Merge branch 'sterr/move-sound-implementation' into 'main'

Added sounds to Gigaton Hammer and Pyro Ball

See merge request cable-mc/cobblemon!2518
This commit is contained in:
Jackson Bowes committed 2026-11-01 08:14:14 -06:00
commit 74a57eb972
9 files changed
+80 -2

No files matched your search

+1
View File
@@ -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
@@ -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 } ]
},
@@ -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
}
]
}
@@ -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",