diff --git a/CHANGELOG.md b/CHANGELOG.md index ebb0bd75c..5b188fe79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ - Magma blocks are now hot to hold @Pyritie - Added a recipe to craft old gregtech facades into ones with a new texture @Pyritie - Fluid sources of alcohol and milks are no longer placeable, so you can't drink from them infinitely any more @bigtho80 +- Changed the ambient sounds in the Beneath, added some to the moon and mars @Pyritie +- Tweaked the ambient sounds in the overworld @Pyritie ### Bug fixes - Fix for food stacking everywhere! @Mqrius - Fixed some curving press tool head recipes being cheaper than intended (#2478) @Pyritie diff --git a/config/ambientsounds-client.json b/config/ambientsounds-client.json index a1f0e85b0..1244a3329 100644 --- a/config/ambientsounds-client.json +++ b/config/ambientsounds-client.json @@ -202,9 +202,9 @@ "animal": { "animal": 1, "bird": { - "bird": 0.75, - "bird_day": 0.75, - "bird_night": 0.75 + "bird": 0.5, + "bird_day": 0.5, + "bird_night": 0.5 }, "cicadas": 1, "cricket": { @@ -215,7 +215,7 @@ }, "cave": 1, "weather": 1, - "wind": 0.75 + "wind": 0.65 }, "fade-volume": 0.005, "fade-pitch": 0.005, @@ -225,6 +225,7 @@ "ad_astra:moon_orbit", "ad_astra:venus_orbit", "ad_astra:mars_orbit", + "ad_astra:mercury", "ad_astra:mercury_orbit" ] } \ No newline at end of file diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/grass.json b/kubejs/assets/ambientsounds/basic/blockgroups/grass.json new file mode 100644 index 000000000..cfea52f20 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/blockgroups/grass.json @@ -0,0 +1,6 @@ +[ + "tfc:grass/loam", + "tfc:grass/silty_loam", + "tfc:grass/sandy_loam", + "tfc:grass/silt" +] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/ice.json b/kubejs/assets/ambientsounds/basic/blockgroups/ice.json new file mode 100644 index 000000000..9e24b58f1 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/blockgroups/ice.json @@ -0,0 +1,8 @@ +[ + "minecraft:ice", + "minecraft:packed_ice", + "minecraft:frosted_ice", + "minecraft:blue_ice", + "tfc:sea_ice", + "tfc:ice_pile" +] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/log.json b/kubejs/assets/ambientsounds/basic/blockgroups/log.json new file mode 100644 index 000000000..c14e33670 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/blockgroups/log.json @@ -0,0 +1,9 @@ +[ + "tfc:wood/log/oak", + "tfc:wood/log/birch", + "tfc:wood/log/chestnut", + "tfc:wood/log/maple", + "tfc:wood/log/sequoia", + "tfc:wood/log/sycamore", + "afc:wood/log/cypress" +] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/log_cold.json b/kubejs/assets/ambientsounds/basic/blockgroups/log_cold.json new file mode 100644 index 000000000..8fd6a4951 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/blockgroups/log_cold.json @@ -0,0 +1,7 @@ +[ + "tfc:wood/log/pine", + "tfc:wood/log/douglas_fir", + "tfc:wood/log/ash", + "tfc:wood/log/spruce", + "tfc:wood/log/aspen" +] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/log_jungle.json b/kubejs/assets/ambientsounds/basic/blockgroups/log_jungle.json new file mode 100644 index 000000000..4c17e218f --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/blockgroups/log_jungle.json @@ -0,0 +1,10 @@ +[ + "tfc:wood/log/kapok", + "tfc:wood/log/hickory", + "tfc:wood/log/rosewood", + "afc:wood/log/mahogany", + "tfc:wood/log/willow", + "afc:wood/log/tualang", + "afc:wood/log/fig", + "afc:wood/log/hevea" +] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/log_warm.json b/kubejs/assets/ambientsounds/basic/blockgroups/log_warm.json new file mode 100644 index 000000000..75b8d4f86 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/blockgroups/log_warm.json @@ -0,0 +1,10 @@ +[ + "tfc:wood/log/blackwood", + "tfc:wood/log/acacia", + "tfc:wood/log/palm", + "afc:wood/log/ironwood", + "afc:wood/log/ipe", + "afc:wood/log/baobab", + "afc:wood/log/teak", + "afc:wood/log/eucalyptus" +] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/sand.json b/kubejs/assets/ambientsounds/basic/blockgroups/sand.json new file mode 100644 index 000000000..b925cad12 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/blockgroups/sand.json @@ -0,0 +1,9 @@ +[ + "tfc:sand/white", + "tfc:sand/yellow", + "tfc:sand/red", + "tfc:sand/brown", + "tfc:sand/green", + "tfc:sand/pink", + "tfc:sand/black" +] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/snow.json b/kubejs/assets/ambientsounds/basic/blockgroups/snow.json new file mode 100644 index 000000000..1009936ff --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/blockgroups/snow.json @@ -0,0 +1,5 @@ +[ + "minecraft:snow", + "minecraft:snow_block", + "tfc:snow_pile" +] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/water.json b/kubejs/assets/ambientsounds/basic/blockgroups/water.json new file mode 100644 index 000000000..c0a8b1fd7 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/blockgroups/water.json @@ -0,0 +1,5 @@ +[ + "minecraft:water", + "tfc:fluid/river_water", + "tfc:fluid/salt_water" +] diff --git a/kubejs/assets/ambientsounds/basic/features/snow.json b/kubejs/assets/ambientsounds/basic/features/snow.json new file mode 100644 index 000000000..c9ac77a59 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/features/snow.json @@ -0,0 +1,9 @@ +{ + "name": "snow", + "groups": [ + "snow" + ], + "low-count": 20, + "low-weight": 0.1, + "high-weight": 0.3 +} diff --git a/kubejs/assets/ambientsounds/basic/features/tree_cold.json b/kubejs/assets/ambientsounds/basic/features/tree_cold.json new file mode 100644 index 000000000..f9a8f34f8 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/features/tree_cold.json @@ -0,0 +1,19 @@ +{ + "name": "tree", + "and": [ + { + "groups": [ + "leave" + ], + "low-count": 5, + "high-count": 30 + }, + { + "groups": [ + "log_cold" + ], + "low-count": 3, + "high-count": 10 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/features/tree_jungle.json b/kubejs/assets/ambientsounds/basic/features/tree_jungle.json new file mode 100644 index 000000000..77c96df1d --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/features/tree_jungle.json @@ -0,0 +1,19 @@ +{ + "name": "tree", + "and": [ + { + "groups": [ + "leave" + ], + "low-count": 5, + "high-count": 30 + }, + { + "groups": [ + "log_jungle" + ], + "low-count": 3, + "high-count": 10 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/features/tree_warm.json b/kubejs/assets/ambientsounds/basic/features/tree_warm.json new file mode 100644 index 000000000..cc79fb85b --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/features/tree_warm.json @@ -0,0 +1,19 @@ +{ + "name": "tree", + "and": [ + { + "groups": [ + "leave" + ], + "low-count": 5, + "high-count": 30 + }, + { + "groups": [ + "log_warm" + ], + "low-count": 3, + "high-count": 10 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/beach.json b/kubejs/assets/ambientsounds/basic/regions/beach.json new file mode 100644 index 000000000..a7e31a1c4 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/beach.json @@ -0,0 +1,50 @@ +{ + "name": "beach", + "biomes": [ + "shore", + "tidal_flats" + ], + "sounds": [ + { + "name": "beach", + "files": [ + "ambientsounds:water.beach" + ], + "volume": 0.1 + }, + { + "name": "seagull", + "category": "bird_day", + "files": [ + "ambientsounds:animals.seagull" + ], + "volume": 0.4, + "pause": { + "min": 750, + "max": 1000 + } + }, + { + "name": "seagull-long", + "category": "bird_day", + "files": [ + "ambientsounds:animals.seagull-long" + ], + "length": { + "min": 30, + "max": 600 + }, + "pause": { + "min": 750, + "max": 1000 + } + }, + { + "name": "ocean", + "files": [ + "ambientsounds:water.ocean" + ], + "volume": 0.2 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/forest.cold.json b/kubejs/assets/ambientsounds/basic/regions/forest.cold.json new file mode 100644 index 000000000..9c8a520f9 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/forest.cold.json @@ -0,0 +1,87 @@ +{ + "name": "forest.cold", + "features": [ + "tree" + ], + "bad-regions": [ + "rain" + ], + "regions": [ + "surface" + ], + "temperature": { + "max": 0.5 + }, + "sounds": [ + { + "name": "bird-ambience", + "files": [ + "ambientsounds:animals.bird-ambience1", + "ambientsounds:animals.bird-ambience2", + "ambientsounds:animals.bird-ambience3", + "ambientsounds:animals.bird-ambience4", + "ambientsounds:animals.bird-ambience5", + "ambientsounds:animals.bird-ambience6", + "ambientsounds:animals.bird-ambience7", + "ambientsounds:animals.bird-ambience8", + "ambientsounds:animals.bird-ambience9", + "ambientsounds:animals.bird-ambience10", + "ambientsounds:animals.bird-ambience11" + ], + "length": { + "min": 2000, + "max": 3000 + }, + "transition": 400, + "category": "bird_day" + }, + { + "name": "crow", + "category": "bird", + "files": [ + "ambientsounds:animals.crow" + ], + "pause": { + "min": 800, + "max": 4000 + }, + "day": 1, + "night": 0.2 + }, + { + "name": "owl", + "files": [ + "ambientsounds:animals.owl" + ], + "pause": { + "min": 100, + "max": 500 + }, + "category": "bird_night" + }, + { + "name": "wolf", + "category": "animal", + "files": [ + "ambientsounds:animals.wolf" + ], + "pause": { + "min": 100, + "max": 600 + }, + "day": 0 + }, + { + "name": "long-wolf", + "category": "animal", + "files": [ + "ambientsounds:animals.long-wolf" + ], + "pause": { + "min": 12000, + "max": 72000 + }, + "day": 0 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/forest.json b/kubejs/assets/ambientsounds/basic/regions/forest.json new file mode 100644 index 000000000..1dd45d350 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/forest.json @@ -0,0 +1,82 @@ +{ + "name": "forest", + "features": [ + "tree_warm" + ], + "bad-regions": [ + "taiga", + "forest.roofed", + "jungle", + "rain" + ], + "variants": [ + { + "regions": [ + "surface" + ] + }, + { + "regions": [ + "swamp" + ], + "volume": 0.3 + } + ], + "sounds": [ + { + "name": "bird-warm", + "category": "bird_day", + "files": [ + "ambientsounds:animals.bird-ambience-warm1", + "ambientsounds:animals.bird-ambience-warm2" + ], + "length": { + "min": 2000, + "max": 3000 + }, + "overall-raining": false + }, + { + "name": "cricket", + "category": "cricket_day", + "files": [ + "ambientsounds:animals.cricket", + "ambientsounds:animals.cricket2", + "ambientsounds:animals.cricket3" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.25 + }, + { + "name": "cricket-warm-night", + "category": "cricket_night", + "files": [ + "ambientsounds:animals.cricket-warm-night", + "ambientsounds:animals.cricket-warm-night2" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.3 + }, + { + "name": "owl", + "files": [ + "ambientsounds:animals.owl" + ], + "pause": { + "min": 100, + "max": 500 + }, + "category": "bird_night" + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/grass.json b/kubejs/assets/ambientsounds/basic/regions/grass.json new file mode 100644 index 000000000..c1a2dd336 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/grass.json @@ -0,0 +1,73 @@ +{ + "name": "grass", + "features": [ + "grass" + ], + "bad-regions": [ + "plains", + "savanna", + "swamp", + "ocean", + "jungle", + "rain", + "forest", + "forest.cold", + "taiga", + "snow" + ], + "bad-biomes": [ + "river", + "lake", + "mountain_lake", + "old_mountain_lake", + "oceanic_mountain_lake", + "plateau_lake", + "ocean", + "ocean_reef", + "deep_ocean", + "deep_ocean_trench" + ], + "sounds": [ + { + "name": "cricket", + "category": "cricket_day", + "files": [ + "ambientsounds:animals.cricket", + "ambientsounds:animals.cricket2", + "ambientsounds:animals.cricket3" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.05 + }, + { + "name": "cricket-night", + "category": "cricket_night", + "files": [ + "ambientsounds:animals.cricket-night", + "ambientsounds:animals.cricket-night2", + "ambientsounds:animals.cricket-night3", + "ambientsounds:animals.cricket-night4" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.05 + }, + { + "name": "cicadas-night", + "category": "cicadas", + "files": [ + "ambientsounds:animals.cicadas-night" + ], + "time": "day" + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/highland.json b/kubejs/assets/ambientsounds/basic/regions/highland.json new file mode 100644 index 000000000..a4db51513 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/highland.json @@ -0,0 +1,36 @@ +{ + "name": "highland", + "biomes": [ + "old_mountains", + "old_mountain_lake", + "oceanic_mountains", + "oceanic_mountain_lake" + ], + "sounds": [ + { + "name": "heavy-wind", + "category": "wind", + "files": [ + "ambientsounds:wind.heavy-wind" + ], + "air": { + "min": 0.6 + }, + "volume": 0.5 + }, + { + "name": "wind-in-leaves", + "category": "wind", + "files": [ + "ambientsounds:wind.wind-in-leaves" + ], + "air": { + "min": 0.6 + }, + "features": [ + "tree" + ], + "volume": 0.5 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/jungle.json b/kubejs/assets/ambientsounds/basic/regions/jungle.json new file mode 100644 index 000000000..249b4a50d --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/jungle.json @@ -0,0 +1,54 @@ +{ + "name": "jungle", + "features": [ + "wood_jungle" + ], + "bad-biomes": [ + "mountain_lake", + "old_mountain_lake", + "oceanic_mountain_lake", + "plateau_lake", + "ocean", + "ocean_reef", + "deep_ocean", + "deep_ocean_trench", + "rain" + ], + "sounds": [ + { + "name": "cricket-jungle", + "category": "cricket_day", + "files": [ + "ambientsounds:animals.cricket-jungle" + ] + }, + { + "name": "cricket-jungle-night", + "category": "cricket_night", + "files": [ + "ambientsounds:animals.cricket-jungle-night" + ] + }, + { + "name": "bird-ambience-jungle", + "category": "bird_day", + "files": [ + "ambientsounds:animals.bird-ambience-jungle", + "ambientsounds:animals.bird-ambience-jungle2" + ] + }, + { + "name": "bird-ambience-jungle-night", + "category": "bird_night", + "files": [ + "ambientsounds:animals.bird-ambience-jungle-night", + "ambientsounds:animals.bird-ambience-jungle-night2" + ], + "length": { + "min": 1500, + "max": 2000 + }, + "transition": 200 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/lake.json b/kubejs/assets/ambientsounds/basic/regions/lake.json new file mode 100644 index 000000000..336ea7287 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/lake.json @@ -0,0 +1,25 @@ +{ + "name": "lake", + "biomes": [ + "river", + "lake", + "mountain_lake", + "old_mountain_lake", + "oceanic_mountain_lake", + "plateau_lake", + "volcanic_mountain_lake", + "volcanic_oceanic_mountain_lake" + ], + "features": [ + "water" + ], + "sounds": [ + { + "name": "ocean", + "files": [ + "ambientsounds:water.ocean" + ], + "volume": 0.4 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/mesa.json b/kubejs/assets/ambientsounds/basic/regions/mesa.json new file mode 100644 index 000000000..c41ddb665 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/mesa.json @@ -0,0 +1,20 @@ +{ + "name": "mesa", + "biomes": [ + "mountains", + "mountain_lake", + "volcanic_mountains", + "volcanic_mountain_lake", + "volcanic_oceanic_mountains", + "volcanic_oceanic_mountain_lake" + ], + "sounds": [ + { + "name": "wind-mesa", + "category": "wind", + "files": [ + "ambientsounds:wind.mesa" + ] + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/mushroom_fields.json b/kubejs/assets/ambientsounds/basic/regions/mushroom_fields.json new file mode 100644 index 000000000..0559992d2 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/mushroom_fields.json @@ -0,0 +1,48 @@ +{ + "name": "mushroom_fields", + "biomes": [ + "amber_hills", + "amber_plains", + "amber_edge", + "rusticus_hills", + "rusticus_plains", + "rusticus_edge", + "sangnum_hills", + "sangnum_plains", + "sangnum_edge" + ], + "sounds": [ + { + "name": "cicadas-mushroom-fields", + "category": "cicadas", + "files": [ + "ambientsounds:animals.cicadas-mushroom-fields" + ], + "volume": 0.5, + "day": 1, + "time": [ + "day", + "night" + ], + "night": "0.1" + }, + { + "name": "special-mushroom-fields", + "category": "animal", + "files": [ + "ambientsounds:animals.special-mushroom-fields" + ], + "volume": 0.5, + "day": 1, + "night": "0.2", + "length": { + "min": 40, + "max": 120 + }, + "pause": { + "min": 500, + "max": 2200 + } + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/ocean.json b/kubejs/assets/ambientsounds/basic/regions/ocean.json new file mode 100644 index 000000000..79b49076e --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/ocean.json @@ -0,0 +1,22 @@ +{ + "name": "ocean", + "biomes": [ + "ocean", + "ocean_reef" + ], + "features": [ + "water" + ], + "sound-collections": [ + "wind" + ], + "sounds": [ + { + "name": "ocean", + "files": [ + "ambientsounds:water.ocean" + ], + "volume": 0.1 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/ocean_deep.json b/kubejs/assets/ambientsounds/basic/regions/ocean_deep.json new file mode 100644 index 000000000..1f4083f39 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/ocean_deep.json @@ -0,0 +1,32 @@ +{ + "name": "ocean", + "biomes": [ + "deep_ocean", + "deep_ocean_trench" + ], + "features": [ + "ocean" + ], + "underwater": { + "min": 0.01, + "fade": 4 + }, + "mute": 0.1, + "mute-priority": 10, + "sounds": [ + { + "name": "whale", + "category": "animal", + "pause": { + "min": 100, + "max": 1000 + }, + "features": [ + "ocean" + ], + "files": [ + "ambientsounds:animals.whale" + ] + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/plains.json b/kubejs/assets/ambientsounds/basic/regions/plains.json new file mode 100644 index 000000000..c1ddf9447 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/plains.json @@ -0,0 +1,72 @@ +{ + "name": "plains", + "features": [ + "grass" + ], + "bad-regions": [ + "ocean", + "forest", + "savanna", + "swamp", + "highland", + "nether", + "rain", + "taiga", + "snow" + ], + "biomes": [ + "lake", + "plains", + "highlands", + "hills", + "old_mountains", + "rolling_hills", + "plateau", + "plateau_lake" + ], + "sounds": [ + { + "name": "cricket", + "category": "cricket_day", + "files": [ + "ambientsounds:animals.cricket", + "ambientsounds:animals.cricket2", + "ambientsounds:animals.cricket3" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.3 + }, + { + "name": "cricket-night", + "category": "cricket_night", + "files": [ + "ambientsounds:animals.cricket-night", + "ambientsounds:animals.cricket-night2", + "ambientsounds:animals.cricket-night3", + "ambientsounds:animals.cricket-night4", + "ambientsounds:animals.cricket-night5" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.3 + }, + { + "name": "cicadas-night", + "category": "cicadas", + "files": [ + "ambientsounds:animals.cicadas-night" + ], + "time": "night", + "volume": 0.3 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/savanna.json b/kubejs/assets/ambientsounds/basic/regions/savanna.json new file mode 100644 index 000000000..b876efba6 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/savanna.json @@ -0,0 +1,125 @@ +{ + "name": "savanna", + "bad-regions": [ + "rain", + "snow" + ], + "biomes": [ + "badlands", + "canyons", + "inverted_canyons", + "low_canyons" + ], + "sounds": [ + { + "name": "cricket", + "category": "cricket_day", + "files": [ + "ambientsounds:animals.cricket", + "ambientsounds:animals.cricket2", + "ambientsounds:animals.cricket3" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.25 + }, + { + "name": "cicadas", + "category": "cicadas", + "files": [ + "ambientsounds:animals.cicadas" + ], + "overall-raining": false, + "day": 0.15, + "night": 0.01, + "length": { + "min": 100, + "max": 300 + }, + "pause": { + "min": 100, + "max": 600 + } + }, + { + "name": "cicadas-desert", + "category": "cicadas", + "files": [ + "ambientsounds:animals.cicadas-desert1", + "ambientsounds:animals.cicadas-desert2" + ], + "overall-raining": false, + "special-biomes": { + "temperature": { + "min": 0.8 + } + }, + "day": 1, + "night": 0, + "length": { + "min": 400, + "max": 900 + }, + "pause": { + "min": 500, + "max": 1000 + } + }, + { + "name": "cricket-warm-night", + "category": "cricket_night", + "files": [ + "ambientsounds:animals.cricket-warm-night", + "ambientsounds:animals.cricket-warm-night2" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.3 + }, + { + "name": "wolf", + "category": "animal", + "files": [ + "ambientsounds:animals.wolf" + ], + "pause": { + "min": 100, + "max": 600 + }, + "day": 0 + }, + { + "name": "long-wolf", + "category": "animal", + "files": [ + "ambientsounds:animals.long-wolf" + ], + "pause": { + "min": 12000, + "max": 72000 + }, + "day": 0 + }, + { + "name": "bird-warm", + "category": "bird_day", + "files": [ + "ambientsounds:animals.bird-ambience-warm1", + "ambientsounds:animals.bird-ambience-warm2" + ], + "length": { + "min": 2000, + "max": 3000 + }, + "overall-raining": false + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/snow.json b/kubejs/assets/ambientsounds/basic/regions/snow.json new file mode 100644 index 000000000..30b9df5bf --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/snow.json @@ -0,0 +1,9 @@ +{ + "name": "snow", + "features": [ + "snow" + ], + "sound-collections": [ + "wind" + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/swamp.json b/kubejs/assets/ambientsounds/basic/regions/swamp.json new file mode 100644 index 000000000..02ef2c37e --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/swamp.json @@ -0,0 +1,72 @@ +{ + "name": "swamp", + "bad-regions": [ + "rain", + "snow" + ], + "biomes": [ + "salt_marsh", + "lowlands" + ], + "sounds": [ + { + "name": "cricket-swamp", + "category": "cricket_day", + "files": [ + "ambientsounds:animals.cricket-swamp" + ], + "volume": 0.3, + "overall-raining": false + }, + { + "name": "cricket-warm-night", + "category": "cricket_night", + "files": [ + "ambientsounds:animals.cricket-warm-night", + "ambientsounds:animals.cricket-warm-night2" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.3 + }, + { + "name": "frog", + "category": "animal", + "files": [ + "ambientsounds:animals.frog1", + "ambientsounds:animals.frog2" + ], + "pause": { + "min": 100, + "max": 750 + }, + "day": 0.05, + "night": 0.15 + }, + { + "name": "mouring_dove", + "category": "animal", + "files": [ + "ambientsounds:animals.mouring_dove" + ], + "features": [ + "tree" + ], + "pause": { + "min": 100, + "max": 400 + }, + "time": { + "5": 0, + "6": 1, + "8": 1, + "9": 0 + }, + "volume": 0.14 + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/taiga.json b/kubejs/assets/ambientsounds/basic/regions/taiga.json new file mode 100644 index 000000000..d697d9f8d --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/taiga.json @@ -0,0 +1,73 @@ +{ + "name": "taiga", + "features": [ + "tree_cold" + ], + "bad-regions": [ + "rain" + ], + "bad-biomes": [ + "mountain_lake", + "old_mountain_lake", + "oceanic_mountain_lake", + "plateau_lake", + "ocean", + "ocean_reef", + "deep_ocean", + "deep_ocean_trench", + "rain" + ], + "sounds": [ + { + "name": "bird-ambience-huge", + "category": "bird_day", + "files": [ + "ambientsounds:animals.bird-ambience-huge1", + "ambientsounds:animals.bird-ambience-huge2", + "ambientsounds:animals.bird-ambience-huge3" + ], + "length": { + "min": 2000, + "max": 3000 + }, + "transition": 400 + }, + { + "name": "crow", + "category": "bird", + "files": [ + "ambientsounds:animals.crow" + ], + "pause": { + "min": 800, + "max": 4000 + }, + "day": 1, + "night": 0.2 + }, + { + "name": "wolf", + "category": "animal", + "files": [ + "ambientsounds:animals.wolf" + ], + "pause": { + "min": 100, + "max": 600 + }, + "day": 0 + }, + { + "name": "long-wolf", + "category": "animal", + "files": [ + "ambientsounds:animals.long-wolf" + ], + "pause": { + "min": 12000, + "max": 72000 + }, + "day": 0 + } + ] +} diff --git a/kubejs/startup_scripts/tfg/sounds.js b/kubejs/startup_scripts/tfg/sounds.js index 44974e4b0..2b383fcc6 100644 --- a/kubejs/startup_scripts/tfg/sounds.js +++ b/kubejs/startup_scripts/tfg/sounds.js @@ -18,6 +18,10 @@ function registerTFGSounds(event) { event.create('tfg:ambient.mars_desert.additions') event.create('tfg:ambient.mars_desert.mood') + event.create('tfg:ambient.mars_land.loop') + event.create('tfg:ambient.mars_land.additions') + event.create('tfg:ambient.mars_land.mood') + event.create('tfg:ambient.venus_surface.loop') event.create('tfg:ambient.venus_surface.additions') event.create('tfg:ambient.venus_surface.mood')