added SFX for Pyro Ball (Cinderace & Copycat)

"BONK" - scout tf2

common/src/main/resources/assets/cobblemon/sounds.json

@@ -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 } ]
   },
@@ -1346,7 +1516,7 @@
     "sounds": [ { "name": "cobblemon:move/icebeam/icebeam_target_1", "volume": 0.8 } ]
   },
   "move.icebeam.target_2": {
-    "sounds": [ { "name": "cobblemon:move/icebeam/icebeam_target_2", "volume": 0.8 } ]
+    "sounds": [ { "name": "cobblemon:move/icebeam/icebeam_target_2", "volume": 0.5 } ]
   },
   "move.infestation.actor": {
     "sounds": [ { "name": "cobblemon:move/infestation/infestation_actor", "volume": 0.8 } ]
@@ -1453,6 +1623,57 @@
   "move.waterpulse.target": {
     "sounds": [ { "name": "cobblemon:move/waterpulse/waterpulse_target", "volume": 0.8 } ]
   },
+  "move.leafstorm.actor": {
+    "sounds": [ { "name": "cobblemon:move/leafstorm/leafstorm_actor", "volume": 1.0 } ]
+  },
+  "move.leafstorm.target": {
+    "sounds": [ { "name": "cobblemon:move/leafstorm/leafstorm_target", "volume": 1.0 } ]
+  },
+  "move.suckerpunch.target": {
+    "sounds": [ { "name": "cobblemon:move/suckerpunch/suckerpunch_target", "volume": 1.0 } ]
+  },
+  "move.blizzard.actor": {
+    "sounds": [ { "name": "cobblemon:move/blizzard/blizzard_actor", "volume": 1.0 } ]
+  },
+  "move.blizzard.target": {
+    "sounds": [ { "name": "cobblemon:move/blizzard/blizzard_target", "volume": 1.0 } ]
+  },
+  "move.hydropump.actor": {
+    "sounds": [ { "name": "cobblemon:move/hydropump/hydropump_actor", "volume": 1.0 } ]
+  },
+  "move.hydropump.target": {
+    "sounds": [ { "name": "cobblemon:move/hydropump/hydropump_target", "volume": 1.0 } ]
+  },
+  "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": 1.0 } ]
+  },
+  "move.playrough.actor_2": {
+    "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": 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": [
       { "name": "cobblemon:move/impact_generic/impact_generic_fighting_1", "volume": 0.8 },
@@ -6380,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 } ]
   },
@@ -7403,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 } ]
@@ -7826,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 } ]
   },
@@ -8273,4 +8506,4 @@
   "pokemon.pecharunt.cry": {
     "sounds": [ { "name": "cobblemon:pokemon/pecharunt/pecharunt_cry", "volume": 0.8 } ]
   }
-}
+},

common/src/main/resources/data/cobblemon/action_effects/moves/gigatonhammer_tinkaton.json

@@ -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
+    }
+  ]
+}

common/src/main/resources/data/cobblemon/action_effects/moves/hydropump.json

@@ -21,6 +21,11 @@
       "locators": ["special", "target"],
       "targetLocators": ["target"]
     },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == true",
+      "expressions": ["q.sound('move.hydropump.actor');"]
+    },
     {
       "type": "pause",
       "pause": 0.03
@@ -46,6 +51,11 @@
       "animation": ["recoil"],
       "entityCondition": "q.entity.is_user == false && q.hurt(q.entity.uuid) == true && q.missed(q.entity.uuid) == false"
     },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
+      "expressions": ["q.sound('move.hydropump.target');"]
+    },
     {
       "type": "pause",
       "pause": 0.55

common/src/main/resources/data/cobblemon/action_effects/moves/leafstorm.json

@@ -15,6 +15,11 @@
       "locators": ["special", "target"],
       "targetLocators": ["middle"]
     },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == true",
+      "expressions": ["q.sound('move.leafstorm.actor');"]
+    },
     {
       "type": "pause",
       "pause": 0.1
@@ -35,6 +40,11 @@
       "effect": "cobblemon:leafstorm_target",
       "locators": ["target"]
     },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
+      "expressions": ["q.sound('move.leafstorm.target');"]
+    },
     {
       "type": "animation",
       "animation": ["recoil"],

common/src/main/resources/data/cobblemon/action_effects/moves/lightscreen.json

@@ -15,6 +15,11 @@
         "effect": "cobblemon:lightscreen_actor",
         "locators": ["target"]
       },
+      {
+        "type": "entity_molang",
+        "entityCondition": "q.entity.is_user == true && q.failed == false",
+        "expressions": ["q.sound('move.lightscreen.actor');"]
+      },
       {
         "type": "pause",
         "pause": 0.07

common/src/main/resources/data/cobblemon/action_effects/moves/playrough.json

@@ -14,10 +14,20 @@
     "entityCondition": "q.entity.is_user == true && q.missed(q.entity.uuid) == false",
     "expressions": ["q.play_animation(q.bedrock_stateful('playrough', 'actor'))"]
     },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == true",
