mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-10-23 07:36:25 -04:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 SplashOfAzure
|
f01ea8343f | ||
|
SplashOfAzure
|
51976262d3 | ||
|
SplashOfAzure
|
211232a81f | ||
|
SplashOfAzure
|
e6352acb61 | ||
|
SplashOfAzure
|
766b101722 | ||
|
SplashOfAzure
|
34adb0d7a0 |
@@ -977,6 +977,176 @@
|
||||
{ "name": "cobblemon:block/item_block/paper_large_break_3", "volume": 0.6 }
|
||||
]
|
||||
},
|
||||
"block.bright_powder.use": {
|
||||
"subtitle": "cobblemon.subtitle.item.bright_powder.use",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/bright_powder/bright_powder_use_1", "volume": 0.35 },
|
||||
{ "name": "cobblemon:block/bright_powder/bright_powder_use_2", "volume": 0.35 },
|
||||
{ "name": "cobblemon:block/bright_powder/bright_powder_use_3", "volume": 0.35 }
|
||||
]
|
||||
},
|
||||
"block.item_block.bottle_liquid.place": {
|
||||
"subtitle": "subtitles.block.generic.place",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_place_1", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_place_2", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_place_3", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_place_4", "volume": 0.4 }
|
||||
]
|
||||
},
|
||||
"block.item_block.bottle_liquid.break": {
|
||||
"subtitle": "subtitles.block.generic.break",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_break_1", "volume": 0.5 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_break_2", "volume": 0.5 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_break_3", "volume": 0.5 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_break_4", "volume": 0.5 }
|
||||
]
|
||||
},
|
||||
"block.item_block.bottle_liquid.step": {
|
||||
"subtitle": "subtitles.block.generic.footsteps",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_step_1", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_step_2", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_step_3", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_liquid_step_4", "volume": 0.2 }
|
||||
]
|
||||
},
|
||||
"block.item_block.bottle_pills.place": {
|
||||
"subtitle": "subtitles.block.generic.place",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_place_1", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_place_2", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_place_3", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_place_4", "volume": 0.4 }
|
||||
]
|
||||
},
|
||||
"block.item_block.bottle_pills.break": {
|
||||
"subtitle": "subtitles.block.generic.break",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_break_1", "volume": 0.5 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_break_2", "volume": 0.5 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_break_3", "volume": 0.5 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_break_4", "volume": 0.5 }
|
||||
]
|
||||
},
|
||||
"block.item_block.bottle_pills.step": {
|
||||
"subtitle": "subtitles.block.generic.footsteps",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_step_1", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_step_2", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_step_3", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/bottle_pills_step_4", "volume": 0.2 }
|
||||
]
|
||||
},
|
||||
"block.item_block.powder.place": {
|
||||
"subtitle": "subtitles.block.generic.place",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/powder_place_1", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/powder_place_2", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/powder_place_3", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/powder_place_4", "volume": 0.3 }
|
||||
]
|
||||
},
|
||||
"block.item_block.powder.break": {
|
||||
"subtitle": "subtitles.block.generic.break",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/powder_break_1", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/powder_break_2", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/powder_break_3", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/powder_break_4", "volume": 0.4 }
|
||||
]
|
||||
},
|
||||
"block.item_block.powder.step": {
|
||||
"subtitle": "subtitles.block.generic.footsteps",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/powder_step_1", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/powder_step_2", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/powder_step_3", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/powder_step_4", "volume": 0.2 }
|
||||
]
|
||||
},
|
||||
"block.item_block.dice.place": {
|
||||
"subtitle": "subtitles.block.generic.place",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/dice_place_1", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/dice_place_2", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/dice_place_3", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/dice_place_4", "volume": 0.3 }
|
||||
]
|
||||
},
|
||||
"block.item_block.dice.break": {
|
||||
"subtitle": "subtitles.block.generic.break",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/dice_break_1", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/dice_break_2", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/dice_break_3", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/dice_break_4", "volume": 0.4 }
|
||||
]
|
||||
},
|
||||
"block.item_block.dice.step": {
|
||||
"subtitle": "subtitles.block.generic.footsteps",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/dice_step_1", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/dice_step_2", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/dice_step_3", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/dice_step_4", "volume": 0.2 }
|
||||
]
|
||||
},
|
||||
"block.item_block.metal_can.place": {
|
||||
"subtitle": "subtitles.block.generic.place",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/metal_can_place_1", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/metal_can_place_2", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/metal_can_place_3", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/metal_can_place_4", "volume": 0.3 }
|
||||
]
|
||||
},
|
||||
"block.item_block.metal_can.break": {
|
||||
"subtitle": "subtitles.block.generic.break",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/metal_can_break_1", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/metal_can_break_2", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/metal_can_break_3", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/metal_can_break_4", "volume": 0.4 }
|
||||
]
|
||||
},
|
||||
"block.item_block.metal_can.step": {
|
||||
"subtitle": "subtitles.block.generic.footsteps",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/metal_can_step_1", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/metal_can_step_2", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/metal_can_step_3", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/metal_can_step_4", "volume": 0.2 }
|
||||
]
|
||||
},
|
||||
"block.item_block.jar_glass_liquid.place": {
|
||||
"subtitle": "subtitles.block.generic.place",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_place_1", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_place_2", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_place_3", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_place_4", "volume": 0.3 }
|
||||
]
|
||||
},
|
||||
"block.item_block.jar_glass_liquid.break": {
|
||||
"subtitle": "subtitles.block.generic.break",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_break_1", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_break_2", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_break_3", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_break_4", "volume": 0.4 }
|
||||
]
|
||||
},
|
||||
"block.item_block.jar_glass_liquid.step": {
|
||||
"subtitle": "subtitles.block.generic.footsteps",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_step_1", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_step_2", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_step_3", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_step_4", "volume": 0.2 }
|
||||
]
|
||||
},
|
||||
"move.absorb.actor": {
|
||||
"sounds": [ { "name": "cobblemon:move/absorb/absorb_actor", "volume": 0.3 } ]
|
||||
},
|
||||
@@ -1477,14 +1647,32 @@
|
||||
"move.lightscreen.actor": {
|
||||
"sounds": [ { "name": "cobblemon:move/lightscreen/lightscreen_actor", "volume": 1.0 } ]
|
||||
},
|
||||
"move.horndrill.target_1": {
|
||||
"sounds": [ { "name": "cobblemon:move/horndrill/horndrill_target_1", "volume": 0.8 } ]
|
||||
},
|
||||
"move.horndrill.target_2": {
|
||||
"sounds": [ { "name": "cobblemon:move/horndrill/horndrill_target_2", "volume": 1.0 } ]
|
||||
},
|
||||
"move.playrough.actor_1": {
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_1", "volume": 0.8 } ]
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_1", "volume": 1.0 } ]
|
||||
},
|
||||
"move.playrough.actor_2": {
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_2", "volume": 0.8 } ]
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_2", "volume": 1.0 } ]
|
||||
},
|
||||
"move.playrough.actor_3": {
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_3", "volume": 1.0 } ]
|
||||
},
|
||||
"move.playrough.target": {
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_target", "volume": 0.8 } ]
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_target", "volume": 1.0 } ]
|
||||
},
|
||||
"move.pyroball.actor": {
|
||||
"sounds": [ { "name": "cobblemon:move/pyroball/pyroball_actor", "volume": 1.0 } ]
|
||||
},
|
||||
"move.pyroball.actor_cinderace": {
|
||||
"sounds": [ { "name": "cobblemon:move/pyroball/pyroball_actor_cinderace", "volume": 1.0 } ]
|
||||
},
|
||||
"move.pyroball.target": {
|
||||
"sounds": [ { "name": "cobblemon:move/pyroball/pyroball_target", "volume": 1.0 } ]
|
||||
},
|
||||
"impact.normal": {
|
||||
"sounds": [
|
||||
@@ -6413,6 +6601,9 @@
|
||||
"pokemon.cherrim.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/cherrim/cherrim_cry", "volume": 0.8 } ]
|
||||
},
|
||||
"pokemon.cherrim_sunshine.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/cherrim/cherrim_sunshine_cry", "volume": 0.8 } ]
|
||||
},
|
||||
"pokemon.shellos.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/shellos/shellos_cry", "volume": 0.8 } ]
|
||||
},
|
||||
@@ -7436,8 +7627,14 @@
|
||||
"pokemon.rockruff.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/rockruff/rockruff_cry", "volume": 0.8 } ]
|
||||
},
|
||||
"pokemon.lycanroc.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/lycanroc/lycanroc_cry", "volume": 0.8 } ]
|
||||
"pokemon.lycanroc_midday.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/lycanroc/lycanroc_midday_cry", "volume": 0.8 } ]
|
||||
},
|
||||
"pokemon.lycanroc_midnight.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/lycanroc/lycanroc_midnight_cry", "volume": 0.8 } ]
|
||||
},
|
||||
"pokemon.lycanroc_dusk.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/lycanroc/lycanroc_dusk_cry", "volume": 0.8 } ]
|
||||
},
|
||||
"pokemon.wishiwashi.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/wishiwashi/wishiwashi_cry", "volume": 0.8 } ]
|
||||
@@ -7859,6 +8056,9 @@
|
||||
"pokemon.duraludon.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/duraludon/duraludon_cry", "volume": 0.8 } ]
|
||||
},
|
||||
"pokemon.duraludon.bonk": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/duraludon/duraludon_bonk", "volume": 0.8 } ]
|
||||
},
|
||||
"pokemon.dreepy.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/dreepy/dreepy_cry", "volume": 0.8 } ]
|
||||
},
|
||||
@@ -8306,4 +8506,4 @@
|
||||
"pokemon.pecharunt.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/pecharunt/pecharunt_cry", "volume": 0.8 } ]
|
||||
}
|
||||
}
|
||||
},
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
+44
@@ -0,0 +1,44 @@
|
||||
{
|
||||
"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.tinkaton');"]
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 0.73
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == true",
|
||||
"expressions": ["q.sound('move.gigatonhammer.actor');"]
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 0.49
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == true && q.missed(q.entity.uuid) == false",
|
||||
"expressions": ["q.sound('move.gigatonhammer.target');"]
|
||||
},
|
||||
{
|
||||
"type": "remove_holds",
|
||||
"holds": ["effects"]
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 1.5
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -16,18 +16,18 @@
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == true && q.missed(q.entity.uuid) == false",
|
||||
"entityCondition": "q.entity.is_user == true",
|
||||
"expressions": ["q.sound('move.playrough.actor_1');"]
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == true && q.missed(q.entity.uuid) == false",
|
||||
"expressions": ["q.sound('move.playrough.actor_2');"]
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 0.125
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == false",
|
||||
"expressions": ["q.sound('move.playrough.actor_2');"]
|
||||
},
|
||||
{
|
||||
"type": "entity_particles",
|
||||
"entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
|
||||
@@ -45,16 +45,21 @@
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 0.55
|
||||
"pause": 0.5
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
|
||||
"entityCondition": "q.entity.is_user == true",
|
||||
"expressions": ["q.sound('move.playrough.actor_3');"]
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
|
||||
"expressions": ["q.sound('move.playrough.target');"]
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 0.725
|
||||
"pause": 0.225
|
||||
},
|
||||
{
|
||||
"type": "remove_holds",
|
||||
|
||||
@@ -15,6 +15,11 @@
|
||||
"effect": "cobblemon:flamethrower_targetburst",
|
||||
"locators": ["target"]
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
|
||||
"expressions": ["q.sound('move.pyroball.target');"]
|
||||
},
|
||||
{
|
||||
"type": "remove_holds",
|
||||
"holds": ["effects"]
|
||||
|
||||
+29
-2
@@ -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('move.pyroball.actor_cinderace');"]
|
||||
},
|
||||
{
|
||||
"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",
|
||||
|
||||
Reference in New Issue
Block a user