diff --git a/CHANGELOG.md b/CHANGELOG.md index 365e2bbe6..6362356b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,52 +1,12 @@ -**Update v2.8.1** +**Update v2.8.3** -- Updated Pokemon Animation Controller, to correctly animate per pokemon. -- Added new Backpack Model and animation -- Added new Applin Model -- Added new Arceus Animations -- Fixed Blaziken Animations -- Fixed Clefairy Animations -- New Eevee Model -- Fixed Ho-Oh Animations -- Added new Iron Moth Model -- Added new Jolteon Model -- Added new larvesta Model -- Added new Latios Model -- Added new Magcargo Model -- Added new Mankey Model -- Added new Quaquaval Model -- Added new Munchlax Model -- Added new Primeape Model -- Added new Pikachu Model -- Added new Mankey Model -- Added new Slither Wing Model -- Added new Vaporeon Model -- Added new Volcarona Model -- Added new Xurkitree Model -- Added new Professor Oak Model -- Pokemon now have dynamic animation rendering -- Added new icons to FontGlyph -- Added 3 new Bird shrines -- Added some new sounds and replaced broken ones -- Added new orb textures -- Added lots of new Shiny textures -- Redone the entire previous UI Rendering for the hud screen. Now is dynamic and has property saving. -- Added toedscool, tapukoko, toedscruel -- New ampharos Model -- new Chinchou model -- New electrode model -- new Gardevoir Model -- New kiela Model -- New Lanturn Model -- New Moltres model -- New Pidgey fly animation -- New ralts animation -- New tapukoko Model -- New voltorb Model -- New zapdos Model -- Fixed Zubat model -- Fixed battle logs text -- Fixed currency render -- Removed text on phone -- Changed var size for sidebar -- Added attack animations to pokemon \ No newline at end of file +- Added new Ground Idle, Air Idle, and Water Idle Animations +- Update animations for all pokemon. +- Added Flaffy Model +- Added Mareep Model +- Added Miltank Model +- Added Natu Model +- Added Shiny Butterfree texture +- Added detective Pikachu texture +- Added shiny Quxly and shiny Quaxwell texture +- Fixed some offsets for chest server form \ No newline at end of file diff --git a/animation_controllers/pokemon.json b/animation_controllers/pokemon.json index 7241cb971..e9b45d705 100644 --- a/animation_controllers/pokemon.json +++ b/animation_controllers/pokemon.json @@ -5,16 +5,26 @@ "initial_state": "default", "states": { "default": { - "animations": ["idle"], + "animations": [ + { + "ground_idle": "query.is_on_ground" + }, + { + "air_idle": "!query.is_on_ground && !query.is_in_water" + }, + { + "water_idle": "query.is_in_water" + } + ], "transitions": [ { "walking": "query.modified_move_speed >= 0.01 && query.is_on_ground && !query.is_in_water" }, { - "swimming": "q.is_in_water" + "swimming": "query.modified_move_speed >= 0.01 && q.is_in_water" }, { - "flying": "q.can_fly && !query.is_on_ground && !query.is_in_water" + "flying": "query.modified_move_speed >= 0.01 && q.can_fly && !query.is_on_ground && !query.is_in_water" }, { "sleeping": "q.is_sleeping" diff --git a/animations/pokemon/abra.animation.json b/animations/pokemon/abra.animation.json index 5f2d62bee..fa0d29c38 100644 --- a/animations/pokemon/abra.animation.json +++ b/animations/pokemon/abra.animation.json @@ -202,7 +202,7 @@ } } }, - "animation.abra.idle": { + "animation.abra.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/absol.animation.json b/animations/pokemon/absol.animation.json index 83db2bbc3..389d52d11 100644 --- a/animations/pokemon/absol.animation.json +++ b/animations/pokemon/absol.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.absol.idle": { + "animation.absol.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/aerodactyl.animation.json b/animations/pokemon/aerodactyl.animation.json index be8b07726..6b8f1779e 100644 --- a/animations/pokemon/aerodactyl.animation.json +++ b/animations/pokemon/aerodactyl.animation.json @@ -330,7 +330,7 @@ } } }, - "animation.aerodactyl.idle": { + "animation.aerodactyl.ground_idle": { "loop": true, "animation_length": 2.25, "bones": { diff --git a/animations/pokemon/aipom.animation.json b/animations/pokemon/aipom.animation.json index c83cbea4d..b34b2e6b1 100644 --- a/animations/pokemon/aipom.animation.json +++ b/animations/pokemon/aipom.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.aipom.idle": { + "animation.aipom.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/alakazam.animation.json b/animations/pokemon/alakazam.animation.json index 921488c5c..c79a593bd 100644 --- a/animations/pokemon/alakazam.animation.json +++ b/animations/pokemon/alakazam.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.alakazam.idle": { + "animation.alakazam.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/ambipom.animation.json b/animations/pokemon/ambipom.animation.json index 1bd855cee..7ac2901d3 100644 --- a/animations/pokemon/ambipom.animation.json +++ b/animations/pokemon/ambipom.animation.json @@ -67,7 +67,7 @@ } } }, - "animation.ambipom.idle": { + "animation.ambipom.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/ampharos.animation.json b/animations/pokemon/ampharos.animation.json index c435cb64f..5a9c71c28 100644 --- a/animations/pokemon/ampharos.animation.json +++ b/animations/pokemon/ampharos.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.ampharos.idle": { + "animation.ampharos.ground_idle": { "loop": true, "animation_length": 2.25, "bones": { diff --git a/animations/pokemon/applin.animation.json b/animations/pokemon/applin.animation.json index 5c64a14a9..ef12436e9 100644 --- a/animations/pokemon/applin.animation.json +++ b/animations/pokemon/applin.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.model.idle": { + "animation.model.ground_idle": { "loop": true, "animation_length": 4, "bones": { diff --git a/animations/pokemon/arbok.animation.json b/animations/pokemon/arbok.animation.json index 3263cabb3..9ab6ef7b4 100644 --- a/animations/pokemon/arbok.animation.json +++ b/animations/pokemon/arbok.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.arbok.idle": { + "animation.arbok.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/arcanine.animation.json b/animations/pokemon/arcanine.animation.json index a151d5023..452fdba73 100644 --- a/animations/pokemon/arcanine.animation.json +++ b/animations/pokemon/arcanine.animation.json @@ -61,7 +61,7 @@ } } }, - "animation.arcanine.idle": { + "animation.arcanine.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/arceus.animation.json b/animations/pokemon/arceus.animation.json index c0f5ed4b1..a8ef1407b 100644 --- a/animations/pokemon/arceus.animation.json +++ b/animations/pokemon/arceus.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.arceus.idle": { + "animation.arceus.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/ariados.animation.json b/animations/pokemon/ariados.animation.json index ffaaa800d..4980ba5d7 100644 --- a/animations/pokemon/ariados.animation.json +++ b/animations/pokemon/ariados.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.ariados.idle": { + "animation.ariados.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/armaldo.animation.json b/animations/pokemon/armaldo.animation.json index 48997d2e1..d71e4f24f 100644 --- a/animations/pokemon/armaldo.animation.json +++ b/animations/pokemon/armaldo.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.armaldo.idle": { + "animation.armaldo.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/articuno.animation.json b/animations/pokemon/articuno.animation.json index 3392a3b17..441ff14ae 100644 --- a/animations/pokemon/articuno.animation.json +++ b/animations/pokemon/articuno.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.articuno.idle": { + "animation.articuno.ground_idle": { "loop": true, "bones": { "body": { diff --git a/animations/pokemon/axew.animation.json b/animations/pokemon/axew.animation.json index be7f5b15a..e15d95f24 100644 --- a/animations/pokemon/axew.animation.json +++ b/animations/pokemon/axew.animation.json @@ -43,7 +43,7 @@ } } }, - "animation.axew.idle": { + "animation.axew.ground_idle": { "animation_length": 45.66667, "bones": { "torso": { diff --git a/animations/pokemon/azelf.animation.json b/animations/pokemon/azelf.animation.json index e1eb82cbe..165e4c2a8 100644 --- a/animations/pokemon/azelf.animation.json +++ b/animations/pokemon/azelf.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.azelf.idle": { + "animation.azelf.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/azumarill.animation.json b/animations/pokemon/azumarill.animation.json index 912224cd3..08efa51d5 100644 --- a/animations/pokemon/azumarill.animation.json +++ b/animations/pokemon/azumarill.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.azumarill.idle": { + "animation.azumarill.ground_idle": { "loop": true, "animation_length": 2.5, "bones": { diff --git a/animations/pokemon/azurill.animation.json b/animations/pokemon/azurill.animation.json index 2f2b1ee0b..7d839866f 100644 --- a/animations/pokemon/azurill.animation.json +++ b/animations/pokemon/azurill.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.azurill.idle": { + "animation.azurill.ground_idle": { "loop": true, "animation_length": 1.75, "bones": { diff --git a/animations/pokemon/bastiodon.animation.json b/animations/pokemon/bastiodon.animation.json index 62fb089b9..7afb5bf73 100644 --- a/animations/pokemon/bastiodon.animation.json +++ b/animations/pokemon/bastiodon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.bastiodon.idle": { + "animation.bastiodon.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/bayleef.animation.json b/animations/pokemon/bayleef.animation.json index ae2b075d5..d476ab2e5 100644 --- a/animations/pokemon/bayleef.animation.json +++ b/animations/pokemon/bayleef.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.bayleef.idle": { + "animation.bayleef.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/beedrill.animation.json b/animations/pokemon/beedrill.animation.json index 82d0f860c..f72814d8e 100644 --- a/animations/pokemon/beedrill.animation.json +++ b/animations/pokemon/beedrill.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.beedrill.idle": { + "animation.beedrill.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/bellossom.animation.json b/animations/pokemon/bellossom.animation.json index 9efa15319..cd77da865 100644 --- a/animations/pokemon/bellossom.animation.json +++ b/animations/pokemon/bellossom.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.bellossom.idle": { + "animation.bellossom.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/bibarel.animation.json b/animations/pokemon/bibarel.animation.json index 37001197d..f4233a82b 100644 --- a/animations/pokemon/bibarel.animation.json +++ b/animations/pokemon/bibarel.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.bibarel.idle": { + "animation.bibarel.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/bidoof.animation.json b/animations/pokemon/bidoof.animation.json index 303d099a1..ac8e7164d 100644 --- a/animations/pokemon/bidoof.animation.json +++ b/animations/pokemon/bidoof.animation.json @@ -338,7 +338,7 @@ } } }, - "animation.bidoof.idle": { + "animation.bidoof.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/blastoise.animation.json b/animations/pokemon/blastoise.animation.json index ccf0342c3..9b80bfedc 100644 --- a/animations/pokemon/blastoise.animation.json +++ b/animations/pokemon/blastoise.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.blastoise.idle": { + "animation.blastoise.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/blaziken.animation.json b/animations/pokemon/blaziken.animation.json index 70832b268..702d86849 100644 --- a/animations/pokemon/blaziken.animation.json +++ b/animations/pokemon/blaziken.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.blaziken.idle": { + "animation.blaziken.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/braixen.animation.json b/animations/pokemon/braixen.animation.json index 93b6e4d6b..801e8d572 100644 --- a/animations/pokemon/braixen.animation.json +++ b/animations/pokemon/braixen.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.braixen.idle": { + "animation.braixen.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/brionne.animation.json b/animations/pokemon/brionne.animation.json index 44bd2566d..118a7bd4c 100644 --- a/animations/pokemon/brionne.animation.json +++ b/animations/pokemon/brionne.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.brionne.idle": { + "animation.brionne.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/buizel.animation.json b/animations/pokemon/buizel.animation.json index 1ec1ff46f..f9c9256b6 100644 --- a/animations/pokemon/buizel.animation.json +++ b/animations/pokemon/buizel.animation.json @@ -61,7 +61,7 @@ } } }, - "animation.buizel.idle": { + "animation.buizel.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/bulbasaur.animation.json b/animations/pokemon/bulbasaur.animation.json index 249a40c3b..8d451fe6d 100644 --- a/animations/pokemon/bulbasaur.animation.json +++ b/animations/pokemon/bulbasaur.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.bulbasaur.idle": { + "animation.bulbasaur.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/buneary.animation.json b/animations/pokemon/buneary.animation.json index a5ff7be11..6b6422d9d 100644 --- a/animations/pokemon/buneary.animation.json +++ b/animations/pokemon/buneary.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.buneary.idle": { + "animation.buneary.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/butterfree.animation.json b/animations/pokemon/butterfree.animation.json index d72ad6eba..6d98893ae 100644 --- a/animations/pokemon/butterfree.animation.json +++ b/animations/pokemon/butterfree.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.butterfree.idle": { + "animation.butterfree.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/caterpie.animation.json b/animations/pokemon/caterpie.animation.json index 7b7040367..8cb7b95af 100644 --- a/animations/pokemon/caterpie.animation.json +++ b/animations/pokemon/caterpie.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.caterpie.idle": { + "animation.caterpie.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/celebi.animation.json b/animations/pokemon/celebi.animation.json index c52fdbf52..89bb5393f 100644 --- a/animations/pokemon/celebi.animation.json +++ b/animations/pokemon/celebi.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.celebi.idle": { + "animation.celebi.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/chansey.animation.json b/animations/pokemon/chansey.animation.json index feea67b7a..144e60d22 100644 --- a/animations/pokemon/chansey.animation.json +++ b/animations/pokemon/chansey.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.chansey.idle": { + "animation.chansey.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/charizard.animation.json b/animations/pokemon/charizard.animation.json index 44a38a0dc..476a07420 100644 --- a/animations/pokemon/charizard.animation.json +++ b/animations/pokemon/charizard.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.charizard.idle": { + "animation.charizard.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/charmander.animation.json b/animations/pokemon/charmander.animation.json index ae6f49994..b2dfd1151 100644 --- a/animations/pokemon/charmander.animation.json +++ b/animations/pokemon/charmander.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.charmander.idle": { + "animation.charmander.ground_idle": { "loop": true, "bones": { "tail": { diff --git a/animations/pokemon/charmeleon.animation.json b/animations/pokemon/charmeleon.animation.json index 9e3134e38..f4a394ca4 100644 --- a/animations/pokemon/charmeleon.animation.json +++ b/animations/pokemon/charmeleon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.charmeleon.idle": { + "animation.charmeleon.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/chesnaught.animation.json b/animations/pokemon/chesnaught.animation.json index bbedf4a7b..372082882 100644 --- a/animations/pokemon/chesnaught.animation.json +++ b/animations/pokemon/chesnaught.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.chesnaught.idle": { + "animation.chesnaught.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/chespin.animation.json b/animations/pokemon/chespin.animation.json index dc578f315..482275fbb 100644 --- a/animations/pokemon/chespin.animation.json +++ b/animations/pokemon/chespin.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.chespin.idle": { + "animation.chespin.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/chikorita.animation.json b/animations/pokemon/chikorita.animation.json index 85b77b7d6..28bbbd8cb 100644 --- a/animations/pokemon/chikorita.animation.json +++ b/animations/pokemon/chikorita.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.chikorita.idle": { + "animation.chikorita.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/chimchar.animation.json b/animations/pokemon/chimchar.animation.json index 0602b67b4..0eb8f2fbc 100644 --- a/animations/pokemon/chimchar.animation.json +++ b/animations/pokemon/chimchar.animation.json @@ -247,7 +247,7 @@ } } }, - "animation.chimchar.idle": { + "animation.chimchar.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/chinchou.animation.json b/animations/pokemon/chinchou.animation.json index 961e48d99..04f19a321 100644 --- a/animations/pokemon/chinchou.animation.json +++ b/animations/pokemon/chinchou.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.chinchou.idle": { + "animation.chinchou.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/cinderace.animation.json b/animations/pokemon/cinderace.animation.json index 2b2993c00..7b3276a2c 100644 --- a/animations/pokemon/cinderace.animation.json +++ b/animations/pokemon/cinderace.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.cinderace.idle": { + "animation.cinderace.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/clefable.animation.json b/animations/pokemon/clefable.animation.json index e67560e9c..6b01c1f0f 100644 --- a/animations/pokemon/clefable.animation.json +++ b/animations/pokemon/clefable.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.clefable.idle": { + "animation.clefable.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/clefairy.animation.json b/animations/pokemon/clefairy.animation.json index 3cd1e5fee..81e97eef8 100644 --- a/animations/pokemon/clefairy.animation.json +++ b/animations/pokemon/clefairy.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.clefairy.idle": { + "animation.clefairy.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/cleffa.animation.json b/animations/pokemon/cleffa.animation.json index d389477a2..4f757d521 100644 --- a/animations/pokemon/cleffa.animation.json +++ b/animations/pokemon/cleffa.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.cleffa.idle": { + "animation.cleffa.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/cloyster.animation.json b/animations/pokemon/cloyster.animation.json index 6cac44d30..0f180d5c8 100644 --- a/animations/pokemon/cloyster.animation.json +++ b/animations/pokemon/cloyster.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.cloyster.idle": { + "animation.cloyster.ground_idle": { "loop": true, "bones": { "body": { diff --git a/animations/pokemon/combusken.animation.json b/animations/pokemon/combusken.animation.json index 0f62d76e1..0fba49f3b 100644 --- a/animations/pokemon/combusken.animation.json +++ b/animations/pokemon/combusken.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.combusken.idle": { + "animation.combusken.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/corsola.animation.json b/animations/pokemon/corsola.animation.json index 5af405d18..ca0b369be 100644 --- a/animations/pokemon/corsola.animation.json +++ b/animations/pokemon/corsola.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.corsola.idle": { + "animation.corsola.ground_idle": { "loop": true, "animation_length": 1 }, diff --git a/animations/pokemon/cosmog.animation.json b/animations/pokemon/cosmog.animation.json index 3b3bff0fb..7c123b233 100644 --- a/animations/pokemon/cosmog.animation.json +++ b/animations/pokemon/cosmog.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.cosmog.idle": { + "animation.cosmog.ground_idle": { "loop": true, "animation_length": 1.5, "bones": { diff --git a/animations/pokemon/cradily.animation.json b/animations/pokemon/cradily.animation.json index b56117fca..647aec3f5 100644 --- a/animations/pokemon/cradily.animation.json +++ b/animations/pokemon/cradily.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.cradily.idle": { + "animation.cradily.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/cresselia.animation.json b/animations/pokemon/cresselia.animation.json index 2468be021..e9f892eb4 100644 --- a/animations/pokemon/cresselia.animation.json +++ b/animations/pokemon/cresselia.animation.json @@ -85,7 +85,7 @@ } } }, - "animation.cresselia.idle": { + "animation.cresselia.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/crobat.animation.json b/animations/pokemon/crobat.animation.json index 127d8629e..bdad4501f 100644 --- a/animations/pokemon/crobat.animation.json +++ b/animations/pokemon/crobat.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.crobat.idle": { + "animation.crobat.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/croconaw.animation.json b/animations/pokemon/croconaw.animation.json index 1cd0e94f7..6b5cfcc93 100644 --- a/animations/pokemon/croconaw.animation.json +++ b/animations/pokemon/croconaw.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.croconaw.idle": { + "animation.croconaw.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/cyndaquil.animation.json b/animations/pokemon/cyndaquil.animation.json index 1c776ba50..9d0d568dd 100644 --- a/animations/pokemon/cyndaquil.animation.json +++ b/animations/pokemon/cyndaquil.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.cyndaquil.idle": { + "animation.cyndaquil.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/dartrix.animation.json b/animations/pokemon/dartrix.animation.json index 454b8c653..9e56cb1a8 100644 --- a/animations/pokemon/dartrix.animation.json +++ b/animations/pokemon/dartrix.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.dartrix.idle": { + "animation.dartrix.ground_idle": { "loop": true, "animation_length": 10, "bones": { diff --git a/animations/pokemon/decidueye.animation.json b/animations/pokemon/decidueye.animation.json index 46bf7683d..6e7f74c1c 100644 --- a/animations/pokemon/decidueye.animation.json +++ b/animations/pokemon/decidueye.animation.json @@ -68,7 +68,7 @@ } } }, - "animation.decidueye.idle": { + "animation.decidueye.ground_idle": { "loop": true, "animation_length": 8.25, "bones": { diff --git a/animations/pokemon/delibird.animation.json b/animations/pokemon/delibird.animation.json index e4f1a33c7..32cdb0cfe 100644 --- a/animations/pokemon/delibird.animation.json +++ b/animations/pokemon/delibird.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.delibird.idle": { + "animation.delibird.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/delphox.animation.json b/animations/pokemon/delphox.animation.json index 9e6c9f973..2ebc87014 100644 --- a/animations/pokemon/delphox.animation.json +++ b/animations/pokemon/delphox.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.delphox.idle": { + "animation.delphox.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/dewgong.animation.json b/animations/pokemon/dewgong.animation.json index 6b66fff25..9d2210e76 100644 --- a/animations/pokemon/dewgong.animation.json +++ b/animations/pokemon/dewgong.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.dewgong.idle": { + "animation.dewgong.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/dewott.animation.json b/animations/pokemon/dewott.animation.json index a54e306c7..d5bbc6ab6 100644 --- a/animations/pokemon/dewott.animation.json +++ b/animations/pokemon/dewott.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.dewott.idle": { + "animation.dewott.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/dialga.animation.json b/animations/pokemon/dialga.animation.json index 8da87f4d6..efac566a0 100644 --- a/animations/pokemon/dialga.animation.json +++ b/animations/pokemon/dialga.animation.json @@ -157,7 +157,7 @@ } } }, - "animation.dialga.idle": { + "animation.dialga.ground_idle": { "loop": true, "bones": { "frontshield": { diff --git a/animations/pokemon/diglett.animation.json b/animations/pokemon/diglett.animation.json index 9c146bd13..edeb33d99 100644 --- a/animations/pokemon/diglett.animation.json +++ b/animations/pokemon/diglett.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.diglett.idle": { + "animation.diglett.ground_idle": { "loop": true, "animation_length": 1.5, "bones": { diff --git a/animations/pokemon/ditto.animation.json b/animations/pokemon/ditto.animation.json index bb03d10f0..57b4da661 100644 --- a/animations/pokemon/ditto.animation.json +++ b/animations/pokemon/ditto.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.ditto.idle": { + "animation.ditto.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/dodrio.animation.json b/animations/pokemon/dodrio.animation.json index 9fb03a2cd..ecafd39e6 100644 --- a/animations/pokemon/dodrio.animation.json +++ b/animations/pokemon/dodrio.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.dodrio.idle": { + "animation.dodrio.ground_idle": { "loop": true, "animation_length": 0.75, "bones": { diff --git a/animations/pokemon/doduo.animation.json b/animations/pokemon/doduo.animation.json index 4e9c05ffb..e04cb0722 100644 --- a/animations/pokemon/doduo.animation.json +++ b/animations/pokemon/doduo.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.doduo.idle": { + "animation.doduo.ground_idle": { "loop": true, "animation_length": 0.75, "bones": { diff --git a/animations/pokemon/donphan.animation.json b/animations/pokemon/donphan.animation.json index ce18544d8..b7cc980ed 100644 --- a/animations/pokemon/donphan.animation.json +++ b/animations/pokemon/donphan.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.donphan.idle": { + "animation.donphan.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/dragonair.animation.json b/animations/pokemon/dragonair.animation.json index 61e43c9df..e7782d24a 100644 --- a/animations/pokemon/dragonair.animation.json +++ b/animations/pokemon/dragonair.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.dragonair.idle": { + "animation.dragonair.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/dragonite.animation.json b/animations/pokemon/dragonite.animation.json index b1d66ad1b..75eb430a9 100644 --- a/animations/pokemon/dragonite.animation.json +++ b/animations/pokemon/dragonite.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.dragonite.idle": { + "animation.dragonite.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/drapion.animation.json b/animations/pokemon/drapion.animation.json index 8bfc1b028..5e308b0c0 100644 --- a/animations/pokemon/drapion.animation.json +++ b/animations/pokemon/drapion.animation.json @@ -61,7 +61,7 @@ } } }, - "animation.drapion.idle": { + "animation.drapion.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/dratini.animation.json b/animations/pokemon/dratini.animation.json index dc307f509..9a746bf1e 100644 --- a/animations/pokemon/dratini.animation.json +++ b/animations/pokemon/dratini.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.dratini.idle": { + "animation.dratini.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/drizzile.animation.json b/animations/pokemon/drizzile.animation.json index a3e719ff4..893ee71d7 100644 --- a/animations/pokemon/drizzile.animation.json +++ b/animations/pokemon/drizzile.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.drizzile.idle": { + "animation.drizzile.ground_idle": { "loop": true, "bones": { "body": { diff --git a/animations/pokemon/drowzee.animation.json b/animations/pokemon/drowzee.animation.json index b09aca5bb..f0d0f36e4 100644 --- a/animations/pokemon/drowzee.animation.json +++ b/animations/pokemon/drowzee.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.drowzee.idle": { + "animation.drowzee.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/dugtrio.animation.json b/animations/pokemon/dugtrio.animation.json index 73237c8f5..85bd9c37d 100644 --- a/animations/pokemon/dugtrio.animation.json +++ b/animations/pokemon/dugtrio.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.dugtrio.idle": { + "animation.dugtrio.ground_idle": { "loop": true, "animation_length": 1.5, "bones": { diff --git a/animations/pokemon/eevee.animation.json b/animations/pokemon/eevee.animation.json index a0569f9f7..7ae7d2317 100644 --- a/animations/pokemon/eevee.animation.json +++ b/animations/pokemon/eevee.animation.json @@ -560,7 +560,7 @@ } } }, - "animation.eevee.idle": { + "animation.eevee.ground_idle": { "loop": true, "animation_length": 3, "bones": { diff --git a/animations/pokemon/ekans.animation.json b/animations/pokemon/ekans.animation.json index 710547be7..f7c288de5 100644 --- a/animations/pokemon/ekans.animation.json +++ b/animations/pokemon/ekans.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.ekans.idle": { + "animation.ekans.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/electabuzz.animation.json b/animations/pokemon/electabuzz.animation.json index ad665f540..7b9b8cee0 100644 --- a/animations/pokemon/electabuzz.animation.json +++ b/animations/pokemon/electabuzz.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.electabuzz.idle": { + "animation.electabuzz.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/electrode.animation.json b/animations/pokemon/electrode.animation.json index d19deb028..f1146208d 100644 --- a/animations/pokemon/electrode.animation.json +++ b/animations/pokemon/electrode.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.electrode.idle": { + "animation.electrode.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/elekid.animation.json b/animations/pokemon/elekid.animation.json index e819f0401..225973dda 100644 --- a/animations/pokemon/elekid.animation.json +++ b/animations/pokemon/elekid.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.elekid.idle": { + "animation.elekid.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/emboar.animation.json b/animations/pokemon/emboar.animation.json index 412ee1313..c53f1e441 100644 --- a/animations/pokemon/emboar.animation.json +++ b/animations/pokemon/emboar.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.emboar.idle": { + "animation.emboar.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/empoleon.animation.json b/animations/pokemon/empoleon.animation.json index d48781983..69c9a1934 100644 --- a/animations/pokemon/empoleon.animation.json +++ b/animations/pokemon/empoleon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.empoleon.idle": { + "animation.empoleon.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/entei.animation.json b/animations/pokemon/entei.animation.json index 4fafa88c4..12d82e693 100644 --- a/animations/pokemon/entei.animation.json +++ b/animations/pokemon/entei.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.entei.idle": { + "animation.entei.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/espeon.animation.json b/animations/pokemon/espeon.animation.json index 02554bf8b..9b8fdf43a 100644 --- a/animations/pokemon/espeon.animation.json +++ b/animations/pokemon/espeon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.espeon.idle": { + "animation.espeon.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/exeggcute.animation.json b/animations/pokemon/exeggcute.animation.json index 0a794901c..7c2e8f69e 100644 --- a/animations/pokemon/exeggcute.animation.json +++ b/animations/pokemon/exeggcute.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.exeggcute.idle": { + "animation.exeggcute.ground_idle": { "loop": true, "bones": { "eggA": { diff --git a/animations/pokemon/exeggutor.animation.json b/animations/pokemon/exeggutor.animation.json index 8c1c7d894..a768c5fb6 100644 --- a/animations/pokemon/exeggutor.animation.json +++ b/animations/pokemon/exeggutor.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.exeggutor.idle": { + "animation.exeggutor.ground_idle": { "loop": true, "animation_length": 3, "bones": { diff --git a/animations/pokemon/farfetchd.animation.json b/animations/pokemon/farfetchd.animation.json index c594690d0..8a9da11a4 100644 --- a/animations/pokemon/farfetchd.animation.json +++ b/animations/pokemon/farfetchd.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.farfetchd.idle": { + "animation.farfetchd.ground_idle": { "loop": true, "animation_length": 3, "bones": { diff --git a/animations/pokemon/fearow.animation.json b/animations/pokemon/fearow.animation.json index c98a21e8f..cbd427c81 100644 --- a/animations/pokemon/fearow.animation.json +++ b/animations/pokemon/fearow.animation.json @@ -179,7 +179,7 @@ } } }, - "animation.fearow.idle": { + "animation.fearow.ground_idle": { "loop": true, "animation_length": 0.75, "bones": { diff --git a/animations/pokemon/feraligatr.animation.json b/animations/pokemon/feraligatr.animation.json index b0fa90f2a..daad2b8c4 100644 --- a/animations/pokemon/feraligatr.animation.json +++ b/animations/pokemon/feraligatr.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.feraligatr.idle": { + "animation.feraligatr.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/flaaffy.animation.json b/animations/pokemon/flaaffy.animation.json index ef6bafe85..a5ff333c6 100644 --- a/animations/pokemon/flaaffy.animation.json +++ b/animations/pokemon/flaaffy.animation.json @@ -1,123 +1,710 @@ { "format_version": "1.8.0", "animations": { - "animation.flaaffy.idle": { + "animation.flaaffy.ground_idle": { "loop": true, - "animation_length": 1, + "animation_length": 4, "bones": { - "Body": { + "root": { + "rotation": { + "0.0": [0, 0, 1], + "0.25": [0, 0, 0], + "1.0": [0, 0, 0], + "1.375": [0, 0, -2.5], + "1.625": [0, 0, -2.5], + "2.25": [0, 0, 0], + "3.0": [0, 0, 0], + "3.375": [0, 0, 2.5], + "3.625": [0, 0, 2.5], + "4.0": [0, 0, 1] + }, + "position": [0, 0, 0] + }, + "LeftLeg": { + "rotation": [-10, 0, 0], + "position": [0, 0, 0] + }, + "RightLeg": { + "rotation": [-10, 0, 0], + "position": [0, 0, 0] + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [0.34, 0, 0], + "0.25": [1.27, 0, 0], + "0.375": [1.98, 0, 0], + "0.5": [2.5, 0, 0], + "0.75": [2.8, 0, 0], + "1.0": [2.5, 0, 0], + "1.125": [1.98, 0, 0], + "1.25": [1.15, 0, 0], + "1.375": [0.43, 0, 0], + "1.5": [0, 0, 0], + "1.75": [-0.2, 0, 0], + "2.0": [0, 0, 0], + "2.125": [0.34, 0, 0], + "2.25": [1.27, 0, 0], + "2.375": [1.98, 0, 0], + "2.5": [2.5, 0, 0], + "2.75": [2.8, 0, 0], + "3.0": [2.5, 0, 0], + "3.125": [1.98, 0, 0], + "3.25": [1.15, 0, 0], + "3.375": [0.43, 0, 0], + "3.5": [0, 0, 0], + "3.75": [-0.2, 0, 0], + "4.0": [0, 0, 0] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "2.0": [0, 0, 0] } }, - "Left_Front_Leg": { + "leftArm": { + "rotation": [-30, 0, 17.5] + }, + "rightArm": { + "rotation": [-29.97638, 1.2497, -20.33459] + }, + "head": { + "rotation": { + "0.0": [0, 0, 2.5], + "0.5": [-2.5, 0, 0], + "0.75": [-2.8, 0, 0], + "1.0": [-2.5, 0, 0], + "1.5": [0, 0, -2.5], + "1.75": [-0.07336, -0.55861, -2.42009], + "2.0": [0, 0, -2.5], + "2.5": [-2.5, 0, 0], + "2.75": [-2.8, 0, 0], + "3.0": [-2.5, 0, 0], + "3.5": [0, 0, 2.5], + "3.75": [0.18058, -0.9645, 2.30656], + "4.0": [0, 0, 2.5] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "2.0": [0, 0, 0] } }, - "Right_Front_Leg": { + "bone": { + "rotation": { + "0.0": [10.03742, -4.92385, -0.87038], + "1.0": [10.04, -4.92, -0.87], + "1.375": [12.54, -4.92, -0.87], + "1.625": [12.54, -4.92, -0.87], + "2.0": [10.04, -4.92, -0.87] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "3.0": [0, 0, 0], + "3.375": [0, 0.2, 0], + "3.625": [0, 0.2, 0], + "4.0": [0, 0, 0] } }, - "Tail": { + "bone2": { "rotation": { - "0.0": [0, 20, 0], - "0.52": [0, -20, 0], - "1.0": [0, 20, 0] + "0.0": [10.03742, 4.92385, 0.87038], + "1.0": [10.04, 4.92, 0.87], + "1.625": [10.04, 4.92, 0.87], + "3.0": [10.04, 4.92, 0.87], + "3.375": [12.54, 4.92, 0.87], + "3.625": [12.54, 4.92, 0.87], + "4.0": [10.04, 4.92, 0.87] + }, + "position": { + "1.0": [0, 0, 0], + "1.375": [0, 0.2, 0], + "1.625": [0, 0.2, 0], + "2.0": [0, 0, 0] } }, - "Head": { - "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "tail": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-0.3, -1.4, 0], + "0.5": [0, -2.5, 0], + "1.0": [5.08377, -4.53051, -2.11751], + "1.25": [5.48474, -5.01562, -2.14913], + "1.5": [5.08377, -4.53051, -2.11751], + "2.0": [0, 0, 0], + "2.25": [-0.4, 1.5, 0], + "2.5": [0, 2.5, 0], + "3.0": [5.08377, 4.53051, 2.11751], + "3.25": [5.48474, 5.01562, 2.14913], + "3.5": [5.08377, 4.53051, 2.11751], + "4.0": [0, 0, 0] + } + }, + "tail2": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0.68, -1.18, 0], + "0.5": [2.5, -2.5, 0], + "0.75": [4.31, -3.59, -0.45], + "1.0": [5.0612, -4.80924, -0.95983], + "1.2083": [5.39, -4.81, -0.96], + "1.375": [4.76, -4.81, -0.96], + "1.625": [3.24, -2.89, -0.58], + "2.0": [0, 0, 0], + "2.25": [0.48, 1.18, 0], + "2.5": [1.9, 2.5, 0], + "2.75": [3.73, 3.59, 0.51], + "3.0": [5.06717, 4.76521, 1.05993], + "3.2083": [5.37, 4.77, 1.06], + "3.375": [5.07, 4.77, 1.06], + "3.625": [3.56, 2.87, 0.64], + "4.0": [0, 0, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [0, 5, 0], + "0.5": [0, 0, 0], + "1.0": [0, -5, 0], + "1.5": [0, -6.1, 0], + "2.0": [0, -5, 0], + "2.5": [0, 0, 0], + "3.0": [0, 5, 0], + "3.5": [0, 5.9, 0], + "4.0": [0, 5, 0] } } } }, "animation.flaaffy.walking": { "loop": true, - "animation_length": 1, + "animation_length": 2.5, "bones": { - "Body": { + "root": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, -2.5], + "0.5": [-2.5, 0, -5], + "0.75": [-2.5, 0, -5], + "1.0": [-2.5, 0, -2.5], + "1.25": [0, 0, 0], + "1.5": [0, 0, 2.5], + "1.75": [-2.5, 0, 5], + "2.0": [-2.5, 0, 5], + "2.25": [-2.5, 0, 2.5], + "2.5": [0, 0, 0] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "0.5": [0, 0.5, 0], + "0.875": [0, 0, 0], + "1.5": [0, 0, 0], + "1.75": [0, 0.5, 0], + "2.125": [0, 0, 0] } }, - "Left_Front_Leg": { + "LeftLeg": { + "rotation": { + "0.0": [-7.5, 0, 0], + "0.25": [-2.5, 0, 0], + "0.5": [7.5, 0, 0], + "0.75": [25, 0, 0], + "1.0": [32.27733, 4.02155, -6.33586], + "1.25": [37.27733, 4.02155, -6.33586], + "1.5": [9.77733, 4.02155, -6.33586], + "1.75": [-7.72267, 4.02155, -6.33586], + "2.0": [-35.22267, 4.02155, -6.33586], + "2.25": [-17.72267, 4.02155, -6.33586], + "2.5": [-7.5, 0, 0] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "0.75": [0, 0, 0], + "1.0": [0, 1, 0], + "1.25": [0, 1, -1], + "2.25": [0, 0, -1], + "2.5": [0, 0, 0] } }, - "Right_Front_Leg": { + "bone": { + "rotation": { + "0.0": [7.5, 0, 0], + "0.25": [5, 0, 0], + "0.5": [7.5, 0, 0], + "0.75": [-7.5, 0, 0], + "1.25": [-7.5, 0, 0], + "1.5": [2.5, 0, 0], + "1.75": [10, 0, 0], + "2.0": [25.83, 0, 0], + "2.25": [17.5, 0, 0], + "2.5": [7.5, 0, 0] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "2.25": [0, 0, 0], + "2.5": [0, 0, 0] } }, - "Tail": { + "RightLeg": { "rotation": { - "0.0": [0, 20, 0], - "0.52": [0, -20, 0], - "1.0": [0, 20, 0] + "0.0": [14.98637, -0.64686, 2.41492], + "0.25": [14.99, -0.65, 2.41], + "0.5": [-7.51, -0.65, 2.41], + "0.75": [-32.51, -0.65, 2.41], + "1.0": [-40.01, -0.65, 2.41], + "1.25": [-27.51, -0.65, 2.41], + "1.5": [-15.01, -0.65, 2.41], + "1.75": [-12.51, -0.65, 2.41], + "2.0": [-7.51, -0.65, 2.41], + "2.5": [14.98637, -0.64686, 2.41492] + }, + "position": { + "0.0": [0, 1, 1], + "0.25": [0, 1, 0], + "0.5": [0, 1, -1], + "0.75": [0, 1, -1], + "1.0": [0, 0, -1], + "1.5": [0, 0, -1], + "1.75": [0, 0, 0], + "2.0": [0, 0, 1], + "2.25": [0, 0, 1], + "2.5": [0, 1, 1] } }, - "Head": { - "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "bone2": { + "rotation": { + "0.0": [-10, 0, 0], + "0.25": [-10, 0, 0], + "0.5": [2.5, 0, 0], + "0.75": [35, 0, 0], + "1.0": [35, 0, 0], + "1.25": [25, 0, 0], + "1.5": [17.5, 0, 0], + "1.75": [25, 0, 0], + "2.0": [17.5, 0, 0], + "2.25": [5, 0, 0], + "2.5": [-10, 0, 0] + }, + "position": [0, 0, 0] + }, + "tail": { + "rotation": { + "0.0": [0, 0, 7.5], + "0.25": [0, 0, 2.5], + "0.5": [0, 0, -7.5], + "0.75": [0, 0, -17.5], + "1.0": [0, 0, -15], + "1.25": [0, 0, -15], + "1.5": [0, 0, -7.5], + "1.75": [0, 0, 2.5], + "2.0": [0, 0, 17.5], + "2.25": [0, 0, 12.5], + "2.5": [0, 0, 7.5] } }, - "Left_Back_Leg": { + "tail2": { "rotation": { - "0.0": [-20, 0, 0], - "0.24": [20, 0, 0], - "0.52": [-20, 0, 0], - "0.76": [20, 0, 0], - "1.0": [-20, 0, 0] + "0.0": [0, 12.5, 0], + "0.25": [0, 12.5, 0], + "0.5": [0, 2.5, 0], + "0.75": [0, -12.5, 0], + "1.0": [0, -12.5, 0], + "1.25": [0, -12.5, 0], + "1.5": [0, -10, 0], + "1.75": [0, -15, 0], + "2.0": [0, -2.5, 0], + "2.25": [0, 15, 0], + "2.5": [0, 12.5, 0] } }, - "Right_Back_Leg": { + "leftArm": { + "rotation": [-33.75978, 11.39293, 15.94037] + }, + "rightArm": { + "rotation": [-31.05319, -17.38283, -18.12237] + }, + "head": { "rotation": { - "0.0": [20, 0, 0], - "0.24": [-20, 0, 0], - "0.52": [20, 0, 0], - "0.76": [-20, 0, 0], - "1.0": [20, 0, 0] + "0.0": [0, 0, 2.5], + "0.25": [0, 0, 0], + "0.5": [0, 0, -2.5], + "0.75": [0, 0, -5], + "1.0": [0, 0, -5], + "1.25": [0, 0, -2.5], + "1.5": [0, 0, 0], + "1.75": [0, 0, 2.5], + "2.0": [0, 0, 5], + "2.25": [0, 0, 5], + "2.5": [0, 0, 2.5] } } } }, - "animation.flaaffy.sitting": { + "animation.flaaffy.sleeping": { "loop": true, - "animation_length": 1, + "animation_length": 3.5, "bones": { - "Mareep": { + "root": { + "rotation": [2.5, 0, 0], "position": [0, -3, 0] }, - "Left_Back_Leg": { - "rotation": [-90, 10, 0], - "position": [0, -1, 0] + "LeftLeg": { + "rotation": [-90, 0, 0], + "position": [1, 0, -1] + }, + "bone": { + "rotation": [45.24614, 5.29571, 5.31847] + }, + "RightLeg": { + "rotation": [-90, 0, 0], + "position": [-1, 0, -1] + }, + "bone2": { + "rotation": [43.2148, -9.44605, -8.1773] + }, + "body": { + "rotation": { + "0.0": [10, 0, 0], + "0.75": [9, 0, 0], + "1.25": [9, 0, 0], + "2.25": [10, 0, 0] + } + }, + "tail": { + "rotation": [-67.5, 0, 0], + "position": [0, -1, -1] + }, + "tail2": { + "rotation": [-2.5, 0, 0] + }, + "tail3": { + "rotation": { + "0.0": [0, 0, 0], + "0.75": [1, 0, 0], + "1.25": [1, 0, 0], + "2.25": [0, 0, 0] + } + }, + "leftArm": { + "rotation": [-38.66901, 11.14485, 13.57875] + }, + "rightArm": { + "rotation": [-38.66901, -11.14485, -13.57875] + }, + "head": { + "rotation": [-5, 0, 0] + }, + "eyes": { + "position": [0, -1, 0], + "scale": [1, 0.05, 0.9] + } + } + }, + "animation.flaaffy.swimming": { + "loop": true, + "animation_length": 2.5, + "bones": { + "root": { + "rotation": [60, 0, 0], + "position": [0, 5, 9] + }, + "LeftLeg": { + "rotation": { + "0.0": [15, 0, 0], + "0.25": [-25, 0, 0], + "0.5": [-60, 0, 0], + "1.0": [-122.5, 0, 0], + "1.25": [-92.5, 0, 0], + "1.5": [-42.5, 0, 0], + "1.75": [-5, 0, 0], + "2.25": [15, 0, 0] + } + }, + "bone": { + "rotation": { + "0.0": [40, 0, 0], + "0.25": [12.5, 0, 0], + "0.5": [-7.5, 0, 0], + "0.75": [-7.5, 0, 0], + "1.0": [57.5, 0, 0], + "1.25": [82.5, 0, 0], + "1.5": [95, 0, 0], + "2.375": [95, 0, 0], + "2.5": [40, 0, 0] + } + }, + "RightLeg": { + "rotation": { + "0.0": [15, 0, 0], + "0.25": [-27.5, 0, 0], + "0.5": [-60, 0, 0], + "1.0": [-120, 0, 0], + "1.25": [-90, 0, 0], + "1.5": [-40, 0, 0], + "1.75": [-5, 0, 0], + "2.25": [15, 0, 0] + } + }, + "bone2": { + "rotation": { + "0.0": [37.5, 0, 0], + "0.25": [12.5, 0, 0], + "0.5": [-7.5, 0, 0], + "0.75": [-7.5, 0, 0], + "1.0": [57.5, 0, 0], + "1.25": [80, 0, 0], + "1.5": [90, 0, 0], + "2.375": [90, 0, 0], + "2.5": [37.5, 0, 0] + } + }, + "tail": { + "rotation": [-95, 0, 0], + "position": [0, -2, -2] + }, + "tail2": { + "rotation": { + "0.0": [-45, 0, 0], + "0.75": [-42.5, 0, 0], + "1.25": [-40, 0, 0], + "1.75": [-42.5, 0, 0], + "2.25": [-45, 0, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [-22.5, 0, 0], + "0.25": [-25, 0, 0], + "0.75": [-25, 0, 0], + "1.25": [-22.5, 0, 0], + "1.75": [-17.5, 0, 0], + "2.25": [-20, 0, 0], + "2.5": [-22.5, 0, 0] + } }, - "Right_Back_Leg": { - "rotation": [-90, -10, 0], - "position": [0, -1, 0] + "leftArm": { + "rotation": { + "0.0": [-147.36475, -26.87931, 62.17753], + "0.625": [-149.65113, -29.49294, 67.01459], + "1.375": [-147.36475, -26.87931, 62.17753], + "2.0": [-149.65113, -29.49294, 67.01459], + "2.5": [-147.36475, -26.87931, 62.17753] + }, + "position": [1, 2, 1] + }, + "rightArm": { + "rotation": { + "0.0": [-163.16526, 34.82544, -69.3317], + "0.625": [-166.60827, 36.13043, -75.26005], + "1.375": [-163.16526, 34.82544, -69.3317], + "2.0": [-166.60827, 36.13043, -75.26005], + "2.5": [-163.16526, 34.82544, -69.3317] + }, + "position": [-1, 2, 1] }, - "Tail": { - "rotation": [-40, 0, 0] + "head": { + "rotation": { + "0.0": [-55, 0, 0], + "0.75": [-52.5, 0, 0], + "1.0": [-52.5, 0, 0], + "1.375": [-55, 0, 0], + "2.0": [-57.5, 0, 0], + "2.25": [-57.5, 0, 0], + "2.5": [-55, 0, 0] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.75": [2.5, 0, 0], + "1.0": [2.5, 0, 0], + "2.0": [0, 0, 0] + }, + "position": [0, 0, 0] + } + } + }, + "animation.flaaffy.water_idle": { + "loop": true, + "animation_length": 2.5, + "bones": { + "root": { + "rotation": [60, 0, 0], + "position": [0, 5, 9] + }, + "LeftLeg": { + "rotation": [-100, 0, 0] + }, + "bone": { + "rotation": { + "0.0": [92.5, 0, 0], + "0.75": [95, 0, 0], + "1.25": [94.38, 0, 0], + "2.25": [92.5, 0, 0] + } + }, + "RightLeg": { + "rotation": [-97.5, 0, 0] + }, + "bone2": { + "rotation": { + "0.0": [87.5, 0, 0], + "0.75": [90, 0, 0], + "1.25": [90, 0, 0], + "2.25": [87.5, 0, 0] + } + }, + "tail": { + "rotation": [-95, 0, 0], + "position": [0, -2, -2] + }, + "tail2": { + "rotation": { + "0.0": [-45, 0, 0], + "0.75": [-42.5, 0, 0], + "1.25": [-40, 0, 0], + "1.75": [-42.5, 0, 0], + "2.25": [-45, 0, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [-22.5, 0, 0], + "0.25": [-25, 0, 0], + "0.75": [-25, 0, 0], + "1.25": [-22.5, 0, 0], + "1.75": [-17.5, 0, 0], + "2.25": [-20, 0, 0], + "2.5": [-22.5, 0, 0] + } + }, + "leftArm": { + "rotation": { + "0.0": [-147.36475, -26.87931, 62.17753], + "0.625": [-149.65113, -29.49294, 67.01459], + "1.375": [-147.36475, -26.87931, 62.17753], + "2.0": [-149.65113, -29.49294, 67.01459], + "2.5": [-147.36475, -26.87931, 62.17753] + }, + "position": [1, 2, 1] + }, + "rightArm": { + "rotation": { + "0.0": [-163.16526, 34.82544, -69.3317], + "0.625": [-166.60827, 36.13043, -75.26005], + "1.375": [-163.16526, 34.82544, -69.3317], + "2.0": [-166.60827, 36.13043, -75.26005], + "2.5": [-163.16526, 34.82544, -69.3317] + }, + "position": [-1, 2, 1] + }, + "head": { + "rotation": { + "0.0": [-55, 0, 0], + "0.75": [-52.5, 0, 0], + "1.0": [-52.5, 0, 0], + "1.375": [-55, 0, 0], + "2.0": [-57.5, 0, 0], + "2.25": [-57.5, 0, 0], + "2.5": [-55, 0, 0] + } + }, + "body": { + "rotation": [0, 0, 0], + "position": { + "0.0": [0, 0, 0], + "0.75": [0, 0.1, 0.1], + "1.0": [0, 0.1, 0.1], + "1.75": [0, 0, 0], + "2.0": [0, 0, 0] + } + } + } + }, + "animation.flaaffy.attack": { + "animation_length": 1.5, + "bones": { + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [5, 0, 0], + "0.375": [5, 0, 0], + "0.625": [-2.5, 0, 0], + "0.75": [-2.5, 0, 0], + "1.0": [10, 0, 0], + "1.125": [10, 0, 0], + "1.5": [0, 0, 0] + } + }, + "leftArm": { + "rotation": { + "0.0": [-17.5, 0, 20], + "0.25": [-40, 0, 20], + "0.625": [-130.02687, 1.91486, 18.39243], + "0.75": [-140.02687, 1.91486, 18.39243], + "1.125": [-90.02687, 1.91486, 18.39243], + "1.5": [-17.5, 0, 20] + }, + "position": { + "0.25": [0, 0, 0], + "0.625": [0, 1, 0], + "1.5": [0, 0, 0] + } + }, + "rightArm": { + "rotation": { + "0.0": [-17.5, 0, -22.5], + "0.25": [-37.5, 0, -22.5], + "0.625": [-142.5, 0, -22.5], + "0.75": [-150, 0, -22.5], + "1.125": [-95, 0, -22.5], + "1.5": [-17.5, 0, -22.5] + }, + "position": { + "0.25": [0, 0, 0], + "0.625": [0, 1, 0], + "1.5": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [0, 0, 0], + "0.375": [-7.5, 0, 0], + "0.5": [-7.5, 0, 0], + "0.625": [0, 0, 0], + "0.875": [0, 0, 0], + "1.125": [-15, 0, 0], + "1.5": [0, 0, 0] + } + }, + "tail": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [7.5, 0, 0], + "0.75": [-5, 0, 0], + "1.0": [-10, 0, 0], + "1.25": [-2.5, 0, 0], + "1.5": [0, 0, 0] + } + }, + "tail2": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [0, 0, 0], + "0.75": [5, 0, 0], + "1.0": [-7.5, 0, 0], + "1.25": [-7.5, 0, 0], + "1.5": [0, 0, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [0, 0, 0], + "0.75": [7.5, 0, 0], + "1.0": [7.5, 0, 0], + "1.25": [0, 0, 0], + "1.5": [0, 0, 0] + } } } } diff --git a/animations/pokemon/flareon.animation.json b/animations/pokemon/flareon.animation.json index a4ebe80c1..f48feb972 100644 --- a/animations/pokemon/flareon.animation.json +++ b/animations/pokemon/flareon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.flareon.idle": { + "animation.flareon.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/floatzel.animation.json b/animations/pokemon/floatzel.animation.json index 8d1c1da57..113feab77 100644 --- a/animations/pokemon/floatzel.animation.json +++ b/animations/pokemon/floatzel.animation.json @@ -61,7 +61,7 @@ } } }, - "animation.floatzel.idle": { + "animation.floatzel.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/floragato.animation.json b/animations/pokemon/floragato.animation.json index 897a16de9..f0c2bf4f4 100644 --- a/animations/pokemon/floragato.animation.json +++ b/animations/pokemon/floragato.animation.json @@ -69,7 +69,7 @@ } } }, - "animation.floragato.idle": { + "animation.floragato.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/forretress.animation.json b/animations/pokemon/forretress.animation.json index 03272bd0e..4a442276c 100644 --- a/animations/pokemon/forretress.animation.json +++ b/animations/pokemon/forretress.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.forretress.idle": { + "animation.forretress.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/fraxure.animation.json b/animations/pokemon/fraxure.animation.json index bb4cf7baa..e584ebfc8 100644 --- a/animations/pokemon/fraxure.animation.json +++ b/animations/pokemon/fraxure.animation.json @@ -54,7 +54,7 @@ } } }, - "animation.fraxure.idle": { + "animation.fraxure.ground_idle": { "loop": true, "bones": { "torso": { diff --git a/animations/pokemon/froakie.animation.json b/animations/pokemon/froakie.animation.json index 786ad4d9b..872c6e952 100644 --- a/animations/pokemon/froakie.animation.json +++ b/animations/pokemon/froakie.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.froakie.idle": { + "animation.froakie.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/frogadier.animation.json b/animations/pokemon/frogadier.animation.json index 392f5df9d..916a86233 100644 --- a/animations/pokemon/frogadier.animation.json +++ b/animations/pokemon/frogadier.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.frogadier.idle": { + "animation.frogadier.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/fuecoco.animation.json b/animations/pokemon/fuecoco.animation.json index 0f32b7065..1dc4ef2c2 100644 --- a/animations/pokemon/fuecoco.animation.json +++ b/animations/pokemon/fuecoco.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.fuecoco.idle": { + "animation.fuecoco.ground_idle": { "loop": true, "animation_length": 1.5, "override_previous_animation": true, diff --git a/animations/pokemon/furret.animation.json b/animations/pokemon/furret.animation.json index 22d872f56..c0316f8bb 100644 --- a/animations/pokemon/furret.animation.json +++ b/animations/pokemon/furret.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.furret.idle": { + "animation.furret.ground_idle": { "loop": true, "animation_length": 2.5, "bones": { diff --git a/animations/pokemon/gabite.animation.json b/animations/pokemon/gabite.animation.json index 1e660e049..87d11cfc3 100644 --- a/animations/pokemon/gabite.animation.json +++ b/animations/pokemon/gabite.animation.json @@ -100,7 +100,7 @@ } } }, - "animation.gabite.idle": { + "animation.gabite.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/garchomp.animation.json b/animations/pokemon/garchomp.animation.json index 39040b860..145dc0d7d 100644 --- a/animations/pokemon/garchomp.animation.json +++ b/animations/pokemon/garchomp.animation.json @@ -120,7 +120,7 @@ } } }, - "animation.garchomp.idle": { + "animation.garchomp.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/gardevoir.animation.json b/animations/pokemon/gardevoir.animation.json index b80eade10..860193a3b 100644 --- a/animations/pokemon/gardevoir.animation.json +++ b/animations/pokemon/gardevoir.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.gardevoir.idle": { + "animation.gardevoir.ground_idle": { "loop": true, "animation_length": 2, "bones": { @@ -151,199 +151,160 @@ } } }, - "animation.gardevoir.attack": { + "animation.gardevoir.air_idle": { "loop": true, - "animation_length": 1.125, + "animation_length": 2, "bones": { "waist": { "rotation": { "0.0": [-1, 0, 0], - "0.25": [-1.02427, 12.49807, -0.22168], - "0.375": [-1.04852, 17.49725, -0.31528], - "0.5833": [-1.22071, -34.99389, 0.70014], - "1.0": [-1, 0, 0] + "0.375": [-1.15018, 0.9998, -0.02007], + "0.5417": [-1.46, 1.2, -0.01], + "0.75": [-1.85, 1, 0], + "1.0": [-2, 0, 0], + "1.375": [-1.85, -1, 0], + "1.5417": [-1.53, -1.3, 0], + "1.75": [-1.15, -1, 0], + "2.0": [-1, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "1.0": [0, 0.1, 0], + "2.0": [0, 0, 0] } }, "rightArm": { "rotation": { - "0.0": [0, 10, -75], - "0.25": [7.15231, 9.5337, -29.24791], - "0.375": [7.28611, 14.49411, -28.60571], - "0.6667": [26.1326, -73.81271, -55.66607], - "0.75": [56.03365, -75.86548, -99.86598], - "1.0": [0, 10, -75] + "0.0": [-0.86244, 4.95972, -79.99765], + "0.5": [-0.87458, 7.46185, -80.038], + "1.0": [-0.86588, 4.96029, -80.00191], + "1.5": [-0.86343, 2.46057, -79.96411], + "2.0": [-0.86244, 4.95972, -79.99765] } }, "rightForearm": { "rotation": { - "0.0": [-0.65426, -4.95712, 7.52832], - "0.25": [-0.66775, 12.54174, 7.32677], - "0.375": [-0.70573, 22.54102, 7.20123], - "0.6667": [-0.96398, -47.4534, 8.18201], - "0.8333": [-1.63854, -63.69821, 8.96683], - "1.0": [-0.65426, -4.95712, 7.52832] + "0.0": [-0.65, -4.96, 7.53], + "0.5": [-0.65, -4.96, 7.53], + "1.0": [-0.64816, -2.46016, 7.50162], + "1.5": [-0.64816, -2.46016, 7.50162], + "2.0": [-0.65, -4.96, 7.53] } }, "rightSkirt": { "rotation": { "0.0": [5, 0, 0], - "0.2917": [-19.14724, -10.36733, 14.67165], - "0.5833": [28.14831, -0.11836, 13.21375], - "0.7917": [-43.36158, -10.37621, 28.9864], - "1.125": [5, 0, 0] + "1.0": [5.00474, 2.49048, 0.21803], + "2.0": [5, 0, 0] } }, "rightLeg": { - "rotation": [0.13122, 4.99828, 1.50573] + "rotation": [5.9787, 27.92748, 3.20678], + "position": [0.7, 0, 0] }, "rightDownLeg": { - "rotation": [2.5, 0, 0] + "rotation": [4.5, 0, 0] }, "leftSkirt": { "rotation": { "0.0": [5, 0, 0], - "0.25": [15, 0, 0], - "0.5833": [-14.44, 0, 0], - "0.7917": [12.35814, 3.28214, -14.64456], - "1.0833": [5, 0, 0] + "1.0": [5.00474, -2.49048, -0.21803], + "2.0": [5, 0, 0] } }, "leftLeg": { - "rotation": [0.13122, -4.99828, -1.50573] + "rotation": [-1.08599, 3.99915, 0.83329], + "position": [-0.5, 0, 0] }, "leftDownLeg": { "rotation": [2.5, 0, 0] }, "leftArm": { "rotation": { - "0.0": [0, -10, 75], - "0.25": [4.07361, 20.69955, 54.25045], - "0.375": [16.57361, 20.69955, 54.25045], - "0.5833": [15.5566, -5.76603, 46.64318], - "1.0": [0, -10, 75] + "0.0": [-1.30355, -4.91489, 82.49903], + "0.5": [-1.29991, -2.41553, 82.44212], + "1.0": [-1.30355, -4.91489, 82.49903], + "1.5": [-1.30971, -7.41424, 82.55636], + "2.0": [-1.30355, -4.91489, 82.49903] } }, "leftForearm": { "rotation": { - "0.0": [-0.65426, 4.95712, -7.52832], - "0.25": [-0.88345, 42.45405, -8.06814], - "0.375": [-0.96398, 47.4534, -8.18201], - "0.6667": [-0.66178, 9.95679, -7.58621], - "1.0": [-0.65426, 4.95712, -7.52832] + "0.0": [-0.75904, 2.42648, -10.00184], + "0.5": [-0.75904, 2.42648, -10.00184], + "1.0": [-0.76117, 4.92626, -10.03507], + "1.5": [-0.76, 4.93, -10.04], + "2.0": [-0.75787, 2.43022, -10.00682] } }, "body": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [0, 12.5, 0], - "0.4583": [0, 30, 0], - "0.6667": [-10.30602, -17.08544, 4.81184], - "0.7917": [-10.45515, -19.54453, 5.28631], - "1.0": [0, 0, 0] - }, - "position": [0, 0, 0] - } - } - }, - "animation.gardevoir.sitting": { - "loop": true, - "animation_length": 2, - "bones": { - "waist": { + "rotation": [0, 0, 0] + }, + "head": { "rotation": { "0.0": [5, 0, 0], + "0.5": [6.00091, -0.99452, -0.10454], + "1.0": [7, 0, 0], + "1.5": [6.00091, 0.99452, 0.10454], "2.0": [5, 0, 0] - }, - "position": { - "0.0": [0, -12.1, 0], - "2.0": [0, -12.1, 0] - } - }, - "body": { - "rotation": { - "0.0": [2.5, 0, 0], - "1.0": [1.5, 0, 0], - "2.0": [2.5, 0, 0] - } - }, - "rightArm": { - "rotation": { - "0.0": [30.04556, -8.07642, -71.00195], - "1.0": [29.9191, -6.34402, -69.99456], - "2.0": [30.04556, -8.07642, -71.00195] - } - }, - "rightForearm": { - "rotation": { - "0.0": [0, -25, 0], - "2.0": [0, -25, 0] - } - }, - "rightSkirt": { - "rotation": { - "0.0": [-5, 0, 47.5], - "2.0": [-5, 0, 47.5] - } - }, - "rightLeg": { - "rotation": { - "0.0": [-52.83714, -0.80723, 24.80191], - "2.0": [-52.83714, -0.80723, 24.80191] - }, - "position": { - "0.0": [0, -12.4, 0], - "2.0": [0, -12.4, 0] - } - }, - "rightDownLeg": { - "rotation": { - "0.0": [142.5, 0, 0], - "2.0": [142.5, 0, 0] - }, - "position": { - "0.0": [0, -1.2, 1.4], - "2.0": [0, -1.2, 1.4] } }, - "leftSkirt": { + "bone": { "rotation": { - "0.0": [-5, 0, -47.5], - "2.0": [-5, 0, -47.5] + "0.0417": [0, 0, 0], + "0.375": [-0.28, -0.32, -0.17], + "0.75": [-1.75, -0.97, -0.53], + "0.9583": [-2.02874, -1.27444, -0.6921], + "1.0417": [-2.02874, -1.27444, -0.6921], + "1.25": [-1.72, -0.96, -0.52], + "1.625": [-0.6, -0.34, -0.18], + "1.875": [0, 0, 0] } }, - "leftLeg": { + "bone2": { "rotation": { - "0.0": [-52.83714, 0.80723, -24.80191], - "2.0": [-52.83714, 0.80723, -24.80191] - }, - "position": { - "0.0": [0, -12.4, 0], - "2.0": [0, -12.4, 0] + "0.0": [0, 0, 0], + "0.375": [0, 0, 0.43], + "0.625": [0, 0, 1.67], + "0.875": [0, 0, 2.38], + "1.0": [0, 0, 2.5], + "1.375": [0, 0, 2.28], + "1.625": [0, 0, 1.47], + "1.875": [0, 0, 0.33], + "2.0": [0, 0, 0] } }, - "leftDownLeg": { + "bone4": { "rotation": { - "0.0": [142.5, 0, 0], - "2.0": [142.5, 0, 0] - }, - "position": { - "0.0": [0, -1.2, 1.4], - "2.0": [0, -1.2, 1.4] + "0.0417": [0, 0, 0], + "0.25": [-0.32, 0, 0], + "0.625": [-1.77, 0, 0], + "0.9583": [-2.4, 0, 0], + "1.0417": [-2.4, 0, 0], + "1.375": [-2.07, 0, 0], + "1.75": [-0.42, 0, 0], + "1.9583": [0, 0, 0] } }, - "leftArm": { + "bone5": { "rotation": { - "0.0": [30.04556, 8.07642, 71.00195], - "1.0": [29.9191, 6.34402, 69.99456], - "2.0": [30.04556, 8.07642, 71.00195] + "0.0": [0, 0, 0], + "0.375": [0, 0, -0.62], + "0.625": [0, 0, -1.45], + "0.875": [0, 0, -2.17], + "1.125": [0, 0, -2.3], + "1.375": [0, 0, -1.97], + "1.625": [0, 0, -0.95], + "1.875": [0, 0, -0.12], + "2.0": [0, 0, 0] } }, - "leftForearm": { - "rotation": [0, 25, 0] + "root": { + "position": [0, 2, 0] } } }, - "animation.gardevoir.walking": { + "animation.gardevoir.flying": { "loop": true, "animation_length": 2, "bones": { @@ -571,6 +532,564 @@ "rotation": [107.5, 0, 0] } } + }, + "animation.gardevoir.attack": { + "animation_length": 2.75, + "bones": { + "waist": { + "rotation": [-1, 0, 0] + }, + "rightArm": { + "rotation": { + "0.0": [0, 10, -75], + "0.75": [11.30026, -71.56473, -40.46207], + "1.0": [-11.10546, -67.42939, 9.73614], + "1.25": [-10.06405, -64.97181, 8.59821], + "1.5": [-10.06, -64.97, 8.6], + "1.875": [3.06033, -50.13899, -34.81793], + "2.25": [0, 10, -75] + } + }, + "rightForearm": { + "rotation": { + "0.0": [-0.65426, -4.95712, 7.52832], + "0.125": [-0.65246, 2.5424, 7.44284], + "0.25": [-0.92108, -44.95374, 8.12259], + "0.4167": [42.3364, -76.57002, -36.00931], + "0.5": [88.46494, -83.60544, -83.56351], + "0.75": [109.92944, -83.19868, -105.16763], + "0.875": [40.00238, -80.02623, -34.68151], + "1.0": [6.39749, -2.3135, 4.6325], + "1.5": [6.4, -2.31, 4.63], + "1.75": [5.61684, -25.47802, 9.75933], + "2.0": [7.22359, -45.35701, 7.02878], + "2.375": [-0.65426, -4.95712, 7.52832] + } + }, + "rightSkirt": { + "rotation": { + "0.0": [5, 0, 0], + "0.75": [5, 0, 0], + "1.0": [7.5, 0, 0], + "2.25": [7.5, 0, 0], + "2.75": [5, 0, 0] + } + }, + "rightLeg": { + "rotation": [4.98337, 12.48539, -0.56993] + }, + "rightDownLeg": { + "rotation": [2.5, 0, 0] + }, + "leftSkirt": { + "rotation": { + "0.0": [5, 0, 0], + "0.75": [5, 0, 0], + "1.0": [7.5, 0, 0], + "2.0": [7.5, 0, 0], + "2.5": [5, 0, 0] + } + }, + "leftLeg": { + "rotation": [-0.60597, -7.12737, 3.21638], + "position": [0, 0, 0] + }, + "leftDownLeg": { + "rotation": [2.5, 0, 0] + }, + "leftArm": { + "rotation": { + "0.0": [0, -10, 75], + "0.25": [0, 0, 75], + "0.5": [0, -10, 75], + "0.75": [-7.70847, -19.95609, 75.69346], + "1.0": [-7.71, -19.96, 75.69], + "1.25": [-7.59715, -17.48226, 75.33847], + "1.5": [-7.50144, -15.00393, 74.99639], + "2.0": [-7.5, -15, 75], + "2.25": [0, -10, 75] + } + }, + "leftForearm": { + "rotation": { + "0.0": [-0.65426, 4.95712, -7.52832], + "0.25": [-0.69346, 19.95609, -7.70847], + "0.5": [-0.68329, 17.45627, -7.67676], + "0.75": [-0.68, 17.46, -7.68], + "1.0": [-0.6586, 9.96051, -7.58989], + "1.25": [-0.65111, 4.96084, -7.53227], + "1.5": [-0.64867, -0.03884, -7.47552], + "2.0": [-0.65, -0.04, -7.48], + "2.25": [-0.65426, 4.95712, -7.52832] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, -22.5, 0], + "0.5": [0, -25, 0], + "0.75": [0, -27.5, 0], + "1.0": [0, -30, 0], + "1.5": [0, -30, 0], + "1.75": [0, -20, 0], + "2.125": [0, 0, 0] + }, + "position": [0, 0, 0] + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 25, 0], + "0.5": [0, 25, 0], + "0.75": [0, 27.5, 0], + "1.5": [0, 27.5, 0], + "1.75": [0, 19.58, 0], + "2.125": [0, 0, 0] + } + }, + "bone": { + "rotation": { + "0.875": [0, 0, 0], + "1.125": [12.5, 0, 0], + "1.25": [12.5, 0, 0], + "1.375": [10, 0, 0], + "1.5": [0, 0, 0], + "1.625": [-10, 0, 0], + "1.75": [-12.5, 0, 0], + "1.875": [-12.5, 0, 0], + "2.125": [-7.5, 0, 0], + "2.375": [0, 0, 0] + } + }, + "bone2": { + "rotation": { + "0.875": [0, 0, 0], + "1.125": [15, 0, 0], + "1.25": [15, 0, 0], + "1.375": [10, 0, 0], + "1.5": [2.5, 0, 0], + "1.625": [-10, 0, 0], + "1.75": [-12.5, 0, 0], + "1.875": [-12.5, 0, 0], + "2.125": [0, 0, 0], + "2.375": [2.5, 0, 0], + "2.5": [0, 0, 0] + } + }, + "bone3": { + "rotation": { + "0.875": [0, 0, 0], + "1.125": [12.56397, 7.43547, 0.98448], + "1.25": [17.56, 7.44, 0.98], + "1.5": [7.56, 7.44, 0.98], + "1.75": [-7.44, 7.44, 0.98], + "2.0": [0, 0, 0], + "2.25": [2.5, 0, 0], + "2.375": [2.5, 0, 0], + "2.625": [0, 0, 0] + } + }, + "bone4": { + "rotation": { + "0.875": [0, 0, 0], + "1.125": [7.5, 0, 0], + "1.25": [7.5, 0, 0], + "1.375": [5, 0, 0], + "1.5": [-2.5, 0, 0], + "1.625": [-5, 0, 0], + "1.75": [-5, 0, 0], + "2.0": [0, 0, 0] + } + }, + "bone5": { + "rotation": { + "0.875": [0, 0, 0], + "1.125": [10, 0, 0], + "1.25": [10, 0, 0], + "1.375": [5.01101, -0.10755, -0.30915], + "1.5": [0.01101, -0.10755, -0.30915], + "1.625": [-7.3682, -0.62736, -1.49941], + "1.75": [-9.8682, -0.62736, -1.49941], + "1.875": [-9.87, -0.63, -1.5], + "2.125": [0, 0, 0], + "2.375": [2.5, 0, 0], + "2.5": [0, 0, 0] + } + }, + "bone6": { + "rotation": { + "0.875": [0, 0, 0], + "1.125": [12.68664, -9.76061, -2.18558], + "1.25": [17.69, -9.76, -2.19], + "1.5": [5.19, -9.76, -2.19], + "1.75": [-9.81, -9.76, -2.19], + "2.0": [0, 0, 0], + "2.25": [2.5, 0, 0], + "2.375": [2.5, 0, 0], + "2.625": [0, 0, 0] + } + } + } + }, + "animation.gardevoir.water_idle": { + "loop": true, + "animation_length": 2, + "bones": { + "root": { + "rotation": [7.5, 0, 0], + "position": { + "0.125": [0, 1, 1], + "0.5": [0, 1.09, 1], + "0.75": [0, 1.37, 1], + "0.875": [0, 1.4, 1], + "1.125": [0, 1.4, 1], + "1.5": [0, 1.27, 1], + "1.75": [0, 1.04, 1], + "1.875": [0, 1, 1] + } + }, + "body": { + "rotation": { + "0.0": [-2.5, 0, 0], + "1.0": [-3.5, 0, 0], + "2.0": [-2.5, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [2.5, 0, 0], + "1.0": [3.5, 0, 0], + "2.0": [2.5, 0, 0] + } + }, + "rightArm": { + "rotation": { + "0.0": [-22.3853, 7.30625, -75.95371], + "1.0": [-22.3853, 7.30625, -75.95371], + "2.0": [-22.3853, 7.30625, -75.95371] + } + }, + "rightForearm": { + "rotation": [0, -5, 5] + }, + "leftArm": { + "rotation": { + "0.0": [-22.20062, -3.6368, 74.23621], + "1.0": [-22.20062, -3.6368, 74.23621], + "2.0": [-22.20062, -3.6368, 74.23621] + } + }, + "leftForearm": { + "rotation": [0, 0, -5] + }, + "bone": { + "rotation": { + "0.0417": [0, 0, 0], + "0.375": [0.37, -0.8, 0.74], + "0.75": [1.86, -2.04, 1.87], + "0.9167": [2.40021, -2.60664, 2.3886], + "1.0833": [2.50021, -2.60664, 2.3886], + "1.25": [2.12, -2, 1.84], + "1.5": [0.87, -0.8, 0.74], + "1.75": [0.2, 0, 0], + "2.0": [0, 0, 0] + } + }, + "bone2": { + "rotation": { + "0.0": [2.5, 0, 5], + "0.25": [2.5, -0.08, 5.47], + "0.5": [2.5, -0.15, 7.44], + "0.75": [2.4905, -0.21782, 8.19527], + "1.0": [2.49, -0.17, 7.7], + "1.25": [2.49, -0.13, 6.62], + "1.5": [2.49, -0.09, 5.36], + "1.75": [2.5, -0.05, 4.7], + "2.0": [2.5, 0, 5] + } + }, + "bone3": { + "rotation": { + "0.0": [0, 5, 0], + "0.25": [0.35, 5.68, 0.75], + "0.625": [2.2, 6.69, 1.86], + "0.875": [2.6381, 7.38091, 2.62843], + "1.125": [2.23, 6.79, 1.97], + "1.375": [1.51, 6.05, 1.16], + "1.75": [0.26, 5.53, 0.58], + "2.0": [0, 5, 0] + } + }, + "bone4": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-0.2, 0, 0], + "0.3333": [-0.07, 0.87, -0.8], + "0.625": [1.30021, 2.60664, -2.3886], + "0.875": [2.20021, 2.60664, -2.3886], + "1.0833": [2.60021, 2.60664, -2.3886], + "1.375": [1.93, 1.83, -1.68], + "1.625": [1.13, 0.87, -0.8], + "1.875": [0.2, 0, 0], + "2.0": [0, 0, 0] + } + }, + "bone5": { + "rotation": { + "0.0": [2.5, 0, -3.9], + "0.25": [2.5, 0, -4.6], + "0.625": [2.49, 0.16, -6.95], + "1.0": [2.47864, 0.32621, -7.49294], + "1.375": [2.49, 0.16, -6.54], + "1.75": [2.5, 0, -4.4], + "2.0": [2.5, 0, -3.9] + } + }, + "bone6": { + "rotation": { + "0.0": [-0.8, -5, 0], + "0.25": [-0.2, -5, 0], + "0.75": [2.75, -6.61, -1.78], + "1.0": [3.5381, -7.38091, -2.62843], + "1.375": [2.33, -6.79, -1.97], + "1.75": [-0.46, -5.61, -0.67], + "2.0": [-0.8, -5, 0] + } + }, + "rightLeg": { + "rotation": [-9.88437, 7.29511, 1.73892], + "position": [0.2, 0, 0] + }, + "rightDownLeg": { + "rotation": [7.5, 0, 0] + }, + "leftLeg": { + "rotation": [-2.2488, -9.58952, -2.82361], + "position": [-0.3, 0, 0] + }, + "leftDownLeg": { + "rotation": [10, 0, 0] + }, + "rightSkirt": { + "rotation": [-2.5, 0, 0] + }, + "leftSkirt": { + "rotation": [-2.5, 0, 0] + } + } + }, + "animation.gardevoir.sitting": { + "loop": true, + "animation_length": 2, + "bones": { + "waist": { + "rotation": { + "0.0": [5, 0, 0], + "2.0": [5, 0, 0] + }, + "position": { + "0.0": [0, -12.1, 0], + "2.0": [0, -12.1, 0] + } + }, + "body": { + "rotation": { + "0.0": [2.5, 0, 0], + "1.0": [1.5, 0, 0], + "2.0": [2.5, 0, 0] + } + }, + "rightArm": { + "rotation": { + "0.0": [30.04556, -8.07642, -71.00195], + "1.0": [29.9191, -6.34402, -69.99456], + "2.0": [30.04556, -8.07642, -71.00195] + } + }, + "rightForearm": { + "rotation": { + "0.0": [0, -25, 0], + "2.0": [0, -25, 0] + } + }, + "rightSkirt": { + "rotation": { + "0.0": [-5, 0, 47.5], + "2.0": [-5, 0, 47.5] + } + }, + "rightLeg": { + "rotation": { + "0.0": [-52.83714, -0.80723, 24.80191], + "2.0": [-52.83714, -0.80723, 24.80191] + }, + "position": { + "0.0": [0, -12.4, 0], + "2.0": [0, -12.4, 0] + } + }, + "rightDownLeg": { + "rotation": { + "0.0": [142.5, 0, 0], + "2.0": [142.5, 0, 0] + }, + "position": { + "0.0": [0, -1.2, 1.4], + "2.0": [0, -1.2, 1.4] + } + }, + "leftSkirt": { + "rotation": { + "0.0": [-5, 0, -47.5], + "2.0": [-5, 0, -47.5] + } + }, + "leftLeg": { + "rotation": { + "0.0": [-52.83714, 0.80723, -24.80191], + "2.0": [-52.83714, 0.80723, -24.80191] + }, + "position": { + "0.0": [0, -12.4, 0], + "2.0": [0, -12.4, 0] + } + }, + "leftDownLeg": { + "rotation": { + "0.0": [142.5, 0, 0], + "2.0": [142.5, 0, 0] + }, + "position": { + "0.0": [0, -1.2, 1.4], + "2.0": [0, -1.2, 1.4] + } + }, + "leftArm": { + "rotation": { + "0.0": [30.04556, 8.07642, 71.00195], + "1.0": [29.9191, 6.34402, 69.99456], + "2.0": [30.04556, 8.07642, 71.00195] + } + }, + "leftForearm": { + "rotation": [0, 25, 0] + } + } + }, + "animation.gardevoir.walking": { + "loop": true, + "animation_length": 1, + "bones": { + "waist": { + "rotation": { + "0.0": [2.50954, 4.99523, 0.21865], + "0.5": [2.50954, -4.99523, -0.21865], + "1.0": [2.50954, 4.99523, 0.21865] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 1.1, 0], + "0.5": [0, 0, 0], + "0.75": [0, 1.1, 0], + "1.0": [0, 0, 0] + } + }, + "body": { + "rotation": { + "0.0": [0, -5, 0], + "0.5": [0, 5, 0], + "1.0": [0, -5, 0] + } + }, + "rightArm": { + "rotation": { + "0.0": [0, -7.5, -72.5], + "0.5": [-1.10693, 12.45167, -70.12076], + "1.0": [0, -7.5, -72.5] + } + }, + "rightForearm": { + "rotation": { + "0.0": [0, -5, 0], + "0.5": [0, -2.5, 0], + "1.0": [0, -5, 0] + } + }, + "rightSkirt": { + "rotation": { + "0.0": [5, 0, 0], + "0.5": [-5, 0, 0], + "1.0": [5, 0, 0] + } + }, + "rightLeg": { + "rotation": { + "0.0": [12.5, 0, 0], + "0.25": [-6.25, 0, 0], + "0.5": [-10, 0, 0], + "1.0": [12.5, 0, 0] + }, + "position": { + "0.0": [0, -0.9, 0], + "0.25": [0, 0, 0], + "0.5": [0, -0.7, 0], + "0.75": [0, -0.3, 0], + "1.0": [0, -0.9, 0] + } + }, + "rightDownLeg": { + "rotation": { + "0.0": [12.5, 0, 0], + "0.25": [45, 0, 0], + "0.5": [2.5, 0, 0], + "1.0": [12.5, 0, 0] + } + }, + "leftSkirt": { + "rotation": { + "0.0": [-5, 0, 0], + "0.5": [5, 0, 0], + "1.0": [-5, 0, 0] + } + }, + "leftLeg": { + "rotation": { + "0.0": [-10, 0, 0], + "0.5": [12.5, 0, 0], + "0.75": [-6.25, 0, 0], + "1.0": [-10, 0, 0] + }, + "position": { + "0.0": [0, -0.7, 0], + "0.25": [0, -0.3, 0], + "0.5": [0, -0.9, 0], + "0.75": [0, 0, 0], + "1.0": [0, -0.7, 0] + } + }, + "leftDownLeg": { + "rotation": { + "0.0": [2.5, 0, 0], + "0.5": [12.5, 0, 0], + "0.75": [45, 0, 0], + "1.0": [2.5, 0, 0] + } + }, + "leftArm": { + "rotation": { + "0.0": [-1.10693, -12.45167, 70.12076], + "0.5": [0, 7.5, 72.5], + "1.0": [-1.10693, -12.45167, 70.12076] + } + }, + "leftForearm": { + "rotation": { + "0.0": [0, 2.5, 0], + "0.5": [0, 5, 0], + "1.0": [0, 2.5, 0] + } + } + } } } } \ No newline at end of file diff --git a/animations/pokemon/gastly.animation.json b/animations/pokemon/gastly.animation.json index 391be9b05..b4335bcc5 100644 --- a/animations/pokemon/gastly.animation.json +++ b/animations/pokemon/gastly.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.gastly.idle": { + "animation.gastly.ground_idle": { "loop": true, "animation_length": 3, "bones": { diff --git a/animations/pokemon/gengar.animation.json b/animations/pokemon/gengar.animation.json index 5096f1780..4d654a81a 100644 --- a/animations/pokemon/gengar.animation.json +++ b/animations/pokemon/gengar.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.gengar.idle": { + "animation.gengar.ground_idle": { "loop": true, "animation_length": 6, "bones": { diff --git a/animations/pokemon/geodude.animation.json b/animations/pokemon/geodude.animation.json index 126b17c60..637dbce66 100644 --- a/animations/pokemon/geodude.animation.json +++ b/animations/pokemon/geodude.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.geodude.idle": { + "animation.geodude.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/gible.animation.json b/animations/pokemon/gible.animation.json index ce5911265..76b95c20b 100644 --- a/animations/pokemon/gible.animation.json +++ b/animations/pokemon/gible.animation.json @@ -61,7 +61,7 @@ } } }, - "animation.gible.idle": { + "animation.gible.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/girafarig.animation.json b/animations/pokemon/girafarig.animation.json index 07cc5188a..b75a63dc5 100644 --- a/animations/pokemon/girafarig.animation.json +++ b/animations/pokemon/girafarig.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.girafarig.idle": { + "animation.girafarig.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/giratina.animation.json b/animations/pokemon/giratina.animation.json index 26d712f5e..2496fbdbc 100644 --- a/animations/pokemon/giratina.animation.json +++ b/animations/pokemon/giratina.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.giratina.idle": { + "animation.giratina.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/glaceon.animation.json b/animations/pokemon/glaceon.animation.json index ac4f3e549..181fa92fd 100644 --- a/animations/pokemon/glaceon.animation.json +++ b/animations/pokemon/glaceon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.glaceon.idle": { + "animation.glaceon.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/gligar.animation.json b/animations/pokemon/gligar.animation.json index df22dc2d0..2fa185126 100644 --- a/animations/pokemon/gligar.animation.json +++ b/animations/pokemon/gligar.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.gligar.idle": { + "animation.gligar.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/gloom.animation.json b/animations/pokemon/gloom.animation.json index 0fca1f455..7359e6911 100644 --- a/animations/pokemon/gloom.animation.json +++ b/animations/pokemon/gloom.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.gloom.idle": { + "animation.gloom.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/golbat.animation.json b/animations/pokemon/golbat.animation.json index 59f417686..9500b9a73 100644 --- a/animations/pokemon/golbat.animation.json +++ b/animations/pokemon/golbat.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.golbat.idle": { + "animation.golbat.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/goldeen.animation.json b/animations/pokemon/goldeen.animation.json index 92a48cfc5..4843ffc78 100644 --- a/animations/pokemon/goldeen.animation.json +++ b/animations/pokemon/goldeen.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.goldeen.idle": { + "animation.goldeen.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/golduck.animation.json b/animations/pokemon/golduck.animation.json index a0ad7041f..3d3f6e1aa 100644 --- a/animations/pokemon/golduck.animation.json +++ b/animations/pokemon/golduck.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.golduck.idle": { + "animation.golduck.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/golem.animation.json b/animations/pokemon/golem.animation.json index 3a1b75c95..cbc9be685 100644 --- a/animations/pokemon/golem.animation.json +++ b/animations/pokemon/golem.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.golem.idle": { + "animation.golem.ground_idle": { "loop": true, "animation_length": 3, "bones": { diff --git a/animations/pokemon/graveler.animation.json b/animations/pokemon/graveler.animation.json index 8598cdcb6..b7fc9697f 100644 --- a/animations/pokemon/graveler.animation.json +++ b/animations/pokemon/graveler.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.graveler.idle": { + "animation.graveler.ground_idle": { "loop": true, "animation_length": 3, "bones": { diff --git a/animations/pokemon/greninja.animation.json b/animations/pokemon/greninja.animation.json index 25ba6bbc6..d0b25194c 100644 --- a/animations/pokemon/greninja.animation.json +++ b/animations/pokemon/greninja.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.greninja.idle": { + "animation.greninja.ground_idle": { "loop": true, "animation_length": 9.5, "bones": { diff --git a/animations/pokemon/grookey.animation.json b/animations/pokemon/grookey.animation.json index b808bec44..abb7a2370 100644 --- a/animations/pokemon/grookey.animation.json +++ b/animations/pokemon/grookey.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.grookey.idle": { + "animation.grookey.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/grotle.animation.json b/animations/pokemon/grotle.animation.json index be3e4d150..e52626e2a 100644 --- a/animations/pokemon/grotle.animation.json +++ b/animations/pokemon/grotle.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.grotle.idle": { + "animation.grotle.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/groudon.animation.json b/animations/pokemon/groudon.animation.json index ea77990dc..3808d9274 100644 --- a/animations/pokemon/groudon.animation.json +++ b/animations/pokemon/groudon.animation.json @@ -223,7 +223,7 @@ } } }, - "animation.groudon.idle": { + "animation.groudon.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/grovyle.animation.json b/animations/pokemon/grovyle.animation.json index 53b53aecf..459dc036c 100644 --- a/animations/pokemon/grovyle.animation.json +++ b/animations/pokemon/grovyle.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.grovyle.idle": { + "animation.grovyle.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/growlithe.animation.json b/animations/pokemon/growlithe.animation.json index dfab43dd9..489a0f2af 100644 --- a/animations/pokemon/growlithe.animation.json +++ b/animations/pokemon/growlithe.animation.json @@ -89,7 +89,7 @@ } } }, - "animation.growlithe.idle": { + "animation.growlithe.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/gyarados.animation.json b/animations/pokemon/gyarados.animation.json index b72ffc6ee..513301ea6 100644 --- a/animations/pokemon/gyarados.animation.json +++ b/animations/pokemon/gyarados.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.gyarados.idle": { + "animation.gyarados.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/haunter.animation.json b/animations/pokemon/haunter.animation.json index dafd2befe..3caee7989 100644 --- a/animations/pokemon/haunter.animation.json +++ b/animations/pokemon/haunter.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.haunter.idle": { + "animation.haunter.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/haxorus.animation.json b/animations/pokemon/haxorus.animation.json index 907952c91..54bafd427 100644 --- a/animations/pokemon/haxorus.animation.json +++ b/animations/pokemon/haxorus.animation.json @@ -83,7 +83,7 @@ } } }, - "animation.haxorus.idle": { + "animation.haxorus.ground_idle": { "loop": true, "bones": { "torso": { diff --git a/animations/pokemon/heracross.animation.json b/animations/pokemon/heracross.animation.json index ce90210d7..40303064f 100644 --- a/animations/pokemon/heracross.animation.json +++ b/animations/pokemon/heracross.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.heracross.idle": { + "animation.heracross.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/hitmonchan.animation.json b/animations/pokemon/hitmonchan.animation.json index 99ba1c04a..c11e12015 100644 --- a/animations/pokemon/hitmonchan.animation.json +++ b/animations/pokemon/hitmonchan.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.hitmonchan.idle": { + "animation.hitmonchan.ground_idle": { "loop": true, "animation_length": 2.04167, "override_previous_animation": true, diff --git a/animations/pokemon/hitmonlee.animation.json b/animations/pokemon/hitmonlee.animation.json index 3d7b51ae3..3fd891dc0 100644 --- a/animations/pokemon/hitmonlee.animation.json +++ b/animations/pokemon/hitmonlee.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.hitmonlee.idle": { + "animation.hitmonlee.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/hitmontop.animation.json b/animations/pokemon/hitmontop.animation.json index bcb4ca859..af680cfd2 100644 --- a/animations/pokemon/hitmontop.animation.json +++ b/animations/pokemon/hitmontop.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.hitmontop.idle": { + "animation.hitmontop.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/honchkrow.animation.json b/animations/pokemon/honchkrow.animation.json index ec4d6f334..a24b07464 100644 --- a/animations/pokemon/honchkrow.animation.json +++ b/animations/pokemon/honchkrow.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.honchkrow.idle": { + "animation.honchkrow.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/hooh.animation.json b/animations/pokemon/hooh.animation.json index 3f212637a..5c18eb353 100644 --- a/animations/pokemon/hooh.animation.json +++ b/animations/pokemon/hooh.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.hooh.idle": { + "animation.hooh.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/hoothoot.animation.json b/animations/pokemon/hoothoot.animation.json index 077811c75..cbf6e41b5 100644 --- a/animations/pokemon/hoothoot.animation.json +++ b/animations/pokemon/hoothoot.animation.json @@ -121,7 +121,7 @@ } } }, - "animation.hoothoot.idle": { + "animation.hoothoot.ground_idle": { "loop": true, "animation_length": 0.75, "bones": { diff --git a/animations/pokemon/hoppip.animation.json b/animations/pokemon/hoppip.animation.json index c51a49bc4..08385f538 100644 --- a/animations/pokemon/hoppip.animation.json +++ b/animations/pokemon/hoppip.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.hoppip.idle": { + "animation.hoppip.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/horsea.animation.json b/animations/pokemon/horsea.animation.json index 995a1c551..3b8117180 100644 --- a/animations/pokemon/horsea.animation.json +++ b/animations/pokemon/horsea.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.horsea.idle": { + "animation.horsea.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/houndoom.animation.json b/animations/pokemon/houndoom.animation.json index a27f2298a..03184f9f9 100644 --- a/animations/pokemon/houndoom.animation.json +++ b/animations/pokemon/houndoom.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.houndoom.idle": { + "animation.houndoom.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/houndour.animation.json b/animations/pokemon/houndour.animation.json index 015675a3b..18094def6 100644 --- a/animations/pokemon/houndour.animation.json +++ b/animations/pokemon/houndour.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.houndour.idle": { + "animation.houndour.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/hypno.animation.json b/animations/pokemon/hypno.animation.json index d88352d66..009de8722 100644 --- a/animations/pokemon/hypno.animation.json +++ b/animations/pokemon/hypno.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.hypno.idle": { + "animation.hypno.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/igglybuff.animation.json b/animations/pokemon/igglybuff.animation.json index 354b200f1..3580c0200 100644 --- a/animations/pokemon/igglybuff.animation.json +++ b/animations/pokemon/igglybuff.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.igglybuff.idle": { + "animation.igglybuff.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/incineroar.animation.json b/animations/pokemon/incineroar.animation.json index 5af41f340..89848adc6 100644 --- a/animations/pokemon/incineroar.animation.json +++ b/animations/pokemon/incineroar.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.incineroar.idle": { + "animation.incineroar.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/infernape.animation.json b/animations/pokemon/infernape.animation.json index de7149477..af44e319e 100644 --- a/animations/pokemon/infernape.animation.json +++ b/animations/pokemon/infernape.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.infernape.idle": { + "animation.infernape.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/inteleon.animation.json b/animations/pokemon/inteleon.animation.json index 6c06ec251..d412ef817 100644 --- a/animations/pokemon/inteleon.animation.json +++ b/animations/pokemon/inteleon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.inteleon.idle": { + "animation.inteleon.ground_idle": { "loop": true, "bones": { "waist": { diff --git a/animations/pokemon/ironmoth.animation.json b/animations/pokemon/ironmoth.animation.json index 0f214cb82..70af1fd71 100644 --- a/animations/pokemon/ironmoth.animation.json +++ b/animations/pokemon/ironmoth.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.ironmoth.idle": { + "animation.ironmoth.ground_idle": { "loop": true, "bones": { "torso": { diff --git a/animations/pokemon/ivysaur.animation.json b/animations/pokemon/ivysaur.animation.json index e88146d6f..214b4d68d 100644 --- a/animations/pokemon/ivysaur.animation.json +++ b/animations/pokemon/ivysaur.animation.json @@ -232,7 +232,7 @@ } } }, - "animation.ivysaur.idle": { + "animation.ivysaur.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/jigglypuff.animation.json b/animations/pokemon/jigglypuff.animation.json index f3a546b84..f9e3fb62c 100644 --- a/animations/pokemon/jigglypuff.animation.json +++ b/animations/pokemon/jigglypuff.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.jigglypuff.idle": { + "animation.jigglypuff.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/jirachi.animation.json b/animations/pokemon/jirachi.animation.json index 937df4c92..a0b8cb931 100644 --- a/animations/pokemon/jirachi.animation.json +++ b/animations/pokemon/jirachi.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.jirachi.idle": { + "animation.jirachi.ground_idle": { "loop": true, "animation_length": 4, "bones": { diff --git a/animations/pokemon/jolteon.animation.json b/animations/pokemon/jolteon.animation.json index e2ff2ff87..cfd0dc84f 100644 --- a/animations/pokemon/jolteon.animation.json +++ b/animations/pokemon/jolteon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.jolteon.idle": { + "animation.jolteon.ground_idle": { "loop": true, "animation_length": 1.25, "bones": { diff --git a/animations/pokemon/jumpluff.animation.json b/animations/pokemon/jumpluff.animation.json index f2da1149b..835bbe0ea 100644 --- a/animations/pokemon/jumpluff.animation.json +++ b/animations/pokemon/jumpluff.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.jumpluff.idle": { + "animation.jumpluff.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/jynx.animation.json b/animations/pokemon/jynx.animation.json index 77aa1265f..de91be554 100644 --- a/animations/pokemon/jynx.animation.json +++ b/animations/pokemon/jynx.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.jynx.idle": { + "animation.jynx.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/kabuto.animation.json b/animations/pokemon/kabuto.animation.json index 1e71872d0..68b4a683b 100644 --- a/animations/pokemon/kabuto.animation.json +++ b/animations/pokemon/kabuto.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.kabuto.idle": { + "animation.kabuto.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/kabutops.animation.json b/animations/pokemon/kabutops.animation.json index 9d8f422c6..2d58103e2 100644 --- a/animations/pokemon/kabutops.animation.json +++ b/animations/pokemon/kabutops.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.kabutops.idle": { + "animation.kabutops.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/kadabra.animation.json b/animations/pokemon/kadabra.animation.json index 19d9e8bab..afc26b28f 100644 --- a/animations/pokemon/kadabra.animation.json +++ b/animations/pokemon/kadabra.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.kadabra.idle": { + "animation.kadabra.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/kakuna.animation.json b/animations/pokemon/kakuna.animation.json index c890995ee..298fec28e 100644 --- a/animations/pokemon/kakuna.animation.json +++ b/animations/pokemon/kakuna.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.kakuna.idle": { + "animation.kakuna.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/kangaskhan.animation.json b/animations/pokemon/kangaskhan.animation.json index 89cc873c2..10920e2e0 100644 --- a/animations/pokemon/kangaskhan.animation.json +++ b/animations/pokemon/kangaskhan.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.kangaskhan.idle": { + "animation.kangaskhan.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/kingdra.animation.json b/animations/pokemon/kingdra.animation.json index a2fbbd595..4d21311e5 100644 --- a/animations/pokemon/kingdra.animation.json +++ b/animations/pokemon/kingdra.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.kingdra.idle": { + "animation.kingdra.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/kingler.animation.json b/animations/pokemon/kingler.animation.json index 8abc06c7d..86497252a 100644 --- a/animations/pokemon/kingler.animation.json +++ b/animations/pokemon/kingler.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.kingler.idle": { + "animation.kingler.ground_idle": { "loop": true, "animation_length": 3, "bones": { diff --git a/animations/pokemon/kirlia.animation.json b/animations/pokemon/kirlia.animation.json index f65a8b6bc..aa192ffac 100644 --- a/animations/pokemon/kirlia.animation.json +++ b/animations/pokemon/kirlia.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.kirlia.idle": { + "animation.kirlia.ground_idle": { "loop": true, "animation_length": 2, "bones": { @@ -120,7 +120,6 @@ } }, "animation.kirlia.attack": { - "loop": true, "animation_length": 1.16667, "bones": { "body": { @@ -334,7 +333,7 @@ } } }, - "animation.kirlia.walking": { + "animation.kirlia.flying": { "loop": true, "animation_length": 2, "bones": { @@ -489,6 +488,259 @@ } } } + }, + "animation.kirlia.water_idle": { + "loop": true, + "animation_length": 2, + "bones": { + "1": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "1.25": [0, 0, 2.5], + "1.5": [0, 0, 2.5], + "2.0": [0, 0, 0] + } + }, + "2": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "1.25": [0, 0, -2.5], + "1.5": [0, 0, -2.5], + "2.0": [0, 0, 0] + } + }, + "3": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "1.5": [0, 0, 2.5], + "1.75": [0, 0, 2.5], + "2.0": [0, 0, 0] + } + }, + "4": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "1.5": [0, 0, -2.5], + "1.75": [0, 0, -2.5], + "2.0": [0, 0, 0] + } + }, + "5": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "1.75": [0, 0, 2.5], + "2.0": [0, 0, 0] + } + }, + "6": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "1.75": [0, 0, -2.5], + "2.0": [0, 0, 0] + } + }, + "root": { + "rotation": [5, 0, 0], + "position": { + "0.0": [0, -0.1, 0], + "0.125": [0, -0.3, 0], + "0.25": [0, -0.3, 0], + "0.5": [0, -0.17, 0], + "0.625": [0, 0, 0], + "0.75": [0, 0.3, 0], + "0.875": [0, 0.66, 0], + "1.0": [0, 0.9, 0], + "1.125": [0, 1, 0], + "1.25": [0, 1.1, 0], + "1.5": [0, 1, 0], + "1.625": [0, 0.8, 0], + "1.75": [0, 0.5, 0], + "1.875": [0, 0.1, 0], + "2.0": [0, -0.1, 0] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [-1, 0, 0], + "2.0": [0, 0, 0] + } + }, + "rightArm": { + "rotation": { + "0.0": [-0.03314, 0.44082, -47.53951], + "0.25": [-0.03314, 0.44082, -47.53951], + "0.5": [-0.03314, 0.44082, -47.53951], + "1.0": [-0.03314, 0.44082, -47.53951], + "1.25": [-0.03314, 0.44082, -47.53951], + "1.5": [-0.03314, 0.44082, -47.53951], + "1.75": [-0.03314, 0.44082, -47.53951], + "2.0": [-0.03314, 0.44082, -47.53951] + } + }, + "rightForearm": { + "rotation": [0, -0.05238, 7.5] + }, + "leftArm": { + "rotation": { + "0.0": [0, -2.5, 45], + "0.25": [0, -2.5, 45], + "0.5": [0, -2.5, 45], + "1.0": [0, -2.5, 45], + "1.25": [0, -2.5, 45], + "1.5": [0, -2.5, 45], + "1.75": [0, -2.5, 45], + "2.0": [0, -2.5, 45] + } + }, + "leftForearm": { + "rotation": [0, 0.05238, -12.5] + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [-3, 0, 0], + "2.0": [0, 0, 0] + } + }, + "bone2": { + "rotation": { + "0.0": [5, 0, 0], + "1.0": [7.5, 0, 0], + "2.0": [5, 0, 0] + } + }, + "bone3": { + "rotation": { + "0.0": [5, 0, 0], + "1.0": [7.5, 0, 0], + "2.0": [5, 0, 0] + } + }, + "rightLeg": { + "rotation": [-0.0604, 0.4254, -7.41023] + }, + "rightDownLeg": { + "rotation": { + "0.0": [7.5, 0, 0], + "1.0": [5, 0, 0], + "2.0": [7.5, 0, 0] + } + }, + "leftLeg": { + "rotation": [-7.40165, 2.47671, 5.28569] + }, + "leftDownLeg": { + "rotation": { + "0.0": [7.5, 0, 0], + "1.0": [5, 0, 0], + "2.0": [7.5, 0, 0] + } + } + } + }, + "animation.kirlia.walking": { + "loop": true, + "animation_length": 1, + "bones": { + "body": { + "rotation": { + "0.0": [9, 1, 0], + "0.25": [8.99865, -0.15643, 0.98769], + "0.5": [9, -1, 0], + "0.75": [8.99865, 0.15643, -0.98769], + "1.0": [9, 1, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 0.1, 0], + "0.5": [0, 0, 0], + "0.75": [0, 0.1, 0], + "1.0": [0, 0, 0] + } + }, + "rightArm": { + "rotation": { + "0.0": [15.22074, 9.65594, -34.88702], + "0.25": [15.05423, 9.91708, -35.86657], + "0.5": [15.22074, 9.65594, -34.88702], + "0.75": [15.05423, 9.91708, -35.86657], + "1.0": [15.22074, 9.65594, -34.88702] + } + }, + "rightForearm": { + "rotation": [2.57598, -0.33387, 14.76715] + }, + "head": { + "rotation": { + "0.0": [-7, -2.5, 0], + "0.5": [-7, 2.5, 0], + "1.0": [-7, -2.5, 0] + } + }, + "rightLeg": { + "rotation": { + "0.0": [22.5, 0, 0], + "0.25": [-7.68449, 1.00855, 7.43226], + "0.5": [-7.5, 0, 0], + "1.0": [22.5, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 0.2, 0], + "0.5": [0, 0, 0], + "1.0": [0, 0, 0] + } + }, + "rightDownLeg": { + "rotation": { + "0.0": [5, 0, 0], + "0.25": [41, 0, 0], + "0.5": [2.5, 0, 0], + "1.0": [5, 0, 0] + } + }, + "leftLeg": { + "rotation": { + "0.0": [-7.5, 0, 0], + "0.5": [22.5, 0, 0], + "0.75": [-7.68449, -1.00855, -7.43226], + "1.0": [-7.5, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.5": [0, 0, 0], + "0.75": [0, 0.2, 0], + "1.0": [0, 0, 0] + } + }, + "leftDownLeg": { + "rotation": { + "0.0": [2.5, 0, 0], + "0.5": [5, 0, 0], + "0.75": [41, 0, 0], + "1.0": [2.5, 0, 0] + } + }, + "leftArm": { + "rotation": { + "0.0": [15.22074, -9.65594, 34.88702], + "0.25": [15.05423, -9.91708, 35.86657], + "0.5": [15.22074, -9.65594, 34.88702], + "0.75": [15.05423, -9.91708, 35.86657], + "1.0": [15.22074, -9.65594, 34.88702] + } + }, + "leftForearm": { + "rotation": [2.57598, 0.33387, -14.76715] + } + } } } } \ No newline at end of file diff --git a/animations/pokemon/koffing.animation.json b/animations/pokemon/koffing.animation.json index 09316c2ae..aec2661b8 100644 --- a/animations/pokemon/koffing.animation.json +++ b/animations/pokemon/koffing.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.koffing.idle": { + "animation.koffing.ground_idle": { "loop": true, "animation_length": 4.33333, "override_previous_animation": true, diff --git a/animations/pokemon/krabby.animation.json b/animations/pokemon/krabby.animation.json index 68a1ebc9a..f80c7dc87 100644 --- a/animations/pokemon/krabby.animation.json +++ b/animations/pokemon/krabby.animation.json @@ -328,7 +328,7 @@ } } }, - "animation.krabby.idle": { + "animation.krabby.ground_idle": { "loop": true, "animation_length": 1, "bones": { @@ -382,7 +382,7 @@ } } }, - "animation.kingler.idle": { + "animation.kingler.ground_idle": { "loop": true, "animation_length": 3, "bones": { diff --git a/animations/pokemon/kyogre.animation.json b/animations/pokemon/kyogre.animation.json index 0cd25a7e6..cee61fa50 100644 --- a/animations/pokemon/kyogre.animation.json +++ b/animations/pokemon/kyogre.animation.json @@ -925,7 +925,7 @@ } } }, - "animation.kyogre.idle_underwater": { + "animation.kyogre.ground_idle_underwater": { "loop": true, "animation_length": 2, "bones": { @@ -1086,7 +1086,7 @@ } } }, - "animation.kyogre.idle_floor_underwater": { + "animation.kyogre.ground_idle_floor_underwater": { "loop": true, "animation_length": 2, "bones": { @@ -1247,7 +1247,7 @@ } } }, - "animation.kyogre.idle": { + "animation.kyogre.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/lanturn.animation.json b/animations/pokemon/lanturn.animation.json index 6c11ddf5e..e62b822c5 100644 --- a/animations/pokemon/lanturn.animation.json +++ b/animations/pokemon/lanturn.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.lanturn.idle": { + "animation.lanturn.ground_idle": { "loop": true, "animation_length": 4, "bones": { diff --git a/animations/pokemon/lapras.animation.json b/animations/pokemon/lapras.animation.json index 1b9ed976c..6cfe5f338 100644 --- a/animations/pokemon/lapras.animation.json +++ b/animations/pokemon/lapras.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.lapras.idle": { + "animation.lapras.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/larvesta.animation.json b/animations/pokemon/larvesta.animation.json index 88eb23044..ded6d435b 100644 --- a/animations/pokemon/larvesta.animation.json +++ b/animations/pokemon/larvesta.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.larvesta.idle": { + "animation.larvesta.ground_idle": { "loop": true, "bones": { "torso": { diff --git a/animations/pokemon/larvitar.animation.json b/animations/pokemon/larvitar.animation.json index 42bd98bfb..132e9aecc 100644 --- a/animations/pokemon/larvitar.animation.json +++ b/animations/pokemon/larvitar.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.larvitar.idle": { + "animation.larvitar.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/latias.animation.json b/animations/pokemon/latias.animation.json index 743c281b9..a40cae117 100644 --- a/animations/pokemon/latias.animation.json +++ b/animations/pokemon/latias.animation.json @@ -63,7 +63,7 @@ } } }, - "animation.latias.idle": { + "animation.latias.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/latios.animation.json b/animations/pokemon/latios.animation.json index 7b959bb42..02cd32c08 100644 --- a/animations/pokemon/latios.animation.json +++ b/animations/pokemon/latios.animation.json @@ -63,7 +63,7 @@ } } }, - "animation.latios.idle": { + "animation.latios.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/leafeon.animation.json b/animations/pokemon/leafeon.animation.json index 7a76387e5..83c23b886 100644 --- a/animations/pokemon/leafeon.animation.json +++ b/animations/pokemon/leafeon.animation.json @@ -98,7 +98,7 @@ } } }, - "animation.leafeon.idle": { + "animation.leafeon.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/leavanny.animation.json b/animations/pokemon/leavanny.animation.json index a51df612a..0ddcbda29 100644 --- a/animations/pokemon/leavanny.animation.json +++ b/animations/pokemon/leavanny.animation.json @@ -145,7 +145,7 @@ } } }, - "animation.leavanny.idle": { + "animation.leavanny.ground_idle": { "loop": true, "animation_length": 0.75, "bones": { diff --git a/animations/pokemon/ledian.animation.json b/animations/pokemon/ledian.animation.json index fc657c8ff..38f259de3 100644 --- a/animations/pokemon/ledian.animation.json +++ b/animations/pokemon/ledian.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.ledian.idle": { + "animation.ledian.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/ledyba.animation.json b/animations/pokemon/ledyba.animation.json index f4f6af78f..3ceb0178c 100644 --- a/animations/pokemon/ledyba.animation.json +++ b/animations/pokemon/ledyba.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.ledyba.idle": { + "animation.ledyba.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/lickitung.animation.json b/animations/pokemon/lickitung.animation.json index e58ae3c1b..066377e02 100644 --- a/animations/pokemon/lickitung.animation.json +++ b/animations/pokemon/lickitung.animation.json @@ -168,7 +168,7 @@ } } }, - "animation.lickitung.idle": { + "animation.lickitung.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/lileep.animation.json b/animations/pokemon/lileep.animation.json index 2b231628f..0f85c99c1 100644 --- a/animations/pokemon/lileep.animation.json +++ b/animations/pokemon/lileep.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.lileep.idle": { + "animation.lileep.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/litten.animation.json b/animations/pokemon/litten.animation.json index e896c163b..46d81d0e5 100644 --- a/animations/pokemon/litten.animation.json +++ b/animations/pokemon/litten.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.litten.idle": { + "animation.litten.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/lopunny.animation.json b/animations/pokemon/lopunny.animation.json index e601b607c..ede6d1111 100644 --- a/animations/pokemon/lopunny.animation.json +++ b/animations/pokemon/lopunny.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.lopunny.idle": { + "animation.lopunny.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/lucario.animation.json b/animations/pokemon/lucario.animation.json index 5cceff316..ba9e9b82d 100644 --- a/animations/pokemon/lucario.animation.json +++ b/animations/pokemon/lucario.animation.json @@ -61,7 +61,7 @@ } } }, - "animation.lucario.idle": { + "animation.lucario.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/lugia.animation.json b/animations/pokemon/lugia.animation.json index e05275b7c..68e02b162 100644 --- a/animations/pokemon/lugia.animation.json +++ b/animations/pokemon/lugia.animation.json @@ -493,7 +493,7 @@ } } }, - "animation.lugia.idle": { + "animation.lugia.ground_idle": { "loop": true, "animation_length": 1.5, "bones": { diff --git a/animations/pokemon/lunala.animation.json b/animations/pokemon/lunala.animation.json index 6999047d1..3404c3ef2 100644 --- a/animations/pokemon/lunala.animation.json +++ b/animations/pokemon/lunala.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.lunala.idle": { + "animation.lunala.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/luxio.animation.json b/animations/pokemon/luxio.animation.json index 5f58c5f1b..53c508310 100644 --- a/animations/pokemon/luxio.animation.json +++ b/animations/pokemon/luxio.animation.json @@ -59,7 +59,7 @@ } } }, - "animation.luxio.idle": { + "animation.luxio.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/luxray.animation.json b/animations/pokemon/luxray.animation.json index 584f5fb5b..58114d12d 100644 --- a/animations/pokemon/luxray.animation.json +++ b/animations/pokemon/luxray.animation.json @@ -64,7 +64,7 @@ } } }, - "animation.luxray.idle": { + "animation.luxray.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/machamp.animation.json b/animations/pokemon/machamp.animation.json index e46f08325..da873555e 100644 --- a/animations/pokemon/machamp.animation.json +++ b/animations/pokemon/machamp.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.machamp.idle": { + "animation.machamp.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/machoke.animation.json b/animations/pokemon/machoke.animation.json index 202fa14c1..58b988187 100644 --- a/animations/pokemon/machoke.animation.json +++ b/animations/pokemon/machoke.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.machoke.idle": { + "animation.machoke.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/machop.animation.json b/animations/pokemon/machop.animation.json index e10fd378f..05512e9e9 100644 --- a/animations/pokemon/machop.animation.json +++ b/animations/pokemon/machop.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.machop.idle": { + "animation.machop.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/magby.animation.json b/animations/pokemon/magby.animation.json index eeecd10ee..9692d6221 100644 --- a/animations/pokemon/magby.animation.json +++ b/animations/pokemon/magby.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.magby.idle": { + "animation.magby.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/magcargo.animation.json b/animations/pokemon/magcargo.animation.json index dbaf803bd..78dc788ca 100644 --- a/animations/pokemon/magcargo.animation.json +++ b/animations/pokemon/magcargo.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.magcargo.idle": { + "animation.magcargo.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/magikarp.animation.json b/animations/pokemon/magikarp.animation.json index b767bb5c2..86913333d 100644 --- a/animations/pokemon/magikarp.animation.json +++ b/animations/pokemon/magikarp.animation.json @@ -63,7 +63,7 @@ } } }, - "animation.magikarp.idle": { + "animation.magikarp.ground_idle": { "loop": true, "animation_length": 0.5, "bones": { diff --git a/animations/pokemon/magmar.animation.json b/animations/pokemon/magmar.animation.json index 34e6d3f82..d36aa3db4 100644 --- a/animations/pokemon/magmar.animation.json +++ b/animations/pokemon/magmar.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.magmar.idle": { + "animation.magmar.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/magnemite.animation.json b/animations/pokemon/magnemite.animation.json index 78faa207d..0a6933f07 100644 --- a/animations/pokemon/magnemite.animation.json +++ b/animations/pokemon/magnemite.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.magnemite.idle": { + "animation.magnemite.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/magneton.animation.json b/animations/pokemon/magneton.animation.json index 0f4109dcf..1e7164be1 100644 --- a/animations/pokemon/magneton.animation.json +++ b/animations/pokemon/magneton.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.magneton.idle": { + "animation.magneton.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/magnezone.animation.json b/animations/pokemon/magnezone.animation.json index 6634acdb2..3022b1f45 100644 --- a/animations/pokemon/magnezone.animation.json +++ b/animations/pokemon/magnezone.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.magnezone.idle": { + "animation.magnezone.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/mankey.animation.json b/animations/pokemon/mankey.animation.json index eaf535232..49db30a7a 100644 --- a/animations/pokemon/mankey.animation.json +++ b/animations/pokemon/mankey.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.mankey.idle": { + "animation.mankey.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/mantine.animation.json b/animations/pokemon/mantine.animation.json index 1ea7d0929..19abb6844 100644 --- a/animations/pokemon/mantine.animation.json +++ b/animations/pokemon/mantine.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.mantine.idle": { + "animation.mantine.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/mantyke.animation.json b/animations/pokemon/mantyke.animation.json index 23dc0697b..edb259cb1 100644 --- a/animations/pokemon/mantyke.animation.json +++ b/animations/pokemon/mantyke.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.mantyke.idle": { + "animation.mantyke.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/mareep.animation.json b/animations/pokemon/mareep.animation.json index 094461b65..3675e1cdd 100644 --- a/animations/pokemon/mareep.animation.json +++ b/animations/pokemon/mareep.animation.json @@ -1,128 +1,874 @@ { "format_version": "1.8.0", "animations": { - "animation.mareep.idle": { + "animation.mareep.sitting": { "loop": true, "animation_length": 1, "bones": { "Body": { + "rotation": [-12.5, 0, 0], + "position": [0, -1, 0] + }, + "Left_Back_Leg": { + "rotation": [-42.5, 0, 0], + "position": [0, 0, -1] + }, + "Left_Front_Leg": { + "position": [0, 0, 2] + }, + "Right_Back_Leg": { + "rotation": [-42.5, 0, 0], + "position": [0, 0, -1] + }, + "Right_Front_Leg": { + "position": [0, 0, 2] + }, + "Tail": { + "position": [0, -1, 1] + }, + "Head": { + "position": [0, 0, 1] + } + } + }, + "animation.mareep.attack": { + "loop": "hold_on_last_frame", + "animation_length": 1, + "override_previous_animation": true, + "bones": { + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": [45, 0, 0], + "0.625": [0, 0, 0] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "0.375": [0, -1, 1], + "0.5417": [0, -0.33, -0.67], + "0.625": [0, 0, 0] } }, - "Tail": { + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": [10, 0, 0], + "0.75": [0, 0, 0] + } + }, + "tail": { + "rotation": { + "0.25": [-5, 0, 0], + "0.375": [-25, 0, 0], + "0.625": [-5, 0, 0] + } + }, + "rightLeg": { "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "0.375": [0, 1, 0], + "0.75": [0, 0, 0] } }, - "Head": { + "leftLeg": { + "position": { + "0.0": [0, 0, 0], + "0.375": [0, 1, 0], + "0.75": [0, 0, 0] + } + }, + "root": { + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "0.375": [0, 0, -1], + "0.5": [0, 0, -2], + "0.625": [0, 0, 0] + } + }, + "rightHindLeg": { + "rotation": { + "0.25": [0, 0, 0], + "0.375": [14.58535, 0.66225, 3.53481], + "0.5": [14.59, 0.66, 3.53], + "0.625": [0, 0, 0] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "0.25": [0, 0, 0] + } + }, + "leftHindLeg": { + "rotation": { + "0.25": [0, 0, 0], + "0.375": [15, 0, 0], + "0.5": [15, 0, 0], + "0.625": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0] } } } }, - "animation.mareep.walking": { + "animation.mareep.sleeping": { "loop": true, - "animation_length": 1, + "animation_length": 3, + "override_previous_animation": true, "bones": { - "Body": { + "rightHindLeg": { + "rotation": [0, -90, 90] + }, + "rightLeg": { + "rotation": { + "0.0": [-70, 0, 85], + "1.25": [-70, 0, 85] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "0.75": [0, -0.1, 0], + "1.25": [0, -0.1, 0], + "2.25": [0, 0, 0] } }, - "Tail": { + "body": { + "position": { + "0.0": [0, 0, 0], + "0.75": [0, 0.1, 0], + "1.25": [0, 0.1, 0], + "2.25": [0, 0, 0] + } + }, + "head": { + "rotation": [10, 0, 0], + "position": [0, -3, 0] + }, + "leftLeg": { "rotation": { - "0.0": [0, 15, 0], - "0.52": [0, -15, 0], - "1.0": [0, 15, 0] + "0.0": [-70, 0, -85], + "1.25": [-70, 0, -85], + "2.25": [-70, 0, -85] }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "0.75": [0, -0.1, 0], + "1.25": [0, -0.1, 0], + "2.25": [0, 0, 0] } }, - "Head": { + "leftHindLeg": { + "rotation": [0, 0, -90] + }, + "tail": { + "rotation": [-90, 0, 0] + }, + "tail2": { + "rotation": { + "0.0": [0, 0, 50], + "1.0": [0, 0, 50], + "1.0833": [0, 0, 47.5], + "1.1667": [0, 0, 45], + "1.25": [0, 0, 40], + "1.5": [0, 0, 40], + "1.75": [0, 0, 40], + "2.0": [0, 0, 50] + } + }, + "tail3": { + "rotation": { + "0.0": [26.7633, 15.18892, 13.16783], + "0.75": [26.76, 15.19, 13.17], + "1.0": [22.76046, 9.87798, -9.05431], + "1.25": [21.88742, 1.86688, -32.40163], + "1.3333": [21.85518, 0.15763, -34.2264], + "1.4167": [21.86, 0.16, -34.23], + "1.5": [21.89232, 1.86909, -32.40509], + "1.75": [25.04814, 7.70512, -10.79767], + "2.0": [26.76, 15.19, 13.17], + "2.0833": [27.32378, 16.72788, 15.22011], + "2.1667": [27.32, 16.73, 15.22], + "2.25": [26.76, 15.19, 13.17] + } + }, + "root": { + "position": [0, -2.5, 0] + }, + "bone": { + "scale": [1, 1, 0.05] + } + } + }, + "animation.mareep.ground_idle": { + "loop": true, + "animation_length": 1.5, + "bones": { + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": [0, 0, 0], + "0.5": [1, 0, 0], + "0.625": [2, 0, 0], + "0.75": [2, 0, 0], + "1.0": [1, 0, 0], + "1.375": [0, 0, 0], + "1.5": [0, 0, 0] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, 0, 0], + "0.375": [0, -0.5, 0], + "0.5": [0, -0.6, 0], + "0.625": [0, -0.6, 0], + "0.75": [0, -0.5, 0], + "1.25": [0, 0, 0], + "1.5": [0, 0, 0] } }, - "Left_Back_Leg": { + "tail": { "rotation": { - "0.0": [-15, 0, 0], - "0.24": [0, 0, 0], - "0.52": [15, 0, 0], - "0.76": [0, 0, 0], - "1.0": [-15, 0, 0] + "0.0": [0, 22.5, 0], + "0.125": [0, 20, 0], + "0.375": [0, 2.5, 0], + "0.625": [0, -22.5, 0], + "0.75": [0, -25, 0], + "0.875": [0, -22.5, 0], + "1.125": [0, -7.5, 0], + "1.375": [0, 20, 0], + "1.5": [0, 22.5, 0] } }, - "Left_Front_Leg": { + "tail2": { + "rotation": { + "0.0": [0, 5, 0], + "0.125": [0, 12.5, 0], + "0.375": [0, 15, 0], + "0.625": [0, 5, 0], + "0.75": [0, -5, 0], + "0.875": [0, -15, 0], + "1.125": [0, -17.5, 0], + "1.375": [0, -5, 0], + "1.5": [0, 5, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [0, 17.5, 0], + "0.125": [0, 22.5, 0], + "0.375": [0, 25, 0], + "0.625": [0, 7.5, 0], + "0.75": [0, -7.5, 0], + "0.875": [0, -25, 0], + "1.125": [0, -27.5, 0], + "1.375": [0, -5, 0], + "1.5": [0, 17.5, 0] + } + }, + "rightLeg": { + "rotation": { + "0.375": [0, 0, 0], + "0.625": [-2.5, 0, 0], + "1.25": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.375": [0, 0.5, 0], + "0.5": [0, 0.7, 0], + "0.625": [0, 0.8, 0], + "0.75": [0, 0.7, 0], + "1.25": [0, 0, 0] + } + }, + "leftLeg": { + "rotation": { + "0.375": [0, 0, 0], + "0.625": [-2.5, 0, 0], + "1.25": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.375": [0, 0.5, 0], + "0.5": [0, 0.7, 0], + "0.625": [0, 0.8, 0], + "0.75": [0, 0.7, 0], + "1.25": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "0.5": [0, 0, 0], + "0.75": [2.5, 0, 0], + "1.0": [5, 0, 0], + "1.125": [5, 0, 0], + "1.5": [0, 0, 0] + } + } + } + }, + "animation.mareep.walking": { + "loop": true, + "animation_length": 1.375, + "bones": { + "root": { + "rotation": { + "0.0": [-5, 0, 0], + "0.125": [-7.5, 0, 0], + "0.375": [-2.5, 0, 0], + "0.5": [2.5, 0, 0], + "0.625": [5, 0, 0], + "0.75": [2.5, 0, 0], + "1.0": [0, 0, 0], + "1.125": [0, 0, 0], + "1.25": [-2.5, 0, 0], + "1.375": [-5, 0, 0] + }, + "position": { + "0.0": [0, 1, 0], + "0.125": [0, 2, 0], + "0.25": [0, 2, 0], + "0.5": [0, 1, 0], + "0.75": [0, 0, 0], + "1.125": [0, 0, 0], + "1.375": [0, 1, 0] + } + }, + "rightHindLeg": { "rotation": { "0.0": [12.5, 0, 0], - "0.24": [0, 0, 0], - "0.52": [-15, 0, 0], - "0.76": [0, 0, 0], - "1.0": [12.5, 0, 0] + "0.25": [35, 0, 0], + "0.5": [40, 0, 0], + "0.75": [7.5, 0, 0], + "1.0": [-12.5, 0, 0], + "1.25": [-2.5, 0, 0], + "1.375": [12.5, 0, 0] + }, + "position": { + "0.0": [0, -0.3, 0], + "0.25": [0, -0.1, 1], + "0.5": [0, 0, 1], + "0.75": [0, 1, 0], + "1.0": [0, 0, -1], + "1.25": [0, 0, 0], + "1.375": [0, -0.3, 0] } }, - "Right_Back_Leg": { + "leftHindLeg": { "rotation": { - "0.0": [-15, 0, 0], - "0.24": [0, 0, 0], - "0.52": [15, 0, 0], - "0.76": [0, 0, 0], - "1.0": [-15, 0, 0] + "0.0": [12.5, 0, 0], + "0.25": [32.5, 0, 0], + "0.5": [40, 0, 0], + "0.75": [7.5, 0, 0], + "1.0": [-12.5, 0, 0], + "1.25": [-5, 0, 0], + "1.375": [12.5, 0, 0] + }, + "position": { + "0.0": [0, -0.3, 0], + "0.25": [0, -0.1, 1], + "0.5": [0, 0, 1], + "0.75": [0, 1, 0], + "1.0": [0, 0, -1], + "1.25": [0, 0, 0], + "1.375": [0, -0.3, 0] } }, - "Right_Front_Leg": { + "tail": { + "rotation": { + "0.0": [-37.5, 0, 0], + "0.125": [-33.75, 0, 0], + "0.25": [-25, 0, 0], + "0.5": [-12.5, 0, 0], + "0.75": [-5, 0, 0], + "0.875": [-2.67724, -0.68296, 0.60959], + "1.0": [-5.17724, -0.68296, 0.60959], + "1.125": [-20.17724, -0.68296, 0.60959], + "1.375": [-37.5, 0, 0] + } + }, + "tail2": { + "rotation": { + "0.0": [-32.5, 0, 0], + "0.125": [-35, 0, 0], + "0.25": [-32.5, 0, 0], + "0.5": [-12.5, 0, 0], + "0.625": [0, 0, 0], + "0.75": [2.5, 0, 0], + "0.875": [0, 0, 0], + "1.125": [-20, 0, 0], + "1.375": [-32.5, 0, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [-32.5, 0, 0], + "0.125": [-37.5, 0, 0], + "0.25": [-40, 0, 0], + "0.5": [-40, 0, 0], + "0.75": [-22.56303, -0.51625, 1.32042], + "1.0": [-7.56303, -0.51625, 1.32042], + "1.125": [-15.06303, -0.51625, 1.32042], + "1.25": [-30.06303, -0.51625, 1.32042], + "1.375": [-32.5, 0, 0] + } + }, + "rightLeg": { + "rotation": { + "0.0": [-45, 0, 0], + "0.25": [-55, 0, 0], + "0.5": [-55, 0, 0], + "0.75": [-20, 0, 0], + "0.875": [7.5, 0, 0], + "1.125": [27.5, 0, 0], + "1.375": [-45, 0, 0] + }, + "position": { + "0.0": [0, 1, 0], + "0.25": [0, 1, -1], + "0.5": [0, 0, -1], + "0.75": [0, 0, -1], + "0.875": [0, 0, 0], + "1.125": [0, 1, 0] + } + }, + "leftLeg": { "rotation": { - "0.0": [15, 0, 0], - "0.24": [0, 0, 0], - "0.52": [-15, 0, 0], - "0.76": [0, 0, 0], - "1.0": [15, 0, 0] + "0.0": [-45, 0, 0], + "0.25": [-52.5, 0, 0], + "0.5": [-52.5, 0, 0], + "0.75": [-17.5, 0, 0], + "0.875": [10, 0, 0], + "1.125": [25, 0, 0], + "1.375": [-45, 0, 0] + }, + "position": { + "0.0": [0, 1, 0], + "0.25": [0, 1, -1], + "0.5": [0, 0, -1], + "0.75": [0, 0, -1], + "0.875": [0, 0, 0], + "1.125": [0, 1, 0] + } + }, + "head": { + "rotation": { + "0.0": [-5, 0, 0], + "0.25": [-5, 0, 0], + "0.5": [-10, 0, 0], + "0.75": [-12.5, 0, 0], + "1.0": [-10, 0, 0], + "1.25": [-2.5, 0, 0], + "1.375": [-5, 0, 0] } } } }, - "animation.mareep.sitting": { + "animation.mareep.water_idle": { "loop": true, "animation_length": 1, "bones": { - "Body": { - "rotation": [-12.5, 0, 0], - "position": [0, -1, 0] + "root": { + "rotation": [-2.5, 0, 0] }, - "Left_Back_Leg": { - "rotation": [-42.5, 0, 0], - "position": [0, 0, -1] + "rightHindLeg": { + "rotation": [12.51868, 0.5366, -0.78397], + "position": [0, 1, 0] }, - "Left_Front_Leg": { - "position": [0, 0, 2] + "leftHindLeg": { + "rotation": [12.5, 0, 0], + "position": [0, 1, 0] }, - "Right_Back_Leg": { - "rotation": [-42.5, 0, 0], - "position": [0, 0, -1] + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 1], + "0.5": [0, 0, 0], + "0.75": [0, 0, -1], + "1.0": [0, 0, 0] + } }, - "Right_Front_Leg": { - "position": [0, 0, 2] + "tail": { + "rotation": [-32.5, 0, 0] }, - "Tail": { - "position": [0, -1, 1] + "tail2": { + "rotation": { + "0.0": [-10, 0, 0], + "0.25": [-9.99924, 0.99619, 0.08716], + "0.5": [-10, 0, 0], + "0.75": [-9.99924, -0.99619, -0.08716], + "1.0": [-10, 0, 0] + } }, - "Head": { - "position": [0, 0, 1] + "tail3": { + "rotation": { + "0.0": [-7.48435, -2.38422, -0.7522], + "0.25": [-7.5, 0, 0], + "0.5": [-7.48435, 2.38422, 0.7522], + "0.75": [-7.5, 0, 0], + "1.0": [-7.48435, -2.38422, -0.7522] + } + }, + "rightLeg": { + "rotation": [-77.46939, 36.83503, 7.58967], + "position": [-1, 0, -1] + }, + "leftLeg": { + "rotation": [-81.35612, -29.7174, -4.30963], + "position": [1, 0, -1] + }, + "head": { + "rotation": { + "0.0": [-12.5, 0, 0], + "0.5": [-10, 0, 0], + "1.0": [-12.5, 0, 0] + } + } + } + }, + "animation.mareep.swimming": { + "loop": true, + "animation_length": 1, + "bones": { + "root": { + "rotation": [-2.5, 0, 0] + }, + "rightHindLeg": { + "rotation": { + "0.0": [-19.98132, 0.5366, -0.78397], + "0.125": [-14.98132, 0.5366, -0.78397], + "0.25": [-2.48132, 0.5366, -0.78397], + "0.5": [30.01868, 0.5366, -0.78397], + "0.75": [35.01868, 0.5366, -0.78397], + "0.875": [10.01868, 0.5366, -0.78397], + "1.0": [-19.98132, 0.5366, -0.78397] + }, + "position": { + "0.0": [0, 1, 0], + "0.25": [0, 0, 0], + "0.5": [0, 0, 0], + "0.75": [0, 1, 0] + } + }, + "leftHindLeg": { + "rotation": { + "0.0": [-17.5, 0, 0], + "0.125": [-15, 0, 0], + "0.25": [-5, 0, 0], + "0.5": [27.5, 0, 0], + "0.75": [32.5, 0, 0], + "0.875": [12.5, 0, 0], + "1.0": [-17.5, 0, 0] + }, + "position": { + "0.0": [0, 1, 0], + "0.25": [0, 0, 0], + "0.5": [0, 0, 0], + "0.75": [0, 1, 0] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 1], + "0.5": [0, 0, 0], + "0.75": [0, 0, -1], + "1.0": [0, 0, 0] + } + }, + "tail": { + "rotation": [-32.5, 0, 0] + }, + "tail2": { + "rotation": { + "0.0": [-10, 0, 0], + "0.25": [-9.99924, 0.99619, 0.08716], + "0.5": [-10, 0, 0], + "0.75": [-9.99924, -0.99619, -0.08716], + "1.0": [-10, 0, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [-7.48435, -2.38422, -0.7522], + "0.25": [-7.5, 0, 0], + "0.5": [-7.48435, 2.38422, 0.7522], + "0.75": [-7.5, 0, 0], + "1.0": [-7.48435, -2.38422, -0.7522] + } + }, + "rightLeg": { + "rotation": [-77.46939, 36.83503, 7.58967], + "position": [-1, 0, -1] + }, + "leftLeg": { + "rotation": [-81.35612, -29.7174, -4.30963], + "position": [1, 0, -1] + }, + "head": { + "rotation": { + "0.0": [-12.5, 0, 0], + "0.5": [-10, 0, 0], + "1.0": [-12.5, 0, 0] + } + } + } + }, + "animation.mareep.blink": { + "animation_length": 0.75, + "bones": { + "bone": { + "scale": { + "0.0": [1, 1, 1], + "0.25": [1, 1, 1], + "0.2917": [1, 1, 0.05], + "0.375": [1, 1, 0.05], + "0.4167": [1, 1, 1] + } + } + } + }, + "animation.mareep.attack2": { + "loop": true, + "animation_length": 0.625, + "bones": { + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": [45, 0, 0], + "0.625": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.375": [0, -1, 1], + "0.5417": [0, -0.33, -0.67], + "0.625": [0, 0, 0] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": [10, 0, 0], + "0.625": [0, 0, 0] + }, + "scale": 1 + }, + "tail": { + "rotation": { + "0.25": [-5, 0, 0], + "0.375": [-25, 0, 0], + "0.5": [-5, 0, 0] + } + }, + "rightLeg": { + "position": { + "0.0": [0, 0, 0], + "0.375": [0, 1, 0], + "0.5": [0, 0, 0] + } + }, + "leftLeg": { + "position": { + "0.0": [0, 0, 0], + "0.375": [0, 1, 0], + "0.5": [0, 0, 0] + } + } + } + }, + "animation.mareep.dancing": { + "loop": true, + "animation_length": 1, + "bones": { + "rightLeg": { + "scale": { + "0.0": [1, 1, 1], + "0.25": [1, 0.9, 1], + "0.5": [1, 1, 1], + "0.75": [1, 0.9, 1], + "1.0": [1, 1, 1] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.2917": [0, 0, 0] + }, + "scale": { + "0.0": [1, 1, 1], + "0.25": [1, 1.1, 1], + "0.5": [1, 1, 1], + "0.75": [1, 1.1, 1], + "1.0": [1, 1, 1] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 12.5], + "0.5": [0, 0, -12.5], + "1.0": [0, 0, 12.5] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 1, 0], + "0.5": [0, 0, 0], + "0.75": [0, 1, 0], + "1.0": [0, 0, 0] + } + }, + "leftLeg": { + "scale": { + "0.0": [1, 1, 1], + "0.25": [1, 0.9, 1], + "0.5": [1, 1, 1], + "0.75": [1, 0.9, 1], + "1.0": [1, 1, 1] + } + }, + "tail": { + "rotation": { + "0.0": [0, -10, 0], + "0.5": [0, 10, 0], + "1.0": [0, -10, 0] + } + }, + "tail2": { + "rotation": { + "0.0": [0, -5, 0], + "0.5": [0, 5, 0], + "1.0": [0, -5, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [0, -5, 0], + "0.5": [0, 5, 0], + "1.0": [0, -5, 0] + } + } + } + }, + "animation.mareep.jumping_on_clouds": { + "loop": true, + "animation_length": 2, + "bones": { + "rightHindLeg": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [35, 0, 0], + "1.5": [37.5, 0, 0], + "2.0": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.5": [0, 2.25, 0], + "1.0": [0, 0.5, 0], + "1.5": [0, 2.25, 0], + "2.0": [0, 0, 0] + } + }, + "leftHindLeg": { + "rotation": { + "0.0": [-0.08879, -0.81248, 0.38618], + "1.0": [34.94432, -0.70656, -2.1118], + "1.5": [37.42894, -0.70501, -0.8617], + "2.0": [-0.08644, -0.70346, 0.38839] + }, + "position": { + "0.0": [0, 0, 0], + "0.5": [0, 2.25, 0], + "1.0": [0, 0.5, 0], + "1.5": [0, 2.25, 0], + "2.0": [0, 0, 0] + } + }, + "body": { + "rotation": { + "0.5": [-5, 0, 0], + "1.0": [5, 0, 0], + "2.0": [-5, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.5": [0, 2, 0], + "1.0": [0, 0, 0], + "1.5": [0, 2, 0], + "2.0": [0, 0, 0] + }, + "scale": { + "0.0": [1, 1, 1], + "0.75": [1, 1.2, 1], + "1.0": [1, 1, 1], + "1.75": [1, 1.2, 1], + "2.0": [1, 1, 1] + } + }, + "rightLeg": { + "rotation": { + "0.0": [37.5, 0, 0], + "0.5": [57.5, 0, 0], + "1.0": [-10, 0, 0], + "1.5": [29.94257, 0.8389, -0.34364], + "2.0": [37.44257, 0.8389, -0.34364] + }, + "position": { + "0.0": [0, 0.5, 0], + "2.0": [0, 0.5, 0] + } + }, + "leftLeg": { + "rotation": { + "0.0": [35, 0, 0], + "0.5": [55, 0, 0], + "1.0": [-10, 0, 0], + "1.5": [30, 0, 0], + "2.0": [35, 0, 0] + }, + "position": { + "0.0": [0, 0.5, 0], + "2.0": [0, 0.5, 0] + } + }, + "tail": { + "rotation": { + "0.375": [-30, 0, 0], + "0.5": [-10, 0, 0], + "1.0": [20, 0, 0], + "1.625": [-20, 0, 0], + "2.0": [-27.5, 0, 0] + } + }, + "tail2": { + "rotation": { + "0.0": [-30, 0, 0], + "0.125": [-40, 0, 0], + "1.25": [-3.57, 0, 0], + "2.0": [-35, 0, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [-40, 0, 0], + "0.25": [-50, 0, 0], + "1.25": [-3.57, 0, 0], + "1.875": [-40, 0, 0], + "2.0": [-37.5, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [10, 0, 0], + "1.0": [0, 0, 0], + "1.5": [10, 0, 0], + "2.0": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.5": [0, -1, 0], + "1.0": [0, 0, 0], + "1.5": [0, -1, 0], + "2.0": [0, 0, 0] + } } } } diff --git a/animations/pokemon/marill.animation.json b/animations/pokemon/marill.animation.json index 083e6f454..275a2809f 100644 --- a/animations/pokemon/marill.animation.json +++ b/animations/pokemon/marill.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.marill.idle": { + "animation.marill.ground_idle": { "loop": true, "animation_length": 2.5, "bones": { diff --git a/animations/pokemon/marshtomp.animation.json b/animations/pokemon/marshtomp.animation.json index f56a6c37d..84e8dbfa8 100644 --- a/animations/pokemon/marshtomp.animation.json +++ b/animations/pokemon/marshtomp.animation.json @@ -359,7 +359,7 @@ } } }, - "animation.marshtomp.idle": { + "animation.marshtomp.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/meganium.animation.json b/animations/pokemon/meganium.animation.json index c04ae1cca..ff4d5251c 100644 --- a/animations/pokemon/meganium.animation.json +++ b/animations/pokemon/meganium.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.meganium.idle": { + "animation.meganium.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/meowscarada.animation.json b/animations/pokemon/meowscarada.animation.json index 9234f7202..837ed106f 100644 --- a/animations/pokemon/meowscarada.animation.json +++ b/animations/pokemon/meowscarada.animation.json @@ -188,7 +188,7 @@ } } }, - "animation.meowscarada.idle": { + "animation.meowscarada.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/meowth.animation.json b/animations/pokemon/meowth.animation.json index c528775ba..9348f6de4 100644 --- a/animations/pokemon/meowth.animation.json +++ b/animations/pokemon/meowth.animation.json @@ -367,7 +367,7 @@ } } }, - "animation.meowth.idle": { + "animation.meowth.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/mesprit.animation.json b/animations/pokemon/mesprit.animation.json index 21318d1dc..693e37956 100644 --- a/animations/pokemon/mesprit.animation.json +++ b/animations/pokemon/mesprit.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.mesprit.idle": { + "animation.mesprit.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/metapod.animation.json b/animations/pokemon/metapod.animation.json index ba622829a..c3c69e215 100644 --- a/animations/pokemon/metapod.animation.json +++ b/animations/pokemon/metapod.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.metapod.idle": { + "animation.metapod.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/mew.animation.json b/animations/pokemon/mew.animation.json index 49edc0c64..f854d9a71 100644 --- a/animations/pokemon/mew.animation.json +++ b/animations/pokemon/mew.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.mew.idle": { + "animation.mew.ground_idle": { "loop": true, "bones": { "body": { diff --git a/animations/pokemon/mewtwo.animation.json b/animations/pokemon/mewtwo.animation.json index da3455ace..35d572c85 100644 --- a/animations/pokemon/mewtwo.animation.json +++ b/animations/pokemon/mewtwo.animation.json @@ -61,7 +61,7 @@ } } }, - "animation.mewtwo.idle": { + "animation.mewtwo.ground_idle": { "loop": true, "animation_length": 1.20833, "bones": { diff --git a/animations/pokemon/mewtwo_x.animation.json b/animations/pokemon/mewtwo_x.animation.json index 199e1be1c..7dc899359 100644 --- a/animations/pokemon/mewtwo_x.animation.json +++ b/animations/pokemon/mewtwo_x.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.mewtwo_x.idle": { + "animation.mewtwo_x.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/mewtwo_y.animation.json b/animations/pokemon/mewtwo_y.animation.json index 513739890..a3e74d331 100644 --- a/animations/pokemon/mewtwo_y.animation.json +++ b/animations/pokemon/mewtwo_y.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.mewtwo_y.idle": { + "animation.mewtwo_y.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/miltank.animation.json b/animations/pokemon/miltank.animation.json index b30e51d30..3f726717e 100644 --- a/animations/pokemon/miltank.animation.json +++ b/animations/pokemon/miltank.animation.json @@ -1,105 +1,245 @@ { "format_version": "1.8.0", "animations": { - "animation.miltank.idle": { - "loop": true, + "animation.miltank.attack": { "animation_length": 1, "bones": { - "Body": { + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [0, 15, 0], + "0.75": [0, -20, 0], + "1.0": [0, 0, 0] + } + }, + "rightArm": { "rotation": { - "0.0": [0, 5, 0], - "0.52": [0, -5, 0], - "1.0": [0, 5, 0] + "0.0": [0, 2.5, 0], + "0.5": [25, 0, 90], + "0.75": [-110, 0, 90], + "1.0": [0, 2.5, 0] + }, + "position": [0, 0, -1] + }, + "leftArm": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [0, 0, -10], + "0.75": [0, 0, -5], + "1.0": [0, 0, 0] } }, - "Head": { + "head": { "rotation": { - "0.0": [0, 5, 0], - "0.52": [0, -5, 0], - "1.0": [0, 5, 0] + "0.0": [0, 0, 0], + "0.5": [0, 45, 0], + "0.75": [0, -45, 0], + "1.0": [0, 0, 0] } }, - "Tail": { + "tail": { "rotation": { - "0.0": [0, 5, 0], - "0.52": [0, -5, 0], - "1.0": [0, 5, 0] + "0.0": [0, 0, 0], + "0.75": [-15, 0, 0], + "1.0": [0, 0, 0] + } + }, + "rightEar": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [0, -30, 0], + "0.75": [0, 30, 0], + "1.0": [0, 0, 0] + } + }, + "leftEar": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [0, -30, 0], + "0.75": [0, 30, 0], + "1.0": [0, 0, 0] } } } }, "animation.miltank.sitting": { "loop": true, - "animation_length": 1, + "animation_length": 2, + "bones": { + "root": { + "position": [0, -4, 0], + "scale": { + "0.0": [1, 1, 1], + "1.0": [1, 1.05, 1], + "2.0": [1, 1, 1] + } + }, + "leftLeg": { + "rotation": [-93.10921, -29.96468, 1.57948], + "position": [0, -0.5, -1] + }, + "rightLeg": { + "rotation": [-93.10921, 29.96468, -1.57948], + "position": [0, -0.5, -1] + }, + "rightArm": { + "rotation": [-38.10058, -19.84302, -10.82777] + }, + "leftArm": { + "rotation": [-35.62807, 20.14355, 17.54579] + }, + "body": { + "position": [0, 1, 0] + }, + "tail": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [-10, 0, 0], + "2.0": [0, 0, 0] + } + }, + "rightEar": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [0, 0, -15], + "2.0": [0, 0, 0] + } + }, + "leftEar": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [0, 0, 15], + "2.0": [0.54357, 0.685, -1.04769] + } + } + } + }, + "animation.miltank.ground_idle": { + "loop": true, + "animation_length": 2, "bones": { - "Miltank": { - "position": [0, -6, 0] + "root": { + "scale": { + "0.0": [1, 1, 1], + "1.0": [1, 1.05, 1], + "2.0": [1, 1, 1] + } }, - "left_Leg": { - "rotation": [-90, 0, 0], - "position": [0, -1, 0] + "rightArm": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [0, 0, -5], + "2.0": [0, 0, 0] + } + }, + "leftArm": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [0, 0, 5], + "2.0": [0, 0, 0] + } + }, + "tail": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [-10, 0, 0], + "2.0": [0, 0, 0] + } + }, + "rightEar": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [0, 0, -15], + "2.0": [0, 0, 0] + } }, - "right_Leg": { - "rotation": [-90, 0, 0], - "position": [0, -1, 0] + "leftEar": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": [0, 0, 15], + "2.0": [0, 0, 0] + } } } }, "animation.miltank.walking": { "loop": true, - "animation_length": 1, + "animation_length": 2, "bones": { - "Body": { - "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "root": { + "scale": { + "0.0": [1, 1, 1], + "0.75": [1, 1.05, 1], + "1.0": [1, 1, 1], + "1.75": [1, 1.05, 1], + "1.9583": [1, 1, 1] + } + }, + "leftLeg": { + "rotation": { + "0.0": [22.5, 0, 0], + "1.0": [-22.5, 0, 0], + "2.0": [22.5, 0, 0] } }, - "left_Leg": { + "rightLeg": { "rotation": { - "0.0": [-20, 0, 0], - "0.24": [20, 0, 0], - "0.52": [-20, 0, 0], - "0.76": [20, 0, 0], - "1.0": [-20, 0, 0] + "0.0": [-22.5, 0, 0], + "1.0": [22.5, 0, 0], + "2.0": [-22.5, 0, 0] } }, - "right_Leg": { + "rightArm": { "rotation": { - "0.0": [20, 0, 0], - "0.24": [-20, 0, 0], - "0.52": [20, 0, 0], - "0.76": [-20, 0, 0], - "1.0": [20, 0, 0] + "0.0": [22.5, 0, 0], + "1.0": [-22.5, 0, 0], + "2.0": [22.5, 0, 0] } }, - "Left_Arm": { - "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "leftArm": { + "rotation": { + "0.0": [-22.5, 0, 0], + "1.0": [22.5, 0, 0], + "2.0": [-22.5, 0, 0] } }, - "Right_Arm2": { - "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "tail": { + "rotation": { + "0.0": [0, -30, 0], + "1.0": [0, 30, 0], + "2.0": [0, -30, 0] } }, - "Head": { - "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "tail2": { + "rotation": { + "0.0": [0, 0, -30], + "1.0": [0, 0, 30], + "2.0": [0, 0, -30] + } + }, + "tail3": { + "rotation": { + "0.0": [0, 0, -30], + "1.0": [0, 0, 30], + "2.0": [0, 0, -30] + } + }, + "rightEar": { + "rotation": { + "0.0": [0, 0, 20], + "0.75": [0, 0, -15], + "1.0": [0, 0, 20], + "1.75": [0, 0, -15], + "2.0": [0, 0, 20] } }, - "Tail": { + "leftEar": { "rotation": { - "0.0": [0, -10, 0], - "0.52": [0, 10, 0], - "1.0": [0, -10, 0] + "0.0": [0, 0, -20], + "0.75": [0, 0, 15], + "1.0": [0, 0, -20], + "1.75": [0, 0, 15], + "2.0": [0, 0, -20] } } } diff --git a/animations/pokemon/moltres.animation.json b/animations/pokemon/moltres.animation.json index 698c89fc9..665b91a88 100644 --- a/animations/pokemon/moltres.animation.json +++ b/animations/pokemon/moltres.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.moltres.idle": { + "animation.moltres.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/monferno.animation.json b/animations/pokemon/monferno.animation.json index 05177ab46..7868c1af4 100644 --- a/animations/pokemon/monferno.animation.json +++ b/animations/pokemon/monferno.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.monferno.idle": { + "animation.monferno.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/mrmime.animation.json b/animations/pokemon/mrmime.animation.json index 4af4a3f24..ed35dc0f9 100644 --- a/animations/pokemon/mrmime.animation.json +++ b/animations/pokemon/mrmime.animation.json @@ -188,7 +188,7 @@ } } }, - "animation.mrmime.idle": { + "animation.mrmime.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/mudkip.animation.json b/animations/pokemon/mudkip.animation.json index 7084afb23..cd6092c1f 100644 --- a/animations/pokemon/mudkip.animation.json +++ b/animations/pokemon/mudkip.animation.json @@ -50,7 +50,7 @@ } } }, - "animation.mudkip.idle_in_water": { + "animation.mudkip.ground_idle_in_water": { "loop": true, "animation_length": 3, "bones": { @@ -269,7 +269,7 @@ } } }, - "animation.mudkip.idle": { + "animation.mudkip.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/munchlax.animation.json b/animations/pokemon/munchlax.animation.json index 5b7e5a7c5..51b3fdc91 100644 --- a/animations/pokemon/munchlax.animation.json +++ b/animations/pokemon/munchlax.animation.json @@ -187,7 +187,7 @@ } } }, - "animation.munchlax.idle": { + "animation.munchlax.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/murkrow.animation.json b/animations/pokemon/murkrow.animation.json index 41c2fefca..7351a4cc3 100644 --- a/animations/pokemon/murkrow.animation.json +++ b/animations/pokemon/murkrow.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.murkrow.idle": { + "animation.murkrow.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/natu.animation.json b/animations/pokemon/natu.animation.json index c9a78468e..4c2247637 100644 --- a/animations/pokemon/natu.animation.json +++ b/animations/pokemon/natu.animation.json @@ -1,170 +1,314 @@ { "format_version": "1.8.0", "animations": { - "animation.natu.idle": { + "animation.natu.air_idle": { "loop": true, - "animation_length": 0.75, + "animation_length": 0.875, "bones": { - "Hari": { + "all": { + "position": { + "0.0": [0, 6, 0], + "0.2917": [0, 4, 0], + "0.875": [0, 6, 0] + } + }, + "left_leg": { + "rotation": [10, 0, 0] + }, + "left_foot": { "rotation": { - "0.0": [-42.5, 0, 0], - "0.375": [-35, 0, 0], - "0.75": [-42.5, 0, 0] + "0.0": [-5, 0, 0], + "0.25": [7.5, 0, 0], + "0.875": [-5, 0, 0] } }, - "Tell": { + "right_leg": { + "rotation": [10, 0, 0] + }, + "right_foot": { "rotation": { - "0.0": [-25, 0, 0], - "0.375": [-15, 0, 0], - "0.75": [-25, 0, 0] + "0.0": [-5, 0, 0], + "0.25": [7.5, 0, 0], + "0.875": [-5, 0, 0] } }, - "Wing1": { + "Topfeather": { "rotation": { - "0.0": [0, 0, -52.5], - "0.375": [0, 0, -42.5], - "0.75": [0, 0, -52.5] + "0.0": [32.5, 0, 0], + "0.25": [2.5, 0, 0], + "0.875": [32.5, 0, 0] } }, - "Wing2": { + "left_wing": { "rotation": { - "0.0": [0, 0, 65], - "0.375": [0, 0, 55], - "0.75": [0, 0, 65] + "0.0": [-90, 0, -67.5], + "0.25": [-90, 0, -7.5], + "0.875": [-90, 0, -67.5] }, "position": { - "0.0": [0, 0, 0], - "0.375": [0, 0, 0], - "0.75": [0, 0, 0] + "0.0": [1.2, -0.4, 1], + "0.25": [0.4, -0.4, 1], + "0.875": [1.2, -0.4, 1] + } + }, + "right_wing": { + "rotation": { + "0.0": [-90, 0, 67.5], + "0.25": [-90, 0, 7.5], + "0.875": [-90, 0, 67.5] + }, + "position": { + "0.0": [-1.2, -0.4, 1], + "0.25": [-0.4, -0.4, 1], + "0.875": [-1.2, -0.4, 1] } } } }, "animation.natu.walking": { "loop": true, - "animation_length": 1, + "animation_length": 0.5, + "bones": { + "all": { + "rotation": [10, 0, 0], + "position": { + "0.0": [0, 0, 0], + "0.1667": [0, 1, 0], + "0.3333": [0, 0.08, -1], + "0.5": [0, 0.08, 0] + } + }, + "left_leg": { + "rotation": { + "0.0": [-10, 0, 0], + "0.0833": [5, 0, 0], + "0.3333": [-10, 0, 0] + } + }, + "right_leg": { + "rotation": { + "0.0": [-10, 0, 0], + "0.0833": [5, 0, 0], + "0.3333": [-10, 0, 0] + } + } + } + }, + "animation.natu.ground_idle": { + "loop": true, + "animation_length": 1.16667, "bones": { - "Body": { + "body": { + "rotation": { + "0.0": [0, 0, 10], + "0.2917": [0, 0, 0], + "0.5417": [0, 0, -10], + "0.8333": [0, 0, 0], + "1.1667": [0, 0, 10] + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, -0.3, 0], + "0.2917": [0, 0.3, 0], + "0.5417": [0, -0.2, 0], + "0.8333": [0, 0.3, 0], + "1.1667": [0, -0.3, 0] } }, - "Wing1": { + "Topfeather": { "rotation": { - "0.0": [0, -25, 0], - "0.24": [0, -70, 0], - "0.52": [0, -25, 0], - "0.76": [0, -70, 0], - "1.0": [0, -25, 0] + "0.0": [0, 25, 10], + "0.2917": [0, 0, 0], + "0.5417": [0, 0, -32.5], + "0.8333": [0, 0, 0], + "1.1667": [0, 25, 10] }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, -0.3, 0], + "0.2917": [0, 0.3, 0], + "0.5417": [0, -0.2, 0], + "0.8333": [0, 0.3, 0], + "1.1667": [0, -0.3, 0] } }, - "Wing2": { + "left_wing": { "rotation": { - "0.0": [0, 25, 0], - "0.24": [0, 70, 0], - "0.52": [0, 25, 0], - "0.76": [0, 70, 0], - "1.0": [0, 25, 0] + "0.0": [0, 0, 10], + "0.2917": [0, 0, 0], + "0.5417": [0, 0, -10], + "0.8333": [0, 0, 0], + "1.1667": [0, 0, 10] }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": [0, -0.3, 0], + "0.2917": [0, 0.3, 0], + "0.5417": [0, -0.2, 0], + "0.8333": [0, 0.3, 0], + "1.1667": [0, -0.3, 0] + } + }, + "right_wing": { + "rotation": { + "0.0": [0, 0, 10], + "0.2917": [0, 0, 0], + "0.5417": [0, 0, -10], + "0.8333": [0, 0, 0], + "1.1667": [0, 0, 10] + }, + "position": { + "0.0": [0, -0.3, 0], + "0.2917": [0, 0.3, 0], + "0.5417": [0, -0.2, 0], + "0.8333": [0, 0.3, 0], + "1.1667": [0, -0.3, 0] } } } }, - "animation.natu.sitting": { + "animation.natu.flying": { "loop": true, + "animation_length": 1.08333, "bones": { - "Body": { - "position": [0, -1, 0] + "all": { + "rotation": { + "0.0": [10, 0, 0], + "1.0833": [10, 0, 0] + }, + "position": { + "0.0": [0, 7, 0], + "0.2917": [0, 5, 0], + "1.0833": [0, 7, 0] + } }, - "Wing1": { - "position": [0, -1, 0] + "left_leg": { + "rotation": [7.5, 0, 0] }, - "Wing2": { - "position": [0, -1, 0] + "left_foot": { + "rotation": [12.5, 0, 0] + }, + "right_foot": { + "rotation": [17.5, 0, 0] + }, + "Topfeather": { + "rotation": { + "0.0": [22.5, 0, 0], + "0.2917": [-5, 0, 0], + "1.0833": [22.5, 0, 0] + } + }, + "left_wing": { + "rotation": { + "0.0": [-90, 0, -67.5], + "0.2917": [-90, 0, -2.5], + "1.0833": [-90, 0, -67.5] + }, + "position": { + "0.0": [1.2, -0.4, 1], + "0.2917": [0.2, -0.4, 1], + "1.0833": [1.2, -0.4, 1] + } + }, + "right_wing": { + "rotation": { + "0.0": [-90, 0, 67.5], + "0.2917": [-90, 0, 2.5], + "1.0833": [-90, 0, 67.5] + }, + "position": { + "0.0": [-1.2, -0.4, 1], + "0.2917": [-0.2, -0.4, 1], + "1.0833": [-1.2, -0.4, 1] + } } } }, - "animation.natu.flying": { + "animation.natu.attack": { "loop": true, - "animation_length": 0.75, + "animation_length": 0.875, "bones": { - "Body": { + "all": { "rotation": { - "0.0": [12.5, 0, 0], - "0.375": [12.5, 0, 0], - "0.75": [12.5, 0, 0] + "0.0": [0, 0, 0], + "0.1667": [37.5, 0, 0], + "0.5": [0, 0, 0] }, "position": { - "0.0": [0, 3, 0], - "0.1667": [0, 4, 0], - "0.375": [0, 3, 0], - "0.5833": [0, 2, 0], - "0.75": [0, 3, 0] + "0.0": [0, 6, 0], + "0.2917": [0, 4, 0], + "0.875": [0, 6, 0] } }, - "Hari": { + "left_wing": { "rotation": { - "0.0": [-32.5, 0, 0], - "0.1667": [-47.5, 0, 0], - "0.375": [-32.5, 0, 0], - "0.5833": [-60, 0, 0], - "0.75": [-32.5, 0, 0] + "0.0": [-90, 0, -67.5], + "0.25": [-90, 0, -7.5], + "0.875": [-90, 0, -67.5] + }, + "position": { + "0.0": [1.2, -0.4, 1], + "0.25": [0.4, -0.4, 1], + "0.875": [1.2, -0.4, 1] } }, - "Tell": { + "right_wing": { "rotation": { - "0.0": [-25, 0, 0], - "0.1667": [-12.5, 0, 0], - "0.375": [-25, 0, 0], - "0.5833": [-45, 0, 0], - "0.75": [-25, 0, 0] + "0.0": [-90, 0, 67.5], + "0.25": [-90, 0, 7.5], + "0.875": [-90, 0, 67.5] + }, + "position": { + "0.0": [-1.2, -0.4, 1], + "0.25": [-0.4, -0.4, 1], + "0.875": [-1.2, -0.4, 1] + } + } + } + }, + "animation.natu.faint": { + "animation_length": 0.95833, + "bones": { + "all": { + "rotation": { + "0.0": [0, 0, 0], + "0.625": [0, 0, 90] + }, + "position": { + "0.0": [0, 6, 0], + "0.25": [0, 0, 0], + "0.625": [0, 2.6, 0] } }, - "Leg1": { + "left_leg": { "rotation": { - "0.0": [10, 0, 0], - "0.1667": [15, 0, 0], - "0.375": [10, 0, 0], - "0.5833": [-7.5, 0, 0], - "0.75": [10, 0, 0] + "0.0": [0, 0, 0], + "0.75": [0, 0, -32.5] } }, - "Wing1": { + "right_leg": { "rotation": { "0.0": [0, 0, 0], - "0.1667": [0, 0, 12.5], - "0.375": [0, 0, 0], - "0.5833": [0, 0, -10], - "0.75": [0, 0, 0] + "0.75": [0, 0, -25] } }, - "Leg2": { + "left_wing": { "rotation": { - "0.0": [10, 0, 0], - "0.1667": [15, 0, 0], - "0.375": [10, 0, 0], - "0.5833": [-2.5, 0, 0], - "0.75": [10, 0, 0] + "0.0": [-90, 0, -67.5], + "0.25": [-90, 0, -7.5] + }, + "position": { + "0.0": [1.2, -0.4, 1], + "0.25": [0.4, -0.4, 1] } }, - "Wing2": { + "right_wing": { "rotation": { - "0.0": [0, 0, 0], - "0.1667": [0, 0, -12.5], - "0.375": [0, 0, 0], - "0.5833": [0, 0, 12.5], - "0.75": [0, 0, 0] + "0.0": [-90, 0, 67.5], + "0.25": [-90, 0, 7.5], + "0.375": [-90, 0, 45], + "0.7083": [-90, 0, 0] + }, + "position": { + "0.0": [-1.2, -0.4, 1], + "0.25": [-0.4, -0.4, 1] } } } diff --git a/animations/pokemon/nidoking.animation.json b/animations/pokemon/nidoking.animation.json index 89b145f52..793843665 100644 --- a/animations/pokemon/nidoking.animation.json +++ b/animations/pokemon/nidoking.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.nidoking.idle": { + "animation.nidoking.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/nidoqueen.animation.json b/animations/pokemon/nidoqueen.animation.json index 81ee63696..44196efed 100644 --- a/animations/pokemon/nidoqueen.animation.json +++ b/animations/pokemon/nidoqueen.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.nidoqueen.idle": { + "animation.nidoqueen.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/nidoranf.animation.json b/animations/pokemon/nidoranf.animation.json index ab74cc8df..be1ead825 100644 --- a/animations/pokemon/nidoranf.animation.json +++ b/animations/pokemon/nidoranf.animation.json @@ -314,7 +314,7 @@ } } }, - "animation.nidoranf.idle": { + "animation.nidoranf.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/nidoranm.animation.json b/animations/pokemon/nidoranm.animation.json index 3fc6a20de..30f6b00b8 100644 --- a/animations/pokemon/nidoranm.animation.json +++ b/animations/pokemon/nidoranm.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.nidoranm.idle": { + "animation.nidoranm.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/nidorina.animation.json b/animations/pokemon/nidorina.animation.json index 626bd8065..547eff2c8 100644 --- a/animations/pokemon/nidorina.animation.json +++ b/animations/pokemon/nidorina.animation.json @@ -118,7 +118,7 @@ } } }, - "animation.nidorina.idle": { + "animation.nidorina.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/nidorino.animation.json b/animations/pokemon/nidorino.animation.json index 1da48fb69..f473049d7 100644 --- a/animations/pokemon/nidorino.animation.json +++ b/animations/pokemon/nidorino.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.nidorino.idle": { + "animation.nidorino.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/ninetales.animation.json b/animations/pokemon/ninetales.animation.json index d2834dc81..567b3aed9 100644 --- a/animations/pokemon/ninetales.animation.json +++ b/animations/pokemon/ninetales.animation.json @@ -454,7 +454,7 @@ } } }, - "animation.ninetales.idle": { + "animation.ninetales.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/noctowl.animation.json b/animations/pokemon/noctowl.animation.json index 53abcc4a7..c9f0e249b 100644 --- a/animations/pokemon/noctowl.animation.json +++ b/animations/pokemon/noctowl.animation.json @@ -130,7 +130,7 @@ } } }, - "animation.noctowl.idle": { + "animation.noctowl.ground_idle": { "loop": true, "animation_length": 0.5, "bones": { diff --git a/animations/pokemon/octillery.animation.json b/animations/pokemon/octillery.animation.json index 1655e8bbc..6ba65e72a 100644 --- a/animations/pokemon/octillery.animation.json +++ b/animations/pokemon/octillery.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.octillery.idle": { + "animation.octillery.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/oddish.animation.json b/animations/pokemon/oddish.animation.json index 62c7dda84..99054fd16 100644 --- a/animations/pokemon/oddish.animation.json +++ b/animations/pokemon/oddish.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.oddish.idle": { + "animation.oddish.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/omanyte.animation.json b/animations/pokemon/omanyte.animation.json index 268d4dbd5..5fa988be6 100644 --- a/animations/pokemon/omanyte.animation.json +++ b/animations/pokemon/omanyte.animation.json @@ -19,7 +19,7 @@ } } }, - "animation.omanyte.idle": { + "animation.omanyte.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/omastar.animation.json b/animations/pokemon/omastar.animation.json index e86319c96..0daf8bfea 100644 --- a/animations/pokemon/omastar.animation.json +++ b/animations/pokemon/omastar.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.omastar.idle": { + "animation.omastar.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/onix.animation.json b/animations/pokemon/onix.animation.json index c571e606c..cbf5ab3a0 100644 --- a/animations/pokemon/onix.animation.json +++ b/animations/pokemon/onix.animation.json @@ -352,7 +352,7 @@ } } }, - "animation.onix.idle": { + "animation.onix.ground_idle": { "loop": true, "animation_length": 6, "override_previous_animation": true, diff --git a/animations/pokemon/oshawott.animation.json b/animations/pokemon/oshawott.animation.json index bef5a30b5..e3e2e31a6 100644 --- a/animations/pokemon/oshawott.animation.json +++ b/animations/pokemon/oshawott.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.oshawott.idle": { + "animation.oshawott.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/palkia.animation.json b/animations/pokemon/palkia.animation.json index 5a27fdcd1..26c00faf1 100644 --- a/animations/pokemon/palkia.animation.json +++ b/animations/pokemon/palkia.animation.json @@ -498,7 +498,7 @@ } } }, - "animation.palkia.idle": { + "animation.palkia.ground_idle": { "loop": true, "bones": { "body": { diff --git a/animations/pokemon/paras.animation.json b/animations/pokemon/paras.animation.json index f4b1a35f7..1c88cad78 100644 --- a/animations/pokemon/paras.animation.json +++ b/animations/pokemon/paras.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.paras.idle": { + "animation.paras.ground_idle": { "loop": true, "animation_length": 4, "override_previous_animation": true, diff --git a/animations/pokemon/parasect.animation.json b/animations/pokemon/parasect.animation.json index 45262caf3..b91b5b987 100644 --- a/animations/pokemon/parasect.animation.json +++ b/animations/pokemon/parasect.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.parasect.idle": { + "animation.parasect.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/persian.animation.json b/animations/pokemon/persian.animation.json index d892847f7..65403ca6c 100644 --- a/animations/pokemon/persian.animation.json +++ b/animations/pokemon/persian.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.persian.idle": { + "animation.persian.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/petilil.animation.json b/animations/pokemon/petilil.animation.json index 356a47105..cc27aee20 100644 --- a/animations/pokemon/petilil.animation.json +++ b/animations/pokemon/petilil.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.petilil.idle": { + "animation.petilil.ground_idle": { "loop": true, "animation_length": 0.75, "bones": { diff --git a/animations/pokemon/phanpy.animation.json b/animations/pokemon/phanpy.animation.json index 36385f288..5b8235f91 100644 --- a/animations/pokemon/phanpy.animation.json +++ b/animations/pokemon/phanpy.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.phanpy.idle": { + "animation.phanpy.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/pichu.animation.json b/animations/pokemon/pichu.animation.json index 7b04a2506..0922c734d 100644 --- a/animations/pokemon/pichu.animation.json +++ b/animations/pokemon/pichu.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.pichu.idle": { + "animation.pichu.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/pidgeot.animation.json b/animations/pokemon/pidgeot.animation.json index 9c6b6ac8b..6fd9e46f8 100644 --- a/animations/pokemon/pidgeot.animation.json +++ b/animations/pokemon/pidgeot.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.pidgeot.idle": { + "animation.pidgeot.ground_idle": { "loop": true, "animation_length": 3, "override_previous_animation": true, diff --git a/animations/pokemon/pidgeotto.animation.json b/animations/pokemon/pidgeotto.animation.json index c213b2cd9..e466ce652 100644 --- a/animations/pokemon/pidgeotto.animation.json +++ b/animations/pokemon/pidgeotto.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.pidgeotto.idle": { + "animation.pidgeotto.ground_idle": { "loop": true, "animation_length": 1, "override_previous_animation": true, diff --git a/animations/pokemon/pidgey.animation.json b/animations/pokemon/pidgey.animation.json index 17d8a217f..c8a82e3d6 100644 --- a/animations/pokemon/pidgey.animation.json +++ b/animations/pokemon/pidgey.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.pidgey.idle": { + "animation.pidgey.ground_idle": { "loop": true, "animation_length": 1.5, "override_previous_animation": true, diff --git a/animations/pokemon/pignite.animation.json b/animations/pokemon/pignite.animation.json index f1c6dc546..b5f1c2ec9 100644 --- a/animations/pokemon/pignite.animation.json +++ b/animations/pokemon/pignite.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.pignite.idle": { + "animation.pignite.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/pikachu.animation.json b/animations/pokemon/pikachu.animation.json index 67d1b11c0..ce0e8e216 100644 --- a/animations/pokemon/pikachu.animation.json +++ b/animations/pokemon/pikachu.animation.json @@ -306,7 +306,7 @@ } } }, - "animation.pikachu.idle": { + "animation.pikachu.ground_idle": { "loop": true, "animation_length": 1.33333, "bones": { diff --git a/animations/pokemon/piloswine.animation.json b/animations/pokemon/piloswine.animation.json index e43b15fa6..ff6dc7564 100644 --- a/animations/pokemon/piloswine.animation.json +++ b/animations/pokemon/piloswine.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.piloswine.idle": { + "animation.piloswine.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/pineco.animation.json b/animations/pokemon/pineco.animation.json index 153c83fbb..1a2ae6c91 100644 --- a/animations/pokemon/pineco.animation.json +++ b/animations/pokemon/pineco.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.pineco.idle": { + "animation.pineco.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/pinsir.animation.json b/animations/pokemon/pinsir.animation.json index 746020688..31f44325f 100644 --- a/animations/pokemon/pinsir.animation.json +++ b/animations/pokemon/pinsir.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.pinsir.idle": { + "animation.pinsir.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/piplup.animation.json b/animations/pokemon/piplup.animation.json index c0cfe86aa..876d908f4 100644 --- a/animations/pokemon/piplup.animation.json +++ b/animations/pokemon/piplup.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.piplup.idle": { + "animation.piplup.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/politoed.animation.json b/animations/pokemon/politoed.animation.json index 8dcf8e918..63d9e36e5 100644 --- a/animations/pokemon/politoed.animation.json +++ b/animations/pokemon/politoed.animation.json @@ -49,7 +49,7 @@ } } }, - "animation.politoed.idle": { + "animation.politoed.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/poliwag.animation.json b/animations/pokemon/poliwag.animation.json index 5ec724023..4a3699568 100644 --- a/animations/pokemon/poliwag.animation.json +++ b/animations/pokemon/poliwag.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.poliwag.idle": { + "animation.poliwag.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/poliwhirl.animation.json b/animations/pokemon/poliwhirl.animation.json index ea85284bb..e4b006c16 100644 --- a/animations/pokemon/poliwhirl.animation.json +++ b/animations/pokemon/poliwhirl.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.poliwhirl.idle": { + "animation.poliwhirl.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/poliwrath.animation.json b/animations/pokemon/poliwrath.animation.json index 7da65de28..e8cb72cc6 100644 --- a/animations/pokemon/poliwrath.animation.json +++ b/animations/pokemon/poliwrath.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.poliwrath.idle": { + "animation.poliwrath.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/popplio.animation.json b/animations/pokemon/popplio.animation.json index 1022cf471..c4da42473 100644 --- a/animations/pokemon/popplio.animation.json +++ b/animations/pokemon/popplio.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.popplio.idle": { + "animation.popplio.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/porygon.animation.json b/animations/pokemon/porygon.animation.json index 6eba230d7..2bd9300f2 100644 --- a/animations/pokemon/porygon.animation.json +++ b/animations/pokemon/porygon.animation.json @@ -106,7 +106,7 @@ } } }, - "animation.porygon.idle": { + "animation.porygon.ground_idle": { "loop": true, "animation_length": 1, "override_previous_animation": true, diff --git a/animations/pokemon/porygon2.animation.json b/animations/pokemon/porygon2.animation.json index 38c89a65a..f6e66a359 100644 --- a/animations/pokemon/porygon2.animation.json +++ b/animations/pokemon/porygon2.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.porygon2.idle": { + "animation.porygon2.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/porygonz.animation.json b/animations/pokemon/porygonz.animation.json index a2472d05e..5390af100 100644 --- a/animations/pokemon/porygonz.animation.json +++ b/animations/pokemon/porygonz.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.porygonz.idle": { + "animation.porygonz.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/primarina.animation.json b/animations/pokemon/primarina.animation.json index 926449a74..b63c90868 100644 --- a/animations/pokemon/primarina.animation.json +++ b/animations/pokemon/primarina.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.primarina.idle": { + "animation.primarina.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/primeape.animation.json b/animations/pokemon/primeape.animation.json index 9b4d6ceac..3d8a96427 100644 --- a/animations/pokemon/primeape.animation.json +++ b/animations/pokemon/primeape.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.primeape.idle": { + "animation.primeape.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/prinplup.animation.json b/animations/pokemon/prinplup.animation.json index 5edaf16d9..9c8257c99 100644 --- a/animations/pokemon/prinplup.animation.json +++ b/animations/pokemon/prinplup.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.prinplup.idle": { + "animation.prinplup.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/psyduck.animation.json b/animations/pokemon/psyduck.animation.json index 63000942f..ebdde96b1 100644 --- a/animations/pokemon/psyduck.animation.json +++ b/animations/pokemon/psyduck.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.psyduck.idle": { + "animation.psyduck.ground_idle": { "animation_length": 1.5, "bones": { "Body": { diff --git a/animations/pokemon/pupitar.animation.json b/animations/pokemon/pupitar.animation.json index 43519cd0c..c65fbeff9 100644 --- a/animations/pokemon/pupitar.animation.json +++ b/animations/pokemon/pupitar.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.pupitar.idle": { + "animation.pupitar.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/quagsire.animation.json b/animations/pokemon/quagsire.animation.json index bd1942b51..9deee08e6 100644 --- a/animations/pokemon/quagsire.animation.json +++ b/animations/pokemon/quagsire.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.quagsire.idle": { + "animation.quagsire.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/quaquaval.animation.json b/animations/pokemon/quaquaval.animation.json index ccd2e9938..152b8dc59 100644 --- a/animations/pokemon/quaquaval.animation.json +++ b/animations/pokemon/quaquaval.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.quaquaval.idle": { + "animation.quaquaval.ground_idle": { "loop": true, "animation_length": 1.5, "override_previous_animation": true, diff --git a/animations/pokemon/quaxly.animation.json b/animations/pokemon/quaxly.animation.json index 038ca19dc..9ae87958d 100644 --- a/animations/pokemon/quaxly.animation.json +++ b/animations/pokemon/quaxly.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.quaxly.idle": { + "animation.quaxly.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/quaxwell.animation.json b/animations/pokemon/quaxwell.animation.json index 3c1fa260d..ed5abd032 100644 --- a/animations/pokemon/quaxwell.animation.json +++ b/animations/pokemon/quaxwell.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.quaxwell.idle": { + "animation.quaxwell.ground_idle": { "loop": true, "animation_length": 1.5, "override_previous_animation": true, diff --git a/animations/pokemon/quilava.animation.json b/animations/pokemon/quilava.animation.json index 22c56f6ee..f01d0147e 100644 --- a/animations/pokemon/quilava.animation.json +++ b/animations/pokemon/quilava.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.quilava.idle": { + "animation.quilava.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/quilladin.animation.json b/animations/pokemon/quilladin.animation.json index b3a25bd1a..57443da2e 100644 --- a/animations/pokemon/quilladin.animation.json +++ b/animations/pokemon/quilladin.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.quilladin.idle": { + "animation.quilladin.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/qwilfish.animation.json b/animations/pokemon/qwilfish.animation.json index e0cd239c7..31a896fee 100644 --- a/animations/pokemon/qwilfish.animation.json +++ b/animations/pokemon/qwilfish.animation.json @@ -14,7 +14,7 @@ } } }, - "animation.qwilfish.idle": { + "animation.qwilfish.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/raboot.animation.json b/animations/pokemon/raboot.animation.json index db5cdd0d7..5f0c622b6 100644 --- a/animations/pokemon/raboot.animation.json +++ b/animations/pokemon/raboot.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.raboot.idle": { + "animation.raboot.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/raichu.animation.json b/animations/pokemon/raichu.animation.json index af9e79829..117f74f37 100644 --- a/animations/pokemon/raichu.animation.json +++ b/animations/pokemon/raichu.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.raichu.idle": { + "animation.raichu.ground_idle": { "loop": true, "animation_length": 1.5, "bones": { diff --git a/animations/pokemon/raikou.animation.json b/animations/pokemon/raikou.animation.json index 2d0059c8b..16e8ee07d 100644 --- a/animations/pokemon/raikou.animation.json +++ b/animations/pokemon/raikou.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.raikou.idle": { + "animation.raikou.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/ralts.animation.json b/animations/pokemon/ralts.animation.json index 1d1b4d388..d8340ce9b 100644 --- a/animations/pokemon/ralts.animation.json +++ b/animations/pokemon/ralts.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.ralts.idle": { + "animation.ralts.ground_idle": { "loop": true, "animation_length": 2, "bones": { @@ -64,15 +64,17 @@ } }, "animation.ralts.attack": { - "loop": true, - "animation_length": 0.625, + "animation_length": 2, "bones": { "body": { "rotation": { "0.0": [-1, 0, 0], - "0.2083": [-1.08237, 22.49639, -0.41419], - "0.375": [-1.18564, -32.49444, 0.63701], - "0.5833": [-1, 0, 0] + "0.25": [1.5, 0, 0], + "0.5": [4, 0, 0], + "0.75": [1.5, 0, 0], + "1.0": [-3.5, 0, 0], + "1.25": [-3.5, 0, 0], + "1.75": [-1, 0, 0] } }, "rightLeg": { @@ -81,21 +83,38 @@ "rightArm": { "rotation": { "0.0": [0, 0, -1], - "0.25": [52.5, 0, 56.5], - "0.4167": [-75.71865, -20.29348, 46.57074], - "0.625": [0, 0, -1] + "0.2083": [-61.74388, -8.31087, 22.66235], + "0.5": [-83.34077, -38.09153, 62.36828], + "0.75": [-89.02593, 12.78524, 47.13492], + "1.0": [-103.01106, 37.22545, 11.02042], + "1.125": [-103.01106, 37.22545, 11.02042], + "1.5": [-19.35245, 18.43926, 16.8656], + "1.75": [0, 0, -1] } }, "leftArm": { "rotation": { - "0.0": [0, 0, 1], - "0.25": [-40, 0, 1], - "0.4167": [35, 0, 1], - "0.625": [0, 0, 1] + "0.0": [0, 0, 0], + "0.2083": [-54.6665, -13.47157, 18.19144], + "0.5": [-66.76453, -7.30997, 53.22139], + "0.75": [-61.66593, -34.46496, 39.37909], + "1.0": [-47.57317, -37.44823, 17.89208], + "1.25": [-47.57317, -37.44823, 17.89208], + "1.625": [0, 0, 0] } }, "leftLeg": { "rotation": [-0.21865, 4.99523, -2.50954] + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [7.5, 0, 0], + "0.75": [0, 0, 0], + "1.0": [2.5, 0, 0], + "1.25": [5, 0, 0], + "1.75": [0, 0, 0] + } } } }, diff --git a/animations/pokemon/rayquaza.animation.json b/animations/pokemon/rayquaza.animation.json index 0ed403bbb..4058b3232 100644 --- a/animations/pokemon/rayquaza.animation.json +++ b/animations/pokemon/rayquaza.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.rayquaza.idle": { + "animation.rayquaza.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/regice.animation.json b/animations/pokemon/regice.animation.json index 2399d8d2e..f62e1e382 100644 --- a/animations/pokemon/regice.animation.json +++ b/animations/pokemon/regice.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.regice.idle": { + "animation.regice.ground_idle": { "loop": true, "animation_length": 0.75, "bones": { diff --git a/animations/pokemon/regigigas.animation.json b/animations/pokemon/regigigas.animation.json index 578643f12..fe6723bca 100644 --- a/animations/pokemon/regigigas.animation.json +++ b/animations/pokemon/regigigas.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.regigigas.idle": { + "animation.regigigas.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/regirock.animation.json b/animations/pokemon/regirock.animation.json index ef133f96d..26c526b33 100644 --- a/animations/pokemon/regirock.animation.json +++ b/animations/pokemon/regirock.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.regirock.idle": { + "animation.regirock.ground_idle": { "loop": true, "animation_length": 0.75, "bones": { diff --git a/animations/pokemon/registeel.animation.json b/animations/pokemon/registeel.animation.json index 03be6b7c5..12af38835 100644 --- a/animations/pokemon/registeel.animation.json +++ b/animations/pokemon/registeel.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.registeel.idle": { + "animation.registeel.ground_idle": { "loop": true, "animation_length": 0.75, "bones": { diff --git a/animations/pokemon/remoraid.animation.json b/animations/pokemon/remoraid.animation.json index a3a36cf79..e6b4c74ff 100644 --- a/animations/pokemon/remoraid.animation.json +++ b/animations/pokemon/remoraid.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.remoraid.idle": { + "animation.remoraid.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/rillaboom.animation.json b/animations/pokemon/rillaboom.animation.json index 29b352081..4fd8be3ca 100644 --- a/animations/pokemon/rillaboom.animation.json +++ b/animations/pokemon/rillaboom.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.rillaboom.idle": { + "animation.rillaboom.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/riolu.animation.json b/animations/pokemon/riolu.animation.json index bb71b2b15..b5692ef13 100644 --- a/animations/pokemon/riolu.animation.json +++ b/animations/pokemon/riolu.animation.json @@ -52,7 +52,7 @@ } } }, - "animation.riolu.idle": { + "animation.riolu.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/rowlet.animation.json b/animations/pokemon/rowlet.animation.json index 89363a825..920433676 100644 --- a/animations/pokemon/rowlet.animation.json +++ b/animations/pokemon/rowlet.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.rowlet.idle": { + "animation.rowlet.ground_idle": { "loop": true, "animation_length": 9, "bones": { diff --git a/animations/pokemon/sableye.animation.json b/animations/pokemon/sableye.animation.json index cbb887d93..0a0821aa1 100644 --- a/animations/pokemon/sableye.animation.json +++ b/animations/pokemon/sableye.animation.json @@ -127,7 +127,7 @@ } } }, - "animation.sableye.idle": { + "animation.sableye.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/samurott.animation.json b/animations/pokemon/samurott.animation.json index de5b87eca..e10442a5c 100644 --- a/animations/pokemon/samurott.animation.json +++ b/animations/pokemon/samurott.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.samurott.idle": { + "animation.samurott.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/sandshrew.animation.json b/animations/pokemon/sandshrew.animation.json index ce4fbdf79..97d94dd40 100644 --- a/animations/pokemon/sandshrew.animation.json +++ b/animations/pokemon/sandshrew.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.sandshrew.idle": { + "animation.sandshrew.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/sandslash.animation.json b/animations/pokemon/sandslash.animation.json index 894c999f3..7e7ec4d82 100644 --- a/animations/pokemon/sandslash.animation.json +++ b/animations/pokemon/sandslash.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.sandslash.idle": { + "animation.sandslash.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/sceptile.animation.json b/animations/pokemon/sceptile.animation.json index 2b016e43b..a0d931f58 100644 --- a/animations/pokemon/sceptile.animation.json +++ b/animations/pokemon/sceptile.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.sceptile.idle": { + "animation.sceptile.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/scizor.animation.json b/animations/pokemon/scizor.animation.json index 910ecd50e..735682fb3 100644 --- a/animations/pokemon/scizor.animation.json +++ b/animations/pokemon/scizor.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.scizor.idle": { + "animation.scizor.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/scorbunny.animation.json b/animations/pokemon/scorbunny.animation.json index 17ef41789..478eb7475 100644 --- a/animations/pokemon/scorbunny.animation.json +++ b/animations/pokemon/scorbunny.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.scorbunny.idle": { + "animation.scorbunny.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/scyther.animation.json b/animations/pokemon/scyther.animation.json index 74883ed93..d873eb465 100644 --- a/animations/pokemon/scyther.animation.json +++ b/animations/pokemon/scyther.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.scyther.idle": { + "animation.scyther.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/seadra.animation.json b/animations/pokemon/seadra.animation.json index 25975b203..0b7878d5e 100644 --- a/animations/pokemon/seadra.animation.json +++ b/animations/pokemon/seadra.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.seadra.idle": { + "animation.seadra.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/seaking.animation.json b/animations/pokemon/seaking.animation.json index 115d5128b..be95c4b1a 100644 --- a/animations/pokemon/seaking.animation.json +++ b/animations/pokemon/seaking.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.seaking.idle": { + "animation.seaking.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/seel.animation.json b/animations/pokemon/seel.animation.json index 54880671b..b3bbfa57e 100644 --- a/animations/pokemon/seel.animation.json +++ b/animations/pokemon/seel.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.seel.idle": { + "animation.seel.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/sentret.animation.json b/animations/pokemon/sentret.animation.json index cf2bef075..a2e044843 100644 --- a/animations/pokemon/sentret.animation.json +++ b/animations/pokemon/sentret.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.sentret.idle": { + "animation.sentret.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/serperior.animation.json b/animations/pokemon/serperior.animation.json index f17ff5ded..7f47e6858 100644 --- a/animations/pokemon/serperior.animation.json +++ b/animations/pokemon/serperior.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.serperior.idle": { + "animation.serperior.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/servine.animation.json b/animations/pokemon/servine.animation.json index 9eba6e08b..6b2a04e39 100644 --- a/animations/pokemon/servine.animation.json +++ b/animations/pokemon/servine.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.servine.idle": { + "animation.servine.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/sewaddle.animation.json b/animations/pokemon/sewaddle.animation.json index c1d212c82..c787e74f6 100644 --- a/animations/pokemon/sewaddle.animation.json +++ b/animations/pokemon/sewaddle.animation.json @@ -105,7 +105,7 @@ } } }, - "animation.sewaddle.idle": { + "animation.sewaddle.ground_idle": { "loop": true, "animation_length": 0.5, "bones": { diff --git a/animations/pokemon/shaymin-land.animation.json b/animations/pokemon/shaymin-land.animation.json index 4d77a2072..cb4eeb4f6 100644 --- a/animations/pokemon/shaymin-land.animation.json +++ b/animations/pokemon/shaymin-land.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.shayminland.idle": { + "animation.shayminland.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/shellder.animation.json b/animations/pokemon/shellder.animation.json index 33b64cfae..45591eb39 100644 --- a/animations/pokemon/shellder.animation.json +++ b/animations/pokemon/shellder.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.shellder.idle": { + "animation.shellder.ground_idle": { "loop": true, "bones": { "body": { diff --git a/animations/pokemon/shinx.animation.json b/animations/pokemon/shinx.animation.json index ccbef8d2a..4b7c487b5 100644 --- a/animations/pokemon/shinx.animation.json +++ b/animations/pokemon/shinx.animation.json @@ -87,7 +87,7 @@ } } }, - "animation.shinx.idle": { + "animation.shinx.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/shuckle.animation.json b/animations/pokemon/shuckle.animation.json index 82e60ad8c..7377ccb1f 100644 --- a/animations/pokemon/shuckle.animation.json +++ b/animations/pokemon/shuckle.animation.json @@ -158,7 +158,7 @@ } } }, - "animation.shuckle.idle": { + "animation.shuckle.ground_idle": { "loop": true, "animation_length": 4, "bones": { diff --git a/animations/pokemon/skarmory.animation.json b/animations/pokemon/skarmory.animation.json index fad11f0e3..3430847ce 100644 --- a/animations/pokemon/skarmory.animation.json +++ b/animations/pokemon/skarmory.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.skarmory.idle": { + "animation.skarmory.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/skeledirge.animation.json b/animations/pokemon/skeledirge.animation.json index 820dfe584..e02a8d3f8 100644 --- a/animations/pokemon/skeledirge.animation.json +++ b/animations/pokemon/skeledirge.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.skeledirge.idle": { + "animation.skeledirge.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/skiploom.animation.json b/animations/pokemon/skiploom.animation.json index 0bb17f436..e8f0f4397 100644 --- a/animations/pokemon/skiploom.animation.json +++ b/animations/pokemon/skiploom.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.skiploom.idle": { + "animation.skiploom.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/skorupi.animation.json b/animations/pokemon/skorupi.animation.json index dafae3e00..31ffcde3b 100644 --- a/animations/pokemon/skorupi.animation.json +++ b/animations/pokemon/skorupi.animation.json @@ -64,7 +64,7 @@ } } }, - "animation.skorupi.idle": { + "animation.skorupi.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/slakoth.animation.json b/animations/pokemon/slakoth.animation.json index 16786a5a3..aa587e73f 100644 --- a/animations/pokemon/slakoth.animation.json +++ b/animations/pokemon/slakoth.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.slakoth.idle": { + "animation.slakoth.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/slitherwing.animation.json b/animations/pokemon/slitherwing.animation.json index 15484437c..099c1d074 100644 --- a/animations/pokemon/slitherwing.animation.json +++ b/animations/pokemon/slitherwing.animation.json @@ -81,7 +81,7 @@ } } }, - "animation.slitherwing.idle": { + "animation.slitherwing.ground_idle": { "loop": true, "animation_length": 8, "bones": { diff --git a/animations/pokemon/slowbro.animation.json b/animations/pokemon/slowbro.animation.json index cf3556b21..e5e248435 100644 --- a/animations/pokemon/slowbro.animation.json +++ b/animations/pokemon/slowbro.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.slowbro.idle": { + "animation.slowbro.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/slowking.animation.json b/animations/pokemon/slowking.animation.json index 7d047a802..7bb179cfc 100644 --- a/animations/pokemon/slowking.animation.json +++ b/animations/pokemon/slowking.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.slowking.idle": { + "animation.slowking.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/slowpoke.animation.json b/animations/pokemon/slowpoke.animation.json index 197f4235d..263278780 100644 --- a/animations/pokemon/slowpoke.animation.json +++ b/animations/pokemon/slowpoke.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.slowpoke.idle": { + "animation.slowpoke.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/slugma.animation.json b/animations/pokemon/slugma.animation.json index c5d022a73..aec2a16ae 100644 --- a/animations/pokemon/slugma.animation.json +++ b/animations/pokemon/slugma.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.slugma.idle": { + "animation.slugma.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/smeargle.animation.json b/animations/pokemon/smeargle.animation.json index f6c2c3686..572531342 100644 --- a/animations/pokemon/smeargle.animation.json +++ b/animations/pokemon/smeargle.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.smeargle.idle": { + "animation.smeargle.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/smoochum.animation.json b/animations/pokemon/smoochum.animation.json index d9d26da82..f49cdb872 100644 --- a/animations/pokemon/smoochum.animation.json +++ b/animations/pokemon/smoochum.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.smoochum.idle": { + "animation.smoochum.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/sneasel.animation.json b/animations/pokemon/sneasel.animation.json index 78aa060b4..c9598291c 100644 --- a/animations/pokemon/sneasel.animation.json +++ b/animations/pokemon/sneasel.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.sneasel.idle": { + "animation.sneasel.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/snivy.animation.json b/animations/pokemon/snivy.animation.json index 958b65de3..f774d6632 100644 --- a/animations/pokemon/snivy.animation.json +++ b/animations/pokemon/snivy.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.snivy.idle": { + "animation.snivy.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/snorlax.animation.json b/animations/pokemon/snorlax.animation.json index 3c43a25c5..33c49b72e 100644 --- a/animations/pokemon/snorlax.animation.json +++ b/animations/pokemon/snorlax.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.snorlax.idle": { + "animation.snorlax.ground_idle": { "loop": true, "animation_length": 2.5, "bones": { diff --git a/animations/pokemon/sobble.animation.json b/animations/pokemon/sobble.animation.json index 214204350..128e98d25 100644 --- a/animations/pokemon/sobble.animation.json +++ b/animations/pokemon/sobble.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.sobble.idle": { + "animation.sobble.ground_idle": { "loop": true, "bones": { "body": { diff --git a/animations/pokemon/spearow.animation.json b/animations/pokemon/spearow.animation.json index 4ab5959ca..b3eafbfd0 100644 --- a/animations/pokemon/spearow.animation.json +++ b/animations/pokemon/spearow.animation.json @@ -98,7 +98,7 @@ } } }, - "animation.spearow.idle": { + "animation.spearow.ground_idle": { "loop": true, "animation_length": 0.75, "bones": { diff --git a/animations/pokemon/spinarak.animation.json b/animations/pokemon/spinarak.animation.json index f147d84d6..3225b2d10 100644 --- a/animations/pokemon/spinarak.animation.json +++ b/animations/pokemon/spinarak.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.spinarak.idle": { + "animation.spinarak.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/sprigatito.animation.json b/animations/pokemon/sprigatito.animation.json index 5f263b4ad..56af230a9 100644 --- a/animations/pokemon/sprigatito.animation.json +++ b/animations/pokemon/sprigatito.animation.json @@ -93,7 +93,7 @@ } } }, - "animation.sprigatito.idle": { + "animation.sprigatito.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/squirtle.animation.json b/animations/pokemon/squirtle.animation.json index 660a84ac6..4ceb8ee97 100644 --- a/animations/pokemon/squirtle.animation.json +++ b/animations/pokemon/squirtle.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.squirtle.idle": { + "animation.squirtle.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/stantler.animation.json b/animations/pokemon/stantler.animation.json index c216ace55..f0921e1f3 100644 --- a/animations/pokemon/stantler.animation.json +++ b/animations/pokemon/stantler.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.stantler.idle": { + "animation.stantler.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/starmie.animation.json b/animations/pokemon/starmie.animation.json index d1242fe95..8cefc5f38 100644 --- a/animations/pokemon/starmie.animation.json +++ b/animations/pokemon/starmie.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.starmie.idle": { + "animation.starmie.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/staryu.animation.json b/animations/pokemon/staryu.animation.json index c7e2fbed4..24f2a32ac 100644 --- a/animations/pokemon/staryu.animation.json +++ b/animations/pokemon/staryu.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.staryu.idle": { + "animation.staryu.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/steelix.animation.json b/animations/pokemon/steelix.animation.json index f22afa662..6b28c6d23 100644 --- a/animations/pokemon/steelix.animation.json +++ b/animations/pokemon/steelix.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.steelix.idle": { + "animation.steelix.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/sudowoodo.animation.json b/animations/pokemon/sudowoodo.animation.json index 2485331d2..60a5158b5 100644 --- a/animations/pokemon/sudowoodo.animation.json +++ b/animations/pokemon/sudowoodo.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.sudowoodo.idle": { + "animation.sudowoodo.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/suicune.animation.json b/animations/pokemon/suicune.animation.json index a7d5bc6ef..72935bde0 100644 --- a/animations/pokemon/suicune.animation.json +++ b/animations/pokemon/suicune.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.suicune.idle": { + "animation.suicune.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/swadloon.animation.json b/animations/pokemon/swadloon.animation.json index 20de950f5..710834eb2 100644 --- a/animations/pokemon/swadloon.animation.json +++ b/animations/pokemon/swadloon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.swadloon.idle": { + "animation.swadloon.ground_idle": { "loop": true, "animation_length": 0.5, "bones": { diff --git a/animations/pokemon/swampert.animation.json b/animations/pokemon/swampert.animation.json index 570dedb88..d30691011 100644 --- a/animations/pokemon/swampert.animation.json +++ b/animations/pokemon/swampert.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.swampert.idle": { + "animation.swampert.ground_idle": { "loop": true, "animation_length": 2, "bones": { @@ -139,7 +139,7 @@ } } }, - "animation.swampert.idle_in_water": { + "animation.swampert.ground_idle_in_water": { "loop": true, "animation_length": 3, "bones": { diff --git a/animations/pokemon/swinub.animation.json b/animations/pokemon/swinub.animation.json index d6886f550..351615151 100644 --- a/animations/pokemon/swinub.animation.json +++ b/animations/pokemon/swinub.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.swinub.idle": { + "animation.swinub.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/sylveon.animation.json b/animations/pokemon/sylveon.animation.json index 6e69d6525..8909fda30 100644 --- a/animations/pokemon/sylveon.animation.json +++ b/animations/pokemon/sylveon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.sylveon.idle": { + "animation.sylveon.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/tangela.animation.json b/animations/pokemon/tangela.animation.json index 04e2c798c..aa3ce8d1f 100644 --- a/animations/pokemon/tangela.animation.json +++ b/animations/pokemon/tangela.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.tangela.idle": { + "animation.tangela.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/tapukoko.animation.json b/animations/pokemon/tapukoko.animation.json index 3f68dd171..5350e9180 100644 --- a/animations/pokemon/tapukoko.animation.json +++ b/animations/pokemon/tapukoko.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.tapukoko.idle": { + "animation.tapukoko.ground_idle": { "loop": true, "bones": { "arm_right3": { diff --git a/animations/pokemon/tauros.animation.json b/animations/pokemon/tauros.animation.json index 9374ff340..a7565e202 100644 --- a/animations/pokemon/tauros.animation.json +++ b/animations/pokemon/tauros.animation.json @@ -272,7 +272,7 @@ } } }, - "animation.tauros.idle": { + "animation.tauros.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/teddiursa.animation.json b/animations/pokemon/teddiursa.animation.json index 7dcf70fb8..214477433 100644 --- a/animations/pokemon/teddiursa.animation.json +++ b/animations/pokemon/teddiursa.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.teddiursa.idle": { + "animation.teddiursa.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/tentacool.animation.json b/animations/pokemon/tentacool.animation.json index afcdad0ec..ccf7782ff 100644 --- a/animations/pokemon/tentacool.animation.json +++ b/animations/pokemon/tentacool.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.tentacool.idle": { + "animation.tentacool.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/tentacruel.animation.json b/animations/pokemon/tentacruel.animation.json index 62869660b..24d3edf3e 100644 --- a/animations/pokemon/tentacruel.animation.json +++ b/animations/pokemon/tentacruel.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.tentacruel.idle": { + "animation.tentacruel.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/tepig.animation.json b/animations/pokemon/tepig.animation.json index f5aa92b21..55d11191e 100644 --- a/animations/pokemon/tepig.animation.json +++ b/animations/pokemon/tepig.animation.json @@ -78,7 +78,7 @@ } } }, - "animation.tepig.idle": { + "animation.tepig.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/thwackey.animation.json b/animations/pokemon/thwackey.animation.json index 3ce2e0b93..3b0e466ef 100644 --- a/animations/pokemon/thwackey.animation.json +++ b/animations/pokemon/thwackey.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.thwackey.idle": { + "animation.thwackey.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/toedscool.animation.json b/animations/pokemon/toedscool.animation.json index 578e4bc2f..3acf2fbae 100644 --- a/animations/pokemon/toedscool.animation.json +++ b/animations/pokemon/toedscool.animation.json @@ -45,7 +45,7 @@ } } }, - "animation.toedscool.idle": { + "animation.toedscool.ground_idle": { "loop": true, "bones": { "body": { diff --git a/animations/pokemon/toedscruel.animation.json b/animations/pokemon/toedscruel.animation.json index 564456eae..39956d459 100644 --- a/animations/pokemon/toedscruel.animation.json +++ b/animations/pokemon/toedscruel.animation.json @@ -162,7 +162,7 @@ } } }, - "animation.toedscruel.idle": { + "animation.toedscruel.ground_idle": { "loop": true, "bones": { "body": { @@ -364,14 +364,8 @@ } }, "position": { - "0.0": { - "post": [0, "-5+math.cos(q.anim_time*150 *2) * 17", 0], - "lerp_mode": "catmullrom" - }, - "0.0833": { - "post": [0, "-5 + math.cos(q.anim_time*150*2) *17", 0], - "lerp_mode": "catmullrom" - } + "0.0": [0, "-5+math.cos(q.anim_time*150 *2) * 17", 0], + "0.0833": [0, "-5 + math.cos(q.anim_time*150*2) *17", 0] } }, "torso": { diff --git a/animations/pokemon/togepi.animation.json b/animations/pokemon/togepi.animation.json index 26cfc389d..913e37929 100644 --- a/animations/pokemon/togepi.animation.json +++ b/animations/pokemon/togepi.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.togepi.idle": { + "animation.togepi.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/togetic.animation.json b/animations/pokemon/togetic.animation.json index 4db6a30e7..4f3c3cfa5 100644 --- a/animations/pokemon/togetic.animation.json +++ b/animations/pokemon/togetic.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.togetic.idle": { + "animation.togetic.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/torchic.animation.json b/animations/pokemon/torchic.animation.json index 2ee356c51..36e11d338 100644 --- a/animations/pokemon/torchic.animation.json +++ b/animations/pokemon/torchic.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.torchic.idle": { + "animation.torchic.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/torracat.animation.json b/animations/pokemon/torracat.animation.json index a089188a3..b7024b070 100644 --- a/animations/pokemon/torracat.animation.json +++ b/animations/pokemon/torracat.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.torracat.idle": { + "animation.torracat.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/torterra.animation.json b/animations/pokemon/torterra.animation.json index 98e157e95..dbd48ae27 100644 --- a/animations/pokemon/torterra.animation.json +++ b/animations/pokemon/torterra.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.torterra.idle": { + "animation.torterra.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/totodile.animation.json b/animations/pokemon/totodile.animation.json index a0b4e1c1d..961601875 100644 --- a/animations/pokemon/totodile.animation.json +++ b/animations/pokemon/totodile.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.totodile.idle": { + "animation.totodile.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/treecko.animation.json b/animations/pokemon/treecko.animation.json index d43d15592..3c79e7281 100644 --- a/animations/pokemon/treecko.animation.json +++ b/animations/pokemon/treecko.animation.json @@ -149,7 +149,7 @@ } } }, - "animation.treecko.idle": { + "animation.treecko.ground_idle": { "loop": true, "animation_length": 3.75, "bones": { diff --git a/animations/pokemon/turtwig.animation.json b/animations/pokemon/turtwig.animation.json index 5f1bd33de..11a276033 100644 --- a/animations/pokemon/turtwig.animation.json +++ b/animations/pokemon/turtwig.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.turtwig.idle": { + "animation.turtwig.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/typhlosion.animation.json b/animations/pokemon/typhlosion.animation.json index c21ebea91..e141a8084 100644 --- a/animations/pokemon/typhlosion.animation.json +++ b/animations/pokemon/typhlosion.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.typhlosion.idle": { + "animation.typhlosion.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/tyranitar.animation.json b/animations/pokemon/tyranitar.animation.json index 4852ffd69..24e18ea5d 100644 --- a/animations/pokemon/tyranitar.animation.json +++ b/animations/pokemon/tyranitar.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.tyranitar.idle": { + "animation.tyranitar.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/tyrogue.animation.json b/animations/pokemon/tyrogue.animation.json index 9816204a2..0491e870e 100644 --- a/animations/pokemon/tyrogue.animation.json +++ b/animations/pokemon/tyrogue.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.tyrogue.idle": { + "animation.tyrogue.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/tyrunt.animation.json b/animations/pokemon/tyrunt.animation.json index d969b8b13..8345141f5 100644 --- a/animations/pokemon/tyrunt.animation.json +++ b/animations/pokemon/tyrunt.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.tyrunt.idle": { + "animation.tyrunt.ground_idle": { "loop": true, "bones": { "torso": { diff --git a/animations/pokemon/umbreon.animation.json b/animations/pokemon/umbreon.animation.json index 099756648..41bd5490c 100644 --- a/animations/pokemon/umbreon.animation.json +++ b/animations/pokemon/umbreon.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.umbreon.idle": { + "animation.umbreon.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/ursaring.animation.json b/animations/pokemon/ursaring.animation.json index ddde2db7e..4710ad8cb 100644 --- a/animations/pokemon/ursaring.animation.json +++ b/animations/pokemon/ursaring.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.ursaring.idle": { + "animation.ursaring.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/uxie.animation.json b/animations/pokemon/uxie.animation.json index 4ea85c79e..5f5d57795 100644 --- a/animations/pokemon/uxie.animation.json +++ b/animations/pokemon/uxie.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.uxie.idle": { + "animation.uxie.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/vaporeon.animation.json b/animations/pokemon/vaporeon.animation.json index b75390d08..ed08410f5 100644 --- a/animations/pokemon/vaporeon.animation.json +++ b/animations/pokemon/vaporeon.animation.json @@ -49,7 +49,7 @@ } } }, - "animation.vaporeon.idle": { + "animation.vaporeon.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/venomoth.animation.json b/animations/pokemon/venomoth.animation.json index 86062534d..e1c6bdfc6 100644 --- a/animations/pokemon/venomoth.animation.json +++ b/animations/pokemon/venomoth.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.venomoth.idle": { + "animation.venomoth.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/venonat.animation.json b/animations/pokemon/venonat.animation.json index 1afc0250e..448c1b442 100644 --- a/animations/pokemon/venonat.animation.json +++ b/animations/pokemon/venonat.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.venonat.idle": { + "animation.venonat.ground_idle": { "loop": true, "animation_length": 4, "override_previous_animation": true, diff --git a/animations/pokemon/venusaur.animation.json b/animations/pokemon/venusaur.animation.json index 89629e645..ca13cb1d8 100644 --- a/animations/pokemon/venusaur.animation.json +++ b/animations/pokemon/venusaur.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.venusaur.idle": { + "animation.venusaur.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/vigoroth.animation.json b/animations/pokemon/vigoroth.animation.json index 041f91c0e..c4828f2f8 100644 --- a/animations/pokemon/vigoroth.animation.json +++ b/animations/pokemon/vigoroth.animation.json @@ -185,7 +185,7 @@ } } }, - "animation.vigoroth.idle": { + "animation.vigoroth.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/vileplume.animation.json b/animations/pokemon/vileplume.animation.json index db71853b0..6c77cc705 100644 --- a/animations/pokemon/vileplume.animation.json +++ b/animations/pokemon/vileplume.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.vileplume.idle": { + "animation.vileplume.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/volcarona.animation.json b/animations/pokemon/volcarona.animation.json index 4db9005d8..bf88b9496 100644 --- a/animations/pokemon/volcarona.animation.json +++ b/animations/pokemon/volcarona.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.volcarona.idle": { + "animation.volcarona.ground_idle": { "loop": true, "bones": { "body": { diff --git a/animations/pokemon/voltorb.animation.json b/animations/pokemon/voltorb.animation.json index 6cc7f7f6a..be6f98a1a 100644 --- a/animations/pokemon/voltorb.animation.json +++ b/animations/pokemon/voltorb.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.voltorb.idle": { + "animation.voltorb.ground_idle": { "loop": true, "animation_length": 4, "bones": { diff --git a/animations/pokemon/vulpix.animation.json b/animations/pokemon/vulpix.animation.json index 4fbc37e5e..484296ab7 100644 --- a/animations/pokemon/vulpix.animation.json +++ b/animations/pokemon/vulpix.animation.json @@ -287,7 +287,7 @@ } } }, - "animation.vulpix.idle": { + "animation.vulpix.ground_idle": { "loop": true, "animation_length": 2, "override_previous_animation": true, diff --git a/animations/pokemon/wartortle.animation.json b/animations/pokemon/wartortle.animation.json index 2f2de1088..d059db481 100644 --- a/animations/pokemon/wartortle.animation.json +++ b/animations/pokemon/wartortle.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.wartortle.idle": { + "animation.wartortle.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/weedle.animation.json b/animations/pokemon/weedle.animation.json index b6cf18742..82d8ab344 100644 --- a/animations/pokemon/weedle.animation.json +++ b/animations/pokemon/weedle.animation.json @@ -82,7 +82,7 @@ } } }, - "animation.weedle.idle": { + "animation.weedle.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/weezing.animation.json b/animations/pokemon/weezing.animation.json index 646f93fd2..9b6de293e 100644 --- a/animations/pokemon/weezing.animation.json +++ b/animations/pokemon/weezing.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.weezing.idle": { + "animation.weezing.ground_idle": { "loop": true, "animation_length": 4.33333, "override_previous_animation": true, diff --git a/animations/pokemon/wigglytuff.animation.json b/animations/pokemon/wigglytuff.animation.json index 73449454f..396abb966 100644 --- a/animations/pokemon/wigglytuff.animation.json +++ b/animations/pokemon/wigglytuff.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.wigglytuff.idle": { + "animation.wigglytuff.ground_idle": { "loop": true, "animation_length": 2, "bones": { diff --git a/animations/pokemon/wooper.animation.json b/animations/pokemon/wooper.animation.json index 4f1f83bf0..c8c72ffc7 100644 --- a/animations/pokemon/wooper.animation.json +++ b/animations/pokemon/wooper.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.wooper.idle": { + "animation.wooper.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/xatu.animation.json b/animations/pokemon/xatu.animation.json index 756034bdd..0f660fc86 100644 --- a/animations/pokemon/xatu.animation.json +++ b/animations/pokemon/xatu.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.xatu.idle": { + "animation.xatu.ground_idle": { "loop": true, "animation_length": 1, "bones": { diff --git a/animations/pokemon/xurkitree.animation.json b/animations/pokemon/xurkitree.animation.json index 4bc52f146..4fe1ba624 100644 --- a/animations/pokemon/xurkitree.animation.json +++ b/animations/pokemon/xurkitree.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.xurkitree.idle": { + "animation.xurkitree.ground_idle": { "loop": true, "animation_length": 4, "bones": { diff --git a/animations/pokemon/zapdos.animation.json b/animations/pokemon/zapdos.animation.json index a9c0cf62e..ac989e6e0 100644 --- a/animations/pokemon/zapdos.animation.json +++ b/animations/pokemon/zapdos.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.zapdos.idle": { + "animation.zapdos.ground_idle": { "loop": true, "animation_length": 1.5, "bones": { diff --git a/animations/pokemon/zubat.animation.json b/animations/pokemon/zubat.animation.json index 211730915..794749d03 100644 --- a/animations/pokemon/zubat.animation.json +++ b/animations/pokemon/zubat.animation.json @@ -213,7 +213,7 @@ } } }, - "animation.zubat.idle": { + "animation.zubat.ground_idle": { "loop": true, "animation_length": 1, "override_previous_animation": true, diff --git a/entity/pokemon/abra.json b/entity/pokemon/abra.json index 94989d6d1..37f77b9de 100644 --- a/entity/pokemon/abra.json +++ b/entity/pokemon/abra.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.abra.idle", + "ground_idle": "animation.abra.ground_idle", + "air_idle": "animation.abra.ground_idle", + "water_idle": "animation.abra.ground_idle", "walking": "animation.abra.walking", "flying": "animation.abra.walking", "swimming": "animation.abra.walking", - "sleeping": "animation.abra.idle", - "fall_asleep": "animation.abra.fall_asleep", - "wake_up": "animation.abra.wake_up", + "sleeping": "animation.abra.ground_idle", "attack": "animation.abra.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/aerodactyl.json b/entity/pokemon/aerodactyl.json index 887ef2eff..7b926cfa3 100644 --- a/entity/pokemon/aerodactyl.json +++ b/entity/pokemon/aerodactyl.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.aerodactyl.idle", + "ground_idle": "animation.aerodactyl.ground_idle", + "air_idle": "animation.aerodactyl.ground_idle", + "water_idle": "animation.aerodactyl.ground_idle", "walking": "animation.aerodactyl.walking", "flying": "animation.aerodactyl.flying", "swimming": "animation.aerodactyl.walking", "sleeping": "animation.aerodactyl.sleeping", - "fall_asleep": "animation.aerodactyl.fall_asleep", - "wake_up": "animation.aerodactyl.wake_up", "attack": "animation.aerodactyl.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/aipom.json b/entity/pokemon/aipom.json index b08a3a629..8a45b6b54 100644 --- a/entity/pokemon/aipom.json +++ b/entity/pokemon/aipom.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.aipom.idle", + "ground_idle": "animation.aipom.ground_idle", + "air_idle": "animation.aipom.ground_idle", + "water_idle": "animation.aipom.ground_idle", "walking": "animation.aipom.walking", "flying": "animation.aipom.walking", "swimming": "animation.aipom.walking", - "sleeping": "animation.aipom.idle", - "fall_asleep": "animation.aipom.fall_asleep", - "wake_up": "animation.aipom.wake_up", - "attack": "animation.aipom.idle", + "sleeping": "animation.aipom.ground_idle", + "attack": "animation.aipom.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/alakazam.json b/entity/pokemon/alakazam.json index 48c60f533..b4edf36d3 100644 --- a/entity/pokemon/alakazam.json +++ b/entity/pokemon/alakazam.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.alakazam.idle", + "ground_idle": "animation.alakazam.ground_idle", + "air_idle": "animation.alakazam.ground_idle", + "water_idle": "animation.alakazam.ground_idle", "walking": "animation.alakazam.walking", "flying": "animation.alakazam.walking", "swimming": "animation.alakazam.walking", - "sleeping": "animation.alakazam.idle", - "fall_asleep": "animation.alakazam.fall_asleep", - "wake_up": "animation.alakazam.wake_up", + "sleeping": "animation.alakazam.ground_idle", "attack": "animation.alakazam.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/ambipom.json b/entity/pokemon/ambipom.json index 3b092a50e..341fdf962 100644 --- a/entity/pokemon/ambipom.json +++ b/entity/pokemon/ambipom.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.ambipom.idle", + "ground_idle": "animation.ambipom.ground_idle", + "air_idle": "animation.ambipom.ground_idle", + "water_idle": "animation.ambipom.ground_idle", "walking": "animation.ambipom.walking", "flying": "animation.ambipom.walking", "swimming": "animation.ambipom.walking", - "sleeping": "animation.ambipom.idle", - "fall_asleep": "animation.ambipom.fall_asleep", - "wake_up": "animation.ambipom.wake_up", - "attack": "animation.ambipom.idle", + "sleeping": "animation.ambipom.ground_idle", + "attack": "animation.ambipom.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/ampharos.json b/entity/pokemon/ampharos.json index 986f6d828..10d193358 100644 --- a/entity/pokemon/ampharos.json +++ b/entity/pokemon/ampharos.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.ampharos.idle", + "ground_idle": "animation.ampharos.ground_idle", + "air_idle": "animation.ampharos.ground_idle", + "water_idle": "animation.ampharos.ground_idle", "walking": "animation.ampharos.walking", "flying": "animation.ampharos.walking", "swimming": "animation.ampharos.swimming", "sleeping": "animation.ampharos.sleeping", - "fall_asleep": "animation.ampharos.fall_asleep", - "wake_up": "animation.ampharos.wake_up", - "attack": "animation.ampharos.idle", + "attack": "animation.ampharos.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/arbok.json b/entity/pokemon/arbok.json index 446d5ed5d..dd9fba04c 100644 --- a/entity/pokemon/arbok.json +++ b/entity/pokemon/arbok.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.arbok.idle", + "ground_idle": "animation.arbok.ground_idle", + "air_idle": "animation.arbok.ground_idle", + "water_idle": "animation.arbok.ground_idle", "walking": "animation.arbok.walking", "flying": "animation.arbok.walking", "swimming": "animation.arbok.walking", - "sleeping": "animation.arbok.idle", - "fall_asleep": "animation.arbok.fall_asleep", - "wake_up": "animation.arbok.wake_up", + "sleeping": "animation.arbok.ground_idle", "attack": "animation.arbok.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/arcanine.json b/entity/pokemon/arcanine.json index 8b23a3981..dbee79bd8 100644 --- a/entity/pokemon/arcanine.json +++ b/entity/pokemon/arcanine.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.arcanine.idle", + "ground_idle": "animation.arcanine.ground_idle", + "air_idle": "animation.arcanine.ground_idle", + "water_idle": "animation.arcanine.ground_idle", "walking": "animation.arcanine.walking", "flying": "animation.arcanine.walking", "swimming": "animation.arcanine.walking", - "sleeping": "animation.arcanine.idle", - "fall_asleep": "animation.arcanine.fall_asleep", - "wake_up": "animation.arcanine.wake_up", - "attack": "animation.arcanine.idle", + "sleeping": "animation.arcanine.ground_idle", + "attack": "animation.arcanine.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/arceus.json b/entity/pokemon/arceus.json index 89e6496c3..5a7a2563f 100644 --- a/entity/pokemon/arceus.json +++ b/entity/pokemon/arceus.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.arceus.idle", + "ground_idle": "animation.arceus.ground_idle", + "air_idle": "animation.arceus.ground_idle", + "water_idle": "animation.arceus.ground_idle", "walking": "animation.arceus.walking", "flying": "animation.arceus.walking", "swimming": "animation.arceus.walking", - "sleeping": "animation.arceus.idle", - "fall_asleep": "animation.arceus.fall_asleep", - "wake_up": "animation.arceus.wake_up", - "attack": "animation.arceus.idle", + "sleeping": "animation.arceus.ground_idle", + "attack": "animation.arceus.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/ariados.json b/entity/pokemon/ariados.json index f554cc213..96769eed7 100644 --- a/entity/pokemon/ariados.json +++ b/entity/pokemon/ariados.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.ariados.idle", + "ground_idle": "animation.ariados.ground_idle", + "air_idle": "animation.ariados.ground_idle", + "water_idle": "animation.ariados.ground_idle", "walking": "animation.ariados.walking", "flying": "animation.ariados.walking", "swimming": "animation.ariados.walking", - "sleeping": "animation.ariados.idle", - "fall_asleep": "animation.ariados.fall_asleep", - "wake_up": "animation.ariados.wake_up", - "attack": "animation.ariados.idle", + "sleeping": "animation.ariados.ground_idle", + "attack": "animation.ariados.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/articuno.json b/entity/pokemon/articuno.json index debe401a4..4096ef5c0 100644 --- a/entity/pokemon/articuno.json +++ b/entity/pokemon/articuno.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.articuno.idle", + "ground_idle": "animation.articuno.ground_idle", + "air_idle": "animation.articuno.ground_idle", + "water_idle": "animation.articuno.ground_idle", "walking": "animation.articuno.walking", "flying": "animation.articuno.walking", "swimming": "animation.articuno.walking", - "sleeping": "animation.articuno.idle", - "fall_asleep": "animation.articuno.fall_asleep", - "wake_up": "animation.articuno.wake_up", - "attack": "animation.articuno.idle", + "sleeping": "animation.articuno.ground_idle", + "attack": "animation.articuno.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/axew.json b/entity/pokemon/axew.json index d22542bfa..85da91175 100644 --- a/entity/pokemon/axew.json +++ b/entity/pokemon/axew.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.axew.idle", + "ground_idle": "animation.axew.ground_idle", + "air_idle": "animation.axew.ground_idle", + "water_idle": "animation.axew.ground_idle", "walking": "animation.axew.walking", "flying": "animation.axew.walking", "swimming": "animation.axew.walking", - "sleeping": "animation.axew.idle", - "fall_asleep": "animation.axew.fall_asleep", - "wake_up": "animation.axew.wake_up", - "attack": "animation.axew.idle", + "sleeping": "animation.axew.ground_idle", + "attack": "animation.axew.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/azelf.json b/entity/pokemon/azelf.json index 5709253ee..8ef18e869 100644 --- a/entity/pokemon/azelf.json +++ b/entity/pokemon/azelf.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.azelf.idle", + "ground_idle": "animation.azelf.ground_idle", + "air_idle": "animation.azelf.ground_idle", + "water_idle": "animation.azelf.ground_idle", "walking": "animation.azelf.walking", "flying": "animation.azelf.walking", "swimming": "animation.azelf.walking", - "sleeping": "animation.azelf.idle", - "fall_asleep": "animation.azelf.fall_asleep", - "wake_up": "animation.azelf.wake_up", - "attack": "animation.azelf.idle", + "sleeping": "animation.azelf.ground_idle", + "attack": "animation.azelf.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/azumarill.json b/entity/pokemon/azumarill.json index 5029677bf..21dff3bd7 100644 --- a/entity/pokemon/azumarill.json +++ b/entity/pokemon/azumarill.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.azumarill.idle", + "ground_idle": "animation.azumarill.ground_idle", + "air_idle": "animation.azumarill.ground_idle", + "water_idle": "animation.azumarill.ground_idle", "walking": "animation.azumarill.walking", "flying": "animation.azumarill.walking", "swimming": "animation.azumarill.swimming", "sleeping": "animation.azumarill.sleeping", - "fall_asleep": "animation.azumarill.fall_asleep", - "wake_up": "animation.azumarill.wake_up", - "attack": "animation.azumarill.idle", + "attack": "animation.azumarill.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/azurill.json b/entity/pokemon/azurill.json index 44093813d..48f60434a 100644 --- a/entity/pokemon/azurill.json +++ b/entity/pokemon/azurill.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.azurill.idle", + "ground_idle": "animation.azurill.ground_idle", + "air_idle": "animation.azurill.ground_idle", + "water_idle": "animation.azurill.ground_idle", "walking": "animation.azurill.walking", "flying": "animation.azurill.walking", "swimming": "animation.azurill.swimming", "sleeping": "animation.azurill.sleeping", - "fall_asleep": "animation.azurill.fall_asleep", - "wake_up": "animation.azurill.wake_up", - "attack": "animation.azurill.idle", + "attack": "animation.azurill.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/bayleef.json b/entity/pokemon/bayleef.json index 3e40c12b3..f28f78b20 100644 --- a/entity/pokemon/bayleef.json +++ b/entity/pokemon/bayleef.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.bayleef.idle", + "ground_idle": "animation.bayleef.ground_idle", + "air_idle": "animation.bayleef.ground_idle", + "water_idle": "animation.bayleef.ground_idle", "walking": "animation.bayleef.walking", "flying": "animation.bayleef.walking", "swimming": "animation.bayleef.walking", - "sleeping": "animation.bayleef.idle", - "fall_asleep": "animation.bayleef.fall_asleep", - "wake_up": "animation.bayleef.wake_up", + "sleeping": "animation.bayleef.ground_idle", "attack": "animation.bayleef.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/beedrill.json b/entity/pokemon/beedrill.json index 42715cbd6..8949b67d4 100644 --- a/entity/pokemon/beedrill.json +++ b/entity/pokemon/beedrill.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.beedrill.idle", + "ground_idle": "animation.beedrill.ground_idle", + "air_idle": "animation.beedrill.ground_idle", + "water_idle": "animation.beedrill.ground_idle", "walking": "animation.beedrill.walking", "flying": "animation.beedrill.walking", "swimming": "animation.beedrill.walking", - "sleeping": "animation.beedrill.idle", - "fall_asleep": "animation.beedrill.fall_asleep", - "wake_up": "animation.beedrill.wake_up", - "attack": "animation.beedrill.idle", + "sleeping": "animation.beedrill.ground_idle", + "attack": "animation.beedrill.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/bellossom.json b/entity/pokemon/bellossom.json index c28ee983d..d56107e9a 100644 --- a/entity/pokemon/bellossom.json +++ b/entity/pokemon/bellossom.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.bellossom.idle", + "ground_idle": "animation.bellossom.ground_idle", + "air_idle": "animation.bellossom.ground_idle", + "water_idle": "animation.bellossom.ground_idle", "walking": "animation.bellossom.walking", "flying": "animation.bellossom.walking", "swimming": "animation.bellossom.walking", - "sleeping": "animation.bellossom.idle", - "fall_asleep": "animation.bellossom.fall_asleep", - "wake_up": "animation.bellossom.wake_up", - "attack": "animation.bellossom.idle", + "sleeping": "animation.bellossom.ground_idle", + "attack": "animation.bellossom.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/bibarel.json b/entity/pokemon/bibarel.json index 110b1b083..35eacfaee 100644 --- a/entity/pokemon/bibarel.json +++ b/entity/pokemon/bibarel.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.bibarel.idle", + "ground_idle": "animation.bibarel.ground_idle", + "air_idle": "animation.bibarel.ground_idle", + "water_idle": "animation.bibarel.ground_idle", "walking": "animation.bibarel.walking", "flying": "animation.bibarel.walking", "swimming": "animation.bibarel.walking", - "sleeping": "animation.bibarel.idle", - "fall_asleep": "animation.bibarel.fall_asleep", - "wake_up": "animation.bibarel.wake_up", - "attack": "animation.bibarel.idle", + "sleeping": "animation.bibarel.ground_idle", + "attack": "animation.bibarel.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/bidoof.json b/entity/pokemon/bidoof.json index 48e58cb6c..e3a704da7 100644 --- a/entity/pokemon/bidoof.json +++ b/entity/pokemon/bidoof.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.bidoof.idle", + "ground_idle": "animation.bidoof.ground_idle", + "air_idle": "animation.bidoof.ground_idle", + "water_idle": "animation.bidoof.ground_idle", "walking": "animation.bidoof.walking", "flying": "animation.bidoof.walking", "swimming": "animation.bidoof.walking", - "sleeping": "animation.bidoof.idle", - "fall_asleep": "animation.bidoof.fall_asleep", - "wake_up": "animation.bidoof.wake_up", - "attack": "animation.bidoof.idle", + "sleeping": "animation.bidoof.ground_idle", + "attack": "animation.bidoof.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/blastoise.json b/entity/pokemon/blastoise.json index 122a355ff..e5fa69bd8 100644 --- a/entity/pokemon/blastoise.json +++ b/entity/pokemon/blastoise.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.blastoise.idle", + "ground_idle": "animation.blastoise.ground_idle", + "air_idle": "animation.blastoise.ground_idle", + "water_idle": "animation.blastoise.ground_idle", "walking": "animation.blastoise.walking", "flying": "animation.blastoise.walking", "swimming": "animation.blastoise.walking", - "sleeping": "animation.blastoise.idle", - "fall_asleep": "animation.blastoise.fall_asleep", - "wake_up": "animation.blastoise.wake_up", + "sleeping": "animation.blastoise.ground_idle", "attack": "animation.blastoise.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/blaziken.json b/entity/pokemon/blaziken.json index ce730c708..895bf14d4 100644 --- a/entity/pokemon/blaziken.json +++ b/entity/pokemon/blaziken.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.blaziken.idle", + "ground_idle": "animation.blaziken.ground_idle", + "air_idle": "animation.blaziken.ground_idle", + "water_idle": "animation.blaziken.ground_idle", "walking": "animation.blaziken.walking", "flying": "animation.blaziken.walking", "swimming": "animation.blaziken.walking", - "sleeping": "animation.blaziken.idle", - "fall_asleep": "animation.blaziken.fall_asleep", - "wake_up": "animation.blaziken.wake_up", + "sleeping": "animation.blaziken.ground_idle", "attack": "animation.blaziken.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/bonsly.json b/entity/pokemon/bonsly.json index b35708c73..65be39ef2 100644 --- a/entity/pokemon/bonsly.json +++ b/entity/pokemon/bonsly.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.bonsly.idle", + "ground_idle": "animation.bonsly.ground_idle", + "air_idle": "animation.bonsly.air_idle", + "water_idle": "animation.bonsly.water_idle", "walking": "animation.bonsly.walking", "flying": "animation.bonsly.flying", "swimming": "animation.bonsly.swimming", "sleeping": "animation.bonsly.sleeping", - "fall_asleep": "animation.bonsly.fall_asleep", - "wake_up": "animation.bonsly.wake_up", "attack": "animation.bonsly.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/braixen.json b/entity/pokemon/braixen.json index 9652387eb..ff8a9ac50 100644 --- a/entity/pokemon/braixen.json +++ b/entity/pokemon/braixen.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.braixen.idle", + "ground_idle": "animation.braixen.ground_idle", + "air_idle": "animation.braixen.ground_idle", + "water_idle": "animation.braixen.ground_idle", "walking": "animation.braixen.walking", "flying": "animation.braixen.walking", "swimming": "animation.braixen.walking", - "sleeping": "animation.braixen.idle", - "fall_asleep": "animation.braixen.fall_asleep", - "wake_up": "animation.braixen.wake_up", + "sleeping": "animation.braixen.ground_idle", "attack": "animation.braixen.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/brionne.json b/entity/pokemon/brionne.json index c049e242f..fd646d06b 100644 --- a/entity/pokemon/brionne.json +++ b/entity/pokemon/brionne.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.brionne.idle", + "ground_idle": "animation.brionne.ground_idle", + "air_idle": "animation.brionne.ground_idle", + "water_idle": "animation.brionne.ground_idle", "walking": "animation.brionne.walking", "flying": "animation.brionne.walking", "swimming": "animation.brionne.walking", - "sleeping": "animation.brionne.idle", - "fall_asleep": "animation.brionne.fall_asleep", - "wake_up": "animation.brionne.wake_up", + "sleeping": "animation.brionne.ground_idle", "attack": "animation.brionne.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/buizel.json b/entity/pokemon/buizel.json index e282600d3..dc03ff2a9 100644 --- a/entity/pokemon/buizel.json +++ b/entity/pokemon/buizel.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.buizel.idle", + "ground_idle": "animation.buizel.ground_idle", + "air_idle": "animation.buizel.ground_idle", + "water_idle": "animation.buizel.ground_idle", "walking": "animation.buizel.walking", "flying": "animation.buizel.walking", "swimming": "animation.buizel.walking", - "sleeping": "animation.buizel.idle", - "fall_asleep": "animation.buizel.fall_asleep", - "wake_up": "animation.buizel.wake_up", - "attack": "animation.buizel.idle", + "sleeping": "animation.buizel.ground_idle", + "attack": "animation.buizel.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/bulbasaur.json b/entity/pokemon/bulbasaur.json index 232c531c8..5b4805f36 100644 --- a/entity/pokemon/bulbasaur.json +++ b/entity/pokemon/bulbasaur.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.bulbasaur.idle", + "ground_idle": "animation.bulbasaur.ground_idle", + "air_idle": "animation.bulbasaur.ground_idle", + "water_idle": "animation.bulbasaur.ground_idle", "walking": "animation.bulbasaur.walking", "flying": "animation.bulbasaur.walking", "swimming": "animation.bulbasaur.walking", - "sleeping": "animation.bulbasaur.idle", - "fall_asleep": "animation.bulbasaur.fall_asleep", - "wake_up": "animation.bulbasaur.wake_up", + "sleeping": "animation.bulbasaur.ground_idle", "attack": "animation.bulbasaur.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/butterfree.json b/entity/pokemon/butterfree.json index 1e2ac9949..5cedb5a17 100644 --- a/entity/pokemon/butterfree.json +++ b/entity/pokemon/butterfree.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.butterfree.idle", + "ground_idle": "animation.butterfree.ground_idle", + "air_idle": "animation.butterfree.ground_idle", + "water_idle": "animation.butterfree.ground_idle", "walking": "animation.butterfree.walking", "flying": "animation.butterfree.walking", "swimming": "animation.butterfree.walking", - "sleeping": "animation.butterfree.idle", - "fall_asleep": "animation.butterfree.fall_asleep", - "wake_up": "animation.butterfree.wake_up", - "attack": "animation.butterfree.idle", + "sleeping": "animation.butterfree.ground_idle", + "attack": "animation.butterfree.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/caterpie.json b/entity/pokemon/caterpie.json index ba18aa846..0788bc9cf 100644 --- a/entity/pokemon/caterpie.json +++ b/entity/pokemon/caterpie.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.caterpie.idle", + "ground_idle": "animation.caterpie.ground_idle", + "air_idle": "animation.caterpie.ground_idle", + "water_idle": "animation.caterpie.ground_idle", "walking": "animation.caterpie.walking", "flying": "animation.caterpie.walking", "swimming": "animation.caterpie.walking", - "sleeping": "animation.caterpie.idle", - "fall_asleep": "animation.caterpie.fall_asleep", - "wake_up": "animation.caterpie.wake_up", - "attack": "animation.caterpie.idle", + "sleeping": "animation.caterpie.ground_idle", + "attack": "animation.caterpie.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/celebi.json b/entity/pokemon/celebi.json index 179637d99..b23a71bed 100644 --- a/entity/pokemon/celebi.json +++ b/entity/pokemon/celebi.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.celebi.idle", + "ground_idle": "animation.celebi.ground_idle", + "air_idle": "animation.celebi.ground_idle", + "water_idle": "animation.celebi.ground_idle", "walking": "animation.celebi.walking", "flying": "animation.celebi.walking", "swimming": "animation.celebi.walking", - "sleeping": "animation.celebi.idle", - "fall_asleep": "animation.celebi.fall_asleep", - "wake_up": "animation.celebi.wake_up", - "attack": "animation.celebi.idle", + "sleeping": "animation.celebi.ground_idle", + "attack": "animation.celebi.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/chansey.json b/entity/pokemon/chansey.json index 644b122b2..fefe4e552 100644 --- a/entity/pokemon/chansey.json +++ b/entity/pokemon/chansey.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.chansey.idle", + "ground_idle": "animation.chansey.ground_idle", + "air_idle": "animation.chansey.ground_idle", + "water_idle": "animation.chansey.ground_idle", "walking": "animation.chansey.walking", "flying": "animation.chansey.walking", "swimming": "animation.chansey.walking", - "sleeping": "animation.chansey.idle", - "fall_asleep": "animation.chansey.fall_asleep", - "wake_up": "animation.chansey.wake_up", + "sleeping": "animation.chansey.ground_idle", "attack": "animation.chansey.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/charizard.json b/entity/pokemon/charizard.json index ebd9849db..9b5db5afb 100644 --- a/entity/pokemon/charizard.json +++ b/entity/pokemon/charizard.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.charizard.idle", + "ground_idle": "animation.charizard.ground_idle", + "air_idle": "animation.charizard.ground_idle", + "water_idle": "animation.charizard.ground_idle", "walking": "animation.charizard.walking", "flying": "animation.charizard.flying", "swimming": "animation.charizard.walking", - "sleeping": "animation.charizard.idle", - "fall_asleep": "animation.charizard.fall_asleep", - "wake_up": "animation.charizard.wake_up", - "attack": "animation.charizard.idle", + "sleeping": "animation.charizard.ground_idle", + "attack": "animation.charizard.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/charmander.json b/entity/pokemon/charmander.json index 1681bad25..5457f2148 100644 --- a/entity/pokemon/charmander.json +++ b/entity/pokemon/charmander.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.charmander.idle", + "ground_idle": "animation.charmander.ground_idle", + "air_idle": "animation.charmander.ground_idle", + "water_idle": "animation.charmander.ground_idle", "walking": "animation.charmander.walking", "flying": "animation.charmander.walking", "swimming": "animation.charmander.walking", - "sleeping": "animation.charmander.idle", - "fall_asleep": "animation.charmander.fall_asleep", - "wake_up": "animation.charmander.wake_up", - "attack": "animation.charmander.idle", + "sleeping": "animation.charmander.ground_idle", + "attack": "animation.charmander.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/charmeleon.json b/entity/pokemon/charmeleon.json index d3aa8d588..0e544ed82 100644 --- a/entity/pokemon/charmeleon.json +++ b/entity/pokemon/charmeleon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.charmeleon.idle", + "ground_idle": "animation.charmeleon.ground_idle", + "air_idle": "animation.charmeleon.ground_idle", + "water_idle": "animation.charmeleon.ground_idle", "walking": "animation.charmeleon.walking", "flying": "animation.charmeleon.walking", "swimming": "animation.charmeleon.walking", - "sleeping": "animation.charmeleon.idle", - "fall_asleep": "animation.charmeleon.fall_asleep", - "wake_up": "animation.charmeleon.wake_up", - "attack": "animation.charmeleon.idle", + "sleeping": "animation.charmeleon.ground_idle", + "attack": "animation.charmeleon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/chesnaught.json b/entity/pokemon/chesnaught.json index 6f1fc122c..db3a4cb8f 100644 --- a/entity/pokemon/chesnaught.json +++ b/entity/pokemon/chesnaught.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.chesnaught.idle", + "ground_idle": "animation.chesnaught.ground_idle", + "air_idle": "animation.chesnaught.ground_idle", + "water_idle": "animation.chesnaught.ground_idle", "walking": "animation.chesnaught.walking", "flying": "animation.chesnaught.walking", "swimming": "animation.chesnaught.walking", - "sleeping": "animation.chesnaught.idle", - "fall_asleep": "animation.chesnaught.fall_asleep", - "wake_up": "animation.chesnaught.wake_up", + "sleeping": "animation.chesnaught.ground_idle", "attack": "animation.chesnaught.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/chespin.json b/entity/pokemon/chespin.json index 4398d7e72..16e0dfddd 100644 --- a/entity/pokemon/chespin.json +++ b/entity/pokemon/chespin.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.chespin.idle", + "ground_idle": "animation.chespin.ground_idle", + "air_idle": "animation.chespin.ground_idle", + "water_idle": "animation.chespin.ground_idle", "walking": "animation.chespin.walking", "flying": "animation.chespin.walking", "swimming": "animation.chespin.walking", - "sleeping": "animation.chespin.idle", - "fall_asleep": "animation.chespin.fall_asleep", - "wake_up": "animation.chespin.wake_up", + "sleeping": "animation.chespin.ground_idle", "attack": "animation.chespin.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/chikorita.json b/entity/pokemon/chikorita.json index 6ba7b5385..3919d7855 100644 --- a/entity/pokemon/chikorita.json +++ b/entity/pokemon/chikorita.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.chikorita.idle", + "ground_idle": "animation.chikorita.ground_idle", + "air_idle": "animation.chikorita.ground_idle", + "water_idle": "animation.chikorita.ground_idle", "walking": "animation.chikorita.walking", "flying": "animation.chikorita.walking", "swimming": "animation.chikorita.walking", - "sleeping": "animation.chikorita.idle", - "fall_asleep": "animation.chikorita.fall_asleep", - "wake_up": "animation.chikorita.wake_up", - "attack": "animation.chikorita.idle", + "sleeping": "animation.chikorita.ground_idle", + "attack": "animation.chikorita.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/chimchar.json b/entity/pokemon/chimchar.json index c902459b4..645a377c3 100644 --- a/entity/pokemon/chimchar.json +++ b/entity/pokemon/chimchar.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.chimchar.idle", + "ground_idle": "animation.chimchar.ground_idle", + "air_idle": "animation.chimchar.ground_idle", + "water_idle": "animation.chimchar.ground_idle", "walking": "animation.chimchar.walking", "flying": "animation.chimchar.walking", "swimming": "animation.chimchar.walking", - "sleeping": "animation.chimchar.idle", - "fall_asleep": "animation.chimchar.fall_asleep", - "wake_up": "animation.chimchar.wake_up", + "sleeping": "animation.chimchar.ground_idle", "attack": "animation.chimchar.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/chinchou.json b/entity/pokemon/chinchou.json index b1154edae..f5d29327c 100644 --- a/entity/pokemon/chinchou.json +++ b/entity/pokemon/chinchou.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.chinchou.idle", - "walking": "animation.chinchou.idle", + "ground_idle": "animation.chinchou.ground_idle", + "air_idle": "animation.chinchou.ground_idle", + "water_idle": "animation.chinchou.ground_idle", + "walking": "animation.chinchou.ground_idle", "flying": "animation.chinchou.walking", "swimming": "animation.chinchou.walking", - "sleeping": "animation.chinchou.idle", - "fall_asleep": "animation.chinchou.fall_asleep", - "wake_up": "animation.chinchou.wake_up", + "sleeping": "animation.chinchou.ground_idle", "attack": "animation.chinchou.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/cinderace.json b/entity/pokemon/cinderace.json index f5bf80a78..ced21acf2 100644 --- a/entity/pokemon/cinderace.json +++ b/entity/pokemon/cinderace.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.cinderace.idle", + "ground_idle": "animation.cinderace.ground_idle", + "air_idle": "animation.cinderace.ground_idle", + "water_idle": "animation.cinderace.ground_idle", "walking": "animation.cinderace.walking", "flying": "animation.cinderace.walking", "swimming": "animation.cinderace.walking", - "sleeping": "animation.cinderace.idle", - "fall_asleep": "animation.cinderace.fall_asleep", - "wake_up": "animation.cinderace.wake_up", + "sleeping": "animation.cinderace.ground_idle", "attack": "animation.cinderace.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/clefable.json b/entity/pokemon/clefable.json index 180ab5ffc..93cc42835 100644 --- a/entity/pokemon/clefable.json +++ b/entity/pokemon/clefable.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.clefable.idle", + "ground_idle": "animation.clefable.ground_idle", + "air_idle": "animation.clefable.ground_idle", + "water_idle": "animation.clefable.ground_idle", "walking": "animation.clefable.walking", "flying": "animation.clefable.walking", "swimming": "animation.clefable.walking", - "sleeping": "animation.clefable.idle", - "fall_asleep": "animation.clefable.fall_asleep", - "wake_up": "animation.clefable.wake_up", + "sleeping": "animation.clefable.ground_idle", "attack": "animation.clefable.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/clefairy.json b/entity/pokemon/clefairy.json index e6b477ed7..0f1d73a97 100644 --- a/entity/pokemon/clefairy.json +++ b/entity/pokemon/clefairy.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.clefairy.idle", + "ground_idle": "animation.clefairy.ground_idle", + "air_idle": "animation.clefairy.ground_idle", + "water_idle": "animation.clefairy.ground_idle", "walking": "animation.clefairy.walking", "flying": "animation.clefairy.walking", "swimming": "animation.clefairy.walking", - "sleeping": "animation.clefairy.idle", - "fall_asleep": "animation.clefairy.fall_asleep", - "wake_up": "animation.clefairy.wake_up", + "sleeping": "animation.clefairy.ground_idle", "attack": "animation.clefairy.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/cleffa.json b/entity/pokemon/cleffa.json index d12347360..69cc1a19f 100644 --- a/entity/pokemon/cleffa.json +++ b/entity/pokemon/cleffa.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.cleffa.idle", + "ground_idle": "animation.cleffa.ground_idle", + "air_idle": "animation.cleffa.ground_idle", + "water_idle": "animation.cleffa.ground_idle", "walking": "animation.cleffa.walking", "flying": "animation.cleffa.walking", "swimming": "animation.cleffa.walking", - "sleeping": "animation.cleffa.idle", - "fall_asleep": "animation.cleffa.fall_asleep", - "wake_up": "animation.cleffa.wake_up", - "attack": "animation.cleffa.idle", + "sleeping": "animation.cleffa.ground_idle", + "attack": "animation.cleffa.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/cloyster.json b/entity/pokemon/cloyster.json index e41c940a7..49b8c64c3 100644 --- a/entity/pokemon/cloyster.json +++ b/entity/pokemon/cloyster.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.cloyster.idle", + "ground_idle": "animation.cloyster.ground_idle", + "air_idle": "animation.cloyster.ground_idle", + "water_idle": "animation.cloyster.ground_idle", "walking": "animation.cloyster.walking", "flying": "animation.cloyster.walking", "swimming": "animation.cloyster.walking", - "sleeping": "animation.cloyster.idle", - "fall_asleep": "animation.cloyster.fall_asleep", - "wake_up": "animation.cloyster.wake_up", - "attack": "animation.cloyster.idle", + "sleeping": "animation.cloyster.ground_idle", + "attack": "animation.cloyster.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/combusken.json b/entity/pokemon/combusken.json index a8fc3ffd7..3486e7339 100644 --- a/entity/pokemon/combusken.json +++ b/entity/pokemon/combusken.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.combusken.idle", + "ground_idle": "animation.combusken.ground_idle", + "air_idle": "animation.combusken.ground_idle", + "water_idle": "animation.combusken.ground_idle", "walking": "animation.combusken.walking", "flying": "animation.combusken.walking", "swimming": "animation.combusken.walking", - "sleeping": "animation.combusken.idle", - "fall_asleep": "animation.combusken.fall_asleep", - "wake_up": "animation.combusken.wake_up", + "sleeping": "animation.combusken.ground_idle", "attack": "animation.combusken.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/corsola.json b/entity/pokemon/corsola.json index 65ff68d76..3e9566b26 100644 --- a/entity/pokemon/corsola.json +++ b/entity/pokemon/corsola.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.corsola.idle", + "ground_idle": "animation.corsola.ground_idle", + "air_idle": "animation.corsola.ground_idle", + "water_idle": "animation.corsola.ground_idle", "walking": "animation.corsola.walking", "flying": "animation.corsola.walking", "swimming": "animation.corsola.walking", - "sleeping": "animation.corsola.idle", - "fall_asleep": "animation.corsola.fall_asleep", - "wake_up": "animation.corsola.wake_up", - "attack": "animation.corsola.idle", + "sleeping": "animation.corsola.ground_idle", + "attack": "animation.corsola.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/cosmog.json b/entity/pokemon/cosmog.json index 731a1a8b5..7593d489a 100644 --- a/entity/pokemon/cosmog.json +++ b/entity/pokemon/cosmog.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.cosmog.idle", + "ground_idle": "animation.cosmog.ground_idle", + "air_idle": "animation.cosmog.ground_idle", + "water_idle": "animation.cosmog.ground_idle", "walking": "animation.cosmog.walking", "flying": "animation.cosmog.walking", "swimming": "animation.cosmog.walking", - "sleeping": "animation.cosmog.idle", - "fall_asleep": "animation.cosmog.fall_asleep", - "wake_up": "animation.cosmog.wake_up", - "attack": "animation.cosmog.idle", + "sleeping": "animation.cosmog.ground_idle", + "attack": "animation.cosmog.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/cradily.json b/entity/pokemon/cradily.json index 05cd1e4b1..8945707a4 100644 --- a/entity/pokemon/cradily.json +++ b/entity/pokemon/cradily.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.cradily.idle", - "walking": "animation.cradily.idle", + "ground_idle": "animation.cradily.ground_idle", + "air_idle": "animation.cradily.ground_idle", + "water_idle": "animation.cradily.ground_idle", + "walking": "animation.cradily.ground_idle", "flying": "animation.cradily.walking", "swimming": "animation.cradily.walking", - "sleeping": "animation.cradily.idle", - "fall_asleep": "animation.cradily.fall_asleep", - "wake_up": "animation.cradily.wake_up", - "attack": "animation.cradily.idle", + "sleeping": "animation.cradily.ground_idle", + "attack": "animation.cradily.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/cresselia.json b/entity/pokemon/cresselia.json index 143e08865..16a2d710d 100644 --- a/entity/pokemon/cresselia.json +++ b/entity/pokemon/cresselia.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.cresselia.idle", + "ground_idle": "animation.cresselia.ground_idle", + "air_idle": "animation.cresselia.ground_idle", + "water_idle": "animation.cresselia.ground_idle", "walking": "animation.cresselia.walking", "flying": "animation.cresselia.walking", "swimming": "animation.cresselia.walking", - "sleeping": "animation.cresselia.idle", - "fall_asleep": "animation.cresselia.fall_asleep", - "wake_up": "animation.cresselia.wake_up", - "attack": "animation.cresselia.idle", + "sleeping": "animation.cresselia.ground_idle", + "attack": "animation.cresselia.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/crobat.json b/entity/pokemon/crobat.json index 877782c8b..2b1ff0791 100644 --- a/entity/pokemon/crobat.json +++ b/entity/pokemon/crobat.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.crobat.idle", + "ground_idle": "animation.crobat.ground_idle", + "air_idle": "animation.crobat.ground_idle", + "water_idle": "animation.crobat.ground_idle", "walking": "animation.crobat.walking", "flying": "animation.crobat.walking", "swimming": "animation.crobat.walking", - "sleeping": "animation.crobat.idle", - "fall_asleep": "animation.crobat.fall_asleep", - "wake_up": "animation.crobat.wake_up", - "attack": "animation.crobat.idle", + "sleeping": "animation.crobat.ground_idle", + "attack": "animation.crobat.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/crocalor.json b/entity/pokemon/crocalor.json index db5a21c17..07120a1db 100644 --- a/entity/pokemon/crocalor.json +++ b/entity/pokemon/crocalor.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.crocalor.idle", + "ground_idle": "animation.crocalor.ground_idle", + "air_idle": "animation.crocalor.air_idle", + "water_idle": "animation.crocalor.water_idle", "walking": "animation.crocalor.walking", "flying": "animation.crocalor.flying", "swimming": "animation.crocalor.swimming", "sleeping": "animation.crocalor.sleeping", - "fall_asleep": "animation.crocalor.fall_asleep", - "wake_up": "animation.crocalor.wake_up", "attack": "animation.crocalor.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/croconaw.json b/entity/pokemon/croconaw.json index a3ce79fc2..d6c1e8d7f 100644 --- a/entity/pokemon/croconaw.json +++ b/entity/pokemon/croconaw.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.croconaw.idle", + "ground_idle": "animation.croconaw.ground_idle", + "air_idle": "animation.croconaw.ground_idle", + "water_idle": "animation.croconaw.ground_idle", "walking": "animation.croconaw.walking", "flying": "animation.croconaw.walking", "swimming": "animation.croconaw.walking", - "sleeping": "animation.croconaw.idle", - "fall_asleep": "animation.croconaw.fall_asleep", - "wake_up": "animation.croconaw.wake_up", + "sleeping": "animation.croconaw.ground_idle", "attack": "animation.croconaw.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/cyndaquil.json b/entity/pokemon/cyndaquil.json index e97ee8e30..9ae792704 100644 --- a/entity/pokemon/cyndaquil.json +++ b/entity/pokemon/cyndaquil.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.cyndaquil.idle", + "ground_idle": "animation.cyndaquil.ground_idle", + "air_idle": "animation.cyndaquil.ground_idle", + "water_idle": "animation.cyndaquil.ground_idle", "walking": "animation.cyndaquil.walking", "flying": "animation.cyndaquil.walking", "swimming": "animation.cyndaquil.walking", - "sleeping": "animation.cyndaquil.idle", - "fall_asleep": "animation.cyndaquil.fall_asleep", - "wake_up": "animation.cyndaquil.wake_up", + "sleeping": "animation.cyndaquil.ground_idle", "attack": "animation.cyndaquil.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/dartrix.json b/entity/pokemon/dartrix.json index e26d4c35e..bd6ac7aeb 100644 --- a/entity/pokemon/dartrix.json +++ b/entity/pokemon/dartrix.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.dartrix.idle", + "ground_idle": "animation.dartrix.ground_idle", + "air_idle": "animation.dartrix.ground_idle", + "water_idle": "animation.dartrix.ground_idle", "walking": "animation.dartrix.walking", "flying": "animation.dartrix.walking", "swimming": "animation.dartrix.walking", - "sleeping": "animation.dartrix.idle", - "fall_asleep": "animation.dartrix.fall_asleep", - "wake_up": "animation.dartrix.wake_up", + "sleeping": "animation.dartrix.ground_idle", "attack": "animation.dartrix.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/decidueye.json b/entity/pokemon/decidueye.json index b666d13fd..6fe8c9067 100644 --- a/entity/pokemon/decidueye.json +++ b/entity/pokemon/decidueye.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.decidueye.idle", + "ground_idle": "animation.decidueye.ground_idle", + "air_idle": "animation.decidueye.ground_idle", + "water_idle": "animation.decidueye.ground_idle", "walking": "animation.decidueye.walking", "flying": "animation.decidueye.walking", "swimming": "animation.decidueye.walking", - "sleeping": "animation.decidueye.idle", - "fall_asleep": "animation.decidueye.fall_asleep", - "wake_up": "animation.decidueye.wake_up", + "sleeping": "animation.decidueye.ground_idle", "attack": "animation.decidueye.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/delibird.json b/entity/pokemon/delibird.json index 72f5a5d50..3ac82051f 100644 --- a/entity/pokemon/delibird.json +++ b/entity/pokemon/delibird.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.delibird.idle", + "ground_idle": "animation.delibird.ground_idle", + "air_idle": "animation.delibird.ground_idle", + "water_idle": "animation.delibird.ground_idle", "walking": "animation.delibird.walking", "flying": "animation.delibird.walking", "swimming": "animation.delibird.walking", - "sleeping": "animation.delibird.idle", - "fall_asleep": "animation.delibird.fall_asleep", - "wake_up": "animation.delibird.wake_up", - "attack": "animation.delibird.idle", + "sleeping": "animation.delibird.ground_idle", + "attack": "animation.delibird.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/delphox.json b/entity/pokemon/delphox.json index 32d5aea84..be5f497f9 100644 --- a/entity/pokemon/delphox.json +++ b/entity/pokemon/delphox.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.delphox.idle", + "ground_idle": "animation.delphox.ground_idle", + "air_idle": "animation.delphox.ground_idle", + "water_idle": "animation.delphox.ground_idle", "walking": "animation.delphox.walking", "flying": "animation.delphox.walking", "swimming": "animation.delphox.walking", - "sleeping": "animation.delphox.idle", - "fall_asleep": "animation.delphox.fall_asleep", - "wake_up": "animation.delphox.wake_up", + "sleeping": "animation.delphox.ground_idle", "attack": "animation.delphox.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/dewgong.json b/entity/pokemon/dewgong.json index 493088c41..6ed05b87f 100644 --- a/entity/pokemon/dewgong.json +++ b/entity/pokemon/dewgong.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.dewgong.idle", + "ground_idle": "animation.dewgong.ground_idle", + "air_idle": "animation.dewgong.ground_idle", + "water_idle": "animation.dewgong.ground_idle", "walking": "animation.dewgong.walking", "flying": "animation.dewgong.walking", "swimming": "animation.dewgong.walking", - "sleeping": "animation.dewgong.idle", - "fall_asleep": "animation.dewgong.fall_asleep", - "wake_up": "animation.dewgong.wake_up", - "attack": "animation.dewgong.idle", + "sleeping": "animation.dewgong.ground_idle", + "attack": "animation.dewgong.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/dewott.json b/entity/pokemon/dewott.json index 72a755502..7e238f9d5 100644 --- a/entity/pokemon/dewott.json +++ b/entity/pokemon/dewott.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.dewott.idle", + "ground_idle": "animation.dewott.ground_idle", + "air_idle": "animation.dewott.ground_idle", + "water_idle": "animation.dewott.ground_idle", "walking": "animation.dewott.walking", "flying": "animation.dewott.walking", "swimming": "animation.dewott.walking", - "sleeping": "animation.dewott.idle", - "fall_asleep": "animation.dewott.fall_asleep", - "wake_up": "animation.dewott.wake_up", + "sleeping": "animation.dewott.ground_idle", "attack": "animation.dewott.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/dialga.json b/entity/pokemon/dialga.json index 4340b52a2..924008adf 100644 --- a/entity/pokemon/dialga.json +++ b/entity/pokemon/dialga.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.dialga.idle", + "ground_idle": "animation.dialga.ground_idle", + "air_idle": "animation.dialga.ground_idle", + "water_idle": "animation.dialga.ground_idle", "walking": "animation.dialga.walking", "flying": "animation.dialga.walking", "swimming": "animation.dialga.walking", - "sleeping": "animation.dialga.idle", - "fall_asleep": "animation.dialga.fall_asleep", - "wake_up": "animation.dialga.wake_up", - "attack": "animation.dialga.idle", + "sleeping": "animation.dialga.ground_idle", + "attack": "animation.dialga.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/diglett.json b/entity/pokemon/diglett.json index a1bc223c1..032535a63 100644 --- a/entity/pokemon/diglett.json +++ b/entity/pokemon/diglett.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.diglett.idle", + "ground_idle": "animation.diglett.ground_idle", + "air_idle": "animation.diglett.ground_idle", + "water_idle": "animation.diglett.ground_idle", "walking": "animation.diglett.walking", "flying": "animation.diglett.walking", "swimming": "animation.diglett.walking", - "sleeping": "animation.diglett.idle", - "fall_asleep": "animation.diglett.fall_asleep", - "wake_up": "animation.diglett.wake_up", - "attack": "animation.diglett.idle", + "sleeping": "animation.diglett.ground_idle", + "attack": "animation.diglett.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/ditto.json b/entity/pokemon/ditto.json index 770c3b244..f96716283 100644 --- a/entity/pokemon/ditto.json +++ b/entity/pokemon/ditto.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.ditto.idle", + "ground_idle": "animation.ditto.ground_idle", + "air_idle": "animation.ditto.ground_idle", + "water_idle": "animation.ditto.ground_idle", "walking": "animation.ditto.walking", "flying": "animation.ditto.walking", "swimming": "animation.ditto.walking", - "sleeping": "animation.ditto.idle", - "fall_asleep": "animation.ditto.fall_asleep", - "wake_up": "animation.ditto.wake_up", + "sleeping": "animation.ditto.ground_idle", "attack": "animation.ditto.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/donphan.json b/entity/pokemon/donphan.json index 314ec8ccb..4b61eeaa0 100644 --- a/entity/pokemon/donphan.json +++ b/entity/pokemon/donphan.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.donphan.idle", + "ground_idle": "animation.donphan.ground_idle", + "air_idle": "animation.donphan.ground_idle", + "water_idle": "animation.donphan.ground_idle", "walking": "animation.donphan.walking", "flying": "animation.donphan.walking", "swimming": "animation.donphan.walking", - "sleeping": "animation.donphan.idle", - "fall_asleep": "animation.donphan.fall_asleep", - "wake_up": "animation.donphan.wake_up", - "attack": "animation.donphan.idle", + "sleeping": "animation.donphan.ground_idle", + "attack": "animation.donphan.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/dragonair.json b/entity/pokemon/dragonair.json index aeb4bb187..ea9749fc7 100644 --- a/entity/pokemon/dragonair.json +++ b/entity/pokemon/dragonair.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.dragonair.idle", + "ground_idle": "animation.dragonair.ground_idle", + "air_idle": "animation.dragonair.ground_idle", + "water_idle": "animation.dragonair.ground_idle", "walking": "animation.dragonair.walking", "flying": "animation.dragonair.walking", "swimming": "animation.dragonair.walking", - "sleeping": "animation.dragonair.idle", - "fall_asleep": "animation.dragonair.fall_asleep", - "wake_up": "animation.dragonair.wake_up", - "attack": "animation.dragonair.idle", + "sleeping": "animation.dragonair.ground_idle", + "attack": "animation.dragonair.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/dragonite.json b/entity/pokemon/dragonite.json index 2049e08b6..b45e6b3a2 100644 --- a/entity/pokemon/dragonite.json +++ b/entity/pokemon/dragonite.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.dragonite.idle", + "ground_idle": "animation.dragonite.ground_idle", + "air_idle": "animation.dragonite.ground_idle", + "water_idle": "animation.dragonite.ground_idle", "walking": "animation.dragonite.walking", "flying": "animation.dragonite.walking", "swimming": "animation.dragonite.walking", - "sleeping": "animation.dragonite.idle", - "fall_asleep": "animation.dragonite.fall_asleep", - "wake_up": "animation.dragonite.wake_up", - "attack": "animation.dragonite.idle", + "sleeping": "animation.dragonite.ground_idle", + "attack": "animation.dragonite.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/dratini.json b/entity/pokemon/dratini.json index ea0a5a441..3375d2d8a 100644 --- a/entity/pokemon/dratini.json +++ b/entity/pokemon/dratini.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.dratini.idle", + "ground_idle": "animation.dratini.ground_idle", + "air_idle": "animation.dratini.ground_idle", + "water_idle": "animation.dratini.ground_idle", "walking": "animation.dratini.walking", "flying": "animation.dratini.walking", "swimming": "animation.dratini.walking", - "sleeping": "animation.dratini.idle", - "fall_asleep": "animation.dratini.fall_asleep", - "wake_up": "animation.dratini.wake_up", - "attack": "animation.dratini.idle", + "sleeping": "animation.dratini.ground_idle", + "attack": "animation.dratini.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/drizzile.json b/entity/pokemon/drizzile.json index 00e935f12..7d70ff1de 100644 --- a/entity/pokemon/drizzile.json +++ b/entity/pokemon/drizzile.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.drizzile.idle", + "ground_idle": "animation.drizzile.ground_idle", + "air_idle": "animation.drizzile.ground_idle", + "water_idle": "animation.drizzile.ground_idle", "walking": "animation.drizzile.walking", "flying": "animation.drizzile.walking", "swimming": "animation.drizzile.walking", - "sleeping": "animation.drizzile.idle", - "fall_asleep": "animation.drizzile.fall_asleep", - "wake_up": "animation.drizzile.wake_up", + "sleeping": "animation.drizzile.ground_idle", "attack": "animation.drizzile.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/drowzee.json b/entity/pokemon/drowzee.json index 8590f0c33..bfe138a4a 100644 --- a/entity/pokemon/drowzee.json +++ b/entity/pokemon/drowzee.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.drowzee.idle", + "ground_idle": "animation.drowzee.ground_idle", + "air_idle": "animation.drowzee.ground_idle", + "water_idle": "animation.drowzee.ground_idle", "walking": "animation.drowzee.walking", "flying": "animation.drowzee.walking", "swimming": "animation.drowzee.walking", - "sleeping": "animation.drowzee.idle", - "fall_asleep": "animation.drowzee.fall_asleep", - "wake_up": "animation.drowzee.wake_up", + "sleeping": "animation.drowzee.ground_idle", "attack": "animation.drowzee.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/dugtrio.json b/entity/pokemon/dugtrio.json index 003ae67e1..0374330da 100644 --- a/entity/pokemon/dugtrio.json +++ b/entity/pokemon/dugtrio.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.dugtrio.idle", + "ground_idle": "animation.dugtrio.ground_idle", + "air_idle": "animation.dugtrio.ground_idle", + "water_idle": "animation.dugtrio.ground_idle", "walking": "animation.dugtrio.walking", "flying": "animation.dugtrio.walking", "swimming": "animation.dugtrio.walking", - "sleeping": "animation.dugtrio.idle", - "fall_asleep": "animation.dugtrio.fall_asleep", - "wake_up": "animation.dugtrio.wake_up", - "attack": "animation.dugtrio.idle", + "sleeping": "animation.dugtrio.ground_idle", + "attack": "animation.dugtrio.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/eevee.json b/entity/pokemon/eevee.json index 3176cb327..f4ee73655 100644 --- a/entity/pokemon/eevee.json +++ b/entity/pokemon/eevee.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.eevee.idle", + "ground_idle": "animation.eevee.ground_idle", + "air_idle": "animation.eevee.ground_idle", + "water_idle": "animation.eevee.ground_idle", "walking": "animation.eevee.walking", "flying": "animation.eevee.walking", "swimming": "animation.eevee.walking", "sleeping": "animation.eevee.sleeping", - "fall_asleep": "animation.eevee.fall_asleep", - "wake_up": "animation.eevee.wake_up", "attack": "animation.eevee.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/ekans.json b/entity/pokemon/ekans.json index c50360eae..5b5acdc89 100644 --- a/entity/pokemon/ekans.json +++ b/entity/pokemon/ekans.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.ekans.idle", + "ground_idle": "animation.ekans.ground_idle", + "air_idle": "animation.ekans.ground_idle", + "water_idle": "animation.ekans.ground_idle", "walking": "animation.ekans.walking", "flying": "animation.ekans.walking", "swimming": "animation.ekans.walking", - "sleeping": "animation.ekans.idle", - "fall_asleep": "animation.ekans.fall_asleep", - "wake_up": "animation.ekans.wake_up", + "sleeping": "animation.ekans.ground_idle", "attack": "animation.ekans.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/electabuzz.json b/entity/pokemon/electabuzz.json index 85e98c096..78510fb81 100644 --- a/entity/pokemon/electabuzz.json +++ b/entity/pokemon/electabuzz.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.electabuzz.idle", + "ground_idle": "animation.electabuzz.ground_idle", + "air_idle": "animation.electabuzz.ground_idle", + "water_idle": "animation.electabuzz.ground_idle", "walking": "animation.electabuzz.walking", "flying": "animation.electabuzz.walking", "swimming": "animation.electabuzz.walking", - "sleeping": "animation.electabuzz.idle", - "fall_asleep": "animation.electabuzz.fall_asleep", - "wake_up": "animation.electabuzz.wake_up", - "attack": "animation.electabuzz.idle", + "sleeping": "animation.electabuzz.ground_idle", + "attack": "animation.electabuzz.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/electivire.json b/entity/pokemon/electivire.json index 3dba233ee..b0bc5230b 100644 --- a/entity/pokemon/electivire.json +++ b/entity/pokemon/electivire.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.electivire.idle", + "ground_idle": "animation.electivire.ground_idle", + "air_idle": "animation.electivire.air_idle", + "water_idle": "animation.electivire.water_idle", "walking": "animation.electivire.walking", "flying": "animation.electivire.flying", "swimming": "animation.electivire.swimming", "sleeping": "animation.electivire.sleeping", - "fall_asleep": "animation.electivire.fall_asleep", - "wake_up": "animation.electivire.wake_up", "attack": "animation.electivire.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/electrode.json b/entity/pokemon/electrode.json index b0b2e9791..666354a17 100644 --- a/entity/pokemon/electrode.json +++ b/entity/pokemon/electrode.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.electrode.idle", + "ground_idle": "animation.electrode.ground_idle", + "air_idle": "animation.electrode.ground_idle", + "water_idle": "animation.electrode.ground_idle", "walking": "animation.electrode.walking", "flying": "animation.electrode.walking", "swimming": "animation.electrode.walking", "sleeping": "animation.electrode.sleeping", - "fall_asleep": "animation.electrode.fall_asleep", - "wake_up": "animation.electrode.wake_up", - "attack": "animation.electrode.idle", + "attack": "animation.electrode.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/elekid.json b/entity/pokemon/elekid.json index 6c6d2404f..fb5e53c07 100644 --- a/entity/pokemon/elekid.json +++ b/entity/pokemon/elekid.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.elekid.idle", + "ground_idle": "animation.elekid.ground_idle", + "air_idle": "animation.elekid.ground_idle", + "water_idle": "animation.elekid.ground_idle", "walking": "animation.elekid.walking", "flying": "animation.elekid.walking", "swimming": "animation.elekid.walking", - "sleeping": "animation.elekid.idle", - "fall_asleep": "animation.elekid.fall_asleep", - "wake_up": "animation.elekid.wake_up", - "attack": "animation.elekid.idle", + "sleeping": "animation.elekid.ground_idle", + "attack": "animation.elekid.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/emboar.json b/entity/pokemon/emboar.json index 19fd21e57..9fd8f6a43 100644 --- a/entity/pokemon/emboar.json +++ b/entity/pokemon/emboar.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.emboar.idle", + "ground_idle": "animation.emboar.ground_idle", + "air_idle": "animation.emboar.ground_idle", + "water_idle": "animation.emboar.ground_idle", "walking": "animation.emboar.walking", "flying": "animation.emboar.walking", "swimming": "animation.emboar.walking", - "sleeping": "animation.emboar.idle", - "fall_asleep": "animation.emboar.fall_asleep", - "wake_up": "animation.emboar.wake_up", + "sleeping": "animation.emboar.ground_idle", "attack": "animation.emboar.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/empoleon.json b/entity/pokemon/empoleon.json index 12ceba73f..923d72f5d 100644 --- a/entity/pokemon/empoleon.json +++ b/entity/pokemon/empoleon.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.empoleon.idle", + "ground_idle": "animation.empoleon.ground_idle", + "air_idle": "animation.empoleon.ground_idle", + "water_idle": "animation.empoleon.ground_idle", "walking": "animation.empoleon.walking", "flying": "animation.empoleon.walking", "swimming": "animation.empoleon.walking", - "sleeping": "animation.empoleon.idle", - "fall_asleep": "animation.empoleon.fall_asleep", - "wake_up": "animation.empoleon.wake_up", + "sleeping": "animation.empoleon.ground_idle", "attack": "animation.empoleon.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/entei.json b/entity/pokemon/entei.json index c1bc1aa97..87643cfbc 100644 --- a/entity/pokemon/entei.json +++ b/entity/pokemon/entei.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.entei.idle", + "ground_idle": "animation.entei.ground_idle", + "air_idle": "animation.entei.ground_idle", + "water_idle": "animation.entei.ground_idle", "walking": "animation.entei.walking", "flying": "animation.entei.walking", "swimming": "animation.entei.walking", - "sleeping": "animation.entei.idle", - "fall_asleep": "animation.entei.fall_asleep", - "wake_up": "animation.entei.wake_up", - "attack": "animation.entei.idle", + "sleeping": "animation.entei.ground_idle", + "attack": "animation.entei.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/espeon.json b/entity/pokemon/espeon.json index 8b0631649..31fb99a28 100644 --- a/entity/pokemon/espeon.json +++ b/entity/pokemon/espeon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.espeon.idle", + "ground_idle": "animation.espeon.ground_idle", + "air_idle": "animation.espeon.ground_idle", + "water_idle": "animation.espeon.ground_idle", "walking": "animation.espeon.walking", "flying": "animation.espeon.walking", "swimming": "animation.espeon.walking", - "sleeping": "animation.espeon.idle", - "fall_asleep": "animation.espeon.fall_asleep", - "wake_up": "animation.espeon.wake_up", - "attack": "animation.espeon.idle", + "sleeping": "animation.espeon.ground_idle", + "attack": "animation.espeon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/exeggcute.json b/entity/pokemon/exeggcute.json index cfdc37601..64cfe072d 100644 --- a/entity/pokemon/exeggcute.json +++ b/entity/pokemon/exeggcute.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.exeggcute.idle", + "ground_idle": "animation.exeggcute.ground_idle", + "air_idle": "animation.exeggcute.ground_idle", + "water_idle": "animation.exeggcute.ground_idle", "walking": "animation.exeggcute.walking", "flying": "animation.exeggcute.walking", "swimming": "animation.exeggcute.walking", - "sleeping": "animation.exeggcute.idle", - "fall_asleep": "animation.exeggcute.fall_asleep", - "wake_up": "animation.exeggcute.wake_up", - "attack": "animation.exeggcute.idle", + "sleeping": "animation.exeggcute.ground_idle", + "attack": "animation.exeggcute.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/exeggutor.json b/entity/pokemon/exeggutor.json index 0268b7dc4..7fb929e79 100644 --- a/entity/pokemon/exeggutor.json +++ b/entity/pokemon/exeggutor.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.exeggutor.idle", + "ground_idle": "animation.exeggutor.ground_idle", + "air_idle": "animation.exeggutor.ground_idle", + "water_idle": "animation.exeggutor.ground_idle", "walking": "animation.exeggutor.walking", "flying": "animation.exeggutor.walking", "swimming": "animation.exeggutor.walking", - "sleeping": "animation.exeggutor.idle", - "fall_asleep": "animation.exeggutor.fall_asleep", - "wake_up": "animation.exeggutor.wake_up", - "attack": "animation.exeggutor.idle", + "sleeping": "animation.exeggutor.ground_idle", + "attack": "animation.exeggutor.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/farfetchd.json b/entity/pokemon/farfetchd.json index 0db1ef54c..ebed5781e 100644 --- a/entity/pokemon/farfetchd.json +++ b/entity/pokemon/farfetchd.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.farfetchd.idle", + "ground_idle": "animation.farfetchd.ground_idle", + "air_idle": "animation.farfetchd.ground_idle", + "water_idle": "animation.farfetchd.ground_idle", "walking": "animation.farfetchd.walking", "flying": "animation.farfetchd.flying", "swimming": "animation.farfetchd.walking", - "sleeping": "animation.farfetchd.idle", - "fall_asleep": "animation.farfetchd.fall_asleep", - "wake_up": "animation.farfetchd.wake_up", - "attack": "animation.farfetchd.idle", + "sleeping": "animation.farfetchd.ground_idle", + "attack": "animation.farfetchd.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/fennekin.json b/entity/pokemon/fennekin.json index e313baa45..c8dec5574 100644 --- a/entity/pokemon/fennekin.json +++ b/entity/pokemon/fennekin.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.fennekin.idle", + "ground_idle": "animation.fennekin.ground_idle", + "air_idle": "animation.fennekin.air_idle", + "water_idle": "animation.fennekin.water_idle", "walking": "animation.fennekin.walking", "flying": "animation.fennekin.flying", "swimming": "animation.fennekin.swimming", "sleeping": "animation.fennekin.sleeping", - "fall_asleep": "animation.fennekin.fall_asleep", - "wake_up": "animation.fennekin.wake_up", "attack": "animation.fennekin.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/feraligatr.json b/entity/pokemon/feraligatr.json index ea16f3e59..c23bca788 100644 --- a/entity/pokemon/feraligatr.json +++ b/entity/pokemon/feraligatr.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.feraligatr.idle", + "ground_idle": "animation.feraligatr.ground_idle", + "air_idle": "animation.feraligatr.ground_idle", + "water_idle": "animation.feraligatr.ground_idle", "walking": "animation.feraligatr.walking", "flying": "animation.feraligatr.walking", "swimming": "animation.feraligatr.walking", - "sleeping": "animation.feraligatr.idle", - "fall_asleep": "animation.feraligatr.fall_asleep", - "wake_up": "animation.feraligatr.wake_up", + "sleeping": "animation.feraligatr.ground_idle", "attack": "animation.feraligatr.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/flaaffy.json b/entity/pokemon/flaaffy.json index 1434c7338..81851c1e2 100644 --- a/entity/pokemon/flaaffy.json +++ b/entity/pokemon/flaaffy.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.flaaffy.idle", + "ground_idle": "animation.flaaffy.ground_idle", + "air_idle": "animation.flaaffy.ground_idle", + "water_idle": "animation.flaaffy.water_idle", "walking": "animation.flaaffy.walking", "flying": "animation.flaaffy.walking", - "swimming": "animation.flaaffy.walking", - "sleeping": "animation.flaaffy.idle", - "fall_asleep": "animation.flaaffy.fall_asleep", - "wake_up": "animation.flaaffy.wake_up", - "attack": "animation.flaaffy.idle", + "swimming": "animation.flaaffy.swimming", + "sleeping": "animation.flaaffy.sleeping", + "attack": "animation.flaaffy.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/flareon.json b/entity/pokemon/flareon.json index 53271244a..ea75ace02 100644 --- a/entity/pokemon/flareon.json +++ b/entity/pokemon/flareon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.flareon.idle", + "ground_idle": "animation.flareon.ground_idle", + "air_idle": "animation.flareon.ground_idle", + "water_idle": "animation.flareon.ground_idle", "walking": "animation.flareon.walking", "flying": "animation.flareon.walking", "swimming": "animation.flareon.walking", - "sleeping": "animation.flareon.idle", - "fall_asleep": "animation.flareon.fall_asleep", - "wake_up": "animation.flareon.wake_up", - "attack": "animation.flareon.idle", + "sleeping": "animation.flareon.ground_idle", + "attack": "animation.flareon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/floatzel.json b/entity/pokemon/floatzel.json index c33494665..24d5e07cb 100644 --- a/entity/pokemon/floatzel.json +++ b/entity/pokemon/floatzel.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.floatzel.idle", + "ground_idle": "animation.floatzel.ground_idle", + "air_idle": "animation.floatzel.ground_idle", + "water_idle": "animation.floatzel.ground_idle", "walking": "animation.floatzel.walking", "flying": "animation.floatzel.walking", "swimming": "animation.floatzel.walking", - "sleeping": "animation.floatzel.idle", - "fall_asleep": "animation.floatzel.fall_asleep", - "wake_up": "animation.floatzel.wake_up", - "attack": "animation.floatzel.idle", + "sleeping": "animation.floatzel.ground_idle", + "attack": "animation.floatzel.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/floragato.json b/entity/pokemon/floragato.json index bba06eafa..c0986e1ef 100644 --- a/entity/pokemon/floragato.json +++ b/entity/pokemon/floragato.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.floragato.idle", + "ground_idle": "animation.floragato.ground_idle", + "air_idle": "animation.floragato.ground_idle", + "water_idle": "animation.floragato.ground_idle", "walking": "animation.floragato.walking", "flying": "animation.floragato.walking", "swimming": "animation.floragato.walking", - "sleeping": "animation.floragato.idle", - "fall_asleep": "animation.floragato.fall_asleep", - "wake_up": "animation.floragato.wake_up", + "sleeping": "animation.floragato.ground_idle", "attack": "animation.floragato.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/forretress.json b/entity/pokemon/forretress.json index 7bd19a83c..003f522c7 100644 --- a/entity/pokemon/forretress.json +++ b/entity/pokemon/forretress.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.forretress.idle", + "ground_idle": "animation.forretress.ground_idle", + "air_idle": "animation.forretress.ground_idle", + "water_idle": "animation.forretress.ground_idle", "walking": "animation.forretress.walking", "flying": "animation.forretress.walking", "swimming": "animation.forretress.walking", - "sleeping": "animation.forretress.idle", - "fall_asleep": "animation.forretress.fall_asleep", - "wake_up": "animation.forretress.wake_up", - "attack": "animation.forretress.idle", + "sleeping": "animation.forretress.ground_idle", + "attack": "animation.forretress.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/fraxure.json b/entity/pokemon/fraxure.json index 8c7b41863..35836399b 100644 --- a/entity/pokemon/fraxure.json +++ b/entity/pokemon/fraxure.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.fraxure.idle", + "ground_idle": "animation.fraxure.ground_idle", + "air_idle": "animation.fraxure.ground_idle", + "water_idle": "animation.fraxure.ground_idle", "walking": "animation.fraxure.walking", "flying": "animation.fraxure.walking", "swimming": "animation.fraxure.walking", - "sleeping": "animation.fraxure.idle", - "fall_asleep": "animation.fraxure.fall_asleep", - "wake_up": "animation.fraxure.wake_up", - "attack": "animation.fraxure.idle", + "sleeping": "animation.fraxure.ground_idle", + "attack": "animation.fraxure.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/froakie.json b/entity/pokemon/froakie.json index 0faa57fc0..32b29a022 100644 --- a/entity/pokemon/froakie.json +++ b/entity/pokemon/froakie.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.froakie.idle", + "ground_idle": "animation.froakie.ground_idle", + "air_idle": "animation.froakie.ground_idle", + "water_idle": "animation.froakie.ground_idle", "walking": "animation.froakie.walking", "flying": "animation.froakie.walking", "swimming": "animation.froakie.walking", - "sleeping": "animation.froakie.idle", - "fall_asleep": "animation.froakie.fall_asleep", - "wake_up": "animation.froakie.wake_up", + "sleeping": "animation.froakie.ground_idle", "attack": "animation.froakie.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/frogadier.json b/entity/pokemon/frogadier.json index 54e738d4d..27b0e23a8 100644 --- a/entity/pokemon/frogadier.json +++ b/entity/pokemon/frogadier.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.frogadier.idle", + "ground_idle": "animation.frogadier.ground_idle", + "air_idle": "animation.frogadier.ground_idle", + "water_idle": "animation.frogadier.ground_idle", "walking": "animation.frogadier.walking", "flying": "animation.frogadier.walking", "swimming": "animation.frogadier.walking", - "sleeping": "animation.frogadier.idle", - "fall_asleep": "animation.frogadier.fall_asleep", - "wake_up": "animation.frogadier.wake_up", + "sleeping": "animation.frogadier.ground_idle", "attack": "animation.frogadier.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/fuecoco.json b/entity/pokemon/fuecoco.json index 83d13e761..fe4fa3b97 100644 --- a/entity/pokemon/fuecoco.json +++ b/entity/pokemon/fuecoco.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.fuecoco.idle", + "ground_idle": "animation.fuecoco.ground_idle", + "air_idle": "animation.fuecoco.ground_idle", + "water_idle": "animation.fuecoco.ground_idle", "walking": "animation.fuecoco.walking", "flying": "animation.fuecoco.walking", "swimming": "animation.fuecoco.walking", - "sleeping": "animation.fuecoco.idle", - "fall_asleep": "animation.fuecoco.fall_asleep", - "wake_up": "animation.fuecoco.wake_up", + "sleeping": "animation.fuecoco.ground_idle", "attack": "animation.fuecoco.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/furret.json b/entity/pokemon/furret.json index 478eb882b..71890ee01 100644 --- a/entity/pokemon/furret.json +++ b/entity/pokemon/furret.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.furret.idle", + "ground_idle": "animation.furret.ground_idle", + "air_idle": "animation.furret.ground_idle", + "water_idle": "animation.furret.ground_idle", "walking": "animation.furret.walking", "flying": "animation.furret.walking", - "swimming": "animation.furret.walking", - "sleeping": "animation.furret.idle", - "fall_asleep": "animation.furret.fall_asleep", - "wake_up": "animation.furret.wake_up", - "attack": "animation.furret.idle", + "swimming": "animation.furret.swimming", + "sleeping": "animation.furret.sleeping", + "attack": "animation.furret.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/gabite.json b/entity/pokemon/gabite.json index a876c601e..b1232b890 100644 --- a/entity/pokemon/gabite.json +++ b/entity/pokemon/gabite.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.gabite.idle", + "ground_idle": "animation.gabite.ground_idle", + "air_idle": "animation.gabite.ground_idle", + "water_idle": "animation.gabite.ground_idle", "walking": "animation.gabite.walking", "flying": "animation.gabite.flying", "swimming": "animation.gabite.walking", - "sleeping": "animation.gabite.idle", - "fall_asleep": "animation.gabite.fall_asleep", - "wake_up": "animation.gabite.wake_up", - "attack": "animation.gabite.idle", + "sleeping": "animation.gabite.ground_idle", + "attack": "animation.gabite.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/garchomp.json b/entity/pokemon/garchomp.json index d9d18f485..db06e42fb 100644 --- a/entity/pokemon/garchomp.json +++ b/entity/pokemon/garchomp.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.garchomp.idle", + "ground_idle": "animation.garchomp.ground_idle", + "air_idle": "animation.garchomp.ground_idle", + "water_idle": "animation.garchomp.ground_idle", "walking": "animation.garchomp.walking", "flying": "animation.garchomp.flying", "swimming": "animation.garchomp.walking", - "sleeping": "animation.garchomp.idle", - "fall_asleep": "animation.garchomp.fall_asleep", - "wake_up": "animation.garchomp.wake_up", - "attack": "animation.garchomp.idle", + "sleeping": "animation.garchomp.ground_idle", + "attack": "animation.garchomp.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/gardevoir.json b/entity/pokemon/gardevoir.json index 78346031c..18d5198f7 100644 --- a/entity/pokemon/gardevoir.json +++ b/entity/pokemon/gardevoir.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.gardevoir.idle", + "ground_idle": "animation.gardevoir.ground_idle", + "air_idle": "animation.gardevoir.air_idle", + "water_idle": "animation.gardevoir.water_idle", "walking": "animation.gardevoir.walking", - "flying": "animation.gardevoir.walking", + "flying": "animation.gardevoir.flying", "swimming": "animation.gardevoir.walking", "sleeping": "animation.gardevoir.sleeping", - "fall_asleep": "animation.gardevoir.fall_asleep", - "wake_up": "animation.gardevoir.wake_up", "attack": "animation.gardevoir.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/gastly.json b/entity/pokemon/gastly.json index 9ae3c92eb..29dafc07a 100644 --- a/entity/pokemon/gastly.json +++ b/entity/pokemon/gastly.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.gastly.idle", + "ground_idle": "animation.gastly.ground_idle", + "air_idle": "animation.gastly.ground_idle", + "water_idle": "animation.gastly.ground_idle", "walking": "animation.gastly.walking", "flying": "animation.gastly.walking", "swimming": "animation.gastly.walking", - "sleeping": "animation.gastly.idle", - "fall_asleep": "animation.gastly.fall_asleep", - "wake_up": "animation.gastly.wake_up", - "attack": "animation.gastly.idle", + "sleeping": "animation.gastly.ground_idle", + "attack": "animation.gastly.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/gastrodon.json b/entity/pokemon/gastrodon.json index 6103de225..9978abe93 100644 --- a/entity/pokemon/gastrodon.json +++ b/entity/pokemon/gastrodon.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.gastrodon.idle", + "ground_idle": "animation.gastrodon.ground_idle", + "air_idle": "animation.gastrodon.air_idle", + "water_idle": "animation.gastrodon.water_idle", "walking": "animation.gastrodon.walking", "flying": "animation.gastrodon.flying", "swimming": "animation.gastrodon.swimming", "sleeping": "animation.gastrodon.sleeping", - "fall_asleep": "animation.gastrodon.fall_asleep", - "wake_up": "animation.gastrodon.wake_up", "attack": "animation.gastrodon.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/gengar.json b/entity/pokemon/gengar.json index 73fa943e3..33821d5eb 100644 --- a/entity/pokemon/gengar.json +++ b/entity/pokemon/gengar.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.gengar.idle", + "ground_idle": "animation.gengar.ground_idle", + "air_idle": "animation.gengar.ground_idle", + "water_idle": "animation.gengar.ground_idle", "walking": "animation.gengar.walking", "flying": "animation.gengar.walking", "swimming": "animation.gengar.walking", - "sleeping": "animation.gengar.idle", - "fall_asleep": "animation.gengar.fall_asleep", - "wake_up": "animation.gengar.wake_up", - "attack": "animation.gengar.idle", + "sleeping": "animation.gengar.ground_idle", + "attack": "animation.gengar.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/geodude.json b/entity/pokemon/geodude.json index 7cb521d87..9509d262f 100644 --- a/entity/pokemon/geodude.json +++ b/entity/pokemon/geodude.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.geodude.idle", + "ground_idle": "animation.geodude.ground_idle", + "air_idle": "animation.geodude.ground_idle", + "water_idle": "animation.geodude.ground_idle", "walking": "animation.geodude.walking", "flying": "animation.geodude.walking", "swimming": "animation.geodude.walking", - "sleeping": "animation.geodude.idle", - "fall_asleep": "animation.geodude.fall_asleep", - "wake_up": "animation.geodude.wake_up", - "attack": "animation.geodude.idle", + "sleeping": "animation.geodude.ground_idle", + "attack": "animation.geodude.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/gible.json b/entity/pokemon/gible.json index 8a683dce9..a3ff8a7b7 100644 --- a/entity/pokemon/gible.json +++ b/entity/pokemon/gible.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.gible.idle", + "ground_idle": "animation.gible.ground_idle", + "air_idle": "animation.gible.ground_idle", + "water_idle": "animation.gible.ground_idle", "walking": "animation.gible.walking", "flying": "animation.gible.walking", "swimming": "animation.gible.walking", - "sleeping": "animation.gible.idle", - "fall_asleep": "animation.gible.fall_asleep", - "wake_up": "animation.gible.wake_up", - "attack": "animation.gible.idle", + "sleeping": "animation.gible.ground_idle", + "attack": "animation.gible.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/girafarig.json b/entity/pokemon/girafarig.json index 0c7c87b4f..cac4ec41c 100644 --- a/entity/pokemon/girafarig.json +++ b/entity/pokemon/girafarig.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.girafarig.idle", + "ground_idle": "animation.girafarig.ground_idle", + "air_idle": "animation.girafarig.ground_idle", + "water_idle": "animation.girafarig.ground_idle", "walking": "animation.girafarig.walking", "flying": "animation.girafarig.walking", "swimming": "animation.girafarig.walking", - "sleeping": "animation.girafarig.idle", - "fall_asleep": "animation.girafarig.fall_asleep", - "wake_up": "animation.girafarig.wake_up", - "attack": "animation.girafarig.idle", + "sleeping": "animation.girafarig.ground_idle", + "attack": "animation.girafarig.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/giratina.json b/entity/pokemon/giratina.json index 741b092e8..8ab9cf7c9 100644 --- a/entity/pokemon/giratina.json +++ b/entity/pokemon/giratina.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.giratina.idle", + "ground_idle": "animation.giratina.ground_idle", + "air_idle": "animation.giratina.ground_idle", + "water_idle": "animation.giratina.ground_idle", "walking": "animation.giratina.walking", "flying": "animation.giratina.walking", "swimming": "animation.giratina.walking", - "sleeping": "animation.giratina.idle", - "fall_asleep": "animation.giratina.fall_asleep", - "wake_up": "animation.giratina.wake_up", - "attack": "animation.giratina.idle", + "sleeping": "animation.giratina.ground_idle", + "attack": "animation.giratina.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/glaceon.json b/entity/pokemon/glaceon.json index 92151c181..300bc754f 100644 --- a/entity/pokemon/glaceon.json +++ b/entity/pokemon/glaceon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.glaceon.idle", + "ground_idle": "animation.glaceon.ground_idle", + "air_idle": "animation.glaceon.ground_idle", + "water_idle": "animation.glaceon.ground_idle", "walking": "animation.glaceon.walking", "flying": "animation.glaceon.walking", "swimming": "animation.glaceon.walking", - "sleeping": "animation.glaceon.idle", - "fall_asleep": "animation.glaceon.fall_asleep", - "wake_up": "animation.glaceon.wake_up", - "attack": "animation.glaceon.idle", + "sleeping": "animation.glaceon.ground_idle", + "attack": "animation.glaceon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/gligar.json b/entity/pokemon/gligar.json index 308923697..812083ff0 100644 --- a/entity/pokemon/gligar.json +++ b/entity/pokemon/gligar.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.gligar.idle", + "ground_idle": "animation.gligar.ground_idle", + "air_idle": "animation.gligar.ground_idle", + "water_idle": "animation.gligar.ground_idle", "walking": "animation.gligar.walking", "flying": "animation.gligar.walking", "swimming": "animation.gligar.walking", - "sleeping": "animation.gligar.idle", - "fall_asleep": "animation.gligar.fall_asleep", - "wake_up": "animation.gligar.wake_up", - "attack": "animation.gligar.idle", + "sleeping": "animation.gligar.ground_idle", + "attack": "animation.gligar.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/gliscor.json b/entity/pokemon/gliscor.json index 3c26110a7..61fe654da 100644 --- a/entity/pokemon/gliscor.json +++ b/entity/pokemon/gliscor.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.gliscor.idle", + "ground_idle": "animation.gliscor.ground_idle", + "air_idle": "animation.gliscor.air_idle", + "water_idle": "animation.gliscor.water_idle", "walking": "animation.gliscor.walking", "flying": "animation.gliscor.flying", "swimming": "animation.gliscor.swimming", "sleeping": "animation.gliscor.sleeping", - "fall_asleep": "animation.gliscor.fall_asleep", - "wake_up": "animation.gliscor.wake_up", "attack": "animation.gliscor.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/gloom.json b/entity/pokemon/gloom.json index ee87c9152..21315b565 100644 --- a/entity/pokemon/gloom.json +++ b/entity/pokemon/gloom.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.gloom.idle", + "ground_idle": "animation.gloom.ground_idle", + "air_idle": "animation.gloom.ground_idle", + "water_idle": "animation.gloom.ground_idle", "walking": "animation.gloom.walking", "flying": "animation.gloom.walking", "swimming": "animation.gloom.walking", - "sleeping": "animation.gloom.idle", - "fall_asleep": "animation.gloom.fall_asleep", - "wake_up": "animation.gloom.wake_up", + "sleeping": "animation.gloom.ground_idle", "attack": "animation.gloom.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/golbat.json b/entity/pokemon/golbat.json index 19f31df57..a8735c7af 100644 --- a/entity/pokemon/golbat.json +++ b/entity/pokemon/golbat.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.golbat.idle", + "ground_idle": "animation.golbat.ground_idle", + "air_idle": "animation.golbat.ground_idle", + "water_idle": "animation.golbat.ground_idle", "walking": "animation.golbat.walking", "flying": "animation.golbat.walking", "swimming": "animation.golbat.walking", - "sleeping": "animation.golbat.idle", - "fall_asleep": "animation.golbat.fall_asleep", - "wake_up": "animation.golbat.wake_up", + "sleeping": "animation.golbat.ground_idle", "attack": "animation.golbat.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/goldeen.json b/entity/pokemon/goldeen.json index b0796a25e..3c76fd1fe 100644 --- a/entity/pokemon/goldeen.json +++ b/entity/pokemon/goldeen.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.goldeen.idle", + "ground_idle": "animation.goldeen.ground_idle", + "air_idle": "animation.goldeen.ground_idle", + "water_idle": "animation.goldeen.ground_idle", "walking": "animation.goldeen.walking", "flying": "animation.goldeen.walking", "swimming": "animation.goldeen.walking", - "sleeping": "animation.goldeen.idle", - "fall_asleep": "animation.goldeen.fall_asleep", - "wake_up": "animation.goldeen.wake_up", - "attack": "animation.goldeen.idle", + "sleeping": "animation.goldeen.ground_idle", + "attack": "animation.goldeen.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/golduck.json b/entity/pokemon/golduck.json index adf246e8e..3215a2fca 100644 --- a/entity/pokemon/golduck.json +++ b/entity/pokemon/golduck.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.golduck.idle", + "ground_idle": "animation.golduck.ground_idle", + "air_idle": "animation.golduck.ground_idle", + "water_idle": "animation.golduck.ground_idle", "walking": "animation.golduck.walking", "flying": "animation.golduck.walking", "swimming": "animation.golduck.walking", - "sleeping": "animation.golduck.idle", - "fall_asleep": "animation.golduck.fall_asleep", - "wake_up": "animation.golduck.wake_up", - "attack": "animation.golduck.idle", + "sleeping": "animation.golduck.ground_idle", + "attack": "animation.golduck.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/golem.json b/entity/pokemon/golem.json index 9b16615f4..ea3df60bf 100644 --- a/entity/pokemon/golem.json +++ b/entity/pokemon/golem.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.golem.idle", + "ground_idle": "animation.golem.ground_idle", + "air_idle": "animation.golem.ground_idle", + "water_idle": "animation.golem.ground_idle", "walking": "animation.golem.walking", "flying": "animation.golem.walking", "swimming": "animation.golem.walking", - "sleeping": "animation.golem.idle", - "fall_asleep": "animation.golem.fall_asleep", - "wake_up": "animation.golem.wake_up", - "attack": "animation.golem.idle", + "sleeping": "animation.golem.ground_idle", + "attack": "animation.golem.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/graveler.json b/entity/pokemon/graveler.json index b44b838d1..e353a44ed 100644 --- a/entity/pokemon/graveler.json +++ b/entity/pokemon/graveler.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.graveler.idle", + "ground_idle": "animation.graveler.ground_idle", + "air_idle": "animation.graveler.ground_idle", + "water_idle": "animation.graveler.ground_idle", "walking": "animation.graveler.walking", "flying": "animation.graveler.walking", "swimming": "animation.graveler.walking", - "sleeping": "animation.graveler.idle", - "fall_asleep": "animation.graveler.fall_asleep", - "wake_up": "animation.graveler.wake_up", - "attack": "animation.graveler.idle", + "sleeping": "animation.graveler.ground_idle", + "attack": "animation.graveler.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/greninja.json b/entity/pokemon/greninja.json index 7166777c9..fd69e0b97 100644 --- a/entity/pokemon/greninja.json +++ b/entity/pokemon/greninja.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.greninja.idle", + "ground_idle": "animation.greninja.ground_idle", + "air_idle": "animation.greninja.ground_idle", + "water_idle": "animation.greninja.ground_idle", "walking": "animation.greninja.walking", "flying": "animation.greninja.walking", "swimming": "animation.greninja.walking", - "sleeping": "animation.greninja.idle", - "fall_asleep": "animation.greninja.fall_asleep", - "wake_up": "animation.greninja.wake_up", + "sleeping": "animation.greninja.ground_idle", "attack": "animation.greninja.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/grookey.json b/entity/pokemon/grookey.json index 4854adc85..f419f7293 100644 --- a/entity/pokemon/grookey.json +++ b/entity/pokemon/grookey.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.grookey.idle", + "ground_idle": "animation.grookey.ground_idle", + "air_idle": "animation.grookey.ground_idle", + "water_idle": "animation.grookey.ground_idle", "walking": "animation.grookey.walking", "flying": "animation.grookey.walking", "swimming": "animation.grookey.walking", - "sleeping": "animation.grookey.idle", - "fall_asleep": "animation.grookey.fall_asleep", - "wake_up": "animation.grookey.wake_up", + "sleeping": "animation.grookey.ground_idle", "attack": "animation.grookey.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/grotle.json b/entity/pokemon/grotle.json index 2dc3249f6..9173ff082 100644 --- a/entity/pokemon/grotle.json +++ b/entity/pokemon/grotle.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.grotle.idle", + "ground_idle": "animation.grotle.ground_idle", + "air_idle": "animation.grotle.ground_idle", + "water_idle": "animation.grotle.ground_idle", "walking": "animation.grotle.walking", "flying": "animation.grotle.walking", "swimming": "animation.grotle.walking", - "sleeping": "animation.grotle.idle", - "fall_asleep": "animation.grotle.fall_asleep", - "wake_up": "animation.grotle.wake_up", + "sleeping": "animation.grotle.ground_idle", "attack": "animation.grotle.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/groudon.json b/entity/pokemon/groudon.json index 4b94d29b2..e14407cdd 100644 --- a/entity/pokemon/groudon.json +++ b/entity/pokemon/groudon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.groudon.idle", + "ground_idle": "animation.groudon.ground_idle", + "air_idle": "animation.groudon.ground_idle", + "water_idle": "animation.groudon.ground_idle", "walking": "animation.groudon.walking", "flying": "animation.groudon.walking", "swimming": "animation.groudon.walking", - "sleeping": "animation.groudon.idle", - "fall_asleep": "animation.groudon.fall_asleep", - "wake_up": "animation.groudon.wake_up", - "attack": "animation.groudon.idle", + "sleeping": "animation.groudon.ground_idle", + "attack": "animation.groudon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/grovyle.json b/entity/pokemon/grovyle.json index f3e01a3b7..43254db19 100644 --- a/entity/pokemon/grovyle.json +++ b/entity/pokemon/grovyle.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.grovyle.idle", + "ground_idle": "animation.grovyle.ground_idle", + "air_idle": "animation.grovyle.ground_idle", + "water_idle": "animation.grovyle.ground_idle", "walking": "animation.grovyle.walking", "flying": "animation.grovyle.walking", "swimming": "animation.grovyle.walking", - "sleeping": "animation.grovyle.idle", - "fall_asleep": "animation.grovyle.fall_asleep", - "wake_up": "animation.grovyle.wake_up", + "sleeping": "animation.grovyle.ground_idle", "attack": "animation.grovyle.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/growlithe.json b/entity/pokemon/growlithe.json index ee1f7c0b2..85e9b7114 100644 --- a/entity/pokemon/growlithe.json +++ b/entity/pokemon/growlithe.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.growlithe.idle", + "ground_idle": "animation.growlithe.ground_idle", + "air_idle": "animation.growlithe.ground_idle", + "water_idle": "animation.growlithe.ground_idle", "walking": "animation.growlithe.walking", "flying": "animation.growlithe.walking", "swimming": "animation.growlithe.walking", - "sleeping": "animation.growlithe.idle", - "fall_asleep": "animation.growlithe.fall_asleep", - "wake_up": "animation.growlithe.wake_up", - "attack": "animation.growlithe.idle", + "sleeping": "animation.growlithe.ground_idle", + "attack": "animation.growlithe.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/gyarados.json b/entity/pokemon/gyarados.json index 693bf22ca..35f0b4c9d 100644 --- a/entity/pokemon/gyarados.json +++ b/entity/pokemon/gyarados.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.gyarados.idle", + "ground_idle": "animation.gyarados.ground_idle", + "air_idle": "animation.gyarados.ground_idle", + "water_idle": "animation.gyarados.ground_idle", "walking": "animation.gyarados.walking", "flying": "animation.gyarados.walking", "swimming": "animation.gyarados.walking", - "sleeping": "animation.gyarados.idle", - "fall_asleep": "animation.gyarados.fall_asleep", - "wake_up": "animation.gyarados.wake_up", + "sleeping": "animation.gyarados.ground_idle", "attack": "animation.gyarados.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/haunter.json b/entity/pokemon/haunter.json index d230bd07a..29f03c3d9 100644 --- a/entity/pokemon/haunter.json +++ b/entity/pokemon/haunter.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.haunter.idle", + "ground_idle": "animation.haunter.ground_idle", + "air_idle": "animation.haunter.ground_idle", + "water_idle": "animation.haunter.ground_idle", "walking": "animation.haunter.walking", "flying": "animation.haunter.walking", "swimming": "animation.haunter.walking", - "sleeping": "animation.haunter.idle", - "fall_asleep": "animation.haunter.fall_asleep", - "wake_up": "animation.haunter.wake_up", - "attack": "animation.haunter.idle", + "sleeping": "animation.haunter.ground_idle", + "attack": "animation.haunter.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/haxorus.json b/entity/pokemon/haxorus.json index 8cad19f3c..33e8b4e82 100644 --- a/entity/pokemon/haxorus.json +++ b/entity/pokemon/haxorus.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.haxorus.idle", + "ground_idle": "animation.haxorus.ground_idle", + "air_idle": "animation.haxorus.ground_idle", + "water_idle": "animation.haxorus.ground_idle", "walking": "animation.haxorus.walking", "flying": "animation.haxorus.walking", "swimming": "animation.haxorus.walking", - "sleeping": "animation.haxorus.idle", - "fall_asleep": "animation.haxorus.fall_asleep", - "wake_up": "animation.haxorus.wake_up", - "attack": "animation.haxorus.idle", + "sleeping": "animation.haxorus.ground_idle", + "attack": "animation.haxorus.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/heracross.json b/entity/pokemon/heracross.json index c31f9d2fc..727c15b0d 100644 --- a/entity/pokemon/heracross.json +++ b/entity/pokemon/heracross.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.heracross.idle", + "ground_idle": "animation.heracross.ground_idle", + "air_idle": "animation.heracross.ground_idle", + "water_idle": "animation.heracross.ground_idle", "walking": "animation.heracross.walking", "flying": "animation.heracross.walking", "swimming": "animation.heracross.walking", - "sleeping": "animation.heracross.idle", - "fall_asleep": "animation.heracross.fall_asleep", - "wake_up": "animation.heracross.wake_up", - "attack": "animation.heracross.idle", + "sleeping": "animation.heracross.ground_idle", + "attack": "animation.heracross.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/hitmonchan.json b/entity/pokemon/hitmonchan.json index 4b8c99db6..da6a57a56 100644 --- a/entity/pokemon/hitmonchan.json +++ b/entity/pokemon/hitmonchan.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.hitmonchan.idle", + "ground_idle": "animation.hitmonchan.ground_idle", + "air_idle": "animation.hitmonchan.ground_idle", + "water_idle": "animation.hitmonchan.ground_idle", "walking": "animation.hitmonchan.walking", "flying": "animation.hitmonchan.walking", "swimming": "animation.hitmonchan.walking", - "sleeping": "animation.hitmonchan.idle", - "fall_asleep": "animation.hitmonchan.fall_asleep", - "wake_up": "animation.hitmonchan.wake_up", + "sleeping": "animation.hitmonchan.ground_idle", "attack": "animation.hitmonchan.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/hitmonlee.json b/entity/pokemon/hitmonlee.json index aa63a8bed..99b56bb32 100644 --- a/entity/pokemon/hitmonlee.json +++ b/entity/pokemon/hitmonlee.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.hitmonlee.idle", + "ground_idle": "animation.hitmonlee.ground_idle", + "air_idle": "animation.hitmonlee.ground_idle", + "water_idle": "animation.hitmonlee.ground_idle", "walking": "animation.hitmonlee.walking", "flying": "animation.hitmonlee.walking", "swimming": "animation.hitmonlee.walking", - "sleeping": "animation.hitmonlee.idle", - "fall_asleep": "animation.hitmonlee.fall_asleep", - "wake_up": "animation.hitmonlee.wake_up", - "attack": "animation.hitmonlee.idle", + "sleeping": "animation.hitmonlee.ground_idle", + "attack": "animation.hitmonlee.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/hitmontop.json b/entity/pokemon/hitmontop.json index 65ea0d56f..360397aca 100644 --- a/entity/pokemon/hitmontop.json +++ b/entity/pokemon/hitmontop.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.hitmontop.idle", + "ground_idle": "animation.hitmontop.ground_idle", + "air_idle": "animation.hitmontop.ground_idle", + "water_idle": "animation.hitmontop.ground_idle", "walking": "animation.hitmontop.walking", "flying": "animation.hitmontop.walking", "swimming": "animation.hitmontop.walking", - "sleeping": "animation.hitmontop.idle", - "fall_asleep": "animation.hitmontop.fall_asleep", - "wake_up": "animation.hitmontop.wake_up", - "attack": "animation.hitmontop.idle", + "sleeping": "animation.hitmontop.ground_idle", + "attack": "animation.hitmontop.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/honchkrow.json b/entity/pokemon/honchkrow.json index 3e93fb9f9..59a6ad41a 100644 --- a/entity/pokemon/honchkrow.json +++ b/entity/pokemon/honchkrow.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.honchkrow.idle", + "ground_idle": "animation.honchkrow.ground_idle", + "air_idle": "animation.honchkrow.ground_idle", + "water_idle": "animation.honchkrow.ground_idle", "walking": "animation.honchkrow.walking", "flying": "animation.honchkrow.walking", "swimming": "animation.honchkrow.walking", - "sleeping": "animation.honchkrow.idle", - "fall_asleep": "animation.honchkrow.fall_asleep", - "wake_up": "animation.honchkrow.wake_up", - "attack": "animation.honchkrow.idle", + "sleeping": "animation.honchkrow.ground_idle", + "attack": "animation.honchkrow.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/hooh.json b/entity/pokemon/hooh.json index 85b7c666e..6b1401dbf 100644 --- a/entity/pokemon/hooh.json +++ b/entity/pokemon/hooh.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.hooh.idle", + "ground_idle": "animation.hooh.ground_idle", + "air_idle": "animation.hooh.ground_idle", + "water_idle": "animation.hooh.ground_idle", "walking": "animation.hooh.walking", "flying": "animation.hooh.walking", "swimming": "animation.hooh.walking", - "sleeping": "animation.hooh.idle", - "fall_asleep": "animation.hooh.fall_asleep", - "wake_up": "animation.hooh.wake_up", - "attack": "animation.hooh.idle", + "sleeping": "animation.hooh.ground_idle", + "attack": "animation.hooh.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/hoothoot.json b/entity/pokemon/hoothoot.json index 5f0e95af6..a6f3d3166 100644 --- a/entity/pokemon/hoothoot.json +++ b/entity/pokemon/hoothoot.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.hoothoot.idle", + "ground_idle": "animation.hoothoot.ground_idle", + "air_idle": "animation.hoothoot.ground_idle", + "water_idle": "animation.hoothoot.ground_idle", "walking": "animation.hoothoot.walking", "flying": "animation.hoothoot.flying", "swimming": "animation.hoothoot.walking", - "sleeping": "animation.hoothoot.idle", - "fall_asleep": "animation.hoothoot.fall_asleep", - "wake_up": "animation.hoothoot.wake_up", - "attack": "animation.hoothoot.idle", + "sleeping": "animation.hoothoot.ground_idle", + "attack": "animation.hoothoot.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/hoppip.json b/entity/pokemon/hoppip.json index 7e70784a8..e714a7ce6 100644 --- a/entity/pokemon/hoppip.json +++ b/entity/pokemon/hoppip.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.hoppip.idle", + "ground_idle": "animation.hoppip.ground_idle", + "air_idle": "animation.hoppip.ground_idle", + "water_idle": "animation.hoppip.ground_idle", "walking": "animation.hoppip.walking", "flying": "animation.hoppip.walking", "swimming": "animation.hoppip.walking", - "sleeping": "animation.hoppip.idle", - "fall_asleep": "animation.hoppip.fall_asleep", - "wake_up": "animation.hoppip.wake_up", - "attack": "animation.hoppip.idle", + "sleeping": "animation.hoppip.ground_idle", + "attack": "animation.hoppip.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/horsea.json b/entity/pokemon/horsea.json index f8ebd15e1..ff1e87cfa 100644 --- a/entity/pokemon/horsea.json +++ b/entity/pokemon/horsea.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.horsea.idle", + "ground_idle": "animation.horsea.ground_idle", + "air_idle": "animation.horsea.ground_idle", + "water_idle": "animation.horsea.ground_idle", "walking": "animation.horsea.walking", "flying": "animation.horsea.walking", "swimming": "animation.horsea.walking", - "sleeping": "animation.horsea.idle", - "fall_asleep": "animation.horsea.fall_asleep", - "wake_up": "animation.horsea.wake_up", + "sleeping": "animation.horsea.ground_idle", "attack": "animation.horsea.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/houndoom.json b/entity/pokemon/houndoom.json index 14ede82bd..fcacf8eeb 100644 --- a/entity/pokemon/houndoom.json +++ b/entity/pokemon/houndoom.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.houndoom.idle", + "ground_idle": "animation.houndoom.ground_idle", + "air_idle": "animation.houndoom.ground_idle", + "water_idle": "animation.houndoom.ground_idle", "walking": "animation.houndoom.walking", "flying": "animation.houndoom.walking", "swimming": "animation.houndoom.walking", - "sleeping": "animation.houndoom.idle", - "fall_asleep": "animation.houndoom.fall_asleep", - "wake_up": "animation.houndoom.wake_up", - "attack": "animation.houndoom.idle", + "sleeping": "animation.houndoom.ground_idle", + "attack": "animation.houndoom.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/houndour.json b/entity/pokemon/houndour.json index 2c3d63566..1579d553d 100644 --- a/entity/pokemon/houndour.json +++ b/entity/pokemon/houndour.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.houndour.idle", + "ground_idle": "animation.houndour.ground_idle", + "air_idle": "animation.houndour.ground_idle", + "water_idle": "animation.houndour.ground_idle", "walking": "animation.houndour.walking", "flying": "animation.houndour.walking", "swimming": "animation.houndour.walking", - "sleeping": "animation.houndour.idle", - "fall_asleep": "animation.houndour.fall_asleep", - "wake_up": "animation.houndour.wake_up", - "attack": "animation.houndour.idle", + "sleeping": "animation.houndour.ground_idle", + "attack": "animation.houndour.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/hypno.json b/entity/pokemon/hypno.json index 0f2f2a774..489b33c18 100644 --- a/entity/pokemon/hypno.json +++ b/entity/pokemon/hypno.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.hypno.idle", + "ground_idle": "animation.hypno.ground_idle", + "air_idle": "animation.hypno.ground_idle", + "water_idle": "animation.hypno.ground_idle", "walking": "animation.hypno.walking", "flying": "animation.hypno.walking", "swimming": "animation.hypno.walking", - "sleeping": "animation.hypno.idle", - "fall_asleep": "animation.hypno.fall_asleep", - "wake_up": "animation.hypno.wake_up", + "sleeping": "animation.hypno.ground_idle", "attack": "animation.hypno.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/igglybuff.json b/entity/pokemon/igglybuff.json index 65c5d0dfc..19c23734f 100644 --- a/entity/pokemon/igglybuff.json +++ b/entity/pokemon/igglybuff.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.igglybuff.idle", + "ground_idle": "animation.igglybuff.ground_idle", + "air_idle": "animation.igglybuff.ground_idle", + "water_idle": "animation.igglybuff.ground_idle", "walking": "animation.igglybuff.walking", "flying": "animation.igglybuff.walking", "swimming": "animation.igglybuff.walking", - "sleeping": "animation.igglybuff.idle", - "fall_asleep": "animation.igglybuff.fall_asleep", - "wake_up": "animation.igglybuff.wake_up", - "attack": "animation.igglybuff.idle", + "sleeping": "animation.igglybuff.ground_idle", + "attack": "animation.igglybuff.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/incineroar.json b/entity/pokemon/incineroar.json index 60c723bcb..8464cf925 100644 --- a/entity/pokemon/incineroar.json +++ b/entity/pokemon/incineroar.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.incineroar.idle", + "ground_idle": "animation.incineroar.ground_idle", + "air_idle": "animation.incineroar.ground_idle", + "water_idle": "animation.incineroar.ground_idle", "walking": "animation.incineroar.walking", "flying": "animation.incineroar.walking", "swimming": "animation.incineroar.walking", - "sleeping": "animation.incineroar.idle", - "fall_asleep": "animation.incineroar.fall_asleep", - "wake_up": "animation.incineroar.wake_up", + "sleeping": "animation.incineroar.ground_idle", "attack": "animation.incineroar.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/infernape.json b/entity/pokemon/infernape.json index 0aa641832..8ffff389f 100644 --- a/entity/pokemon/infernape.json +++ b/entity/pokemon/infernape.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.infernape.idle", + "ground_idle": "animation.infernape.ground_idle", + "air_idle": "animation.infernape.ground_idle", + "water_idle": "animation.infernape.ground_idle", "walking": "animation.infernape.walking", "flying": "animation.infernape.walking", "swimming": "animation.infernape.walking", - "sleeping": "animation.infernape.idle", - "fall_asleep": "animation.infernape.fall_asleep", - "wake_up": "animation.infernape.wake_up", + "sleeping": "animation.infernape.ground_idle", "attack": "animation.infernape.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/inteleon.json b/entity/pokemon/inteleon.json index 0052e8c6b..0d50d6a8d 100644 --- a/entity/pokemon/inteleon.json +++ b/entity/pokemon/inteleon.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.inteleon.idle", + "ground_idle": "animation.inteleon.ground_idle", + "air_idle": "animation.inteleon.ground_idle", + "water_idle": "animation.inteleon.ground_idle", "walking": "animation.inteleon.walking", "flying": "animation.inteleon.walking", "swimming": "animation.inteleon.walking", - "sleeping": "animation.inteleon.idle", - "fall_asleep": "animation.inteleon.fall_asleep", - "wake_up": "animation.inteleon.wake_up", + "sleeping": "animation.inteleon.ground_idle", "attack": "animation.inteleon.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/ironmoth.json b/entity/pokemon/ironmoth.json index 2dfd8b591..0d08e312e 100644 --- a/entity/pokemon/ironmoth.json +++ b/entity/pokemon/ironmoth.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.ironmoth.idle", + "ground_idle": "animation.ironmoth.ground_idle", + "air_idle": "animation.ironmoth.ground_idle", + "water_idle": "animation.ironmoth.ground_idle", "walking": "animation.ironmoth.walking", "flying": "animation.ironmoth.walking", "swimming": "animation.ironmoth.walking", "sleeping": "animation.ironmoth.sleeping", - "fall_asleep": "animation.ironmoth.fall_asleep", - "wake_up": "animation.ironmoth.wake_up", "attack": "animation.ironmoth.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/ivysaur.json b/entity/pokemon/ivysaur.json index 14131974b..daf984d3d 100644 --- a/entity/pokemon/ivysaur.json +++ b/entity/pokemon/ivysaur.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.ivysaur.idle", + "ground_idle": "animation.ivysaur.ground_idle", + "air_idle": "animation.ivysaur.ground_idle", + "water_idle": "animation.ivysaur.ground_idle", "walking": "animation.ivysaur.walking", "flying": "animation.ivysaur.walking", "swimming": "animation.ivysaur.walking", - "sleeping": "animation.ivysaur.idle", - "fall_asleep": "animation.ivysaur.fall_asleep", - "wake_up": "animation.ivysaur.wake_up", + "sleeping": "animation.ivysaur.ground_idle", "attack": "animation.ivysaur.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/jigglypuff.json b/entity/pokemon/jigglypuff.json index ecc98d5b7..a10c3ac56 100644 --- a/entity/pokemon/jigglypuff.json +++ b/entity/pokemon/jigglypuff.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.jigglypuff.idle", + "ground_idle": "animation.jigglypuff.ground_idle", + "air_idle": "animation.jigglypuff.ground_idle", + "water_idle": "animation.jigglypuff.ground_idle", "walking": "animation.jigglypuff.walking", "flying": "animation.jigglypuff.walking", "swimming": "animation.jigglypuff.walking", - "sleeping": "animation.jigglypuff.idle", - "fall_asleep": "animation.jigglypuff.fall_asleep", - "wake_up": "animation.jigglypuff.wake_up", + "sleeping": "animation.jigglypuff.ground_idle", "attack": "animation.jigglypuff.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/jirachi.json b/entity/pokemon/jirachi.json index b8ad1ff90..dcb1ef9ee 100644 --- a/entity/pokemon/jirachi.json +++ b/entity/pokemon/jirachi.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.jirachi.idle", + "ground_idle": "animation.jirachi.ground_idle", + "air_idle": "animation.jirachi.ground_idle", + "water_idle": "animation.jirachi.ground_idle", "walking": "animation.jirachi.walking", "flying": "animation.jirachi.walking", "swimming": "animation.jirachi.walking", - "sleeping": "animation.jirachi.idle", - "fall_asleep": "animation.jirachi.fall_asleep", - "wake_up": "animation.jirachi.wake_up", - "attack": "animation.jirachi.idle", + "sleeping": "animation.jirachi.ground_idle", + "attack": "animation.jirachi.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/jolteon.json b/entity/pokemon/jolteon.json index a6592e33d..26430efef 100644 --- a/entity/pokemon/jolteon.json +++ b/entity/pokemon/jolteon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.jolteon.idle", + "ground_idle": "animation.jolteon.ground_idle", + "air_idle": "animation.jolteon.ground_idle", + "water_idle": "animation.jolteon.ground_idle", "walking": "animation.jolteon.walking", "flying": "animation.jolteon.walking", "swimming": "animation.jolteon.swimming", "sleeping": "animation.jolteon.sleeping", - "fall_asleep": "animation.jolteon.fall_asleep", - "wake_up": "animation.jolteon.wake_up", - "attack": "animation.jolteon.idle", + "attack": "animation.jolteon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/jumpluff.json b/entity/pokemon/jumpluff.json index 69fb67424..31ff9c131 100644 --- a/entity/pokemon/jumpluff.json +++ b/entity/pokemon/jumpluff.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.jumpluff.idle", + "ground_idle": "animation.jumpluff.ground_idle", + "air_idle": "animation.jumpluff.ground_idle", + "water_idle": "animation.jumpluff.ground_idle", "walking": "animation.jumpluff.walking", "flying": "animation.jumpluff.walking", "swimming": "animation.jumpluff.walking", - "sleeping": "animation.jumpluff.idle", - "fall_asleep": "animation.jumpluff.fall_asleep", - "wake_up": "animation.jumpluff.wake_up", - "attack": "animation.jumpluff.idle", + "sleeping": "animation.jumpluff.ground_idle", + "attack": "animation.jumpluff.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/jynx.json b/entity/pokemon/jynx.json index ec535110e..2c3622e44 100644 --- a/entity/pokemon/jynx.json +++ b/entity/pokemon/jynx.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.jynx.idle", + "ground_idle": "animation.jynx.ground_idle", + "air_idle": "animation.jynx.ground_idle", + "water_idle": "animation.jynx.ground_idle", "walking": "animation.jynx.walking", "flying": "animation.jynx.walking", "swimming": "animation.jynx.walking", - "sleeping": "animation.jynx.idle", - "fall_asleep": "animation.jynx.fall_asleep", - "wake_up": "animation.jynx.wake_up", - "attack": "animation.jynx.idle", + "sleeping": "animation.jynx.ground_idle", + "attack": "animation.jynx.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/kabuto.json b/entity/pokemon/kabuto.json index 0a5c2b54e..f37308f68 100644 --- a/entity/pokemon/kabuto.json +++ b/entity/pokemon/kabuto.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.kabuto.idle", + "ground_idle": "animation.kabuto.ground_idle", + "air_idle": "animation.kabuto.ground_idle", + "water_idle": "animation.kabuto.ground_idle", "walking": "animation.kabuto.walking", "flying": "animation.kabuto.walking", "swimming": "animation.kabuto.walking", - "sleeping": "animation.kabuto.idle", - "fall_asleep": "animation.kabuto.fall_asleep", - "wake_up": "animation.kabuto.wake_up", - "attack": "animation.kabuto.idle", + "sleeping": "animation.kabuto.ground_idle", + "attack": "animation.kabuto.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/kabutops.json b/entity/pokemon/kabutops.json index 9179c9e82..be44836b5 100644 --- a/entity/pokemon/kabutops.json +++ b/entity/pokemon/kabutops.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.kabutops.idle", + "ground_idle": "animation.kabutops.ground_idle", + "air_idle": "animation.kabutops.ground_idle", + "water_idle": "animation.kabutops.ground_idle", "walking": "animation.kabutops.walking", "flying": "animation.kabutops.walking", "swimming": "animation.kabutops.walking", - "sleeping": "animation.kabutops.idle", - "fall_asleep": "animation.kabutops.fall_asleep", - "wake_up": "animation.kabutops.wake_up", - "attack": "animation.kabutops.idle", + "sleeping": "animation.kabutops.ground_idle", + "attack": "animation.kabutops.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/kadabra.json b/entity/pokemon/kadabra.json index b6340fbb6..1fe85e7bb 100644 --- a/entity/pokemon/kadabra.json +++ b/entity/pokemon/kadabra.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.kadabra.idle", + "ground_idle": "animation.kadabra.ground_idle", + "air_idle": "animation.kadabra.ground_idle", + "water_idle": "animation.kadabra.ground_idle", "walking": "animation.kadabra.walking", "flying": "animation.kadabra.walking", "swimming": "animation.kadabra.walking", - "sleeping": "animation.kadabra.idle", - "fall_asleep": "animation.kadabra.fall_asleep", - "wake_up": "animation.kadabra.wake_up", + "sleeping": "animation.kadabra.ground_idle", "attack": "animation.kadabra.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/kakuna.json b/entity/pokemon/kakuna.json index c6bedc22b..8d31c3176 100644 --- a/entity/pokemon/kakuna.json +++ b/entity/pokemon/kakuna.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.kakuna.idle", + "ground_idle": "animation.kakuna.ground_idle", + "air_idle": "animation.kakuna.ground_idle", + "water_idle": "animation.kakuna.ground_idle", "walking": "animation.kakuna.walking", "flying": "animation.kakuna.walking", "swimming": "animation.kakuna.walking", - "sleeping": "animation.kakuna.idle", - "fall_asleep": "animation.kakuna.fall_asleep", - "wake_up": "animation.kakuna.wake_up", - "attack": "animation.kakuna.idle", + "sleeping": "animation.kakuna.ground_idle", + "attack": "animation.kakuna.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/kangaskhan.json b/entity/pokemon/kangaskhan.json index f6fbb7d86..d3a683d3c 100644 --- a/entity/pokemon/kangaskhan.json +++ b/entity/pokemon/kangaskhan.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.kangaskhan.idle", + "ground_idle": "animation.kangaskhan.ground_idle", + "air_idle": "animation.kangaskhan.ground_idle", + "water_idle": "animation.kangaskhan.ground_idle", "walking": "animation.kangaskhan.walking", "flying": "animation.kangaskhan.walking", "swimming": "animation.kangaskhan.walking", - "sleeping": "animation.kangaskhan.idle", - "fall_asleep": "animation.kangaskhan.fall_asleep", - "wake_up": "animation.kangaskhan.wake_up", + "sleeping": "animation.kangaskhan.ground_idle", "attack": "animation.kangaskhan.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/kingdra.json b/entity/pokemon/kingdra.json index a83f77511..15051c690 100644 --- a/entity/pokemon/kingdra.json +++ b/entity/pokemon/kingdra.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.kingdra.idle", + "ground_idle": "animation.kingdra.ground_idle", + "air_idle": "animation.kingdra.ground_idle", + "water_idle": "animation.kingdra.ground_idle", "walking": "animation.kingdra.walking", "flying": "animation.kingdra.walking", "swimming": "animation.kingdra.walking", - "sleeping": "animation.kingdra.idle", - "fall_asleep": "animation.kingdra.fall_asleep", - "wake_up": "animation.kingdra.wake_up", - "attack": "animation.kingdra.idle", + "sleeping": "animation.kingdra.ground_idle", + "attack": "animation.kingdra.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/kingler.json b/entity/pokemon/kingler.json index c7d911149..f2674fdc1 100644 --- a/entity/pokemon/kingler.json +++ b/entity/pokemon/kingler.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.kingler.idle", + "ground_idle": "animation.kingler.ground_idle", + "air_idle": "animation.kingler.ground_idle", + "water_idle": "animation.kingler.ground_idle", "walking": "animation.kingler.walking", "flying": "animation.kingler.walking", "swimming": "animation.kingler.walking", - "sleeping": "animation.kingler.idle", - "fall_asleep": "animation.kingler.fall_asleep", - "wake_up": "animation.kingler.wake_up", + "sleeping": "animation.kingler.ground_idle", "attack": "animation.kingler.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/kirlia.json b/entity/pokemon/kirlia.json index e20515e63..3bf687e76 100644 --- a/entity/pokemon/kirlia.json +++ b/entity/pokemon/kirlia.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.kirlia.idle", + "ground_idle": "animation.kirlia.ground_idle", + "air_idle": "animation.kirlia.ground_idle", + "water_idle": "animation.kirlia.water_idle", "walking": "animation.kirlia.walking", - "flying": "animation.kirlia.walking", + "flying": "animation.kirlia.flying", "swimming": "animation.kirlia.walking", "sleeping": "animation.kirlia.sleeping", - "fall_asleep": "animation.kirlia.fall_asleep", - "wake_up": "animation.kirlia.wake_up", "attack": "animation.kirlia.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/koffing.json b/entity/pokemon/koffing.json index c1103e422..6adb69baa 100644 --- a/entity/pokemon/koffing.json +++ b/entity/pokemon/koffing.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.koffing.idle", + "ground_idle": "animation.koffing.ground_idle", + "air_idle": "animation.koffing.ground_idle", + "water_idle": "animation.koffing.ground_idle", "walking": "animation.koffing.walking", "flying": "animation.koffing.walking", "swimming": "animation.koffing.walking", - "sleeping": "animation.koffing.idle", - "fall_asleep": "animation.koffing.fall_asleep", - "wake_up": "animation.koffing.wake_up", + "sleeping": "animation.koffing.ground_idle", "attack": "animation.koffing.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/krabby.json b/entity/pokemon/krabby.json index a8fa8e332..83bb9d1b5 100644 --- a/entity/pokemon/krabby.json +++ b/entity/pokemon/krabby.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.krabby.idle", + "ground_idle": "animation.krabby.ground_idle", + "air_idle": "animation.krabby.ground_idle", + "water_idle": "animation.krabby.ground_idle", "walking": "animation.krabby.walking", "flying": "animation.krabby.walking", "swimming": "animation.krabby.walking", - "sleeping": "animation.krabby.idle", - "fall_asleep": "animation.krabby.fall_asleep", - "wake_up": "animation.krabby.wake_up", - "attack": "animation.krabby.idle", + "sleeping": "animation.krabby.ground_idle", + "attack": "animation.krabby.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/kyogre.json b/entity/pokemon/kyogre.json index 1b3637fe0..b8f8877aa 100644 --- a/entity/pokemon/kyogre.json +++ b/entity/pokemon/kyogre.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.kyogre.idle", + "ground_idle": "animation.kyogre.ground_idle", + "air_idle": "animation.kyogre.ground_idle", + "water_idle": "animation.kyogre.ground_idle", "walking": "animation.kyogre.walking", "flying": "animation.kyogre.walking", "swimming": "animation.kyogre.swimming", - "sleeping": "animation.kyogre.idle", - "fall_asleep": "animation.kyogre.fall_asleep", - "wake_up": "animation.kyogre.wake_up", - "attack": "animation.kyogre.idle", + "sleeping": "animation.kyogre.ground_idle", + "attack": "animation.kyogre.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/lanturn.json b/entity/pokemon/lanturn.json index e0109a536..4d4f8ca80 100644 --- a/entity/pokemon/lanturn.json +++ b/entity/pokemon/lanturn.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.lanturn.idle", + "ground_idle": "animation.lanturn.ground_idle", + "air_idle": "animation.lanturn.ground_idle", + "water_idle": "animation.lanturn.ground_idle", "walking": "animation.lanturn.walking", "flying": "animation.lanturn.walking", "swimming": "animation.lanturn.walking", - "sleeping": "animation.lanturn.idle", - "fall_asleep": "animation.lanturn.fall_asleep", - "wake_up": "animation.lanturn.wake_up", + "sleeping": "animation.lanturn.ground_idle", "attack": "animation.lanturn.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/lapras.json b/entity/pokemon/lapras.json index 1876f09cb..835bad7a3 100644 --- a/entity/pokemon/lapras.json +++ b/entity/pokemon/lapras.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.lapras.idle", + "ground_idle": "animation.lapras.ground_idle", + "air_idle": "animation.lapras.ground_idle", + "water_idle": "animation.lapras.ground_idle", "walking": "animation.lapras.walking", "flying": "animation.lapras.walking", "swimming": "animation.lapras.walking", - "sleeping": "animation.lapras.idle", - "fall_asleep": "animation.lapras.fall_asleep", - "wake_up": "animation.lapras.wake_up", - "attack": "animation.lapras.idle", + "sleeping": "animation.lapras.ground_idle", + "attack": "animation.lapras.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/larvesta.json b/entity/pokemon/larvesta.json index a299a94ac..8f3dceb97 100644 --- a/entity/pokemon/larvesta.json +++ b/entity/pokemon/larvesta.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.larvesta.idle", + "ground_idle": "animation.larvesta.ground_idle", + "air_idle": "animation.larvesta.ground_idle", + "water_idle": "animation.larvesta.ground_idle", "walking": "animation.larvesta.walking", "flying": "animation.larvesta.walking", "swimming": "animation.larvesta.swimming", "sleeping": "animation.larvesta.sleeping", - "fall_asleep": "animation.larvesta.fall_asleep", - "wake_up": "animation.larvesta.wake_up", - "attack": "animation.larvesta.idle", + "attack": "animation.larvesta.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/larvitar.json b/entity/pokemon/larvitar.json index 25f0209a5..9d1593911 100644 --- a/entity/pokemon/larvitar.json +++ b/entity/pokemon/larvitar.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.larvitar.idle", + "ground_idle": "animation.larvitar.ground_idle", + "air_idle": "animation.larvitar.ground_idle", + "water_idle": "animation.larvitar.ground_idle", "walking": "animation.larvitar.walking", "flying": "animation.larvitar.walking", "swimming": "animation.larvitar.walking", - "sleeping": "animation.larvitar.idle", - "fall_asleep": "animation.larvitar.fall_asleep", - "wake_up": "animation.larvitar.wake_up", - "attack": "animation.larvitar.idle", + "sleeping": "animation.larvitar.ground_idle", + "attack": "animation.larvitar.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/latias.json b/entity/pokemon/latias.json index 66b421d2e..92399f071 100644 --- a/entity/pokemon/latias.json +++ b/entity/pokemon/latias.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.latias.idle", + "ground_idle": "animation.latias.ground_idle", + "air_idle": "animation.latias.ground_idle", + "water_idle": "animation.latias.ground_idle", "walking": "animation.latias.walking", "flying": "animation.latias.walking", "swimming": "animation.latias.walking", - "sleeping": "animation.latias.idle", - "fall_asleep": "animation.latias.fall_asleep", - "wake_up": "animation.latias.wake_up", - "attack": "animation.latias.idle", + "sleeping": "animation.latias.ground_idle", + "attack": "animation.latias.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/latios.json b/entity/pokemon/latios.json index f908d08de..9d9fc289b 100644 --- a/entity/pokemon/latios.json +++ b/entity/pokemon/latios.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.latios.idle", + "ground_idle": "animation.latios.ground_idle", + "air_idle": "animation.latios.ground_idle", + "water_idle": "animation.latios.ground_idle", "walking": "animation.latios.walking", "flying": "animation.latios.walking", "swimming": "animation.latios.walking", - "sleeping": "animation.latios.idle", - "fall_asleep": "animation.latios.fall_asleep", - "wake_up": "animation.latios.wake_up", - "attack": "animation.latios.idle", + "sleeping": "animation.latios.ground_idle", + "attack": "animation.latios.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/leafeon.json b/entity/pokemon/leafeon.json index 31d6cd2fc..eb43cfd74 100644 --- a/entity/pokemon/leafeon.json +++ b/entity/pokemon/leafeon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.leafeon.idle", + "ground_idle": "animation.leafeon.ground_idle", + "air_idle": "animation.leafeon.ground_idle", + "water_idle": "animation.leafeon.ground_idle", "walking": "animation.leafeon.walking", "flying": "animation.leafeon.walking", "swimming": "animation.leafeon.walking", - "sleeping": "animation.leafeon.idle", - "fall_asleep": "animation.leafeon.fall_asleep", - "wake_up": "animation.leafeon.wake_up", - "attack": "animation.leafeon.idle", + "sleeping": "animation.leafeon.ground_idle", + "attack": "animation.leafeon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/ledian.json b/entity/pokemon/ledian.json index 0b6be267c..339bb7ff0 100644 --- a/entity/pokemon/ledian.json +++ b/entity/pokemon/ledian.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.ledian.idle", + "ground_idle": "animation.ledian.ground_idle", + "air_idle": "animation.ledian.ground_idle", + "water_idle": "animation.ledian.ground_idle", "walking": "animation.ledian.walking", "flying": "animation.ledian.walking", "swimming": "animation.ledian.walking", - "sleeping": "animation.ledian.idle", - "fall_asleep": "animation.ledian.fall_asleep", - "wake_up": "animation.ledian.wake_up", - "attack": "animation.ledian.idle", + "sleeping": "animation.ledian.ground_idle", + "attack": "animation.ledian.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/ledyba.json b/entity/pokemon/ledyba.json index f2ad524a6..ba8d51d52 100644 --- a/entity/pokemon/ledyba.json +++ b/entity/pokemon/ledyba.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.ledyba.idle", + "ground_idle": "animation.ledyba.ground_idle", + "air_idle": "animation.ledyba.ground_idle", + "water_idle": "animation.ledyba.ground_idle", "walking": "animation.ledyba.walking", "flying": "animation.ledyba.walking", "swimming": "animation.ledyba.walking", - "sleeping": "animation.ledyba.idle", - "fall_asleep": "animation.ledyba.fall_asleep", - "wake_up": "animation.ledyba.wake_up", - "attack": "animation.ledyba.idle", + "sleeping": "animation.ledyba.ground_idle", + "attack": "animation.ledyba.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/lickitung.json b/entity/pokemon/lickitung.json index 5880f96fd..4564753b8 100644 --- a/entity/pokemon/lickitung.json +++ b/entity/pokemon/lickitung.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.lickitung.idle", + "ground_idle": "animation.lickitung.ground_idle", + "air_idle": "animation.lickitung.ground_idle", + "water_idle": "animation.lickitung.ground_idle", "walking": "animation.lickitung.walking", "flying": "animation.lickitung.walking", "swimming": "animation.lickitung.walking", - "sleeping": "animation.lickitung.idle", - "fall_asleep": "animation.lickitung.fall_asleep", - "wake_up": "animation.lickitung.wake_up", + "sleeping": "animation.lickitung.ground_idle", "attack": "animation.lickitung.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/lileep.json b/entity/pokemon/lileep.json index 9c1897d0b..67159aeac 100644 --- a/entity/pokemon/lileep.json +++ b/entity/pokemon/lileep.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.lileep.idle", - "walking": "animation.lileep.idle", + "ground_idle": "animation.lileep.ground_idle", + "air_idle": "animation.lileep.ground_idle", + "water_idle": "animation.lileep.ground_idle", + "walking": "animation.lileep.ground_idle", "flying": "animation.lileep.walking", "swimming": "animation.lileep.walking", - "sleeping": "animation.lileep.idle", - "fall_asleep": "animation.lileep.fall_asleep", - "wake_up": "animation.lileep.wake_up", - "attack": "animation.lileep.idle", + "sleeping": "animation.lileep.ground_idle", + "attack": "animation.lileep.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/litten.json b/entity/pokemon/litten.json index 81411f06a..4cc332c12 100644 --- a/entity/pokemon/litten.json +++ b/entity/pokemon/litten.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.litten.idle", + "ground_idle": "animation.litten.ground_idle", + "air_idle": "animation.litten.ground_idle", + "water_idle": "animation.litten.ground_idle", "walking": "animation.litten.walking", "flying": "animation.litten.walking", "swimming": "animation.litten.walking", - "sleeping": "animation.litten.idle", - "fall_asleep": "animation.litten.fall_asleep", - "wake_up": "animation.litten.wake_up", + "sleeping": "animation.litten.ground_idle", "attack": "animation.litten.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/lucario.json b/entity/pokemon/lucario.json index 6888bfb7f..6898bb5fb 100644 --- a/entity/pokemon/lucario.json +++ b/entity/pokemon/lucario.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.lucario.idle", + "ground_idle": "animation.lucario.ground_idle", + "air_idle": "animation.lucario.ground_idle", + "water_idle": "animation.lucario.ground_idle", "walking": "animation.lucario.walking", "flying": "animation.lucario.walking", "swimming": "animation.lucario.walking", - "sleeping": "animation.lucario.idle", - "fall_asleep": "animation.lucario.fall_asleep", - "wake_up": "animation.lucario.wake_up", - "attack": "animation.lucario.idle", + "sleeping": "animation.lucario.ground_idle", + "attack": "animation.lucario.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/lugia.json b/entity/pokemon/lugia.json index 05fe9347d..f67ed1536 100644 --- a/entity/pokemon/lugia.json +++ b/entity/pokemon/lugia.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.lugia.idle", + "ground_idle": "animation.lugia.ground_idle", + "air_idle": "animation.lugia.ground_idle", + "water_idle": "animation.lugia.ground_idle", "walking": "animation.lugia.walking", "flying": "animation.lugia.walking", "swimming": "animation.lugia.walking", - "sleeping": "animation.lugia.idle", - "fall_asleep": "animation.lugia.fall_asleep", - "wake_up": "animation.lugia.wake_up", - "attack": "animation.lugia.idle", + "sleeping": "animation.lugia.ground_idle", + "attack": "animation.lugia.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/lunala.json b/entity/pokemon/lunala.json index c235b21e1..df1b0aea6 100644 --- a/entity/pokemon/lunala.json +++ b/entity/pokemon/lunala.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.lunala.idle", + "ground_idle": "animation.lunala.ground_idle", + "air_idle": "animation.lunala.ground_idle", + "water_idle": "animation.lunala.ground_idle", "walking": "animation.lunala.walking", "flying": "animation.lunala.walking", "swimming": "animation.lunala.walking", - "sleeping": "animation.lunala.idle", - "fall_asleep": "animation.lunala.fall_asleep", - "wake_up": "animation.lunala.wake_up", - "attack": "animation.lunala.idle", + "sleeping": "animation.lunala.ground_idle", + "attack": "animation.lunala.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/luxio.json b/entity/pokemon/luxio.json index d2487d8da..e9920142a 100644 --- a/entity/pokemon/luxio.json +++ b/entity/pokemon/luxio.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.luxio.idle", + "ground_idle": "animation.luxio.ground_idle", + "air_idle": "animation.luxio.ground_idle", + "water_idle": "animation.luxio.ground_idle", "walking": "animation.luxio.walking", "flying": "animation.luxio.walking", "swimming": "animation.luxio.walking", - "sleeping": "animation.luxio.idle", - "fall_asleep": "animation.luxio.fall_asleep", - "wake_up": "animation.luxio.wake_up", - "attack": "animation.luxio.idle", + "sleeping": "animation.luxio.ground_idle", + "attack": "animation.luxio.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/luxray.json b/entity/pokemon/luxray.json index fcb7ee25d..7f36c88c7 100644 --- a/entity/pokemon/luxray.json +++ b/entity/pokemon/luxray.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.luxray.idle", + "ground_idle": "animation.luxray.ground_idle", + "air_idle": "animation.luxray.ground_idle", + "water_idle": "animation.luxray.ground_idle", "walking": "animation.luxray.walking", "flying": "animation.luxray.walking", "swimming": "animation.luxray.walking", - "sleeping": "animation.luxray.idle", - "fall_asleep": "animation.luxray.fall_asleep", - "wake_up": "animation.luxray.wake_up", - "attack": "animation.luxray.idle", + "sleeping": "animation.luxray.ground_idle", + "attack": "animation.luxray.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/machamp.json b/entity/pokemon/machamp.json index 9a4145460..c3d32ec48 100644 --- a/entity/pokemon/machamp.json +++ b/entity/pokemon/machamp.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.machamp.idle", + "ground_idle": "animation.machamp.ground_idle", + "air_idle": "animation.machamp.ground_idle", + "water_idle": "animation.machamp.ground_idle", "walking": "animation.machamp.walking", "flying": "animation.machamp.walking", "swimming": "animation.machamp.walking", - "sleeping": "animation.machamp.idle", - "fall_asleep": "animation.machamp.fall_asleep", - "wake_up": "animation.machamp.wake_up", - "attack": "animation.machamp.idle", + "sleeping": "animation.machamp.ground_idle", + "attack": "animation.machamp.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/machoke.json b/entity/pokemon/machoke.json index 3feb6f75e..ff699c13a 100644 --- a/entity/pokemon/machoke.json +++ b/entity/pokemon/machoke.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.machoke.idle", + "ground_idle": "animation.machoke.ground_idle", + "air_idle": "animation.machoke.ground_idle", + "water_idle": "animation.machoke.ground_idle", "walking": "animation.machoke.walking", "flying": "animation.machoke.walking", "swimming": "animation.machoke.walking", - "sleeping": "animation.machoke.idle", - "fall_asleep": "animation.machoke.fall_asleep", - "wake_up": "animation.machoke.wake_up", - "attack": "animation.machoke.idle", + "sleeping": "animation.machoke.ground_idle", + "attack": "animation.machoke.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/machop.json b/entity/pokemon/machop.json index a82e11b30..ca73b6efe 100644 --- a/entity/pokemon/machop.json +++ b/entity/pokemon/machop.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.machop.idle", + "ground_idle": "animation.machop.ground_idle", + "air_idle": "animation.machop.ground_idle", + "water_idle": "animation.machop.ground_idle", "walking": "animation.machop.walking", "flying": "animation.machop.walking", "swimming": "animation.machop.walking", - "sleeping": "animation.machop.idle", - "fall_asleep": "animation.machop.fall_asleep", - "wake_up": "animation.machop.wake_up", - "attack": "animation.machop.idle", + "sleeping": "animation.machop.ground_idle", + "attack": "animation.machop.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/magby.json b/entity/pokemon/magby.json index 66c1be138..6315f908c 100644 --- a/entity/pokemon/magby.json +++ b/entity/pokemon/magby.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.magby.idle", + "ground_idle": "animation.magby.ground_idle", + "air_idle": "animation.magby.ground_idle", + "water_idle": "animation.magby.ground_idle", "walking": "animation.magby.walking", "flying": "animation.magby.walking", "swimming": "animation.magby.walking", - "sleeping": "animation.magby.idle", - "fall_asleep": "animation.magby.fall_asleep", - "wake_up": "animation.magby.wake_up", - "attack": "animation.magby.idle", + "sleeping": "animation.magby.ground_idle", + "attack": "animation.magby.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/magcargo.json b/entity/pokemon/magcargo.json index 62e373930..ec0985d67 100644 --- a/entity/pokemon/magcargo.json +++ b/entity/pokemon/magcargo.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.magcargo.idle", + "ground_idle": "animation.magcargo.ground_idle", + "air_idle": "animation.magcargo.ground_idle", + "water_idle": "animation.magcargo.ground_idle", "walking": "animation.magcargo.walking", "flying": "animation.magcargo.walking", "swimming": "animation.magcargo.walking", - "sleeping": "animation.magcargo.idle", - "fall_asleep": "animation.magcargo.fall_asleep", - "wake_up": "animation.magcargo.wake_up", - "attack": "animation.magcargo.idle", + "sleeping": "animation.magcargo.ground_idle", + "attack": "animation.magcargo.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/magikarp.json b/entity/pokemon/magikarp.json index c56d146f0..6813eeab8 100644 --- a/entity/pokemon/magikarp.json +++ b/entity/pokemon/magikarp.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.magikarp.idle", + "ground_idle": "animation.magikarp.ground_idle", + "air_idle": "animation.magikarp.ground_idle", + "water_idle": "animation.magikarp.ground_idle", "walking": "animation.magikarp.walking", "flying": "animation.magikarp.walking", "swimming": "animation.magikarp.swimming", - "sleeping": "animation.magikarp.idle", - "fall_asleep": "animation.magikarp.fall_asleep", - "wake_up": "animation.magikarp.wake_up", - "attack": "animation.magikarp.idle", + "sleeping": "animation.magikarp.ground_idle", + "attack": "animation.magikarp.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/magmar.json b/entity/pokemon/magmar.json index de46d824b..c9b25cc1e 100644 --- a/entity/pokemon/magmar.json +++ b/entity/pokemon/magmar.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.magmar.idle", + "ground_idle": "animation.magmar.ground_idle", + "air_idle": "animation.magmar.ground_idle", + "water_idle": "animation.magmar.ground_idle", "walking": "animation.magmar.walking", "flying": "animation.magmar.walking", "swimming": "animation.magmar.walking", - "sleeping": "animation.magmar.idle", - "fall_asleep": "animation.magmar.fall_asleep", - "wake_up": "animation.magmar.wake_up", + "sleeping": "animation.magmar.ground_idle", "attack": "animation.magmar.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/magmortar.json b/entity/pokemon/magmortar.json index aa592ae39..158d348b6 100644 --- a/entity/pokemon/magmortar.json +++ b/entity/pokemon/magmortar.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.magmortar.idle", + "ground_idle": "animation.magmortar.ground_idle", + "air_idle": "animation.magmortar.air_idle", + "water_idle": "animation.magmortar.water_idle", "walking": "animation.magmortar.walking", "flying": "animation.magmortar.flying", "swimming": "animation.magmortar.swimming", "sleeping": "animation.magmortar.sleeping", - "fall_asleep": "animation.magmortar.fall_asleep", - "wake_up": "animation.magmortar.wake_up", "attack": "animation.magmortar.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/magnemite.json b/entity/pokemon/magnemite.json index 80aece73f..dffe061a0 100644 --- a/entity/pokemon/magnemite.json +++ b/entity/pokemon/magnemite.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.magnemite.idle", + "ground_idle": "animation.magnemite.ground_idle", + "air_idle": "animation.magnemite.ground_idle", + "water_idle": "animation.magnemite.ground_idle", "walking": "animation.magnemite.walking", "flying": "animation.magnemite.walking", "swimming": "animation.magnemite.walking", - "sleeping": "animation.magnemite.idle", - "fall_asleep": "animation.magnemite.fall_asleep", - "wake_up": "animation.magnemite.wake_up", - "attack": "animation.magnemite.idle", + "sleeping": "animation.magnemite.ground_idle", + "attack": "animation.magnemite.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/magneton.json b/entity/pokemon/magneton.json index a8f0dfc7d..44e515963 100644 --- a/entity/pokemon/magneton.json +++ b/entity/pokemon/magneton.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.magneton.idle", + "ground_idle": "animation.magneton.ground_idle", + "air_idle": "animation.magneton.ground_idle", + "water_idle": "animation.magneton.ground_idle", "walking": "animation.magneton.walking", "flying": "animation.magneton.walking", "swimming": "animation.magneton.walking", - "sleeping": "animation.magneton.idle", - "fall_asleep": "animation.magneton.fall_asleep", - "wake_up": "animation.magneton.wake_up", - "attack": "animation.magneton.idle", + "sleeping": "animation.magneton.ground_idle", + "attack": "animation.magneton.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/magnezone.json b/entity/pokemon/magnezone.json index 649de5f18..2002d4886 100644 --- a/entity/pokemon/magnezone.json +++ b/entity/pokemon/magnezone.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.magnezone.idle", + "ground_idle": "animation.magnezone.ground_idle", + "air_idle": "animation.magnezone.ground_idle", + "water_idle": "animation.magnezone.ground_idle", "walking": "animation.magnezone.walking", "flying": "animation.magnezone.walking", "swimming": "animation.magnezone.walking", - "sleeping": "animation.magnezone.idle", - "fall_asleep": "animation.magnezone.fall_asleep", - "wake_up": "animation.magnezone.wake_up", - "attack": "animation.magnezone.idle", + "sleeping": "animation.magnezone.ground_idle", + "attack": "animation.magnezone.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/mamoswine.json b/entity/pokemon/mamoswine.json index 4caa34b7a..00ec73852 100644 --- a/entity/pokemon/mamoswine.json +++ b/entity/pokemon/mamoswine.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.mamoswine.idle", + "ground_idle": "animation.mamoswine.ground_idle", + "air_idle": "animation.mamoswine.air_idle", + "water_idle": "animation.mamoswine.water_idle", "walking": "animation.mamoswine.walking", "flying": "animation.mamoswine.flying", "swimming": "animation.mamoswine.swimming", "sleeping": "animation.mamoswine.sleeping", - "fall_asleep": "animation.mamoswine.fall_asleep", - "wake_up": "animation.mamoswine.wake_up", "attack": "animation.mamoswine.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/mankey.json b/entity/pokemon/mankey.json index 85bafe78b..f56b8b2f5 100644 --- a/entity/pokemon/mankey.json +++ b/entity/pokemon/mankey.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.mankey.idle", + "ground_idle": "animation.mankey.ground_idle", + "air_idle": "animation.mankey.ground_idle", + "water_idle": "animation.mankey.ground_idle", "walking": "animation.mankey.walking", "flying": "animation.mankey.walking", "swimming": "animation.mankey.walking", - "sleeping": "animation.mankey.idle", - "fall_asleep": "animation.mankey.fall_asleep", - "wake_up": "animation.mankey.wake_up", + "sleeping": "animation.mankey.ground_idle", "attack": "animation.mankey.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/mantine.json b/entity/pokemon/mantine.json index 239959f67..0975948ee 100644 --- a/entity/pokemon/mantine.json +++ b/entity/pokemon/mantine.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.mantine.idle", + "ground_idle": "animation.mantine.ground_idle", + "air_idle": "animation.mantine.ground_idle", + "water_idle": "animation.mantine.ground_idle", "walking": "animation.mantine.walking", "flying": "animation.mantine.walking", "swimming": "animation.mantine.walking", - "sleeping": "animation.mantine.idle", - "fall_asleep": "animation.mantine.fall_asleep", - "wake_up": "animation.mantine.wake_up", - "attack": "animation.mantine.idle", + "sleeping": "animation.mantine.ground_idle", + "attack": "animation.mantine.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/mantyke.json b/entity/pokemon/mantyke.json index e45dd0d95..15588ead4 100644 --- a/entity/pokemon/mantyke.json +++ b/entity/pokemon/mantyke.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.mantyke.idle", + "ground_idle": "animation.mantyke.ground_idle", + "air_idle": "animation.mantyke.ground_idle", + "water_idle": "animation.mantyke.ground_idle", "walking": "animation.mantyke.walking", "flying": "animation.mantyke.walking", "swimming": "animation.mantyke.walking", - "sleeping": "animation.mantyke.idle", - "fall_asleep": "animation.mantyke.fall_asleep", - "wake_up": "animation.mantyke.wake_up", - "attack": "animation.mantyke.idle", + "sleeping": "animation.mantyke.ground_idle", + "attack": "animation.mantyke.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/mareep.json b/entity/pokemon/mareep.json index da3b40255..7c1be43c3 100644 --- a/entity/pokemon/mareep.json +++ b/entity/pokemon/mareep.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.mareep.idle", + "ground_idle": "animation.mareep.ground_idle", + "air_idle": "animation.mareep.ground_idle", + "water_idle": "animation.mareep.water_idle", "walking": "animation.mareep.walking", "flying": "animation.mareep.walking", - "swimming": "animation.mareep.walking", - "sleeping": "animation.mareep.idle", - "fall_asleep": "animation.mareep.fall_asleep", - "wake_up": "animation.mareep.wake_up", - "attack": "animation.mareep.idle", + "swimming": "animation.mareep.swimming", + "sleeping": "animation.mareep.sleeping", + "attack": "animation.mareep.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/marill.json b/entity/pokemon/marill.json index 88b0749b0..9101d50a5 100644 --- a/entity/pokemon/marill.json +++ b/entity/pokemon/marill.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.marill.idle", + "ground_idle": "animation.marill.ground_idle", + "air_idle": "animation.marill.ground_idle", + "water_idle": "animation.marill.ground_idle", "walking": "animation.marill.walking", "flying": "animation.marill.walking", "swimming": "animation.marill.swimming", "sleeping": "animation.marill.sleeping", - "fall_asleep": "animation.marill.fall_asleep", - "wake_up": "animation.marill.wake_up", - "attack": "animation.marill.idle", + "attack": "animation.marill.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/marshtomp.json b/entity/pokemon/marshtomp.json index eeda8a990..96b23baa8 100644 --- a/entity/pokemon/marshtomp.json +++ b/entity/pokemon/marshtomp.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.marshtomp.idle", + "ground_idle": "animation.marshtomp.ground_idle", + "air_idle": "animation.marshtomp.ground_idle", + "water_idle": "animation.marshtomp.ground_idle", "walking": "animation.marshtomp.walking", "flying": "animation.marshtomp.walking", "swimming": "animation.marshtomp.swimming", - "sleeping": "animation.marshtomp.idle", - "fall_asleep": "animation.marshtomp.fall_asleep", - "wake_up": "animation.marshtomp.wake_up", + "sleeping": "animation.marshtomp.ground_idle", "attack": "animation.marshtomp.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/meganium.json b/entity/pokemon/meganium.json index 6155bf3b5..23fd4b478 100644 --- a/entity/pokemon/meganium.json +++ b/entity/pokemon/meganium.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.meganium.idle", + "ground_idle": "animation.meganium.ground_idle", + "air_idle": "animation.meganium.ground_idle", + "water_idle": "animation.meganium.ground_idle", "walking": "animation.meganium.walking", "flying": "animation.meganium.walking", "swimming": "animation.meganium.walking", - "sleeping": "animation.meganium.idle", - "fall_asleep": "animation.meganium.fall_asleep", - "wake_up": "animation.meganium.wake_up", - "attack": "animation.meganium.idle", + "sleeping": "animation.meganium.ground_idle", + "attack": "animation.meganium.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/meowscarada.json b/entity/pokemon/meowscarada.json index be4584a01..0e2f12b02 100644 --- a/entity/pokemon/meowscarada.json +++ b/entity/pokemon/meowscarada.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.meowscarada.idle", + "ground_idle": "animation.meowscarada.ground_idle", + "air_idle": "animation.meowscarada.ground_idle", + "water_idle": "animation.meowscarada.ground_idle", "walking": "animation.meowscarada.walking", "flying": "animation.meowscarada.walking", "swimming": "animation.meowscarada.walking", - "sleeping": "animation.meowscarada.idle", - "fall_asleep": "animation.meowscarada.fall_asleep", - "wake_up": "animation.meowscarada.wake_up", + "sleeping": "animation.meowscarada.ground_idle", "attack": "animation.meowscarada.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/meowth.json b/entity/pokemon/meowth.json index 8c6c72a0e..aa1d227aa 100644 --- a/entity/pokemon/meowth.json +++ b/entity/pokemon/meowth.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.meowth.idle", + "ground_idle": "animation.meowth.ground_idle", + "air_idle": "animation.meowth.ground_idle", + "water_idle": "animation.meowth.ground_idle", "walking": "animation.meowth.walking", "flying": "animation.meowth.walking", "swimming": "animation.meowth.walking", - "sleeping": "animation.meowth.idle", - "fall_asleep": "animation.meowth.fall_asleep", - "wake_up": "animation.meowth.wake_up", - "attack": "animation.meowth.idle", + "sleeping": "animation.meowth.ground_idle", + "attack": "animation.meowth.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/mesprit.json b/entity/pokemon/mesprit.json index 136f785af..cd9e9f941 100644 --- a/entity/pokemon/mesprit.json +++ b/entity/pokemon/mesprit.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.mesprit.idle", + "ground_idle": "animation.mesprit.ground_idle", + "air_idle": "animation.mesprit.ground_idle", + "water_idle": "animation.mesprit.ground_idle", "walking": "animation.mesprit.walking", "flying": "animation.mesprit.walking", "swimming": "animation.mesprit.walking", - "sleeping": "animation.mesprit.idle", - "fall_asleep": "animation.mesprit.fall_asleep", - "wake_up": "animation.mesprit.wake_up", - "attack": "animation.mesprit.idle", + "sleeping": "animation.mesprit.ground_idle", + "attack": "animation.mesprit.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/metapod.json b/entity/pokemon/metapod.json index 73495d1b5..2d3007c76 100644 --- a/entity/pokemon/metapod.json +++ b/entity/pokemon/metapod.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.metapod.idle", + "ground_idle": "animation.metapod.ground_idle", + "air_idle": "animation.metapod.ground_idle", + "water_idle": "animation.metapod.ground_idle", "walking": "animation.metapod.walking", "flying": "animation.metapod.walking", "swimming": "animation.metapod.walking", - "sleeping": "animation.metapod.idle", - "fall_asleep": "animation.metapod.fall_asleep", - "wake_up": "animation.metapod.wake_up", - "attack": "animation.metapod.idle", + "sleeping": "animation.metapod.ground_idle", + "attack": "animation.metapod.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/mew.json b/entity/pokemon/mew.json index c56bd0e9a..553e85f29 100644 --- a/entity/pokemon/mew.json +++ b/entity/pokemon/mew.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.mew.idle", + "ground_idle": "animation.mew.ground_idle", + "air_idle": "animation.mew.ground_idle", + "water_idle": "animation.mew.ground_idle", "walking": "animation.mew.walking", "flying": "animation.mew.walking", "swimming": "animation.mew.walking", - "sleeping": "animation.mew.idle", - "fall_asleep": "animation.mew.fall_asleep", - "wake_up": "animation.mew.wake_up", - "attack": "animation.mew.idle", + "sleeping": "animation.mew.ground_idle", + "attack": "animation.mew.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/mewtwo.json b/entity/pokemon/mewtwo.json index b7f6cfb5b..11e88e6ed 100644 --- a/entity/pokemon/mewtwo.json +++ b/entity/pokemon/mewtwo.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.mewtwo.idle", + "ground_idle": "animation.mewtwo.ground_idle", + "air_idle": "animation.mewtwo.ground_idle", + "water_idle": "animation.mewtwo.ground_idle", "walking": "animation.mewtwo.walking", "flying": "animation.mewtwo.walking", "swimming": "animation.mewtwo.walking", - "sleeping": "animation.mewtwo.idle", - "fall_asleep": "animation.mewtwo.fall_asleep", - "wake_up": "animation.mewtwo.wake_up", - "attack": "animation.mewtwo.idle", + "sleeping": "animation.mewtwo.ground_idle", + "attack": "animation.mewtwo.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/miltank.json b/entity/pokemon/miltank.json index c3e2a0f63..bd4c494e8 100644 --- a/entity/pokemon/miltank.json +++ b/entity/pokemon/miltank.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.miltank.idle", + "ground_idle": "animation.miltank.ground_idle", + "air_idle": "animation.miltank.ground_idle", + "water_idle": "animation.miltank.ground_idle", "walking": "animation.miltank.walking", "flying": "animation.miltank.walking", "swimming": "animation.miltank.walking", - "sleeping": "animation.miltank.idle", - "fall_asleep": "animation.miltank.fall_asleep", - "wake_up": "animation.miltank.wake_up", - "attack": "animation.miltank.idle", + "sleeping": "animation.miltank.ground_idle", + "attack": "animation.miltank.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/moltres.json b/entity/pokemon/moltres.json index fe54e0f15..3511b898d 100644 --- a/entity/pokemon/moltres.json +++ b/entity/pokemon/moltres.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.moltres.idle", + "ground_idle": "animation.moltres.ground_idle", + "air_idle": "animation.moltres.air_idle", + "water_idle": "animation.moltres.ground_idle", "walking": "animation.moltres.walking", "flying": "animation.moltres.flying", "swimming": "animation.moltres.walking", - "sleeping": "animation.moltres.idle", - "fall_asleep": "animation.moltres.fall_asleep", - "wake_up": "animation.moltres.wake_up", - "attack": "animation.moltres.idle", + "sleeping": "animation.moltres.ground_idle", + "attack": "animation.moltres.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/monferno.json b/entity/pokemon/monferno.json index a73a15a84..97223d0ae 100644 --- a/entity/pokemon/monferno.json +++ b/entity/pokemon/monferno.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.monferno.idle", + "ground_idle": "animation.monferno.ground_idle", + "air_idle": "animation.monferno.ground_idle", + "water_idle": "animation.monferno.ground_idle", "walking": "animation.monferno.walking", "flying": "animation.monferno.walking", "swimming": "animation.monferno.walking", - "sleeping": "animation.monferno.idle", - "fall_asleep": "animation.monferno.fall_asleep", - "wake_up": "animation.monferno.wake_up", + "sleeping": "animation.monferno.ground_idle", "attack": "animation.monferno.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/mrmime.json b/entity/pokemon/mrmime.json index 717f18815..23afbba20 100644 --- a/entity/pokemon/mrmime.json +++ b/entity/pokemon/mrmime.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.mrmime.idle", + "ground_idle": "animation.mrmime.ground_idle", + "air_idle": "animation.mrmime.ground_idle", + "water_idle": "animation.mrmime.ground_idle", "walking": "animation.mrmime.walking", "flying": "animation.mrmime.walking", "swimming": "animation.mrmime.walking", - "sleeping": "animation.mrmime.idle", - "fall_asleep": "animation.mrmime.fall_asleep", - "wake_up": "animation.mrmime.wake_up", + "sleeping": "animation.mrmime.ground_idle", "attack": "animation.mrmime.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/mudkip.json b/entity/pokemon/mudkip.json index 6bb2a8930..2f76b6d62 100644 --- a/entity/pokemon/mudkip.json +++ b/entity/pokemon/mudkip.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.mudkip.idle", + "ground_idle": "animation.mudkip.ground_idle", + "air_idle": "animation.mudkip.ground_idle", + "water_idle": "animation.mudkip.ground_idle", "walking": "animation.mudkip.walking", "flying": "animation.mudkip.walking", "swimming": "animation.mudkip.swimming", - "sleeping": "animation.mudkip.idle", - "fall_asleep": "animation.mudkip.fall_asleep", - "wake_up": "animation.mudkip.wake_up", + "sleeping": "animation.mudkip.ground_idle", "attack": "animation.mudkip.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/munchlax.json b/entity/pokemon/munchlax.json index 6c41e8eaa..f7b84909c 100644 --- a/entity/pokemon/munchlax.json +++ b/entity/pokemon/munchlax.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.munchlax.idle", + "ground_idle": "animation.munchlax.ground_idle", + "air_idle": "animation.munchlax.ground_idle", + "water_idle": "animation.munchlax.ground_idle", "walking": "animation.munchlax.walking", "flying": "animation.munchlax.walking", "swimming": "animation.munchlax.swimming", "sleeping": "animation.munchlax.sleeping", - "fall_asleep": "animation.munchlax.fall_asleep", - "wake_up": "animation.munchlax.wake_up", "attack": "animation.munchlax.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/murkrow.json b/entity/pokemon/murkrow.json index 3a9b18622..01a7f0c9a 100644 --- a/entity/pokemon/murkrow.json +++ b/entity/pokemon/murkrow.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.murkrow.idle", + "ground_idle": "animation.murkrow.ground_idle", + "air_idle": "animation.murkrow.ground_idle", + "water_idle": "animation.murkrow.ground_idle", "walking": "animation.murkrow.walking", "flying": "animation.murkrow.walking", "swimming": "animation.murkrow.walking", - "sleeping": "animation.murkrow.idle", - "fall_asleep": "animation.murkrow.fall_asleep", - "wake_up": "animation.murkrow.wake_up", - "attack": "animation.murkrow.idle", + "sleeping": "animation.murkrow.ground_idle", + "attack": "animation.murkrow.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/natu.json b/entity/pokemon/natu.json index cc3daddce..3d1acca03 100644 --- a/entity/pokemon/natu.json +++ b/entity/pokemon/natu.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.natu.idle", + "ground_idle": "animation.natu.ground_idle", + "air_idle": "animation.natu.ground_idle", + "water_idle": "animation.natu.ground_idle", "walking": "animation.natu.walking", "flying": "animation.natu.flying", "swimming": "animation.natu.walking", - "sleeping": "animation.natu.idle", - "fall_asleep": "animation.natu.fall_asleep", - "wake_up": "animation.natu.wake_up", - "attack": "animation.natu.idle", + "sleeping": "animation.natu.ground_idle", + "attack": "animation.natu.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/nidoking.json b/entity/pokemon/nidoking.json index e697abaf2..27ecb83aa 100644 --- a/entity/pokemon/nidoking.json +++ b/entity/pokemon/nidoking.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.nidoking.idle", + "ground_idle": "animation.nidoking.ground_idle", + "air_idle": "animation.nidoking.ground_idle", + "water_idle": "animation.nidoking.ground_idle", "walking": "animation.nidoking.walking", "flying": "animation.nidoking.walking", "swimming": "animation.nidoking.walking", - "sleeping": "animation.nidoking.idle", - "fall_asleep": "animation.nidoking.fall_asleep", - "wake_up": "animation.nidoking.wake_up", + "sleeping": "animation.nidoking.ground_idle", "attack": "animation.nidoking.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/nidoqueen.json b/entity/pokemon/nidoqueen.json index 543e76992..508450da5 100644 --- a/entity/pokemon/nidoqueen.json +++ b/entity/pokemon/nidoqueen.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.nidoqueen.idle", + "ground_idle": "animation.nidoqueen.ground_idle", + "air_idle": "animation.nidoqueen.ground_idle", + "water_idle": "animation.nidoqueen.ground_idle", "walking": "animation.nidoqueen.walking", "flying": "animation.nidoqueen.walking", "swimming": "animation.nidoqueen.walking", - "sleeping": "animation.nidoqueen.idle", - "fall_asleep": "animation.nidoqueen.fall_asleep", - "wake_up": "animation.nidoqueen.wake_up", + "sleeping": "animation.nidoqueen.ground_idle", "attack": "animation.nidoqueen.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/nidoranf.json b/entity/pokemon/nidoranf.json index bea540314..bf437688b 100644 --- a/entity/pokemon/nidoranf.json +++ b/entity/pokemon/nidoranf.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.nidoranf.idle", + "ground_idle": "animation.nidoranf.ground_idle", + "air_idle": "animation.nidoranf.ground_idle", + "water_idle": "animation.nidoranf.ground_idle", "walking": "animation.nidoranf.walking", "flying": "animation.nidoranf.walking", "swimming": "animation.nidoranf.walking", - "sleeping": "animation.nidoranf.idle", - "fall_asleep": "animation.nidoranf.fall_asleep", - "wake_up": "animation.nidoranf.wake_up", + "sleeping": "animation.nidoranf.ground_idle", "attack": "animation.nidoranf.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/nidoranm.json b/entity/pokemon/nidoranm.json index d998dec31..1eea22f64 100644 --- a/entity/pokemon/nidoranm.json +++ b/entity/pokemon/nidoranm.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.nidoranm.idle", + "ground_idle": "animation.nidoranm.ground_idle", + "air_idle": "animation.nidoranm.ground_idle", + "water_idle": "animation.nidoranm.ground_idle", "walking": "animation.nidoranm.walking", "flying": "animation.nidoranm.walking", "swimming": "animation.nidoranm.walking", - "sleeping": "animation.nidoranm.idle", - "fall_asleep": "animation.nidoranm.fall_asleep", - "wake_up": "animation.nidoranm.wake_up", + "sleeping": "animation.nidoranm.ground_idle", "attack": "animation.nidoranm.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/nidorina.json b/entity/pokemon/nidorina.json index dc7c312af..2230abcac 100644 --- a/entity/pokemon/nidorina.json +++ b/entity/pokemon/nidorina.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.nidorina.idle", + "ground_idle": "animation.nidorina.ground_idle", + "air_idle": "animation.nidorina.ground_idle", + "water_idle": "animation.nidorina.ground_idle", "walking": "animation.nidorina.walking", "flying": "animation.nidorina.walking", "swimming": "animation.nidorina.walking", - "sleeping": "animation.nidorina.idle", - "fall_asleep": "animation.nidorina.fall_asleep", - "wake_up": "animation.nidorina.wake_up", - "attack": "animation.nidorina.idle", + "sleeping": "animation.nidorina.ground_idle", + "attack": "animation.nidorina.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/nidorino.json b/entity/pokemon/nidorino.json index 983abab38..624f355e2 100644 --- a/entity/pokemon/nidorino.json +++ b/entity/pokemon/nidorino.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.nidorino.idle", + "ground_idle": "animation.nidorino.ground_idle", + "air_idle": "animation.nidorino.ground_idle", + "water_idle": "animation.nidorino.ground_idle", "walking": "animation.nidorino.walking", "flying": "animation.nidorino.walking", "swimming": "animation.nidorino.walking", - "sleeping": "animation.nidorino.idle", - "fall_asleep": "animation.nidorino.fall_asleep", - "wake_up": "animation.nidorino.wake_up", + "sleeping": "animation.nidorino.ground_idle", "attack": "animation.nidorino.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/ninetales.json b/entity/pokemon/ninetales.json index 42e0bd4ab..0078249b5 100644 --- a/entity/pokemon/ninetales.json +++ b/entity/pokemon/ninetales.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.ninetales.idle", + "ground_idle": "animation.ninetales.ground_idle", + "air_idle": "animation.ninetales.ground_idle", + "water_idle": "animation.ninetales.ground_idle", "walking": "animation.ninetales.walking", "flying": "animation.ninetales.walking", "swimming": "animation.ninetales.walking", - "sleeping": "animation.ninetales.idle", - "fall_asleep": "animation.ninetales.fall_asleep", - "wake_up": "animation.ninetales.wake_up", - "attack": "animation.ninetales.idle", + "sleeping": "animation.ninetales.ground_idle", + "attack": "animation.ninetales.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/noctowl.json b/entity/pokemon/noctowl.json index 6acbdd706..7a2539833 100644 --- a/entity/pokemon/noctowl.json +++ b/entity/pokemon/noctowl.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.noctowl.idle", + "ground_idle": "animation.noctowl.ground_idle", + "air_idle": "animation.noctowl.ground_idle", + "water_idle": "animation.noctowl.ground_idle", "walking": "animation.noctowl.walking", "flying": "animation.noctowl.flying", "swimming": "animation.noctowl.walking", - "sleeping": "animation.noctowl.idle", - "fall_asleep": "animation.noctowl.fall_asleep", - "wake_up": "animation.noctowl.wake_up", - "attack": "animation.noctowl.idle", + "sleeping": "animation.noctowl.ground_idle", + "attack": "animation.noctowl.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/octillery.json b/entity/pokemon/octillery.json index 9644ec8e4..43b6e8df0 100644 --- a/entity/pokemon/octillery.json +++ b/entity/pokemon/octillery.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.octillery.idle", + "ground_idle": "animation.octillery.ground_idle", + "air_idle": "animation.octillery.ground_idle", + "water_idle": "animation.octillery.ground_idle", "walking": "animation.octillery.walking", "flying": "animation.octillery.walking", "swimming": "animation.octillery.walking", - "sleeping": "animation.octillery.idle", - "fall_asleep": "animation.octillery.fall_asleep", - "wake_up": "animation.octillery.wake_up", - "attack": "animation.octillery.idle", + "sleeping": "animation.octillery.ground_idle", + "attack": "animation.octillery.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/oddish.json b/entity/pokemon/oddish.json index 271c91ade..005b44875 100644 --- a/entity/pokemon/oddish.json +++ b/entity/pokemon/oddish.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.oddish.idle", + "ground_idle": "animation.oddish.ground_idle", + "air_idle": "animation.oddish.ground_idle", + "water_idle": "animation.oddish.ground_idle", "walking": "animation.oddish.walking", "flying": "animation.oddish.walking", "swimming": "animation.oddish.walking", - "sleeping": "animation.oddish.idle", - "fall_asleep": "animation.oddish.fall_asleep", - "wake_up": "animation.oddish.wake_up", + "sleeping": "animation.oddish.ground_idle", "attack": "animation.oddish.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/omanyte.json b/entity/pokemon/omanyte.json index 6d8a76145..99af59921 100644 --- a/entity/pokemon/omanyte.json +++ b/entity/pokemon/omanyte.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.omanyte.idle", + "ground_idle": "animation.omanyte.ground_idle", + "air_idle": "animation.omanyte.ground_idle", + "water_idle": "animation.omanyte.ground_idle", "walking": "animation.omanyte.walking", "flying": "animation.omanyte.walking", "swimming": "animation.omanyte.walking", - "sleeping": "animation.omanyte.idle", - "fall_asleep": "animation.omanyte.fall_asleep", - "wake_up": "animation.omanyte.wake_up", + "sleeping": "animation.omanyte.ground_idle", "attack": "animation.omanyte.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/omastar.json b/entity/pokemon/omastar.json index fcdc9a244..9ccc8b196 100644 --- a/entity/pokemon/omastar.json +++ b/entity/pokemon/omastar.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.omastar.idle", + "ground_idle": "animation.omastar.ground_idle", + "air_idle": "animation.omastar.ground_idle", + "water_idle": "animation.omastar.ground_idle", "walking": "animation.omastar.walking", "flying": "animation.omastar.walking", "swimming": "animation.omastar.walking", - "sleeping": "animation.omastar.idle", - "fall_asleep": "animation.omastar.fall_asleep", - "wake_up": "animation.omastar.wake_up", + "sleeping": "animation.omastar.ground_idle", "attack": "animation.omastar.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/onix.json b/entity/pokemon/onix.json index b5bf08886..0f4e70852 100644 --- a/entity/pokemon/onix.json +++ b/entity/pokemon/onix.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.onix.idle", + "ground_idle": "animation.onix.ground_idle", + "air_idle": "animation.onix.ground_idle", + "water_idle": "animation.onix.ground_idle", "walking": "animation.onix.walking", "flying": "animation.onix.walking", "swimming": "animation.onix.walking", - "sleeping": "animation.onix.idle", - "fall_asleep": "animation.onix.fall_asleep", - "wake_up": "animation.onix.wake_up", + "sleeping": "animation.onix.ground_idle", "attack": "animation.onix.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/oshawott.json b/entity/pokemon/oshawott.json index baed41485..2bbdcf4d1 100644 --- a/entity/pokemon/oshawott.json +++ b/entity/pokemon/oshawott.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.oshawott.idle", + "ground_idle": "animation.oshawott.ground_idle", + "air_idle": "animation.oshawott.ground_idle", + "water_idle": "animation.oshawott.ground_idle", "walking": "animation.oshawott.walking", "flying": "animation.oshawott.walking", "swimming": "animation.oshawott.walking", - "sleeping": "animation.oshawott.idle", - "fall_asleep": "animation.oshawott.fall_asleep", - "wake_up": "animation.oshawott.wake_up", + "sleeping": "animation.oshawott.ground_idle", "attack": "animation.oshawott.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/palkia.json b/entity/pokemon/palkia.json index be9151a7a..898b3488e 100644 --- a/entity/pokemon/palkia.json +++ b/entity/pokemon/palkia.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.palkia.idle", + "ground_idle": "animation.palkia.ground_idle", + "air_idle": "animation.palkia.ground_idle", + "water_idle": "animation.palkia.ground_idle", "walking": "animation.palkia.walking", "flying": "animation.palkia.walking", "swimming": "animation.palkia.walking", - "sleeping": "animation.palkia.idle", - "fall_asleep": "animation.palkia.fall_asleep", - "wake_up": "animation.palkia.wake_up", - "attack": "animation.palkia.idle", + "sleeping": "animation.palkia.ground_idle", + "attack": "animation.palkia.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/paras.json b/entity/pokemon/paras.json index 166c8f99b..7e3eb7d7a 100644 --- a/entity/pokemon/paras.json +++ b/entity/pokemon/paras.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.paras.idle", + "ground_idle": "animation.paras.ground_idle", + "air_idle": "animation.paras.ground_idle", + "water_idle": "animation.paras.ground_idle", "walking": "animation.paras.walking", "flying": "animation.paras.walking", "swimming": "animation.paras.walking", - "sleeping": "animation.paras.idle", - "fall_asleep": "animation.paras.fall_asleep", - "wake_up": "animation.paras.wake_up", + "sleeping": "animation.paras.ground_idle", "attack": "animation.paras.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/parasect.json b/entity/pokemon/parasect.json index 3d7f737d1..1fc993a33 100644 --- a/entity/pokemon/parasect.json +++ b/entity/pokemon/parasect.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.parasect.idle", + "ground_idle": "animation.parasect.ground_idle", + "air_idle": "animation.parasect.ground_idle", + "water_idle": "animation.parasect.ground_idle", "walking": "animation.parasect.walking", "flying": "animation.parasect.walking", "swimming": "animation.parasect.walking", - "sleeping": "animation.parasect.idle", - "fall_asleep": "animation.parasect.fall_asleep", - "wake_up": "animation.parasect.wake_up", + "sleeping": "animation.parasect.ground_idle", "attack": "animation.parasect.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/persian.json b/entity/pokemon/persian.json index 5166c9c09..8e00c5f7e 100644 --- a/entity/pokemon/persian.json +++ b/entity/pokemon/persian.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.persian.idle", + "ground_idle": "animation.persian.ground_idle", + "air_idle": "animation.persian.ground_idle", + "water_idle": "animation.persian.ground_idle", "walking": "animation.persian.walking", "flying": "animation.persian.walking", "swimming": "animation.persian.walking", - "sleeping": "animation.persian.idle", - "fall_asleep": "animation.persian.fall_asleep", - "wake_up": "animation.persian.wake_up", - "attack": "animation.persian.idle", + "sleeping": "animation.persian.ground_idle", + "attack": "animation.persian.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/petilil.json b/entity/pokemon/petilil.json index c229ad300..3133657d9 100644 --- a/entity/pokemon/petilil.json +++ b/entity/pokemon/petilil.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.petilil.idle", + "ground_idle": "animation.petilil.ground_idle", + "air_idle": "animation.petilil.ground_idle", + "water_idle": "animation.petilil.ground_idle", "walking": "animation.petilil.walking", "flying": "animation.petilil.walking", "swimming": "animation.petilil.walking", - "sleeping": "animation.petilil.idle", - "fall_asleep": "animation.petilil.fall_asleep", - "wake_up": "animation.petilil.wake_up", - "attack": "animation.petilil.idle", + "sleeping": "animation.petilil.ground_idle", + "attack": "animation.petilil.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/phanpy.json b/entity/pokemon/phanpy.json index 153bc3b23..45c689fba 100644 --- a/entity/pokemon/phanpy.json +++ b/entity/pokemon/phanpy.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.phanpy.idle", + "ground_idle": "animation.phanpy.ground_idle", + "air_idle": "animation.phanpy.ground_idle", + "water_idle": "animation.phanpy.ground_idle", "walking": "animation.phanpy.walking", "flying": "animation.phanpy.walking", "swimming": "animation.phanpy.walking", - "sleeping": "animation.phanpy.idle", - "fall_asleep": "animation.phanpy.fall_asleep", - "wake_up": "animation.phanpy.wake_up", - "attack": "animation.phanpy.idle", + "sleeping": "animation.phanpy.ground_idle", + "attack": "animation.phanpy.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/pichu.json b/entity/pokemon/pichu.json index 1f8233d91..78db83624 100644 --- a/entity/pokemon/pichu.json +++ b/entity/pokemon/pichu.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.pichu.idle", + "ground_idle": "animation.pichu.ground_idle", + "air_idle": "animation.pichu.ground_idle", + "water_idle": "animation.pichu.ground_idle", "walking": "animation.pichu.walking", "flying": "animation.pichu.walking", "swimming": "animation.pichu.walking", - "sleeping": "animation.pichu.idle", - "fall_asleep": "animation.pichu.fall_asleep", - "wake_up": "animation.pichu.wake_up", - "attack": "animation.pichu.idle", + "sleeping": "animation.pichu.ground_idle", + "attack": "animation.pichu.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/pidgeot.json b/entity/pokemon/pidgeot.json index bf379fb3a..ea51bf20e 100644 --- a/entity/pokemon/pidgeot.json +++ b/entity/pokemon/pidgeot.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.pidgeot.idle", + "ground_idle": "animation.pidgeot.ground_idle", + "air_idle": "animation.pidgeot.ground_idle", + "water_idle": "animation.pidgeot.ground_idle", "walking": "animation.pidgeot.walking", "flying": "animation.pidgeot.flying", "swimming": "animation.pidgeot.walking", - "sleeping": "animation.pidgeot.idle", - "fall_asleep": "animation.pidgeot.fall_asleep", - "wake_up": "animation.pidgeot.wake_up", + "sleeping": "animation.pidgeot.ground_idle", "attack": "animation.pidgeot.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/pidgeotto.json b/entity/pokemon/pidgeotto.json index 0d75df11a..e0bfb96bb 100644 --- a/entity/pokemon/pidgeotto.json +++ b/entity/pokemon/pidgeotto.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.pidgeotto.idle", + "ground_idle": "animation.pidgeotto.ground_idle", + "air_idle": "animation.pidgeotto.ground_idle", + "water_idle": "animation.pidgeotto.ground_idle", "walking": "animation.pidgeotto.walking", "flying": "animation.pidgeotto.flying", "swimming": "animation.pidgeotto.walking", - "sleeping": "animation.pidgeotto.idle", - "fall_asleep": "animation.pidgeotto.fall_asleep", - "wake_up": "animation.pidgeotto.wake_up", + "sleeping": "animation.pidgeotto.ground_idle", "attack": "animation.pidgeotto.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/pidgey.json b/entity/pokemon/pidgey.json index 22df68053..ca6ec9faa 100644 --- a/entity/pokemon/pidgey.json +++ b/entity/pokemon/pidgey.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.pidgey.idle", + "ground_idle": "animation.pidgey.ground_idle", + "air_idle": "animation.pidgey.ground_idle", + "water_idle": "animation.pidgey.ground_idle", "walking": "animation.pidgey.walking", "flying": "animation.pidgey.flying", "swimming": "animation.pidgey.walking", - "sleeping": "animation.pidgey.idle", - "fall_asleep": "animation.pidgey.fall_asleep", - "wake_up": "animation.pidgey.wake_up", + "sleeping": "animation.pidgey.ground_idle", "attack": "animation.pidgey.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/pignite.json b/entity/pokemon/pignite.json index ba3f42ebe..0ca37ceac 100644 --- a/entity/pokemon/pignite.json +++ b/entity/pokemon/pignite.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.pignite.idle", + "ground_idle": "animation.pignite.ground_idle", + "air_idle": "animation.pignite.ground_idle", + "water_idle": "animation.pignite.ground_idle", "walking": "animation.pignite.walking", "flying": "animation.pignite.walking", "swimming": "animation.pignite.walking", - "sleeping": "animation.pignite.idle", - "fall_asleep": "animation.pignite.fall_asleep", - "wake_up": "animation.pignite.wake_up", + "sleeping": "animation.pignite.ground_idle", "attack": "animation.pignite.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/pikachu.json b/entity/pokemon/pikachu.json index c0989987c..376530b53 100644 --- a/entity/pokemon/pikachu.json +++ b/entity/pokemon/pikachu.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.pikachu.idle", + "ground_idle": "animation.pikachu.ground_idle", + "air_idle": "animation.pikachu.ground_idle", + "water_idle": "animation.pikachu.ground_idle", "walking": "animation.pikachu.walking", "flying": "animation.pikachu.walking", "swimming": "animation.pikachu.walking", - "sleeping": "animation.pikachu.idle", - "fall_asleep": "animation.pikachu.fall_asleep", - "wake_up": "animation.pikachu.wake_up", + "sleeping": "animation.pikachu.ground_idle", "attack": "animation.pikachu.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/piloswine.json b/entity/pokemon/piloswine.json index f566a24ba..0ca4e1274 100644 --- a/entity/pokemon/piloswine.json +++ b/entity/pokemon/piloswine.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.piloswine.idle", + "ground_idle": "animation.piloswine.ground_idle", + "air_idle": "animation.piloswine.ground_idle", + "water_idle": "animation.piloswine.ground_idle", "walking": "animation.piloswine.walking", "flying": "animation.piloswine.walking", "swimming": "animation.piloswine.walking", - "sleeping": "animation.piloswine.idle", - "fall_asleep": "animation.piloswine.fall_asleep", - "wake_up": "animation.piloswine.wake_up", - "attack": "animation.piloswine.idle", + "sleeping": "animation.piloswine.ground_idle", + "attack": "animation.piloswine.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/pineco.json b/entity/pokemon/pineco.json index 79a79fd5d..83f91732e 100644 --- a/entity/pokemon/pineco.json +++ b/entity/pokemon/pineco.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.pineco.idle", + "ground_idle": "animation.pineco.ground_idle", + "air_idle": "animation.pineco.ground_idle", + "water_idle": "animation.pineco.ground_idle", "walking": "animation.pineco.walking", "flying": "animation.pineco.walking", "swimming": "animation.pineco.walking", - "sleeping": "animation.pineco.idle", - "fall_asleep": "animation.pineco.fall_asleep", - "wake_up": "animation.pineco.wake_up", - "attack": "animation.pineco.idle", + "sleeping": "animation.pineco.ground_idle", + "attack": "animation.pineco.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/pinsir.json b/entity/pokemon/pinsir.json index 671aa1ff8..d4454bb6e 100644 --- a/entity/pokemon/pinsir.json +++ b/entity/pokemon/pinsir.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.pinsir.idle", + "ground_idle": "animation.pinsir.ground_idle", + "air_idle": "animation.pinsir.ground_idle", + "water_idle": "animation.pinsir.ground_idle", "walking": "animation.pinsir.walking", "flying": "animation.pinsir.walking", "swimming": "animation.pinsir.walking", - "sleeping": "animation.pinsir.idle", - "fall_asleep": "animation.pinsir.fall_asleep", - "wake_up": "animation.pinsir.wake_up", + "sleeping": "animation.pinsir.ground_idle", "attack": "animation.pinsir.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/piplup.json b/entity/pokemon/piplup.json index be6780bf7..b343413fc 100644 --- a/entity/pokemon/piplup.json +++ b/entity/pokemon/piplup.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.piplup.idle", + "ground_idle": "animation.piplup.ground_idle", + "air_idle": "animation.piplup.ground_idle", + "water_idle": "animation.piplup.ground_idle", "walking": "animation.piplup.walking", "flying": "animation.piplup.walking", "swimming": "animation.piplup.walking", - "sleeping": "animation.piplup.idle", - "fall_asleep": "animation.piplup.fall_asleep", - "wake_up": "animation.piplup.wake_up", + "sleeping": "animation.piplup.ground_idle", "attack": "animation.piplup.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/politoed.json b/entity/pokemon/politoed.json index 8292d4f0f..0eabd0036 100644 --- a/entity/pokemon/politoed.json +++ b/entity/pokemon/politoed.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.politoed.idle", + "ground_idle": "animation.politoed.ground_idle", + "air_idle": "animation.politoed.ground_idle", + "water_idle": "animation.politoed.ground_idle", "walking": "animation.politoed.walking", "flying": "animation.politoed.walking", "swimming": "animation.politoed.walking", - "sleeping": "animation.politoed.idle", - "fall_asleep": "animation.politoed.fall_asleep", - "wake_up": "animation.politoed.wake_up", - "attack": "animation.politoed.idle", + "sleeping": "animation.politoed.ground_idle", + "attack": "animation.politoed.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/poliwag.json b/entity/pokemon/poliwag.json index 191b42073..a9701605e 100644 --- a/entity/pokemon/poliwag.json +++ b/entity/pokemon/poliwag.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.poliwag.idle", + "ground_idle": "animation.poliwag.ground_idle", + "air_idle": "animation.poliwag.ground_idle", + "water_idle": "animation.poliwag.ground_idle", "walking": "animation.poliwag.walking", "flying": "animation.poliwag.walking", "swimming": "animation.poliwag.walking", - "sleeping": "animation.poliwag.idle", - "fall_asleep": "animation.poliwag.fall_asleep", - "wake_up": "animation.poliwag.wake_up", - "attack": "animation.poliwag.idle", + "sleeping": "animation.poliwag.ground_idle", + "attack": "animation.poliwag.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/poliwhirl.json b/entity/pokemon/poliwhirl.json index 8ae055af5..8a4db917d 100644 --- a/entity/pokemon/poliwhirl.json +++ b/entity/pokemon/poliwhirl.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.poliwhirl.idle", + "ground_idle": "animation.poliwhirl.ground_idle", + "air_idle": "animation.poliwhirl.ground_idle", + "water_idle": "animation.poliwhirl.ground_idle", "walking": "animation.poliwhirl.walking", "flying": "animation.poliwhirl.walking", "swimming": "animation.poliwhirl.walking", - "sleeping": "animation.poliwhirl.idle", - "fall_asleep": "animation.poliwhirl.fall_asleep", - "wake_up": "animation.poliwhirl.wake_up", - "attack": "animation.poliwhirl.idle", + "sleeping": "animation.poliwhirl.ground_idle", + "attack": "animation.poliwhirl.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/poliwrath.json b/entity/pokemon/poliwrath.json index d3b8101ab..f03fcda41 100644 --- a/entity/pokemon/poliwrath.json +++ b/entity/pokemon/poliwrath.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.poliwrath.idle", + "ground_idle": "animation.poliwrath.ground_idle", + "air_idle": "animation.poliwrath.ground_idle", + "water_idle": "animation.poliwrath.ground_idle", "walking": "animation.poliwrath.walking", "flying": "animation.poliwrath.walking", "swimming": "animation.poliwrath.walking", - "sleeping": "animation.poliwrath.idle", - "fall_asleep": "animation.poliwrath.fall_asleep", - "wake_up": "animation.poliwrath.wake_up", - "attack": "animation.poliwrath.idle", + "sleeping": "animation.poliwrath.ground_idle", + "attack": "animation.poliwrath.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/popplio.json b/entity/pokemon/popplio.json index b29b3c915..230643cf7 100644 --- a/entity/pokemon/popplio.json +++ b/entity/pokemon/popplio.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.popplio.idle", + "ground_idle": "animation.popplio.ground_idle", + "air_idle": "animation.popplio.ground_idle", + "water_idle": "animation.popplio.ground_idle", "walking": "animation.popplio.walking", "flying": "animation.popplio.walking", "swimming": "animation.popplio.walking", - "sleeping": "animation.popplio.idle", - "fall_asleep": "animation.popplio.fall_asleep", - "wake_up": "animation.popplio.wake_up", + "sleeping": "animation.popplio.ground_idle", "attack": "animation.popplio.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/porygon.json b/entity/pokemon/porygon.json index b41c42c17..a571bdfd7 100644 --- a/entity/pokemon/porygon.json +++ b/entity/pokemon/porygon.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.porygon.idle", + "ground_idle": "animation.porygon.ground_idle", + "air_idle": "animation.porygon.ground_idle", + "water_idle": "animation.porygon.ground_idle", "walking": "animation.porygon.walking", "flying": "animation.porygon.walking", "swimming": "animation.porygon.walking", - "sleeping": "animation.porygon.idle", - "fall_asleep": "animation.porygon.fall_asleep", - "wake_up": "animation.porygon.wake_up", + "sleeping": "animation.porygon.ground_idle", "attack": "animation.porygon.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/porygon2.json b/entity/pokemon/porygon2.json index 2b0bd72c7..28b18a7dd 100644 --- a/entity/pokemon/porygon2.json +++ b/entity/pokemon/porygon2.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.porygon2.idle", + "ground_idle": "animation.porygon2.ground_idle", + "air_idle": "animation.porygon2.ground_idle", + "water_idle": "animation.porygon2.ground_idle", "walking": "animation.porygon2.walking", "flying": "animation.porygon2.walking", "swimming": "animation.porygon2.walking", - "sleeping": "animation.porygon2.idle", - "fall_asleep": "animation.porygon2.fall_asleep", - "wake_up": "animation.porygon2.wake_up", - "attack": "animation.porygon2.idle", + "sleeping": "animation.porygon2.ground_idle", + "attack": "animation.porygon2.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/porygonz.json b/entity/pokemon/porygonz.json index b584e5170..a8c6f2742 100644 --- a/entity/pokemon/porygonz.json +++ b/entity/pokemon/porygonz.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.porygonz.idle", + "ground_idle": "animation.porygonz.ground_idle", + "air_idle": "animation.porygonz.ground_idle", + "water_idle": "animation.porygonz.ground_idle", "walking": "animation.porygonz.walking", "flying": "animation.porygonz.walking", "swimming": "animation.porygonz.walking", - "sleeping": "animation.porygonz.idle", - "fall_asleep": "animation.porygonz.fall_asleep", - "wake_up": "animation.porygonz.wake_up", - "attack": "animation.porygonz.idle", + "sleeping": "animation.porygonz.ground_idle", + "attack": "animation.porygonz.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/primarina.json b/entity/pokemon/primarina.json index 80accf745..12f40ecb1 100644 --- a/entity/pokemon/primarina.json +++ b/entity/pokemon/primarina.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.primarina.idle", + "ground_idle": "animation.primarina.ground_idle", + "air_idle": "animation.primarina.ground_idle", + "water_idle": "animation.primarina.ground_idle", "walking": "animation.primarina.walking", "flying": "animation.primarina.walking", "swimming": "animation.primarina.walking", - "sleeping": "animation.primarina.idle", - "fall_asleep": "animation.primarina.fall_asleep", - "wake_up": "animation.primarina.wake_up", + "sleeping": "animation.primarina.ground_idle", "attack": "animation.primarina.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/primeape.json b/entity/pokemon/primeape.json index 7b03063de..79cecd6ef 100644 --- a/entity/pokemon/primeape.json +++ b/entity/pokemon/primeape.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.primeape.idle", + "ground_idle": "animation.primeape.ground_idle", + "air_idle": "animation.primeape.ground_idle", + "water_idle": "animation.primeape.ground_idle", "walking": "animation.primeape.walking", "flying": "animation.primeape.walking", "swimming": "animation.primeape.swimming", "sleeping": "animation.primeape.sleeping", - "fall_asleep": "animation.primeape.fall_asleep", - "wake_up": "animation.primeape.wake_up", "attack": "animation.primeape.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/prinplup.json b/entity/pokemon/prinplup.json index aaf2ff9a3..42060a1a8 100644 --- a/entity/pokemon/prinplup.json +++ b/entity/pokemon/prinplup.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.prinplup.idle", + "ground_idle": "animation.prinplup.ground_idle", + "air_idle": "animation.prinplup.ground_idle", + "water_idle": "animation.prinplup.ground_idle", "walking": "animation.prinplup.walking", "flying": "animation.prinplup.walking", "swimming": "animation.prinplup.walking", - "sleeping": "animation.prinplup.idle", - "fall_asleep": "animation.prinplup.fall_asleep", - "wake_up": "animation.prinplup.wake_up", + "sleeping": "animation.prinplup.ground_idle", "attack": "animation.prinplup.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/psyduck.json b/entity/pokemon/psyduck.json index 6bc59f8da..3473f6e05 100644 --- a/entity/pokemon/psyduck.json +++ b/entity/pokemon/psyduck.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.psyduck.idle", + "ground_idle": "animation.psyduck.ground_idle", + "air_idle": "animation.psyduck.ground_idle", + "water_idle": "animation.psyduck.ground_idle", "walking": "animation.psyduck.walking", "flying": "animation.psyduck.walking", "swimming": "animation.psyduck.walking", - "sleeping": "animation.psyduck.idle", - "fall_asleep": "animation.psyduck.fall_asleep", - "wake_up": "animation.psyduck.wake_up", - "attack": "animation.psyduck.idle", + "sleeping": "animation.psyduck.ground_idle", + "attack": "animation.psyduck.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/pupitar.json b/entity/pokemon/pupitar.json index 362ef0f35..5e518497b 100644 --- a/entity/pokemon/pupitar.json +++ b/entity/pokemon/pupitar.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.pupitar.idle", + "ground_idle": "animation.pupitar.ground_idle", + "air_idle": "animation.pupitar.ground_idle", + "water_idle": "animation.pupitar.ground_idle", "walking": "animation.pupitar.walking", "flying": "animation.pupitar.walking", "swimming": "animation.pupitar.walking", - "sleeping": "animation.pupitar.idle", - "fall_asleep": "animation.pupitar.fall_asleep", - "wake_up": "animation.pupitar.wake_up", - "attack": "animation.pupitar.idle", + "sleeping": "animation.pupitar.ground_idle", + "attack": "animation.pupitar.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/quagsire.json b/entity/pokemon/quagsire.json index 3b717e7d4..4696d720d 100644 --- a/entity/pokemon/quagsire.json +++ b/entity/pokemon/quagsire.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.quagsire.idle", + "ground_idle": "animation.quagsire.ground_idle", + "air_idle": "animation.quagsire.ground_idle", + "water_idle": "animation.quagsire.ground_idle", "walking": "animation.quagsire.walking", "flying": "animation.quagsire.walking", "swimming": "animation.quagsire.walking", - "sleeping": "animation.quagsire.idle", - "fall_asleep": "animation.quagsire.fall_asleep", - "wake_up": "animation.quagsire.wake_up", - "attack": "animation.quagsire.idle", + "sleeping": "animation.quagsire.ground_idle", + "attack": "animation.quagsire.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/quaquaval.json b/entity/pokemon/quaquaval.json index 613285c90..9ef3a6c9b 100644 --- a/entity/pokemon/quaquaval.json +++ b/entity/pokemon/quaquaval.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.quaquaval.idle", + "ground_idle": "animation.quaquaval.ground_idle", + "air_idle": "animation.quaquaval.ground_idle", + "water_idle": "animation.quaquaval.ground_idle", "walking": "animation.quaquaval.walking", "flying": "animation.quaquaval.walking", "swimming": "animation.quaquaval.walking", - "sleeping": "animation.quaquaval.idle", - "fall_asleep": "animation.quaquaval.fall_asleep", - "wake_up": "animation.quaquaval.wake_up", + "sleeping": "animation.quaquaval.ground_idle", "attack": "animation.quaquaval.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/quaxly.json b/entity/pokemon/quaxly.json index f76c78fac..c29018b63 100644 --- a/entity/pokemon/quaxly.json +++ b/entity/pokemon/quaxly.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.quaxly.idle", + "ground_idle": "animation.quaxly.ground_idle", + "air_idle": "animation.quaxly.ground_idle", + "water_idle": "animation.quaxly.ground_idle", "walking": "animation.quaxly.walking", "flying": "animation.quaxly.walking", "swimming": "animation.quaxly.walking", - "sleeping": "animation.quaxly.idle", - "fall_asleep": "animation.quaxly.fall_asleep", - "wake_up": "animation.quaxly.wake_up", + "sleeping": "animation.quaxly.ground_idle", "attack": "animation.quaxly.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/quaxwell.json b/entity/pokemon/quaxwell.json index d8f8e9a9c..a0957e08f 100644 --- a/entity/pokemon/quaxwell.json +++ b/entity/pokemon/quaxwell.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.quaxwell.idle", + "ground_idle": "animation.quaxwell.ground_idle", + "air_idle": "animation.quaxwell.ground_idle", + "water_idle": "animation.quaxwell.ground_idle", "walking": "animation.quaxwell.walking", "flying": "animation.quaxwell.walking", "swimming": "animation.quaxwell.walking", - "sleeping": "animation.quaxwell.idle", - "fall_asleep": "animation.quaxwell.fall_asleep", - "wake_up": "animation.quaxwell.wake_up", + "sleeping": "animation.quaxwell.ground_idle", "attack": "animation.quaxwell.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/quilava.json b/entity/pokemon/quilava.json index 4f8d97db5..df396116f 100644 --- a/entity/pokemon/quilava.json +++ b/entity/pokemon/quilava.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.quilava.idle", + "ground_idle": "animation.quilava.ground_idle", + "air_idle": "animation.quilava.ground_idle", + "water_idle": "animation.quilava.ground_idle", "walking": "animation.quilava.walking", "flying": "animation.quilava.walking", "swimming": "animation.quilava.walking", - "sleeping": "animation.quilava.idle", - "fall_asleep": "animation.quilava.fall_asleep", - "wake_up": "animation.quilava.wake_up", + "sleeping": "animation.quilava.ground_idle", "attack": "animation.quilava.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/quilladin.json b/entity/pokemon/quilladin.json index 56de33fa6..c990d3661 100644 --- a/entity/pokemon/quilladin.json +++ b/entity/pokemon/quilladin.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.quilladin.idle", + "ground_idle": "animation.quilladin.ground_idle", + "air_idle": "animation.quilladin.ground_idle", + "water_idle": "animation.quilladin.ground_idle", "walking": "animation.quilladin.walking", "flying": "animation.quilladin.walking", "swimming": "animation.quilladin.walking", - "sleeping": "animation.quilladin.idle", - "fall_asleep": "animation.quilladin.fall_asleep", - "wake_up": "animation.quilladin.wake_up", + "sleeping": "animation.quilladin.ground_idle", "attack": "animation.quilladin.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/qwilfish.json b/entity/pokemon/qwilfish.json index 843261ebf..6c35026d1 100644 --- a/entity/pokemon/qwilfish.json +++ b/entity/pokemon/qwilfish.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.qwilfish.idle", + "ground_idle": "animation.qwilfish.ground_idle", + "air_idle": "animation.qwilfish.ground_idle", + "water_idle": "animation.qwilfish.ground_idle", "walking": "animation.qwilfish.walking", "flying": "animation.qwilfish.walking", "swimming": "animation.qwilfish.walking", - "sleeping": "animation.qwilfish.idle", - "fall_asleep": "animation.qwilfish.fall_asleep", - "wake_up": "animation.qwilfish.wake_up", - "attack": "animation.qwilfish.idle", + "sleeping": "animation.qwilfish.ground_idle", + "attack": "animation.qwilfish.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/raboot.json b/entity/pokemon/raboot.json index a4cf96f60..2be384f85 100644 --- a/entity/pokemon/raboot.json +++ b/entity/pokemon/raboot.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.raboot.idle", + "ground_idle": "animation.raboot.ground_idle", + "air_idle": "animation.raboot.ground_idle", + "water_idle": "animation.raboot.ground_idle", "walking": "animation.raboot.walking", "flying": "animation.raboot.walking", "swimming": "animation.raboot.walking", - "sleeping": "animation.raboot.idle", - "fall_asleep": "animation.raboot.fall_asleep", - "wake_up": "animation.raboot.wake_up", + "sleeping": "animation.raboot.ground_idle", "attack": "animation.raboot.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/raichu.json b/entity/pokemon/raichu.json index 315083c50..312f48d7f 100644 --- a/entity/pokemon/raichu.json +++ b/entity/pokemon/raichu.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.raichu.idle", + "ground_idle": "animation.raichu.ground_idle", + "air_idle": "animation.raichu.ground_idle", + "water_idle": "animation.raichu.ground_idle", "walking": "animation.raichu.walking", "flying": "animation.raichu.walking", "swimming": "animation.raichu.walking", - "sleeping": "animation.raichu.idle", - "fall_asleep": "animation.raichu.fall_asleep", - "wake_up": "animation.raichu.wake_up", - "attack": "animation.raichu.idle", + "sleeping": "animation.raichu.ground_idle", + "attack": "animation.raichu.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/raikou.json b/entity/pokemon/raikou.json index 2bd626f31..50ca47220 100644 --- a/entity/pokemon/raikou.json +++ b/entity/pokemon/raikou.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.raikou.idle", + "ground_idle": "animation.raikou.ground_idle", + "air_idle": "animation.raikou.ground_idle", + "water_idle": "animation.raikou.ground_idle", "walking": "animation.raikou.walking", "flying": "animation.raikou.walking", "swimming": "animation.raikou.walking", - "sleeping": "animation.raikou.idle", - "fall_asleep": "animation.raikou.fall_asleep", - "wake_up": "animation.raikou.wake_up", - "attack": "animation.raikou.idle", + "sleeping": "animation.raikou.ground_idle", + "attack": "animation.raikou.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/ralts.json b/entity/pokemon/ralts.json index d2f39ce3a..753a1c44b 100644 --- a/entity/pokemon/ralts.json +++ b/entity/pokemon/ralts.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.ralts.idle", + "ground_idle": "animation.ralts.ground_idle", + "air_idle": "animation.ralts.ground_idle", + "water_idle": "animation.ralts.ground_idle", "walking": "animation.ralts.walking", "flying": "animation.ralts.walking", "swimming": "animation.ralts.walking", "sleeping": "animation.ralts.sleeping", - "fall_asleep": "animation.ralts.fall_asleep", - "wake_up": "animation.ralts.wake_up", "attack": "animation.ralts.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/rayquaza.json b/entity/pokemon/rayquaza.json index 0d150878a..01b73bf88 100644 --- a/entity/pokemon/rayquaza.json +++ b/entity/pokemon/rayquaza.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.rayquaza.idle", + "ground_idle": "animation.rayquaza.ground_idle", + "air_idle": "animation.rayquaza.ground_idle", + "water_idle": "animation.rayquaza.ground_idle", "walking": "animation.rayquaza.walking", "flying": "animation.rayquaza.flying", "swimming": "animation.rayquaza.walking", - "sleeping": "animation.rayquaza.idle", - "fall_asleep": "animation.rayquaza.fall_asleep", - "wake_up": "animation.rayquaza.wake_up", - "attack": "animation.rayquaza.idle", + "sleeping": "animation.rayquaza.ground_idle", + "attack": "animation.rayquaza.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/regice.json b/entity/pokemon/regice.json index 9438caf0b..c4071e029 100644 --- a/entity/pokemon/regice.json +++ b/entity/pokemon/regice.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.regice.idle", + "ground_idle": "animation.regice.ground_idle", + "air_idle": "animation.regice.ground_idle", + "water_idle": "animation.regice.ground_idle", "walking": "animation.regice.walking", "flying": "animation.regice.walking", "swimming": "animation.regice.walking", - "sleeping": "animation.regice.idle", - "fall_asleep": "animation.regice.fall_asleep", - "wake_up": "animation.regice.wake_up", - "attack": "animation.regice.idle", + "sleeping": "animation.regice.ground_idle", + "attack": "animation.regice.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/regigigas.json b/entity/pokemon/regigigas.json index ec2b9cd53..75434d493 100644 --- a/entity/pokemon/regigigas.json +++ b/entity/pokemon/regigigas.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.regigigas.idle", + "ground_idle": "animation.regigigas.ground_idle", + "air_idle": "animation.regigigas.ground_idle", + "water_idle": "animation.regigigas.ground_idle", "walking": "animation.regigigas.walking", "flying": "animation.regigigas.walking", "swimming": "animation.regigigas.walking", - "sleeping": "animation.regigigas.idle", - "fall_asleep": "animation.regigigas.fall_asleep", - "wake_up": "animation.regigigas.wake_up", - "attack": "animation.regigigas.idle", + "sleeping": "animation.regigigas.ground_idle", + "attack": "animation.regigigas.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/regirock.json b/entity/pokemon/regirock.json index d048a2a8d..970afdea3 100644 --- a/entity/pokemon/regirock.json +++ b/entity/pokemon/regirock.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.regirock.idle", + "ground_idle": "animation.regirock.ground_idle", + "air_idle": "animation.regirock.ground_idle", + "water_idle": "animation.regirock.ground_idle", "walking": "animation.regirock.walking", "flying": "animation.regirock.walking", "swimming": "animation.regirock.walking", - "sleeping": "animation.regirock.idle", - "fall_asleep": "animation.regirock.fall_asleep", - "wake_up": "animation.regirock.wake_up", - "attack": "animation.regirock.idle", + "sleeping": "animation.regirock.ground_idle", + "attack": "animation.regirock.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/registeel.json b/entity/pokemon/registeel.json index fb5f3cae5..0b1a9945e 100644 --- a/entity/pokemon/registeel.json +++ b/entity/pokemon/registeel.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.registeel.idle", + "ground_idle": "animation.registeel.ground_idle", + "air_idle": "animation.registeel.ground_idle", + "water_idle": "animation.registeel.ground_idle", "walking": "animation.registeel.walking", "flying": "animation.registeel.walking", "swimming": "animation.registeel.walking", - "sleeping": "animation.registeel.idle", - "fall_asleep": "animation.registeel.fall_asleep", - "wake_up": "animation.registeel.wake_up", - "attack": "animation.registeel.idle", + "sleeping": "animation.registeel.ground_idle", + "attack": "animation.registeel.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/remoraid.json b/entity/pokemon/remoraid.json index cb7bdd7f6..b0f5bb217 100644 --- a/entity/pokemon/remoraid.json +++ b/entity/pokemon/remoraid.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.remoraid.idle", + "ground_idle": "animation.remoraid.ground_idle", + "air_idle": "animation.remoraid.ground_idle", + "water_idle": "animation.remoraid.ground_idle", "walking": "animation.remoraid.walking", "flying": "animation.remoraid.walking", "swimming": "animation.remoraid.walking", - "sleeping": "animation.remoraid.idle", - "fall_asleep": "animation.remoraid.fall_asleep", - "wake_up": "animation.remoraid.wake_up", - "attack": "animation.remoraid.idle", + "sleeping": "animation.remoraid.ground_idle", + "attack": "animation.remoraid.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/rillaboom.json b/entity/pokemon/rillaboom.json index 148fe5afb..335421fd9 100644 --- a/entity/pokemon/rillaboom.json +++ b/entity/pokemon/rillaboom.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.rillaboom.idle", + "ground_idle": "animation.rillaboom.ground_idle", + "air_idle": "animation.rillaboom.ground_idle", + "water_idle": "animation.rillaboom.ground_idle", "walking": "animation.rillaboom.walking", "flying": "animation.rillaboom.walking", "swimming": "animation.rillaboom.walking", - "sleeping": "animation.rillaboom.idle", - "fall_asleep": "animation.rillaboom.fall_asleep", - "wake_up": "animation.rillaboom.wake_up", + "sleeping": "animation.rillaboom.ground_idle", "attack": "animation.rillaboom.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/riolu.json b/entity/pokemon/riolu.json index 37d11b1d2..3954b009a 100644 --- a/entity/pokemon/riolu.json +++ b/entity/pokemon/riolu.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.riolu.idle", + "ground_idle": "animation.riolu.ground_idle", + "air_idle": "animation.riolu.ground_idle", + "water_idle": "animation.riolu.ground_idle", "walking": "animation.riolu.walking", "flying": "animation.riolu.walking", "swimming": "animation.riolu.walking", - "sleeping": "animation.riolu.idle", - "fall_asleep": "animation.riolu.fall_asleep", - "wake_up": "animation.riolu.wake_up", - "attack": "animation.riolu.idle", + "sleeping": "animation.riolu.ground_idle", + "attack": "animation.riolu.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/rowlet.json b/entity/pokemon/rowlet.json index dc9f72ea2..345a4856e 100644 --- a/entity/pokemon/rowlet.json +++ b/entity/pokemon/rowlet.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.rowlet.idle", - "walking": "animation.rowlet.idle", + "ground_idle": "animation.rowlet.ground_idle", + "air_idle": "animation.rowlet.ground_idle", + "water_idle": "animation.rowlet.ground_idle", + "walking": "animation.rowlet.ground_idle", "flying": "animation.rowlet.flying", "swimming": "animation.rowlet.walking", - "sleeping": "animation.rowlet.idle", - "fall_asleep": "animation.rowlet.fall_asleep", - "wake_up": "animation.rowlet.wake_up", + "sleeping": "animation.rowlet.ground_idle", "attack": "animation.rowlet.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/sableye.json b/entity/pokemon/sableye.json index 6a5e17b60..a4b020ac9 100644 --- a/entity/pokemon/sableye.json +++ b/entity/pokemon/sableye.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.sableye.idle", + "ground_idle": "animation.sableye.ground_idle", + "air_idle": "animation.sableye.ground_idle", + "water_idle": "animation.sableye.ground_idle", "walking": "animation.sableye.walking", "flying": "animation.sableye.walking", "swimming": "animation.sableye.walking", - "sleeping": "animation.sableye.idle", - "fall_asleep": "animation.sableye.fall_asleep", - "wake_up": "animation.sableye.wake_up", - "attack": "animation.sableye.idle", + "sleeping": "animation.sableye.ground_idle", + "attack": "animation.sableye.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/samurott.json b/entity/pokemon/samurott.json index 987c0be2a..884646bb6 100644 --- a/entity/pokemon/samurott.json +++ b/entity/pokemon/samurott.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.samurott.idle", + "ground_idle": "animation.samurott.ground_idle", + "air_idle": "animation.samurott.ground_idle", + "water_idle": "animation.samurott.ground_idle", "walking": "animation.samurott.walking", "flying": "animation.samurott.walking", "swimming": "animation.samurott.walking", - "sleeping": "animation.samurott.idle", - "fall_asleep": "animation.samurott.fall_asleep", - "wake_up": "animation.samurott.wake_up", + "sleeping": "animation.samurott.ground_idle", "attack": "animation.samurott.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/sandshrew.json b/entity/pokemon/sandshrew.json index 7deda3ce5..b1ce0499c 100644 --- a/entity/pokemon/sandshrew.json +++ b/entity/pokemon/sandshrew.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.sandshrew.idle", + "ground_idle": "animation.sandshrew.ground_idle", + "air_idle": "animation.sandshrew.ground_idle", + "water_idle": "animation.sandshrew.ground_idle", "walking": "animation.sandshrew.walking", "flying": "animation.sandshrew.walking", "swimming": "animation.sandshrew.walking", - "sleeping": "animation.sandshrew.idle", - "fall_asleep": "animation.sandshrew.fall_asleep", - "wake_up": "animation.sandshrew.wake_up", + "sleeping": "animation.sandshrew.ground_idle", "attack": "animation.sandshrew.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/sandslash.json b/entity/pokemon/sandslash.json index 830fd9151..22ef31ff4 100644 --- a/entity/pokemon/sandslash.json +++ b/entity/pokemon/sandslash.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.sandslash.idle", + "ground_idle": "animation.sandslash.ground_idle", + "air_idle": "animation.sandslash.ground_idle", + "water_idle": "animation.sandslash.ground_idle", "walking": "animation.sandslash.walking", "flying": "animation.sandslash.walking", "swimming": "animation.sandslash.walking", - "sleeping": "animation.sandslash.idle", - "fall_asleep": "animation.sandslash.fall_asleep", - "wake_up": "animation.sandslash.wake_up", + "sleeping": "animation.sandslash.ground_idle", "attack": "animation.sandslash.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/sceptile.json b/entity/pokemon/sceptile.json index eba1689b5..7ce19c79e 100644 --- a/entity/pokemon/sceptile.json +++ b/entity/pokemon/sceptile.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.sceptile.idle", + "ground_idle": "animation.sceptile.ground_idle", + "air_idle": "animation.sceptile.ground_idle", + "water_idle": "animation.sceptile.ground_idle", "walking": "animation.sceptile.walking", "flying": "animation.sceptile.walking", "swimming": "animation.sceptile.walking", - "sleeping": "animation.sceptile.idle", - "fall_asleep": "animation.sceptile.fall_asleep", - "wake_up": "animation.sceptile.wake_up", + "sleeping": "animation.sceptile.ground_idle", "attack": "animation.sceptile.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/scizor.json b/entity/pokemon/scizor.json index 03a278ff5..6dcc18ae6 100644 --- a/entity/pokemon/scizor.json +++ b/entity/pokemon/scizor.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.scizor.idle", + "ground_idle": "animation.scizor.ground_idle", + "air_idle": "animation.scizor.ground_idle", + "water_idle": "animation.scizor.ground_idle", "walking": "animation.scizor.walking", "flying": "animation.scizor.walking", "swimming": "animation.scizor.walking", - "sleeping": "animation.scizor.idle", - "fall_asleep": "animation.scizor.fall_asleep", - "wake_up": "animation.scizor.wake_up", - "attack": "animation.scizor.idle", + "sleeping": "animation.scizor.ground_idle", + "attack": "animation.scizor.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/scorbunny.json b/entity/pokemon/scorbunny.json index c4946cc4e..90c610b62 100644 --- a/entity/pokemon/scorbunny.json +++ b/entity/pokemon/scorbunny.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.scorbunny.idle", + "ground_idle": "animation.scorbunny.ground_idle", + "air_idle": "animation.scorbunny.ground_idle", + "water_idle": "animation.scorbunny.ground_idle", "walking": "animation.scorbunny.walking", "flying": "animation.scorbunny.walking", "swimming": "animation.scorbunny.walking", - "sleeping": "animation.scorbunny.idle", - "fall_asleep": "animation.scorbunny.fall_asleep", - "wake_up": "animation.scorbunny.wake_up", + "sleeping": "animation.scorbunny.ground_idle", "attack": "animation.scorbunny.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/scyther.json b/entity/pokemon/scyther.json index 5847748da..406d63877 100644 --- a/entity/pokemon/scyther.json +++ b/entity/pokemon/scyther.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.scyther.idle", + "ground_idle": "animation.scyther.ground_idle", + "air_idle": "animation.scyther.ground_idle", + "water_idle": "animation.scyther.ground_idle", "walking": "animation.scyther.walking", "flying": "animation.scyther.walking", "swimming": "animation.scyther.walking", - "sleeping": "animation.scyther.idle", - "fall_asleep": "animation.scyther.fall_asleep", - "wake_up": "animation.scyther.wake_up", + "sleeping": "animation.scyther.ground_idle", "attack": "animation.scyther.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/seadra.json b/entity/pokemon/seadra.json index 085c4c0bb..be81063aa 100644 --- a/entity/pokemon/seadra.json +++ b/entity/pokemon/seadra.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.seadra.idle", + "ground_idle": "animation.seadra.ground_idle", + "air_idle": "animation.seadra.ground_idle", + "water_idle": "animation.seadra.ground_idle", "walking": "animation.seadra.walking", "flying": "animation.seadra.walking", "swimming": "animation.seadra.walking", - "sleeping": "animation.seadra.idle", - "fall_asleep": "animation.seadra.fall_asleep", - "wake_up": "animation.seadra.wake_up", + "sleeping": "animation.seadra.ground_idle", "attack": "animation.seadra.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/seaking.json b/entity/pokemon/seaking.json index cbc321e4d..ab3269135 100644 --- a/entity/pokemon/seaking.json +++ b/entity/pokemon/seaking.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.seaking.idle", + "ground_idle": "animation.seaking.ground_idle", + "air_idle": "animation.seaking.ground_idle", + "water_idle": "animation.seaking.ground_idle", "walking": "animation.seaking.walking", "flying": "animation.seaking.walking", "swimming": "animation.seaking.walking", - "sleeping": "animation.seaking.idle", - "fall_asleep": "animation.seaking.fall_asleep", - "wake_up": "animation.seaking.wake_up", + "sleeping": "animation.seaking.ground_idle", "attack": "animation.seaking.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/seel.json b/entity/pokemon/seel.json index 363ab3ca1..fe9bee04b 100644 --- a/entity/pokemon/seel.json +++ b/entity/pokemon/seel.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.seel.idle", + "ground_idle": "animation.seel.ground_idle", + "air_idle": "animation.seel.ground_idle", + "water_idle": "animation.seel.ground_idle", "walking": "animation.seel.walking", "flying": "animation.seel.walking", "swimming": "animation.seel.walking", - "sleeping": "animation.seel.idle", - "fall_asleep": "animation.seel.fall_asleep", - "wake_up": "animation.seel.wake_up", - "attack": "animation.seel.idle", + "sleeping": "animation.seel.ground_idle", + "attack": "animation.seel.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/sentret.json b/entity/pokemon/sentret.json index 10e9043aa..942ef8b7d 100644 --- a/entity/pokemon/sentret.json +++ b/entity/pokemon/sentret.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.sentret.idle", + "ground_idle": "animation.sentret.ground_idle", + "air_idle": "animation.sentret.ground_idle", + "water_idle": "animation.sentret.ground_idle", "walking": "animation.sentret.walking", "flying": "animation.sentret.walking", - "swimming": "animation.sentret.walking", - "sleeping": "animation.sentret.idle", - "fall_asleep": "animation.sentret.fall_asleep", - "wake_up": "animation.sentret.wake_up", - "attack": "animation.sentret.idle", + "swimming": "animation.sentret.swimming", + "sleeping": "animation.sentret.sleeping", + "attack": "animation.sentret.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/serperior.json b/entity/pokemon/serperior.json index 1e80a7e06..a7887f971 100644 --- a/entity/pokemon/serperior.json +++ b/entity/pokemon/serperior.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.serperior.idle", + "ground_idle": "animation.serperior.ground_idle", + "air_idle": "animation.serperior.ground_idle", + "water_idle": "animation.serperior.ground_idle", "walking": "animation.serperior.walking", "flying": "animation.serperior.walking", "swimming": "animation.serperior.walking", - "sleeping": "animation.serperior.idle", - "fall_asleep": "animation.serperior.fall_asleep", - "wake_up": "animation.serperior.wake_up", + "sleeping": "animation.serperior.ground_idle", "attack": "animation.serperior.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/servine.json b/entity/pokemon/servine.json index f8380ee6f..60e2a8b57 100644 --- a/entity/pokemon/servine.json +++ b/entity/pokemon/servine.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.servine.idle", + "ground_idle": "animation.servine.ground_idle", + "air_idle": "animation.servine.ground_idle", + "water_idle": "animation.servine.ground_idle", "walking": "animation.servine.walking", "flying": "animation.servine.walking", "swimming": "animation.servine.walking", - "sleeping": "animation.servine.idle", - "fall_asleep": "animation.servine.fall_asleep", - "wake_up": "animation.servine.wake_up", + "sleeping": "animation.servine.ground_idle", "attack": "animation.servine.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/sewaddle.json b/entity/pokemon/sewaddle.json index ef9d0e7af..1bd0f4cbb 100644 --- a/entity/pokemon/sewaddle.json +++ b/entity/pokemon/sewaddle.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.sewaddle.idle", + "ground_idle": "animation.sewaddle.ground_idle", + "air_idle": "animation.sewaddle.ground_idle", + "water_idle": "animation.sewaddle.ground_idle", "walking": "animation.sewaddle.walking", "flying": "animation.sewaddle.walking", "swimming": "animation.sewaddle.walking", - "sleeping": "animation.sewaddle.idle", - "fall_asleep": "animation.sewaddle.fall_asleep", - "wake_up": "animation.sewaddle.wake_up", - "attack": "animation.sewaddle.idle", + "sleeping": "animation.sewaddle.ground_idle", + "attack": "animation.sewaddle.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/shellder.json b/entity/pokemon/shellder.json index 3e0bb44e4..476af4a0e 100644 --- a/entity/pokemon/shellder.json +++ b/entity/pokemon/shellder.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.shellder.idle", + "ground_idle": "animation.shellder.ground_idle", + "air_idle": "animation.shellder.ground_idle", + "water_idle": "animation.shellder.ground_idle", "walking": "animation.shellder.walking", "flying": "animation.shellder.walking", "swimming": "animation.shellder.walking", - "sleeping": "animation.shellder.idle", - "fall_asleep": "animation.shellder.fall_asleep", - "wake_up": "animation.shellder.wake_up", - "attack": "animation.shellder.idle", + "sleeping": "animation.shellder.ground_idle", + "attack": "animation.shellder.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/shinx.json b/entity/pokemon/shinx.json index e993571b0..97db9652d 100644 --- a/entity/pokemon/shinx.json +++ b/entity/pokemon/shinx.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.shinx.idle", + "ground_idle": "animation.shinx.ground_idle", + "air_idle": "animation.shinx.ground_idle", + "water_idle": "animation.shinx.ground_idle", "walking": "animation.shinx.walking", "flying": "animation.shinx.walking", "swimming": "animation.shinx.walking", - "sleeping": "animation.shinx.idle", - "fall_asleep": "animation.shinx.fall_asleep", - "wake_up": "animation.shinx.wake_up", - "attack": "animation.shinx.idle", + "sleeping": "animation.shinx.ground_idle", + "attack": "animation.shinx.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/shuckle.json b/entity/pokemon/shuckle.json index f1a0210f4..fdea98dec 100644 --- a/entity/pokemon/shuckle.json +++ b/entity/pokemon/shuckle.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.shuckle.idle", + "ground_idle": "animation.shuckle.ground_idle", + "air_idle": "animation.shuckle.ground_idle", + "water_idle": "animation.shuckle.ground_idle", "walking": "animation.shuckle.walking", "flying": "animation.shuckle.walking", "swimming": "animation.shuckle.walking", "sleeping": "animation.shuckle.sleeping", - "fall_asleep": "animation.shuckle.fall_asleep", - "wake_up": "animation.shuckle.wake_up", "attack": "animation.shuckle.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/skarmory.json b/entity/pokemon/skarmory.json index b51c5b887..13ed5f569 100644 --- a/entity/pokemon/skarmory.json +++ b/entity/pokemon/skarmory.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.skarmory.idle", + "ground_idle": "animation.skarmory.ground_idle", + "air_idle": "animation.skarmory.ground_idle", + "water_idle": "animation.skarmory.ground_idle", "walking": "animation.skarmory.walking", "flying": "animation.skarmory.walking", "swimming": "animation.skarmory.walking", - "sleeping": "animation.skarmory.idle", - "fall_asleep": "animation.skarmory.fall_asleep", - "wake_up": "animation.skarmory.wake_up", - "attack": "animation.skarmory.idle", + "sleeping": "animation.skarmory.ground_idle", + "attack": "animation.skarmory.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/skeledirge.json b/entity/pokemon/skeledirge.json index 4436a8bdd..61e6f20e2 100644 --- a/entity/pokemon/skeledirge.json +++ b/entity/pokemon/skeledirge.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.skeledirge.idle", + "ground_idle": "animation.skeledirge.ground_idle", + "air_idle": "animation.skeledirge.ground_idle", + "water_idle": "animation.skeledirge.ground_idle", "walking": "animation.skeledirge.walking", "flying": "animation.skeledirge.walking", "swimming": "animation.skeledirge.walking", - "sleeping": "animation.skeledirge.idle", - "fall_asleep": "animation.skeledirge.fall_asleep", - "wake_up": "animation.skeledirge.wake_up", + "sleeping": "animation.skeledirge.ground_idle", "attack": "animation.skeledirge.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/skiploom.json b/entity/pokemon/skiploom.json index c4848abb0..b37027645 100644 --- a/entity/pokemon/skiploom.json +++ b/entity/pokemon/skiploom.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.skiploom.idle", + "ground_idle": "animation.skiploom.ground_idle", + "air_idle": "animation.skiploom.ground_idle", + "water_idle": "animation.skiploom.ground_idle", "walking": "animation.skiploom.walking", "flying": "animation.skiploom.walking", "swimming": "animation.skiploom.walking", - "sleeping": "animation.skiploom.idle", - "fall_asleep": "animation.skiploom.fall_asleep", - "wake_up": "animation.skiploom.wake_up", - "attack": "animation.skiploom.idle", + "sleeping": "animation.skiploom.ground_idle", + "attack": "animation.skiploom.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/slitherwing.json b/entity/pokemon/slitherwing.json index 7fc5595f8..b121c9ac9 100644 --- a/entity/pokemon/slitherwing.json +++ b/entity/pokemon/slitherwing.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.slitherwing.idle", + "ground_idle": "animation.slitherwing.ground_idle", + "air_idle": "animation.slitherwing.ground_idle", + "water_idle": "animation.slitherwing.ground_idle", "walking": "animation.slitherwing.walking", "flying": "animation.slitherwing.walking", "swimming": "animation.slitherwing.swimming", "sleeping": "animation.slitherwing.sleeping", - "fall_asleep": "animation.slitherwing.fall_asleep", - "wake_up": "animation.slitherwing.wake_up", - "attack": "animation.slitherwing.idle", + "attack": "animation.slitherwing.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/slowbro.json b/entity/pokemon/slowbro.json index ff2f94554..eb6b3ea53 100644 --- a/entity/pokemon/slowbro.json +++ b/entity/pokemon/slowbro.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.slowbro.idle", + "ground_idle": "animation.slowbro.ground_idle", + "air_idle": "animation.slowbro.ground_idle", + "water_idle": "animation.slowbro.ground_idle", "walking": "animation.slowbro.walking", "flying": "animation.slowbro.walking", "swimming": "animation.slowbro.walking", - "sleeping": "animation.slowbro.idle", - "fall_asleep": "animation.slowbro.fall_asleep", - "wake_up": "animation.slowbro.wake_up", - "attack": "animation.slowbro.idle", + "sleeping": "animation.slowbro.ground_idle", + "attack": "animation.slowbro.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/slowking.json b/entity/pokemon/slowking.json index 326d7ff68..1d015cc02 100644 --- a/entity/pokemon/slowking.json +++ b/entity/pokemon/slowking.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.slowking.idle", + "ground_idle": "animation.slowking.ground_idle", + "air_idle": "animation.slowking.ground_idle", + "water_idle": "animation.slowking.ground_idle", "walking": "animation.slowking.walking", "flying": "animation.slowking.walking", "swimming": "animation.slowking.walking", - "sleeping": "animation.slowking.idle", - "fall_asleep": "animation.slowking.fall_asleep", - "wake_up": "animation.slowking.wake_up", - "attack": "animation.slowking.idle", + "sleeping": "animation.slowking.ground_idle", + "attack": "animation.slowking.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/slowpoke.json b/entity/pokemon/slowpoke.json index 7f007e68a..2704a5524 100644 --- a/entity/pokemon/slowpoke.json +++ b/entity/pokemon/slowpoke.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.slowpoke.idle", + "ground_idle": "animation.slowpoke.ground_idle", + "air_idle": "animation.slowpoke.ground_idle", + "water_idle": "animation.slowpoke.ground_idle", "walking": "animation.slowpoke.walking", "flying": "animation.slowpoke.walking", "swimming": "animation.slowpoke.walking", - "sleeping": "animation.slowpoke.idle", - "fall_asleep": "animation.slowpoke.fall_asleep", - "wake_up": "animation.slowpoke.wake_up", - "attack": "animation.slowpoke.idle", + "sleeping": "animation.slowpoke.ground_idle", + "attack": "animation.slowpoke.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/slugma.json b/entity/pokemon/slugma.json index 4316ff5ee..f6aa3fd96 100644 --- a/entity/pokemon/slugma.json +++ b/entity/pokemon/slugma.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.slugma.idle", + "ground_idle": "animation.slugma.ground_idle", + "air_idle": "animation.slugma.ground_idle", + "water_idle": "animation.slugma.ground_idle", "walking": "animation.slugma.walking", "flying": "animation.slugma.walking", "swimming": "animation.slugma.walking", - "sleeping": "animation.slugma.idle", - "fall_asleep": "animation.slugma.fall_asleep", - "wake_up": "animation.slugma.wake_up", - "attack": "animation.slugma.idle", + "sleeping": "animation.slugma.ground_idle", + "attack": "animation.slugma.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/smeargle.json b/entity/pokemon/smeargle.json index e41e4df91..9fe36d114 100644 --- a/entity/pokemon/smeargle.json +++ b/entity/pokemon/smeargle.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.smeargle.idle", + "ground_idle": "animation.smeargle.ground_idle", + "air_idle": "animation.smeargle.ground_idle", + "water_idle": "animation.smeargle.ground_idle", "walking": "animation.smeargle.walking", "flying": "animation.smeargle.walking", "swimming": "animation.smeargle.walking", - "sleeping": "animation.smeargle.idle", - "fall_asleep": "animation.smeargle.fall_asleep", - "wake_up": "animation.smeargle.wake_up", - "attack": "animation.smeargle.idle", + "sleeping": "animation.smeargle.ground_idle", + "attack": "animation.smeargle.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/smoochum.json b/entity/pokemon/smoochum.json index 719a47aa0..b9b7c064e 100644 --- a/entity/pokemon/smoochum.json +++ b/entity/pokemon/smoochum.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.smoochum.idle", + "ground_idle": "animation.smoochum.ground_idle", + "air_idle": "animation.smoochum.ground_idle", + "water_idle": "animation.smoochum.ground_idle", "walking": "animation.smoochum.walking", "flying": "animation.smoochum.walking", "swimming": "animation.smoochum.walking", - "sleeping": "animation.smoochum.idle", - "fall_asleep": "animation.smoochum.fall_asleep", - "wake_up": "animation.smoochum.wake_up", - "attack": "animation.smoochum.idle", + "sleeping": "animation.smoochum.ground_idle", + "attack": "animation.smoochum.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/sneasel.json b/entity/pokemon/sneasel.json index a92fb8a04..0905b9429 100644 --- a/entity/pokemon/sneasel.json +++ b/entity/pokemon/sneasel.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.sneasel.idle", + "ground_idle": "animation.sneasel.ground_idle", + "air_idle": "animation.sneasel.ground_idle", + "water_idle": "animation.sneasel.ground_idle", "walking": "animation.sneasel.walking", "flying": "animation.sneasel.walking", "swimming": "animation.sneasel.walking", - "sleeping": "animation.sneasel.idle", - "fall_asleep": "animation.sneasel.fall_asleep", - "wake_up": "animation.sneasel.wake_up", - "attack": "animation.sneasel.idle", + "sleeping": "animation.sneasel.ground_idle", + "attack": "animation.sneasel.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/snivy.json b/entity/pokemon/snivy.json index 39f38120b..d12a26286 100644 --- a/entity/pokemon/snivy.json +++ b/entity/pokemon/snivy.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.snivy.idle", + "ground_idle": "animation.snivy.ground_idle", + "air_idle": "animation.snivy.ground_idle", + "water_idle": "animation.snivy.ground_idle", "walking": "animation.snivy.walking", "flying": "animation.snivy.walking", "swimming": "animation.snivy.walking", - "sleeping": "animation.snivy.idle", - "fall_asleep": "animation.snivy.fall_asleep", - "wake_up": "animation.snivy.wake_up", + "sleeping": "animation.snivy.ground_idle", "attack": "animation.snivy.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/snorlax.json b/entity/pokemon/snorlax.json index 3dc3243ef..c35f059ca 100644 --- a/entity/pokemon/snorlax.json +++ b/entity/pokemon/snorlax.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.snorlax.idle", + "ground_idle": "animation.snorlax.ground_idle", + "air_idle": "animation.snorlax.ground_idle", + "water_idle": "animation.snorlax.ground_idle", "walking": "animation.snorlax.walking", "flying": "animation.snorlax.walking", "swimming": "animation.snorlax.walking", - "sleeping": "animation.snorlax.idle", - "fall_asleep": "animation.snorlax.fall_asleep", - "wake_up": "animation.snorlax.wake_up", + "sleeping": "animation.snorlax.ground_idle", "attack": "animation.snorlax.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/sobble.json b/entity/pokemon/sobble.json index e0c54e355..a7317670a 100644 --- a/entity/pokemon/sobble.json +++ b/entity/pokemon/sobble.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.sobble.idle", + "ground_idle": "animation.sobble.ground_idle", + "air_idle": "animation.sobble.ground_idle", + "water_idle": "animation.sobble.ground_idle", "walking": "animation.sobble.walking", "flying": "animation.sobble.walking", "swimming": "animation.sobble.walking", - "sleeping": "animation.sobble.idle", - "fall_asleep": "animation.sobble.fall_asleep", - "wake_up": "animation.sobble.wake_up", + "sleeping": "animation.sobble.ground_idle", "attack": "animation.sobble.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/spinarak.json b/entity/pokemon/spinarak.json index 574a718a9..29f86d16e 100644 --- a/entity/pokemon/spinarak.json +++ b/entity/pokemon/spinarak.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.spinarak.idle", + "ground_idle": "animation.spinarak.ground_idle", + "air_idle": "animation.spinarak.ground_idle", + "water_idle": "animation.spinarak.ground_idle", "walking": "animation.spinarak.walking", "flying": "animation.spinarak.walking", "swimming": "animation.spinarak.walking", - "sleeping": "animation.spinarak.idle", - "fall_asleep": "animation.spinarak.fall_asleep", - "wake_up": "animation.spinarak.wake_up", - "attack": "animation.spinarak.idle", + "sleeping": "animation.spinarak.ground_idle", + "attack": "animation.spinarak.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/sprigatito.json b/entity/pokemon/sprigatito.json index 75cd96351..4acec4d06 100644 --- a/entity/pokemon/sprigatito.json +++ b/entity/pokemon/sprigatito.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.sprigatito.idle", + "ground_idle": "animation.sprigatito.ground_idle", + "air_idle": "animation.sprigatito.ground_idle", + "water_idle": "animation.sprigatito.ground_idle", "walking": "animation.sprigatito.walking", "flying": "animation.sprigatito.walking", "swimming": "animation.sprigatito.walking", - "sleeping": "animation.sprigatito.idle", - "fall_asleep": "animation.sprigatito.fall_asleep", - "wake_up": "animation.sprigatito.wake_up", + "sleeping": "animation.sprigatito.ground_idle", "attack": "animation.sprigatito.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/squirtle.json b/entity/pokemon/squirtle.json index 0e1daffdd..12e8fc924 100644 --- a/entity/pokemon/squirtle.json +++ b/entity/pokemon/squirtle.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.squirtle.idle", + "ground_idle": "animation.squirtle.ground_idle", + "air_idle": "animation.squirtle.ground_idle", + "water_idle": "animation.squirtle.ground_idle", "walking": "animation.squirtle.walking", "flying": "animation.squirtle.walking", "swimming": "animation.squirtle.walking", - "sleeping": "animation.squirtle.idle", - "fall_asleep": "animation.squirtle.fall_asleep", - "wake_up": "animation.squirtle.wake_up", - "attack": "animation.squirtle.idle", + "sleeping": "animation.squirtle.ground_idle", + "attack": "animation.squirtle.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/stantler.json b/entity/pokemon/stantler.json index 67faf4e8d..aede0a58f 100644 --- a/entity/pokemon/stantler.json +++ b/entity/pokemon/stantler.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.stantler.idle", + "ground_idle": "animation.stantler.ground_idle", + "air_idle": "animation.stantler.ground_idle", + "water_idle": "animation.stantler.ground_idle", "walking": "animation.stantler.walking", "flying": "animation.stantler.walking", "swimming": "animation.stantler.walking", - "sleeping": "animation.stantler.idle", - "fall_asleep": "animation.stantler.fall_asleep", - "wake_up": "animation.stantler.wake_up", - "attack": "animation.stantler.idle", + "sleeping": "animation.stantler.ground_idle", + "attack": "animation.stantler.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/starmie.json b/entity/pokemon/starmie.json index ea6da327a..2f90894b0 100644 --- a/entity/pokemon/starmie.json +++ b/entity/pokemon/starmie.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.starmie.idle", + "ground_idle": "animation.starmie.ground_idle", + "air_idle": "animation.starmie.ground_idle", + "water_idle": "animation.starmie.ground_idle", "walking": "animation.starmie.walking", "flying": "animation.starmie.walking", "swimming": "animation.starmie.walking", - "sleeping": "animation.starmie.idle", - "fall_asleep": "animation.starmie.fall_asleep", - "wake_up": "animation.starmie.wake_up", - "attack": "animation.starmie.idle", + "sleeping": "animation.starmie.ground_idle", + "attack": "animation.starmie.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/staryu.json b/entity/pokemon/staryu.json index 696fe3bd1..6c52a6883 100644 --- a/entity/pokemon/staryu.json +++ b/entity/pokemon/staryu.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.staryu.idle", + "ground_idle": "animation.staryu.ground_idle", + "air_idle": "animation.staryu.ground_idle", + "water_idle": "animation.staryu.ground_idle", "walking": "animation.staryu.walking", "flying": "animation.staryu.walking", "swimming": "animation.staryu.walking", - "sleeping": "animation.staryu.idle", - "fall_asleep": "animation.staryu.fall_asleep", - "wake_up": "animation.staryu.wake_up", - "attack": "animation.staryu.idle", + "sleeping": "animation.staryu.ground_idle", + "attack": "animation.staryu.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/steelix.json b/entity/pokemon/steelix.json index ff1ea32e0..643e1d323 100644 --- a/entity/pokemon/steelix.json +++ b/entity/pokemon/steelix.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.steelix.idle", + "ground_idle": "animation.steelix.ground_idle", + "air_idle": "animation.steelix.ground_idle", + "water_idle": "animation.steelix.ground_idle", "walking": "animation.steelix.walking", "flying": "animation.steelix.walking", "swimming": "animation.steelix.walking", - "sleeping": "animation.steelix.idle", - "fall_asleep": "animation.steelix.fall_asleep", - "wake_up": "animation.steelix.wake_up", - "attack": "animation.steelix.idle", + "sleeping": "animation.steelix.ground_idle", + "attack": "animation.steelix.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/sudowoodo.json b/entity/pokemon/sudowoodo.json index cd8e1f5da..1ca4f3c98 100644 --- a/entity/pokemon/sudowoodo.json +++ b/entity/pokemon/sudowoodo.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.sudowoodo.idle", + "ground_idle": "animation.sudowoodo.ground_idle", + "air_idle": "animation.sudowoodo.ground_idle", + "water_idle": "animation.sudowoodo.ground_idle", "walking": "animation.sudowoodo.walking", "flying": "animation.sudowoodo.walking", "swimming": "animation.sudowoodo.walking", - "sleeping": "animation.sudowoodo.idle", - "fall_asleep": "animation.sudowoodo.fall_asleep", - "wake_up": "animation.sudowoodo.wake_up", - "attack": "animation.sudowoodo.idle", + "sleeping": "animation.sudowoodo.ground_idle", + "attack": "animation.sudowoodo.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/suicune.json b/entity/pokemon/suicune.json index ddfd0f3b1..62047f6c1 100644 --- a/entity/pokemon/suicune.json +++ b/entity/pokemon/suicune.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.suicune.idle", + "ground_idle": "animation.suicune.ground_idle", + "air_idle": "animation.suicune.ground_idle", + "water_idle": "animation.suicune.ground_idle", "walking": "animation.suicune.walking", "flying": "animation.suicune.walking", "swimming": "animation.suicune.walking", - "sleeping": "animation.suicune.idle", - "fall_asleep": "animation.suicune.fall_asleep", - "wake_up": "animation.suicune.wake_up", - "attack": "animation.suicune.idle", + "sleeping": "animation.suicune.ground_idle", + "attack": "animation.suicune.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/swadloon.json b/entity/pokemon/swadloon.json index ad4be58a1..49a3148d4 100644 --- a/entity/pokemon/swadloon.json +++ b/entity/pokemon/swadloon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.swadloon.idle", + "ground_idle": "animation.swadloon.ground_idle", + "air_idle": "animation.swadloon.ground_idle", + "water_idle": "animation.swadloon.ground_idle", "walking": "animation.swadloon.walking", "flying": "animation.swadloon.walking", "swimming": "animation.swadloon.walking", - "sleeping": "animation.swadloon.idle", - "fall_asleep": "animation.swadloon.fall_asleep", - "wake_up": "animation.swadloon.wake_up", - "attack": "animation.swadloon.idle", + "sleeping": "animation.swadloon.ground_idle", + "attack": "animation.swadloon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/swampert.json b/entity/pokemon/swampert.json index c2263ba51..055d1be0d 100644 --- a/entity/pokemon/swampert.json +++ b/entity/pokemon/swampert.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.swampert.idle", + "ground_idle": "animation.swampert.ground_idle", + "air_idle": "animation.swampert.ground_idle", + "water_idle": "animation.swampert.ground_idle", "walking": "animation.swampert.walking", "flying": "animation.swampert.walking", "swimming": "animation.swampert.swimming", - "sleeping": "animation.swampert.idle", - "fall_asleep": "animation.swampert.fall_asleep", - "wake_up": "animation.swampert.wake_up", + "sleeping": "animation.swampert.ground_idle", "attack": "animation.swampert.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/swinub.json b/entity/pokemon/swinub.json index 5aaf6fe0b..88a8c8e73 100644 --- a/entity/pokemon/swinub.json +++ b/entity/pokemon/swinub.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.swinub.idle", + "ground_idle": "animation.swinub.ground_idle", + "air_idle": "animation.swinub.ground_idle", + "water_idle": "animation.swinub.ground_idle", "walking": "animation.swinub.walking", "flying": "animation.swinub.walking", "swimming": "animation.swinub.walking", - "sleeping": "animation.swinub.idle", - "fall_asleep": "animation.swinub.fall_asleep", - "wake_up": "animation.swinub.wake_up", - "attack": "animation.swinub.idle", + "sleeping": "animation.swinub.ground_idle", + "attack": "animation.swinub.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/sylveon.json b/entity/pokemon/sylveon.json index 225429739..884c76603 100644 --- a/entity/pokemon/sylveon.json +++ b/entity/pokemon/sylveon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.sylveon.idle", + "ground_idle": "animation.sylveon.ground_idle", + "air_idle": "animation.sylveon.ground_idle", + "water_idle": "animation.sylveon.ground_idle", "walking": "animation.sylveon.walking", "flying": "animation.sylveon.walking", "swimming": "animation.sylveon.walking", - "sleeping": "animation.sylveon.idle", - "fall_asleep": "animation.sylveon.fall_asleep", - "wake_up": "animation.sylveon.wake_up", - "attack": "animation.sylveon.idle", + "sleeping": "animation.sylveon.ground_idle", + "attack": "animation.sylveon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/tangela.json b/entity/pokemon/tangela.json index 8c51ceb60..b3eb2a41b 100644 --- a/entity/pokemon/tangela.json +++ b/entity/pokemon/tangela.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.tangela.idle", + "ground_idle": "animation.tangela.ground_idle", + "air_idle": "animation.tangela.ground_idle", + "water_idle": "animation.tangela.ground_idle", "walking": "animation.tangela.walking", "flying": "animation.tangela.walking", "swimming": "animation.tangela.walking", - "sleeping": "animation.tangela.idle", - "fall_asleep": "animation.tangela.fall_asleep", - "wake_up": "animation.tangela.wake_up", + "sleeping": "animation.tangela.ground_idle", "attack": "animation.tangela.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/tapukoko.json b/entity/pokemon/tapukoko.json index a3b5dac01..8af54bd75 100644 --- a/entity/pokemon/tapukoko.json +++ b/entity/pokemon/tapukoko.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.tapukoko.idle", + "ground_idle": "animation.tapukoko.ground_idle", + "air_idle": "animation.tapukoko.ground_idle", + "water_idle": "animation.tapukoko.ground_idle", "walking": "animation.tapukoko.walking", "flying": "animation.tapukoko.walking", "swimming": "animation.tapukoko.walking", "sleeping": "animation.tapukoko.sleeping", - "fall_asleep": "animation.tapukoko.fall_asleep", - "wake_up": "animation.tapukoko.wake_up", - "attack": "animation.tapukoko.idle", + "attack": "animation.tapukoko.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/tauros.json b/entity/pokemon/tauros.json index db9c2b55d..483366ba3 100644 --- a/entity/pokemon/tauros.json +++ b/entity/pokemon/tauros.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.tauros.idle", + "ground_idle": "animation.tauros.ground_idle", + "air_idle": "animation.tauros.ground_idle", + "water_idle": "animation.tauros.ground_idle", "walking": "animation.tauros.walking", "flying": "animation.tauros.walking", "swimming": "animation.tauros.walking", - "sleeping": "animation.tauros.idle", - "fall_asleep": "animation.tauros.fall_asleep", - "wake_up": "animation.tauros.wake_up", + "sleeping": "animation.tauros.ground_idle", "attack": "animation.tauros.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/teddiursa.json b/entity/pokemon/teddiursa.json index 0fc11b22a..151f48da4 100644 --- a/entity/pokemon/teddiursa.json +++ b/entity/pokemon/teddiursa.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.teddiursa.idle", + "ground_idle": "animation.teddiursa.ground_idle", + "air_idle": "animation.teddiursa.ground_idle", + "water_idle": "animation.teddiursa.ground_idle", "walking": "animation.teddiursa.walking", "flying": "animation.teddiursa.walking", "swimming": "animation.teddiursa.walking", - "sleeping": "animation.teddiursa.idle", - "fall_asleep": "animation.teddiursa.fall_asleep", - "wake_up": "animation.teddiursa.wake_up", - "attack": "animation.teddiursa.idle", + "sleeping": "animation.teddiursa.ground_idle", + "attack": "animation.teddiursa.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/tentacool.json b/entity/pokemon/tentacool.json index 2d63c252c..8be3a541b 100644 --- a/entity/pokemon/tentacool.json +++ b/entity/pokemon/tentacool.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.tentacool.idle", + "ground_idle": "animation.tentacool.ground_idle", + "air_idle": "animation.tentacool.ground_idle", + "water_idle": "animation.tentacool.ground_idle", "walking": "animation.tentacool.walking", "flying": "animation.tentacool.walking", "swimming": "animation.tentacool.walking", - "sleeping": "animation.tentacool.idle", - "fall_asleep": "animation.tentacool.fall_asleep", - "wake_up": "animation.tentacool.wake_up", - "attack": "animation.tentacool.idle", + "sleeping": "animation.tentacool.ground_idle", + "attack": "animation.tentacool.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/tentacruel.json b/entity/pokemon/tentacruel.json index 45fe0c599..97bc61bd5 100644 --- a/entity/pokemon/tentacruel.json +++ b/entity/pokemon/tentacruel.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.tentacruel.idle", + "ground_idle": "animation.tentacruel.ground_idle", + "air_idle": "animation.tentacruel.ground_idle", + "water_idle": "animation.tentacruel.ground_idle", "walking": "animation.tentacruel.walking", "flying": "animation.tentacruel.walking", "swimming": "animation.tentacruel.walking", - "sleeping": "animation.tentacruel.idle", - "fall_asleep": "animation.tentacruel.fall_asleep", - "wake_up": "animation.tentacruel.wake_up", - "attack": "animation.tentacruel.idle", + "sleeping": "animation.tentacruel.ground_idle", + "attack": "animation.tentacruel.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/tepig.json b/entity/pokemon/tepig.json index ab2c3e850..a7d709ebd 100644 --- a/entity/pokemon/tepig.json +++ b/entity/pokemon/tepig.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.tepig.idle", + "ground_idle": "animation.tepig.ground_idle", + "air_idle": "animation.tepig.ground_idle", + "water_idle": "animation.tepig.ground_idle", "walking": "animation.tepig.walking", "flying": "animation.tepig.walking", "swimming": "animation.tepig.walking", - "sleeping": "animation.tepig.idle", - "fall_asleep": "animation.tepig.fall_asleep", - "wake_up": "animation.tepig.wake_up", + "sleeping": "animation.tepig.ground_idle", "attack": "animation.tepig.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/thwackey.json b/entity/pokemon/thwackey.json index b9d50a850..989c86117 100644 --- a/entity/pokemon/thwackey.json +++ b/entity/pokemon/thwackey.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.thwackey.idle", + "ground_idle": "animation.thwackey.ground_idle", + "air_idle": "animation.thwackey.ground_idle", + "water_idle": "animation.thwackey.ground_idle", "walking": "animation.thwackey.walking", "flying": "animation.thwackey.walking", "swimming": "animation.thwackey.walking", - "sleeping": "animation.thwackey.idle", - "fall_asleep": "animation.thwackey.fall_asleep", - "wake_up": "animation.thwackey.wake_up", + "sleeping": "animation.thwackey.ground_idle", "attack": "animation.thwackey.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/toedscool.json b/entity/pokemon/toedscool.json index 75d53c193..2c561bc1b 100644 --- a/entity/pokemon/toedscool.json +++ b/entity/pokemon/toedscool.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.toedscool.idle", + "ground_idle": "animation.toedscool.ground_idle", + "air_idle": "animation.toedscool.ground_idle", + "water_idle": "animation.toedscool.ground_idle", "walking": "animation.toedscool.walking", "flying": "animation.toedscool.walking", "swimming": "animation.toedscool.walking", "sleeping": "animation.toedscool.sleeping", - "fall_asleep": "animation.toedscool.fall_asleep", - "wake_up": "animation.toedscool.wake_up", - "attack": "animation.toedscool.idle", + "attack": "animation.toedscool.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/toedscruel.json b/entity/pokemon/toedscruel.json index 8577b1141..056a3f191 100644 --- a/entity/pokemon/toedscruel.json +++ b/entity/pokemon/toedscruel.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.toedscruel.idle", + "ground_idle": "animation.toedscruel.ground_idle", + "air_idle": "animation.toedscruel.ground_idle", + "water_idle": "animation.toedscruel.ground_idle", "walking": "animation.toedscruel.walking", "flying": "animation.toedscruel.walking", "swimming": "animation.toedscruel.walking", "sleeping": "animation.toedscruel.sleeping", - "fall_asleep": "animation.toedscruel.fall_asleep", - "wake_up": "animation.toedscruel.wake_up", - "attack": "animation.toedscruel.idle", + "attack": "animation.toedscruel.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/togekiss.json b/entity/pokemon/togekiss.json index 0f13844e8..0dd6be379 100644 --- a/entity/pokemon/togekiss.json +++ b/entity/pokemon/togekiss.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.togekiss.idle", + "ground_idle": "animation.togekiss.ground_idle", + "air_idle": "animation.togekiss.air_idle", + "water_idle": "animation.togekiss.water_idle", "walking": "animation.togekiss.walking", "flying": "animation.togekiss.flying", "swimming": "animation.togekiss.swimming", "sleeping": "animation.togekiss.sleeping", - "fall_asleep": "animation.togekiss.fall_asleep", - "wake_up": "animation.togekiss.wake_up", "attack": "animation.togekiss.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/togepi.json b/entity/pokemon/togepi.json index 88a057c06..41f560ea5 100644 --- a/entity/pokemon/togepi.json +++ b/entity/pokemon/togepi.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.togepi.idle", + "ground_idle": "animation.togepi.ground_idle", + "air_idle": "animation.togepi.ground_idle", + "water_idle": "animation.togepi.ground_idle", "walking": "animation.togepi.walking", "flying": "animation.togepi.walking", "swimming": "animation.togepi.walking", - "sleeping": "animation.togepi.idle", - "fall_asleep": "animation.togepi.fall_asleep", - "wake_up": "animation.togepi.wake_up", - "attack": "animation.togepi.idle", + "sleeping": "animation.togepi.ground_idle", + "attack": "animation.togepi.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/togetic.json b/entity/pokemon/togetic.json index 074f3410c..13715d8da 100644 --- a/entity/pokemon/togetic.json +++ b/entity/pokemon/togetic.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.togetic.idle", + "ground_idle": "animation.togetic.ground_idle", + "air_idle": "animation.togetic.ground_idle", + "water_idle": "animation.togetic.ground_idle", "walking": "animation.togetic.walking", "flying": "animation.togetic.walking", "swimming": "animation.togetic.walking", - "sleeping": "animation.togetic.idle", - "fall_asleep": "animation.togetic.fall_asleep", - "wake_up": "animation.togetic.wake_up", - "attack": "animation.togetic.idle", + "sleeping": "animation.togetic.ground_idle", + "attack": "animation.togetic.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/torchic.json b/entity/pokemon/torchic.json index c3ebf9305..73cf7b1a5 100644 --- a/entity/pokemon/torchic.json +++ b/entity/pokemon/torchic.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.torchic.idle", + "ground_idle": "animation.torchic.ground_idle", + "air_idle": "animation.torchic.ground_idle", + "water_idle": "animation.torchic.ground_idle", "walking": "animation.torchic.walking", "flying": "animation.torchic.walking", "swimming": "animation.torchic.walking", - "sleeping": "animation.torchic.idle", - "fall_asleep": "animation.torchic.fall_asleep", - "wake_up": "animation.torchic.wake_up", + "sleeping": "animation.torchic.ground_idle", "attack": "animation.torchic.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/torracat.json b/entity/pokemon/torracat.json index f7fc07bc5..88c360d5a 100644 --- a/entity/pokemon/torracat.json +++ b/entity/pokemon/torracat.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.torracat.idle", + "ground_idle": "animation.torracat.ground_idle", + "air_idle": "animation.torracat.ground_idle", + "water_idle": "animation.torracat.ground_idle", "walking": "animation.torracat.walking", "flying": "animation.torracat.walking", "swimming": "animation.torracat.walking", - "sleeping": "animation.torracat.idle", - "fall_asleep": "animation.torracat.fall_asleep", - "wake_up": "animation.torracat.wake_up", + "sleeping": "animation.torracat.ground_idle", "attack": "animation.torracat.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/torterra.json b/entity/pokemon/torterra.json index 20b2e91c4..ea596e709 100644 --- a/entity/pokemon/torterra.json +++ b/entity/pokemon/torterra.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.torterra.idle", + "ground_idle": "animation.torterra.ground_idle", + "air_idle": "animation.torterra.ground_idle", + "water_idle": "animation.torterra.ground_idle", "walking": "animation.torterra.walking", "flying": "animation.torterra.walking", "swimming": "animation.torterra.walking", - "sleeping": "animation.torterra.idle", - "fall_asleep": "animation.torterra.fall_asleep", - "wake_up": "animation.torterra.wake_up", + "sleeping": "animation.torterra.ground_idle", "attack": "animation.torterra.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/totodile.json b/entity/pokemon/totodile.json index 201b2a542..eaac7c1a8 100644 --- a/entity/pokemon/totodile.json +++ b/entity/pokemon/totodile.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.totodile.idle", + "ground_idle": "animation.totodile.ground_idle", + "air_idle": "animation.totodile.ground_idle", + "water_idle": "animation.totodile.ground_idle", "walking": "animation.totodile.walking", "flying": "animation.totodile.walking", "swimming": "animation.totodile.walking", - "sleeping": "animation.totodile.idle", - "fall_asleep": "animation.totodile.fall_asleep", - "wake_up": "animation.totodile.wake_up", + "sleeping": "animation.totodile.ground_idle", "attack": "animation.totodile.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/treecko.json b/entity/pokemon/treecko.json index b52d648db..6f3ef87f3 100644 --- a/entity/pokemon/treecko.json +++ b/entity/pokemon/treecko.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.treecko.idle", + "ground_idle": "animation.treecko.ground_idle", + "air_idle": "animation.treecko.ground_idle", + "water_idle": "animation.treecko.ground_idle", "walking": "animation.treecko.walking", "flying": "animation.treecko.walking", "swimming": "animation.treecko.walking", - "sleeping": "animation.treecko.idle", - "fall_asleep": "animation.treecko.fall_asleep", - "wake_up": "animation.treecko.wake_up", - "attack": "animation.treecko.idle", + "sleeping": "animation.treecko.ground_idle", + "attack": "animation.treecko.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/turtwig.json b/entity/pokemon/turtwig.json index 036dcf5cd..f11438407 100644 --- a/entity/pokemon/turtwig.json +++ b/entity/pokemon/turtwig.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.turtwig.idle", + "ground_idle": "animation.turtwig.ground_idle", + "air_idle": "animation.turtwig.ground_idle", + "water_idle": "animation.turtwig.ground_idle", "walking": "animation.turtwig.walking", "flying": "animation.turtwig.walking", "swimming": "animation.turtwig.walking", - "sleeping": "animation.turtwig.idle", - "fall_asleep": "animation.turtwig.fall_asleep", - "wake_up": "animation.turtwig.wake_up", + "sleeping": "animation.turtwig.ground_idle", "attack": "animation.turtwig.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/typhlosion.json b/entity/pokemon/typhlosion.json index f0e034ef0..3358314cb 100644 --- a/entity/pokemon/typhlosion.json +++ b/entity/pokemon/typhlosion.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.typhlosion.idle", + "ground_idle": "animation.typhlosion.ground_idle", + "air_idle": "animation.typhlosion.ground_idle", + "water_idle": "animation.typhlosion.ground_idle", "walking": "animation.typhlosion.walking", "flying": "animation.typhlosion.walking", "swimming": "animation.typhlosion.walking", - "sleeping": "animation.typhlosion.idle", - "fall_asleep": "animation.typhlosion.fall_asleep", - "wake_up": "animation.typhlosion.wake_up", + "sleeping": "animation.typhlosion.ground_idle", "attack": "animation.typhlosion.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/tyranitar.json b/entity/pokemon/tyranitar.json index 60b429926..6d793de63 100644 --- a/entity/pokemon/tyranitar.json +++ b/entity/pokemon/tyranitar.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.tyranitar.idle", + "ground_idle": "animation.tyranitar.ground_idle", + "air_idle": "animation.tyranitar.ground_idle", + "water_idle": "animation.tyranitar.ground_idle", "walking": "animation.tyranitar.walking", "flying": "animation.tyranitar.walking", "swimming": "animation.tyranitar.walking", - "sleeping": "animation.tyranitar.idle", - "fall_asleep": "animation.tyranitar.fall_asleep", - "wake_up": "animation.tyranitar.wake_up", - "attack": "animation.tyranitar.idle", + "sleeping": "animation.tyranitar.ground_idle", + "attack": "animation.tyranitar.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/tyrogue.json b/entity/pokemon/tyrogue.json index cf495968f..06c19e940 100644 --- a/entity/pokemon/tyrogue.json +++ b/entity/pokemon/tyrogue.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.tyrogue.idle", + "ground_idle": "animation.tyrogue.ground_idle", + "air_idle": "animation.tyrogue.ground_idle", + "water_idle": "animation.tyrogue.ground_idle", "walking": "animation.tyrogue.walking", "flying": "animation.tyrogue.walking", "swimming": "animation.tyrogue.walking", - "sleeping": "animation.tyrogue.idle", - "fall_asleep": "animation.tyrogue.fall_asleep", - "wake_up": "animation.tyrogue.wake_up", - "attack": "animation.tyrogue.idle", + "sleeping": "animation.tyrogue.ground_idle", + "attack": "animation.tyrogue.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/tyrunt.json b/entity/pokemon/tyrunt.json index 958f63c56..92dc3618d 100644 --- a/entity/pokemon/tyrunt.json +++ b/entity/pokemon/tyrunt.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.tyrunt.idle", + "ground_idle": "animation.tyrunt.ground_idle", + "air_idle": "animation.tyrunt.ground_idle", + "water_idle": "animation.tyrunt.ground_idle", "walking": "animation.tyrunt.walking", "flying": "animation.tyrunt.walking", "swimming": "animation.tyrunt.walking", - "sleeping": "animation.tyrunt.idle", - "fall_asleep": "animation.tyrunt.fall_asleep", - "wake_up": "animation.tyrunt.wake_up", - "attack": "animation.tyrunt.idle", + "sleeping": "animation.tyrunt.ground_idle", + "attack": "animation.tyrunt.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/umbreon.json b/entity/pokemon/umbreon.json index c006fc8bb..b923c9ce6 100644 --- a/entity/pokemon/umbreon.json +++ b/entity/pokemon/umbreon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.umbreon.idle", + "ground_idle": "animation.umbreon.ground_idle", + "air_idle": "animation.umbreon.ground_idle", + "water_idle": "animation.umbreon.ground_idle", "walking": "animation.umbreon.walking", "flying": "animation.umbreon.walking", "swimming": "animation.umbreon.walking", - "sleeping": "animation.umbreon.idle", - "fall_asleep": "animation.umbreon.fall_asleep", - "wake_up": "animation.umbreon.wake_up", - "attack": "animation.umbreon.idle", + "sleeping": "animation.umbreon.ground_idle", + "attack": "animation.umbreon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/ursaring.json b/entity/pokemon/ursaring.json index 100cd6612..40dfe8f96 100644 --- a/entity/pokemon/ursaring.json +++ b/entity/pokemon/ursaring.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.ursaring.idle", + "ground_idle": "animation.ursaring.ground_idle", + "air_idle": "animation.ursaring.ground_idle", + "water_idle": "animation.ursaring.ground_idle", "walking": "animation.ursaring.walking", "flying": "animation.ursaring.walking", "swimming": "animation.ursaring.walking", - "sleeping": "animation.ursaring.idle", - "fall_asleep": "animation.ursaring.fall_asleep", - "wake_up": "animation.ursaring.wake_up", - "attack": "animation.ursaring.idle", + "sleeping": "animation.ursaring.ground_idle", + "attack": "animation.ursaring.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/uxie.json b/entity/pokemon/uxie.json index 8c6278fef..8a4f87985 100644 --- a/entity/pokemon/uxie.json +++ b/entity/pokemon/uxie.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.uxie.idle", + "ground_idle": "animation.uxie.ground_idle", + "air_idle": "animation.uxie.ground_idle", + "water_idle": "animation.uxie.ground_idle", "walking": "animation.uxie.walking", "flying": "animation.uxie.walking", "swimming": "animation.uxie.walking", - "sleeping": "animation.uxie.idle", - "fall_asleep": "animation.uxie.fall_asleep", - "wake_up": "animation.uxie.wake_up", - "attack": "animation.uxie.idle", + "sleeping": "animation.uxie.ground_idle", + "attack": "animation.uxie.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/vaporeon.json b/entity/pokemon/vaporeon.json index 2c8606b4f..b28dc8a3c 100644 --- a/entity/pokemon/vaporeon.json +++ b/entity/pokemon/vaporeon.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.vaporeon.idle", + "ground_idle": "animation.vaporeon.ground_idle", + "air_idle": "animation.vaporeon.ground_idle", + "water_idle": "animation.vaporeon.ground_idle", "walking": "animation.vaporeon.walking", "flying": "animation.vaporeon.walking", "swimming": "animation.vaporeon.swimming", "sleeping": "animation.vaporeon.sleeping", - "fall_asleep": "animation.vaporeon.fall_asleep", - "wake_up": "animation.vaporeon.wake_up", - "attack": "animation.vaporeon.idle", + "attack": "animation.vaporeon.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/venomoth.json b/entity/pokemon/venomoth.json index 5a314128c..7f2287e51 100644 --- a/entity/pokemon/venomoth.json +++ b/entity/pokemon/venomoth.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.venomoth.idle", + "ground_idle": "animation.venomoth.ground_idle", + "air_idle": "animation.venomoth.ground_idle", + "water_idle": "animation.venomoth.ground_idle", "walking": "animation.venomoth.walking", "flying": "animation.venomoth.walking", "swimming": "animation.venomoth.walking", - "sleeping": "animation.venomoth.idle", - "fall_asleep": "animation.venomoth.fall_asleep", - "wake_up": "animation.venomoth.wake_up", + "sleeping": "animation.venomoth.ground_idle", "attack": "animation.venomoth.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/venonat.json b/entity/pokemon/venonat.json index c3b451c2f..59b716f85 100644 --- a/entity/pokemon/venonat.json +++ b/entity/pokemon/venonat.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.venonat.idle", + "ground_idle": "animation.venonat.ground_idle", + "air_idle": "animation.venonat.ground_idle", + "water_idle": "animation.venonat.ground_idle", "walking": "animation.venonat.walking", "flying": "animation.venonat.walking", "swimming": "animation.venonat.walking", - "sleeping": "animation.venonat.idle", - "fall_asleep": "animation.venonat.fall_asleep", - "wake_up": "animation.venonat.wake_up", + "sleeping": "animation.venonat.ground_idle", "attack": "animation.venonat.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/venusaur.json b/entity/pokemon/venusaur.json index 18f2bbc30..6dfaecf34 100644 --- a/entity/pokemon/venusaur.json +++ b/entity/pokemon/venusaur.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.venusaur.idle", + "ground_idle": "animation.venusaur.ground_idle", + "air_idle": "animation.venusaur.ground_idle", + "water_idle": "animation.venusaur.ground_idle", "walking": "animation.venusaur.walking", "flying": "animation.venusaur.walking", "swimming": "animation.venusaur.walking", - "sleeping": "animation.venusaur.idle", - "fall_asleep": "animation.venusaur.fall_asleep", - "wake_up": "animation.venusaur.wake_up", + "sleeping": "animation.venusaur.ground_idle", "attack": "animation.venusaur.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/vileplume.json b/entity/pokemon/vileplume.json index 3509e3477..b8576f757 100644 --- a/entity/pokemon/vileplume.json +++ b/entity/pokemon/vileplume.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.vileplume.idle", + "ground_idle": "animation.vileplume.ground_idle", + "air_idle": "animation.vileplume.ground_idle", + "water_idle": "animation.vileplume.ground_idle", "walking": "animation.vileplume.walking", "flying": "animation.vileplume.walking", "swimming": "animation.vileplume.walking", - "sleeping": "animation.vileplume.idle", - "fall_asleep": "animation.vileplume.fall_asleep", - "wake_up": "animation.vileplume.wake_up", + "sleeping": "animation.vileplume.ground_idle", "attack": "animation.vileplume.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/volcarona.json b/entity/pokemon/volcarona.json index 7f6a00dc2..0b75ac8d7 100644 --- a/entity/pokemon/volcarona.json +++ b/entity/pokemon/volcarona.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.volcarona.idle", + "ground_idle": "animation.volcarona.ground_idle", + "air_idle": "animation.volcarona.ground_idle", + "water_idle": "animation.volcarona.ground_idle", "walking": "animation.volcarona.walking", "flying": "animation.volcarona.flying", "swimming": "animation.volcarona.walking", "sleeping": "animation.volcarona.sleeping", - "fall_asleep": "animation.volcarona.fall_asleep", - "wake_up": "animation.volcarona.wake_up", - "attack": "animation.volcarona.idle", + "attack": "animation.volcarona.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/voltorb.json b/entity/pokemon/voltorb.json index 9299f8d2f..dc9d3e875 100644 --- a/entity/pokemon/voltorb.json +++ b/entity/pokemon/voltorb.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.voltorb.idle", + "ground_idle": "animation.voltorb.ground_idle", + "air_idle": "animation.voltorb.ground_idle", + "water_idle": "animation.voltorb.ground_idle", "walking": "animation.voltorb.walking", "flying": "animation.voltorb.walking", "swimming": "animation.voltorb.walking", "sleeping": "animation.voltorb.sleeping", - "fall_asleep": "animation.voltorb.fall_asleep", - "wake_up": "animation.voltorb.wake_up", - "attack": "animation.voltorb.idle", + "attack": "animation.voltorb.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/vulpix.json b/entity/pokemon/vulpix.json index 7c6009be5..56c0ac1af 100644 --- a/entity/pokemon/vulpix.json +++ b/entity/pokemon/vulpix.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.vulpix.idle", + "ground_idle": "animation.vulpix.ground_idle", + "air_idle": "animation.vulpix.ground_idle", + "water_idle": "animation.vulpix.ground_idle", "walking": "animation.vulpix.walking", "flying": "animation.vulpix.walking", "swimming": "animation.vulpix.walking", - "sleeping": "animation.vulpix.idle", - "fall_asleep": "animation.vulpix.fall_asleep", - "wake_up": "animation.vulpix.wake_up", + "sleeping": "animation.vulpix.ground_idle", "attack": "animation.vulpix.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/wartortle.json b/entity/pokemon/wartortle.json index 1798537f1..a1f228e19 100644 --- a/entity/pokemon/wartortle.json +++ b/entity/pokemon/wartortle.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.wartortle.idle", + "ground_idle": "animation.wartortle.ground_idle", + "air_idle": "animation.wartortle.ground_idle", + "water_idle": "animation.wartortle.ground_idle", "walking": "animation.wartortle.walking", "flying": "animation.wartortle.walking", "swimming": "animation.wartortle.walking", - "sleeping": "animation.wartortle.idle", - "fall_asleep": "animation.wartortle.fall_asleep", - "wake_up": "animation.wartortle.wake_up", - "attack": "animation.wartortle.idle", + "sleeping": "animation.wartortle.ground_idle", + "attack": "animation.wartortle.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/weavile.json b/entity/pokemon/weavile.json index 4f5453a8f..0b61a5af1 100644 --- a/entity/pokemon/weavile.json +++ b/entity/pokemon/weavile.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.weavile.idle", + "ground_idle": "animation.weavile.ground_idle", + "air_idle": "animation.weavile.air_idle", + "water_idle": "animation.weavile.water_idle", "walking": "animation.weavile.walking", "flying": "animation.weavile.flying", "swimming": "animation.weavile.swimming", "sleeping": "animation.weavile.sleeping", - "fall_asleep": "animation.weavile.fall_asleep", - "wake_up": "animation.weavile.wake_up", "attack": "animation.weavile.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/weedle.json b/entity/pokemon/weedle.json index 4c19f6f33..001ca771b 100644 --- a/entity/pokemon/weedle.json +++ b/entity/pokemon/weedle.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.weedle.idle", + "ground_idle": "animation.weedle.ground_idle", + "air_idle": "animation.weedle.ground_idle", + "water_idle": "animation.weedle.ground_idle", "walking": "animation.weedle.walking", "flying": "animation.weedle.walking", "swimming": "animation.weedle.walking", - "sleeping": "animation.weedle.idle", - "fall_asleep": "animation.weedle.fall_asleep", - "wake_up": "animation.weedle.wake_up", - "attack": "animation.weedle.idle", + "sleeping": "animation.weedle.ground_idle", + "attack": "animation.weedle.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/weezing.json b/entity/pokemon/weezing.json index 8ed63c696..2f224913d 100644 --- a/entity/pokemon/weezing.json +++ b/entity/pokemon/weezing.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.weezing.idle", + "ground_idle": "animation.weezing.ground_idle", + "air_idle": "animation.weezing.ground_idle", + "water_idle": "animation.weezing.ground_idle", "walking": "animation.weezing.walking", "flying": "animation.weezing.walking", "swimming": "animation.weezing.walking", - "sleeping": "animation.weezing.idle", - "fall_asleep": "animation.weezing.fall_asleep", - "wake_up": "animation.weezing.wake_up", + "sleeping": "animation.weezing.ground_idle", "attack": "animation.weezing.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/wigglytuff.json b/entity/pokemon/wigglytuff.json index 8db04fc9d..28ae212cf 100644 --- a/entity/pokemon/wigglytuff.json +++ b/entity/pokemon/wigglytuff.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.wigglytuff.idle", + "ground_idle": "animation.wigglytuff.ground_idle", + "air_idle": "animation.wigglytuff.ground_idle", + "water_idle": "animation.wigglytuff.ground_idle", "walking": "animation.wigglytuff.walking", "flying": "animation.wigglytuff.walking", "swimming": "animation.wigglytuff.walking", - "sleeping": "animation.wigglytuff.idle", - "fall_asleep": "animation.wigglytuff.fall_asleep", - "wake_up": "animation.wigglytuff.wake_up", + "sleeping": "animation.wigglytuff.ground_idle", "attack": "animation.wigglytuff.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/wooper.json b/entity/pokemon/wooper.json index d63135c85..f597f9d5a 100644 --- a/entity/pokemon/wooper.json +++ b/entity/pokemon/wooper.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.wooper.idle", + "ground_idle": "animation.wooper.ground_idle", + "air_idle": "animation.wooper.ground_idle", + "water_idle": "animation.wooper.ground_idle", "walking": "animation.wooper.walking", "flying": "animation.wooper.walking", "swimming": "animation.wooper.walking", - "sleeping": "animation.wooper.idle", - "fall_asleep": "animation.wooper.fall_asleep", - "wake_up": "animation.wooper.wake_up", - "attack": "animation.wooper.idle", + "sleeping": "animation.wooper.ground_idle", + "attack": "animation.wooper.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/xatu.json b/entity/pokemon/xatu.json index 53f04b3d1..cb453ec27 100644 --- a/entity/pokemon/xatu.json +++ b/entity/pokemon/xatu.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.xatu.idle", + "ground_idle": "animation.xatu.ground_idle", + "air_idle": "animation.xatu.ground_idle", + "water_idle": "animation.xatu.ground_idle", "walking": "animation.xatu.walking", "flying": "animation.xatu.walking", "swimming": "animation.xatu.walking", - "sleeping": "animation.xatu.idle", - "fall_asleep": "animation.xatu.fall_asleep", - "wake_up": "animation.xatu.wake_up", - "attack": "animation.xatu.idle", + "sleeping": "animation.xatu.ground_idle", + "attack": "animation.xatu.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/xurkitree.json b/entity/pokemon/xurkitree.json index 785e079b0..a3e3dccb4 100644 --- a/entity/pokemon/xurkitree.json +++ b/entity/pokemon/xurkitree.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.xurkitree.idle", + "ground_idle": "animation.xurkitree.ground_idle", + "air_idle": "animation.xurkitree.ground_idle", + "water_idle": "animation.xurkitree.ground_idle", "walking": "animation.xurkitree.walking", "flying": "animation.xurkitree.walking", "swimming": "animation.xurkitree.walking", - "sleeping": "animation.xurkitree.idle", - "fall_asleep": "animation.xurkitree.fall_asleep", - "wake_up": "animation.xurkitree.wake_up", - "attack": "animation.xurkitree.idle", + "sleeping": "animation.xurkitree.ground_idle", + "attack": "animation.xurkitree.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/zapdos.json b/entity/pokemon/zapdos.json index fee75c2a5..bd88518a1 100644 --- a/entity/pokemon/zapdos.json +++ b/entity/pokemon/zapdos.json @@ -43,14 +43,14 @@ ] }, "animations": { - "idle": "animation.zapdos.idle", + "ground_idle": "animation.zapdos.ground_idle", + "air_idle": "animation.zapdos.air_idle", + "water_idle": "animation.zapdos.ground_idle", "walking": "animation.zapdos.walking", "flying": "animation.zapdos.flying", "swimming": "animation.zapdos.walking", - "sleeping": "animation.zapdos.idle", - "fall_asleep": "animation.zapdos.fall_asleep", - "wake_up": "animation.zapdos.wake_up", - "attack": "animation.zapdos.idle", + "sleeping": "animation.zapdos.ground_idle", + "attack": "animation.zapdos.ground_idle", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" }, diff --git a/entity/pokemon/zubat.json b/entity/pokemon/zubat.json index b052d02fe..523a16b22 100644 --- a/entity/pokemon/zubat.json +++ b/entity/pokemon/zubat.json @@ -43,13 +43,13 @@ ] }, "animations": { - "idle": "animation.zubat.idle", + "ground_idle": "animation.zubat.ground_idle", + "air_idle": "animation.zubat.ground_idle", + "water_idle": "animation.zubat.ground_idle", "walking": "animation.zubat.walking", "flying": "animation.zubat.walking", "swimming": "animation.zubat.walking", - "sleeping": "animation.zubat.idle", - "fall_asleep": "animation.zubat.fall_asleep", - "wake_up": "animation.zubat.wake_up", + "sleeping": "animation.zubat.ground_idle", "attack": "animation.zubat.attack", "look_at_target": "animation.common.look_at_target", "controller": "controller.animation.pokemon" diff --git a/manifest.json b/manifest.json index 215805b64..7f1e4db78 100644 --- a/manifest.json +++ b/manifest.json @@ -4,15 +4,15 @@ "name": "pack.name", "description": "pack.description", "min_engine_version": [1, 20, 50], - "uuid": "86909208-4fc7-4a8e-820a-e0da8a2a8cd2", - "version": [2, 8, 2] + "uuid": "d681fa8b-53c8-4cea-8b31-882ff75f6b43", + "version": [2, 8, 3] }, "modules": [ { "description": "Resources Module", "type": "resources", - "uuid": "576bc55c-ee76-476b-98ed-25a18c0415c8", - "version": [2, 8, 2] + "uuid": "2984e4ad-c7da-4602-af16-276dd5cec7fa", + "version": [2, 8, 3] } ], "metadata": { diff --git a/models/entity/pokemon/flaaffy.geo.json b/models/entity/pokemon/flaaffy.geo.json index c5ab5403f..486de2ae7 100644 --- a/models/entity/pokemon/flaaffy.geo.json +++ b/models/entity/pokemon/flaaffy.geo.json @@ -4,347 +4,126 @@ { "description": { "identifier": "geometry.flaaffy", - "texture_width": 32, - "texture_height": 32, - "visible_bounds_width": 4, + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 3, "visible_bounds_height": 3.5, "visible_bounds_offset": [0, 1.25, 0] }, "bones": [ { - "name": "Mareep", + "name": "root", "pivot": [0, 0, 0] }, { - "name": "Body", - "parent": "Mareep", - "pivot": [0, 10.32, -0.84], + "name": "LeftLeg", + "parent": "root", + "pivot": [4.5, 5.5, 0], "cubes": [ - { - "origin": [-3.44, 12.9, -9.44], - "size": [6.88, 6.02, 8.6], - "pivot": [0, 10.32, -6], - "rotation": [-90, 0, 0], - "uv": { - "north": {"uv": [5, 5], "uv_size": [4, 3]}, - "east": {"uv": [0, 5], "uv_size": [5, 3]}, - "south": {"uv": [14, 5], "uv_size": [4, 3]}, - "west": {"uv": [9, 5], "uv_size": [5, 3]}, - "up": {"uv": [5, 0], "uv_size": [4, 5]}, - "down": {"uv": [9, 5], "uv_size": [4, -5]} - } - }, - { - "origin": [-3.01, 12.9, -16.32], - "size": [6.02, 6.02, 6.88], - "pivot": [0, 10.32, -6], - "rotation": [-90, 0, 0], - "uv": { - "north": {"uv": [16, 16], "uv_size": [3, 3]}, - "east": {"uv": [12, 16], "uv_size": [4, 3]}, - "south": {"uv": [23, 16], "uv_size": [3, 3]}, - "west": {"uv": [19, 16], "uv_size": [4, 3]}, - "up": {"uv": [16, 12], "uv_size": [3, 4]}, - "down": {"uv": [19, 16], "uv_size": [3, -4]} - } - }, - { - "origin": [-4.73, 12.384, -16.32], - "size": [9.46, 6.708, 3.44], - "pivot": [0, 10.32, -6], - "rotation": [-90, 0, 0], - "uv": { - "north": {"uv": [15, 2], "uv_size": [5, 3]}, - "east": {"uv": [13, 2], "uv_size": [2, 3]}, - "south": {"uv": [22, 2], "uv_size": [5, 3]}, - "west": {"uv": [20, 2], "uv_size": [2, 3]}, - "up": {"uv": [15, 0], "uv_size": [5, 2]}, - "down": {"uv": [20, 2], "uv_size": [5, -2]} - } - }, - { - "origin": [-3.01, 14.534, -21.48], - "size": [6.02, 3.784, 8.6], - "pivot": [0, 10.32, -6], - "rotation": [-90, 0, 0], - "uv": { - "north": {"uv": [5, 13], "uv_size": [3, 2]}, - "east": {"uv": [0, 13], "uv_size": [5, 2]}, - "south": {"uv": [13, 13], "uv_size": [3, 2]}, - "west": {"uv": [8, 13], "uv_size": [5, 2]}, - "up": {"uv": [5, 8], "uv_size": [3, 5]}, - "down": {"uv": [8, 13], "uv_size": [3, -5]} - } - } + {"origin": [1.5, 2, -2.5], "size": [4, 5, 5], "uv": [0, 42]} ] }, { - "name": "Left_Back_Leg", - "parent": "Mareep", - "pivot": [-3.44, 6.6, -0.12], + "name": "bone", + "parent": "LeftLeg", + "pivot": [4.5, 2.5, 1], "cubes": [ - { - "origin": [-4.3, 3.44, -1.7], - "size": [2.58, 5.16, 3.44], - "uv": { - "north": {"uv": [18, 25], "uv_size": [1, 3]}, - "east": {"uv": [16, 25], "uv_size": [2, 3]}, - "south": {"uv": [21, 25], "uv_size": [1, 3]}, - "west": {"uv": [19, 25], "uv_size": [2, 3]}, - "up": {"uv": [18, 23], "uv_size": [1, 2]}, - "down": {"uv": [19, 25], "uv_size": [1, -2]} - } - }, - { - "origin": [-4.3, 1.72, 0.02], - "size": [2.58, 1.72, 1.72], - "uv": { - "north": {"uv": [23, 6], "uv_size": [1, 1]}, - "east": {"uv": [22, 6], "uv_size": [1, 1]}, - "south": {"uv": [25, 6], "uv_size": [1, 1]}, - "west": {"uv": [24, 6], "uv_size": [1, 1]}, - "up": {"uv": [23, 5], "uv_size": [1, 1]}, - "down": {"uv": [24, 6], "uv_size": [1, -1]} - } - }, - { - "origin": [-4.3, 0, -2.56], - "size": [2.58, 1.72, 4.3], - "uv": { - "north": {"uv": [7, 22], "uv_size": [1, 1]}, - "east": {"uv": [5, 22], "uv_size": [2, 1]}, - "south": {"uv": [10, 22], "uv_size": [1, 1]}, - "west": {"uv": [8, 22], "uv_size": [2, 1]}, - "up": {"uv": [7, 20], "uv_size": [1, 2]}, - "down": {"uv": [8, 22], "uv_size": [1, -2]} - } - } + {"origin": [2.5, 0, -4.5], "size": [2, 2, 7], "uv": [29, 45]} ] }, { - "name": "Left_Front_Leg", - "parent": "Mareep", - "pivot": [-3.44, 17.2, -2.56], + "name": "RightLeg", + "parent": "root", + "pivot": [-4.5, 5.5, 0], "cubes": [ - { - "origin": [-3.92454, 13.06799, -3.42], - "size": [1.72, 5.16, 1.72], - "pivot": [-3.44, 17.2, -2.56], - "rotation": [-22.5, 0, 42.5], - "uv": { - "north": {"uv": [1, 9], "uv_size": [1, 3]}, - "east": {"uv": [0, 9], "uv_size": [1, 3]}, - "south": {"uv": [3, 9], "uv_size": [1, 3]}, - "west": {"uv": [2, 9], "uv_size": [1, 3]}, - "up": {"uv": [1, 8], "uv_size": [1, 1]}, - "down": {"uv": [2, 9], "uv_size": [1, -1]} - } - } + {"origin": [-5.5, 2, -2.5], "size": [4, 5, 5], "uv": [41, 38]} ] }, { - "name": "Right_Back_Leg", - "parent": "Mareep", - "pivot": [3.44, 6.6, -0.12], + "name": "bone2", + "parent": "RightLeg", + "pivot": [-4.5, 2.5, 1], "cubes": [ - { - "origin": [1.72, 3.44, -1.7], - "size": [2.58, 5.16, 3.44], - "uv": { - "north": {"uv": [24, 13], "uv_size": [1, 3]}, - "east": {"uv": [22, 13], "uv_size": [2, 3]}, - "south": {"uv": [27, 13], "uv_size": [1, 3]}, - "west": {"uv": [25, 13], "uv_size": [2, 3]}, - "up": {"uv": [24, 11], "uv_size": [1, 2]}, - "down": {"uv": [25, 13], "uv_size": [1, -2]} - } - }, - { - "origin": [1.72, 1.72, 0.02], - "size": [2.58, 1.72, 1.72], - "uv": { - "north": {"uv": [21, 20], "uv_size": [1, 1]}, - "east": {"uv": [20, 20], "uv_size": [1, 1]}, - "south": {"uv": [23, 20], "uv_size": [1, 1]}, - "west": {"uv": [22, 20], "uv_size": [1, 1]}, - "up": {"uv": [21, 19], "uv_size": [1, 1]}, - "down": {"uv": [22, 20], "uv_size": [1, -1]} - } - }, - { - "origin": [1.72, 0, -2.56], - "size": [2.58, 1.72, 4.3], - "uv": { - "north": {"uv": [13, 11], "uv_size": [1, 1]}, - "east": {"uv": [11, 11], "uv_size": [2, 1]}, - "south": {"uv": [16, 11], "uv_size": [1, 1]}, - "west": {"uv": [14, 11], "uv_size": [2, 1]}, - "up": {"uv": [13, 9], "uv_size": [1, 2]}, - "down": {"uv": [14, 11], "uv_size": [1, -2]} - } - } + {"origin": [-4.5, 0, -4.5], "size": [2, 2, 7], "uv": [18, 43]} ] }, { - "name": "Right_Front_Leg", - "parent": "Mareep", - "pivot": [3.44, 17.2, -2.56], + "name": "body", + "parent": "root", + "pivot": [0, 1, 0], "cubes": [ - { - "origin": [2.20454, 13.06799, -3.42], - "size": [1.72, 5.16, 1.72], - "pivot": [3.44, 17.2, -2.56], - "rotation": [-22.5, 0, -42.5], - "uv": { - "north": {"uv": [1, 1], "uv_size": [1, 3]}, - "east": {"uv": [0, 1], "uv_size": [1, 3]}, - "south": {"uv": [3, 1], "uv_size": [1, 3]}, - "west": {"uv": [2, 1], "uv_size": [1, 3]}, - "up": {"uv": [1, 0], "uv_size": [1, 1]}, - "down": {"uv": [2, 1], "uv_size": [1, -1]} - } - } + {"origin": [-4.5, 3, -4.5], "size": [9, 7, 9], "uv": [0, 14]}, + {"origin": [-3.5, 10, -3.5], "size": [7, 3, 7], "uv": [30, 0]}, + {"origin": [-5, 13, -5], "size": [10, 4, 10], "uv": [0, 0]}, + {"origin": [-4, 17, -4], "size": [8, 2, 8], "uv": [28, 22]} ] }, { - "name": "Tail", - "parent": "Mareep", - "pivot": [0, 8.6, 2.6], + "name": "tail", + "parent": "body", + "pivot": [0, 7.5, 5], + "rotation": [20, 0, 0], "cubes": [ - { - "origin": [-1.29, 6.88, 0.88], - "size": [2.58, 2.58, 6.88], - "pivot": [0, 8.6, 2.6], - "rotation": [30, 0, 0], - "uv": { - "north": {"uv": [12, 23], "uv_size": [1, 1]}, - "east": {"uv": [8, 23], "uv_size": [4, 1]}, - "south": {"uv": [17, 23], "uv_size": [1, 1]}, - "west": {"uv": [13, 23], "uv_size": [4, 1]}, - "up": {"uv": [12, 19], "uv_size": [1, 4]}, - "down": {"uv": [13, 23], "uv_size": [1, -4]} - } - }, - { - "origin": [-0.86, 8.6, 5.868], - "size": [1.72, 1.72, 5.16], - "pivot": [0, 10.32, 6.04], - "rotation": [70, 0, 0], - "uv": { - "north": {"uv": [3, 23], "uv_size": [1, 1]}, - "east": {"uv": [0, 23], "uv_size": [3, 1]}, - "south": {"uv": [7, 23], "uv_size": [1, 1]}, - "west": {"uv": [4, 23], "uv_size": [3, 1]}, - "up": {"uv": [3, 20], "uv_size": [1, 3]}, - "down": {"uv": [4, 23], "uv_size": [1, -3]} - } - }, - { - "origin": [-2.15, 7.31, 11.028], - "size": [4.3, 4.3, 4.3], - "pivot": [0, 10.32, 6.04], - "rotation": [70, 0, 0], - "uv": { - "north": {"uv": [16, 21], "uv_size": [2, 2]}, - "east": {"uv": [14, 21], "uv_size": [2, 2]}, - "south": {"uv": [20, 21], "uv_size": [2, 2]}, - "west": {"uv": [18, 21], "uv_size": [2, 2]}, - "up": {"uv": [16, 19], "uv_size": [2, 2]}, - "down": {"uv": [18, 21], "uv_size": [2, -2]} - } - } + {"origin": [-1.5, 6, 4.5], "size": [3, 3, 3], "uv": [46, 32]} ] }, { - "name": "Head", - "parent": "Mareep", - "pivot": [0, 20.64, -0.84], - "rotation": [-7.5, 0, 0], + "name": "tail2", + "parent": "tail", + "pivot": [0, 7.5, 8], + "rotation": [20, 0, 0], "cubes": [ - { - "origin": [-2.15, 18.89057, -4.72901], - "size": [4.3, 5.16, 5.16], - "uv": { - "north": {"uv": [18, 8], "uv_size": [2, 3]}, - "east": {"uv": [15, 8], "uv_size": [3, 3]}, - "south": {"uv": [23, 8], "uv_size": [2, 3]}, - "west": {"uv": [20, 8], "uv_size": [3, 3]}, - "up": {"uv": [18, 5], "uv_size": [2, 3]}, - "down": {"uv": [20, 8], "uv_size": [2, -3]} - } - }, - { - "origin": [-4.3, 22.33057, -4.29901], - "size": [2.15, 2.58, 2.58], - "uv": { - "north": {"uv": [13, 25], "uv_size": [1, 1]}, - "east": {"uv": [12, 25], "uv_size": [1, 1]}, - "south": {"uv": [15, 25], "uv_size": [1, 1]}, - "west": {"uv": [14, 25], "uv_size": [1, 1]}, - "up": {"uv": [13, 24], "uv_size": [1, 1]}, - "down": {"uv": [14, 25], "uv_size": [1, -1]} - } - }, - { - "origin": [2.15, 22.33057, -4.29901], - "size": [2.15, 2.58, 2.58], - "uv": { - "north": {"uv": [9, 25], "uv_size": [1, 1]}, - "east": {"uv": [8, 25], "uv_size": [1, 1]}, - "south": {"uv": [11, 25], "uv_size": [1, 1]}, - "west": {"uv": [10, 25], "uv_size": [1, 1]}, - "up": {"uv": [9, 24], "uv_size": [1, 1]}, - "down": {"uv": [10, 25], "uv_size": [1, -1]} - } - }, - { - "origin": [-5.59, 22.76057, -3.86901], - "size": [1.72, 1.72, 1.72], - "uv": { - "north": {"uv": [5, 25], "uv_size": [1, 1]}, - "east": {"uv": [4, 25], "uv_size": [1, 1]}, - "south": {"uv": [7, 25], "uv_size": [1, 1]}, - "west": {"uv": [6, 25], "uv_size": [1, 1]}, - "up": {"uv": [5, 24], "uv_size": [1, 1]}, - "down": {"uv": [6, 25], "uv_size": [1, -1]} - } - }, - { - "origin": [3.87, 22.76057, -3.86901], - "size": [1.72, 1.72, 1.72], - "uv": { - "north": {"uv": [1, 25], "uv_size": [1, 1]}, - "east": {"uv": [0, 25], "uv_size": [1, 1]}, - "south": {"uv": [3, 25], "uv_size": [1, 1]}, - "west": {"uv": [2, 25], "uv_size": [1, 1]}, - "up": {"uv": [1, 24], "uv_size": [1, 1]}, - "down": {"uv": [2, 25], "uv_size": [1, -1]} - } - }, - { - "origin": [-2.15, 24.05057, -4.72901], - "size": [4.3, 1.72, 3.44], - "uv": { - "north": {"uv": [22, 23], "uv_size": [2, 1]}, - "east": {"uv": [20, 23], "uv_size": [2, 1]}, - "south": {"uv": [26, 23], "uv_size": [2, 1]}, - "west": {"uv": [24, 23], "uv_size": [2, 1]}, - "up": {"uv": [22, 21], "uv_size": [2, 2]}, - "down": {"uv": [24, 23], "uv_size": [2, -2]} - } - }, - { - "origin": [-2.58, 23.62057, -5.58901], - "size": [5.16, 3.44, 5.16], - "uv": { - "north": {"uv": [3, 18], "uv_size": [3, 2]}, - "east": {"uv": [0, 18], "uv_size": [3, 2]}, - "south": {"uv": [9, 18], "uv_size": [3, 2]}, - "west": {"uv": [6, 18], "uv_size": [3, 2]}, - "up": {"uv": [3, 15], "uv_size": [3, 3]}, - "down": {"uv": [6, 18], "uv_size": [3, -3]} - } - } + {"origin": [-1, 6.5, 7.5], "size": [2, 2, 3], "uv": [0, 0]} + ] + }, + { + "name": "tail3", + "parent": "tail2", + "pivot": [0, 7.5, 11], + "rotation": [20, 0, 0], + "cubes": [ + {"origin": [-0.5, 7, 10.5], "size": [1, 1, 2], "uv": [0, 20]}, + {"origin": [-1.5, 6, 12.5], "size": [3, 3, 3], "uv": [18, 30]} + ] + }, + { + "name": "leftArm", + "parent": "body", + "pivot": [3, 12, -4], + "cubes": [ + {"origin": [2, 9, -5], "size": [2, 4, 2], "uv": [27, 14]} + ] + }, + { + "name": "rightArm", + "parent": "body", + "pivot": [-3, 12, -4], + "cubes": [ + {"origin": [-4, 9, -5], "size": [2, 4, 2], "uv": [0, 14]} + ] + }, + { + "name": "head", + "parent": "body", + "pivot": [0, 18, -1.5], + "rotation": [22.5, 0, 0], + "cubes": [ + {"origin": [-2.5, 18, -6], "size": [5, 4, 8], "uv": [0, 30]}, + {"origin": [-0.5, 18, -1.5], "size": [5, 6, 5], "inflate": 0.1, "pivot": [2, 24, 1], "rotation": [0, -45, 0], "uv": [35, 10]}, + {"origin": [-4.5, 18, -1.5], "size": [5, 6, 5], "inflate": 0.1, "pivot": [-2, 24, 1], "rotation": [0, 45, 0], "uv": [26, 32]}, + {"origin": [2.5, 18.5, -2.5], "size": [3, 3, 3], "uv": [51, 0]}, + {"origin": [-5.5, 18.5, -2.5], "size": [3, 3, 3], "uv": [47, 48]}, + {"origin": [5.5, 19, -2], "size": [2, 2, 2], "uv": [0, 30]}, + {"origin": [-7.5, 19, -2], "size": [2, 2, 2], "uv": [0, 5]} + ] + }, + { + "name": "eyes", + "parent": "head", + "pivot": [0, 21, -3.5], + "cubes": [ + {"origin": [-2.55, 20, -4.5], "size": [0, 2, 2], "pivot": [-2.55, 22, -5], "rotation": [-12.5, 0, 0], "uv": [6, 3]}, + {"origin": [2.55, 20, -4.5], "size": [0, 2, 2], "pivot": [2.55, 22, -5], "rotation": [-12.5, 0, 0], "uv": [4, 18]} ] } ] diff --git a/models/entity/pokemon/mareep.geo.json b/models/entity/pokemon/mareep.geo.json index 9f549b0fb..d4a582925 100644 --- a/models/entity/pokemon/mareep.geo.json +++ b/models/entity/pokemon/mareep.geo.json @@ -6,271 +6,321 @@ "identifier": "geometry.mareep", "texture_width": 64, "texture_height": 64, - "visible_bounds_width": 3, + "visible_bounds_width": 4, "visible_bounds_height": 2.5, "visible_bounds_offset": [0, 0.75, 0] }, "bones": [ { - "name": "Mareep", + "name": "root", "pivot": [0, 0, 0] }, { - "name": "Body", - "parent": "Mareep", - "pivot": [0, 7.5, 1.5], + "name": "rightHindLeg", + "parent": "root", + "pivot": [-2.5, 4, 5], "cubes": [ { - "origin": [-3.75, 3, -5], - "size": [7.5, 10.5, 11.25], + "origin": [-4, 0, 3.5], + "size": [3, 6, 3], "uv": { - "north": {"uv": [9, 9], "uv_size": [6, 7]}, - "east": {"uv": [0, 9], "uv_size": [9, 7]}, - "south": {"uv": [24, 9], "uv_size": [6, 7]}, - "west": {"uv": [15, 9], "uv_size": [9, 7]}, - "up": {"uv": [9, 0], "uv_size": [6, 9]}, - "down": {"uv": [15, 9], "uv_size": [6, -9]} + "north": {"uv": [36, 40], "uv_size": [3, 5]}, + "east": {"uv": [36, 45], "uv_size": [3, 5]}, + "south": {"uv": [33, 47], "uv_size": [3, 5]}, + "west": {"uv": [47, 36], "uv_size": [3, 5]}, + "up": {"uv": [52, 32], "uv_size": [3, 3]}, + "down": {"uv": [48, 55], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "leftHindLeg", + "parent": "root", + "pivot": [2.5, 4, 5], + "cubes": [ + { + "origin": [1, 0, 3.5], + "size": [3, 6, 3], + "uv": { + "north": {"uv": [39, 40], "uv_size": [-3, 5]}, + "east": {"uv": [50, 36], "uv_size": [-3, 5]}, + "south": {"uv": [36, 47], "uv_size": [-3, 5]}, + "west": {"uv": [39, 45], "uv_size": [-3, 5]}, + "up": {"uv": [55, 32], "uv_size": [-3, 3]}, + "down": {"uv": [51, 55], "uv_size": [-3, -3]} + } + } + ] + }, + { + "name": "body", + "parent": "root", + "pivot": [0, 5, 2.5], + "cubes": [ + { + "origin": [-4.1, 5, -6.5], + "size": [8.2, 7, 13.5], + "uv": { + "north": {"uv": [28, 40], "uv_size": [8, 7]}, + "east": {"uv": [0, 40], "uv_size": [14, 7]}, + "south": {"uv": [0, 47], "uv_size": [8, 7]}, + "west": {"uv": [14, 40], "uv_size": [14, 7]}, + "up": {"uv": [39, 20], "uv_size": [8, 14]}, + "down": {"uv": [39, 48], "uv_size": [8, -14]} } }, { - "origin": [-4, 3.375, -5], - "size": [8, 9.75, 11.25], + "origin": [-6, 4, -7.5], + "size": [12, 10, 15], "uv": { - "north": {"uv": [9, 25], "uv_size": [6, 6]}, - "east": {"uv": [0, 25], "uv_size": [9, 6]}, - "south": {"uv": [24, 25], "uv_size": [6, 6]}, - "west": {"uv": [15, 25], "uv_size": [9, 6]}, - "up": {"uv": [9, 16], "uv_size": [6, 9]}, - "down": {"uv": [15, 25], "uv_size": [6, -9]} + "north": {"uv": [15, 30], "uv_size": [12, 10]}, + "east": {"uv": [24, 0], "uv_size": [15, 10]}, + "south": {"uv": [27, 30], "uv_size": [12, 10]}, + "west": {"uv": [24, 10], "uv_size": [15, 10]}, + "up": {"uv": [0, 0], "uv_size": [12, 15]}, + "down": {"uv": [12, 15], "uv_size": [12, -15]} } }, { - "origin": [-3.4375, 12.6, -5], - "size": [6.875, 1.5, 11.25], + "origin": [-6, 4, -7.5], + "size": [12, 10, 15], + "inflate": 0.25, "uv": { - "north": {"uv": [30, 16], "uv_size": [5, 1]}, - "east": {"uv": [21, 16], "uv_size": [9, 1]}, - "south": {"uv": [44, 16], "uv_size": [5, 1]}, - "west": {"uv": [35, 16], "uv_size": [9, 1]}, - "up": {"uv": [30, 7], "uv_size": [5, 9]}, - "down": {"uv": [35, 16], "uv_size": [5, -9]} + "north": {"uv": [39, 0], "uv_size": [12, 10]}, + "east": {"uv": [24, 20], "uv_size": [15, 10]}, + "south": {"uv": [39, 10], "uv_size": [12, 10]}, + "west": {"uv": [0, 30], "uv_size": [15, 10]}, + "up": {"uv": [0, 15], "uv_size": [12, 15]}, + "down": {"uv": [12, 30], "uv_size": [12, -15]} } } ] }, { - "name": "Left_Back_Leg", - "parent": "Mareep", - "pivot": [-3, 3, 6], + "name": "tail", + "parent": "body", + "pivot": [0, 10, 7.5], + "rotation": [15, 0, 0], "cubes": [ { - "origin": [-3.125, 0, 4.375], - "size": [1.875, 4.5, 1.25], + "origin": [-1.5, 8.5, 5.5], + "size": [3, 3, 5], "uv": { - "north": {"uv": [31, 22], "uv_size": [1, 3]}, - "east": {"uv": [30, 22], "uv_size": [1, 3]}, - "south": {"uv": [33, 22], "uv_size": [1, 3]}, - "west": {"uv": [32, 22], "uv_size": [1, 3]}, - "up": {"uv": [31, 21], "uv_size": [1, 1]}, - "down": {"uv": [32, 22], "uv_size": [1, -1]} + "north": {"uv": [42, 53], "uv_size": [3, 3]}, + "east": {"uv": [50, 36], "uv_size": [5, 3]}, + "south": {"uv": [53, 42], "uv_size": [3, 3]}, + "west": {"uv": [50, 39], "uv_size": [5, 3]}, + "up": {"uv": [36, 50], "uv_size": [3, 5]}, + "down": {"uv": [50, 47], "uv_size": [3, -5]} } } ] }, { - "name": "Left_Front_Leg", - "parent": "Mareep", - "pivot": [-3, 3, -4.5], + "name": "tail2", + "parent": "tail", + "pivot": [0, 10, 10.5], + "rotation": [15, 0, 0], "cubes": [ { - "origin": [-3.125, 0, -4.375], - "size": [1.875, 4.5, 1.25], + "origin": [-1, 9, 10.5], + "size": [2, 2, 3], "uv": { - "north": {"uv": [30, 31], "uv_size": [1, 3]}, - "east": {"uv": [29, 31], "uv_size": [1, 3]}, - "south": {"uv": [32, 31], "uv_size": [1, 3]}, - "west": {"uv": [31, 31], "uv_size": [1, 3]}, - "up": {"uv": [30, 30], "uv_size": [1, 1]}, - "down": {"uv": [31, 31], "uv_size": [1, -1]} + "north": {"uv": [55, 23], "uv_size": [2, 2]}, + "east": {"uv": [18, 54], "uv_size": [3, 2]}, + "south": {"uv": [34, 55], "uv_size": [2, 2]}, + "west": {"uv": [54, 18], "uv_size": [3, 2]}, + "up": {"uv": [45, 48], "uv_size": [2, 3]}, + "down": {"uv": [34, 55], "uv_size": [2, -3]} } } ] }, { - "name": "Right_Back_Leg", - "parent": "Mareep", - "pivot": [3, 3, 6], + "name": "tail3", + "parent": "tail2", + "pivot": [0, 10, 13.5], + "rotation": [25, 0, 0], "cubes": [ { - "origin": [1.25, 0, 4.375], - "size": [1.875, 4.5, 1.25], + "origin": [-0.5, 9.5, 13.5], + "size": [1, 1, 2], + "uv": { + "north": {"uv": [52, 35], "uv_size": [1, 1]}, + "east": {"uv": [31, 51], "uv_size": [2, 1]}, + "south": {"uv": [53, 35], "uv_size": [1, 1]}, + "west": {"uv": [48, 51], "uv_size": [2, 1]}, + "up": {"uv": [27, 55], "uv_size": [1, 2]}, + "down": {"uv": [38, 57], "uv_size": [1, -2]} + } + }, + { + "origin": [-1.5, 8.5, 15.5], + "size": [3, 3, 3], "uv": { - "north": {"uv": [28, 18], "uv_size": [1, 3]}, - "east": {"uv": [27, 18], "uv_size": [1, 3]}, - "south": {"uv": [30, 18], "uv_size": [1, 3]}, - "west": {"uv": [29, 18], "uv_size": [1, 3]}, - "up": {"uv": [28, 17], "uv_size": [1, 1]}, - "down": {"uv": [29, 18], "uv_size": [1, -1]} + "north": {"uv": [53, 45], "uv_size": [3, 3]}, + "east": {"uv": [53, 48], "uv_size": [3, 3]}, + "south": {"uv": [0, 54], "uv_size": [3, 3]}, + "west": {"uv": [54, 0], "uv_size": [3, 3]}, + "up": {"uv": [3, 54], "uv_size": [3, 3]}, + "down": {"uv": [54, 6], "uv_size": [3, -3]} } } ] }, { - "name": "Right_Front_Leg", - "parent": "Mareep", - "pivot": [3, 3, -4.5], + "name": "rightLeg", + "parent": "body", + "pivot": [-2.5, 4, -4.5], "cubes": [ { - "origin": [1.25, 0, -4.375], - "size": [1.875, 4.5, 1.25], + "origin": [-4, 0, -6], + "size": [3, 6, 3], "uv": { - "north": {"uv": [22, 18], "uv_size": [1, 3]}, - "east": {"uv": [21, 18], "uv_size": [1, 3]}, - "south": {"uv": [24, 18], "uv_size": [1, 3]}, - "west": {"uv": [23, 18], "uv_size": [1, 3]}, - "up": {"uv": [22, 17], "uv_size": [1, 1]}, - "down": {"uv": [23, 18], "uv_size": [1, -1]} + "north": {"uv": [50, 47], "uv_size": [3, 5]}, + "east": {"uv": [51, 0], "uv_size": [3, 5]}, + "south": {"uv": [51, 5], "uv_size": [3, 5]}, + "west": {"uv": [51, 10], "uv_size": [3, 5]}, + "up": {"uv": [6, 54], "uv_size": [3, 3]}, + "down": {"uv": [54, 9], "uv_size": [3, -3]} } } ] }, { - "name": "Tail", - "parent": "Mareep", - "pivot": [0, 9, 7.5], + "name": "leftLeg", + "parent": "body", + "pivot": [2.5, 4, -4.5], "cubes": [ { - "origin": [-0.9375, 7.5, 5], - "size": [1.875, 2.25, 5], - "pivot": [0, 9, 6.25], - "rotation": [30, 0, 0], - "uv": { - "north": {"uv": [25, 21], "uv_size": [1, 1]}, - "east": {"uv": [21, 21], "uv_size": [4, 1]}, - "south": {"uv": [30, 21], "uv_size": [1, 1]}, - "west": {"uv": [26, 21], "uv_size": [4, 1]}, - "up": {"uv": [25, 17], "uv_size": [1, 4]}, - "down": {"uv": [26, 21], "uv_size": [1, -4]} - } - }, - { - "origin": [-0.625, 9, 8.625], - "size": [1.25, 1.5, 3.75], - "pivot": [0, 10.5, 8.75], - "rotation": [70, 0, 0], - "uv": { - "north": {"uv": [3, 7], "uv_size": [1, 1]}, - "east": {"uv": [0, 7], "uv_size": [3, 1]}, - "south": {"uv": [7, 7], "uv_size": [1, 1]}, - "west": {"uv": [4, 7], "uv_size": [3, 1]}, - "up": {"uv": [3, 4], "uv_size": [1, 3]}, - "down": {"uv": [4, 7], "uv_size": [1, -3]} - } - }, - { - "origin": [-1.5625, 7.875, 12.375], - "size": [3.125, 3.75, 3.125], - "pivot": [0, 10.5, 8.75], - "rotation": [70, 0, 0], + "origin": [1, 0, -6], + "size": [3, 6, 3], "uv": { - "north": {"uv": [2, 2], "uv_size": [2, 2]}, - "east": {"uv": [0, 2], "uv_size": [2, 2]}, - "south": {"uv": [6, 2], "uv_size": [2, 2]}, - "west": {"uv": [4, 2], "uv_size": [2, 2]}, - "up": {"uv": [2, 0], "uv_size": [2, 2]}, - "down": {"uv": [4, 2], "uv_size": [2, -2]} + "north": {"uv": [53, 47], "uv_size": [-3, 5]}, + "east": {"uv": [54, 10], "uv_size": [-3, 5]}, + "south": {"uv": [54, 5], "uv_size": [-3, 5]}, + "west": {"uv": [54, 0], "uv_size": [-3, 5]}, + "up": {"uv": [9, 54], "uv_size": [-3, 3]}, + "down": {"uv": [57, 9], "uv_size": [-3, -3]} } } ] }, { - "name": "Head", - "parent": "Mareep", - "pivot": [0, 10.5, -6], - "rotation": [-7.5, 0, 0], + "name": "head", + "parent": "body", + "pivot": [0, 8, -7.5], + "rotation": [-65, 0, 0], "cubes": [ { - "origin": [-1.5625, 6, -7.5], - "size": [3.125, 4.5, 3.75], + "origin": [-2.5, 4, -12], + "size": [5, 7, 5], "uv": { - "north": {"uv": [24, 3], "uv_size": [2, 3]}, - "east": {"uv": [21, 3], "uv_size": [3, 3]}, - "south": {"uv": [29, 3], "uv_size": [2, 3]}, - "west": {"uv": [26, 3], "uv_size": [3, 3]}, - "up": {"uv": [24, 0], "uv_size": [2, 3]}, - "down": {"uv": [26, 3], "uv_size": [2, -3]} + "north": {"uv": [8, 47], "uv_size": [5, 7]}, + "east": {"uv": [13, 47], "uv_size": [5, 7]}, + "south": {"uv": [18, 47], "uv_size": [5, 7]}, + "west": {"uv": [47, 20], "uv_size": [5, 7]}, + "up": {"uv": [23, 47], "uv_size": [5, 5]}, + "down": {"uv": [47, 32], "uv_size": [5, -5]} } }, { - "origin": [-3.125, 9, -7.1875], - "size": [1.5625, 2.25, 1.875], + "origin": [2.5, 7, -12], + "size": [2, 3, 3], "uv": { - "north": {"uv": [6, 23], "uv_size": [1, 1]}, - "east": {"uv": [5, 23], "uv_size": [1, 1]}, - "south": {"uv": [8, 23], "uv_size": [1, 1]}, - "west": {"uv": [7, 23], "uv_size": [1, 1]}, - "up": {"uv": [6, 22], "uv_size": [1, 1]}, - "down": {"uv": [7, 23], "uv_size": [1, -1]} + "north": {"uv": [21, 54], "uv_size": [2, 3]}, + "east": {"uv": [12, 54], "uv_size": [3, 3]}, + "south": {"uv": [54, 51], "uv_size": [2, 3]}, + "west": {"uv": [54, 12], "uv_size": [3, 3]}, + "up": {"uv": [54, 54], "uv_size": [2, 3]}, + "down": {"uv": [55, 23], "uv_size": [2, -3]} } }, { - "origin": [1.5625, 9, -7.1875], - "size": [1.5625, 2.25, 1.875], + "origin": [-4.5, 7, -12], + "size": [2, 3, 3], "uv": { - "north": {"uv": [22, 7], "uv_size": [1, 1]}, - "east": {"uv": [21, 7], "uv_size": [1, 1]}, - "south": {"uv": [24, 7], "uv_size": [1, 1]}, - "west": {"uv": [23, 7], "uv_size": [1, 1]}, - "up": {"uv": [22, 6], "uv_size": [1, 1]}, - "down": {"uv": [23, 7], "uv_size": [1, -1]} + "north": {"uv": [23, 54], "uv_size": [-2, 3]}, + "east": {"uv": [57, 12], "uv_size": [-3, 3]}, + "south": {"uv": [56, 51], "uv_size": [-2, 3]}, + "west": {"uv": [15, 54], "uv_size": [-3, 3]}, + "up": {"uv": [56, 54], "uv_size": [-2, 3]}, + "down": {"uv": [57, 23], "uv_size": [-2, -3]} } }, { - "origin": [-4.0625, 9.375, -6.875], - "size": [1.25, 1.5, 1.25], + "origin": [4.5, 7.5, -11.5], + "size": [1, 2, 2], "uv": { - "north": {"uv": [5, 20], "uv_size": [1, 1]}, - "east": {"uv": [4, 20], "uv_size": [1, 1]}, - "south": {"uv": [7, 20], "uv_size": [1, 1]}, - "west": {"uv": [6, 20], "uv_size": [1, 1]}, - "up": {"uv": [5, 19], "uv_size": [1, 1]}, - "down": {"uv": [6, 20], "uv_size": [1, -1]} + "north": {"uv": [18, 56], "uv_size": [1, 2]}, + "east": {"uv": [55, 40], "uv_size": [2, 2]}, + "south": {"uv": [19, 56], "uv_size": [1, 2]}, + "west": {"uv": [48, 55], "uv_size": [2, 2]}, + "up": {"uv": [20, 56], "uv_size": [1, 2]}, + "down": {"uv": [28, 58], "uv_size": [1, -2]} } }, { - "origin": [2.8125, 9.375, -6.875], - "size": [1.25, 1.5, 1.25], + "origin": [-5.5, 7.5, -11.5], + "size": [1, 2, 2], "uv": { - "north": {"uv": [6, 6], "uv_size": [1, 1]}, - "east": {"uv": [5, 6], "uv_size": [1, 1]}, - "south": {"uv": [8, 6], "uv_size": [1, 1]}, - "west": {"uv": [7, 6], "uv_size": [1, 1]}, - "up": {"uv": [6, 5], "uv_size": [1, 1]}, - "down": {"uv": [7, 6], "uv_size": [1, -1]} + "north": {"uv": [19, 56], "uv_size": [-1, 2]}, + "east": {"uv": [50, 55], "uv_size": [-2, 2]}, + "south": {"uv": [20, 56], "uv_size": [-1, 2]}, + "west": {"uv": [57, 40], "uv_size": [-2, 2]}, + "up": {"uv": [21, 56], "uv_size": [-1, 2]}, + "down": {"uv": [29, 58], "uv_size": [-1, -2]} } }, { - "origin": [-1.5625, 10.5, -7.5], - "size": [3.125, 1.5, 2.5], + "origin": [-2.5, 7, -15], + "size": [5, 4, 3], + "inflate": 0.2, + "pivot": [0, 7, -12], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [28, 47], "uv_size": [5, 4]}, + "east": {"uv": [52, 28], "uv_size": [3, 4]}, + "south": {"uv": [47, 32], "uv_size": [5, 4]}, + "west": {"uv": [31, 52], "uv_size": [3, 4]}, + "up": {"uv": [23, 52], "uv_size": [5, 3]}, + "down": {"uv": [52, 28], "uv_size": [5, -3]} + } + } + ] + }, + { + "name": "bone", + "parent": "head", + "pivot": [0, 6, -9.5], + "cubes": [ + { + "origin": [2.55, 5, -11], + "size": [0, 2, 2], + "pivot": [2.55, 5, -10], + "rotation": [-10, 0, 0], "uv": { - "north": {"uv": [2, 18], "uv_size": [2, 1]}, - "east": {"uv": [0, 18], "uv_size": [2, 1]}, - "south": {"uv": [6, 18], "uv_size": [2, 1]}, - "west": {"uv": [4, 18], "uv_size": [2, 1]}, - "up": {"uv": [2, 16], "uv_size": [2, 2]}, - "down": {"uv": [4, 18], "uv_size": [2, -2]} + "north": {"uv": [0, 0], "uv_size": [0, 2]}, + "east": {"uv": [55, 34], "uv_size": [2, 2]}, + "south": {"uv": [0, 0], "uv_size": [0, 2]}, + "west": {"uv": [36, 55], "uv_size": [2, 2]}, + "up": {"uv": [0, 0], "uv_size": [0, 2]}, + "down": {"uv": [0, 2], "uv_size": [0, -2]} } }, { - "origin": [-0.9375, 10.125, -8.125], - "size": [1.875, 3, 2.5], + "origin": [-2.55, 5, -11], + "size": [0, 2, 2], + "pivot": [-2.55, 5, -10], + "rotation": [-10, 0, 0], "uv": { - "north": {"uv": [2, 21], "uv_size": [1, 2]}, - "east": {"uv": [0, 21], "uv_size": [2, 2]}, - "south": {"uv": [5, 21], "uv_size": [1, 2]}, - "west": {"uv": [3, 21], "uv_size": [2, 2]}, - "up": {"uv": [2, 19], "uv_size": [1, 2]}, - "down": {"uv": [3, 21], "uv_size": [1, -2]} + "north": {"uv": [0, 0], "uv_size": [0, 2]}, + "east": {"uv": [38, 55], "uv_size": [-2, 2]}, + "south": {"uv": [0, 0], "uv_size": [0, 2]}, + "west": {"uv": [57, 34], "uv_size": [-2, 2]}, + "up": {"uv": [0, 0], "uv_size": [0, 2]}, + "down": {"uv": [0, 2], "uv_size": [0, -2]} } } ] diff --git a/models/entity/pokemon/miltank.geo.json b/models/entity/pokemon/miltank.geo.json index 9eaa39ac8..af6a8eb36 100644 --- a/models/entity/pokemon/miltank.geo.json +++ b/models/entity/pokemon/miltank.geo.json @@ -4,406 +4,448 @@ { "description": { "identifier": "geometry.miltank", - "texture_width": 128, - "texture_height": 128, - "visible_bounds_width": 4, + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 3, "visible_bounds_height": 3.5, "visible_bounds_offset": [0, 1.25, 0] }, "bones": [ { - "name": "Miltank", + "name": "root", "pivot": [0, 0, 0] }, { - "name": "Body", - "parent": "Miltank", - "pivot": [0, 7.59, 0], + "name": "rightLeg", + "parent": "root", + "pivot": [-4.9, 5, 0], "cubes": [ { - "origin": [-5.52, 4.14, -4.899], - "size": [11.04, 11.04, 7.59], + "origin": [-6.5, 1, -2.5], + "size": [5, 6, 5], "uv": { - "north": {"uv": [11, 11], "uv_size": [16, 16]}, - "east": {"uv": [0, 11], "uv_size": [11, 16]}, - "south": {"uv": [38, 11], "uv_size": [16, 16]}, - "west": {"uv": [27, 11], "uv_size": [11, 16]}, - "up": {"uv": [11, 0], "uv_size": [16, 11]}, - "down": {"uv": [27, 11], "uv_size": [16, -11]} + "north": {"uv": [27, 14], "uv_size": [5, 6]}, + "east": {"uv": [28, 0], "uv_size": [5, 6]}, + "south": {"uv": [16, 30], "uv_size": [5, 6]}, + "west": {"uv": [21, 30], "uv_size": [5, 6]}, + "up": {"uv": [0, 33], "uv_size": [5, 5]}, + "down": {"uv": [33, 5], "uv_size": [5, -5]} } }, { - "origin": [-2.76, 9.66, -7.659], - "size": [1.38, 1.38, 6.21], + "origin": [-5, 0, -2.5], + "size": [3, 1, 4], + "pivot": [-4.5, 0.5, 1.5], + "rotation": [0, 22.5, 0], "uv": { - "north": {"uv": [57, 70], "uv_size": [2, 2]}, - "east": {"uv": [48, 70], "uv_size": [9, 2]}, - "south": {"uv": [68, 70], "uv_size": [2, 2]}, - "west": {"uv": [59, 70], "uv_size": [9, 2]}, - "up": {"uv": [57, 61], "uv_size": [2, 9]}, - "down": {"uv": [59, 70], "uv_size": [2, -9]} + "north": {"uv": [6, 42], "uv_size": [3, 1]}, + "east": {"uv": [39, 31], "uv_size": [4, 1]}, + "south": {"uv": [42, 6], "uv_size": [3, 1]}, + "west": {"uv": [39, 32], "uv_size": [4, 1]}, + "up": {"uv": [34, 36], "uv_size": [3, 4]}, + "down": {"uv": [5, 41], "uv_size": [3, -4]} } - }, + } + ] + }, + { + "name": "leftLeg", + "parent": "root", + "pivot": [4.9, 5, 0], + "cubes": [ { - "origin": [1.38, 9.66, -7.659], - "size": [1.38, 1.38, 6.21], + "origin": [1.5, 1, -2.5], + "size": [5, 6, 5], "uv": { - "north": {"uv": [44, 68], "uv_size": [2, 2]}, - "east": {"uv": [35, 68], "uv_size": [9, 2]}, - "south": {"uv": [55, 68], "uv_size": [2, 2]}, - "west": {"uv": [46, 68], "uv_size": [9, 2]}, - "up": {"uv": [44, 59], "uv_size": [2, 9]}, - "down": {"uv": [46, 68], "uv_size": [2, -9]} + "north": {"uv": [26, 30], "uv_size": [5, 6]}, + "east": {"uv": [7, 31], "uv_size": [5, 6]}, + "south": {"uv": [31, 30], "uv_size": [5, 6]}, + "west": {"uv": [32, 14], "uv_size": [5, 6]}, + "up": {"uv": [33, 20], "uv_size": [5, 5]}, + "down": {"uv": [33, 30], "uv_size": [5, -5]} } }, { - "origin": [1.38, 6.21, -7.659], - "size": [1.38, 1.38, 6.21], + "origin": [2, 0, -2.5], + "size": [3, 1, 4], + "pivot": [4.5, 0.5, 1.5], + "rotation": [0, -22.5, 0], + "uv": { + "north": {"uv": [42, 7], "uv_size": [3, 1]}, + "east": {"uv": [41, 2], "uv_size": [4, 1]}, + "south": {"uv": [42, 8], "uv_size": [3, 1]}, + "west": {"uv": [5, 41], "uv_size": [4, 1]}, + "up": {"uv": [8, 37], "uv_size": [3, 4]}, + "down": {"uv": [37, 18], "uv_size": [3, -4]} + } + } + ] + }, + { + "name": "waist", + "parent": "root", + "pivot": [0, 2, 0] + }, + { + "name": "body", + "parent": "waist", + "pivot": [0, 2, 0], + "cubes": [ + { + "origin": [-4, 10, -3.5], + "size": [8, 3, 7], "uv": { - "north": {"uv": [31, 66], "uv_size": [2, 2]}, - "east": {"uv": [22, 66], "uv_size": [9, 2]}, - "south": {"uv": [42, 66], "uv_size": [2, 2]}, - "west": {"uv": [33, 66], "uv_size": [9, 2]}, - "up": {"uv": [31, 57], "uv_size": [2, 9]}, - "down": {"uv": [33, 66], "uv_size": [2, -9]} + "north": {"uv": [34, 5], "uv_size": [8, 3]}, + "east": {"uv": [34, 11], "uv_size": [7, 3]}, + "south": {"uv": [34, 8], "uv_size": [8, 3]}, + "west": {"uv": [12, 36], "uv_size": [7, 3]}, + "up": {"uv": [19, 16], "uv_size": [8, 7]}, + "down": {"uv": [20, 7], "uv_size": [8, -7]} } }, { - "origin": [-2.76, 6.21, -7.659], - "size": [1.38, 1.38, 6.21], + "origin": [-5, 2, -5], + "size": [10, 8, 9], "uv": { - "north": {"uv": [9, 66], "uv_size": [2, 2]}, - "east": {"uv": [0, 66], "uv_size": [9, 2]}, - "south": {"uv": [20, 66], "uv_size": [2, 2]}, - "west": {"uv": [11, 66], "uv_size": [9, 2]}, - "up": {"uv": [9, 57], "uv_size": [2, 9]}, - "down": {"uv": [11, 66], "uv_size": [2, -9]} + "north": {"uv": [10, 0], "uv_size": [10, 8]}, + "east": {"uv": [10, 16], "uv_size": [9, 8]}, + "south": {"uv": [10, 8], "uv_size": [10, 8]}, + "west": {"uv": [0, 18], "uv_size": [9, 8]}, + "up": {"uv": [0, 0], "uv_size": [10, 9]}, + "down": {"uv": [0, 18], "uv_size": [10, -9]} } }, { - "origin": [-4.83, 15.18, -4.14], - "size": [9.66, 2.76, 6.9], + "origin": [-3, 6, -7], + "size": [1, 1, 2], + "inflate": 0.25, + "pivot": [-2, 6, -5], + "rotation": [-15, 15, 0], "uv": { - "north": {"uv": [10, 37], "uv_size": [14, 4]}, - "east": {"uv": [0, 37], "uv_size": [10, 4]}, - "south": {"uv": [34, 37], "uv_size": [14, 4]}, - "west": {"uv": [24, 37], "uv_size": [10, 4]}, - "up": {"uv": [10, 27], "uv_size": [14, 10]}, - "down": {"uv": [24, 37], "uv_size": [14, -10]} + "north": {"uv": [38, 42], "uv_size": [1, 1]}, + "east": {"uv": [13, 42], "uv_size": [2, 1]}, + "south": {"uv": [42, 38], "uv_size": [1, 1]}, + "west": {"uv": [42, 14], "uv_size": [2, 1]}, + "up": {"uv": [15, 42], "uv_size": [1, 2]}, + "down": {"uv": [42, 17], "uv_size": [1, -2]} } - } - ] - }, - { - "name": "left_Leg", - "parent": "Miltank", - "pivot": [-5.52, 6.9, 0], - "rotation": [0, 7.5, 0], - "cubes": [ + }, { - "origin": [-5.53181, 0, -2.57988], - "size": [2.76, 1.38, 4.14], + "origin": [2, 6, -7], + "size": [1, 1, 2], + "inflate": 0.25, + "pivot": [2, 6, -5], + "rotation": [-15, -15, 0], "uv": { - "north": {"uv": [70, 73], "uv_size": [4, 2]}, - "east": {"uv": [64, 73], "uv_size": [6, 2]}, - "south": {"uv": [80, 73], "uv_size": [4, 2]}, - "west": {"uv": [74, 73], "uv_size": [6, 2]}, - "up": {"uv": [70, 67], "uv_size": [4, 6]}, - "down": {"uv": [74, 73], "uv_size": [4, -6]} + "north": {"uv": [39, 42], "uv_size": [1, 1]}, + "east": {"uv": [16, 42], "uv_size": [2, 1]}, + "south": {"uv": [42, 39], "uv_size": [1, 1]}, + "west": {"uv": [42, 17], "uv_size": [2, 1]}, + "up": {"uv": [18, 42], "uv_size": [1, 2]}, + "down": {"uv": [42, 20], "uv_size": [1, -2]} } }, { - "origin": [-5.53181, 1.38, -1.19988], - "size": [2.76, 1.38, 2.76], + "origin": [2, 3, -7], + "size": [1, 1, 2], + "inflate": 0.25, + "pivot": [2, 4, -5], + "rotation": [15, -15, 0], "uv": { - "north": {"uv": [32, 74], "uv_size": [4, 2]}, - "east": {"uv": [28, 74], "uv_size": [4, 2]}, - "south": {"uv": [40, 74], "uv_size": [4, 2]}, - "west": {"uv": [36, 74], "uv_size": [4, 2]}, - "up": {"uv": [32, 70], "uv_size": [4, 4]}, - "down": {"uv": [36, 74], "uv_size": [4, -4]} + "north": {"uv": [40, 42], "uv_size": [1, 1]}, + "east": {"uv": [19, 42], "uv_size": [2, 1]}, + "south": {"uv": [42, 40], "uv_size": [1, 1]}, + "west": {"uv": [21, 42], "uv_size": [2, 1]}, + "up": {"uv": [42, 21], "uv_size": [1, 2]}, + "down": {"uv": [23, 44], "uv_size": [1, -2]} } }, { - "origin": [-6.22181, 2.76, -1.88988], - "size": [4.14, 6.9, 4.14], + "origin": [-3, 3, -7], + "size": [1, 1, 2], + "inflate": 0.25, + "pivot": [-2, 4, -5], + "rotation": [15, 15, 0], "uv": { - "north": {"uv": [54, 27], "uv_size": [6, 10]}, - "east": {"uv": [48, 27], "uv_size": [6, 10]}, - "south": {"uv": [66, 27], "uv_size": [6, 10]}, - "west": {"uv": [60, 27], "uv_size": [6, 10]}, - "up": {"uv": [54, 21], "uv_size": [6, 6]}, - "down": {"uv": [60, 27], "uv_size": [6, -6]} + "north": {"uv": [41, 42], "uv_size": [1, 1]}, + "east": {"uv": [42, 23], "uv_size": [2, 1]}, + "south": {"uv": [42, 42], "uv_size": [1, 1]}, + "west": {"uv": [42, 24], "uv_size": [2, 1]}, + "up": {"uv": [24, 42], "uv_size": [1, 2]}, + "down": {"uv": [34, 44], "uv_size": [1, -2]} } } ] }, { - "name": "right_Leg", - "parent": "Miltank", - "pivot": [6.21, 6.9, 0], - "rotation": [0, -7.5, 0], + "name": "tail", + "parent": "body", + "pivot": [0, 3.5, 4], + "rotation": [30, 0, 0], "cubes": [ { - "origin": [2.77771, 0, -2.48981], - "size": [2.76, 1.38, 4.14], + "origin": [-0.5, 3, 4], + "size": [1, 1, 4], "uv": { - "north": {"uv": [72, 24], "uv_size": [4, 2]}, - "east": {"uv": [66, 24], "uv_size": [6, 2]}, - "south": {"uv": [82, 24], "uv_size": [4, 2]}, - "west": {"uv": [76, 24], "uv_size": [6, 2]}, - "up": {"uv": [72, 18], "uv_size": [4, 6]}, - "down": {"uv": [76, 24], "uv_size": [4, -6]} + "north": {"uv": [35, 42], "uv_size": [1, 1]}, + "east": {"uv": [41, 11], "uv_size": [4, 1]}, + "south": {"uv": [42, 35], "uv_size": [1, 1]}, + "west": {"uv": [41, 12], "uv_size": [4, 1]}, + "up": {"uv": [9, 18], "uv_size": [1, 4]}, + "down": {"uv": [15, 35], "uv_size": [1, -4]} } - }, - { - "origin": [2.77771, 1.38, -1.10981], - "size": [2.76, 1.38, 2.76], - "uv": { - "north": {"uv": [20, 72], "uv_size": [4, 2]}, - "east": {"uv": [16, 72], "uv_size": [4, 2]}, - "south": {"uv": [28, 72], "uv_size": [4, 2]}, - "west": {"uv": [24, 72], "uv_size": [4, 2]}, - "up": {"uv": [20, 68], "uv_size": [4, 4]}, - "down": {"uv": [24, 72], "uv_size": [4, -4]} - } - }, + } + ] + }, + { + "name": "tail2", + "parent": "tail", + "pivot": [0, 3.5, 8], + "rotation": [30, 0, 0], + "cubes": [ { - "origin": [2.08771, 2.76, -1.79981], - "size": [4.14, 6.9, 4.14], + "origin": [-0.5, 3, 8], + "size": [1, 1, 4], "uv": { - "north": {"uv": [38, 47], "uv_size": [6, 10]}, - "east": {"uv": [32, 47], "uv_size": [6, 10]}, - "south": {"uv": [50, 47], "uv_size": [6, 10]}, - "west": {"uv": [44, 47], "uv_size": [6, 10]}, - "up": {"uv": [38, 41], "uv_size": [6, 6]}, - "down": {"uv": [44, 47], "uv_size": [6, -6]} + "north": {"uv": [36, 42], "uv_size": [1, 1]}, + "east": {"uv": [41, 13], "uv_size": [4, 1]}, + "south": {"uv": [42, 36], "uv_size": [1, 1]}, + "west": {"uv": [17, 41], "uv_size": [4, 1]}, + "up": {"uv": [2, 41], "uv_size": [1, 4]}, + "down": {"uv": [9, 45], "uv_size": [1, -4]} } } ] }, { - "name": "Left_Arm", - "parent": "Miltank", - "pivot": [-4.14, 16.56, -1.38], + "name": "tail3", + "parent": "tail2", + "pivot": [0, 3.5, 12], + "rotation": [30, 0, 0], "cubes": [ { - "origin": [-9.66, 14.49, -2.76], - "size": [6.21, 2.76, 2.76], - "pivot": [-5.52, 15.18, -2.76], - "rotation": [0, 0, -32.5], + "origin": [-0.5, 3, 12], + "size": [1, 1, 4], "uv": { - "north": {"uv": [58, 14], "uv_size": [9, 4]}, - "east": {"uv": [54, 14], "uv_size": [4, 4]}, - "south": {"uv": [71, 14], "uv_size": [9, 4]}, - "west": {"uv": [67, 14], "uv_size": [4, 4]}, - "up": {"uv": [58, 10], "uv_size": [9, 4]}, - "down": {"uv": [67, 14], "uv_size": [9, -4]} + "north": {"uv": [37, 42], "uv_size": [1, 1]}, + "east": {"uv": [41, 20], "uv_size": [4, 1]}, + "south": {"uv": [42, 37], "uv_size": [1, 1]}, + "west": {"uv": [21, 41], "uv_size": [4, 1]}, + "up": {"uv": [10, 41], "uv_size": [1, 4]}, + "down": {"uv": [41, 25], "uv_size": [1, -4]} } }, { - "origin": [-11.04, 15.18, -2.415], - "size": [2.07, 2.07, 2.07], - "pivot": [-5.52, 16.56, -2.76], - "rotation": [0, 0, -32.5], + "origin": [-1, 2.5, 16], + "size": [2, 2, 2], + "pivot": [0, 3.5, 16], + "rotation": [30, 0, 0], "uv": { - "north": {"uv": [74, 3], "uv_size": [3, 3]}, - "east": {"uv": [71, 3], "uv_size": [3, 3]}, - "south": {"uv": [80, 3], "uv_size": [3, 3]}, - "west": {"uv": [77, 3], "uv_size": [3, 3]}, - "up": {"uv": [74, 0], "uv_size": [3, 3]}, - "down": {"uv": [77, 3], "uv_size": [3, -3]} + "north": {"uv": [25, 41], "uv_size": [2, 2]}, + "east": {"uv": [41, 25], "uv_size": [2, 2]}, + "south": {"uv": [27, 41], "uv_size": [2, 2]}, + "west": {"uv": [41, 27], "uv_size": [2, 2]}, + "up": {"uv": [29, 41], "uv_size": [2, 2]}, + "down": {"uv": [31, 43], "uv_size": [2, -2]} } } ] }, { - "name": "Right_Arm2", - "parent": "Miltank", - "pivot": [4.83, 16.56, -1.38], + "name": "rightArm", + "parent": "body", + "pivot": [-4, 11, 0], + "rotation": [0, 0, 40], "cubes": [ { - "origin": [3.45, 14.49, -2.76], - "size": [6.21, 2.76, 2.76], - "pivot": [5.52, 15.18, -2.76], - "rotation": [0, 0, 32.5], + "origin": [-6, 7, -1.5], + "size": [3, 5, 3], "uv": { - "north": {"uv": [56, 57], "uv_size": [9, 4]}, - "east": {"uv": [52, 57], "uv_size": [4, 4]}, - "south": {"uv": [69, 57], "uv_size": [9, 4]}, - "west": {"uv": [65, 57], "uv_size": [4, 4]}, - "up": {"uv": [56, 53], "uv_size": [9, 4]}, - "down": {"uv": [65, 57], "uv_size": [9, -4]} + "north": {"uv": [16, 24], "uv_size": [3, 5]}, + "east": {"uv": [12, 31], "uv_size": [3, 5]}, + "south": {"uv": [19, 36], "uv_size": [3, 5]}, + "west": {"uv": [22, 36], "uv_size": [3, 5]}, + "up": {"uv": [37, 37], "uv_size": [3, 3]}, + "down": {"uv": [0, 41], "uv_size": [3, -3]} } }, { - "origin": [8.97, 15.18, -2.415], - "size": [2.07, 2.07, 2.07], - "pivot": [5.52, 16.56, -2.76], - "rotation": [0, 0, 32.5], + "origin": [-5.5, 5, -1], + "size": [2, 2, 2], "uv": { - "north": {"uv": [29, 44], "uv_size": [3, 3]}, - "east": {"uv": [26, 44], "uv_size": [3, 3]}, - "south": {"uv": [35, 44], "uv_size": [3, 3]}, - "west": {"uv": [32, 44], "uv_size": [3, 3]}, - "up": {"uv": [29, 41], "uv_size": [3, 3]}, - "down": {"uv": [32, 44], "uv_size": [3, -3]} + "north": {"uv": [17, 39], "uv_size": [2, 2]}, + "east": {"uv": [39, 33], "uv_size": [2, 2]}, + "south": {"uv": [3, 40], "uv_size": [2, 2]}, + "west": {"uv": [40, 14], "uv_size": [2, 2]}, + "up": {"uv": [40, 16], "uv_size": [2, 2]}, + "down": {"uv": [34, 42], "uv_size": [2, -2]} } } ] }, { - "name": "Head", - "parent": "Miltank", - "pivot": [0, 17.94, 0], + "name": "leftArm", + "parent": "body", + "pivot": [4, 11, 0], + "rotation": [0, 0, -40], "cubes": [ { - "origin": [-3.45, 17.94, -2.76], - "size": [6.9, 6.9, 4.14], + "origin": [3, 7, -1.5], + "size": [3, 5, 3], "uv": { - "north": {"uv": [6, 47], "uv_size": [10, 10]}, - "east": {"uv": [0, 47], "uv_size": [6, 10]}, - "south": {"uv": [22, 47], "uv_size": [10, 10]}, - "west": {"uv": [16, 47], "uv_size": [6, 10]}, - "up": {"uv": [6, 41], "uv_size": [10, 6]}, - "down": {"uv": [16, 47], "uv_size": [10, -6]} + "north": {"uv": [25, 36], "uv_size": [3, 5]}, + "east": {"uv": [28, 36], "uv_size": [3, 5]}, + "south": {"uv": [36, 30], "uv_size": [3, 5]}, + "west": {"uv": [31, 36], "uv_size": [3, 5]}, + "up": {"uv": [11, 39], "uv_size": [3, 3]}, + "down": {"uv": [14, 42], "uv_size": [3, -3]} } }, { - "origin": [-2.76, 24.15, -2.7945], - "size": [5.52, 1.38, 4.14], + "origin": [3.5, 5, -1], + "size": [2, 2, 2], "uv": { - "north": {"uv": [56, 43], "uv_size": [8, 2]}, - "east": {"uv": [50, 43], "uv_size": [6, 2]}, - "south": {"uv": [70, 43], "uv_size": [8, 2]}, - "west": {"uv": [64, 43], "uv_size": [6, 2]}, - "up": {"uv": [56, 37], "uv_size": [8, 6]}, - "down": {"uv": [64, 43], "uv_size": [8, -6]} + "north": {"uv": [36, 40], "uv_size": [2, 2]}, + "east": {"uv": [40, 37], "uv_size": [2, 2]}, + "south": {"uv": [38, 40], "uv_size": [2, 2]}, + "west": {"uv": [40, 39], "uv_size": [2, 2]}, + "up": {"uv": [0, 41], "uv_size": [2, 2]}, + "down": {"uv": [41, 2], "uv_size": [2, -2]} } - }, + } + ] + }, + { + "name": "head", + "parent": "body", + "pivot": [0, 13, 0], + "cubes": [ { - "origin": [-2.76, 25.53, -2.76], - "size": [1.38, 1.38, 1.38], + "origin": [-3.5, 13, -3.5], + "size": [7, 7, 7], "uv": { - "north": {"uv": [2, 29], "uv_size": [2, 2]}, - "east": {"uv": [0, 29], "uv_size": [2, 2]}, - "south": {"uv": [6, 29], "uv_size": [2, 2]}, - "west": {"uv": [4, 29], "uv_size": [2, 2]}, - "up": {"uv": [2, 27], "uv_size": [2, 2]}, - "down": {"uv": [4, 29], "uv_size": [2, -2]} + "north": {"uv": [20, 7], "uv_size": [7, 7]}, + "east": {"uv": [19, 23], "uv_size": [7, 7]}, + "south": {"uv": [9, 24], "uv_size": [7, 7]}, + "west": {"uv": [0, 26], "uv_size": [7, 7]}, + "up": {"uv": [26, 23], "uv_size": [7, 7]}, + "down": {"uv": [27, 14], "uv_size": [7, -7]} } }, { - "origin": [1.38, 25.53, -2.76], - "size": [1.38, 1.38, 1.38], + "origin": [-2.5, 20, -1], + "size": [1, 2, 1], + "pivot": [-1.5, 20, -1], + "rotation": [-15, 0, -15], "uv": { - "north": {"uv": [2, 7], "uv_size": [2, 2]}, - "east": {"uv": [0, 7], "uv_size": [2, 2]}, - "south": {"uv": [6, 7], "uv_size": [2, 2]}, - "west": {"uv": [4, 7], "uv_size": [2, 2]}, - "up": {"uv": [2, 5], "uv_size": [2, 2]}, - "down": {"uv": [4, 7], "uv_size": [2, -2]} + "north": {"uv": [9, 22], "uv_size": [1, 2]}, + "east": {"uv": [32, 20], "uv_size": [1, 2]}, + "south": {"uv": [33, 5], "uv_size": [1, 2]}, + "west": {"uv": [11, 37], "uv_size": [1, 2]}, + "up": {"uv": [32, 6], "uv_size": [1, 1]}, + "down": {"uv": [15, 36], "uv_size": [1, -1]} } }, { - "origin": [-8.28, 24.012, -2.07], - "size": [5.52, 1.38, 2.76], - "pivot": [-2.76, 24.84, -1.38], - "rotation": [0, 0, -15], + "origin": [1.5, 20, -1], + "size": [1, 2, 1], + "pivot": [1.5, 20, -1], + "rotation": [-15, 0, 15], "uv": { - "north": {"uv": [65, 65], "uv_size": [8, 2]}, - "east": {"uv": [61, 65], "uv_size": [4, 2]}, - "south": {"uv": [77, 65], "uv_size": [8, 2]}, - "west": {"uv": [73, 65], "uv_size": [4, 2]}, - "up": {"uv": [65, 61], "uv_size": [8, 4]}, - "down": {"uv": [73, 65], "uv_size": [8, -4]} + "north": {"uv": [33, 41], "uv_size": [1, 2]}, + "east": {"uv": [42, 9], "uv_size": [1, 2]}, + "south": {"uv": [11, 42], "uv_size": [1, 2]}, + "west": {"uv": [12, 42], "uv_size": [1, 2]}, + "up": {"uv": [36, 35], "uv_size": [1, 1]}, + "down": {"uv": [38, 30], "uv_size": [1, -1]} } }, { - "origin": [2.76, 24.012, -2.07], - "size": [5.52, 1.38, 2.76], - "pivot": [2.76, 24.84, -1.38], - "rotation": [0, 0, 15], + "origin": [-2.5, 14, -5.5], + "size": [5, 2, 2], "uv": { - "north": {"uv": [60, 49], "uv_size": [8, 2]}, - "east": {"uv": [56, 49], "uv_size": [4, 2]}, - "south": {"uv": [72, 49], "uv_size": [8, 2]}, - "west": {"uv": [68, 49], "uv_size": [4, 2]}, - "up": {"uv": [60, 45], "uv_size": [8, 4]}, - "down": {"uv": [68, 49], "uv_size": [8, -4]} + "north": {"uv": [20, 14], "uv_size": [5, 2]}, + "east": {"uv": [25, 14], "uv_size": [2, 2]}, + "south": {"uv": [27, 20], "uv_size": [5, 2]}, + "west": {"uv": [7, 26], "uv_size": [2, 2]}, + "up": {"uv": [37, 18], "uv_size": [5, 2]}, + "down": {"uv": [37, 37], "uv_size": [5, -2]} } }, { - "origin": [-3.4155, 17.94, -4.14], - "size": [6.831, 3.45, 2.76], + "origin": [-2, 13, -5], + "size": [4, 1, 2], "uv": { - "north": {"uv": [47, 4], "uv_size": [9, 5]}, - "east": {"uv": [43, 4], "uv_size": [4, 5]}, - "south": {"uv": [60, 4], "uv_size": [9, 5]}, - "west": {"uv": [56, 4], "uv_size": [4, 5]}, - "up": {"uv": [47, 0], "uv_size": [9, 4]}, - "down": {"uv": [56, 4], "uv_size": [9, -4]} + "north": {"uv": [27, 22], "uv_size": [4, 1]}, + "east": {"uv": [7, 30], "uv_size": [2, 1]}, + "south": {"uv": [28, 6], "uv_size": [4, 1]}, + "west": {"uv": [31, 22], "uv_size": [2, 1]}, + "up": {"uv": [38, 3], "uv_size": [4, 2]}, + "down": {"uv": [39, 31], "uv_size": [4, -2]} } } ] }, { - "name": "Tail", - "parent": "Miltank", - "pivot": [0, 5.52, 2.07], + "name": "rightEar", + "parent": "head", + "pivot": [-3.5, 18.5, 0], + "rotation": [-15, 0, -15], "cubes": [ { - "origin": [-0.69, 5.52, 2.76], - "size": [0.69, 0.69, 2.76], + "origin": [-6.5, 18, -2], + "size": [3, 1, 3], "uv": { - "north": {"uv": [4, 4], "uv_size": [1, 1]}, - "east": {"uv": [0, 4], "uv_size": [4, 1]}, - "south": {"uv": [9, 4], "uv_size": [1, 1]}, - "west": {"uv": [5, 4], "uv_size": [4, 1]}, - "up": {"uv": [4, 0], "uv_size": [1, 4]}, - "down": {"uv": [5, 4], "uv_size": [1, -4]} + "north": {"uv": [16, 29], "uv_size": [3, 1]}, + "east": {"uv": [41, 33], "uv_size": [3, 1]}, + "south": {"uv": [41, 34], "uv_size": [3, 1]}, + "west": {"uv": [40, 41], "uv_size": [3, 1]}, + "up": {"uv": [38, 0], "uv_size": [3, 3]}, + "down": {"uv": [38, 23], "uv_size": [3, -3]} } }, { - "origin": [-0.69, 10.074, 9.522], - "size": [0.69, 0.69, 4.14], - "pivot": [0, 9.66, 9.66], - "rotation": [82.5, 0, 0], + "origin": [-8.5, 18, -1.5], + "size": [2, 0, 2], "uv": { - "north": {"uv": [44, 76], "uv_size": [1, 1]}, - "east": {"uv": [38, 76], "uv_size": [6, 1]}, - "south": {"uv": [51, 76], "uv_size": [1, 1]}, - "west": {"uv": [45, 76], "uv_size": [6, 1]}, - "up": {"uv": [44, 70], "uv_size": [1, 6]}, - "down": {"uv": [45, 76], "uv_size": [1, -6]} + "north": {"uv": [0, 0], "uv_size": [2, 0]}, + "east": {"uv": [0, 0], "uv_size": [2, 0]}, + "south": {"uv": [0, 0], "uv_size": [2, 0]}, + "west": {"uv": [0, 0], "uv_size": [2, 0]}, + "up": {"uv": [7, 28], "uv_size": [2, 2]}, + "down": {"uv": [5, 35], "uv_size": [2, -2]} } - }, + } + ] + }, + { + "name": "leftEar", + "parent": "head", + "pivot": [3.5, 18.5, 0], + "rotation": [-15, 0, 15], + "cubes": [ { - "origin": [-1.656, 11.454, 10.764], - "size": [2.76, 2.76, 2.76], - "pivot": [0, 12.42, 9.66], - "rotation": [82.5, 0, 0], + "origin": [3.5, 18, -2], + "size": [3, 1, 3], "uv": { - "north": {"uv": [4, 72], "uv_size": [4, 4]}, - "east": {"uv": [0, 72], "uv_size": [4, 4]}, - "south": {"uv": [12, 72], "uv_size": [4, 4]}, - "west": {"uv": [8, 72], "uv_size": [4, 4]}, - "up": {"uv": [4, 68], "uv_size": [4, 4]}, - "down": {"uv": [8, 72], "uv_size": [4, -4]} + "north": {"uv": [3, 42], "uv_size": [3, 1]}, + "east": {"uv": [42, 3], "uv_size": [3, 1]}, + "south": {"uv": [42, 4], "uv_size": [3, 1]}, + "west": {"uv": [42, 5], "uv_size": [3, 1]}, + "up": {"uv": [38, 23], "uv_size": [3, 3]}, + "down": {"uv": [38, 29], "uv_size": [3, -3]} } }, { - "origin": [-0.69, 5.52, 5.52], - "size": [0.69, 0.69, 5.52], - "pivot": [0, 5.52, 5.52], - "rotation": [47.5, 0, 0], + "origin": [6.5, 18, -1.5], + "size": [2, 0, 2], "uv": { - "north": {"uv": [21, 65], "uv_size": [1, 1]}, - "east": {"uv": [13, 65], "uv_size": [8, 1]}, - "south": {"uv": [30, 65], "uv_size": [1, 1]}, - "west": {"uv": [22, 65], "uv_size": [8, 1]}, - "up": {"uv": [21, 57], "uv_size": [1, 8]}, - "down": {"uv": [22, 65], "uv_size": [1, -8]} + "north": {"uv": [0, 0], "uv_size": [2, 0]}, + "east": {"uv": [0, 0], "uv_size": [2, 0]}, + "south": {"uv": [0, 0], "uv_size": [2, 0]}, + "west": {"uv": [0, 0], "uv_size": [2, 0]}, + "up": {"uv": [5, 35], "uv_size": [2, 2]}, + "down": {"uv": [3, 40], "uv_size": [2, -2]} } } ] diff --git a/models/entity/pokemon/natu.geo.json b/models/entity/pokemon/natu.geo.json index 5426c7340..c889dda2c 100644 --- a/models/entity/pokemon/natu.geo.json +++ b/models/entity/pokemon/natu.geo.json @@ -4,75 +4,118 @@ { "description": { "identifier": "geometry.natu", - "texture_width": 64, - "texture_height": 64, + "texture_width": 32, + "texture_height": 32, "visible_bounds_width": 2, "visible_bounds_height": 2.5, "visible_bounds_offset": [0, 0.75, 0] }, "bones": [ { - "name": "Body", - "pivot": [0, 5, 0], + "name": "all", + "pivot": [0, 0, 0] + }, + { + "name": "body", + "parent": "all", + "pivot": [0, 4, 0], + "cubes": [ + {"origin": [-2.5, 2, -2.5], "size": [5, 5, 5], "uv": [0, 0]}, + {"origin": [-1.5, 3.56461, -4.40869], "size": [3, 1, 3], "pivot": [0, 4, -2], "rotation": [7.5, 0, 0], "uv": [10, 12]}, + {"origin": [-1, 3.72043, 1.42179], "size": [2, 0, 5], "pivot": [0, 4, 3], "rotation": [12.5, 0, 0], "uv": [4, 10]}, + {"origin": [-2.49824, 3.74701, 1.30192], "size": [2, 0, 5], "pivot": [-1, 4, 3], "rotation": [12.5, -27.5, 0], "uv": [0, 10]}, + {"origin": [0.49824, 3.74701, 1.30192], "size": [2, 0, 5], "pivot": [1, 4, 3], "rotation": [12.5, 27.5, 0], "uv": [10, 0]} + ] + }, + { + "name": "left_leg", + "parent": "all", + "pivot": [1.5, 1.9343, 0.00036], + "cubes": [ + {"origin": [1, 0.4, -0.5], "size": [1, 2, 1], "uv": [0, 16]} + ] + }, + { + "name": "left_foot", + "parent": "left_leg", + "pivot": [1.5, 0.9343, 0.00036], "cubes": [ - {"origin": [-3, 2, -3], "size": [6, 6, 6], "uv": [0, 0]}, - {"origin": [-2, 4, -6], "size": [4, 2, 3], "uv": [17, 14]} + {"origin": [0.5, 0, -1], "size": [2, 1, 2], "uv": [6, 16]}, + {"origin": [2, 0, -3], "size": [0, 1, 2], "pivot": [1.5, 1, -1], "rotation": [0, -5, 0], "uv": [6, 13]}, + {"origin": [1, 0, -3], "size": [0, 1, 2], "pivot": [1.5, 1, -1], "rotation": [0, 5, 0], "uv": [0, 2]}, + {"origin": [1.5, 0, 1], "size": [0, 1, 2], "uv": [10, 22], "mirror": true} ] }, { - "name": "Hari", - "parent": "Body", - "pivot": [0, 8, 0], + "name": "right_leg", + "parent": "all", + "pivot": [-1.5, 1.9343, 0.00036], "cubes": [ - {"origin": [-1, 8, 0], "size": [2, 5, 0], "uv": [0, 0]} + {"origin": [-2, 0.4, -0.5], "size": [1, 2, 1], "uv": [20, 3]} ] }, { - "name": "Tell", - "parent": "Body", - "pivot": [0, 2, 3], + "name": "right_foot", + "parent": "right_leg", + "pivot": [-1.5, 0.9343, 0.00036], "cubes": [ - {"origin": [-4, 2, 3], "size": [8, 0, 4], "uv": [0, 12]} + {"origin": [-1, 0, -3], "size": [0, 1, 2], "pivot": [-1.5, 1, -1], "rotation": [0, -5, 0], "uv": [0, 0]}, + {"origin": [-2, 0, -3], "size": [0, 1, 2], "pivot": [-1.5, 1, -1], "rotation": [0, 5, 0], "uv": [0, 1]}, + {"origin": [-2.5, 0, -1], "size": [2, 1, 2], "uv": [14, 16]}, + {"origin": [-1.5, 0, 1], "size": [0, 1, 2], "uv": [10, 21]} ] }, { - "name": "Leg1", - "parent": "Body", - "pivot": [-1.5, 2, 0.5], + "name": "Topfeather", + "parent": "all", + "pivot": [0, 6.91154, 0.20104], "cubes": [ - {"origin": [-2, 1, 0], "size": [1, 1, 1], "uv": [0, 12]}, - {"origin": [-2.5, 0, -0.5], "size": [2, 1, 2], "uv": [18, 0]}, - {"origin": [-2.5, 0, -2.5], "size": [0, 1, 2], "uv": [0, 3]}, - {"origin": [-0.5, 0, -2.5], "size": [0, 1, 2], "uv": [0, 3]}, - {"origin": [-1.5, 0, -2.3], "size": [0, 1, 2], "pivot": [-1.5, 0, 0.6], "rotation": [0, 180, 0], "uv": [0, 3]} + {"origin": [-1, 4.93831, 0.58713], "size": [2, 6, 0], "pivot": [0, 7, 1], "rotation": [-47.5, 0, 0], "uv": [0, 10]} ] }, { - "name": "Wing1", - "parent": "Body", - "pivot": [-3, 4.5, -1], + "name": "top_feather_end", + "parent": "Topfeather", + "pivot": [0, 9.96508, 3.6247], "cubes": [ - {"origin": [-3.5, -1, -3], "size": [0, 5, 6], "pivot": [-3, 4, 0], "rotation": [0, 0, 90], "uv": [0, 10]} + {"origin": [-0.5, 10.32747, 3.56672], "size": [1, 1, 0], "pivot": [0, 10.10474, 3.33725], "rotation": [-70, 0, 0], "uv": [21, 8]} ] }, { - "name": "Leg2", - "parent": "Body", - "pivot": [1.5, 2, 0.5], + "name": "left_wing", + "parent": "all", + "pivot": [2, 4, 0], + "cubes": [ + {"origin": [2, 1.9, -1.4], "size": [1, 3, 4], "uv": [17, 23]} + ] + }, + { + "name": "right_wing", + "parent": "all", + "pivot": [-2, 4, 0], + "cubes": [ + {"origin": [-3, 1.9, -1.4], "size": [1, 3, 4], "uv": [0, 23]} + ] + }, + { + "name": "closedeyes", + "parent": "all", + "pivot": [0, 0, 0] + }, + { + "name": "bone", + "parent": "closedeyes", + "pivot": [0, 0, 0], "cubes": [ - {"origin": [1, 1, 0], "size": [1, 1, 1], "uv": [0, 12]}, - {"origin": [0.5, 0, -0.5], "size": [2, 1, 2], "uv": [18, 0]}, - {"origin": [0.5, 0, -2.5], "size": [0, 1, 2], "uv": [0, 3]}, - {"origin": [2.5, 0, -2.5], "size": [0, 1, 2], "uv": [0, 3]}, - {"origin": [1.5, 0, -2.3], "size": [0, 1, 2], "pivot": [1.5, 0, 0.6], "rotation": [0, 180, 0], "uv": [0, 3]} + {"origin": [0.5, 5, -1.6], "size": [1.1, 1, 2], "uv": [19, 0]} ] }, { - "name": "Wing2", - "parent": "Body", - "pivot": [3, 4.5, -1], + "name": "bone2", + "parent": "closedeyes", + "pivot": [0, 0, 0], "cubes": [ - {"origin": [8.5, 0, -3], "size": [0, 5, 6], "pivot": [8, 5, 0], "rotation": [0, 0, 90], "uv": [0, 10]} + {"origin": [-1.6, 5, -1.6], "size": [1.1, 1, 2.1], "uv": [18, 9]} ] } ] diff --git a/texts/en_US.lang b/texts/en_US.lang index 0c6facc4d..2b2fa81e3 100644 --- a/texts/en_US.lang +++ b/texts/en_US.lang @@ -1,4 +1,4 @@ -pack.name=§lPokeBedrock v2.8.2 RES +pack.name=§lPokeBedrock v2.8.3 RES pack.description=§aA High Level Pokemon Addon Created by Smell of curry for Minecraft Bedrock ## Orbs diff --git a/textures/entity/pokemon/butterfree/shiny_butterfree.png b/textures/entity/pokemon/butterfree/shiny_butterfree.png new file mode 100644 index 000000000..a2cb908e7 Binary files /dev/null and b/textures/entity/pokemon/butterfree/shiny_butterfree.png differ diff --git a/textures/entity/pokemon/flaaffy/flaaffy.png b/textures/entity/pokemon/flaaffy/flaaffy.png index ef3ba5173..1654d922a 100644 Binary files a/textures/entity/pokemon/flaaffy/flaaffy.png and b/textures/entity/pokemon/flaaffy/flaaffy.png differ diff --git a/textures/entity/pokemon/flaaffy/shiny_flaaffy.png b/textures/entity/pokemon/flaaffy/shiny_flaaffy.png index c10a1598d..1ea096e65 100644 Binary files a/textures/entity/pokemon/flaaffy/shiny_flaaffy.png and b/textures/entity/pokemon/flaaffy/shiny_flaaffy.png differ diff --git a/textures/entity/pokemon/mareep/mareep.png b/textures/entity/pokemon/mareep/mareep.png index 99809afd7..e7d01992a 100644 Binary files a/textures/entity/pokemon/mareep/mareep.png and b/textures/entity/pokemon/mareep/mareep.png differ diff --git a/textures/entity/pokemon/mareep/mareep_shaved.png b/textures/entity/pokemon/mareep/mareep_shaved.png new file mode 100644 index 000000000..061289b1c Binary files /dev/null and b/textures/entity/pokemon/mareep/mareep_shaved.png differ diff --git a/textures/entity/pokemon/mareep/nude.png b/textures/entity/pokemon/mareep/nude.png new file mode 100644 index 000000000..d6e7065ab Binary files /dev/null and b/textures/entity/pokemon/mareep/nude.png differ diff --git a/textures/entity/pokemon/mareep/shiny_mareep.png b/textures/entity/pokemon/mareep/shiny_mareep.png index 780c8b90f..aab3656a9 100644 Binary files a/textures/entity/pokemon/mareep/shiny_mareep.png and b/textures/entity/pokemon/mareep/shiny_mareep.png differ diff --git a/textures/entity/pokemon/mareep/shiny_mareep_shaved.png b/textures/entity/pokemon/mareep/shiny_mareep_shaved.png new file mode 100644 index 000000000..1bf49f5f9 Binary files /dev/null and b/textures/entity/pokemon/mareep/shiny_mareep_shaved.png differ diff --git a/textures/entity/pokemon/miltank/miltank.png b/textures/entity/pokemon/miltank/miltank.png index 33591e3b0..cad11d324 100644 Binary files a/textures/entity/pokemon/miltank/miltank.png and b/textures/entity/pokemon/miltank/miltank.png differ diff --git a/textures/entity/pokemon/miltank/shiny_miltank.png b/textures/entity/pokemon/miltank/shiny_miltank.png index 77e9b846b..ca64e9090 100644 Binary files a/textures/entity/pokemon/miltank/shiny_miltank.png and b/textures/entity/pokemon/miltank/shiny_miltank.png differ diff --git a/textures/entity/pokemon/natu/natu.png b/textures/entity/pokemon/natu/natu.png index bdaf729f1..dbf900084 100644 Binary files a/textures/entity/pokemon/natu/natu.png and b/textures/entity/pokemon/natu/natu.png differ diff --git a/textures/entity/pokemon/natu/shiny_natu.png b/textures/entity/pokemon/natu/shiny_natu.png index 58439d355..2ddd2a33d 100644 Binary files a/textures/entity/pokemon/natu/shiny_natu.png and b/textures/entity/pokemon/natu/shiny_natu.png differ diff --git a/textures/entity/pokemon/pikachu/detective_female_pikachu.png b/textures/entity/pokemon/pikachu/detective_female_pikachu.png index defed97b0..d4e6971c9 100644 Binary files a/textures/entity/pokemon/pikachu/detective_female_pikachu.png and b/textures/entity/pokemon/pikachu/detective_female_pikachu.png differ diff --git a/textures/entity/pokemon/pikachu/detective_male_pikachu.png b/textures/entity/pokemon/pikachu/detective_male_pikachu.png index f623e4f07..201f7912a 100644 Binary files a/textures/entity/pokemon/pikachu/detective_male_pikachu.png and b/textures/entity/pokemon/pikachu/detective_male_pikachu.png differ diff --git a/textures/entity/pokemon/quaquaval/shiny_quaquaval.png b/textures/entity/pokemon/quaquaval/shiny_quaquaval.png new file mode 100644 index 000000000..0a05bd3bd Binary files /dev/null and b/textures/entity/pokemon/quaquaval/shiny_quaquaval.png differ diff --git a/textures/entity/pokemon/quaxly/shiny_quaxly.png b/textures/entity/pokemon/quaxly/shiny_quaxly.png new file mode 100644 index 000000000..e7b780b76 Binary files /dev/null and b/textures/entity/pokemon/quaxly/shiny_quaxly.png differ diff --git a/textures/entity/pokemon/quaxwell/shiny_quaxwell.png b/textures/entity/pokemon/quaxwell/shiny_quaxwell.png new file mode 100644 index 000000000..8b3181e26 Binary files /dev/null and b/textures/entity/pokemon/quaxwell/shiny_quaxwell.png differ diff --git a/ui/chest_server_form.json b/ui/chest_server_form.json index d32f3fb8c..ab08d8957 100644 --- a/ui/chest_server_form.json +++ b/ui/chest_server_form.json @@ -34,8 +34,8 @@ "single_chest_grid": { "type": "grid", "grid_dimensions": [9, 5], - "size": ["100% - 14px", "100% - 27px"], - "offset": [7, 21], + "size": ["100% - 17px", "100% - 32px"], + "offset": [8, 22], "anchor_from": "top_left", "anchor_to": "top_left", "grid_item_template": "chest_ui.chest_item", @@ -381,7 +381,7 @@ ] }, "ui_inventory_item@chest_ui.inventory_button": { - "$offset": [0, 13.5], + "$offset": [0, 8], "bindings": [ { "binding_type": "collection", @@ -405,7 +405,7 @@ ] }, "ui_hot_bar_item@chest_ui.inventory_button": { - "$offset": [0, 18], + "$offset": [0, 8], "bindings": [ { "binding_type": "collection",