diff --git a/CHANGELOG.md b/CHANGELOG.md index ded701b3bc..e15170701d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Additions - Added the `healersSetSpawn` gamerule. When enabled, using a healing machine will set your spawnpoint. - A Pokémon holding a Power item now gains 1 point in the corresponding riding stat every two minutes while being ridden. The interval is configurable, and can be disabled with `-1`. +- Added sounds to Gigaton Hammer and Pyro Ball ### Changes - Amethyst now grows from Typegem core blocks like typegems do diff --git a/common/src/main/resources/assets/cobblemon/sounds.json b/common/src/main/resources/assets/cobblemon/sounds.json index c7b1c55ebe..b097d33973 100644 --- a/common/src/main/resources/assets/cobblemon/sounds.json +++ b/common/src/main/resources/assets/cobblemon/sounds.json @@ -1653,6 +1653,18 @@ "move.horndrill.target_2": { "sounds": [ { "name": "cobblemon:move/horndrill/horndrill_target_2", "volume": 1.0 } ] }, + "move.gigatonhammer.actor": { + "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_actor", "volume": 1.0 } ] + }, + "move.gigatonhammer.target": { + "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_target", "volume": 1.0 } ] + }, + "move.pyroball.actor": { + "sounds": [ { "name": "cobblemon:move/pyroball/pyroball_actor", "volume": 1.0 } ] + }, + "move.pyroball.target": { + "sounds": [ { "name": "cobblemon:move/pyroball/pyroball_target", "volume": 1.0 } ] + }, "impact.normal": { "sounds": [ { "name": "cobblemon:move/impact_generic/impact_generic_fighting_1", "volume": 0.8 }, @@ -8672,6 +8684,9 @@ "pokemon.cinderace.cry": { "sounds": [ { "name": "cobblemon:pokemon/cinderace/cinderace_cry", "volume": 0.8 } ] }, + "pokemon.cinderace.pyroball": { + "sounds": [ { "name": "cobblemon:pokemon/cinderace/cinderace_pyroball", "volume": 0.5 } ] + }, "pokemon.sobble.cry": { "sounds": [ { "name": "cobblemon:pokemon/sobble/sobble_cry", "volume": 0.8 } ] }, diff --git a/common/src/main/resources/assets/cobblemon/sounds/move/gigatonhammer/gigatonhammer_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/move/gigatonhammer/gigatonhammer_actor.ogg new file mode 100644 index 0000000000..6af45e3a42 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/move/gigatonhammer/gigatonhammer_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/move/gigatonhammer/gigatonhammer_target.ogg b/common/src/main/resources/assets/cobblemon/sounds/move/gigatonhammer/gigatonhammer_target.ogg new file mode 100644 index 0000000000..b991d6812e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/move/gigatonhammer/gigatonhammer_target.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/move/pyroball/pyroball_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/move/pyroball/pyroball_actor.ogg new file mode 100644 index 0000000000..ecc3ac4f0c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/move/pyroball/pyroball_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/move/pyroball/pyroball_target.ogg b/common/src/main/resources/assets/cobblemon/sounds/move/pyroball/pyroball_target.ogg new file mode 100644 index 0000000000..411fd81d1d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/move/pyroball/pyroball_target.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/cinderace/cinderace_pyroball.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/cinderace/cinderace_pyroball.ogg new file mode 100644 index 0000000000..de899d182f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/cinderace/cinderace_pyroball.ogg differ diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/gigatonhammer_tinkaton.json b/common/src/main/resources/data/cobblemon/action_effects/moves/gigatonhammer_tinkaton.json new file mode 100644 index 0000000000..9af4a64ba5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/gigatonhammer_tinkaton.json @@ -0,0 +1,35 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["gigatonhammer"], + "delay": 0.3 + }, + { + "type": "entity_molang", + "entityCondition": "q.entity.is_user == true", + "expressions": ["q.sound('move.gigatonhammer.actor');"] + }, + { + "type": "pause", + "pause": 1.1 + }, + { + "type": "entity_molang", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "expressions": ["q.sound('move.gigatonhammer.target');"] + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.5 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/pyroball_cinderace.json b/common/src/main/resources/data/cobblemon/action_effects/moves/pyroball_cinderace.json index cb11234b37..6b86cf12d1 100644 --- a/common/src/main/resources/data/cobblemon/action_effects/moves/pyroball_cinderace.json +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/pyroball_cinderace.json @@ -3,11 +3,38 @@ { "type": "add_holds", "holds": ["effects"] + }, { "type": "animation", - "animation": ["pyroball"], - "delay": 2.05 + "animation": ["pyroball"] + }, + { + "type": "pause", + "pause" : 0.1 + }, + { + "type": "entity_molang", + "entityCondition": "q.entity.is_user == true", + "expressions": ["q.sound('move.pyroball.actor');"] + }, + { + "type": "entity_molang", + "entityCondition": "q.entity.is_user == true", + "expressions": ["q.sound('pokemon.cinderace.pyroball');"] + }, + { + "type": "pause", + "pause" : 1.875 + }, + { + "type": "entity_molang", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "expressions": ["q.sound('move.pyroball.target');"] + }, + { + "type": "pause", + "pause" : 0.175 }, { "type": "entity_particles",