From e83694faac171068e1aa97675d150ebe1059d3cd Mon Sep 17 00:00:00 2001 From: Smell of curry <75345244+smell-of-curry@users.noreply.github.com> Date: Thu, 21 Dec 2023 10:31:09 -0500 Subject: [PATCH] v2.8.3 --- CHANGELOG.md | 62 +- animation_controllers/pokemon.json | 16 +- animations/pokemon/abra.animation.json | 2 +- animations/pokemon/absol.animation.json | 2 +- animations/pokemon/aerodactyl.animation.json | 2 +- animations/pokemon/aipom.animation.json | 2 +- animations/pokemon/alakazam.animation.json | 2 +- animations/pokemon/ambipom.animation.json | 2 +- animations/pokemon/ampharos.animation.json | 2 +- animations/pokemon/applin.animation.json | 2 +- animations/pokemon/arbok.animation.json | 2 +- animations/pokemon/arcanine.animation.json | 2 +- animations/pokemon/arceus.animation.json | 2 +- animations/pokemon/ariados.animation.json | 2 +- animations/pokemon/armaldo.animation.json | 2 +- animations/pokemon/articuno.animation.json | 2 +- animations/pokemon/axew.animation.json | 2 +- animations/pokemon/azelf.animation.json | 2 +- animations/pokemon/azumarill.animation.json | 2 +- animations/pokemon/azurill.animation.json | 2 +- animations/pokemon/bastiodon.animation.json | 2 +- animations/pokemon/bayleef.animation.json | 2 +- animations/pokemon/beedrill.animation.json | 2 +- animations/pokemon/bellossom.animation.json | 2 +- animations/pokemon/bibarel.animation.json | 2 +- animations/pokemon/bidoof.animation.json | 2 +- animations/pokemon/blastoise.animation.json | 2 +- animations/pokemon/blaziken.animation.json | 2 +- animations/pokemon/braixen.animation.json | 2 +- animations/pokemon/brionne.animation.json | 2 +- animations/pokemon/buizel.animation.json | 2 +- animations/pokemon/bulbasaur.animation.json | 2 +- animations/pokemon/buneary.animation.json | 2 +- animations/pokemon/butterfree.animation.json | 2 +- animations/pokemon/caterpie.animation.json | 2 +- animations/pokemon/celebi.animation.json | 2 +- animations/pokemon/chansey.animation.json | 2 +- animations/pokemon/charizard.animation.json | 2 +- animations/pokemon/charmander.animation.json | 2 +- animations/pokemon/charmeleon.animation.json | 2 +- animations/pokemon/chesnaught.animation.json | 2 +- animations/pokemon/chespin.animation.json | 2 +- animations/pokemon/chikorita.animation.json | 2 +- animations/pokemon/chimchar.animation.json | 2 +- animations/pokemon/chinchou.animation.json | 2 +- animations/pokemon/cinderace.animation.json | 2 +- animations/pokemon/clefable.animation.json | 2 +- animations/pokemon/clefairy.animation.json | 2 +- animations/pokemon/cleffa.animation.json | 2 +- animations/pokemon/cloyster.animation.json | 2 +- animations/pokemon/combusken.animation.json | 2 +- animations/pokemon/corsola.animation.json | 2 +- animations/pokemon/cosmog.animation.json | 2 +- animations/pokemon/cradily.animation.json | 2 +- animations/pokemon/cresselia.animation.json | 2 +- animations/pokemon/crobat.animation.json | 2 +- animations/pokemon/croconaw.animation.json | 2 +- animations/pokemon/cyndaquil.animation.json | 2 +- animations/pokemon/dartrix.animation.json | 2 +- animations/pokemon/decidueye.animation.json | 2 +- animations/pokemon/delibird.animation.json | 2 +- animations/pokemon/delphox.animation.json | 2 +- animations/pokemon/dewgong.animation.json | 2 +- animations/pokemon/dewott.animation.json | 2 +- animations/pokemon/dialga.animation.json | 2 +- animations/pokemon/diglett.animation.json | 2 +- animations/pokemon/ditto.animation.json | 2 +- animations/pokemon/dodrio.animation.json | 2 +- animations/pokemon/doduo.animation.json | 2 +- animations/pokemon/donphan.animation.json | 2 +- animations/pokemon/dragonair.animation.json | 2 +- animations/pokemon/dragonite.animation.json | 2 +- animations/pokemon/drapion.animation.json | 2 +- animations/pokemon/dratini.animation.json | 2 +- animations/pokemon/drizzile.animation.json | 2 +- animations/pokemon/drowzee.animation.json | 2 +- animations/pokemon/dugtrio.animation.json | 2 +- animations/pokemon/eevee.animation.json | 2 +- animations/pokemon/ekans.animation.json | 2 +- animations/pokemon/electabuzz.animation.json | 2 +- animations/pokemon/electrode.animation.json | 2 +- animations/pokemon/elekid.animation.json | 2 +- animations/pokemon/emboar.animation.json | 2 +- animations/pokemon/empoleon.animation.json | 2 +- animations/pokemon/entei.animation.json | 2 +- animations/pokemon/espeon.animation.json | 2 +- animations/pokemon/exeggcute.animation.json | 2 +- animations/pokemon/exeggutor.animation.json | 2 +- animations/pokemon/farfetchd.animation.json | 2 +- animations/pokemon/fearow.animation.json | 2 +- animations/pokemon/feraligatr.animation.json | 2 +- animations/pokemon/flaaffy.animation.json | 723 ++++++++++++-- animations/pokemon/flareon.animation.json | 2 +- animations/pokemon/floatzel.animation.json | 2 +- animations/pokemon/floragato.animation.json | 2 +- animations/pokemon/forretress.animation.json | 2 +- animations/pokemon/fraxure.animation.json | 2 +- animations/pokemon/froakie.animation.json | 2 +- animations/pokemon/frogadier.animation.json | 2 +- animations/pokemon/fuecoco.animation.json | 2 +- animations/pokemon/furret.animation.json | 2 +- animations/pokemon/gabite.animation.json | 2 +- animations/pokemon/garchomp.animation.json | 2 +- animations/pokemon/gardevoir.animation.json | 781 ++++++++++++--- animations/pokemon/gastly.animation.json | 2 +- animations/pokemon/gengar.animation.json | 2 +- animations/pokemon/geodude.animation.json | 2 +- animations/pokemon/gible.animation.json | 2 +- animations/pokemon/girafarig.animation.json | 2 +- animations/pokemon/giratina.animation.json | 2 +- animations/pokemon/glaceon.animation.json | 2 +- animations/pokemon/gligar.animation.json | 2 +- animations/pokemon/gloom.animation.json | 2 +- animations/pokemon/golbat.animation.json | 2 +- animations/pokemon/goldeen.animation.json | 2 +- animations/pokemon/golduck.animation.json | 2 +- animations/pokemon/golem.animation.json | 2 +- animations/pokemon/graveler.animation.json | 2 +- animations/pokemon/greninja.animation.json | 2 +- animations/pokemon/grookey.animation.json | 2 +- animations/pokemon/grotle.animation.json | 2 +- animations/pokemon/groudon.animation.json | 2 +- animations/pokemon/grovyle.animation.json | 2 +- animations/pokemon/growlithe.animation.json | 2 +- animations/pokemon/gyarados.animation.json | 2 +- animations/pokemon/haunter.animation.json | 2 +- animations/pokemon/haxorus.animation.json | 2 +- animations/pokemon/heracross.animation.json | 2 +- animations/pokemon/hitmonchan.animation.json | 2 +- animations/pokemon/hitmonlee.animation.json | 2 +- animations/pokemon/hitmontop.animation.json | 2 +- animations/pokemon/honchkrow.animation.json | 2 +- animations/pokemon/hooh.animation.json | 2 +- animations/pokemon/hoothoot.animation.json | 2 +- animations/pokemon/hoppip.animation.json | 2 +- animations/pokemon/horsea.animation.json | 2 +- animations/pokemon/houndoom.animation.json | 2 +- animations/pokemon/houndour.animation.json | 2 +- animations/pokemon/hypno.animation.json | 2 +- animations/pokemon/igglybuff.animation.json | 2 +- animations/pokemon/incineroar.animation.json | 2 +- animations/pokemon/infernape.animation.json | 2 +- animations/pokemon/inteleon.animation.json | 2 +- animations/pokemon/ironmoth.animation.json | 2 +- animations/pokemon/ivysaur.animation.json | 2 +- animations/pokemon/jigglypuff.animation.json | 2 +- animations/pokemon/jirachi.animation.json | 2 +- animations/pokemon/jolteon.animation.json | 2 +- animations/pokemon/jumpluff.animation.json | 2 +- animations/pokemon/jynx.animation.json | 2 +- animations/pokemon/kabuto.animation.json | 2 +- animations/pokemon/kabutops.animation.json | 2 +- animations/pokemon/kadabra.animation.json | 2 +- animations/pokemon/kakuna.animation.json | 2 +- animations/pokemon/kangaskhan.animation.json | 2 +- animations/pokemon/kingdra.animation.json | 2 +- animations/pokemon/kingler.animation.json | 2 +- animations/pokemon/kirlia.animation.json | 258 ++++- animations/pokemon/koffing.animation.json | 2 +- animations/pokemon/krabby.animation.json | 4 +- animations/pokemon/kyogre.animation.json | 6 +- animations/pokemon/lanturn.animation.json | 2 +- animations/pokemon/lapras.animation.json | 2 +- animations/pokemon/larvesta.animation.json | 2 +- animations/pokemon/larvitar.animation.json | 2 +- animations/pokemon/latias.animation.json | 2 +- animations/pokemon/latios.animation.json | 2 +- animations/pokemon/leafeon.animation.json | 2 +- animations/pokemon/leavanny.animation.json | 2 +- animations/pokemon/ledian.animation.json | 2 +- animations/pokemon/ledyba.animation.json | 2 +- animations/pokemon/lickitung.animation.json | 2 +- animations/pokemon/lileep.animation.json | 2 +- animations/pokemon/litten.animation.json | 2 +- animations/pokemon/lopunny.animation.json | 2 +- animations/pokemon/lucario.animation.json | 2 +- animations/pokemon/lugia.animation.json | 2 +- animations/pokemon/lunala.animation.json | 2 +- animations/pokemon/luxio.animation.json | 2 +- animations/pokemon/luxray.animation.json | 2 +- animations/pokemon/machamp.animation.json | 2 +- animations/pokemon/machoke.animation.json | 2 +- animations/pokemon/machop.animation.json | 2 +- animations/pokemon/magby.animation.json | 2 +- animations/pokemon/magcargo.animation.json | 2 +- animations/pokemon/magikarp.animation.json | 2 +- animations/pokemon/magmar.animation.json | 2 +- animations/pokemon/magnemite.animation.json | 2 +- animations/pokemon/magneton.animation.json | 2 +- animations/pokemon/magnezone.animation.json | 2 +- animations/pokemon/mankey.animation.json | 2 +- animations/pokemon/mantine.animation.json | 2 +- animations/pokemon/mantyke.animation.json | 2 +- animations/pokemon/mareep.animation.json | 886 ++++++++++++++++-- animations/pokemon/marill.animation.json | 2 +- animations/pokemon/marshtomp.animation.json | 2 +- animations/pokemon/meganium.animation.json | 2 +- animations/pokemon/meowscarada.animation.json | 2 +- animations/pokemon/meowth.animation.json | 2 +- animations/pokemon/mesprit.animation.json | 2 +- animations/pokemon/metapod.animation.json | 2 +- animations/pokemon/mew.animation.json | 2 +- animations/pokemon/mewtwo.animation.json | 2 +- animations/pokemon/mewtwo_x.animation.json | 2 +- animations/pokemon/mewtwo_y.animation.json | 2 +- animations/pokemon/miltank.animation.json | 260 +++-- animations/pokemon/moltres.animation.json | 2 +- animations/pokemon/monferno.animation.json | 2 +- animations/pokemon/mrmime.animation.json | 2 +- animations/pokemon/mudkip.animation.json | 4 +- animations/pokemon/munchlax.animation.json | 2 +- animations/pokemon/murkrow.animation.json | 2 +- animations/pokemon/natu.animation.json | 338 +++++-- animations/pokemon/nidoking.animation.json | 2 +- animations/pokemon/nidoqueen.animation.json | 2 +- animations/pokemon/nidoranf.animation.json | 2 +- animations/pokemon/nidoranm.animation.json | 2 +- animations/pokemon/nidorina.animation.json | 2 +- animations/pokemon/nidorino.animation.json | 2 +- animations/pokemon/ninetales.animation.json | 2 +- animations/pokemon/noctowl.animation.json | 2 +- animations/pokemon/octillery.animation.json | 2 +- animations/pokemon/oddish.animation.json | 2 +- animations/pokemon/omanyte.animation.json | 2 +- animations/pokemon/omastar.animation.json | 2 +- animations/pokemon/onix.animation.json | 2 +- animations/pokemon/oshawott.animation.json | 2 +- animations/pokemon/palkia.animation.json | 2 +- animations/pokemon/paras.animation.json | 2 +- animations/pokemon/parasect.animation.json | 2 +- animations/pokemon/persian.animation.json | 2 +- animations/pokemon/petilil.animation.json | 2 +- animations/pokemon/phanpy.animation.json | 2 +- animations/pokemon/pichu.animation.json | 2 +- animations/pokemon/pidgeot.animation.json | 2 +- animations/pokemon/pidgeotto.animation.json | 2 +- animations/pokemon/pidgey.animation.json | 2 +- animations/pokemon/pignite.animation.json | 2 +- animations/pokemon/pikachu.animation.json | 2 +- animations/pokemon/piloswine.animation.json | 2 +- animations/pokemon/pineco.animation.json | 2 +- animations/pokemon/pinsir.animation.json | 2 +- animations/pokemon/piplup.animation.json | 2 +- animations/pokemon/politoed.animation.json | 2 +- animations/pokemon/poliwag.animation.json | 2 +- animations/pokemon/poliwhirl.animation.json | 2 +- animations/pokemon/poliwrath.animation.json | 2 +- animations/pokemon/popplio.animation.json | 2 +- animations/pokemon/porygon.animation.json | 2 +- animations/pokemon/porygon2.animation.json | 2 +- animations/pokemon/porygonz.animation.json | 2 +- animations/pokemon/primarina.animation.json | 2 +- animations/pokemon/primeape.animation.json | 2 +- animations/pokemon/prinplup.animation.json | 2 +- animations/pokemon/psyduck.animation.json | 2 +- animations/pokemon/pupitar.animation.json | 2 +- animations/pokemon/quagsire.animation.json | 2 +- animations/pokemon/quaquaval.animation.json | 2 +- animations/pokemon/quaxly.animation.json | 2 +- animations/pokemon/quaxwell.animation.json | 2 +- animations/pokemon/quilava.animation.json | 2 +- animations/pokemon/quilladin.animation.json | 2 +- animations/pokemon/qwilfish.animation.json | 2 +- animations/pokemon/raboot.animation.json | 2 +- animations/pokemon/raichu.animation.json | 2 +- animations/pokemon/raikou.animation.json | 2 +- animations/pokemon/ralts.animation.json | 45 +- animations/pokemon/rayquaza.animation.json | 2 +- animations/pokemon/regice.animation.json | 2 +- animations/pokemon/regigigas.animation.json | 2 +- animations/pokemon/regirock.animation.json | 2 +- animations/pokemon/registeel.animation.json | 2 +- animations/pokemon/remoraid.animation.json | 2 +- animations/pokemon/rillaboom.animation.json | 2 +- animations/pokemon/riolu.animation.json | 2 +- animations/pokemon/rowlet.animation.json | 2 +- animations/pokemon/sableye.animation.json | 2 +- animations/pokemon/samurott.animation.json | 2 +- animations/pokemon/sandshrew.animation.json | 2 +- animations/pokemon/sandslash.animation.json | 2 +- animations/pokemon/sceptile.animation.json | 2 +- animations/pokemon/scizor.animation.json | 2 +- animations/pokemon/scorbunny.animation.json | 2 +- animations/pokemon/scyther.animation.json | 2 +- animations/pokemon/seadra.animation.json | 2 +- animations/pokemon/seaking.animation.json | 2 +- animations/pokemon/seel.animation.json | 2 +- animations/pokemon/sentret.animation.json | 2 +- animations/pokemon/serperior.animation.json | 2 +- animations/pokemon/servine.animation.json | 2 +- animations/pokemon/sewaddle.animation.json | 2 +- .../pokemon/shaymin-land.animation.json | 2 +- animations/pokemon/shellder.animation.json | 2 +- animations/pokemon/shinx.animation.json | 2 +- animations/pokemon/shuckle.animation.json | 2 +- animations/pokemon/skarmory.animation.json | 2 +- animations/pokemon/skeledirge.animation.json | 2 +- animations/pokemon/skiploom.animation.json | 2 +- animations/pokemon/skorupi.animation.json | 2 +- animations/pokemon/slakoth.animation.json | 2 +- animations/pokemon/slitherwing.animation.json | 2 +- animations/pokemon/slowbro.animation.json | 2 +- animations/pokemon/slowking.animation.json | 2 +- animations/pokemon/slowpoke.animation.json | 2 +- animations/pokemon/slugma.animation.json | 2 +- animations/pokemon/smeargle.animation.json | 2 +- animations/pokemon/smoochum.animation.json | 2 +- animations/pokemon/sneasel.animation.json | 2 +- animations/pokemon/snivy.animation.json | 2 +- animations/pokemon/snorlax.animation.json | 2 +- animations/pokemon/sobble.animation.json | 2 +- animations/pokemon/spearow.animation.json | 2 +- animations/pokemon/spinarak.animation.json | 2 +- animations/pokemon/sprigatito.animation.json | 2 +- animations/pokemon/squirtle.animation.json | 2 +- animations/pokemon/stantler.animation.json | 2 +- animations/pokemon/starmie.animation.json | 2 +- animations/pokemon/staryu.animation.json | 2 +- animations/pokemon/steelix.animation.json | 2 +- animations/pokemon/sudowoodo.animation.json | 2 +- animations/pokemon/suicune.animation.json | 2 +- animations/pokemon/swadloon.animation.json | 2 +- animations/pokemon/swampert.animation.json | 4 +- animations/pokemon/swinub.animation.json | 2 +- animations/pokemon/sylveon.animation.json | 2 +- animations/pokemon/tangela.animation.json | 2 +- animations/pokemon/tapukoko.animation.json | 2 +- animations/pokemon/tauros.animation.json | 2 +- animations/pokemon/teddiursa.animation.json | 2 +- animations/pokemon/tentacool.animation.json | 2 +- animations/pokemon/tentacruel.animation.json | 2 +- animations/pokemon/tepig.animation.json | 2 +- animations/pokemon/thwackey.animation.json | 2 +- animations/pokemon/toedscool.animation.json | 2 +- animations/pokemon/toedscruel.animation.json | 12 +- animations/pokemon/togepi.animation.json | 2 +- animations/pokemon/togetic.animation.json | 2 +- animations/pokemon/torchic.animation.json | 2 +- animations/pokemon/torracat.animation.json | 2 +- animations/pokemon/torterra.animation.json | 2 +- animations/pokemon/totodile.animation.json | 2 +- animations/pokemon/treecko.animation.json | 2 +- animations/pokemon/turtwig.animation.json | 2 +- animations/pokemon/typhlosion.animation.json | 2 +- animations/pokemon/tyranitar.animation.json | 2 +- animations/pokemon/tyrogue.animation.json | 2 +- animations/pokemon/tyrunt.animation.json | 2 +- animations/pokemon/umbreon.animation.json | 2 +- animations/pokemon/ursaring.animation.json | 2 +- animations/pokemon/uxie.animation.json | 2 +- animations/pokemon/vaporeon.animation.json | 2 +- animations/pokemon/venomoth.animation.json | 2 +- animations/pokemon/venonat.animation.json | 2 +- animations/pokemon/venusaur.animation.json | 2 +- animations/pokemon/vigoroth.animation.json | 2 +- animations/pokemon/vileplume.animation.json | 2 +- animations/pokemon/volcarona.animation.json | 2 +- animations/pokemon/voltorb.animation.json | 2 +- animations/pokemon/vulpix.animation.json | 2 +- animations/pokemon/wartortle.animation.json | 2 +- animations/pokemon/weedle.animation.json | 2 +- animations/pokemon/weezing.animation.json | 2 +- animations/pokemon/wigglytuff.animation.json | 2 +- animations/pokemon/wooper.animation.json | 2 +- animations/pokemon/xatu.animation.json | 2 +- animations/pokemon/xurkitree.animation.json | 2 +- animations/pokemon/zapdos.animation.json | 2 +- animations/pokemon/zubat.animation.json | 2 +- entity/pokemon/abra.json | 8 +- entity/pokemon/aerodactyl.json | 6 +- entity/pokemon/aipom.json | 10 +- entity/pokemon/alakazam.json | 8 +- entity/pokemon/ambipom.json | 10 +- entity/pokemon/ampharos.json | 8 +- entity/pokemon/arbok.json | 8 +- entity/pokemon/arcanine.json | 10 +- entity/pokemon/arceus.json | 10 +- entity/pokemon/ariados.json | 10 +- entity/pokemon/articuno.json | 10 +- entity/pokemon/axew.json | 10 +- entity/pokemon/azelf.json | 10 +- entity/pokemon/azumarill.json | 8 +- entity/pokemon/azurill.json | 8 +- entity/pokemon/bayleef.json | 8 +- entity/pokemon/beedrill.json | 10 +- entity/pokemon/bellossom.json | 10 +- entity/pokemon/bibarel.json | 10 +- entity/pokemon/bidoof.json | 10 +- entity/pokemon/blastoise.json | 8 +- entity/pokemon/blaziken.json | 8 +- entity/pokemon/bonsly.json | 6 +- entity/pokemon/braixen.json | 8 +- entity/pokemon/brionne.json | 8 +- entity/pokemon/buizel.json | 10 +- entity/pokemon/bulbasaur.json | 8 +- entity/pokemon/butterfree.json | 10 +- entity/pokemon/caterpie.json | 10 +- entity/pokemon/celebi.json | 10 +- entity/pokemon/chansey.json | 8 +- entity/pokemon/charizard.json | 10 +- entity/pokemon/charmander.json | 10 +- entity/pokemon/charmeleon.json | 10 +- entity/pokemon/chesnaught.json | 8 +- entity/pokemon/chespin.json | 8 +- entity/pokemon/chikorita.json | 10 +- entity/pokemon/chimchar.json | 8 +- entity/pokemon/chinchou.json | 10 +- entity/pokemon/cinderace.json | 8 +- entity/pokemon/clefable.json | 8 +- entity/pokemon/clefairy.json | 8 +- entity/pokemon/cleffa.json | 10 +- entity/pokemon/cloyster.json | 10 +- entity/pokemon/combusken.json | 8 +- entity/pokemon/corsola.json | 10 +- entity/pokemon/cosmog.json | 10 +- entity/pokemon/cradily.json | 12 +- entity/pokemon/cresselia.json | 10 +- entity/pokemon/crobat.json | 10 +- entity/pokemon/crocalor.json | 6 +- entity/pokemon/croconaw.json | 8 +- entity/pokemon/cyndaquil.json | 8 +- entity/pokemon/dartrix.json | 8 +- entity/pokemon/decidueye.json | 8 +- entity/pokemon/delibird.json | 10 +- entity/pokemon/delphox.json | 8 +- entity/pokemon/dewgong.json | 10 +- entity/pokemon/dewott.json | 8 +- entity/pokemon/dialga.json | 10 +- entity/pokemon/diglett.json | 10 +- entity/pokemon/ditto.json | 8 +- entity/pokemon/donphan.json | 10 +- entity/pokemon/dragonair.json | 10 +- entity/pokemon/dragonite.json | 10 +- entity/pokemon/dratini.json | 10 +- entity/pokemon/drizzile.json | 8 +- entity/pokemon/drowzee.json | 8 +- entity/pokemon/dugtrio.json | 10 +- entity/pokemon/eevee.json | 6 +- entity/pokemon/ekans.json | 8 +- entity/pokemon/electabuzz.json | 10 +- entity/pokemon/electivire.json | 6 +- entity/pokemon/electrode.json | 8 +- entity/pokemon/elekid.json | 10 +- entity/pokemon/emboar.json | 8 +- entity/pokemon/empoleon.json | 8 +- entity/pokemon/entei.json | 10 +- entity/pokemon/espeon.json | 10 +- entity/pokemon/exeggcute.json | 10 +- entity/pokemon/exeggutor.json | 10 +- entity/pokemon/farfetchd.json | 10 +- entity/pokemon/fennekin.json | 6 +- entity/pokemon/feraligatr.json | 8 +- entity/pokemon/flaaffy.json | 12 +- entity/pokemon/flareon.json | 10 +- entity/pokemon/floatzel.json | 10 +- entity/pokemon/floragato.json | 8 +- entity/pokemon/forretress.json | 10 +- entity/pokemon/fraxure.json | 10 +- entity/pokemon/froakie.json | 8 +- entity/pokemon/frogadier.json | 8 +- entity/pokemon/fuecoco.json | 8 +- entity/pokemon/furret.json | 12 +- entity/pokemon/gabite.json | 10 +- entity/pokemon/garchomp.json | 10 +- entity/pokemon/gardevoir.json | 8 +- entity/pokemon/gastly.json | 10 +- entity/pokemon/gastrodon.json | 6 +- entity/pokemon/gengar.json | 10 +- entity/pokemon/geodude.json | 10 +- entity/pokemon/gible.json | 10 +- entity/pokemon/girafarig.json | 10 +- entity/pokemon/giratina.json | 10 +- entity/pokemon/glaceon.json | 10 +- entity/pokemon/gligar.json | 10 +- entity/pokemon/gliscor.json | 6 +- entity/pokemon/gloom.json | 8 +- entity/pokemon/golbat.json | 8 +- entity/pokemon/goldeen.json | 10 +- entity/pokemon/golduck.json | 10 +- entity/pokemon/golem.json | 10 +- entity/pokemon/graveler.json | 10 +- entity/pokemon/greninja.json | 8 +- entity/pokemon/grookey.json | 8 +- entity/pokemon/grotle.json | 8 +- entity/pokemon/groudon.json | 10 +- entity/pokemon/grovyle.json | 8 +- entity/pokemon/growlithe.json | 10 +- entity/pokemon/gyarados.json | 8 +- entity/pokemon/haunter.json | 10 +- entity/pokemon/haxorus.json | 10 +- entity/pokemon/heracross.json | 10 +- entity/pokemon/hitmonchan.json | 8 +- entity/pokemon/hitmonlee.json | 10 +- entity/pokemon/hitmontop.json | 10 +- entity/pokemon/honchkrow.json | 10 +- entity/pokemon/hooh.json | 10 +- entity/pokemon/hoothoot.json | 10 +- entity/pokemon/hoppip.json | 10 +- entity/pokemon/horsea.json | 8 +- entity/pokemon/houndoom.json | 10 +- entity/pokemon/houndour.json | 10 +- entity/pokemon/hypno.json | 8 +- entity/pokemon/igglybuff.json | 10 +- entity/pokemon/incineroar.json | 8 +- entity/pokemon/infernape.json | 8 +- entity/pokemon/inteleon.json | 8 +- entity/pokemon/ironmoth.json | 6 +- entity/pokemon/ivysaur.json | 8 +- entity/pokemon/jigglypuff.json | 8 +- entity/pokemon/jirachi.json | 10 +- entity/pokemon/jolteon.json | 8 +- entity/pokemon/jumpluff.json | 10 +- entity/pokemon/jynx.json | 10 +- entity/pokemon/kabuto.json | 10 +- entity/pokemon/kabutops.json | 10 +- entity/pokemon/kadabra.json | 8 +- entity/pokemon/kakuna.json | 10 +- entity/pokemon/kangaskhan.json | 8 +- entity/pokemon/kingdra.json | 10 +- entity/pokemon/kingler.json | 8 +- entity/pokemon/kirlia.json | 8 +- entity/pokemon/koffing.json | 8 +- entity/pokemon/krabby.json | 10 +- entity/pokemon/kyogre.json | 10 +- entity/pokemon/lanturn.json | 8 +- entity/pokemon/lapras.json | 10 +- entity/pokemon/larvesta.json | 8 +- entity/pokemon/larvitar.json | 10 +- entity/pokemon/latias.json | 10 +- entity/pokemon/latios.json | 10 +- entity/pokemon/leafeon.json | 10 +- entity/pokemon/ledian.json | 10 +- entity/pokemon/ledyba.json | 10 +- entity/pokemon/lickitung.json | 8 +- entity/pokemon/lileep.json | 12 +- entity/pokemon/litten.json | 8 +- entity/pokemon/lucario.json | 10 +- entity/pokemon/lugia.json | 10 +- entity/pokemon/lunala.json | 10 +- entity/pokemon/luxio.json | 10 +- entity/pokemon/luxray.json | 10 +- entity/pokemon/machamp.json | 10 +- entity/pokemon/machoke.json | 10 +- entity/pokemon/machop.json | 10 +- entity/pokemon/magby.json | 10 +- entity/pokemon/magcargo.json | 10 +- entity/pokemon/magikarp.json | 10 +- entity/pokemon/magmar.json | 8 +- entity/pokemon/magmortar.json | 6 +- entity/pokemon/magnemite.json | 10 +- entity/pokemon/magneton.json | 10 +- entity/pokemon/magnezone.json | 10 +- entity/pokemon/mamoswine.json | 6 +- entity/pokemon/mankey.json | 8 +- entity/pokemon/mantine.json | 10 +- entity/pokemon/mantyke.json | 10 +- entity/pokemon/mareep.json | 12 +- entity/pokemon/marill.json | 8 +- entity/pokemon/marshtomp.json | 8 +- entity/pokemon/meganium.json | 10 +- entity/pokemon/meowscarada.json | 8 +- entity/pokemon/meowth.json | 10 +- entity/pokemon/mesprit.json | 10 +- entity/pokemon/metapod.json | 10 +- entity/pokemon/mew.json | 10 +- entity/pokemon/mewtwo.json | 10 +- entity/pokemon/miltank.json | 10 +- entity/pokemon/moltres.json | 10 +- entity/pokemon/monferno.json | 8 +- entity/pokemon/mrmime.json | 8 +- entity/pokemon/mudkip.json | 8 +- entity/pokemon/munchlax.json | 6 +- entity/pokemon/murkrow.json | 10 +- entity/pokemon/natu.json | 10 +- entity/pokemon/nidoking.json | 8 +- entity/pokemon/nidoqueen.json | 8 +- entity/pokemon/nidoranf.json | 8 +- entity/pokemon/nidoranm.json | 8 +- entity/pokemon/nidorina.json | 10 +- entity/pokemon/nidorino.json | 8 +- entity/pokemon/ninetales.json | 10 +- entity/pokemon/noctowl.json | 10 +- entity/pokemon/octillery.json | 10 +- entity/pokemon/oddish.json | 8 +- entity/pokemon/omanyte.json | 8 +- entity/pokemon/omastar.json | 8 +- entity/pokemon/onix.json | 8 +- entity/pokemon/oshawott.json | 8 +- entity/pokemon/palkia.json | 10 +- entity/pokemon/paras.json | 8 +- entity/pokemon/parasect.json | 8 +- entity/pokemon/persian.json | 10 +- entity/pokemon/petilil.json | 10 +- entity/pokemon/phanpy.json | 10 +- entity/pokemon/pichu.json | 10 +- entity/pokemon/pidgeot.json | 8 +- entity/pokemon/pidgeotto.json | 8 +- entity/pokemon/pidgey.json | 8 +- entity/pokemon/pignite.json | 8 +- entity/pokemon/pikachu.json | 8 +- entity/pokemon/piloswine.json | 10 +- entity/pokemon/pineco.json | 10 +- entity/pokemon/pinsir.json | 8 +- entity/pokemon/piplup.json | 8 +- entity/pokemon/politoed.json | 10 +- entity/pokemon/poliwag.json | 10 +- entity/pokemon/poliwhirl.json | 10 +- entity/pokemon/poliwrath.json | 10 +- entity/pokemon/popplio.json | 8 +- entity/pokemon/porygon.json | 8 +- entity/pokemon/porygon2.json | 10 +- entity/pokemon/porygonz.json | 10 +- entity/pokemon/primarina.json | 8 +- entity/pokemon/primeape.json | 6 +- entity/pokemon/prinplup.json | 8 +- entity/pokemon/psyduck.json | 10 +- entity/pokemon/pupitar.json | 10 +- entity/pokemon/quagsire.json | 10 +- entity/pokemon/quaquaval.json | 8 +- entity/pokemon/quaxly.json | 8 +- entity/pokemon/quaxwell.json | 8 +- entity/pokemon/quilava.json | 8 +- entity/pokemon/quilladin.json | 8 +- entity/pokemon/qwilfish.json | 10 +- entity/pokemon/raboot.json | 8 +- entity/pokemon/raichu.json | 10 +- entity/pokemon/raikou.json | 10 +- entity/pokemon/ralts.json | 6 +- entity/pokemon/rayquaza.json | 10 +- entity/pokemon/regice.json | 10 +- entity/pokemon/regigigas.json | 10 +- entity/pokemon/regirock.json | 10 +- entity/pokemon/registeel.json | 10 +- entity/pokemon/remoraid.json | 10 +- entity/pokemon/rillaboom.json | 8 +- entity/pokemon/riolu.json | 10 +- entity/pokemon/rowlet.json | 10 +- entity/pokemon/sableye.json | 10 +- entity/pokemon/samurott.json | 8 +- entity/pokemon/sandshrew.json | 8 +- entity/pokemon/sandslash.json | 8 +- entity/pokemon/sceptile.json | 8 +- entity/pokemon/scizor.json | 10 +- entity/pokemon/scorbunny.json | 8 +- entity/pokemon/scyther.json | 8 +- entity/pokemon/seadra.json | 8 +- entity/pokemon/seaking.json | 8 +- entity/pokemon/seel.json | 10 +- entity/pokemon/sentret.json | 12 +- entity/pokemon/serperior.json | 8 +- entity/pokemon/servine.json | 8 +- entity/pokemon/sewaddle.json | 10 +- entity/pokemon/shellder.json | 10 +- entity/pokemon/shinx.json | 10 +- entity/pokemon/shuckle.json | 6 +- entity/pokemon/skarmory.json | 10 +- entity/pokemon/skeledirge.json | 8 +- entity/pokemon/skiploom.json | 10 +- entity/pokemon/slitherwing.json | 8 +- entity/pokemon/slowbro.json | 10 +- entity/pokemon/slowking.json | 10 +- entity/pokemon/slowpoke.json | 10 +- entity/pokemon/slugma.json | 10 +- entity/pokemon/smeargle.json | 10 +- entity/pokemon/smoochum.json | 10 +- entity/pokemon/sneasel.json | 10 +- entity/pokemon/snivy.json | 8 +- entity/pokemon/snorlax.json | 8 +- entity/pokemon/sobble.json | 8 +- entity/pokemon/spinarak.json | 10 +- entity/pokemon/sprigatito.json | 8 +- entity/pokemon/squirtle.json | 10 +- entity/pokemon/stantler.json | 10 +- entity/pokemon/starmie.json | 10 +- entity/pokemon/staryu.json | 10 +- entity/pokemon/steelix.json | 10 +- entity/pokemon/sudowoodo.json | 10 +- entity/pokemon/suicune.json | 10 +- entity/pokemon/swadloon.json | 10 +- entity/pokemon/swampert.json | 8 +- entity/pokemon/swinub.json | 10 +- entity/pokemon/sylveon.json | 10 +- entity/pokemon/tangela.json | 8 +- entity/pokemon/tapukoko.json | 8 +- entity/pokemon/tauros.json | 8 +- entity/pokemon/teddiursa.json | 10 +- entity/pokemon/tentacool.json | 10 +- entity/pokemon/tentacruel.json | 10 +- entity/pokemon/tepig.json | 8 +- entity/pokemon/thwackey.json | 8 +- entity/pokemon/toedscool.json | 8 +- entity/pokemon/toedscruel.json | 8 +- entity/pokemon/togekiss.json | 6 +- entity/pokemon/togepi.json | 10 +- entity/pokemon/togetic.json | 10 +- entity/pokemon/torchic.json | 8 +- entity/pokemon/torracat.json | 8 +- entity/pokemon/torterra.json | 8 +- entity/pokemon/totodile.json | 8 +- entity/pokemon/treecko.json | 10 +- entity/pokemon/turtwig.json | 8 +- entity/pokemon/typhlosion.json | 8 +- entity/pokemon/tyranitar.json | 10 +- entity/pokemon/tyrogue.json | 10 +- entity/pokemon/tyrunt.json | 10 +- entity/pokemon/umbreon.json | 10 +- entity/pokemon/ursaring.json | 10 +- entity/pokemon/uxie.json | 10 +- entity/pokemon/vaporeon.json | 8 +- entity/pokemon/venomoth.json | 8 +- entity/pokemon/venonat.json | 8 +- entity/pokemon/venusaur.json | 8 +- entity/pokemon/vileplume.json | 8 +- entity/pokemon/volcarona.json | 8 +- entity/pokemon/voltorb.json | 8 +- entity/pokemon/vulpix.json | 8 +- entity/pokemon/wartortle.json | 10 +- entity/pokemon/weavile.json | 6 +- entity/pokemon/weedle.json | 10 +- entity/pokemon/weezing.json | 8 +- entity/pokemon/wigglytuff.json | 8 +- entity/pokemon/wooper.json | 10 +- entity/pokemon/xatu.json | 10 +- entity/pokemon/xurkitree.json | 10 +- entity/pokemon/zapdos.json | 10 +- entity/pokemon/zubat.json | 8 +- manifest.json | 8 +- models/entity/pokemon/flaaffy.geo.json | 395 ++------ models/entity/pokemon/mareep.geo.json | 398 ++++---- models/entity/pokemon/miltank.geo.json | 590 ++++++------ models/entity/pokemon/natu.geo.json | 119 ++- texts/en_US.lang | 2 +- .../pokemon/butterfree/shiny_butterfree.png | Bin 0 -> 3656 bytes textures/entity/pokemon/flaaffy/flaaffy.png | Bin 4399 -> 7136 bytes .../entity/pokemon/flaaffy/shiny_flaaffy.png | Bin 4254 -> 4861 bytes textures/entity/pokemon/mareep/mareep.png | Bin 9261 -> 3272 bytes .../entity/pokemon/mareep/mareep_shaved.png | Bin 0 -> 2703 bytes textures/entity/pokemon/mareep/nude.png | Bin 0 -> 2306 bytes .../entity/pokemon/mareep/shiny_mareep.png | Bin 9278 -> 3261 bytes .../pokemon/mareep/shiny_mareep_shaved.png | Bin 0 -> 2692 bytes textures/entity/pokemon/miltank/miltank.png | Bin 35056 -> 2015 bytes .../entity/pokemon/miltank/shiny_miltank.png | Bin 34874 -> 2416 bytes textures/entity/pokemon/natu/natu.png | Bin 1537 -> 898 bytes textures/entity/pokemon/natu/shiny_natu.png | Bin 1520 -> 878 bytes .../pikachu/detective_female_pikachu.png | Bin 3510 -> 3932 bytes .../pikachu/detective_male_pikachu.png | Bin 3470 -> 3833 bytes .../pokemon/quaquaval/shiny_quaquaval.png | Bin 0 -> 3997 bytes .../entity/pokemon/quaxly/shiny_quaxly.png | Bin 0 -> 2278 bytes .../pokemon/quaxwell/shiny_quaxwell.png | Bin 0 -> 2345 bytes ui/chest_server_form.json | 8 +- 750 files changed, 5575 insertions(+), 3290 deletions(-) create mode 100644 textures/entity/pokemon/butterfree/shiny_butterfree.png create mode 100644 textures/entity/pokemon/mareep/mareep_shaved.png create mode 100644 textures/entity/pokemon/mareep/nude.png create mode 100644 textures/entity/pokemon/mareep/shiny_mareep_shaved.png create mode 100644 textures/entity/pokemon/quaquaval/shiny_quaquaval.png create mode 100644 textures/entity/pokemon/quaxly/shiny_quaxly.png create mode 100644 textures/entity/pokemon/quaxwell/shiny_quaxwell.png 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 0000000000000000000000000000000000000000..a2cb908e7cb3dc2352bc7a26a9559c5cd5fac865 GIT binary patch literal 3656 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 literal 0 HcmV?d00001 diff --git a/textures/entity/pokemon/flaaffy/flaaffy.png b/textures/entity/pokemon/flaaffy/flaaffy.png index ef3ba51732b4b4b3333f42bdce491d8e0154416d..1654d922a2d33ed983264dad6b64e3c840e9960f 100644 GIT binary patch literal 7136 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

