diff --git a/biomes/surface/arcana_ruinous.biome b/biomes/surface/arcana_ruinous.biome index 20f7e4cab..e28aa2fbb 100644 --- a/biomes/surface/arcana_ruinous.biome +++ b/biomes/surface/arcana_ruinous.biome @@ -119,10 +119,10 @@ "musicTrack" : { "day" : { - "tracks" : [ "/music/outisde-the-citadel.ogg" ] + "tracks" : [ "/music/feel_the_same.ogg" ] }, "night" : { - "tracks" : [ "/music/outisde-the-citadel.ogg" ] + "tracks" : [ "/music/outisde-the-citadel.ogg","/music/feel_the_same.ogg" ] } }, diff --git a/biomes/surface/arcana_ruinousswamp.biome b/biomes/surface/arcana_ruinousswamp.biome new file mode 100644 index 000000000..62e81d984 --- /dev/null +++ b/biomes/surface/arcana_ruinousswamp.biome @@ -0,0 +1,306 @@ +{ + "name" : "arcana_ruinousSwamp", + "friendlyName" : "Ruinous Swamp", + + "statusEffects" : [ "arcana_status_cataclysm" ], + + "spawnProfile" : { + "groups" : [ + { + "select" : 1, + "pool" : [ + [ 1.0, "arcana_abyssTentablob" ] + ] + }, + { + "select" : 3, + "pool" : [ + [ 0.1666, "tentaclecrawler" ], + [ 0.1666, "tentaclegnat" ], + [ 0.1666, "tentaclebomb" ], + [ 0.1666, "tentacleghost" ], + [ 0.1666, "tentacleclam" ] + ] + }, + { + "select" : 1, + "pool" : [ + [ 0.4, "tidefly" ], + [ 0.3, "seahornet" ], + [ 0.3, "wavebird" ] + ] + }, + { + "select" : 1, + "pool" : "generatedGroundAggroDay" + }, + { + "select" : 3, + "pool" : "nightTerrors" + }, + { + "select" : 2, + "pool" : "generatedGround" + }, + { + "select" : 2, + "pool" : "generatedFlying" + }, + { + "select" : 2, + "pool" : [ + [ 1, "gullcritter" ], + [ 1, "squidcritter" ], + [ 1, "jellycritter" ], + [ 1, "crabcritter" ], + [ 1, "fishlemoncritter" ], + [ 1, "fishberrycritter" ], + [ 1, "fishchilicritter" ], + [ 1, "tortoisecritter" ] + ] + } + ], + "monsterParameters" : { + "colors" : "ocean", + "statusSettings" : { + "stats" : { + "knockbackThreshold" : { + "baseValue" : 30 + }, + "maxHealth" : { + "baseValue" : 140 + }, + "specialStatusImmunity" : { + "baseValue" : 1.0 + } + } + } + } + }, + + "hueShiftOptions" : [0], + + "weather" : [ + [0, [ + "/weather.config:arcana_ruinous" + ]] + ], + + "skyOptions" : [ + { + "mainColor" : [255, 255, 255], + + "morningColors" : [ [24, 38, 70, 60], [38, 22, 150, 120] ], + "dayColors" : [ [24, 38, 70, 60], [38, 22, 150, 120] ], + "eveningColors" : [ [24, 38, 70, 60], [38, 22, 150, 120] ], + "nightColors" : [ [24, 38, 70, 60], [38, 22, 150, 120] ], + + "morningLightColor" : [30, 20, 60], + "dayLightColor" : [30, 20, 60], + "eveningLightColor" : [30, 20, 60], + "nightLightColor" : [30, 20, 60] + } + ], + + "mainBlock" : "ruinous_tile1", + "subBlocks" : [ "desolate_tile1", "desolate_tile2", "shadowblock"], + "ores" : "arcana_ruinous_ores_surface", + + "parallax" : "/parallax/surface/arcana_ruinousSwamp.parallax", + + "ambientNoises" : { + "day" : { + "tracks" : [ "/sfx/environmental/ocean_surface_calm.ogg" ] + }, + "night" : { + "tracks" : [ "/sfx/environmental/ocean_surface_calm.ogg" ] + } + }, + + "musicTrack" : { + "day" : { + "tracks" : [ "/music/feel_the_same.ogg" ] + }, + "night" : { + "tracks" : [ "/music/outisde-the-citadel.ogg","/music/feel_the_same.ogg" ] + } + }, + + "surfacePlaceables" : { + "grassMod" : [ "blackash" ], + "grassModDensity" : 0.3, + + "items" : [ + { + "mode" : "floor", + "priority" : 0.0, + "variants" : 1, + "distribution" : "/biomes/distributions.config:undergroundweaponChests", + + "type" : "treasureBox", + "treasureBoxSets" : [ "weaponChest" ] + }, + { + "mode" : "floor", + "priority" : 1, + "variants" : 1, + "distribution" : "/biomes/distributions.config:common", + + "type" : "microdungeon", + "microdungeons" : [ "arcana_ruinous_dungeon_1" ] + }, + { + "mode" : "floor", + "priority" : 1, + "variants" : 1, + "distribution" : "/biomes/distributions.config:rare", + + "type" : "microdungeon", + "microdungeons" : [ "arcana_dungeon_general_lush_horizon" ] + }, + { + "mode" : "floor", + "priority" : 1, + "variants" : 1, + "distribution" : "/biomes/distributions.config:uncommon", + + "type" : "microdungeon", + "microdungeons" : [ "darkmicrodungeons" ] + }, + { + "mode" : "floor", + "priority" : 1, + "variants" : 1, + "distribution" : "/biomes/distributions.config:common", + + "type" : "microdungeon", + "microdungeons" : [ "arcana_ruinous_dungeon_1" ] + }, + { + "mode" : "floor", + "priority" : 1.0, + "variants" : 1, + "distribution" : "/biomes/distributions.config:overgroundRareChests", + + "type" : "object", + "objectSets" : [ + { + "pool" : [ [1, "statuspod" ] ], + "parameters" : { } + } + ] + }, + { + "mode" : "floor", + "priority" : 1.0, + "variants" : 1, + "distribution" : "/biomes/distributions.config:surfaceCapsules", + + "type" : "object", + "objectSets" : [ + { + "pool" : [ [0.35, "capsulesmall" ], [0.35, "capsulemed" ], [0.35, "capsulebig" ] ], + "parameters" : { } + } + ] + }, + { + "mode" : "floor", + "priority" : 3.0, + "variants" : 1, + "distribution" : "/biomes/distributions.config:scatteredSmall", + + "type" : "grass", + "grasses" : [ "arcana_ruinous_grass_1" ] + }, + { + "mode" : "floor", + "priority" : 1.0, + "variants" : 1, + "distribution" : "/biomes/distributions.config:scatteredLarge", + + "type" : "tree", + "treeFoliageHueShiftMax" : 0, + "treeStemHueShiftMax" : 0, + "treeStemList" : [ "omen" ], + "treeFoliageList" : [ "omen" ] + }, + { + "mode" : "floor", + "priority" : 1.0, + "variants" : 1, + "distribution" : "/biomes/distributions.config:scatteredLarge", + + "type" : "tree", + "treeFoliageHueShiftMax" : 0, + "treeStemHueShiftMax" : 0, + "treeStemList" : [ "ruinous" ], + "treeFoliageList" : [ "ruinous" ] + }, + + { + "mode" : "floor", + "priority" : 0, + "variants" : 1, + "distribution" : "/biomes/distributions.config:surfaceCrops", + + "type" : "object", + "objectSets" : [ + { + "pool" : [ [1, "wildboltbulbseed" ] ], + "parameters" : { + "startingStage" : 3 + } + } + ] + }, + { + "mode" : "floor", + "priority" : 0, + "variants" : 1, + "distribution" : "/biomes/distributions.config:surfaceCrops", + + "type" : "object", + "objectSets" : [ + { + "pool" : [ [1, "wildcurrentcornseed" ] ], + "parameters" : { + "startingStage" : 3 + } + } + ] + } + ] + }, + + "undergroundPlaceables" : { + "grassMod" : [ "sand" ], + "grassModDensity" : 0.9, + + "items" : [ + { + "mode" : "floor", + "priority" : 0.0, + "variants" : 1, + "distribution" : "/biomes/distributions.config:undergroundChests", + + "type" : "treasureBox", + "treasureBoxSets" : [ "basicChest" ] + }, + { + "mode" : "floor", + "priority" : 1.0, + "variants" : 1, + "distribution" : "/biomes/distributions.config:undergroundCapsules", + + "type" : "object", + "objectSets" : [ + { + "pool" : [ [0.35, "capsulesmall" ], [0.35, "capsulemed" ], [0.35, "capsulebig" ] ], + "parameters" : { } + } + ] + } + ] + } +} diff --git a/biomes/surface/arcana_senbonzakura.biome b/biomes/surface/arcana_senbonzakura.biome index 12ccd0471..a4b23e894 100644 --- a/biomes/surface/arcana_senbonzakura.biome +++ b/biomes/surface/arcana_senbonzakura.biome @@ -156,26 +156,20 @@ "musicTrack" : { "day" : { "tracks" : [ - "/music/the-deep.ogg", + "/music/sternengesang.ogg", "/music/surface.ogg", - "/music/over-the-spring-horizon.ogg", - "/music/woodland-trance.ogg", - "/music/forest-loop.ogg", - "/music/hymn-to-the-stars.ogg", - "/music/haiku.ogg", - "/music/m54.ogg" + "/music/elegy-of-the-star.ogg", + "/music/forest-loop.ogg" ] }, "night" : { "tracks" : [ - "/music/the-deep.ogg", + "/music/sternengesang.ogg", "/music/surface.ogg", "/music/drift-far.ogg", - "/music/woodland-trance.ogg", + "/music/permafrost.ogg", "/music/forest-loop.ogg", - "/music/tranquility-base.ogg", - "/music/psyche.ogg", - "/music/eridanus-supervoid.ogg" + "/music/ophelia.ogg" ] } }, diff --git a/music/credits.txt b/music/credits.txt index 93094eac6..60b79118f 100644 --- a/music/credits.txt +++ b/music/credits.txt @@ -1,97 +1,106 @@ -AlexR1der: drift-far -https://soundcloud.com/alexr1der/drift-far - -AlexR1der: space-explorer -https://www.audiotool.com/track/lucmfo7bic/ - -FinRain: elegy-of-the-star -https://soundcloud.com/fin-rain/elegy-of-the-star - -FinRain: time-will-show -https://soundcloud.com/fin-rain/time-will-show - -FinRain: distortion -https://soundcloud.com/fin-rain/distortion - -Xyntho: frozen-in-time -https://soundcloud.com/xyntho/frozen-in-time - -Xyntho: over-the-spring-horizon -https://soundcloud.com/xyntho/over-the-spring-horizon - -Xyntho: woodland-trance -https://soundcloud.com/xyntho/woodland-trance - -Xyntho: gallyri-islands -https://soundcloud.com/xyntho/gallyri-islands - -HectorBat: tenacity -https://open.spotify.com/album/0pK6NJoitMTGPgLZBW1R05?si=Ei09nPXoRWC-w3EsR3RpZQ -https://soundcloud.com/azuxmusic/tenacity-1 - -DäMica: Vizaydn_Circle_Extended -https://soundcloud.com/dma3mcc070490-522875460 - -DäMica: Ever_So_Friendly (Ever So Elated) -https://soundcloud.com/dma3mcc070490-522875460/ever-so-friendly - -DäMica: Atsu -https://soundcloud.com/dma3mcc070490-522875460/atsu - -DäMica: Tick_Tock -https://soundcloud.com/dma3mcc070490-522875460/tick-tock - -Ceiis: surface -https://soundcloud.com/ceiis/surface - -Monolog Rockstars: at-the-restaurant - -Lobo Loco: summerrain-part-b - -Water Features: outisde-the-citadel - -KarlH: 04 Thetis - -Danijel-Zambo: last-breath -http://uppbeat.io/t/danijel-zambo/last-breath - -V-Draganov: mystery-box -http://uppbeat.io/t/v-draganov/mystery-box - -Kevin-Macleod: malicious -http://uppbeat.io/t/kevin-macleod/malicious - -Kevin-Macleod: unholy-knight -http://uppbeat.io/t/kevin-macleod/unholy-knight - -Roo Walker: ophelia -http://uppbeat.io/t/roo-walker/ophelia - -Walz: by-the-fireplace -http://uppbeat.io/t/walz/by-the-fireplace - -Voyager: -http://uppbeat.io/t/ - -Permafrost: -https://uppbeat.io/t/bakerman/permafrost - -Pedal-to-the-metal: -https://uppbeat.io/t/matrika/pedal-to-the-metal - -Sfx: -Joshua Shivers - -Sva: Aeon -(Sva) - -Sva: Azure -(Sva) - -Sva: Bright Blue Fog -(Sva) - -Sva: Auric -(Sva) - - +AlexR1der: drift-far +https://soundcloud.com/alexr1der/drift-far + +AlexR1der: space-explorer +https://www.audiotool.com/track/lucmfo7bic/ + +FinRain: elegy-of-the-star +https://soundcloud.com/fin-rain/elegy-of-the-star + +FinRain: time-will-show +https://soundcloud.com/fin-rain/time-will-show + +FinRain: distortion +https://soundcloud.com/fin-rain/distortion + +Xyntho: frozen-in-time +https://soundcloud.com/xyntho/frozen-in-time + +Xyntho: over-the-spring-horizon +https://soundcloud.com/xyntho/over-the-spring-horizon + +Xyntho: woodland-trance +https://soundcloud.com/xyntho/woodland-trance + +Xyntho: gallyri-islands +https://soundcloud.com/xyntho/gallyri-islands + +HectorBat: tenacity +https://open.spotify.com/album/0pK6NJoitMTGPgLZBW1R05?si=Ei09nPXoRWC-w3EsR3RpZQ +https://soundcloud.com/azuxmusic/tenacity-1 + +DäMica: Vizaydn_Circle_Extended +https://soundcloud.com/dma3mcc070490-522875460 + +DäMica: Ever_So_Friendly (Ever So Elated) +https://soundcloud.com/dma3mcc070490-522875460/ever-so-friendly + +DäMica: Atsu +https://soundcloud.com/dma3mcc070490-522875460/atsu + +DäMica: Tick_Tock +https://soundcloud.com/dma3mcc070490-522875460/tick-tock + +Ceiis: surface +https://soundcloud.com/ceiis/surface + +Monolog Rockstars: at-the-restaurant + +Lobo Loco: summerrain-part-b + +Water Features: outisde-the-citadel + +KarlH: 04 Thetis + +Danijel-Zambo: last-breath +http://uppbeat.io/t/danijel-zambo/last-breath + +V-Draganov: mystery-box +http://uppbeat.io/t/v-draganov/mystery-box + +Kevin-Macleod: malicious +http://uppbeat.io/t/kevin-macleod/malicious + +Kevin-Macleod: unholy-knight +http://uppbeat.io/t/kevin-macleod/unholy-knight + +Roo Walker: ophelia +http://uppbeat.io/t/roo-walker/ophelia + +Walz: by-the-fireplace +http://uppbeat.io/t/walz/by-the-fireplace + +Voyager: +http://uppbeat.io/t/ + +Permafrost: +https://uppbeat.io/t/bakerman/permafrost + +Pedal-to-the-metal: +https://uppbeat.io/t/matrika/pedal-to-the-metal + +feel-the-same: +Battle Tapes + +sternengesang: +Cyua + +keeper-of-the-forest: +Vindsvept + +Sfx: +Joshua Shivers + +Sva: Aeon +(Sva) + +Sva: Azure +(Sva) + +Sva: Bright Blue Fog +(Sva) + +Sva: Auric +(Sva) + + diff --git a/music/feel_the_same.ogg b/music/feel_the_same.ogg new file mode 100644 index 000000000..83e391db5 Binary files /dev/null and b/music/feel_the_same.ogg differ diff --git a/music/keeper-of-the-forest.ogg b/music/keeper-of-the-forest.ogg new file mode 100644 index 000000000..56bc25151 Binary files /dev/null and b/music/keeper-of-the-forest.ogg differ diff --git a/music/sternengesang.ogg b/music/sternengesang.ogg new file mode 100644 index 000000000..2b0303c6e Binary files /dev/null and b/music/sternengesang.ogg differ