+      "expressions": ["q.sound('move.playrough.actor_1');"]
+    },
     {
       "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",
@@ -35,7 +45,21 @@
     },
     {
       "type": "pause",
-      "pause": 0.725
+      "pause": 0.5
+    },
+    {
+      "type": "entity_molang",
+      "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.225
     },
     {
       "type": "remove_holds",

common/src/main/resources/data/cobblemon/action_effects/moves/pyroball.json

@@ -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"]

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('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",

common/src/main/resources/data/cobblemon/action_effects/moves/suckerpunch.json

@@ -27,6 +27,11 @@
       "effect": "cobblemon:suckerpunch_target1",
       "locator": "target"
     },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
+      "expressions": ["q.sound('move.suckerpunch.target');"]
+    },
     {
       "type": "pause",
       "pause": 0.2

common/src/main/resources/data/cobblemon/tms/afteryou.json

@@ -2,7 +2,7 @@
   "moveName": "afteryou",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/aircutter.json

@@ -2,7 +2,7 @@
   "moveName": "aircutter",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "flying",

common/src/main/resources/data/cobblemon/tms/allyswitch.json

@@ -2,7 +2,7 @@
   "moveName": "allyswitch",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "psychic",

common/src/main/resources/data/cobblemon/tms/assurance.json

@@ -2,7 +2,7 @@
   "moveName": "assurance",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "dark",

common/src/main/resources/data/cobblemon/tms/attract.json

@@ -2,7 +2,7 @@
   "moveName": "attract",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/babydolleyes.json

@@ -2,7 +2,7 @@
   "moveName": "babydolleyes",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fairy",

common/src/main/resources/data/cobblemon/tms/bind.json

@@ -2,7 +2,7 @@
   "moveName": "bind",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/block.json

@@ -2,7 +2,7 @@
   "moveName": "block",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/bugbite.json

@@ -2,7 +2,7 @@
   "moveName": "bugbite",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "bug",

common/src/main/resources/data/cobblemon/tms/bulletseed.json

@@ -2,7 +2,7 @@
   "moveName": "bulletseed",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "grass",

common/src/main/resources/data/cobblemon/tms/charge.json

@@ -2,7 +2,7 @@
   "moveName": "charge",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "electric",

common/src/main/resources/data/cobblemon/tms/chargebeam.json

@@ -2,7 +2,7 @@
   "moveName": "chargebeam",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "electric",

common/src/main/resources/data/cobblemon/tms/charm.json

@@ -2,7 +2,7 @@
   "moveName": "charm",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fairy",

common/src/main/resources/data/cobblemon/tms/chillingwater.json

@@ -2,7 +2,7 @@
   "moveName": "chillingwater",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "water",

common/src/main/resources/data/cobblemon/tms/coaching.json

@@ -2,7 +2,7 @@
   "moveName": "coaching",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fighting",

common/src/main/resources/data/cobblemon/tms/confide.json

@@ -2,7 +2,7 @@
   "moveName": "confide",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/confuseray.json

@@ -2,7 +2,7 @@
   "moveName": "confuseray",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "ghost",

common/src/main/resources/data/cobblemon/tms/corrosivegas.json

@@ -2,7 +2,7 @@
   "moveName": "corrosivegas",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "poison",

common/src/main/resources/data/cobblemon/tms/covet.json

@@ -2,7 +2,7 @@
   "moveName": "covet",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/disarmingvoice.json

@@ -2,7 +2,7 @@
   "moveName": "disarmingvoice",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fairy",

common/src/main/resources/data/cobblemon/tms/dragoncheer.json

@@ -2,7 +2,7 @@
   "moveName": "dragoncheer",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "dragon",

common/src/main/resources/data/cobblemon/tms/dreameater.json

@@ -2,7 +2,7 @@
   "moveName": "dreameater",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "psychic",

common/src/main/resources/data/cobblemon/tms/echoedvoice.json

@@ -2,7 +2,7 @@
   "moveName": "echoedvoice",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/eerieimpulse.json

@@ -2,7 +2,7 @@
   "moveName": "eerieimpulse",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "electric",

common/src/main/resources/data/cobblemon/tms/electricterrain.json

@@ -2,7 +2,7 @@
   "moveName": "electricterrain",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "electric",

common/src/main/resources/data/cobblemon/tms/embargo.json

@@ -2,7 +2,7 @@
   "moveName": "embargo",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "dark",

common/src/main/resources/data/cobblemon/tms/endure.json

@@ -2,7 +2,7 @@
   "moveName": "endure",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/faketears.json

@@ -2,7 +2,7 @@
   "moveName": "faketears",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "dark",

common/src/main/resources/data/cobblemon/tms/falseswipe.json

@@ -2,7 +2,7 @@
   "moveName": "falseswipe",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/featherdance.json

@@ -2,7 +2,7 @@
   "moveName": "featherdance",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "flying",

common/src/main/resources/data/cobblemon/tms/firefang.json

@@ -2,7 +2,7 @@
   "moveName": "firefang",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fire",

common/src/main/resources/data/cobblemon/tms/firepledge.json

@@ -2,7 +2,7 @@
   "moveName": "firepledge",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fire",

common/src/main/resources/data/cobblemon/tms/firespin.json

@@ -2,7 +2,7 @@
   "moveName": "firespin",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fire",

common/src/main/resources/data/cobblemon/tms/flamecharge.json

@@ -2,7 +2,7 @@
   "moveName": "flamecharge",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fire",

common/src/main/resources/data/cobblemon/tms/fling.json

@@ -2,7 +2,7 @@
   "moveName": "fling",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "dark",

common/src/main/resources/data/cobblemon/tms/focusenergy.json

@@ -2,7 +2,7 @@
   "moveName": "focusenergy",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/furycutter.json

@@ -2,7 +2,7 @@
   "moveName": "furycutter",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "bug",

common/src/main/resources/data/cobblemon/tms/gastroacid.json

@@ -2,7 +2,7 @@
   "moveName": "gastroacid",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "poison",

common/src/main/resources/data/cobblemon/tms/grassknot.json

@@ -2,7 +2,7 @@
   "moveName": "grassknot",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "grass",

common/src/main/resources/data/cobblemon/tms/grasspledge.json

@@ -2,7 +2,7 @@
   "moveName": "grasspledge",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "grass",

common/src/main/resources/data/cobblemon/tms/grassyterrain.json

@@ -2,7 +2,7 @@
   "moveName": "grassyterrain",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "grass",

common/src/main/resources/data/cobblemon/tms/gravity.json

@@ -2,7 +2,7 @@
   "moveName": "gravity",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "psychic",

common/src/main/resources/data/cobblemon/tms/guardswap.json

@@ -2,7 +2,7 @@
   "moveName": "guardswap",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "psychic",

common/src/main/resources/data/cobblemon/tms/hail.json

@@ -2,7 +2,7 @@
   "moveName": "hail",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "ice",

common/src/main/resources/data/cobblemon/tms/hardpress.json

@@ -2,7 +2,7 @@
   "moveName": "hardpress",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "steel",

common/src/main/resources/data/cobblemon/tms/haze.json

@@ -2,7 +2,7 @@
   "moveName": "haze",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "ice",

common/src/main/resources/data/cobblemon/tms/headbutt.json

@@ -2,7 +2,7 @@
   "moveName": "headbutt",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/healbell.json

@@ -2,7 +2,7 @@
   "moveName": "healbell",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/helpinghand.json

@@ -2,7 +2,7 @@
   "moveName": "helpinghand",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/icefang.json

@@ -2,7 +2,7 @@
   "moveName": "icefang",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "ice",

common/src/main/resources/data/cobblemon/tms/iciclespear.json

@@ -2,7 +2,7 @@
   "moveName": "iciclespear",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "ice",

common/src/main/resources/data/cobblemon/tms/imprison.json

@@ -2,7 +2,7 @@
   "moveName": "imprison",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "psychic",

common/src/main/resources/data/cobblemon/tms/incinerate.json

@@ -2,7 +2,7 @@
   "moveName": "incinerate",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fire",

common/src/main/resources/data/cobblemon/tms/infestation.json

@@ -2,7 +2,7 @@
   "moveName": "infestation",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "bug",

common/src/main/resources/data/cobblemon/tms/laserfocus.json

@@ -2,7 +2,7 @@
   "moveName": "laserfocus",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/lastresort.json

@@ -2,7 +2,7 @@
   "moveName": "lastresort",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/lowkick.json

@@ -2,7 +2,7 @@
   "moveName": "lowkick",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fighting",

common/src/main/resources/data/cobblemon/tms/magicalleaf.json

@@ -2,7 +2,7 @@
   "moveName": "magicalleaf",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "grass",

common/src/main/resources/data/cobblemon/tms/magicroom.json

@@ -2,7 +2,7 @@
   "moveName": "magicroom",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "psychic",

common/src/main/resources/data/cobblemon/tms/magnetrise.json

@@ -2,7 +2,7 @@
   "moveName": "magnetrise",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "electric",

common/src/main/resources/data/cobblemon/tms/metalclaw.json

@@ -2,7 +2,7 @@
   "moveName": "metalclaw",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "steel",

common/src/main/resources/data/cobblemon/tms/metronome.json

@@ -2,7 +2,7 @@
   "moveName": "metronome",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "normal",

common/src/main/resources/data/cobblemon/tms/mistyterrain.json

@@ -2,7 +2,7 @@
   "moveName": "mistyterrain",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "fairy",

common/src/main/resources/data/cobblemon/tms/mudshot.json

@@ -2,7 +2,7 @@
   "moveName": "mudshot",
   "obtainMethods": [
     {
-      "variant": "cobblemon:unlockable"
+      "variant": "cobblemon:default"
     }
   ],
   "type": "ground",