EvRNggs!TYlTT_((oOVE*gcMymMcgpfMC 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 literal 4254 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 B6E^?= diff --git a/textures/entity/pokemon/mareep/mareep.png b/textures/entity/pokemon/mareep/mareep.png index 99809afd72b9feb884b32cf46b5ff95cef8ee15e..e7d01992a8fcea2b177bbde6be2f5f8129e08661 100644 GIT binary patch literal 3272 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 diff --git a/textures/entity/pokemon/mareep/mareep_shaved.png b/textures/entity/pokemon/mareep/mareep_shaved.png new file mode 100644 index 0000000000000000000000000000000000000000..061289b1cad10571ae24ec4df9261fa7d65f66d7 GIT binary patch literal 2703 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 JPDHLkV1k089`67E literal 0 HcmV?d00001 diff --git a/textures/entity/pokemon/mareep/nude.png b/textures/entity/pokemon/mareep/nude.png new file mode 100644 index 0000000000000000000000000000000000000000..d6e7065abfcba246be206fc4f838e01b4bc4d966 GIT binary patch literal 2306 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 literal 9278 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 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 0000000000000000000000000000000000000000..1bf49f5f96d37198d53a77e07e1b72afea0db17e GIT binary patch literal 2692 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 literal 35056 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 Df!KyT diff --git a/textures/entity/pokemon/miltank/shiny_miltank.png b/textures/entity/pokemon/miltank/shiny_miltank.png index 77e9b846bf0c6b01ebb570ad15d6645b3be9631c..ca64e90903e8f51f9e8191d8b674a6874d4ee42a 100644 GIT binary patch literal 2416 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 Y3y-VeO%84fZvX%Q07*qoM6N<$g2ri~#sB~S literal 1537 zcmeH{SyPh-6oyYQVPYZ>z_1urL#9H6Qnf|N0zoj~$S$C40R^R^xBv}n`DBJg>Vj3V zqJ#>fAP_7RT1ZIJqJmHf2%?rHv|xrFd6T) z-X5RcoxgREO2Oah>j`?fB`1F~DUVLsYL#APchDY>r|gY=@_TODm{Q3s>%SrA(cEVK zXq9D7CW^R9Vdi9(lq-@+8OjcVE{i}P&dKUs8gWhEwZlyr{bKCa`4)xh`O3gd>Og|v zUzI71P9Jp{`$9HdF0;%K+~u2QIK}@MODbr|63Dy=gD7N*<3<*c@g}-Dl1nem5Sii| zXYq4~NDLa`jHi+;ODRJePl9uUg4-Z>s!0VK^NLV#yR#X-H|o%h>3C({z;KwKrL0)% zUqpS_Ni(jCY)pAem6UGh2oDVv1vrUL9h3gHD_Dq<2-VDALuz-sw~qD?#Tyrbx4sd? zlPAWQ+Lj1xQMb#mzSgdoHl`Jrf@&7~&Y8L1qCJ^{?RYT9FAaqR>vg6E*0T(wvUSr! z7en79+Xu6PqtA6>#w}T&ZRjzUbf-$YC|!v9&a#&3pK9UY#QurQ)fLmJs{^h za@w;D_X!zqh{U}SR3yxiwE?m35;lT!c}O1AI072!MbXWwRkjlPzGtN`xb<5g^4I=)0YG3mduV|KW8K!^qL1Q|v;TSg>`jZ8w^*{iCqA8t?=ZY&B^ z6HE`eDOM7IQiTjt;lZ{ezNxeH<^{q=@+y{+uO_I5$!0ex)npb9i za1)59v~J<>A>IL&<}0l&IlGTCNNI;Pq7N2-%~cBe)tXNIDxS;vQL%Y8@2k7Vf;c?u zu4OKEK<4_f453NyTV84NFE$oI^@Mly}xzF)k47GslM8E;0wf-@v79BH!yITwxgdUS{@h{#?j8D^9l=>17L zBkGIND&l5rB_dfvh&$LMDxzqrJ;hO|XERM2JfiVeU)PHBGh|io9oZ#MrPmUsaRDjV zQ?>*UZ5c{j>eEN5if*?iZ8Jb|d+Ystt2k8mWOBm`-ek0HMajnuufF3h&0@pB>5REd zSyv(_tB$@M3p~D!9|r6~tpZV!0pi0NKpu9J9U!eOcP9~w52Slyz(0&|PX~;sm#SfW z3itPZa6k0MkO=fB)-4=(*U>9u&lET~0BAB_r5^@_{xD?@8Y-V?MZ+2%Rc7Dz7do%C7neV-MGmMA`02pJ;bzSm2 zk9D@@$(|mAfPZ)f0Lbc|?(YEr*mE#Q*x+*n0L#wzlwO63EO?&B|V&!2B83kEI6GorfhgpMRj6`;Yk%mI_`(@ zzo4Ajpln+5kV=7IK;&Em@(<6HIyt!Pqt8w7mPsTleM>bgu50s!L`-;Y+ZlH`usAn+ugS-A*uA1H$gFxpU5-A&i=R86SN0*pMzkv>!g zr%gBQd=kL!5bR;p%Dc_-HBbRC(omEQCaaswck0+C9J|~dVW@&-11f`GljMv4ZWAO2 z?lwUSv&FTOJHT5eO}+UI##mH{n=ZwHj}_k|X<^3zYj~wjf%fvqp6Tp7-M9`$ba?>0 z6*-b`L_k&j>2&DEbzpfrP~BuxjxKmI=dw&_(QSfM$16`?7KVOGgrvH|Qu?yc(v&?~ z+z+uZ3+(O#Dt!_4f~m#Tf1IAOpf*NcNh2w6-Kfoq7jkS&MB)LPJt;aL35!vhWF|%y za2fAE8k7oI9}(rEM$)yCdXxe{&9YFlETvtl6UAB@_dJ~wgi(+qkal7Z{D1MEBwQq8BRUH7?(#=3=HUy_~I9{}4+2ZhbasK0eD zauxu`iE+)c&{zimnNCl+3*njNjko zaBLIYkG_sNK7@})p8*`DH}P)4gJTEaeu%{!`~Mq%07|9OgCRlu`Tzg`07*qoM6N<$ Eg5R*25&!@I literal 1520 zcmeH{`#01H7{=fEnyG1Aa%p5!8CzS+pptE@ahVA_h=y?)8!>faEURr-4U@rFc4}c8lRea`tj&wI{$&iljr!;|iNn4wG9 zLI40=PY*ZNTB0AouUqpw&c`~|0u#q#90Y0C)(HSyrl%V{AR%lzj~cVd4}{!mbCK8@ zmnJOa80`$)G^d3n8{G6y&(;^%tq`=`H(<5Xe*H8$fEf&S0mhj!3f59q~ec+DN8C@pYV`If;GZ+(SB6yg^q=yXfu z<0sAdBPj4IsIl0d?Zo`c##LfYhdCG4sp5{p>mJKh2f9 z)dsfB_Hv3tsHQqcb16J*&<5KcxMONc{s{ZLk_JzGtQwPSfM3n$%=bn)9|5~ZU6(3! z(Sg%<%&cL_mI%q3C*q&0id;fNJ@U2l68|tQm0L z*U*6Z(o*&c6%#L+(6Hr9U;QSC@)~pgWb>*+-Q-G6U||%_BY7dK{HwsEcxom1WR)MV zk$J0`H!AX=)Yz&c=z1$dZ4}FU9hG7mw_08JCdoU5493@4&}T%CX%&KB)0IPT3s5Wk z1DIVNRrMQ#HAW#U#G}WutB4TNx#JQ0`Dqa2Y-o)b_Z2~jjwpy%tGVF;4(8iy_Pi4mHM~=8=y#eowWv!95f@-Hf*HJcyy3ohTK}=s zL_W1ktv|ca@}@K3d<}A%GRK?d4@HooHQ%wZ{k-l4Q+mI2eX~0M_P_U9AM8(q!3n}} z0ML%VG$4ZGQF$Y(@agp2mG|38b5IA_7RHq{BGa8MNIGqv$5y zEd%uKgB_NTAU|hMgv?;R8xELk{SpKW$>P%gkAGZm=}yTpV-_TvmSwFKwO&N9XQYo0 YSgy_ZH9qJs{|_7RbU*ASJ;*utAK;vP^8f$< diff --git a/textures/entity/pokemon/pikachu/detective_female_pikachu.png b/textures/entity/pokemon/pikachu/detective_female_pikachu.png index defed97b05620ff2b5e0f27afea487e924a86272..d4e6971c9b86a93727620c05932b176352a07e4d 100644 GIT binary patch literal 3932 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 B{4f9j delta 3469 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 diff --git a/textures/entity/pokemon/quaquaval/shiny_quaquaval.png b/textures/entity/pokemon/quaquaval/shiny_quaquaval.png new file mode 100644 index 0000000000000000000000000000000000000000..0a05bd3bdec613ac60d30289429c5f192bc8561f GIT binary patch literal 3997 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 literal 0 HcmV?d00001 diff --git a/textures/entity/pokemon/quaxwell/shiny_quaxwell.png b/textures/entity/pokemon/quaxwell/shiny_quaxwell.png new file mode 100644 index 0000000000000000000000000000000000000000..8b3181e26f720b3770efc83533c4138fd079335f GIT binary patch literal 2345 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