Skip to content

Commit

Permalink
tentacleghost monsters from vanilla now properly make sound
Browse files Browse the repository at this point in the history
  • Loading branch information
sayterdarkwynd committed Jun 14, 2017
1 parent 027280d commit bd17a8d
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 15 deletions.
4 changes: 2 additions & 2 deletions biomes/surface/atropus.biome
Original file line number Diff line number Diff line change
Expand Up @@ -598,10 +598,10 @@

"musicTrack" : {
"day" : {
"tracks" : [ ]
"tracks" : [ "/music/atropusambiance1a.ogg", "/music/atropusambiance2a.ogg" ]
},
"night" : {
"tracks" : [ ]
"tracks" : [ "/music/atropusambiance3a.ogg", "/music/atropusambiance4a.ogg" ]
}
},

Expand Down
4 changes: 2 additions & 2 deletions biomes/surface/atropusdark.biome
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,10 @@

"musicTrack" : {
"day" : {
"tracks" : [ ]
"tracks" : [ "/music/atropusambiance1a.ogg", "/music/atropusambiance2a.ogg" ]
},
"night" : {
"tracks" : [ ]
"tracks" : [ "/music/atropusambiance3a.ogg", "/music/atropusambiance4a.ogg" ]
}
},

Expand Down
12 changes: 6 additions & 6 deletions biomes/surface/bloodstone.biome
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@
},

"musicTrack" : {
"day" : {
"tracks" : [ "/music/epsilon-indi.ogg", "/music/hymn-to-the-stars.ogg", "/music/planetarium.ogg", "/music/procyon.ogg", "/music/stellarformation.ogg", "/music/vast-immortal-suns.ogg", "/music/atlas.ogg", "/music/blue-straggler.ogg", "/music/cygnus-x1.ogg", "/music/europa.ogg", "/music/haiku.ogg", "/music/M54.ogg", "/music/on-the-beach-at-night.ogg" ]
},
"night" : {
"tracks" : [ "/music/jupiter.ogg", "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/mercury.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/psyche.ogg", "/music/accretion-Disc.ogg", "/music/cygnus-x1.ogg", "/music/eridanus-supervoid.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg", "/music/M54.ogg", "/music/Nomads.ogg", "/music/on-the-beach-at-night.ogg" ]
}
"day" : {
"tracks" : [ "/music/atropusambiance1a.ogg", "/music/atropusambiance2a.ogg" ]
},
"night" : {
"tracks" : [ "/music/atropusambiance3a.ogg", "/music/atropusambiance4a.ogg" ]
}
},

"surfacePlaceables" : {
Expand Down
4 changes: 2 additions & 2 deletions biomes/surface/bloodstonesea.biome
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@

"musicTrack" : {
"day" : {
"tracks" : [ ]
"tracks" : [ "/music/atropusambiance1a.ogg", "/music/atropusambiance2a.ogg" ]
},
"night" : {
"tracks" : [ ]
"tracks" : [ "/music/atropusambiance3a.ogg", "/music/atropusambiance4a.ogg" ]
}
},

Expand Down
6 changes: 3 additions & 3 deletions monsters/boss/gorillaking/gorillaking.animation
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"frames" : 6,
"cycle" : 0.7,
"properties" : {
"persistentSound" : "/sfx/npc/monsters/gorillaking_notice.ogg",
"persistentSound" : "/sfx/npc/boss/apeboss_stage1_attack1.ogg",
"particleEmittersOff" : [ "spindust", "burndust" ]
}
},
Expand Down Expand Up @@ -131,15 +131,15 @@
"frames" : 6,
"cycle" : 0.6,
"properties" : {
"immediateSound" : "/sfx/npc/quadruped/lion_attack1.ogg",
"immediateSound" : "/sfx/npc/boss/apeboss_stage1_attack2.ogg",
"particleEmittersOff" : [ "spindust", "burndust" ]
}
},
"fire3" : {
"frames" : 10,
"cycle" : 1.0,
"properties" : {
"immediateSound" : "/sfx/npc/quadruped/lion_attack1.ogg",
"immediateSound" : "/sfx/npc/boss/apeboss_stage1_attack1.ogg",
"particleEmittersOff" : [ "spindust", "burndust" ]
}
},
Expand Down
23 changes: 23 additions & 0 deletions monsters/ghosts/tentacleghost/tentacleghost.animation.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[
{
"op": "add",
"path": "/animatedParts/stateTypes/body/states/firewindup/frameProperties",
"value": {
"immediateSound": [
"",
"/sfx/npc/monsters/wisper_windup1.ogg",
"",
"",
"/sfx/npc/monsters/wisper_windup1.ogg",
""
]
}
},
{
"op": "add",
"path": "/sounds/fire",
"value": [
"/sfx/npc/monsters/ringram_attack1.ogg"
]
}
]
7 changes: 7 additions & 0 deletions monsters/ghosts/tentacleghost/tentacleghost.monstertype.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"op": "replace",
"path": "/baseParameters/behaviorConfig/hostileActions/0/parameters/fireSound",
"value": "fire"
}
]
Binary file added music/atropusambiance1a.ogg
Binary file not shown.
Binary file added music/atropusambiance2a.ogg
Binary file not shown.
Binary file added music/atropusambiance3a.ogg
Binary file not shown.
Binary file added music/atropusambiance4a.ogg
Binary file not shown.

0 comments on commit bd17a8d

Please sign in to comment.