diff --git a/.gitattributes b/.gitattributes index f811f6ae6a..ddb600fab2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ # are changed when only line endings change. src/generated/**/.cache/cache text eol=lf src/generated/**/*.json text eol=lf +CHANGELOG.md merge=union \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7f904d2da1..a800c00724 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,8 @@ build # other eclipse run +runClient +runServer # Files from Forge MDK forge*changelog.txt @@ -34,6 +36,7 @@ common/src/main/resources/assets/cobblemon/showdown */generated/resources/* /fabric/src/generated/resources/cobblemon-common.accesswidener /.ignored/ +common/.fabric # MacOS .DS_Store \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 761657babf..c069bd193d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,42 +1,178 @@ # Changelog -## [1.5.0](#1-5-0) + +## [1.5.3](#1-5-3) +### Fixes +- Scaled down Amaura's fetus model to avoid clipping through the tank while animating +- Added Polished Tumblestone and Tumblestone Brick block sets from Tumblestone, Black Tumblestone, and Sky Tumblestone. +- Fixed Cubone's cry not having a sound. +- Fixed the Seafloor spawning context not being a usable context. +- Fixed Pokemon spawning in non-full blocks like slabs. +- Fixed Gilded Chests not dropping the chest itself when broken, only the contents. +- Fixed Pokémon losing their Hidden Ability through evolution if the middle stage did not have a Hidden Ability. + +### Additions +- Added extra visuals to early berry growth stages + +### Added cries to the following Pokémon +- Timburr, Gurdurr, Conkeldurr +- Golett, Golurk + +### Changes +- Altered the item model for Medicinal Leeks and Roasted Leeks to be held like sticks and other rod items. +- Adjusted some berry balance values like yield and growth times +- Changes to mulch buffs/durations + +### Developer + +### Data Pack & Resource Pack Creators +- Added support for "shedders" similar to Shedinja's evolution logic. + +## [1.5.2 (May 27th, 2024)](#1-5-2) +### Fixes +- Fixed Wooloo and Dubwool dyeing making your game start dying. Only if you do it on a server. +- Fixed Gimmighoul causing PCs and parties to look glitched out, also only in a server. +- Fixed players being able to dye other people's sheep Pokémon. + +## [1.5.1 (May 27th, 2024)](#1-5-1) + +### Additions +- Added unique send out particles for Cherish, Dream, Beast, and Ancient Origin balls. +- Made Wooloo and Dubwool dye-able like sheep. So cute! +- Added stat up and down particles. +- Most status effects now have particles! These include: Paralysis, Poison, Sleep, Confusion, Infatuation. +#### Move Particle Effects +- Confusion +- Cotton Guard +- Growl +- Ice Punch +- Fire Punch +- Thunder Punch +- Minimize +- Quick Attack +- Protect +- Swords Dance +- Sand Attack +- Poison Powder +- Sleep Powder +- Stun Spore +- Powder +- Rage Powder +- Spore +- Thunder Wave + +### Changes +- Sounds for Relic Coin Sacks have been correctly renamed. Relic Coin Pouches received new sounds for breaking and placing. +- Readjusted Petilil portraits so they fit a bit better. +- Improved handling of Pokémon taken from the Restoration Tank block to be a bit more stable. +- Made Mulch cheaper to craft. + +### Fixes +- Fixed a bug in which adding organic material to the restoration tank via right click was adding the full count of the stack currently in hand - but only taking 1 of the item. +- Fixed a niche issue where some properties of entities were not initialized correctly, causing Pokémon that appeared to be level 1 until you battle them. +- Fixed Fossilized Drake being missing from the Fossils item tag. +- Fixed Gilded Chest block entity not being cleared on block break, creating spooky ghost blocks. Old ones can be fixed by placing something like a furnace where it was, then breaking the furnace. +- Fixed sherd brokenness on Forge. +- Fixed Supplementaries incompatibility. +- Fixed Fossil Compartment crash with Jade / WAILA forks. +- Fixed pasture block PC lookups when the player is offline. +- Fixed an untranslated battle message that occurs when using a move that just ran out of PP (e.g. Fire Blast that just got spited mid-turn). +- Fixed held items being eaten even when the held item evolutions are already unlocked. +- Fixed Hisuian Decidueye not being Grass/Fighting. +- Fixed both Decidueye forms learning both Triple Arrows and Spirit Shackle. +- Fixed Pineco being unable to evolve into Shulker Forretress. +- Fixed Kabutops T-posing when underwater. It doesn't have proper swimming animations yet, though. +- Fixed Pidgey's missing walk animation. +- Fixed Cyndaquil's hidden flames clipping if it was swimming. +- Fixed Chimecho and Chingling being unable to spawn near bells. They are meant to! +- Fixed Tyrantrum and Wailord Party Overlay models peeking through the chat box. It was kinda funny though. +- Fixed hitbox sizes for Seedot, Nuzleaf, and Shiftry. +- Fixed Budew and Lechonk sliding if they walked for too long. +- Fixed Shedinja T-posing in battle. +- Fixed recoil evolution condition not working, making things like Basculegion unobtainable. +- Fixed issue where poser debug tools didn't work on JSON posers. +- Fixed issue where gilded chests don't close when going far away. +- Fixed issue where the restoration tank's renderer was reading old data, making it appear wrong. +- Fixed issue where the lights on the restoration tank would not animate if it was facing east. Very specific. +- Fixed client crash with the fossil machine when updating block state on a chunk that is unloaded in the client. I don't understand this but the devs are sure that all of those are real words. +- Fixed Restoration Tank crash with Create upon the tank block's destruction. +- Fixed Restoration Tank over consuming items when interacting with Create blocks. +- Fixed addons that add very many moves to a learn-set causing disappearing Pokémon (visually) issues on servers. +- Fixed Hyper Cutter and Big Pecks incorrectly stating that it prevented accuracy from being lowered in battle. +- Fixed missing messages for Rough Skin and Iron Barbs in battle. +- Fixed a bug where sometimes Pokémon sendouts wouldn't create an entity, or the entity would spawn at 0 0 0 which is not a good place for a Pokémon to be. Or any of us, really. +- Fixed issue in which a locked gilded chest would animate to the open state when the client fails to open it, such as when it is locked. +- Fixed a bug where aspects of a form would not be properly reflected on form changes (eg. Normal -> Hisui). +- Fixed generic battle effect sounds not sounding the way they were intended to. +- Fixed particle effects often not having access to some specific entity functions from MoLang. +- Fixed particles sometimes lasting a single tick too long, causing (very quick) visual glitches. +- Fixed particle rotations being inverted. +- Fixed particle events not spawning at the instigating particle's location. +- Fixed a bunch of spam during world generation. +- Fixed a bug in which throwing a Poké Ball at a player owned Pokémon with the ability Illusion would reveal its true species. Hilarious meta strategy. +- Fixed root-part animations not working for JSON posed Pokémon. You didn't notice this but if we didn't fix this in this update then if you use Quick Attack a lot you'd have seen a whole lot of [this](https://cdn.discordapp.com/attachments/1076993968803434627/1242660506783715369/Minecraft__1.20.1_-_Singleplayer_2024-05-21_22-08-17.mp4?ex=66549408&is=66534288&hm=ff95ee293eb15634fd63e6546534ea279540a1c892605e8d561593ca2c5600c5&) which is damn funny but very unintended. + +### Developer +- Changed SpawnAction#complete to return a nullable generic R (the spawn action result) instead of a boolean. Provides more information this way. +- Added an event that fires when a fossil is revived, with or without a player. +- Added IVS and EVS property extractors. +- Fixed PCStore#resize not allowing PC boxes size reduction. + +### Data Pack & Resource Pack Creators +- Added support for MoLang conditions for quirks and poses. +- Changed the AttackDefenceRatio requirement to StatCompare and StatEqual. There is some backwards compatibility for AttackDefenceRatio, though. +- Changed "dimensions" spawn condition to check with dimension IDs instead of effects, so custom dimension IDs can be used. +- Added parametric motion and rotation support to particle effects. +- Added entity_scale as a molang var for particles (likely only applicable to Pokemon) +- Added support for primary quirk animations using the following format: +```JSON +{ + "quirks": [ + "q.bedrock_primary_quirk('', '', , , , '', q.curve(''))" + ] +} +``` + +### Localization +- Updated translations for: + - Simplified and Traditional Chinese. + - Spanish. + +## [1.5.0 - The Ruins and Revival Update (May 12th, 2024)](#1-5-0) +#### "You're telling me that Mojang has added archaeology to the game? Hmm... that gives me an idea." ### Additions - Added 17 ruin structures, where you can find Pokémon-themed Armor Trims and Pottery Sherds, Tumblestones, and more. -- Added 22 fossil structures, where you can brush Suspicious Sand/Gravel for Fossils. -- Added the Data Monitor, Fossil Compartment, and Restoration Tank. Placed in the correct formation, you can use these to create a Restoration Machine where you can bring fossils back to life. -- Added 3 variants of Tumblestones, which can be planted near Lava or Magma to grow harvestable Tumblestone Clusters. +- Added 23 fossil structures, where you can brush Suspicious Sand/Gravel for [Fossils](https://wiki.cobblemon.com/index.php/Fossil). You can add [custom fossils using datapacks](https://wiki.cobblemon.com/index.php/Fossils_File). +- Added the Data Monitor, Fossil Compartment, and Restoration Tank blocks. Placed in the correct formation, you can use these to create a [Restoration Machine](https://wiki.cobblemon.com/index.php/Resurrection_Machine) where you can bring fossils back to life. Use organic material to fill the tank first! +- Added 3 variants of [Tumblestone](https://wiki.cobblemon.com/index.php/Tumblestone), which can be planted near Lava or Magma to grow harvestable Tumblestone Clusters. - Added Tumblestone Blocks, a storage block crafted from 9 Tumblestones. - Added Ancient Poké Balls, which are aesthetic variants crafted from Tumblestones. - Added the Ancient Feather, Wing, and Jet Balls, which fly further than regular Poké Balls. - Added the Ancient Heavy, Leaden, and Gigaton Balls, which are heavier and don't fly as far as regular Poké Balls. These will receive more functionality in a future update. -- Added Original Trainer functionality. To edit the OT through commands, you must specify originaltrainertype=, and originaltrainer= +- Added visual effects for many Poké Balls when sending out or capturing Pokémon. +- Added a new send-out ball toss animation that showcases the ball used for the Pokémon. +- Added simple move animations for Pokémon in battle with a proof of concept (Flamethrower) for more complicated animations. More and more specific animations will come in future updates. +- Added Original Trainer to the summary menu. To edit the OT through commands, you must specify originaltrainertype=, and originaltrainer= - Added support for planting Apricorn trees, berries, and mints in [Botany Pots](https://modrinth.com/mod/botany-pots) - Added the hidden "True Vivillionaire" advancement. -- The "Poké Ball" Vivillon variant is now obtainable by evolving a Spewpa after obtaining the "Aspiring Vivillionaire" advancement. -- Added dynamic lighting support for any Species or Forms when using [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) or [Dynamic Lights Reforged](https://www.curseforge.com/minecraft/mc-mods/dynamiclights-reforged), at this time we don't ship with any defaults for this feature but addon creators can make use of this feature. -- Added a Display Case block! Use it to display your archaeological findings, or other items. -- Added 6 Pokémon-themed Pottery Sherds, obtained from ruin structures. +- Added the [Display Case](https://wiki.cobblemon.com/index.php/Display_Case) block. Use it to display your archaeological findings, Poké Balls, or other items. +- Added 6 Pokémon-themed Pottery Sherds, obtained from ruin structures. Sherds... sh-erds. Weird word. - Added a Pokémon-themed armor trim, obtained from ruin structures. -- You can now find Nether Fire Stone Ore in, surprisingly, the Nether. -- You'll also find Terracotta Sun Stone Ore in Badlands biomes. -- Added effects for many Poké Balls when sending out Pokémon or capturing. -- Added a new send-out ball toss animation that showcases the ball used for the Pokémon. -- Added simple move animations for Pokémon in battle with a proof of concept for more complicated animations. +- Added Nether Fire Stone Ore to, surprisingly, the Nether. +- Added Terracotta Sun Stone Ore to Badlands biomes. - Added the EV Boosting Feathers. -- Added various new tags for searchability and better compatibility. -- Added the [Ability Capsule](https://bulbapedia.bulbagarden.net/wiki/Ability_Capsule) and [Patch](https://bulbapedia.bulbagarden.net/wiki/Ability_Patch), these have no acquisition method for now and only work as intended with the traditional ability format of 1 to 2 common abilities and 1 hidden ability. -- Added Gilded Chests, available in all Apricorn colors. -- Added Relic Coins, Relic Coin Pouches, and Relic Coin Sacks. -- Added Type Gems. These items hold no functionality for now. Start collecting though... -- Added cries to Meowth, Alolan Meowth, Galaraian Meowth, -- Completed the advancement for placing a Tumblestone near Lava or Magma to make it grow. +- Added [Gilded Chests](https://wiki.cobblemon.com/index.php/Gilded_Chest), available in all Apricorn colors. +- Added Relic Coins, Relic Coin Pouches, and Relic Coin Sacks. Gimmighoul might be interested in these. +- Added Type Gems. These will have additional uses later, so you should start collecting them. - Added new held items: Ability Shield, Absorb Bulb, Air Balloon, Binding Band, Blunder Policy, Cell Battery, Covert Cloak, Damp Rock, Eject Button, Eviolite, Expert Belt, Float Stone, Focus Sash, Heat Rock, Icy Rock, Iron Ball, Light Ball, Loaded Dice, Red Card, Shell Bell, Sticky Barb, Smooth Rock, Soothe Bell and Weakness Policy. -- Added Hisui starters to the starter selection menu. -- Added bubble quirk to Krabby that only play during clear sunset's. +- Added Hisui starters to the starter selection menu. They come inside of ancient Poké Balls. +- Added a bubble quirk to Krabby that only plays during clear sunsets. It looks familiar... - Added forfeit option to PVP battles. - Added visual changes for entities affected by Illusion, Imposter, or Transform in battle. - Added shoulder mounting for Squirtle, Ralts, Roggenrola, Charcadet, Sizzlipede, Litwick, Cutiefly, Flabebe, Flittle, and Scatterbug +- Added species data for Hydrapple, Iron Boulder, Iron Crown, Pecharunt, Raging Bolt, and Terapagos +- Added various new tags for search-ability and better mod compatibility. +- Added the [Ability Capsule](https://bulbapedia.bulbagarden.net/wiki/Ability_Capsule) and [Patch](https://bulbapedia.bulbagarden.net/wiki/Ability_Patch). These have no way of getting them (for now) and only work as intended with the traditional ability format of 1 to 2 common abilities and 1 hidden ability. ### Pokémon Added #### Gen 2 @@ -167,7 +303,7 @@ #### Gen 9 - Gimmighoul - Using Relic Coins, you can increase Gimmighoul's Coin Stash. Upon reaching 999, it can be evolved into Gholdengo. - - Additionally, if you give Gimmighoul a Netherite Scrap, you can increase its Netherite Stash. Who knows what might happen if it fills up? + - Additionally, if you give Gimmighoul a Netherite Scrap, you can increase its Netherite Stash. But what will that do to when you evolve it? - Gholdengo #### Cobblemon Exclusives @@ -180,6 +316,8 @@ - Hisui Bias Goomy - Hisui Bias Petilil +These are our compromise for having both regular and Hisuian forms of these Pokémon in the game. Hisui Biased variations will evolve into the Hisuian evolutions under most conditions. They are otherwise purely cosmetic differences. + ### Added cries to the following Pokémon - Alolan Raticate - Vulpix, Ninetales @@ -245,82 +383,86 @@ ### Changes -- Alolan Pikachu and Exeggcute changed to Alola bias. +- Alolan Pikachu and Exeggcute changed to Alola Bias. - Pokémon now transition more smoothly between different poses. -- Updated models for Mimikyu, Alcremie, Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Pidgeot, Omanyte, Omastar, Growlithe, Arcanine, Nidoran Male, Nidoran Female, Lapras, Swinub, Piloswine, Basculin, Rowlet, Dartrix, Decidueye, Kabuto, Kabutops, Piplup, Prinplup, Elekid, Electabuzz, Cubone, Marowak, Paras, Mawile, Drifloon, Drifblim, Venonat, Venomoth, Yanma, Yanmega, Psyduck, Dusknoir, Diglett, Dugtrio, Natu, Xatu, Oshawott, Samurott, Torchic, Grovyle, Sceptile, Sizzlipede, and Raboot. +- Updated models for Mimikyu, Alcremie, Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Pidgeot, Omanyte, Omastar, Growlithe, Arcanine, Nidoran Male, Nidoran Female, Lapras, Swinub, Piloswine, Basculin, Rowlet, Dartrix, Decidueye, Kabuto, Kabutops, Piplup, Prinplup, Elekid, Electabuzz, Cubone, Marowak, Paras, Mawile, Drifloon, Drifblim, Venonat, Venomoth, Yanma, Yanmega, Psyduck, Dusknoir, Diglett, Dugtrio, Natu, Xatu, Oshawott, Samurott, Torchic, Grovyle, Sceptile, Sizzlipede, Mismagius, and Raboot. - Updated animations for Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Diglett, Dugtrio, Magikarp, Dragonite, Omanyte, Omastar, Kabuto, Pinsir, Chinchou, Lanturn, Ralts, Kirlia, Gardevoir, Gallade, Buizel, Garchomp, Pumpkaboo, Falinks, Lechonk, Litwick, Lampent, Chandelure, Carnivine, Galarian Meowth, Galarian Rapidash, Venonat, Venomoth, Phanphy, Donphan, Dratini, Dragonair, Happiny, Chansey, Blissey, Volbeat, Illumise, Numel, Sizzlipede, Centiskorch, Obstagoon, Timburr, Gurdurr, Conkeldurr, Drifloon, and Drifblim. +- Resized Drifloon. - Added more held items to the held item tag, and Metal Coat to the held item tab. - Added all ores to the modloader ore tags, and added tags for each ore type to the mod (both blocks and items). -- Changed the Destiny Knot to be crafted with a Ghast Tear, rather than a diamond. -- You can now punch grown apricorns to harvest them. +- Changed the Destiny Knot to be crafted with a Ghast Tear rather than a diamond. We have big plans for the Destiny Knot... +- You can now punch grown apricorns to harvest them. We saw so many content creators breaking apricorns with their fists that it was making us die inside. +- The "Poké Ball" Vivillon variant is now obtainable by evolving a Spewpa after obtaining the "Aspiring Vivillionaire" advancement. - Renamed the "Vivillionaire" advancement to "Aspiring Vivillionaire" - Removed the Inferno, Forsaken, Poké Ball, and Void patterns from the Aspiring Vivillionaire advancement. -- Updated movesets to add Gen 9 DLC moves. +- Updated the biome tags for Spewpa's evolutions into the various Vivillon patterns. You should mostly be getting one evolution option at a time now. - Apricorn Sprouts can now be planted directly on Apricorn leaves to create a new Apricorn of the same color. - Added tooltips to interaction GUIs to make it clearer what they do. -- Poké Ball recipes now use tags for their center ingredient, rather than specificied Copper Ingot, Iron Ingot, Gold Ingot, and Diamond, allowing for further datapack customisation. -- Starter Toast now closes once corresponding button is pressed once. -- Moved some items in the vanilla Food & Drinks category. +- Poké Ball recipes now use tags for their center ingredient, rather than specifically Copper Ingots, Iron Ingots, Gold Ingots, and Diamonds, allowing for further datapack customisation and mod compatibility. +- Starter Toast now closes once the corresponding button is pressed once. +- Moved some items into the vanilla Food & Drinks category. - Stacked Cobblemon Potion Bases can now be quick moved into Brewing Stands. -- Changed Healer recipe to swap the Max Revive for a Revive. -- Upped the rate that Gastly drop Ghast Tears from 2.5% to 5%. +- Changed the Healing Machine recipe to swap the Max Revive for a Revive so that it is a bit easier to craft. +- Upped the rate that Gastly drop Ghast Tears from 2.5% to 5%, further helping the crafting of a Healing Machine. - Pokémon with a low Blaze Powder drop chance now drop it more frequently in the Nether. - Reorganised a few advancements. - Pokémon entity shadows now scale when the Pokémon is being sent out or recalled. - Remade Torkoal particles, now they only appear when in battle. -- Updated shiny icon within summary and PC interfaces. -- Changed the Poison Barb sprite so that it doesn't look like a sword when held. -- Moon Stone ore generates more frequently in Taigas and has been added to Magical and Spooky biomes. +- Improved the shiny icon within summary and PC interfaces. +- Changed the Poison Barb sprite so that it doesn't look like a sword when held. It's a Poison Barb, not a Poison Sword. Wait, that gives me an idea. +- Moon Stone ore generates more frequently in Taigas and has been added to Magical and Spooky biomes. Ooo... Sorry. - Density, Season, and Nether biome tags have been moved and renamed within the biome tags directory. -- Added particles to Lucario when in battle. +- Added particles to Lucario when in battle. Lucario is special. +- Movesets updated for Blueberry DLC. ### Fixes -- Resized Snorlax -- Re-added the recipe for the Iron Vitamin. -- Cleaned up empty evolutions declaration in species files (no, I'm not listing all 169 by name). +- Re-added the recipe for the Iron vitamin. Well, technically it's a mineral. - Fixed Exeggcute and Pikachu not being able to evolve. -- Fixed battle lang for Poison Touch Ability -- Fixed Cubone not being able to evolve into Alolan Marowak. +- Fixed evolution priority for Exeggcute and Pikachu regional evolutions. Using a thunder stone on Kantonian Pikachu on the beach will give Alolan Raichu. A second thunder stone would then give Kantonian Raichu. +- Fixed battle text for the Poison Touch Ability. +- Finally found Sudowoodo and Bonsly. They were missing spawn data. Same with Drifloon and Litwick. Uh... sorry about that. - Fixed Squawkabilly forms not being recognized. -- Fixed the bounce animation for Poké Balls being delayed by like, a full second. -- Note blocks now play the correct sound on the Apricorn Plank based blocks. +- Fixed the bounce animation for Poké Balls being delayed by like, a full second. It's enough to drive you mad. +- Note blocks now play the correct sound on the Apricorn Plank-based blocks. - Fixed an issue with transformed parts in posers causing whacky positional issues. -- Fixed Poké Balls freezing in an open state if you look away when it's meant to close. -- Adds a translation string name to the Empty Pokeball entity. -- Fixed very many issues with Bedrock particle effects. -- Fixed Arbok patterns not being as specific in spawning as they were intended. +- Fixed Poké Balls freezing in an open state if you're looking away at the moment that it's meant to close. This actually fixes some other things but it's hard to explain. +- Fixed thrown Poké Balls technically having no name. +- Fixed very many issues with Bedrock particle effects. There are probably many more. Life goes on. +- Fixed Arbok patterns not being as specific in spawning as they were intended to be. - Fixed Pokémon not avoiding danger at all when pathfinding. - Fixed Pokémon pathing over snow layers and carpets. -- Fixed Sobble line not being able to swim or breathe underwater. -- Fixed incompatibility with [Just Enough Resources](https://modrinth.com/mod/just-enough-resources-jer). -- Fixed incompatibility with [Visual Overhaul](https://modrinth.com/mod/visual-overhaul). -- Fixed an issue that allowed Pokemon to spawn on rails. +- Fixed the Sobble line not being able to swim or breathe underwater. +- Fixed mod incompatibility with [Just Enough Resources](https://modrinth.com/mod/just-enough-resources-jer). +- Fixed mod incompatibility with [Visual Overhaul](https://modrinth.com/mod/visual-overhaul). +- Fixed an issue that allowed Pokémon to spawn on rails. - Fixed the data set on Pokémon when abilities are given via properties such as in ``/spawnpokemon``. -- Fixed sometimes Pokémon losing hidden abilities when evolving, this fix will only take effect to newly created Pokémon. -- Fixed capture messages not displaying. -- Fixed illusion ability causing the wrong Pokémon to be targeted in battle. -- Battles starting with fainted party members no longer cause a softlock on defeat. -- Fixed some issues with eyes in the faint animations for Hitmonlee and Phantump +- Fixed Pokémon sometimes losing hidden abilities when evolving. This fix will only take effect for newly created Pokémon because of technical reasons that were explained to me but which I then forgot. +- Fixed capture messages not displaying in battle. +- Fixed the Illusion ability causing the wrong Pokémon to be targeted in battle. +- Fixed battles started with fainted party members causing a soft-lock on defeat. +- Fixed some issues with eyes in the faint animations of Hitmonlee and Phantump +- Fixed missing evolution moves, for example Stone Axe for Kleavor. +- Cleaned up empty evolutions declaration in species data (And no, I'm not listing all 169. No I don't care what you pay me, I'm not doing it). +- Fixed non-consumable held items being consumed or swapped in battle permanently. ### Developer -- Significantly changed the way properties in PokemonEntity work. This could break some plugins (not in a big way, but changes will be needed). -- Rebuilt the scheduling API to more clearly force side choices and temporal frames of reference for tasks. -- Added dialogue API and data registry. +- Significantly changed the way the properties in PokemonEntity work. This could break some plugins (not in a big way, but changes will be needed for some things). +- Rebuilt the scheduling API to more clearly force side choices and temporal frames of reference for tasks. The developers say that how it works is cool but I stopped listening. +- Added dialogue API and data registry. This is powerful, and there is a full example in the Cobblemon mod you can trigger using /opendialogue \ cobblemon:example. The example JSON is inside the data folder of the mod. - Opened up the ItemDropEntry class to allow for it to be extended. - Added a new "advancement" evolution variant that takes an advancement identifier and succeeds if the player has the advancement. -- Made spawning API capable of non-entity spawning -- Made PokemonProperties.parse more interoperable with Java. +- Made the spawning API capable of non-entity spawning. You can make it 'spawn' commands if you want. Go nuts. +- Made PokemonProperties.parse more interoperable with Java. Save yourself and stop using Java. - Added the ``HeldItemEvent``, this comes with 2 implementation ``HeldItemEvent.Pre`` and ``HeldItemEvent.Post``. -- API to support dynamic lighting in any mod that implements this feature has been added to all Species & Forms, see LightingData class for details. -- Added a Mixin for the BrewingStandScreenHandler to fix the incorrect handling of quickMove in Fabric. - Corrections to the ability implementation have been made that make ``Ability.forced`` function as intended and never reroll an ability for a Pokémon, please check your implementations to ensure the corrected behavior is intended for your use case. -- ``Pokemon.ability`` no longer has a public setter, please migrate to using ``Pokemon#updateAbility``, this handles the ability coordinate storage for you when necessary. +- ``Pokemon.ability`` no longer has a public setter. Please migrate to using ``Pokemon#updateAbility``, this handles the ability coordinate storage for you when necessary. - ``Ability.forced``, ``Ability.index`` and ``Ability.priority`` have all had their setters internalized, there is no longer any need to manually adjust these migrate to the method mentioned above to handle that process for you. -- ``AbilityChanger`` has been added to API alongside some implementations, this is subject to change as the ability capsule and patch currently only expect the traditional behaviour in the Pokémon games of 1 to 2 regular abilities and 1 hidden. -- ``Pokemon#rollAbility`` has been added, this rerolls a legal ability for the Pokémon. -- `docs/cobblemon-tags` tags and spawn-presets can now be auto-generated from the current tags in the cobblemon mod with the `generateSpawnPresetList.py` and `generateTagList.py` scripts. +- ``AbilityChanger`` has been added to API alongside some implementations, this is subject to change as the ability capsule and patch currently only expect the traditional behaviour in the Pokémon games of 1 or 2 regular abilities and 1 hidden ability. +- ``Pokemon#rollAbility`` has been added which rerolls for a legal ability for the Pokémon. +- `docs/cobblemon-tags` tags and spawn-presets can now be auto-generated from the current tags in the Cobblemon mod with the `generateSpawnPresetList.py` and `generateTagList.py` scripts. - `public_spawns_to_json.py` script has been added to give the powerful spawn.json generator a simplistic UI. -- Updated Showdown with Gen 9 DLC. +- Updated Showdown with Gen 9 DLC. +- Changed mixins to be Java 17 for compatibility level instead of 16, removing a warning from startup logs. ### Datapack & Resourcepack Creators - The maximum amount of fossils that can fit in the Fossil Analyzer can be adjusted in the config. @@ -490,6 +632,7 @@ Thank you so much to all of our community translators that bring the mod to the rest of the world! ## [1.4.0 - The Friends and Farms Update (October 13th, 2023)](#1-4-0) +#### "No, we don't provide the friends." ### Additions - Added pasture blocks, used to let your PC Pokémon roam around an area. - Added nicknaming from the summary menu of a Pokémon (click their name). @@ -1030,6 +1173,7 @@ Thank you so much to all of our community translators that bring the mod to the - All the translators that contributed are amazing. ## [1.3.0 - The Foundation Update (March 17th, 2023)](#1-3-0) +#### "Now we can start doing the really cool stuff." ### Dependencies - Upgraded Fabric API dependence to 0.75.1+1.19.2 @@ -1179,6 +1323,7 @@ Thank you so much to all of our community translators that bring the mod to the - Thank you to all of the fantastic volunteer translators for taking the time to help with this! ## [1.2.0 - The Customization Update (January 1st, 2023)](#1-2-0) +#### "There are going to be so many fakemon..." ### Additions - Added models for Natu and Xatu, Murkrow and Honchkrow, Wailmer and Wailord. - Added new PC interface and it is beautiful. @@ -1292,4 +1437,4 @@ Thank you so much to all of our community translators that bring the mod to the - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`. ## [1.0.0 (November 12th, 2022)](#1-0-0) -- Initial release. \ No newline at end of file +- Initial release. diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts deleted file mode 100644 index e2a582bac4..0000000000 --- a/build-logic/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -import ca.stellardrift.build.configurate.ConfigFormats -import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension - -plugins { - id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1" -} - -extensions.configure { - from(ConfigFormats.YAML, file("../gradle/libs.versions.yml")) -} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/cobblemon.platform-conventions.gradle.kts b/build-logic/src/main/kotlin/cobblemon.platform-conventions.gradle.kts deleted file mode 100644 index c0b0576e53..0000000000 --- a/build-logic/src/main/kotlin/cobblemon.platform-conventions.gradle.kts +++ /dev/null @@ -1,32 +0,0 @@ -plugins { - id("cobblemon.base-conventions") - id("com.github.johnrengelman.shadow") -} - -val bundle: Configuration by configurations.creating { - isCanBeConsumed = false - isCanBeResolved = true -} - -tasks { - - jar { - archiveBaseName.set("Cobblemon-${project.name}") - archiveClassifier.set("dev-slim") - } - - shadowJar { - archiveClassifier.set("dev-shadow") - archiveBaseName.set("Cobblemon-${project.name}") - configurations = listOf(bundle) - mergeServiceFiles() - } - - remapJar { - dependsOn(shadowJar) - inputFile.set(shadowJar.flatMap { it.archiveFile }) - archiveBaseName.set("Cobblemon-${project.name}") - archiveVersion.set("${rootProject.version}") - } - -} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/cobblemon.root-conventions.gradle.kts b/build-logic/src/main/kotlin/cobblemon.root-conventions.gradle.kts deleted file mode 100644 index b0e1062667..0000000000 --- a/build-logic/src/main/kotlin/cobblemon.root-conventions.gradle.kts +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - `java-library` -} - -tasks { - val collectJars by registering(Copy::class) { - val tasks = subprojects.filter { it.path != ":common" }.map { it.tasks.named("remapJar") } - dependsOn(tasks) - - from(tasks) - into(buildDir.resolve("libs")) - } - - assemble { - dependsOn(collectJars) - } -} - -tasks.withType { - useJUnitPlatform() -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 1c8f4f1f36..2b15023914 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,12 @@ plugins { - base id("cobblemon.root-conventions") id ("net.nemerosa.versioning") version "2.8.2" } -group = "com.cobblemon.mod" version = "${project.property("mod_version")}+${project.property("mc_version")}" val isSnapshot = project.property("snapshot")?.equals("true") ?: false if (isSnapshot) { - version = "$version-${versioning.info.branch}-${versioning.info.build}" + val fixedBranchName = versioning.info.branch.substringAfter("/") + version = "$version-${fixedBranchName}-${versioning.info.build}" } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 190d12119b..83f9c56a1f 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,5 +1,5 @@ -import extensions.isSnapshot -import extensions.version +import utilities.isSnapshot +import utilities.version import java.time.OffsetDateTime import java.time.ZoneOffset import java.time.format.DateTimeFormatter @@ -20,7 +20,7 @@ plugins { id("net.kyori.blossom") id("org.jetbrains.gradle.plugin.idea-ext") - id ("net.nemerosa.versioning") version "2.8.2" + id("net.nemerosa.versioning") version "2.8.2" } architectury { @@ -35,29 +35,26 @@ repositories { } dependencies { - implementation(libs.stdlib) - implementation(libs.reflect) - - modImplementation(libs.fabricLoader) - //Flywheel has no common dep so just pick one and don't use any platform specific code in common - //modCompileOnly(libs.flywheelFabric) + implementation(libs.bundles.kotlin) + modImplementation(libs.fabric.loader) modApi(libs.molang) - //modCompileOnly(libs.lambDynamicLights) { isTransitive = false } - // For Showdown + // Integrations + compileOnlyApi(libs.jei.api) + modCompileOnly(libs.bundles.fabric.integrations.compileOnly) { + isTransitive = false + } + // Flywheel has no common dep so just pick one and don't use any platform specific code in common + // modCompileOnly(libs.flywheelFabric) + + // Showdown modCompileOnly(libs.graal) - //shadowCommon group: 'commons-io', name: 'commons-io', version: '2.6' + // Data Storage + modCompileOnly(libs.bundles.mongo) - // For datastore - modCompileOnly(libs.mongoDriverCore) - modCompileOnly(libs.mongoDriverSync) - - testImplementation(libs.fabricJunit) - testImplementation(libs.junitParams) - testImplementation(libs.mockito) - testImplementation(libs.mockk) - testImplementation(libs.classgraph) + // Unit Testing + testImplementation(libs.bundles.unitTesting) } tasks.withType { @@ -93,7 +90,6 @@ sourceSets { property("gitCommit", versioning.info.commit) property("branch", versioning.info.branch) System.getProperty("buildNumber")?.let { property("buildNumber", it) } - property("timestamp", OffsetDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("MM/dd/yyyy hh:mm:ss")) + " UTC") } } } diff --git a/common/src/main/java/com/cobblemon/mod/common/mixin/CrashReportMixin.java b/common/src/main/java/com/cobblemon/mod/common/mixin/CrashReportMixin.java index 2d4d4b0841..744c3f210a 100644 --- a/common/src/main/java/com/cobblemon/mod/common/mixin/CrashReportMixin.java +++ b/common/src/main/java/com/cobblemon/mod/common/mixin/CrashReportMixin.java @@ -26,7 +26,6 @@ public final class CrashReportMixin { cobblemon.add("Is Snapshot", CobblemonBuildDetails.SNAPSHOT); cobblemon.add("Git Commit", CobblemonBuildDetails.INSTANCE.smallCommitHash() + " (" + "https://gitlab.com/cable-mc/cobblemon/-/commit/" + CobblemonBuildDetails.GIT_COMMIT + ")"); cobblemon.add("Branch", CobblemonBuildDetails.BRANCH); - cobblemon.add("Timestamp", CobblemonBuildDetails.TIMESTAMP); cobblemon.addStackTrace(builder); builder.append("\n\n"); diff --git a/common/src/main/java/com/cobblemon/mod/common/mixin/invoker/AdornRegisterInvoker.java b/common/src/main/java/com/cobblemon/mod/common/mixin/invoker/AdornRegisterInvoker.java new file mode 100644 index 0000000000..d87e8d0e63 --- /dev/null +++ b/common/src/main/java/com/cobblemon/mod/common/mixin/invoker/AdornRegisterInvoker.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.mixin.invoker; + +import com.cobblemon.mod.common.integration.adorn.AdornCompatibility; +import java.util.List; +import juuxel.adorn.block.variant.BlockVariantSet; +import juuxel.adorn.block.variant.BlockVariantSets; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +//This is a yucky hack but better than what we were doing before +@Mixin(BlockVariantSets.class) +public abstract class AdornRegisterInvoker { + @Final + @Shadow(remap = false) + private static List variantSets; + + @Inject(method = "register()V", at = @At("HEAD"), remap = false) + void register(CallbackInfo ci) { + variantSets.add(AdornCompatibility.INSTANCE); + } +} diff --git a/common/src/main/kotlin-templates/CobblemonBuildDetails.kt.peb b/common/src/main/kotlin-templates/CobblemonBuildDetails.kt.peb index 0a5a33350f..0c2de0dd35 100644 --- a/common/src/main/kotlin-templates/CobblemonBuildDetails.kt.peb +++ b/common/src/main/kotlin-templates/CobblemonBuildDetails.kt.peb @@ -10,7 +10,6 @@ object CobblemonBuildDetails { const val GIT_COMMIT = "{{ gitCommit | default("Not Specified") }}" const val BRANCH = "{{ branch | default("Not Specified") }}" - const val TIMESTAMP = "{{ timestamp }}" fun smallCommitHash(): String { return this.GIT_COMMIT.substring(0, 7) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt b/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt index 637a247a7e..6628481c7b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt @@ -102,7 +102,6 @@ import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider -import com.cobblemon.mod.common.sherds.CobblemonSherds import com.cobblemon.mod.common.starter.CobblemonStarterHandler import com.cobblemon.mod.common.trade.TradeManager import com.cobblemon.mod.common.util.DataKeys @@ -179,7 +178,6 @@ object Cobblemon { if(CobblemonBuildDetails.SNAPSHOT) { this.LOGGER.info(" - Git Commit: ${smallCommitHash()} (https://gitlab.com/cable-mc/cobblemon/-/commit/${CobblemonBuildDetails.GIT_COMMIT})") this.LOGGER.info(" - Branch: ${CobblemonBuildDetails.BRANCH}") - this.LOGGER.info(" - Timestamp: ${CobblemonBuildDetails.TIMESTAMP}") } implementation.registerPermissionValidator() @@ -237,7 +235,7 @@ object Cobblemon { val player = event.player val block = player.world.getBlockState(event.pos).block player.party().forEach { pokemon -> - pokemon.evolutions + pokemon.lockedEvolutions .filterIsInstance() .forEach { evolution -> evolution.attemptEvolution(pokemon, BlockClickEvolution.BlockInteractionContext(block, player.world)) @@ -374,36 +372,6 @@ object Cobblemon { BATTLE_VICTORY.subscribe { AdvancementHandler.onWinBattle(it) } EVOLUTION_COMPLETE.subscribe(Priority.LOWEST) { event -> AdvancementHandler.onEvolve(event) - val pokemon = event.pokemon - val ninjaskIdentifier = cobblemonResource("ninjask") - // Ensure the config option is enabled and that the result was a ninjask and that shedinja exists - if (this.config.ninjaskCreatesShedinja && pokemon.species.resourceIdentifier == ninjaskIdentifier && PokemonSpecies.getByIdentifier(Pokemon.SHEDINJA) != null) { - val player = pokemon.getOwnerPlayer() ?: return@subscribe - if (player.isCreative || player.inventory.containsAny { it.item is PokeBallItem }) { - var pokeball = Items.AIR - player.inventory.combinedInventory.forEach { - it.forEach { - itemStack -> if (itemStack.item is PokeBallItem && pokeball == Items.AIR) { - pokeball = itemStack.item as PokeBallItem - } - } - } - if (!player.isCreative) { - player.inventory.removeAmountIf(1) { it.item is PokeBallItem } - } - if (pokeball == Items.AIR) { - pokeball = CobblemonItems.POKE_BALL - } - val properties = event.evolution.result.copy() - properties.species = Pokemon.SHEDINJA.toString() - val product = pokemon.clone() - product.removeHeldItem() - properties.apply(product) - product.caughtBall = (pokeball as PokeBallItem).pokeBall - pokemon.storeCoordinates.get()?.store?.add(product) - CobblemonCriteria.EVOLVE_POKEMON.trigger(player, EvolvePokemonContext(event.pokemon.preEvolution!!.species.resourceIdentifier, product.species.resourceIdentifier, playerData.get(player).advancementData.totalEvolvedCount)) - } - } } LEVEL_UP_EVENT.subscribe { AdvancementHandler.onLevelUp(it) } TRADE_COMPLETED.subscribe { AdvancementHandler.onTradeCompleted(it) } @@ -418,7 +386,6 @@ object Cobblemon { ).ifSuccessful { it.mute = true } } - CobblemonSherds.registerSherds() } fun getLevel(dimension: RegistryKey): World? { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt b/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt index b6882eca0e..06bdb06640 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt @@ -214,6 +214,213 @@ object CobblemonBlocks : PlatformRegistry, RegistryKey, RegistryKey, RegistryKey, RegistryKey, RegistryKey, RegistryKey, RegistryKey, RegistryKey, RegistryKey, RegistryKey, RegistryKey, RegistryKey, RegistryKey, RegistryKey + pokemon.lockedEvolutions.forEach { evolution -> evolution.requirements.filterIsInstance().forEach { defeatRequirement -> if (defeatRequirement.target.matches(faintedPokemon.effectedPokemon)) { val progress = pokemon.evolutionProxy.current().progressFirstOrCreate({ it is DefeatEvolutionProgress && it.currentProgress().target == defeatRequirement.target }) { DefeatEvolutionProgress() } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/berry/Berry.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/berry/Berry.kt index b037e6d69b..361ecbdf54 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/berry/Berry.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/berry/Berry.kt @@ -16,7 +16,7 @@ import com.cobblemon.mod.common.api.events.berry.BerryYieldCalculationEvent import com.cobblemon.mod.common.api.mulch.MulchVariant import com.cobblemon.mod.common.block.BerryBlock import com.cobblemon.mod.common.block.entity.BerryBlockEntity -import com.cobblemon.mod.common.item.BerryItem +import com.cobblemon.mod.common.item.berry.BerryItem import com.cobblemon.mod.common.pokemon.Nature import com.cobblemon.mod.common.util.readBox import com.cobblemon.mod.common.util.readEnumConstant @@ -56,9 +56,8 @@ import net.minecraft.world.biome.Biome * @property identifier The [Identifier] of this berry. * @property baseYield The [IntRange] possible for the berry tree before [bonusYield] is calculated. * @property preferredBiomeTags The [TagKey]s of the berries preffered biomes. Determines spawning and yield - * @property growthTime The [IntRange] possible in minutes for how long the berry tree takes to grow. - * @property refreshRate The [IntRange] possible in minutes for how long the berry tree takes to regrow its berries once it has been harvested. - * @depreciated @property lifeCycles The [IntRange] possible for the berry to live for between harvests. + * @property growthTime The [IntRange] possible in minutes for how long the berry tree takes to grow frome age 0 to age 3 + * @property refreshRate The [IntRange] possible in minutes for how long the berry tree takes to grow from age 3 to age 5 * @property favoriteMulches The types of mulches that benefit this berries yield * @property growthFactors An array of [GrowthFactor]s that will affect this berry. The client is not aware of these. * @property mutations A map of the partner berry as the key and the value as the resulting mutation with this berry. @@ -71,6 +70,7 @@ import net.minecraft.world.biome.Biome * @property flowerTexture The [Identifier] for the texture of the berry in flower form. This is resolved into a [ModelPart] on the client. * @property fruitModelIdentifier The [Identifier] for the model of the berry in flower form. This is resolved into a [ModelPart] on the client. * @property fruitTexture The [Identifier] for the texture of the berry in flower form. + * @property stageOnePositioning Transformation of the berry model for age 0 * * @throws IllegalArgumentException if the any yield range argument is not a positive range. */ @@ -80,7 +80,6 @@ class Berry( val preferredBiomeTags: List>, val growthTime: IntRange, val refreshRate: IntRange, - //val lifeCycles: IntRange, val favoriteMulches: EnumSet, val growthFactors: Collection, val spawnConditions: List, @@ -99,7 +98,9 @@ class Berry( @SerializedName("fruitModel") val fruitModelIdentifier: Identifier, val fruitTexture: Identifier, - val weight: Float + val stageOnePositioning: GrowthPoint, + val weight: Float, + val boneMealChance: Float ) { @Transient @@ -172,8 +173,9 @@ class Berry( val bonus = this.bonusYield(world, state, pos) var yield = base + bonus.first val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity - if (BerryBlock.getMulch(state) == MulchVariant.RICH) { - yield = min(yield + 1, maxYield()) + if (BerryBlock.getMulch(treeEntity) == MulchVariant.RICH) { + //I hope the upper bound isnt exclusive, especially when there's a method called nextBetweenExclusive + yield += world.random.nextBetween(1, 3) treeEntity.decrementMulchDuration(world, pos, state) } val event = BerryYieldCalculationEvent(this, world, state, pos, placer, yield, bonus.second) @@ -290,6 +292,13 @@ class Berry( buffer.writeIdentifier(this.flowerTexture) buffer.writeIdentifier(this.fruitModelIdentifier) buffer.writeIdentifier(this.fruitTexture) + buffer.writeDouble(stageOnePositioning.position.x) + buffer.writeDouble(stageOnePositioning.position.y) + buffer.writeDouble(stageOnePositioning.position.z) + buffer.writeDouble(stageOnePositioning.rotation.x) + buffer.writeDouble(stageOnePositioning.rotation.y) + buffer.writeDouble(stageOnePositioning.rotation.z) + buffer.writeFloat(boneMealChance) } /** @@ -303,7 +312,8 @@ class Berry( private fun bonusYield(world: World, state: BlockState, pos: BlockPos): Pair> { var bonus = 0 val passed = arrayListOf() - val mulchVariant = BerryBlock.getMulch(state) + val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return 0 to passed + val mulchVariant = BerryBlock.getMulch(treeEntity) val hasBiomeMulch = mulchVariant in favoriteMulches this.growthFactors.forEach { factor -> if (factor.isValid(world, state, pos)) { @@ -350,7 +360,9 @@ class Berry( val flowerTexture = buffer.readIdentifier() val fruitModelIdentifier = buffer.readIdentifier() val fruitTexture = buffer.readIdentifier() - return Berry(identifier, baseYield, emptyList(), growthTime, refreshRate, favMulchs, emptySet(), emptyList(), growthPoints, randomizedGrowthPoints, mutations, sproutShapeBoxes, matureShapeBoxes, flavors, tintIndexes, flowerModelIdentifier, flowerTexture, fruitModelIdentifier, fruitTexture, 0F) + val stageOneYPos = GrowthPoint(Vec3d(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()), Vec3d(buffer.readDouble(), buffer.readDouble(), buffer.readDouble())) + val boneMealChance = buffer.readFloat() + return Berry(identifier, baseYield, emptyList(), growthTime, refreshRate, favMulchs, emptySet(), emptyList(), growthPoints, randomizedGrowthPoints, mutations, sproutShapeBoxes, matureShapeBoxes, flavors, tintIndexes, flowerModelIdentifier, flowerTexture, fruitModelIdentifier, fruitTexture, stageOneYPos, 0F, boneMealChance) } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt index 36ce059951..408af7aa26 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt @@ -78,6 +78,8 @@ object CobblemonEvents { val POKE_BALL_CAPTURE_CALCULATED = EventObservable() @JvmField val POKEMON_CAPTURED = EventObservable() + @JvmField + val FOSSIL_REVIVED = EventObservable() // @JvmField // val EGG_HATCH = EventObservable() @JvmField diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/FossilRevivedEvent.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/FossilRevivedEvent.kt new file mode 100644 index 0000000000..156d636396 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/FossilRevivedEvent.kt @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.events.pokemon + +import com.cobblemon.mod.common.pokemon.Pokemon +import net.minecraft.server.network.ServerPlayerEntity + +data class FossilRevivedEvent ( + val pokemon: Pokemon, + val player: ServerPlayerEntity? +) \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffectTimeline.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffectTimeline.kt index cb3e93ca97..5976f0a270 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffectTimeline.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffectTimeline.kt @@ -10,9 +10,7 @@ package com.cobblemon.mod.common.api.moves.animations import com.bedrockk.molang.Expression import com.bedrockk.molang.runtime.MoLangRuntime -import com.bedrockk.molang.runtime.struct.VariableStruct import com.cobblemon.mod.common.api.moves.animations.keyframes.ActionEffectKeyframe -import com.cobblemon.mod.common.api.scheduling.ScheduledTask import com.cobblemon.mod.common.util.asExpression import com.cobblemon.mod.common.util.resolveBoolean import java.util.concurrent.CompletableFuture @@ -43,6 +41,9 @@ class ActionEffectTimeline( // .toList copy because I'm paranoid about iterators being trying to share between identical effects playing chainKeyframes(context, timeline.toList().iterator(), finalFuture) finalFuture + }.exceptionallyCompose { + it.printStackTrace() + CompletableFuture.completedFuture(Unit) } } @@ -55,6 +56,7 @@ class ActionEffectTimeline( keyframe.play(context) .thenRun { context.currentKeyframes.remove(keyframe) } .thenApply { chainKeyframes(context, iterator, finalFuture) } + .exceptionally { finalFuture.completeExceptionally(it) } } } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityParticlesActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityParticlesActionEffectKeyframe.kt index e48606bfaa..67b4d3cb71 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityParticlesActionEffectKeyframe.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityParticlesActionEffectKeyframe.kt @@ -8,7 +8,6 @@ package com.cobblemon.mod.common.api.moves.animations.keyframes -import com.cobblemon.mod.common.CobblemonNetwork.sendPacket import com.cobblemon.mod.common.api.molang.ExpressionLike import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext import com.cobblemon.mod.common.api.moves.animations.EntityProvider @@ -40,7 +39,7 @@ class EntityParticlesActionEffectKeyframe : ConditionalActionEffectKeyframe(), E .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } } val effectIdentifier = try { - effect?.asExpressionLike()?.resolveString(context.runtime) + effect?.asExpressionLike()?.resolveString(context.runtime)?.takeIf { it != "0.0" } ?: effect } catch (e: Exception) { effect }?.asIdentifierDefaultingNamespace() ?: return skip() diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/mulch/MulchVariant.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/mulch/MulchVariant.kt index e0d0d366e9..c73d8ffc37 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/mulch/MulchVariant.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/mulch/MulchVariant.kt @@ -8,24 +8,30 @@ package com.cobblemon.mod.common.api.mulch +import com.cobblemon.mod.common.BakingOverride +import com.cobblemon.mod.common.client.CobblemonBakingOverrides import net.minecraft.util.StringIdentifiable /** * Represents the different types of Mulch implemented in the mod. * */ -enum class MulchVariant(val duration: Int = -1) : StringIdentifiable { - COARSE, - GROWTH(3), - HUMID, - LOAMY, - PEAT, - RICH(3), - SANDY, - SURPRISE(3), - NONE; +enum class MulchVariant(val model: BakingOverride?, val duration: Int = -1) : StringIdentifiable { + COARSE(CobblemonBakingOverrides.COARSE_MULCH), + GROWTH(CobblemonBakingOverrides.GROWTH_MULCH, 5), + HUMID(CobblemonBakingOverrides.HUMID_MULCH), + LOAMY(CobblemonBakingOverrides.LOAMY_MULCH), + PEAT(CobblemonBakingOverrides.PEAT_MULCH), + RICH(CobblemonBakingOverrides.RICH_MULCH, 5), + SANDY(CobblemonBakingOverrides.SANDY_MULCH), + SURPRISE(CobblemonBakingOverrides.SURPRISE_MULCH, 3), + NONE(null); override fun asString(): String { return name.lowercase() } + + companion object { + const val GROWTH_TIME_MULTIPLIER = 0.5 + } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockBlock.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockBlock.kt index beb9247afc..a491b9afbc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockBlock.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockBlock.kt @@ -64,6 +64,7 @@ abstract class MultiblockBlock(properties: Settings) : BlockWithEntity(propertie if (entity is MultiblockEntity && entity.multiblockStructure != null) { entity.multiblockStructure!!.onBreak(world, pos, state, player) } + entity?.markRemoved() } return result } @@ -77,6 +78,7 @@ abstract class MultiblockBlock(properties: Settings) : BlockWithEntity(propertie return BlockRenderType.MODEL } + //This is done so a block picked with NBT doesnt absolutely DESTROY multiblocks override fun getPickStack(world: WorldView, pos: BlockPos, state: BlockState): ItemStack { val blockEntity = world.getBlockEntity(pos) as? MultiblockEntity ?: return ItemStack.EMPTY return if (blockEntity.multiblockStructure == null) super.getPickStack(world, pos, state) else ItemStack.EMPTY diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonPropertyExtractor.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonPropertyExtractor.kt index 06fb13fe95..fd5f763248 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonPropertyExtractor.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonPropertyExtractor.kt @@ -47,6 +47,10 @@ fun interface PokemonPropertyExtractor { val NICKNAME = add { pokemon, properties -> properties.nickname = pokemon.nickname } @JvmField val STATUS = add { pokemon, properties -> properties.status = pokemon.status?.status?.showdownName } + @JvmField + val IVS = add { pokemon, properties -> properties.ivs = pokemon.ivs } + @JvmField + val EVS = add { pokemon, properties -> properties.evs = pokemon.evs } @JvmField val ILLUSION = mutableListOf(SPECIES, FORM, ASPECTS, GENDER, NICKNAME, SHINY) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt index 36ed584fb2..33a900cf93 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt @@ -8,7 +8,11 @@ package com.cobblemon.mod.common.api.pokemon.evolution +import com.cobblemon.mod.common.Cobblemon.playerData +import com.cobblemon.mod.common.CobblemonItems import com.cobblemon.mod.common.CobblemonSounds +import com.cobblemon.mod.common.advancement.CobblemonCriteria +import com.cobblemon.mod.common.advancement.criterion.EvolvePokemonContext import com.cobblemon.mod.common.api.events.CobblemonEvents import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent @@ -17,7 +21,9 @@ import com.cobblemon.mod.common.api.moves.MoveTemplate import com.cobblemon.mod.common.api.pokemon.PokemonProperties import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement import com.cobblemon.mod.common.api.scheduling.afterOnServer +import com.cobblemon.mod.common.api.tags.CobblemonItemTags import com.cobblemon.mod.common.entity.generic.GenericBedrockEntity +import com.cobblemon.mod.common.item.PokeBallItem import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution @@ -25,6 +31,7 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution import com.cobblemon.mod.common.util.cobblemonResource import com.cobblemon.mod.common.util.lang +import com.cobblemon.mod.common.util.party import net.minecraft.item.ItemStack import net.minecraft.sound.SoundCategory @@ -44,6 +51,11 @@ interface Evolution : EvolutionLike { */ val result: PokemonProperties + /** + * The shed result of this evolution. + */ + val shedder: PokemonProperties? + /** * If this evolution allows the user to choose when to start it or not. */ @@ -95,6 +107,36 @@ interface Evolution : EvolutionLike { return true } + fun shed(pokemon: Pokemon): Boolean { + val innerShedder = shedder ?: return false + + val owner = pokemon.getOwnerPlayer() ?: return false + // If the player has at least one Pokeball in their inventory. + var pokeballStack: ItemStack? = null + if (!owner.isCreative) { + for (i in 0 until owner.inventory.size()) { + val stackI = owner.inventory.getStack(i) + if (stackI.isIn(CobblemonItemTags.POKE_BALLS)) { + pokeballStack = stackI + } + } + if (pokeballStack == null) return false + } + // If the player has at least one empty spot in their party. + val emptySlot = owner.party().getFirstAvailablePosition() ?: return false + + // Add shed Pokemon to player's party + val shedPokemon = pokemon.clone() + shedPokemon.removeHeldItem() + innerShedder.apply(shedPokemon) + shedPokemon.caughtBall = ((pokeballStack?.item ?: CobblemonItems.POKE_BALL) as PokeBallItem).pokeBall + pokemon.storeCoordinates.get()?.store?.add(shedPokemon) + CobblemonCriteria.EVOLVE_POKEMON.trigger(owner, EvolvePokemonContext(pokemon.preEvolution!!.species.resourceIdentifier, shedPokemon.species.resourceIdentifier, playerData.get(owner).advancementData.totalEvolvedCount)) + // Consume one of the balls + pokeballStack?.decrement(1) + + return true + } /** * Starts this evolution as soon as possible. @@ -153,8 +195,9 @@ interface Evolution : EvolutionLike { pokemon.getOwnerPlayer()?.sendMessage(lang("experience.learned_move", pokemon.getDisplayName(), move.displayName)) } // we want to instantly tick for example you might only evolve your Bulbasaur at level 34 so Venusaur should be immediately available - pokemon.evolutions.filterIsInstance().forEach { evolution -> evolution.attemptEvolution(pokemon) } - pokemon.getOwnerPlayer()?.playSound(CobblemonSounds.EVOLVING, 1F, 1F) + pokemon.lockedEvolutions.filterIsInstance().forEach { evolution -> evolution.attemptEvolution(pokemon) } + pokemon.getOwnerPlayer()?.playSound(CobblemonSounds.EVOLVING, SoundCategory.NEUTRAL, 1F, 1F) + this.shed(pokemon) CobblemonEvents.EVOLUTION_COMPLETE.post(EvolutionCompleteEvent(pokemon, this)) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/moves/Learnset.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/moves/Learnset.kt index 16f3723d38..bca6967387 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/moves/Learnset.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/moves/Learnset.kt @@ -101,7 +101,7 @@ open class Learnset : ClientDataSynchronizer { repeat(times = buffer.readSizedInt(IntSize.U_BYTE)) { val level = buffer.readSizedInt(IntSize.U_SHORT) val moves = mutableListOf() - repeat(times = buffer.readSizedInt(IntSize.U_BYTE)) { + repeat(times = buffer.readSizedInt(IntSize.U_SHORT)) { Moves.getByNumericalId(buffer.readInt())?.let(moves::add) } levelUpMoves[level] = moves @@ -112,7 +112,7 @@ open class Learnset : ClientDataSynchronizer { buffer.writeSizedInt(IntSize.U_BYTE, levelUpMoves.size) for ((level, moves) in levelUpMoves) { buffer.writeSizedInt(IntSize.U_SHORT, level) - buffer.writeSizedInt(IntSize.U_BYTE, moves.size) + buffer.writeSizedInt(IntSize.U_SHORT, moves.size) for (move in moves) { buffer.writeInt(move.num) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt index d307b5f3ef..31f9eef65c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt @@ -51,8 +51,8 @@ enum class Stats(override val identifier: Identifier, override val displayName: /** Gets the [Stat] from the respective Showdown id. */ fun getStat(statKey: String) = when(statKey) { - "atk" -> ATTACK - "def" -> DEFENCE + "atk", "Attack" -> ATTACK // Hyper Cutter states the full stat name "Attack" + "def", "Defense" -> DEFENCE // Big Pecks states the full stat name "Defense" "spa" -> SPECIAL_ATTACK "spd" -> SPECIAL_DEFENCE "spe" -> SPEED diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Status.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Status.kt index 53bf99bb9c..7c089fd1bb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Status.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Status.kt @@ -8,6 +8,9 @@ package com.cobblemon.mod.common.api.pokemon.status +import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline +import com.cobblemon.mod.common.api.moves.animations.ActionEffects +import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace import net.minecraft.util.Identifier /** @@ -20,4 +23,6 @@ open class Status( val showdownName: String = "", val applyMessage: String, val removeMessage: String -) \ No newline at end of file +) { + fun getActionEffect() = ActionEffects.actionEffects[name] +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Statuses.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Statuses.kt index b88fea9ec3..e2f46e5d72 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Statuses.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Statuses.kt @@ -9,21 +9,29 @@ package com.cobblemon.mod.common.api.pokemon.status import com.cobblemon.mod.common.pokemon.status.PersistentStatus -import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus -import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus -import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus -import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus +import com.cobblemon.mod.common.pokemon.status.VolatileStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus +import com.cobblemon.mod.common.pokemon.status.statuses.nonpersistent.ConfuseStatus +import com.cobblemon.mod.common.pokemon.status.statuses.nonpersistent.AttractStatus import net.minecraft.util.Identifier /** * Main API point for Statuses * Get or register Statuses * + * NOTE: May seem weird to have so many things called volatile statuses but the package is called nonpersistent. + * Its because volatile is a reserved keyword in Java. Cant use it in a package name + * * @author Deltric */ object Statuses { + private val persistentStatuses = mutableListOf() + private val volatileStatuses = mutableListOf() private val allStatuses = mutableListOf() val POISON = registerStatus(PoisonStatus()) @@ -32,13 +40,23 @@ object Statuses { val SLEEP = registerStatus(SleepStatus()) val FROZEN = registerStatus(FrozenStatus()) val BURN = registerStatus(BurnStatus()) + val ATTRACT = registerStatus(AttractStatus()) + val CONFUSE = registerStatus(ConfuseStatus()) + + fun registerStatus(status: T) : T { + if (status is PersistentStatus) { + persistentStatuses.add(status) + } + else if (status is VolatileStatus) { + volatileStatuses.add(status) + } allStatuses.add(status) return status } fun getStatus(name: Identifier) = allStatuses.find { status -> status.name == name } fun getStatus(showdownName: String) = allStatuses.find { it.showdownName == showdownName } - fun getPersistentStatuses() = allStatuses.filterIsInstance() + fun getPersistentStatuses() = persistentStatuses } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleEvent.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleEvent.kt index 233cac7224..4c9628d76f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleEvent.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleEvent.kt @@ -79,15 +79,15 @@ class ParticleEvent( particleEffect?.let { effect -> val bedrockParticleEffect = BedrockParticleEffectRepository.getEffect(effect.effect) ?: return@let val rootMatrix = when (effect.type) { - EventParticleEffect.EventParticleType.EMITTER -> MatrixWrapper().updatePosition(storm.matrixWrapper.getOrigin()) - EventParticleEffect.EventParticleType.EMITTER_BOUND -> storm.matrixWrapper + EventParticleEffect.EventParticleType.EMITTER,// -> MatrixWrapper().updatePosition(storm.matrixWrapper.getOrigin()) + EventParticleEffect.EventParticleType.EMITTER_BOUND,// -> storm.matrixWrapper EventParticleEffect.EventParticleType.PARTICLE, EventParticleEffect.EventParticleType.PARTICLE_WITH_VELOCITY -> (particle?.let { Vec3d(it.getX(), it.getY(), it.getZ()) } ?: Vec3d(storm.getX(), storm.getY(), storm.getZ())).let { MatrixWrapper().updatePosition(it) } } val sourceVelocity = when (effect.type) { - EventParticleEffect.EventParticleType.EMITTER -> storm.sourceVelocity().let { { it } } - EventParticleEffect.EventParticleType.EMITTER_BOUND -> storm.sourceVelocity + EventParticleEffect.EventParticleType.EMITTER,// -> storm.sourceVelocity().let { { it } } + EventParticleEffect.EventParticleType.EMITTER_BOUND,// -> storm.sourceVelocity EventParticleEffect.EventParticleType.PARTICLE -> { { Vec3d.ZERO } } EventParticleEffect.EventParticleType.PARTICLE_WITH_VELOCITY -> (particle?.let { Vec3d(it.getVelocityX(), it.getVelocityY(), it.getVelocityZ()) } ?: Vec3d.ZERO).let { { it } } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMotion.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMotion.kt index d0cf054504..35125a0ed3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMotion.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMotion.kt @@ -15,10 +15,12 @@ import com.bedrockk.molang.runtime.MoLangRuntime import com.cobblemon.mod.common.api.codec.CodecMapped import com.cobblemon.mod.common.api.data.ArbitrarilyMappedSerializableCompanion import com.cobblemon.mod.common.client.particle.ParticleStorm +import com.cobblemon.mod.common.client.render.SnowstormParticle import com.cobblemon.mod.common.util.codec.EXPRESSION_CODEC import com.cobblemon.mod.common.util.getString import com.cobblemon.mod.common.util.math.geometry.transformDirection import com.cobblemon.mod.common.util.resolveDouble +import com.cobblemon.mod.common.util.resolveVec3d import com.mojang.serialization.Codec import com.mojang.serialization.DynamicOps import com.mojang.serialization.codecs.PrimitiveCodec @@ -35,20 +37,79 @@ interface ParticleMotion : CodecMapped { init { registerSubtype(ParticleMotionType.DYNAMIC, DynamicParticleMotion::class.java, DynamicParticleMotion.CODEC) registerSubtype(ParticleMotionType.STATIC, StaticParticleMotion::class.java, StaticParticleMotion.CODEC) + registerSubtype(ParticleMotionType.PARAMETRIC, ParametricParticleMotion::class.java, ParametricParticleMotion.CODEC) } } val type: ParticleMotionType fun getInitialVelocity(runtime: MoLangRuntime, storm: ParticleStorm, particlePos: Vec3d, emitterPos: Vec3d): Vec3d - fun getAcceleration(runtime: MoLangRuntime, velocity: Vec3d): Vec3d + fun getVelocity(runtime: MoLangRuntime, particle: SnowstormParticle, velocity: Vec3d): Vec3d + fun getParticleDirection(runtime: MoLangRuntime, storm: ParticleStorm, velocity: Vec3d, minSpeed: Float): Vec3d } enum class ParticleMotionType { DYNAMIC, - PARAMETRIC, // TODO figure out how that even works + PARAMETRIC, STATIC } +class ParametricParticleMotion( + var offset: Triple = Triple( + NumberExpression(0.0), + NumberExpression(0.0), + NumberExpression(0.0) + ), + var direction: Triple = Triple( + NumberExpression(0.0), + NumberExpression(0.0), + NumberExpression(0.0) + ) +) : ParticleMotion { + companion object { + val CODEC: Codec = RecordCodecBuilder.create { instance -> + instance.group( + PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }, + EXPRESSION_CODEC.listOf().fieldOf("offset").forGetter { listOf(it.offset.first, it.offset.second, it.offset.third) }, + EXPRESSION_CODEC.listOf().fieldOf("direction").forGetter { listOf(it.direction.first, it.direction.second, it.direction.third) } + ).apply(instance) { _, offset, direction -> ParametricParticleMotion(Triple(offset[0], offset[1], offset[2]), Triple(direction[0], direction[1], direction[2])) } + } + } + + override val type = ParticleMotionType.PARAMETRIC + + override fun getInitialVelocity(runtime: MoLangRuntime, storm: ParticleStorm, particlePos: Vec3d, emitterPos: Vec3d) = Vec3d.ZERO + override fun getVelocity(runtime: MoLangRuntime, particle: SnowstormParticle, velocity: Vec3d): Vec3d { + val stormPosition = Vec3d(particle.storm.getX(), particle.storm.getY(), particle.storm.getZ()) + val offset = runtime.resolveVec3d(this.offset) + val particlePosition = Vec3d(particle.getX(), particle.getY(), particle.getZ()) + val desiredPosition = stormPosition.add(offset) + return desiredPosition.subtract(particlePosition) + } + + override fun getParticleDirection(runtime: MoLangRuntime, storm: ParticleStorm, velocity: Vec3d, minSpeed: Float) = runtime.resolveVec3d(direction).normalize() + override fun encode(ops: DynamicOps) = CODEC.encodeStart(ops, this) + override fun readFromBuffer(buffer: PacketByteBuf) { + offset = Triple( + MoLang.createParser(buffer.readString()).parseExpression(), + MoLang.createParser(buffer.readString()).parseExpression(), + MoLang.createParser(buffer.readString()).parseExpression() + ) + direction = Triple( + MoLang.createParser(buffer.readString()).parseExpression(), + MoLang.createParser(buffer.readString()).parseExpression(), + MoLang.createParser(buffer.readString()).parseExpression() + ) + } + override fun writeToBuffer(buffer: PacketByteBuf) { + buffer.writeString(offset.first.getString()) + buffer.writeString(offset.second.getString()) + buffer.writeString(offset.third.getString()) + buffer.writeString(direction.first.getString()) + buffer.writeString(direction.second.getString()) + buffer.writeString(direction.third.getString()) + } +} + class DynamicParticleMotion( var direction: ParticleMotionDirection = InwardsMotionDirection(), var speed: Expression = NumberExpression(0.0), @@ -79,14 +140,23 @@ class DynamicParticleMotion( return direction.getDirectionVector(runtime, storm, emitterPos, particlePos).normalize().multiply(runtime.resolveDouble(speed)) } - override fun getAcceleration(runtime: MoLangRuntime, velocity: Vec3d): Vec3d { - return Vec3d( + override fun getVelocity(runtime: MoLangRuntime, particle: SnowstormParticle, velocity: Vec3d): Vec3d { + val acceleration = Vec3d( runtime.resolveDouble(acceleration.first), runtime.resolveDouble(acceleration.second), runtime.resolveDouble(acceleration.third) - ).subtract(velocity.multiply(runtime.resolveDouble(drag))) + ) + .subtract(velocity.multiply(20 * runtime.resolveDouble(drag))) + .multiply(1 / 20.0).multiply(1 / 20.0) // blocks per second per second -> blocks per tick per tick + + return Vec3d( + velocity.x + acceleration.x, + velocity.y + acceleration.y, + velocity.z + acceleration.z + ) } + override fun getParticleDirection(runtime: MoLangRuntime, storm: ParticleStorm, velocity: Vec3d, minSpeed: Float) = velocity.normalize() override fun encode(ops: DynamicOps) = CODEC.encodeStart(ops, this) override fun readFromBuffer(buffer: RegistryByteBuf) { @@ -234,7 +304,8 @@ class StaticParticleMotion : ParticleMotion { override val type = ParticleMotionType.STATIC override fun getInitialVelocity(runtime: MoLangRuntime, storm: ParticleStorm, particlePos: Vec3d, emitterPos: Vec3d) = Vec3d.ZERO - override fun getAcceleration(runtime: MoLangRuntime, velocity: Vec3d) = Vec3d.ZERO + override fun getVelocity(runtime: MoLangRuntime, particle: SnowstormParticle, velocity: Vec3d) = velocity + override fun getParticleDirection(runtime: MoLangRuntime, storm: ParticleStorm, velocity: Vec3d, minSpeed: Float) = velocity.normalize() override fun encode(ops: DynamicOps) = CODEC.encodeStart(ops, this) override fun readFromBuffer(buffer: RegistryByteBuf) {} override fun writeToBuffer(buffer: RegistryByteBuf) {} diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleRotation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleRotation.kt index 988c2a3c50..5e0957063a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleRotation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleRotation.kt @@ -32,6 +32,7 @@ interface ParticleRotation : CodecMapped { ) { init { registerSubtype(ParticleRotationType.DYNAMIC, DynamicParticleRotation::class.java, DynamicParticleRotation.CODEC) + registerSubtype(ParticleRotationType.PARAMETRIC, ParametricParticleRotation::class.java, ParametricParticleRotation.CODEC) } } @@ -39,7 +40,34 @@ interface ParticleRotation : CodecMapped { fun getInitialRotation(runtime: MoLangRuntime): Double fun getInitialAngularVelocity(runtime: MoLangRuntime): Double - fun getAngularAcceleration(runtime: MoLangRuntime, angularVelocity: Double): Double + fun getAngularVelocity(runtime: MoLangRuntime, angle: Double, angularVelocity: Double): Double +} + +class ParametricParticleRotation(var expression: Expression = NumberExpression(0.0)): ParticleRotation { + companion object { + val CODEC: Codec = RecordCodecBuilder.create { instance -> + instance.group( + PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }, + EXPRESSION_CODEC.fieldOf("expression").forGetter { it.expression } + ).apply(instance) { _, expression -> + ParametricParticleRotation(expression) + } + } + } + + override val type = ParticleRotationType.PARAMETRIC + override fun encode(ops: DynamicOps) = CODEC.encodeStart(ops, this) + override fun getInitialRotation(runtime: MoLangRuntime) = runtime.resolveDouble(expression) + override fun getInitialAngularVelocity(runtime: MoLangRuntime) = 0.0 + override fun getAngularVelocity(runtime: MoLangRuntime, angle: Double, angularVelocity: Double) = runtime.resolveDouble(expression) - angle + + override fun readFromBuffer(buffer: PacketByteBuf) { + expression = MoLang.createParser(buffer.readString()).parseExpression() + } + + override fun writeToBuffer(buffer: PacketByteBuf) { + buffer.writeString(expression.getString()) + } } class DynamicParticleRotation( @@ -66,15 +94,15 @@ class DynamicParticleRotation( override fun encode(ops: DynamicOps) = CODEC.encodeStart(ops, this) override fun getInitialRotation(runtime: MoLangRuntime) = runtime.resolveDouble(startRotation) override fun getInitialAngularVelocity(runtime: MoLangRuntime) = runtime.resolveDouble(speed) / 20 - override fun getAngularAcceleration(runtime: MoLangRuntime, angularVelocity: Double): Double { + override fun getAngularVelocity(runtime: MoLangRuntime, angle: Double, angularVelocity: Double): Double { val acceleration = runtime.resolveDouble(acceleration) - val nextVelocity = angularVelocity + acceleration + val nextVelocity = angularVelocity * 20 + acceleration val drag = nextVelocity * runtime.resolveDouble(drag) - return if (abs(drag) > abs(nextVelocity)) { + return angularVelocity + (if (abs(drag) > abs(nextVelocity)) { 0.0 } else { - nextVelocity - drag - angularVelocity - } + nextVelocity - drag - angularVelocity * 20 + }) } override fun readFromBuffer(buffer: RegistryByteBuf) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/BestSpawner.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/BestSpawner.kt index 08e55584c8..2c9b24f3ca 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/BestSpawner.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/BestSpawner.kt @@ -10,12 +10,7 @@ package com.cobblemon.mod.common.api.spawning import com.cobblemon.mod.common.Cobblemon.LOGGER import com.cobblemon.mod.common.api.entity.Despawner -import com.cobblemon.mod.common.api.spawning.condition.AreaSpawningCondition -import com.cobblemon.mod.common.api.spawning.condition.BasicSpawningCondition -import com.cobblemon.mod.common.api.spawning.condition.GroundedSpawningCondition -import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition -import com.cobblemon.mod.common.api.spawning.condition.SubmergedSpawningCondition -import com.cobblemon.mod.common.api.spawning.condition.SurfaceSpawningCondition +import com.cobblemon.mod.common.api.spawning.condition.* import com.cobblemon.mod.common.api.spawning.context.AreaContextResolver import com.cobblemon.mod.common.api.spawning.context.GroundedSpawningContext import com.cobblemon.mod.common.api.spawning.context.LavafloorSpawningContext @@ -91,6 +86,7 @@ object BestSpawner { SpawningCondition.register(SubmergedSpawningCondition.NAME, SubmergedSpawningCondition::class.java) SpawningCondition.register(GroundedSpawningCondition.NAME, GroundedSpawningCondition::class.java) SpawningCondition.register(SurfaceSpawningCondition.NAME, SurfaceSpawningCondition::class.java) + SpawningCondition.register(SeafloorSpawningCondition.NAME, SeafloorSpawningCondition::class.java) LOGGER.info("Loaded ${SpawningCondition.conditionTypes.size} spawning condition types.") SpawningContextCalculator.register(GroundedSpawningContextCalculator) @@ -100,7 +96,7 @@ object BestSpawner { SpawningContextCalculator.register(SurfaceSpawningContextCalculator) SpawningContext.register(name = "grounded", clazz = GroundedSpawningContext::class.java, defaultCondition = GroundedSpawningCondition.NAME) - SpawningContext.register(name = "seafloor", clazz = SeafloorSpawningContext::class.java, defaultCondition = GroundedSpawningCondition.NAME) + SpawningContext.register(name = "seafloor", clazz = SeafloorSpawningContext::class.java, defaultCondition = SeafloorSpawningCondition.NAME) SpawningContext.register(name = "lavafloor", clazz = LavafloorSpawningContext::class.java, defaultCondition = GroundedSpawningCondition.NAME) SpawningContext.register(name = "submerged", clazz = SubmergedSpawningContext::class.java, defaultCondition = SubmergedSpawningCondition.NAME) SpawningContext.register(name = "surface", clazz = SurfaceSpawningContext::class.java, defaultCondition = SurfaceSpawningCondition.NAME) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/TimeRange.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/TimeRange.kt index ab1914a147..fce3c09a8c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/TimeRange.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/TimeRange.kt @@ -35,11 +35,13 @@ class TimeRange : IntRanges { "night" to TimeRange(12542..23459), "noon" to TimeRange(5000..6999), "midnight" to TimeRange(17000..18999), - "dawn" to TimeRange(22300..23999, 0..166), + "dawn" to TimeRange(22300..23999, 0..999), "dusk" to TimeRange(11834..13701), "twilight" to TimeRange(11834..13701, 22300..23999, 0..166), - "morning" to TimeRange(0..4999), - "afternoon" to TimeRange(7000..12039) + "morning" to TimeRange(23000..23999, 0..4999), + "afternoon" to TimeRange(7000..12999), + "predawn" to TimeRange(19000..22999), + "evening" to TimeRange(13000..16999) ) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SeafloorSpawningCondition.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SeafloorSpawningCondition.kt new file mode 100644 index 0000000000..4c4fd04f6d --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SeafloorSpawningCondition.kt @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.spawning.condition + +import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition +import com.cobblemon.mod.common.api.spawning.context.SeafloorSpawningContext +import com.cobblemon.mod.common.util.Merger +import net.minecraft.block.Block + +/** + * Base type for a spawning condition that applies to some kind of [SeafloorSpawningContext]. This + * can be extended for subclasses of [SeafloorSpawningContext]. + * + * Borrowed the Grounded context code since it was unintentionally spawning Pokémon on the sea floor + * already. Seems to be working fine /shrug + * + * @author FrankTheFarmer + * @since May 22nd, 2024 + */ +abstract class SeafloorTypeSpawningCondition : AreaTypeSpawningCondition() { + var neededBaseBlocks: MutableList>? = null + + override fun fits(ctx: T): Boolean { + return if (!super.fits(ctx)) { + false + } else if (minHeight != null && ctx.height < minHeight!!) { + return false + } else if (maxHeight != null && ctx.height > maxHeight!!) { + return false + } else !(neededBaseBlocks != null && neededBaseBlocks!!.none { it.fits(ctx.baseBlock.block, ctx.blockRegistry) }) + } + + override fun copyFrom(other: SpawningCondition<*>, merger: Merger) { + super.copyFrom(other, merger) + if (other is SeafloorTypeSpawningCondition) { + neededBaseBlocks = merger.merge(neededBaseBlocks, other.neededBaseBlocks)?.toMutableList() + } + } +} + +/** + * A spawning condition for a [SeafloorSpawningContext]. + * + * @author FrankTheFarmer + * @since May 22nd, 2024 + */ +open class SeafloorSpawningCondition : SeafloorTypeSpawningCondition() { + override fun contextClass() = SeafloorSpawningContext::class.java + companion object { + const val NAME = "seafloor" + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningCondition.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningCondition.kt index c9846eb112..a7fe232f1f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningCondition.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningCondition.kt @@ -78,7 +78,7 @@ abstract class SpawningCondition { return false } else if (ctx.position.z < minZ.orMin() || ctx.position.z > maxZ.orMax()) { return false - } else if (dimensions != null && dimensions!!.isNotEmpty() && ctx.world.dimension.effects !in dimensions!!) { + } else if (dimensions != null && dimensions!!.isNotEmpty() && ctx.world.dimensionKey.value !in dimensions!!) { return false } else if (moonPhase != null && ctx.moonPhase !in moonPhase!!) { return false diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/AreaSpawningContext.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/AreaSpawningContext.kt index b7d6b41e0e..2e603a5b1d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/AreaSpawningContext.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/AreaSpawningContext.kt @@ -49,7 +49,7 @@ open class AreaSpawningContext( * This is not considering the provided state as what the entity would be on top of, * but rather the space its hitbox would fill. */ - open fun isSafeSpace(world: ServerWorld, pos: BlockPos, state: BlockState): Boolean = !state.isFullCube(world, pos) + open fun isSafeSpace(world: ServerWorld, pos: BlockPos, state: BlockState): Boolean = !state.isSolid override fun postFilter(detail: SpawnDetail): Boolean { if (!super.postFilter(detail)) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/calculators/SpawningContextCalculator.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/calculators/SpawningContextCalculator.kt index ecd2240985..034bad405d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/calculators/SpawningContextCalculator.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/calculators/SpawningContextCalculator.kt @@ -30,8 +30,8 @@ import net.minecraft.server.world.ServerWorld */ interface SpawningContextCalculator { companion object { - val isAirCondition: (BlockState) -> Boolean = { it.isAir || (!it.isSolid && !it.isLiquid) } - val isSolidCondition: (BlockState) -> Boolean = { it.isSolid && !it.isIn(BlockTags.LEAVES) } + val isAirCondition: (BlockState) -> Boolean = { it.isAir || (!it.isSolid && !it.fluidState.isIn(FluidTags.WATER)) } + val isSolidCondition: (BlockState) -> Boolean = { it.isSolid } val isWaterCondition: (BlockState) -> Boolean = { it.fluidState.isIn(FluidTags.WATER) && it.fluidState.isStill } val isLavaCondition: (BlockState) -> Boolean = { it.fluidState.isIn(FluidTags.LAVA) && it.fluidState.isStill } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SpawnAction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SpawnAction.kt index ba242c5cc7..4ee88a8104 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SpawnAction.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SpawnAction.kt @@ -34,15 +34,19 @@ abstract class SpawnAction( /** * Runs the spawn action and processes any non-null result. */ - open fun complete(): Boolean { + open fun complete(): R? { + if (future.isDone) { + return null + } + ctx.influences.forEach { it.affectAction(this) } val result = run() - return if (result != null) { + if (result != null) { future.complete(result) - true } else { future.completeExceptionally(Exception("Nothing was spawned.")) - false } + + return result } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/BestSpawnerConfig.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/BestSpawnerConfig.kt index 7cee807e16..85665779c9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/BestSpawnerConfig.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/BestSpawnerConfig.kt @@ -34,7 +34,8 @@ class BestSpawnerConfig { val contextWeights = mutableMapOf( "grounded" to 1F, "submerged" to 0.99F, - "surface" to 0.01F + "surface" to 0.01F, + "seafloor" to 1F ) val buckets = mutableListOf( SpawnBucket("common", 93.8F), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/SpawnDetailPreset.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/SpawnDetailPreset.kt index 76f6f670b3..08196d502c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/SpawnDetailPreset.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/SpawnDetailPreset.kt @@ -48,7 +48,7 @@ abstract class SpawnDetailPreset { var weightMultipliers: MutableList? = null var weight: Float? = null var percentage: Float? = null - var mergeMode = MergeMode.KEEP + var mergeMode = MergeMode.INSERT open fun apply(spawnDetail: SpawnDetail) { bucket?.let { spawnDetail.bucket = it } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PlayerPartyStore.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PlayerPartyStore.kt index 8e40ddd1bd..40bc949179 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PlayerPartyStore.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PlayerPartyStore.kt @@ -123,7 +123,7 @@ open class PlayerPartyStore( } // Passive evolutions - pokemon.evolutions.filterIsInstance().forEach { it.attemptEvolution(pokemon) } + pokemon.lockedEvolutions.filterIsInstance().forEach { it.attemptEvolution(pokemon) } val removeList = mutableListOf() pokemon.evolutionProxy.server().forEach { if (!it.test(pokemon) && it is LevelUpEvolution && !it.permanent) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/pc/PCStore.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/pc/PCStore.kt index ab72409732..d2556f5683 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/pc/PCStore.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/pc/PCStore.kt @@ -99,7 +99,7 @@ open class PCStore( this.lockedSize = lockNewSize if (boxes.size > newSize) { // reduce - val slicedBoxes = boxes.slice(boxes.size until newSize) + val slicedBoxes = boxes.slice(newSize until boxes.size) boxes.removeAll(slicedBoxes) slicedBoxes.flatMap { it.asIterable() }.forEach(overflowHandler) } else { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleBuilder.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleBuilder.kt index bf5eaaff74..a0e41cb8b6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleBuilder.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleBuilder.kt @@ -70,7 +70,6 @@ object BattleBuilder { player1Actor.battleTheme = player2.getBattleTheme() player2Actor.battleTheme = player1.getBattleTheme() } - errors } else { errors } @@ -139,7 +138,6 @@ object BattleBuilder { } playerActor.battleTheme = pokemonEntity.getBattleTheme() } - errors } else { errors } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/ActionEffectInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/ActionEffectInstruction.kt new file mode 100644 index 0000000000..fd94d16403 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/ActionEffectInstruction.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.battles.dispatch + +import com.bedrockk.molang.runtime.MoLangRuntime +import com.bedrockk.molang.runtime.value.StringValue +import com.cobblemon.mod.common.api.battles.model.PokemonBattle +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import net.minecraft.util.Identifier +import java.util.concurrent.CompletableFuture + +/** + * An [InterpreterInstruction] that triggers an [ActionEffectTimeline] + * I think it might be better to have this as an abstract class so we can default the fields + * + * @author Apion + * @since May 19, 2024 + */ +interface ActionEffectInstruction : InterpreterInstruction { + var future: CompletableFuture<*> + var holds: MutableSet + //To expose via molang, so action effects can do different stuff in different instructions + //e.g. "x is confused" vs "x hit itself in confusion" + val id: Identifier + override fun invoke(battle: PokemonBattle) { + preActionEffect(battle) + val runtime = MoLangRuntime() + battle.addQueryFunctions(runtime.environment.getQueryStruct()) + runtime.environment.getQueryStruct().addStandardFunctions() + addMolangQueries(runtime) + runActionEffect(battle, runtime) + postActionEffect(battle) + } + + fun preActionEffect(battle: PokemonBattle) + fun runActionEffect(battle: PokemonBattle, runtime: MoLangRuntime) + fun postActionEffect(battle: PokemonBattle) + + fun addMolangQueries(runtime: MoLangRuntime) { + runtime.environment.getQueryStruct() + .addFunction("instruction_id") { StringValue(id.toString()) } + } + +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/ActivateInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/ActivateInstruction.kt index 22dacc1637..8038d9e1db 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/ActivateInstruction.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/ActivateInstruction.kt @@ -8,16 +8,28 @@ package com.cobblemon.mod.common.battles.interpreter.instructions +import com.bedrockk.molang.runtime.MoLangRuntime +import com.bedrockk.molang.runtime.value.MoValue import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage import com.cobblemon.mod.common.api.battles.model.PokemonBattle +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.UsersProvider +import com.cobblemon.mod.common.api.pokemon.status.Statuses import com.cobblemon.mod.common.battles.ShowdownInterpreter +import com.cobblemon.mod.common.battles.dispatch.ActionEffectInstruction import com.cobblemon.mod.common.battles.dispatch.CauserInstruction import com.cobblemon.mod.common.battles.dispatch.GO import com.cobblemon.mod.common.battles.dispatch.InstructionSet import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction +import com.cobblemon.mod.common.battles.dispatch.UntilDispatch import com.cobblemon.mod.common.battles.dispatch.WaitDispatch import com.cobblemon.mod.common.util.battleLang +import com.cobblemon.mod.common.util.cobblemonResource import net.minecraft.text.Text +import net.minecraft.util.Identifier +import java.util.concurrent.CompletableFuture /** * Format: |-activate|POKEMON|EFFECT @@ -28,19 +40,50 @@ import net.minecraft.text.Text * @author Hunter * @since September 25th, 2022 */ -class ActivateInstruction(val instructionSet: InstructionSet, val message: BattleMessage) : InterpreterInstruction, CauserInstruction { - override fun invoke(battle: PokemonBattle) { +class ActivateInstruction(val instructionSet: InstructionSet, val message: BattleMessage) : ActionEffectInstruction, CauserInstruction { + override var future: CompletableFuture<*> = CompletableFuture.completedFuture(Unit) + override var holds = mutableSetOf() + override val id = cobblemonResource("activate") + + override fun preActionEffect(battle: PokemonBattle) { val pokemon = message.battlePokemon(0, battle) ?: return val effect = message.effectAt(1) ?: return - val extraEffect = message.effectAt(2)?.typelessData ?: Text.literal("UNKNOWN") ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemon) battle.dispatch{ - val pokemonName = pokemon.getName() - val sourceName = message.battlePokemonFromOptional(battle)?.getName() ?: Text.literal("UNKNOWN") ShowdownInterpreter.lastCauser[battle.battleId] = message battle.minorBattleActions[pokemon.uuid] = message + GO + } + } + override fun runActionEffect(battle: PokemonBattle, runtime: MoLangRuntime) { + battle.dispatch { + val effect = message.effectAt(1) ?: return@dispatch GO + val status = Statuses.getStatus(effect.id) + val actionEffect = status?.getActionEffect() ?: return@dispatch GO + val providers = mutableListOf(battle) + val pokemon = message.battlePokemon(0, battle) ?: return@dispatch GO + pokemon.effectedPokemon.entity?.let { UsersProvider(it) }?.let(providers::add) + val context = ActionEffectContext( + actionEffect = actionEffect, + runtime = runtime, + providers = providers + ) + this.future = actionEffect.run(context) + holds = context.holds // Reference so future things can check on this action effect's holds + future.thenApply { holds.clear() } + return@dispatch GO + } + } + + override fun postActionEffect(battle: PokemonBattle) { + battle.dispatch { + val pokemon = message.battlePokemon(0, battle) ?: return@dispatch GO + val extraEffect = message.effectAt(2)?.typelessData ?: Text.literal("UNKNOWN") + val effect = message.effectAt(1) ?: return@dispatch GO + val pokemonName = pokemon.getName() + val sourceName = message.battlePokemonFromOptional(battle)?.getName() ?: Text.literal("UNKNOWN") val lang = when (effect.id) { // Includes a 3rd argument being the magnitude level as a number "magnitude" -> battleLang("activate.magnitude", message.argumentAt(2)?.toIntOrNull() ?: 1) @@ -59,7 +102,8 @@ class ActivateInstruction(val instructionSet: InstructionSet, val message: Battl else -> battleLang("activate.${effect.id}", pokemonName, sourceName, extraEffect) } battle.broadcastChatMessage(lang) - WaitDispatch(1F) + //We check holds here so the chat msg + particle effect happen more concurrently, instead of sequentially + UntilDispatch { "effects" !in holds} } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/BoostInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/BoostInstruction.kt index 899f02b9ca..558e08a3fe 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/BoostInstruction.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/BoostInstruction.kt @@ -8,14 +8,25 @@ package com.cobblemon.mod.common.battles.interpreter.instructions +import com.bedrockk.molang.runtime.MoLangRuntime import com.cobblemon.mod.common.api.battles.interpreter.BattleContext import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage import com.cobblemon.mod.common.api.battles.model.PokemonBattle +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.ActionEffects +import com.cobblemon.mod.common.api.moves.animations.UsersProvider import com.cobblemon.mod.common.api.pokemon.stats.Stats +import com.cobblemon.mod.common.api.pokemon.status.Statuses import com.cobblemon.mod.common.battles.ShowdownInterpreter +import com.cobblemon.mod.common.battles.dispatch.ActionEffectInstruction +import com.cobblemon.mod.common.battles.dispatch.GO import com.cobblemon.mod.common.battles.dispatch.InstructionSet import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction +import com.cobblemon.mod.common.battles.dispatch.UntilDispatch import com.cobblemon.mod.common.util.battleLang +import com.cobblemon.mod.common.util.cobblemonResource +import net.minecraft.util.Identifier +import java.util.concurrent.CompletableFuture /** * Format: |-boost|POKEMON|STAT|AMOUNT or |-unboost|POKEMON|STAT|AMOUNT @@ -25,9 +36,33 @@ import com.cobblemon.mod.common.util.battleLang * @author Hiroku * @since August 20th, 2022 */ -class BoostInstruction(val instructionSet: InstructionSet, val message: BattleMessage, val remainingLines: Iterator, val isBoost: Boolean = true): InterpreterInstruction { +class BoostInstruction(val instructionSet: InstructionSet, val message: BattleMessage, val remainingLines: Iterator, val isBoost: Boolean = true): ActionEffectInstruction { + override var future: CompletableFuture<*> = CompletableFuture.completedFuture(Unit) + override var holds = mutableSetOf() + override val id = cobblemonResource("boost") + override fun preActionEffect(battle: PokemonBattle) { - override fun invoke(battle: PokemonBattle) { + } + + override fun runActionEffect(battle: PokemonBattle, runtime: MoLangRuntime) { + battle.dispatch { + val actionEffect = if (isBoost) BOOST_EFFECT else UNBOOST_EFFECT + val providers = mutableListOf(battle) + val pokemon = message.battlePokemon(0, battle) ?: return@dispatch GO + pokemon.effectedPokemon.entity?.let { UsersProvider(it) }?.let(providers::add) + val context = ActionEffectContext( + actionEffect = actionEffect, + runtime = runtime, + providers = providers + ) + this.future = actionEffect.run(context) + holds = context.holds // Reference so future things can check on this action effect's holds + future.thenApply { holds.clear() } + return@dispatch GO + } + } + + override fun postActionEffect(battle: PokemonBattle) { val pokemon = message.battlePokemon(0, battle) ?: return val statKey = message.argumentAt(1) ?: return val stages = message.argumentAt(2)?.toInt() ?: return @@ -35,7 +70,7 @@ class BoostInstruction(val instructionSet: InstructionSet, val message: BattleMe val severity = Stats.getSeverity(stages) val rootKey = if (isBoost) "boost" else "unboost" - battle.dispatchWaiting(1.5F) { + battle.dispatch { val lang = when { message.hasOptionalArgument("zeffect") -> battleLang("$rootKey.$severity.zeffect", pokemon.getName(), stat) else -> battleLang("$rootKey.$severity", pokemon.getName(), stat) @@ -47,6 +82,13 @@ class BoostInstruction(val instructionSet: InstructionSet, val message: BattleMe // TODO: replace with context that tracks detailed information such as # of stages repeat(stages) { pokemon.contextManager.add(context) } battle.minorBattleActions[pokemon.uuid] = message + return@dispatch UntilDispatch { "effects" !in holds } } } + + companion object { + val BOOST_EFFECT = ActionEffects.actionEffects[cobblemonResource("boost")]!! + val UNBOOST_EFFECT = ActionEffects.actionEffects[cobblemonResource("unboost")]!! + } + } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/CantInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/CantInstruction.kt index f9fb487a6d..a0c8701d12 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/CantInstruction.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/CantInstruction.kt @@ -8,14 +8,27 @@ package com.cobblemon.mod.common.battles.interpreter.instructions +import com.bedrockk.molang.runtime.MoLangRuntime import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage import com.cobblemon.mod.common.api.battles.model.PokemonBattle +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.TargetsProvider +import com.cobblemon.mod.common.api.moves.animations.UsersProvider import com.cobblemon.mod.common.api.pokemon.status.Statuses import com.cobblemon.mod.common.api.text.red import com.cobblemon.mod.common.api.text.text +import com.cobblemon.mod.common.battles.dispatch.ActionEffectInstruction +import com.cobblemon.mod.common.battles.dispatch.GO import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction +import com.cobblemon.mod.common.battles.dispatch.UntilDispatch +import com.cobblemon.mod.common.battles.dispatch.WaitDispatch import com.cobblemon.mod.common.util.battleLang +import com.cobblemon.mod.common.util.cobblemonResource import com.cobblemon.mod.common.util.lang +import net.minecraft.util.Identifier +import java.util.concurrent.CompletableFuture /** * Formats: |cant|POKEMON|REASON and |cant|POKEMON|REASON|MOVE @@ -24,12 +37,40 @@ import com.cobblemon.mod.common.util.lang * @author Deltric * @since January 22nd, 2022 */ -class CantInstruction(val message: BattleMessage): InterpreterInstruction { +class CantInstruction(val message: BattleMessage): ActionEffectInstruction { + override var future: CompletableFuture<*> = CompletableFuture.completedFuture(Unit) + override var holds = mutableSetOf() + override val id = cobblemonResource("cant") + override fun preActionEffect(battle: PokemonBattle) { - override fun invoke(battle: PokemonBattle) { - battle.dispatchWaiting { - val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting - val effectID = message.effectAt(1)?.id ?: return@dispatchWaiting + } + + override fun runActionEffect(battle: PokemonBattle, runtime: MoLangRuntime) { + battle.dispatch { + val pokemon = message.battlePokemon(0, battle) ?: return@dispatch GO + val effectID = message.effectAt(1)?.id ?: return@dispatch GO + val name = pokemon.getName() + val status = Statuses.getStatus(effectID) + val actionEffect = status?.getActionEffect() ?: return@dispatch GO + val providers = mutableListOf(battle) + pokemon.effectedPokemon.entity?.let { UsersProvider(it) }?.let(providers::add) + + val context = ActionEffectContext( + actionEffect = actionEffect, + runtime = runtime, + providers = providers + ) + this.future = actionEffect.run(context) + holds = context.holds // Reference so future things can check on this action effect's holds + future.thenApply { holds.clear() } + GO + } + } + + override fun postActionEffect(battle: PokemonBattle) { + battle.dispatch { + val pokemon = message.battlePokemon(0, battle) ?: return@dispatch GO + val effectID = message.effectAt(1)?.id ?: return@dispatch GO val name = pokemon.getName() // Move may be null as it's not always given val moveName = message.moveAt(2)?.displayName ?: run { "(Unrecognized: ${message.argumentAt(2)})".text() } @@ -38,7 +79,7 @@ class CantInstruction(val message: BattleMessage): InterpreterInstruction { // TODO: in the games they use a generic image because there is a popup of the ability and the sprite of the mon, it may be good to have a similar system here "armortail", "damp", "dazzling", "queenlymajesty" -> battleLang("cant.generic", name, moveName) "par", "slp", "frz" -> { - val status = Statuses.getStatus(effectID)?.name?.path ?: return@dispatchWaiting + val status = Statuses.getStatus(effectID)?.name?.path ?: return@dispatch GO lang("status.$status.is", name) } else -> battleLang("cant.$effectID", name, moveName) @@ -46,6 +87,10 @@ class CantInstruction(val message: BattleMessage): InterpreterInstruction { battle.broadcastChatMessage(lang.red()) battle.minorBattleActions[pokemon.uuid] = message + UntilDispatch { "effects" !in holds } } + } + + } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/DamageInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/DamageInstruction.kt index 40ff7db95f..6055531323 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/DamageInstruction.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/DamageInstruction.kt @@ -8,15 +8,21 @@ package com.cobblemon.mod.common.battles.interpreter.instructions +import com.bedrockk.molang.runtime.MoLangRuntime import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage import com.cobblemon.mod.common.api.battles.model.PokemonBattle import com.cobblemon.mod.common.api.battles.model.actor.BattleActor +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.UsersProvider import com.cobblemon.mod.common.api.pokemon.status.Statuses import com.cobblemon.mod.common.api.text.red import com.cobblemon.mod.common.battles.ShowdownInterpreter +import com.cobblemon.mod.common.battles.ShowdownInterpreter.lastCauser +import com.cobblemon.mod.common.battles.dispatch.ActionEffectInstruction import com.cobblemon.mod.common.battles.dispatch.GO import com.cobblemon.mod.common.battles.dispatch.InstructionSet -import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction import com.cobblemon.mod.common.battles.dispatch.UntilDispatch import com.cobblemon.mod.common.battles.dispatch.WaitDispatch import com.cobblemon.mod.common.battles.pokemon.BattlePokemon @@ -25,11 +31,13 @@ import com.cobblemon.mod.common.net.messages.client.battle.BattleHealthChangePac import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket import com.cobblemon.mod.common.pokemon.evolution.progress.DamageTakenEvolutionProgress import com.cobblemon.mod.common.pokemon.evolution.progress.RecoilEvolutionProgress +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus import com.cobblemon.mod.common.util.battleLang +import com.cobblemon.mod.common.util.cobblemonResource import com.cobblemon.mod.common.util.lang import java.util.concurrent.CompletableFuture -import kotlin.math.roundToInt import net.minecraft.text.Text +import net.minecraft.util.Identifier /** * Format: |-damage|POKEMON|HP STATUS @@ -43,45 +51,87 @@ class DamageInstruction( val actor: BattleActor, val publicMessage: BattleMessage, val privateMessage: BattleMessage -) : InterpreterInstruction { - var future = CompletableFuture.completedFuture(Unit) +) : ActionEffectInstruction { val expectedTarget = publicMessage.battlePokemon(0, actor.battle) + override var future: CompletableFuture<*> = CompletableFuture.completedFuture(Unit) + override var holds = mutableSetOf() + override val id = cobblemonResource("damage") - override fun invoke(battle: PokemonBattle) { + override fun preActionEffect(battle: PokemonBattle) { val battlePokemon = publicMessage.battlePokemon(0, actor.battle) ?: return val recoiling = privateMessage.optionalArgument("from")?.equals("recoil", true) == true val lastCauser = instructionSet.getMostRecentCauser(comparedTo = this) if (recoiling) { - battlePokemon.effectedPokemon.let { pokemon -> - if (RecoilEvolutionProgress.supports(pokemon)) { - val newPercentage = privateMessage.argumentAt(1)?.split("/")?.getOrNull(0)?.toIntOrNull() ?: 0 - val newHealth = (pokemon.hp * (newPercentage / 100.0)).roundToInt() - val difference = pokemon.currentHealth - newHealth - if (difference > 0) { - val progress = pokemon.evolutionProxy.current().progressFirstOrCreate({ it is RecoilEvolutionProgress }) { RecoilEvolutionProgress() } - progress.updateProgress(RecoilEvolutionProgress.Progress(progress.currentProgress().recoil + difference)) - } + doRecoilEvoChecks(battlePokemon) + if (lastCauser is MoveInstruction) { + battle.dispatch { + //Is the recoil hold currently used anywhere? + UntilDispatch { "recoil" !in lastCauser.holds } } } } val newHealth = privateMessage.argumentAt(1)?.split(" ")?.get(0) ?: return val effect = privateMessage.effect() val source = privateMessage.battlePokemonFromOptional(battle) - var causedFaint = newHealth == "0" + source?.let { ShowdownInterpreter.broadcastOptionalAbility(battle, effect, it) } + } - battle.dispatch { - if (lastCauser is MoveInstruction && recoiling) { - UntilDispatch { "recoil" !in lastCauser.holds } - } else { - GO + private fun doRecoilEvoChecks(battlePokemon: BattlePokemon) { + battlePokemon.effectedPokemon.let { pokemon -> + if (RecoilEvolutionProgress.supports(pokemon)) { + val healthStr = privateMessage.argumentAt(1) ?: throw UnsupportedOperationException( + "Cant get recoil string" + ) + val newHealth = + "([0-9]+).*".toRegex().find(healthStr)?.groups?.get(1)?.value?.toIntOrNull() + ?: throw UnsupportedOperationException("Cant get recoil string") + val difference = pokemon.currentHealth - newHealth + if (difference > 0) { + val progress = pokemon.evolutionProxy.current() + .progressFirstOrCreate({ it is RecoilEvolutionProgress }) { RecoilEvolutionProgress() } + progress.updateProgress(RecoilEvolutionProgress.Progress(progress.currentProgress().recoil + difference)) + } } } + } - source?.let { ShowdownInterpreter.broadcastOptionalAbility(battle, effect, it) } + override fun runActionEffect(battle: PokemonBattle, runtime: MoLangRuntime) { + val effect = privateMessage.effect() + val battlePokemon = publicMessage.battlePokemon(0, actor.battle) ?: return + var status = effect?.id?.let { Statuses.getStatus(it) } + battle.dispatch { + val pokemon = privateMessage.battlePokemon(0, battle) ?: return@dispatch GO + //Showdown doesnt tell us on damage if its poison or toxic so we gotta consult the entity + if (status is PoisonStatus) { + status = pokemon.effectedPokemon.status?.status ?: status + } + val actionEffect = status?.getActionEffect() ?: return@dispatch GO + val providers = mutableListOf(battle) + battlePokemon.effectedPokemon.entity?.let { UsersProvider(it) }?.let(providers::add) + val context = ActionEffectContext( + actionEffect = actionEffect, + runtime = runtime, + providers = providers + ) + this.future = actionEffect.run(context) + holds = context.holds // Reference so future things can check on this action effect's holds + future.thenApply { holds.clear() } + return@dispatch GO + } + } + + override fun postActionEffect(battle: PokemonBattle) { + val newHealth = privateMessage.argumentAt(1)?.split(" ")?.get(0) ?: return + val battlePokemon = publicMessage.battlePokemon(0, actor.battle) ?: return + var causedFaint = newHealth == "0" + val effect = privateMessage.effect() + val source = privateMessage.battlePokemonFromOptional(battle) + val lastCauser = instructionSet.getMostRecentCauser(comparedTo = this) battle.dispatch { val pokemonName = battlePokemon.getName() val pokemonEntity = battlePokemon.entity + //Play recoil animation if the pokemon recoiling isnt dead if (!causedFaint && pokemonEntity != null) { val pkt = PlayPoseableAnimationPacket(pokemonEntity.id, setOf("recoil"), emptySet()) pkt.sendToPlayersAround( @@ -92,7 +142,7 @@ class DamageInstruction( distance = 50.0 ) } - + //Play hit particle if (pokemonEntity != null) { RunPosableMoLangPacket(pokemonEntity.id, setOf("q.particle('cobblemon:hit', 'target')")).sendToPlayersAround( x = pokemonEntity.x, @@ -157,8 +207,9 @@ class DamageInstruction( } else if (causedFaint) { GO } else { - WaitDispatch(1F) + UntilDispatch {"effects" !in holds} } } } + } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt index 504ede6fd0..c0bf2d0ccd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt @@ -10,10 +10,10 @@ package com.cobblemon.mod.common.battles.interpreter.instructions import com.bedrockk.molang.runtime.MoLangRuntime import com.bedrockk.molang.runtime.value.DoubleValue +import com.bedrockk.molang.runtime.value.StringValue import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage import com.cobblemon.mod.common.api.battles.interpreter.Effect import com.cobblemon.mod.common.api.battles.model.PokemonBattle -import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunction import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct import com.cobblemon.mod.common.api.moves.Moves @@ -29,6 +29,7 @@ import com.cobblemon.mod.common.battles.dispatch.UntilDispatch import com.cobblemon.mod.common.battles.pokemon.BattlePokemon import com.cobblemon.mod.common.pokemon.evolution.progress.UseMoveEvolutionProgress import com.cobblemon.mod.common.util.battleLang +import com.cobblemon.mod.common.util.cobblemonResource import java.util.concurrent.CompletableFuture /** @@ -121,6 +122,7 @@ class MoveInstruction( } runtime.environment.getQueryStruct().addFunction("move") { move.struct } + runtime.environment.getQueryStruct().addFunction("instruction_id") { StringValue(cobblemonResource("move").toString()) } this.future = actionEffect.run(context) holds = context.holds // Reference so future things can check on this action effect's holds diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt index 1c589877d3..929ec77524 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt @@ -21,6 +21,7 @@ import com.cobblemon.mod.common.api.tags.CobblemonBlockTags import com.cobblemon.mod.common.block.entity.BerryBlockEntity import com.mojang.serialization.MapCodec import com.mojang.serialization.codecs.RecordCodecBuilder +//import dev.lambdaurora.lambdynlights.util.SodiumDynamicLightHandler.pos import net.minecraft.block.Block import net.minecraft.block.BlockRenderType import net.minecraft.block.BlockState @@ -89,22 +90,31 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) : init { defaultState = this.stateManager.defaultState .with(WAS_GENERATED, false) - .with(AGE, 0) .with(MULCH, MulchVariant.NONE) + .with(AGE, 0) + .with(IS_ROOTED, false) } override fun grow(world: ServerWorld, random: Random, pos: BlockPos, state: BlockState) { + growHelper(world, random, pos, state, true) + } + + //grow, but cooler + fun growHelper(world: ServerWorld, random: Random, pos: BlockPos, state: BlockState, boneMealed: Boolean = false) { + val berry = berry() ?: return + if (boneMealed && random.nextFloat() > berry.boneMealChance) return val curAge = state.get(AGE) val newAge = curAge + 1 if (newAge > FRUIT_AGE) return val newState = state.with(AGE, newAge) val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity if (curAge == MATURE_AGE) { - treeEntity.generateGrowthPoints(world, state, pos, null) - determineMutation(world, random, pos, state) + treeEntity.generateGrowthPoints(world, newState, pos, null) + determineMutation(world, random, pos, newState) } world.setBlockState(pos, newState, Block.NOTIFY_LISTENERS) + convertMulchToEntity(world, newState, pos) treeEntity.goToNextStageTimer(FRUIT_AGE - curAge) treeEntity.markDirty() } @@ -124,7 +134,7 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) : CobblemonEvents.BERRY_MUTATION_OFFER.post(BerryMutationOfferEvent(berry, world, state, pos, mutations)) { berryMutationOffer -> if (berryMutationOffer.mutations.isNotEmpty()) { var mutateChance = 125 - if (getMulch(state) == MulchVariant.SURPRISE) { + if (getMulch(treeEntity) == MulchVariant.SURPRISE) { mutateChance *= 4 treeEntity.decrementMulchDuration(world, pos, state) } @@ -145,7 +155,10 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) : state: BlockState, variant: MulchVariant ): Boolean { - return getMulch(state) == MulchVariant.NONE && state.get(AGE) < FLOWER_AGE && world.getBlockState(pos.down()).isOf(Blocks.FARMLAND) + val underBlockState = world.getBlockState(pos.down()) + val validSoil = state.get(IS_ROOTED) || underBlockState.isIn(CobblemonBlockTags.BERRY_SOIL) + val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return false + return getMulch(treeEntity) == MulchVariant.NONE && state.get(AGE) < FLOWER_AGE && validSoil } override fun applyMulch( @@ -156,10 +169,8 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) : variant: MulchVariant ) { val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity - setMulch(world, pos, state, variant) - treeEntity.mulchDuration = variant.duration + treeEntity.setMulch(variant, world, state, pos) world.playSound(null, pos, CobblemonSounds.MULCH_PLACE, SoundCategory.BLOCKS, 0.6F, 1F) - treeEntity.refreshTimers(pos) } @Deprecated("Deprecated in Java") @@ -197,7 +208,7 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) : val below = world.getBlockState(pos.down()) return (state.get(WAS_GENERATED) && below.isIn(CobblemonBlockTags.BERRY_WILD_SOIL)) || below.isIn(CobblemonBlockTags.BERRY_SOIL) - || below.block is FarmlandBlock + || state.get(IS_ROOTED) } override fun getCodec(): MapCodec { @@ -220,6 +231,7 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) : builder.add(AGE) builder.add(WAS_GENERATED) builder.add(MULCH) + builder.add(IS_ROOTED) } override fun getPickStack(world: WorldView?, pos: BlockPos?, state: BlockState?): ItemStack { @@ -256,6 +268,7 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) : val AGE: IntProperty = IntProperty.of("age", 0, FRUIT_AGE) val MULCH: EnumProperty = EnumProperty.of("mulch", MulchVariant::class.java) val WAS_GENERATED: BooleanProperty = BooleanProperty.of("generated") + val IS_ROOTED: BooleanProperty = BooleanProperty.of("rooted") // val PLANTED_SHAPE = VoxelShapes.union( // VoxelShapes.cuboid(0.3125, -0.0625, 0.3125, 0.6875, 0.0, 0.6875), // VoxelShapes.cuboid(0.375, 0.0, 0.375, 0.625, 0.0625, 0.625) @@ -318,15 +331,14 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) : val TALL_MATURE = listOf(Box(0.0, -1.0, 0.0, 16.0, 24.0, 16.0)) - fun getMulch(state: BlockState): MulchVariant { - if (!state.contains(MULCH)) { - return MulchVariant.NONE - } - return state.get(MULCH) - } + fun getMulch(entity: BerryBlockEntity) = entity.mulchVariant - fun setMulch(world: World, pos: BlockPos, state: BlockState, mulch: MulchVariant) { - world.setBlockState(pos, state.with(MULCH, mulch)) + fun convertMulchToEntity(world: ServerWorld, state: BlockState, pos: BlockPos) { + val entity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return + if (state.get(MULCH) != MulchVariant.NONE && state.get(MULCH) != entity.mulchVariant) { + entity.mulchVariant = state.get(MULCH) + world.setBlockState(pos, state.with(MULCH, MulchVariant.NONE)) + } } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/BindingSoilBlock.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/BindingSoilBlock.kt new file mode 100644 index 0000000000..b9a5689337 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/BindingSoilBlock.kt @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.block + +import com.cobblemon.mod.common.block.entity.BerryBlockEntity +import com.cobblemon.mod.common.item.berry.BerryItem +import net.minecraft.block.AbstractBlock +import net.minecraft.block.Block +import net.minecraft.block.BlockState +import net.minecraft.entity.player.PlayerEntity +import net.minecraft.util.ActionResult +import net.minecraft.util.Hand +import net.minecraft.util.hit.BlockHitResult +import net.minecraft.util.math.BlockPos +import net.minecraft.world.World + +/** + * @author Apion + * @since February 27, 2024 + */ +class BindingSoilBlock(settings: Settings) : Block(settings) { + @Deprecated("Deprecated in Java") + override fun onUse( + state: BlockState, + world: World, + pos: BlockPos, + player: PlayerEntity, + hand: Hand, + hit: BlockHitResult + ): ActionResult { + if (!world.isClient) { + val itemStack = player.getStackInHand(hand) + val item = itemStack.item + if (item is BerryItem) { + world.setBlockState(pos, item.block.defaultState.with(BerryBlock.IS_ROOTED, true)) + if (!player.isCreative) { + itemStack.decrement(1) + } + } + } + return ActionResult.SUCCESS + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/RestorationTankBlock.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/RestorationTankBlock.kt index c20c525c70..83509b3545 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/RestorationTankBlock.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/RestorationTankBlock.kt @@ -20,6 +20,7 @@ import net.minecraft.entity.LivingEntity import net.minecraft.entity.ai.pathing.NavigationType import net.minecraft.entity.player.PlayerEntity import net.minecraft.inventory.SidedInventory +import net.minecraft.inventory.SimpleInventory import net.minecraft.item.ItemPlacementContext import net.minecraft.item.ItemStack import net.minecraft.server.world.ServerWorld @@ -39,6 +40,7 @@ import net.minecraft.util.shape.VoxelShapes import net.minecraft.world.BlockView import net.minecraft.world.World import net.minecraft.world.WorldAccess +import net.minecraft.world.WorldEvents import net.minecraft.world.WorldView @@ -72,11 +74,13 @@ class RestorationTankBlock(properties: Settings) : MultiblockBlock(properties), override fun onBreak(world: World, pos: BlockPos, state: BlockState, player: PlayerEntity?): BlockState { val result = super.onBreak(world, pos, state, player) - val otherPart = world.getBlockState(getPositionOfOtherPart(state, pos)) + if (!world.isClient) { + val otherPart = world.getBlockState(getPositionOfOtherPart(state, pos)) - if (otherPart.block is RestorationTankBlock) { - world.setBlockState(getPositionOfOtherPart(state, pos), Blocks.AIR.defaultState, 35) - world.syncWorldEvent(player, 2001, getPositionOfOtherPart(state, pos), getRawIdFromState(otherPart)) + if (otherPart.block is RestorationTankBlock) { + world.setBlockState(getPositionOfOtherPart(state, pos), Blocks.AIR.defaultState, Block.NOTIFY_ALL) + world.syncWorldEvent(player, WorldEvents.BLOCK_BROKEN, getPositionOfOtherPart(state, pos), getRawIdFromState(otherPart)) + } } return result @@ -90,9 +94,9 @@ class RestorationTankBlock(properties: Settings) : MultiblockBlock(properties), itemStack: ItemStack? ) { //Place the full block before we call to super to validate the multiblock - world.setBlockState(pos.up(), state.with(PART, TankPart.TOP) as BlockState, 3) + world.setBlockState(pos.up(), state.with(PART, TankPart.TOP) as BlockState, Block.NOTIFY_ALL) world.updateNeighbors(pos, Blocks.AIR) - state.updateNeighbors(world, pos, 3) + state.updateNeighbors(world, pos, Block.NOTIFY_ALL) super.onPlaced(world, pos, state, placer, itemStack) } @@ -215,9 +219,8 @@ class RestorationTankBlock(properties: Settings) : MultiblockBlock(properties), ): SidedInventory { val tankEntity = (if (state.get(PART) == TankPart.TOP) world.getBlockEntity(pos.down()) - else world.getBlockEntity(pos)) as RestorationTankBlockEntity - - return tankEntity.inv + else world.getBlockEntity(pos)) + return if(tankEntity != null && tankEntity is RestorationTankBlockEntity) tankEntity.inv else DummyInventory() } enum class TankPart(private val label: String) : StringIdentifiable { @@ -241,5 +244,19 @@ class RestorationTankBlock(properties: Settings) : MultiblockBlock(properties), val PART = EnumProperty.of("part", TankPart::class.java) val TRIGGERED = Properties.TRIGGERED val ON = BooleanProperty.of("on") + + class DummyInventory : SimpleInventory(0), SidedInventory { + override fun getAvailableSlots(side: Direction): IntArray { + return IntArray(0) + } + + override fun canInsert(slot: Int, stack: ItemStack, dir: Direction?): Boolean { + return false + } + + override fun canExtract(slot: Int, stack: ItemStack, dir: Direction): Boolean { + return false + } + } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/chest/GildedChestBlock.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/chest/GildedChestBlock.kt index 71c7d91131..71d33d8fcb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/chest/GildedChestBlock.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/chest/GildedChestBlock.kt @@ -31,6 +31,7 @@ import net.minecraft.item.ItemPlacementContext import net.minecraft.item.ItemStack import net.minecraft.screen.ScreenHandler import net.minecraft.server.network.ServerPlayerEntity +import net.minecraft.server.world.ServerWorld import net.minecraft.sound.SoundCategory import net.minecraft.state.StateManager import net.minecraft.state.property.BooleanProperty @@ -47,6 +48,7 @@ import net.minecraft.util.StringIdentifiable import net.minecraft.util.hit.BlockHitResult import net.minecraft.util.math.BlockPos import net.minecraft.util.math.Direction +import net.minecraft.util.math.random.Random import net.minecraft.util.shape.VoxelShape import net.minecraft.util.shape.VoxelShapes import net.minecraft.world.BlockView @@ -200,10 +202,6 @@ class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWit if (!player.world.isClient) { PiglinBrain.onGuardedBlockInteracted(player, true) } - val state = entity.poseableState - state.currentModel?.let { - it.moveToPose(null, state, it.getPose("OPEN")!!) - } return ActionResult.SUCCESS } @@ -214,9 +212,11 @@ class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWit newState: BlockState, moved: Boolean ) { - if (!state.isOf(newState.block)) { - val chest = world.getBlockEntity(pos) as GildedChestBlockEntity - ItemScatterer.spawn(world, pos, chest.inventoryContents) + if (!state.isOf(newState.block) && !world.isClient) { + val chest = world.getBlockEntity(pos) as? GildedChestBlockEntity + chest?.let { + ItemScatterer.spawn(world, pos, chest.inventoryContents) + } } } @@ -293,4 +293,14 @@ class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWit */ } + override fun scheduledTick( + state: BlockState?, + world: ServerWorld?, + pos: BlockPos?, + random: Random? + ) { + val blockEntity = world?.getBlockEntity(pos) as? GildedChestBlockEntity ?: return + blockEntity.onScheduledTick() + } + } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/BerryBlockEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/BerryBlockEntity.kt index 90103228e7..7edd59b732 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/BerryBlockEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/BerryBlockEntity.kt @@ -17,7 +17,6 @@ import com.cobblemon.mod.common.api.events.berry.BerryHarvestEvent import com.cobblemon.mod.common.api.mulch.MulchVariant import com.cobblemon.mod.common.block.BerryBlock import com.cobblemon.mod.common.block.BerryBlock.Companion.getMulch -import com.cobblemon.mod.common.block.BerryBlock.Companion.setMulch import net.minecraft.block.Block import net.minecraft.block.BlockState import net.minecraft.block.entity.BlockEntity @@ -44,8 +43,8 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon lateinit var berryIdentifier: Identifier private val ticksPerMinute = 1200 var renderState: RenderState? = null - //The time left for the tree to grow to stage 5 - var growthTimer: Int = 72000 + //The time left for the tree until its either age 3 or age 5 (check block state, if we are at age 0() + var mulchVariant = MulchVariant.NONE /** * The idea behind the growth point sequence is it's a 16-long string of @@ -86,20 +86,6 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon markDirty() } - fun decrementMulchDuration(world: World, pos: BlockPos, state: BlockState) { - val currentMulch = getMulch(state) - if (currentMulch == MulchVariant.NONE || currentMulch.duration == -1) { - return - } - val newDuration = mulchDuration - 1 - mulchDuration = if (newDuration <= 0) { - setMulch(world, pos, state, MulchVariant.NONE) - 0 - } else { - newDuration - } - } - constructor(pos: BlockPos, state: BlockState, berryIdentifier: Identifier): this(pos, state) { this.berryIdentifier = berryIdentifier resetGrowTimers(pos, state) @@ -108,6 +94,31 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon } } + fun decrementMulchDuration(world: World, pos: BlockPos, state: BlockState) { + if (mulchVariant == MulchVariant.NONE || mulchVariant.duration == -1) { + return + } + val newDuration = mulchDuration - 1 + mulchDuration = if (newDuration <= 0) { + mulchVariant = MulchVariant.NONE + this.markDirty() + world.updateListeners(pos, state, state, Block.NOTIFY_LISTENERS) + 0 + } else { + newDuration + } + } + + fun setMulch(mulch: MulchVariant, world: World, state: BlockState, pos: BlockPos) { + this.mulchVariant = mulch + this.mulchDuration = mulch.duration + refreshTimers(pos) + world.updateListeners(pos, state, state, Block.NOTIFY_LISTENERS) + this.markDirty() + } + + //This function basically runs twice when the berry tree is growing, once when it starts, once when it hits age 3 + //Why dont we just go 0-5? Design thinks its annoying to balance the numbers using 0-5 and 3-5 fun resetGrowTimers(pos: BlockPos, state: BlockState) { val curAge = state.get(BerryBlock.AGE) if (curAge == 5) { @@ -120,12 +131,15 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon val upperGrowthLimit = (if (curAge == 0) berry.growthTime.last else berry.refreshRate.last) * multiplier / 10 val growthRange = lowerGrowthLimit..upperGrowthLimit - this.growthTimer = this.applyMulchModifier(pos, growthRange.random() * ticksPerMinute) - this.goToNextStageTimer(BerryBlock.FRUIT_AGE - curAge) + this.growthTimer = this.applyMulchModifier(pos, growthRange.random() * ticksPerMinute, true) + val stagesLeft = if (curAge < 3) BerryBlock.MATURE_AGE - curAge else BerryBlock.FRUIT_AGE - curAge + this.goToNextStageTimer(stagesLeft) } fun goToNextStageTimer(stagesLeft: Int) { val avgStageTime = growthTimer / stagesLeft + //A number between 80% and 100% the average stage time + //So stages have some variance stageTimer = this.world?.random?.nextBetween((avgStageTime * 8) / 10, avgStageTime) ?: (((Math.random() * 0.2) + 0.8) * avgStageTime).toInt() growthTimer -= stageTimer @@ -138,7 +152,7 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon * @param timer Timer to be modified * @return The modified timer */ - private fun applyMulchModifier(pos: BlockPos, timer: Int): Int { + private fun applyMulchModifier(pos: BlockPos, timer: Int, decrementMulch: Boolean = false): Int { val state = world?.getBlockState(pos) ?: return timer val curAge = state.get(BerryBlock.AGE) @@ -146,11 +160,15 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon return timer } - if (getMulch(state) != MulchVariant.GROWTH) { + if (mulchVariant != MulchVariant.GROWTH) { return timer } - - return (timer * 0.66).toInt() + if (decrementMulch) { + world?.let { + decrementMulchDuration(it, pos, state) + } + } + return (timer * MulchVariant.GROWTH_TIME_MULTIPLIER).toInt() } /** @@ -158,8 +176,8 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon * @param pos The position of the block */ fun refreshTimers(pos: BlockPos) { - this.growthTimer = this.applyMulchModifier(pos, growthTimer) - this.stageTimer = this.applyMulchModifier(pos, stageTimer) + this.growthTimer = this.applyMulchModifier(pos, growthTimer, false) + this.stageTimer = this.applyMulchModifier(pos, stageTimer, false) } /** @@ -249,6 +267,9 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon if (nbt.contains(GROWTH_POINTS_SEQUENCE)) { growthPointSequence = nbt.getString(GROWTH_POINTS_SEQUENCE) } + if (nbt.contains(MULCH_VARIANT)) { + mulchVariant = MulchVariant.valueOf(nbt.getString(MULCH_VARIANT)) + } this.renderState?.needsRebuild = true } @@ -261,6 +282,7 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon nbt.putString(BERRY, berryIdentifier.toString()) nbt.putInt(MULCH_DURATION, mulchDuration) nbt.putString(GROWTH_POINTS_SEQUENCE, growthPointSequence) + nbt.putString(MULCH_VARIANT, mulchVariant.toString()) } override fun markDirty() { @@ -324,11 +346,12 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon companion object { internal val TICKER = BlockEntityTicker { world, pos, state, blockEntity -> if (world.isClient) return@BlockEntityTicker + if (state.get(BerryBlock.IS_ROOTED)) return@BlockEntityTicker if (blockEntity.stageTimer >= 0) { blockEntity.stageTimer-- } if (blockEntity.stageTimer == 0) { - (state.block as BerryBlock).grow(world as ServerWorld, world.random, pos, state) + (state.block as BerryBlock).growHelper(world as ServerWorld, world.random, pos, state) } } //private const val LIFE_CYCLES = "life_cycles" @@ -338,6 +361,7 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon private const val STAGE_TIMER = "StageTimer" private const val BERRY = "Berry" private const val MULCH_DURATION = "MulchDuration" + private const val MULCH_VARIANT = "MulchVariant" } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilAnalyzerBlockEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilAnalyzerBlockEntity.kt index dc4dfa50f4..3a2eb1c43d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilAnalyzerBlockEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilAnalyzerBlockEntity.kt @@ -29,11 +29,17 @@ class FossilAnalyzerBlockEntity( class FossilAnalyzerInventory(val analyzerEntity: FossilAnalyzerBlockEntity) : SidedInventory { override fun clear() { - TODO("Not yet implemented") + if(analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) { + val fossilMultiblockStructure = analyzerEntity.multiblockStructure as FossilMultiblockStructure + fossilMultiblockStructure.fossilInventory.clear() + } } override fun size(): Int { - TODO("Not yet implemented") + if (analyzerEntity.multiblockStructure != null) { + return 3 + } + return 0 } override fun isEmpty(): Boolean { @@ -41,11 +47,18 @@ class FossilAnalyzerBlockEntity( } override fun getStack(slot: Int): ItemStack { + if (analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) { + val fossilMultiblockStructure = analyzerEntity.multiblockStructure as FossilMultiblockStructure + if (fossilMultiblockStructure.fossilInventory.size > slot) { + return fossilMultiblockStructure.fossilInventory[slot] + } + } return ItemStack.EMPTY } + //Unimplemented since no extract override fun removeStack(slot: Int, amount: Int): ItemStack { - return ItemStack.EMPTY + return removeStack(slot) } override fun removeStack(slot: Int): ItemStack { @@ -53,7 +66,7 @@ class FossilAnalyzerBlockEntity( } override fun setStack(slot: Int, stack: ItemStack) { - if (analyzerEntity.multiblockStructure != null) { + if (analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) { val struct = analyzerEntity.multiblockStructure as FossilMultiblockStructure analyzerEntity.world?.let { struct.insertFossil(stack, it) @@ -72,7 +85,10 @@ class FossilAnalyzerBlockEntity( } override fun getAvailableSlots(side: Direction?): IntArray { - return IntArray(1) + if(analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) { + return intArrayOf(0,1,2) + } + return IntArray(0) } override fun canInsert(slot: Int, stack: ItemStack?, dir: Direction?): Boolean { @@ -89,6 +105,5 @@ class FossilAnalyzerBlockEntity( override fun canExtract(slot: Int, stack: ItemStack?, dir: Direction?): Boolean { return false } - } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilMultiblockEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilMultiblockEntity.kt index 64dbf573f5..36d01eeaf7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilMultiblockEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilMultiblockEntity.kt @@ -39,18 +39,14 @@ open class FossilMultiblockEntity( } } get() { - return if (field != null) { - field - } else if (masterBlockPos != null && masterBlockPos != pos) { + if(masterBlockPos != null && masterBlockPos != pos) { val chunkPos = ChunkPos(masterBlockPos) if (world?.chunkManager?.isChunkLoaded(chunkPos.x, chunkPos.z) == true) { val entity: FossilMultiblockEntity? = world?.getBlockEntity(masterBlockPos) as FossilMultiblockEntity? field = entity?.multiblockStructure } - field - } else { - null } + return field } override fun markRemoved() { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/GildedChestBlockEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/GildedChestBlockEntity.kt index 3a85e83f1c..e7f7c78b28 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/GildedChestBlockEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/GildedChestBlockEntity.kt @@ -20,10 +20,10 @@ import net.minecraft.entity.player.PlayerEntity import net.minecraft.entity.player.PlayerInventory import net.minecraft.inventory.DoubleInventory import net.minecraft.inventory.Inventories +import net.minecraft.inventory.Inventory import net.minecraft.inventory.SidedInventory import net.minecraft.item.ItemStack import net.minecraft.nbt.NbtCompound -import net.minecraft.registry.RegistryWrapper import net.minecraft.screen.GenericContainerScreenHandler import net.minecraft.sound.SoundCategory import net.minecraft.state.property.Properties @@ -59,9 +59,7 @@ class GildedChestBlockEntity(pos: BlockPos, state: BlockState, val type: Type = override fun isPlayerViewing(player: PlayerEntity): Boolean { if (player.currentScreenHandler is GenericContainerScreenHandler) { val inventory = (player.currentScreenHandler as GenericContainerScreenHandler).inventory - return inventory === this@GildedChestBlockEntity || inventory is DoubleInventory && inventory.isPart( - this@GildedChestBlockEntity - ) + return inventory === this@GildedChestBlockEntity } return false } @@ -89,7 +87,7 @@ class GildedChestBlockEntity(pos: BlockPos, state: BlockState, val type: Type = } override fun getAvailableSlots(side: Direction): IntArray { - return if (type == Type.FAKE) IntArray(0) else IntArray(NUM_SLOTS) + return if (type == Type.FAKE) IntArray(0) else IntArray(NUM_SLOTS) { it } } override fun canInsert(slot: Int, stack: ItemStack?, dir: Direction?): Boolean { @@ -165,4 +163,10 @@ class GildedChestBlockEntity(pos: BlockPos, state: BlockState, val type: Type = Inventories.readNbt(nbt, inventoryContents, registryLookup) } } + + fun onScheduledTick() { + if (!this.removed) { + stateManager.updateViewerCount(this.getWorld(), this.getPos(), this.cachedState) + } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/HealingMachineBlockEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/HealingMachineBlockEntity.kt index 0453169d6a..c5ba664dab 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/HealingMachineBlockEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/HealingMachineBlockEntity.kt @@ -37,8 +37,8 @@ import net.minecraft.util.math.BlockPos @Suppress("MemberVisibilityCanBePrivate", "unused") class HealingMachineBlockEntity( - val blockPos: BlockPos, - val blockState: BlockState + blockPos: BlockPos, + blockState: BlockState ) : BlockEntity(CobblemonBlockEntities.HEALING_MACHINE, blockPos, blockState) { var currentUser: UUID? = null private set @@ -115,7 +115,7 @@ class HealingMachineBlockEntity( this.setUser(player.uuid) alreadyHealing.add(player.uuid) updateBlockChargeLevel(HealingMachineBlock.MAX_CHARGE_LEVEL + 1) - if (world != null && !world!!.isClient) world!!.playSoundServer(position = blockPos.toVec3d(), sound = CobblemonSounds.HEALING_MACHINE_ACTIVE, volume = 1F, pitch = 1F) + if (world != null && !world!!.isClient) world!!.playSoundServer(position = pos.toVec3d(), sound = CobblemonSounds.HEALING_MACHINE_ACTIVE, volume = 1F, pitch = 1F) } fun completeHealing() { @@ -224,10 +224,10 @@ class HealingMachineBlockEntity( else floor((healingCharge / maxCharge) * HealingMachineBlock.MAX_CHARGE_LEVEL).toInt() ).coerceIn(0..HealingMachineBlock.MAX_CHARGE_LEVEL + 1) - val state = world!!.getBlockState(blockPos) + val state = world!!.getBlockState(pos) if (state != null && state.block is HealingMachineBlock) { val currentCharge = state.get(HealingMachineBlock.CHARGE_LEVEL).toInt() - if (chargeLevel != currentCharge) world!!.setBlockState(blockPos, state.with(HealingMachineBlock.CHARGE_LEVEL, chargeLevel)) + if (chargeLevel != currentCharge) world!!.setBlockState(pos, state.with(HealingMachineBlock.CHARGE_LEVEL, chargeLevel)) } } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PCBlockEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PCBlockEntity.kt index 1e5c99c50e..fb9c5b3667 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PCBlockEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PCBlockEntity.kt @@ -26,24 +26,24 @@ import net.minecraft.util.math.Box import net.minecraft.world.World class PCBlockEntity( - val blockPos: BlockPos, - val blockState: BlockState + blockPos: BlockPos, + blockState: BlockState ) : BlockEntity(CobblemonBlockEntities.PC, blockPos, blockState) { companion object { internal val TICKER = BlockEntityTicker { world, _, _, blockEntity -> if (world.isClient) return@BlockEntityTicker - blockEntity.togglePCOn(blockEntity.getInRangeViewerCount(world, blockEntity.blockPos) > 0) + blockEntity.togglePCOn(blockEntity.getInRangeViewerCount(world, blockEntity.pos) > 0) } } private fun togglePCOn(on: Boolean) { - val pcBlock = blockState.block as PCBlock + val pcBlock = cachedState.block as PCBlock if (world != null && !world!!.isClient) { val world = world!! - val posBottom = pcBlock.getBasePosition(blockState, blockPos) + val posBottom = pcBlock.getBasePosition(cachedState, pos) val stateBottom = world.getBlockState(posBottom) val posTop = pcBlock.getPositionOfOtherPart(stateBottom, posBottom) @@ -71,7 +71,7 @@ class PCBlockEntity( val pcLink = PCLinkManager.getLink(player.uuid) return pcLink != null && pcLink is ProximityPCLink - && pcLink.pos == blockPos + && pcLink.pos == pos && pcLink.world!!.dimension == player.world.dimension } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokemonPastureBlockEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokemonPastureBlockEntity.kt index d927057233..ae8b3e738c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokemonPastureBlockEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokemonPastureBlockEntity.kt @@ -50,7 +50,7 @@ import net.minecraft.world.World import java.util.* import kotlin.math.ceil -class PokemonPastureBlockEntity(pos: BlockPos, val state: BlockState) : BlockEntity(CobblemonBlockEntities.PASTURE, pos, state) { +class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(CobblemonBlockEntities.PASTURE, pos, state) { open class Tethering( val minRoamPos: BlockPos, val maxRoamPos: BlockPos, @@ -175,11 +175,11 @@ class PokemonPastureBlockEntity(pos: BlockPos, val state: BlockState) : BlockEnt } private fun togglePastureOn(on: Boolean) { - val pastureBlock = state.block as PastureBlock + val pastureBlock = cachedState.block as PastureBlock if (world != null && !world!!.isClient) { val world = world!! - val posBottom = pastureBlock.getBasePosition(state, pos) + val posBottom = pastureBlock.getBasePosition(cachedState, pos) val stateBottom = world.getBlockState(posBottom) val posTop = pastureBlock.getPositionOfOtherPart(stateBottom, posBottom) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/RestorationTankBlockEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/RestorationTankBlockEntity.kt index e2f6f45d5a..c46baf5362 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/RestorationTankBlockEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/entity/RestorationTankBlockEntity.kt @@ -16,9 +16,10 @@ import net.minecraft.block.BlockState import net.minecraft.entity.player.PlayerEntity import net.minecraft.inventory.Inventories import net.minecraft.inventory.SidedInventory -import net.minecraft.item.Item +import net.minecraft.inventory.SimpleInventory import net.minecraft.item.ItemStack import net.minecraft.nbt.NbtCompound +import net.minecraft.nbt.NbtList import net.minecraft.registry.Registries import net.minecraft.registry.RegistryWrapper import net.minecraft.util.collection.DefaultedList @@ -28,7 +29,7 @@ import net.minecraft.util.math.Direction class RestorationTankBlockEntity( pos: BlockPos, state: BlockState, multiblockBuilder: MultiblockStructureBuilder -) : FossilMultiblockEntity(pos, state, multiblockBuilder, CobblemonBlockEntities.RESTORATION_TANK) { +) : FossilMultiblockEntity(pos, state, multiblockBuilder, CobblemonBlockEntities.RESTORATION_TANK) { val inv = RestorationTankInventory(this) override fun writeNbt(nbt: NbtCompound, registryLookup: RegistryWrapper.WrapperLookup) { @@ -55,61 +56,52 @@ class RestorationTankBlockEntity( override fun size(): Int { return 8 } + } - override fun isEmpty(): Boolean { - return items.all { it == ItemStack.EMPTY } - } + class RestorationTankInventory(val tankEntity: RestorationTankBlockEntity, vararg items: ItemStack) : SimpleInventory(*items), SidedInventory { - override fun getStack(slot: Int): ItemStack { - if(slot == -1 || slot >= size()) { - return ItemStack.EMPTY - } - return items[slot] - } + constructor(tankEntity: RestorationTankBlockEntity) : this(tankEntity, *Array(8) { ItemStack.EMPTY }) - override fun removeStack(slot: Int, amount: Int): ItemStack { - if(slot < 0 || slot >= size()) { - return ItemStack.EMPTY - } - val result = items[slot].split(amount) - if(items[slot].count == 0) { - items[slot] = ItemStack.EMPTY - } - return result - } - - override fun removeStack(slot: Int): ItemStack { - return removeStack(slot, 1) - } - - override fun setStack(slot: Int, stack: ItemStack) { - val struct = tankEntity.multiblockStructure as? FossilMultiblockStructure - tankEntity.world?.let { - struct?.insertOrganicMaterial(stack, it) - val returnIdentifier = NaturalMaterials.getReturnItem((stack)) - if(returnIdentifier != null ) { - // Store the return item - val returnItem = Registries.ITEM.get(returnIdentifier) - storeReturnItem(returnItem, stack.count) - } - } - } - - private fun storeReturnItem(returnItem: Item, count: Int) { - val destStack = items.withIndex().firstOrNull { - it.value == ItemStack.EMPTY || (it.value.count < it.value.maxCount && it.value.item == returnItem) - } - if (destStack != null) { - if(destStack.value == ItemStack.EMPTY) { - items[destStack.index] = ItemStack(returnItem, 1) - } else { - destStack.value.increment(count) - } - } + override fun getMaxCountPerStack(): Int { + return 1 } override fun markDirty() { + super.markDirty() + for(i in 0 until size()) { // iterate over inventory, consume items, generate and place return items + val itemStack : ItemStack = this.getStack(i) + if(!itemStack.isEmpty) { + val struct = tankEntity.multiblockStructure as? FossilMultiblockStructure + val returnIdentifier = NaturalMaterials.getReturnItem(itemStack) + if(tankEntity.world != null) { + if(struct?.insertOrganicMaterial(itemStack, tankEntity.world!!) == true) { + removeStack(i) + if (returnIdentifier != null) { + val returnItem = Registries.ITEM.get(returnIdentifier) + val returnStack = ItemStack(returnItem, itemStack.count) + var done = false + for(j in 1 until size()) { + // Look for a inventory slot to merge with + val existingStack : ItemStack = getStack(j) + if (existingStack.isEmpty + || (Registries.ITEM.getId(existingStack.item) == returnIdentifier && existingStack.count + returnStack.count < existingStack.maxCount)) { + setStack(j, ItemStack(returnItem, existingStack.count + returnStack.count)) + done = true + } + } + if (!done) { + setStack(i, ItemStack(returnItem, itemStack.count)) + } + } + } + } + } + } + tankEntity.world?.let { +// tankEntity.world!!.updateListeners(tankEntity.pos, tankEntity.cachedState, tankEntity.cachedState, Block.NOTIFY_ALL) +// tankEntity.world!!.updateComparators(tankEntity.pos, tankEntity.world!!.getBlockState(tankEntity.pos).block) + tankEntity.markDirty() tankEntity.multiblockStructure?.markDirty(it) } } @@ -119,7 +111,7 @@ class RestorationTankBlockEntity( } override fun getAvailableSlots(side: Direction?): IntArray { - return if(side == Direction.DOWN) intArrayOf(0,1,2,3,4,5,6,7) else intArrayOf(-1) + return if (side == Direction.DOWN) intArrayOf(0,1,2,3,4,5,6,7) else intArrayOf(0) } override fun canInsert(slot: Int, stack: ItemStack?, dir: Direction?): Boolean { @@ -128,17 +120,25 @@ class RestorationTankBlockEntity( val structure = tankEntity.multiblockStructure as FossilMultiblockStructure val canUtilize = stack?.let { NaturalMaterials.isNaturalMaterial(it) } == true && structure.organicMaterialInside < FossilMultiblockStructure.MATERIAL_TO_START - && structure.createdPokemon == null + && !structure.hasCreatedPokemon val returnItem = NaturalMaterials.getReturnItem(stack!!) ?: return canUtilize - if(canUtilize) { - // See if there's room - for (i in items.indices ) { - if(items[i] == ItemStack.EMPTY || (items[i].count < items[i].maxCount - && items[i].item == Registries.ITEM.get(returnItem))) { - return true + val returnStack = ItemStack(Registries.ITEM.get(returnItem), stack.count) + if(canUtilize && super.canInsert(returnStack)) { + if(returnStack == ItemStack.EMPTY && getStack(0) == ItemStack.EMPTY) { + return true + } + // See if there's room for the return item + var emptyCount = 0 + for(i in 1 until size()) { + val existingStack : ItemStack = getStack(i) + if(existingStack == ItemStack.EMPTY) { + emptyCount += 1 + if(emptyCount > 1) { + // 2 empty slots, safe to insert + return true + } } } - return false } } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt index 4f62d28afe..b2abc525aa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt @@ -10,7 +10,8 @@ package com.cobblemon.mod.common.block.multiblock import com.cobblemon.mod.common.Cobblemon import com.cobblemon.mod.common.CobblemonSounds -import com.cobblemon.mod.common.advancement.CobblemonCriteria +import com.cobblemon.mod.common.api.events.CobblemonEvents +import com.cobblemon.mod.common.api.events.pokemon.FossilRevivedEvent import com.cobblemon.mod.common.api.fossil.Fossil import com.cobblemon.mod.common.api.fossil.Fossils import com.cobblemon.mod.common.api.fossil.NaturalMaterials @@ -72,7 +73,7 @@ class FossilMultiblockStructure ( var organicMaterialInside = 0 private set - var createdPokemon: Pokemon? = null + var hasCreatedPokemon: Boolean = false private set var timeRemaining = -1 private set @@ -101,8 +102,7 @@ class FossilMultiblockStructure ( if (player !is ServerPlayerEntity) { return ActionResult.SUCCESS } - if (this.createdPokemon != null) { - + if (this.hasCreatedPokemon) { if (this.fossilOwnerUUID != null && player.uuid != this.fossilOwnerUUID) { var ownerName : String = "UNKNOWN_USER" // TODO: lang agnostic fallback server()?.userCache?.getByUuid(this.fossilOwnerUUID)?.orElse(null)?.name?.let { @@ -113,25 +113,28 @@ class FossilMultiblockStructure ( } - val ballType = (stack.item as PokeBallItem).pokeBall if (!player.isCreative) { stack?.decrement(1) } - this.createdPokemon!!.caughtBall = ballType - player.party().add(this.createdPokemon!!) - this.fossilState.growthState = "Taken" - player.playSound(CobblemonSounds.FOSSIL_MACHINE_RETRIEVE_POKEMON, 1.0F, 1.0F) - CobblemonCriteria.RESURRECT_POKEMON.trigger(player, createdPokemon!!) + val pokemon = this.resultingFossil?.result?.create() + + if(pokemon != null) { + pokemon.caughtBall = ballType + player.party().add(pokemon) + this.fossilState.growthState = "Taken" + player.playSound(CobblemonSounds.FOSSIL_MACHINE_RETRIEVE_POKEMON, SoundCategory.BLOCKS, 1.0F, 1.0F) + CobblemonEvents.FOSSIL_REVIVED.post(FossilRevivedEvent(pokemon, player)) + } // Turn the monitor off val monitorState = world.getBlockState(monitorPos) - if(!monitorState.equals(MonitorBlock.MonitorScreen.OFF)) { + if(monitorState.contains(MonitorBlock.SCREEN) && !monitorState.equals(MonitorBlock.MonitorScreen.OFF)) { world.setBlockState(monitorPos, monitorState.with(MonitorBlock.SCREEN, MonitorBlock.MonitorScreen.OFF)) } - this.createdPokemon = null + this.hasCreatedPokemon = false this.fossilOwnerUUID = null this.protectionTime = -1 this.updateFossilType(world) @@ -163,19 +166,17 @@ class FossilMultiblockStructure ( // Check if the player is holding a fossil and if so insert it into the machine. if (Fossils.isFossilIngredient(stack)) { - if(!this.isRunning() && this.createdPokemon == null) { + if (!this.isRunning() && !this.hasCreatedPokemon) { if (fossilInventory.size > Cobblemon.config.maxInsertedFossilItems) { return ActionResult.FAIL } - - val copyFossilStack = stack.copyWithCount(1) - if (!player.isCreative) { - stack?.decrement(1) - } - - fossilOwnerUUID = player.uuid - fossilInventory.add(copyFossilStack) - if(!world.isClient) { + if (player is ServerPlayerEntity) { + val copyFossilStack = stack.copyWithCount(1) + if (!player.isCreative) { + stack?.decrement(1) + } + fossilOwnerUUID = player.uuid + fossilInventory.add(copyFossilStack) this.updateFossilType(world) world.playSound(null, analyzerPos, CobblemonSounds.FOSSIL_MACHINE_INSERT_FOSSIL, SoundCategory.BLOCKS) this.syncToClient(world) @@ -187,7 +188,11 @@ class FossilMultiblockStructure ( // Check if the player is holding a natural material and if so, feed it to the machine. if (NaturalMaterials.isNaturalMaterial(stack)) { - if (!this.isRunning() && this.createdPokemon == null && this.organicMaterialInside < MATERIAL_TO_START && insertOrganicMaterial(stack, world)) { + if (player is ServerPlayerEntity + && !this.isRunning() + && !this.hasCreatedPokemon + && this.organicMaterialInside < MATERIAL_TO_START + && insertOrganicMaterial(ItemStack(stack.item, 1), world)) { this.lastInteraction = world.time if (!player.isCreative) { val returnItem = NaturalMaterials.getReturnItem(stack) @@ -219,6 +224,7 @@ class FossilMultiblockStructure ( entity.setPosition(fixedPosition.toCenterPos().subtract(0.0, 0.5, 0.0)) // TODO: Find a correct way to set the new entity's Yaw rotation. (Face away from the machine) if (world.spawnEntity(entity)) { + CobblemonEvents.FOSSIL_REVIVED.post(FossilRevivedEvent(pokemon, null)) return true } else { Cobblemon.LOGGER.warn("Couldn't spawn resurrected Pokémon for some reason") @@ -270,7 +276,7 @@ class FossilMultiblockStructure ( return 0 } if(monitorPos == pos) { - if(createdPokemon != null) { + if(hasCreatedPokemon) { return 15 } if(!isRunning()) { @@ -286,13 +292,13 @@ class FossilMultiblockStructure ( override fun onTriggerEvent(state: BlockState?, world: ServerWorld?, pos: BlockPos?, random: Random?) { // instantiate the pokemon as a new entity and spawn it at the location of the machine if(this.protectionTime <= 0) { - val wildPokemon: Pokemon = this.createdPokemon ?: return + val wildPokemon: Pokemon = if (hasCreatedPokemon) resultingFossil?.result?.create() ?: return else return val direction = state?.get(HorizontalFacingBlock.FACING)?.opposite if(pos != null && direction != null && world != null) { val success = this.spawn(world, pos, direction, wildPokemon) if(success) { this.fossilState.growthState = "Taken" - this.createdPokemon = null + this.hasCreatedPokemon = false this.fossilOwnerUUID = null this.protectionTime = -1 world.playSound(null, tankBasePos, CobblemonSounds.FOSSIL_MACHINE_RETRIEVE_POKEMON, SoundCategory.BLOCKS) @@ -309,9 +315,9 @@ class FossilMultiblockStructure ( val analyzerEntity = world.getBlockEntity(analyzerPos) as? MultiblockEntity val tankBaseEntity = world.getBlockEntity(tankBasePos) as? MultiblockEntity val tankTopEntity = world.getBlockEntity(tankBasePos.up()) as? MultiblockEntity - val state = world.getBlockState(tankBaseEntity?.pos) - val direction = state.get(HorizontalFacingBlock.FACING).getOpposite() - val wildPokemon: Pokemon? = this.createdPokemon + val tankBaseBlockState = world.getBlockState(tankBaseEntity?.pos) + val direction = tankBaseBlockState.get(HorizontalFacingBlock.FACING).opposite + val wildPokemon: Pokemon? = if(hasCreatedPokemon) resultingFossil?.result?.create() else null monitorEntity?.multiblockStructure = null analyzerEntity?.multiblockStructure = null @@ -330,11 +336,9 @@ class FossilMultiblockStructure ( } } if(tankBaseEntity is RestorationTankBlockEntity) { - tankBaseEntity.inv.items.forEach { - val stack = ItemStack(it.item, 1) - ItemScatterer.spawn(world, pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble(), stack) + tankBaseEntity.inv.clearToList().forEach { + ItemScatterer.spawn(world, pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble(), it) } - tankBaseEntity.inv.clear() } @@ -373,7 +377,7 @@ class FossilMultiblockStructure ( world.playSound(null, tankBasePos, CobblemonSounds.FOSSIL_MACHINE_UNPROTECTED, SoundCategory.BLOCKS) } - if (this.createdPokemon != null) { + if (this.hasCreatedPokemon) { return } @@ -402,10 +406,7 @@ class FossilMultiblockStructure ( if (this.timeRemaining == 0) { world.playSound(null, tankBasePos, CobblemonSounds.FOSSIL_MACHINE_FINISHED, SoundCategory.BLOCKS) fossilInventory.clear() - - this.resultingFossil?.let { - this.createdPokemon = it.result.create() - } + this.hasCreatedPokemon = true if(this.fossilOwnerUUID != null) { protectionTime = PROTECTION_TIME } @@ -476,20 +477,26 @@ class FossilMultiblockStructure ( val upperTankPos = tankBasePos.up() val analyzerState = world.getBlockState(analyzerPos) val tankState = world.getBlockState(tankBasePos.up()) - world.setBlockState(analyzerPos, analyzerState.with(FossilAnalyzerBlock.ON, timeRemaining >= 0)) - world.setBlockState(upperTankPos, tankState.with(RestorationTankBlock.ON, timeRemaining >= 0)) + if (analyzerState.contains(FossilAnalyzerBlock.ON)) { + world.setBlockState(analyzerPos, analyzerState.with(FossilAnalyzerBlock.ON, timeRemaining >= 0)) + } + if (tankState.contains(RestorationTankBlock.ON)) { + world.setBlockState(upperTankPos, tankState.with(RestorationTankBlock.ON, timeRemaining >= 0)) + } } fun updateProgress(world: World) { - val screenID = if(protectionTime > 0F ) { - MonitorBlock.MonitorScreen.GREEN_PROGRESS_9 - } else if (timeRemaining <= 0) { - MonitorBlock.MonitorScreen.OFF - } else { - getProgressScreen((TIME_TO_TAKE - timeRemaining) / TIME_PER_STAGE) - } val monitorState = world.getBlockState(monitorPos) - world.setBlockState(monitorPos, monitorState.with(MonitorBlock.SCREEN, screenID)) + if (monitorState.contains(MonitorBlock.SCREEN)) { + val screenID = if (protectionTime > 0F) { + MonitorBlock.MonitorScreen.GREEN_PROGRESS_9 + } else if (timeRemaining <= 0) { + MonitorBlock.MonitorScreen.OFF + } else { + getProgressScreen((TIME_TO_TAKE - timeRemaining) / TIME_PER_STAGE) + } + world.setBlockState(monitorPos, monitorState.with(MonitorBlock.SCREEN, screenID)) + } } fun getProgressScreen(progress:Int) : MonitorBlock.MonitorScreen { @@ -532,12 +539,13 @@ class FossilMultiblockStructure ( //Returns false if material wasnt inserted fun insertOrganicMaterial(stack: ItemStack, world: World): Boolean { - val natureValue = NaturalMaterials.getContent(stack) + var natureValue = NaturalMaterials.getContent(stack) if (timeRemaining > 0 || this.organicMaterialInside >= MATERIAL_TO_START || natureValue == null) { return false } + natureValue *= stack.count - if (natureValue < 0 && organicMaterialInside == 0) return false + if (natureValue <= 0 && organicMaterialInside == 0) return false val oldFillStage = organicMaterialInside * 8 / MATERIAL_TO_START // to prevent over/under filling the tank causing a crash @@ -607,9 +615,7 @@ class FossilMultiblockStructure ( result.putString(DataKeys.INSERTED_FOSSIL, this.resultingFossil!!.asString()) } - if (this.createdPokemon != null) { - result.put(DataKeys.CREATED_POKEMON, createdPokemon!!.saveToNBT(NbtCompound())) - } + result.putBoolean(DataKeys.HAS_CREATED_POKEMON, hasCreatedPokemon) return result } @@ -660,7 +666,10 @@ class FossilMultiblockStructure ( } if (nbt.contains(DataKeys.CREATED_POKEMON)) { - result.createdPokemon = Pokemon.loadFromNBT(nbt.getCompound(DataKeys.CREATED_POKEMON)) + // migration of instances that saved the created pokeon in the nbt + result.hasCreatedPokemon = true + } else if (nbt.contains(DataKeys.HAS_CREATED_POKEMON)){ + result.hasCreatedPokemon = nbt.getBoolean(DataKeys.HAS_CREATED_POKEMON) } result.fillLevel = result.organicMaterialInside * 8 / MATERIAL_TO_START return result diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/ClientMoLangFunctions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/ClientMoLangFunctions.kt index 4756b02fac..55d0d97f44 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/ClientMoLangFunctions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/ClientMoLangFunctions.kt @@ -14,6 +14,7 @@ import com.bedrockk.molang.runtime.value.MoValue import com.bedrockk.molang.runtime.value.StringValue import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import com.cobblemon.mod.common.api.text.text import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace import net.minecraft.client.MinecraftClient import net.minecraft.client.sound.PositionedSoundInstance @@ -31,6 +32,13 @@ object ClientMoLangFunctions { MinecraftClient.getInstance().soundManager.play(PositionedSoundInstance.master(soundEvent, pitch)) } }, + "is_time" to java.util.function.Function { params -> + val time = (MinecraftClient.getInstance().world?.timeOfDay ?: 0) % 24000 + val min = params.getInt(0) + val max = params.getInt(1) + time in min..max + }, + "say" to java.util.function.Function { params -> MinecraftClient.getInstance().player?.sendMessage(params.getString(0).text()) ?: Unit }, ) fun MoLangRuntime.setupClient(): MoLangRuntime { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonBakingOverrides.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonBakingOverrides.kt index 111089d215..05b90c1183 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonBakingOverrides.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonBakingOverrides.kt @@ -62,6 +62,46 @@ object CobblemonBakingOverrides { cobblemonModel("restoration_tank_connector", "none") ) + val COARSE_MULCH = registerOverride( + cobblemonResource("block/coarse_mulch"), + cobblemonModel("coarse_mulch", "none") + ) + + val GROWTH_MULCH = registerOverride( + cobblemonResource("block/growth_mulch"), + cobblemonModel("growth_mulch", "none") + ) + + val HUMID_MULCH = registerOverride( + cobblemonResource("block/humid_mulch"), + cobblemonModel("humid_mulch", "none") + ) + + val LOAMY_MULCH = registerOverride( + cobblemonResource("block/loamy_mulch"), + cobblemonModel("loamy_mulch", "none") + ) + + val PEAT_MULCH = registerOverride( + cobblemonResource("block/peat_mulch"), + cobblemonModel("peat_mulch", "none") + ) + + val RICH_MULCH = registerOverride( + cobblemonResource("block/rich_mulch"), + cobblemonModel("rich_mulch", "none") + ) + + val SANDY_MULCH = registerOverride( + cobblemonResource("block/sandy_mulch"), + cobblemonModel("sandy_mulch", "none") + ) + + val SURPRISE_MULCH = registerOverride( + cobblemonResource("block/surprise_mulch"), + cobblemonModel("surprise_mulch", "none") + ) + fun registerOverride(modelLocation: Identifier, modelIdentifier: ModelIdentifier): BakingOverride { val result = BakingOverride(modelLocation, modelIdentifier) models.add(result) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt index 73437f90a9..694ecc830c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt @@ -272,6 +272,9 @@ class PokemonClientDelegate : PoseableEntityState(), PokemonSideD }, "weight" to java.util.function.Function { return@Function DoubleValue(currentEntity.pokemon.species.weight.toDouble()) + }, + "friendship" to java.util.function.Function { + return@Function DoubleValue(currentEntity.pokemon.friendship.toDouble()) } )) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt index e17adf2595..eff2265895 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt @@ -318,7 +318,6 @@ class PCGUI( centered = true, shadow = true, scale = SCALE, - colour = 0x32CBFF, pMouseX = mouseX, pMouseY = mouseY ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/SpawnSnowstormParticleHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/SpawnSnowstormParticleHandler.kt index 85f336f6f2..6ab1fb29fa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/SpawnSnowstormParticleHandler.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/SpawnSnowstormParticleHandler.kt @@ -15,9 +15,6 @@ import com.cobblemon.mod.common.client.render.MatrixWrapper import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket import net.minecraft.client.MinecraftClient import net.minecraft.client.util.math.MatrixStack -import net.minecraft.util.math.RotationAxis.NEGATIVE_X -import net.minecraft.util.math.RotationAxis.POSITIVE_X -import net.minecraft.util.math.RotationAxis.POSITIVE_Y object SpawnSnowstormParticleHandler : ClientNetworkPacketHandler { override fun handle(packet: SpawnSnowstormParticlePacket, client: MinecraftClient) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/particle/ParticleStorm.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/particle/ParticleStorm.kt index 756b9ac766..819b540d19 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/particle/ParticleStorm.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/particle/ParticleStorm.kt @@ -10,16 +10,20 @@ package com.cobblemon.mod.common.client.particle import com.bedrockk.molang.runtime.MoLangRuntime import com.bedrockk.molang.runtime.value.DoubleValue +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunction import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import com.cobblemon.mod.common.api.pokemon.PokemonSpecies.species import com.cobblemon.mod.common.api.snowstorm.BedrockParticleEffect import com.cobblemon.mod.common.api.snowstorm.ParticleEmitterAction import com.cobblemon.mod.common.client.render.MatrixWrapper import com.cobblemon.mod.common.client.render.SnowstormParticle +import com.cobblemon.mod.common.entity.pokemon.PokemonEntity import com.cobblemon.mod.common.particle.SnowstormParticleEffect import com.cobblemon.mod.common.util.math.geometry.transformDirection import kotlin.random.Random import net.minecraft.client.MinecraftClient import net.minecraft.client.particle.NoRenderParticle +import net.minecraft.client.util.ParticleUtil.spawnParticle import net.minecraft.client.world.ClientWorld import net.minecraft.entity.Entity import net.minecraft.util.math.Vec3d @@ -44,16 +48,26 @@ class ParticleStorm( fun spawn() { if (entity != null) { runtime.environment.getQueryStruct() - .addFunction("entity_width") { DoubleValue(entity.boundingBox.lengthX) } - .addFunction("entity_height") { DoubleValue(entity.boundingBox.lengthY) } - .addFunction("entity_size") { DoubleValue(entity.boundingBox.run { if (lengthX > lengthY) lengthX else lengthY }) } - .addFunction("entity_radius") { DoubleValue(entity.boundingBox.run { if (lengthX > lengthY) lengthX else lengthY } / 2) } + .addFunction("entity_width") { DoubleValue(entity.boundingBox.xLength) } + .addFunction("entity_height") { DoubleValue(entity.boundingBox.yLength) } + .addFunction("entity_size") { DoubleValue(entity.boundingBox.run { if (xLength > yLength) xLength else yLength }) } + .addFunction("entity_radius") { DoubleValue(entity.boundingBox.run { if (xLength > yLength) xLength else yLength } / 2) } + .addFunction("entity_scale") { + val pokeEntity = entity as? PokemonEntity + val pokemon = pokeEntity?.pokemon + //Use form data if available, species as fall back + val baseScale = pokemon?.form?.baseScale ?: pokemon?.species?.baseScale ?: 1.0F + val pokemonScale = pokemon?.scaleModifier ?: 1.0F + val entityScale = pokeEntity?.scaleFactor ?: 1.0F + DoubleValue(baseScale * pokemonScale * entityScale) + } // TODO replace with a generified call to if (entity is MoLangEntity) entity.applyVariables(env) or w/e runtime.environment.setSimpleVariable("entity_width", DoubleValue(entity.boundingBox.lengthX)) runtime.environment.setSimpleVariable("entity_height", DoubleValue(entity.boundingBox.lengthY)) val longerDiameter = entity.boundingBox.run { if (lengthX > lengthY) lengthX else lengthY } runtime.environment.setSimpleVariable("entity_size", DoubleValue(longerDiameter)) runtime.environment.setSimpleVariable("entity_radius", DoubleValue(longerDiameter / 2)) + runtime.environment.setSimpleVariable("entity_scale", DoubleValue((entity as? PokemonEntity)?.scaleFactor ?: 1.0)) } MinecraftClient.getInstance().particleManager.addParticle(this) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt index d18c9399ba..879f1c2b81 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt @@ -118,7 +118,7 @@ class SnowstormParticle( init { setVelocity(initialVelocity.x, initialVelocity.y, initialVelocity.z) - angle = storm.effect.particle.rotation.getInitialRotation(storm.runtime).toFloat() + angle = -storm.effect.particle.rotation.getInitialRotation(storm.runtime).toFloat() prevAngle = angle angularVelocity = storm.effect.particle.rotation.getInitialAngularVelocity(storm.runtime) velocityMultiplier = 1F @@ -256,24 +256,20 @@ class SnowstormParticle( setParticleAgeInRuntime() storm.effect.curves.forEach { it.apply(storm.runtime) } storm.runtime.execute(storm.effect.particle.updateExpressions) - angularVelocity += storm.effect.particle.rotation.getAngularAcceleration(storm.runtime, angularVelocity) / 20 + angularVelocity = storm.effect.particle.rotation.getAngularVelocity(storm.runtime, -angle.toDouble(), angularVelocity) / 20 - if (age > maxAge || storm.runtime.resolveBoolean(storm.effect.particle.killExpression)) { + if (age >= maxAge || storm.runtime.resolveBoolean(storm.effect.particle.killExpression)) { runExpirationEvents() markDead() return } else { - val acceleration = storm.effect.particle.motion.getAcceleration( - storm.runtime, - Vec3d(velocityX, velocityY, velocityZ).multiply(20.0) // Uses blocks per second, not blocks per tick - ).multiply(1 / 20.0).multiply(1 / 20.0) // blocks per second per second -> blocks per tick per tick - - velocityX += acceleration.x - velocityY += acceleration.y - velocityZ += acceleration.z - + val velocity = storm.effect.particle.motion.getVelocity(storm.runtime, this, Vec3d(velocityX, velocityY, velocityZ)) + velocityX = velocity.x + velocityY = velocity.y + velocityZ = velocity.z prevAngle = angle - angle = prevAngle + angularVelocity.toFloat() + // Subtract because Bedrock particles are counter-clockwise and Java Edition is clockwise. + angle = prevAngle - angularVelocity.toFloat() } viewDirection = storm.effect.particle.viewDirection.getDirection( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/BerryBlockEntityRenderState.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/BerryBlockEntityRenderState.kt index d6fe3201a6..a13ddad5d2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/BerryBlockEntityRenderState.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/BerryBlockEntityRenderState.kt @@ -16,6 +16,7 @@ class BerryBlockEntityRenderState : BerryBlockEntity.RenderState { override var needsRebuild = true val vbo: VertexBuffer = VertexBuffer(VertexBuffer.Usage.STATIC) var vboLightLevel: Int = 0 + var drawVbo: Boolean = false override fun close() { vbo.close() diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/BerryBlockRenderer.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/BerryBlockRenderer.kt index bf74c291ac..1413363e76 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/BerryBlockRenderer.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/BerryBlockRenderer.kt @@ -23,6 +23,7 @@ import net.minecraft.client.gl.ShaderProgram import net.minecraft.client.gl.VertexBuffer import net.minecraft.client.render.GameRenderer import net.minecraft.client.render.LightmapTextureManager +import net.minecraft.client.render.RenderLayer import net.minecraft.client.render.Tessellator import net.minecraft.client.render.VertexConsumerProvider import net.minecraft.client.render.VertexFormat @@ -33,6 +34,7 @@ import net.minecraft.client.util.math.MatrixStack import net.minecraft.util.math.Box import net.minecraft.util.math.Vec3d import org.joml.Matrix4f +import org.joml.Vector3f class BerryBlockRenderer(private val context: BlockEntityRendererFactory.Context) : BlockEntityRenderer { @@ -45,33 +47,88 @@ class BerryBlockRenderer(private val context: BlockEntityRendererFactory.Context override fun render(entity: BerryBlockEntity, tickDelta: Float, matrices: MatrixStack, vertexConsumers: VertexConsumerProvider, light: Int, overlay: Int) { if (!isInRenderDistance(entity, entity.pos.toVec3d())) return val blockState = entity.cachedState - val age = blockState.get(BerryBlock.AGE) - if (age <= BerryBlock.MATURE_AGE) { - return - } if (entity.renderState == null) { entity.renderState = BerryBlockEntityRenderState() } val renderState = entity.renderState as BerryBlockEntityRenderState if (renderState.needsRebuild || renderState.vboLightLevel != light) { - renderToBuffer(entity, light, overlay, renderState.vbo) + renderToBuffer(entity, light, overlay, renderState) renderState.vboLightLevel = light (entity.renderState as BerryBlockEntityRenderState).needsRebuild = false } + if (renderState.drawVbo) { + matrices.push() + CobblemonRenderLayers.BERRY_LAYER.startDrawing() + renderState.vbo.bind() + renderState.vbo.draw( + matrices.peek().positionMatrix.mul(RenderSystem.getModelViewMatrix()), + RenderSystem.getProjectionMatrix(), + GameRenderer.getRenderTypeCutoutProgram() + ) + VertexBuffer.unbind() + CobblemonRenderLayers.BERRY_LAYER.endDrawing() + matrices.pop() + } + drawMulch(matrices, vertexConsumers, entity, light, overlay) + } + + private fun drawMulch( + matrices: MatrixStack, + vertexConsumers: VertexConsumerProvider, + entity: BerryBlockEntity, + light: Int, + overlay: Int + ) { matrices.push() - CobblemonRenderLayers.BERRY_LAYER.startDrawing() - renderState.vbo.bind() - renderState.vbo.draw( - matrices.peek().positionMatrix.mul(RenderSystem.getModelViewMatrix()), - RenderSystem.getProjectionMatrix(), - GameRenderer.getRenderTypeCutoutProgram() - ) - VertexBuffer.unbind() - CobblemonRenderLayers.BERRY_LAYER.endDrawing() + //Mulch is rendered on a different layer than the actual berries so + val mulchBuf = vertexConsumers.getBuffer(RenderLayer.getCutout()) + val model = entity.mulchVariant.model + model?.let { + it.getModel().getQuads(entity.cachedState, null, entity.world?.random).forEach { quad -> + mulchBuf.quad(matrices.peek(), quad, 1F, 1F, 1F, light, overlay) + } + } matrices.pop() } - fun renderToBuffer(entity: BerryBlockEntity, light: Int, overlay: Int, buffer: VertexBuffer) { + + fun renderToBuffer(entity: BerryBlockEntity, light: Int, overlay: Int, renderState: BerryBlockEntityRenderState) { + if (entity.cachedState.get(BerryBlock.AGE) == 0) { + renderBabyToBuffer(entity, light, overlay, renderState.vbo) + renderState.drawVbo = true + } + else if (entity.cachedState.get(BerryBlock.AGE) > BerryBlock.MATURE_AGE){ + renderAdultToBuffer(entity, light, overlay, renderState.vbo) + renderState.drawVbo = true + } + else { + renderState.drawVbo = false + } + } + + fun renderBabyToBuffer(entity: BerryBlockEntity, light: Int, overlay: Int, buffer: VertexBuffer) { + val bufferBuilder = Tessellator.getInstance().buffer + bufferBuilder.begin(CobblemonRenderLayers.BERRY_LAYER.drawMode, CobblemonRenderLayers.BERRY_LAYER.vertexFormat) + val berry = entity.berry() ?: return + val model = BerryModelRepository.modelOf(berry.fruitModelIdentifier) ?: return + val pos = berry.stageOnePositioning.position + model.setPosition(Axis.X_AXIS.ordinal, pos.x.toFloat()) + model.setPosition(Axis.Y_AXIS.ordinal, pos.y.toFloat()) + model.setPosition(Axis.Z_AXIS.ordinal, pos.z.toFloat()) + val rot = berry.stageOnePositioning.rotation + model.setAngles( + Math.toRadians(180 - rot.x).toFloat(), + Math.toRadians(180 + rot.y).toFloat(), + Math.toRadians(rot.z).toFloat() + ) + model.render(MatrixStack(), bufferBuilder, light, overlay) + val bufferBuilderFinal = bufferBuilder.end() + buffer.bind() + buffer.upload(bufferBuilderFinal) + VertexBuffer.unbind() + } + + fun renderAdultToBuffer(entity: BerryBlockEntity, light: Int, overlay: Int, buffer: VertexBuffer) { val blockState = entity.cachedState val age = blockState.get(BerryBlock.AGE) if (age <= BerryBlock.MATURE_AGE) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/RestorationTankRenderer.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/RestorationTankRenderer.kt index 7244dafe6b..11b7d909d8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/RestorationTankRenderer.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/RestorationTankRenderer.kt @@ -61,17 +61,17 @@ class RestorationTankRenderer(ctx: BlockEntityRendererFactory.Context) : BlockEn matrices.pop() } val fillLevel = struct.fillLevel - if (fillLevel == 0 && struct.createdPokemon == null) { + if (fillLevel == 0 && !struct.hasCreatedPokemon) { return } - if (struct.isRunning() or (struct.createdPokemon != null)) renderFetus(entity, tickDelta, matrices, vertexConsumers, light, overlay) + if (struct.isRunning() or (struct.hasCreatedPokemon)) renderFetus(entity, tickDelta, matrices, vertexConsumers, light, overlay) matrices.push() val transparentBuffer = vertexConsumers.getBuffer(RenderLayer.getTranslucent()) val fluidModel = if (struct.isRunning()) FLUID_MODELS[8] - else if (struct.createdPokemon != null) FLUID_MODELS[7] + else if (struct.hasCreatedPokemon) FLUID_MODELS[7] else FLUID_MODELS[fillLevel.coerceAtMost(FLUID_MODELS.size - 1) - 1] fluidModel.getQuads(entity.cachedState, null, entity.world?.random).forEach { quad -> transparentBuffer?.quad(matrices.peek(), quad, 0.75f, 0.75f, 0.75f, 1f, light, OverlayTexture.DEFAULT_UV) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPose.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPose.kt index 237033ff4a..145b0f9a65 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPose.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPose.kt @@ -20,7 +20,10 @@ import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFram import com.cobblemon.mod.common.client.render.models.blockbench.quirk.SimpleQuirk import com.cobblemon.mod.common.entity.PoseType import com.cobblemon.mod.common.util.asExpressionLike +import com.cobblemon.mod.common.util.normalizeToArray +import com.cobblemon.mod.common.util.resolveBoolean import com.cobblemon.mod.common.util.resolveObject +import com.cobblemon.mod.common.util.singularToPluralList import com.google.gson.JsonArray import com.google.gson.JsonObject import com.google.gson.JsonPrimitive @@ -34,6 +37,8 @@ class JsonPose(model: PoseableEntityModel, json: JsonObject) { it.environment.getQueryStruct().addFunctions(model.functions.functions) } + val condition: ExpressionLike = json.singularToPluralList("condition").get("conditions")?.normalizeToArray()?.map { it.asString }?.asExpressionLike() ?: "true".asExpressionLike() + val poseName = json.get("poseName")?.asString ?: "pose" val poseTypes = (json.get("poseTypes")?.asJsonArray?.map { name -> PoseType.values().find { it.name.lowercase() == name.asString.lowercase() } @@ -81,8 +86,9 @@ class JsonPose(model: PoseableEntityModel, json: JsonObject) { } json as JsonObject + json.singularToPluralList("animation") val animations: (state: PoseableEntityState) -> List> = { _ -> - (json.get("animations")?.asJsonArray ?: JsonArray()).map { animJson -> + (json.get("animations")?.normalizeToArray()?.asJsonArray ?: JsonArray()).map { animJson -> try { val expr = animJson.asString.asExpressionLike() runtime.resolveObject(expr).obj as StatefulAnimation @@ -97,10 +103,11 @@ class JsonPose(model: PoseableEntityModel, json: JsonObject) { val loopTimes = json.get("loopTimes")?.asInt ?: 1 val minSeconds = json.get("minSecondsBetweenOccurrences")?.asFloat ?: 8F val maxSeconds = json.get("maxSecondsBetweenOccurrences")?.asFloat ?: 30F + val condition = json.get("condition")?.asString?.asExpressionLike() ?: "true".asExpressionLike() model.quirkMultiple( secondsBetweenOccurrences = minSeconds to maxSeconds, - condition = { true }, + condition = { it.runtime.resolveBoolean(condition) }, loopTimes = 1..loopTimes, animations = animations ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/LocatorAccess.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/LocatorAccess.kt index fbd360426c..5c4f738f62 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/LocatorAccess.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/LocatorAccess.kt @@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench import com.cobblemon.mod.common.client.render.MatrixWrapper import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone import net.minecraft.client.util.math.MatrixStack +import net.minecraft.entity.Entity /** * A storage of locator information for a model, attached to its [joint]. @@ -68,20 +69,45 @@ class LocatorAccess( * Updates all of the locator states with the position at this current frame. * This is the same logic as ModelPart uses, that's why we reuse ModelPart#rotate. */ - fun update(matrixStack: MatrixStack, state: MutableMap) { + fun update(matrixStack: MatrixStack, entity: Entity, scale: Float, state: MutableMap, isRoot: Boolean = false) { matrixStack.push() joint.transform(matrixStack) + if (isRoot) { + matrixStack.push() + matrixStack.scale(-1F, -1F, 1F) + state.getOrPut("root") { MatrixWrapper() }.updateMatrix(matrixStack.peek().positionMatrix) + matrixStack.pop() + + // Put in an approximation of the target locator. If the model has one defined, + // this will be overridden. + matrixStack.push() + matrixStack.translate(0.0, -entity.boundingBox.yLength / 2.0 / scale, -entity.width * 0.6 / scale) + matrixStack.scale(-1F, -1F, 1F) + state.getOrPut("target") { MatrixWrapper() }.updateMatrix(matrixStack.peek().positionMatrix) + state.getOrPut("special_attack") { MatrixWrapper() }.updateMatrix(matrixStack.peek().positionMatrix) + matrixStack.pop() + + // If we have the entity, put in a "middle" locator for center of mass + // this will be overridden. + matrixStack.push() + matrixStack.translate(0.0, -entity.boundingBox.yLength / 2.0 / scale, 0.0) + matrixStack.scale(-1F, -1F, 1F) + state.getOrPut("middle") { MatrixWrapper() }.updateMatrix(matrixStack.peek().positionMatrix) + matrixStack.pop() + + } + for ((name, locator) in locators) { matrixStack.push() locator.transform(matrixStack) - matrixStack.scale(1F, -1F, 1F) + matrixStack.scale(-1F, -1F, 1F) state.getOrPut(name) { MatrixWrapper() }.updateMatrix(matrixStack.peek().positionMatrix) matrixStack.pop() } children.forEach { - it.update(matrixStack, state) + it.update(matrixStack, entity, scale, state, isRoot = false) } matrixStack.pop() diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt index 5cf91acd30..78c09e1f34 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt @@ -46,6 +46,7 @@ import com.cobblemon.mod.common.util.asExpressionLike import com.cobblemon.mod.common.util.getDoubleOrNull import com.cobblemon.mod.common.util.getStringOrNull import com.cobblemon.mod.common.util.plus +import com.cobblemon.mod.common.util.resolveBoolean import net.minecraft.client.model.ModelPart import net.minecraft.client.render.OverlayTexture import net.minecraft.client.render.RenderLayer @@ -154,6 +155,7 @@ abstract class PoseableEntityModel( val maxPitch = params.getDoubleOrNull(3) ?: 70F val minPitch = params.getDoubleOrNull(4) ?: -45F val maxYaw = params.getDoubleOrNull(5) ?: 45F + val minYaw = params.getDoubleOrNull(6) ?: -45F ObjectValue( SingleBoneLookAnimation( frame = this, @@ -162,7 +164,8 @@ abstract class PoseableEntityModel( yawMultiplier = yawMultiplier.toFloat(), maxPitch = maxPitch.toFloat(), minPitch = minPitch.toFloat(), - maxYaw = maxYaw.toFloat() + maxYaw = maxYaw.toFloat(), + minYaw = minYaw.toFloat() ) ) } @@ -258,6 +261,41 @@ abstract class PoseableEntityModel( ) ) } + .addFunction("bedrock_primary_quirk") { params -> + val animationGroup = params.getString(0) + val animationNames = params.get(1)?.let { if (it is ArrayStruct) it.map.values.map { it.asString() } else listOf(it.asString()) } ?: listOf() + val minSeconds = params.getDoubleOrNull(2) ?: 8F + val maxSeconds = params.getDoubleOrNull(3) ?: 30F + val loopTimes = params.getDoubleOrNull(4)?.toInt() ?: 1 + val excludedLabels = mutableSetOf() + var curve: WaveFunction = { t -> + if (t < 0.1) { + t * 10 + } else if (t < 0.9) { + 1F + } else { + 1F + } + } + for (index in 5 until params.params.size) { + val param = params.get(index) + if (param is ObjectValue<*>) { + curve = param.obj as WaveFunction + continue + } + + val label = params.getString(index) ?: continue + excludedLabels.add(label) + } + ObjectValue( + quirk( + secondsBetweenOccurrences = minSeconds.toFloat() to maxSeconds.toFloat(), + condition = { true }, + loopTimes = 1..loopTimes, + animation = { PrimaryAnimation(bedrockStateful(animationGroup, animationNames.random()), excludedLabels = excludedLabels, curve = curve) } + ) + ) + } @Transient val runtime = MoLangRuntime().setup().setupClient().also { it.environment.getQueryStruct().addFunctions(functions.functions) } @@ -785,7 +823,6 @@ abstract class PoseableEntityModel( matrixStack.push() matrixStack.scale(-1F, -1F, 1F) scale = entity.pokemon.form.baseScale * entity.pokemon.scaleModifier * (entity.delegate as PokemonClientDelegate).entityScaleModifier - matrixStack.scale(scale, scale, scale) } else if (entity is EmptyPokeBallEntity) { matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(entity.yaw)) @@ -800,17 +837,14 @@ abstract class PoseableEntityModel( matrixStack.scale(1F, -1F, 1F) } - matrixStack.push() - matrixStack.scale(1F, -1F, 1F) val states = state.locatorStates - states.getOrPut("root") { MatrixWrapper() }.updateMatrix(matrixStack.peek().positionMatrix) - matrixStack.pop() if (isForLivingEntityRenderer) { // Standard living entity offset, only God knows why Mojang did this. matrixStack.translate(0.0, -1.5, 0.0) } + locatorAccess.update(matrixStack, entity, scale, states, isRoot = true) // If we have the entity, put in an approximation of the target locator. If the model has one defined, // this will be overridden. matrixStack.push() @@ -876,6 +910,18 @@ abstract class PoseableEntityModel( animations = { listOf(animation(it)) } ) + fun quirkMoLangCondition( + secondsBetweenOccurrences: Pair = 8F to 30F, + loopTimes: IntRange = 1..1, + conditionExpression: ExpressionLike = "true".asExpressionLike(), + animation: (state: PoseableEntityState) -> StatefulAnimation + ) = SimpleQuirk( + secondsBetweenOccurrences = secondsBetweenOccurrences, + loopTimes = loopTimes, + condition = { it.runtime.resolveBoolean(conditionExpression) }, + animations = { listOf(animation(it)) } + ) + fun quirkMultiple( secondsBetweenOccurrences: Pair = 8F to 30F, loopTimes: IntRange = 1..1, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt index f56e05716b..509e4d1646 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt @@ -78,7 +78,7 @@ abstract class PoseableEntityState : Schedulable { "anim_time" to java.util.function.Function { return@Function reusableAnimTime.also { it.value = animationSeconds.toDouble() } }, "pose_type" to java.util.function.Function { return@Function StringValue((getEntity() as Poseable).getCurrentPoseType().name) }, "pose" to java.util.function.Function { _ -> return@Function StringValue(currentPose ?: "") }, - "say" to java.util.function.Function { params -> MinecraftClient.getInstance().player?.sendMessage(params.getString(0).text()) ?: Unit }, + "has_entity" to java.util.function.Function { _ -> return@Function DoubleValue(getEntity() != null) }, "sound" to java.util.function.Function { params -> val entity = getEntity() ?: return@Function Unit if (params.get(0) !is StringValue) { @@ -135,6 +135,7 @@ abstract class PoseableEntityState : Schedulable { val storm = ParticleStorm( effect = effect, + entity = entity, matrixWrapper = matrixWrapper, world = world, runtime = particleRuntime, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/SingleBoneLookAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/SingleBoneLookAnimation.kt index 58858d91e9..c81c90d6e6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/SingleBoneLookAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/SingleBoneLookAnimation.kt @@ -33,7 +33,7 @@ class SingleBoneLookAnimation( val pitchMultiplier: Float = 1F, val yawMultiplier: Float = 1F, val maxPitch: Float = 70F, - val minPitch: Float = 45F, + val minPitch: Float = -45F, val maxYaw: Float = 45F, val minYaw: Float = -45F, ) : StatelessAnimation(frame) { @@ -54,8 +54,8 @@ class SingleBoneLookAnimation( bone = frame.head, pitchMultiplier = pitchMultiplier ?: if (disableX) 0F else if (invertX) -1F else 1F, yawMultiplier = yawMultiplier ?: if (disableY) 0F else if (invertY) -1F else 1F, - maxPitch = maxPitch ?: 45F, - minPitch = minPitch ?: -70F, + maxPitch = maxPitch ?: 70F, + minPitch = minPitch ?: -45F, maxYaw = maxYaw ?: 45F, minYaw = minYaw ?: -45F, ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt index 004214eb68..c7b2dd97b8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt @@ -9,6 +9,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.client.entity.PokemonClientDelegate import com.cobblemon.mod.common.client.render.models.blockbench.JsonPose import com.cobblemon.mod.common.client.render.models.blockbench.JsonPoseableEntityModel import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState @@ -20,6 +21,11 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose import com.cobblemon.mod.common.entity.pokemon.PokemonEntity import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter import com.cobblemon.mod.common.util.adapters.Vec3dAdapter +import com.cobblemon.mod.common.util.isDusk +import com.cobblemon.mod.common.util.isStandingOnRedSand +import com.cobblemon.mod.common.util.isStandingOnSand +import com.cobblemon.mod.common.util.isStandingOnSandOrRedSand +import com.cobblemon.mod.common.util.resolveBoolean import com.google.gson.ExclusionStrategy import com.google.gson.FieldAttributes import com.google.gson.GsonBuilder @@ -33,6 +39,7 @@ import com.google.gson.annotations.SerializedName import com.google.gson.reflect.TypeToken import java.lang.reflect.Type import java.util.function.Supplier +import net.minecraft.client.model.ModelPart import net.minecraft.util.math.Vec3d /** @@ -43,7 +50,8 @@ import net.minecraft.util.math.Vec3d * @author Hiroku * @since August 7th, 2022 */ -class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableModel(), HeadedFrame { +class JsonPokemonPoseableModel(rootPart: Bone) : PokemonPoseableModel(), HeadedFrame { + override val rootPart = (rootPart as ModelPart).children.entries.first().let { rootPart.registerChildWithAllChildren(it.key) } companion object { val gson = GsonBuilder() .setPrettyPrinting() @@ -80,30 +88,12 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod override val head: Bone by lazy { headJoint?.let { getPart(it) } ?: rootPart } - - @SerializedName("portraitScale") - private val _portraitScale: Float? = null - @SerializedName("portraitTranslation") - private val _portraitTranslation: Vec3d? = null - - @SerializedName("profileScale") - private val _profileScale: Float? = null - @SerializedName("profileTranslation") - private val _profileTranslation: Vec3d? = null - //Some weirdness going on here, vars have to be initialized, gson doesn't like multiple fields with the same name - @Transient + //Idk, works fine with Blastoise override var portraitScale = 1F - get() = _portraitScale ?: 1F - @Transient override var portraitTranslation = Vec3d.ZERO - get() = _portraitTranslation ?: Vec3d(0.0, 0.0, 0.0) - @Transient override var profileScale = 1F - get() = _profileScale ?: 1F - @Transient override var profileTranslation = Vec3d.ZERO - get() = _profileTranslation ?: Vec3d(0.0, 0.0, 0.0) val faint: Supplier>? = null @@ -142,6 +132,7 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod override fun createInstance(type: Type): JsonPokemonPoseableModel { return JsonPokemonPoseableModel(modelPart!!).also { model = it + modelPart as ModelPart it.loadAllNamedChildren(modelPart!!) } } @@ -163,6 +154,32 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod if (mustBeTouchingWater != null) { conditionsList.add { mustBeTouchingWater == it.isTouchingWater } } + val mustBeTouchingWaterOrRain = json.get("isTouchingWaterOrRain")?.asBoolean + if (mustBeTouchingWaterOrRain != null) { + conditionsList.add { mustBeTouchingWaterOrRain == it.isTouchingWaterOrRain } + } + val mustBeSubmergedInWater = json.get("isSubmergedInWater")?.asBoolean + if (mustBeSubmergedInWater != null) { + conditionsList.add { mustBeSubmergedInWater == it.isSubmergedInWater } + } + val mustBeStandingOnRedSand = json.get("isStandingOnRedSand")?.asBoolean + if (mustBeStandingOnRedSand != null) { + conditionsList.add { mustBeStandingOnRedSand == it.isStandingOnRedSand() } + } + val mustBeStandingOnSand = json.get("isStandingOnSand")?.asBoolean + if (mustBeStandingOnSand != null) { + conditionsList.add { mustBeStandingOnSand == it.isStandingOnSand() } + } + val mustBeStandingOnSandOrRedSand = json.get("isStandingOnSandOrRedSand")?.asBoolean + if (mustBeStandingOnSandOrRedSand != null) { + conditionsList.add { mustBeStandingOnSandOrRedSand == it.isStandingOnSandOrRedSand() } + } + val mustBeDusk = json.get("isDusk")?.asBoolean + if (mustBeDusk != null) { + conditionsList.add { mustBeDusk == it.isDusk() } + } + + conditionsList.add { (it.delegate as PokemonClientDelegate).runtime.resolveBoolean(pose.condition) } val poseCondition: ((PokemonEntity) -> Boolean)? = if (conditionsList.isEmpty()) null else conditionsList.reduce { acc, function -> { acc(it) && function(it) } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KabutopsModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KabutopsModel.kt index e66fa04149..0caccd708f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KabutopsModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KabutopsModel.kt @@ -8,13 +8,14 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 -import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel import com.cobblemon.mod.common.entity.PoseType +import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES +import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES import net.minecraft.client.model.ModelPart import net.minecraft.util.math.Vec3d @@ -56,7 +57,7 @@ class KabutopsModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe standing = registerPose( poseName = "standing", - poseTypes = UI_POSES + PoseType.STAND, + poseTypes = UI_POSES + STATIONARY_POSES, condition = { !it.isBattling }, quirks = arrayOf(blink), idleAnimations = arrayOf( @@ -67,7 +68,7 @@ class KabutopsModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe walk = registerPose( poseName = "walk", - poseType = PoseType.WALK, + poseTypes = MOVING_POSES, quirks = arrayOf(blink), idleAnimations = arrayOf( singleBoneLook(), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt index 2110d80fa2..072d1e278c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt @@ -8,21 +8,14 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 -import com.cobblemon.mod.common.client.render.models.blockbench.animation.WingFlapIdleAnimation import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation -import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame -import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel -import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation -import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.parabolaFunction -import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.sineFunction import com.cobblemon.mod.common.entity.PoseType import com.cobblemon.mod.common.entity.PoseType.Companion.SHOULDER_POSES import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES -import com.cobblemon.mod.common.util.math.geometry.toRadians import net.minecraft.client.model.ModelPart import net.minecraft.util.math.Vec3d @@ -66,7 +59,7 @@ class PidgeyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { stand = registerPose( poseName = "standing", - poseTypes = SHOULDER_POSES + UI_POSES + PoseType.STANDING_POSES, + poseTypes = SHOULDER_POSES + UI_POSES + PoseType.STATIONARY_POSES - PoseType.HOVER, transformTicks = 10, transformedParts = arrayOf( wingClosedLeft.createTransformation().withVisibility(visibility = true), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt index 1f17ee1a08..49f10c4c0a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt @@ -58,7 +58,6 @@ class RattataAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, poseTypes = setOf(PoseType.NONE, PoseType.PROFILE, PoseType.STAND, PoseType.FLOAT, PoseType.PORTRAIT, PoseType.SHOULDER_LEFT, PoseType.SHOULDER_RIGHT), transformTicks = 10, quirks = arrayOf(blink), - condition = { !it.dataTracker.get(PokemonEntity.MOVING) }, idleAnimations = arrayOf( singleBoneLook(), bedrock("rattata_alolan", "ground_idle") @@ -69,7 +68,6 @@ class RattataAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, poseType = PoseType.WALK, transformTicks = 10, quirks = arrayOf(blink), - condition = { it.dataTracker.get(PokemonEntity.MOVING) }, idleAnimations = arrayOf( singleBoneLook(), bedrock("rattata_alolan", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt index fa9f8dcf23..216ce3e9c5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt @@ -57,7 +57,6 @@ class RattataModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr poseTypes = setOf(PoseType.NONE, PoseType.PROFILE, PoseType.STAND, PoseType.FLOAT, PoseType.PORTRAIT, PoseType.SHOULDER_LEFT, PoseType.SHOULDER_RIGHT), transformTicks = 10, quirks = arrayOf(blink), - condition = { !it.dataTracker.get(PokemonEntity.MOVING) }, idleAnimations = arrayOf( singleBoneLook(), bedrock("rattata", "ground_idle") @@ -68,7 +67,6 @@ class RattataModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr poseType = PoseType.WALK, transformTicks = 10, quirks = arrayOf(blink), - condition = { it.dataTracker.get(PokemonEntity.MOVING) }, idleAnimations = arrayOf( singleBoneLook(), bedrock("rattata", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmeargleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmeargleModel.kt new file mode 100644 index 0000000000..c136347f0c --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmeargleModel.kt @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2 + +import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel +import com.cobblemon.mod.common.entity.PoseType +import net.minecraft.client.model.ModelPart +import net.minecraft.util.math.Vec3d + +class SmeargleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { + override val rootPart = root.registerChildWithAllChildren("smeargle") + override val head = getPart("head") + + /* No arm swinging because it's holding its tail */ + override val leftLeg = getPart("leg_left") + override val rightLeg = getPart("leg_right") + + override var portraitScale = 1.29F + override var portraitTranslation = Vec3d(-0.03, 0.96, 0.0) + + override var profileScale = 0.67F + override var profileTranslation = Vec3d(0.05, 0.8, 0.0) + + lateinit var standing: PokemonPose + lateinit var walk: PokemonPose + + //override val cryAnimation = CryProvider { _, _ -> bedrockStateful("smeargle", "cry") } + + override fun registerPoses() { + val blink = quirk { bedrockStateful("smeargle", "blink") } + standing = registerPose( + poseName = "standing", + poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES + PoseType.SLEEP, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + bedrock("smeargle", "ground_idle") + ) + ) + + walk = registerPose( + poseName = "walk", + poseTypes = PoseType.MOVING_POSES, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + bedrock("smeargle", "ground_idle"), + BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F) + ) + ) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt index 5cb3bf1bf1..3dd8e7513c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt @@ -46,7 +46,7 @@ class SudowoodoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip poseTypes = STATIONARY_POSES + UI_POSES, quirks = arrayOf(blink), idleAnimations = arrayOf( - singleBoneLook(), + singleBoneLook(yawMultiplier = 0F), bedrock("sudowoodo", "ground_idle") ) ) @@ -56,7 +56,7 @@ class SudowoodoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip poseTypes = MOVING_POSES, quirks = arrayOf(blink), idleAnimations = arrayOf( - singleBoneLook(), + singleBoneLook(yawMultiplier = 0F), bedrock("sudowoodo", "ground_idle"), BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F), BimanualSwingAnimation(this, swingPeriodMultiplier = 0.6F, amplitudeMultiplier = 0.9F) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt index d2035065d9..60bcc4ccbd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt @@ -47,7 +47,6 @@ class ShedinjaModel (root: ModelPart) : PokemonPoseableModel() { poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, transformTicks = 10, - condition = { !it.isBattling }, quirks = arrayOf(blink), idleAnimations = arrayOf( bedrock("shedinja", "ground_idle") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt index ba4c8ec519..084f167d52 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt @@ -20,7 +20,7 @@ import net.minecraft.util.math.Vec3d class WailordModel(root: ModelPart) : PokemonPoseableModel() { override val rootPart = root.registerChildWithAllChildren("wailord") override var portraitScale = 0.45F - override var portraitTranslation = Vec3d(-0.38, 0.8, 0.0) + override var portraitTranslation = Vec3d(-0.38, 0.8, 6.69) override var profileScale = 0.25F override var profileTranslation = Vec3d(0.0, 1.2, -10.0) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt index d2f54850b4..f80097f542 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt @@ -9,6 +9,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation +import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose @@ -34,6 +35,12 @@ class ZigzagoonGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedF lateinit var standing: PokemonPose lateinit var walk: PokemonPose + lateinit var shoulderLeft: PokemonPose + lateinit var shoulderRight: PokemonPose + + val shoulderOffsetX = 0 + val shoulderOffsetY = 0 + val shoulderOffsetZ = -0.5 override fun registerPoses() { val blink = quirk { bedrockStateful("zigzagoon_galarian", "blink") } @@ -57,6 +64,30 @@ class ZigzagoonGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedF bedrock("zigzagoon_galarian", "ground_idle") ) ) + + shoulderLeft = registerPose( + poseType = PoseType.SHOULDER_LEFT, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + bedrock("zigzagoon", "shoulder_left") + ), + transformedParts = arrayOf( + rootPart.createTransformation().addPosition(shoulderOffsetX, shoulderOffsetY, shoulderOffsetZ) + ) + ) + + shoulderRight = registerPose( + poseType = PoseType.SHOULDER_RIGHT, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + bedrock("zigzagoon", "shoulder_right") + ), + transformedParts = arrayOf( + rootPart.createTransformation().addPosition(-shoulderOffsetX, shoulderOffsetY, shoulderOffsetZ) + ) + ) } // override fun getFaintAnimation( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt index 92134a57a2..208e36fe35 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt @@ -35,7 +35,7 @@ class MismagiusModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, quirks = arrayOf(blink), idleAnimations = arrayOf( - singleBoneLook(), + singleBoneLook(yawMultiplier = 0.5F), bedrock("mismagius", "ground_idle") ) ) @@ -45,7 +45,7 @@ class MismagiusModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseTypes = PoseType.MOVING_POSES, quirks = arrayOf(blink), idleAnimations = arrayOf( - singleBoneLook(), + singleBoneLook(yawMultiplier = 0.5F), bedrock("mismagius", "ground_idle") //bedrock("mismagius", "ground_walk") ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt index f0f823aab5..b4c0a25cbc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt @@ -8,15 +8,12 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen5 -import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState -import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel import com.cobblemon.mod.common.entity.PoseType -import com.cobblemon.mod.common.entity.pokemon.PokemonEntity import net.minecraft.client.model.ModelPart import net.minecraft.util.math.Vec3d @@ -39,6 +36,7 @@ class ConkeldurrModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var battleidle: PokemonPose override val cryAnimation = CryProvider { _, _ -> bedrockStateful("conkeldurr", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("conkeldurr", "blink") } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt index 474172daca..b45f7c7b3b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt @@ -14,6 +14,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFr import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel import com.cobblemon.mod.common.entity.PoseType @@ -40,6 +41,8 @@ class GolettModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose lateinit var sleep: PokemonPose + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golett", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("golett", "blink") } standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt index 28c0ac92e3..c4580f330f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt @@ -12,6 +12,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntitySt import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel import com.cobblemon.mod.common.entity.PoseType @@ -33,6 +34,8 @@ class GolurkModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golurk", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("golurk", "blink") } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PetililHisuiBiasModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PetililHisuiBiasModel.kt index 93831a8d28..7dc966d497 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PetililHisuiBiasModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PetililHisuiBiasModel.kt @@ -25,8 +25,8 @@ class PetililHisuiBiasModel (root: ModelPart) : PokemonPoseableModel(), HeadedFr val leaf_left = getPart("leaf_left_rotation") val leaf_right = getPart("leaf_right_rotation") - override var portraitScale = 1.75F - override var portraitTranslation = Vec3d(0.01, -0.39, 0.0) + override var portraitScale = 1.52F + override var portraitTranslation = Vec3d(0.1, -0.25, 0.0) override var profileScale = 0.8F override var profileTranslation = Vec3d(0.0, 0.5, 0.0) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PetililModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PetililModel.kt index b20b8fe564..beaebe4144 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PetililModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PetililModel.kt @@ -22,8 +22,8 @@ class PetililModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override val rootPart = root.registerChildWithAllChildren("petilil") override val head = getPart("head") - override var portraitScale = 2.0F - override var portraitTranslation = Vec3d(-0.3, -1.2, 0.0) + override var portraitScale = 1.52F + override var portraitTranslation = Vec3d(0.1, -0.25, 0.0) override var profileScale = 0.8F override var profileTranslation = Vec3d(0.0, 0.5, 0.0) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AurorusModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AurorusModel.kt index d088c2aeda..85feee6a47 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AurorusModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AurorusModel.kt @@ -8,13 +8,11 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen6 -import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel import com.cobblemon.mod.common.entity.PoseType -import com.cobblemon.mod.common.entity.pokemon.PokemonEntity import net.minecraft.client.model.ModelPart import net.minecraft.util.math.Vec3d @@ -51,7 +49,7 @@ class AurorusModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { condition = { !it.isBattling }, quirks = arrayOf(blink), idleAnimations = arrayOf( - singleBoneLook(), + singleBoneLook(minPitch = -15F), bedrock("aurorus", "ground_idle") ) ) @@ -63,7 +61,7 @@ class AurorusModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { quirks = arrayOf(blink), condition = { it.isBattling }, idleAnimations = arrayOf( - singleBoneLook(), + singleBoneLook(minPitch = -15F), bedrock("aurorus", "battle_idle") ) ) @@ -74,7 +72,7 @@ class AurorusModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( - singleBoneLook(), + singleBoneLook(minPitch = -15F), bedrock("aurorus", "ground_walk") ) ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/KlefkiModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/KlefkiModel.kt index 8d66679153..516016c104 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/KlefkiModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/KlefkiModel.kt @@ -36,7 +36,7 @@ class KlefkiModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val blink = quirk { bedrockStateful("klefki", "blink") } standing = registerPose( poseName = "standing", - poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, + poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES + PoseType.SLEEP, quirks = arrayOf(blink), condition = { !it.isBattling }, idleAnimations = arrayOf( @@ -47,7 +47,7 @@ class KlefkiModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { battleidle = registerPose( poseName = "battle_idle", - poseTypes = PoseType.STATIONARY_POSES, + poseTypes = PoseType.STATIONARY_POSES + PoseType.SLEEP, transformTicks = 10, quirks = arrayOf(blink), condition = { it.isBattling }, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TyrantrumModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TyrantrumModel.kt index bc0c2045e7..03a366f4e2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TyrantrumModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TyrantrumModel.kt @@ -21,7 +21,7 @@ class TyrantrumModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override val head = getPart("head") - override var portraitTranslation = Vec3d(-0.86, 2.0, 0.0) + override var portraitTranslation = Vec3d(-0.86, 2.0, 5.0) override var portraitScale = 0.59F override var profileTranslation = Vec3d(0.02, 1.28, -10.0) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArctozoltModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArctozoltModel.kt index 41eac01567..ac42f23ba8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArctozoltModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArctozoltModel.kt @@ -20,7 +20,7 @@ import net.minecraft.util.math.Vec3d class ArctozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override val rootPart = root.registerChildWithAllChildren("arctozolt") - override val head = getPart("head") + override val head = getPart("head_ai") override var portraitTranslation = Vec3d(-0.45, 2.15, 0.0) override var portraitScale = 0.85F @@ -85,6 +85,7 @@ class ArctozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink, quirk), idleAnimations = arrayOf( + singleBoneLook(), bedrock("arctozolt", "ground_idle") ) ) @@ -96,6 +97,7 @@ class ArctozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("arctozolt", "ground_walk") ) ) @@ -107,6 +109,7 @@ class ArctozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("arctozolt", "water_idle") ) ) @@ -118,6 +121,7 @@ class ArctozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("arctozolt", "water_swim") ) ) @@ -129,6 +133,7 @@ class ArctozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink, quirk), idleAnimations = arrayOf( + singleBoneLook(), bedrock("arctozolt", "surfacewater_idle") ) ) @@ -140,6 +145,7 @@ class ArctozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("arctozolt", "surfacewater_swim") ) ) @@ -151,6 +157,7 @@ class ArctozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink, quirk), idleAnimations = arrayOf( + singleBoneLook(), bedrock("arctozolt", "battle_idle") ) ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DracovishModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DracovishModel.kt index 5482db5706..adce3aa211 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DracovishModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DracovishModel.kt @@ -18,9 +18,9 @@ import net.minecraft.util.math.Vec3d class DracovishModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override val rootPart = root.registerChildWithAllChildren("dracovish") - override val head = getPart("head") + override val head = getPart("head_ai") - override var portraitTranslation = Vec3d(-0.25, 2.15, 0.0) + override var portraitTranslation = Vec3d(-0.25, 1.90, 0.0) override var portraitScale = 0.55F override var profileScale = 0.3F @@ -74,6 +74,7 @@ class DracovishModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("dracovish", "ground_idle") ) ) @@ -84,6 +85,7 @@ class DracovishModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("dracovish", "ground_walk") ) ) @@ -94,6 +96,7 @@ class DracovishModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("dracovish", "water_idle") ) ) @@ -104,6 +107,7 @@ class DracovishModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("dracovish", "water_swim") ) ) @@ -115,6 +119,7 @@ class DracovishModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("dracovish", "battle_idle") ) ) @@ -126,6 +131,7 @@ class DracovishModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("dracovish", "water_battle_idle") ) ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DracozoltModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DracozoltModel.kt index 90669562f0..008f2f8c6a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DracozoltModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DracozoltModel.kt @@ -18,7 +18,7 @@ import net.minecraft.util.math.Vec3d class DracozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override val rootPart = root.registerChildWithAllChildren("dracozolt") - override val head = getPart("head") + override val head = getPart("head_ai") override var portraitScale = 0.85F override var portraitTranslation = Vec3d(-0.55, 1.45, 0.0) @@ -53,6 +53,7 @@ class DracozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("dracozolt", "ground_idle") ) ) @@ -63,6 +64,7 @@ class DracozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("dracozolt", "ground_walk") ) ) @@ -74,6 +76,7 @@ class DracozoltModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { transformTicks = 10, quirks = arrayOf(blink), idleAnimations = arrayOf( + singleBoneLook(), bedrock("dracozolt", "battle_idle") ) ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt index be96fb1213..a66f0208a4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt @@ -28,8 +28,8 @@ class DubwoolModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr override val foreRightLeg = getPart("leg_front_right") override val hindLeftLeg = getPart("leg_back_left") override val hindRightLeg = getPart("leg_back_right") - val wool = getPart("wool") - val neckWool = getPart("neck_wool") + val wool = getPart("wool_shearable") + val neckWool = getPart("neck_wool_shearable") override var portraitScale = 3.1F override var portraitTranslation = Vec3d(-1.2, -0.7, 0.0) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt index da9b9c9f92..832715968a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt @@ -28,7 +28,7 @@ class WoolooModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru override val foreRightLeg = getPart("leg_front_right") override val hindLeftLeg = getPart("leg_back_left") override val hindRightLeg = getPart("leg_back_right") - val wool = getPart("wool") + val wool = getPart("wool_shearable") override var portraitScale = 3.1F override var portraitTranslation = Vec3d(-0.85, -1.8, 0.0) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt index 9ad0daa451..b200178a75 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt @@ -714,6 +714,7 @@ object PokemonModelRepository : VaryingModelRepository PokemonPoseableModel { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt index fa316770cb..df84e5e64c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt @@ -42,7 +42,6 @@ import net.minecraft.client.render.entity.model.EntityModel import net.minecraft.client.render.item.ItemRenderer import net.minecraft.client.util.math.MatrixStack import net.minecraft.entity.Entity -import net.minecraft.entity.player.PlayerEntity import net.minecraft.text.Text import net.minecraft.util.Identifier import net.minecraft.util.math.MathConstants.PI @@ -154,7 +153,6 @@ class PokemonRenderer( var beamSourcePosition = if (phaseTarget is EmptyPokeBallEntity) { (phaseTarget.delegate as PokeBallPoseableState).locatorStates["beam"]?.getOrigin() ?: phaseTarget.pos } else { - phaseTarget as PlayerEntity if (phaseTarget.uuid == MinecraftClient.getInstance().player?.uuid) { val lookVec = phaseTarget.rotationVector.rotateY(PI / 2).multiply(1.0, 0.0, 1.0).normalize() phaseTarget.getCameraPosVec(partialTicks).subtract(0.0, 0.4, 0.0).subtract(lookVec.multiply(0.3)) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/command/CobblemonInfoCommand.kt b/common/src/main/kotlin/com/cobblemon/mod/common/command/CobblemonInfoCommand.kt index 5edc49b0da..06501fef91 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/command/CobblemonInfoCommand.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/command/CobblemonInfoCommand.kt @@ -65,12 +65,6 @@ object CobblemonInfoCommand { .append(this.SPACE) .append(CobblemonBuildDetails.BRANCH) - message.append(this.NEW_LINE) - .append(this.INDENT) - .append(Text.literal("Timestamp:").styled { it.withColor(Formatting.GRAY) }) - .append(this.SPACE) - .append(CobblemonBuildDetails.TIMESTAMP) - ctx.source.sendMessage(message) 0 } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/command/SpawnPokemonFromPool.kt b/common/src/main/kotlin/com/cobblemon/mod/common/command/SpawnPokemonFromPool.kt index 8b1cb3d03b..b5bb9abaef 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/command/SpawnPokemonFromPool.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/command/SpawnPokemonFromPool.kt @@ -92,6 +92,7 @@ object SpawnPokemonFromPool { } } + spawnAction.complete() spawnsTriggered++ } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt b/common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt index 929e6887af..de77803e3a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/command/TestCommand.kt @@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.Priority import com.cobblemon.mod.common.api.abilities.Abilities import com.cobblemon.mod.common.api.item.ability.AbilityChanger import com.cobblemon.mod.common.api.pokemon.PokemonProperties +import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker.after import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker import com.cobblemon.mod.common.api.scheduling.taskBuilder import com.cobblemon.mod.common.api.text.green @@ -25,10 +26,13 @@ import com.cobblemon.mod.common.battles.BattleSide import com.cobblemon.mod.common.battles.actor.PlayerBattleActor import com.cobblemon.mod.common.battles.actor.PokemonBattleActor import com.cobblemon.mod.common.battles.pokemon.BattlePokemon +import com.cobblemon.mod.common.entity.generic.GenericBedrockEntity +import com.cobblemon.mod.common.net.messages.client.animation.PlayPoseableAnimationPacket import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket import com.cobblemon.mod.common.trade.ActiveTrade import com.cobblemon.mod.common.trade.DummyTradeParticipant import com.cobblemon.mod.common.trade.PlayerTradeParticipant +import com.cobblemon.mod.common.util.cobblemonResource import com.cobblemon.mod.common.util.party import com.cobblemon.mod.common.util.toPokemon import com.google.gson.GsonBuilder @@ -61,6 +65,22 @@ object TestCommand { } try { + val player = context.source.entity as ServerPlayerEntity + val evolutionEntity = GenericBedrockEntity(world = player.world) + evolutionEntity?.apply { + category = cobblemonResource("evolution") + colliderHeight = 1.5F + colliderWidth = 1.5F + scale = 1F + syncAge = true // Otherwise particle animation will be starting from zero even if you come along partway through + setPosition(player.x, player.y, player.z + 4) + } + player.world.spawnEntity(evolutionEntity) + after(seconds = 0.5F) { + player.sendPacket(PlayPoseableAnimationPacket(evolutionEntity.id, setOf("evolution:animation.evolution.evolution"), emptySet())) + } + + // readBerryDataFromCSV() // this.testClosestBattle(context) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt b/common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt index 1a8dde1967..d1e17a27b1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt @@ -171,9 +171,6 @@ class CobblemonConfig { @NodeCategory(Category.Spawning) var baseApricornTreeGenerationChance = 0.1F - @NodeCategory(Category.Pokemon) - var ninjaskCreatesShedinja = true - @NodeCategory(Category.Pokemon) var displayEntityLevelLabel = true diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/config/starter/StarterConfig.kt b/common/src/main/kotlin/com/cobblemon/mod/common/config/starter/StarterConfig.kt index 1da0f42587..fd76f04e52 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/config/starter/StarterConfig.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/config/starter/StarterConfig.kt @@ -109,9 +109,9 @@ class StarterConfig { name = "Hisui Bias", displayName = "cobblemon.starterselection.category.hisui_bias", pokemon = mutableListOf( - PokemonProperties.parse("Rowlet region_bias=hisui level=10"), - PokemonProperties.parse("Cyndaquil region_bias=hisui level=10"), - PokemonProperties.parse("Oshawott region_bias=hisui level=10"), + PokemonProperties.parse("Rowlet region_bias=hisui level=10 pokeball=ancient_poke_ball"), + PokemonProperties.parse("Cyndaquil region_bias=hisui level=10 pokeball=ancient_poke_ball"), + PokemonProperties.parse("Oshawott region_bias=hisui level=10 pokeball=ancient_poke_ball"), ) ), StarterCategory( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokeball/EmptyPokeBallEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokeball/EmptyPokeBallEntity.kt index 8fd776c4fb..c09c2ebb17 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokeball/EmptyPokeBallEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokeball/EmptyPokeBallEntity.kt @@ -20,6 +20,7 @@ import com.cobblemon.mod.common.api.net.serializers.StringSetDataSerializer import com.cobblemon.mod.common.api.net.serializers.Vec3DataSerializer import com.cobblemon.mod.common.api.pokeball.PokeBalls import com.cobblemon.mod.common.api.pokeball.catching.CaptureContext +import com.cobblemon.mod.common.api.pokemon.PokemonSpecies import com.cobblemon.mod.common.api.pokemon.status.Statuses import com.cobblemon.mod.common.api.reactive.SimpleObservable import com.cobblemon.mod.common.api.scheduling.Schedulable @@ -57,6 +58,7 @@ import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket import net.minecraft.particle.ParticleTypes import net.minecraft.server.network.ServerPlayerEntity import net.minecraft.sound.SoundEvents +import net.minecraft.util.Identifier import net.minecraft.util.hit.BlockHitResult import net.minecraft.util.hit.EntityHitResult import net.minecraft.util.hit.HitResult @@ -191,7 +193,7 @@ class EmptyPokeBallEntity : ThrownItemEntity, Poseable, WaterDragModifier, Sched val owner = owner if (!pokemonEntity.pokemon.isWild()) { - owner?.sendMessage(lang("capture.not_wild", pokemonEntity.pokemon.species.translatedName).red()) + owner?.sendMessage(lang("capture.not_wild", pokemonEntity.exposedSpecies.translatedName).red()) return drop() } @@ -206,7 +208,7 @@ class EmptyPokeBallEntity : ThrownItemEntity, Poseable, WaterDragModifier, Sched val hitBattlePokemon = hitActor?.activePokemon?.find { it.battlePokemon?.effectedPokemon?.entity == pokemonEntity } if (throwerActor == null) { - owner.sendMessage(lang("capture.in_battle", pokemonEntity.pokemon.species.translatedName).red()) + owner.sendMessage(lang("capture.in_battle", pokemonEntity.exposedSpecies.translatedName).red()) return drop() } @@ -232,13 +234,13 @@ class EmptyPokeBallEntity : ThrownItemEntity, Poseable, WaterDragModifier, Sched "capture.attempted_capture", throwerActor.getName(), pokeBall.item().name, - pokemonEntity.pokemon.species.translatedName + pokemonEntity.exposedSpecies.translatedName ).yellow() ) battle.sendUpdate(BattleCaptureStartPacket(pokeBall.name, aspects, hitBattlePokemon.getPNX())) throwerActor.forceChoose(ForcePassActionResponse()) } else if (pokemonEntity.isBusy) { - owner?.sendMessage(lang("capture.busy", pokemonEntity.pokemon.species.translatedName).red()) + owner?.sendMessage(lang("capture.busy", pokemonEntity.exposedSpecies.translatedName).red()) return drop() } else if (owner is ServerPlayerEntity && BattleRegistry.getBattleByParticipatingPlayer(owner) != null) { owner.sendMessage(lang("you_in_battle").red()) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt index 7fcb285a35..efe073d624 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt @@ -20,7 +20,11 @@ import com.cobblemon.mod.common.api.events.pokemon.ShoulderMountEvent import com.cobblemon.mod.common.api.interaction.PokemonEntityInteraction import com.cobblemon.mod.common.api.net.serializers.PoseTypeDataSerializer import com.cobblemon.mod.common.api.net.serializers.StringSetDataSerializer +import com.cobblemon.mod.common.api.pokemon.PokemonProperties +import com.cobblemon.mod.common.api.pokemon.feature.ChoiceSpeciesFeatureProvider import com.cobblemon.mod.common.api.pokemon.feature.FlagSpeciesFeature +import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures +import com.cobblemon.mod.common.api.pokemon.feature.StringSpeciesFeature import com.cobblemon.mod.common.api.pokemon.status.Statuses import com.cobblemon.mod.common.api.reactive.ObservableSubscription import com.cobblemon.mod.common.api.reactive.SimpleObservable @@ -58,7 +62,9 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolut import com.cobblemon.mod.common.pokemon.misc.GimmighoulStashHandler import com.cobblemon.mod.common.util.* import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules -import java.util.* +import java.util.EnumSet +import java.util.Optional +import java.util.UUID import java.util.concurrent.CompletableFuture import net.minecraft.entity.* import net.minecraft.entity.ai.control.MoveControl @@ -78,6 +84,7 @@ import net.minecraft.entity.passive.PassiveEntity import net.minecraft.entity.passive.TameableShoulderEntity import net.minecraft.entity.player.PlayerEntity import net.minecraft.fluid.FluidState +import net.minecraft.item.DyeItem import net.minecraft.item.ItemStack import net.minecraft.item.ItemUsage import net.minecraft.item.Items @@ -98,8 +105,11 @@ import net.minecraft.sound.SoundEvents import net.minecraft.text.PlainTextContent import net.minecraft.text.Text import net.minecraft.util.ActionResult +import net.minecraft.util.Colors +import net.minecraft.util.DyeColor import net.minecraft.util.Hand import net.minecraft.util.Identifier +import net.minecraft.util.Util import net.minecraft.util.math.BlockPos import net.minecraft.util.math.Box import net.minecraft.util.math.Vec3d @@ -131,6 +141,7 @@ open class PokemonEntity( @JvmStatic val UNBATTLEABLE = DataTracker.registerData(PokemonEntity::class.java, TrackedDataHandlerRegistry.BOOLEAN) @JvmStatic val COUNTS_TOWARDS_SPAWN_CAP = DataTracker.registerData(PokemonEntity::class.java, TrackedDataHandlerRegistry.BOOLEAN) @JvmStatic val SPAWN_DIRECTION = DataTracker.registerData(PokemonEntity::class.java, TrackedDataHandlerRegistry.FLOAT) + @JvmStatic val FRIENDSHIP = DataTracker.registerData(PokemonEntity::class.java, TrackedDataHandlerRegistry.INTEGER) const val BATTLE_LOCK = "battle" @@ -177,6 +188,8 @@ open class PokemonEntity( set(value) = dataTracker.set(BATTLE_ID, Optional.ofNullable(value)) val isBattling: Boolean get() = dataTracker.get(BATTLE_ID).isPresent + val friendship: Int + get() = dataTracker.get(FRIENDSHIP) var drops: DropTable? = null @@ -244,6 +257,7 @@ open class PokemonEntity( builder.add(UNBATTLEABLE, false) builder.add(SPAWN_DIRECTION, world.random.nextFloat() * 360F) builder.add(COUNTS_TOWARDS_SPAWN_CAP, true) + builder.add(FRIENDSHIP, 0) } override fun onTrackedDataSet(data: TrackedData<*>) { @@ -323,6 +337,21 @@ open class PokemonEntity( this.tethering = null this.pokemon.recall() } + //This is so that pokemon in the pasture block are ALWAYS in sync with the pokemon box + //Before, pokemon entities in pastures would hold an old ref to a pokemon obj and changes to that would not appear to the underlying file + if (this.tethering != null) { + //Only for online players + if (world.getPlayerByUuid(ownerUuid) != null){ + this.ownerUuid?.let { + val actualPokemon = Cobblemon.storage.getPC(it)[this.pokemon.uuid] + actualPokemon?.let { + if (it !== pokemon) { + pokemon = it + } + } + } + } + } schedulingTracker.update(1/20F) } @@ -587,88 +616,127 @@ open class PokemonEntity( override fun interactMob(player: PlayerEntity, hand: Hand) : ActionResult { val itemStack = player.getStackInHand(hand) + val colorFeatureType = SpeciesFeatures.getFeaturesFor(pokemon.species).find { it is ChoiceSpeciesFeatureProvider && DataKeys.CAN_BE_COLORED in it.keys } + val colorFeature = pokemon.getFeature(DataKeys.CAN_BE_COLORED) - if (itemStack.isOf(Items.SHEARS) && this.isShearable) { - this.sheared(SoundCategory.PLAYERS) - this.emitGameEvent(GameEvent.SHEAR, player) - itemStack.damage(1, player, EquipmentSlot.MAINHAND) - return ActionResult.SUCCESS - } - else if (itemStack.isOf(Items.BUCKET)) { - if (pokemon.getFeature(DataKeys.CAN_BE_MILKED) != null) { - player.playSound(SoundEvents.ENTITY_GOAT_MILK, 1.0f, 1.0f) - val milkBucket = ItemUsage.exchangeStack(itemStack, player, Items.MILK_BUCKET.defaultStack) - player.setStackInHand(hand, milkBucket) - return ActionResult.success(world.isClient) - } - } else if (itemStack.isOf(Items.BOWL)) { - if (pokemon.aspects.any() {it.contains("mooshtank")}) { - player.playSound(SoundEvents.ENTITY_MOOSHROOM_MILK, 1.0f, 1.0f) - // if the Mooshtank ate a Flower beforehand - if (pokemon.lastFlowerFed != ItemStack.EMPTY && pokemon.aspects.any() {it.contains("mooshtank-brown")}) { - when (pokemon.lastFlowerFed.item) { - Items.ALLIUM -> StatusEffects.FIRE_RESISTANCE to 80 - Items.AZURE_BLUET -> StatusEffects.BLINDNESS to 160 - Items.BLUE_ORCHID, Items.DANDELION -> StatusEffects.SATURATION to 7 - Items.CORNFLOWER -> StatusEffects.JUMP_BOOST to 120 - Items.LILY_OF_THE_VALLEY -> StatusEffects.POISON to 240 - Items.OXEYE_DAISY -> StatusEffects.REGENERATION to 160 - Items.POPPY, Items.TORCHFLOWER -> StatusEffects.NIGHT_VISION to 100 - Items.PINK_TULIP, Items.RED_TULIP, Items.WHITE_TULIP, Items.ORANGE_TULIP -> StatusEffects.WEAKNESS to 180 - Items.WITHER_ROSE -> StatusEffects.WITHER to 160 - CobblemonItems.PEP_UP_FLOWER -> StatusEffects.LEVITATION to 160 - else -> null - }?.let { - // modify the suspicious stew with the effect - val susStewStack = Items.SUSPICIOUS_STEW.defaultStack - //SuspiciousStewItem.addEffectsToStew(susStewStack, listOf(StewEffect(it.first, it.second))) - val susStewEffect = ItemUsage.exchangeStack(itemStack, player, susStewStack) - //give player modified Suspicious Stew - player.setStackInHand(hand, susStewEffect) - // reset the flower fed state - pokemon.lastFlowerFed = ItemStack.EMPTY - } - return ActionResult.success(world.isClient) - } else { - val mushroomStew = ItemUsage.exchangeStack(itemStack, player, Items.MUSHROOM_STEW.defaultStack) - player.setStackInHand(hand, mushroomStew) - return ActionResult.success(world.isClient) - } - } - } - // Flowers used on brown MooshTanks - else if (itemStack.isOf(Items.ALLIUM) || - itemStack.isOf(Items.AZURE_BLUET) || - itemStack.isOf(Items.BLUE_ORCHID) || - itemStack.isOf(Items.DANDELION) || - itemStack.isOf(Items.CORNFLOWER) || - itemStack.isOf(Items.LILY_OF_THE_VALLEY) || - itemStack.isOf(Items.OXEYE_DAISY) || - itemStack.isOf(Items.POPPY) || - itemStack.isOf(Items.TORCHFLOWER) || - itemStack.isOf(Items.PINK_TULIP) || - itemStack.isOf(Items.RED_TULIP) || - itemStack.isOf(Items.WHITE_TULIP) || - itemStack.isOf(Items.ORANGE_TULIP) || - itemStack.isOf(Items.WITHER_ROSE) || - itemStack.isOf(CobblemonItems.PEP_UP_FLOWER)) { - if (pokemon.aspects.any() {it.contains("mooshtank")}) { - player.playSound(SoundEvents.ENTITY_MOOSHROOM_EAT, 1.0f, 1.0f) - pokemon.lastFlowerFed = itemStack - return ActionResult.success(world.isClient) - } - } else if(!player.isSneaking && (itemStack.isOf(CobblemonItems.RELIC_COIN) - || itemStack.isOf(CobblemonItems.RELIC_COIN_POUCH) - || itemStack.isOf(CobblemonItems.RELIC_COIN_SACK) - || itemStack.isOf(Items.NETHERITE_SCRAP) - || itemStack.isOf(Items.NETHERITE_INGOT) - || itemStack.isOf(Items.NETHERITE_BLOCK))) { - - if(GimmighoulStashHandler.interactMob(player, hand, pokemon)) { + if (ownerUuid == player.uuid || ownerUuid == null) + { + if (itemStack.isOf(Items.SHEARS) && this.isShearable) { + this.sheared(SoundCategory.PLAYERS) + this.emitGameEvent(GameEvent.SHEAR, player) + itemStack.damage(1, player, EquipmentSlot.MAINHAND) return ActionResult.SUCCESS } - } + else if (itemStack.isOf(Items.BUCKET)) { + if (pokemon.getFeature(DataKeys.CAN_BE_MILKED) != null) { + player.playSound(SoundEvents.ENTITY_GOAT_MILK, 1.0f, 1.0f) + val milkBucket = ItemUsage.exchangeStack(itemStack, player, Items.MILK_BUCKET.defaultStack) + player.setStackInHand(hand, milkBucket) + return ActionResult.success(world.isClient) + } + } else if (itemStack.isOf(Items.BOWL)) { + if (pokemon.aspects.any() {it.contains("mooshtank")}) { + player.playSound(SoundEvents.ENTITY_MOOSHROOM_MILK, 1.0f, 1.0f) + // if the Mooshtank ate a Flower beforehand + if (pokemon.lastFlowerFed != ItemStack.EMPTY && pokemon.aspects.any() {it.contains("mooshtank-brown")}) { + when (pokemon.lastFlowerFed.item) { + Items.ALLIUM -> StatusEffects.FIRE_RESISTANCE to 80 + Items.AZURE_BLUET -> StatusEffects.BLINDNESS to 160 + Items.BLUE_ORCHID, Items.DANDELION -> StatusEffects.SATURATION to 7 + Items.CORNFLOWER -> StatusEffects.JUMP_BOOST to 120 + Items.LILY_OF_THE_VALLEY -> StatusEffects.POISON to 240 + Items.OXEYE_DAISY -> StatusEffects.REGENERATION to 160 + Items.POPPY, Items.TORCHFLOWER -> StatusEffects.NIGHT_VISION to 100 + Items.PINK_TULIP, Items.RED_TULIP, Items.WHITE_TULIP, Items.ORANGE_TULIP -> StatusEffects.WEAKNESS to 180 + Items.WITHER_ROSE -> StatusEffects.WITHER to 160 + CobblemonItems.PEP_UP_FLOWER -> StatusEffects.LEVITATION to 160 + else -> null + }?.let { + // modify the suspicious stew with the effect + val susStewStack = Items.SUSPICIOUS_STEW.defaultStack + //SuspiciousStewItem.addEffectsToStew(susStewStack, listOf(StewEffect(it.first, it.second))) + val susStewEffect = ItemUsage.exchangeStack(itemStack, player, susStewStack) + //give player modified Suspicious Stew + player.setStackInHand(hand, susStewEffect) + // reset the flower fed state + pokemon.lastFlowerFed = ItemStack.EMPTY + } + return ActionResult.success(world.isClient) + } else { + val mushroomStew = ItemUsage.exchangeStack(itemStack, player, Items.MUSHROOM_STEW.defaultStack) + player.setStackInHand(hand, mushroomStew) + return ActionResult.success(world.isClient) + } + } + } + // Flowers used on brown MooshTanks + else if (itemStack.isOf(Items.ALLIUM) || + itemStack.isOf(Items.AZURE_BLUET) || + itemStack.isOf(Items.BLUE_ORCHID) || + itemStack.isOf(Items.DANDELION) || + itemStack.isOf(Items.CORNFLOWER) || + itemStack.isOf(Items.LILY_OF_THE_VALLEY) || + itemStack.isOf(Items.OXEYE_DAISY) || + itemStack.isOf(Items.POPPY) || + itemStack.isOf(Items.TORCHFLOWER) || + itemStack.isOf(Items.PINK_TULIP) || + itemStack.isOf(Items.RED_TULIP) || + itemStack.isOf(Items.WHITE_TULIP) || + itemStack.isOf(Items.ORANGE_TULIP) || + itemStack.isOf(Items.WITHER_ROSE) || + itemStack.isOf(CobblemonItems.PEP_UP_FLOWER)) { + if (pokemon.aspects.any() {it.contains("mooshtank")}) { + player.playSound(SoundEvents.ENTITY_MOOSHROOM_EAT, 1.0f, 1.0f) + pokemon.lastFlowerFed = itemStack + return ActionResult.success(world.isClient) + } + } else if(!player.isSneaking && (itemStack.isOf(CobblemonItems.RELIC_COIN) + || itemStack.isOf(CobblemonItems.RELIC_COIN_POUCH) + || itemStack.isOf(CobblemonItems.RELIC_COIN_SACK) + || itemStack.isOf(Items.NETHERITE_SCRAP) + || itemStack.isOf(Items.NETHERITE_INGOT) + || itemStack.isOf(Items.NETHERITE_BLOCK))) { + if(GimmighoulStashHandler.interactMob(player, hand, pokemon)) { + return ActionResult.SUCCESS + } + } else if (itemStack.item is DyeItem && colorFeatureType != null) { + val currentColor = colorFeature?.value ?: "" + val item = itemStack.item as DyeItem + if (!item.color.name.equals(currentColor, ignoreCase = true)) { + if (player is ServerPlayerEntity) { + if (colorFeature != null) { + colorFeature.value = item.color.name.lowercase() + this.pokemon.markFeatureDirty(colorFeature) + } else { + val newColorFeature = + StringSpeciesFeature(DataKeys.CAN_BE_COLORED, item.color.name.lowercase()) + this.pokemon.features.add(newColorFeature) + this.pokemon.anyChangeObservable.emit(pokemon) + } + + this.pokemon.updateAspects() + if (!player.isCreative) { + itemStack.decrement(1) + } + } + return ActionResult.success(world.isClient) + } + } else if (itemStack.item.equals(Items.WATER_BUCKET) && colorFeatureType != null) { + if (player is ServerPlayerEntity) { + if (colorFeature != null) { + if (!player.isCreative) { + itemStack.decrement(1) + player.giveOrDropItemStack(Items.BUCKET.defaultStack) + } + colorFeature.value = "" + this.pokemon.markFeatureDirty(colorFeature) + this.pokemon.updateAspects() + } + } + return ActionResult.success(world.isClient) + } + } if (hand == Hand.MAIN_HAND && player is ServerPlayerEntity && pokemon.getOwnerPlayer() == player) { if (player.isSneaking) { @@ -802,7 +870,7 @@ open class PokemonEntity( // Check evolution item interaction if (pokemon.getOwnerPlayer() == player) { val context = ItemInteractionEvolution.ItemInteractionContext(stack, player.world) - pokemon.evolutions + pokemon.lockedEvolutions .filterIsInstance() .forEach { evolution -> if (evolution.attemptEvolution(pokemon, context)) { @@ -1103,8 +1171,26 @@ open class PokemonEntity( this.pokemon.markFeatureDirty(feature) this.pokemon.updateAspects() val i = this.random.nextInt(3) + 1 - for (j in 0 until i) { - val itemEntity = this.dropItem(Items.WHITE_WOOL, 1) ?: return + for (j in 0 .. i) { + val color = this.pokemon.getFeature(DataKeys.CAN_BE_COLORED)?.value ?: "white" + val woolItem = when (color) { + "black" -> Items.BLACK_WOOL + "blue" -> Items.BLUE_WOOL + "brown" -> Items.BROWN_WOOL + "cyan" -> Items.CYAN_WOOL + "gray" -> Items.GRAY_WOOL + "green" -> Items.GREEN_WOOL + "light-blue" -> Items.LIGHT_BLUE_WOOL + "light-gray" -> Items.LIGHT_GRAY_WOOL + "lime" -> Items.LIME_WOOL + "magenta" -> Items.MAGENTA_WOOL + "orange" -> Items.ORANGE_WOOL + "purple" -> Items.PURPLE_WOOL + "red" -> Items.RED_WOOL + "yellow" -> Items.YELLOW_WOOL + else -> Items.WHITE_WOOL + } + val itemEntity = this.dropItem(woolItem, 1) ?: return itemEntity.velocity = itemEntity.velocity.add( ((this.random.nextFloat() - this.random.nextFloat()) * 0.1f).toDouble(), (this.random.nextFloat() * 0.05f).toDouble(), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt index 076cde4865..645793b0a8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt @@ -92,10 +92,28 @@ class PokemonServerDelegate : PokemonSideDelegate { speed = 0.1F entity.despawner.beginTracking(this) } + updateTrackedValues() } fun getBattle() = entity.battleId?.let(BattleRegistry::getBattle) + fun updateTrackedValues() { + val trackedSpecies = mock?.species ?: entity.pokemon.species.resourceIdentifier.toString() + val trackedNickname = mock?.nickname ?: entity.pokemon.nickname ?: Text.empty() + val trackedAspects = mock?.aspects ?: entity.pokemon.aspects + + entity.dataTracker.set(PokemonEntity.SPECIES, trackedSpecies) + if (entity.dataTracker.get(PokemonEntity.NICKNAME) != trackedNickname) { + entity.dataTracker.set(PokemonEntity.NICKNAME, trackedNickname) + } + entity.dataTracker.set(PokemonEntity.ASPECTS, trackedAspects) + entity.dataTracker.set(PokemonEntity.LABEL_LEVEL, entity.pokemon.level) + entity.dataTracker.set(PokemonEntity.MOVING, entity.velocity.multiply(1.0, if (entity.isOnGround) 0.0 else 1.0, 1.0).length() > 0.005F) + entity.dataTracker.set(PokemonEntity.FRIENDSHIP, entity.pokemon.friendship) + + updatePoseType() + } + override fun onTrackedDataSet(data: TrackedData<*>) { super.onTrackedDataSet(data) if (this::entity.isInitialized) { @@ -162,24 +180,12 @@ class PokemonServerDelegate : PokemonSideDelegate { entity.remove(Entity.RemovalReason.DISCARDED) } - val trackedSpecies = mock?.species ?: entity.pokemon.species.resourceIdentifier.toString() - val trackedNickname = mock?.nickname ?: entity.pokemon.nickname ?: Text.empty() - val trackedAspects = mock?.aspects ?: entity.pokemon.aspects - - entity.dataTracker.set(PokemonEntity.SPECIES, trackedSpecies) - if (entity.dataTracker.get(PokemonEntity.NICKNAME) != trackedNickname) { - entity.dataTracker.set(PokemonEntity.NICKNAME, trackedNickname) - } - entity.dataTracker.set(PokemonEntity.ASPECTS, trackedAspects) - entity.dataTracker.set(PokemonEntity.LABEL_LEVEL, entity.pokemon.level) - entity.dataTracker.set(PokemonEntity.MOVING, !entity.navigation.isIdle) - - updatePoseType() + updateTrackedValues() } fun updatePoseType() { val isSleeping = entity.pokemon.status?.status == Statuses.SLEEP && entity.behaviour.resting.canSleep - val isMoving = entity.velocity.multiply(1.0, if (entity.isOnGround) 0.0 else 1.0, 1.0).length() > 0.005F + val isMoving = entity.dataTracker.get(PokemonEntity.MOVING) val isPassenger = entity.hasVehicle() val isUnderwater = entity.getIsSubmerged() val isFlying = entity.getBehaviourFlag(PokemonBehaviourFlag.FLYING) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/events/AdvancementHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/events/AdvancementHandler.kt index 2dc0bf2d24..aee215f6fe 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/events/AdvancementHandler.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/events/AdvancementHandler.kt @@ -88,9 +88,7 @@ object AdvancementHandler { event.battle.actors.forEach { battleActor -> if (!event.winners.contains(battleActor) && battleActor.type == ActorType.WILD) { battleActor.pokemonList.forEach { battlePokemon -> - battlePokemon.entity?.pokemon?.let { - advancementData.updateTotalDefeatedCount(it) - } + advancementData.updateTotalDefeatedCount(battlePokemon.originalPokemon) } } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/item/BerryItem.kt b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/BerryItem.kt similarity index 91% rename from common/src/main/kotlin/com/cobblemon/mod/common/item/BerryItem.kt rename to common/src/main/kotlin/com/cobblemon/mod/common/item/berry/BerryItem.kt index 73a9002b6a..31714b1fd4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/item/BerryItem.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/BerryItem.kt @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package com.cobblemon.mod.common.item +package com.cobblemon.mod.common.item.berry import com.cobblemon.mod.common.block.BerryBlock import net.minecraft.item.AliasedBlockItem diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/FriendshipRaisingBerryItem.kt b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/FriendshipRaisingBerryItem.kt index 35b0e31234..c4e4c35d8f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/FriendshipRaisingBerryItem.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/FriendshipRaisingBerryItem.kt @@ -14,7 +14,6 @@ import com.cobblemon.mod.common.CobblemonSounds import com.cobblemon.mod.common.api.item.PokemonSelectingItem import com.cobblemon.mod.common.api.pokemon.stats.Stat import com.cobblemon.mod.common.block.BerryBlock -import com.cobblemon.mod.common.item.BerryItem import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.util.genericRuntime import com.cobblemon.mod.common.util.resolveInt diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/HealingBerryItem.kt b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/HealingBerryItem.kt index 7d5e913b77..2ecb2d859c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/HealingBerryItem.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/HealingBerryItem.kt @@ -15,7 +15,6 @@ import com.cobblemon.mod.common.api.battles.model.actor.BattleActor import com.cobblemon.mod.common.api.item.PokemonSelectingItem import com.cobblemon.mod.common.battles.pokemon.BattlePokemon import com.cobblemon.mod.common.block.BerryBlock -import com.cobblemon.mod.common.item.BerryItem import com.cobblemon.mod.common.item.battle.BagItem import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.util.genericRuntime diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/PPRestoringBerryItem.kt b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/PPRestoringBerryItem.kt index 867d6fe10a..7e1777b523 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/PPRestoringBerryItem.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/PPRestoringBerryItem.kt @@ -16,7 +16,6 @@ import com.cobblemon.mod.common.api.item.PokemonAndMoveSelectingItem import com.cobblemon.mod.common.api.moves.Move import com.cobblemon.mod.common.battles.pokemon.BattlePokemon import com.cobblemon.mod.common.block.BerryBlock -import com.cobblemon.mod.common.item.BerryItem import com.cobblemon.mod.common.item.battle.BagItem import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.util.genericRuntime diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/PortionHealingBerryItem.kt b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/PortionHealingBerryItem.kt index b193e91823..612de3434c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/PortionHealingBerryItem.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/PortionHealingBerryItem.kt @@ -15,7 +15,6 @@ import com.cobblemon.mod.common.api.battles.model.actor.BattleActor import com.cobblemon.mod.common.api.item.PokemonSelectingItem import com.cobblemon.mod.common.battles.pokemon.BattlePokemon import com.cobblemon.mod.common.block.BerryBlock -import com.cobblemon.mod.common.item.BerryItem import com.cobblemon.mod.common.item.battle.BagItem import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.util.genericRuntime diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/StatusCuringBerryItem.kt b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/StatusCuringBerryItem.kt index 9ee36a82d5..ca8d69bc36 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/StatusCuringBerryItem.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/StatusCuringBerryItem.kt @@ -15,7 +15,6 @@ import com.cobblemon.mod.common.api.item.PokemonSelectingItem import com.cobblemon.mod.common.api.pokemon.status.Status import com.cobblemon.mod.common.battles.pokemon.BattlePokemon import com.cobblemon.mod.common.block.BerryBlock -import com.cobblemon.mod.common.item.BerryItem import com.cobblemon.mod.common.item.battle.BagItem import com.cobblemon.mod.common.pokemon.Pokemon import net.minecraft.entity.player.PlayerEntity diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/VolatileCuringBerryItem.kt b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/VolatileCuringBerryItem.kt index 065a97e7d0..865002b590 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/VolatileCuringBerryItem.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/item/berry/VolatileCuringBerryItem.kt @@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.battles.model.actor.BattleActor import com.cobblemon.mod.common.api.item.PokemonSelectingItem import com.cobblemon.mod.common.battles.pokemon.BattlePokemon import com.cobblemon.mod.common.block.BerryBlock -import com.cobblemon.mod.common.item.BerryItem import com.cobblemon.mod.common.item.battle.BagItem import com.cobblemon.mod.common.pokemon.Pokemon import net.minecraft.item.ItemStack diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt b/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt index f5ea71819d..d76e3a65b8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt @@ -253,6 +253,37 @@ object CobblemonItemGroups { entries.add(CobblemonItems.BLACK_TUMBLESTONE_BLOCK) entries.add(CobblemonItems.SKY_TUMBLESTONE_BLOCK) + entries.add(CobblemonItems.POLISHED_TUMBLESTONE) + entries.add(CobblemonItems.POLISHED_TUMBLESTONE_STAIRS) + entries.add(CobblemonItems.POLISHED_TUMBLESTONE_SLAB) + entries.add(CobblemonItems.POLISHED_TUMBLESTONE_WALL) + entries.add(CobblemonItems.CHISELED_POLISHED_TUMBLESTONE) + entries.add(CobblemonItems.TUMBLESTONE_BRICKS) + entries.add(CobblemonItems.TUMBLESTONE_BRICK_STAIRS) + entries.add(CobblemonItems.TUMBLESTONE_BRICK_SLAB) + entries.add(CobblemonItems.TUMBLESTONE_BRICK_WALL) + entries.add(CobblemonItems.CHISELED_TUMBLESTONE_BRICKS) + entries.add(CobblemonItems.POLISHED_BLACK_TUMBLESTONE) + entries.add(CobblemonItems.POLISHED_BLACK_TUMBLESTONE_STAIRS) + entries.add(CobblemonItems.POLISHED_BLACK_TUMBLESTONE_SLAB) + entries.add(CobblemonItems.POLISHED_BLACK_TUMBLESTONE_WALL) + entries.add(CobblemonItems.CHISELED_POLISHED_BLACK_TUMBLESTONE) + entries.add(CobblemonItems.BLACK_TUMBLESTONE_BRICKS) + entries.add(CobblemonItems.BLACK_TUMBLESTONE_BRICK_STAIRS) + entries.add(CobblemonItems.BLACK_TUMBLESTONE_BRICK_SLAB) + entries.add(CobblemonItems.BLACK_TUMBLESTONE_BRICK_WALL) + entries.add(CobblemonItems.CHISELED_BLACK_TUMBLESTONE_BRICKS) + entries.add(CobblemonItems.POLISHED_SKY_TUMBLESTONE) + entries.add(CobblemonItems.POLISHED_SKY_TUMBLESTONE_STAIRS) + entries.add(CobblemonItems.POLISHED_SKY_TUMBLESTONE_SLAB) + entries.add(CobblemonItems.POLISHED_SKY_TUMBLESTONE_WALL) + entries.add(CobblemonItems.CHISELED_POLISHED_SKY_TUMBLESTONE) + entries.add(CobblemonItems.SKY_TUMBLESTONE_BRICKS) + entries.add(CobblemonItems.SKY_TUMBLESTONE_BRICK_STAIRS) + entries.add(CobblemonItems.SKY_TUMBLESTONE_BRICK_SLAB) + entries.add(CobblemonItems.SKY_TUMBLESTONE_BRICK_WALL) + entries.add(CobblemonItems.CHISELED_SKY_TUMBLESTONE_BRICKS) + entries.add(CobblemonItems.DAWN_STONE_ORE) entries.add(CobblemonItems.DEEPSLATE_DAWN_STONE_ORE) entries.add(CobblemonItems.DUSK_STONE_ORE) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/LinkCableItem.kt b/common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/LinkCableItem.kt index e5248c1a6c..c2da220acf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/LinkCableItem.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/LinkCableItem.kt @@ -19,7 +19,7 @@ class LinkCableItem : CobblemonItem(Settings()), PokemonEntityInteraction { override val accepted = setOf(PokemonEntityInteraction.Ownership.OWNER) override fun processInteraction(player: ServerPlayerEntity, entity: PokemonEntity, stack: ItemStack): Boolean { val pokemon = entity.pokemon - pokemon.evolutions.filterIsInstance().forEach { evolution -> + pokemon.lockedEvolutions.filterIsInstance().forEach { evolution -> // If an evolution is possible non-optional or has been successfully queued we will consume the item and stop // validate requirements to respect required held items and such. if (evolution.requirements.all { it.check(pokemon) } && evolution.evolve(pokemon)) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/PokemonDTO.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/PokemonDTO.kt index db9b8dbaca..bf4304c8f3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/PokemonDTO.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/PokemonDTO.kt @@ -125,7 +125,7 @@ class PokemonDTO : Encodable, Decodable { this.featuresBuffer = PacketByteBuf(Unpooled.buffer()) val visibleFeatures = pokemon.features .filterIsInstance() - .filter { (SpeciesFeatures.getFeature(it.name)!! as SynchronizedSpeciesFeatureProvider<*>).visible } + .filter { (SpeciesFeatures.getFeature(it.name) as? SynchronizedSpeciesFeatureProvider<*>)?.visible == true } featuresBuffer.writeCollection(visibleFeatures) { _, value -> featuresBuffer.writeString(value.name) value.saveToBuffer(featuresBuffer, true) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/FormUpdatePacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/FormUpdatePacket.kt new file mode 100644 index 0000000000..99c6022ee8 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/FormUpdatePacket.kt @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.net.messages.client.pokemon.update + +import com.cobblemon.mod.common.pokemon.FormData +import com.cobblemon.mod.common.pokemon.Pokemon +import com.cobblemon.mod.common.util.cobblemonResource +import net.minecraft.network.PacketByteBuf +import net.minecraft.util.Identifier + +class FormUpdatePacket(pokemon: () -> Pokemon, form: FormData) : SingleUpdatePacket(pokemon, form) { + override fun encodeValue(buffer: PacketByteBuf) { + this.value.encode(buffer) + } + + override fun set(pokemon: Pokemon, value: FormData) { + pokemon.form = value + } + + override val id: Identifier = ID + + companion object { + val ID: Identifier = cobblemonResource("packets/form-update") + fun decode(buffer: PacketByteBuf): FormUpdatePacket { + val pokemon = decodePokemon(buffer) + val form = FormData() + form.species = pokemon().species + form.decode(buffer) + return FormUpdatePacket(pokemon, form) + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt index 4d92675178..167ad0a830 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt @@ -42,6 +42,7 @@ class SpawnPokemonPacket( private val hideLabel: Boolean, private val caughtBall: Identifier, private val spawnYaw: Float, + private val friendship: Int, vanillaSpawnPacket: EntitySpawnS2CPacket ) : SpawnExtraDataEntityPacket(vanillaSpawnPacket) { @@ -63,6 +64,7 @@ class SpawnPokemonPacket( entity.dataTracker.get(PokemonEntity.HIDE_LABEL), entity.pokemon.caughtBall.name, entity.dataTracker.get(PokemonEntity.SPAWN_DIRECTION), + entity.dataTracker.get(PokemonEntity.FRIENDSHIP), vanillaSpawnPacket ) @@ -82,6 +84,7 @@ class SpawnPokemonPacket( buffer.writeBoolean(this.hideLabel) buffer.writeIdentifier(this.caughtBall) buffer.writeFloat(this.spawnYaw) + buffer.writeInt(this.friendship) } override fun applyData(entity: PokemonEntity) { @@ -104,6 +107,7 @@ class SpawnPokemonPacket( entity.dataTracker.set(PokemonEntity.UNBATTLEABLE, unbattlable) entity.dataTracker.set(PokemonEntity.HIDE_LABEL, hideLabel) entity.dataTracker.set(PokemonEntity.SPAWN_DIRECTION, spawnYaw) + entity.dataTracker.set(PokemonEntity.FRIENDSHIP, friendship) } override fun checkType(entity: Entity): Boolean = entity is PokemonEntity @@ -127,9 +131,10 @@ class SpawnPokemonPacket( val hideLabel = buffer.readBoolean() val caughtBall = buffer.readIdentifier() val spawnAngle = buffer.readFloat() + val friendship = buffer.readInt() val vanillaPacket = decodeVanillaPacket(buffer) - return SpawnPokemonPacket(ownerId, scaleModifier, species, form, aspects, battleId, phasingTargetId, beamModeEmitter, nickname, labelLevel, poseType, unbattlable, hideLabel, caughtBall, spawnAngle, vanillaPacket) + return SpawnPokemonPacket(ownerId, scaleModifier, species, form, aspects, battleId, phasingTargetId, beamModeEmitter, nickname, labelLevel, poseType, unbattlable, hideLabel, caughtBall, spawnAngle, friendship, vanillaPacket) } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/particle/SnowstormParticleReader.kt b/common/src/main/kotlin/com/cobblemon/mod/common/particle/SnowstormParticleReader.kt index ec4c823581..e7b4b92978 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/particle/SnowstormParticleReader.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/particle/SnowstormParticleReader.kt @@ -43,6 +43,7 @@ object SnowstormParticleReader { val emitterShapeEntityBoundingBoxJson = componentsJson.get("minecraft:emitter_shape_entity_aabb")?.asJsonObject val emitterLifetimeEventsJson = componentsJson.get("minecraft:emitter_lifetime_events")?.asJsonObject val dynamicMotionJson = componentsJson.get("minecraft:particle_motion_dynamic")?.asJsonObject + val parametricMotionJson = componentsJson.get("minecraft:particle_motion_parametric")?.asJsonObject val particleAppearanceJson = componentsJson.get("minecraft:particle_appearance_billboard").asJsonObject val sizeJson = particleAppearanceJson.get("size")?.asJsonArray val particleLifetimeJson = componentsJson.get("minecraft:particle_lifetime_expression")?.asJsonObject @@ -234,13 +235,22 @@ object SnowstormParticleReader { val motion = if (dynamicMotionJson != null) { val accelerationExpressions = dynamicMotionJson.get("linear_acceleration")?.asJsonArray?.map { it.asString.asExpression() } ?: listOf(0.0.asExpression(), 0.0.asExpression(), 0.0.asExpression()) - val drag= dynamicMotionJson.get("linear_drag_coefficient")?.asString?.asExpression() ?: 0.0.asExpression() + val drag = dynamicMotionJson.get("linear_drag_coefficient")?.asString?.asExpression() ?: 0.0.asExpression() DynamicParticleMotion( direction = direction!!, speed = speed, acceleration = Triple(accelerationExpressions[0], accelerationExpressions[1], accelerationExpressions[2]), drag = drag ) + } else if (parametricMotionJson != null) { + val offsetExpressions = parametricMotionJson.get("relative_position")?.asJsonArray?.map { it.asString.asExpression() } + ?: listOf(0.0.asExpression(), 0.0.asExpression(), 0.0.asExpression()) + val directionExpressions = parametricMotionJson.get("direction")?.asJsonArray?.map { it.asString.asExpression() } + ?: listOf(0.0.asExpression(), 0.0.asExpression(), 0.0.asExpression()) + ParametricParticleMotion( + offset = Triple(offsetExpressions[0], offsetExpressions[1], offsetExpressions[2]), + direction = Triple(directionExpressions[0], directionExpressions[1], directionExpressions[2]) + ) } else { StaticParticleMotion() } @@ -299,12 +309,19 @@ object SnowstormParticleReader { textureSizeY = uvModeJson.get("texture_height")?.asInt ?: 128 ) } - val rotation = DynamicParticleRotation( - startRotation = startRotation, - speed = rotationSpeed, - acceleration = dynamicMotionJson?.get("rotation_acceleration")?.asString?.asExpression() ?: 0.0.asExpression(), - drag = dynamicMotionJson?.get("rotation_drag_coefficient")?.asString?.asExpression() ?: 0.0.asExpression() - ) + + val motionJson = dynamicMotionJson ?: parametricMotionJson + val parametricParticleRotation = motionJson?.get("rotation")?.asString?.asExpression() + val rotation = if (parametricParticleRotation != null) { + ParametricParticleRotation(expression = parametricParticleRotation) + } else { + DynamicParticleRotation( + startRotation = startRotation, + speed = rotationSpeed, + acceleration = dynamicMotionJson?.get("rotation_acceleration")?.asString?.asExpression() ?: 0.0.asExpression(), + drag = dynamicMotionJson?.get("rotation_drag_coefficient")?.asString?.asExpression() ?: 0.0.asExpression() + ) + } val tinting = if (colourJson is JsonObject) { GradientParticleTinting( interpolant = colourJson.get("interpolant").asString.asExpression(), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/CobblemonCaptureCalculator.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/CobblemonCaptureCalculator.kt index 503a5a477d..e61444e7d9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/CobblemonCaptureCalculator.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/CobblemonCaptureCalculator.kt @@ -18,12 +18,12 @@ import com.cobblemon.mod.common.battles.actor.PlayerBattleActor import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.PokemonEntity import com.cobblemon.mod.common.pokemon.Pokemon -import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus -import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus -import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus -import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus import kotlin.math.max import kotlin.math.min import kotlin.math.pow diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen1CaptureCalculator.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen1CaptureCalculator.kt index 2b64ef1702..ed92633fa2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen1CaptureCalculator.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen1CaptureCalculator.kt @@ -14,12 +14,12 @@ import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalcula import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.PokemonEntity import com.cobblemon.mod.common.pokemon.Pokemon -import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus -import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus -import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus -import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus import kotlin.math.roundToInt import kotlin.random.Random import net.minecraft.entity.LivingEntity diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen2CaptureCalculator.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen2CaptureCalculator.kt index de8e7324a5..a535aa7ac9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen2CaptureCalculator.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen2CaptureCalculator.kt @@ -12,12 +12,12 @@ import com.cobblemon.mod.common.api.pokeball.catching.CaptureContext import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculator import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.PokemonEntity -import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus -import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus -import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus -import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus import kotlin.math.max import kotlin.math.roundToInt import kotlin.random.Random diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen3And4CaptureCalculator.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen3And4CaptureCalculator.kt index 3db3297685..b79bbd833e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen3And4CaptureCalculator.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen3And4CaptureCalculator.kt @@ -13,12 +13,12 @@ import com.cobblemon.mod.common.api.pokeball.catching.CaptureContext import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculator import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.PokemonEntity -import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus -import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus -import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus -import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus import kotlin.math.roundToInt import kotlin.math.sqrt import kotlin.random.Random diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen5CaptureCalculator.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen5CaptureCalculator.kt index 010181309f..6130eaaa59 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen5CaptureCalculator.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen5CaptureCalculator.kt @@ -15,12 +15,12 @@ import com.cobblemon.mod.common.api.pokeball.catching.calculators.CriticalCaptur import com.cobblemon.mod.common.api.pokeball.catching.calculators.PokedexProgressCaptureMultiplierProvider import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.PokemonEntity -import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus -import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus -import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus -import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus import kotlin.math.roundToInt import kotlin.math.sqrt import kotlin.random.Random diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen6CaptureCalculator.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen6CaptureCalculator.kt index 2294e4f880..805425fdaf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen6CaptureCalculator.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen6CaptureCalculator.kt @@ -15,12 +15,12 @@ import com.cobblemon.mod.common.api.pokeball.catching.calculators.CriticalCaptur import com.cobblemon.mod.common.api.pokeball.catching.calculators.PokedexProgressCaptureMultiplierProvider import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.PokemonEntity -import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus -import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus -import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus -import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus import kotlin.math.pow import kotlin.math.roundToInt import kotlin.random.Random diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen7CaptureCalculator.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen7CaptureCalculator.kt index 367f4b6c9b..56c79bc707 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen7CaptureCalculator.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen7CaptureCalculator.kt @@ -15,12 +15,12 @@ import com.cobblemon.mod.common.api.pokeball.catching.calculators.CriticalCaptur import com.cobblemon.mod.common.api.pokeball.catching.calculators.PokedexProgressCaptureMultiplierProvider import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.PokemonEntity -import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus -import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus -import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus -import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus import kotlin.math.pow import kotlin.math.roundToInt import kotlin.random.Random diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen8CaptureCalculator.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen8CaptureCalculator.kt index b02e06d009..d382d61082 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen8CaptureCalculator.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen8CaptureCalculator.kt @@ -13,12 +13,12 @@ import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalcula import com.cobblemon.mod.common.api.pokeball.catching.calculators.CriticalCaptureProvider import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.PokemonEntity -import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus -import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus -import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus -import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus import kotlin.math.max import kotlin.math.pow import kotlin.math.roundToInt diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen9CaptureCalculator.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen9CaptureCalculator.kt index 05118eea9e..ea0efd89ae 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen9CaptureCalculator.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokeball/catching/calculators/Gen9CaptureCalculator.kt @@ -14,12 +14,12 @@ import com.cobblemon.mod.common.api.pokeball.catching.calculators.CriticalCaptur import com.cobblemon.mod.common.api.pokeball.catching.calculators.PokedexProgressCaptureMultiplierProvider import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.PokemonEntity -import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus -import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus -import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus -import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus -import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus +import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus import kotlin.math.max import kotlin.math.pow import kotlin.math.roundToInt diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt index 64f6808d4c..e0f2a732d4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt @@ -51,6 +51,7 @@ import com.cobblemon.mod.common.api.pokemon.experience.ExperienceSource import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeature import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures import com.cobblemon.mod.common.api.pokemon.feature.SynchronizedSpeciesFeature +import com.cobblemon.mod.common.api.pokemon.feature.SynchronizedSpeciesFeatureProvider import com.cobblemon.mod.common.api.pokemon.friendship.FriendshipMutationCalculator import com.cobblemon.mod.common.api.pokemon.labels.CobblemonPokemonLabels import com.cobblemon.mod.common.api.pokemon.moves.LearnsetQuery @@ -480,6 +481,8 @@ open class Pokemon : ShowdownIdentifiable { // We want non-optional evolutions to trigger first to avoid unnecessary packets and any cost associate with an optional one that would just be lost val evolutions: Iterable get() = this.form.evolutions.sortedBy { evolution -> evolution.optional } + val lockedEvolutions: Iterable + get() = evolutions.filter { it !in evolutionProxy.current() } val preEvolution: PreEvolution? get() = this.form.preEvolution @@ -524,7 +527,11 @@ open class Pokemon : ShowdownIdentifiable { SeasonFeatureHandler.updateSeason(this, level, position.toBlockPos()) val entity = PokemonEntity(level, this) illusion?.start(entity) - entity.setPositionSafely(position) + val sentOut = entity.setPositionSafely(position) + //If sendout failed, fall back + if (!sentOut) { + entity.setPos(position.x, position.y, position.z) + } mutation(entity) level.spawnEntity(entity) state = SentOutState(entity) @@ -1645,7 +1652,7 @@ open class Pokemon : ShowdownIdentifiable { } } - private val _form = SimpleObservable() + private val _form = registerObservable(SimpleObservable()) { FormUpdatePacket({ this }, it) } private val _species = registerObservable(SimpleObservable()) { SpeciesUpdatePacket({ this }, it) } private val _nickname = registerObservable(SimpleObservable()) { NicknameUpdatePacket({ this }, it) } private val _experience = registerObservable(SimpleObservable()) { ExperienceUpdatePacket({ this }, it) } @@ -1673,7 +1680,8 @@ open class Pokemon : ShowdownIdentifiable { private val _originalTrainerName = registerObservable(SimpleObservable()) { OriginalTrainerUpdatePacket({ this }, it) } private val _features = registerObservable(SimpleObservable()) { - if (it is SynchronizedSpeciesFeature) { + val featureProvider = SpeciesFeatures.getFeature(it.name) + if (it is SynchronizedSpeciesFeature && featureProvider is SynchronizedSpeciesFeatureProvider && featureProvider.visible) { SpeciesFeatureUpdatePacket({ this }, species.resourceIdentifier, it) } else { null diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/adapters/CobbledRequirementAdapter.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/adapters/CobbledRequirementAdapter.kt index 5ac21e096b..b1f039818d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/adapters/CobbledRequirementAdapter.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/adapters/CobbledRequirementAdapter.kt @@ -43,6 +43,8 @@ object CobblemonRequirementAdapter : RequirementAdapter { this.registerType(TimeRangeRequirement.ADAPTER_VARIANT, TimeRangeRequirement::class) this.registerType(LevelRequirement.ADAPTER_VARIANT, LevelRequirement::class) this.registerType(WeatherRequirement.ADAPTER_VARIANT, WeatherRequirement::class) + this.registerType(StatCompareRequirement.ADAPTER_VARIANT, StatCompareRequirement::class) + this.registerType(StatEqualRequirement.ADAPTER_VARIANT, StatEqualRequirement::class) this.registerType(AttackDefenceRatioRequirement.ADAPTER_VARIANT, AttackDefenceRatioRequirement::class) this.registerType(BattleCriticalHitsRequirement.ADAPTER_VARIANT, BattleCriticalHitsRequirement::class) this.registerType(DamageTakenRequirement.ADAPTER_VARIANT, DamageTakenRequirement::class) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/AttackDefenceRatioRequirement.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/AttackDefenceRatioRequirement.kt index df318dd767..e0881adf10 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/AttackDefenceRatioRequirement.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/AttackDefenceRatioRequirement.kt @@ -10,6 +10,7 @@ package com.cobblemon.mod.common.pokemon.evolution.requirements import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement import com.cobblemon.mod.common.pokemon.Pokemon + class AttackDefenceRatioRequirement : EvolutionRequirement { companion object { const val ADAPTER_VARIANT = "attack_defence_ratio" diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/StatCompareRequirement.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/StatCompareRequirement.kt new file mode 100644 index 0000000000..73546d04fc --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/StatCompareRequirement.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.pokemon.evolution.requirements + +import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement +import com.cobblemon.mod.common.api.pokemon.stats.Stats +import com.cobblemon.mod.common.pokemon.Pokemon + +class StatCompareRequirement : EvolutionRequirement { + companion object { + const val ADAPTER_VARIANT = "stat_compare" + } + + val highStat = Stats.ATTACK.name + val lowStat = Stats.DEFENCE.name + + override fun check(pokemon: Pokemon): Boolean { + return pokemon.getStat(Stats.getStat(highStat)) > pokemon.getStat(Stats.getStat(lowStat)) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/StatEqualRequirement.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/StatEqualRequirement.kt new file mode 100644 index 0000000000..ffb79e3547 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/StatEqualRequirement.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.pokemon.evolution.requirements + +import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement +import com.cobblemon.mod.common.api.pokemon.stats.Stats +import com.cobblemon.mod.common.pokemon.Pokemon + +class StatEqualRequirement : EvolutionRequirement { + companion object { + const val ADAPTER_VARIANT = "stat_equal" + } + + val statOne = Stats.ATTACK.name + val statTwo = Stats.DEFENCE.name + + override fun check(pokemon: Pokemon): Boolean { + return pokemon.getStat(Stats.getStat(statOne)) == pokemon.getStat(Stats.getStat(statTwo)) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/StructureRequirement.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/StructureRequirement.kt index d0a9787056..ecb7a53c3a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/StructureRequirement.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/requirements/StructureRequirement.kt @@ -24,10 +24,11 @@ import net.minecraft.world.gen.structure.Structure */ class StructureRequirement : EntityQueryRequirement { val structureCondition: RegistryLikeCondition? = null + val structureAnticondition: RegistryLikeCondition? = null override fun check(pokemon: Pokemon, queriedEntity: LivingEntity): Boolean { val structures = queriedEntity.world.getChunk(queriedEntity.blockPos).structureReferences val registry = queriedEntity.world.registryManager.get(RegistryKeys.STRUCTURE) - return (structureCondition == null || structures.any { structureCondition.fits(it.key, registry) }) + return (structureCondition == null || structures.any { structureCondition.fits(it.key, registry) }) && (structureAnticondition == null || !structures.any { structureAnticondition.fits(it.key, registry) }) } companion object { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/BlockClickEvolution.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/BlockClickEvolution.kt index d24f40245e..3532493f04 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/BlockClickEvolution.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/BlockClickEvolution.kt @@ -31,6 +31,7 @@ import net.minecraft.world.World open class BlockClickEvolution( override val id: String, override val result: PokemonProperties, + override val shedder: PokemonProperties?, override val requiredContext: RegistryLikeCondition, override var optional: Boolean, override var consumeHeldItem: Boolean, @@ -40,6 +41,7 @@ open class BlockClickEvolution( constructor(): this( id = "id", result = PokemonProperties(), + shedder = null, requiredContext = BlockIdentifierCondition(Identifier("minecraft", "dirt")), optional = true, consumeHeldItem = true, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/DummyEvolution.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/DummyEvolution.kt index 24cbf16fc7..291064dcf1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/DummyEvolution.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/DummyEvolution.kt @@ -19,6 +19,7 @@ internal class DummyEvolution : Evolution { override val id = "dummy" override val result: PokemonProperties = PokemonProperties() + override val shedder: PokemonProperties? = null override var optional = false override var consumeHeldItem = false override val requirements: MutableSet = mutableSetOf() diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/ItemInteractionEvolution.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/ItemInteractionEvolution.kt index 2e82167d47..ae4cf6162c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/ItemInteractionEvolution.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/ItemInteractionEvolution.kt @@ -31,6 +31,7 @@ import net.minecraft.world.World open class ItemInteractionEvolution( override val id: String, override val result: PokemonProperties, + override val shedder: PokemonProperties?, override val requiredContext: NbtItemPredicate, override var optional: Boolean, override var consumeHeldItem: Boolean, @@ -40,7 +41,8 @@ open class ItemInteractionEvolution( constructor(): this( id = "id", result = PokemonProperties(), - requiredContext = NbtItemPredicate(ItemIdentifierCondition(Identifier("minecraft", "fish")), null), + shedder = null, + requiredContext = NbtItemPredicate(ItemIdentifierCondition(Identifier("minecraft", "fish")), NbtPredicate.ANY), optional = true, consumeHeldItem = true, requirements = mutableSetOf(), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/LevelUpEvolution.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/LevelUpEvolution.kt index 9c9af50f9c..b6db180d0e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/LevelUpEvolution.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/LevelUpEvolution.kt @@ -25,6 +25,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon open class LevelUpEvolution( override val id: String, override val result: PokemonProperties, + override val shedder: PokemonProperties?, override var optional: Boolean, override var consumeHeldItem: Boolean, override val requirements: MutableSet, @@ -36,6 +37,7 @@ open class LevelUpEvolution( constructor(): this( id = "id", result = PokemonProperties(), + shedder = null, optional = true, consumeHeldItem = true, requirements = mutableSetOf(), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/TradeEvolution.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/TradeEvolution.kt index 0153382678..e1ae57877b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/TradeEvolution.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/evolution/variants/TradeEvolution.kt @@ -26,6 +26,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon open class TradeEvolution( override val id: String, override val result: PokemonProperties, + override val shedder: PokemonProperties?, override val requiredContext: PokemonProperties, override var optional: Boolean, override var consumeHeldItem: Boolean, @@ -35,6 +36,7 @@ open class TradeEvolution( constructor(): this( id = "id", result = PokemonProperties(), + shedder = null, requiredContext = PokemonProperties(), optional = true, consumeHeldItem = true, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/helditem/CobblemonHeldItemManager.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/helditem/CobblemonHeldItemManager.kt index b9b8285bce..e788546244 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/helditem/CobblemonHeldItemManager.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/helditem/CobblemonHeldItemManager.kt @@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage import com.cobblemon.mod.common.api.battles.model.PokemonBattle import com.cobblemon.mod.common.api.pokemon.helditem.HeldItemManager import com.cobblemon.mod.common.api.tags.CobblemonItemTags +import com.cobblemon.mod.common.battles.actor.PlayerBattleActor import com.cobblemon.mod.common.battles.pokemon.BattlePokemon import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.util.battleLang @@ -87,7 +88,7 @@ object CobblemonHeldItemManager : BaseCobblemonHeldItemManager() { val battlerName = pokemon.getName() // Airballoon is the only item using the null effect gimmick if (effect == null) { - battle.broadcastChatMessage(battleLang("item.$itemID.start", battlerName)) + battle.broadcastChatMessage(battleLang("item.$itemID", battlerName)) return } val sourceName = battleMessage.battlePokemonFromOptional(battle)?.getName() ?: Text.of("UNKNOWN") @@ -104,26 +105,33 @@ object CobblemonHeldItemManager : BaseCobblemonHeldItemManager() { if (this.takeItemEffect.contains(effectId) && this.giveItemEffect.contains(effectId) && !consumeHeldItems) { return } - if (this.giveItemEffect.contains(effectId)) { + // Block item swapping in PVP until we have a rule + if (battle.isPvP && !consumeHeldItems) { + return + } + // if items aren't consumed, then we don't want to give them to wild pokemon (dupe) + if (this.giveItemEffect.contains(effectId) && (pokemon.actor is PlayerBattleActor || consumeHeldItems)) { this.give(pokemon, itemID) } - if (this.takeItemEffect.contains(effectId)) { + // allow players to steal wild held items + if (this.takeItemEffect.contains(effectId) && (pokemon.actor !is PlayerBattleActor || consumeHeldItems)) { battleMessage.actorAndActivePokemonFromOptional(battle)?.second?.battlePokemon?.let { this.take(it, itemID) } } } override fun handleEndInstruction(pokemon: BattlePokemon, battle: PokemonBattle, battleMessage: BattleMessage) { val itemID = battleMessage.effectAt(1)?.id ?: return + val consumeHeldItems = this.shouldConsumeItem(pokemon, battle, itemID) // These are sent when showdown wants the client to animate something but not produce any text if (battleMessage.hasOptionalArgument("silent")) { - this.take(pokemon, itemID) + if (consumeHeldItems) this.take(pokemon, itemID) return } val battlerName = pokemon.getName() val itemName = this.nameOf(itemID) if (battleMessage.hasOptionalArgument("eat")) { battle.broadcastChatMessage(battleLang("item.eat", battlerName, itemName)) - this.take(pokemon, itemID) + if (consumeHeldItems) this.take(pokemon, itemID) return } val sourceName = battleMessage.battlePokemonFromOptional(battle)?.getName() ?: Text.of("UNKNOWN") @@ -135,7 +143,7 @@ object CobblemonHeldItemManager : BaseCobblemonHeldItemManager() { else -> battleLang("enditem.$itemID", battlerName) } } - this.take(pokemon, itemID) + if (consumeHeldItems) this.take(pokemon, itemID) battle.broadcastChatMessage(text) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/VolatileStatus.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/VolatileStatus.kt index fc6183844b..bca52fa0f9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/VolatileStatus.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/VolatileStatus.kt @@ -16,4 +16,9 @@ import net.minecraft.util.Identifier * * @author Deltric */ -class VolatileStatus(name: Identifier) : Status(name, "", "", "") \ No newline at end of file +open class VolatileStatus( + name: Identifier, + showdownName: String, + applyMessage: String, + removeMessage: String, +) : Status(name, showdownName, applyMessage, removeMessage) \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/nonpersistent/AttractStatus.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/nonpersistent/AttractStatus.kt new file mode 100644 index 0000000000..df757c96ef --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/nonpersistent/AttractStatus.kt @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.pokemon.status.statuses.nonpersistent + +import com.cobblemon.mod.common.pokemon.status.VolatileStatus +import com.cobblemon.mod.common.util.cobblemonResource + +class AttractStatus : VolatileStatus( + cobblemonResource("attract"), + "attract", + "cobblemon.battle.attract_start", + "cobblemon.battle.attract_snapped" +) \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/nonpersistent/ConfuseStatus.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/nonpersistent/ConfuseStatus.kt new file mode 100644 index 0000000000..031fc80c52 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/nonpersistent/ConfuseStatus.kt @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.pokemon.status.statuses.nonpersistent + +import com.cobblemon.mod.common.pokemon.status.VolatileStatus +import com.cobblemon.mod.common.util.cobblemonResource + +class ConfuseStatus : VolatileStatus( + cobblemonResource("confused"), + "confusion", + "cobblemon.battle.confusion_start", + "cobblemon.battle.confusion_snapped" +) \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/BurnStatus.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/BurnStatus.kt similarity index 90% rename from common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/BurnStatus.kt rename to common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/BurnStatus.kt index 8821747ba1..2a9aa03434 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/BurnStatus.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/BurnStatus.kt @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package com.cobblemon.mod.common.pokemon.status.statuses +package com.cobblemon.mod.common.pokemon.status.statuses.persistent import com.cobblemon.mod.common.pokemon.status.PersistentStatus import com.cobblemon.mod.common.util.cobblemonResource diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/FrozenStatus.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/FrozenStatus.kt similarity index 90% rename from common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/FrozenStatus.kt rename to common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/FrozenStatus.kt index c954e7aa02..bf5c558dc0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/FrozenStatus.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/FrozenStatus.kt @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package com.cobblemon.mod.common.pokemon.status.statuses +package com.cobblemon.mod.common.pokemon.status.statuses.persistent import com.cobblemon.mod.common.pokemon.status.PersistentStatus import com.cobblemon.mod.common.util.cobblemonResource diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/ParalysisStatus.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/ParalysisStatus.kt similarity index 90% rename from common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/ParalysisStatus.kt rename to common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/ParalysisStatus.kt index 0d66a8c553..50726c1e7a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/ParalysisStatus.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/ParalysisStatus.kt @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package com.cobblemon.mod.common.pokemon.status.statuses +package com.cobblemon.mod.common.pokemon.status.statuses.persistent import com.cobblemon.mod.common.pokemon.status.PersistentStatus import com.cobblemon.mod.common.util.cobblemonResource diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/PoisonBadlyStatus.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/PoisonBadlyStatus.kt similarity index 95% rename from common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/PoisonBadlyStatus.kt rename to common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/PoisonBadlyStatus.kt index 3525e789f9..4c498c8eff 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/PoisonBadlyStatus.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/PoisonBadlyStatus.kt @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package com.cobblemon.mod.common.pokemon.status.statuses +package com.cobblemon.mod.common.pokemon.status.statuses.persistent import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.pokemon.status.PersistentStatus diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/PoisonStatus.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/PoisonStatus.kt similarity index 95% rename from common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/PoisonStatus.kt rename to common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/PoisonStatus.kt index b612b22dc6..e3c6744f57 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/PoisonStatus.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/PoisonStatus.kt @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package com.cobblemon.mod.common.pokemon.status.statuses +package com.cobblemon.mod.common.pokemon.status.statuses.persistent import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.pokemon.status.PersistentStatus diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/SleepStatus.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/SleepStatus.kt similarity index 90% rename from common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/SleepStatus.kt rename to common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/SleepStatus.kt index c62d2a02a9..040a42840e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/SleepStatus.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/SleepStatus.kt @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package com.cobblemon.mod.common.pokemon.status.statuses +package com.cobblemon.mod.common.pokemon.status.statuses.persistent import com.cobblemon.mod.common.pokemon.status.PersistentStatus import com.cobblemon.mod.common.util.cobblemonResource diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/trade/TradeManager.kt b/common/src/main/kotlin/com/cobblemon/mod/common/trade/TradeManager.kt index 559eaf049e..0165782ce1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/trade/TradeManager.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/trade/TradeManager.kt @@ -98,11 +98,11 @@ object TradeManager { party2.add(pokemon1) party1.add(pokemon2) - pokemon1.evolutions.filterIsInstance().firstOrNull { + pokemon1.lockedEvolutions.filterIsInstance().firstOrNull { it.attemptEvolution(pokemon1, pokemon2) } - pokemon2.evolutions.filterIsInstance().firstOrNull { + pokemon2.lockedEvolutions.filterIsInstance().firstOrNull { it.attemptEvolution(pokemon2, pokemon1) } CobblemonEvents.TRADE_COMPLETED.post(TradeCompletedEvent(player1, pokemon2, player2, pokemon1)) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt index 43ec11e3a4..297e967967 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt @@ -134,6 +134,7 @@ object DataKeys { // Features const val CAN_BE_MILKED = "milkable" const val HAS_BEEN_SHEARED = "sheared" + const val CAN_BE_COLORED = "color" // Variants const val IS_MOOSHTANK = "mooshtank" @@ -168,6 +169,7 @@ object DataKeys { const val PROTECTED_TIME_LEFT = "ProtectedTimeLeft" const val FORMED = "Formed" const val CREATED_POKEMON = "CreatedPokemon" + const val HAS_CREATED_POKEMON = "HasCreatedPokemon" const val FOSSIL_OWNER = "FossilOwner" const val FOSSIL_STATE = "FossilState" diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/GsonExtensions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/GsonExtensions.kt index d45f147b12..62b7c86f88 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/GsonExtensions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/GsonExtensions.kt @@ -24,7 +24,7 @@ inline fun Gson.fromJson(string: String) = fromJson(string, T::class * the list value identified by the plural name. During runtime only the plural exists, but when * configuring the JSON the user can use the singular form for a cleaner document. */ -fun JsonObject.singularToPluralList(rootName: String, pluralName: String = "${rootName}s") { +fun JsonObject.singularToPluralList(rootName: String, pluralName: String = "${rootName}s"): JsonObject { if (has(rootName)) { if (!has(pluralName)) { add(pluralName, JsonArray()) @@ -32,6 +32,7 @@ fun JsonObject.singularToPluralList(rootName: String, pluralName: String = "${ro get(pluralName).asJsonArray.add(get(rootName)) remove(rootName) } + return this } fun JsonElement.normalizeToArray(): JsonArray { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/fossils/posers/amaura.json b/common/src/main/resources/assets/cobblemon/bedrock/fossils/posers/amaura.json index bf762cb7c2..bb1537822f 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/fossils/posers/amaura.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/fossils/posers/amaura.json @@ -1,5 +1,5 @@ { - "maxScale": 1.0, + "maxScale": 0.8, "yTranslation": 0.1, "yGrowthPoint": 0.5625, "animations": [ diff --git a/common/src/main/resources/assets/cobblemon/bedrock/generic/animations/evolution.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/generic/animations/evolution.animation.json index 9378b154ea..21a6bc0510 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/generic/animations/evolution.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/generic/animations/evolution.animation.json @@ -2,65 +2,172 @@ "format_version": "1.8.0", "animations": { "animation.evolution.evolution": { - "animation_length": 12, + "animation_length": 18.45833, "bones": { - "evolution": { - "position": [0, 8, 0] - }, - "rotation": { + "root_part": { "rotation": { - "0.0": [0, 0, 0], - "4.0": [0, -360, 0], - "4.4583": [0, -550, 0], - "9.9583": [0, -4410, 0] + "5.0": [0, 0, 0.01], + "5.0417": [0, 1.69062, 0], + "5.0833": [0, 6.2568, 0], + "5.125": [0, 13.45169, 0], + "5.1667": [0, 22.98049, 0], + "5.2083": [0, 34.54587, 0], + "5.25": [0, 47.95457, 0], + "5.2917": [0, 63.03739, 0], + "5.3333": [0, 79.64558, 0], + "5.375": [0, 97.64781, 0], + "5.4167": [0, 116.92776, 0], + "5.4583": [0, 137.38204, 0], + "5.5": [0, 158.91842, 0], + "5.5417": [0, 181.45442, 0], + "5.5833": [0, 204.92016, 0], + "5.625": [0, 229.29923, 0], + "5.6667": [0, 254.4783, 0], + "5.7083": [0, 280.40222, 0], + "5.75": [0, 307.03431, 0], + "5.7917": [0, 334.37233, 0], + "5.8333": [0, 362.31666, 0], + "5.875": [0, 390.84133, 0], + "5.9167": [0, 419.96056, 0], + "5.9583": [0, 449.57842, 0], + "6.0": [0, 479.70479, 0], + "6.0417": [0, 510.30613, 0], + "6.0833": [0, 541.33046, 0], + "6.125": [0, 572.80843, 0], + "6.1667": [0, 604.65184, 0], + "6.2083": [0, 636.90357, 0], + "6.25": [0, 669.48693, 0], + "6.2917": [0, 702.42889, 0], + "6.3333": [0, 735.67367, 0], + "6.375": [0, 769.23809, 0], + "6.4167": [0, 803.07399, 0], + "6.4583": [0, 837.19888, 0], + "6.5": [0, 871.5627, 0], + "6.5417": [0, 906.19102, 0], + "6.5833": [0, 941.02696, 0], + "6.625": [0, 976.10462, 0], + "6.6667": [0, 1011.3691, 0], + "6.7083": [0, 1046.8387, 0], + "6.75": [0, 1082.48407, 0], + "6.7917": [0, 1118.29994, 0], + "6.8333": [0, 1154.28155, 0], + "6.875": [0, 1190.40158, 0], + "6.9167": [0, 1226.67735, 0], + "6.9583": [0, 1263.07209, 0], + "7.0": [0, 1299.59251, 0], + "7.0833": [0, 1372.95248, 0], + "7.2917": [0, 1557.84986, 0], + "7.7083": [0, 1930.52531, 0], + "7.9167": [0, 2116.31891, 0], + "8.0417": [0, 2227.04752, 0], + "8.125": [0, 2300.40749, 0], + "8.1667": [0, 2336.92791, 0], + "8.2083": [0, 2373.32265, 0], + "8.25": [0, 2409.59842, 0], + "8.2917": [0, 2445.71845, 0], + "8.3333": [0, 2481.70006, 0], + "8.375": [0, 2517.51593, 0], + "8.4167": [0, 2553.1613, 0], + "8.4583": [0, 2588.6309, 0], + "8.5": [0, 2623.89538, 0], + "8.5417": [0, 2658.97304, 0], + "8.5833": [0, 2693.80898, 0], + "8.625": [0, 2728.4373, 0], + "8.6667": [0, 2762.80112, 0], + "8.7083": [0, 2796.92601, 0], + "8.75": [0, 2830.76191, 0], + "8.7917": [0, 2864.32633, 0], + "8.8333": [0, 2897.57111, 0], + "8.875": [0, 2930.51307, 0], + "8.9167": [0, 2963.09643, 0], + "8.9583": [0, 2995.34816, 0], + "9.0": [0, 3027.19157, 0], + "9.0417": [0, 3058.66954, 0], + "9.0833": [0, 3089.69387, 0], + "9.125": [0, 3120.29521, 0], + "9.1667": [0, 3150.42158, 0], + "9.2083": [0, 3180.03944, 0], + "9.25": [0, 3209.15867, 0], + "9.2917": [0, 3237.68334, 0], + "9.3333": [0, 3265.62767, 0], + "9.375": [0, 3292.96569, 0], + "9.4167": [0, 3319.59778, 0], + "9.4583": [0, 3345.5217, 0], + "9.5": [0, 3370.70077, 0], + "9.5417": [0, 3395.07984, 0], + "9.5833": [0, 3418.54558, 0], + "9.625": [0, 3441.08158, 0], + "9.6667": [0, 3462.61796, 0], + "9.7083": [0, 3483.07224, 0], + "9.75": [0, 3502.35219, 0], + "9.7917": [0, 3520.35442, 0], + "9.8333": [0, 3536.96261, 0], + "9.875": [0, 3552.04543, 0], + "9.9167": [0, 3565.45413, 0], + "9.9583": [0, 3577.01951, 0], + "10.0": [0, 3586.54831, 0], + "10.0417": [0, 3593.7432, 0], + "10.0833": [0, 3598.30938, 0], + "10.125": [0, "360 * 10", 0] + }, + "position": { + "5.25": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "7.125": { + "post": [0, "20 * math.clamp(q.entity_size,1,1.2)", 0], + "lerp_mode": "catmullrom" + }, + "10.3333": { + "post": [0, "20 * math.clamp(q.entity_size,1,1.2)", 0], + "lerp_mode": "catmullrom" + }, + "10.625": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "10.7083": { + "post": [0, "q.entity_size / 2", 0], + "lerp_mode": "catmullrom" + }, + "10.7917": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "scale": { + "4.9167": { + "pre": [1, 1, 1], + "post": [1, 1, 1], + "lerp_mode": "catmullrom" + }, + "5.5417": { + "post": [0.75, 0.75, 0.75], + "lerp_mode": "catmullrom" + }, + "10.3333": { + "post": [0.75, 0.75, 0.75], + "lerp_mode": "catmullrom" + }, + "10.4583": { + "post": [1, 1, 1], + "lerp_mode": "catmullrom" + } } } }, + "sound_effects": { + "0.0": { + "effect": "evolution.evolving" + } + }, "particle_effects": { "0.0": { - "effect": "evo_sparkle", - "locator": "sparkles" - }, - "3.0": { - "effect": "evo_buildup", - "locator": "sparkles" - }, - "4.0": [ - { - "effect": "evo_obscuring", - "locator": "clouds" - }, - { - "effect": "evo_godrays", - "locator": "sparkles" - } - ], - "4.5417": { - "effect": "evo_flyingsparkles", - "locator": "sparkles" - }, - "6.0": { - "effect": "evo_bigsparkle", - "locator": "sparkles" - }, - "8.6667": { - "effect": "evo_implode", - "locator": "sparkles" - }, - "9.0": [ - { - "effect": "evo_sparkleburst", - "locator": "sparkles" - }, - { - "effect": "evo_smokeburst", - "locator": "sparkles" - }, - { - "effect": "evo_sparklefetti", - "locator": "sparkles" - } - ] + "effect": "cobblemon:evo_particles", + "locator": "middle" + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/generic/animations/moves/minimize.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/generic/animations/moves/minimize.animation.json new file mode 100644 index 0000000000..8f733fff00 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/generic/animations/moves/minimize.animation.json @@ -0,0 +1,52 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.minimize.actor": { + "animation_length": 2, + "bones": { + "root_part": { + "scale": { + "0.0": { + "post": [1, 1, 1], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [0.75, 0.75, 0.75], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0.9, 0.9, 0.9], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [0.5, 0.5, 0.5], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [0.7, 0.7, 0.7], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [0.25, 0.25, 0.25], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [0.25, 0.25, 0.25], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [1, 1, 1], + "lerp_mode": "catmullrom" + } + } + } + }, + "particle_effects": { + "0.9167": { + "effect": "cobblemon:minimize_actor", + "locator": "root" + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/generic/animations/moves/quickattack.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/generic/animations/moves/quickattack.animation.json new file mode 100644 index 0000000000..ed2538cca2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/generic/animations/moves/quickattack.animation.json @@ -0,0 +1,62 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.quickattack.actor": { + "animation_length": 1.75, + "bones": { + "root_part": { + "position": { + "1.0417": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [0, 0, -10], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [0, 0, -30], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [0, 0, -40], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5417": { + "post": [0, 0, -10], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "scale": { + "1.0833": [1, 1, 1], + "1.125": {"pre": [1, 1, 1], "post": [0, 0, 0]}, + "1.1667": {"pre": [0, 0, 0], "post": [1, 1, 1]}, + "1.2083": {"pre": [1, 1, 1], "post": [0, 0, 0]}, + "1.6667": {"pre": [0, 0, 0], "post": [1, 1, 1]} + } + } + }, + "particle_effects": { + "0.75": { + "effect": "cobblemon:quickattack_dust" + }, + "0.875": { + "effect": "cobblemon:quickattack_dashlines", + "locator": "middle" + }, + "1.6667": { + "effect": "cobblemon:quickattack_dust" + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/generic/posers/evolution.json b/common/src/main/resources/assets/cobblemon/bedrock/generic/posers/evolution.json index f1ffc2afef..2cf976959f 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/generic/posers/evolution.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/generic/posers/evolution.json @@ -5,7 +5,6 @@ "transformTicks": 0, "poseTypes": ["NONE"], "animations": [ - "bedrock(evolution, evolution)" ] } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/ballsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/ballsparkle.particle.json index 2350089402..367e7b3445 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/ballsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/ballsparkle.particle.json @@ -5,30 +5,32 @@ "identifier": "cobblemon:ancientoriginball/ballsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparkle" + "texture": "textures/particles/balls/originball/originballsparkle" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 16, - "max_particles": 16 + "spawn_rate": 22, + "max_particles": 24 }, "minecraft:emitter_lifetime_once": { "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "offset": [0, 1.5, 0], + "offset": [0, 2, 0], "radius": "math.random(0.5,1.5)*1.5", "surface_only": true, - "direction": [0, 1, 0] + "direction": ["math.random(-9,9)", "math.random(4,7)", "math.random(-9,9)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, "minecraft:particle_initial_speed": 0.75, - "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 2, 0] + }, "minecraft:particle_appearance_billboard": { - "size": [0.2, 0.2], + "size": [0.175, 0.175], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 36, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsendsparkle.particle.json index f0b62063eb..3b1180242f 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsendsparkle.particle.json @@ -5,25 +5,30 @@ "identifier": "cobblemon:ancientoriginball/battle/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/originball/originballsendsparkle" } }, "components": { - "minecraft:emitter_rate_instant": { - "num_particles": 8 + "minecraft:emitter_initialization": { + "per_update_expression": "variable.radius = 0.6;" + }, + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 16 }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, "minecraft:emitter_shape_sphere": { - "direction": ["math.random(-10,10)", "math.random(-0.05,4)*4+0.5", "math.random(-10,10)"] + "radius": "variable.radius*math.cos(variable.emitter_age*2080)", + "direction": ["math.random(-5,5)*1.75", "math.random(-0.05,6)*3+0.5", "math.random(-5,5)*1.75"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3", + "minecraft:particle_initial_speed": "math.random(3,7)*4", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -5, 0], + "linear_acceleration": [0, "-math.random(5,8)", 0], "linear_drag_coefficient": 4 }, "minecraft:particle_appearance_billboard": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsparks.particle.json index dc9e6bf2c5..f45e2e4a46 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/ballsparks.particle.json @@ -5,38 +5,52 @@ "identifier": "cobblemon:ancientoriginball/battle/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/originball/originballsparks" + } + }, + "curves": { + "variable.sizefunny": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [1, 1, 1, 0.98, 0.93, 0.83, 0.58, -0.01, 0, 0] } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 10 + "num_particles": 20 }, "minecraft:emitter_lifetime_once": { - "active_time": 1 + "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.5", "math.random(-10,10)"] + "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.25", "math.random(-10,10)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3.5", + "minecraft:particle_initial_speed": "math.random(3.1,4.8)*3.5", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 4.5 + "linear_acceleration": ["math.random(-3.5,3.5)*10", "math.random(-2.5,2.5)*10", "math.random(-3.5,3.5)*10"], + "linear_drag_coefficient": 3.5 }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": ["(0.225-(variable.particle_random_3*0.1))*v.sizefunny", "(0.225-(variable.particle_random_3*0.1))*v.sizefunny"], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 80, - "texture_height": 8, - "flipbook": { - "base_UV": [0, 0], - "size_UV": [8, 8], - "step_UV": [8, 0], - "frames_per_second": 18, - "max_frame": 10 + "texture_width": 90, + "texture_height": 9, + "uv": ["math.floor(v.particle_random_3*10)*9", 0], + "uv_size": [9, 9] + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.14": "#ffffffff", + "0.43": "#FFFF0000", + "0.71": "#FF7B0000" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/sendflash.particle.json index aede1dcd6f..fde432370a 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/battle/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:ancientoriginball/battle/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/battle/sendflash" + "texture": "textures/particles/balls/originball/battle/originsendflash" } }, "components": { @@ -27,14 +27,14 @@ "size": [2.25, 2.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 1024, + "texture_width": 1088, "texture_height": 64, "flipbook": { "base_UV": [0, 0], "size_UV": [64, 64], "step_UV": [64, 0], "frames_per_second": 24, - "max_frame": 16 + "max_frame": 17 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsendsparkle.particle.json index cf41d6db57..6e1f6b0f35 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:ancientoriginball/casual/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/originball/originballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 4 + "num_particles": 6 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,7 +21,7 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,6)*2.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3", "minecraft:particle_motion_dynamic": { "linear_acceleration": [0, -6, 0], "linear_drag_coefficient": 4 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsparks.particle.json index 55b3587946..cf3941acbd 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/ballsparks.particle.json @@ -5,38 +5,52 @@ "identifier": "cobblemon:ancientoriginball/casual/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/originball/originballsparks" + } + }, + "curves": { + "variable.sizefunny": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [1, 1, 1, 0.98, 0.93, 0.83, 0.58, -0.01, 0, 0, 0] } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 5 + "num_particles": 10 }, "minecraft:emitter_lifetime_once": { - "active_time": 1 + "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.5", "math.random(-10,10)"] + "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.25", "math.random(-10,10)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*2.1", + "minecraft:particle_initial_speed": "math.random(3.1,4.8)*2.5", "minecraft:particle_motion_dynamic": { + "linear_acceleration": ["math.random(-3.5,3.5)*10", "math.random(-2.5,2.5)*10", "math.random(-3.5,3.5)*10"], "linear_drag_coefficient": 3.5 }, "minecraft:particle_appearance_billboard": { - "size": [0.1, 0.1], + "size": ["(0.225-(variable.particle_random_3*0.1))*v.sizefunny", "(0.225-(variable.particle_random_3*0.1))*v.sizefunny"], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 80, - "texture_height": 8, - "flipbook": { - "base_UV": [0, 0], - "size_UV": [8, 8], - "step_UV": [8, 0], - "frames_per_second": 18, - "max_frame": 10 + "texture_width": 90, + "texture_height": 9, + "uv": ["math.floor(v.particle_random_3*10)*9", 0], + "uv_size": [9, 9] + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.14": "#ffffffff", + "0.33": "#FFFF0000", + "0.61": "#FF7B0000" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/sendflash.particle.json index fe9385fa33..5eda29abc0 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/ancientoriginball/casual/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:ancientoriginball/casual/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/casual/sendcasual" + "texture": "textures/particles/balls/originball/casual/originsendcasual" } }, "components": { @@ -27,14 +27,14 @@ "size": [1.25, 1.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 384, + "texture_width": 416, "texture_height": 32, "flipbook": { "base_UV": [0, 0], "size_UV": [32, 32], "step_UV": [32, 0], "frames_per_second": 24, - "max_frame": 12 + "max_frame": 13 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/ballsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/ballsparkle.particle.json index eb588e0ccb..2f18d74671 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/ballsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/ballsparkle.particle.json @@ -5,30 +5,32 @@ "identifier": "cobblemon:beastball/ballsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparkle" + "texture": "textures/particles/balls/beastball/beastballsparkle" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 16, - "max_particles": 16 + "spawn_rate": 24, + "max_particles": 18 }, "minecraft:emitter_lifetime_once": { "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "offset": [0, 1.5, 0], - "radius": "math.random(0.5,1.5)*1.5", + "offset": [0, 1.75, 0], + "radius": 1.25, "surface_only": true, - "direction": [0, 1, 0] + "direction": ["math.random(-9,9)", "math.random(4,7)", "math.random(-9,9)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, "minecraft:particle_initial_speed": 0.75, - "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 2, 0] + }, "minecraft:particle_appearance_billboard": { - "size": [0.2, 0.2], + "size": [0.15, 0.15], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 36, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsendsparkle.particle.json index 7029f19c15..4071d379e1 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:beastball/battle/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/beastball/beastballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 8 + "num_particles": 14 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,13 +21,13 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3", + "minecraft:particle_initial_speed": "math.random(4,7)*4.5", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -5, 0], - "linear_drag_coefficient": 4 + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 5 }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": [0.125, 0.125], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 99, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsparks.particle.json index 3b41076eac..693eca2362 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/ballsparks.particle.json @@ -5,28 +5,32 @@ "identifier": "cobblemon:beastball/battle/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/beastball/beastballsparks" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 10 + "num_particles": 20 }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, "minecraft:emitter_shape_sphere": { - "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.5", "math.random(-10,10)"] + "direction": ["math.random(-10,10)", "math.random(-0.5,5)*5+0.5", "math.random(-10,10)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3.5", + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(3,6)*3", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 4.5 + "linear_acceleration": [0, -20, 0], + "linear_drag_coefficient": 2 }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": ["0.075+0.075*v.particle_random_2", "0.075+0.075*v.particle_random_2"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 80, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/sendflash.particle.json index 0e44886fb1..be146005dd 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/battle/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:beastball/battle/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/battle/sendflash" + "texture": "textures/particles/balls/beastball/battle/beastsendflash" } }, "components": { @@ -27,14 +27,14 @@ "size": [2.25, 2.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 1024, + "texture_width": 1088, "texture_height": 64, "flipbook": { "base_UV": [0, 0], "size_UV": [64, 64], "step_UV": [64, 0], "frames_per_second": 24, - "max_frame": 16 + "max_frame": 17 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsendsparkle.particle.json index 8f32774eba..44b69c9462 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:beastball/casual/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/beastball/beastballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 4 + "num_particles": 6 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,7 +21,7 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,6)*2.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3", "minecraft:particle_motion_dynamic": { "linear_acceleration": [0, -6, 0], "linear_drag_coefficient": 4 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsparks.particle.json index bf05dbf81f..eaf0e48784 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/ballsparks.particle.json @@ -5,28 +5,32 @@ "identifier": "cobblemon:beastball/casual/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/beastball/beastballsparks" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 5 + "num_particles": 12 }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, "minecraft:emitter_shape_sphere": { - "direction": ["math.random(-10,10)", "math.random(-0.1,4)*3+0.5", "math.random(-10,10)"] + "direction": ["math.random(-10,10)", "math.random(-0.5,5)*5+0.5", "math.random(-10,10)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*2.1", + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(3,7)*2", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 3.5 + "linear_acceleration": [0, -15, 0], + "linear_drag_coefficient": 2 }, "minecraft:particle_appearance_billboard": { - "size": [0.1, 0.1], + "size": ["0.05+0.075*v.particle_random_2", "0.05+0.075*v.particle_random_2"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 80, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/sendflash.particle.json index 07575a5f3d..315047a086 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/beastball/casual/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:beastball/casual/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/casual/sendcasual" + "texture": "textures/particles/balls/beastball/casual/beastsendcasual" } }, "components": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/ballsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/ballsparkle.particle.json index f1e576c3c2..fc122995cb 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/ballsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/ballsparkle.particle.json @@ -5,30 +5,32 @@ "identifier": "cobblemon:cherishball/ballsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparkle" + "texture": "textures/particles/balls/cherishball/cherishballsparkle" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 16, - "max_particles": 16 + "spawn_rate": 24, + "max_particles": 18 }, "minecraft:emitter_lifetime_once": { "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "offset": [0, 1.5, 0], - "radius": "math.random(0.5,1.5)*1.5", + "offset": [0, 1.75, 0], + "radius": 1.25, "surface_only": true, - "direction": [0, 1, 0] + "direction": ["math.random(-9,9)", "math.random(4,7)", "math.random(-9,9)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, "minecraft:particle_initial_speed": 0.75, - "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 2, 0] + }, "minecraft:particle_appearance_billboard": { - "size": [0.2, 0.2], + "size": [0.15, 0.15], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 36, @@ -41,6 +43,15 @@ "max_frame": 4 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFFFFF", + "0.19": "#FFFF8845" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsendsparkle.particle.json index c33b38cea1..6c472fd11c 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:cherishball/battle/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/cherishball/cherishballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 8 + "num_particles": 14 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,13 +21,13 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3", + "minecraft:particle_initial_speed": "math.random(4,7)*4.5", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -5, 0], - "linear_drag_coefficient": 4 + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 5 }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": [0.125, 0.125], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 99, @@ -40,6 +40,17 @@ "max_frame": 11 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsparks.particle.json index aed1eb4a2b..de4511dc04 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/ballsparks.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:cherishball/battle/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/cherishball/cherishballsparks" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 10 + "num_particles": 8 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,9 +21,9 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3.75", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 4.5 + "linear_drag_coefficient": 5 }, "minecraft:particle_appearance_billboard": { "size": [0.15, 0.15], @@ -39,6 +39,17 @@ "max_frame": 10 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/sendflash.particle.json index 0e4c935796..92ab713702 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/battle/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:cherishball/battle/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/battle/sendflash" + "texture": "textures/particles/balls/cherishball/battle/cherishsendflash" } }, "components": { @@ -27,14 +27,25 @@ "size": [2.25, 2.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 1024, + "texture_width": 1088, "texture_height": 64, "flipbook": { "base_UV": [0, 0], "size_UV": [64, 64], "step_UV": [64, 0], "frames_per_second": 24, - "max_frame": 16 + "max_frame": 17 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsendsparkle.particle.json index 5ecd5b8690..e089532483 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:cherishball/casual/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/cherishball/cherishballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 4 + "num_particles": 6 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,7 +21,7 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,6)*2.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3", "minecraft:particle_motion_dynamic": { "linear_acceleration": [0, -6, 0], "linear_drag_coefficient": 4 @@ -40,6 +40,17 @@ "max_frame": 11 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsparks.particle.json index 723bd2fa00..45ff834a13 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/ballsparks.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:cherishball/casual/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/cherishball/cherishballsparks" } }, "components": { @@ -21,9 +21,9 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*2.1", + "minecraft:particle_initial_speed": "math.random(3,7)*2", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 3.5 + "linear_drag_coefficient": 3 }, "minecraft:particle_appearance_billboard": { "size": [0.1, 0.1], @@ -39,6 +39,17 @@ "max_frame": 10 } } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/sendflash.particle.json index c13e61e1eb..5667445a0e 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/cherishball/casual/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:cherishball/casual/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/casual/sendcasual" + "texture": "textures/particles/balls/cherishball/casual/cherishsendcasual" } }, "components": { @@ -27,14 +27,25 @@ "size": [1.25, 1.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 384, + "texture_width": 416, "texture_height": 32, "flipbook": { "base_UV": [0, 0], "size_UV": [32, 32], "step_UV": [32, 0], "frames_per_second": 24, - "max_frame": 12 + "max_frame": 13 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF8DFFC6", + "0.2": "#ffffffff", + "0.35": "#ffffffff", + "0.53": "#FFFF8845" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/ballsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/ballsparkle.particle.json index ec4534de09..35feb44810 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/ballsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/ballsparkle.particle.json @@ -5,22 +5,22 @@ "identifier": "cobblemon:dreamball/ballsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparkle" + "texture": "textures/particles/balls/dreamball/dreamballsparkle" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 16, - "max_particles": 16 + "spawn_rate": 20, + "max_particles": 14 }, "minecraft:emitter_lifetime_once": { "active_time": 0.5 }, "minecraft:emitter_shape_sphere": { - "offset": [0, 1.5, 0], - "radius": "math.random(0.5,1.5)*1.5", + "offset": [0, 1.25, 0], + "radius": "1.25", "surface_only": true, - "direction": [0, 1, 0] + "direction": "outwards" }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsendsparkle.particle.json index 652f36f308..e1a75a1d3b 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:dreamball/battle/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/dreamball/dreamballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 8 + "num_particles": 14 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,13 +21,13 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3", + "minecraft:particle_initial_speed": "math.random(4,7)*4.5", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -5, 0], - "linear_drag_coefficient": 4 + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 5 }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": [0.125, 0.125], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 99, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsparks.particle.json index 76e2468074..64ee639c17 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/ballsparks.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:dreamball/battle/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/dreamball/dreamballsparks" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 10 + "num_particles": 8 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,9 +21,9 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*3.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3.75", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 4.5 + "linear_drag_coefficient": 5 }, "minecraft:particle_appearance_billboard": { "size": [0.15, 0.15], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/sendflash.particle.json index a9af38dd9a..97faa0236d 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/battle/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:dreamball/battle/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/battle/sendflash" + "texture": "textures/particles/balls/dreamball/battle/dreamsendflash" } }, "components": { @@ -27,14 +27,14 @@ "size": [2.25, 2.25], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 1024, + "texture_width": 1088, "texture_height": 64, "flipbook": { "base_UV": [0, 0], "size_UV": [64, 64], "step_UV": [64, 0], "frames_per_second": 24, - "max_frame": 16 + "max_frame": 17 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsendsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsendsparkle.particle.json index dcc6ac3fc2..a717bb6be9 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsendsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsendsparkle.particle.json @@ -5,12 +5,12 @@ "identifier": "cobblemon:dreamball/casual/ballsendsparkle", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsendsparkle" + "texture": "textures/particles/balls/dreamball/dreamballsendsparkle" } }, "components": { "minecraft:emitter_rate_instant": { - "num_particles": 4 + "num_particles": 6 }, "minecraft:emitter_lifetime_once": { "active_time": 1 @@ -21,7 +21,7 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,6)*2.5", + "minecraft:particle_initial_speed": "math.random(3,6)*3", "minecraft:particle_motion_dynamic": { "linear_acceleration": [0, -6, 0], "linear_drag_coefficient": 4 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsparks.particle.json index bd6910237c..b5e04c789d 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsparks.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/ballsparks.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:dreamball/casual/ballsparks", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/ballsparks" + "texture": "textures/particles/balls/dreamball/dreamballsparks" } }, "components": { @@ -21,9 +21,9 @@ "minecraft:particle_lifetime_expression": { "max_lifetime": 1 }, - "minecraft:particle_initial_speed": "math.random(4,7)*2.1", + "minecraft:particle_initial_speed": "math.random(3,7)*2", "minecraft:particle_motion_dynamic": { - "linear_drag_coefficient": 3.5 + "linear_drag_coefficient": 3 }, "minecraft:particle_appearance_billboard": { "size": [0.1, 0.1], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/sendflash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/sendflash.particle.json index 8d9af57028..0eb4b84ab6 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/sendflash.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/balls/dreamball/casual/sendflash.particle.json @@ -5,7 +5,7 @@ "identifier": "cobblemon:dreamball/casual/sendflash", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particles/balls/pokeball/casual/sendcasual" + "texture": "textures/particles/balls/dreamball/casual/dreamsendcasual" } }, "components": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_bigsparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_bigsparkle.particle.json index 157a61f585..6f49e20b27 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_bigsparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_bigsparkle.particle.json @@ -9,19 +9,16 @@ } }, "components": { - "minecraft:emitter_initialization": { - "creation_expression": "variable.entity_radius = 1;" - }, "minecraft:emitter_rate_steady": { - "spawn_rate": "8 * v.entity_radius", + "spawn_rate": "8 * math.clamp(q.entity_size,1,2)", "max_particles": 100 }, "minecraft:emitter_lifetime_once": { "active_time": 2 }, "minecraft:emitter_shape_disc": { - "offset": [0, "math.random(-1,1) * v.entity_radius", 0], - "radius": "v.entity_radius * 1.5 + math.random(0,0.5) * v.entity_radius", + "offset": [0, "math.random(-1,1) * math.clamp(q.entity_size,1,2)", 0], + "radius": "math.clamp(q.entity_size,1,2) * 1.5 + math.random(0.2,1) * math.clamp(q.entity_size,1,2)", "surface_only": true, "direction": "outwards" }, @@ -31,7 +28,7 @@ "minecraft:particle_initial_speed": 0, "minecraft:particle_motion_dynamic": {}, "minecraft:particle_appearance_billboard": { - "size": ["0.3 * v.entity_radius", "0.3 * v.entity_radius"], + "size": ["0.3 * math.clamp(q.entity_size,1,4)", "0.3 * math.clamp(q.entity_size,1,4)"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 16, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_buildup.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_buildup.particle.json index aa2540ad40..869749a414 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_buildup.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_buildup.particle.json @@ -9,8 +9,9 @@ } }, "components": { - "minecraft:emitter_initialization": { - "creation_expression": "variable.entity_radius = 1;" + "minecraft:emitter_local_space": { + "position": true, + "rotation": false }, "minecraft:emitter_rate_steady": { "spawn_rate": "v.emitter_age * 10", @@ -20,19 +21,19 @@ "active_time": 5 }, "minecraft:emitter_shape_sphere": { - "radius": "v.entity_radius * 2", + "radius": "math.clamp(math.clamp(q.entity_size, 1,4)* 2, 1, 2)", "surface_only": true, "direction": "inwards" }, "minecraft:particle_lifetime_expression": { - "max_lifetime": 1 + "max_lifetime": "0.7 * math.clamp(q.entity_size, 1, 1.1)" }, - "minecraft:particle_initial_speed": "0.125 * v.entity_radius", + "minecraft:particle_initial_speed": "0.125 * math.clamp(q.entity_size,1,4)", "minecraft:particle_motion_dynamic": { "linear_drag_coefficient": -4.5 }, "minecraft:particle_appearance_billboard": { - "size": ["v.entity_radius/8", "v.entity_radius/8"], + "size": ["math.clamp(math.clamp(q.entity_size, 1,2), 1, 2)/8", "math.clamp(math.clamp(q.entity_size, 1,2), 1, 2)/8"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 8, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_flyingsparkles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_flyingsparkles.particle.json index ee79306760..35a5433cce 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_flyingsparkles.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_flyingsparkles.particle.json @@ -9,18 +9,15 @@ } }, "components": { - "minecraft:emitter_initialization": { - "creation_expression": "variable.entity_radius = 1;" - }, "minecraft:emitter_rate_steady": { - "spawn_rate": "10 * (v.entity_radius/2) + 5", + "spawn_rate": "10 * (math.clamp(q.entity_size,1,2)/2) + 5", "max_particles": 100 }, "minecraft:emitter_lifetime_once": { "active_time": 4 }, "minecraft:emitter_shape_sphere": { - "radius": "v.entity_radius", + "radius": "math.clamp(q.entity_size,1,2)", "surface_only": true, "direction": "outwards" }, @@ -30,19 +27,19 @@ "minecraft:particle_initial_spin": { "rotation": "math.random_integer(1,4)*90" }, - "minecraft:particle_initial_speed": "math.random(4,6) * v.entity_radius", + "minecraft:particle_initial_speed": "math.random(4,6) * math.clamp(q.entity_size,1,2)", "minecraft:particle_motion_dynamic": { "linear_drag_coefficient": 2 }, "minecraft:particle_appearance_billboard": { - "size": ["0.2 * v.entity_radius", "0.2 * v.entity_radius"], + "size": ["0.2 * math.clamp(q.entity_size,1,2)", "0.2 * math.clamp(q.entity_size,1,2)"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 8, "texture_height": 32, "flipbook": { "base_UV": [0, 0], - "size_UV": [0, 8], + "size_UV": [8, 8], "step_UV": [0, 8], "frames_per_second": 24, "max_frame": 4, @@ -50,6 +47,10 @@ } } }, + "minecraft:particle_motion_collision": { + "collision_drag": 1, + "coefficient_of_restitution": 1 + }, "minecraft:particle_appearance_tinting": { "color": { "interpolant": "v.particle_age / v.particle_lifetime", diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_godrays.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_godrays.particle.json index a908849c4a..3916f8ece6 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_godrays.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_godrays.particle.json @@ -9,8 +9,9 @@ } }, "components": { - "minecraft:emitter_initialization": { - "creation_expression": "variable.entity_radius = 1;" + "minecraft:emitter_local_space": { + "position": true, + "rotation": false }, "minecraft:emitter_rate_steady": { "spawn_rate": 12, @@ -30,7 +31,7 @@ "minecraft:particle_initial_speed": 0, "minecraft:particle_motion_dynamic": {}, "minecraft:particle_appearance_billboard": { - "size": ["(6/128) * 2 * v.particle_age * v.entity_radius", "3 * v.particle_age * v.entity_radius"], + "size": ["(6/128) * 1 * v.particle_age * math.clamp(q.entity_size,1,10)", "3 * v.particle_age * math.clamp(q.entity_size,1,10)"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 6, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_godrays_small.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_godrays_small.particle.json new file mode 100644 index 0000000000..69c48c685c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_godrays_small.particle.json @@ -0,0 +1,57 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:evo_godrays_small", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/lightbeam" + } + }, + "components": { + "minecraft:emitter_local_space": { + "position": true, + "rotation": false + }, + "minecraft:emitter_rate_steady": { + "spawn_rate": 12, + "max_particles": 100 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 3 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_spin": { + "rotation": "v.emitter_age/v.emitter_lifetime*360*6 + v.emitter_age/v.emitter_lifetime*360*math.pi + v.emitter_random_1*360", + "rotation_rate": "math.random(-20,20)" + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": ["(6/128) * 1 * v.particle_age * math.clamp(q.entity_size,1,2)", "2 * v.particle_age * math.clamp(q.entity_size,1,2)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 6, + "texture_height": 128, + "uv": [0, 0], + "uv_size": [6, 128] + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#0037FFF7", + "0.24": "#FFFF9BAF", + "0.5": "#FFFFF864", + "0.8": "#FFB63EFB", + "1.0": "#0082F8FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_implode.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_implode.particle.json index 84195118af..66d79b2c57 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_implode.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_implode.particle.json @@ -9,8 +9,9 @@ } }, "components": { - "minecraft:emitter_initialization": { - "creation_expression": "variable.entity_radius = 1;" + "minecraft:emitter_local_space": { + "position": true, + "rotation": false }, "minecraft:emitter_rate_instant": { "num_particles": 64 @@ -19,20 +20,20 @@ "active_time": 5 }, "minecraft:emitter_shape_sphere": { - "radius": "v.entity_radius * 4", + "radius": "math.clamp(q.entity_size,1,2) * 3", "surface_only": true, "direction": "inwards" }, "minecraft:particle_lifetime_expression": { - "max_lifetime": 0.4 + "max_lifetime": "0.3 * math.clamp(q.entity_size,1,2)" }, - "minecraft:particle_initial_speed": "28 * v.entity_radius", + "minecraft:particle_initial_speed": "28 * math.clamp(q.entity_size,1,2)", "minecraft:particle_motion_dynamic": { "linear_acceleration": ["math.random(-40,40)/2", "math.random(-40,40)/2", "math.random(-40,40)/2"], "linear_drag_coefficient": 6 }, "minecraft:particle_appearance_billboard": { - "size": ["v.entity_radius/8", "v.entity_radius/8"], + "size": ["math.clamp(q.entity_size,1,2)/8", "math.clamp(q.entity_size,1,2)/8"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 8, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscure_layer1.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscure_layer1.particle.json deleted file mode 100644 index 3fc7f20d9d..0000000000 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscure_layer1.particle.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "format_version": "1.10.0", - "particle_effect": { - "description": { - "identifier": "cobblemon:evo_obscure_layer1", - "basic_render_parameters": { - "material": "particles_alpha", - "texture": "textures/particles/glowing_smoke_cyan" - } - }, - "curves": { - "variable.size": { - "type": "linear", - "input": "v.particle_age", - "horizontal_range": "v.particle_lifetime", - "nodes": [1, 0] - } - }, - "components": { - "minecraft:emitter_initialization": { - "creation_expression": "v.entity_radius = 1;" - }, - "minecraft:emitter_rate_steady": { - "spawn_rate": "v.entity_radius * 20", - "max_particles": 50 - }, - "minecraft:emitter_lifetime_once": { - "active_time": 0.8 - }, - "minecraft:emitter_shape_point": {}, - "minecraft:particle_lifetime_expression": { - "max_lifetime": 0.8 - }, - "minecraft:particle_initial_spin": { - "rotation": "math.random(-360,360)" - }, - "minecraft:particle_motion_parametric": { - "relative_position": ["Math.cos((variable.particle_age * 360 / 2) + v.particle_random_2*(360*2) * v.entity_radius * 3)", 0, "Math.sin((variable.particle_age * 360 / 2) + v.particle_random_2*(360*2) * v.entity_radius * 3)"] - }, - "minecraft:particle_appearance_billboard": { - "size": [0.2, 0.2], - "facing_camera_mode": "rotate_xyz", - "uv": { - "texture_width": 8, - "texture_height": 48, - "uv": [0, 8], - "uv_size": [8, 8] - } - } - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscure_layer2.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscure_layer2.particle.json deleted file mode 100644 index 7fe89fed3b..0000000000 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscure_layer2.particle.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "format_version": "1.10.0", - "particle_effect": { - "description": { - "identifier": "cobblemon:evo_obscure_layer2", - "basic_render_parameters": { - "material": "particles_alpha", - "texture": "textures/particles/glowing_smoke_cyan" - } - }, - "curves": { - "variable.pop": { - "type": "linear", - "input": "v.particle_age ", - "horizontal_range": "v.particle_lifetime ", - "nodes": [1, 1, 0] - }, - "variable.size": { - "type": "linear", - "input": "v.particle_age", - "horizontal_range": "v.particle_lifetime", - "nodes": [1, 0] - } - }, - "components": { - "minecraft:emitter_initialization": { - "creation_expression": "v.entity_radius = 1;" - }, - "minecraft:emitter_rate_instant": { - "num_particles": 20 - }, - "minecraft:emitter_lifetime_once": { - "active_time": 1 - }, - "minecraft:emitter_shape_disc": { - "radius": "v.entity_radius", - "surface_only": true, - "direction": "outwards" - }, - "minecraft:particle_lifetime_expression": { - "max_lifetime": 2 - }, - "minecraft:particle_initial_spin": { - "rotation": "math.random(-360,360)" - }, - "minecraft:particle_initial_speed": 5, - "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -1, 0], - "linear_drag_coefficient": 2 - }, - "minecraft:particle_appearance_billboard": { - "size": ["0.4 * v.size", "0.4 * v.size"], - "facing_camera_mode": "rotate_xyz", - "uv": { - "texture_width": 8, - "texture_height": 48, - "flipbook": { - "base_UV": [0, 0], - "size_UV": [8, 8], - "step_UV": [0, 8], - "frames_per_second": 6, - "max_frame": 6 - } - } - } - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscure_swirl.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscure_swirl.particle.json deleted file mode 100644 index d78399d264..0000000000 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscure_swirl.particle.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "format_version": "1.10.0", - "particle_effect": { - "description": { - "identifier": "cobblemon:evo_obscure_swirl", - "basic_render_parameters": { - "material": "particles_alpha", - "texture": "textures/particles/glowing_smoke_cyan" - } - }, - "curves": { - "variable.size": { - "type": "linear", - "input": "v.particle_age", - "horizontal_range": "v.particle_lifetime", - "nodes": [1, 0] - } - }, - "components": { - "minecraft:emitter_initialization": { - "creation_expression": "v.entity_radius = 1;" - }, - "minecraft:emitter_rate_steady": { - "spawn_rate": "v.entity_radius * 10", - "max_particles": 50 - }, - "minecraft:emitter_lifetime_once": { - "active_time": 2.5 - }, - "minecraft:emitter_shape_point": {}, - "minecraft:particle_lifetime_expression": { - "max_lifetime": 1.5 - }, - "minecraft:particle_initial_spin": { - "rotation": "math.random(-360,360)" - }, - "minecraft:particle_motion_parametric": { - "relative_position": ["Math.cos((variable.particle_age * 360 / 2) + (v.particle_random_2 * 360) * v.entity_radius * 3)", "-1.5 + v.particle_age / 1.1", "Math.sin((variable.particle_age * 360 / 2) + (v.particle_random_2 * 360) * v.entity_radius * 3)"] - }, - "minecraft:particle_appearance_billboard": { - "size": [0.2, 0.2], - "facing_camera_mode": "rotate_xyz", - "uv": { - "texture_width": 8, - "texture_height": 48, - "uv": [0, 8], - "uv_size": [8, 8] - } - } - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json index 00ed662a1c..292c0b60af 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_obscuring.particle.json @@ -9,21 +9,18 @@ } }, "components": { - "minecraft:emitter_initialization": { - "creation_expression": "v.entity_radius = v.entity_radius == 0 ? 1 : v.entity_radius;variable.entity_radius = 1;" - }, "minecraft:emitter_local_space": { "position": true, "rotation": true }, "minecraft:emitter_rate_instant": { - "num_particles": "350 * v.entity_radius" + "num_particles": "math.clamp(350 * math.clamp(q.entity_size,1,2), 10, 500)" }, "minecraft:emitter_lifetime_once": { "active_time": 5 }, "minecraft:emitter_shape_sphere": { - "radius": "v.entity_radius + 2", + "radius": "math.clamp(q.entity_size,0.8,1) + (2.5 / math.clamp(q.entity_size,0.5,2))", "surface_only": true, "direction": "inwards" }, @@ -33,13 +30,13 @@ "minecraft:particle_initial_spin": { "rotation": "math.random_integer(1,4) * 90" }, - "minecraft:particle_initial_speed": "7 + v.entity_radius/2 * v.particle_random_1", + "minecraft:particle_initial_speed": "7 + math.clamp(q.entity_size,1,4)/2 * v.particle_random_1", "minecraft:particle_motion_dynamic": { - "linear_acceleration": ["math.random(-1,1) * v.entity_radius * 1.3", "math.random(-1,1) * v.entity_radius * 1.3", "math.random(-1,1) * v.entity_radius * 1.3 "], - "linear_drag_coefficient": "3 + v.entity_radius/2 * v.particle_random_1" + "linear_acceleration": ["math.random(-1,1) * math.clamp(q.entity_size, 1,100) * 1.3", "math.random(-1,1) * math.clamp(q.entity_size, 1,100) * 1.3", "math.random(-1,1) * math.clamp(q.entity_size, 1,100) * 1.3 "], + "linear_drag_coefficient": "3 + math.clamp(q.entity_size, 1,100)/2 * v.particle_random_1" }, "minecraft:particle_appearance_billboard": { - "size": ["0.175 * v.entity_radius", "0.175 * v.entity_radius"], + "size": ["0.175 * math.clamp(q.entity_size,1,2)", "0.175 * math.clamp(q.entity_size,1,2)"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 8, @@ -54,7 +51,16 @@ } }, "minecraft:particle_appearance_tinting": { - "color": [1, 1, 1, 1] + "color": { + "interpolant": "v.particle_random_4", + "gradient": { + "0.0": "#FFFFFFFF", + "0.22": "#FFCCFFFC", + "0.56": "#FFDCE5FE", + "0.77": "#FFFADDFE", + "1.0": "#FF86FBFF" + } + } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_particles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_particles.particle.json index 4f1fc7e6dc..c9f62caf56 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_particles.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_particles.particle.json @@ -5,110 +5,81 @@ "identifier": "cobblemon:evo_particles", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/blocks/wool_colored_white" + "texture": "textures/particles/glowing_dots_cyan" } }, "events": { "event_sparkle": { "particle_effect": { "effect": "cobblemon:evo_sparkle", - "type": "particle", - "pre_effect_expression": "variable.entity_radius = 1;" - }, - "expression": "" + "type": "emitter_bound" + } }, "event_buildup": { "particle_effect": { "effect": "cobblemon:evo_buildup", - "type": "particle", - "pre_effect_expression": "variable.entity_radius = 1;" - } - }, - "event_obscuring": { - "particle_effect": { - "effect": "cobblemon:evo_obscuring", - "type": "particle", - "pre_effect_expression": "variable.entity_radius = 1;" + "type": "emitter_bound" } }, "event_flyingsparkles": { "particle_effect": { "effect": "cobblemon:evo_flyingsparkles", - "type": "particle", - "pre_effect_expression": "variable.entity_radius = 1;" + "type": "emitter_bound" } }, "event_bigsparkle": { "particle_effect": { "effect": "cobblemon:evo_bigsparkle", - "type": "particle", - "pre_effect_expression": "variable.entity_radius = 1;" + "type": "emitter_bound" } }, "event_sparklefetti": { "particle_effect": { "effect": "cobblemon:evo_sparklefetti", - "type": "particle", - "pre_effect_expression": "variable.entity_radius = 1;" + "type": "emitter_bound" } }, "event_sparkleburst": { "particle_effect": { "effect": "cobblemon:evo_sparkleburst", - "type": "particle", - "pre_effect_expression": "variable.entity_radius = 1;" - } - }, - "event_smokeburst": { - "particle_effect": { - "effect": "cobblemon:evo_smokeburst", - "type": "particle", - "pre_effect_expression": "variable.entity_radius = 1;" + "type": "particle" } }, "event_godrays": { "particle_effect": { "effect": "cobblemon:evo_godrays", - "type": "particle", - "pre_effect_expression": "variable.entity_radius = 1;" + "type": "emitter_bound" } }, "event_implode": { "particle_effect": { "effect": "cobblemon:evo_implode", - "type": "particle", - "pre_effect_expression": "variable.entity_radius = 1;" + "type": "particle" } }, - "event_swirl": { + "event_obscuring": { "particle_effect": { - "effect": "cobblemon:evo_obscure_swirl", - "type": "emitter", - "pre_effect_expression": "variable.entity_radius = 1;" + "effect": "cobblemon:evo_obscuring", + "type": "emitter_bound" } }, - "event_swirlend": { + "event_color_godrays": { "particle_effect": { - "effect": "cobblemon:evo_obscure_layer2", - "type": "emitter", - "pre_effect_expression": "variable.entity_radius = 1;" + "effect": "cobblemon:evo_godrays_small", + "type": "emitter_bound" } }, - "event_obscure_spin": { + "event_smokeburst": { "particle_effect": { - "effect": "cobblemon:evo_obscure_layer1", - "type": "emitter" - }, - "expression": "" - }, - "event_expression": { - "expression": "" + "effect": "cobblemon:evo_smokeburst", + "type": "emitter_bound" + } } }, "components": { "minecraft:emitter_local_space": { "position": true, - "rotation": true + "rotation": false }, "minecraft:emitter_rate_instant": { "num_particles": 1 @@ -119,15 +90,13 @@ "minecraft:emitter_lifetime_events": { "creation_event": "event_sparkle", "timeline": { - "3.00": "event_buildup", + "2.00": "event_buildup", "5.00": "event_obscuring", - "5.80": "event_swirl", + "5.01": "event_color_godrays", + "5.10": "event_godrays", "6.00": "event_flyingsparkles", "7.00": "event_bigsparkle", - "9.00": "event_obscure_spin", - "9.50": "event_godrays", "9.58": "event_implode", - "9.99": "event_swirlend", "10.00": "event_smokeburst", "10.01": "event_sparkleburst", "10.02": "event_sparklefetti" @@ -137,7 +106,6 @@ "offset": [0, 1, 0] }, "minecraft:particle_lifetime_expression": { - "max_lifetime": 1, "expiration_expression": 1 }, "minecraft:particle_initial_speed": 0, @@ -146,10 +114,10 @@ "size": [0.2, 0.2], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 16, - "texture_height": 16, + "texture_width": 8, + "texture_height": 32, "uv": [0, 0], - "uv_size": [16, 16] + "uv_size": [1, 1] } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_smokeburst.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_smokeburst.particle.json index 9cee88976e..d8087b79e3 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_smokeburst.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_smokeburst.particle.json @@ -9,18 +9,19 @@ } }, "components": { - "minecraft:emitter_initialization": { - "creation_expression": "variable.entity_radius = 1;" + "minecraft:emitter_local_space": { + "position": true, + "rotation": false }, "minecraft:emitter_rate_instant": { - "num_particles": "150 * v.entity_radius" + "num_particles": "math.clamp(130 * math.clamp(q.entity_size,1,2), 1, 260)" }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, "minecraft:emitter_shape_sphere": { "offset": [0, -0.1, 0], - "radius": "v.entity_radius/2", + "radius": "math.clamp(q.entity_size, 1,3)/ 2", "surface_only": true, "direction": "outwards" }, @@ -30,13 +31,13 @@ "minecraft:particle_initial_spin": { "rotation": "math.random_integer(1,4)*90" }, - "minecraft:particle_initial_speed": "math.random(10,12.5)", + "minecraft:particle_initial_speed": "math.clamp(math.random(10,12.5) * q.entity_size, 9, 20 )", "minecraft:particle_motion_dynamic": { - "linear_acceleration": ["(v.particle_random_2*15 - 15/2) + math.random(-4,4)", "(v.particle_random_3*8 - 4) + math.random(-4,4)", "(v.particle_random_4*15 - 15/2) + math.random(-4,4)"], - "linear_drag_coefficient": "math.random(4,5)" + "linear_acceleration": ["(v.particle_random_2*15 - 15/2) + (math.random(-4,4) * math.clamp(q.entity_size,1,2))", "(v.particle_random_3*8 - 4) + (math.random(-4,4) * math.clamp(q.entity_size,1,2))", "(v.particle_random_4*15 - 15/2) + (math.random(-4,4) * math.clamp(q.entity_size,1,2))"], + "linear_drag_coefficient": "math.random(4,5) / (math.clamp(q.entity_size,1,2))" }, "minecraft:particle_appearance_billboard": { - "size": [0.15, 0.15], + "size": ["0.15 * math.clamp(q.entity_size,1,2)", "0.15 * math.clamp(q.entity_size,1,2)"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 8, @@ -45,7 +46,7 @@ "base_UV": [0, 0], "size_UV": [8, 8], "step_UV": [0, 8], - "max_frame": 7, + "max_frame": 6, "stretch_to_lifetime": true } } @@ -56,12 +57,13 @@ }, "minecraft:particle_appearance_tinting": { "color": { - "interpolant": "v.particle_age / v.particle_lifetime", + "interpolant": "v.particle_random_4", "gradient": { "0.0": "#FFFFFFFF", - "0.18": "#B5FFFFFF", - "0.5": "#A3FFFFFF", - "1.0": "#FF00FFF6" + "0.22": "#FFCCFFFC", + "0.56": "#FFD0DAFE", + "0.77": "#FFFAD8FF", + "1.0": "#FFFFFFFF" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparkle.particle.json index b5f3cb79d4..8747e412b3 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparkle.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparkle.particle.json @@ -9,18 +9,19 @@ } }, "components": { - "minecraft:emitter_initialization": { - "creation_expression": "variable.entity_radius = 1;" + "minecraft:emitter_local_space": { + "position": true, + "rotation": false }, "minecraft:emitter_rate_steady": { - "spawn_rate": "math.clamp(10 * v.entity_radius, 10, 100)", + "spawn_rate": "math.clamp(10 * math.clamp(q.entity_size,1,2), 10, 100)", "max_particles": 100 }, "minecraft:emitter_lifetime_looping": { "active_time": 5 }, "minecraft:emitter_shape_point": { - "offset": ["math.sin(v.emitter_age*360*3+v.emitter_random_1*360)*(v.entity_radius+0.2)", -0.5, "math.cos(v.emitter_age*360*3+v.emitter_random_1*360)*(v.entity_radius+0.2)"] + "offset": ["math.sin(v.emitter_age*360*3+v.emitter_random_1*360)*(math.clamp(q.entity_size,1,2)+0.1)", -0.5, "math.cos(v.emitter_age*360*3+v.emitter_random_1*360)*(math.clamp(q.entity_size,1,2)+0.1)"] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 1 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparkleburst.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparkleburst.particle.json index 7740d69f8c..069fe42a17 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparkleburst.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparkleburst.particle.json @@ -9,17 +9,14 @@ } }, "components": { - "minecraft:emitter_initialization": { - "creation_expression": "variable.entity_radius = 1;" - }, "minecraft:emitter_rate_instant": { - "num_particles": "35 * v.entity_radius" + "num_particles": "35 * math.clamp(q.entity_size,1,2)" }, "minecraft:emitter_lifetime_once": { - "active_time": "0.5 * v.entity_radius" + "active_time": "0.5 * math.clamp(q.entity_size,1,2)" }, "minecraft:emitter_shape_sphere": { - "radius": "v.entity_radius/2", + "radius": "math.clamp(q.entity_size,1,2)/2", "surface_only": true, "direction": "outwards" }, @@ -32,7 +29,7 @@ "linear_drag_coefficient": 4 }, "minecraft:particle_appearance_billboard": { - "size": ["0.125 * v.entity_radius + 0.1", "0.125 * v.entity_radius + 0.1"], + "size": ["0.125 * math.clamp(q.entity_size,1,2) + 0.1", "0.125 * math.clamp(q.entity_size,1,2) + 0.1"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 8, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparklefetti.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparklefetti.particle.json index e160f7ffb7..4468bebdc2 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparklefetti.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/evo_sparklefetti.particle.json @@ -17,12 +17,13 @@ } }, "components": { - "minecraft:emitter_initialization": { - "creation_expression": "variable.entity_radius = 1;" + "minecraft:emitter_local_space": { + "position": true, + "rotation": false }, "minecraft:emitter_rate_steady": { - "spawn_rate": "200 * v.entity_radius", - "max_particles": "15 * v.entity_radius" + "spawn_rate": "200 * math.clamp(q.entity_size,1,4)", + "max_particles": "15 * math.clamp(q.entity_size,1,4)" }, "minecraft:emitter_lifetime_once": { "active_time": 0.5 @@ -31,19 +32,19 @@ "offset": [0, 0.1, 0], "radius": 0.1, "surface_only": true, - "direction": ["math.random(-0.6,0.6)", "math.random(0.6,0.4)", "math.random(-0.6,0.6)"] + "direction": ["math.random(-0.6,0.6)", "math.random(0.6,1)", "math.random(-0.6,0.6)"] }, "minecraft:particle_lifetime_expression": { - "max_lifetime": "v.particle_random_1 + 1" + "max_lifetime": "v.particle_random_1 + 1.5" }, - "minecraft:particle_initial_speed": "math.random(4,8) * v.entity_radius", + "minecraft:particle_initial_speed": "math.random(4,8) * math.clamp(q.entity_size,1,4)", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -12, 0], - "linear_drag_coefficient": 1.5, + "linear_acceleration": [0, -10, 0], + "linear_drag_coefficient": 0.1, "rotation_drag_coefficient": 1 }, "minecraft:particle_appearance_billboard": { - "size": ["math.clamp(0.125 * v.entity_radius, 0.075, 0.2)", "math.clamp(0.125 * v.entity_radius, 0.075, 0.2)"], + "size": ["math.clamp(0.125 * math.clamp(q.entity_size,1,4), 0.075, 0.2)", "math.clamp(0.125 * math.clamp(q.entity_size,1,4), 0.075, 0.2)"], "facing_camera_mode": "rotate_xyz", "uv": { "texture_width": 16, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_actor.particle.json new file mode 100644 index 0000000000..2fd78e2c03 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_actor.particle.json @@ -0,0 +1,86 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confused_actor", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/chirp" + } + }, + "curves": { + "variable.size": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0] + } + }, + "events": { + "event_bird2": { + "particle_effect": { + "effect": "cobblemon:confused_bird2", + "type": "particle" + } + }, + "event_bird3": { + "particle_effect": { + "effect": "cobblemon:confused_bird3", + "type": "particle" + } + }, + "event_bird4": { + "particle_effect": { + "effect": "cobblemon:confused_bird4", + "type": "particle" + } + }, + "event_bird5": { + "particle_effect": { + "effect": "cobblemon:confused_bird5", + "type": "particle" + } + }, + "event_bird6": { + "particle_effect": { + "effect": "cobblemon:confused_bird6", + "type": "particle" + } + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": ["event_bird2", "event_bird3", "event_bird4", "event_bird5", "event_bird6"] + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1.5 + }, + "minecraft:particle_motion_parametric": { + "relative_position": ["math.clamp(q.entity_radius/1.5,0.4,999)*math.sin(v.particle_age/1.5*360)", "0.2+(q.entity_height*1)+0.1*math.sin(v.particle_age)+(math.sin(v.particle_age*580)/25)", "math.clamp(q.entity_radius/1.5,0.4,999)*-math.cos(v.particle_age/1.5*360)"] + }, + "minecraft:particle_appearance_billboard": { + "size": ["(math.clamp(q.entity_height*1.25,1.25,2.5)*v.size)*1.25", "math.clamp(q.entity_height*1.25,1.25,2.5)*v.size"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 192, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [12, 9], + "step_UV": [12, 0], + "frames_per_second": 12, + "max_frame": 16, + "loop": true + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird2.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird2.particle.json new file mode 100644 index 0000000000..932dc18a9e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird2.particle.json @@ -0,0 +1,51 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confused_bird2", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/chirp" + } + }, + "curves": { + "variable.size": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0] + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1.5 + }, + "minecraft:particle_motion_parametric": { + "relative_position": ["math.clamp(q.entity_radius/1.5,0.4,999)*-math.sin(v.particle_age/1.5*360)", "0.2+(q.entity_height*1)+0.1*math.sin(v.particle_age)-(math.sin(v.particle_age*580)/25)", "math.clamp(q.entity_radius/1.5,0.4,999)*math.cos(v.particle_age/1.5*360)"] + }, + "minecraft:particle_appearance_billboard": { + "size": ["(math.clamp(q.entity_height*1.25,1.25,2.5)*v.size)*1.25", "math.clamp(q.entity_height*1.25,1.25,2.5)*v.size"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 192, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [12, 9], + "step_UV": [12, 0], + "frames_per_second": 12, + "max_frame": 16, + "loop": true + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird3.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird3.particle.json new file mode 100644 index 0000000000..7223c1502f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird3.particle.json @@ -0,0 +1,51 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confused_bird3", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/chirp" + } + }, + "curves": { + "variable.size": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0] + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1.5 + }, + "minecraft:particle_motion_parametric": { + "relative_position": ["math.clamp(q.entity_radius/1.5,0.4,999)*math.sin(60+v.particle_age/1.5*360)", "0.2+(q.entity_height*1)+0.1*math.sin(v.particle_age)-(math.sin(v.particle_age*580)/25)", "math.clamp(q.entity_radius/1.5,0.4,999)*-math.cos(60+v.particle_age/1.5*360)"] + }, + "minecraft:particle_appearance_billboard": { + "size": ["(math.clamp(q.entity_height*1.25,1.25,2.5)*v.size)*1.25", "math.clamp(q.entity_height*1.25,1.25,2.5)*v.size"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 192, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [12, 9], + "step_UV": [12, 0], + "frames_per_second": 12, + "max_frame": 16, + "loop": true + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird4.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird4.particle.json new file mode 100644 index 0000000000..dd347d1fc7 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird4.particle.json @@ -0,0 +1,51 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confused_bird4", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/chirp" + } + }, + "curves": { + "variable.size": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0] + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1.5 + }, + "minecraft:particle_motion_parametric": { + "relative_position": ["math.clamp(q.entity_radius/1.5,0.4,999)*math.sin(-60+v.particle_age/1.5*360)", "0.2+(q.entity_height*1)+0.1*math.sin(v.particle_age)-(math.sin(v.particle_age*580)/25)", "math.clamp(q.entity_radius/1.5,0.4,999)*-math.cos(-60+v.particle_age/1.5*360)"] + }, + "minecraft:particle_appearance_billboard": { + "size": ["(math.clamp(q.entity_height*1.25,1.25,2.5)*v.size)*1.25", "math.clamp(q.entity_height*1.25,1.25,2.5)*v.size"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 192, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [12, 9], + "step_UV": [12, 0], + "frames_per_second": 12, + "max_frame": 16, + "loop": true + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird5.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird5.particle.json new file mode 100644 index 0000000000..582342c72c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird5.particle.json @@ -0,0 +1,51 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confused_bird5", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/chirp" + } + }, + "curves": { + "variable.size": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0] + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1.5 + }, + "minecraft:particle_motion_parametric": { + "relative_position": ["math.clamp(q.entity_radius/1.5,0.4,999)*math.sin(120+v.particle_age/1.5*360)", "0.2+(q.entity_height*1)+0.1*math.sin(v.particle_age)+(math.sin(v.particle_age*580)/25)", "math.clamp(q.entity_radius/1.5,0.4,999)*-math.cos(120+v.particle_age/1.5*360)"] + }, + "minecraft:particle_appearance_billboard": { + "size": ["(math.clamp(q.entity_height*1.25,1.25,2.5)*v.size)*1.25", "math.clamp(q.entity_height*1.25,1.25,2.5)*v.size"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 192, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [12, 9], + "step_UV": [12, 0], + "frames_per_second": 12, + "max_frame": 16, + "loop": true + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird6.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird6.particle.json new file mode 100644 index 0000000000..4052928377 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/confused_bird6.particle.json @@ -0,0 +1,51 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confused_bird6", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/chirp" + } + }, + "curves": { + "variable.size": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0] + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1.5 + }, + "minecraft:particle_motion_parametric": { + "relative_position": ["math.clamp(q.entity_radius/1.5,0.4,999)*math.sin(-120+v.particle_age/1.5*360)", "0.2+(q.entity_height*1)+0.1*math.sin(v.particle_age)+(math.sin(v.particle_age*580)/25)", "math.clamp(q.entity_radius/1.5,0.4,999)*-math.cos(-120+v.particle_age/1.5*360)"] + }, + "minecraft:particle_appearance_billboard": { + "size": ["(math.clamp(q.entity_height*1.25,1.25,2.5)*v.size)*1.25", "math.clamp(q.entity_height*1.25,1.25,2.5)*v.size"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 192, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [12, 9], + "step_UV": [12, 0], + "frames_per_second": 12, + "max_frame": 16, + "loop": true + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/infatuate_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/infatuate_actor.particle.json new file mode 100644 index 0000000000..0ff96dd427 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/infatuate_actor.particle.json @@ -0,0 +1,72 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:infatuate_actor", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/attract_heart" + } + }, + "events": { + "extrahearts": { + "particle_effect": { + "effect": "cobblemon:infatuate_actorresidual", + "type": "emitter" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 12, + "max_particles": 10 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.5 + }, + "minecraft:emitter_lifetime_events": { + "timeline": { + "0.25": "extrahearts" + } + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "((variable.particle_random_3-(variable.particle_random_3*0.5))*(q.entity_height*0.6))", 0], + "radius": "math.clamp(q.entity_radius*0.7,0.6,1.3)", + "surface_only": true, + "direction": ["math.random(-1.9,1.9)", "math.random(4,7)", "math.random(-1.5,1.5)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.65 + }, + "minecraft:particle_initial_speed": "math.random(3,4)", + "minecraft:particle_motion_dynamic": { + "linear_drag_coefficient": 2 + }, + "minecraft:particle_appearance_billboard": { + "size": ["(0.2+0.125*v.particle_random_2)*math.clamp(q.entity_size*0.5,1,1.75)", "(0.2+0.125*v.particle_random_2)*math.clamp(q.entity_size*0.5,1,1.75)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 90, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 16, + "max_frame": 10 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFF99B7", + "0.5": "#ffffffff", + "1.0": "#FFFF99B7" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/infatuate_actorresidual.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/infatuate_actorresidual.particle.json new file mode 100644 index 0000000000..d4a3214020 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/infatuate_actorresidual.particle.json @@ -0,0 +1,59 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:infatuate_actorresidual", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/attract_heart" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 6, + "max_particles": 10 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.65 + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "((variable.particle_random_3-(variable.particle_random_3*0.5))*(q.entity_height*0.6))", 0], + "radius": "math.clamp(q.entity_radius*0.7,0.6,1.3)", + "surface_only": true, + "direction": ["math.random(-9,9)", "math.random(4,7)", "math.random(-9,9)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.65 + }, + "minecraft:particle_initial_speed": 0.75, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 2, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": ["(0.15+0.125*v.particle_random_2)*math.clamp(q.entity_size*0.6,1,1.75)", "(0.15+0.125*v.particle_random_2)*math.clamp(q.entity_size*0.6,1,1.75)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 90, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 16, + "max_frame": 10 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFF99B7", + "0.5": "#ffffffff", + "1.0": "#FFFF99B7" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/paralysis_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/paralysis_actor.particle.json new file mode 100644 index 0000000000..246a95aec0 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/paralysis_actor.particle.json @@ -0,0 +1,73 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:paralysis_actor", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/paralysis-spark" + } + }, + "events": { + "paraSparks": { + "particle_effect": { + "effect": "cobblemon:paralysis_actorresidual", + "type": "emitter" + }, + "sound_effect": { + "event_name": "cobblemon:status.paralysis.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 28, + "max_particles": 14 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.5 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "paraSparks" + }, + "minecraft:emitter_shape_sphere": { + "radius": "math.clamp(q.entity_radius*0.9,0.7,1.5)", + "surface_only": true, + "direction": ["(math.random(-2,2))*math.random(2,4)", "math.random(12,15)", "(math.random(-2,2))*math.random(2,4)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.47 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.55,0.85)*0.8", + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": ["(0.225-(variable.particle_random_3*0.075))*math.clamp(q.entity_height,1,1.25)", "(0.225-(variable.particle_random_3*0.075))*math.clamp(q.entity_height,1,1.25)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 80, + "texture_height": 8, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [8, 0], + "frames_per_second": 20, + "max_frame": 10 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.33": "#ffffffff", + "0.74": "#FFFF9E9E", + "0.83": "#ffffffff" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/paralysis_actorresidual.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/paralysis_actorresidual.particle.json new file mode 100644 index 0000000000..96f51866de --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/paralysis_actorresidual.particle.json @@ -0,0 +1,50 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:paralysis_actorresidual", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/accessory-spark" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 20, + "max_particles": 10 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.4 + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, 0, 0], + "radius": "math.clamp(q.entity_radius*0.95,0.75,1.55)", + "surface_only": true, + "direction": ["(math.random(-2,2))*math.random(2,4)", "math.random(12,15)", "(math.random(-2,2))*math.random(2,4)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.15 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.55,0.85)*1", + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": ["(0.3-(variable.particle_random_3*0.085))*math.clamp(q.entity_height,1,1.25)", "(0.3-(variable.particle_random_3*0.085))*math.clamp(q.entity_height,1,1.25)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 32, + "texture_height": 8, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [8, 0], + "frames_per_second": 20, + "max_frame": 4 + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/paralysis_passive.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/paralysis_passive.particle.json new file mode 100644 index 0000000000..26d273f956 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/paralysis_passive.particle.json @@ -0,0 +1,60 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:paralysis_passive", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/paralysis-spark" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 24, + "max_particles": 12 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.5 + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, 0, 0], + "radius": "math.clamp(q.entity_radius*0.9,0.7,1.5)", + "surface_only": true, + "direction": ["(math.random(-2,2))*math.random(2,4)", "math.random(12,15)", "(math.random(-2,2))*math.random(2,4)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.47 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.55,0.85)*0.4", + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": ["(0.175-(variable.particle_random_3*0.05))*math.clamp(q.entity_height,1,1.25)", "(0.175-(variable.particle_random_3*0.05))*math.clamp(q.entity_height,1,1.25)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 80, + "texture_height": 8, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [8, 0], + "frames_per_second": 20, + "max_frame": 10 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.31": "#ffffffff", + "0.74": "#FFFF8B8B", + "0.83": "#ffffffff" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/poison_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/poison_actor.particle.json new file mode 100644 index 0000000000..220a929279 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/poison_actor.particle.json @@ -0,0 +1,66 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:poison_actor", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/poison-bubble" + } + }, + "events": { + "poisonHit": { + "particle_effect": { + "effect": "cobblemon:poison_actorresidual", + "type": "emitter_bound" + }, + "sound_effect": { + "event_name": "cobblemon:status.poison.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 24, + "max_particles": 12 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.7 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "poisonHit" + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, "((variable.particle_random_3-(variable.particle_random_3*0.5))*math.clamp(q.entity_height*0.6,1,2))", 0], + "radius": "math.clamp(q.entity_radius*0.55,0.65,1.3)", + "surface_only": true, + "direction": ["(math.random(-1,1))*math.random(3.75,5.0)", "math.random(3,15)", "(math.random(-1,1))*math.random(3.75,5.0)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_speed": "math.random(2.55,3.75)+(q.entity_height*0.1)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -0.125, 0], + "linear_drag_coefficient": 3 + }, + "minecraft:particle_appearance_billboard": { + "size": ["(0.15+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)", "(0.15+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 80, + "texture_height": 8, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [8, 0], + "frames_per_second": 18, + "max_frame": 10, + "stretch_to_lifetime": true + } + } + }, + "minecraft:particle_appearance_lighting": {} + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/poison_actorresidual.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/poison_actorresidual.particle.json new file mode 100644 index 0000000000..36f38ad1da --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/poison_actorresidual.particle.json @@ -0,0 +1,53 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:poison_actorresidual", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/impact-poison" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 300, + "max_particles": 16 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.3 + }, + "minecraft:emitter_shape_sphere": { + "radius": "math.clamp(q.entity_radius*0.9,0.625,1.3)", + "surface_only": true, + "direction": ["math.random(-2.3,2.3)", "math.random(4.9,10.9)", "math.random(-2.3,2.3)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.35 + }, + "minecraft:particle_initial_spin": { + "rotation": "(math.random_integer(1,4))*90" + }, + "minecraft:particle_initial_speed": "math.random(5.55,9.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -28, 0], + "linear_drag_coefficient": 2 + }, + "minecraft:particle_appearance_billboard": { + "size": ["(0.1+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)", "(0.1+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 8, + "texture_height": 56, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [0, 8], + "frames_per_second": 18, + "max_frame": 7 + } + } + }, + "minecraft:particle_appearance_lighting": {} + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/poison_passive.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/poison_passive.particle.json new file mode 100644 index 0000000000..53792d42d3 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/poison_passive.particle.json @@ -0,0 +1,50 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:poison_passive", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/poison-bubble" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 10, + "max_particles": 150 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "((variable.particle_random_3-(variable.particle_random_3*0.5))*math.clamp(q.entity_height*0.6,1,2))", 0], + "radius": "math.clamp(q.entity_radius*0.6,0.65,1.3)", + "surface_only": true, + "direction": ["(math.random(-1,1))*math.random(3.75,5.0)", "math.random(3,15)", "(math.random(-1,1))*math.random(3.75,5.0)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_speed": "math.random(0.5,0.85)", + "minecraft:particle_motion_dynamic": { + "linear_drag_coefficient": 0.4 + }, + "minecraft:particle_appearance_billboard": { + "size": ["(0.125+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)", "(0.125+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 80, + "texture_height": 8, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [8, 0], + "frames_per_second": 12, + "max_frame": 10 + } + } + }, + "minecraft:particle_appearance_lighting": {} + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/sleep_bubbles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/sleep_bubbles.particle.json similarity index 91% rename from common/src/main/resources/assets/cobblemon/bedrock/particles/generic/sleep_bubbles.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/sleep_bubbles.particle.json index bb4c48e387..7c1242c5f9 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/sleep_bubbles.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/sleep_bubbles.particle.json @@ -2,7 +2,7 @@ "format_version": "1.10.0", "particle_effect": { "description": { - "identifier": "cobblemon:sleep_zzz", + "identifier": "cobblemon:sleep_bubbles", "basic_render_parameters": { "material": "particles_blend", "texture": "textures/particles/bubble" @@ -13,9 +13,8 @@ "spawn_rate": 4, "max_particles": 16 }, - "minecraft:emitter_lifetime_looping": { - "active_time": 1.5, - "sleep_time": 3 + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 }, "minecraft:emitter_shape_point": { "direction": ["math.random(-0.55,0.55)", "math.random(0.8,1)", "math.random(-0.55,0.55)"] diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/sleep_zzz.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/sleep_zzz.particle.json similarity index 94% rename from common/src/main/resources/assets/cobblemon/bedrock/particles/generic/sleep_zzz.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/sleep_zzz.particle.json index a2973d237b..1d61a24fb3 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/sleep_zzz.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/sleep_zzz.particle.json @@ -13,9 +13,8 @@ "spawn_rate": 2, "max_particles": 9 }, - "minecraft:emitter_lifetime_looping": { - "active_time": 1.5, - "sleep_time": 3 + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 }, "minecraft:emitter_shape_point": { "direction": ["math.random(-0.25,0.25)", "math.random(0.8,1)", "math.random(-0.25,0.25)"] diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/toxpoison_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/toxpoison_actor.particle.json new file mode 100644 index 0000000000..3ef217eec5 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/toxpoison_actor.particle.json @@ -0,0 +1,76 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:toxpoison_actor", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/poison-bubble" + } + }, + "events": { + "toxicHit": { + "particle_effect": { + "effect": "cobblemon:toxpoison_actorresidual", + "type": "emitter_bound" + }, + "sound_effect": { + "event_name": "cobblemon:status.badlypoison.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 24, + "max_particles": 12 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.7 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "toxicHit" + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, "((variable.particle_random_3-(variable.particle_random_3*0.5))*math.clamp(q.entity_height*0.6,1,2))", 0], + "radius": "math.clamp(q.entity_radius*0.6,0.65,1.3)", + "surface_only": true, + "direction": ["(math.random(-1,1))*math.random(3.75,5.0)", "math.random(3,15)", "(math.random(-1,1))*math.random(3.75,5.0)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_speed": "math.random(2.55,3.75)+(q.entity_height*0.1)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -0.125, 0], + "linear_drag_coefficient": 3 + }, + "minecraft:particle_appearance_billboard": { + "size": ["(0.15+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)", "(0.15+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 80, + "texture_height": 8, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [8, 0], + "frames_per_second": 18, + "max_frame": 10, + "stretch_to_lifetime": true + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF6E00AC", + "0.5": "#FFA900FF", + "1.0": "#FF7F00C7" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/toxpoison_actorresidual.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/toxpoison_actorresidual.particle.json new file mode 100644 index 0000000000..8bbe4a0273 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/toxpoison_actorresidual.particle.json @@ -0,0 +1,82 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:toxpoison_actorresidual", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/impact-poison" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 300, + "max_particles": 16 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.3 + }, + "minecraft:emitter_shape_sphere": { + "radius": "math.clamp(q.entity_radius*0.9,0.625,1.3)", + "surface_only": true, + "direction": [ + "math.random(-2.3,2.3)", + "math.random(4.9,10.9)", + "math.random(-2.3,2.3)" + ] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.35 + }, + "minecraft:particle_initial_spin": { + "rotation": "(math.random_integer(1,4))*90" + }, + "minecraft:particle_initial_speed": "math.random(5.55,9.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [ + 0, + -28, + 0 + ], + "linear_drag_coefficient": 2 + }, + "minecraft:particle_appearance_billboard": { + "size": [ + "(0.1+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)", + "(0.1+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)" + ], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 8, + "texture_height": 56, + "flipbook": { + "base_UV": [ + 0, + 0 + ], + "size_UV": [ + 8, + 8 + ], + "step_UV": [ + 0, + 8 + ], + "frames_per_second": 18, + "max_frame": 7 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFA900FF", + "1.0": "#FF7F00C7" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/toxpoison_passive.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/toxpoison_passive.particle.json new file mode 100644 index 0000000000..ede5669c0d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/ailments/toxpoison_passive.particle.json @@ -0,0 +1,60 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:toxpoison_passive", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/poison-bubble" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 10, + "max_particles": 150 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "((variable.particle_random_3-(variable.particle_random_3*0.5))*math.clamp(q.entity_height*0.6,1,2))", 0], + "radius": "math.clamp(q.entity_radius*0.65,0.6,1.3)", + "surface_only": true, + "direction": ["(math.random(-1,1))*math.random(3.75,5.0)", "math.random(3,15)", "(math.random(-1,1))*math.random(3.75,5.0)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_speed": "math.random(0.5,0.85)", + "minecraft:particle_motion_dynamic": { + "linear_drag_coefficient": 0.4 + }, + "minecraft:particle_appearance_billboard": { + "size": ["(0.125+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)", "(0.125+0.25*v.particle_random_2)*math.clamp(q.entity_height,1,1.25)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 80, + "texture_height": 8, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [8, 0], + "frames_per_second": 12, + "max_frame": 10 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF6E00AC", + "0.5": "#FFA900FF", + "1.0": "#FF7F00C7" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit.particle.json index 6409015e5b..f4cf234c38 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit.particle.json @@ -17,10 +17,10 @@ }, "minecraft:emitter_shape_point": {}, "minecraft:particle_lifetime_expression": { - "max_lifetime": 0.5 + "max_lifetime": 0.2 }, "minecraft:particle_initial_spin": { - "rotation": "math.random(0,90)" + "rotation": "math.random_integer(0,3)*90" }, "minecraft:particle_appearance_billboard": { "size": [1, 1], @@ -33,7 +33,8 @@ "size_UV": [32, 32], "step_UV": [0, 32], "frames_per_second": 24, - "max_frame": 5 + "max_frame": 5, + "stretch_to_lifetime": true } } }, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_dragon.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_dragon.particle.json index c10ba62498..145b061607 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_dragon.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_dragon.particle.json @@ -20,7 +20,7 @@ "max_lifetime": 0.5 }, "minecraft:particle_initial_spin": { - "rotation": "math.random(0,90)" + "rotation": "math.random_integer(0,3)*90" }, "minecraft:particle_appearance_billboard": { "size": [1, 1], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_poison.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_poison.particle.json index cd9da6f529..aeedb846ab 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_poison.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_poison.particle.json @@ -20,7 +20,7 @@ "max_lifetime": 0.5 }, "minecraft:particle_initial_spin": { - "rotation": "math.random(0,90)" + "rotation": "math.random_integer(0,3)*90" }, "minecraft:particle_appearance_billboard": { "size": [1, 1], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_circles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_circles.particle.json index 65ba5fe3b1..a4c5ce1647 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_circles.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_circles.particle.json @@ -5,50 +5,52 @@ "identifier": "cobblemon:stat_down_circles", "basic_render_parameters": { "material": "particles_blend", - "texture": "textures/blocks/wool_colored_white" + "texture": "textures/particles/statdown_orb" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 20, - "max_particles": 100 + "spawn_rate": 35, + "max_particles": 150 }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, "minecraft:emitter_shape_disc": { - "offset": [0, "0.75*v.particle_random_3+0.75", 0], - "radius": 1, + "offset": [0, "(q.entity_height+(0.4-(q.entity_height/3.5)))-(v.particle_random_3/2)", 0], + "radius": "math.clamp(q.entity_radius*0.8,0.6,999)", "surface_only": true, - "direction": "outwards" + "direction": [0, -1, 0] }, "minecraft:particle_lifetime_expression": { - "max_lifetime": "0.8+v.particle_random_1*0.5" + "max_lifetime": 0.625 }, - "minecraft:particle_initial_speed": 0.2, + "minecraft:particle_initial_speed": "(q.entity_height*1.5)+(math.random(0.4,1.95)*(q.entity_height/2))", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, "v.particle_random_4*2-6", 0], - "linear_drag_coefficient": 1.25 + "linear_drag_coefficient": 1.05 }, "minecraft:particle_appearance_billboard": { "size": ["0.05+0.15*v.particle_random_2", "0.05+0.15*v.particle_random_2"], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 8, - "texture_height": 8, - "uv": [0, 0], - "uv_size": [8, 8] + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } } }, "minecraft:particle_appearance_tinting": { "color": { "interpolant": "v.particle_age / v.particle_lifetime", "gradient": { - "0.0": "#00422A85", - "0.24": "#B36982FF", - "0.5": "#B361DFFF", - "0.76": "#B35661FF", - "1.0": "#00270F5E" + "0.0": "#FF116FFF", + "0.4": "#ffffffff", + "1.0": "#FF116FFF" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_lines.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_lines.particle.json index f9d682336a..3e689c92fa 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_lines.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_lines.particle.json @@ -5,43 +5,42 @@ "identifier": "cobblemon:stat_down_lines", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particle/cut" + "texture": "textures/particles/statdown_line" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 6, - "max_particles": 100 + "spawn_rate": 21, + "max_particles": 125 }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, - "minecraft:emitter_shape_point": { - "offset": ["math.sin(v.emitter_age/v.emitter_lifetime*90*9+v.emitter_random_1*360)", "v.particle_random_1 * 0.3 - 0.15", "math.cos(v.emitter_age/v.emitter_lifetime*90*9+v.emitter_random_1*360)"], - "direction": [0, 1, 0] + "minecraft:emitter_shape_disc": { + "offset": ["math.sin(v.emitter_age/v.emitter_lifetime*270*9+v.emitter_random_1*360)", "(q.entity_height+(5.5+(q.entity_height/7))) * v.particle_random_1 * 0.2 - 0.15", "math.cos(v.emitter_age/v.emitter_lifetime*270*9+v.emitter_random_1*360)"], + "radius": "q.entity_radius*0.4", + "surface_only": true, + "direction": [0, -1, 0] }, "minecraft:particle_lifetime_expression": { - "max_lifetime": 1 + "max_lifetime": 0.34 }, - "minecraft:particle_initial_spin": { - "rotation": 45 - }, - "minecraft:particle_initial_speed": 2, + "minecraft:particle_initial_speed": 3.5, "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -16, 0] + "linear_drag_coefficient": 1 }, "minecraft:particle_appearance_billboard": { - "size": [0.3, 0.3], + "size": [0.06, 0.6], "facing_camera_mode": "lookat_y", "uv": { - "texture_width": 32, - "texture_height": 224, + "texture_width": 27, + "texture_height": 31, "flipbook": { "base_UV": [0, 0], - "size_UV": [32, 32], - "step_UV": [0, 32], - "frames_per_second": 18, - "max_frame": 8 + "size_UV": [3, 31], + "step_UV": [3, 0], + "frames_per_second": 24, + "max_frame": 9 } } }, @@ -49,9 +48,9 @@ "color": { "interpolant": "v.particle_age / v.particle_lifetime", "gradient": { - "0.0": "#ffffffff", - "0.17": "#FF78E4FF", - "0.49": "#FF4915BD" + "0.0": "#FF116FFF", + "0.4": "#ffffffff", + "1.0": "#FF116FFF" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up.particle.json deleted file mode 100644 index 16d3047727..0000000000 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up.particle.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "format_version": "1.10.0", - "particle_effect": { - "description": { - "identifier": "cobblemon:stat_up", - "basic_render_parameters": { - "material": "particles_alpha", - "texture": "textures/blocks/wool_colored_white" - } - }, - "components": { - "minecraft:emitter_rate_steady": { - "spawn_rate": 5, - "max_particles": 100 - }, - "minecraft:emitter_lifetime_once": { - "active_time": 1 - }, - "minecraft:emitter_shape_entity_aabb": { - "surface_only": true, - "direction": [0, 1, 0] - }, - "minecraft:particle_lifetime_expression": { - "max_lifetime": 1 - }, - "minecraft:particle_initial_speed": 0.6, - "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, 2, 0] - }, - "minecraft:particle_appearance_billboard": { - "size": [0.5, 0.5], - "facing_camera_mode": "rotate_y", - "uv": { - "texture_width": 16, - "texture_height": 80, - "flipbook": { - "base_UV": [0, 0], - "size_UV": [16, 16], - "step_UV": [0, 16], - "frames_per_second": 12, - "loop": true - } - } - } - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_circles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_circles.particle.json index 05e6159097..68634c295f 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_circles.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_circles.particle.json @@ -5,50 +5,52 @@ "identifier": "cobblemon:stat_up_circles", "basic_render_parameters": { "material": "particles_blend", - "texture": "textures/blocks/wool_colored_white" + "texture": "textures/particles/statup_orb" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 20, - "max_particles": 100 + "spawn_rate": 35, + "max_particles": 150 }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, "minecraft:emitter_shape_disc": { - "offset": [0, "0.75*v.particle_random_3-0.75", 0], - "radius": 1, + "offset": [0, "(q.entity_height-(q.entity_height*1.5))+(v.particle_random_3/2)", 0], + "radius": "math.clamp(q.entity_radius*0.8,0.6,999)", "surface_only": true, - "direction": "outwards" + "direction": [0, 10, 0] }, "minecraft:particle_lifetime_expression": { - "max_lifetime": "0.8+v.particle_random_1*0.5" + "max_lifetime": 0.625 }, - "minecraft:particle_initial_speed": 0.2, + "minecraft:particle_initial_speed": "(q.entity_height*1.5)+(math.random(0.4,1.95)*(q.entity_height/2))", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, "v.particle_random_4*2+6", 0], - "linear_drag_coefficient": 1.25 + "linear_drag_coefficient": 1.05 }, "minecraft:particle_appearance_billboard": { "size": ["0.05+0.15*v.particle_random_2", "0.05+0.15*v.particle_random_2"], "facing_camera_mode": "rotate_xyz", "uv": { - "texture_width": 8, - "texture_height": 8, - "uv": [0, 0], - "uv_size": [8, 8] + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } } }, "minecraft:particle_appearance_tinting": { "color": { "interpolant": "v.particle_age / v.particle_lifetime", "gradient": { - "0.0": "#00852A2A", - "0.24": "#B3FFB469", - "0.5": "#B3FFE461", - "0.76": "#B3FF7356", - "1.0": "#005E1F0F" + "0.0": "#FFFF814B", + "0.43": "#ffffffff", + "1.0": "#FFFF814B" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_lines.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_lines.particle.json index 5b5083a6fd..45fd6d4570 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_lines.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_lines.particle.json @@ -5,43 +5,41 @@ "identifier": "cobblemon:stat_up_lines", "basic_render_parameters": { "material": "particles_alpha", - "texture": "textures/particle/cut" + "texture": "textures/particles/statup_line" } }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 6, - "max_particles": 100 + "spawn_rate": 21, + "max_particles": 125 }, "minecraft:emitter_lifetime_once": { "active_time": 1 }, - "minecraft:emitter_shape_point": { - "offset": ["math.sin(v.emitter_age/v.emitter_lifetime*90*9+v.emitter_random_1*360)", "v.particle_random_1 * 0.3 - 0.15", "math.cos(v.emitter_age/v.emitter_lifetime*90*9+v.emitter_random_1*360)"], - "direction": [0, -1, 0] + "minecraft:emitter_shape_disc": { + "offset": ["math.sin(v.emitter_age/v.emitter_lifetime*270*9+v.emitter_random_1*360)", "((math.random(-2,1)/4)+(q.entity_height/7))", "math.cos(v.emitter_age/v.emitter_lifetime*360*9+v.emitter_random_1*360)"], + "radius": "q.entity_radius*0.4", + "direction": [0, 1, 0] }, "minecraft:particle_lifetime_expression": { - "max_lifetime": 1 + "max_lifetime": 0.34 }, - "minecraft:particle_initial_spin": { - "rotation": -135 - }, - "minecraft:particle_initial_speed": 2, + "minecraft:particle_initial_speed": 3.5, "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, 16, 0] + "linear_drag_coefficient": 1 }, "minecraft:particle_appearance_billboard": { - "size": [0.3, 0.3], + "size": [0.06, 0.6], "facing_camera_mode": "lookat_y", "uv": { - "texture_width": 32, - "texture_height": 224, + "texture_width": 27, + "texture_height": 31, "flipbook": { "base_UV": [0, 0], - "size_UV": [32, 32], - "step_UV": [0, 32], - "frames_per_second": 18, - "max_frame": 8 + "size_UV": [3, 31], + "step_UV": [3, 0], + "frames_per_second": 24, + "max_frame": 9 } } }, @@ -49,9 +47,9 @@ "color": { "interpolant": "v.particle_age / v.particle_lifetime", "gradient": { - "0.0": "#ffffffff", - "0.17": "#FFFFEC78", - "0.49": "#FFBD3315" + "0.0": "#FFFF814B", + "0.43": "#ffffffff", + "1.0": "#FFFF814B" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_actor.particle.json new file mode 100644 index 0000000000..1dedd5faba --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_actor.particle.json @@ -0,0 +1,57 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:bubblebeam_actor", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/invisible" + } + }, + "events": { + "bubbles": { + "particle_effect": { + "effect": "cobblemon:bubblebeam_bubbles", + "type": "emitter_bound" + } + }, + "spray": { + "particle_effect": { + "effect": "cobblemon:bubblebeam_spray", + "type": "emitter_bound" + } + } + }, + "components": { + "minecraft:emitter_local_space": { + "position": true, + "rotation": true + }, + "minecraft:emitter_rate_instant": { + "num_particles": 0 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 4 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": ["bubbles", "spray"] + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": [0.2, 0.2], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 16, + "texture_height": 16, + "uv": [0, 0], + "uv_size": [16, 16] + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_bubbles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_bubbles.particle.json new file mode 100644 index 0000000000..cb7dad051e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_bubbles.particle.json @@ -0,0 +1,72 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:bubblebeam_bubbles", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "minecraft:textures/particles/bubble" + } + }, + "events": { + "pop": { + "particle_effect": { + "effect": "cobblemon:bubblebeam_pop", + "type": "particle" + } + } + }, + "components": { + "minecraft:emitter_local_space": { + "position": true, + "rotation": true + }, + "minecraft:emitter_rate_steady": { + "spawn_rate": 16, + "max_particles": 100 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 2 + }, + "minecraft:emitter_shape_sphere": { + "radius": 0.1, + "surface_only": true, + "direction": [0, 0, -1] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_lifetime_events": { + "expiration_event": "pop" + }, + "minecraft:particle_initial_speed": "math.random(10,15)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": ["math.random(-4,4)", "math.random(-4,4)", "math.random(-4,4)"], + "linear_drag_coefficient": "math.random(2,3)" + }, + "minecraft:particle_appearance_billboard": { + "size": [0.2, 0.2], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 16, + "texture_height": 16, + "uv": [0, 0], + "uv_size": [16, 16] + } + }, + "minecraft:particle_motion_collision": { + "collision_radius": 0.08 + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_random_1", + "gradient": { + "0.0": "#FF80A9FF", + "0.41": "#FF64FBFF", + "0.52": "#FFFFFFFF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_pop.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_pop.particle.json new file mode 100644 index 0000000000..3c61046065 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_pop.particle.json @@ -0,0 +1,54 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:bubblebeam_pop", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/bubble_pop" + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.35 + }, + "minecraft:particle_initial_speed": 0.2, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0], + "linear_drag_coefficient": 3 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.35, 0.35], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 16, + "texture_height": 80, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [16, 16], + "step_UV": [0, 16], + "frames_per_second": 12, + "max_frame": 5, + "stretch_to_lifetime": true + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFB5FFF6", + "1.0": "#FF228CFF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_spray.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_spray.particle.json new file mode 100644 index 0000000000..989863a4dd --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/bubblebeam/bubblebeam_spray.particle.json @@ -0,0 +1,54 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:bubblebeam_spray", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/impact_water" + } + }, + "components": { + "minecraft:emitter_local_space": { + "position": true, + "rotation": true + }, + "minecraft:emitter_rate_steady": { + "spawn_rate": "36*q.entity_radius", + "max_particles": "150 * q.entity_radius" + }, + "minecraft:emitter_lifetime_once": { + "active_time": 2 + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-1,1)/2", "math.random(-1,1)/2-0.25", -1] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": "math.random(0.5,1)" + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(4,12) * q.entity_radius", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, "math.random(1,2)", 0], + "linear_drag_coefficient": 0.6 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.15, 0.15], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 8, + "texture_height": 56, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [0, 8], + "frames_per_second": 12, + "stretch_to_lifetime": true + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_actor.particle.json new file mode 100644 index 0000000000..ec358dcb77 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_actor.particle.json @@ -0,0 +1,68 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confusion_actor", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/medium-fadeorb" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:move.confusion.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 12 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 0.4 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, 0, -0.4], + "radius": "1.075-math.clamp(q.entity_height*0.2,0.2,0.35)", + "surface_only": true, + "direction": "inwards" + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.5 + }, + "minecraft:particle_initial_speed": 2.8, + "minecraft:particle_motion_dynamic": { + "linear_drag_coefficient": 2 + }, + "minecraft:particle_appearance_billboard": { + "size": ["0.3+(v.emitter_age/2)", "0.3+(v.emitter_age/2)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 24, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.1": "#7088F5FF", + "0.4": "#A0FFABDE", + "1.0": "#00BA16FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_impact.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_impact.particle.json new file mode 100644 index 0000000000..a40968ddd8 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_impact.particle.json @@ -0,0 +1,52 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confusion_impact", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/large-smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.4 + }, + "minecraft:emitter_shape_point": { + "offset": [0, 0, -0.4] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.45 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.75, 0.75], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 143, + "texture_height": 13, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [13, 13], + "step_UV": [13, 0], + "frames_per_second": 24, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.1": "#FFFFFFFF", + "0.6": "#9089E4FF", + "0.8": "#6B4BAAFF", + "1.0": "#001E94FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_impactdots.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_impactdots.particle.json new file mode 100644 index 0000000000..e21acf7fae --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_impactdots.particle.json @@ -0,0 +1,60 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confusion_impactdots", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/small-fadeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 300, + "max_particles": 16 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 0.2 + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, 0, -0.4], + "radius": 0.2, + "surface_only": true, + "direction": "outwards" + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.45 + }, + "minecraft:particle_initial_speed": "math.random(0.6,1.2)*7", + "minecraft:particle_motion_dynamic": { + "linear_drag_coefficient": 4 + }, + "minecraft:particle_appearance_billboard": { + "size": ["0.225-(v.particle_random_3*0.125)", "0.225-(v.particle_random_3*0.125)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 63, + "texture_height": 7, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [7, 7], + "step_UV": [7, 0], + "frames_per_second": 20, + "max_frame": 9 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.1": "#FFFFFFFF", + "0.6": "#9089E4FF", + "0.8": "#6B4BAAFF", + "1.0": "#001E94FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_release.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_release.particle.json new file mode 100644 index 0000000000..4990f710cc --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_release.particle.json @@ -0,0 +1,52 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confusion_release", + "basic_render_parameters": { + "material": "particles_add", + "texture": "textures/particles/medium-fadeorb" + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.55 + }, + "minecraft:emitter_shape_point": { + "offset": [0, 0, -0.4] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.45 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.45, 0.45], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 24, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFFFFF", + "0.25": "#F0FFBED2", + "0.55": "#90E77EFF", + "1.0": "#00B531FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_releasedots.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_releasedots.particle.json new file mode 100644 index 0000000000..a317f0a574 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_releasedots.particle.json @@ -0,0 +1,60 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confusion_releasedots", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/xs-fadeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 150, + "max_particles": 12 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 0.5 + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, 0, -0.4], + "radius": 0.45, + "surface_only": true, + "direction": "outwards" + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.55 + }, + "minecraft:particle_initial_speed": "math.random(0.75,1.5)*2.75", + "minecraft:particle_motion_dynamic": { + "linear_drag_coefficient": 4 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.175, 0.175], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 45, + "texture_height": 5, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [5, 5], + "step_UV": [5, 0], + "frames_per_second": 20, + "max_frame": 9 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFFFFF", + "0.2": "#F0FFABDE", + "0.5": "#90DE64FF", + "1.0": "#00AC31FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_releasering.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_releasering.particle.json new file mode 100644 index 0000000000..1285bbe332 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_releasering.particle.json @@ -0,0 +1,54 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confusion_releasering", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/medium-ring" + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 1 + }, + "minecraft:emitter_shape_point": { + "offset": [0, 0, -0.4] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.4 + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": [0.8, 0.8], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 90, + "texture_height": 15, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [15, 15], + "step_UV": [15, 0], + "frames_per_second": 16, + "max_frame": 6 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFFFFF", + "0.2": "#F0FFABDE", + "0.5": "#90DE64FF", + "1.0": "#00AC31FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_target.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_target.particle.json new file mode 100644 index 0000000000..a3bc11219c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_target.particle.json @@ -0,0 +1,68 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:confusion_target", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/medium-fadeorb" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:move.confusion.target" + } + } + }, + "components": { + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_rate_instant": { + "num_particles": 12 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 1 + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, 0, -0.4], + "radius": "1.2-math.clamp(q.entity_height*0.2,0.2,0.4)", + "surface_only": true, + "direction": "inwards" + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.55 + }, + "minecraft:particle_initial_speed": 4.25, + "minecraft:particle_motion_dynamic": { + "linear_drag_coefficient": 3 + }, + "minecraft:particle_appearance_billboard": { + "size": ["0.275+(v.emitter_age*0.75)", "0.275+(v.emitter_age*0.75)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 20, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#40FFE563", + "0.35": "#B0FFABDE", + "1.0": "#00BD21FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/cottonguard/cottonguard.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/cottonguard/cottonguard.particle.json new file mode 100644 index 0000000000..031388c299 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/cottonguard/cottonguard.particle.json @@ -0,0 +1,52 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:cottonguard", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/cotton" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": "math.clamp(350 * math.clamp(q.entity_size,0.5,3), 10, 100)", + "max_particles": 100 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 2 + }, + "minecraft:emitter_shape_sphere": { + "radius": "math.clamp(q.entity_scale,0.9,1) + (1.8 / math.clamp(q.entity_size,1,1.2))", + "surface_only": true, + "direction": "inwards" + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 3 + }, + "minecraft:particle_lifetime_events": { + "expiration_event": "event_wind" + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.clamp(q.entity_scale,4,10) + math.clamp(q.entity_scale,0.5,4) * v.particle_random_1", + "minecraft:particle_motion_dynamic": { + "linear_drag_coefficient": "math.clamp(1.5+q.entity_scale,1.2,1.5) + math.clamp(q.entity_scale,2.5,2.8)/3 * v.particle_random_1" + }, + "minecraft:particle_appearance_billboard": { + "size": ["math.clamp(v.particle_random_2*0.5,0.65,1)*math.max(q.entity_size,0.7)", "math.clamp(v.particle_random_2*0.5,0.65,1)*math.max(q.entity_size,0.7)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 48, + "texture_height": 256, + "uv": ["math.floor(v.particle_random_4*3)*16", "math.clamp(math.floor((v.particle_age/4)*18)*16,0,240)"], + "uv_size": [16, 16] + } + }, + "minecraft:particle_appearance_tinting": { + "color": [1, 1, 1, 0.8] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/elemental_punches/firepunch.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/elemental_punches/firepunch.particle.json new file mode 100644 index 0000000000..52942375bb --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/elemental_punches/firepunch.particle.json @@ -0,0 +1,68 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:firepunch", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/fist" + } + }, + "curves": { + "variable.size": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [2, 1.99, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.55, 0] + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_shape_disc": { + "radius": 0.1, + "plane_normal": "z", + "surface_only": true, + "direction": [-1, 0, 0] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.5 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random(-25,0)" + }, + "minecraft:particle_appearance_billboard": { + "size": ["variable.size/2", "variable.size/2"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 16, + "texture_height": 80, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [16, 16], + "step_UV": [0, 16], + "frames_per_second": 24, + "max_frame": 5 + } + } + }, + "minecraft:particle_motion_collision": { + "enabled": "positio" + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF693A0E", + "0.21": "#FFFF9737", + "1.0": "#FFFF9737" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/elemental_punches/icepunch.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/elemental_punches/icepunch.particle.json new file mode 100644 index 0000000000..7a7133b4d1 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/elemental_punches/icepunch.particle.json @@ -0,0 +1,68 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:icepunch", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/fist" + } + }, + "curves": { + "variable.size": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [2, 1.99, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.55, 0] + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_shape_disc": { + "radius": 0.1, + "plane_normal": "z", + "surface_only": true, + "direction": [-1, 0, 0] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.5 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random(-25,0)" + }, + "minecraft:particle_appearance_billboard": { + "size": ["variable.size/2", "variable.size/2"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 16, + "texture_height": 80, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [16, 16], + "step_UV": [0, 16], + "frames_per_second": 24, + "max_frame": 5 + } + } + }, + "minecraft:particle_motion_collision": { + "enabled": "positio" + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF364E50", + "0.21": "#FFC8FFFD", + "1.0": "#FFC4FFFD" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/elemental_punches/thunderpunch.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/elemental_punches/thunderpunch.particle.json new file mode 100644 index 0000000000..501894338c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/elemental_punches/thunderpunch.particle.json @@ -0,0 +1,68 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:thunderpunch", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/fist" + } + }, + "curves": { + "variable.size": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [2, 1.99, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.55, 0] + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_shape_disc": { + "radius": 0.1, + "plane_normal": "z", + "surface_only": true, + "direction": [-1, 0, 0] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.5 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random(-25,0)" + }, + "minecraft:particle_appearance_billboard": { + "size": ["variable.size/2", "variable.size/2"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 16, + "texture_height": 80, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [16, 16], + "step_UV": [0, 16], + "frames_per_second": 24, + "max_frame": 5 + } + } + }, + "minecraft:particle_motion_collision": { + "enabled": "positio" + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF505036", + "0.21": "#FFFEFE61", + "1.0": "#FFFEFE61" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_fire.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_fire.particle.json new file mode 100644 index 0000000000..eda32d5015 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_fire.particle.json @@ -0,0 +1,57 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:ember_fire", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/ember" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 50, + "max_particles": 25 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.45 + }, + "minecraft:emitter_shape_point": { + "offset": ["math.random(-0.41,0.41)*(v.emitter_age*3.5)", "math.random(-0.41,0.41)*(v.emitter_age*3.5)", "math.random(-0.35,0.35)-v.emitter_age*7"], + "direction": ["math.random(-0.45,0.45)*(v.emitter_age*3)", "math.random(-0.45,0.45)*(v.emitter_age*3)", "math.random(-2.05,-0.55)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": "math.random(22,32)/100" + }, + "minecraft:particle_initial_speed": "math.random(2.75,4.25)*1.95", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 4, 0], + "linear_drag_coefficient": 3 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.1, 0.1], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 25, + "texture_height": 5, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [5, 5], + "step_UV": [5, 0], + "frames_per_second": 20, + "max_frame": 5 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.15": "#ffffffff", + "1.0": "#FFFF4600" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_firesparks.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_firesparks.particle.json new file mode 100644 index 0000000000..e8b9a6ef70 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_firesparks.particle.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:ember_firesparks", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 20, + "max_particles": 10 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.4 + }, + "minecraft:emitter_shape_point": { + "offset": ["math.random(-0.31,0.31)*(v.emitter_age*3)", "math.random(-0.31,0.31)*(v.emitter_age*3)", "math.random(-0.35,0.35)-v.emitter_age*9"], + "direction": ["math.random(-0.25,0.25)*(v.emitter_age*2)", "math.random(-0.25,0.25)*(v.emitter_age*2)", "math.random(-2.05,-0.55)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(2.75,4.25)*0.75", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 3, 0], + "linear_drag_coefficient": 2 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.25, 0.25], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 24, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFEB72", + "0.18": "#FFFFEB72", + "0.28": "#FFFFB64D", + "0.42": "#FFFF6F3D", + "0.5": "#FFFF6F3D" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_froth.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_froth.particle.json new file mode 100644 index 0000000000..fa229636f8 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_froth.particle.json @@ -0,0 +1,55 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:ember_froth", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/ember" + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 15 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.2 + }, + "minecraft:emitter_shape_point": { + "offset": ["math.random(-0.11,0.11)", "math.random(-0.11,0.11)", "math.random(-0.15,0.15)-0.05"], + "direction": ["math.random(-0.625,0.625)", "math.random(-0.35,0.35)", "math.random(-1.25,-0.45)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": "math.random(28,36)/100" + }, + "minecraft:particle_initial_speed": "math.random(0.75,2.25)*3", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 3, 4.5] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.12, 0.12], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 25, + "texture_height": 5, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [5, 5], + "step_UV": [5, 0], + "frames_per_second": 20, + "max_frame": 5 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.15": "#ffffffff", + "1.0": "#FFFF7441" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_impact.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_impact.particle.json new file mode 100644 index 0000000000..4d8baca5ac --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_impact.particle.json @@ -0,0 +1,54 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:ember_impact", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/ember" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 220, + "max_particles": 15 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.2 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.3 + }, + "minecraft:particle_initial_speed": "math.random(1.75,4.5)*2.5", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 7, 0], + "linear_drag_coefficient": 2 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.15, 0.15], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 25, + "texture_height": 5, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [5, 5], + "step_UV": [5, 0], + "frames_per_second": 20, + "max_frame": 5 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.15": "#ffffffff", + "1.0": "#FFFF4600" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_impactlinger.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_impactlinger.particle.json new file mode 100644 index 0000000000..4e88615b0e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ember/ember_impactlinger.particle.json @@ -0,0 +1,58 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:ember_impactlinger", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/ember" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 40, + "max_particles": 20 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.5 + }, + "minecraft:emitter_shape_sphere": { + "radius": "q.entity_radius*(0.65+v.emitter_age)", + "surface_only": true, + "direction": ["math.random(-1.5,1.5)", "math.random(0,2)", "math.random(-1.5,1.5)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.25 + }, + "minecraft:particle_initial_speed": "math.random(2.75,4.75)*0.45", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 6, 0], + "linear_drag_coefficient": 2 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.12, 0.12], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 25, + "texture_height": 5, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [5, 5], + "step_UV": [5, 0], + "frames_per_second": 20, + "max_frame": 5 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFC8B3", + "1.0": "#FFB23000" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_actor.particle.json index ffd37aa299..0f36f7d1f8 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_actor.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_actor.particle.json @@ -8,6 +8,13 @@ "texture": "textures/particles/impact-fire" } }, + "events": { + "flamethrower_cast": { + "sound_effect": { + "event_name": "flamethrower.cast" + } + } + }, "components": { "minecraft:emitter_rate_steady": { "spawn_rate": 50, @@ -16,8 +23,11 @@ "minecraft:emitter_lifetime_once": { "active_time": 1.25 }, + "minecraft:emitter_lifetime_events": { + "creation_event": "flamethrower_cast" + }, "minecraft:emitter_shape_point": { - "direction": [0, "math.random(-0.1,0.1)", -1.0] + "direction": [0, "math.random(-0.1,0.1)", -1] }, "minecraft:particle_lifetime_expression": { "max_lifetime": 0.8 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_target.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_target.particle.json index 9c3630d2fb..1666eb3638 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_target.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_target.particle.json @@ -8,6 +8,13 @@ "texture": "textures/particles/hit" } }, + "events": { + "flamethrower_impact": { + "sound_effect": { + "event_name": "flamethrower.impact" + } + } + }, "components": { "minecraft:emitter_rate_instant": { "num_particles": 1 @@ -15,6 +22,9 @@ "minecraft:emitter_lifetime_once": { "active_time": 1 }, + "minecraft:emitter_lifetime_events": { + "creation_event": "flamethrower_impact" + }, "minecraft:emitter_shape_point": {}, "minecraft:particle_lifetime_expression": { "max_lifetime": 0.5 diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/minimize/minimize.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/minimize/minimize.particle.json new file mode 100644 index 0000000000..b2445502fe --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/minimize/minimize.particle.json @@ -0,0 +1,59 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:minimize_actor", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/white_orb_shrink" + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_shape_sphere": { + "radius": "math.clamp(q.entity_radius,1,100) * 2", + "surface_only": true, + "direction": "inwards" + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": "math.clamp(q.entity_radius,1,100) / 2" + }, + "minecraft:particle_initial_speed": "math.clamp(q.entity_radius,1,100) * 2", + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": ["math.clamp(q.entity_size, 0.03,0.1)", "math.clamp(q.entity_size, 0.03,0.1)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 56, + "texture_height": 8, + "flipbook": { + "base_UV": [8, 0], + "size_UV": [8, 8], + "step_UV": [8, 0], + "frames_per_second": 1, + "max_frame": 6, + "stretch_to_lifetime": true, + "loop": true + } + } + }, + "minecraft:particle_motion_collision": { + "expire_on_contact": true + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF6BDDFF", + "1.0": "#ffffffff" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder.particle.json new file mode 100644 index 0000000000..abfb4d0cd8 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder.particle.json @@ -0,0 +1,61 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:poisonpowder", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:powder.poison.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 50 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 1 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-1.31,1.31)", "math.random(1.25,2.55)", "math.random(-4,-1)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_speed": "math.random(6.05,18.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 2.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 12, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": [0.78824, 0.36471, 1, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder_cloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder_cloud.particle.json new file mode 100644 index 0000000000..fdb975f157 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder_cloud.particle.json @@ -0,0 +1,58 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:poisonpowder_cloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 50 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.7 + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-1.21,1.21)", "math.random(1.3,2.5)", "math.random(-4,-1)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.75 + }, + "minecraft:particle_initial_speed": "math.random(6.55,17.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 2.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 16, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#15E079FF", + "0.3": "#25E079FF", + "1.0": "#00E887FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder_land.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder_land.particle.json new file mode 100644 index 0000000000..d69e417cfe --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder_land.particle.json @@ -0,0 +1,70 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:poisonpowder_land", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "poisonpowderlandClouding": { + "particle_effect": { + "effect": "cobblemon:poisonpowder_landcloud", + "type": "emitter_bound" + }, + "sound_effect": { + "event_name": "cobblemon:powder.generic.target" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "poisonpowderlandClouding" + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "(math.clamp(q.entity_height,0.8,1.15))-(v.emitter_age*0.6)+(v.particle_random_3*(1.25*math.clamp(q.entity_height,0.75,1.5)))", 0], + "radius": "math.clamp((q.entity_radius*1.05)-(v.emitter_age*0.3),0.8,1.4)+math.random(-0.1,0.1)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.25,0.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": [0.78824, 0.36471, 1, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder_landcloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder_landcloud.particle.json new file mode 100644 index 0000000000..5588f4fee2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/poisonpowder/poisonpowder_landcloud.particle.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:poisonpowder_landcloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "(math.clamp(q.entity_height,0.85,1.1))-(v.emitter_age*0.6)+(v.particle_random_3*(1.125*math.clamp(q.entity_height,0.75,1.5)))", 0], + "radius": "math.clamp((q.entity_radius*1)-(v.emitter_age*0.2),0.75,1.35)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.25,0.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#00E079FF", + "0.13": "#23E079FF", + "1.0": "#00E079FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/powder/powder_cloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/powder/powder_cloud.particle.json new file mode 100644 index 0000000000..889898bfc4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/powder/powder_cloud.particle.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:powder_cloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 200, + "max_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, "(math.clamp(q.entity_height*0.85,0.85,1.1))-(v.emitter_age*0.15)", 0], + "radius": "math.clamp((q.entity_radius*0.7)-(v.emitter_age*0.2),0.55,1.05)-(v.emitter_age*0.3),0.75,1.35)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.65,0.95)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -0.5, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#009F9A9A", + "0.13": "#509F9A9A", + "1.0": "#009F9A9A" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/powder/powder_particles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/powder/powder_particles.particle.json new file mode 100644 index 0000000000..e69327d598 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/powder/powder_particles.particle.json @@ -0,0 +1,77 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:powder_particles", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "powderClouding": { + "particle_effect": { + "effect": "cobblemon:powder_cloud", + "type": "emitter_bound" + }, + "sound_effect": { + "event_name": "cobblemon:powder.generic.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 24, + "max_particles": 48 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.75 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "powderClouding" + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, "(math.clamp(q.entity_height*0.85,0.85,1.1))-(v.emitter_age*0.15)", 0], + "radius": "math.clamp((q.entity_radius*0.8)-(v.emitter_age*0.3),0.8,1.4)+math.random(-0.1,0.1)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.25,0.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.08": "#FFFFC0C0", + "0.29": "#ffffffff", + "0.54": "#FFA4DBFF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/protect/protect-rings.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/protect/protect-rings.particle.json new file mode 100644 index 0000000000..7e2435b9d9 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/protect/protect-rings.particle.json @@ -0,0 +1,64 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:protect-rings", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/large-ring" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:move.protect.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 5, + "max_particles": 2 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.45 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_point": { + "offset": [0, "1-(math.clamp(q.entity_height*0.33,0,1))", -0.62] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.55 + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": [1.25, 1.25], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 160, + "texture_height": 20, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [20, 20], + "step_UV": [20, 0], + "frames_per_second": 16, + "max_frame": 8 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFD8FDFF", + "0.57": "#FF6FCCFF", + "1.0": "#FF2C91FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/protect/protect-shine.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/protect/protect-shine.particle.json new file mode 100644 index 0000000000..64f8df1f97 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/protect/protect-shine.particle.json @@ -0,0 +1,50 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:protect-shine", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/protect-shine" + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_shape_point": { + "offset": [0, "1-(math.clamp(q.entity_height*0.33,0,1))", -0.621] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.6 + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": [1.25, 1.25], + "facing_camera_mode": "lookat_direction", + "direction": { + "mode": "custom", + "custom_direction": [-1, 0, 0] + }, + "uv": { + "texture_width": 200, + "texture_height": 20, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [20, 20], + "step_UV": [20, 0], + "frames_per_second": 18, + "max_frame": 10 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": [1, 1, 1, 0.6902] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/protect/protect-sparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/protect/protect-sparkle.particle.json new file mode 100644 index 0000000000..817f369886 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/protect/protect-sparkle.particle.json @@ -0,0 +1,61 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:protect-sparkle", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/small-sparkle" + } + }, + "components": { + "minecraft:emitter_local_space": { + "position": true, + "rotation": false + }, + "minecraft:emitter_rate_steady": { + "spawn_rate": 28, + "max_particles": 20 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 0.7 + }, + "minecraft:emitter_shape_point": { + "offset": ["(1.1/math.clamp(q.entity_scale*1.1-0.1,1,9))*math.sin(v.emitter_age*360*643)", "(1.1/math.clamp(q.entity_scale*1.1-0.1,1,9))*-math.cos(v.emitter_age*360*643)+(1-(math.clamp(q.entity_height*0.33,0,1)))", -0.625], + "direction": ["math.random(-2,2)", "math.random(1,2)", "math.random(-2,2)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.325 + }, + "minecraft:particle_initial_speed": 0.2, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 0.4, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.25, 0.25], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 49, + "texture_height": 7, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [7, 7], + "step_UV": [7, 0], + "frames_per_second": 20, + "max_frame": 7 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#ffffffff", + "0.5": "#FFE6FFFE", + "1.0": "#FFAEF1FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/quick_attack/quickattack_dashlines.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/quick_attack/quickattack_dashlines.particle.json new file mode 100644 index 0000000000..7c6cf23c8c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/quick_attack/quickattack_dashlines.particle.json @@ -0,0 +1,53 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:quickattack_dashlines", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/quickattack_dashlines" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 50, + "max_particles": 100 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.2 + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, 0, -1], + "radius": "math.clamp(query.entity_radius,1,50)", + "direction": [0, 0, 1] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.2 + }, + "minecraft:particle_initial_speed": 8, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 0, 1] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.4, 0.4], + "facing_camera_mode": "lookat_direction", + "uv": { + "texture_width": 64, + "texture_height": 16, + "uv": ["math.floor(variable.particle_random_2 * 4) * 16", 0], + "uv_size": [16, 16] + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.17": "#FFB4FEFF", + "0.5": "#ffffffff", + "0.86": "#FFB7FEFF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/quick_attack/quickattack_dust.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/quick_attack/quickattack_dust.particle.json new file mode 100644 index 0000000000..786b8467f4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/quick_attack/quickattack_dust.particle.json @@ -0,0 +1,51 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:quickattack_dust", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/vanilla_smoke" + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 12 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_shape_disc": { + "radius": "math.clamp(query.entity_radius,1,50)", + "direction": [0, 0, 1] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": "math.random(0.5,1.2)" + }, + "minecraft:particle_initial_speed": 4, + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 2, 1], + "linear_drag_coefficient": 1 + }, + "minecraft:particle_appearance_billboard": { + "size": ["math.clamp(v.particle_random_3 * 0.5, 0.5,2)", "math.clamp(v.particle_random_3 * 0.5, 0.5,2)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 16, + "texture_height": 192, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [16, 16], + "step_UV": [0, 16], + "frames_per_second": 12, + "max_frame": 11, + "stretch_to_lifetime": true + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": [0.67843, 0.58039, 0.35686, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder.particle.json new file mode 100644 index 0000000000..4831814ae5 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder.particle.json @@ -0,0 +1,61 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:ragepowder", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:powder.generic.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 50 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 1 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-0.71,0.71)", "math.random(0.45,1.65)", "math.random(-0.71,0.71)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_speed": "math.random(5.05,16.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 2.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 12, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": [1, 0.36471, 0.36471, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder_cloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder_cloud.particle.json new file mode 100644 index 0000000000..5a03084997 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder_cloud.particle.json @@ -0,0 +1,58 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:ragepowder_cloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 50 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.7 + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-0.66,0.66)", "math.random(0.55,1.55)", "math.random(-0.66,0.66)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.75 + }, + "minecraft:particle_initial_speed": "math.random(6.55,17.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 2.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 16, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#15FF5252", + "0.3": "#25FF5252", + "1.0": "#00FF5252" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder_land.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder_land.particle.json new file mode 100644 index 0000000000..5679c6d2e5 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder_land.particle.json @@ -0,0 +1,70 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:ragepowder_land", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "ragepowderlandClouding": { + "particle_effect": { + "effect": "cobblemon:ragepowder_landcloud", + "type": "emitter_bound" + }, + "sound_effect": { + "event_name": "cobblemon:powder.generic.target" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "ragepowderlandClouding" + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "(math.clamp(q.entity_height,0.8,1.15))-(v.emitter_age*0.6)+(v.particle_random_3*(1.25*math.clamp(q.entity_height,0.75,1.5)))", 0], + "radius": "math.clamp((q.entity_radius*1.05)-(v.emitter_age*0.3),0.8,1.4)+math.random(-0.1,0.1)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.25,0.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": [1, 0.36471, 0.36471, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder_landcloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder_landcloud.particle.json new file mode 100644 index 0000000000..e9a15a7ccc --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/ragepowder/ragepowder_landcloud.particle.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:ragepowder_landcloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "(math.clamp(q.entity_height,0.85,1.1))-(v.emitter_age*0.6)+(v.particle_random_3*(1.125*math.clamp(q.entity_height,0.75,1.5)))", 0], + "radius": "math.clamp((q.entity_radius*1)-(v.emitter_age*0.2),0.75,1.35)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.25,0.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#00FF5252", + "0.13": "#23FF5252", + "1.0": "#00FF5252" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_actor.particle.json new file mode 100644 index 0000000000..471c95b064 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_actor.particle.json @@ -0,0 +1,74 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sandattack_actor", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:move.sandattack.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 45 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 1 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_point": { + "offset": [0, 0, "-(q.entity_radius*0.7))"], + "direction": ["math.random(-1.11,1.11)", "math.random(0.85,1.85)", "math.random(-4,-1)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(3.5,20.5)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -9, 0], + "linear_drag_coefficient": 2.75 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 14, + "max_frame": 11 + } + } + }, + "minecraft:particle_motion_collision": { + "coefficient_of_restitution": 2 + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFE9C3", + "1.0": "#FFEED18F" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_impact.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_impact.particle.json new file mode 100644 index 0000000000..6f382cc42d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_impact.particle.json @@ -0,0 +1,73 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sandattack_impact", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:move.sandattack.target" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 30 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 1 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-1.61,1.61)", "math.random(-0.35,2.15)", "math.random(-0.81,2.21)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(5.25,8.25)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -8, 0], + "linear_drag_coefficient": 3 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 14, + "max_frame": 11 + } + } + }, + "minecraft:particle_motion_collision": { + "coefficient_of_restitution": 2 + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFE9C3", + "1.0": "#FFEED18F" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_impactresidual.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_impactresidual.particle.json new file mode 100644 index 0000000000..9792d55137 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_impactresidual.particle.json @@ -0,0 +1,61 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sandattack_impactresidual", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 35 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 0.5 + }, + "minecraft:emitter_shape_point": { + "offset": [0, 0, "-(q.entity_radius*0.7))"], + "direction": ["math.random(-1.11,1.11)", "math.random(-0.35,1.85)", "math.random(-1.11,1.11)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.55 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(1.5,6.5)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -5, 0], + "linear_drag_coefficient": 3 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 20, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#20FFF2D1", + "1.0": "#10EED18F" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_residual.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_residual.particle.json new file mode 100644 index 0000000000..e38f17cc70 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_attack/sandattack_residual.particle.json @@ -0,0 +1,61 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sandattack_residual", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 45 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 0.5 + }, + "minecraft:emitter_shape_point": { + "offset": [0, 0, "-(q.entity_radius*0.7))"], + "direction": ["math.random(-1.11,1.11)", "math.random(0.85,1.65)", "math.random(-4,-1)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.55 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(2.5,14.5)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -7, 0], + "linear_drag_coefficient": 2.75 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 20, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#20FFF2D1", + "1.0": "#10EED18F" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder.particle.json new file mode 100644 index 0000000000..b25b12e439 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder.particle.json @@ -0,0 +1,61 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sleeppowder", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:powder.sleep.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 50 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 1 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-1.31,1.31)", "math.random(1.25,2.55)", "math.random(-4,-1)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_speed": "math.random(6.05,18.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 2.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 12, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": [0.50196, 1, 0.8, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder_cloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder_cloud.particle.json new file mode 100644 index 0000000000..24e276e548 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder_cloud.particle.json @@ -0,0 +1,58 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sleeppowder_cloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 50 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.7 + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-1.21,1.21)", "math.random(1.3,2.5)", "math.random(-4,-1)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.75 + }, + "minecraft:particle_initial_speed": "math.random(6.55,17.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 2.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 16, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#1580FFCC", + "0.3": "#2580FFCC", + "1.0": "#0080FFCC" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder_land.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder_land.particle.json new file mode 100644 index 0000000000..6076ac9406 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder_land.particle.json @@ -0,0 +1,70 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sleeppowder_land", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "sleeppowderlandClouding": { + "particle_effect": { + "effect": "cobblemon:sleeppowder_landcloud", + "type": "emitter_bound" + }, + "sound_effect": { + "event_name": "cobblemon:powder.generic.target" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "sleeppowderlandClouding" + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "(math.clamp(q.entity_height,0.8,1.15))-(v.emitter_age*0.6)+(v.particle_random_3*(1.25*math.clamp(q.entity_height,0.75,1.5)))", 0], + "radius": "math.clamp((q.entity_radius*1.05)-(v.emitter_age*0.3),0.8,1.4)+math.random(-0.1,0.1)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.25,0.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": [0.50196, 1, 0.8, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder_landcloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder_landcloud.particle.json new file mode 100644 index 0000000000..d396b57dc4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sleeppowder/sleeppowder_landcloud.particle.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sleeppowder_landcloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "(math.clamp(q.entity_height,0.85,1.1))-(v.emitter_age*0.6)+(v.particle_random_3*(1.125*math.clamp(q.entity_height,0.75,1.5)))", 0], + "radius": "math.clamp((q.entity_radius*1)-(v.emitter_age*0.2),0.75,1.35)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.25,0.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#0080FFCC", + "0.13": "#2580FFCC", + "1.0": "#0080FFCC" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/shrooms.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/shrooms.particle.json new file mode 100644 index 0000000000..e7efdb91bd --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/shrooms.particle.json @@ -0,0 +1,72 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:shrooms", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/mushroomize" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:powder.spore.mushroom" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": "math.random_integer(2,4)", + "max_particles": 3 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_lifetime_events": { + "timeline": { + "0.05": "event_sound", + "0.15": "event_sound", + "0.35": "event_sound", + "0.55": "event_sound" + } + }, + "minecraft:emitter_shape_disc": { + "offset": ["math.sin(v.emitter_age/v.emitter_lifetime*90*9+v.emitter_random_1*360)", "0.5-(v.particle_random_2/8)-0.1", "math.cos(v.emitter_age/v.emitter_lifetime*90*9+v.emitter_random_1*360)"], + "radius": "q.entity_radius", + "direction": "outwards" + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1.5 + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": ["0.5-(v.particle_random_2/8)", "0.5-(v.particle_random_2/8)"], + "facing_camera_mode": "rotate_y", + "uv": { + "texture_width": 192, + "texture_height": 16, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [16, 16], + "step_UV": [16, 0], + "frames_per_second": 8, + "max_frame": 12 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#ffffffff", + "0.9": "#ffffffff", + "1.0": "#00FFFFFF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore.particle.json new file mode 100644 index 0000000000..330b0f9d0b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore.particle.json @@ -0,0 +1,71 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:spore", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:powder.sleep.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 50 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 1 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-1.31,1.31)", "math.random(1.25,2.55)", "math.random(-4,-1)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_speed": "math.random(6.05,18.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 2.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 12, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF80FFA2", + "0.2": "#FFE1FF80", + "0.4": "#FF80FFA2", + "0.6": "#FFE1FF80", + "0.8": "#FF80FFA2", + "1.0": "#FFE1FF80" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore_cloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore_cloud.particle.json new file mode 100644 index 0000000000..c03af79e22 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore_cloud.particle.json @@ -0,0 +1,58 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:spore_cloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 600, + "max_particles": 60 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.7 + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-1.21,1.21)", "math.random(1.3,2.5)", "math.random(-4,-1)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.75 + }, + "minecraft:particle_initial_speed": "math.random(6.55,17.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 2.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 16, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#15FFFFFF", + "0.3": "#30FFFFFF", + "1.0": "#00FFFFFF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore_land.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore_land.particle.json new file mode 100644 index 0000000000..bb413192b6 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore_land.particle.json @@ -0,0 +1,89 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:spore_land", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "sporelandClouding": { + "particle_effect": { + "effect": "cobblemon:spore_landcloud", + "type": "emitter_bound" + }, + "sound_effect": { + "event_name": "cobblemon:powder.generic.target" + } + }, + "shrooms": { + "particle_effect": { + "effect": "cobblemon:shrooms", + "type": "emitter" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "sporelandClouding", + "timeline": { + "0.45": "shrooms" + } + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "(math.clamp(q.entity_height,0.8,1.15))-(v.emitter_age*0.6)+(v.particle_random_3*(1.25*math.clamp(q.entity_height,0.75,1.5)))", 0], + "radius": "math.clamp((q.entity_radius*1.05)-(v.emitter_age*0.3),0.8,1.4)+math.random(-0.1,0.1)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.25,0.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FF80FFA2", + "0.2": "#FFE1FF80", + "0.4": "#FF80FFA2", + "0.6": "#FFE1FF80", + "0.8": "#FF80FFA2", + "1.0": "#FFE1FF80" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore_landcloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore_landcloud.particle.json new file mode 100644 index 0000000000..c0cd7627e2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/spore/spore_landcloud.particle.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:spore_landcloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 200, + "max_particles": 300 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "(math.clamp(q.entity_height,0.85,1.1))-(v.emitter_age*0.6)+(v.particle_random_3*(1.125*math.clamp(q.entity_height,0.75,1.5)))", 0], + "radius": "math.clamp((q.entity_radius*1)-(v.emitter_age*0.2),0.75,1.35)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.65,0.95)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#10FFFFFF", + "0.13": "#30FFFFFF", + "1.0": "#00FFFFFF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore.particle.json new file mode 100644 index 0000000000..59513d6e2b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore.particle.json @@ -0,0 +1,61 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:stunspore", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:powder.stun.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 50 + }, + "minecraft:emitter_lifetime_looping": { + "active_time": 1 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-1.31,1.31)", "math.random(1.25,2.55)", "math.random(-4,-1)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_speed": "math.random(6.05,18.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 2.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 12, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": [1, 0.8902, 0.34902, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore_cloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore_cloud.particle.json new file mode 100644 index 0000000000..654dee999f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore_cloud.particle.json @@ -0,0 +1,58 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:stunspore_cloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 500, + "max_particles": 50 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.7 + }, + "minecraft:emitter_shape_point": { + "direction": ["math.random(-1.21,1.21)", "math.random(1.3,2.5)", "math.random(-4,-1)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.75 + }, + "minecraft:particle_initial_speed": "math.random(6.55,17.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -6, 0], + "linear_drag_coefficient": 2.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 16, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#15FFDB59", + "0.3": "#25FFDB59", + "1.0": "#00FFDB59" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore_land.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore_land.particle.json new file mode 100644 index 0000000000..6a43ea2080 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore_land.particle.json @@ -0,0 +1,70 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:stunspore_land", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/powder" + } + }, + "events": { + "stunsporelandClouding": { + "particle_effect": { + "effect": "cobblemon:stunspore_landcloud", + "type": "emitter_bound" + }, + "sound_effect": { + "event_name": "cobblemon:powder.generic.target" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "stunsporelandClouding" + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "(math.clamp(q.entity_height,0.8,1.15))-(v.emitter_age*0.6)+(v.particle_random_3*(1.25*math.clamp(q.entity_height,0.75,1.5)))", 0], + "radius": "math.clamp((q.entity_radius*1.05)-(v.emitter_age*0.3),0.8,1.4)+math.random(-0.1,0.1)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.25,0.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": [1, 0.8902, 0.34902, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore_landcloud.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore_landcloud.particle.json new file mode 100644 index 0000000000..34b58d4661 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/stunspore/stunspore_landcloud.particle.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:stunspore_landcloud", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/smokeorb" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 200 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.5 + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "(math.clamp(q.entity_height,0.85,1.1))-(v.emitter_age*0.6)+(v.particle_random_3*(1.125*math.clamp(q.entity_height,0.75,1.5)))", 0], + "radius": "math.clamp((q.entity_radius*1)-(v.emitter_age*0.2),0.75,1.35)", + "surface_only": true, + "direction": ["math.random(-2.31,2.31)", "math.random(-2.31,2.31)", "math.random(-2.31,2.31)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.7 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.25,0.55)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, -1, 0] + }, + "minecraft:particle_appearance_billboard": { + "size": [0.3, 0.3], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 99, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 18, + "max_frame": 11 + } + } + }, + "minecraft:particle_appearance_lighting": {}, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#00FFEB99", + "0.13": "#25FFDB59", + "1.0": "#00FFEB99" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_actor.particle.json new file mode 100644 index 0000000000..13bb238a43 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_actor.particle.json @@ -0,0 +1,54 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sweet_scent_actor", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/invisible" + } + }, + "events": { + "event_petals": { + "particle_effect": { + "effect": "cobblemon:sweet_scent_petals", + "type": "particle" + } + }, + "event_obscure": { + "particle_effect": { + "effect": "cobblemon:sweet_scent_obscure", + "type": "particle" + } + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 5.5 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": ["event_petals", "event_obscure"] + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 1, + "expiration_expression": 1 + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": [0.2, 0.2], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 16, + "texture_height": 16, + "uv": [0, 0], + "uv_size": [16, 16] + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_obscure.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_obscure.particle.json new file mode 100644 index 0000000000..1bd2c9ceb0 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_obscure.particle.json @@ -0,0 +1,47 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sweet_scent_obscure", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/pink_obscure" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 100, + "max_particles": 300 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 3 + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "math.random(0,8)", 0], + "radius": 8, + "direction": "outwards" + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 2 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random(1,4) * 90" + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": ["math.clamp(v.particle_random_2 * 8, 2,8)", "math.clamp(v.particle_random_2 * 8, 2,8)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 32, + "texture_height": 32, + "uv": [0, 0], + "uv_size": [32, 32] + } + }, + "minecraft:particle_appearance_tinting": { + "color": [1, 1, 1, 0.14118] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_petals.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_petals.particle.json new file mode 100644 index 0000000000..bab18241f5 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_petals.particle.json @@ -0,0 +1,64 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sweet_scent_petals", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/cherry_petal" + } + }, + "curves": { + "variable.wave": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [0, 1, -1, 1, -1, 1, -1, 1, -11.75] + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 24, + "max_particles": 100 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 3 + }, + "minecraft:emitter_shape_disc": { + "offset": [0, "math.random(0.1,8)", 6], + "radius": 8, + "direction": [0, 0, -2] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": "math.random(2.8,3.1)" + }, + "minecraft:particle_initial_speed": "math.random(3.8,4.2)", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, "-1 + variable.wave ", 0], + "linear_drag_coefficient": 0.5 + }, + "minecraft:particle_appearance_billboard": { + "size": ["v.particle_random_1 > 0.5 ? 0.05 : 0.075", "v.particle_random_1 > 0.5 ? 0.05 : 0.075"], + "facing_camera_mode": "lookat_xyz", + "uv": { + "texture_width": 12, + "texture_height": 9, + "uv": ["math.floor(v.particle_random_1 * 4) * 3", "math.floor(v.particle_random_2 * 3) * 3"], + "uv_size": [3, 3] + } + }, + "minecraft:particle_motion_collision": { + "expire_on_contact": true + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.71": "#ffffffff", + "1.0": "#00FFFFFF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_puffs.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_puffs.particle.json new file mode 100644 index 0000000000..0276fe41ed --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sweet_scent/sweet_scent_puffs.particle.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:sweet_scent_puffs", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/pink_obscure" + } + }, + "curves": { + "variable.size": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [0, 1] + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 24 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1 + }, + "minecraft:emitter_shape_disc": { + "radius": 1, + "surface_only": true, + "direction": "outwards" + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": "math.random(1.5,3)" + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random(1,4) * 90" + }, + "minecraft:particle_initial_speed": "4 * q.entity_size", + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [0, 2, 0], + "linear_drag_coefficient": "2 * q.entity_size" + }, + "minecraft:particle_appearance_billboard": { + "size": ["2 * v.size", "2* v.size"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 16, + "texture_height": 16, + "uv": [0, 0], + "uv_size": [16, 16] + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#42FFFFFF", + "1.0": "#00FFFFFF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_actor.particle.json new file mode 100644 index 0000000000..40cb98c64a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_actor.particle.json @@ -0,0 +1,101 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:swordsdance_actor", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/swordsdance_swords" + } + }, + "curves": { + "variable.move": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime-0.25", + "nodes": [0, 0, 0, 0.22, 0.19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.45, 0.61, 0.66, 0.68, 0.7] + }, + "variable.speed": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [9.4, 9.81, 10.9, 13.31, 16.5, 13.3] + } + }, + "events": { + "event_sparkle": { + "particle_effect": { + "effect": "cobblemon:swordsdance_sparkle", + "type": "particle" + } + }, + "event_sword2": { + "particle_effect": { + "effect": "cobblemon:swordsdance_sword2", + "type": "emitter_bound" + } + }, + "event_sword4": { + "particle_effect": { + "effect": "cobblemon:swordsdance_sword4", + "type": "emitter_bound" + } + }, + "event_sword3": { + "particle_effect": { + "effect": "cobblemon:swordsdance_sword3", + "type": "emitter_bound" + } + }, + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:move.swordsdance.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 2.5 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": ["event_sword2", "event_sword3", "event_sword4", "event_sound"] + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 2.5 + }, + "minecraft:particle_lifetime_events": { + "timeline": { + "2.10": "event_sparkle" + } + }, + "minecraft:particle_initial_spin": { + "rotation": -45 + }, + "minecraft:particle_motion_parametric": { + "relative_position": ["math.clamp(q.entity_radius,0.6,999)*math.sin(v.particle_age*(v.speed*20)+45)", "1+(math.clamp(q.entity_height,0.5,10)+0.5)*variable.move", "math.clamp(q.entity_radius,0.6,999)*-math.cos(v.particle_age*(v.speed*20)+45)"] + }, + "minecraft:particle_appearance_billboard": { + "size": ["math.clamp(q.entity_size/1.3,0.1,99) / math.clamp(q.entity_size, 0.2,100)", "math.clamp(q.entity_size/1.3,0.1,99) / math.clamp(q.entity_size, 0.2,100)"], + "facing_camera_mode": "rotate_y", + "uv": { + "texture_width": 896, + "texture_height": 32, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [32, 32], + "step_UV": [32, 0], + "frames_per_second": 12, + "max_frame": 28 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": [1, 1, 1, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sparkle.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sparkle.particle.json new file mode 100644 index 0000000000..3b4fee243e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sparkle.particle.json @@ -0,0 +1,51 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:swordsdance_sparkle", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/sparkle" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 20, + "max_particles": 4 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.25 + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, -0.25, 0], + "radius": 0.4, + "surface_only": true, + "direction": [0, 1, 0] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.19 + }, + "minecraft:particle_initial_speed": 0.3, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": [0.1, 0.1], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 8, + "texture_height": 16, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [0, 8], + "frames_per_second": 1, + "max_frame": 2, + "stretch_to_lifetime": true + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": [0.56863, 0.99608, 1, 0.8902] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sword2.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sword2.particle.json new file mode 100644 index 0000000000..614cddf790 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sword2.particle.json @@ -0,0 +1,75 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:swordsdance_sword2", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/swordsdance_swords" + } + }, + "curves": { + "variable.move": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime-0.25", + "nodes": [0, 0, 0, 0.22, 0.19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.45, 0.61, 0.66, 0.68, 0.7] + }, + "variable.speed": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [9.4, 9.81, 10.9, 13.31, 16.5, 13.3] + } + }, + "events": { + "event_sparkle": { + "particle_effect": { + "effect": "cobblemon:swordsdance_sparkle", + "type": "particle" + } + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 2 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 2.5 + }, + "minecraft:particle_lifetime_events": { + "timeline": { + "2.10": "event_sparkle" + } + }, + "minecraft:particle_initial_spin": { + "rotation": -45 + }, + "minecraft:particle_motion_parametric": { + "relative_position": ["math.clamp(q.entity_radius,0.6,999)*math.sin(v.particle_age*(v.speed*20)+135)", "1+(math.clamp(q.entity_height,0.5,10)+0.5)*variable.move", "math.clamp(q.entity_radius,0.6,999)*-math.cos(v.particle_age*(v.speed*20)+135)"] + }, + "minecraft:particle_appearance_billboard": { + "size": ["math.clamp(q.entity_size/1.3,0.1,99) / math.clamp(q.entity_size, 0.2,100)", "math.clamp(q.entity_size/1.3,0.1,99) / math.clamp(q.entity_size, 0.2,100)"], + "facing_camera_mode": "rotate_y", + "uv": { + "texture_width": 896, + "texture_height": 32, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [32, 32], + "step_UV": [32, 0], + "frames_per_second": 12, + "max_frame": 28 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": [1, 1, 1, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sword3.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sword3.particle.json new file mode 100644 index 0000000000..96ff088266 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sword3.particle.json @@ -0,0 +1,75 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:swordsdance_sword3", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/swordsdance_swords" + } + }, + "curves": { + "variable.move": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime-0.25", + "nodes": [0, 0, 0, 0.22, 0.19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.45, 0.61, 0.66, 0.68, 0.7] + }, + "variable.speed": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [9.4, 9.81, 10.9, 13.31, 16.5, 13.3] + } + }, + "events": { + "event_sparkle": { + "particle_effect": { + "effect": "cobblemon:swordsdance_sparkle", + "type": "particle" + } + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 2 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 2.5 + }, + "minecraft:particle_lifetime_events": { + "timeline": { + "2.10": "event_sparkle" + } + }, + "minecraft:particle_initial_spin": { + "rotation": -45 + }, + "minecraft:particle_motion_parametric": { + "relative_position": ["math.clamp(q.entity_radius,0.6,999)*math.sin(v.particle_age*(v.speed*20)+225)", "1+(math.clamp(q.entity_height,0.5,10)+0.5)*variable.move", "math.clamp(q.entity_radius,0.6,999)*-math.cos(v.particle_age*(v.speed*20)+225)"] + }, + "minecraft:particle_appearance_billboard": { + "size": ["math.clamp(q.entity_size/1.3,0.1,99) / math.clamp(q.entity_size, 0.2,100)", "math.clamp(q.entity_size/1.3,0.1,99) / math.clamp(q.entity_size, 0.2,100)"], + "facing_camera_mode": "rotate_y", + "uv": { + "texture_width": 896, + "texture_height": 32, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [32, 32], + "step_UV": [32, 0], + "frames_per_second": 12, + "max_frame": 28 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": [1, 1, 1, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sword4.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sword4.particle.json new file mode 100644 index 0000000000..9e842b2050 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swords_dance/swordsdance_sword4.particle.json @@ -0,0 +1,75 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:swordsdance_sword4", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/swordsdance_swords" + } + }, + "curves": { + "variable.move": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime-0.25", + "nodes": [0, 0, 0, 0.22, 0.19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.45, 0.61, 0.66, 0.68, 0.7] + }, + "variable.speed": { + "type": "linear", + "input": "v.particle_age", + "horizontal_range": "v.particle_lifetime", + "nodes": [9.4, 9.81, 10.9, 13.31, 16.5, 13.3] + } + }, + "events": { + "event_sparkle": { + "particle_effect": { + "effect": "cobblemon:swordsdance_sparkle", + "type": "particle" + } + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 2 + }, + "minecraft:emitter_shape_point": {}, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 2.5 + }, + "minecraft:particle_lifetime_events": { + "timeline": { + "2.10": "event_sparkle" + } + }, + "minecraft:particle_initial_spin": { + "rotation": -45 + }, + "minecraft:particle_motion_parametric": { + "relative_position": ["math.clamp(q.entity_radius,0.6,999)*math.sin(v.particle_age*(v.speed*20)+315)", "1+(math.clamp(q.entity_height,0.5,10)+0.5)*variable.move", "math.clamp(q.entity_radius,0.6,999)*-math.cos(v.particle_age*(v.speed*20)+315)"] + }, + "minecraft:particle_appearance_billboard": { + "size": ["math.clamp(q.entity_size/1.3,0.1,99) / math.clamp(q.entity_size, 0.2,100)", "math.clamp(q.entity_size/1.3,0.1,99) / math.clamp(q.entity_size, 0.2,100)"], + "facing_camera_mode": "rotate_y", + "uv": { + "texture_width": 896, + "texture_height": 32, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [32, 32], + "step_UV": [32, 0], + "frames_per_second": 12, + "max_frame": 28 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": [1, 1, 1, 1] + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_actor.particle.json new file mode 100644 index 0000000000..7ea5374af0 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_actor.particle.json @@ -0,0 +1,67 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:thunderwave_actor", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/small-ring" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:move.thunderwave.actor" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 8, + "max_particles": 8 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.25 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_point": { + "direction": [0, 0, 3] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.5 + }, + "minecraft:particle_initial_speed": -4.5, + "minecraft:particle_motion_dynamic": { + "linear_drag_coefficient": 1 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.55, 0.55], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 54, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 12, + "max_frame": 6 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFFCE3", + "0.3": "#FFFFE27A", + "0.6": "#FFFFDA4B", + "1.0": "#FF8C91FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_impact1.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_impact1.particle.json new file mode 100644 index 0000000000..b5533e2626 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_impact1.particle.json @@ -0,0 +1,65 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:thunderwave_impact1", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/large-ring" + } + }, + "events": { + "event_sound": { + "sound_effect": { + "event_name": "cobblemon:move.thunderwave.target" + } + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 6, + "max_particles": 2 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.35 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event_sound" + }, + "minecraft:emitter_shape_point": { + "offset": [0, 0, -0.2] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.465 + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": [1.1, 1.1], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 160, + "texture_height": 20, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [20, 20], + "step_UV": [20, 0], + "frames_per_second": 20, + "max_frame": 8 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFFCE3", + "0.3": "#FFFFE27A", + "0.6": "#FFFFDA4B", + "1.0": "#FF8C91FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_impact2.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_impact2.particle.json new file mode 100644 index 0000000000..d5eb61cb59 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_impact2.particle.json @@ -0,0 +1,55 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:thunderwave_impact2", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/medium-ring" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 24, + "max_particles": 8 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.25 + }, + "minecraft:emitter_shape_point": { + "offset": ["math.sin(v.emitter_age*360*7.5)*0.75", "-math.cos(v.emitter_age*360*7.5)*0.75", -0.15] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.405 + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": [0.8, 0.8], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 90, + "texture_height": 15, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [15, 15], + "step_UV": [15, 0], + "frames_per_second": 16, + "max_frame": 6 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFFCE3", + "0.3": "#FFFFE27A", + "0.6": "#FFFFDA4B", + "1.0": "#FF8C91FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_impact3.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_impact3.particle.json new file mode 100644 index 0000000000..7cd46a7430 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_impact3.particle.json @@ -0,0 +1,55 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:thunderwave_impact3", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/small-ring" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 24, + "max_particles": 8 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.25 + }, + "minecraft:emitter_shape_point": { + "offset": ["math.sin(v.emitter_age*360*7.5+45)*0.95", "-math.cos(v.emitter_age*360*7.5+45)*0.95", -0.175] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.405 + }, + "minecraft:particle_initial_speed": 0, + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": [0.5, 0.5], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 54, + "texture_height": 9, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [9, 9], + "step_UV": [9, 0], + "frames_per_second": 16, + "max_frame": 6 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFFCE3", + "0.3": "#FFFFE27A", + "0.6": "#FFFFDA4B", + "1.0": "#FF8C91FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_launch.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_launch.particle.json new file mode 100644 index 0000000000..9b3dc893b2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_launch.particle.json @@ -0,0 +1,60 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:thunderwave_launch", + "basic_render_parameters": { + "material": "particles_alpha", + "texture": "textures/particles/medium-ring" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 4.5, + "max_particles": 5 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 1.35 + }, + "minecraft:emitter_lifetime_events": { + "creation_event": "event" + }, + "minecraft:emitter_shape_point": { + "direction": [0, 0, 3] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.4 + }, + "minecraft:particle_initial_speed": -2.5, + "minecraft:particle_motion_dynamic": { + "linear_drag_coefficient": 1.5 + }, + "minecraft:particle_appearance_billboard": { + "size": [0.9, 0.9], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 90, + "texture_height": 15, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [15, 15], + "step_UV": [15, 0], + "frames_per_second": 16, + "max_frame": 6 + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": { + "interpolant": "v.particle_age / v.particle_lifetime", + "gradient": { + "0.0": "#FFFFFCE3", + "0.3": "#FFFFE27A", + "0.6": "#FFFFDA4B", + "1.0": "#FF8C91FF" + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_sparking.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_sparking.particle.json new file mode 100644 index 0000000000..3f061af204 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/thunderwave/thunderwave_sparking.particle.json @@ -0,0 +1,50 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "cobblemon:thunderwave_sparking", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particles/accessory-spark" + } + }, + "components": { + "minecraft:emitter_rate_steady": { + "spawn_rate": 28, + "max_particles": 14 + }, + "minecraft:emitter_lifetime_once": { + "active_time": 0.75 + }, + "minecraft:emitter_shape_sphere": { + "offset": [0, "(q.entity_height-(q.entity_height*1.15))+(variable.particle_random_3*0.9)", 0], + "radius": "math.clamp(q.entity_radius*1.1,1.1,999)", + "surface_only": true, + "direction": ["(math.random(-2,2))*math.random(2,4)", "math.random(12,15)", "(math.random(-2,2))*math.random(2,4)"] + }, + "minecraft:particle_lifetime_expression": { + "max_lifetime": 0.125 + }, + "minecraft:particle_initial_spin": { + "rotation": "math.random_integer(0,3)*90" + }, + "minecraft:particle_initial_speed": "math.random(0.55,0.85)*1", + "minecraft:particle_motion_dynamic": {}, + "minecraft:particle_appearance_billboard": { + "size": ["0.35-(variable.particle_random_3*0.085)", "0.35-(variable.particle_random_3*0.085)"], + "facing_camera_mode": "rotate_xyz", + "uv": { + "texture_width": 32, + "texture_height": 8, + "flipbook": { + "base_UV": [0, 0], + "size_UV": [8, 8], + "step_UV": [8, 0], + "frames_per_second": 20, + "max_frame": 4 + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/sleep_bubbles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/sleep_bubbles.particle.json deleted file mode 100644 index ec0e7befec..0000000000 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/sleep_bubbles.particle.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "format_version": "1.10.0", - "particle_effect": { - "description": { - "identifier": "cobblemon:sleep_bubbles", - "basic_render_parameters": { - "material": "particles_blend", - "texture": "textures/particles/bubble" - } - }, - "components": { - "minecraft:emitter_rate_steady": { - "spawn_rate": 4, - "max_particles": 16 - }, - "minecraft:emitter_lifetime_looping": { - "active_time": 1.5, - "sleep_time": 3 - }, - "minecraft:emitter_shape_point": { - "direction": ["math.random(-0.5,0.5)", "math.random(0.8,1)", "math.random(-0.5,0.5)"] - }, - "minecraft:particle_lifetime_expression": { - "max_lifetime": 4 - }, - "minecraft:particle_initial_speed": "1/3", - "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, 0.2, 0], - "linear_drag_coefficient": 0.95 - }, - "minecraft:particle_appearance_billboard": { - "size": ["math.clamp(v.particle_age*0.33, 0, 0.2)", "math.clamp(v.particle_age*0.33, 0, 0.2)"], - "facing_camera_mode": "rotate_xyz", - "uv": { - "texture_width": 16, - "texture_height": 48, - "flipbook": { - "base_UV": [0, 0], - "size_UV": [16, 16], - "step_UV": [0, 16], - "frames_per_second": 4, - "max_frame": 4, - "loop": true - } - } - }, - "minecraft:particle_appearance_tinting": { - "color": { - "interpolant": "v.particle_age / v.particle_lifetime", - "gradient": { - "0.0": "#ffffffff", - "0.5": "#CCFFFFFF", - "1.0": "#00FFFFFF" - } - } - } - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/particles/sleep_zzz.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/sleep_zzz.particle.json deleted file mode 100644 index d86768c242..0000000000 --- a/common/src/main/resources/assets/cobblemon/bedrock/particles/sleep_zzz.particle.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "format_version": "1.10.0", - "particle_effect": { - "description": { - "identifier": "cobblemon:sleep_zzz", - "basic_render_parameters": { - "material": "particles_blend", - "texture": "textures/particles/sleep_zzz" - } - }, - "components": { - "minecraft:emitter_rate_steady": { - "spawn_rate": 2, - "max_particles": 9 - }, - "minecraft:emitter_lifetime_looping": { - "active_time": 1.5, - "sleep_time": 3 - }, - "minecraft:emitter_shape_point": { - "direction": ["math.random(-0.25,0.25)", "math.random(0.8,1)", "math.random(-0.25,0.25)"] - }, - "minecraft:particle_lifetime_expression": { - "max_lifetime": 4 - }, - "minecraft:particle_initial_speed": "1/4", - "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, 0.25, 0], - "linear_drag_coefficient": 0.85 - }, - "minecraft:particle_appearance_billboard": { - "size": ["math.clamp(v.particle_age*0.33/2, 0, 0.25)", "math.clamp(v.particle_age*0.66/2, 0, 0.25)"], - "facing_camera_mode": "rotate_xyz", - "uv": { - "texture_width": 8, - "texture_height": 24, - "flipbook": { - "base_UV": [0, 0], - "size_UV": [8, 8], - "step_UV": [0, 8], - "frames_per_second": 1, - "max_frame": 3 - } - } - }, - "minecraft:particle_appearance_tinting": { - "color": { - "interpolant": "v.particle_age / v.particle_lifetime", - "gradient": { - "0.0": "#ffffffff", - "0.5": "#CCFFFFFF", - "1.0": "#00FFFFFF" - } - } - } - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0041_zubat/zubat.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0041_zubat/zubat.animation.json index 8519ce2256..902186a833 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0041_zubat/zubat.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0041_zubat/zubat.animation.json @@ -732,6 +732,9 @@ }, "torso": { "rotation": [0, 0, 0] + }, + "wings_open": { + "scale": 0 } } }, @@ -823,6 +826,9 @@ }, "torso": { "rotation": [0, 0, 0] + }, + "wings_open": { + "scale": 0 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0098_krabby/krabby.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0098_krabby/krabby.animation.json index f1bef15d24..2c00e46047 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0098_krabby/krabby.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0098_krabby/krabby.animation.json @@ -482,89 +482,379 @@ "animation.krabby.quirk_bubble": { "animation_length": 24, "bones": { + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": { + "pre": [3, 0, 0], + "post": [3, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [3, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [-8, 2, 0], + "lerp_mode": "catmullrom" + }, + "3.2083": { + "post": [-7.41, -1.07, 1.44], + "lerp_mode": "catmullrom" + }, + "5.875": { + "post": [-3, -5, 3], + "lerp_mode": "catmullrom" + }, + "7.4583": { + "post": [0.02, -1.27, 0.87], + "lerp_mode": "catmullrom" + }, + "9.125": { + "post": [-7.94, 2.86, -1.52], + "lerp_mode": "catmullrom" + }, + "10.875": { + "post": [-10.1, -0.03, -0.81], + "lerp_mode": "catmullrom" + }, + "11.625": { + "post": [-13.91, -1.34, -0.34], + "lerp_mode": "catmullrom" + }, + "12.125": { + "post": [-6.1, -1, 0], + "lerp_mode": "catmullrom" + }, + "12.5417": { + "post": [1.41, -0.84, 0.06], + "lerp_mode": "catmullrom" + }, + "13.125": { + "post": [3.15, -0.76, 0.06], + "lerp_mode": "catmullrom" + }, + "17.1667": [0, 0, 0] + } + }, + "arm_right": { + "rotation": { + "0.0": [0, 0, 0], + "1.0417": { + "pre": [0, -12, 0], + "post": [0, -12, 0], + "lerp_mode": "catmullrom" + }, + "3.4583": { + "post": [0, 9, 0], + "lerp_mode": "catmullrom" + }, + "4.4167": { + "post": [-17.03, 10.99, 0], + "lerp_mode": "catmullrom" + }, + "5.25": { + "post": [-12.56, 11.18, 0], + "lerp_mode": "catmullrom" + }, + "6.0833": { + "post": [-23.84, 11.17, 0], + "lerp_mode": "catmullrom" + }, + "7.0": { + "post": [-16, 10.89, 0], + "lerp_mode": "catmullrom" + }, + "10.6667": { + "post": [0, 9, 0], + "lerp_mode": "catmullrom" + }, + "11.9583": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "12.7083": [0, 0, 0] + } + }, + "arm_right2": { + "rotation": { + "0.0": [0, 0, 0], + "0.6667": { + "pre": [0, 4, 0], + "post": [0, 4, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [-4.25, -25.17, -0.96], + "lerp_mode": "catmullrom" + }, + "10.9583": { + "post": [-23.76, -28.06, -1.04], + "lerp_mode": "catmullrom" + }, + "11.9167": { + "post": [-24, -27, -1], + "lerp_mode": "catmullrom" + }, + "12.7083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "14.0": [0, 0, 0] + } + }, "claw_right": { "rotation": { - "0.0417": { - "pre": [0, 0, 0], + "0.0": [0, 0, 0], + "0.7917": { + "pre": [18, 23.5, 0], + "post": [18, 23.5, 0], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [-7, 0, 0], + "lerp_mode": "catmullrom" + }, + "7.0417": { + "post": [10.95, 0, 0], + "lerp_mode": "catmullrom" + }, + "11.0417": { + "post": [-7, 0, 0], + "lerp_mode": "catmullrom" + }, + "12.3333": { "post": [0, 0, 0], "lerp_mode": "catmullrom" }, - "0.5417": { - "post": [-2.5, -20, -37.5], + "13.625": [0, 0, 0] + } + }, + "claw_mandible_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.625": { + "pre": [0, 0, -20], + "post": [0, 0, -20], "lerp_mode": "catmullrom" }, - "10.7083": { - "post": [-2.5, -20, -37.5], + "2.6667": { + "post": [0, 0, 27.5], "lerp_mode": "catmullrom" }, - "11.3333": { + "3.375": { + "post": [0, 0, -12.38], + "lerp_mode": "catmullrom" + }, + "4.0417": { + "post": [0, 0, 30.12], + "lerp_mode": "catmullrom" + }, + "4.9167": { + "post": [0, 0, -11.85], + "lerp_mode": "catmullrom" + }, + "5.7083": { + "post": [0, 0, 30.41], + "lerp_mode": "catmullrom" + }, + "6.2917": { + "post": [0, 0, 27.5], + "lerp_mode": "catmullrom" + }, + "7.0": { + "post": [0, 0, -12.38], + "lerp_mode": "catmullrom" + }, + "7.6667": { + "post": [0, 0, 30.12], + "lerp_mode": "catmullrom" + }, + "8.5417": { + "post": [0, 0, -11.85], + "lerp_mode": "catmullrom" + }, + "9.3333": { + "post": [0, 0, 30.41], + "lerp_mode": "catmullrom" + }, + "11.2083": { + "post": [0, 0, 27.5], + "lerp_mode": "catmullrom" + }, + "11.9167": { "post": [0, 0, 0], "lerp_mode": "catmullrom" - } + }, + "12.6667": [0, 0, 0] } }, "arm_left": { "rotation": { - "0.0417": { - "pre": [0, 0, 0], + "0.0": [0, 0, 0], + "1.0417": { + "pre": [0, 12, 0], + "post": [0, 12, 0], + "lerp_mode": "catmullrom" + }, + "3.4583": { + "post": [0, -9, 0], + "lerp_mode": "catmullrom" + }, + "4.4167": { + "post": [-17.03, -10.99, 0], + "lerp_mode": "catmullrom" + }, + "5.25": { + "post": [-12.56, -11.18, 0], + "lerp_mode": "catmullrom" + }, + "6.0833": { + "post": [-23.84, -11.17, 0], + "lerp_mode": "catmullrom" + }, + "7.0": { + "post": [-16, -10.89, 0], + "lerp_mode": "catmullrom" + }, + "10.6667": { + "post": [0, -9, 0], + "lerp_mode": "catmullrom" + }, + "11.9583": { "post": [0, 0, 0], "lerp_mode": "catmullrom" }, - "0.5417": { - "post": [5, -10, 0], - "lerp_mode": "catmullrom" - }, - "10.7083": { - "post": [5, -10, 0], - "lerp_mode": "catmullrom" - }, - "11.3333": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - } + "12.7083": [0, 0, 0] } }, "arm_left2": { "rotation": { - "0.0417": { - "pre": [0, 0, 0], + "0.0": [0, 0, 0], + "0.6667": { + "pre": [0, -4, 0], + "post": [0, -4, 0], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [83, 18, 17], + "lerp_mode": "catmullrom" + }, + "11.5417": { + "post": [84.5, 27.33, 17.31], + "lerp_mode": "catmullrom" + }, + "11.9167": { + "post": [83, 18, 17], + "lerp_mode": "catmullrom" + }, + "12.7083": { "post": [0, 0, 0], "lerp_mode": "catmullrom" }, - "0.5417": { - "post": [-12.5, -2.5, -5], - "lerp_mode": "catmullrom" - }, - "10.7083": { - "post": [-12.5, -2.5, -5], - "lerp_mode": "catmullrom" - }, - "11.3333": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - } + "14.0": [0, 0, 0] } }, "claw_left": { "rotation": { - "0.0417": { - "pre": [0, 0, 0], - "post": [0, 0, 0], + "0.0": [0, 0, 0], + "0.7917": { + "pre": [18, -16, -15], + "post": [18, -16, -15], "lerp_mode": "catmullrom" }, - "0.5417": { - "post": [-10, -7.5, 55], + "1.5417": { + "post": [-77, -2.5, 22.5], "lerp_mode": "catmullrom" }, - "10.7083": { - "post": [-10, -7.5, 55], + "2.75": { + "post": [-69.4, -0.44, 25.82], "lerp_mode": "catmullrom" }, - "11.3333": { - "post": [0, 0, 0], + "4.25": { + "post": [-73.16, -0.17, 24.04], "lerp_mode": "catmullrom" - } + }, + "7.0417": { + "post": [-72, -2.5, 22.5], + "lerp_mode": "catmullrom" + }, + "11.0417": { + "post": [-67, -2.5, 22.5], + "lerp_mode": "catmullrom" + }, + "11.7083": { + "post": [-53.26, -1.2, 28.8], + "lerp_mode": "catmullrom" + }, + "12.3333": { + "post": [-32, 0, 0], + "lerp_mode": "catmullrom" + }, + "13.625": [0, 0, 0] } + }, + "claw_mandible_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.625": { + "pre": [0, 0, 20], + "post": [0, 0, 20], + "lerp_mode": "catmullrom" + }, + "2.2917": { + "post": [0, 0, -27.5], + "lerp_mode": "catmullrom" + }, + "2.9583": { + "post": [0, 0, 12.38], + "lerp_mode": "catmullrom" + }, + "3.625": { + "post": [0, 0, -30.12], + "lerp_mode": "catmullrom" + }, + "4.5": { + "post": [0, 0, 11.85], + "lerp_mode": "catmullrom" + }, + "5.2917": { + "post": [0, 0, -30.41], + "lerp_mode": "catmullrom" + }, + "5.9167": { + "post": [0, 0, -27.5], + "lerp_mode": "catmullrom" + }, + "6.5833": { + "post": [0, 0, 12.38], + "lerp_mode": "catmullrom" + }, + "7.25": { + "post": [0, 0, -30.12], + "lerp_mode": "catmullrom" + }, + "8.125": { + "post": [0, 0, 11.85], + "lerp_mode": "catmullrom" + }, + "8.9167": { + "post": [0, 0, -30.41], + "lerp_mode": "catmullrom" + }, + "11.2083": { + "post": [0, 0, -27.5], + "lerp_mode": "catmullrom" + }, + "11.9167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "12.6667": [0, 0, 0] + } + }, + "claw_left3": { + "rotation": [0, 0, 0] } }, "particle_effects": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0104_cubone/cubone.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0104_cubone/cubone.animation.json index 6a6a09e165..f888c320f3 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0104_cubone/cubone.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0104_cubone/cubone.animation.json @@ -117,6 +117,22 @@ }, "right_foot": { "rotation": [0, 12.5, 0] + }, + "bone_torso": { + "rotation": [4.99527, 0.21782, -2.4905] + }, + "bone_upper_torso": { + "rotation": [-4.89169, 2.70615, 2.27522] + }, + "bone_right_upper_arm": { + "rotation": [48.86565, 2.2249, -21.49591], + "position": [0, -0.25, -0.25] + }, + "bone_right_lower_arm": { + "rotation": [0, -7.5, 0] + }, + "bone": { + "position": [0.5, 0, -0.25] } } }, @@ -126,21 +142,38 @@ "left_eyelid": { "position": { "0.0": [0.1, 0, 0], - "0.125": {"pre": [0.1, 0, 0], "post": [0.1, 0, 0]}, - "0.1667": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} + "0.125": { + "pre": [0.1, 0, 0], + "post": [0.1, 0, 0] + }, + "0.1667": { + "pre": [0.1, 0, 0], + "post": [0, 0, 0] + } } }, "right_eyelid": { "position": { "0.0": [-0.1, 0, 0], - "0.125": {"pre": [-0.1, 0, 0], "post": [-0.1, 0, 0]}, - "0.1667": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} + "0.125": { + "pre": [-0.1, 0, 0], + "post": [-0.1, 0, 0] + }, + "0.1667": { + "pre": [-0.1, 0, 0], + "post": [0, 0, 0] + } } } } }, "animation.cubone.cry": { "animation_length": 1.16667, + "sound_effects": { + "0.04": { + "effect": "pokemon.cubone.cry" + } + }, "bones": { "upper_torso": { "rotation": { @@ -199,11 +232,6 @@ } } } - }, - "sound_effects": { - "0.2083": { - "effect": "pokemon.cubone.cry" - } } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0155_cyndaquil/cyndaquil.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0155_cyndaquil/cyndaquil.animation.json index 2c5fb4b9af..e1468c12d8 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0155_cyndaquil/cyndaquil.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0155_cyndaquil/cyndaquil.animation.json @@ -28,7 +28,7 @@ "fire": { "rotation": ["math.sin(q.anim_time*90*3*2-90)*1-1*6", 0, "math.sin(q.anim_time*90*3-150)*1-1)+6*(math.sin(q.anim_time*90*3/2-90)*10"], "position": [0, -2.75, 0], - "scale": [0.3, 0.2, 0.6] + "scale": [0.3, 0, 0.6] }, "torso2": { "rotation": ["-7.5+math.cos(q.anim_time*90*3-60)*1", 0, 0] @@ -112,7 +112,7 @@ "fire": { "rotation": ["math.sin(q.anim_time*90*3*2-90)*1-1*6", 0, "math.sin(q.anim_time*90*3-150)*1-1)+6*(math.sin(q.anim_time*90*3/2-90)*10"], "position": [0, -2.75, 0], - "scale": [0.3, 0.2, 0.6] + "scale": [0.3, 0, 0.6] }, "torso2": { "rotation": ["-7.5+math.cos(q.anim_time*90*4*2-60)*1", 0, "0+math.cos(q.anim_time*90*4-60)*3"] diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0235_smeargle/smeargle.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0235_smeargle/smeargle.animation.json new file mode 100644 index 0000000000..b25df2e6bf --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0235_smeargle/smeargle.animation.json @@ -0,0 +1,149 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.smeargle.ground_idle": { + "loop": true, + "bones": { + "body": { + "position": [0, 0.7, 0] + }, + "torso": { + "rotation": [10, 0, 0] + }, + "chest": { + "rotation": [2.5, 0, 0] + }, + "arm_left": { + "rotation": [0, -7.5, 45] + }, + "arm_left2": { + "rotation": [0, 22.5, 0] + }, + "hand_left": { + "rotation": [0, 0, -2.5] + }, + "thumb_left": { + "rotation": [27.72579, 33.60134, 43.52279] + }, + "thumb_left2": { + "rotation": [0, -20, 0] + }, + "finger_front_left": { + "rotation": [0, 0, 5] + }, + "finger_front_left2": { + "rotation": [0, 0, 17.5] + }, + "finger_back_left": { + "rotation": [0, -10, 20] + }, + "finger_back_left2": { + "rotation": [0, 2.5, 22.5] + }, + "arm_right": { + "rotation": [-27.30867, 8.51177, -22.18713] + }, + "arm_right2": { + "rotation": [-1.61893, -19.96631, 2.53679] + }, + "hand_right": { + "rotation": [-0.43688, -4.98093, -12.481] + }, + "thumb_right": { + "rotation": [48.59634, -34.79252, -79.4313] + }, + "thumb_right2": { + "rotation": [0, 45, 0] + }, + "finger_front_right": { + "rotation": [0, 0, -32.5] + }, + "finger_front_right2": { + "rotation": [0, 0, -32.5] + }, + "finger_back_right": { + "rotation": [-8.28342, 15.46973, -28.62702] + }, + "finger_back_right2": { + "rotation": [0, 0, -50] + }, + "head": { + "rotation": [-10, 0, 0] + }, + "tail": { + "rotation": [-12.48999, 7.14863, -3.2365] + }, + "tail2": { + "rotation": [5, -50, 0] + }, + "tail3": { + "rotation": [0, -50, 0] + }, + "tail4": { + "rotation": [10, -55, 0] + }, + "tail5": { + "rotation": [5, -25, 0] + }, + "tail6": { + "rotation": [-0.07131, -20.69823, -1.64443] + }, + "tail7": { + "rotation": [35.93866, 12.2403, 8.73739] + }, + "tail_end": { + "rotation": [17.89807, 11.91276, 3.81397] + }, + "tail_end2": { + "rotation": [12.5, 0, 0] + }, + "leg_left": { + "rotation": [6.06552, -19.25096, -10.58873] + }, + "leg_left2": { + "rotation": [5, 0, 0] + }, + "foot_left": { + "rotation": [15.08017, -19.607, 7.5937] + }, + "foot_left2": { + "rotation": [-20, 0, 0] + }, + "leg_right": { + "rotation": [-0.63556, 30.36949, 8.66804] + }, + "leg_right2": { + "rotation": [15, 0, 0] + }, + "foot_right": { + "rotation": [17.43745, 1.50179, -4.76968] + }, + "foot_right2": { + "rotation": [-25, 0, 0] + }, + "tail_end_fur": { + "rotation": [12.5, 0, 0] + } + } + }, + "animation.smeargle.blink": { + "animation_length": 0.16667, + "bones": { + "eyelid_left": { + "position": { + "0.0": [0.1, 0, 0], + "0.125": [0.1, 0, 0], + "0.1667": [-0.2, 0, 0] + } + }, + "eyelid_right": { + "position": { + "0.0": [-0.1, 0, 0], + "0.125": [-0.1, 0, 0], + "0.1667": [0.2, 0, 0] + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0534_conkeldurr/conkeldurr.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0534_conkeldurr/conkeldurr.animation.json index 8f155366af..69b1b6bb93 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0534_conkeldurr/conkeldurr.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0534_conkeldurr/conkeldurr.animation.json @@ -61,7 +61,8 @@ }, "pillar_connected_left": { "rotation": [-0.08508, -0.64686, 14.98637], - "position": [-0.27434, 9.83489, -0.09301] + "position": [-0.27434, 9.83489, -0.09301], + "scale": 0 }, "arm_right": { "rotation": [-15, 0, 0], @@ -103,7 +104,8 @@ }, "pillar_connected_right": { "rotation": [-0.08508, 0.64686, -14.98637], - "position": [0.27434, 9.83489, -0.09301] + "position": [0.27434, 9.83489, -0.09301], + "scale": 0 }, "head": { "rotation": ["-12.5+3*math.sin(q.anim_time*90*1-50)", 0, 0], @@ -493,7 +495,8 @@ }, "pillar_connected_left": { "rotation": [-0.08508, -0.64686, 14.98637], - "position": [-0.27434, 9.83489, -0.09301] + "position": [-0.27434, 9.83489, -0.09301], + "scale": 0 }, "arm_right": { "rotation": { @@ -605,7 +608,8 @@ }, "pillar_connected_right": { "rotation": [-0.08508, 0.64686, -14.98637], - "position": [0.27434, 9.83489, -0.09301] + "position": [0.27434, 9.83489, -0.09301], + "scale": 0 }, "head": { "rotation": ["-12.5+3*math.sin(q.anim_time*90*4-50)", "10*math.sin(q.anim_time*90*2)", 0] @@ -1265,7 +1269,8 @@ }, "pillar_connected_left": { "rotation": [-0.08508, -0.64686, 14.98637], - "position": [-0.27434, 9.83489, -0.09301] + "position": [-0.27434, 9.83489, -0.09301], + "scale": 0 }, "arm_right": { "rotation": { @@ -1436,7 +1441,8 @@ }, "pillar_connected_right": { "rotation": [-0.08508, 0.64686, -14.98637], - "position": [0.27434, 9.83489, -0.09301] + "position": [0.27434, 9.83489, -0.09301], + "scale": 0 }, "head": { "rotation": ["-10+2*math.sin(q.anim_time*90*4-90)", 0, 0], @@ -1968,28 +1974,64 @@ "mouth_closed": { "position": { "0.0": [0, 0, 0], - "0.125": {"pre": [0, 0, 0], "post": [0, 0, 0]}, - "0.1667": {"pre": [0, 0, 0], "post": [0, -0.03059, 0.09521]}, - "1.375": {"pre": [0, -0.03059, 0.09521], "post": [0, -0.03059, 0.09521]}, - "1.4167": {"pre": [0, -0.03059, 0.09521], "post": [0, 0, 0]} + "0.125": { + "pre": [0, 0, 0], + "post": [0, 0, 0] + }, + "0.1667": { + "pre": [0, 0, 0], + "post": [0, -0.03059, 0.09521] + }, + "1.375": { + "pre": [0, -0.03059, 0.09521], + "post": [0, -0.03059, 0.09521] + }, + "1.4167": { + "pre": [0, -0.03059, 0.09521], + "post": [0, 0, 0] + } } }, "mouth_open": { "position": { "0.0": [0, 0, 0], - "0.125": {"pre": [0, 0, 0], "post": [0, 0, 0]}, - "0.1667": {"pre": [0, 0, 0], "post": [0, 0.03059, -0.09521]}, - "1.375": {"pre": [0, 0.03059, -0.09521], "post": [0, 0.03059, -0.09521]}, - "1.4167": {"pre": [0, 0.03059, -0.09521], "post": [0, 0, 0]} + "0.125": { + "pre": [0, 0, 0], + "post": [0, 0, 0] + }, + "0.1667": { + "pre": [0, 0, 0], + "post": [0, 0.03059, -0.09521] + }, + "1.375": { + "pre": [0, 0.03059, -0.09521], + "post": [0, 0.03059, -0.09521] + }, + "1.4167": { + "pre": [0, 0.03059, -0.09521], + "post": [0, 0, 0] + } } }, "mouth_frown": { "position": { "0.0": [0, 0, 0], - "0.125": {"pre": [0, 0, 0], "post": [0, 0, 0]}, - "0.1667": {"pre": [0, 0, 0], "post": [0, -0.03059, 0.09521]}, - "1.375": {"pre": [0, -0.03059, 0.09521], "post": [0, -0.03059, 0.09521]}, - "1.4167": {"pre": [0, -0.03059, 0.09521], "post": [0, 0, 0]} + "0.125": { + "pre": [0, 0, 0], + "post": [0, 0, 0] + }, + "0.1667": { + "pre": [0, 0, 0], + "post": [0, -0.03059, 0.09521] + }, + "1.375": { + "pre": [0, -0.03059, 0.09521], + "post": [0, -0.03059, 0.09521] + }, + "1.4167": { + "pre": [0, -0.03059, 0.09521], + "post": [0, 0, 0] + } } }, "hand_left": { @@ -2167,6 +2209,12 @@ "pillar_disconnected_right": { "rotation": [-3.29767, -14.6123, 3.9999], "position": [27, 11.25, -12] + }, + "pillar_connected_left": { + "scale": 0 + }, + "pillar_connected_right": { + "scale": 0 } } }, @@ -2238,7 +2286,8 @@ }, "pillar_connected_left": { "rotation": [-0.08508, -0.64686, 14.98637], - "position": [-0.27434, 9.83489, -0.09301] + "position": [-0.27434, 9.83489, -0.09301], + "scale": 0 }, "arm_right": { "rotation": [80.69367, 5.68422, 13.9042], @@ -2280,7 +2329,8 @@ }, "pillar_connected_right": { "rotation": [-0.08508, 0.64686, -14.98637], - "position": [0.27434, 9.83489, -0.09301] + "position": [0.27434, 9.83489, -0.09301], + "scale": 0 }, "head": { "rotation": ["2.5+3*math.sin(q.anim_time*90*1-50)", 0, 0] @@ -2657,7 +2707,8 @@ }, "pillar_connected_left": { "rotation": [-0.08508, -0.64686, 14.98637], - "position": [-0.27434, 9.83489, -0.09301] + "position": [-0.27434, 9.83489, -0.09301], + "scale": 0 }, "arm_right": { "rotation": { @@ -2752,7 +2803,8 @@ }, "pillar_connected_right": { "rotation": [-0.08508, 0.64686, -14.98637], - "position": [0.27434, 9.83489, -0.09301] + "position": [0.27434, 9.83489, -0.09301], + "scale": 0 }, "head": { "rotation": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0571_zoroark/zoroark.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0571_zoroark/zoroark.animation.json index 6ceac5a501..e8007420d3 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0571_zoroark/zoroark.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0571_zoroark/zoroark.animation.json @@ -212,7 +212,6 @@ } }, "animation.zoroark.cry": { - "loop": true, "animation_length": 1.04167, "bones": { "head": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0571_zoroark/zoroark_hisuian.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0571_zoroark/zoroark_hisuian.animation.json index ec6547fc16..4de59370b7 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0571_zoroark/zoroark_hisuian.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0571_zoroark/zoroark_hisuian.animation.json @@ -1230,7 +1230,6 @@ } }, "animation.zoroark_hisuian.cry": { - "loop": true, "animation_length": 1.0417, "bones": { "head": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0622_golett/golett.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0622_golett/golett.animation.json index 74ace243b0..446dfebaed 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0622_golett/golett.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0622_golett/golett.animation.json @@ -445,6 +445,11 @@ }, "animation.golett.cry": { "animation_length": 1.5, + "sound_effects": { + "0.0417": { + "effect": "pokemon.golett.cry" + } + }, "bones": { "neck": { "rotation": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0623_golurk/golurk.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0623_golurk/golurk.animation.json index df64e583a2..3f14522286 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0623_golurk/golurk.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0623_golurk/golurk.animation.json @@ -782,6 +782,11 @@ }, "animation.golurk.cry": { "animation_length": 1.5, + "sound_effects": { + "0.0417": { + "effect": "pokemon.golurk.cry" + } + }, "bones": { "neck": { "rotation": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0699_aurorus/aurorus.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0699_aurorus/aurorus.animation.json index 46ed350fd0..74065d444a 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0699_aurorus/aurorus.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0699_aurorus/aurorus.animation.json @@ -71,7 +71,7 @@ "tail9": { "rotation": ["12.5-2*math.cos(q.anim_time*90*1-270)*1", 0, "-0.5*math.cos(q.anim_time*90*0.75-270)*1"] }, - "tailten": { + "tail_10": { "rotation": ["44.9746-3*math.cos(q.anim_time*90*1-300)*1", -0.34107, "0.0929-0.5*math.cos(q.anim_time*90*0.75-300)*1"] }, "tail12": { @@ -101,7 +101,7 @@ "head": { "rotation": [5, 0, 0] }, - "taileleven": { + "tail_11": { "rotation": ["32.5-3*math.cos(q.anim_time*90*1-330)*1", 0, "-0.5*math.cos(q.anim_time*90*0.75-330)*1"] }, "head_sail_left1": { @@ -270,7 +270,7 @@ "tail9": { "rotation": ["8.75-2*math.cos(q.anim_time*90*2-270)*1", 0, "-0.5*math.cos(q.anim_time*90*1.25-270)*1"] }, - "tailten": { + "tail_10": { "rotation": ["36.9746-3*math.cos(q.anim_time*90*2-300)*1", -0.34107, "0.0929-0.5*math.cos(q.anim_time*90*1.25-300)*1"] }, "tail12": { @@ -300,7 +300,7 @@ "head": { "rotation": ["2.75+2*math.cos(q.anim_time*90*2-160)*1", 0, 0] }, - "taileleven": { + "tail_11": { "rotation": ["25.25-3*math.cos(q.anim_time*90*2-330)*1", 0, "-0.5*math.cos(q.anim_time*90*1.25-330)*1"] }, "head_sail_left1": { @@ -788,7 +788,7 @@ "tail9": { "rotation": ["12.5-1*math.cos(q.anim_time*90*4-270)*1", "-0.5*math.cos(q.anim_time*90*2-270)*1", "-0.5*math.cos(q.anim_time*90*2-270)*1"] }, - "tailten": { + "tail_10": { "rotation": ["44.9746-2*math.cos(q.anim_time*90*4-300)*1", "-0.5*math.cos(q.anim_time*90*2-300)*1", "0.0929-0.5*math.cos(q.anim_time*90*2-300)*1"] }, "tail12": { @@ -818,7 +818,7 @@ "head": { "rotation": [5, 0, 0] }, - "taileleven": { + "tail_11": { "rotation": ["32.5-3*math.cos(q.anim_time*90*4-330)*1", "-0.5*math.cos(q.anim_time*90*2-330)*1", "-0.5*math.cos(q.anim_time*90*2-330)*1"] }, "head_sail_left1": { @@ -1008,7 +1008,7 @@ "tail9": { "rotation": ["2*math.cos(q.anim_time*90*1-270)*1", -3.15697, 0.19154] }, - "tailten": { + "tail_10": { "rotation": ["29.9746+2*math.cos(q.anim_time*90*1-300)*1", -0.34107, 0.09288] }, "tail12": { @@ -1038,7 +1038,7 @@ "head": { "rotation": [24.2014, -5.73534, 1.95662] }, - "taileleven": { + "tail_11": { "rotation": ["46.75+1*math.cos(q.anim_time*90*1-330)*1", 0, 0] }, "head_sail_left1": { @@ -1659,7 +1659,7 @@ "tail9": { "rotation": [12.5, 0, 0] }, - "tailten": { + "tail_10": { "rotation": [44.97461, -0.34107, 0.09288] }, "tail12": { @@ -1689,7 +1689,7 @@ "head": { "rotation": [5, 0, 0] }, - "taileleven": { + "tail_11": { "rotation": [32.5, 0, 0] }, "head_sail_left1": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0754_lurantis/lurantis.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0754_lurantis/lurantis.animation.json index 83fc140b7e..54b57df327 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0754_lurantis/lurantis.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0754_lurantis/lurantis.animation.json @@ -78,6 +78,9 @@ }, "front_attenna_right": { "scale": 0 + }, + "head": { + "rotation": [10, 0, 0] } } }, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0831_wooloo/wooloo.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0831_wooloo/wooloo.animation.json index 4c4c4b333d..93ba906550 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0831_wooloo/wooloo.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0831_wooloo/wooloo.animation.json @@ -231,7 +231,7 @@ ], "position": [0, "(math.clamp(math.sin(q.anim_time*90*4-110+180)*1,0.5,1)-0.5)*0.7", 0] }, - "wool": { + "wool_shearable": { "position": [0, "0.5+Math.sin((query.anim_time-0.3) * 90 * 8) * 0.3", 0] }, "tail": { @@ -419,10 +419,10 @@ }, "position": { "0.0": [0, 0, 0], - "0.1667": [0, -2, -1], - "0.3333": [0, -4, 0], - "1.6667": [0, -4, 0], - "1.8333": [0, -2, -1], + "0.1667": [0, -1, -1], + "0.3333": [0, -3, 0], + "1.6667": [0, -3, 0], + "1.8333": [0, -1, -1], "2.0": [0, 0, 0] } }, @@ -544,26 +544,28 @@ }, "ear_left": { "rotation": { - "0.0": [0, -10, 0], - "0.2917": [0, -10, -10], - "0.4583": [0, -5, 5], - "0.6667": [0, -10, 0], - "1.6667": [0, -10, 0], - "1.9167": [0, 0, 10], - "2.0417": [0, -15, -5], - "2.1667": [0, -10, 0] + "0.0": [0, 0, 0], + "0.2917": [-5, 10, -10], + "0.4583": [-12.5, 11, -5], + "0.6667": [-14, 12.3, 0], + "1.0": [-15, 11.53, 0], + "1.6667": [-10, 10, 0], + "1.9167": [0, 10, 10], + "2.0417": [0, -5, -5], + "2.1667": [0, 0, 0] } }, "ear_right": { "rotation": { - "0.0": [0, 10, 0], - "0.2917": [0, 10, 10], - "0.4583": [0, 5, -5], - "0.6667": [0, 10, 0], - "1.6667": [0, 10, 0], - "1.9167": [0, 0, -10], - "2.0417": [0, 15, 5], - "2.1667": [0, 10, 0] + "0.0": [0, 0, 0], + "0.2917": [-5, -10, 10], + "0.4583": [-12.5, -11, 5], + "0.6667": [-14, -12.3, 0], + "1.0": [-15, -11.53, 0], + "1.6667": [-10, -10, 0], + "1.9167": [0, -10, -10], + "2.0417": [0, 5, 5], + "2.1667": [0, 0, 0] } }, "neck": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/special/particle_dummy.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/special/particle_dummy.animation.json index 74c4828d28..af430fcb0a 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/special/particle_dummy.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/special/particle_dummy.animation.json @@ -132,11 +132,6 @@ }, "animation.particle_dummy.flamethrower_target": { "animation_length": 2, - "sound_effects": { - "0.0": { - "effect": "effective" - } - }, "particle_effects": { "0.0833": [ { @@ -375,36 +370,6 @@ ] } }, - "animation.particle_dummy.stat_up": { - "animation_length": 2, - "particle_effects": { - "0.0": [ - { - "effect": "stat_up_lines", - "locator": "center" - }, - { - "effect": "stat_up_circles", - "locator": "center" - } - ] - } - }, - "animation.particle_dummy.stat_down": { - "animation_length": 2, - "particle_effects": { - "0.0": [ - { - "effect": "stat_down_lines", - "locator": "center" - }, - { - "effect": "stat_down_circles", - "locator": "center" - } - ] - } - }, "animation.particle_dummy.razor_leaf_actor": { "animation_length": 2.5, "particle_effects": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0235_smeargle/smeargle.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0235_smeargle/smeargle.geo.json new file mode 100644 index 0000000000..45d723522d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0235_smeargle/smeargle.geo.json @@ -0,0 +1,495 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.smeargle", + "texture_width": 128, + "texture_height": 64, + "visible_bounds_width": 8, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "smeargle", + "pivot": [0, 0, 0] + }, + { + "name": "body", + "parent": "smeargle", + "pivot": [0, 6, 0] + }, + { + "name": "torso", + "parent": "body", + "pivot": [0, 6, 0], + "cubes": [ + {"origin": [-3.5, 6, -3], "size": [7, 6, 6], "inflate": 0.01, "uv": [24, 34]} + ] + }, + { + "name": "chest", + "parent": "torso", + "pivot": [0, 12, 3], + "cubes": [ + {"origin": [-3, 12, -3], "size": [6, 5, 6], "uv": [0, 34]}, + {"origin": [-0.5, 14.5, 3.01], "size": [1, 1, 0], "uv": [29, 46]}, + {"origin": [1.25, 14, 3.01], "size": [1, 1, 0], "uv": [29, 47]}, + {"origin": [-2.25, 14, 3.01], "size": [1, 1, 0], "uv": [29, 48], "mirror": true} + ] + }, + { + "name": "arms", + "parent": "chest", + "pivot": [0, 16, 0] + }, + { + "name": "arm_left", + "parent": "arms", + "pivot": [3, 16, 0], + "cubes": [ + {"origin": [2.5, 14, -1], "size": [4, 2, 2], "uv": [0, 45]} + ] + }, + { + "name": "arm_left2", + "parent": "arm_left", + "pivot": [6.5, 16, 1], + "cubes": [ + {"origin": [6.5, 14, -1], "size": [4, 2, 2], "inflate": 0.01, "uv": [0, 49]} + ] + }, + { + "name": "hand_left", + "parent": "arm_left2", + "pivot": [10.5, 16, 0], + "cubes": [ + {"origin": [10.5, 14, -1.5], "size": [2, 2, 3], "inflate": 0.02, "uv": [22, 46]} + ] + }, + { + "name": "thumb_left", + "parent": "hand_left", + "pivot": [11, 14.5, -1.5], + "cubes": [ + {"origin": [11, 13.5, -2], "size": [2, 2, 1], "inflate": 0.01, "uv": [0, 61]} + ] + }, + { + "name": "thumb_left2", + "parent": "thumb_left", + "pivot": [13, 15.5, -2], + "cubes": [ + {"origin": [13, 13.5, -2], "size": [2, 2, 1], "uv": [12, 61]} + ] + }, + { + "name": "finger_front_left", + "parent": "hand_left", + "pivot": [12.5, 16, -0.5], + "cubes": [ + {"origin": [12.5, 14, -1.5], "size": [2, 2, 2], "inflate": 0.01, "uv": [12, 53]} + ] + }, + { + "name": "finger_front_left2", + "parent": "finger_front_left", + "pivot": [14.5, 16, -0.5], + "cubes": [ + {"origin": [14.5, 14, -1.5], "size": [2, 2, 2], "uv": [10, 57]} + ] + }, + { + "name": "finger_back_left", + "parent": "hand_left", + "pivot": [12.5, 16, 1], + "cubes": [ + {"origin": [12.5, 14, 0.5], "size": [2, 2, 1], "inflate": 0.01, "uv": [0, 53]} + ] + }, + { + "name": "finger_back_left2", + "parent": "finger_back_left", + "pivot": [14.5, 16, 1], + "cubes": [ + {"origin": [14.5, 14, 0.5], "size": [2, 2, 1], "uv": [0, 56]} + ] + }, + { + "name": "arm_right", + "parent": "arms", + "pivot": [-3, 16, 0], + "cubes": [ + {"origin": [-6.5, 14, -1], "size": [4, 2, 2], "uv": [12, 45], "mirror": true} + ] + }, + { + "name": "arm_right2", + "parent": "arm_right", + "pivot": [-6.5, 16, 1], + "cubes": [ + {"origin": [-10.5, 14, -1], "size": [4, 2, 2], "inflate": 0.01, "uv": [12, 49], "mirror": true} + ] + }, + { + "name": "hand_right", + "parent": "arm_right2", + "pivot": [-10.5, 16, 0], + "cubes": [ + {"origin": [-12.5, 14, -1.5], "size": [2, 2, 3], "inflate": 0.02, "uv": [32, 46], "mirror": true} + ] + }, + { + "name": "thumb_right", + "parent": "hand_right", + "pivot": [-11, 14.5, -1.5], + "cubes": [ + {"origin": [-13, 13.5, -2], "size": [2, 2, 1], "inflate": 0.01, "uv": [6, 61], "mirror": true} + ] + }, + { + "name": "thumb_right2", + "parent": "thumb_right", + "pivot": [-13, 15.5, -2], + "cubes": [ + {"origin": [-15, 13.5, -2], "size": [2, 2, 1], "uv": [18, 61], "mirror": true} + ] + }, + { + "name": "finger_front_right", + "parent": "hand_right", + "pivot": [-12.5, 16, -0.5], + "cubes": [ + {"origin": [-14.5, 14, -1.5], "size": [2, 2, 2], "inflate": 0.01, "uv": [20, 53], "mirror": true} + ] + }, + { + "name": "finger_front_right2", + "parent": "finger_front_right", + "pivot": [-14.5, 16, -0.5], + "cubes": [ + {"origin": [-16.5, 14, -1.5], "size": [2, 2, 2], "uv": [18, 57], "mirror": true} + ] + }, + { + "name": "finger_back_right", + "parent": "hand_right", + "pivot": [-12.5, 16, 1], + "cubes": [ + {"origin": [-14.5, 14, 0.5], "size": [2, 2, 1], "inflate": 0.01, "uv": [6, 53], "mirror": true} + ] + }, + { + "name": "finger_back_right2", + "parent": "finger_back_right", + "pivot": [-14.5, 16, 1], + "cubes": [ + {"origin": [-16.5, 14, 0.5], "size": [2, 2, 1], "uv": [6, 56], "mirror": true} + ] + }, + { + "name": "neck", + "parent": "chest", + "pivot": [0, 16, 0], + "cubes": [ + {"origin": [-3.5, 16, -3.5], "size": [7, 3, 7], "uv": [33, 12]} + ] + }, + { + "name": "head", + "parent": "neck", + "pivot": [0, 18, 0], + "cubes": [ + {"origin": [-4, 18, -8], "size": [8, 7, 12], "uv": [0, 0]}, + {"origin": [0.5, 21, -8.01], "size": [1, 1, 0], "pivot": [1, 21.5, -8.01], "rotation": [0, 0, 15], "uv": [0, 10]}, + {"origin": [-1.5, 21, -8.01], "size": [1, 1, 0], "pivot": [-1, 21.5, -8.01], "rotation": [0, 0, -15], "uv": [0, 9], "mirror": true} + ] + }, + { + "name": "eyes", + "parent": "head", + "pivot": [0, 23, -3] + }, + { + "name": "eye_left", + "parent": "eyes", + "pivot": [4.02, 23.5, -4], + "cubes": [ + {"origin": [4.02, 21.5, -6], "size": [0, 4, 4], "uv": [0, -4]}, + {"origin": [4.01, 20.5, -7], "size": [0, 5, 6], "uv": [0, -2]} + ] + }, + { + "name": "pupil_left", + "parent": "eye_left", + "pivot": [4.03, 23.5, -5], + "cubes": [ + {"origin": [4.03, 22.5, -5.5], "size": [0, 2, 1], "uv": [8, -1]} + ] + }, + { + "name": "eyelid_left", + "parent": "eye_left", + "pivot": [3.43, 23.5, -4], + "cubes": [ + {"origin": [2.93, 21.5, -6], "size": [1, 4, 4], "inflate": 0.01, "uv": [68, 23]} + ] + }, + { + "name": "eye_right", + "parent": "eyes", + "pivot": [-4.02, 23.5, -4], + "cubes": [ + {"origin": [-4.02, 21.5, -6], "size": [0, 4, 4], "uv": [0, 15], "mirror": true}, + {"origin": [-4.01, 20.5, -7], "size": [0, 5, 6], "uv": [18, 28], "mirror": true} + ] + }, + { + "name": "pupil_right", + "parent": "eye_right", + "pivot": [-4.03, 23.5, -5], + "cubes": [ + {"origin": [-4.03, 22.5, -5.5], "size": [0, 2, 1], "uv": [8, 18], "mirror": true} + ] + }, + { + "name": "eyelid_right", + "parent": "eye_right", + "pivot": [-3.43, 23.5, -4], + "cubes": [ + {"origin": [-3.93, 21.5, -6], "size": [1, 4, 4], "inflate": 0.01, "uv": [78, 19], "mirror": true} + ] + }, + { + "name": "mouth", + "parent": "head", + "pivot": [0, 17.99, -4.5] + }, + { + "name": "mouth_closed", + "parent": "mouth", + "pivot": [0, 17.99, -4.5], + "cubes": [ + {"origin": [-2, 17.99, -5], "size": [4, 0, 1], "uv": [-1, 11]} + ] + }, + { + "name": "mouth_open", + "parent": "mouth", + "pivot": [0, 18.09, -5], + "cubes": [ + {"origin": [-2, 18.09, -6], "size": [4, 0, 2], "uv": [-2, 23]} + ] + }, + { + "name": "tongue", + "parent": "mouth", + "pivot": [0, 18, -4], + "rotation": [-27.5, 0, 0], + "cubes": [ + {"origin": [-1.5, 16, -5], "size": [3, 2, 1], "uv": [50, 40]} + ] + }, + { + "name": "ear_left", + "parent": "head", + "pivot": [4, 25, -1.5], + "rotation": [5, 0, -37.5], + "cubes": [ + {"origin": [2, 18, -1.5], "size": [2, 7, 5], "uv": [28, 0]} + ] + }, + { + "name": "ear_right", + "parent": "head", + "pivot": [-4, 25, -1.5], + "rotation": [5, 0, 37.5], + "cubes": [ + {"origin": [-4, 18, -1.5], "size": [2, 7, 5], "uv": [42, 0], "mirror": true} + ] + }, + { + "name": "hat", + "parent": "head", + "pivot": [0, 24.5, -0.75], + "rotation": [-5, 0, 0], + "cubes": [ + {"origin": [-5, 24.5, -6.25], "size": [10, 4, 11], "uv": [0, 19]}, + {"origin": [-1, 28, -1.25], "size": [2, 3, 2], "uv": [3, 25]} + ] + }, + { + "name": "tail", + "parent": "torso", + "pivot": [0, 7.5, 3], + "cubes": [ + {"origin": [-1.1, 6.5, 2], "size": [2, 2, 7], "inflate": 0.01, "uv": [54, 10]} + ] + }, + { + "name": "tail2", + "parent": "tail", + "pivot": [0, 7.5, 8.5], + "cubes": [ + {"origin": [-1.1, 6.5, 8.5], "size": [2, 2, 6], "uv": [31, 22]} + ] + }, + { + "name": "tail3", + "parent": "tail2", + "pivot": [0, 7.5, 14], + "cubes": [ + {"origin": [-1.1, 6.5, 14], "size": [2, 2, 6], "inflate": 0.01, "uv": [42, 24]} + ] + }, + { + "name": "tail4", + "parent": "tail3", + "pivot": [0, 7.5, 19.5], + "cubes": [ + {"origin": [-1.1, 6.5, 19.5], "size": [2, 2, 6], "uv": [44, 32]} + ] + }, + { + "name": "tail5", + "parent": "tail4", + "pivot": [0, 7.5, 25], + "cubes": [ + {"origin": [-1.1, 6.5, 25], "size": [2, 2, 6], "inflate": 0.01, "uv": [52, 22]} + ] + }, + { + "name": "tail6", + "parent": "tail5", + "pivot": [0, 7.5, 30.5], + "cubes": [ + {"origin": [-1.1, 6.5, 30.5], "size": [2, 2, 6], "uv": [52, 40]} + ] + }, + { + "name": "tail7", + "parent": "tail6", + "pivot": [0, 7.5, 36], + "cubes": [ + {"origin": [-1.1, 6.5, 36], "size": [2, 2, 6], "inflate": 0.01, "uv": [50, 48]} + ] + }, + { + "name": "tail_end", + "parent": "tail7", + "pivot": [0, 7.5, 41], + "cubes": [ + {"origin": [-3, 4.5, 41], "size": [6, 6, 6], "uv": [70, 4]} + ] + }, + { + "name": "tail_end2", + "parent": "tail_end", + "pivot": [0, 7.5, 47], + "cubes": [ + {"origin": [-2.5, 5, 45.5], "size": [5, 5, 5], "uv": [56, 0]} + ] + }, + { + "name": "tail_end_fur", + "parent": "tail_end2", + "pivot": [0, 7.5, 50.5], + "cubes": [ + {"origin": [0, 4.5, 50], "size": [0, 6, 4], "pivot": [0, 7.5, 52], "rotation": [0, 0, -45], "uv": [62, 15]}, + {"origin": [-3, 7.5, 50], "size": [6, 0, 4], "pivot": [0, 7.5, 52], "rotation": [0, 0, -45], "uv": [66, 19]} + ] + }, + { + "name": "tail_end_fur_left", + "parent": "tail_end2", + "pivot": [2, 7.5, 50.5], + "rotation": [0, 12.5, 0], + "cubes": [ + {"origin": [2, 6.5, 50], "size": [0, 2, 3], "uv": [72, 13]} + ] + }, + { + "name": "tail_end_fur_right", + "parent": "tail_end2", + "pivot": [-2, 7.5, 50.5], + "rotation": [0, -12.5, 0], + "cubes": [ + {"origin": [-2, 6.5, 50], "size": [0, 2, 3], "uv": [78, 13], "mirror": true} + ] + }, + { + "name": "legs", + "parent": "body", + "pivot": [0, 5, 0] + }, + { + "name": "leg_left", + "parent": "legs", + "pivot": [2, 6, 0], + "cubes": [ + {"origin": [1, 4, -1], "size": [2, 3, 2], "uv": [28, 51]} + ] + }, + { + "name": "leg_left2", + "parent": "leg_left", + "pivot": [2, 4, -1], + "cubes": [ + {"origin": [1, 1, -1], "size": [2, 3, 2], "inflate": 0.01, "uv": [26, 56]} + ] + }, + { + "name": "foot_left", + "parent": "leg_left2", + "pivot": [2, 2.1, 0], + "cubes": [ + {"origin": [0.5, 0.1, -2.5], "size": [3, 2, 4], "uv": [42, 46]}, + {"origin": [1, 0.09, -1], "size": [2, 0, 2], "uv": [50, 48]} + ] + }, + { + "name": "foot_left2", + "parent": "foot_left", + "pivot": [2, 0.1, -2.5], + "cubes": [ + {"origin": [0.5, 0.1, -5.5], "size": [3, 2, 3], "uv": [39, 58]} + ] + }, + { + "name": "leg_right", + "parent": "legs", + "pivot": [-2, 6, 0], + "cubes": [ + {"origin": [-3, 4, -1], "size": [2, 3, 2], "uv": [36, 51], "mirror": true} + ] + }, + { + "name": "leg_right2", + "parent": "leg_right", + "pivot": [-2, 4, -1], + "cubes": [ + {"origin": [-3, 1, -1], "size": [2, 3, 2], "inflate": 0.01, "uv": [34, 56], "mirror": true} + ] + }, + { + "name": "foot_right", + "parent": "leg_right2", + "pivot": [-2, 2.1, 0], + "cubes": [ + {"origin": [-3.5, 0.1, -2.5], "size": [3, 2, 4], "uv": [40, 52], "mirror": true}, + {"origin": [-3, 0.09, -1], "size": [2, 0, 2], "uv": [50, 52], "mirror": true} + ] + }, + { + "name": "foot_right2", + "parent": "foot_right", + "pivot": [-2, 0.1, -2.5], + "cubes": [ + {"origin": [-3.5, 0.1, -5.5], "size": [3, 2, 3], "uv": [51, 58], "mirror": true} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0429_mismagius/mismagius.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0429_mismagius/mismagius.geo.json index 7de64b958a..4f6ff15645 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0429_mismagius/mismagius.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0429_mismagius/mismagius.geo.json @@ -21,9 +21,298 @@ "pivot": [0, 0, 0] }, { - "name": "head", + "name": "neck", "parent": "body", - "pivot": [0, 0, 1], + "pivot": [0, 18, 0.5], + "cubes": [ + {"origin": [-3, 21, -3], "size": [6, 3, 6], "uv": [74, 12]}, + {"origin": [-2, 18, -1], "size": [4, 3, 3], "uv": [66, 0]} + ] + }, + { + "name": "dress", + "parent": "neck", + "pivot": [0, 18, -1], + "cubes": [ + {"origin": [-2.5, 17, -1], "size": [5, 1, 4], "inflate": 0.01, "uv": [60, 42]} + ] + }, + { + "name": "gems", + "parent": "dress", + "pivot": [0, 16.5, -1.5] + }, + { + "name": "gem_middle", + "parent": "gems", + "pivot": [0, 16.3, -1.5], + "cubes": [ + {"origin": [-1, 14.3, -2], "size": [2, 4, 1], "uv": [98, 17]} + ] + }, + { + "name": "gem_right", + "parent": "gems", + "pivot": [-2, 16.7, -1], + "cubes": [ + {"origin": [-2.5, 15.7, -1.5], "size": [1, 2, 1], "uv": [18, 16]} + ] + }, + { + "name": "gem_left", + "parent": "gems", + "pivot": [2, 16.7, -1], + "cubes": [ + {"origin": [1.5, 15.7, -1.5], "size": [1, 2, 1], "uv": [0, 0]} + ] + }, + { + "name": "dress_front", + "parent": "dress", + "pivot": [0, 17, -1] + }, + { + "name": "arm_right", + "parent": "dress_front", + "pivot": [-2.7, 14, -0.99], + "cubes": [ + {"origin": [-5.2, 14, -4.99], "size": [3, 0, 4], "uv": [66, 6]} + ] + }, + { + "name": "arm_right2", + "parent": "arm_right", + "pivot": [-2.2, 14, -4.99], + "cubes": [ + {"origin": [-6.2, 14, -9.99], "size": [4, 0, 5], "inflate": 0.01, "uv": [47, 42]} + ] + }, + { + "name": "arm_right3", + "parent": "arm_right2", + "pivot": [-2.2, 14, -9.99], + "cubes": [ + {"origin": [-7.2, 14, -14.99], "size": [6, 0, 5], "inflate": 0.02, "uv": [75, 0]} + ] + }, + { + "name": "arm_right4", + "parent": "arm_right3", + "pivot": [-1.2, 14, -14.99], + "cubes": [ + {"origin": [-4.2, 14, -19.99], "size": [3, 0, 5], "uv": [91, 5]} + ] + }, + { + "name": "arm_left", + "parent": "dress_front", + "pivot": [2.7, 14, -0.99], + "cubes": [ + {"origin": [2.2, 14, -4.99], "size": [3, 0, 4], "uv": [62, 47]} + ] + }, + { + "name": "arm_left2", + "parent": "arm_left", + "pivot": [2.2, 14, -4.99], + "cubes": [ + {"origin": [2.2, 14, -9.99], "size": [4, 0, 5], "inflate": 0.01, "uv": [46, 25]} + ] + }, + { + "name": "arm_left3", + "parent": "arm_left2", + "pivot": [2.2, 14, -9.99], + "cubes": [ + {"origin": [1.2, 14, -14.99], "size": [6, 0, 5], "inflate": 0.02, "uv": [87, 0]} + ] + }, + { + "name": "arm_left4", + "parent": "arm_left3", + "pivot": [1.2, 14, -14.99], + "cubes": [ + {"origin": [1.2, 14, -19.99], "size": [3, 0, 5], "uv": [85, 5]} + ] + }, + { + "name": "dress_front_middle", + "parent": "dress_front", + "pivot": [0, 2, 0], + "cubes": [ + {"origin": [-8.5, 4.3, -0.99], "size": [17, 13, 0], "uv": [0, 38]}, + {"origin": [-5.45, 12.89, -0.99], "size": [6, 0, 11], "uv": [105, 0]}, + {"origin": [-0.55, 12.9, -0.99], "size": [6, 0, 11], "uv": [93, 0]} + ] + }, + { + "name": "dress_front_right", + "parent": "dress_front", + "pivot": [-2.5, 17, -1], + "rotation": [0, 0, 36.2], + "cubes": [ + {"origin": [-2.51, 4, -1], "size": [2, 14, 0], "uv": [124, 11]} + ] + }, + { + "name": "dress_front_left", + "parent": "dress_front", + "pivot": [2.5, 17, -1], + "rotation": [0, 0, -36.2], + "cubes": [ + {"origin": [0.51, 4, -1], "size": [2, 14, 0], "uv": [120, 11]} + ] + }, + { + "name": "dress_right", + "parent": "dress", + "pivot": [-2.5, 17, 0], + "rotation": [0, 0, 36.2] + }, + { + "name": "dress_right_front", + "parent": "dress_right", + "pivot": [-0.5, -1, 0], + "cubes": [ + {"origin": [-2.51, 4, -1], "size": [0, 14, 2], "uv": [116, 9]} + ] + }, + { + "name": "dress_right_bottom", + "parent": "dress_right_front", + "pivot": [-2.51, 4, 1], + "rotation": [27, 0, 0], + "cubes": [ + {"origin": [-2.495, 4, 1], "size": [0, 2, 11], "uv": [22, 46]} + ] + }, + { + "name": "dress_right_flap", + "parent": "dress_right_bottom", + "pivot": [-2.51, 4, 6], + "cubes": [ + {"origin": [-2.495, 2, 1], "size": [0, 2, 11], "uv": [0, 46]} + ] + }, + { + "name": "dress_right_middle", + "parent": "dress_right", + "pivot": [-0.5, -1, 1.4], + "cubes": [ + {"origin": [-2.49, 6, 0.4], "size": [0, 12, 9], "uv": [34, 33]} + ] + }, + { + "name": "dress_right_back", + "parent": "dress_right", + "pivot": [-2.5, 17, 3], + "rotation": [54.5, 0, 0], + "cubes": [ + {"origin": [-2.5, 6, 1], "size": [0, 13, 2], "uv": [66, 4]} + ] + }, + { + "name": "dress_right2", + "parent": "dress_right_back", + "pivot": [-2.5, 14, 3] + }, + { + "name": "dress_left", + "parent": "dress", + "pivot": [2.5, 17, 0], + "rotation": [0, 0, -36.2] + }, + { + "name": "dress_left_front", + "parent": "dress_left", + "pivot": [0.5, -1, 0], + "cubes": [ + {"origin": [2.51, 4, -1], "size": [0, 14, 2], "uv": [18, 0]} + ] + }, + { + "name": "dress_left_bottom", + "parent": "dress_left_front", + "pivot": [2.51, 4, 1], + "rotation": [27, 0, 0], + "cubes": [ + {"origin": [2.495, 4, 1], "size": [0, 2, 11], "uv": [29, 16]} + ] + }, + { + "name": "dress_left_flap", + "parent": "dress_left_bottom", + "pivot": [2.51, 4, 6], + "cubes": [ + {"origin": [2.495, 2, 1], "size": [0, 2, 11], "uv": [29, 14]} + ] + }, + { + "name": "dress_left_middle", + "parent": "dress_left", + "pivot": [0.5, -1, 1.4], + "cubes": [ + {"origin": [2.49, 6, 0.4], "size": [0, 12, 9], "uv": [0, 1]} + ] + }, + { + "name": "dress_left_back", + "parent": "dress_left", + "pivot": [2.5, 17, 3], + "rotation": [54.5, 0, 0], + "cubes": [ + {"origin": [2.5, 6, 1], "size": [0, 13, 2], "uv": [112, 9]} + ] + }, + { + "name": "dress_left2", + "parent": "dress_left_back", + "pivot": [2.5, 14, 3] + }, + { + "name": "dress_back", + "parent": "dress", + "pivot": [2, 17, 3], + "rotation": [60, 0, 0] + }, + { + "name": "dress_back_middle", + "parent": "dress_back", + "pivot": [2, 17, 3], + "cubes": [ + {"origin": [-4.5, 6, 2.99], "size": [9, 11, 0], "uv": [110, 25]} + ] + }, + { + "name": "dress_back2", + "parent": "dress_back_middle", + "pivot": [0, 6, 3], + "cubes": [ + {"origin": [-4.5, 4, 2.99], "size": [9, 2, 0], "uv": [0, 5]} + ] + }, + { + "name": "dress_back_left", + "parent": "dress_back", + "pivot": [2.5, 17, 3], + "rotation": [0, 0, -20.1], + "cubes": [ + {"origin": [0.5, 6, 3], "size": [2, 12, 0], "uv": [70, 10]} + ] + }, + { + "name": "dress_back_right", + "parent": "dress_back", + "pivot": [-2.5, 17, 3], + "rotation": [0, 0, 20.1], + "cubes": [ + {"origin": [-2.5, 6, 3], "size": [2, 12, 0], "uv": [108, 11]} + ] + }, + { + "name": "head", + "parent": "neck", + "pivot": [0, 23, 0], "cubes": [ {"origin": [-4.5, 23, -4], "size": [9, 4, 8], "uv": [34, 30]} ] @@ -213,295 +502,6 @@ {"origin": [0, 36.5, -4], "size": [0, 6, 7], "pivot": [0, 39.5, -0.5], "rotation": [0, -45, 0], "uv": [80, 18]}, {"origin": [0, 35.5, -0.3], "size": [0, 6, 5], "uv": [80, 0]} ] - }, - { - "name": "neck", - "parent": "head", - "pivot": [0, 23, 0], - "cubes": [ - {"origin": [-3, 21, -2], "size": [6, 3, 6], "uv": [74, 12]}, - {"origin": [-2, 18, 0], "size": [4, 3, 3], "uv": [66, 0]} - ] - }, - { - "name": "dress", - "parent": "neck", - "pivot": [0, 18, 0], - "cubes": [ - {"origin": [-2.5, 17, 0], "size": [5, 1, 4], "inflate": 0.01, "uv": [60, 42]} - ] - }, - { - "name": "gems", - "parent": "dress", - "pivot": [0, 16.5, -0.5] - }, - { - "name": "gem_middle", - "parent": "gems", - "pivot": [0, 16.3, -0.5], - "cubes": [ - {"origin": [-1, 14.3, -1], "size": [2, 4, 1], "uv": [98, 17]} - ] - }, - { - "name": "gem_right", - "parent": "gems", - "pivot": [-2, 16.7, 0], - "cubes": [ - {"origin": [-2.5, 15.7, -0.5], "size": [1, 2, 1], "uv": [18, 16]} - ] - }, - { - "name": "gem_left", - "parent": "gems", - "pivot": [2, 16.7, 0], - "cubes": [ - {"origin": [1.5, 15.7, -0.5], "size": [1, 2, 1], "uv": [0, 0]} - ] - }, - { - "name": "dress_front", - "parent": "dress", - "pivot": [0, 17, 0] - }, - { - "name": "arm_right", - "parent": "dress_front", - "pivot": [-2.7, 14, 0.01], - "cubes": [ - {"origin": [-5.2, 14, -3.99], "size": [3, 0, 4], "uv": [66, 6]} - ] - }, - { - "name": "arm_right2", - "parent": "arm_right", - "pivot": [-2.2, 14, -3.99], - "cubes": [ - {"origin": [-6.2, 14, -8.99], "size": [4, 0, 5], "inflate": 0.01, "uv": [47, 42]} - ] - }, - { - "name": "arm_right3", - "parent": "arm_right2", - "pivot": [-2.2, 14, -8.99], - "cubes": [ - {"origin": [-7.2, 14, -13.99], "size": [6, 0, 5], "inflate": 0.02, "uv": [75, 0]} - ] - }, - { - "name": "arm_right4", - "parent": "arm_right3", - "pivot": [-1.2, 14, -13.99], - "cubes": [ - {"origin": [-4.2, 14, -18.99], "size": [3, 0, 5], "uv": [91, 5]} - ] - }, - { - "name": "arm_left", - "parent": "dress_front", - "pivot": [2.7, 14, 0.01], - "cubes": [ - {"origin": [2.2, 14, -3.99], "size": [3, 0, 4], "uv": [62, 47]} - ] - }, - { - "name": "arm_left2", - "parent": "arm_left", - "pivot": [2.2, 14, -3.99], - "cubes": [ - {"origin": [2.2, 14, -8.99], "size": [4, 0, 5], "inflate": 0.01, "uv": [46, 25]} - ] - }, - { - "name": "arm_left3", - "parent": "arm_left2", - "pivot": [2.2, 14, -8.99], - "cubes": [ - {"origin": [1.2, 14, -13.99], "size": [6, 0, 5], "inflate": 0.02, "uv": [87, 0]} - ] - }, - { - "name": "arm_left4", - "parent": "arm_left3", - "pivot": [1.2, 14, -13.99], - "cubes": [ - {"origin": [1.2, 14, -18.99], "size": [3, 0, 5], "uv": [85, 5]} - ] - }, - { - "name": "dress_front_middle", - "parent": "dress_front", - "pivot": [0, 2, 1], - "cubes": [ - {"origin": [-8.5, 4.3, 0.01], "size": [17, 13, 0], "uv": [0, 38]}, - {"origin": [-5.45, 12.89, 0.01], "size": [6, 0, 11], "uv": [105, 0]}, - {"origin": [-0.55, 12.9, 0.01], "size": [6, 0, 11], "uv": [93, 0]} - ] - }, - { - "name": "dress_front_right", - "parent": "dress_front", - "pivot": [-2.5, 17, 0], - "rotation": [0, 0, 36.2], - "cubes": [ - {"origin": [-2.51, 4, 0], "size": [2, 14, 0], "uv": [124, 11]} - ] - }, - { - "name": "dress_front_left", - "parent": "dress_front", - "pivot": [2.5, 17, 0], - "rotation": [0, 0, -36.2], - "cubes": [ - {"origin": [0.51, 4, 0], "size": [2, 14, 0], "uv": [120, 11]} - ] - }, - { - "name": "dress_right", - "parent": "dress", - "pivot": [-2.5, 17, 1], - "rotation": [0, 0, 36.2] - }, - { - "name": "dress_right_front", - "parent": "dress_right", - "pivot": [-0.5, -1, 1], - "cubes": [ - {"origin": [-2.51, 4, 0], "size": [0, 14, 2], "uv": [116, 9]} - ] - }, - { - "name": "dress_right_bottom", - "parent": "dress_right_front", - "pivot": [-2.51, 4, 2], - "rotation": [27, 0, 0], - "cubes": [ - {"origin": [-2.495, 4, 2], "size": [0, 2, 11], "uv": [22, 46]} - ] - }, - { - "name": "dress_right_flap", - "parent": "dress_right_bottom", - "pivot": [-2.51, 4, 7], - "cubes": [ - {"origin": [-2.495, 2, 2], "size": [0, 2, 11], "uv": [0, 46]} - ] - }, - { - "name": "dress_right_middle", - "parent": "dress_right", - "pivot": [-0.5, -1, 2.4], - "cubes": [ - {"origin": [-2.49, 6, 1.4], "size": [0, 12, 9], "uv": [34, 33]} - ] - }, - { - "name": "dress_right_back", - "parent": "dress_right", - "pivot": [-2.5, 17, 4], - "rotation": [54.5, 0, 0], - "cubes": [ - {"origin": [-2.5, 6, 2], "size": [0, 13, 2], "uv": [66, 4]} - ] - }, - { - "name": "dress_right2", - "parent": "dress_right_back", - "pivot": [-2.5, 14, 4] - }, - { - "name": "dress_left", - "parent": "dress", - "pivot": [2.5, 17, 1], - "rotation": [0, 0, -36.2] - }, - { - "name": "dress_left_front", - "parent": "dress_left", - "pivot": [0.5, -1, 1], - "cubes": [ - {"origin": [2.51, 4, 0], "size": [0, 14, 2], "uv": [18, 0]} - ] - }, - { - "name": "dress_left_bottom", - "parent": "dress_left_front", - "pivot": [2.51, 4, 2], - "rotation": [27, 0, 0], - "cubes": [ - {"origin": [2.495, 4, 2], "size": [0, 2, 11], "uv": [29, 16]} - ] - }, - { - "name": "dress_left_flap", - "parent": "dress_left_bottom", - "pivot": [2.51, 4, 7], - "cubes": [ - {"origin": [2.495, 2, 2], "size": [0, 2, 11], "uv": [29, 14]} - ] - }, - { - "name": "dress_left_middle", - "parent": "dress_left", - "pivot": [0.5, -1, 2.4], - "cubes": [ - {"origin": [2.49, 6, 1.4], "size": [0, 12, 9], "uv": [0, 1]} - ] - }, - { - "name": "dress_left_back", - "parent": "dress_left", - "pivot": [2.5, 17, 4], - "rotation": [54.5, 0, 0], - "cubes": [ - {"origin": [2.5, 6, 2], "size": [0, 13, 2], "uv": [112, 9]} - ] - }, - { - "name": "dress_left2", - "parent": "dress_left_back", - "pivot": [2.5, 14, 4] - }, - { - "name": "dress_back", - "parent": "dress", - "pivot": [2, 17, 4], - "rotation": [60, 0, 0] - }, - { - "name": "dress_back_middle", - "parent": "dress_back", - "pivot": [2, 17, 4], - "cubes": [ - {"origin": [-4.5, 6, 3.99], "size": [9, 11, 0], "uv": [110, 25]} - ] - }, - { - "name": "dress_back2", - "parent": "dress_back_middle", - "pivot": [0, 6, 4], - "cubes": [ - {"origin": [-4.5, 4, 3.99], "size": [9, 2, 0], "uv": [0, 5]} - ] - }, - { - "name": "dress_back_left", - "parent": "dress_back", - "pivot": [2.5, 17, 4], - "rotation": [0, 0, -20.1], - "cubes": [ - {"origin": [0.5, 6, 4], "size": [2, 12, 0], "uv": [70, 10]} - ] - }, - { - "name": "dress_back_right", - "parent": "dress_back", - "pivot": [-2.5, 17, 4], - "rotation": [0, 0, 20.1], - "cubes": [ - {"origin": [-2.5, 6, 4], "size": [2, 12, 0], "uv": [108, 11]} - ] } ] } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0605_elgyem/elgyem.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0605_elgyem/elgyem.geo.json index 7565c35973..2f904f96f8 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0605_elgyem/elgyem.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0605_elgyem/elgyem.geo.json @@ -6,7 +6,7 @@ "identifier": "geometry.elgyem", "texture_width": 64, "texture_height": 32, - "visible_bounds_width": 2, + "visible_bounds_width": 3, "visible_bounds_height": 2.5, "visible_bounds_offset": [0, 0.75, 0] }, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0699_aurorus/aurorus.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0699_aurorus/aurorus.geo.json index a9ec93040b..b3f78d8f21 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0699_aurorus/aurorus.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0699_aurorus/aurorus.geo.json @@ -445,7 +445,7 @@ ] }, { - "name": "tailten", + "name": "tail_10", "parent": "tail9", "pivot": [0, 21.5, 66], "cubes": [ @@ -453,8 +453,8 @@ ] }, { - "name": "taileleven", - "parent": "tailten", + "name": "tail_11", + "parent": "tail_10", "pivot": [0, 21.5, 69], "cubes": [ {"origin": [-1, 21.5, 69], "size": [2, 2, 4], "uv": [0, 7]} @@ -462,7 +462,7 @@ }, { "name": "tail12", - "parent": "taileleven", + "parent": "tail_11", "pivot": [0, 21.5, 73], "cubes": [ {"origin": [-1, 21.5, 73], "size": [2, 2, 4], "inflate": 0.01, "uv": [53, 9]} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0831_wooloo/wooloo.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0831_wooloo/wooloo.geo.json index ea27c6738d..cb14fbd289 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0831_wooloo/wooloo.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0831_wooloo/wooloo.geo.json @@ -23,16 +23,16 @@ { "name": "torso", "parent": "body", - "pivot": [0, 8.5, 3.75], + "pivot": [0, 7.5, 3.75], "cubes": [ - {"origin": [-3, 6.75, 0], "size": [6, 6, 6], "uv": [24, 26]}, - {"origin": [-3, 6.75, -5], "size": [6, 6, 6], "inflate": 0.01, "uv": [0, 26]} + {"origin": [-3, 5.75, 0], "size": [6, 6, 6], "uv": [24, 26]}, + {"origin": [-3, 5.75, -5], "size": [6, 6, 6], "inflate": 0.01, "uv": [0, 26]} ] }, { - "name": "wool", + "name": "wool_shearable", "parent": "torso", - "pivot": [6.5, 2.75, -5], + "pivot": [6.5, 1.75, -5], "cubes": [ {"origin": [-6.5, 2.75, -5.5], "size": [13, 13, 13], "inflate": 0.02, "uv": [0, 0]} ] @@ -58,177 +58,201 @@ { "name": "neck", "parent": "torso", - "pivot": [0, 8.65, -1.5], + "pivot": [0, 7.65, -1.5], "cubes": [ - {"origin": [-2, 8.65, -5.5], "size": [4, 4, 4], "inflate": 0.01, "uv": [8, 56]} + {"origin": [-2, 7.65, -5.5], "size": [4, 4, 4], "inflate": 0.01, "uv": [8, 56]} ] }, { "name": "head", "parent": "torso", - "pivot": [0.1, 10.75, -5], + "pivot": [0.1, 9.75, -5], "cubes": [ - {"origin": [-2.5, 8.75, -10.5], "size": [5, 4, 6], "uv": [0, 39]}, - {"origin": [-1, 10, -10.5], "size": [2, 1, 0], "inflate": 0.01, "uv": [0, 30]}, - {"origin": [-1.9, 12.75, -8.25], "size": [1, 2, 1], "pivot": [-1.9, 12.75, -7.25], "rotation": [0, -5, -5], "uv": [39, 0]}, - {"origin": [0.9, 12.75, -8.25], "size": [1, 2, 1], "pivot": [1.9, 12.75, -7.25], "rotation": [0, 5, 5], "uv": [9, 0]} + {"origin": [-2.5, 7.75, -10.5], "size": [5, 4, 6], "uv": [0, 39]}, + {"origin": [-1, 9, -10.5], "size": [2, 1, 0], "inflate": 0.01, "uv": [0, 30]} + ] + }, + { + "name": "horn_right", + "parent": "head", + "pivot": [-2, 12.75, -7.75], + "rotation": [-15, 0, -5], + "cubes": [ + {"origin": [-2.5, 11.75, -8.25], "size": [1, 2, 1], "pivot": [-2, 12.75, -7.75], "rotation": [0, 47.5, 0], "uv": [39, 0]} + ] + }, + { + "name": "horn_left", + "parent": "head", + "pivot": [2, 12.75, -7.75], + "rotation": [-15, 0, 5], + "cubes": [ + {"origin": [1.5, 11.75, -8.25], "size": [1, 2, 1], "pivot": [2, 12.75, -7.75], "rotation": [0, -47.5, 0], "uv": [9, 0]} ] }, { "name": "eyes", "parent": "head", - "pivot": [-0.15, 10.75, -9] + "pivot": [-0.15, 9.75, -9] }, { "name": "eye_right", "parent": "eyes", - "pivot": [-3.6, 10, -8.5], + "pivot": [-3.6, 9, -8.5], "cubes": [ - {"origin": [-2.51, 9.75, -9.5], "size": [0, 2, 1], "uv": [18, 25], "mirror": true}, - {"origin": [-2.401, 9.75, -9.5], "size": [0, 2, 1], "inflate": 0.1, "uv": [0, 0], "mirror": true}, - {"origin": [-2.52, 10.25, -9.5], "size": [0, 1, 1], "uv": [8, 9], "mirror": true} + {"origin": [-2.51, 8.75, -9.5], "size": [0, 2, 1], "uv": [18, 25], "mirror": true}, + {"origin": [-2.451, 8.75, -9.5], "size": [0, 2, 1], "inflate": 0.05, "uv": [0, 0], "mirror": true}, + {"origin": [-2.52, 9.25, -9.5], "size": [0, 1, 1], "uv": [8, 9], "mirror": true} ] }, { "name": "eyelid_right", "parent": "eye_right", - "pivot": [-1.82, 10.75, -9], + "pivot": [-1.8645, 9.75, -9.01], "cubes": [ - {"origin": [-2.32, 9.75, -9.5], "size": [1, 2, 1], "inflate": 0.11, "uv": [54, 39]} + {"origin": [-2.3645, 8.75, -10.01], "size": [1, 2, 2], "inflate": 0.06, "uv": [54, 39]} ] }, { "name": "eye_left", "parent": "eyes", - "pivot": [3.75, 10, -8.5], + "pivot": [3.75, 9, -8.5], "cubes": [ - {"origin": [2.51, 9.75, -9.5], "size": [0, 2, 1], "uv": [24, 25], "mirror": true}, - {"origin": [2.402, 9.75, -9.5], "size": [0, 2, 1], "inflate": 0.1, "uv": [0, 7], "mirror": true}, - {"origin": [2.52, 10.25, -9.5], "size": [0, 1, 1], "uv": [8, 10], "mirror": true} + {"origin": [2.51, 8.75, -9.5], "size": [0, 2, 1], "uv": [24, 25], "mirror": true}, + {"origin": [2.452, 8.75, -9.5], "size": [0, 2, 1], "inflate": 0.05, "uv": [0, 7], "mirror": true}, + {"origin": [2.52, 9.25, -9.5], "size": [0, 1, 1], "uv": [8, 10], "mirror": true} ] }, { "name": "eyelid_left", "parent": "eye_left", - "pivot": [1.82, 10.75, -9], + "pivot": [1.8645, 9.75, -9.01], "cubes": [ - {"origin": [1.32, 9.75, -9.5], "size": [1, 2, 1], "inflate": 0.11, "uv": [52, 36], "mirror": true} + {"origin": [1.3645, 8.75, -10.01], "size": [1, 2, 2], "inflate": 0.06, "uv": [56, 32], "mirror": true} ] }, { "name": "mouth_open", "parent": "head", - "pivot": [-0.05, 10, -9.5], + "pivot": [-0.05, 9, -9.5], "cubes": [ - {"origin": [-1.05, 8.75, -10.41], "size": [2, 1, 0], "uv": [8, 12]} + {"origin": [-1.05, 7.75, -10.41], "size": [2, 1, 0], "uv": [8, 12]} ] }, { "name": "head_wool", "parent": "head", - "pivot": [-2.3928, 13.73889, -6.69372], + "pivot": [-2.3928, 12.73889, -6.69372], "cubes": [ - {"origin": [-2.025, 12, -9.19785], "size": [2, 2, 2], "pivot": [-1.05693, 12.8315, -8.01133], "rotation": [0, 5, 0], "uv": [50, 24]}, - {"origin": [-2.5, 8.5, -7.5], "size": [5, 6, 4], "inflate": 0.01, "uv": [39, 0]}, - {"origin": [0.025, 12, -9.19785], "size": [2, 2, 2], "pivot": [1.06611, 12.8315, -8.01133], "rotation": [0, -5, 0], "uv": [52, 10]}, - {"origin": [-3.75, 11.5, -8.25], "size": [2, 2, 2], "uv": [8, 49]}, - {"origin": [1.75, 11.5, -8.25], "size": [2, 2, 2], "uv": [16, 39]} + {"origin": [-2.025, 11, -9.19785], "size": [2, 2, 2], "pivot": [-1.05693, 11.8315, -8.01133], "rotation": [0, 5, 0], "uv": [50, 24]}, + {"origin": [-2.5, 7.5, -7.5], "size": [5, 5, 3], "inflate": 0.01, "uv": [24, 56]}, + {"origin": [0.025, 11, -9.19785], "size": [2, 2, 2], "pivot": [1.06611, 11.8315, -8.01133], "rotation": [0, -5, 0], "uv": [52, 10]}, + {"origin": [-3.75, 10.75, -8.5], "size": [2, 2, 2], "uv": [8, 49]}, + {"origin": [1.75, 10.75, -8.5], "size": [2, 2, 2], "uv": [16, 39]} + ] + }, + { + "name": "head_wool_shearable", + "parent": "head_wool", + "pivot": [0, -1, 0], + "cubes": [ + {"origin": [-2.5, 9.5, -7.5], "size": [5, 4, 4], "inflate": 0.02, "uv": [39, 0]} ] }, { "name": "braid_right", "parent": "head_wool", - "pivot": [-3, 11.5, -7.5], + "pivot": [-3, 10.75, -7.5], "cubes": [ - {"origin": [-3.5, 10.75, -8], "size": [1, 1, 1], "uv": [0, 39]}, - {"origin": [-4, 9, -8.5], "size": [2, 2, 2], "uv": [0, 49]} + {"origin": [-3.5, 10, -8], "size": [1, 1, 1], "uv": [0, 39]}, + {"origin": [-4, 8.25, -8.5], "size": [2, 2, 2], "uv": [0, 49]} ] }, { "name": "braid_middle_right", "parent": "braid_right", - "pivot": [-3, 9, -7.5], + "pivot": [-3, 8.25, -7.5], "cubes": [ - {"origin": [-3.5, 8.25, -8], "size": [1, 1, 1], "uv": [0, 41]}, - {"origin": [-4, 6.5, -8.5], "size": [2, 2, 2], "uv": [36, 48]} + {"origin": [-3.5, 7.5, -8], "size": [1, 1, 1], "uv": [0, 41]}, + {"origin": [-4, 5.75, -8.5], "size": [2, 2, 2], "uv": [36, 48]} ] }, { "name": "braid_bottom_right", "parent": "braid_middle_right", - "pivot": [-3, 6.5, -7.5], + "pivot": [-3, 5.75, -7.5], "cubes": [ - {"origin": [-3.5, 5.75, -8], "size": [1, 1, 1], "uv": [0, 43]}, - {"origin": [-4, 4, -8.5], "size": [2, 2, 2], "uv": [28, 48]}, - {"origin": [-4, 3.75, -8.5], "size": [2, 1, 0], "pivot": [-3, 4.75, -8.5], "rotation": [-12.5, 0, 0], "uv": [0, 61]}, - {"origin": [-4, 3.75, -8.5], "size": [0, 1, 2], "pivot": [-4, 4.75, -7.5], "rotation": [0, 0, 12.5], "uv": [0, 60]}, - {"origin": [-2, 3.75, -8.5], "size": [0, 1, 2], "pivot": [-2, 4.75, -7.5], "rotation": [0, 0, -12.5], "uv": [0, 61]}, - {"origin": [-4, 3.75, -6.5], "size": [2, 1, 0], "pivot": [-3, 4.75, -6.5], "rotation": [12.5, 0, 0], "uv": [0, 60]} + {"origin": [-3.5, 5, -8], "size": [1, 1, 1], "uv": [0, 43]}, + {"origin": [-4, 3.25, -8.5], "size": [2, 2, 2], "uv": [28, 48]}, + {"origin": [-4, 3, -8.5], "size": [2, 1, 0], "pivot": [-3, 4, -8.5], "rotation": [-12.5, 0, 0], "uv": [0, 61]}, + {"origin": [-4, 3, -8.5], "size": [0, 1, 2], "pivot": [-4, 4, -7.5], "rotation": [0, 0, 12.5], "uv": [0, 60]}, + {"origin": [-2, 3, -8.5], "size": [0, 1, 2], "pivot": [-2, 4, -7.5], "rotation": [0, 0, -12.5], "uv": [0, 61]}, + {"origin": [-4, 3, -6.5], "size": [2, 1, 0], "pivot": [-3, 4, -6.5], "rotation": [12.5, 0, 0], "uv": [0, 60]} ] }, { "name": "braid_left", "parent": "head_wool", - "pivot": [3, 11.5, -7.5], + "pivot": [3, 10.75, -7.5], "cubes": [ - {"origin": [2.5, 10.75, -8], "size": [1, 1, 1], "uv": [26, 26]}, - {"origin": [2, 9, -8.5], "size": [2, 2, 2], "uv": [48, 30]} + {"origin": [2.5, 10, -8], "size": [1, 1, 1], "uv": [26, 26]}, + {"origin": [2, 8.25, -8.5], "size": [2, 2, 2], "uv": [48, 30]} ] }, { "name": "braid_middle_left", "parent": "braid_left", - "pivot": [3, 9, -7.5], + "pivot": [3, 8.25, -7.5], "cubes": [ - {"origin": [2.5, 8.25, -8], "size": [1, 1, 1], "uv": [26, 28]}, - {"origin": [2, 6.5, -8.5], "size": [2, 2, 2], "uv": [32, 39]} + {"origin": [2.5, 7.5, -8], "size": [1, 1, 1], "uv": [26, 28]}, + {"origin": [2, 5.75, -8.5], "size": [2, 2, 2], "uv": [32, 39]} ] }, { "name": "braid_bottom_left", "parent": "braid_middle_left", - "pivot": [3, 6.5, -7.5], + "pivot": [3, 5.75, -7.5], "cubes": [ - {"origin": [2.5, 5.75, -8], "size": [1, 1, 1], "uv": [26, 30]}, - {"origin": [2, 4, -8.5], "size": [2, 2, 2], "uv": [0, 8]}, - {"origin": [2, 3.75, -8.5], "size": [2, 1, 0], "pivot": [3, 4.75, -8.5], "rotation": [-12.5, 0, 0], "uv": [4, 61], "mirror": true}, - {"origin": [2, 3.75, -8.5], "size": [0, 1, 2], "pivot": [2, 4.75, -7.5], "rotation": [0, 0, 12.5], "uv": [4, 61], "mirror": true}, - {"origin": [4, 3.75, -8.5], "size": [0, 1, 2], "pivot": [4, 4.75, -7.5], "rotation": [0, 0, -12.5], "uv": [4, 60], "mirror": true}, - {"origin": [2, 3.75, -6.5], "size": [2, 1, 0], "pivot": [3, 4.75, -6.5], "rotation": [12.5, 0, 0], "uv": [4, 60], "mirror": true} + {"origin": [2.5, 5, -8], "size": [1, 1, 1], "uv": [26, 30]}, + {"origin": [2, 3.25, -8.5], "size": [2, 2, 2], "uv": [0, 8]}, + {"origin": [2, 3, -8.5], "size": [2, 1, 0], "pivot": [3, 4, -8.5], "rotation": [-12.5, 0, 0], "uv": [4, 61], "mirror": true}, + {"origin": [2, 3, -8.5], "size": [0, 1, 2], "pivot": [2, 4, -7.5], "rotation": [0, 0, 12.5], "uv": [4, 61], "mirror": true}, + {"origin": [4, 3, -8.5], "size": [0, 1, 2], "pivot": [4, 4, -7.5], "rotation": [0, 0, -12.5], "uv": [4, 60], "mirror": true}, + {"origin": [2, 3, -6.5], "size": [2, 1, 0], "pivot": [3, 4, -6.5], "rotation": [12.5, 0, 0], "uv": [4, 60], "mirror": true} ] }, { "name": "ear_left", "parent": "head", - "pivot": [2.5, 11.75, -6.5], + "pivot": [2.5, 10.75, -6.5], "rotation": [0, 0, 15], "cubes": [ - {"origin": [2.25, 10, -6.5], "size": [4, 2, 0], "uv": [48, 34]} + {"origin": [2.25, 9, -6.5], "size": [4, 2, 0], "uv": [48, 34]} ] }, { "name": "ear_right", "parent": "head", - "pivot": [-2.5, 11.75, -6.5], + "pivot": [-2.5, 10.75, -6.5], "rotation": [0, 0, -15], "cubes": [ - {"origin": [-6.25, 10, -6.5], "size": [4, 2, 0], "uv": [39, 10]} + {"origin": [-6.25, 9, -6.5], "size": [4, 2, 0], "uv": [39, 10]} ] }, { "name": "leg_front_right", "parent": "body", - "pivot": [2.25, 8.5, -3], + "pivot": [2.25, 7.5, -3], "cubes": [ - {"origin": [0.75, 5, -4.5], "size": [3, 5, 3], "uv": [0, 0]} + {"origin": [0.75, 4, -4.5], "size": [3, 5, 3], "uv": [0, 0]} ] }, { "name": "leg_front_right2", "parent": "leg_front_right", - "pivot": [2.25, 6, -3.75], + "pivot": [2.25, 5, -3.75], "cubes": [ - {"origin": [1.25, 1.25, -3.75], "size": [2, 4, 2], "uv": [18, 26]} + {"origin": [1.25, 1.25, -3.75], "size": [2, 3, 2], "uv": [18, 26]} ] }, { @@ -242,17 +266,17 @@ { "name": "leg_front_left", "parent": "body", - "pivot": [-2.25, 8.5, -3], + "pivot": [-2.25, 7.5, -3], "cubes": [ - {"origin": [-3.75, 5, -4.5], "size": [3, 5, 3], "uv": [47, 45]} + {"origin": [-3.75, 4, -4.5], "size": [3, 5, 3], "uv": [47, 45]} ] }, { "name": "leg_front_left2", "parent": "leg_front_left", - "pivot": [-2.25, 5, -3.75], + "pivot": [-2.25, 4, -3.75], "cubes": [ - {"origin": [-3.25, 1.25, -3.75], "size": [2, 4, 2], "uv": [42, 26]} + {"origin": [-3.25, 1.25, -3.75], "size": [2, 3, 2], "uv": [42, 26]} ] }, { @@ -266,17 +290,17 @@ { "name": "leg_back_right", "parent": "body", - "pivot": [2.25, 8.5, 3.5], + "pivot": [2.25, 7.5, 3.5], "cubes": [ - {"origin": [0.75, 5, 1.5], "size": [3, 5, 4], "uv": [22, 39]} + {"origin": [0.75, 4, 1.5], "size": [3, 5, 4], "uv": [22, 39]} ] }, { "name": "leg_back_right2", "parent": "leg_back_right", - "pivot": [2.25, 5, 5], + "pivot": [2.25, 4, 5], "cubes": [ - {"origin": [1.25, 1.25, 3.75], "size": [2, 4, 2], "uv": [46, 37]} + {"origin": [1.25, 1.25, 3.75], "size": [2, 3, 2], "uv": [46, 37]} ] }, { @@ -290,17 +314,17 @@ { "name": "leg_back_left", "parent": "body", - "pivot": [-2.25, 8.5, 3.5], + "pivot": [-2.25, 7.5, 3.5], "cubes": [ - {"origin": [-3.75, 5, 1.5], "size": [3, 5, 4], "uv": [36, 39]} + {"origin": [-3.75, 4, 1.5], "size": [3, 5, 4], "uv": [36, 39]} ] }, { "name": "leg_back_left2", "parent": "leg_back_left", - "pivot": [-2.25, 5, 5], + "pivot": [-2.25, 4, 5], "cubes": [ - {"origin": [-3.25, 1.25, 3.75], "size": [2, 4, 2], "uv": [20, 48]} + {"origin": [-3.25, 1.25, 3.75], "size": [2, 3, 2], "uv": [20, 48]} ] }, { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0832_dubwool/dubwool.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0832_dubwool/dubwool.geo.json index e3aaab3cd9..abe8b331e9 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0832_dubwool/dubwool.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0832_dubwool/dubwool.geo.json @@ -30,7 +30,7 @@ ] }, { - "name": "wool", + "name": "wool_shearable", "parent": "torso", "pivot": [0, 12.75, 0.25], "cubes": [ @@ -47,7 +47,7 @@ ] }, { - "name": "neck_wool", + "name": "neck_wool_shearable", "parent": "neck", "pivot": [0, 15.5, -9.5], "rotation": [-62.5, 0, 0], @@ -57,7 +57,7 @@ }, { "name": "neck_wool_middle_right", - "parent": "neck_wool", + "parent": "neck_wool_shearable", "pivot": [0.25, 13.75, -9.5], "rotation": [7.5, 0, 12.5], "cubes": [ @@ -66,7 +66,7 @@ }, { "name": "neck_wool_middle_left", - "parent": "neck_wool", + "parent": "neck_wool_shearable", "pivot": [-0.25, 13.75, -9.5], "rotation": [7.5, 0, -12.5], "cubes": [ @@ -75,7 +75,7 @@ }, { "name": "neck_wool_right", - "parent": "neck_wool", + "parent": "neck_wool_shearable", "pivot": [-1.75, 13.75, -9.5], "rotation": [12.5, 0, 25], "cubes": [ @@ -84,7 +84,7 @@ }, { "name": "neck_wool_left", - "parent": "neck_wool", + "parent": "neck_wool_shearable", "pivot": [1.75, 13.75, -9.5], "rotation": [12.5, 0, -25], "cubes": [ @@ -324,19 +324,19 @@ { "name": "tail", "parent": "torso", - "pivot": [0, 15, 7], + "pivot": [0, 14, 7], "rotation": [-42.5, 0, 0], "cubes": [ - {"origin": [-0.5, 14, 7], "size": [1, 1, 3], "inflate": 0.01, "uv": [102, 1]} + {"origin": [-0.5, 13, 7], "size": [1, 1, 3], "inflate": 0.01, "uv": [102, 1]} ] }, { "name": "tail2", "parent": "tail", - "pivot": [0, 14, 10], + "pivot": [0, 13, 10], "rotation": [35, 0, 0], "cubes": [ - {"origin": [-0.5, 14, 10], "size": [1, 1, 3], "uv": [98, 26]} + {"origin": [-0.5, 13, 10], "size": [1, 1, 3], "uv": [98, 26]} ] }, { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0235_smeargle/0_smeargle_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0235_smeargle/0_smeargle_base.json new file mode 100644 index 0000000000..e6cdb7ed4c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0235_smeargle/0_smeargle_base.json @@ -0,0 +1,177 @@ +{ + "species": "cobblemon:smeargle", + "order": 0, + "variations": [ + { + "aspects": [], + "poser": "cobblemon:smeargle", + "model": "cobblemon:smeargle.geo", + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle.png", + "layers": [] + }, + { + "aspects": ["shiny"], + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_shiny.png" + }, + { + "aspects": ["color-black"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_black.png" + } + ] + }, + { + "aspects": ["color-blue"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_blue.png" + } + ] + }, + { + "aspects": ["color-brown"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_brown.png" + } + ] + }, + { + "aspects": ["color-cyan"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_cyan.png" + } + ] + }, + { + "aspects": ["color-gray"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_gray.png" + } + ] + }, + { + "aspects": ["color-green"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_green.png" + } + ] + }, + { + "aspects": ["color-light_blue"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_light_blue.png" + } + ] + }, + { + "aspects": ["color-light_gray"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_light_gray.png" + } + ] + }, + { + "aspects": ["color-lime"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_lime.png" + } + ] + }, + { + "aspects": ["color-magenta"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_magenta.png" + } + ] + }, + { + "aspects": ["color-orange"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_orange.png" + } + ] + }, + { + "aspects": ["color-pink"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_pink.png" + } + ] + }, + { + "aspects": ["color-purple"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_purple.png" + } + ] + }, + { + "aspects": ["color-red"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_red.png" + } + ] + }, + { + "aspects": ["color-white"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_white.png" + } + ] + }, + { + "aspects": ["color-yellow"], + "layers": [ + { + "name": "paint", + "translucent": true, + "texture": "cobblemon:textures/pokemon/0235_smeargle/smeargle_paint_yellow.png" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0831_wooloo/0_wooloo_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0831_wooloo/0_wooloo_base.json index 6837775247..fb8902b0a9 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0831_wooloo/0_wooloo_base.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0831_wooloo/0_wooloo_base.json @@ -14,6 +14,210 @@ "shiny" ], "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_shiny.png" + }, + { + "aspects": [ + "color-black" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_black.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-blue" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_blue.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-brown" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_brown.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-cyan" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_cyan.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-gray" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_gray.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-green" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_green.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-light_blue" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_light_blue.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-light_gray" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_light_gray.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-lime" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_lime.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-magenta" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_magenta.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-orange" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_orange.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-pink" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_pink.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-purple" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_purple.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-red" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_red.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-white" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_white.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-white shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-yellow" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0831_wooloo/wooloo_wool_yellow.png", + "emissive": false + } + ] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0832_dubwool/0_dubwool_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0832_dubwool/0_dubwool_base.json index 63cfe389b0..d801a633fc 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0832_dubwool/0_dubwool_base.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0832_dubwool/0_dubwool_base.json @@ -14,6 +14,390 @@ "shiny" ], "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_shiny.png" + }, + { + "aspects": [ + "color-black" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_black.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-blue" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_blue.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-brown" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_brown.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-cyan" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_cyan.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-gray" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_gray.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-green" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_green.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-light_blue" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_light_blue.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-light_gray" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_light_gray.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-lime" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_lime.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-magenta" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_magenta.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-orange" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_orange.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-pink" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_pink.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-purple" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_purple.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-red" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_red.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-white" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_white.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-yellow" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_yellow.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-black shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_black_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-blue shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_blue_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-brown shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_brown_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-cyan shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_cyan_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-gray shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_gray_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-green shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_green_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-light_blue shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_light_blue_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-light_gray shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_light_gray_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-lime shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_lime_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-magenta shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_magenta_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-orange shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_orange_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-pink shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_pink_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-purple shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_purple_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-red shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_red_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-white shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_white_shiny.png", + "emissive": false + } + ] + }, + { + "aspects": [ + "color-yellow shiny" + ], + "layers": [ + { + "name": "color", + "texture": "cobblemon:textures/pokemon/0832_dubwool/dubwool_wool_yellow_shiny.png", + "emissive": false + } + ] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/aguav_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/aguav_berry.json index e2a18ce016..c281d91066 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/aguav_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/aguav_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aguav_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aguav_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/aguav_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aguav_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/aguav_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/aguav_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aguav_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aguav_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aguav_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/aguav_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/apicot_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/apicot_berry.json index 59fba1d19b..d994e37099 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/apicot_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/apicot_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/apicot_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/apicot_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/apicot_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/apicot_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/apicot_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/apicot_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/apicot_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/apicot_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/apicot_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/apicot_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/aspear_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/aspear_berry.json index 03d5531ecd..7deca6e405 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/aspear_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/aspear_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aspear_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aspear_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/aspear_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aspear_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/aspear_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/aspear_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aspear_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aspear_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/aspear_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/aspear_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/babiri_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/babiri_berry.json index 65556bdbb1..9f79b48a07 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/babiri_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/babiri_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/babiri_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/babiri_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/babiri_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/babiri_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/babiri_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/babiri_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/babiri_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/babiri_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/babiri_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/babiri_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/belue_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/belue_berry.json index e182ec0315..4ae73822fa 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/belue_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/belue_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/belue_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/belue_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/belue_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/belue_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/belue_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/belue_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/belue_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/belue_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/belue_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/belue_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_brick_slab.json b/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_brick_slab.json new file mode 100644 index 0000000000..0c4812b773 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "cobblemon:block/black_tumblestone_brick_slab" + }, + "type=double": { + "model": "cobblemon:block/black_tumblestone_bricks" + }, + "type=top": { + "model": "cobblemon:block/black_tumblestone_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_brick_stairs.json b/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..54b75e7f89 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "cobblemon:block/black_tumblestone_brick_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "cobblemon:block/black_tumblestone_brick_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "cobblemon:block/black_tumblestone_brick_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "cobblemon:block/black_tumblestone_brick_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "cobblemon:block/black_tumblestone_brick_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "cobblemon:block/black_tumblestone_brick_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "cobblemon:block/black_tumblestone_brick_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "cobblemon:block/black_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "cobblemon:block/black_tumblestone_brick_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_brick_wall.json b/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_brick_wall.json new file mode 100644 index 0000000000..21bdf5e2c4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "cobblemon:block/black_tumblestone_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "cobblemon:block/black_tumblestone_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/black_tumblestone_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/black_tumblestone_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/black_tumblestone_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/black_tumblestone_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/black_tumblestone_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/black_tumblestone_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/black_tumblestone_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_bricks.json new file mode 100644 index 0000000000..cd65a4d7a0 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/black_tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/black_tumblestone_bricks" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/bluk_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/bluk_berry.json index e49ac0c523..ee80d08efc 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/bluk_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/bluk_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/bluk_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/bluk_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/bluk_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/bluk_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/bluk_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/bluk_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/bluk_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/bluk_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/bluk_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/bluk_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/charti_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/charti_berry.json index e88d0acf2a..8878fc108b 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/charti_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/charti_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/charti_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/charti_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/charti_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/charti_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/charti_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/charti_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/charti_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/charti_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/charti_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/charti_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/cheri_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/cheri_berry.json index 8a640f182b..5304dd4651 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/cheri_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/cheri_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cheri_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cheri_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/cheri_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cheri_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/cheri_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/cheri_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cheri_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cheri_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cheri_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/cheri_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/chesto_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/chesto_berry.json index bec8903fc2..365a482e36 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/chesto_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/chesto_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chesto_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chesto_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/chesto_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chesto_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/chesto_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/chesto_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chesto_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chesto_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chesto_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/chesto_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/chilan_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/chilan_berry.json index 572215a2b6..bda0783996 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/chilan_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/chilan_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chilan_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chilan_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/chilan_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chilan_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/chilan_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/chilan_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chilan_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chilan_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chilan_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/chilan_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/chiseled_black_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_black_tumblestone_bricks.json new file mode 100644 index 0000000000..e150eb65cd --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_black_tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/chiseled_black_tumblestone_bricks" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/chiseled_polished_black_tumblestone.json b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_polished_black_tumblestone.json new file mode 100644 index 0000000000..d6b104021a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_polished_black_tumblestone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/chiseled_polished_black_tumblestone" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/chiseled_polished_sky_tumblestone.json b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_polished_sky_tumblestone.json new file mode 100644 index 0000000000..c16da38d2d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_polished_sky_tumblestone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/chiseled_polished_sky_tumblestone" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/chiseled_polished_tumblestone.json b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_polished_tumblestone.json new file mode 100644 index 0000000000..0bf183b984 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_polished_tumblestone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/chiseled_polished_tumblestone" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/chiseled_sky_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_sky_tumblestone_bricks.json new file mode 100644 index 0000000000..f257366a49 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_sky_tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/chiseled_sky_tumblestone_bricks" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/chiseled_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_tumblestone_bricks.json new file mode 100644 index 0000000000..097585ace3 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/chiseled_tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/chiseled_tumblestone_bricks" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/chople_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/chople_berry.json index c54abae7c0..840a9275a1 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/chople_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/chople_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chople_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chople_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/chople_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chople_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/chople_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/chople_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chople_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chople_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/chople_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/chople_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/coba_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/coba_berry.json index b6abd6bb67..452eca89a6 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/coba_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/coba_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/coba_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/coba_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/coba_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/coba_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/coba_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/coba_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/coba_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/coba_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/coba_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/coba_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/colbur_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/colbur_berry.json index 1636f6203f..18ae562240 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/colbur_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/colbur_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/colbur_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/colbur_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/colbur_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/colbur_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/colbur_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/colbur_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/colbur_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/colbur_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/colbur_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/colbur_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/cornn_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/cornn_berry.json index 1e2f8b5371..c44ed4d03d 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/cornn_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/cornn_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cornn_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cornn_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/cornn_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cornn_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/cornn_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/cornn_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cornn_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cornn_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/cornn_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/cornn_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/custap_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/custap_berry.json index 23f0175189..38b730a549 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/custap_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/custap_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/custap_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/custap_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/custap_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/custap_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/custap_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/custap_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/custap_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/custap_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/custap_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/custap_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/durin_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/durin_berry.json index 3d5118b5d2..52d23dc188 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/durin_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/durin_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/durin_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/durin_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/durin_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/durin_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/durin_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/durin_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/durin_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/durin_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/durin_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/durin_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/enigma_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/enigma_berry.json index 7a1077db7d..740a47fbf0 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/enigma_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/enigma_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/enigma_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/enigma_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/enigma_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/enigma_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/enigma_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/enigma_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/enigma_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/enigma_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/enigma_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/enigma_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/figy_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/figy_berry.json index c7fc183649..2203adff8d 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/figy_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/figy_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/figy_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/figy_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/figy_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/figy_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/figy_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/figy_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/figy_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/figy_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/figy_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/figy_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/ganlon_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/ganlon_berry.json index a2fb8a838d..0deba44049 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/ganlon_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/ganlon_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/ganlon_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/ganlon_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/ganlon_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/ganlon_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/ganlon_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/ganlon_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/ganlon_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/ganlon_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/ganlon_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/ganlon_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/grepa_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/grepa_berry.json index 1c7aea75db..80e399b3ce 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/grepa_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/grepa_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/grepa_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/grepa_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/grepa_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/grepa_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/grepa_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/grepa_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/grepa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/grepa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/grepa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/grepa_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/haban_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/haban_berry.json index b9ebbea2a1..62267ec47f 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/haban_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/haban_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/haban_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/haban_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/haban_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/haban_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/haban_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/haban_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/haban_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/haban_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/haban_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/haban_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/hondew_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/hondew_berry.json index 331eb7bdb0..47161c92a8 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/hondew_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/hondew_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hondew_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hondew_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/hondew_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hondew_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/hondew_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/hondew_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hondew_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hondew_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hondew_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/hondew_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/hopo_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/hopo_berry.json index 567eb96c7b..f1a0bc32df 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/hopo_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/hopo_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hopo_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hopo_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/hopo_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hopo_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/hopo_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/hopo_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hopo_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hopo_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/hopo_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/hopo_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/iapapa_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/iapapa_berry.json index eb1d9ccdca..4c2ee0f934 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/iapapa_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/iapapa_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/iapapa_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/iapapa_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/iapapa_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/iapapa_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/iapapa_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/iapapa_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/iapapa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/iapapa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/iapapa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/iapapa_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/jaboca_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/jaboca_berry.json index 153fca53c5..c4dcb803fc 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/jaboca_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/jaboca_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/jaboca_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/jaboca_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/jaboca_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/jaboca_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/jaboca_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/jaboca_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/jaboca_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/jaboca_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/jaboca_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/jaboca_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/kasib_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/kasib_berry.json index b38758a68f..6324e5a3d6 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/kasib_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/kasib_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kasib_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kasib_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/kasib_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kasib_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/kasib_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/kasib_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kasib_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kasib_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kasib_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/kasib_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/kebia_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/kebia_berry.json index ded7473eb4..915ab78218 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/kebia_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/kebia_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kebia_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kebia_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/kebia_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kebia_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/kebia_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/kebia_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kebia_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kebia_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kebia_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/kebia_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/kee_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/kee_berry.json index f55480552c..1f7a1592f3 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/kee_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/kee_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kee_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kee_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/kee_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kee_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/kee_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/kee_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kee_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kee_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kee_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/kee_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/kelpsy_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/kelpsy_berry.json index c47577dd18..12effdf6fb 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/kelpsy_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/kelpsy_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kelpsy_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kelpsy_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/kelpsy_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kelpsy_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/kelpsy_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/kelpsy_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kelpsy_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kelpsy_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/kelpsy_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/kelpsy_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/lansat_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/lansat_berry.json index fafe16ef4c..66d969ccf3 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/lansat_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/lansat_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lansat_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lansat_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/lansat_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lansat_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/lansat_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/lansat_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lansat_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lansat_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lansat_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/lansat_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/leppa_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/leppa_berry.json index 36e695d8d1..dfee810ed3 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/leppa_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/leppa_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/leppa_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/leppa_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/leppa_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/leppa_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/leppa_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/leppa_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/leppa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/leppa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/leppa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/leppa_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/liechi_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/liechi_berry.json index de49e8696b..4e5ef3377e 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/liechi_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/liechi_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/liechi_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/liechi_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/liechi_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/liechi_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/liechi_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/liechi_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/liechi_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/liechi_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/liechi_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/liechi_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/lum_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/lum_berry.json index dded7de113..934446b499 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/lum_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/lum_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lum_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lum_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/lum_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lum_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/lum_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/lum_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lum_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lum_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/lum_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/lum_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/mago_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/mago_berry.json index 88e3b2cadc..59cd39a84a 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/mago_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/mago_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/mago_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/mago_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/mago_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/mago_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/mago_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/mago_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/mago_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/mago_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/mago_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/mago_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/magost_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/magost_berry.json index 803bb22131..45149d767e 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/magost_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/magost_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/magost_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/magost_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/magost_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/magost_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/magost_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/magost_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/magost_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/magost_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/magost_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/magost_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/maranga_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/maranga_berry.json index ef6e03ab0e..3e114d9f1d 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/maranga_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/maranga_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/maranga_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/maranga_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/maranga_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/maranga_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/maranga_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/maranga_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/maranga_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/maranga_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/maranga_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/maranga_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/micle_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/micle_berry.json index cbac18b3a0..2b8f887869 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/micle_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/micle_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/micle_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/micle_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/micle_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/micle_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/micle_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/micle_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/micle_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/micle_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/micle_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/micle_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/nanab_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/nanab_berry.json index 25497b3a82..e7c0bb9935 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/nanab_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/nanab_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nanab_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nanab_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/nanab_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nanab_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/nanab_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/nanab_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nanab_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nanab_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nanab_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/nanab_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/nomel_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/nomel_berry.json index 4be7f9f791..ecd1758387 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/nomel_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/nomel_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nomel_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nomel_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/nomel_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nomel_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/nomel_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/nomel_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nomel_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nomel_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/nomel_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/nomel_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/occa_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/occa_berry.json index d1758e4ae7..1d425f4ff5 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/occa_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/occa_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/occa_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/occa_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/occa_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/occa_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/occa_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/occa_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/occa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/occa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/occa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/occa_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/oran_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/oran_berry.json index 596b307547..fb2767d1b0 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/oran_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/oran_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/oran_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/oran_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/oran_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/oran_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/oran_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/oran_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/oran_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/oran_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/oran_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/oran_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/pamtre_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/pamtre_berry.json index 79fad74206..5623f479c0 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/pamtre_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/pamtre_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pamtre_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pamtre_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/pamtre_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pamtre_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/pamtre_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/pamtre_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pamtre_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pamtre_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pamtre_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/pamtre_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/passho_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/passho_berry.json index 2cd2d39938..47a943b269 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/passho_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/passho_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/passho_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/passho_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/passho_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/passho_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/passho_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/passho_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/passho_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/passho_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/passho_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/passho_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/payapa_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/payapa_berry.json index 405cba4da0..5fd81ceeaf 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/payapa_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/payapa_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/payapa_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/payapa_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/payapa_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/payapa_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/payapa_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/payapa_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/payapa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/payapa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/payapa_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/payapa_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/pecha_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/pecha_berry.json index 887ad3e587..84c35f71ed 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/pecha_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/pecha_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pecha_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pecha_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/pecha_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pecha_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/pecha_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/pecha_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pecha_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pecha_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pecha_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/pecha_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/persim_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/persim_berry.json index e3a1f1ee1a..d532a62e7d 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/persim_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/persim_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/persim_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/persim_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/persim_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/persim_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/persim_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/persim_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/persim_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/persim_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/persim_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/persim_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/petaya_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/petaya_berry.json index 048d92794c..27a64d9fb8 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/petaya_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/petaya_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/petaya_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/petaya_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/petaya_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/petaya_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/petaya_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/petaya_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/petaya_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/petaya_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/petaya_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/petaya_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/pinap_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/pinap_berry.json index 61b20ae361..39048b197e 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/pinap_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/pinap_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pinap_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pinap_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/pinap_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pinap_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/pinap_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/pinap_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pinap_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pinap_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pinap_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/pinap_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone.json new file mode 100644 index 0000000000..4208b10cd8 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/polished_black_tumblestone" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone_slab.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone_slab.json new file mode 100644 index 0000000000..a05d2a5c51 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "cobblemon:block/polished_black_tumblestone_slab" + }, + "type=double": { + "model": "cobblemon:block/polished_black_tumblestone_slab_double" + }, + "type=top": { + "model": "cobblemon:block/polished_black_tumblestone_slab_top" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone_stairs.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone_stairs.json new file mode 100644 index 0000000000..d3f95d967c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_black_tumblestone_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "cobblemon:block/polished_black_tumblestone_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_black_tumblestone_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "cobblemon:block/polished_black_tumblestone_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_black_tumblestone_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "cobblemon:block/polished_black_tumblestone_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_black_tumblestone_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_black_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "cobblemon:block/polished_black_tumblestone_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone_wall.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone_wall.json new file mode 100644 index 0000000000..21ad07e773 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_black_tumblestone_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "cobblemon:block/polished_black_tumblestone_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_black_tumblestone_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_black_tumblestone_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_black_tumblestone_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_black_tumblestone_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_black_tumblestone_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_black_tumblestone_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_black_tumblestone_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_black_tumblestone_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone.json new file mode 100644 index 0000000000..2049195c03 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/polished_sky_tumblestone" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone_slab.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone_slab.json new file mode 100644 index 0000000000..58de0136ac --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "cobblemon:block/polished_sky_tumblestone_slab" + }, + "type=double": { + "model": "cobblemon:block/polished_sky_tumblestone_slab_double" + }, + "type=top": { + "model": "cobblemon:block/polished_sky_tumblestone_slab_top" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone_stairs.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone_stairs.json new file mode 100644 index 0000000000..0a3959515e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "cobblemon:block/polished_sky_tumblestone_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone_wall.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone_wall.json new file mode 100644 index 0000000000..dd45bb97fa --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_sky_tumblestone_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "cobblemon:block/polished_sky_tumblestone_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_sky_tumblestone_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_sky_tumblestone_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_sky_tumblestone_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_sky_tumblestone_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_sky_tumblestone_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_sky_tumblestone_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_sky_tumblestone_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_sky_tumblestone_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone.json new file mode 100644 index 0000000000..908ae3036f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/polished_tumblestone" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone_slab.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone_slab.json new file mode 100644 index 0000000000..0474463203 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "cobblemon:block/polished_tumblestone_slab" + }, + "type=double": { + "model": "cobblemon:block/polished_tumblestone_slab_double" + }, + "type=top": { + "model": "cobblemon:block/polished_tumblestone_slab_top" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone_stairs.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone_stairs.json new file mode 100644 index 0000000000..ab3b4b2ecb --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_tumblestone_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "cobblemon:block/polished_tumblestone_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_tumblestone_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "cobblemon:block/polished_tumblestone_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_tumblestone_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "cobblemon:block/polished_tumblestone_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "cobblemon:block/polished_tumblestone_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "cobblemon:block/polished_tumblestone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "cobblemon:block/polished_tumblestone_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone_wall.json b/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone_wall.json new file mode 100644 index 0000000000..cf6878ab4e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/polished_tumblestone_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "cobblemon:block/polished_tumblestone_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_tumblestone_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_tumblestone_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_tumblestone_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_tumblestone_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_tumblestone_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_tumblestone_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_tumblestone_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/polished_tumblestone_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/pomeg_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/pomeg_berry.json index a18cc9f6ac..2487b5bac7 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/pomeg_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/pomeg_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pomeg_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pomeg_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/pomeg_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pomeg_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/pomeg_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/pomeg_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pomeg_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pomeg_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/pomeg_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/pomeg_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/qualot_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/qualot_berry.json index c515bf9478..79dcc18d6c 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/qualot_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/qualot_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/qualot_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/qualot_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/qualot_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/qualot_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/qualot_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/qualot_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/qualot_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/qualot_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/qualot_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/qualot_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/rabuta_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/rabuta_berry.json index 087498d7e7..88f4b2f4b5 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/rabuta_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/rabuta_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rabuta_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rabuta_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/rabuta_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rabuta_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/rabuta_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/rabuta_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rabuta_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rabuta_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rabuta_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/rabuta_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/rawst_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/rawst_berry.json index 2bfef67689..9008320d13 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/rawst_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/rawst_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rawst_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rawst_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/rawst_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rawst_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/rawst_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/rawst_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rawst_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rawst_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rawst_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/rawst_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/razz_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/razz_berry.json index 4c3eff1fbf..77692afd3e 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/razz_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/razz_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/razz_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/razz_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/razz_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/razz_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/razz_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/razz_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/razz_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/razz_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/razz_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/razz_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/restoration_tank.json b/common/src/main/resources/assets/cobblemon/blockstates/restoration_tank.json index 530c7b39c4..89d1996b53 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/restoration_tank.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/restoration_tank.json @@ -54,7 +54,7 @@ "y": 270 }, "facing=east,part=top,on=true,triggered=false": { - "model": "cobblemon:block/restoration_tank_upper", + "model": "cobblemon:block/restoration_tank_upper_animated", "y": 270 }, "facing=south,part=top,on=false": { diff --git a/common/src/main/resources/assets/cobblemon/blockstates/rindo_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/rindo_berry.json index 3d5f3cefed..510aceb4f6 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/rindo_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/rindo_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rindo_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rindo_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/rindo_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rindo_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/rindo_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/rindo_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rindo_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rindo_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rindo_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/rindo_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/roseli_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/roseli_berry.json index 75caae6c38..7b5d8911c4 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/roseli_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/roseli_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/roseli_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/roseli_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/roseli_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/roseli_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/roseli_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/roseli_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/roseli_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/roseli_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/roseli_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/roseli_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/rowap_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/rowap_berry.json index e68c246a54..3900d589b8 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/rowap_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/rowap_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rowap_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rowap_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/rowap_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rowap_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/rowap_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/rowap_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rowap_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rowap_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/rowap_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/rowap_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/salac_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/salac_berry.json index 7d2f6af2ad..61a361e281 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/salac_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/salac_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/salac_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/salac_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/salac_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/salac_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/salac_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/salac_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/salac_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/salac_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/salac_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/salac_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/shuca_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/shuca_berry.json index 3cc0fd593e..dd507b2442 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/shuca_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/shuca_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/shuca_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/shuca_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/shuca_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/shuca_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/shuca_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/shuca_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/shuca_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/shuca_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/shuca_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/shuca_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/sitrus_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/sitrus_berry.json index c4a98be75a..1abcfac6e3 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/sitrus_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/sitrus_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/sitrus_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/sitrus_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/sitrus_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/sitrus_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/sitrus_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/sitrus_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/sitrus_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/sitrus_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/sitrus_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/sitrus_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_brick_slab.json b/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_brick_slab.json new file mode 100644 index 0000000000..cf8b2c9dfd --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "cobblemon:block/sky_tumblestone_brick_slab" + }, + "type=double": { + "model": "cobblemon:block/sky_tumblestone_bricks" + }, + "type=top": { + "model": "cobblemon:block/sky_tumblestone_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_brick_stairs.json b/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..7a29841368 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "cobblemon:block/sky_tumblestone_brick_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_brick_wall.json b/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_brick_wall.json new file mode 100644 index 0000000000..2567fc8863 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "cobblemon:block/sky_tumblestone_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "cobblemon:block/sky_tumblestone_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/sky_tumblestone_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/sky_tumblestone_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/sky_tumblestone_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/sky_tumblestone_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/sky_tumblestone_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/sky_tumblestone_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/sky_tumblestone_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_bricks.json new file mode 100644 index 0000000000..6c58ca358c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/sky_tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/sky_tumblestone_bricks" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/spelon_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/spelon_berry.json index 1b9dc7f541..616a70267b 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/spelon_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/spelon_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/spelon_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/spelon_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/spelon_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/spelon_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/spelon_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/spelon_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/spelon_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/spelon_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/spelon_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/spelon_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/starf_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/starf_berry.json index 2e14f155e7..2b46d22fc5 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/starf_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/starf_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/starf_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/starf_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/starf_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/starf_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/starf_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/starf_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/starf_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/starf_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/starf_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/starf_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/tamato_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/tamato_berry.json index 7a82e97988..5744649be1 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/tamato_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/tamato_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tamato_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tamato_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/tamato_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tamato_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/tamato_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/tamato_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tamato_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tamato_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tamato_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/tamato_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/tanga_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/tanga_berry.json index 75540dac26..90313b91a5 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/tanga_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/tanga_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tanga_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tanga_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/tanga_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tanga_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/tanga_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/tanga_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tanga_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tanga_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/tanga_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/tanga_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/touga_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/touga_berry.json index 69a404a403..6e284873b9 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/touga_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/touga_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/touga_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/touga_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/touga_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/touga_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/touga_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/touga_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/touga_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/touga_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/touga_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/touga_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_brick_slab.json b/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_brick_slab.json new file mode 100644 index 0000000000..568fcb1400 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "cobblemon:block/tumblestone_brick_slab" + }, + "type=double": { + "model": "cobblemon:block/tumblestone_bricks" + }, + "type=top": { + "model": "cobblemon:block/tumblestone_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_brick_stairs.json b/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_brick_stairs.json new file mode 100644 index 0000000000..29ee05672c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "cobblemon:block/tumblestone_brick_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "cobblemon:block/tumblestone_brick_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "cobblemon:block/tumblestone_brick_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "cobblemon:block/tumblestone_brick_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "cobblemon:block/tumblestone_brick_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "cobblemon:block/tumblestone_brick_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "cobblemon:block/tumblestone_brick_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "cobblemon:block/tumblestone_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "cobblemon:block/tumblestone_brick_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_brick_wall.json b/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_brick_wall.json new file mode 100644 index 0000000000..d7efad1dce --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "cobblemon:block/tumblestone_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "cobblemon:block/tumblestone_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/tumblestone_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/tumblestone_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/tumblestone_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "cobblemon:block/tumblestone_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/tumblestone_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/tumblestone_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "cobblemon:block/tumblestone_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_bricks.json new file mode 100644 index 0000000000..3a4fddbe88 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "cobblemon:block/tumblestone_bricks" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/wacan_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/wacan_berry.json index f672990ef7..b95f716d17 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/wacan_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/wacan_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wacan_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wacan_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/wacan_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wacan_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/wacan_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/wacan_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wacan_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wacan_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wacan_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/wacan_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/watmel_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/watmel_berry.json index 9c5481b58f..a25ecf9aed 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/watmel_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/watmel_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/watmel_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/watmel_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/watmel_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/watmel_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/watmel_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/watmel_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/watmel_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/watmel_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/watmel_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/watmel_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/wepear_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/wepear_berry.json index 698bd60d52..6010ed3309 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/wepear_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/wepear_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wepear_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wepear_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/wepear_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wepear_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/wepear_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/wepear_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wepear_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wepear_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wepear_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/wepear_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/wiki_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/wiki_berry.json index a6b7e61171..58a8d81306 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/wiki_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/wiki_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wiki_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wiki_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/wiki_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wiki_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/wiki_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/wiki_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wiki_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wiki_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/wiki_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/wiki_mature", diff --git a/common/src/main/resources/assets/cobblemon/blockstates/yache_berry.json b/common/src/main/resources/assets/cobblemon/blockstates/yache_berry.json index d6f886d6a7..7d6492b38d 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/yache_berry.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/yache_berry.json @@ -2,7 +2,14 @@ "multipart": [ { "when": { - "age": "0" + "AND": [ + { + "age": 0 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/planted", @@ -11,16 +18,62 @@ }, { "when": { - "age": "1" + "AND": [ + { + "age": 0 + }, + { + "rooted": true + } + ] }, "apply": { - "model": "cobblemon:block/berries/sprout", + "model": "cobblemon:block/berries/planted_bound", "uvlock": false } }, { "when": { - "age": "2" + "AND": [ + { + "age": 1 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/yache_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 1 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/yache_sprout", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 2 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/yache_young", @@ -29,7 +82,30 @@ }, { "when": { - "age": "3" + "AND": [ + { + "age": 2 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/yache_young", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 3 + }, + { + "rooted": false + } + ] }, "apply": { "model": "cobblemon:block/berries/yache_mature", @@ -38,7 +114,14 @@ }, { "when": { - "age": "4" + "AND": [ + { + "age": 3 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/yache_mature", @@ -47,7 +130,62 @@ }, { "when": { - "age": "5" + "AND": [ + { + "age": 4 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/yache_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 4 + }, + { + "rooted": true + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/yache_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": false + } + ] + }, + "apply": { + "model": "cobblemon:block/berries/yache_mature", + "uvlock": false + } + }, + { + "when": { + "AND": [ + { + "age": 5 + }, + { + "rooted": true + } + ] }, "apply": { "model": "cobblemon:block/berries/yache_mature", diff --git a/common/src/main/resources/assets/cobblemon/lang/en_us.json b/common/src/main/resources/assets/cobblemon/lang/en_us.json index 1e73a2151f..2621915c23 100644 --- a/common/src/main/resources/assets/cobblemon/lang/en_us.json +++ b/common/src/main/resources/assets/cobblemon/lang/en_us.json @@ -505,18 +505,48 @@ "block.cobblemon.large_budding_tumblestone": "Large Tumblestone Bud", "block.cobblemon.tumblestone_cluster": "Tumblestone Cluster", "block.cobblemon.tumblestone_block": "Block of Tumblestone", + "block.cobblemon.polished_tumblestone": "Polished Tumblestone", + "block.cobblemon.polished_tumblestone_slab": "Polished Tumblestone Slab", + "block.cobblemon.polished_tumblestone_stairs": "Polished Tumblestone Stairs", + "block.cobblemon.polished_tumblestone_wall": "Polished Tumblestone Wall", + "block.cobblemon.chiseled_polished_tumblestone": "Chiseled Polished Tumblestone", + "block.cobblemon.tumblestone_bricks": "Tumblestone Bricks", + "block.cobblemon.tumblestone_brick_slab": "Tumblestone Brick Slab", + "block.cobblemon.tumblestone_brick_stairs": "Tumblestone Brick Stairs", + "block.cobblemon.tumblestone_brick_wall": "Tumblestone Brick Wall", + "block.cobblemon.chiseled_tumblestone_bricks": "Chiseled Tumblestone Bricks", "block.cobblemon.small_budding_sky_tumblestone": "Small Sky Tumblestone Bud", "block.cobblemon.medium_budding_sky_tumblestone": "Medium Sky Tumblestone Bud", "block.cobblemon.large_budding_sky_tumblestone": "Large Sky Tumblestone Bud", "block.cobblemon.sky_tumblestone_cluster": "Sky Tumblestone Cluster", "block.cobblemon.sky_tumblestone_block": "Block of Sky Tumblestone", + "block.cobblemon.polished_sky_tumblestone": "Polished Sky Tumblestone", + "block.cobblemon.polished_sky_tumblestone_slab": "Polished Sky Tumblestone Slab", + "block.cobblemon.polished_sky_tumblestone_stairs": "Polished Sky Tumblestone Stairs", + "block.cobblemon.polished_sky_tumblestone_wall": "Polished Sky Tumblestone Wall", + "block.cobblemon.chiseled_polished_sky_tumblestone": "Chiseled Polished Sky Tumblestone", + "block.cobblemon.sky_tumblestone_bricks": "Sky Tumblestone Bricks", + "block.cobblemon.sky_tumblestone_brick_slab": "Sky Tumblestone Brick Slab", + "block.cobblemon.sky_tumblestone_brick_stairs": "Sky Tumblestone Brick Stairs", + "block.cobblemon.sky_tumblestone_brick_wall": "Sky Tumblestone Brick Wall", + "block.cobblemon.chiseled_sky_tumblestone_bricks": "Chiseled Sky Tumblestone Bricks", "block.cobblemon.small_budding_black_tumblestone": "Small Black Tumblestone Bud", "block.cobblemon.medium_budding_black_tumblestone": "Medium Black Tumblestone Bud", "block.cobblemon.large_budding_black_tumblestone": "Large Black Tumblestone Bud", "block.cobblemon.black_tumblestone_cluster": "Black Tumblestone Cluster", "block.cobblemon.black_tumblestone_block": "Block of Black Tumblestone", + "block.cobblemon.polished_black_tumblestone": "Polished Black Tumblestone", + "block.cobblemon.polished_black_tumblestone_slab": "Polished Black Tumblestone Slab", + "block.cobblemon.polished_black_tumblestone_stairs": "Polished Black Tumblestone Stairs", + "block.cobblemon.polished_black_tumblestone_wall": "Polished Black Tumblestone Wall", + "block.cobblemon.chiseled_polished_black_tumblestone": "Chiseled Polished Black Tumblestone", + "block.cobblemon.black_tumblestone_bricks": "Black Tumblestone Bricks", + "block.cobblemon.black_tumblestone_brick_slab": "Black Tumblestone Brick Slab", + "block.cobblemon.black_tumblestone_brick_stairs": "Black Tumblestone Brick Stairs", + "block.cobblemon.black_tumblestone_brick_wall": "Black Tumblestone Brick Wall", + "block.cobblemon.chiseled_black_tumblestone_bricks": "Chiseled Black Tumblestone Bricks", "cobblemon.overflow_no_pc": "Your party was full and you don't have a PC!", "cobblemon.overflow_no_space": "Your party was full and so was %1$s!", @@ -1132,6 +1162,7 @@ "cobblemon.battle.cant.shelltrap": "%1$s's shell trap didn't work!", "cobblemon.battle.cant.taunt": "%1$s can't use %2$s after the taunt!", "cobblemon.battle.cant.throatchop": "The effects of Throat Chop prevent %1$s from using certain moves!", + "cobblemon.battle.cant.nopp": "%1$s can't use %2$s because it is out of PP!", "cobblemon.battle.activate.confusion": "%1$s is confused!", "cobblemon.battle.activate.happyhour": "Everyone is caught up in the happy atmosphere!", @@ -1275,6 +1306,8 @@ "cobblemon.battle.damage.flameburst": "The bursting flame hit %1$s!", "cobblemon.battle.damage.dryskin": "%1$s was hurt by its Dry Skin!", "cobblemon.battle.damage.sandtomb": "%1$s is hurt by Sand Tomb!", + "cobblemon.battle.damage.roughskin": "%1$s was hurt!", + "cobblemon.battle.damage.ironbarbs": "%1$s was hurt!", "cobblemon.battle.end.bind": "%1$s is no longer being squeezed!", "cobblemon.battle.end.wrap": "%1$s was freed from wrap!", @@ -2412,6 +2445,8 @@ "cobblemon.move.hydrocannon.desc": "The target is hit with a watery blast. The user can’t move on the next turn.", "cobblemon.move.hydropump": "Hydro Pump", "cobblemon.move.hydropump.desc": "The target is blasted by a huge volume of water launched under great pressure.", + "cobblemon.move.hydrostream": "Hydro Stream", + "cobblemon.move.hydrostream.desc": "The user blasts the target with boiling-hot water. This move's power is not lowered in harsh sunlight but rather boosted by 50 percent.", "cobblemon.move.hydrovortex": "Hydro Vortex", "cobblemon.move.hydrovortex.desc": "The user creates a huge whirling current using its Z-Power to swallow the target with full force. The power varies, depending on the original move.", "cobblemon.move.hyperbeam": "Hyper Beam", @@ -5523,6 +5558,8 @@ "cobblemon.species.ironcrown.desc": "There was supposedly an incident in which it launched shining blades to cut everything around it to pieces. Little else is known about it.", "cobblemon.species.terapagos.name": "Terapagos", "cobblemon.species.terapagos.desc": "It's thought that this Pokémon lived in ancient Paldea until it got caught in seismic shifts and went extinct.", + "cobblemon.species.pecharunt.name": "Pecharunt", + "cobblemon.species.pecharunt.desc": "Its peach-shaped shell serves as storage for a potent poison. It makes poisonous mochi and serves them to people and Pokémon.", "cobblemon.ability.adaptability": "Adaptability", "cobblemon.ability.adaptability.desc": "Powers up moves of the same type as the Pokémon.", @@ -5874,6 +5911,8 @@ "cobblemon.ability.poisonheal.desc": "Restores HP if the Pokémon is poisoned instead of losing HP.", "cobblemon.ability.poisonpoint": "Poison Point", "cobblemon.ability.poisonpoint.desc": "Contact with the Pokémon may poison the attacker.", + "cobblemon.ability.poisonpuppeteer": "Poison Puppeteer", + "cobblemon.ability.poisonpuppeteer.desc": "Pokémon poisoned by Pecharunt's moves will also become confused.", "cobblemon.ability.poisontouch": "Poison Touch", "cobblemon.ability.poisontouch.desc": "May poison a target when the Pokémon makes contact.", "cobblemon.ability.powerconstruct": "Power Construct", diff --git a/common/src/main/resources/assets/cobblemon/lang/es_es.json b/common/src/main/resources/assets/cobblemon/lang/es_es.json index 7e90bd893f..aa0a0a50b6 100644 --- a/common/src/main/resources/assets/cobblemon/lang/es_es.json +++ b/common/src/main/resources/assets/cobblemon/lang/es_es.json @@ -31,22 +31,22 @@ "item.cobblemon.park_ball": "Parque Ball", "item.cobblemon.dream_ball": "Ensueño Ball", "item.cobblemon.beast_ball": "Ente Ball", - "item.cobblemon.ancient_poke_ball": "Ancient Poké Ball", - "item.cobblemon.ancient_citrine_ball": "Ancient Citrine Ball", - "item.cobblemon.ancient_verdant_ball": "Ancient Verdant Ball", - "item.cobblemon.ancient_azure_ball": "Ancient Azure Ball", - "item.cobblemon.ancient_roseate_ball": "Ancient Roseate Ball", - "item.cobblemon.ancient_slate_ball": "Ancient Slate Ball", - "item.cobblemon.ancient_ivory_ball": "Ancient Ivory Ball", - "item.cobblemon.ancient_great_ball": "Ancient Great Ball", - "item.cobblemon.ancient_ultra_ball": "Ancient Ultra Ball", - "item.cobblemon.ancient_heavy_ball": "Ancient Heavy Ball", - "item.cobblemon.ancient_leaden_ball": "Ancient Leaden Ball", - "item.cobblemon.ancient_gigaton_ball": "Ancient Gigaton Ball", - "item.cobblemon.ancient_feather_ball": "Ancient Feather Ball", - "item.cobblemon.ancient_wing_ball": "Ancient Wing Ball", - "item.cobblemon.ancient_jet_ball": "Ancient Jet Ball", - "item.cobblemon.ancient_origin_ball": "Ancient Origin Ball", + "item.cobblemon.ancient_poke_ball": "Poké Ball Antigua", + "item.cobblemon.ancient_citrine_ball": "Citrino Ball Antigua", + "item.cobblemon.ancient_verdant_ball": "Verdor Ball Antigua", + "item.cobblemon.ancient_azure_ball": "Azur Ball Antigua", + "item.cobblemon.ancient_roseate_ball": "Rosado Ball Antigua", + "item.cobblemon.ancient_slate_ball": "Pizarra Ball Antigua", + "item.cobblemon.ancient_ivory_ball": "Marfil Ball Antigua", + "item.cobblemon.ancient_great_ball": "Super Ball Antigua", + "item.cobblemon.ancient_ultra_ball": "Ultra Ball Antigua", + "item.cobblemon.ancient_heavy_ball": "Peso Ball Antigua", + "item.cobblemon.ancient_leaden_ball": "Kilo Ball Antigua", + "item.cobblemon.ancient_gigaton_ball": "Quintal Ball Antigua", + "item.cobblemon.ancient_feather_ball": "Pluma Ball Antigua", + "item.cobblemon.ancient_wing_ball": "Ala Ball Antigua", + "item.cobblemon.ancient_jet_ball": "Aero Ball Antigua", + "item.cobblemon.ancient_origin_ball": "Origen Ball Antigua", "item.cobblemon.black_apricorn_seed": "Brote de Bonguri Negro", "item.cobblemon.blue_apricorn_seed": "Brote de Bonguri Azul", "item.cobblemon.green_apricorn_seed": "Borte de Bonguri Verde", @@ -90,8 +90,8 @@ "item.cobblemon.ribbon_sweet": "Confite Lazo", "item.cobblemon.chipped_pot": "Tetera Rota", "item.cobblemon.cracked_pot": "Tetera Agrietada", - "item.cobblemon.masterpiece_teacup": "Masterpiece Teacup", - "item.cobblemon.unremarkable_teacup": "Unremarkable Teacup", + "item.cobblemon.masterpiece_teacup": "Cuenco Exquisito", + "item.cobblemon.unremarkable_teacup": "Cuenco Mediocre", "item.cobblemon.sweet_apple": "Manzana Dulce", "item.cobblemon.tart_apple": "Manzana Ácida", "item.cobblemon.galarica_cuff": "Brazal Galanuez", @@ -125,14 +125,14 @@ "item.cobblemon.hyper_potion": "Hiperpoción", "item.cobblemon.max_potion": "Poción Máxima", "item.cobblemon.full_restore": "Restaurar Todo", - "item.cobblemon.health_feather": "Health Feather", - "item.cobblemon.muscle_feather": "Muscle Feather", - "item.cobblemon.resist_feather": "Resist Feather", - "item.cobblemon.genius_feather": "Genius Feather", - "item.cobblemon.clever_feather": "Clever Feather", - "item.cobblemon.swift_feather": "Swift Feather", - "item.cobblemon.ability_capsule": "Ability Capsule", - "item.cobblemon.ability_patch": "Ability Patch", + "item.cobblemon.health_feather": "Pluma Vigor", + "item.cobblemon.muscle_feather": "Pluma Músculo", + "item.cobblemon.resist_feather": "Pluma Aguante", + "item.cobblemon.genius_feather": "Pluma Intelecto", + "item.cobblemon.clever_feather": "Pluma Mente", + "item.cobblemon.swift_feather": "Pluma Ímpetu", + "item.cobblemon.ability_capsule": "Cápsula Habilidad", + "item.cobblemon.ability_patch": "Parche Habilidad", "item.cobblemon.red_mint_leaf": "Hoja de Menta Roja", "item.cobblemon.red_mint_leaf.tooltip": "Capaz de cambiar la estadística de ataque de un Pokémon", "item.cobblemon.blue_mint_leaf": "Hoja de Menta Azul", @@ -166,47 +166,47 @@ "item.cobblemon.jolly_mint": "Menta Alegre", "item.cobblemon.naive_mint": "Menta Ingenua", "item.cobblemon.serious_mint": "Menta Seria", - "item.cobblemon.ability_shield": "Ability Shield", - "item.cobblemon.absorb_bulb": "Absorb Bulb", - "item.cobblemon.air_balloon": "Air Balloon", + "item.cobblemon.ability_shield": "Escudo Habilidad", + "item.cobblemon.absorb_bulb": "Tubérculo", + "item.cobblemon.air_balloon": "Globo Helio", "item.cobblemon.assault_vest": "Chaleco Asalto", "item.cobblemon.auspicious_armor": "Armadura Auspiciosa", "item.cobblemon.malicious_armor": "Armadura Maldita", - "item.cobblemon.binding_band": "Binding Band", + "item.cobblemon.binding_band": "Banda Atadura", "item.cobblemon.black_belt": "Cinturón Negro", "item.cobblemon.black_glasses": "Gafas de Sol", "item.cobblemon.black_sludge": "Lodo Negro", - "item.cobblemon.blunder_policy": "Blunder Policy", - "item.cobblemon.cell_battery": "Cell Battery", + "item.cobblemon.blunder_policy": "Seguro Fallo", + "item.cobblemon.cell_battery": "Pila", "item.cobblemon.charcoal_stick": "Carbón", "item.cobblemon.choice_band": "Cinta Elección", "item.cobblemon.choice_scarf": "Pañuelo Elección", "item.cobblemon.choice_specs": "Gafas Elección", "item.cobblemon.cleanse_tag": "Amuleto", - "item.cobblemon.clear_amulet": "Clear Amulet", - "item.cobblemon.covert_cloak": "Covert Cloak", + "item.cobblemon.clear_amulet": "Amuleto Puro", + "item.cobblemon.covert_cloak": "Capa Furtiva", "item.cobblemon.dragon_fang": "Colmillo Dragón", - "item.cobblemon.eject_button": "Eject Button", - "item.cobblemon.eject_pack": "Eject Pack", + "item.cobblemon.eject_button": "Botón Escape", + "item.cobblemon.eject_pack": "Mochila Escape", "item.cobblemon.everstone": "Piedra Eterna", - "item.cobblemon.eviolite": "Eviolite", + "item.cobblemon.eviolite": "Mineral Evolutivo", "item.cobblemon.exp_share": "Repartir Experiencia", - "item.cobblemon.expert_belt": "Expert Belt", + "item.cobblemon.expert_belt": "Cinta Experto", "item.cobblemon.fairy_feather": "Pluma feérica", - "item.cobblemon.float_stone": "Float Stone", + "item.cobblemon.float_stone": "Piedra Pómez", "item.cobblemon.focus_band": "Cinta Aguante", - "item.cobblemon.focus_sash": "Focus Sash", - "item.cobblemon.grip_claw": "Grip Claw", + "item.cobblemon.focus_sash": "Banda Aguante", + "item.cobblemon.grip_claw": "Garra Garfio", "item.cobblemon.hard_stone": "Piedra Dura", "item.cobblemon.heavy_duty_boots": "Botas Gruesas", - "item.cobblemon.iron_ball": "Iron Ball", - "item.cobblemon.lagging_tail": "Lagging Tail", + "item.cobblemon.iron_ball": "Bola Férrea", + "item.cobblemon.lagging_tail": "Cola Plúmbea", "item.cobblemon.leftovers": "Restos", - "item.cobblemon.light_ball": "Light Ball", + "item.cobblemon.light_ball": "Bola Luminosa", "item.cobblemon.light_clay": "Refleluz", - "item.cobblemon.loaded_dice": "Loaded Dice", + "item.cobblemon.loaded_dice": "Dado Trucado", "item.cobblemon.lucky_egg": "Huevo Suerte", - "item.cobblemon.luminous_moss": "Luminous Moss", + "item.cobblemon.luminous_moss": "Musgo Brillante", "item.cobblemon.magnet": "Imán", "item.cobblemon.metronome": "Metronome", "item.cobblemon.miracle_seed": "Semilla Milagro", @@ -214,34 +214,34 @@ "item.cobblemon.mystic_water": "Agua Mística", "item.cobblemon.never_melt_ice": "Antiderretir", "item.cobblemon.poison_barb": "Flecha Venenosa", - "item.cobblemon.protective_pads": "Protective Pads", - "item.cobblemon.punching_glove": "Punching Glove", + "item.cobblemon.protective_pads": "Paracontacto", + "item.cobblemon.punching_glove": "Guante de Boxeo", "item.cobblemon.quick_claw": "Garra Rápida", "item.cobblemon.razor_claw": "Garra Afilada", "item.cobblemon.razor_fang": "Colmillo Agudo", - "item.cobblemon.red_card": "Red Card", - "item.cobblemon.ring_target": "Ring Target", + "item.cobblemon.red_card": "Targeta Roja", + "item.cobblemon.ring_target": "Blanco", "item.cobblemon.rocky_helmet": "Casco Dentado", - "item.cobblemon.room_service": "Room Service", + "item.cobblemon.room_service": "Servicio Raro", "item.cobblemon.safety_goggles": "Gafa Protectora", - "item.cobblemon.scope_lens": "Scope Lens", + "item.cobblemon.scope_lens": "Periscopio", "item.cobblemon.sharp_beak": "Pico Afilado", - "item.cobblemon.shed_shell": "Shed Shell", - "item.cobblemon.shell_bell": "Shell Bell", + "item.cobblemon.shed_shell": "Muda Concha", + "item.cobblemon.shell_bell": "Cascabel Concha", "item.cobblemon.silk_scarf": "Pañuelo de Seda", "item.cobblemon.silver_powder": "Polvo Plata", "item.cobblemon.soft_sand": "Arena Fina", - "item.cobblemon.soothe_bell": "Soothe Bell", + "item.cobblemon.soothe_bell": "Cascabel Alivio", "item.cobblemon.spell_tag": "Hechizo", - "item.cobblemon.sticky_barb": "Sticky Barb", - "item.cobblemon.terrain_extender": "Terrain Extender", - "item.cobblemon.throat_spray": "Throat Spray", + "item.cobblemon.sticky_barb": "Toxiestrella", + "item.cobblemon.terrain_extender": "Cubresuelos", + "item.cobblemon.throat_spray": "Espray Bucal", "item.cobblemon.twisted_spoon": "Cuchara Torcida", - "item.cobblemon.utility_umbrella": "Utility Umbrella", - "item.cobblemon.weakness_policy": "Weakness Policy", - "item.cobblemon.wide_lens": "Wide Lens", + "item.cobblemon.utility_umbrella": "Parasol Multiuso", + "item.cobblemon.weakness_policy": "Seguro Debilidad", + "item.cobblemon.wide_lens": "Lupa", "item.cobblemon.wise_glasses": "Gafas Especiales", - "item.cobblemon.zoom_lens": "Zoom Lens", + "item.cobblemon.zoom_lens": "Telescopio", "item.cobblemon.mental_herb": "Hierba Mental", "item.cobblemon.mirror_herb": "Hierba Copia", "item.cobblemon.power_herb": "Hierba Única", @@ -261,10 +261,10 @@ "item.cobblemon.smoke_ball": "Bola de humo", "item.cobblemon.toxic_orb": "Toxisfera", "item.cobblemon.life_orb": "Vidasfera", - "item.cobblemon.damp_rock": "Damp Rock", - "item.cobblemon.heat_rock": "Heat Rock", - "item.cobblemon.smooth_rock": "Smooth Rock", - "item.cobblemon.icy_rock": "Icy Rock", + "item.cobblemon.damp_rock": "Roca Lluvia", + "item.cobblemon.heat_rock": "Roca Calor", + "item.cobblemon.smooth_rock": "Roca Suave", + "item.cobblemon.icy_rock": "Roca Helada", "item.cobblemon.poke_ball.tooltip": "Ratio de captura ×1", "item.cobblemon.slate_ball.tooltip": "Ratio de captura ×1", "item.cobblemon.azure_ball.tooltip": "Ratio de captura ×1", @@ -297,22 +297,22 @@ "item.cobblemon.park_ball.tooltip": "Ratio de captura ×2,5 en todos los biomas de Bosque o Llanuras", "item.cobblemon.dream_ball.tooltip": "Ratio de captura ×4 en Pokémon dormidos", "item.cobblemon.beast_ball.tooltip": "Ratio de captura ×5 en Ultraentes, ×0,1 en otro caso", - "item.cobblemon.ancient_poke_ball.tooltip": "1× catch rate", - "item.cobblemon.ancient_citrine_ball.tooltip": "1× catch rate", - "item.cobblemon.ancient_verdant_ball.tooltip": "1× catch rate", - "item.cobblemon.ancient_azure_ball.tooltip": "1× catch rate", - "item.cobblemon.ancient_roseate_ball.tooltip": "1× catch rate", - "item.cobblemon.ancient_slate_ball.tooltip": "1× catch rate", - "item.cobblemon.ancient_ivory_ball.tooltip": "1× catch rate", - "item.cobblemon.ancient_great_ball.tooltip": "1.5× catch rate", - "item.cobblemon.ancient_ultra_ball.tooltip": "2× catch rate", - "item.cobblemon.ancient_feather_ball.tooltip": "1×, flies further", - "item.cobblemon.ancient_wing_ball.tooltip": "1.5×, flies further", - "item.cobblemon.ancient_jet_ball.tooltip": "2×, flies further", - "item.cobblemon.ancient_heavy_ball.tooltip": "1×, throws less far", - "item.cobblemon.ancient_leaden_ball.tooltip": "1.5×, throws less far", - "item.cobblemon.ancient_gigaton_ball.tooltip": "2×, throws less far", - "item.cobblemon.ancient_origin_ball.tooltip": "Guaranteed capture", + "item.cobblemon.ancient_poke_ball.tooltip": "Ratio de captura ×1", + "item.cobblemon.ancient_citrine_ball.tooltip": "Ratio de captura ×1", + "item.cobblemon.ancient_verdant_ball.tooltip": "Ratio de captura ×1", + "item.cobblemon.ancient_azure_ball.tooltip": "Ratio de captura ×1", + "item.cobblemon.ancient_roseate_ball.tooltip": "Ratio de captura ×1", + "item.cobblemon.ancient_slate_ball.tooltip": "Ratio de captura ×1", + "item.cobblemon.ancient_ivory_ball.tooltip": "Ratio de captura ×1", + "item.cobblemon.ancient_great_ball.tooltip": "Ratio de captura ×1,5", + "item.cobblemon.ancient_ultra_ball.tooltip": "Ratio de captura ×2", + "item.cobblemon.ancient_feather_ball.tooltip": "1×, vuela más lejos", + "item.cobblemon.ancient_wing_ball.tooltip": "1,5×, vuela más lejos", + "item.cobblemon.ancient_jet_ball.tooltip": "2×, vuela más lejos", + "item.cobblemon.ancient_heavy_ball.tooltip": "1×, lanza menos lejos", + "item.cobblemon.ancient_leaden_ball.tooltip": "1.5×, lanza menos lejos", + "item.cobblemon.ancient_gigaton_ball.tooltip": "2×, lanza menos lejos", + "item.cobblemon.ancient_origin_ball.tooltip": "Captura garantizada", "item.cobblemon.mulch_base": "Abono", "item.cobblemon.coarse_mulch": "Abono Grueso", "item.cobblemon.growth_mulch": "Abono Rápido", @@ -357,75 +357,75 @@ "item.cobblemon.max_ether": "Éter Máximo", "item.cobblemon.elixir": "Elixir", "item.cobblemon.max_elixir": "Elixir Máximo", - "item.cobblemon.normal_gem": "Normal Gem", - "item.cobblemon.water_gem": "Water Gem", - "item.cobblemon.fire_gem": "Fire Gem", - "item.cobblemon.grass_gem": "Grass Gem", - "item.cobblemon.dragon_gem": "Dragon Gem", - "item.cobblemon.ghost_gem": "Ghost Gem", - "item.cobblemon.ground_gem": "Ground Gem", - "item.cobblemon.steel_gem": "Steel Gem", - "item.cobblemon.fairy_gem": "Fairy Gem", - "item.cobblemon.rock_gem": "Rock Gem", - "item.cobblemon.psychic_gem": "Psychic Gem", - "item.cobblemon.electric_gem": "Electric Gem", - "item.cobblemon.bug_gem": "Bug Gem", - "item.cobblemon.poison_gem": "Poison Gem", - "item.cobblemon.ice_gem": "Ice Gem", - "item.cobblemon.dark_gem": "Dark Gem", - "item.cobblemon.fighting_gem": "Fighting Gem", - "item.cobblemon.flying_gem": "Flying Gem", - "item.cobblemon.armor_fossil": "Armor Fossil", - "item.cobblemon.fossilized_bird": "Fossilized Bird", - "item.cobblemon.claw_fossil": "Claw Fossil", - "item.cobblemon.cover_fossil": "Cover Fossil", - "item.cobblemon.fossilized_dino": "Fossilized Dino", - "item.cobblemon.dome_fossil": "Dome Fossil", - "item.cobblemon.fossilized_drake": "Fossilized Drake", - "item.cobblemon.fossilized_fish": "Fossilized Fish", - "item.cobblemon.helix_fossil": "Helix Fossil", - "item.cobblemon.jaw_fossil": "Jaw Fossil", - "item.cobblemon.old_amber_fossil": "Old Amber Fossil", - "item.cobblemon.plume_fossil": "Plume Fossil", - "item.cobblemon.root_fossil": "Root Fossil", - "item.cobblemon.sail_fossil": "Sail Fossil", - "item.cobblemon.skull_fossil": "Skull Fossil", - "item.cobblemon.bygone_sherd": "Bygone Pottery Sherd", - "item.cobblemon.capture_sherd": "Capture Pottery Sherd", - "item.cobblemon.dome_sherd": "Dome Pottery Sherd", - "item.cobblemon.helix_sherd": "Helix Pottery Sherd", - "item.cobblemon.nostalgic_sherd": "Nostalgic Pottery Sherd", - "item.cobblemon.suspicious_sherd": "Suspicious Pottery Sherd", - "item.cobblemon.tumblestone": "Tumblestone", - "item.cobblemon.black_tumblestone": "Black Tumblestone", - "item.cobblemon.sky_tumblestone": "Sky Tumblestone", - "item.cobblemon.relic_coin": "Relic Coin", - "block.cobblemon.relic_coin_pouch": "Relic Coin Pouch", - "block.cobblemon.relic_coin_sack": "Relic Coin Sack", - "trim_pattern.cobblemon.automaton": "Automaton Armour Trim", - "cobblemon.fossil.armor": "Armor", - "cobblemon.fossil.bird": "Bird", - "cobblemon.fossil.claw": "Claw", - "cobblemon.fossil.cover": "Cover", - "cobblemon.fossil.dino": "Dino", - "cobblemon.fossil.dome": "Dome", - "cobblemon.fossil.drake": "Drake", - "cobblemon.fossil.fish": "Fish", + "item.cobblemon.normal_gem": "Gema Normal", + "item.cobblemon.water_gem": "Gema Agua", + "item.cobblemon.fire_gem": "Gema Fuego", + "item.cobblemon.grass_gem": "Gema Planta", + "item.cobblemon.dragon_gem": "Gema Dragón", + "item.cobblemon.ghost_gem": "Gema Fantasma", + "item.cobblemon.ground_gem": "Gema Tierra", + "item.cobblemon.steel_gem": "Gema Acero", + "item.cobblemon.fairy_gem": "Gema Hada", + "item.cobblemon.rock_gem": "Gema Roca", + "item.cobblemon.psychic_gem": "Gema Psíquico", + "item.cobblemon.electric_gem": "Gema Eléctrico", + "item.cobblemon.bug_gem": "Gema Bicho", + "item.cobblemon.poison_gem": "Gema Veneno", + "item.cobblemon.ice_gem": "Gema Hielo", + "item.cobblemon.dark_gem": "Gema Siniestro", + "item.cobblemon.fighting_gem": "Gema Lucha", + "item.cobblemon.flying_gem": "Gema Volador", + "item.cobblemon.armor_fossil": "Fósil Coraza", + "item.cobblemon.fossilized_bird": "Ornitofósil", + "item.cobblemon.claw_fossil": "Fósil Garra", + "item.cobblemon.cover_fossil": "Fósil Tapa", + "item.cobblemon.fossilized_dino": "Plesiofósil", + "item.cobblemon.dome_fossil": "Fósil Domo", + "item.cobblemon.fossilized_drake": "Dracofósil", + "item.cobblemon.fossilized_fish": "Ictiofósil", + "item.cobblemon.helix_fossil": "Fósil Helix", + "item.cobblemon.jaw_fossil": "Fósil Mandíbula", + "item.cobblemon.old_amber_fossil": "Ámbar Viejo", + "item.cobblemon.plume_fossil": "Fósil Pluma", + "item.cobblemon.root_fossil": "Fósil Raíz", + "item.cobblemon.sail_fossil": "Fósil Aleta", + "item.cobblemon.skull_fossil": "Fósil Cráneo", + "item.cobblemon.bygone_sherd": "Fragmento de cerámica del pasado", + "item.cobblemon.capture_sherd": "Fragmento de cerámica de captura", + "item.cobblemon.dome_sherd": "Fragmento de cerámica de domo", + "item.cobblemon.helix_sherd": "Fragmento de cerámica de helix", + "item.cobblemon.nostalgic_sherd": "Fragmento de cerámica nostálgico", + "item.cobblemon.suspicious_sherd": "Fragmento de cerámica sospechoso", + "item.cobblemon.tumblestone": "Guijarro Rojo", + "item.cobblemon.black_tumblestone": "Guijarro Negro", + "item.cobblemon.sky_tumblestone": "Guijarro Celeste", + "item.cobblemon.relic_coin": "Moneda Reliquia", + "block.cobblemon.relic_coin_pouch": "Bolsa de monedas reliquia", + "block.cobblemon.relic_coin_sack": "Saco de monedas reliquia", + "trim_pattern.cobblemon.automaton": "Diseño de Armadura de Autómata", + "cobblemon.fossil.armor": "Coraza", + "cobblemon.fossil.bird": "Ornito", + "cobblemon.fossil.claw": "Garra", + "cobblemon.fossil.cover": "Tapa", + "cobblemon.fossil.dino": "Plesio", + "cobblemon.fossil.dome": "Domo", + "cobblemon.fossil.drake": "Draco", + "cobblemon.fossil.fish": "Ictio", "cobblemon.fossil.helix": "Helix", - "cobblemon.fossil.jaw": "Jaw", - "cobblemon.fossil.old_amber": "Old Amber", - "cobblemon.fossil.plume": "Plume", - "cobblemon.fossil.root": "Root", - "cobblemon.fossil.sail": "Sail", - "cobblemon.fossil.skull": "Skull", - "cobblemon.fossilmachine.protected": "This fossil belongs to %s!", + "cobblemon.fossil.jaw": "Mandíbula", + "cobblemon.fossil.old_amber": "Ámbar Viejo", + "cobblemon.fossil.plume": "Pluma", + "cobblemon.fossil.root": "Raíz", + "cobblemon.fossil.sail": "Aleta", + "cobblemon.fossil.skull": "Cráneo", + "cobblemon.fossilmachine.protected": "Este fósil pertenece a %s!", "itemGroup.cobblemon.blocks": "Bloques", "itemGroup.cobblemon.pokeball": "Poké Balls", "itemGroup.cobblemon.agriculture": "Agricultura", "itemGroup.cobblemon.consumables": "Consumibles", "itemGroup.cobblemon.held_item": "Objetos Potenciadores", "itemGroup.cobblemon.evolution_item": "Objetos Evolutivos", - "itemGroup.cobblemon.archaeology": "Archaeology", + "itemGroup.cobblemon.archaeology": "Arqueología", "block.cobblemon.apricorn_log": "Tronco de Bonguri", "block.cobblemon.stripped_apricorn_log": "Tronco de Bonguri sin corteza", "block.cobblemon.apricorn_wood": "Leño de Bonguri", @@ -454,9 +454,9 @@ "block.cobblemon.healing_machine.tooltip1": "Debe cargarse después de ser colocada.", "block.cobblemon.healing_machine.tooltip2": "Se carga a lo largo del tiempo.", "block.cobblemon.pc": "PC", - "block.cobblemon.restoration_tank": "Restoration Tank", - "block.cobblemon.fossil_analyzer": "Fossil Analyzer", - "block.cobblemon.monitor": "Data Monitor", + "block.cobblemon.restoration_tank": "Tanque de Restauración", + "block.cobblemon.fossil_analyzer": "Analizador de Fósiles", + "block.cobblemon.monitor": "Monitor de Datos", "block.cobblemon.red_mint": "Semillas de Menta Roja", "block.cobblemon.blue_mint": "Semillas de Menta Azul", "block.cobblemon.cyan_mint": "Semillas de Menta Cian", @@ -466,30 +466,30 @@ "block.cobblemon.vivichoke_seeds": "Semillas de Revibrote", "block.cobblemon.pep_up_flower": "Flor Éter", "block.cobblemon.potted_pep_up_flower": "Flor Éter en maceta", - "block.cobblemon.gilded_chest": "Gilded Chest", - "block.cobblemon.gimmighoul_chest": "Gimmighoul Chest", - "block.cobblemon.blue_gilded_chest": "Blue Gilded Chest", - "block.cobblemon.yellow_gilded_chest": "Yellow Gilded Chest", - "block.cobblemon.pink_gilded_chest": "Pink Gilded Chest", - "block.cobblemon.black_gilded_chest": "Black Gilded Chest", - "block.cobblemon.green_gilded_chest": "Green Gilded Chest", - "block.cobblemon.white_gilded_chest": "White Gilded Chest", - "block.cobblemon.display_case": "Display Case", - "block.cobblemon.small_budding_tumblestone": "Small Tumblestone Bud", - "block.cobblemon.medium_budding_tumblestone": "Medium Tumblestone Bud", - "block.cobblemon.large_budding_tumblestone": "Large Tumblestone Bud", - "block.cobblemon.tumblestone_cluster": "Tumblestone Cluster", - "block.cobblemon.tumblestone_block": "Block of Tumblestone", - "block.cobblemon.small_budding_sky_tumblestone": "Small Sky Tumblestone Bud", - "block.cobblemon.medium_budding_sky_tumblestone": "Medium Sky Tumblestone Bud", - "block.cobblemon.large_budding_sky_tumblestone": "Large Sky Tumblestone Bud", - "block.cobblemon.sky_tumblestone_cluster": "Sky Tumblestone Cluster", - "block.cobblemon.sky_tumblestone_block": "Block of Sky Tumblestone", - "block.cobblemon.small_budding_black_tumblestone": "Small Black Tumblestone Bud", - "block.cobblemon.medium_budding_black_tumblestone": "Medium Black Tumblestone Bud", - "block.cobblemon.large_budding_black_tumblestone": "Large Black Tumblestone Bud", - "block.cobblemon.black_tumblestone_cluster": "Black Tumblestone Cluster", - "block.cobblemon.black_tumblestone_block": "Block of Black Tumblestone", + "block.cobblemon.gilded_chest": "Cofre Dorado", + "block.cobblemon.gimmighoul_chest": "Cofre de Gimmighoul", + "block.cobblemon.blue_gilded_chest": "Cofre Dorado Azul", + "block.cobblemon.yellow_gilded_chest": "Cofre Dorado Amarillo", + "block.cobblemon.pink_gilded_chest": "Cofre Dorado Rosa", + "block.cobblemon.black_gilded_chest": "Cofre Dorado Negro", + "block.cobblemon.green_gilded_chest": "Cofre Dorado Verde", + "block.cobblemon.white_gilded_chest": "Cofre Dorado Blanco", + "block.cobblemon.display_case": "Expositor", + "block.cobblemon.small_budding_tumblestone": "Brote Pequeño de Guijarro", + "block.cobblemon.medium_budding_tumblestone": "Brote Mediano de Guijarro", + "block.cobblemon.large_budding_tumblestone": "Brote Grande de Guijarro", + "block.cobblemon.tumblestone_cluster": "Conjunto de Guijarro", + "block.cobblemon.tumblestone_block": "Bloque de Guijaro", + "block.cobblemon.small_budding_sky_tumblestone": "Brote Pequeño de Guijarro Celeste", + "block.cobblemon.medium_budding_sky_tumblestone": "Brote Mediano de Guijarro Celeste", + "block.cobblemon.large_budding_sky_tumblestone": "Brote Grande de Guijarro Celeste", + "block.cobblemon.sky_tumblestone_cluster": "Conjunto de Guijarro Celeste", + "block.cobblemon.sky_tumblestone_block": "Bloque de Guijarro Celeste", + "block.cobblemon.small_budding_black_tumblestone": "Brote Pequeño de Guijarro Negro", + "block.cobblemon.medium_budding_black_tumblestone": "Brote Mediano de Guijarro Negro", + "block.cobblemon.large_budding_black_tumblestone": "Brote Grande de Guijarro Negro", + "block.cobblemon.black_tumblestone_cluster": "Conjunto de Guijarro Negro", + "block.cobblemon.black_tumblestone_block": "Bloque de Guijarro Negro", "cobblemon.overflow_no_pc": "¡Tu equipo estaba lleno y no tienes un PC!", "cobblemon.overflow_no_space": "¡Tu equipo estaba lleno y también lo estaba %1$s!", "cobblemon.overflow_to_pc": "¡Tu equipo estaba lleno! %1$s ha sido añadido a %2$s.", @@ -558,10 +558,10 @@ "cobblemon.ui.pasture.recall_all": "Retirar Todo", "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)", "cobblemon.pasture.too_many_nearby": "Hay demasiados Pokémon cerca.", - "cobblemon.ui.interact.give.item": "Change held item", - "cobblemon.ui.interact.spectate": "Spectate", - "cobblemon.ui.interact.trade": "Trade", - "cobblemon.ui.interact.battle": "Battle", + "cobblemon.ui.interact.give.item": "Cambiar objeto equipado", + "cobblemon.ui.interact.spectate": "Espectear", + "cobblemon.ui.interact.trade": "Intercámbio", + "cobblemon.ui.interact.battle": "Combáte", "cobblemon.ui.interact.mount.shoulder": "Shoulder", "key.cobblemon.upshiftparty": "Pokémon Superior", "key.cobblemon.downshiftparty": "Pokémon Inferior", @@ -5482,5 +5482,4 @@ "cobblemon.species.spectrier.desc": "Amante de la quietud y la soledad, galopa por las tinieblas nocturnas absorbiendo la energía vital de toda criatura que esté durmiendo.", "cobblemon.species.calyrex.name": "Calyrex", "cobblemon.species.calyrex.desc": "Legendario monarca del antiguo Galar. Posee el poder de sanar el espíritu y de hacer brotar la vegetación." - } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/lang/pt_pt.json b/common/src/main/resources/assets/cobblemon/lang/pt_pt.json index a53007510c..44272ef67c 100644 --- a/common/src/main/resources/assets/cobblemon/lang/pt_pt.json +++ b/common/src/main/resources/assets/cobblemon/lang/pt_pt.json @@ -90,8 +90,8 @@ "item.cobblemon.ribbon_sweet": "Doce de Laço", "item.cobblemon.chipped_pot": "Bule Lascado", "item.cobblemon.cracked_pot": "Bule Rachado", - "item.cobblemon.masterpiece_teacup": "Masterpiece Teacup", - "item.cobblemon.unremarkable_teacup": "Unremarkable Teacup", + "item.cobblemon.masterpiece_teacup": "Chávena de Chá Magistral", + "item.cobblemon.unremarkable_teacup": "Chávena de Chá Insignificante", "item.cobblemon.sweet_apple": "Maçã Doce", "item.cobblemon.tart_apple": "Maçã Azeda", "item.cobblemon.galarica_cuff": "Pulseira de Galarica", @@ -132,7 +132,7 @@ "item.cobblemon.clever_feather": "Pena Esperta", "item.cobblemon.swift_feather": "Pena Rápida", "item.cobblemon.ability_capsule": "Cápsula de Habilidade", - "item.cobblemon.ability_patch": "Ability Patch", + "item.cobblemon.ability_patch": "Adesivo de Habilidade", "item.cobblemon.red_mint_leaf": "Folha de Hortelã Vermelha", "item.cobblemon.red_mint_leaf.tooltip": "Capaz de influenciar o atributo de ataque de um Pokémon", "item.cobblemon.blue_mint_leaf": "Folha de Hortelã Azul", @@ -167,36 +167,36 @@ "item.cobblemon.naive_mint": "Hortelã Ingénua", "item.cobblemon.serious_mint": "Hortelã Séria", "item.cobblemon.ability_shield": "Escudo de Habilidade", - "item.cobblemon.absorb_bulb": "Absorb Bulb", + "item.cobblemon.absorb_bulb": "Bulbo de Absorção", "item.cobblemon.air_balloon": "Balão de Ar", "item.cobblemon.assault_vest": "Colete de Assalto", "item.cobblemon.auspicious_armor": "Armadura Peculiar", "item.cobblemon.malicious_armor": "Armadura Maliciosa", - "item.cobblemon.binding_band": "Binding Band", + "item.cobblemon.binding_band": "Banda de Ligação", "item.cobblemon.black_belt": "Cinturão Preto", "item.cobblemon.black_glasses": "Óculos Negros", "item.cobblemon.black_sludge": "Lodo Preto", - "item.cobblemon.blunder_policy": "Blunder Policy", - "item.cobblemon.cell_battery": "Cell Battery", + "item.cobblemon.blunder_policy": "Política de Erro", + "item.cobblemon.cell_battery": "Pilha", "item.cobblemon.charcoal_stick": "Vara de Carvão", "item.cobblemon.choice_band": "Faixa de Escolha", "item.cobblemon.choice_scarf": "Cachecol de Escolha", "item.cobblemon.choice_specs": "Lentes de Escolha", "item.cobblemon.cleanse_tag": "Etiqueta Purificadora", "item.cobblemon.clear_amulet": "Amuleto Claro", - "item.cobblemon.covert_cloak": "Covert Cloak", + "item.cobblemon.covert_cloak": "Capa de Cobertura", "item.cobblemon.dragon_fang": "Presa de Dragão", "item.cobblemon.eject_button": "Botão de Fuga", - "item.cobblemon.eject_pack": "Eject Pack", + "item.cobblemon.eject_pack": "Mochila de Fuga", "item.cobblemon.everstone": "Pedra Eterna", "item.cobblemon.eviolite": "Eviolite", "item.cobblemon.exp_share": "Partilha de Exp.", - "item.cobblemon.expert_belt": "Expert Belt", + "item.cobblemon.expert_belt": "Cinturão Especialista", "item.cobblemon.fairy_feather": "Pena Encantada", - "item.cobblemon.float_stone": "Float Stone", + "item.cobblemon.float_stone": "Pedra Flutuante", "item.cobblemon.focus_band": "Faixa de Foco", "item.cobblemon.focus_sash": "Cinta de Foco", - "item.cobblemon.grip_claw": "Grip Claw", + "item.cobblemon.grip_claw": "Garra de Aderência", "item.cobblemon.hard_stone": "Pedra Rígida", "item.cobblemon.heavy_duty_boots": "Botas de Trabalho", "item.cobblemon.iron_ball": "Bola de Ferro", @@ -208,36 +208,36 @@ "item.cobblemon.lucky_egg": "Ovo Sortudo", "item.cobblemon.luminous_moss": "Musgo Luminoso", "item.cobblemon.magnet": "Íman", - "item.cobblemon.metronome": "Metronome", + "item.cobblemon.metronome": "Metrónomo", "item.cobblemon.miracle_seed": "Semente Milagrosa", "item.cobblemon.muscle_band": "Faixa de Músculo", "item.cobblemon.mystic_water": "Água Mística", "item.cobblemon.never_melt_ice": "Gelo Nunca-Derrete", "item.cobblemon.poison_barb": "Farpa de Veneno", - "item.cobblemon.protective_pads": "Protective Pads", + "item.cobblemon.protective_pads": "Amortecedores Protetores", "item.cobblemon.punching_glove": "Luva de Boxe", "item.cobblemon.quick_claw": "Garra Rápida", "item.cobblemon.razor_claw": "Garra Afiada", "item.cobblemon.razor_fang": "Presa Afiada", "item.cobblemon.red_card": "Cartão Vermelho", - "item.cobblemon.ring_target": "Ring Target", + "item.cobblemon.ring_target": "Alvo de Anel", "item.cobblemon.rocky_helmet": "Capacete Rochoso", - "item.cobblemon.room_service": "Room Service", + "item.cobblemon.room_service": "Serviço de Quartos", "item.cobblemon.safety_goggles": "Óculos de Segurança", "item.cobblemon.scope_lens": "Lente de Escopo", "item.cobblemon.sharp_beak": "Bico Afiado", - "item.cobblemon.shed_shell": "Shed Shell", + "item.cobblemon.shed_shell": "Carapaça Vazia", "item.cobblemon.shell_bell": "Sino de Concha", "item.cobblemon.silk_scarf": "Cachecol de Seda", "item.cobblemon.silver_powder": "Pó de Prata", "item.cobblemon.soft_sand": "Areia Suave", - "item.cobblemon.soothe_bell": "Soothe Bell", + "item.cobblemon.soothe_bell": "Sino Calmante", "item.cobblemon.spell_tag": "Etiqueta de Feitiço", "item.cobblemon.sticky_barb": "Farpa Pegajosa", "item.cobblemon.terrain_extender": "Extensor de Terreno", "item.cobblemon.throat_spray": "Spray de Garganta", "item.cobblemon.twisted_spoon": "Colher Torcida", - "item.cobblemon.utility_umbrella": "Utility Umbrella", + "item.cobblemon.utility_umbrella": "Guarda-chuva de Utilidade", "item.cobblemon.weakness_policy": "Política de Fraqueza", "item.cobblemon.wide_lens": "Lente Ampla", "item.cobblemon.wise_glasses": "Óculos Sábios", @@ -379,9 +379,9 @@ "item.cobblemon.fossilized_bird": "Pássaro Fossilizado", "item.cobblemon.claw_fossil": "Fóssil Garra", "item.cobblemon.cover_fossil": "Fóssil Capa", - "item.cobblemon.fossilized_dino": "Fossilized Dino", + "item.cobblemon.fossilized_dino": "Dino Fossilizado", "item.cobblemon.dome_fossil": "Fóssil Cúpula", - "item.cobblemon.fossilized_drake": "Fossilized Drake", + "item.cobblemon.fossilized_drake": "Drago Fossilizado", "item.cobblemon.fossilized_fish": "Peixe Fossilizado", "item.cobblemon.helix_fossil": "Fóssil Hélice", "item.cobblemon.jaw_fossil": "Fóssil Mandíbula", @@ -391,25 +391,25 @@ "item.cobblemon.sail_fossil": "Fóssil Vela", "item.cobblemon.skull_fossil": "Fóssil Caveira", "item.cobblemon.bygone_sherd": "Fragmento de Cerâmica Desaparecido", - "item.cobblemon.capture_sherd": "Capture Pottery Sherd", + "item.cobblemon.capture_sherd": "Fragmento de Cerâmica de Captura", "item.cobblemon.dome_sherd": "Fragmento de Cerâmica Cúpula", "item.cobblemon.helix_sherd": "Fragmento de Cerâmica Hélice", "item.cobblemon.nostalgic_sherd": "Fragmento de Cerâmica Nostálgico", "item.cobblemon.suspicious_sherd": "Fragmento de Cerâmica Suspeito", - "item.cobblemon.tumblestone": "Tumblestone", - "item.cobblemon.black_tumblestone": "Black Tumblestone", - "item.cobblemon.sky_tumblestone": "Sky Tumblestone", - "item.cobblemon.relic_coin": "Relic Coin", - "block.cobblemon.relic_coin_pouch": "Relic Coin Pouch", - "block.cobblemon.relic_coin_sack": "Relic Coin Sack", - "trim_pattern.cobblemon.automaton": "Automaton Armour Trim", + "item.cobblemon.tumblestone": "Seixo", + "item.cobblemon.black_tumblestone": "Seixo Preto", + "item.cobblemon.sky_tumblestone": "Seixo do Céu", + "item.cobblemon.relic_coin": "Moeda Relíquia", + "block.cobblemon.relic_coin_pouch": "Bolsa de Moedas Relíquia", + "block.cobblemon.relic_coin_sack": "Saco de Moedas Relíquia", + "trim_pattern.cobblemon.automaton": "Revestimento de Armadura Autómato", "cobblemon.fossil.armor": "Armadura", "cobblemon.fossil.bird": "Pássaro", "cobblemon.fossil.claw": "Garra", "cobblemon.fossil.cover": "Capa", "cobblemon.fossil.dino": "Dino", "cobblemon.fossil.dome": "Cúpula", - "cobblemon.fossil.drake": "Drake", + "cobblemon.fossil.drake": "Drago", "cobblemon.fossil.fish": "Peixe", "cobblemon.fossil.helix": "Hélice", "cobblemon.fossil.jaw": "Mandíbula", @@ -466,7 +466,7 @@ "block.cobblemon.vivichoke_seeds": "Sementes de Alcachofra", "block.cobblemon.pep_up_flower": "Flor Estimulante", "block.cobblemon.potted_pep_up_flower": "Flor Estimulante Envasada", - "block.cobblemon.gilded_chest": "Gilded Chest", + "block.cobblemon.gilded_chest": "Baú Dourado", "block.cobblemon.gimmighoul_chest": "Baú de Gimmighoul", "block.cobblemon.blue_gilded_chest": "Baú Dourado Azul", "block.cobblemon.yellow_gilded_chest": "Baú Dourado Amarelo", @@ -474,22 +474,22 @@ "block.cobblemon.black_gilded_chest": "Baú Dourado Preto", "block.cobblemon.green_gilded_chest": "Baú Dourado Verde", "block.cobblemon.white_gilded_chest": "Baú Dourado Branco", - "block.cobblemon.display_case": "Display Case", - "block.cobblemon.small_budding_tumblestone": "Small Tumblestone Bud", - "block.cobblemon.medium_budding_tumblestone": "Medium Tumblestone Bud", - "block.cobblemon.large_budding_tumblestone": "Large Tumblestone Bud", - "block.cobblemon.tumblestone_cluster": "Tumblestone Cluster", - "block.cobblemon.tumblestone_block": "Block of Tumblestone", - "block.cobblemon.small_budding_sky_tumblestone": "Small Sky Tumblestone Bud", - "block.cobblemon.medium_budding_sky_tumblestone": "Medium Sky Tumblestone Bud", - "block.cobblemon.large_budding_sky_tumblestone": "Large Sky Tumblestone Bud", - "block.cobblemon.sky_tumblestone_cluster": "Sky Tumblestone Cluster", - "block.cobblemon.sky_tumblestone_block": "Block of Sky Tumblestone", - "block.cobblemon.small_budding_black_tumblestone": "Small Black Tumblestone Bud", - "block.cobblemon.medium_budding_black_tumblestone": "Medium Black Tumblestone Bud", - "block.cobblemon.large_budding_black_tumblestone": "Large Black Tumblestone Bud", - "block.cobblemon.black_tumblestone_cluster": "Black Tumblestone Cluster", - "block.cobblemon.black_tumblestone_block": "Block of Black Tumblestone", + "block.cobblemon.display_case": "Vitrine", + "block.cobblemon.small_budding_tumblestone": "Broto Pequeno de Seixo", + "block.cobblemon.medium_budding_tumblestone": "Broto Médio de Seixo", + "block.cobblemon.large_budding_tumblestone": "Broto Grande de Seixo", + "block.cobblemon.tumblestone_cluster": "Aglomerado de Seixos", + "block.cobblemon.tumblestone_block": "Bloco de Seixo", + "block.cobblemon.small_budding_sky_tumblestone": "Broto Pequeno de Seixo do Céu", + "block.cobblemon.medium_budding_sky_tumblestone": "Broto Médio de Seixo do Céu", + "block.cobblemon.large_budding_sky_tumblestone": "Broto Grande de Seixo do Céu", + "block.cobblemon.sky_tumblestone_cluster": "Aglomerado de Seixos do Céu", + "block.cobblemon.sky_tumblestone_block": "Bloco de Seixo do Céu", + "block.cobblemon.small_budding_black_tumblestone": "Broto Pequeno de Seixo Preto", + "block.cobblemon.medium_budding_black_tumblestone": "Broto Médio de Seixo Preto", + "block.cobblemon.large_budding_black_tumblestone": "Broto Grande de Seixo Preto", + "block.cobblemon.black_tumblestone_cluster": "Aglomerado de Seixos Pretos", + "block.cobblemon.black_tumblestone_block": "Bloco de Seixo Preto", "cobblemon.overflow_no_pc": "A tua equipa estava cheia e não tens um PC!", "cobblemon.overflow_no_space": "A tua equipa estava cheia e %1$s também!", "cobblemon.overflow_to_pc": "A tua equipa está cheia! %1$s foi adicionado(a) a %2$s.", @@ -530,7 +530,7 @@ "cobblemon.ui.stats.sp_def": "Defesa Especial", "cobblemon.ui.stats.speed": "Velocidade", "cobblemon.ui.gold_hoard": "Saco de Moedas", - "cobblemon.ui.netherite_hoard": "Scrap Stash", + "cobblemon.ui.netherite_hoard": "Saco de Sucata", "cobblemon.ui.info": "Informação", "cobblemon.ui.info.pokedex_number": "N.º Dex", "cobblemon.ui.info.species": "Espécie", @@ -558,7 +558,7 @@ "cobblemon.ui.pasture.recall_all": "Retirar Todos", "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)", "cobblemon.pasture.too_many_nearby": "Há demasiados Pokémon por perto.", - "cobblemon.ui.interact.give.item": "Change held item", + "cobblemon.ui.interact.give.item": "Mudar o equipamento", "cobblemon.ui.interact.spectate": "Assistir", "cobblemon.ui.interact.trade": "Trocar", "cobblemon.ui.interact.battle": "Batalhar", @@ -570,26 +570,26 @@ "key.cobblemon.pokenavigator": "Abrir PokéNav", "key.cobblemon.summary": "Abrir Sumário", "key.cobblemon.categories.cobblemon": "Pedramon", - "key.cobblemon.scaleportraitup": "Scale Portrait Up", - "key.cobblemon.scaleportraitdown": "Scale Portrait Down", - "key.cobblemon.translateportraitup": "Translate Portrait Up", - "key.cobblemon.translateportraitdown": "Translate Portrait Down", - "key.cobblemon.translateportraitleft": "Translate Portrait Left", - "key.cobblemon.translateportraitright": "Translate Portrait Right", - "key.cobblemon.printmodelsettings": "Print Model Settings", - "key.cobblemon.categories.cobblemon.debug": "Cobblemon Debug", - "cobblemon.subtitle.poke_ball.capture_succeeded": "Poké Ball capture succeeds", + "key.cobblemon.scaleportraitup": "Dimensionar o Retrato Cima", + "key.cobblemon.scaleportraitdown": "Dimensionar o Retrato Baixo", + "key.cobblemon.translateportraitup": "Converter o Retrato Cima", + "key.cobblemon.translateportraitdown": "Converter o Retrato Baixo", + "key.cobblemon.translateportraitleft": "Converter o Retrato Esquerda", + "key.cobblemon.translateportraitright": "Converter o Retrato Direito", + "key.cobblemon.printmodelsettings": "Configurações de Impressão de Modelo", + "key.cobblemon.categories.cobblemon.debug": "Depuração do Cobblemon", + "cobblemon.subtitle.poke_ball.capture_succeeded": "Captura de Pokébola teve sucesso", "cobblemon.subtitle.fossilmachine.activate": "Máquina de Restauração ativa-se", - "cobblemon.subtitle.fossilmachine.active_loop": "Restoration Machine hums", + "cobblemon.subtitle.fossilmachine.active_loop": "Máquina de Restauração zumbe", "cobblemon.subtitle.fossilmachine.dna_full": "Tanque de Restauração alcança a capacidade", "cobblemon.subtitle.fossilmachine.finished": "Máquina de Restauração acaba", "cobblemon.subtitle.fossilmachine.insert_dna": "Tanque de Restauração salpica", "cobblemon.subtitle.fossilmachine.insert_dna_small": "Tanque de restauração salpica levemente", "cobblemon.subtitle.fossilmachine.insert_fossil": "Fóssil inserido", "cobblemon.subtitle.fossilmachine.retrieve_fossil": "Fóssil recuperado", - "cobblemon.subtitle.fossilmachine.retrieve_pokemon": "Fossil Pokémon retrieved", + "cobblemon.subtitle.fossilmachine.retrieve_pokemon": "Pokémon Fóssil recuperado", "cobblemon.subtitle.fossilmachine.unprotected": "Proteção da Máquina de Restauração acaba", - "cobblemon.subtitle.fossilmachine.assemble": "Restoration Machine assembles", + "cobblemon.subtitle.fossilmachine.assemble": "Máquina de Restauração reúne", "cobblemon.healingmachine.alreadyinuse": "Esta máquina de cura já está a ser utilizada!", "cobblemon.healingmachine.nopokemon": "Não tens nenhum Pokémon na tua equipa para curar!", "cobblemon.healingmachine.alreadyhealed": "A tua equipa de Pokémon já está completamente curada!", @@ -859,9 +859,9 @@ "advancements.cobblemon.obtain_all_berries.description": "Obtém um de cada Baga em Cobblemon", "advancements.cobblemon.use_pasture": "Um Novo Jardim Zoológico", "advancements.cobblemon.use_pasture.description": "Cria um Bloco de Pastagem e permite que os teus amigos vagueiem", - "advancements.cobblemon.catch_all_vivillon": "Aspiring Vivillionaire", + "advancements.cobblemon.catch_all_vivillon": "Aspirante a Vivillionário", "advancements.cobblemon.catch_all_vivillon.description": "Obtém todos os padrões de Vivillon...", - "advancements.cobblemon.catch_all_vivillon_but_actually": "True Vivillionaire", + "advancements.cobblemon.catch_all_vivillon_but_actually": "Verdadeiro Vivillionário", "advancements.cobblemon.catch_all_vivillon_but_actually.description": "Obtém o resto.", "advancements.cobblemon.evolve_veevees": "Veevees Valorizadas", "advancements.cobblemon.evolve_veevees.description": "Evolui Eevee em 8 formas diferentes", @@ -879,16 +879,16 @@ "advancements.cobblemon.own_zangoose_seviper.description": "Tenha um Zangoose e um Seviper na sua equipa ao mesmo tempo", "advancements.cobblemon.obtain_fossil": "Consulta o Fóssil", "advancements.cobblemon.obtain_fossil.description": "Descobre um fóssil enterrado em ruínas ancestrais", - "advancements.cobblemon.evolve_gholdengo_netherite": "Cover thee in Debris", - "advancements.cobblemon.evolve_gholdengo_netherite.description": "Evolve a Gimmighoul into a fully netherite-coated Gholdengo", - "advancements.cobblemon.resurrect_pokemon": "Life Finds a Way", + "advancements.cobblemon.evolve_gholdengo_netherite": "Cobre-te em Detritos", + "advancements.cobblemon.evolve_gholdengo_netherite.description": "Evolui um Gimmighoul para um Gholdengo totalmente revestido em netherite", + "advancements.cobblemon.resurrect_pokemon": "A Vida Encontra um Caminho", "advancements.cobblemon.resurrect_pokemon.description": "Obtém um Pokémon Fóssil a partir de uma Máquina de Ressurreição", - "advancements.cobblemon.obtain_tumblestone": "The Rolling Stone", - "advancements.cobblemon.obtain_tumblestone.description": "Safely extract a Tumblestone from suspicious sand or gravel", - "advancements.cobblemon.grow_tumblestone": "Tumbling Down", - "advancements.cobblemon.grow_tumblestone.description": "Place a Tumblestone near Lava or Magma to grow it over time", - "advancements.cobblemon.craft_ancient_balls": "A true Antiquarian", - "advancements.cobblemon.craft_ancient_balls.description": "Utilize Tumblestones to craft all fifteen Ancient Balls", + "advancements.cobblemon.obtain_tumblestone": "De Volta ao Passado", + "advancements.cobblemon.obtain_tumblestone.description": "Extrai com segurança um Seixo de areia suspeita ou cascalho", + "advancements.cobblemon.grow_tumblestone": "Uma Plantação Bastante Quente", + "advancements.cobblemon.grow_tumblestone.description": "Coloca um Seixo perto de Lava ou Magma para fazê-lo crescer com o tempo", + "advancements.cobblemon.craft_ancient_balls": "Um verdadeiro Antiquário", + "advancements.cobblemon.craft_ancient_balls.description": "Utiliza Seixos para fabricar todas as quinze Bolas Ancestrais", "cobblemon.battle.crash": "Ocorreu um erro de batalha. Se está a jogar em single-player, reporte isto à equipe de mods. Caso contrário, reporte isto ao administrador do servidor.", "cobblemon.battle.damage_dealt": "%1$s sofreu %2$s de dano!", "cobblemon.battle.used_move": "%1$s usou %2$s!", @@ -897,7 +897,7 @@ "cobblemon.battle.owned_pokemon": "%2$s de %1$s", "cobblemon.battle.fainted": "%1$s desmaiou!", "cobblemon.battle.win": "%1$s ganhou!", - "cobblemon.battle.lose": "%1$s is out of usable Pokémon!", + "cobblemon.battle.lose": "%1$s já não tem mais Pokémon disponíveis!", "cobblemon.battle.forfeit": "%1$s desistiu da batalha!", "cobblemon.battle.flee": "Fugiste da batalha.", "cobblemon.battle.switch_option": "Trocar Pokémon: ", @@ -1202,7 +1202,7 @@ "cobblemon.battle.damage.spikyshield": "%1$s foi magoado(a) pelo contacto!", "cobblemon.battle.damage.flameburst": "A rajada das chamas atingiu o(a) %1$s!", "cobblemon.battle.damage.dryskin": "%1$s foi magoado pela sua Pele Seca!", - "cobblemon.battle.damage.sandtomb": "%1$s is hurt by Sand Tomb!", + "cobblemon.battle.damage.sandtomb": "%1$s é magoado(a) pelo Túmulo de Areia!", "cobblemon.battle.end.bind": "%1$s já não está a ser espremido!", "cobblemon.battle.end.wrap": "%1$s libertou-se da constrição!", "cobblemon.battle.end.magnetrise": "O eletromagnetismo do(a) %1$s acabou!", @@ -1293,7 +1293,7 @@ "cobblemon.battle.enditem.whiteherb": "%1$s voltou ao seu estado normal graças à sua Erva Branca!", "cobblemon.battle.enditem.corrosivegas": "%3$s corroeu o(a) %2$s do(a) %1$s!", "cobblemon.battle.enditem.stealeat": "%3$s roubou e comeu o(a) %2$s do seu alvo!", - "cobblemon.battle.enditem.cellbattery": "%1$s used its Cell Battery!", + "cobblemon.battle.enditem.cellbattery": "%1$s usou a sua Pilha!", "cobblemon.battle.enditem.ejectbutton": "%1$s foi mandado(a) para fora com o Botão de Fuga!", "cobblemon.battle.enditem.snowball": "%1$s usou a sua Bola de Neve!", "cobblemon.battle.heal.zeffect": "O HP do(a) %1$s foi restaurado pelo Poder-Z!", @@ -1311,12 +1311,12 @@ "cobblemon.battle.heal.generic": "%1$s restaurou a sua própria Vida.", "cobblemon.battle.heal.bagitempotion": "Restaurou o HP do(a) %1$s", "cobblemon.battle.heal.poisonheal": "%1$s restaurou HP graças à Cura de Veneno!", - "cobblemon.battle.heal.cheekpouch": "%1$s restored HP from its Cheek Pouch!", + "cobblemon.battle.heal.cheekpouch": "%1$s restaurou HP graças à sua Bolsa de Bochechas!", "cobblemon.battle.heal.dryskin": "%1$s restaurou HP graças à sua Pela Seca!", "cobblemon.battle.heal.eartheater": "%1$s restaurou HP graças a Comedor de Terra!", "cobblemon.battle.heal.icybody": "%1$s restaurou HP graças ao seu Corpo Gelado!", - "cobblemon.battle.heal.voltabsorb": "%1$s restored HP from Volt Absorb!", - "cobblemon.battle.heal.waterabsorb": "%1$s restored HP from Water Absorb!", + "cobblemon.battle.heal.voltabsorb": "%1$s restaurou HP graças à Absorção de Volts!", + "cobblemon.battle.heal.waterabsorb": "%1$s restaurou HP graças à Absorção de Água!", "cobblemon.battle.curestatus.naturalcure": "%1$s foi curado por Cura Natural!", "cobblemon.battle.bagitem.use": "O(A) %2$s do(a) %1$s foi usado(a) no(a) %3$s!", "cobblemon.battle.bagitem.cannot": "Tu não podes usar itens agora.", @@ -1435,12 +1435,12 @@ "block.cobblemon.deepslate_thunder_stone_ore": "Minério de Pedra de Trovão de ardósia", "block.cobblemon.deepslate_water_stone_ore": "Minério de Pedra de Água de ardósia", "block.cobblemon.dripstone_moon_stone_ore": "Minério de Pedra da Lua de espeleotema", - "block.cobblemon.nether_fire_stone_ore": "Nether Fire Stone Ore", - "block.cobblemon.terracotta_sun_stone_ore": "Terracotta Sun Stone Ore", + "block.cobblemon.nether_fire_stone_ore": "Minério de Pedra de Fogo do Nether", + "block.cobblemon.terracotta_sun_stone_ore": "Minério de Pedra do Sol de Terracota", "block.cobblemon.pasture": "Bloco de Pastagem", "gamerule.doPokemonSpawning": "Gerar Pokémon", "gamerule.doShinyStarters": "Iniciantes serão brilhantes", - "gamerule.doPokemonLoot": "Drop Pokémon Loot", + "gamerule.doPokemonLoot": "Dropar o Loot de Pokémon", "cobblemon.command.checkspawns.invalid-bucket": "Categoria Inválida de Geração", "cobblemon.command.checkspawns.spawns": "Gerações", "cobblemon.command.checkspawns.nothing": "Nada pode gerar aqui neste momento.", @@ -1462,9 +1462,9 @@ "tag.item.cobblemon.held.destiny_knot": "Nós do Destino", "tag.item.cobblemon.held.everstone": "Pedras Eternas", "tag.item.cobblemon.held.experience_share": "Partilhas de Experiência", - "tag.item.cobblemon.held.consumed_in_npc_battle": "Held Items consumed in NPC Battles", - "tag.item.cobblemon.held.consumed_in_pvp_battle": "Held Items consumed in PvP Battles", - "tag.item.cobblemon.held.consumed_in_wild_battle": "Held Items consumed in Wild Battles", + "tag.item.cobblemon.held.consumed_in_npc_battle": "Equipamentos consumidos em Batalhas NPC", + "tag.item.cobblemon.held.consumed_in_pvp_battle": "Equipamentos consumidos em Batalhas PvP", + "tag.item.cobblemon.held.consumed_in_wild_battle": "Equipamentos consumidos nas Batalhas Selvagens", "tag.item.cobblemon.held.is_held_item": "Equipamentos", "tag.item.cobblemon.held.lucky_egg": "Ovos sortudos", "tag.item.cobblemon.held.power_anklet": "Tornozeleiras do Poder", @@ -1483,55 +1483,55 @@ "tag.item.cobblemon.zinc_ingredients": "Ingredientes de Zinco", "tag.item.cobblemon.seeds": "Sementes", "tag.item.cobblemon.boats": "Barcos", - "tag.item.cobblemon.hanging_signs": "Hanging Signs", - "tag.item.cobblemon.signs": "Signs", - "tag.item.cobblemon.dawn_stone_ores": "Dawn Stone Ores", - "tag.item.cobblemon.dusk_stone_ores": "Dusk Stone Ores", - "tag.item.cobblemon.fire_stone_ores": "Fire Stone Ores", - "tag.item.cobblemon.ice_stone_ores": "Ice Stone Ores", - "tag.item.cobblemon.leaf_stone_ores": "Leaf Stone Ores", - "tag.item.cobblemon.shiny_stone_ores": "Shiny Stone Ores", - "tag.item.cobblemon.moon_stone_ores": "Moon Stone Ores", - "tag.item.cobblemon.sun_stone_ores": "Sun Stone Ores", - "tag.item.cobblemon.thunder_stone_ores": "Thunder Stone Ores", - "tag.item.cobblemon.water_stone_ores": "Water Stone Ores", - "tag.item.cobblemon.fossil_machine_parts": "Fossil Machine Parts", + "tag.item.cobblemon.hanging_signs": "Tabuletas Penduradas", + "tag.item.cobblemon.signs": "Tabuletas", + "tag.item.cobblemon.dawn_stone_ores": "Minérios de Pedra do Amanhecer", + "tag.item.cobblemon.dusk_stone_ores": "Minérios de Pedra do Crepúsculo", + "tag.item.cobblemon.fire_stone_ores": "Minérios de Pedra de Fogo", + "tag.item.cobblemon.ice_stone_ores": "Minérios de Pedra de Gelo", + "tag.item.cobblemon.leaf_stone_ores": "Minérios de Pedra de Folha", + "tag.item.cobblemon.shiny_stone_ores": "Minérios de Pedra Brilhante", + "tag.item.cobblemon.moon_stone_ores": "Minérios de Pedra da Lua", + "tag.item.cobblemon.sun_stone_ores": "Minérios de Pedra do Sol", + "tag.item.cobblemon.thunder_stone_ores": "Minérios de Pedra de Trovão", + "tag.item.cobblemon.water_stone_ores": "Minérios de Pedra de Água", + "tag.item.cobblemon.fossil_machine_parts": "Peças de Máquina de Fósseis", "tag.item.cobblemon.machines": "Máquinas", "tag.item.cobblemon.poke_balls": "Pokébolas", "tag.item.cobblemon.apricorn_poke_balls": "Pokébolas de Bolotas", "tag.item.cobblemon.ancient_poke_balls": "Pokébolas Ancestrais", - "tag.item.cobblemon.tier_1_poke_balls": "Copper Tier Poké Balls", - "tag.item.cobblemon.tier_2_poke_balls": "Iron Tier Poké Balls", - "tag.item.cobblemon.tier_3_poke_balls": "Gold Tier Poké Balls", - "tag.item.cobblemon.tier_4_poke_balls": "Diamond Tier Poké Balls", - "tag.item.cobblemon.tier_5_poke_balls": "Nether Star Tier Poké Balls", - "tag.item.cobblemon.tier_1_poke_ball_materials": "Copper Tier Poké Ball Materials", - "tag.item.cobblemon.tier_2_poke_ball_materials": "Iron Tier Poké Ball Materials", - "tag.item.cobblemon.tier_3_poke_ball_materials": "Gold Tier Poké Ball Materials", - "tag.item.cobblemon.tier_4_poke_ball_materials": "Diamond Tier Poké Ball Materials", + "tag.item.cobblemon.tier_1_poke_balls": "Pokébolas Nível de Cobre", + "tag.item.cobblemon.tier_2_poke_balls": "Pokébolas Nível de Ferro", + "tag.item.cobblemon.tier_3_poke_balls": "Pokébolas Nível de Ouro", + "tag.item.cobblemon.tier_4_poke_balls": "Pokébolas Nível de Diamante", + "tag.item.cobblemon.tier_5_poke_balls": "Pokébolas Nível de Estrela do Nether", + "tag.item.cobblemon.tier_1_poke_ball_materials": "Materiais de Pokébola Nível de Cobre", + "tag.item.cobblemon.tier_2_poke_ball_materials": "Materiais de Pokébola Nível de Ferro", + "tag.item.cobblemon.tier_3_poke_ball_materials": "Materiais de Pokébola Nível de Ouro", + "tag.item.cobblemon.tier_4_poke_ball_materials": "Materiais de Pokébola Nível de Diamante", "tag.item.cobblemon.potions": "Poções", - "tag.item.cobblemon.ethers": "Ethers and Elixirs", + "tag.item.cobblemon.ethers": "Éteres e Elixires", "tag.item.cobblemon.remedies": "Remédios", - "tag.item.cobblemon.restores": "Restores", - "tag.item.cobblemon.revives": "Revives", - "tag.item.cobblemon.x_items": "X Battle Items", + "tag.item.cobblemon.restores": "Restauradores", + "tag.item.cobblemon.revives": "Reviveres", + "tag.item.cobblemon.x_items": "Itens de Batalha X", "tag.item.cobblemon.vitamins": "Vitaminas", - "tag.item.cobblemon.tumblestones": "Tumblestones", - "tag.item.cobblemon.red_tumblestones": "Tumblestones", - "tag.item.cobblemon.black_tumblestones": "Black Tumblestones", - "tag.item.cobblemon.sky_tumblestones": "Sky Tumblestones", + "tag.item.cobblemon.tumblestones": "Seixos", + "tag.item.cobblemon.red_tumblestones": "Seixos", + "tag.item.cobblemon.black_tumblestones": "Seixos Pretos", + "tag.item.cobblemon.sky_tumblestones": "Seixos do Céu", "tag.item.cobblemon.apples": "Maçãs", "tag.item.cobblemon.deep_seas": "Itens do Fundo do Mar", "tag.item.cobblemon.sweets": "Doces", - "tag.item.cobblemon.teapots": "Teapots", - "tag.item.cobblemon.teacups": "Teacups", + "tag.item.cobblemon.teapots": "Bules", + "tag.item.cobblemon.teacups": "Chávenas de Chá", "tag.item.cobblemon.raw_meat": "Carne Crua", - "tag.item.cobblemon.cooked_meat": "Cooked Meat", + "tag.item.cobblemon.cooked_meat": "Carne Assada", "tag.item.cobblemon.fossils": "Fósseis", - "tag.item.cobblemon.held.leaves_leftovers": "Leftover Foods", - "tag.item.cobblemon.decorated_pot_sherds": "Decorated Pot Sherds", + "tag.item.cobblemon.held.leaves_leftovers": "Alimentos de Sobra", + "tag.item.cobblemon.decorated_pot_sherds": "Fragmentos de Pote Decorados", "tag.item.cobblemon.type_gems": "Gemas de Tipos", "tag.item.cobblemon.feathers": "Penas", - "tag.item.cobblemon.ability_changers": "Ability Changers", - "tag.item.cobblemon.held.is_friendship_booster": "Friendship Boosters" + "tag.item.cobblemon.ability_changers": "Modificadores de Habilidade", + "tag.item.cobblemon.held.is_friendship_booster": "Propulsores de Amizade" } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json index ef5e1015dc..bda77453ef 100644 --- a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json +++ b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json @@ -643,7 +643,7 @@ "cobblemon.pc.inbattle": "Вы не можете использовать ПК во время битвы!", "cobblemon.held_item": "Предмет", - "cobblemon.held_item.give": "%Вы дали 1$s %2$s.", + "cobblemon.held_item.give": "Вы дали %1$s %2$s.", "cobblemon.held_item.replace": "Вы забрали %1$s у %2$s и дали %3$s.", "cobblemon.held_item.take": "Вы забрали %1$s у %2$s.", "cobblemon.held_item.already_holding": "%1$s уже держит %2$s!", @@ -4792,7 +4792,7 @@ "cobblemon.species.diggersby.desc": "The fur on its belly retains heat exceptionally well. People used to make heavy winter clothing from fur shed by this Pokémon.", "cobblemon.species.fletchling.name": "Флетчлинг", "cobblemon.species.fletchling.desc": "When this Pokémon gets excited, its body temperature increases sharply. If you touch a Fletchling with bare hands, you might get burned.", - "cobblemon.species.fletchinder.name": "Флетчлинг", + "cobblemon.species.fletchinder.name": "Флетчлиндер", "cobblemon.species.fletchinder.desc": "Fletchinder are exceedingly territorial and aggressive. These Pokémon fight among themselves over feeding grounds.", "cobblemon.species.talonflame.name": "Талонфлейм", "cobblemon.species.talonflame.desc": "Talonflame dives toward prey at speeds of up to 310 mph and assaults them with powerful kicks, giving the prey no chance to escape.", diff --git a/common/src/main/resources/assets/cobblemon/lang/zh_cn.json b/common/src/main/resources/assets/cobblemon/lang/zh_cn.json index 2f8b6c1fef..59ccde1d58 100644 --- a/common/src/main/resources/assets/cobblemon/lang/zh_cn.json +++ b/common/src/main/resources/assets/cobblemon/lang/zh_cn.json @@ -31,6 +31,22 @@ "item.cobblemon.park_ball": "公园球", "item.cobblemon.dream_ball": "梦境球", "item.cobblemon.beast_ball": "究极球", + "item.cobblemon.ancient_poke_ball": "古代精灵球", + "item.cobblemon.ancient_citrine_ball": "古代精灵球（黄）", + "item.cobblemon.ancient_verdant_ball": "古代精灵球（绿）", + "item.cobblemon.ancient_azure_ball": "古代精灵球（蓝）", + "item.cobblemon.ancient_roseate_ball": "古代精灵球（粉）", + "item.cobblemon.ancient_slate_ball": "古代精灵球（黑）", + "item.cobblemon.ancient_ivory_ball": "古代精灵球（白）", + "item.cobblemon.ancient_great_ball": "古代超级球", + "item.cobblemon.ancient_ultra_ball": "古代高级球", + "item.cobblemon.ancient_heavy_ball": "古代沉重球", + "item.cobblemon.ancient_leaden_ball": "超重球", + "item.cobblemon.ancient_gigaton_ball": "巨重球", + "item.cobblemon.ancient_feather_ball": "飞羽球", + "item.cobblemon.ancient_wing_ball": "飞翼球", + "item.cobblemon.ancient_jet_ball": "飞梭球", + "item.cobblemon.ancient_origin_ball": "起源球", "item.cobblemon.black_apricorn_seed": "黑球果树芽", "item.cobblemon.blue_apricorn_seed": "蓝球果树芽", "item.cobblemon.green_apricorn_seed": "绿球果树芽", @@ -74,6 +90,8 @@ "item.cobblemon.ribbon_sweet": "蝴蝶结糖饰", "item.cobblemon.chipped_pot": "缺损的茶壶", "item.cobblemon.cracked_pot": "破裂的茶壶", + "item.cobblemon.masterpiece_teacup": "杰作茶碗", + "item.cobblemon.unremarkable_teacup": "凡作茶碗", "item.cobblemon.sweet_apple": "甜甜苹果", "item.cobblemon.tart_apple": "酸酸苹果", "item.cobblemon.galarica_cuff": "伽勒豆蔻手环", @@ -107,6 +125,14 @@ "item.cobblemon.hyper_potion": "厉害伤药", "item.cobblemon.max_potion": "全满药", "item.cobblemon.full_restore": "全复药", + "item.cobblemon.health_feather": "体力之羽", + "item.cobblemon.muscle_feather": "肌力之羽", + "item.cobblemon.resist_feather": "抵抗之羽", + "item.cobblemon.genius_feather": "智力之羽", + "item.cobblemon.clever_feather": "精神之羽", + "item.cobblemon.swift_feather": "瞬发之羽", + "item.cobblemon.ability_capsule": "特性胶囊", + "item.cobblemon.ability_patch": "特性膏药", "item.cobblemon.red_mint_leaf": "红色薄荷叶", "item.cobblemon.red_mint_leaf.tooltip": "能够影响宝可梦的攻击能力值", "item.cobblemon.blue_mint_leaf": "蓝色薄荷叶", @@ -140,44 +166,82 @@ "item.cobblemon.jolly_mint": "爽朗薄荷", "item.cobblemon.naive_mint": "天真薄荷", "item.cobblemon.serious_mint": "认真薄荷", + "item.cobblemon.ability_shield": "特性护具", + "item.cobblemon.absorb_bulb": "球根", + "item.cobblemon.air_balloon": "气球", "item.cobblemon.assault_vest": "突击背心", "item.cobblemon.auspicious_armor": "庆祝之铠", "item.cobblemon.malicious_armor": "咒术之铠", + "item.cobblemon.binding_band": "紧绑束带", "item.cobblemon.black_belt": "黑带", "item.cobblemon.black_glasses": "黑色眼镜", "item.cobblemon.black_sludge": "黑色污泥", + "item.cobblemon.blunder_policy": "打空保险", + "item.cobblemon.cell_battery": "充电电池", "item.cobblemon.charcoal_stick": "木炭条", "item.cobblemon.choice_band": "讲究头带", "item.cobblemon.choice_scarf": "讲究围巾", "item.cobblemon.choice_specs": "讲究眼镜", "item.cobblemon.cleanse_tag": "洁净之符", + "item.cobblemon.clear_amulet": "清净坠饰", + "item.cobblemon.covert_cloak": "密探斗篷", "item.cobblemon.dragon_fang": "龙之牙", + "item.cobblemon.eject_button": "逃脱按键", + "item.cobblemon.eject_pack": "避难背包", + "item.cobblemon.everstone": "不变之石", + "item.cobblemon.eviolite": "进化奇石", "item.cobblemon.exp_share": "学习装置", + "item.cobblemon.expert_belt": "达人带", "item.cobblemon.fairy_feather": "妖精之羽", + "item.cobblemon.float_stone": "轻石", "item.cobblemon.focus_band": "气势头带", + "item.cobblemon.focus_sash": "气势披带", + "item.cobblemon.grip_claw": "紧缠钩爪", "item.cobblemon.hard_stone": "硬石头", "item.cobblemon.heavy_duty_boots": "厚底靴", + "item.cobblemon.iron_ball": "黑色铁球", + "item.cobblemon.lagging_tail": "后攻之尾", "item.cobblemon.leftovers": "吃剩的东西", + "item.cobblemon.light_ball": "电气球", "item.cobblemon.light_clay": "光之黏土", + "item.cobblemon.loaded_dice": "机变骰子", "item.cobblemon.lucky_egg": "幸运蛋", + "item.cobblemon.luminous_moss": "光苔", "item.cobblemon.magnet": "磁铁", + "item.cobblemon.metronome": "节拍器", "item.cobblemon.miracle_seed": "奇迹种子", "item.cobblemon.muscle_band": "力量头带", "item.cobblemon.mystic_water": "神秘水滴", "item.cobblemon.never_melt_ice": "不融冰", "item.cobblemon.poison_barb": "毒针", + "item.cobblemon.protective_pads": "部位护具", + "item.cobblemon.punching_glove": "拳击手套", "item.cobblemon.quick_claw": "先制之爪", "item.cobblemon.razor_claw": "锐利之爪", "item.cobblemon.razor_fang": "锐利之牙", + "item.cobblemon.red_card": "红牌", + "item.cobblemon.ring_target": "标靶", "item.cobblemon.rocky_helmet": "凸凸头盔", + "item.cobblemon.room_service": "客房服务", "item.cobblemon.safety_goggles": "防尘护目镜", + "item.cobblemon.scope_lens": "焦点镜", "item.cobblemon.sharp_beak": "锐利鸟嘴", + "item.cobblemon.shed_shell": "美丽空壳", + "item.cobblemon.shell_bell": "贝壳之铃", "item.cobblemon.silk_scarf": "丝绸围巾", "item.cobblemon.silver_powder": "银粉", "item.cobblemon.soft_sand": "柔软沙子", + "item.cobblemon.soothe_bell": "安抚之铃", "item.cobblemon.spell_tag": "诅咒之符", + "item.cobblemon.sticky_barb": "附着针", + "item.cobblemon.terrain_extender": "大地膜", + "item.cobblemon.throat_spray": "爽喉喷雾", "item.cobblemon.twisted_spoon": "弯曲的汤匙", + "item.cobblemon.utility_umbrella": "万能伞", + "item.cobblemon.weakness_policy": "弱点保险", + "item.cobblemon.wide_lens": "广角镜", "item.cobblemon.wise_glasses": "博识眼镜", + "item.cobblemon.zoom_lens": "对焦镜", "item.cobblemon.mental_herb": "心灵香草", "item.cobblemon.mirror_herb": "模仿香草", "item.cobblemon.power_herb": "强力香草", @@ -186,7 +250,6 @@ "item.cobblemon.metal_powder": "金属粉", "item.cobblemon.quick_powder": "速度粉", "item.cobblemon.destiny_knot": "红线", - "item.cobblemon.everstone": "不变之石", "item.cobblemon.power_anklet": "力量护裸", "item.cobblemon.power_band": "力量束带", "item.cobblemon.power_belt": "力量腰带", @@ -198,6 +261,10 @@ "item.cobblemon.smoke_ball": "烟雾球", "item.cobblemon.toxic_orb": "剧毒宝珠", "item.cobblemon.life_orb": "生命宝珠", + "item.cobblemon.damp_rock": "潮湿岩石", + "item.cobblemon.heat_rock": "炽热岩石", + "item.cobblemon.smooth_rock": "沙沙岩石", + "item.cobblemon.icy_rock": "冰冷岩石", "item.cobblemon.poke_ball.tooltip": "普通的精灵球。捕获率×1。", "item.cobblemon.slate_ball.tooltip": "黑色的精灵球。捕获率×1。", "item.cobblemon.azure_ball.tooltip": "蓝色的精灵球。捕获率×1。", @@ -230,6 +297,22 @@ "item.cobblemon.park_ball.tooltip": "在分类为森林或平原的生物群系内使用时，捕获率×1.5。", "item.cobblemon.dream_ball.tooltip": "若目标进入睡眠，捕获率×4。", "item.cobblemon.beast_ball.tooltip": "若目标是究极异兽，捕获率×5，否则捕获率×0.1。", + "item.cobblemon.ancient_poke_ball.tooltip": "不可思议的球。捕获率×1。", + "item.cobblemon.ancient_citrine_ball.tooltip": "不可思议的球。捕获率×1。", + "item.cobblemon.ancient_verdant_ball.tooltip": "不可思议的球。捕获率×1。", + "item.cobblemon.ancient_azure_ball.tooltip": "不可思议的球。捕获率×1。", + "item.cobblemon.ancient_roseate_ball.tooltip": "不可思议的球。捕获率×1。", + "item.cobblemon.ancient_slate_ball.tooltip": "不可思议的球。捕获率×1。", + "item.cobblemon.ancient_ivory_ball.tooltip": "不可思议的球。捕获率×1。", + "item.cobblemon.ancient_great_ball.tooltip": "性能还算不错的，不可思议的球。捕获率×1.5。", + "item.cobblemon.ancient_ultra_ball.tooltip": "性能非常不错的，不可思议的球。捕获率×2。", + "item.cobblemon.ancient_feather_ball.tooltip": "能直线高速飞行的球。捕获率×1。", + "item.cobblemon.ancient_wing_ball.tooltip": "强化后的，能直线高速飞行的球。捕获率×1.5。", + "item.cobblemon.ancient_jet_ball.tooltip": "强化到最高阶的，能直线高速飞行的球。捕获率×2。", + "item.cobblemon.ancient_heavy_ball.tooltip": "沉重而无法远投的球。捕获率×1。", + "item.cobblemon.ancient_leaden_ball.tooltip": "强化后的，沉重而无法远投的球。捕获率×1.5。", + "item.cobblemon.ancient_gigaton_ball.tooltip": "强化到最高阶的，沉重而无法远投的球。捕获率×2。", + "item.cobblemon.ancient_origin_ball.tooltip": "独一无二的特殊精灵球。必定能捕获野生宝可梦。", "item.cobblemon.mulch_base": "肥料", "item.cobblemon.coarse_mulch": "粗糙肥", "item.cobblemon.growth_mulch": "速速肥", @@ -274,12 +357,75 @@ "item.cobblemon.max_ether": "PP单项全补剂", "item.cobblemon.elixir": "PP多项小补剂", "item.cobblemon.max_elixir": "PP多项全补剂", + "item.cobblemon.normal_gem": "一般宝石", + "item.cobblemon.water_gem": "水之宝石", + "item.cobblemon.fire_gem": "火之宝石", + "item.cobblemon.grass_gem": "草之宝石", + "item.cobblemon.dragon_gem": "龙之宝石", + "item.cobblemon.ghost_gem": "幽灵宝石", + "item.cobblemon.ground_gem": "地面宝石", + "item.cobblemon.steel_gem": "钢之宝石", + "item.cobblemon.fairy_gem": "妖精宝石", + "item.cobblemon.rock_gem": "岩石宝石", + "item.cobblemon.psychic_gem": "超能力宝石", + "item.cobblemon.electric_gem": "电之宝石", + "item.cobblemon.bug_gem": "虫之宝石", + "item.cobblemon.poison_gem": "毒之宝石", + "item.cobblemon.ice_gem": "冰之宝石", + "item.cobblemon.dark_gem": "恶之宝石", + "item.cobblemon.fighting_gem": "格斗宝石", + "item.cobblemon.flying_gem": "飞行宝石", + "item.cobblemon.armor_fossil": "盾甲化石", + "item.cobblemon.fossilized_bird": "化石鸟", + "item.cobblemon.claw_fossil": "爪子化石", + "item.cobblemon.cover_fossil": "背盖化石", + "item.cobblemon.fossilized_dino": "化石海兽", + "item.cobblemon.dome_fossil": "甲壳化石", + "item.cobblemon.fossilized_drake": "化石龙", + "item.cobblemon.fossilized_fish": "化石鱼", + "item.cobblemon.helix_fossil": "贝壳化石", + "item.cobblemon.jaw_fossil": "颚之化石", + "item.cobblemon.old_amber_fossil": "秘密琥珀", + "item.cobblemon.plume_fossil": "羽毛化石", + "item.cobblemon.root_fossil": "根状化石", + "item.cobblemon.sail_fossil": "鳍之化石", + "item.cobblemon.skull_fossil": "头盖化石", + "item.cobblemon.bygone_sherd": "往事纹样陶片", + "item.cobblemon.capture_sherd": "捕获纹样陶片", + "item.cobblemon.dome_sherd": "甲壳纹样陶片", + "item.cobblemon.helix_sherd": "贝壳纹样陶片", + "item.cobblemon.nostalgic_sherd": "怀旧纹样陶片", + "item.cobblemon.suspicious_sherd": "可疑纹样陶片", + "item.cobblemon.tumblestone": "玉石", + "item.cobblemon.black_tumblestone": "黑玉石", + "item.cobblemon.sky_tumblestone": "天蓝玉石", + "item.cobblemon.relic_coin": "遗迹硬币", + "block.cobblemon.relic_coin_pouch": "遗迹硬币袋", + "block.cobblemon.relic_coin_sack": "遗迹硬币包", + "trim_pattern.cobblemon.automaton": "魔像盔甲纹饰", + "cobblemon.fossil.armor": "盾甲", + "cobblemon.fossil.bird": "鸟", + "cobblemon.fossil.claw": "爪子", + "cobblemon.fossil.cover": "背盖", + "cobblemon.fossil.dino": "海兽", + "cobblemon.fossil.dome": "甲壳", + "cobblemon.fossil.drake": "龙", + "cobblemon.fossil.fish": "鱼", + "cobblemon.fossil.helix": "贝壳", + "cobblemon.fossil.jaw": "颚", + "cobblemon.fossil.old_amber": "琥珀", + "cobblemon.fossil.plume": "羽毛", + "cobblemon.fossil.root": "根", + "cobblemon.fossil.sail": "鳍", + "cobblemon.fossil.skull": "头盖", + "cobblemon.fossilmachine.protected": "这个化石是%s的东西！", "itemGroup.cobblemon.blocks": "方块", "itemGroup.cobblemon.pokeball": "精灵球", "itemGroup.cobblemon.agriculture": "农业", "itemGroup.cobblemon.consumables": "消耗品", "itemGroup.cobblemon.held_item": "携带道具", "itemGroup.cobblemon.evolution_item": "进化道具", + "itemGroup.cobblemon.archaeology": "考古", "block.cobblemon.apricorn_log": "球果原木", "block.cobblemon.stripped_apricorn_log": "去皮球果原木", "block.cobblemon.apricorn_wood": "球果木", @@ -308,6 +454,9 @@ "block.cobblemon.healing_machine.tooltip1": "放置后需等候充能才能使用。", "block.cobblemon.healing_machine.tooltip2": "随时间经过自动充能。", "block.cobblemon.pc": "电脑", + "block.cobblemon.restoration_tank": "复原培养皿", + "block.cobblemon.fossil_analyzer": "化石分析仪", + "block.cobblemon.monitor": "数据显示器", "block.cobblemon.red_mint": "红色薄荷种子", "block.cobblemon.blue_mint": "蓝色薄荷种子", "block.cobblemon.cyan_mint": "青色薄荷种子", @@ -317,6 +466,30 @@ "block.cobblemon.vivichoke_seeds": "活力蕾种子", "block.cobblemon.pep_up_flower": "PP草", "block.cobblemon.potted_pep_up_flower": "PP草盆栽", + "block.cobblemon.gilded_chest": "宝箱", + "block.cobblemon.gimmighoul_chest": "索财灵宝箱", + "block.cobblemon.blue_gilded_chest": "蓝色宝箱", + "block.cobblemon.yellow_gilded_chest": "黄色宝箱", + "block.cobblemon.pink_gilded_chest": "粉红色宝箱", + "block.cobblemon.black_gilded_chest": "黑色宝箱", + "block.cobblemon.green_gilded_chest": "绿色宝箱", + "block.cobblemon.white_gilded_chest": "白色宝箱", + "block.cobblemon.display_case": "展示柜", + "block.cobblemon.small_budding_tumblestone": "小型玉石芽", + "block.cobblemon.medium_budding_tumblestone": "中型玉石芽", + "block.cobblemon.large_budding_tumblestone": "大型玉石芽", + "block.cobblemon.tumblestone_cluster": "玉石簇", + "block.cobblemon.tumblestone_block": "玉石块", + "block.cobblemon.small_budding_sky_tumblestone": "小型天蓝玉石芽", + "block.cobblemon.medium_budding_sky_tumblestone": "中型天蓝玉石芽", + "block.cobblemon.large_budding_sky_tumblestone": "大型天蓝玉石芽", + "block.cobblemon.sky_tumblestone_cluster": "天蓝玉石簇", + "block.cobblemon.sky_tumblestone_block": "天蓝玉石块", + "block.cobblemon.small_budding_black_tumblestone": "小型黑玉石芽", + "block.cobblemon.medium_budding_black_tumblestone": "中型黑玉石芽", + "block.cobblemon.large_budding_black_tumblestone": "大型黑玉石芽", + "block.cobblemon.black_tumblestone_cluster": "黑玉石簇", + "block.cobblemon.black_tumblestone_block": "黑玉石块", "cobblemon.overflow_no_pc": "你的同行队伍已满，并且你尚未拥有电脑！", "cobblemon.overflow_no_space": "你的同行队伍和%1$s都已经满了！", "cobblemon.overflow_to_pc": "你的同行队伍已满！已将%1$s送到%2$s里。", @@ -326,6 +499,7 @@ "cobblemon.command.clearparty.nonethere": "%1$s的队伍中没有宝可梦。", "cobblemon.command.clearparty.cleared": "已清空了%1$s的队伍。", "cobblemon.command.clearpc.cleared": "已清空了 %1$s的电脑", + "cobblemon.command.dialogue.invalid-dialogue": "无效的对话标识", "cobblemon.ui.generic.yes": "确定", "cobblemon.ui.generic.no": "取消", "cobblemon.ui.pokenav.title": "宝可导航", @@ -335,6 +509,7 @@ "cobblemon.ui.starter.alreadyselected": "你已经选择过最初的伙伴了！", "cobblemon.ui.starter.cannotchoose": "你暂时还不能选择最初的伙伴。", "cobblemon.ui.starter.hasalreadychosen": "%1$s已经选择过最初的伙伴了。", + "cobblemon.ui.starter.skippedchoosing": "你還沒有选择最初的伙伴，便已獲得了宝可梦。要选择最初的伙伴，請把队伍中所有的宝可梦放進电脑，再按下 \"%1$s\"。", "cobblemon.ui.starter.choose_starter_title": "选择你最初的伙伴！", "cobblemon.ui.starter.choose_starter_description": "按下 \"%1$s\" 键", "cobblemon.ui.starter.chooseyourstarter": "按%1$s选择宝可梦，开启新的旅途！", @@ -354,6 +529,8 @@ "cobblemon.ui.stats.sp_atk": "特攻", "cobblemon.ui.stats.sp_def": "特防", "cobblemon.ui.stats.speed": "速度", + "cobblemon.ui.gold_hoard": "硬币堆", + "cobblemon.ui.netherite_hoard": "碎片堆", "cobblemon.ui.info": "信息", "cobblemon.ui.info.pokedex_number": "编号.", "cobblemon.ui.info.species": "名字", @@ -381,6 +558,11 @@ "cobblemon.ui.pasture.recall_all": "全部收回", "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)", "cobblemon.pasture.too_many_nearby": "附近有太多的宝可梦。", + "cobblemon.ui.interact.give.item": "给予携带物", + "cobblemon.ui.interact.spectate": "观战", + "cobblemon.ui.interact.trade": "交换", + "cobblemon.ui.interact.battle": "对战", + "cobblemon.ui.interact.mount.shoulder": "背上", "key.cobblemon.upshiftparty": "上移同行宝可梦", "key.cobblemon.downshiftparty": "下移同行宝可梦", "key.cobblemon.hideparty": "隐藏同行宝可梦栏", @@ -388,7 +570,26 @@ "key.cobblemon.pokenavigator": "打开宝可导航", "key.cobblemon.summary": "查看能力", "key.cobblemon.categories.cobblemon": "方块宝可梦", - "cobblemon.subtitle.capture_succeeded": "捕获成功！", + "key.cobblemon.scaleportraitup": "放大头像", + "key.cobblemon.scaleportraitdown": "缩小头像", + "key.cobblemon.translateportraitup": "上移头像", + "key.cobblemon.translateportraitdown": "下移头像", + "key.cobblemon.translateportraitleft": "左移头像", + "key.cobblemon.translateportraitright": "右移头像", + "key.cobblemon.printmodelsettings": "显示模型设定", + "key.cobblemon.categories.cobblemon.debug": "模组调试", + "cobblemon.subtitle.poke_ball.capture_succeeded": "捕获成功", + "cobblemon.subtitle.fossilmachine.activate": "化石复原机启动", + "cobblemon.subtitle.fossilmachine.active_loop": "化石复原机运行中", + "cobblemon.subtitle.fossilmachine.dna_full": "填满复原培养皿", + "cobblemon.subtitle.fossilmachine.finished": "化石复原机运行完毕", + "cobblemon.subtitle.fossilmachine.insert_dna": "注入培养液", + "cobblemon.subtitle.fossilmachine.insert_dna_small": "注入少量培养液", + "cobblemon.subtitle.fossilmachine.insert_fossil": "放入化石", + "cobblemon.subtitle.fossilmachine.retrieve_fossil": "取出化石", + "cobblemon.subtitle.fossilmachine.retrieve_pokemon": "取出化石宝可梦", + "cobblemon.subtitle.fossilmachine.unprotected": "化石复原机的保护期结束", + "cobblemon.subtitle.fossilmachine.assemble": "化石复原机组成", "cobblemon.healingmachine.alreadyinuse": "这台治疗仪正在使用当中！", "cobblemon.healingmachine.nopokemon": "你的队伍里没有任何宝可梦，无法治疗！", "cobblemon.healingmachine.alreadyhealed": "你的同行宝可梦已经精力充沛了！", @@ -418,6 +619,8 @@ "cobblemon.battle.ui.switch": "宝可梦", "cobblemon.battle.ui.capture": "捕捉", "cobblemon.battle.ui.run": "逃走", + "cobblemon.battle.ui.forfeit": "弃权", + "cobblemon.battle.ui.forfeit_confirmation": "放弃对战会让你被认定为败者。 确定要这样做吗？", "cobblemon.battle.ui.hide_label": "按下%1$s来移动你的角色。", "cobblemon.battle.ui.actions_label": "请选择你接下来的行动。可按%1$s返回对战页面。", "cobblemon.ui.evolve": "进化", @@ -432,6 +635,7 @@ "cobblemon.drop.item.full": "你的物品栏放不下更多的物品了！%1$s掉在地上了！", "cobblemon.mint.interact": "%1$s的能力值改变了！", "cobblemon.mint.same_nature": "%1$s的能力值似乎不受%2$s的影响。", + "cobblemon.ability_changer.changed": "%1$s的特性变成了%2$s！", "itemGroup.cobblemon.plants": "植物", "item.cobblemon.aguav_berry": "乐芭果", "item.cobblemon.aguav_berry.tooltip": "HP低于最大HP的1/4时发动，恢复最大HP的1/3；若为特防不容易成长的性格则会陷入混乱状态", @@ -655,8 +859,10 @@ "advancements.cobblemon.obtain_all_berries.description": "获得所有种类的树果！", "advancements.cobblemon.use_pasture": "开放世界", "advancements.cobblemon.use_pasture.description": "制作一个牧场方块，让你的朋友们出来走走", - "advancements.cobblemon.catch_all_vivillon": "彩富豪", - "advancements.cobblemon.catch_all_vivillon.description": "获得彩粉蝶的所有形态", + "advancements.cobblemon.catch_all_vivillon": "索彩灵", + "advancements.cobblemon.catch_all_vivillon.description": "获得彩粉蝶的所有形态...", + "advancements.cobblemon.catch_all_vivillon_but_actually": "彩富豪", + "advancements.cobblemon.catch_all_vivillon_but_actually.description": "真正的获得彩粉蝶的所有形态", "advancements.cobblemon.evolve_veevees": "伊布一家亲", "advancements.cobblemon.evolve_veevees.description": "将伊布进化成八种不同的形态", "advancements.cobblemon.evolve_shedinja": "脱壳机动队", @@ -671,6 +877,18 @@ "advancements.cobblemon.use_candy.description": "对一只宝可梦使用任意经验糖果", "advancements.cobblemon.own_zangoose_seviper": "冤家路窄", "advancements.cobblemon.own_zangoose_seviper.description": "在你的队伍中同时带有猫鼬斩和饭匙蛇", + "advancements.cobblemon.obtain_fossil": "查询化石状态", + "advancements.cobblemon.obtain_fossil.description": "发现埋藏在古代废墟中的化石", + "advancements.cobblemon.evolve_gholdengo_netherite": "残骸裹金", + "advancements.cobblemon.evolve_gholdengo_netherite.description": "让索财灵进化成全身覆盖了下界合金的赛富豪", + "advancements.cobblemon.resurrect_pokemon": "生命总能找到出路", + "advancements.cobblemon.resurrect_pokemon.description": "通过化石复原机取得活生生的化石宝可梦", + "advancements.cobblemon.obtain_tumblestone": "滚石", + "advancements.cobblemon.obtain_tumblestone.description": "从可疑的方块获得玉石", + "advancements.cobblemon.grow_tumblestone": "玉石趋焚", + "advancements.cobblemon.grow_tumblestone.description": "在熔岩或岩浆块旁放置一块玉石，让它慢慢生长", + "advancements.cobblemon.craft_ancient_balls": "真正的古董收藏家", + "advancements.cobblemon.craft_ancient_balls.description": "用玉石制作所有十五种古代精灵球", "cobblemon.battle.crash": "发生了对战错误。若为单人游戏，请向模组团队报告此错误；若为多人游戏则请向服务器管理员报告。", "cobblemon.battle.damage_dealt": "%1$s受到了%2$s点伤害！", "cobblemon.battle.used_move": "%1$s使出了%2$s！", @@ -679,6 +897,8 @@ "cobblemon.battle.owned_pokemon": "玩家%1$s的%2$s", "cobblemon.battle.fainted": "%1$s倒下了！", "cobblemon.battle.win": "%1$s获胜了！", + "cobblemon.battle.lose": "%1$s没有可以战斗的宝可梦！", + "cobblemon.battle.forfeit": "%1$s放弃了对战！", "cobblemon.battle.flee": "你成功逃跑了！", "cobblemon.battle.switch_option": "要替换为哪只宝可梦： ", "cobblemon.battle.your_team": "你的宝可梦队伍：", @@ -962,7 +1182,7 @@ "cobblemon.battle.damage.nightmare": "%1$s被困在了恶梦之中！", "cobblemon.battle.damage.magmastorm": "%1$s受到了熔岩风暴的伤害。", "cobblemon.battle.damage.stealthrock": "锋利的岩石扎进了%1$s！", - "cobblemon.battle.damage.highjumpkick": "%1$s撞在地上！", + "cobblemon.battle.damage.highjumpkick": "%1$s因势头过猛而撞到了地面！", "cobblemon.battle.damage.spikes": "%1$s受到了撒菱的伤害！", "cobblemon.battle.damage.recoil": "%1$s受到了反作用力造成的伤害！", "cobblemon.battle.damage.item": "%1$s因%2$s而受到了伤害！", @@ -974,13 +1194,15 @@ "cobblemon.battle.damage.clamp": "%1$s受到了贝壳夹击的伤害。", "cobblemon.battle.damage.curse": "%1$s正受到诅咒！", "cobblemon.battle.damage.firespin": "%1$s受到了火焰旋涡的伤害。", - "cobblemon.battle.damage.axekick": "%1$s撞在地上！", + "cobblemon.battle.damage.axekick": "%1$s因势头过猛而撞到了地面！", "cobblemon.battle.damage.bind": "%1$s受到了绑紧的伤害。", "cobblemon.battle.damage.baddreams": "%1$s正被恶梦缠身！", "cobblemon.battle.damage.mindblown": "%1$s消耗了自己的HP来发动招式！", "cobblemon.battle.damage.infestation": "%1$s受到了纠缠不休的伤害。", "cobblemon.battle.damage.spikyshield": "%1$s受伤了！", "cobblemon.battle.damage.flameburst": "溅射的火焰击中了%1$s！", + "cobblemon.battle.damage.dryskin": "%1$s因干燥皮肤而受到了伤害！", + "cobblemon.battle.damage.sandtomb": "%1$s受到了流沙深渊的伤害。", "cobblemon.battle.end.bind": "%1$s摆脱了紧绑！", "cobblemon.battle.end.wrap": "%1$s摆脱了紧束！", "cobblemon.battle.end.magnetrise": "%1$s的电磁浮游停止了。", @@ -1007,6 +1229,7 @@ "cobblemon.battle.end.powertrick": "%1$s互换了攻击和防御！", "cobblemon.battle.end.healblock": "%1$s的回复封锁结束了！", "cobblemon.battle.end.skydrop": "%1$s摆脱了自由落体状态！", + "cobblemon.battle.end.illusion": "%1$s造成的幻觉被解除了！", "cobblemon.battle.block.uproar": "吵闹阻止了%1$s入眠！", "cobblemon.battle.fail.substitute": "无法创造替身！", "cobblemon.battle.fail.healblock": "%1$s没有受到影响！", @@ -1070,6 +1293,9 @@ "cobblemon.battle.enditem.whiteherb": "%1$s用白色香草复原了能力！", "cobblemon.battle.enditem.corrosivegas": "%3$s把%1$s的%2$s融化了！", "cobblemon.battle.enditem.stealeat": "%3$s偷走并吃掉了对手的%2$s！", + "cobblemon.battle.enditem.cellbattery": "%1$s发动了它的充电电池！", + "cobblemon.battle.enditem.ejectbutton": "%1$s要用逃脱按键回去了！", + "cobblemon.battle.enditem.snowball": "%1$s发动了它的雪球！", "cobblemon.battle.heal.zeffect": "%1$s的体力通过Z招式回复了！", "cobblemon.battle.heal.wish": "%1$s的祈愿成真了！", "cobblemon.battle.heal.drain": "从%1$s那里吸收了体力！", @@ -1085,6 +1311,12 @@ "cobblemon.battle.heal.generic": "%1$s的体力回复了！", "cobblemon.battle.heal.bagitempotion": "恢复了%1$s的HP", "cobblemon.battle.heal.poisonheal": "毒疗恢复了%1$s的体力！", + "cobblemon.battle.heal.cheekpouch": "颊囊恢复了%1$s的体力！", + "cobblemon.battle.heal.dryskin": "干燥皮肤恢复了%1$s的体力！", + "cobblemon.battle.heal.eartheater": "食土恢复了%1$s的体力！", + "cobblemon.battle.heal.icybody": "冰冻之躯恢复了%1$s的体力！", + "cobblemon.battle.heal.voltabsorb": "蓄电恢复了%1$s的体力！", + "cobblemon.battle.heal.waterabsorb": "储水恢复了%1$s的体力！", "cobblemon.battle.curestatus.naturalcure": "%1$s的自然恢复治愈了它！", "cobblemon.battle.bagitem.use": "%1$s对%3$s使用了%2$s！", "cobblemon.battle.bagitem.cannot": "你现在不能使用道具。", @@ -1116,6 +1348,7 @@ "cobblemon.type.rock": "岩石", "cobblemon.type.poison": "毒", "cobblemon.type.dragon": "龙", + "cobblemon.terra_type.stellar": "星晶", "cobblemon.nature.hardy": "勤奋", "cobblemon.nature.lonely": "怕寂寞", "cobblemon.nature.brave": "勇敢", @@ -1152,6 +1385,7 @@ "cobblemon.starterselection.category.kalos": "卡洛斯", "cobblemon.starterselection.category.alola": "阿罗拉", "cobblemon.starterselection.category.galar": "伽勒尔", + "cobblemon.starterselection.category.hisui_bias": "洗翠", "cobblemon.starterselection.category.paldea": "帕底亚", "cobblemon.stat.hp.name": "HP", "cobblemon.stat.attack.name": "攻击", @@ -1201,9 +1435,12 @@ "block.cobblemon.deepslate_thunder_stone_ore": "深层雷之石矿石", "block.cobblemon.deepslate_water_stone_ore": "深层水之石矿石", "block.cobblemon.dripstone_moon_stone_ore": "滴水月之石矿石", + "block.cobblemon.nether_fire_stone_ore": "下界火之石矿石", + "block.cobblemon.terracotta_sun_stone_ore": "陶瓦日之石矿石", "block.cobblemon.pasture": "牧场方块", "gamerule.doPokemonSpawning": "生成宝可梦", "gamerule.doShinyStarters": "最初的伙伴将会为异色", + "gamerule.doPokemonLoot": "宝可梦能掉落战利品", "cobblemon.command.checkspawns.invalid-bucket": "无效的生成稀有度", "cobblemon.command.checkspawns.spawns": "可在此生成", "cobblemon.command.checkspawns.nothing": "没有宝可梦可以在这里生成。", @@ -1225,6 +1462,9 @@ "tag.item.cobblemon.held.destiny_knot": "红线", "tag.item.cobblemon.held.everstone": "不变之石", "tag.item.cobblemon.held.experience_share": "学习装置", + "tag.item.cobblemon.held.consumed_in_npc_battle": "持有物会在和NPC训练家的对战中被消耗", + "tag.item.cobblemon.held.consumed_in_pvp_battle": "持有物会在和其他玩家的对战中被消耗", + "tag.item.cobblemon.held.consumed_in_wild_battle": "持有物会在和野生宝可梦的对战中被消耗", "tag.item.cobblemon.held.is_held_item": "携带物品", "tag.item.cobblemon.held.lucky_egg": "幸运蛋", "tag.item.cobblemon.held.power_anklet": "力量护裸", @@ -1236,12 +1476,64 @@ "tag.item.cobblemon.herbs": "香草", "tag.item.cobblemon.mint_leaf": "薄荷叶", "tag.item.cobblemon.mints": "薄荷", + "tag.item.cobblemon.mint_seeds": "薄荷种子", "tag.item.cobblemon.mutated_berries": "突变树果", "tag.item.cobblemon.plants": "植物", - "tag.item.cobblemon.poke_balls": "精灵球", "tag.item.cobblemon.protein_ingredients": "攻击增强剂材料", "tag.item.cobblemon.zinc_ingredients": "特防增強劑材料", "tag.item.cobblemon.seeds": "种子", + "tag.item.cobblemon.boats": "船", + "tag.item.cobblemon.hanging_signs": "悬挂式告示牌", + "tag.item.cobblemon.signs": "告示牌", + "tag.item.cobblemon.dawn_stone_ores": "觉醒之石矿石", + "tag.item.cobblemon.dusk_stone_ores": "暗之石矿石", + "tag.item.cobblemon.fire_stone_ores": "火之石矿石", + "tag.item.cobblemon.ice_stone_ores": "冰之石矿石", + "tag.item.cobblemon.leaf_stone_ores": "叶之石矿石", + "tag.item.cobblemon.shiny_stone_ores": "光之石矿石", + "tag.item.cobblemon.moon_stone_ores": "月之石矿石", + "tag.item.cobblemon.sun_stone_ores": "日之石矿石", + "tag.item.cobblemon.thunder_stone_ores": "雷之石矿石", + "tag.item.cobblemon.water_stone_ores": "水之石矿石", + "tag.item.cobblemon.fossil_machine_parts": "化石复原机部件", + "tag.item.cobblemon.machines": "机器", + "tag.item.cobblemon.poke_balls": "精灵球", + "tag.item.cobblemon.apricorn_poke_balls": "球果精灵球", + "tag.item.cobblemon.ancient_poke_balls": "古代精灵球", + "tag.item.cobblemon.tier_1_poke_balls": "铜阶精灵球", + "tag.item.cobblemon.tier_2_poke_balls": "铁阶精灵球", + "tag.item.cobblemon.tier_3_poke_balls": "金阶精灵球", + "tag.item.cobblemon.tier_4_poke_balls": "钻石阶精灵球", + "tag.item.cobblemon.tier_5_poke_balls": "下界之星阶精灵球", + "tag.item.cobblemon.tier_1_poke_ball_materials": "铜阶精灵球原料", + "tag.item.cobblemon.tier_2_poke_ball_materials": "铁阶精灵球原料", + "tag.item.cobblemon.tier_3_poke_ball_materials": "金阶精灵球原料", + "tag.item.cobblemon.tier_4_poke_ball_materials": "钻石阶精灵球原料", + "tag.item.cobblemon.potions": "伤药", + "tag.item.cobblemon.ethers": "PP补充剂", + "tag.item.cobblemon.remedies": "中药", + "tag.item.cobblemon.restores": "状态治愈", + "tag.item.cobblemon.revives": "复苏道具", + "tag.item.cobblemon.x_items": "战斗道具", + "tag.item.cobblemon.vitamins": "营养饮料", + "tag.item.cobblemon.tumblestones": "玉石", + "tag.item.cobblemon.red_tumblestones": "玉石", + "tag.item.cobblemon.black_tumblestones": "黑玉石", + "tag.item.cobblemon.sky_tumblestones": "天蓝玉石", + "tag.item.cobblemon.apples": "苹果", + "tag.item.cobblemon.deep_seas": "深海道具", + "tag.item.cobblemon.sweets": "糖饰", + "tag.item.cobblemon.teapots": "茶壶", + "tag.item.cobblemon.teacups": "茶碗", + "tag.item.cobblemon.raw_meat": "生肉", + "tag.item.cobblemon.cooked_meat": "熟肉", + "tag.item.cobblemon.fossils": "化石", + "tag.item.cobblemon.held.leaves_leftovers": "能吃剩的食物", + "tag.item.cobblemon.decorated_pot_sherds": "纹样陶片", + "tag.item.cobblemon.type_gems": "屬性宝石", + "tag.item.cobblemon.feathers": "羽毛", + "tag.item.cobblemon.ability_changers": "特性更改道具", + "tag.item.cobblemon.held.is_friendship_booster": "亲密度提升道具", "cobblemon.move.absorb": "吸取", "cobblemon.move.absorb.desc": "吸取对手的养分进行攻击。可以回复给予对手伤害的一半ＨＰ。", diff --git a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json index 06fd2a4ba1..1a465122fd 100644 --- a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json +++ b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json @@ -31,6 +31,22 @@ "item.cobblemon.park_ball": "公園球", "item.cobblemon.dream_ball": "夢境球", "item.cobblemon.beast_ball": "究極球", + "item.cobblemon.ancient_poke_ball": "古代精靈球", + "item.cobblemon.ancient_citrine_ball": "古代精靈球（黃）", + "item.cobblemon.ancient_verdant_ball": "古代精靈球（綠）", + "item.cobblemon.ancient_azure_ball": "古代精靈球（藍）", + "item.cobblemon.ancient_roseate_ball": "古代精靈球（粉）", + "item.cobblemon.ancient_slate_ball": "古代精靈球（黑）", + "item.cobblemon.ancient_ivory_ball": "古代精靈球（白）", + "item.cobblemon.ancient_great_ball": "古代超級球", + "item.cobblemon.ancient_ultra_ball": "古代高級球", + "item.cobblemon.ancient_heavy_ball": "古代沉重球", + "item.cobblemon.ancient_leaden_ball": "超重球", + "item.cobblemon.ancient_gigaton_ball": "巨重球", + "item.cobblemon.ancient_feather_ball": "飛羽球", + "item.cobblemon.ancient_wing_ball": "飛翼球", + "item.cobblemon.ancient_jet_ball": "飛梭球", + "item.cobblemon.ancient_origin_ball": "起源球", "item.cobblemon.black_apricorn_seed": "黑球果樹芽", "item.cobblemon.blue_apricorn_seed": "藍球果樹芽", "item.cobblemon.green_apricorn_seed": "綠球果樹芽", @@ -74,6 +90,8 @@ "item.cobblemon.ribbon_sweet": "蝴蝶結糖飾", "item.cobblemon.chipped_pot": "缺損的茶壺", "item.cobblemon.cracked_pot": "破裂的茶壺", + "item.cobblemon.masterpiece_teacup": "傑作茶碗", + "item.cobblemon.unremarkable_teacup": "凡作茶碗", "item.cobblemon.sweet_apple": "甜甜蘋果", "item.cobblemon.tart_apple": "酸酸蘋果", "item.cobblemon.galarica_cuff": "伽勒荳蔻手環", @@ -107,6 +125,14 @@ "item.cobblemon.hyper_potion": "厲害傷藥", "item.cobblemon.max_potion": "全滿藥", "item.cobblemon.full_restore": "全復藥", + "item.cobblemon.health_feather": "體力之羽", + "item.cobblemon.muscle_feather": "肌力之羽", + "item.cobblemon.resist_feather": "抵抗之羽", + "item.cobblemon.genius_feather": "智力之羽", + "item.cobblemon.clever_feather": "精神之羽", + "item.cobblemon.swift_feather": "瞬發之羽", + "item.cobblemon.ability_capsule": "特性膠囊", + "item.cobblemon.ability_patch": "特性膏藥", "item.cobblemon.red_mint_leaf": "紅色薄荷葉", "item.cobblemon.red_mint_leaf.tooltip": "能夠影響寶可夢的攻擊能力值", "item.cobblemon.blue_mint_leaf": "藍色薄荷葉", @@ -140,44 +166,82 @@ "item.cobblemon.jolly_mint": "爽朗薄荷", "item.cobblemon.naive_mint": "天真薄荷", "item.cobblemon.serious_mint": "認真薄荷", + "item.cobblemon.ability_shield": "特性護具", + "item.cobblemon.absorb_bulb": "球根", + "item.cobblemon.air_balloon": "氣球", "item.cobblemon.assault_vest": "突擊背心", "item.cobblemon.auspicious_armor": "慶祝之鎧", "item.cobblemon.malicious_armor": "詛咒之鎧", + "item.cobblemon.binding_band": "緊綁束帶", "item.cobblemon.black_belt": "黑帶", "item.cobblemon.black_glasses": "黑色眼鏡", "item.cobblemon.black_sludge": "黑色污泥", + "item.cobblemon.blunder_policy": "打空保險", + "item.cobblemon.cell_battery": "充電電池", "item.cobblemon.charcoal_stick": "木炭條", "item.cobblemon.choice_band": "講究頭帶", "item.cobblemon.choice_scarf": "講究圍巾", "item.cobblemon.choice_specs": "講究眼鏡", "item.cobblemon.cleanse_tag": "潔淨之符", + "item.cobblemon.clear_amulet": "清淨墜飾", + "item.cobblemon.covert_cloak": "密探斗篷", "item.cobblemon.dragon_fang": "龍之牙", + "item.cobblemon.eject_button": "逃脫按鍵", + "item.cobblemon.eject_pack": "避難背包", + "item.cobblemon.everstone": "不變之石", + "item.cobblemon.eviolite": "進化奇石", "item.cobblemon.exp_share": "學習裝置", + "item.cobblemon.expert_belt": "達人帶", "item.cobblemon.fairy_feather": "妖精之羽", + "item.cobblemon.float_stone": "輕石", "item.cobblemon.focus_band": "氣勢頭帶", + "item.cobblemon.focus_sash": "氣勢披帶", + "item.cobblemon.grip_claw": "緊纏鈎爪", "item.cobblemon.hard_stone": "硬石頭", "item.cobblemon.heavy_duty_boots": "厚底靴", + "item.cobblemon.iron_ball": "黑色鐵球", + "item.cobblemon.lagging_tail": "後攻之尾", "item.cobblemon.leftovers": "吃剩的東西", + "item.cobblemon.light_ball": "電氣球", "item.cobblemon.light_clay": "光之黏土", + "item.cobblemon.loaded_dice": "老千骰子", "item.cobblemon.lucky_egg": "幸運蛋", + "item.cobblemon.luminous_moss": "光苔", "item.cobblemon.magnet": "磁鐵", + "item.cobblemon.metronome": "節拍器", "item.cobblemon.miracle_seed": "奇跡種子", "item.cobblemon.muscle_band": "力量頭帶", "item.cobblemon.mystic_water": "神秘水滴", "item.cobblemon.never_melt_ice": "不融冰", "item.cobblemon.poison_barb": "毒針", + "item.cobblemon.protective_pads": "部位護具", + "item.cobblemon.punching_glove": "拳擊手套", "item.cobblemon.quick_claw": "先制之爪", "item.cobblemon.razor_claw": "銳利之爪", "item.cobblemon.razor_fang": "銳利之牙", + "item.cobblemon.red_card": "紅牌", + "item.cobblemon.ring_target": "標靶", "item.cobblemon.rocky_helmet": "凸凸頭盔", + "item.cobblemon.room_service": "客房服務", "item.cobblemon.safety_goggles": "防塵護目鏡", + "item.cobblemon.scope_lens": "焦點鏡", "item.cobblemon.sharp_beak": "銳利鳥嘴", + "item.cobblemon.shed_shell": "美麗空殼", + "item.cobblemon.shell_bell": "貝殼之鈴", "item.cobblemon.silk_scarf": "絲綢圍巾", "item.cobblemon.silver_powder": "銀粉", "item.cobblemon.soft_sand": "柔軟沙子", + "item.cobblemon.soothe_bell": "安撫之鈴", "item.cobblemon.spell_tag": "詛咒之符", + "item.cobblemon.sticky_barb": "附著針", + "item.cobblemon.terrain_extender": "大地膜", + "item.cobblemon.throat_spray": "爽喉噴霧", "item.cobblemon.twisted_spoon": "彎曲的湯匙", + "item.cobblemon.utility_umbrella": "萬能傘", + "item.cobblemon.weakness_policy": "弱點保險", + "item.cobblemon.wide_lens": "廣角鏡", "item.cobblemon.wise_glasses": "博識眼鏡", + "item.cobblemon.zoom_lens": "對焦鏡", "item.cobblemon.mental_herb": "心靈香草", "item.cobblemon.mirror_herb": "模仿香草", "item.cobblemon.power_herb": "強力香草", @@ -186,7 +250,6 @@ "item.cobblemon.metal_powder": "金屬粉", "item.cobblemon.quick_powder": "速度粉", "item.cobblemon.destiny_knot": "紅線", - "item.cobblemon.everstone": "不變之石", "item.cobblemon.power_anklet": "力量護踝", "item.cobblemon.power_band": "力量束帶", "item.cobblemon.power_belt": "力量腰帶", @@ -198,6 +261,10 @@ "item.cobblemon.smoke_ball": "煙霧球", "item.cobblemon.toxic_orb": "劇毒寶珠", "item.cobblemon.life_orb": "生命寶珠", + "item.cobblemon.damp_rock": "潮濕岩石", + "item.cobblemon.heat_rock": "熾熱岩石", + "item.cobblemon.smooth_rock": "沙沙岩石", + "item.cobblemon.icy_rock": "冰冷岩石", "item.cobblemon.poke_ball.tooltip": "普通的精靈球。捕獲率×1。", "item.cobblemon.slate_ball.tooltip": "黑色的精靈球。捕獲率×1。", "item.cobblemon.azure_ball.tooltip": "藍色的精靈球。捕獲率×1。", @@ -230,6 +297,22 @@ "item.cobblemon.park_ball.tooltip": "在分類為森林或平原的生物群系內使用時，捕獲率x2.5。", "item.cobblemon.dream_ball.tooltip": "若目標進入睡眠，捕獲率x4。", "item.cobblemon.beast_ball.tooltip": "若目標是究極異獸，捕獲率×5，否則捕獲率x0.1。", + "item.cobblemon.ancient_poke_ball.tooltip": "不可思議的球。捕獲率x1。", + "item.cobblemon.ancient_citrine_ball.tooltip": "不可思議的球。捕獲率x1。", + "item.cobblemon.ancient_verdant_ball.tooltip": "不可思議的球。捕獲率x1。", + "item.cobblemon.ancient_azure_ball.tooltip": "不可思議的球。捕獲率x1。", + "item.cobblemon.ancient_roseate_ball.tooltip": "不可思議的球。捕獲率x1。", + "item.cobblemon.ancient_slate_ball.tooltip": "不可思議的球。捕獲率x1。", + "item.cobblemon.ancient_ivory_ball.tooltip": "不可思議的球。捕獲率x1。", + "item.cobblemon.ancient_great_ball.tooltip": "性能還算不錯的，不可思議的球。捕獲率×1.5。", + "item.cobblemon.ancient_ultra_ball.tooltip": "性能非常不錯的，不可思議的球。捕獲率×2。", + "item.cobblemon.ancient_feather_ball.tooltip": "能直線高速飛行的球。捕獲率x1。", + "item.cobblemon.ancient_wing_ball.tooltip": "強化後的，能直線高速飛行的球。捕獲率x1.5。", + "item.cobblemon.ancient_jet_ball.tooltip": "強化到最高階的，能直線高速飛行的球。捕獲率x2。", + "item.cobblemon.ancient_heavy_ball.tooltip": "沉重而無法遠投的球。捕獲率x1。", + "item.cobblemon.ancient_leaden_ball.tooltip": "強化後的，沉重而無法遠投的球。捕獲率x1.5。", + "item.cobblemon.ancient_gigaton_ball.tooltip": "強化到最高階的，沉重而無法遠投的球。捕獲率x2。", + "item.cobblemon.ancient_origin_ball.tooltip": "獨一無二的特殊精靈球。必定能捕獲野生寶可夢。", "item.cobblemon.mulch_base": "肥料", "item.cobblemon.coarse_mulch": "粗糙肥", "item.cobblemon.growth_mulch": "速速肥", @@ -274,12 +357,75 @@ "item.cobblemon.max_ether": "PP單項全補劑", "item.cobblemon.elixir": "PP多項小補劑", "item.cobblemon.max_elixir": "PP多項全補劑", + "item.cobblemon.normal_gem": "一般寶石", + "item.cobblemon.water_gem": "水之寶石", + "item.cobblemon.fire_gem": "火之寶石", + "item.cobblemon.grass_gem": "草之寶石", + "item.cobblemon.dragon_gem": "龍之寶石", + "item.cobblemon.ghost_gem": "幽靈寶石", + "item.cobblemon.ground_gem": "地面寶石", + "item.cobblemon.steel_gem": "鋼之寶石", + "item.cobblemon.fairy_gem": "妖精寶石", + "item.cobblemon.rock_gem": "岩石寶石", + "item.cobblemon.psychic_gem": "超能力寶石", + "item.cobblemon.electric_gem": "電之寶石", + "item.cobblemon.bug_gem": "蟲之寶石", + "item.cobblemon.poison_gem": "毒之寶石", + "item.cobblemon.ice_gem": "冰之寶石", + "item.cobblemon.dark_gem": "惡之寶石", + "item.cobblemon.fighting_gem": "格鬥寶石", + "item.cobblemon.flying_gem": "飛行寶石", + "item.cobblemon.armor_fossil": "盾甲化石", + "item.cobblemon.fossilized_bird": "化石鳥", + "item.cobblemon.claw_fossil": "爪子化石", + "item.cobblemon.cover_fossil": "背蓋化石", + "item.cobblemon.fossilized_dino": "化石海獸", + "item.cobblemon.dome_fossil": "甲殼化石", + "item.cobblemon.fossilized_drake": "化石龍", + "item.cobblemon.fossilized_fish": "化石魚", + "item.cobblemon.helix_fossil": "貝殼化石", + "item.cobblemon.jaw_fossil": "顎之化石", + "item.cobblemon.old_amber_fossil": "秘密琥珀", + "item.cobblemon.plume_fossil": "羽毛化石", + "item.cobblemon.root_fossil": "根狀化石", + "item.cobblemon.sail_fossil": "鰭之化石", + "item.cobblemon.skull_fossil": "頭蓋化石", + "item.cobblemon.bygone_sherd": "往事陶器碎片", + "item.cobblemon.capture_sherd": "捕獲陶器碎片", + "item.cobblemon.dome_sherd": "甲殼陶器碎片", + "item.cobblemon.helix_sherd": "貝殼陶器碎片", + "item.cobblemon.nostalgic_sherd": "懷舊陶器碎片", + "item.cobblemon.suspicious_sherd": "可疑陶器碎片", + "item.cobblemon.tumblestone": "玉石", + "item.cobblemon.black_tumblestone": "黑玉石", + "item.cobblemon.sky_tumblestone": "天藍玉石", + "item.cobblemon.relic_coin": "遺跡硬幣", + "block.cobblemon.relic_coin_pouch": "遺跡硬幣袋", + "block.cobblemon.relic_coin_sack": "遺跡硬幣包", + "trim_pattern.cobblemon.automaton": "魔像盔甲紋樣", + "cobblemon.fossil.armor": "盾甲", + "cobblemon.fossil.bird": "鳥", + "cobblemon.fossil.claw": "爪子", + "cobblemon.fossil.cover": "背蓋", + "cobblemon.fossil.dino": "海獸", + "cobblemon.fossil.dome": "甲殼", + "cobblemon.fossil.drake": "龍", + "cobblemon.fossil.fish": "魚", + "cobblemon.fossil.helix": "貝殼", + "cobblemon.fossil.jaw": "顎", + "cobblemon.fossil.old_amber": "琥珀", + "cobblemon.fossil.plume": "羽毛", + "cobblemon.fossil.root": "根", + "cobblemon.fossil.sail": "鰭", + "cobblemon.fossil.skull": "頭蓋", + "cobblemon.fossilmachine.protected": "這個化石是%s的東西！", "itemGroup.cobblemon.blocks": "方塊", "itemGroup.cobblemon.pokeball": "精靈球", "itemGroup.cobblemon.agriculture": "農業", "itemGroup.cobblemon.consumables": "消耗品", "itemGroup.cobblemon.held_item": "攜帶道具", "itemGroup.cobblemon.evolution_item": "進化道具", + "itemGroup.cobblemon.archaeology": "考古", "block.cobblemon.apricorn_log": "球果原木", "block.cobblemon.stripped_apricorn_log": "剝皮球果原木", "block.cobblemon.apricorn_wood": "球果木", @@ -308,6 +454,9 @@ "block.cobblemon.healing_machine.tooltip1": "放置後須等候充能才能使用。", "block.cobblemon.healing_machine.tooltip2": "隨時間經過自動充能。", "block.cobblemon.pc": "電腦", + "block.cobblemon.restoration_tank": "復原培養皿", + "block.cobblemon.fossil_analyzer": "化石分析儀", + "block.cobblemon.monitor": "數據顯示器", "block.cobblemon.red_mint": "紅色薄荷種子", "block.cobblemon.blue_mint": "藍色薄荷種子", "block.cobblemon.cyan_mint": "青色薄荷種子", @@ -317,7 +466,31 @@ "block.cobblemon.vivichoke_seeds": "活力蕾種子", "block.cobblemon.pep_up_flower": "PP草", "block.cobblemon.potted_pep_up_flower": "PP草盆栽", - "cobblemon.overflow_no_pc": "你的同業隊伍已滿，而且你尚未擁有電腦！", + "block.cobblemon.gilded_chest": "寶箱", + "block.cobblemon.gimmighoul_chest": "索財靈寶箱", + "block.cobblemon.blue_gilded_chest": "藍色寶箱", + "block.cobblemon.yellow_gilded_chest": "黃色寶箱", + "block.cobblemon.pink_gilded_chest": "粉紅色寶箱", + "block.cobblemon.black_gilded_chest": "黑色寶箱", + "block.cobblemon.green_gilded_chest": "綠色寶箱", + "block.cobblemon.white_gilded_chest": "白色寶箱", + "block.cobblemon.display_case": "展示櫃", + "block.cobblemon.small_budding_tumblestone": "小型玉石芽", + "block.cobblemon.medium_budding_tumblestone": "中型玉石芽", + "block.cobblemon.large_budding_tumblestone": "大型玉石芽", + "block.cobblemon.tumblestone_cluster": "玉石簇", + "block.cobblemon.tumblestone_block": "玉石塊", + "block.cobblemon.small_budding_sky_tumblestone": "小型天藍玉石芽", + "block.cobblemon.medium_budding_sky_tumblestone": "中型天藍玉石芽", + "block.cobblemon.large_budding_sky_tumblestone": "大型天藍玉石芽", + "block.cobblemon.sky_tumblestone_cluster": "天藍玉石簇", + "block.cobblemon.sky_tumblestone_block": "天藍玉石塊", + "block.cobblemon.small_budding_black_tumblestone": "小型黑玉石芽", + "block.cobblemon.medium_budding_black_tumblestone": "中型黑玉石芽", + "block.cobblemon.large_budding_black_tumblestone": "大型黑玉石芽", + "block.cobblemon.black_tumblestone_cluster": "黑玉石簇", + "block.cobblemon.black_tumblestone_block": "黑玉石塊", + "cobblemon.overflow_no_pc": "你的同行隊伍已滿，而且你尚未擁有電腦！", "cobblemon.overflow_no_space": "你的同行隊伍和%1$s都已經滿了！", "cobblemon.overflow_to_pc": "你的同行隊伍已滿！ 已將%1$s送到%2$s裡。", "cobblemon.your_pc": "你的電腦", @@ -326,6 +499,7 @@ "cobblemon.command.clearparty.nonethere": "%1$s 的隊伍中沒有寶可夢。", "cobblemon.command.clearparty.cleared": "已清空了%1$s的隊伍。", "cobblemon.command.clearpc.cleared": "已清空了%1$s的電腦。", + "cobblemon.command.dialogue.invalid-dialogue": "無效的對話標識", "cobblemon.ui.generic.yes": "確定", "cobblemon.ui.generic.no": "取消", "cobblemon.ui.pokenav.title": "寶可導航", @@ -335,6 +509,7 @@ "cobblemon.ui.starter.alreadyselected": "你已經選擇過最初的夥伴了！", "cobblemon.ui.starter.cannotchoose": "你暫時還不能選擇最初的夥伴。", "cobblemon.ui.starter.hasalreadychosen": "%1$s 已經選擇過最初的夥伴了。", + "cobblemon.ui.starter.skippedchoosing": "你還沒有選擇最初的夥伴就已獲得了寶可夢。要選擇最初的夥伴，請把隊伍中所有的寶可夢放進電腦，再按下\"%1$s\"。", "cobblemon.ui.starter.choose_starter_title": "選擇你最初的夥伴！", "cobblemon.ui.starter.choose_starter_description": "按下 \"%1$s\" 鍵", "cobblemon.ui.starter.chooseyourstarter": "按下 %1$s 選擇寶可夢，開始新的旅途！", @@ -354,6 +529,8 @@ "cobblemon.ui.stats.sp_atk": "特攻", "cobblemon.ui.stats.sp_def": "特防", "cobblemon.ui.stats.speed": "速度", + "cobblemon.ui.gold_hoard": "硬幣堆", + "cobblemon.ui.netherite_hoard": "碎片堆", "cobblemon.ui.info": "資訊", "cobblemon.ui.info.pokedex_number": "編號", "cobblemon.ui.info.species": "名稱", @@ -381,6 +558,11 @@ "cobblemon.ui.pasture.recall_all": "全部收回", "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)", "cobblemon.pasture.too_many_nearby": "附近有太多的寶可夢。", + "cobblemon.ui.interact.give.item": "給予攜帶物", + "cobblemon.ui.interact.spectate": "觀戰", + "cobblemon.ui.interact.trade": "交換", + "cobblemon.ui.interact.battle": "對戰", + "cobblemon.ui.interact.mount.shoulder": "背上", "key.cobblemon.upshiftparty": "上移同行寶可夢", "key.cobblemon.downshiftparty": "下移同行寶可夢", "key.cobblemon.hideparty": "隱藏同行寶可夢欄", @@ -388,7 +570,26 @@ "key.cobblemon.pokenavigator": "打開寶可導航", "key.cobblemon.summary": "查看能力", "key.cobblemon.categories.cobblemon": "方塊寶可夢", - "cobblemon.subtitle.capture_succeeded": "捕獲成功！", + "key.cobblemon.scaleportraitup": "放大頭像", + "key.cobblemon.scaleportraitdown": "縮小頭像", + "key.cobblemon.translateportraitup": "上移頭像", + "key.cobblemon.translateportraitdown": "下移頭像", + "key.cobblemon.translateportraitleft": "左移頭像", + "key.cobblemon.translateportraitright": "右移頭像", + "key.cobblemon.printmodelsettings": "顯示模型設定", + "key.cobblemon.categories.cobblemon.debug": "模組調試", + "cobblemon.subtitle.poke_ball.capture_succeeded": "捕獲成功", + "cobblemon.subtitle.fossilmachine.activate": "化石復原機啟動", + "cobblemon.subtitle.fossilmachine.active_loop": "化石復原機運作中", + "cobblemon.subtitle.fossilmachine.dna_full": "填滿復原培養皿", + "cobblemon.subtitle.fossilmachine.finished": "化石復原機運作完畢", + "cobblemon.subtitle.fossilmachine.insert_dna": "注入培養液", + "cobblemon.subtitle.fossilmachine.insert_dna_small": "注入少量培養液", + "cobblemon.subtitle.fossilmachine.insert_fossil": "放入化石", + "cobblemon.subtitle.fossilmachine.retrieve_fossil": "取出化石", + "cobblemon.subtitle.fossilmachine.retrieve_pokemon": "取出化石寶可夢", + "cobblemon.subtitle.fossilmachine.unprotected": "化石復原機的保護期結束", + "cobblemon.subtitle.fossilmachine.assemble": "化石復原機組成", "cobblemon.healingmachine.alreadyinuse": "這台治療儀正在使用當中！", "cobblemon.healingmachine.nopokemon": "你的隊伍裡沒有任何寶可夢，無法治療！", "cobblemon.healingmachine.alreadyhealed": "你的同行寶可夢已經精力充沛了！", @@ -418,6 +619,8 @@ "cobblemon.battle.ui.switch": "寶可夢", "cobblemon.battle.ui.capture": "捕捉", "cobblemon.battle.ui.run": "逃走", + "cobblemon.battle.ui.forfeit": "棄權", + "cobblemon.battle.ui.forfeit_confirmation": "放棄對戰會使你被認定為敗者。確定要這樣做嗎？", "cobblemon.battle.ui.hide_label": "按下%1$s來移動你的角色。", "cobblemon.battle.ui.actions_label": "請選擇你接下來的行動。可按%1$s返回對戰介面。", "cobblemon.ui.evolve": "進化", @@ -432,6 +635,7 @@ "cobblemon.drop.item.full": "你的物品欄放不下更多的道具了！%1$s掉在地上了！", "cobblemon.mint.interact": "%1$s的能力值改變了！", "cobblemon.mint.same_nature": "%1$s的能力值似乎不受%2$s的影響。", + "cobblemon.ability_changer.changed": "%1$s的特性變成了%2$s！", "itemGroup.cobblemon.plants": "植物", "item.cobblemon.aguav_berry": "樂芭果", "item.cobblemon.aguav_berry.tooltip": "HP低於最大HP的1/4時發動，回復最大HP的1/3；若為特防不容易成長的性格則會陷入混亂狀態", @@ -655,8 +859,10 @@ "advancements.cobblemon.obtain_all_berries.description": "獲得所有種類的樹果", "advancements.cobblemon.use_pasture": "開放世界", "advancements.cobblemon.use_pasture.description": "製作一個牧場方塊，讓你的朋友們出來走走", - "advancements.cobblemon.catch_all_vivillon": "彩富豪", - "advancements.cobblemon.catch_all_vivillon.description": "收服彩粉蝶的所有型態", + "advancements.cobblemon.catch_all_vivillon": "索彩靈", + "advancements.cobblemon.catch_all_vivillon.description": "獲得彩粉蝶的所有型態...", + "advancements.cobblemon.catch_all_vivillon_but_actually": "彩富豪", + "advancements.cobblemon.catch_all_vivillon_but_actually.description": "真正的獲得彩粉蝶的所有型態", "advancements.cobblemon.evolve_veevees": "伊布一家親", "advancements.cobblemon.evolve_veevees.description": "將伊布進化成八種不同的型態", "advancements.cobblemon.evolve_shedinja": "脫殼機動隊", @@ -671,6 +877,18 @@ "advancements.cobblemon.use_candy.description": "對一隻寶可夢使用任意經驗糖果", "advancements.cobblemon.own_zangoose_seviper": "冤家路窄", "advancements.cobblemon.own_zangoose_seviper.description": "在你的隊伍中同時攜帶貓鼬斬與飯匙蛇", + "advancements.cobblemon.obtain_fossil": "查詢化石狀態", + "advancements.cobblemon.obtain_fossil.description": "發現埋藏在古代廢墟中的化石", + "advancements.cobblemon.evolve_gholdengo_netherite": "殘骸裹金", + "advancements.cobblemon.evolve_gholdengo_netherite.description": "讓索財靈進化成全身覆蓋著獄髓的賽富豪", + "advancements.cobblemon.resurrect_pokemon": "生命總能找到出路", + "advancements.cobblemon.resurrect_pokemon.description": "透過化石復原機取得活生生的化石寶可夢", + "advancements.cobblemon.obtain_tumblestone": "滾石", + "advancements.cobblemon.obtain_tumblestone.description": "從可疑的方塊獲得玉石", + "advancements.cobblemon.grow_tumblestone": "玉石趨焚", + "advancements.cobblemon.grow_tumblestone.description": "在岩漿或岩漿塊旁放置一塊玉石，讓它慢慢生長", + "advancements.cobblemon.craft_ancient_balls": "真正的古董收藏家", + "advancements.cobblemon.craft_ancient_balls.description": "用玉石製作所有十五種古代精靈球", "cobblemon.battle.crash": "發生了對戰錯誤。若為單人遊戲，請向模組團隊回報此錯誤；若為多人遊戲則請向伺服器管理員回報。", "cobblemon.battle.damage_dealt": "%1$s受到了%2$s點傷害！", "cobblemon.battle.used_move": "%1$s使出了%2$s！", @@ -679,6 +897,8 @@ "cobblemon.battle.owned_pokemon": "玩家%1$s的%2$s", "cobblemon.battle.fainted": "%1$s倒下了！", "cobblemon.battle.win": "%1$s獲勝了！", + "cobblemon.battle.lose": "%1$s沒有可以戰鬥的寶可夢！", + "cobblemon.battle.forfeit": "%1$s放棄了對戰！", "cobblemon.battle.flee": "你成功逃跑了！", "cobblemon.battle.switch_option": "要替換為哪隻寶可夢： ", "cobblemon.battle.your_team": "你的寶可夢隊伍：", @@ -962,7 +1182,7 @@ "cobblemon.battle.damage.nightmare": "%1$s被困在了惡夢之中！", "cobblemon.battle.damage.magmastorm": "%1$s受到了熔岩風暴的傷害。", "cobblemon.battle.damage.stealthrock": "尖銳的岩石扎進了%1$s！", - "cobblemon.battle.damage.highjumpkick": "%1$s撞在地上！", + "cobblemon.battle.damage.highjumpkick": "%1$s因勢頭過猛而撞到了地面！", "cobblemon.battle.damage.spikes": "%1$s受到了撒菱的傷害！", "cobblemon.battle.damage.recoil": "%1$s受到了反作用力造成的傷害！", "cobblemon.battle.damage.item": "%1$s因%2$s而受到了傷害！", @@ -974,13 +1194,15 @@ "cobblemon.battle.damage.clamp": "%1$s受到了貝殼夾擊的傷害！", "cobblemon.battle.damage.curse": "%1$s正受到詛咒！", "cobblemon.battle.damage.firespin": "%1$s受到了火焰旋渦的傷害。", - "cobblemon.battle.damage.axekick": "%1$s撞在地上！", + "cobblemon.battle.damage.axekick": "%1$s因勢頭過猛而撞到了地面！", "cobblemon.battle.damage.bind": "%1$s受到了綁緊的傷害。", "cobblemon.battle.damage.baddreams": "%1$s正被惡夢纏身！", "cobblemon.battle.damage.mindblown": "%1$s消耗了自己的HP來發動招式！", "cobblemon.battle.damage.infestation": "%1$s受到了糾纏不休的傷害。", "cobblemon.battle.damage.spikyshield": "%1$s受傷了！", "cobblemon.battle.damage.flameburst": "濺射的火焰擊中了%1$s！", + "cobblemon.battle.damage.dryskin": "%1$s因乾燥皮膚而受到了傷害！", + "cobblemon.battle.damage.sandtomb": "%1$s受到了流沙深淵的傷害。", "cobblemon.battle.end.bind": "%1$s擺脫了緊綁！", "cobblemon.battle.end.wrap": "%1$s擺脫了緊束！", "cobblemon.battle.end.magnetrise": "%1$s的電磁浮游停止了。", @@ -1007,6 +1229,7 @@ "cobblemon.battle.end.powertrick": "%1$s互換了攻擊和防禦！", "cobblemon.battle.end.healblock": "%1$s的回覆封鎖結束了！", "cobblemon.battle.end.skydrop": "%1$s擺脫了自由落體狀態！", + "cobblemon.battle.end.illusion": "%1$s造成的幻覺被解除了！", "cobblemon.battle.block.uproar": "吵鬧阻止了%1$s入眠！", "cobblemon.battle.fail.substitute": "無法創造替身！", "cobblemon.battle.fail.healblock": "%1$s沒有受到影響！", @@ -1070,6 +1293,9 @@ "cobblemon.battle.enditem.whiteherb": "%1$s用白色香草復原了能力！", "cobblemon.battle.enditem.corrosivegas": "%3$s把%1$s的%2$s融化了！", "cobblemon.battle.enditem.stealeat": "%3$s偷走並吃掉了對手的%2$s！", + "cobblemon.battle.enditem.cellbattery": "%1$s發動了它的充電電池！", + "cobblemon.battle.enditem.ejectbutton": "%1$s要用逃脫按鍵回去了！", + "cobblemon.battle.enditem.snowball": "%1$s發動了它的雪球！", "cobblemon.battle.heal.zeffect": "%1$s's 的HP透過Z招式回復了！", "cobblemon.battle.heal.wish": "%1$s的祈願成真了！", "cobblemon.battle.heal.drain": "從%1$s那裡吸取了體力！", @@ -1085,6 +1311,12 @@ "cobblemon.battle.heal.generic": "%1$s的體力回復了！", "cobblemon.battle.heal.bagitempotion": "恢復了%1$s的HP", "cobblemon.battle.heal.poisonheal": "毒療恢復了%1$s的體力！", + "cobblemon.battle.heal.cheekpouch": "頰囊恢復了%1$s的體力！", + "cobblemon.battle.heal.dryskin": "乾燥皮膚恢復了%1$s的體力！", + "cobblemon.battle.heal.eartheater": "食土恢復了%1$s的體力！", + "cobblemon.battle.heal.icybody": "冰凍之軀恢復了%1$s的體力！", + "cobblemon.battle.heal.voltabsorb": "蓄電恢復了%1$s的體力！", + "cobblemon.battle.heal.waterabsorb": "儲水恢復了%1$s的體力！", "cobblemon.battle.curestatus.naturalcure": "%1$s的自然回復治癒了它！", "cobblemon.battle.bagitem.use": "%1$s對%3$s使用了%2$s！", "cobblemon.battle.bagitem.cannot": "你現在無法使用道具。", @@ -1116,6 +1348,7 @@ "cobblemon.type.rock": "岩石", "cobblemon.type.poison": "毒", "cobblemon.type.dragon": "龍", + "cobblemon.terra_type.stellar": "星晶", "cobblemon.nature.hardy": "勤奮", "cobblemon.nature.lonely": "怕寂寞", "cobblemon.nature.brave": "勇敢", @@ -1152,6 +1385,7 @@ "cobblemon.starterselection.category.kalos": "卡洛斯", "cobblemon.starterselection.category.alola": "阿羅拉", "cobblemon.starterselection.category.galar": "伽勒爾", + "cobblemon.starterselection.category.hisui_bias": "洗翠", "cobblemon.starterselection.category.paldea": "帕底亞", "cobblemon.stat.hp.name": "HP", "cobblemon.stat.attack.name": "攻擊", @@ -1201,9 +1435,12 @@ "block.cobblemon.deepslate_thunder_stone_ore": "深層雷之石礦", "block.cobblemon.deepslate_water_stone_ore": "深層水之石礦", "block.cobblemon.dripstone_moon_stone_ore": "滴水月之石礦", + "block.cobblemon.nether_fire_stone_ore": "地獄火之石礦石", + "block.cobblemon.terracotta_sun_stone_ore": "陶土日之石礦石", "block.cobblemon.pasture": "牧場方塊", "gamerule.doPokemonSpawning": "生成寶可夢", "gamerule.doShinyStarters": "最初的夥伴將會為異色", + "gamerule.doPokemonLoot": "寶可夢能掉落戰利品", "cobblemon.command.checkspawns.invalid-bucket": "無效的生成稀有度", "cobblemon.command.checkspawns.spawns": "可在此生成", "cobblemon.command.checkspawns.nothing": "沒有寶可夢可以在這裡生成。", @@ -1225,6 +1462,9 @@ "tag.item.cobblemon.held.destiny_knot": "紅線", "tag.item.cobblemon.held.everstone": "不變之石", "tag.item.cobblemon.held.experience_share": "學習裝置", + "tag.item.cobblemon.held.consumed_in_npc_battle": "持有物會在和NPC訓練家的對戰中被消耗", + "tag.item.cobblemon.held.consumed_in_pvp_battle": "持有物會在和其他玩家的對戰中被消耗", + "tag.item.cobblemon.held.consumed_in_wild_battle": "持有物會在和野生寶可夢的對戰中被消耗", "tag.item.cobblemon.held.is_held_item": "攜帶道具", "tag.item.cobblemon.held.lucky_egg": "幸運蛋", "tag.item.cobblemon.held.power_anklet": "力量護踝", @@ -1236,12 +1476,64 @@ "tag.item.cobblemon.herbs": "香草", "tag.item.cobblemon.mint_leaf": "薄荷葉", "tag.item.cobblemon.mints": "薄荷", + "tag.item.cobblemon.mint_seeds": "薄荷種子", "tag.item.cobblemon.mutated_berries": "突變樹果", "tag.item.cobblemon.plants": "植物", - "tag.item.cobblemon.poke_balls": "精靈球", "tag.item.cobblemon.protein_ingredients": "攻擊增強劑材料", "tag.item.cobblemon.zinc_ingredients": "特防增強劑材料", "tag.item.cobblemon.seeds": "種子", + "tag.item.cobblemon.boats": "船", + "tag.item.cobblemon.hanging_signs": "懸掛式告示牌", + "tag.item.cobblemon.signs": "告示牌", + "tag.item.cobblemon.dawn_stone_ores": "覺醒之石礦石", + "tag.item.cobblemon.dusk_stone_ores": "暗之石礦石", + "tag.item.cobblemon.fire_stone_ores": "火之石礦石", + "tag.item.cobblemon.ice_stone_ores": "冰之石礦石", + "tag.item.cobblemon.leaf_stone_ores": "葉之石礦石", + "tag.item.cobblemon.shiny_stone_ores": "光之石礦石", + "tag.item.cobblemon.moon_stone_ores": "月之石礦石", + "tag.item.cobblemon.sun_stone_ores": "日之石礦石", + "tag.item.cobblemon.thunder_stone_ores": "雷之石礦石", + "tag.item.cobblemon.water_stone_ores": "水之石礦石", + "tag.item.cobblemon.fossil_machine_parts": "化石復原機部件", + "tag.item.cobblemon.machines": "機器", + "tag.item.cobblemon.poke_balls": "精靈球", + "tag.item.cobblemon.apricorn_poke_balls": "球果精靈球", + "tag.item.cobblemon.ancient_poke_balls": "古代精靈球", + "tag.item.cobblemon.tier_1_poke_balls": "銅階精靈球", + "tag.item.cobblemon.tier_2_poke_balls": "鐵階精靈球", + "tag.item.cobblemon.tier_3_poke_balls": "金階精靈球", + "tag.item.cobblemon.tier_4_poke_balls": "鑽石階精靈球", + "tag.item.cobblemon.tier_5_poke_balls": "地獄之星階精靈球", + "tag.item.cobblemon.tier_1_poke_ball_materials": "銅階精靈球原料", + "tag.item.cobblemon.tier_2_poke_ball_materials": "鐵階精靈球原料", + "tag.item.cobblemon.tier_3_poke_ball_materials": "金階精靈球原料", + "tag.item.cobblemon.tier_4_poke_ball_materials": "鑽石階精靈球原料", + "tag.item.cobblemon.potions": "傷藥", + "tag.item.cobblemon.ethers": "PP補充劑", + "tag.item.cobblemon.remedies": "中藥", + "tag.item.cobblemon.restores": "狀態治癒", + "tag.item.cobblemon.revives": "復甦道具", + "tag.item.cobblemon.x_items": "戰鬥道具", + "tag.item.cobblemon.vitamins": "營養飲料", + "tag.item.cobblemon.tumblestones": "玉石", + "tag.item.cobblemon.red_tumblestones": "玉石", + "tag.item.cobblemon.black_tumblestones": "黑玉石", + "tag.item.cobblemon.sky_tumblestones": "天藍玉石", + "tag.item.cobblemon.apples": "蘋果", + "tag.item.cobblemon.deep_seas": "深海道具", + "tag.item.cobblemon.sweets": "糖飾", + "tag.item.cobblemon.teapots": "茶壺", + "tag.item.cobblemon.teacups": "茶碗", + "tag.item.cobblemon.raw_meat": "生肉", + "tag.item.cobblemon.cooked_meat": "熟肉", + "tag.item.cobblemon.fossils": "化石", + "tag.item.cobblemon.held.leaves_leftovers": "能吃剩的食物", + "tag.item.cobblemon.decorated_pot_sherds": "紋飾陶片", + "tag.item.cobblemon.type_gems": "屬性寶石", + "tag.item.cobblemon.feathers": "羽毛", + "tag.item.cobblemon.ability_changers": "特性更改道具", + "tag.item.cobblemon.held.is_friendship_booster": "親密度提升道具", "cobblemon.move.pound": "拍擊", "cobblemon.move.pound.desc": "使用長長的尾巴或手等拍打對手進行攻擊。", diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/aguav_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/aguav_sprout.json new file mode 100644 index 0000000000..dd464f26ac --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/aguav_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/aguav_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/aguav_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/aguav_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/apicot_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/apicot_sprout.json new file mode 100644 index 0000000000..a22790e8d6 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/apicot_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/apicot_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/apicot_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/apicot_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/aspear_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/aspear_sprout.json new file mode 100644 index 0000000000..0430d3e13e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/aspear_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/aspear_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/aspear_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/aspear_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/babiri_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/babiri_sprout.json new file mode 100644 index 0000000000..16054a1fbe --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/babiri_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/babiri_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/babiri_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/babiri_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/belue_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/belue_sprout.json new file mode 100644 index 0000000000..ede8f4bb82 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/belue_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/belue_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/belue_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/belue_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/bluk_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/bluk_sprout.json new file mode 100644 index 0000000000..cafd2fbcff --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/bluk_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/bluk_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/bluk_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/bluk_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/charti_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/charti_sprout.json new file mode 100644 index 0000000000..95089e14dc --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/charti_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/charti_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/charti_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/charti_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/cheri_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/cheri_sprout.json new file mode 100644 index 0000000000..b3b385c4b3 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/cheri_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/cheri_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/cheri_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/cheri_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/chesto_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/chesto_sprout.json new file mode 100644 index 0000000000..db12b4eced --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/chesto_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/chesto_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/chesto_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/chesto_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/chilan_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/chilan_sprout.json new file mode 100644 index 0000000000..65ff216c69 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/chilan_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/chilan_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/chilan_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/chilan_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/chople_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/chople_sprout.json new file mode 100644 index 0000000000..7c05d80589 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/chople_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/chople_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/chople_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/chople_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/coba_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/coba_sprout.json new file mode 100644 index 0000000000..a654c5cea7 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/coba_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/coba_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/coba_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/coba_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/colbur_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/colbur_sprout.json new file mode 100644 index 0000000000..58e2830087 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/colbur_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/colbur_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/colbur_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/colbur_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/cornn_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/cornn_sprout.json new file mode 100644 index 0000000000..a53cccb6ee --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/cornn_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/cornn_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/cornn_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/cornn_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/custap_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/custap_sprout.json new file mode 100644 index 0000000000..b0c892defb --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/custap_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/custap_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/custap_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/custap_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/durin_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/durin_sprout.json new file mode 100644 index 0000000000..03675dd455 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/durin_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/durin_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/durin_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/durin_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/enigma_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/enigma_sprout.json new file mode 100644 index 0000000000..56eaf0faa2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/enigma_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/enigma_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/enigma_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/enigma_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/figy_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/figy_sprout.json new file mode 100644 index 0000000000..c6b116f84f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/figy_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/figy_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/figy_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/figy_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/ganlon_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/ganlon_sprout.json new file mode 100644 index 0000000000..0cd62e7ffd --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/ganlon_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/ganlon_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/ganlon_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/ganlon_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/grepa_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/grepa_sprout.json new file mode 100644 index 0000000000..bb05644052 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/grepa_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/grepa_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/grepa_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/grepa_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/haban_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/haban_sprout.json new file mode 100644 index 0000000000..26f84e0cf6 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/haban_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/haban_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/haban_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/haban_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/hondew_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/hondew_sprout.json new file mode 100644 index 0000000000..8b3e233731 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/hondew_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/hondew_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/hondew_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/hondew_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/hopo_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/hopo_sprout.json new file mode 100644 index 0000000000..cc33702df5 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/hopo_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/hopo_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/hopo_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/hopo_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/iapapa_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/iapapa_sprout.json new file mode 100644 index 0000000000..23e2333776 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/iapapa_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/iapapa_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/iapapa_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/iapapa_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/jaboca_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/jaboca_sprout.json new file mode 100644 index 0000000000..343b064c79 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/jaboca_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/jaboca_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/jaboca_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/jaboca_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/kasib_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/kasib_sprout.json new file mode 100644 index 0000000000..194043cdfa --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/kasib_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/kasib_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/kasib_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/kasib_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/kebia_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/kebia_sprout.json new file mode 100644 index 0000000000..6f4313a5be --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/kebia_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/kebia_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/kebia_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/kebia_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/kee_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/kee_sprout.json new file mode 100644 index 0000000000..abe025004e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/kee_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/kee_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/kee_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/kee_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/kelpsy_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/kelpsy_sprout.json new file mode 100644 index 0000000000..d3531c6443 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/kelpsy_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/kelpsy_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/kelpsy_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/kelpsy_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/lansat_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/lansat_sprout.json new file mode 100644 index 0000000000..810cf88fd4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/lansat_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/lansat_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/lansat_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/lansat_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/leppa_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/leppa_sprout.json new file mode 100644 index 0000000000..647f8fac6c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/leppa_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/leppa_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/leppa_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/leppa_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/liechi_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/liechi_sprout.json new file mode 100644 index 0000000000..5d2203bd35 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/liechi_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/liechi_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/liechi_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/liechi_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/lum_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/lum_sprout.json new file mode 100644 index 0000000000..b314b8c848 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/lum_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/lum_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/lum_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/lum_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/mago_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/mago_sprout.json new file mode 100644 index 0000000000..970e8372ca --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/mago_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/mago_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/mago_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/mago_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/magost_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/magost_sprout.json new file mode 100644 index 0000000000..82211a83de --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/magost_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/magost_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/magost_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/magost_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/maranga_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/maranga_sprout.json new file mode 100644 index 0000000000..8579239a13 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/maranga_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/maranga_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/maranga_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/maranga_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/micle_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/micle_sprout.json new file mode 100644 index 0000000000..9ee7a86d1a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/micle_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/micle_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/micle_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/micle_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/nanab_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/nanab_sprout.json new file mode 100644 index 0000000000..4a4d26f963 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/nanab_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/nanab_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/nanab_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/nanab_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/nomel_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/nomel_sprout.json new file mode 100644 index 0000000000..2d7c4c3473 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/nomel_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/nomel_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/nomel_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/nomel_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/occa_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/occa_sprout.json new file mode 100644 index 0000000000..7664b5c05d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/occa_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/occa_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/occa_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/occa_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/oran_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/oran_sprout.json new file mode 100644 index 0000000000..73425830cb --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/oran_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/oran_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/oran_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/oran_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/pamtre_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/pamtre_sprout.json new file mode 100644 index 0000000000..3ab094cda9 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/pamtre_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/pamtre_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/pamtre_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/pamtre_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/passho_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/passho_sprout.json new file mode 100644 index 0000000000..9a9afdd9d6 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/passho_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/passho_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/passho_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/passho_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/payapa_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/payapa_sprout.json new file mode 100644 index 0000000000..f736da552b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/payapa_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/payapa_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/payapa_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/payapa_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/pecha_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/pecha_sprout.json new file mode 100644 index 0000000000..080f25ac25 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/pecha_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/pecha_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/pecha_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/pecha_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/persim_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/persim_sprout.json new file mode 100644 index 0000000000..27aa22f18d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/persim_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/persim_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/persim_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/persim_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/petaya_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/petaya_sprout.json new file mode 100644 index 0000000000..0c286dd1ab --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/petaya_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/petaya_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/petaya_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/petaya_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/pinap_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/pinap_sprout.json new file mode 100644 index 0000000000..745ead9203 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/pinap_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/pinap_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/pinap_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/pinap_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/planted_bound.json b/common/src/main/resources/assets/cobblemon/models/block/berries/planted_bound.json new file mode 100644 index 0000000000..52f64c730c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/planted_bound.json @@ -0,0 +1,45 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "planted", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/pomeg_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/pomeg_sprout.json new file mode 100644 index 0000000000..d850cdcb3b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/pomeg_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/pomeg_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/pomeg_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/pomeg_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/qualot_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/qualot_sprout.json new file mode 100644 index 0000000000..20b7c4d7fc --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/qualot_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/qualot_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/qualot_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/qualot_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/rabuta_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/rabuta_sprout.json new file mode 100644 index 0000000000..399ca778b0 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/rabuta_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/rabuta_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/rabuta_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/rabuta_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/rawst_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/rawst_sprout.json new file mode 100644 index 0000000000..9f14e652cf --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/rawst_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/rawst_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/rawst_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/rawst_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/razz_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/razz_sprout.json new file mode 100644 index 0000000000..890b1e0aaa --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/razz_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/razz_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/razz_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/razz_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/rindo_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/rindo_sprout.json new file mode 100644 index 0000000000..44b0e749d4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/rindo_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/rindo_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/rindo_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/rindo_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/roseli_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/roseli_sprout.json new file mode 100644 index 0000000000..3580d93ba1 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/roseli_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/roseli_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/roseli_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/roseli_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/rowap_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/rowap_sprout.json new file mode 100644 index 0000000000..515923029a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/rowap_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/rowap_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/rowap_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/rowap_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/salac_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/salac_sprout.json new file mode 100644 index 0000000000..71c6655716 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/salac_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/salac_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/salac_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/salac_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/shuca_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/shuca_sprout.json new file mode 100644 index 0000000000..834535fdec --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/shuca_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/shuca_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/shuca_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/shuca_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/sitrus_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/sitrus_sprout.json new file mode 100644 index 0000000000..b78f717fa6 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/sitrus_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/sitrus_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/sitrus_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/sitrus_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/spelon_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/spelon_sprout.json new file mode 100644 index 0000000000..46fa5e2ed8 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/spelon_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/spelon_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/spelon_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/spelon_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/starf_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/starf_sprout.json new file mode 100644 index 0000000000..49b9bcb5fc --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/starf_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/starf_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/starf_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/starf_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/tamato_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/tamato_sprout.json new file mode 100644 index 0000000000..3d49821a5f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/tamato_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/tamato_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/tamato_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/tamato_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/tanga_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/tanga_sprout.json new file mode 100644 index 0000000000..75abd69e78 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/tanga_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/tanga_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/tanga_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/tanga_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/touga_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/touga_sprout.json new file mode 100644 index 0000000000..91fa3b31d2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/touga_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/touga_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/touga_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/touga_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/wacan_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/wacan_sprout.json new file mode 100644 index 0000000000..340d11ced5 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/wacan_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/wacan_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/wacan_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/wacan_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/watmel_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/watmel_sprout.json new file mode 100644 index 0000000000..4ddc7cdbde --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/watmel_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/watmel_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/watmel_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/watmel_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/wepear_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/wepear_sprout.json new file mode 100644 index 0000000000..4b6f21d84b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/wepear_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/wepear_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/wepear_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/wepear_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/wiki_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/wiki_sprout.json new file mode 100644 index 0000000000..01483e6736 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/wiki_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/wiki_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/wiki_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/wiki_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/berries/yache_sprout.json b/common/src/main/resources/assets/cobblemon/models/block/berries/yache_sprout.json new file mode 100644 index 0000000000..f68af87afb --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/berries/yache_sprout.json @@ -0,0 +1,115 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/farmland_moist", + "3": "cobblemon:block/yache_sprout", + "particle": "block/farmland_moist" + }, + "elements": [ + { + "name": "soil1", + "from": [3.99, -1.01, 3.99], + "to": [12.01, 0.01, 12.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, -1, -1]}, + "faces": { + "north": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "east": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [12, 6, 13, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#0"} + } + }, + { + "name": "soil2", + "from": [5, 0, 5], + "to": [11, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [-1, 0, -1]}, + "faces": { + "north": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "east": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 14, 11, 15], "texture": "#0"}, + "west": {"uv": [7, 5, 8, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#0"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#0"} + } + }, + { + "name": "stem", + "from": [7.5, 1, 8], + "to": [8.5, 3, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#3"} + } + }, + { + "name": "stem", + "from": [8, 1, 7.5], + "to": [8, 3, 8.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, + "up": {"uv": [1, 1, 0, 0], "rotation": 270, "texture": "#3"}, + "down": {"uv": [1, 1, 0, 2], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "leaf_right", + "from": [8, 3, 8], + "to": [12, 3, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "rotation": 180, "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "name": "leaf_left", + "from": [4, 3, 4], + "to": [8, 3, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "east": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "south": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "west": {"uv": [0, 0, 3, 0], "texture": "#3"}, + "up": {"uv": [10, 16, 2, 0], "texture": "#3"}, + "down": {"uv": [10, 0, 2, 16], "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "cobblemon:block/yache_sprout", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "soil", + "origin": [-1, 0, -1], + "color": 0, + "children": [0, 1] + }, + { + "name": "cobblemon:block/yache_sprout", + "origin": [8, 3, 8], + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_slab.json b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_slab.json new file mode 100644 index 0000000000..5a4da13fa2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "cobblemon:block/black_tumblestone_bricks", + "side": "cobblemon:block/black_tumblestone_bricks", + "top": "cobblemon:block/black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_slab_top.json b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_slab_top.json new file mode 100644 index 0000000000..79c2431a56 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "cobblemon:block/black_tumblestone_bricks", + "side": "cobblemon:block/black_tumblestone_bricks", + "top": "cobblemon:block/black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_stairs.json b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..0cb7e05daa --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "cobblemon:block/black_tumblestone_bricks", + "side": "cobblemon:block/black_tumblestone_bricks", + "top": "cobblemon:block/black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_stairs_inner.json b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_stairs_inner.json new file mode 100644 index 0000000000..cad86d5996 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "cobblemon:block/black_tumblestone_bricks", + "side": "cobblemon:block/black_tumblestone_bricks", + "top": "cobblemon:block/black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_stairs_outer.json b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_stairs_outer.json new file mode 100644 index 0000000000..4908fd52d3 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "cobblemon:block/black_tumblestone_bricks", + "side": "cobblemon:block/black_tumblestone_bricks", + "top": "cobblemon:block/black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_inventory.json b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_inventory.json new file mode 100644 index 0000000000..1b22db23f7 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "cobblemon:block/black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_post.json b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_post.json new file mode 100644 index 0000000000..dbeb2772b4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "cobblemon:block/black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_side.json b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_side.json new file mode 100644 index 0000000000..dea2631187 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "cobblemon:block/black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_side_tall.json b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_side_tall.json new file mode 100644 index 0000000000..07db892b3d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "cobblemon:block/black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_bricks.json new file mode 100644 index 0000000000..e1c963bb0e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/black_tumblestone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "cobblemon:block/black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/chiseled_black_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/block/chiseled_black_tumblestone_bricks.json new file mode 100644 index 0000000000..bb254a3048 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/chiseled_black_tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "cobblemon:block/chiseled_black_tumblestone_bricks_top", + "side": "cobblemon:block/chiseled_black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/chiseled_polished_black_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/block/chiseled_polished_black_tumblestone.json new file mode 100644 index 0000000000..c3e5ba142d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/chiseled_polished_black_tumblestone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "cobblemon:block/chiseled_polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/chiseled_polished_sky_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/block/chiseled_polished_sky_tumblestone.json new file mode 100644 index 0000000000..d29ec73c52 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/chiseled_polished_sky_tumblestone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "cobblemon:block/chiseled_polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/chiseled_polished_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/block/chiseled_polished_tumblestone.json new file mode 100644 index 0000000000..e0916b6479 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/chiseled_polished_tumblestone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "cobblemon:block/chiseled_polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/chiseled_sky_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/block/chiseled_sky_tumblestone_bricks.json new file mode 100644 index 0000000000..eee7faf5d0 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/chiseled_sky_tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "cobblemon:block/chiseled_sky_tumblestone_bricks_top", + "side": "cobblemon:block/chiseled_sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/chiseled_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/block/chiseled_tumblestone_bricks.json new file mode 100644 index 0000000000..3cb7a9ae1d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/chiseled_tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "cobblemon:block/chiseled_tumblestone_bricks_top", + "side": "cobblemon:block/chiseled_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone.json new file mode 100644 index 0000000000..6161f02534 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "cobblemon:block/polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_slab.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_slab.json new file mode 100644 index 0000000000..29fb22e9d2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "cobblemon:block/polished_black_tumblestone", + "side": "cobblemon:block/polished_black_tumblestone_slab", + "top": "cobblemon:block/polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_slab_double.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_slab_double.json new file mode 100644 index 0000000000..fcadce8774 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_slab_double.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "cobblemon:block/polished_black_tumblestone", + "side": "cobblemon:block/polished_black_tumblestone_slab" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_slab_top.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_slab_top.json new file mode 100644 index 0000000000..c40599015b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "cobblemon:block/polished_black_tumblestone", + "side": "cobblemon:block/polished_black_tumblestone_slab", + "top": "cobblemon:block/polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_stairs.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_stairs.json new file mode 100644 index 0000000000..40f715aa0f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "cobblemon:block/polished_black_tumblestone", + "side": "cobblemon:block/polished_black_tumblestone", + "top": "cobblemon:block/polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_stairs_inner.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_stairs_inner.json new file mode 100644 index 0000000000..3d657675a2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "cobblemon:block/polished_black_tumblestone", + "side": "cobblemon:block/polished_black_tumblestone", + "top": "cobblemon:block/polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_stairs_outer.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_stairs_outer.json new file mode 100644 index 0000000000..96e67816f9 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "cobblemon:block/polished_black_tumblestone", + "side": "cobblemon:block/polished_black_tumblestone", + "top": "cobblemon:block/polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_inventory.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_inventory.json new file mode 100644 index 0000000000..8b6637232e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "cobblemon:block/polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_post.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_post.json new file mode 100644 index 0000000000..09ff1828a9 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "cobblemon:block/polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_side.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_side.json new file mode 100644 index 0000000000..342dd3bb29 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "cobblemon:block/polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_side_tall.json b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_side_tall.json new file mode 100644 index 0000000000..f3c5c863f7 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_black_tumblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "cobblemon:block/polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone.json new file mode 100644 index 0000000000..9e17743b15 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "cobblemon:block/polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_slab.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_slab.json new file mode 100644 index 0000000000..6b02122d54 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "cobblemon:block/polished_sky_tumblestone", + "side": "cobblemon:block/polished_sky_tumblestone_slab", + "top": "cobblemon:block/polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_slab_double.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_slab_double.json new file mode 100644 index 0000000000..247462b889 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_slab_double.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "cobblemon:block/polished_sky_tumblestone", + "side": "cobblemon:block/polished_sky_tumblestone_slab" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_slab_top.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_slab_top.json new file mode 100644 index 0000000000..3d235cf7cc --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "cobblemon:block/polished_sky_tumblestone", + "side": "cobblemon:block/polished_sky_tumblestone_slab", + "top": "cobblemon:block/polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_stairs.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_stairs.json new file mode 100644 index 0000000000..13ed6b07d6 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "cobblemon:block/polished_sky_tumblestone", + "side": "cobblemon:block/polished_sky_tumblestone", + "top": "cobblemon:block/polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_stairs_inner.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_stairs_inner.json new file mode 100644 index 0000000000..8ca268eb02 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "cobblemon:block/polished_sky_tumblestone", + "side": "cobblemon:block/polished_sky_tumblestone", + "top": "cobblemon:block/polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_stairs_outer.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_stairs_outer.json new file mode 100644 index 0000000000..0acc3ab4fd --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "cobblemon:block/polished_sky_tumblestone", + "side": "cobblemon:block/polished_sky_tumblestone", + "top": "cobblemon:block/polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_inventory.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_inventory.json new file mode 100644 index 0000000000..4e8e40ed9d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "cobblemon:block/polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_post.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_post.json new file mode 100644 index 0000000000..102c095a36 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "cobblemon:block/polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_side.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_side.json new file mode 100644 index 0000000000..21e6ae5673 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "cobblemon:block/polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_side_tall.json b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_side_tall.json new file mode 100644 index 0000000000..fe23811761 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_sky_tumblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "cobblemon:block/polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone.json new file mode 100644 index 0000000000..5777d71da9 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "cobblemon:block/polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_slab.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_slab.json new file mode 100644 index 0000000000..a130b04ed6 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "cobblemon:block/polished_tumblestone", + "side": "cobblemon:block/polished_tumblestone_slab", + "top": "cobblemon:block/polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_slab_double.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_slab_double.json new file mode 100644 index 0000000000..ecad5aa031 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_slab_double.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "cobblemon:block/polished_tumblestone", + "side": "cobblemon:block/polished_tumblestone_slab" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_slab_top.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_slab_top.json new file mode 100644 index 0000000000..356f475579 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "cobblemon:block/polished_tumblestone", + "side": "cobblemon:block/polished_tumblestone_slab", + "top": "cobblemon:block/polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_stairs.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_stairs.json new file mode 100644 index 0000000000..5891f2f0d3 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "cobblemon:block/polished_tumblestone", + "side": "cobblemon:block/polished_tumblestone", + "top": "cobblemon:block/polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_stairs_inner.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_stairs_inner.json new file mode 100644 index 0000000000..0e3126c37b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "cobblemon:block/polished_tumblestone", + "side": "cobblemon:block/polished_tumblestone", + "top": "cobblemon:block/polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_stairs_outer.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_stairs_outer.json new file mode 100644 index 0000000000..2125715702 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "cobblemon:block/polished_tumblestone", + "side": "cobblemon:block/polished_tumblestone", + "top": "cobblemon:block/polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_inventory.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_inventory.json new file mode 100644 index 0000000000..808633e81a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "cobblemon:block/polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_post.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_post.json new file mode 100644 index 0000000000..634cc40817 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "cobblemon:block/polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_side.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_side.json new file mode 100644 index 0000000000..bd7ea37a0f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "cobblemon:block/polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_side_tall.json b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_side_tall.json new file mode 100644 index 0000000000..dc226cf8a2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/polished_tumblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "cobblemon:block/polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_slab.json b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_slab.json new file mode 100644 index 0000000000..65400fdf1c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "cobblemon:block/sky_tumblestone_bricks", + "side": "cobblemon:block/sky_tumblestone_bricks", + "top": "cobblemon:block/sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_slab_top.json b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_slab_top.json new file mode 100644 index 0000000000..aec8edf0a4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "cobblemon:block/sky_tumblestone_bricks", + "side": "cobblemon:block/sky_tumblestone_bricks", + "top": "cobblemon:block/sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_stairs.json b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..c14333c427 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "cobblemon:block/sky_tumblestone_bricks", + "side": "cobblemon:block/sky_tumblestone_bricks", + "top": "cobblemon:block/sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_stairs_inner.json b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_stairs_inner.json new file mode 100644 index 0000000000..099544715a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "cobblemon:block/sky_tumblestone_bricks", + "side": "cobblemon:block/sky_tumblestone_bricks", + "top": "cobblemon:block/sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_stairs_outer.json b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_stairs_outer.json new file mode 100644 index 0000000000..ce0dd5b47b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "cobblemon:block/sky_tumblestone_bricks", + "side": "cobblemon:block/sky_tumblestone_bricks", + "top": "cobblemon:block/sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_inventory.json b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_inventory.json new file mode 100644 index 0000000000..22a2a7045b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "cobblemon:block/sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_post.json b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_post.json new file mode 100644 index 0000000000..f7278313a1 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "cobblemon:block/sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_side.json b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_side.json new file mode 100644 index 0000000000..9c28c2a9dd --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "cobblemon:block/sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_side_tall.json b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_side_tall.json new file mode 100644 index 0000000000..748e2e1d9c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "cobblemon:block/sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_bricks.json new file mode 100644 index 0000000000..0bfde91c7f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/sky_tumblestone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "cobblemon:block/sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_slab.json b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_slab.json new file mode 100644 index 0000000000..7d285d95de --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "cobblemon:block/tumblestone_bricks", + "side": "cobblemon:block/tumblestone_bricks", + "top": "cobblemon:block/tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_slab_top.json b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_slab_top.json new file mode 100644 index 0000000000..832eb8ee42 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "cobblemon:block/tumblestone_bricks", + "side": "cobblemon:block/tumblestone_bricks", + "top": "cobblemon:block/tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_stairs.json b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_stairs.json new file mode 100644 index 0000000000..fc90ca2572 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "cobblemon:block/tumblestone_bricks", + "side": "cobblemon:block/tumblestone_bricks", + "top": "cobblemon:block/tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_stairs_inner.json b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_stairs_inner.json new file mode 100644 index 0000000000..23b78b76a6 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "cobblemon:block/tumblestone_bricks", + "side": "cobblemon:block/tumblestone_bricks", + "top": "cobblemon:block/tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_stairs_outer.json b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_stairs_outer.json new file mode 100644 index 0000000000..2a304e04ef --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "cobblemon:block/tumblestone_bricks", + "side": "cobblemon:block/tumblestone_bricks", + "top": "cobblemon:block/tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_inventory.json b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_inventory.json new file mode 100644 index 0000000000..9ebca0b556 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "cobblemon:block/tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_post.json b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_post.json new file mode 100644 index 0000000000..2f89f7cac8 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "cobblemon:block/tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_side.json b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_side.json new file mode 100644 index 0000000000..ca45845cca --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "cobblemon:block/tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_side_tall.json b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_side_tall.json new file mode 100644 index 0000000000..68cba04591 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "cobblemon:block/tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_bricks.json new file mode 100644 index 0000000000..f693c273c2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/tumblestone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "cobblemon:block/tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_brick_slab.json b/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_brick_slab.json new file mode 100644 index 0000000000..fd470fedfa --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/black_tumblestone_brick_slab" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_brick_stairs.json b/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..fbbcc031e0 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/black_tumblestone_brick_stairs" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_brick_wall.json b/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_brick_wall.json new file mode 100644 index 0000000000..eec2e22aa5 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_brick_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/black_tumblestone_brick_wall_inventory" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_bricks.json new file mode 100644 index 0000000000..bab76f38f8 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/black_tumblestone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/black_tumblestone_bricks" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/chiseled_black_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/item/chiseled_black_tumblestone_bricks.json new file mode 100644 index 0000000000..48d27763ea --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/chiseled_black_tumblestone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/chiseled_black_tumblestone_bricks" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/chiseled_polished_black_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/item/chiseled_polished_black_tumblestone.json new file mode 100644 index 0000000000..3600802ece --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/chiseled_polished_black_tumblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/chiseled_polished_black_tumblestone" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/chiseled_polished_sky_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/item/chiseled_polished_sky_tumblestone.json new file mode 100644 index 0000000000..58873af692 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/chiseled_polished_sky_tumblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/chiseled_polished_sky_tumblestone" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/chiseled_polished_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/item/chiseled_polished_tumblestone.json new file mode 100644 index 0000000000..e297aae437 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/chiseled_polished_tumblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/chiseled_polished_tumblestone" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/chiseled_sky_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/item/chiseled_sky_tumblestone_bricks.json new file mode 100644 index 0000000000..a0aedbe609 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/chiseled_sky_tumblestone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/chiseled_sky_tumblestone_bricks" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/chiseled_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/item/chiseled_tumblestone_bricks.json new file mode 100644 index 0000000000..ca44f61b43 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/chiseled_tumblestone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/chiseled_tumblestone_bricks" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/handheld_rotated.json b/common/src/main/resources/assets/cobblemon/models/item/handheld_rotated.json new file mode 100644 index 0000000000..010d09dc9a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/handheld_rotated.json @@ -0,0 +1,36 @@ +{ + "parent": "item/generated", + "display": { + "thirdperson_righthand": { + "rotation": [0, 90, -55], + "translation": [0, 3.5, 0.25], + "scale": [0.85, 0.85, 0.85] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 55], + "translation": [0, 3.5, 0.25], + "scale": [0.85, 0.85, 0.85] + }, + "firstperson_righthand": { + "rotation": [0, 90, -25], + "translation": [0, 3.8, 0.8], + "scale": [0.68, 0.68, 0.68] + }, + "firstperson_lefthand": { + "rotation": [0, -90, 25], + "translation": [0, 3.8, 0.8], + "scale": [0.68, 0.68, 0.68] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "rotation": [0, 180, 0] + } + } +} diff --git a/common/src/main/resources/assets/cobblemon/models/item/medicinal_leek.json b/common/src/main/resources/assets/cobblemon/models/item/medicinal_leek.json index c0016198f0..9704ff8a43 100644 --- a/common/src/main/resources/assets/cobblemon/models/item/medicinal_leek.json +++ b/common/src/main/resources/assets/cobblemon/models/item/medicinal_leek.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cobblemon:item/medicine/medicinal_leek" - } + "parent": "cobblemon:item/handheld_rotated", + "textures": { + "layer0": "cobblemon:item/medicine/medicinal_leek" + } } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone.json new file mode 100644 index 0000000000..47d6d5522b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_black_tumblestone" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone_slab.json b/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone_slab.json new file mode 100644 index 0000000000..6c05f3acbe --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_black_tumblestone_slab" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone_stairs.json b/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone_stairs.json new file mode 100644 index 0000000000..fdedda7dc4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_black_tumblestone_stairs" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone_wall.json b/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone_wall.json new file mode 100644 index 0000000000..f1642b9d96 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_black_tumblestone_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_black_tumblestone_wall_inventory" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone.json new file mode 100644 index 0000000000..9a2386d589 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_sky_tumblestone" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone_slab.json b/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone_slab.json new file mode 100644 index 0000000000..efb661cc89 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_sky_tumblestone_slab" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone_stairs.json b/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone_stairs.json new file mode 100644 index 0000000000..1830bf0db9 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_sky_tumblestone_stairs" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone_wall.json b/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone_wall.json new file mode 100644 index 0000000000..5cbe6c1531 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_sky_tumblestone_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_sky_tumblestone_wall_inventory" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone.json b/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone.json new file mode 100644 index 0000000000..a74553f220 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_tumblestone" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone_slab.json b/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone_slab.json new file mode 100644 index 0000000000..9779e4b30e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_tumblestone_slab" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone_stairs.json b/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone_stairs.json new file mode 100644 index 0000000000..5db063524f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_tumblestone_stairs" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone_wall.json b/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone_wall.json new file mode 100644 index 0000000000..4661105488 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/polished_tumblestone_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/polished_tumblestone_wall_inventory" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/roasted_leek.json b/common/src/main/resources/assets/cobblemon/models/item/roasted_leek.json index 82d4acc3a5..27a18f4888 100644 --- a/common/src/main/resources/assets/cobblemon/models/item/roasted_leek.json +++ b/common/src/main/resources/assets/cobblemon/models/item/roasted_leek.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "cobblemon:item/handheld_rotated", "textures": { "layer0": "cobblemon:item/roasted_leek" } diff --git a/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_brick_slab.json b/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_brick_slab.json new file mode 100644 index 0000000000..3df765611a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/sky_tumblestone_brick_slab" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_brick_stairs.json b/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..7d212c29f2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/sky_tumblestone_brick_stairs" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_brick_wall.json b/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_brick_wall.json new file mode 100644 index 0000000000..0a62f9d229 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_brick_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/sky_tumblestone_brick_wall_inventory" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_bricks.json new file mode 100644 index 0000000000..62ee06c2aa --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/sky_tumblestone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/sky_tumblestone_bricks" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tumblestone_brick_slab.json b/common/src/main/resources/assets/cobblemon/models/item/tumblestone_brick_slab.json new file mode 100644 index 0000000000..c2d6521027 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tumblestone_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/tumblestone_brick_slab" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tumblestone_brick_stairs.json b/common/src/main/resources/assets/cobblemon/models/item/tumblestone_brick_stairs.json new file mode 100644 index 0000000000..d66975bec7 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tumblestone_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/tumblestone_brick_stairs" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tumblestone_brick_wall.json b/common/src/main/resources/assets/cobblemon/models/item/tumblestone_brick_wall.json new file mode 100644 index 0000000000..00f0c2127b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tumblestone_brick_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/tumblestone_brick_wall_inventory" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tumblestone_bricks.json b/common/src/main/resources/assets/cobblemon/models/item/tumblestone_bricks.json new file mode 100644 index 0000000000..f46fbd49a2 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tumblestone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "cobblemon:block/tumblestone_bricks" +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/particles/snowstorm.json b/common/src/main/resources/assets/cobblemon/particles/snowstorm.json index 34bbf97a32..6a96402554 100644 --- a/common/src/main/resources/assets/cobblemon/particles/snowstorm.json +++ b/common/src/main/resources/assets/cobblemon/particles/snowstorm.json @@ -67,6 +67,34 @@ "cobblemon:pop_particle", "cobblemon:white", "cobblemon:invisible", - "cobblemon:white_aura" + "cobblemon:white_aura", + "cobblemon:pink_obscure", + "cobblemon:statdown_orb", + "cobblemon:statup_orb", + "cobblemon:statdown_line", + "cobblemon:statup_line", + "cobblemon:chirp", + "cobblemon:swordsdance_swords", + "cobblemon:large-ring", + "cobblemon:protect-shine", + "cobblemon:small-sparkle", + "cobblemon:powder", + "cobblemon:smokeorb", + "cobblemon:quickattack_dashlines", + "cobblemon:ember", + "cobblemon:powder", + "cobblemon:paralysis-spark", + "cobblemon:accessory-spark", + "cobblemon:poison-bubble", + "cobblemon:mushroommize", + "cobblemon:smokeorb", + "cobblemon:tochukaso", + "cobblemon:cotton", + "cobblemon:large-smokeorb", + "cobblemon:medium-fadeorb", + "cobblemon:small-fadeorb", + "cobblemon:xs-fadeorb", + "cobblemon:medium-ring", + "cobblemon:small-ring" ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/sounds.json b/common/src/main/resources/assets/cobblemon/sounds.json index 24c3f4661f..0d1a2d18f7 100644 --- a/common/src/main/resources/assets/cobblemon/sounds.json +++ b/common/src/main/resources/assets/cobblemon/sounds.json @@ -75,10 +75,10 @@ "sounds": [ "cobblemon:pokemon/evolution_notification"] }, "evolution.evolve": { - "sounds": ["cobblemon:evolve"] + "sounds": [] }, - "pokemon.evolving": { - "sounds": [ "cobblemon:pokemon/evolving"] + "evolution.evolving": { + "sounds": ["cobblemon:evolution/evolve_full"] }, "gui.click": { "sounds": [ "cobblemon:click" ] @@ -159,36 +159,36 @@ "gimmighoul.reveal": { "sounds": [ "cobblemon:gimmighoul_reveal" ] }, - "coin_pouch.break": { + "relic_coin_sack.break": { "sounds": [ - "cobblemon:block/coin_pouch/coin_pouch_block_break_1", - "cobblemon:block/coin_pouch/coin_pouch_block_break_2", - "cobblemon:block/coin_pouch/coin_pouch_block_break_3", - "cobblemon:block/coin_pouch/coin_pouch_block_break_4" + "cobblemon:block/relic_coin_sack/relic_coin_sack_break_1", + "cobblemon:block/relic_coin_sack/relic_coin_sack_break_2", + "cobblemon:block/relic_coin_sack/relic_coin_sack_break_3", + "cobblemon:block/relic_coin_sack/relic_coin_sack_break_4" ] }, - "coin_pouch.hit": { + "relic_coin_sack.hit": { "sounds": [ - { "name": "cobblemon:block/coin_pouch/coin_pouch_block_hit_1", "volume": 0.6 }, - { "name": "cobblemon:block/coin_pouch/coin_pouch_block_hit_2", "volume": 0.6 }, - { "name": "cobblemon:block/coin_pouch/coin_pouch_block_hit_3", "volume": 0.6 }, - { "name": "cobblemon:block/coin_pouch/coin_pouch_block_hit_4", "volume": 0.6 } + { "name": "cobblemon:block/relic_coin_sack/relic_coin_sack_hit_1", "volume": 0.5 }, + { "name": "cobblemon:block/relic_coin_sack/relic_coin_sack_hit_2", "volume": 0.5 }, + { "name": "cobblemon:block/relic_coin_sack/relic_coin_sack_hit_3", "volume": 0.5 }, + { "name": "cobblemon:block/relic_coin_sack/relic_coin_sack_hit_4", "volume": 0.5 } ] }, - "coin_pouch.place": { + "relic_coin_sack.place": { "sounds": [ - "cobblemon:block/coin_pouch/coin_pouch_block_place_1", - "cobblemon:block/coin_pouch/coin_pouch_block_place_2", - "cobblemon:block/coin_pouch/coin_pouch_block_place_3", - "cobblemon:block/coin_pouch/coin_pouch_block_place_4" + "cobblemon:block/relic_coin_sack/relic_coin_sack_place_1", + "cobblemon:block/relic_coin_sack/relic_coin_sack_place_2", + "cobblemon:block/relic_coin_sack/relic_coin_sack_place_3", + "cobblemon:block/relic_coin_sack/relic_coin_sack_place_4" ] }, - "coin_pouch.step": { + "relic_coin_sack.step": { "sounds": [ - "cobblemon:block/coin_pouch/coin_pouch_block_step_1", - "cobblemon:block/coin_pouch/coin_pouch_block_step_2", - "cobblemon:block/coin_pouch/coin_pouch_block_step_3", - "cobblemon:block/coin_pouch/coin_pouch_block_step_4" + "cobblemon:block/relic_coin_sack/relic_coin_sack_step_1", + "cobblemon:block/relic_coin_sack/relic_coin_sack_step_2", + "cobblemon:block/relic_coin_sack/relic_coin_sack_step_3", + "cobblemon:block/relic_coin_sack/relic_coin_sack_step_4" ] }, "tumblestone.break": { @@ -199,6 +199,22 @@ "cobblemon:block/tumblestone/tumblestone_break_4" ] }, + "relic_coin_pouch.break": { + "sounds": [ + "cobblemon:block/relic_coin_pouch/relic_coin_pouch_break_1", + "cobblemon:block/relic_coin_pouch/relic_coin_pouch_break_2", + "cobblemon:block/relic_coin_pouch/relic_coin_pouch_break_3", + "cobblemon:block/relic_coin_pouch/relic_coin_pouch_break_4" + ] + }, + "relic_coin_pouch.place": { + "sounds": [ + "cobblemon:block/relic_coin_pouch/relic_coin_pouch_place_1", + "cobblemon:block/relic_coin_pouch/relic_coin_pouch_place_2", + "cobblemon:block/relic_coin_pouch/relic_coin_pouch_place_3", + "cobblemon:block/relic_coin_pouch/relic_coin_pouch_place_4" + ] + }, "tumblestone.block_break": { "sounds": [ "cobblemon:block/tumblestone/tumblestone_block_break_1", @@ -391,8 +407,35 @@ "cobblemon:block/gilded_chest/gilded_chest_step_4" ] }, - "flamethrower": { - "sounds": [ "cobblemon:attacks/flamethrower" ] + "move.flamethrower.actor": { + "sounds": [ { "name": "cobblemon:attacks/flamethrower/flamethrower_cast", "volume": 0.8 } ] + }, + "move.flamethrower.impact": { + "sounds": [ { "name": "cobblemon:attacks/flamethrower/flamethrower_impact", "volume": 0.8 } ] + }, + "move.sandattack.actor": { + "sounds": [ { "name": "cobblemon:attacks/sandattack/sand_attack_actor", "volume": 0.8 } ] + }, + "move.sandattack.target": { + "sounds": [ { "name": "cobblemon:attacks/sandattack/sand_attack_target", "volume": 0.8 } ] + }, + "move.confusion.actor": { + "sounds": [ { "name": "cobblemon:attacks/confusion/confusion_actor", "volume": 0.9 } ] + }, + "move.confusion.target": { + "sounds": [ { "name": "cobblemon:attacks/confusion/confusion_target", "volume": 0.8 } ] + }, + "move.swordsdance.actor": { + "sounds": [ { "name": "cobblemon:attacks/swordsdance/swords_dance_actor", "volume": 0.8 } ] + }, + "move.thunderwave.actor": { + "sounds": [ { "name": "cobblemon:attacks/thunderwave/thunder_wave_actor", "volume": 0.8 } ] + }, + "move.thunderwave.target": { + "sounds": [ { "name": "cobblemon:attacks/thunderwave/thunder_wave_target", "volume": 0.8 } ] + }, + "move.protect.actor": { + "sounds": [ { "name": "cobblemon:attacks/protect/protect_actor", "volume": 0.8 } ] }, "effective": { "sounds": [ "cobblemon:effective" ] @@ -619,6 +662,38 @@ { "name": "cobblemon:attacks/impact_generic/impact_generic_fairy_8", "volume": 0.8 } ] }, + "status.paralysis.actor": { + "sounds": [ { "name": "cobblemon:attacks/status/status_paralysis_actor", "volume": 0.8 } ] + }, + "status.poison.actor": { + "sounds": [ { "name": "cobblemon:attacks/status/status_poison_actor", "volume": 0.8 } ] + }, + "status.badlypoison.actor": { + "sounds": [ { "name": "cobblemon:attacks/status/status_toxpoison_actor", "volume": 0.8 } ] + }, + "powder.poison.actor": { + "sounds": [ { "name": "cobblemon:attacks/powder_attacks/poison_powder_actor", "volume": 1.0 } ] + }, + "powder.sleep.actor": { + "sounds": [ { "name": "cobblemon:attacks/powder_attacks/sleep_powder_actor", "volume": 1.0 } ] + }, + "powder.stun.actor": { + "sounds": [ { "name": "cobblemon:attacks/powder_attacks/stun_spore_actor", "volume": 1.0 } ] + }, + "powder.generic.actor": { + "sounds": [ { "name": "cobblemon:attacks/powder_attacks/generic_powder_actor", "volume": 1.0 } ] + }, + "powder.generic.target": { + "sounds": [ { "name": "cobblemon:attacks/powder_attacks/generic_powder_target", "volume": 1.0 } ] + }, + "powder.spore.mushroom": { + "sounds": [ + { "name": "cobblemon:attacks/powder_attacks/spore_mushroom_1", "volume": 0.3 }, + { "name": "cobblemon:attacks/powder_attacks/spore_mushroom_2", "volume": 0.1 }, + { "name": "cobblemon:attacks/powder_attacks/spore_mushroom_3", "volume": 0.1 }, + { "name": "cobblemon:attacks/powder_attacks/spore_mushroom_4", "volume": 0.1 } + ] + }, "pokemon.bulbasaur.ambient": { "sounds": [ "cobblemon:pokemon/bulbasaur/bulbasaur_ambient" ] }, diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/confusion/confusion_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/confusion/confusion_actor.ogg new file mode 100644 index 0000000000..6a6bf83526 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/confusion/confusion_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/confusion/confusion_target.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/confusion/confusion_target.ogg new file mode 100644 index 0000000000..8e87d5c334 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/confusion/confusion_target.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower.ogg deleted file mode 100644 index 81402f09d7..0000000000 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower.ogg and /dev/null differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower/flamethrower_cast.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower/flamethrower_cast.ogg new file mode 100644 index 0000000000..07165d1658 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower/flamethrower_cast.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower/flamethrower_impact.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower/flamethrower_impact.ogg new file mode 100644 index 0000000000..47e1d763b3 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower/flamethrower_impact.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_1.ogg index 832b2c97f8..f45470a0fb 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_2.ogg index 229a02dfb7..95634e1830 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_3.ogg index 39a0b03d06..06358fbc52 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_4.ogg index 2f148ade59..10f50e02c1 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_5.ogg index f8d76d1568..77f3de604b 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_6.ogg index 8f21128375..a460f9031e 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_7.ogg index 80acf6fd59..b57742fadf 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_8.ogg index 0370c3f312..5105b625b9 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_bug_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_1.ogg index cf31551d87..2fc3b01ddf 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_2.ogg index fc91b20812..b900a13397 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_3.ogg index 2e4cb3d856..ceecd8c556 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_4.ogg index 63077e40c8..8b8e083ec7 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_5.ogg index 30be42c74c..5cb8072379 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_6.ogg index ccdda02a79..629f04f035 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_7.ogg index 7a2ffa33fc..4835802af1 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_8.ogg index a64089093f..7872bc50c1 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dark_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_1.ogg index 8a7d11126e..0db6d75b5a 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_2.ogg index ec41494a47..5c0ee59956 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_3.ogg index d1d3de060c..c60afa1308 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_4.ogg index a537acc260..3434986174 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_5.ogg index 202c068ccf..81a4e2475d 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_6.ogg index 7bbaf5f995..435db01dfe 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_7.ogg index 2da10c517a..b562c9f636 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_8.ogg index 1964569218..5d16b7e24a 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_dragon_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_1.ogg index 3d2e8e2351..11f5b6b9d8 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_2.ogg index a1bab09e40..6f3f97063f 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_3.ogg index f954fb4e40..5280be920b 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_4.ogg index 2a14a395c0..1aed8d0a82 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_5.ogg index 27ab2e0386..f6e73faa3c 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_6.ogg index 099b428572..8816e77bc1 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_7.ogg index cb86326fde..82aac44abb 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_8.ogg index 465fbcfc6b..75990cc2f5 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_electric_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_1.ogg index 4ab3916eb3..41c6b35852 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_2.ogg index e2c4b7190b..851d302ff5 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_3.ogg index 2d8e0bdd41..d249c5349d 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_4.ogg index 6ed0539a7b..c28d553e76 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_5.ogg index d0e2e6b971..aa4ae94861 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_6.ogg index 395000e763..a8ae9d93cd 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_7.ogg index 805ebdb451..22e31340a7 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_8.ogg index 515a4d10f1..0155348faa 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fairy_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_1.ogg index 4e61ee514b..75ead1460f 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_2.ogg index c09c32a23c..685312e13b 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_3.ogg index 591d7f3f5f..0fc2655219 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_4.ogg index 63b04685d1..f52f274f49 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_5.ogg index 119c83c362..0491f68694 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_6.ogg index 959801e688..5ef10ed3e3 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_7.ogg index a7729c1879..7bc245138b 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_8.ogg index 05608bb1c0..922b8b9298 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fighting_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_1.ogg index d2e99e4d88..619d06d459 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_2.ogg index 46f8bbaa92..b9a0828242 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_3.ogg index 91fd58c4b2..3be5011303 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_4.ogg index eecdc3b75d..5e10082b02 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_5.ogg index e191d8a861..01d8090a9f 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_6.ogg index 83fb8585ad..fcb0483b3e 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_7.ogg index edf7d182d9..ed2faa820f 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_8.ogg index 282e7e03db..8dfd6fc738 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_fire_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_1.ogg index 093a0a9991..2276bdd014 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_2.ogg index a26538eb7e..e41b341cb6 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_3.ogg index 22f4749cbe..c80ddfb372 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_4.ogg index 8a3105aece..1e25538975 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_5.ogg index 01ad44b3ae..9972093fbf 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_6.ogg index 74a031734c..e37fc2b6b8 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_7.ogg index a8632050a2..bc673bb193 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_8.ogg index 092f0ddfd7..ec71f14ebb 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_flying_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_1.ogg index 815e37e0f6..d180002fbc 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_2.ogg index 6c3aa5f2e7..b6bb085d64 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_3.ogg index 959e7357dc..e97d8a4db8 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_4.ogg index 2c31631f97..91705fe535 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_5.ogg index 0801be77b8..e3cf86b001 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_6.ogg index a30f19b680..4288069494 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_7.ogg index 35306ab64b..f9792fd200 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_8.ogg index 538f1b738f..c59d48ca63 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ghost_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_1.ogg index bd3f210cfa..ef43f658f0 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_2.ogg index a8e5ad2390..9f4c2b3369 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_3.ogg index 68f1200145..64e9300a28 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_4.ogg index 4082f98183..3de4902124 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_5.ogg index b4a543ffc5..699e39a7f0 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_6.ogg index 1d152e543a..be27bc6a6f 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_7.ogg index c78b8110d4..6d7cf0f37c 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_8.ogg index 633e65a702..2bc6f75356 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_grass_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_1.ogg index b6dbb66866..84b6d6b4a6 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_2.ogg index 6d016b4990..fbbb810308 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_3.ogg index 682cc1ebec..dc93904fe3 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_4.ogg index 65f7adf161..57dabdf0a4 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_5.ogg index 4654d0e455..cc61eb9146 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_6.ogg index c6f9545b8f..8ea3dfa2e3 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_7.ogg index 1b617d2481..7a7b07e98b 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_8.ogg index 933589f92f..c1f5e86344 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ground_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_1.ogg index d2ef93b00d..ef965ed635 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_2.ogg index b6725843be..ea63ca3f10 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_3.ogg index 1c7554633c..2feab88b60 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_4.ogg index 6019d9209b..8f614e88b8 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_5.ogg index 805123fdcd..8eaa3aa53b 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_6.ogg index a688fbb498..f5fc8ecc53 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_7.ogg index 23069c758d..cd354d72c8 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_8.ogg index bbace4f6ee..55a847c366 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_ice_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_1.ogg index 82f8ab4c99..fd17b76646 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_2.ogg index bc1ea7afff..79faee7187 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_3.ogg index c2a80b48db..bcc34a2966 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_4.ogg index f48b57e926..ff757b1fae 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_5.ogg index c164273d4d..50ee2d6b37 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_6.ogg index 4b328fd4dd..febdd7f296 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_7.ogg index 9a409c68bc..380a1fe0b0 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_8.ogg index 4b560f1b3a..82c32dc111 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_poison_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_1.ogg index 75b8c36d17..3b70f3b9d9 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_2.ogg index dff88a243e..9f700f7b32 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_3.ogg index 67239e4802..a6297d4949 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_4.ogg index d16fc3c180..4c467d2eed 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_5.ogg index b31431b20e..a7f81bbb59 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_6.ogg index 45aa6f2bb9..d139d8aaec 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_7.ogg index 62c6d1b34d..20607aa5a6 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_8.ogg index a32e2605c3..e628627309 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_psychic_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_1.ogg index f998bb558d..d376367bae 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_2.ogg index c9f17ad15b..b87593b729 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_3.ogg index ad5cbf842d..38d20ecae8 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_4.ogg index 0a3bcbfc88..1c8ab666e4 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_5.ogg index 098d043675..cca7fa161f 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_6.ogg index 0b4cbcc7b4..ae5225011a 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_7.ogg index f26e8918d8..e5a2bcaccc 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_8.ogg index eee805abec..75c1cf1073 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_rock_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_1.ogg index 30e63c6c16..4c3b79a051 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_2.ogg index be6372947b..fb012f3e6c 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_3.ogg index 09aeb85be4..f5f43353e3 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_4.ogg index 58fd48f392..7802859413 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_5.ogg index 4f6feb2575..def4361ef0 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_6.ogg index 77c60bc36a..c37ee45eff 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_7.ogg index 4a68f7d191..23ac39c697 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_8.ogg index d0e5189e88..5f9ea18f22 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_steel_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_1.ogg index 4ea572947d..558075c491 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_2.ogg index 7f25a87de0..425f4dde74 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_3.ogg index bd1df059db..8efcb4f5be 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_4.ogg index 2c8af44143..e0bce3aa22 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_5.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_5.ogg index 3cb310bd7a..59d3e2e5ef 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_5.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_5.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_6.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_6.ogg index 252e3dcf76..cc8f3930ff 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_6.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_6.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_7.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_7.ogg index 9599569076..806b19d08f 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_7.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_7.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_8.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_8.ogg index bfb742498b..12b140a63c 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_8.ogg and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impact_generic/impact_generic_water_8.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/generic_powder_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/generic_powder_actor.ogg new file mode 100644 index 0000000000..743c65d244 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/generic_powder_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/generic_powder_target.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/generic_powder_target.ogg new file mode 100644 index 0000000000..9ea76bc249 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/generic_powder_target.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/poison_powder_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/poison_powder_actor.ogg new file mode 100644 index 0000000000..6d2bc305e6 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/poison_powder_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/sleep_powder_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/sleep_powder_actor.ogg new file mode 100644 index 0000000000..bb6410610b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/sleep_powder_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_1.ogg new file mode 100644 index 0000000000..924f79a7ff Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_2.ogg new file mode 100644 index 0000000000..b9499e3e3c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_3.ogg new file mode 100644 index 0000000000..e1f6ed1ac7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_4.ogg new file mode 100644 index 0000000000..3d96c847bb Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/spore_mushroom_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/stun_spore_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/stun_spore_actor.ogg new file mode 100644 index 0000000000..e4a19698b7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/powder_attacks/stun_spore_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/protect/protect_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/protect/protect_actor.ogg new file mode 100644 index 0000000000..b94abcaf8b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/protect/protect_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/sandattack/sand_attack_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/sandattack/sand_attack_actor.ogg new file mode 100644 index 0000000000..e5a2cbbae2 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/sandattack/sand_attack_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/sandattack/sand_attack_target.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/sandattack/sand_attack_target.ogg new file mode 100644 index 0000000000..eadd3ce876 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/sandattack/sand_attack_target.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/status/status_paralysis_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/status/status_paralysis_actor.ogg new file mode 100644 index 0000000000..38f6897b0a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/status/status_paralysis_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/status/status_poison_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/status/status_poison_actor.ogg new file mode 100644 index 0000000000..55385eec4d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/status/status_poison_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/status/status_toxpoison_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/status/status_toxpoison_actor.ogg new file mode 100644 index 0000000000..74c985d8d0 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/status/status_toxpoison_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/swordsdance/swords_dance_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/swordsdance/swords_dance_actor.ogg new file mode 100644 index 0000000000..9387bc1f33 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/swordsdance/swords_dance_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/thunderwave/thunder_wave_actor.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/thunderwave/thunder_wave_actor.ogg new file mode 100644 index 0000000000..48150439b7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/thunderwave/thunder_wave_actor.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/thunderwave/thunder_wave_target.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/thunderwave/thunder_wave_target.ogg new file mode 100644 index 0000000000..94390b09ea Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/thunderwave/thunder_wave_target.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_1.ogg new file mode 100644 index 0000000000..6b4f8ddfa7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_2.ogg new file mode 100644 index 0000000000..62d1fb31c9 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_3.ogg new file mode 100644 index 0000000000..ce1c447ac2 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_4.ogg new file mode 100644 index 0000000000..cc91803d3f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_break_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_1.ogg new file mode 100644 index 0000000000..4e9616727d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_2.ogg new file mode 100644 index 0000000000..f4b2b65ea7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_3.ogg new file mode 100644 index 0000000000..1e1f4b0117 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_4.ogg new file mode 100644 index 0000000000..cdc06985a6 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_pouch/relic_coin_pouch_place_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_1.ogg similarity index 84% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_1.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_1.ogg index d08e447220..19e35fd636 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_2.ogg similarity index 82% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_2.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_2.ogg index 0f313e04e4..199bf6c9ff 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_3.ogg similarity index 96% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_3.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_3.ogg index d1047b1b78..2415025feb 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_4.ogg similarity index 84% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_4.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_4.ogg index 18ea73b00c..e6d68dcc2e 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_break_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_break_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_1.ogg similarity index 95% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_1.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_1.ogg index 68921a13df..ab7d3f1160 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_2.ogg similarity index 96% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_2.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_2.ogg index 7eda334132..14778295d2 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_3.ogg similarity index 97% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_3.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_3.ogg index 2f16e1fbe8..05ed8c73ed 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_4.ogg similarity index 97% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_4.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_4.ogg index 967e7134cd..374803560b 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_hit_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_hit_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_1.ogg similarity index 84% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_1.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_1.ogg index c869724c51..0a2164d9c8 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_2.ogg similarity index 85% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_2.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_2.ogg index ea75470e65..95f9e015f3 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_3.ogg similarity index 91% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_3.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_3.ogg index f68e19f581..c4e6341181 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_4.ogg similarity index 93% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_4.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_4.ogg index 37d095a6bd..38d6f2c9a9 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_place_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_place_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_1.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_1.ogg similarity index 94% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_1.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_1.ogg index 53ca36bbb7..ae14ebbdc4 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_1.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_1.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_2.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_2.ogg similarity index 95% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_2.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_2.ogg index 75edfba857..9fc77bbee8 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_2.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_2.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_3.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_3.ogg similarity index 97% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_3.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_3.ogg index ea0dc543f7..93eb7a1ac9 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_3.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_3.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_4.ogg b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_4.ogg similarity index 97% rename from common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_4.ogg rename to common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_4.ogg index 5a58391b60..30e5afb6b5 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/block/coin_pouch/coin_pouch_block_step_4.ogg and b/common/src/main/resources/assets/cobblemon/sounds/block/relic_coin_sack/relic_coin_sack_step_4.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/evolution/evolve_full.ogg b/common/src/main/resources/assets/cobblemon/sounds/evolution/evolve_full.ogg new file mode 100644 index 0000000000..aec75bc37a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/evolution/evolve_full.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/conkeldurr/conkeldurr_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/conkeldurr/conkeldurr_cry.ogg index d73c436e64..8aa06fda20 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/conkeldurr/conkeldurr_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/conkeldurr/conkeldurr_cry.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/golett/golett_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/golett/golett_cry.ogg index d73c436e64..7a7e150549 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/golett/golett_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/golett/golett_cry.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/golurk/golurk_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/golurk/golurk_cry.ogg index d73c436e64..1d342f5404 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/golurk/golurk_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/golurk/golurk_cry.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/gurdurr/gurdurr_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/gurdurr/gurdurr_cry.ogg index d73c436e64..cb539a4eb5 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/gurdurr/gurdurr_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/gurdurr/gurdurr_cry.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/timburr/timburr_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/timburr/timburr_cry.ogg index d73c436e64..d3eab656d7 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/timburr/timburr_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/timburr/timburr_cry.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/textures/berries/passho.png b/common/src/main/resources/assets/cobblemon/textures/berries/passho.png index 366c7f77d4..1c29d2af2f 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/berries/passho.png and b/common/src/main/resources/assets/cobblemon/textures/berries/passho.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/aguav_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/aguav_sprout.png new file mode 100644 index 0000000000..5d2469a63b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/aguav_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/apicot_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/apicot_sprout.png new file mode 100644 index 0000000000..7bab8dff76 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/apicot_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/aspear_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/aspear_sprout.png new file mode 100644 index 0000000000..2de94bed2f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/aspear_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/babiri_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/babiri_sprout.png new file mode 100644 index 0000000000..466b78531b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/babiri_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/belue_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/belue_sprout.png new file mode 100644 index 0000000000..9330404fab Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/belue_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/black_tumblestone.png b/common/src/main/resources/assets/cobblemon/textures/block/black_tumblestone.png deleted file mode 100644 index bb8378e282..0000000000 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/black_tumblestone.png and /dev/null differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/black_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/black_tumblestone_bricks.png new file mode 100644 index 0000000000..deb4c4a8ab Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/black_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/bluk_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/bluk_sprout.png new file mode 100644 index 0000000000..23dc6fd952 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/bluk_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/charti_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/charti_sprout.png new file mode 100644 index 0000000000..e43028737e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/charti_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/cheri_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/cheri_sprout.png new file mode 100644 index 0000000000..839f23a565 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/cheri_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chesto_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/chesto_sprout.png new file mode 100644 index 0000000000..6cb9ccbc5f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chesto_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chilan_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/chilan_sprout.png new file mode 100644 index 0000000000..09e1cc3cd2 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chilan_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_black_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_black_tumblestone_bricks.png new file mode 100644 index 0000000000..4b2a7cba33 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_black_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_black_tumblestone_bricks_top.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_black_tumblestone_bricks_top.png new file mode 100644 index 0000000000..8984f878ce Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_black_tumblestone_bricks_top.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_black_tumblestone.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_black_tumblestone.png new file mode 100644 index 0000000000..f877f02616 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_black_tumblestone.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_black_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_black_tumblestone_bricks.png new file mode 100644 index 0000000000..4b2a7cba33 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_black_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_black_tumblestone_bricks_top.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_black_tumblestone_bricks_top.png new file mode 100644 index 0000000000..8984f878ce Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_black_tumblestone_bricks_top.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_sky_tumblestone.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_sky_tumblestone.png new file mode 100644 index 0000000000..9d8a0138cb Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_sky_tumblestone.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_sky_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_sky_tumblestone_bricks.png new file mode 100644 index 0000000000..8ef9ca9bc4 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_sky_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_sky_tumblestone_bricks_top.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_sky_tumblestone_bricks_top.png new file mode 100644 index 0000000000..2581d80d7c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_sky_tumblestone_bricks_top.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_tumblestone.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_tumblestone.png new file mode 100644 index 0000000000..b30065b36f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_tumblestone.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_tumblestone_bricks.png new file mode 100644 index 0000000000..93ace5d1af Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_tumblestone_bricks_top.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_tumblestone_bricks_top.png new file mode 100644 index 0000000000..89f9fafeec Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_polished_tumblestone_bricks_top.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_sky_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_sky_tumblestone_bricks.png new file mode 100644 index 0000000000..8ef9ca9bc4 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_sky_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_sky_tumblestone_bricks_top.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_sky_tumblestone_bricks_top.png new file mode 100644 index 0000000000..2581d80d7c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_sky_tumblestone_bricks_top.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_tumblestone_bricks.png new file mode 100644 index 0000000000..93ace5d1af Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chiseled_tumblestone_bricks_top.png b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_tumblestone_bricks_top.png new file mode 100644 index 0000000000..89f9fafeec Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chiseled_tumblestone_bricks_top.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/chople_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/chople_sprout.png new file mode 100644 index 0000000000..6e5a9ac04b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/chople_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/coba_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/coba_sprout.png new file mode 100644 index 0000000000..e5f3a0284e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/coba_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/colbur_leaves.png b/common/src/main/resources/assets/cobblemon/textures/block/colbur_leaves.png index 26deed0749..476622851e 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/colbur_leaves.png and b/common/src/main/resources/assets/cobblemon/textures/block/colbur_leaves.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/colbur_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/colbur_sprout.png new file mode 100644 index 0000000000..6fd4a8bd4b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/colbur_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/colbur_tree.png b/common/src/main/resources/assets/cobblemon/textures/block/colbur_tree.png index b7bac74db8..a367de5a4f 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/colbur_tree.png and b/common/src/main/resources/assets/cobblemon/textures/block/colbur_tree.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/cornn_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/cornn_sprout.png new file mode 100644 index 0000000000..10e75aaa61 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/cornn_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/custap_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/custap_sprout.png new file mode 100644 index 0000000000..dda5f0d21d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/custap_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/durin_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/durin_sprout.png new file mode 100644 index 0000000000..5b7e1f3234 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/durin_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/durin_tree.png b/common/src/main/resources/assets/cobblemon/textures/block/durin_tree.png index 06f5c1e6b4..604570b2eb 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/durin_tree.png and b/common/src/main/resources/assets/cobblemon/textures/block/durin_tree.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/enigma_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/enigma_sprout.png new file mode 100644 index 0000000000..3c3602a089 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/enigma_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/figy_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/figy_sprout.png new file mode 100644 index 0000000000..92567a1b62 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/figy_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/ganlon_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/ganlon_sprout.png new file mode 100644 index 0000000000..f73a68948d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/ganlon_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/grepa_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/grepa_sprout.png new file mode 100644 index 0000000000..09b46ac103 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/grepa_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/haban_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/haban_sprout.png new file mode 100644 index 0000000000..625b69cc57 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/haban_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/hondew_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/hondew_sprout.png new file mode 100644 index 0000000000..d93f136719 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/hondew_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/hopo_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/hopo_sprout.png new file mode 100644 index 0000000000..0d5f146399 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/hopo_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/iapapa_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/iapapa_sprout.png new file mode 100644 index 0000000000..0ea28a8181 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/iapapa_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/jaboca_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/jaboca_sprout.png new file mode 100644 index 0000000000..6e3cd7855e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/jaboca_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/kasib_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/kasib_sprout.png new file mode 100644 index 0000000000..578ff7a87a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/kasib_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/kebia_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/kebia_sprout.png new file mode 100644 index 0000000000..30c4eb6023 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/kebia_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/kee_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/kee_sprout.png new file mode 100644 index 0000000000..df73367aa7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/kee_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/kelpsy_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/kelpsy_sprout.png new file mode 100644 index 0000000000..b0c7a85469 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/kelpsy_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/lansat_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/lansat_sprout.png new file mode 100644 index 0000000000..982922d627 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/lansat_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/leppa_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/leppa_sprout.png new file mode 100644 index 0000000000..9e28f0ab95 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/leppa_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/liechi_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/liechi_sprout.png new file mode 100644 index 0000000000..dec923241b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/liechi_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/lum_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/lum_sprout.png new file mode 100644 index 0000000000..7bdffad934 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/lum_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/mago_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/mago_sprout.png new file mode 100644 index 0000000000..e7718abb5b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/mago_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/magost_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/magost_sprout.png new file mode 100644 index 0000000000..24b6b6d91c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/magost_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/maranga_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/maranga_sprout.png new file mode 100644 index 0000000000..255c353de5 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/maranga_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/maranga_tree.png b/common/src/main/resources/assets/cobblemon/textures/block/maranga_tree.png index 85481d7aeb..8f27b2a424 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/maranga_tree.png and b/common/src/main/resources/assets/cobblemon/textures/block/maranga_tree.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/micle_leaves.png b/common/src/main/resources/assets/cobblemon/textures/block/micle_leaves.png index ec85bb89bd..80bf39fe7b 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/micle_leaves.png and b/common/src/main/resources/assets/cobblemon/textures/block/micle_leaves.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/micle_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/micle_sprout.png new file mode 100644 index 0000000000..b7d2e4b061 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/micle_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/micle_tree.png b/common/src/main/resources/assets/cobblemon/textures/block/micle_tree.png index f39c33ba52..e9688dd553 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/micle_tree.png and b/common/src/main/resources/assets/cobblemon/textures/block/micle_tree.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/nanab_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/nanab_sprout.png new file mode 100644 index 0000000000..fe7e8e660d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/nanab_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/nomel_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/nomel_sprout.png new file mode 100644 index 0000000000..da2d8f118b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/nomel_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/occa_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/occa_sprout.png new file mode 100644 index 0000000000..70a4335d57 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/occa_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/oran_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/oran_sprout.png new file mode 100644 index 0000000000..70dd21e294 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/oran_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/pamtre_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/pamtre_sprout.png new file mode 100644 index 0000000000..349c7b0dc8 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/pamtre_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/passho_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/passho_sprout.png new file mode 100644 index 0000000000..2347d107e6 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/passho_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/payapa_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/payapa_sprout.png new file mode 100644 index 0000000000..5cd36c201f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/payapa_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/pecha_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/pecha_sprout.png new file mode 100644 index 0000000000..85d050c674 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/pecha_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/persim_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/persim_sprout.png new file mode 100644 index 0000000000..7b9aecfb8e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/persim_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/petaya_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/petaya_sprout.png new file mode 100644 index 0000000000..27f8e14cfb Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/petaya_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/pinap_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/pinap_sprout.png new file mode 100644 index 0000000000..4edf6300ae Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/pinap_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/polished_black_tumblestone.png b/common/src/main/resources/assets/cobblemon/textures/block/polished_black_tumblestone.png new file mode 100644 index 0000000000..29f1e01d7d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/polished_black_tumblestone.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/polished_black_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/polished_black_tumblestone_bricks.png new file mode 100644 index 0000000000..deb4c4a8ab Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/polished_black_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/polished_black_tumblestone_slab.png b/common/src/main/resources/assets/cobblemon/textures/block/polished_black_tumblestone_slab.png new file mode 100644 index 0000000000..9215dd015f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/polished_black_tumblestone_slab.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/polished_sky_tumblestone.png b/common/src/main/resources/assets/cobblemon/textures/block/polished_sky_tumblestone.png new file mode 100644 index 0000000000..1c0321378b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/polished_sky_tumblestone.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/polished_sky_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/polished_sky_tumblestone_bricks.png new file mode 100644 index 0000000000..3c4c1d03bc Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/polished_sky_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/polished_sky_tumblestone_slab.png b/common/src/main/resources/assets/cobblemon/textures/block/polished_sky_tumblestone_slab.png new file mode 100644 index 0000000000..da2054eeb6 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/polished_sky_tumblestone_slab.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/polished_tumblestone.png b/common/src/main/resources/assets/cobblemon/textures/block/polished_tumblestone.png new file mode 100644 index 0000000000..63adae43a3 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/polished_tumblestone.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/polished_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/polished_tumblestone_bricks.png new file mode 100644 index 0000000000..4deab9bb90 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/polished_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/polished_tumblestone_slab.png b/common/src/main/resources/assets/cobblemon/textures/block/polished_tumblestone_slab.png new file mode 100644 index 0000000000..1fe1917ad2 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/polished_tumblestone_slab.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/pomeg_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/pomeg_sprout.png new file mode 100644 index 0000000000..d2f50967e1 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/pomeg_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/qualot_leaves.png b/common/src/main/resources/assets/cobblemon/textures/block/qualot_leaves.png index adc4f38a8d..f0f89e36b2 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/qualot_leaves.png and b/common/src/main/resources/assets/cobblemon/textures/block/qualot_leaves.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/qualot_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/qualot_sprout.png new file mode 100644 index 0000000000..fbcf7e9455 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/qualot_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/qualot_tree.png b/common/src/main/resources/assets/cobblemon/textures/block/qualot_tree.png index eb16c64e62..dac091492a 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/qualot_tree.png and b/common/src/main/resources/assets/cobblemon/textures/block/qualot_tree.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/rabuta_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/rabuta_sprout.png new file mode 100644 index 0000000000..e2f09e3465 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/rabuta_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/rawst_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/rawst_sprout.png new file mode 100644 index 0000000000..b773b00496 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/rawst_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/razz_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/razz_sprout.png new file mode 100644 index 0000000000..c09188be47 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/razz_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/rindo_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/rindo_sprout.png new file mode 100644 index 0000000000..1ef5847595 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/rindo_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/roseli_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/roseli_sprout.png new file mode 100644 index 0000000000..0ddfc744f9 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/roseli_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/rowap_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/rowap_sprout.png new file mode 100644 index 0000000000..ac88e8252e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/rowap_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/salac_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/salac_sprout.png new file mode 100644 index 0000000000..1f6d9c644a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/salac_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/shuca_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/shuca_sprout.png new file mode 100644 index 0000000000..0e708195e6 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/shuca_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/sitrus_leaves.png b/common/src/main/resources/assets/cobblemon/textures/block/sitrus_leaves.png index a36bd5f6b8..337bfcbb31 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/sitrus_leaves.png and b/common/src/main/resources/assets/cobblemon/textures/block/sitrus_leaves.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/sitrus_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/sitrus_sprout.png new file mode 100644 index 0000000000..09f52a635a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/sitrus_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/sky_tumblestone.png b/common/src/main/resources/assets/cobblemon/textures/block/sky_tumblestone.png deleted file mode 100644 index 92df449e31..0000000000 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/sky_tumblestone.png and /dev/null differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/sky_tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/sky_tumblestone_bricks.png new file mode 100644 index 0000000000..3c4c1d03bc Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/sky_tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/spelon_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/spelon_sprout.png new file mode 100644 index 0000000000..24757281cd Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/spelon_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/starf_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/starf_sprout.png new file mode 100644 index 0000000000..c387aff4ec Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/starf_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/tamato_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/tamato_sprout.png new file mode 100644 index 0000000000..9fc8517e86 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/tamato_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/tanga_leaves.png b/common/src/main/resources/assets/cobblemon/textures/block/tanga_leaves.png index 61aeae9802..c9fda586ec 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/tanga_leaves.png and b/common/src/main/resources/assets/cobblemon/textures/block/tanga_leaves.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/tanga_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/tanga_sprout.png new file mode 100644 index 0000000000..d7355f2299 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/tanga_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/touga_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/touga_sprout.png new file mode 100644 index 0000000000..25dbe167e0 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/touga_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/tumblestone.png b/common/src/main/resources/assets/cobblemon/textures/block/tumblestone.png deleted file mode 100644 index 79f3db5704..0000000000 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/tumblestone.png and /dev/null differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/tumblestone_bricks.png b/common/src/main/resources/assets/cobblemon/textures/block/tumblestone_bricks.png new file mode 100644 index 0000000000..4deab9bb90 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/tumblestone_bricks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/wacan_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/wacan_sprout.png new file mode 100644 index 0000000000..8615a7c95c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/wacan_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/watmel_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/watmel_sprout.png new file mode 100644 index 0000000000..39796f021d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/watmel_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/wepear_leaves.png b/common/src/main/resources/assets/cobblemon/textures/block/wepear_leaves.png index 2a2567858c..c27a76984e 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/wepear_leaves.png and b/common/src/main/resources/assets/cobblemon/textures/block/wepear_leaves.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/wepear_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/wepear_sprout.png new file mode 100644 index 0000000000..f3bfb81ce4 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/wepear_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/wiki_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/wiki_sprout.png new file mode 100644 index 0000000000..fa124beb77 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/wiki_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/yache_sprout.png b/common/src/main/resources/assets/cobblemon/textures/block/yache_sprout.png new file mode 100644 index 0000000000..1a38305ce0 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/yache_sprout.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tumblestone.png b/common/src/main/resources/assets/cobblemon/textures/item/tumblestone.png index 1b4c913237..79f3db5704 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/item/tumblestone.png and b/common/src/main/resources/assets/cobblemon/textures/item/tumblestone.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/accessory-spark.png b/common/src/main/resources/assets/cobblemon/textures/particle/accessory-spark.png new file mode 100644 index 0000000000..35dd432b79 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/accessory-spark.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/attract_heart.png b/common/src/main/resources/assets/cobblemon/textures/particle/attract_heart.png new file mode 100644 index 0000000000..bea141f197 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/attract_heart.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/battle/beastsendflash.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/battle/beastsendflash.png new file mode 100644 index 0000000000..fc0efd937f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/battle/beastsendflash.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsendsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsendsparkle.png new file mode 100644 index 0000000000..96d2fb983e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsendsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparkle.png new file mode 100644 index 0000000000..a625b62b11 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparks.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparks.png new file mode 100644 index 0000000000..4ec867ce11 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/beastballsparks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/casual/beastsendcasual.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/casual/beastsendcasual.png new file mode 100644 index 0000000000..458effebfc Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/beastball/casual/beastsendcasual.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/battle/cherishsendflash.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/battle/cherishsendflash.png new file mode 100644 index 0000000000..4d252c7d8b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/battle/cherishsendflash.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/casual/cherishsendcasual.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/casual/cherishsendcasual.png new file mode 100644 index 0000000000..5d694f0056 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/casual/cherishsendcasual.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsendsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsendsparkle.png new file mode 100644 index 0000000000..43d74fcb31 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsendsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparkle.png new file mode 100644 index 0000000000..7d4510be5a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparks.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparks.png new file mode 100644 index 0000000000..209b254e4d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/cherishball/cherishballsparks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/battle/dreamsendflash.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/battle/dreamsendflash.png new file mode 100644 index 0000000000..c501aa1f24 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/battle/dreamsendflash.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/casual/dreamsendcasual.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/casual/dreamsendcasual.png new file mode 100644 index 0000000000..09ed9545d0 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/casual/dreamsendcasual.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsendsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsendsparkle.png new file mode 100644 index 0000000000..f1825127da Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsendsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparkle.png new file mode 100644 index 0000000000..277bc26e1b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparks.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparks.png new file mode 100644 index 0000000000..3ff42cfae6 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/dreamball/dreamballsparks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/battle/originsendflash.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/battle/originsendflash.png new file mode 100644 index 0000000000..cbb24f8943 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/battle/originsendflash.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/casual/originsendcasual.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/casual/originsendcasual.png new file mode 100644 index 0000000000..273798bb21 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/casual/originsendcasual.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsendsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsendsparkle.png new file mode 100644 index 0000000000..88efc9a103 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsendsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparkle.png new file mode 100644 index 0000000000..6361c0c909 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparks.png b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparks.png new file mode 100644 index 0000000000..60926ca6f8 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/balls/originball/originballsparks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/bubble_pop.png b/common/src/main/resources/assets/cobblemon/textures/particle/bubble_pop.png new file mode 100644 index 0000000000..a6618ffa31 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/bubble_pop.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/chirp.png b/common/src/main/resources/assets/cobblemon/textures/particle/chirp.png new file mode 100644 index 0000000000..161658adfd Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/chirp.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/cotton.png b/common/src/main/resources/assets/cobblemon/textures/particle/cotton.png new file mode 100644 index 0000000000..dccfa01749 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/cotton.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/ember.png b/common/src/main/resources/assets/cobblemon/textures/particle/ember.png new file mode 100644 index 0000000000..10df1ace09 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/ember.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/large-ring.png b/common/src/main/resources/assets/cobblemon/textures/particle/large-ring.png new file mode 100644 index 0000000000..837fca7262 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/large-ring.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/large-smokeorb.png b/common/src/main/resources/assets/cobblemon/textures/particle/large-smokeorb.png new file mode 100644 index 0000000000..8f66fc29b0 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/large-smokeorb.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/medium-fadeorb.png b/common/src/main/resources/assets/cobblemon/textures/particle/medium-fadeorb.png new file mode 100644 index 0000000000..fcb06c3036 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/medium-fadeorb.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/medium-ring.png b/common/src/main/resources/assets/cobblemon/textures/particle/medium-ring.png new file mode 100644 index 0000000000..ab0d4b34a8 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/medium-ring.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/mushroomize.png b/common/src/main/resources/assets/cobblemon/textures/particle/mushroomize.png new file mode 100644 index 0000000000..48d16d4a2b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/mushroomize.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/paralysis-spark.png b/common/src/main/resources/assets/cobblemon/textures/particle/paralysis-spark.png new file mode 100644 index 0000000000..f79d8ed009 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/paralysis-spark.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/pink_obscure.png b/common/src/main/resources/assets/cobblemon/textures/particle/pink_obscure.png new file mode 100644 index 0000000000..cb06ce44db Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/pink_obscure.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/poison-bubble.png b/common/src/main/resources/assets/cobblemon/textures/particle/poison-bubble.png new file mode 100644 index 0000000000..27a4521a4d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/poison-bubble.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/powder.png b/common/src/main/resources/assets/cobblemon/textures/particle/powder.png new file mode 100644 index 0000000000..565d160ea1 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/powder.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/protect-shine.png b/common/src/main/resources/assets/cobblemon/textures/particle/protect-shine.png new file mode 100644 index 0000000000..b65ddff06a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/protect-shine.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/quickattack_dashlines.png b/common/src/main/resources/assets/cobblemon/textures/particle/quickattack_dashlines.png new file mode 100644 index 0000000000..5ed648e48e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/quickattack_dashlines.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/small-fadeorb.png b/common/src/main/resources/assets/cobblemon/textures/particle/small-fadeorb.png new file mode 100644 index 0000000000..89d3b5900b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/small-fadeorb.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/small-ring.png b/common/src/main/resources/assets/cobblemon/textures/particle/small-ring.png new file mode 100644 index 0000000000..03cd276c28 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/small-ring.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/small-sparkle.png b/common/src/main/resources/assets/cobblemon/textures/particle/small-sparkle.png new file mode 100644 index 0000000000..c1203a3e0a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/small-sparkle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/smokeorb.png b/common/src/main/resources/assets/cobblemon/textures/particle/smokeorb.png new file mode 100644 index 0000000000..5c436e4840 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/smokeorb.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/statdown_line.png b/common/src/main/resources/assets/cobblemon/textures/particle/statdown_line.png new file mode 100644 index 0000000000..7b3e8c583d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/statdown_line.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/statdown_orb.png b/common/src/main/resources/assets/cobblemon/textures/particle/statdown_orb.png new file mode 100644 index 0000000000..0c5ac270d8 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/statdown_orb.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/statup_line.png b/common/src/main/resources/assets/cobblemon/textures/particle/statup_line.png new file mode 100644 index 0000000000..8e948f43da Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/statup_line.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/statup_orb.png b/common/src/main/resources/assets/cobblemon/textures/particle/statup_orb.png new file mode 100644 index 0000000000..16b5c00597 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/statup_orb.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/swordsdance_swords.png b/common/src/main/resources/assets/cobblemon/textures/particle/swordsdance_swords.png new file mode 100644 index 0000000000..90738bcbe7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/swordsdance_swords.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/tochukaso.png b/common/src/main/resources/assets/cobblemon/textures/particle/tochukaso.png new file mode 100644 index 0000000000..2de6034adc Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/tochukaso.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/white_orb_shrink.png b/common/src/main/resources/assets/cobblemon/textures/particle/white_orb_shrink.png new file mode 100644 index 0000000000..ab35f43951 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/white_orb_shrink.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/particle/xs-fadeorb.png b/common/src/main/resources/assets/cobblemon/textures/particle/xs-fadeorb.png new file mode 100644 index 0000000000..a072de9b0f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/particle/xs-fadeorb.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle.png new file mode 100644 index 0000000000..fda583e55d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_black.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_black.png new file mode 100644 index 0000000000..1464ba3eb8 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_black.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_blue.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_blue.png new file mode 100644 index 0000000000..8a80f066fa Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_blue.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_brown.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_brown.png new file mode 100644 index 0000000000..154fe4d7d9 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_brown.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_cyan.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_cyan.png new file mode 100644 index 0000000000..5502501230 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_cyan.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_gray.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_gray.png new file mode 100644 index 0000000000..a6e811f986 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_gray.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_green.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_green.png new file mode 100644 index 0000000000..858b4650a7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_green.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_light_blue.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_light_blue.png new file mode 100644 index 0000000000..d690d84c22 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_light_blue.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_light_gray.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_light_gray.png new file mode 100644 index 0000000000..a26e8d8b65 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_light_gray.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_lime.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_lime.png new file mode 100644 index 0000000000..c000f4716c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_lime.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_magenta.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_magenta.png new file mode 100644 index 0000000000..3a272008b4 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_magenta.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_orange.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_orange.png new file mode 100644 index 0000000000..1856d37cdb Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_orange.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_pink.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_pink.png new file mode 100644 index 0000000000..d338c47a43 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_pink.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_purple.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_purple.png new file mode 100644 index 0000000000..eadd69e853 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_purple.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_red.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_red.png new file mode 100644 index 0000000000..47c0b52398 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_red.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_white.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_white.png new file mode 100644 index 0000000000..4ab9b19b33 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_white.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_yellow.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_yellow.png new file mode 100644 index 0000000000..735d1104f7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_paint_yellow.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_shiny.png new file mode 100644 index 0000000000..4f0c2ff5cf Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0235_smeargle/smeargle_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0429_mismagius/mismagius.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0429_mismagius/mismagius.png index dfc1d442dd..663db444fb 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0429_mismagius/mismagius.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0429_mismagius/mismagius.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0429_mismagius/mismagius_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0429_mismagius/mismagius_shiny.png index 0c1a8754ad..2f86fbeb0d 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0429_mismagius/mismagius_shiny.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0429_mismagius/mismagius_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0605_elgyem/elgyem.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0605_elgyem/elgyem.png index 5a48071b46..c2362e2a58 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0605_elgyem/elgyem.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0605_elgyem/elgyem.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0605_elgyem/elgyem_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0605_elgyem/elgyem_shiny.png index c689249b61..2ab4b36731 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0605_elgyem/elgyem_shiny.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0605_elgyem/elgyem_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo.png index 7291f88c81..cf43da803d 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_shiny.png index a082b21589..36afb83c96 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_shiny.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_black.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_black.png new file mode 100644 index 0000000000..c360818114 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_black.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_blue.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_blue.png new file mode 100644 index 0000000000..210baa75fd Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_blue.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_brown.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_brown.png new file mode 100644 index 0000000000..d21b962611 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_brown.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_cyan.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_cyan.png new file mode 100644 index 0000000000..e7e95acbdb Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_cyan.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_gray.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_gray.png new file mode 100644 index 0000000000..06fd66f36f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_gray.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_green.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_green.png new file mode 100644 index 0000000000..6d9212717c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_green.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_light_blue.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_light_blue.png new file mode 100644 index 0000000000..62f8a09eb1 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_light_blue.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_light_gray.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_light_gray.png new file mode 100644 index 0000000000..e980c65f65 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_light_gray.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_lime.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_lime.png new file mode 100644 index 0000000000..59f2edfdd0 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_lime.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_magenta.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_magenta.png new file mode 100644 index 0000000000..177d958319 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_magenta.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_orange.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_orange.png new file mode 100644 index 0000000000..267da371a2 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_orange.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_pink.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_pink.png new file mode 100644 index 0000000000..fa8863fe5b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_pink.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_purple.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_purple.png new file mode 100644 index 0000000000..7dd2ea9f8d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_purple.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_red.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_red.png new file mode 100644 index 0000000000..5d24b94f1e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_red.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_shiny.png new file mode 100644 index 0000000000..8369094c3e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_white.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_white.png new file mode 100644 index 0000000000..92d1fd2b48 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_white.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_yellow.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_yellow.png new file mode 100644 index 0000000000..3d7bd7de14 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0831_wooloo/wooloo_wool_yellow.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool.png index c24a99a144..ba32b22402 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_shiny.png index 15854a89c7..e6dc97438b 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_shiny.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_black.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_black.png new file mode 100644 index 0000000000..2cc1dda08e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_black.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_black_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_black_shiny.png new file mode 100644 index 0000000000..d1ab1c804a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_black_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_blue.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_blue.png new file mode 100644 index 0000000000..d5c9d6fc3d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_blue.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_blue_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_blue_shiny.png new file mode 100644 index 0000000000..811e76e454 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_blue_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_brown.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_brown.png new file mode 100644 index 0000000000..aa8ce74221 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_brown.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_brown_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_brown_shiny.png new file mode 100644 index 0000000000..e3877510b3 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_brown_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_cyan.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_cyan.png new file mode 100644 index 0000000000..4d1468dbaa Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_cyan.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_cyan_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_cyan_shiny.png new file mode 100644 index 0000000000..fbbdcba4ae Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_cyan_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_gray.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_gray.png new file mode 100644 index 0000000000..5338a5b0ce Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_gray.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_gray_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_gray_shiny.png new file mode 100644 index 0000000000..eece075ba7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_gray_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_green.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_green.png new file mode 100644 index 0000000000..5fd1ad9add Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_green.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_green_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_green_shiny.png new file mode 100644 index 0000000000..9f91bc6929 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_green_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_blue.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_blue.png new file mode 100644 index 0000000000..1cdacccc88 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_blue.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_blue_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_blue_shiny.png new file mode 100644 index 0000000000..5cc4b126f6 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_blue_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_gray.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_gray.png new file mode 100644 index 0000000000..2f8fa38e6c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_gray.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_gray_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_gray_shiny.png new file mode 100644 index 0000000000..f170b84e66 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_light_gray_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_lime.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_lime.png new file mode 100644 index 0000000000..d2143337ce Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_lime.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_lime_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_lime_shiny.png new file mode 100644 index 0000000000..61ee0800c5 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_lime_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_magenta.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_magenta.png new file mode 100644 index 0000000000..d87076c060 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_magenta.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_magenta_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_magenta_shiny.png new file mode 100644 index 0000000000..a13a70ed2d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_magenta_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_orange.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_orange.png new file mode 100644 index 0000000000..faca81a615 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_orange.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_orange_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_orange_shiny.png new file mode 100644 index 0000000000..4892515210 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_orange_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_pink.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_pink.png new file mode 100644 index 0000000000..02091c91f2 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_pink.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_pink_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_pink_shiny.png new file mode 100644 index 0000000000..f488e86f35 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_pink_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_purple.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_purple.png new file mode 100644 index 0000000000..889975b8a5 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_purple.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_purple_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_purple_shiny.png new file mode 100644 index 0000000000..0c3e7ee7c4 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_purple_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_red.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_red.png new file mode 100644 index 0000000000..7f79b4b8dc Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_red.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_red_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_red_shiny.png new file mode 100644 index 0000000000..8c1c076fbb Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_red_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_white.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_white.png new file mode 100644 index 0000000000..cf055aa477 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_white.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_white_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_white_shiny.png new file mode 100644 index 0000000000..7283dd40a1 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_white_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_yellow.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_yellow.png new file mode 100644 index 0000000000..1b49750dea Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_yellow.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_yellow_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_yellow_shiny.png new file mode 100644 index 0000000000..0a5e8791ca Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_wool_yellow_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_yellow.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_yellow.png new file mode 100644 index 0000000000..b2388ed641 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0832_dubwool/dubwool_yellow.png differ diff --git a/common/src/main/resources/data/cobblemon/action_effects/misc/boost.json b/common/src/main/resources/data/cobblemon/action_effects/misc/boost.json new file mode 100644 index 0000000000..e6a0ffb9dd --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/misc/boost.json @@ -0,0 +1,24 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "entity_particles", + "effect": "cobblemon:stat_up_circles", + "delay": 0.05, + "locator": "middle" + }, + { + "type": "entity_particles", + "effect": "cobblemon:stat_up_lines", + "delay": 0.05, + "locator": "middle" + }, + { + "type": "remove_holds", + "holds": ["effects"] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/misc/unboost.json b/common/src/main/resources/data/cobblemon/action_effects/misc/unboost.json new file mode 100644 index 0000000000..83b092d9b2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/misc/unboost.json @@ -0,0 +1,24 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "entity_particles", + "effect": "cobblemon:stat_down_circles", + "delay": 0.05, + "locator": "middle" + }, + { + "type": "entity_particles", + "effect": "cobblemon:stat_down_lines", + "delay": 0.05, + "locator": "middle" + }, + { + "type": "remove_holds", + "holds": ["effects"] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/confusion.json b/common/src/main/resources/data/cobblemon/action_effects/moves/confusion.json new file mode 100644 index 0000000000..8e740bed84 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/confusion.json @@ -0,0 +1,79 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["confusion", "psychic", "special"], + "delay": 0.92 + }, + { + "type": "entity_particles", + "effect": "cobblemon:confusion_actor", + "locator": "special_attack", + "delay": 0.03 + }, + { + "type": "pause", + "pause": 0.38 + }, + { + "type": "entity_particles", + "effect": "cobblemon:confusion_release", + "locator": "special_attack", + "delay": 0.02 + }, + { + "type": "entity_particles", + "effect": "cobblemon:confusion_releasering", + "locator": "special_attack" + }, + { + "type": "entity_particles", + "effect": "cobblemon:confusion_releasedots", + "locator": "special_attack", + "delay": 0.03 + }, + { + "type": "pause", + "pause": 0.6 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:confusion_target", + "locator": "target", + "delay": 0.03 + }, + { + "type": "pause", + "pause": 0.4 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:confusion_impact", + "locator": "target" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:confusion_impactdots", + "locator": "target" + }, + { + "type": "pause", + "pause": 0.01 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.9 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/cottonguard.json b/common/src/main/resources/data/cobblemon/action_effects/moves/cottonguard.json new file mode 100644 index 0000000000..43f700b643 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/cottonguard.json @@ -0,0 +1,33 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["cottonguard", "status"] + }, + { + "type": "pause", + "pause": 0.1 + }, + { + "type": "entity_particles", + "effect": "cobblemon:cottonguard", + "locator": "middle" + }, + { + "type": "pause", + "pause": 2.5 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 0.5 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/firepunch.json b/common/src/main/resources/data/cobblemon/action_effects/moves/firepunch.json new file mode 100644 index 0000000000..a909d974ce --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/firepunch.json @@ -0,0 +1,46 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["firepunch", "fire", "physical"] + }, + { + "type": "pause", + "pause": 0.5 + }, + { + "type": "sequence", + "keyframes": [ + { + "type": "entity_sound", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "sound": "'cobblemon:impact.fire" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:firepunch", + "locator": "target" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:impact_fire", + "locator": "target" + } + ] + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 3 + } + ] + } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/growl.json b/common/src/main/resources/data/cobblemon/action_effects/moves/growl.json new file mode 100644 index 0000000000..3fe2a8f5c7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/growl.json @@ -0,0 +1,20 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["growl", "cry"] + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 0.5 + } + ] + } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/icepunch.json b/common/src/main/resources/data/cobblemon/action_effects/moves/icepunch.json new file mode 100644 index 0000000000..7fc76ff33a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/icepunch.json @@ -0,0 +1,46 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["icepunch", "ice", "physical"] + }, + { + "type": "pause", + "pause": 0.5 + }, + { + "type": "sequence", + "keyframes": [ + { + "type": "entity_sound", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "sound": "'cobblemon:impact.ice" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:icepunch", + "locator": "target" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:impact_ice", + "locator": "target" + } + ] + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 3 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/minimize.json b/common/src/main/resources/data/cobblemon/action_effects/moves/minimize.json new file mode 100644 index 0000000000..7c392a2f7d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/minimize.json @@ -0,0 +1,33 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["minimize", "status"] + }, + { + "type": "pause", + "pause": 1.3 + }, + { + "type": "entity_molang", + "expressions": ["q.play_animation(q.bedrock_stateful('minimize', 'actor'))"], + "delay": 1.0 + }, + { + "type": "pause", + "pause": 1.8 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 0.5 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/poisonpowder.json b/common/src/main/resources/data/cobblemon/action_effects/moves/poisonpowder.json new file mode 100644 index 0000000000..0188b20d2e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/poisonpowder.json @@ -0,0 +1,43 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["poisonpowder", "status"], + "delay": 1.15 + }, + { + "type": "entity_particles", + "effect": "cobblemon:poisonpowder", + "locator": "target" + }, + { + "type": "entity_particles", + "effect": "cobblemon:poisonpowder_cloud", + "locator": "target", + "delay": 0.1 + }, + { + "type": "pause", + "pause": 0.55 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:poisonpowder_land", + "locator": "root", + "delay": 1 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.95 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/powder.json b/common/src/main/resources/data/cobblemon/action_effects/moves/powder.json new file mode 100644 index 0000000000..4b88e2c566 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/powder.json @@ -0,0 +1,28 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["powder", "status"], + "delay": 1.15 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:powder_particles", + "locator": "root", + "delay": 2 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.75 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/protect.json b/common/src/main/resources/data/cobblemon/action_effects/moves/protect.json new file mode 100644 index 0000000000..ebeb9b3f46 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/protect.json @@ -0,0 +1,54 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["protect", "status"] + }, + { + "type": "pause", + "pause": 0.5 + }, + { + "type": "entity_particles", + "effect": "cobblemon:protect-rings", + "locator": "target", + "delay": 0.475 + }, + { + "type": "pause", + "pause": 0.475 + }, + { + "type": "entity_particles", + "effect": "cobblemon:protect-shine", + "locator": "target", + "delay": 0.1 + }, + { + "type": "pause", + "pause": 0.1 + }, + { + "type": "entity_particles", + "effect": "cobblemon:protect-sparkle", + "locator": "target", + "delay": 0.1 + }, + { + "type": "pause", + "pause": 0.65 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1 + } + ] + } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/quickattack.json b/common/src/main/resources/data/cobblemon/action_effects/moves/quickattack.json new file mode 100644 index 0000000000..f2889a15a3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/quickattack.json @@ -0,0 +1,49 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["quickattack", "tackle", "physical"] + }, + { + "type": "pause", + "pause": 0.1 + }, + { + "type": "entity_molang", + "expressions": ["q.play_animation(q.bedrock_stateful('quickattack', 'actor'))"], + "delay": 0.1 + }, + { + "type": "pause", + "pause": 1.14 + }, + { + "type": "sequence", + "keyframes": [ + { + "type": "entity_sound", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "sound": "cobblemon:impact.normal" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:impact_normal", + "locator": "target" + } + ] + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 2.25 + } + ] + } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/ragepowder.json b/common/src/main/resources/data/cobblemon/action_effects/moves/ragepowder.json new file mode 100644 index 0000000000..1685cbb96b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/ragepowder.json @@ -0,0 +1,43 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["ragepowder", "status"], + "delay": 1.15 + }, + { + "type": "entity_particles", + "effect": "cobblemon:ragepowder", + "locator": "target" + }, + { + "type": "entity_particles", + "effect": "cobblemon:ragepowder_cloud", + "locator": "target", + "delay": 0.1 + }, + { + "type": "pause", + "pause": 0.55 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:ragepowder_land", + "locator": "root", + "delay": 1 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.95 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/sandattack.json b/common/src/main/resources/data/cobblemon/action_effects/moves/sandattack.json new file mode 100644 index 0000000000..6765829f2e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/sandattack.json @@ -0,0 +1,55 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["sandattack", "ground", "status"], + "delay": 1 + }, + { + "type": "entity_particles", + "effect": "cobblemon:sandattack_actor", + "locator": "root" + }, + { + "type": "entity_particles", + "effect": "cobblemon:sandattack_residual", + "locator": "root", + "delay": 0.1 + }, + { + "type": "pause", + "pause": 0.3 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:sandattack_impact", + "locator": "target" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:sandattack_impactresidual", + "locator": "target", + "delay": 0.02 + }, + { + "type": "animation", + "animation": ["recoil"], + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "delay": 0.98 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.25 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/sleeppowder.json b/common/src/main/resources/data/cobblemon/action_effects/moves/sleeppowder.json new file mode 100644 index 0000000000..10d91965f6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/sleeppowder.json @@ -0,0 +1,59 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["sleeppowder", "status"], + "delay": 1.15 + }, + { + "type": "entity_particles", + "effect": "cobblemon:sleeppowder", + "locator": "target" + }, + { + "type": "entity_particles", + "effect": "cobblemon:sleeppowder_cloud", + "locator": "target", + "delay": 0.1 + }, + { + "type": "pause", + "pause": 0.55 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:sleeppowder_land", + "locator": "root", + "delay": 0.1 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:sleep_bubbles", + "locator": "middle" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:sleep_zzz", + "locator": "middle" + }, + { + "type": "pause", + "pause": 1 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.95 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/spore.json b/common/src/main/resources/data/cobblemon/action_effects/moves/spore.json new file mode 100644 index 0000000000..5ba2e48077 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/spore.json @@ -0,0 +1,47 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["spore", "status", "cry"], + "delay": 1.15 + }, + { + "type": "entity_particles", + "effect": "cobblemon:spore", + "locator": "target" + }, + { + "type": "entity_particles", + "effect": "cobblemon:spore_cloud", + "locator": "target", + "delay": 0.1 + }, + { + "type": "pause", + "pause": 0.55 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:spore_land", + "locator": "root", + "delay": 1 + }, + { + "type": "pause", + "pause": 1 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.95 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/stunspore.json b/common/src/main/resources/data/cobblemon/action_effects/moves/stunspore.json new file mode 100644 index 0000000000..ec86f91242 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/stunspore.json @@ -0,0 +1,50 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["stunspore", "status"], + "delay": 1.15 + }, + { + "type": "entity_particles", + "effect": "cobblemon:stunspore", + "locator": "target" + }, + { + "type": "entity_particles", + "effect": "cobblemon:stunspore_cloud", + "locator": "target", + "delay": 0.1 + }, + { + "type": "pause", + "pause": 0.55 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:stunspore_land", + "locator": "target", + "delay": 0.1 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:paralysis_actor", + "locator": "middle", + "delay": 1 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.95 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/swordsdance.json b/common/src/main/resources/data/cobblemon/action_effects/moves/swordsdance.json new file mode 100644 index 0000000000..1347a3af0d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/swordsdance.json @@ -0,0 +1,30 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["swordsdance", "status"], + "delay": 0.1 + }, + { + "type": "entity_particles", + "effect": "cobblemon:swordsdance_actor", + "locator": "middle" + }, + { + "type": "pause", + "pause": 2.45 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.8 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/thunderpunch.json b/common/src/main/resources/data/cobblemon/action_effects/moves/thunderpunch.json new file mode 100644 index 0000000000..3f4637d9e3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/thunderpunch.json @@ -0,0 +1,46 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["thunderpunch", "thunder", "physical"] + }, + { + "type": "pause", + "pause": 0.5 + }, + { + "type": "sequence", + "keyframes": [ + { + "type": "entity_sound", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "sound": "'cobblemon:impact.electric" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:thunderpunch", + "locator": "target" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:impact_electric", + "locator": "target" + } + ] + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 3 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/thunderwave.json b/common/src/main/resources/data/cobblemon/action_effects/moves/thunderwave.json new file mode 100644 index 0000000000..50cb89db18 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/thunderwave.json @@ -0,0 +1,77 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["thunderwave", "electric", "status"], + "delay": 1.15 + }, + { + "type": "entity_particles", + "effect": "cobblemon:thunderwave_launch", + "locator": "target", + "delay": 0.05 + }, + { + "type": "entity_particles", + "effect": "cobblemon:thunderwave_actor", + "locator": "target", + "delay": 0.05 + }, + { + "type": "pause", + "pause": 0.65 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:thunderwave_impact1", + "locator": "target", + "delay": 0.05 + }, + { + "type": "pause", + "pause": 0.1 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:thunderwave_impact2", + "locator": "target", + "delay": 0.05 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:thunderwave_sparking", + "locator": "target", + "delay": 0.05 + }, + { + "type": "pause", + "pause": 0.1 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:thunderwave_impact3", + "locator": "target", + "delay": 0.05 + }, + { + "type": "pause", + "pause": 0.65 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.25 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/toxic.json b/common/src/main/resources/data/cobblemon/action_effects/moves/toxic.json new file mode 100644 index 0000000000..9aac47038e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/toxic.json @@ -0,0 +1,28 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["toxic", "status"], + "delay": 1.15 + }, + { + "type": "pause", + "pause": 1.0 + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "cobblemon:toxpoison_actor", + "locator": "target", + "delay": 1.5 + }, + { + "type": "remove_holds", + "holds": ["effects"] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/statuses/attract.json b/common/src/main/resources/data/cobblemon/action_effects/statuses/attract.json new file mode 100644 index 0000000000..cfb63025f5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/statuses/attract.json @@ -0,0 +1,18 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "entity_particles", + "effect": "cobblemon:infatuate_actor", + "locator": "middle", + "delay": 1.5 + }, + { + "type": "remove_holds", + "holds": ["effects"] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/statuses/confused.json b/common/src/main/resources/data/cobblemon/action_effects/statuses/confused.json new file mode 100644 index 0000000000..4959ee5aa6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/statuses/confused.json @@ -0,0 +1,19 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "entity_particles", + "effect": "cobblemon:confused_actor", + "delay": 1.0, + "locator": "root" + }, + { + "type": "remove_holds", + "holds": ["effects"] + } + ], + "condition": "q.instruction_id == 'cobblemon:activate'" +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/statuses/paralysis.json b/common/src/main/resources/data/cobblemon/action_effects/statuses/paralysis.json new file mode 100644 index 0000000000..82801d1eaa --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/statuses/paralysis.json @@ -0,0 +1,18 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "entity_particles", + "effect": "cobblemon:paralysis_actor", + "locator": "middle", + "delay": 1.5 + }, + { + "type": "remove_holds", + "holds": ["effects"] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/statuses/poison.json b/common/src/main/resources/data/cobblemon/action_effects/statuses/poison.json new file mode 100644 index 0000000000..875c9c2120 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/statuses/poison.json @@ -0,0 +1,22 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.0 + }, + { + "type": "entity_particles", + "effect": "cobblemon:poison_actor", + "locator": "target", + "delay": 1.5 + }, + { + "type": "remove_holds", + "holds": ["effects"] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/statuses/poisonbadly.json b/common/src/main/resources/data/cobblemon/action_effects/statuses/poisonbadly.json new file mode 100644 index 0000000000..d8fc780cf4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/statuses/poisonbadly.json @@ -0,0 +1,22 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.0 + }, + { + "type": "entity_particles", + "effect": "cobblemon:toxpoison_actor", + "locator": "target", + "delay": 1.5 + }, + { + "type": "remove_holds", + "holds": ["effects"] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/statuses/sleep.json b/common/src/main/resources/data/cobblemon/action_effects/statuses/sleep.json new file mode 100644 index 0000000000..4262bf4d75 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/statuses/sleep.json @@ -0,0 +1,28 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "entity_particles", + "effect": "cobblemon:sleep_bubbles", + "locator": "middle", + "delay": 0.05 + }, + { + "type": "entity_particles", + "effect": "cobblemon:sleep_zzz", + "locator": "middle", + "delay": 0.05 + }, + { + "type": "pause", + "pause": 1.0 + }, + { + "type": "remove_holds", + "holds": ["effects"] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab.json new file mode 100644 index 0000000000..44207ce915 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_slab" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_slab" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..19138e2b07 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_slab_from_black_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_slab_from_black_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab_from_black_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab_from_black_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..11d1d6cc48 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab_from_black_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_slab_from_black_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_slab_from_black_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..9f7c88a545 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_slab_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_slab_from_polished_black_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_slab_from_polished_black_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..89c0c3ac76 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_stairs" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_stairs" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..d34e9b6947 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_stairs_from_black_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_stairs_from_black_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs_from_black_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs_from_black_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..59c290b064 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs_from_black_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_stairs_from_black_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_stairs_from_black_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..6a2a18b1cf --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_stairs_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_stairs_from_polished_black_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_stairs_from_polished_black_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall.json new file mode 100644 index 0000000000..246509c688 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_wall" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_wall" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..7ae26d4789 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_wall_from_black_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_wall_from_black_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall_from_black_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall_from_black_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..6056fde4ed --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall_from_black_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_wall_from_black_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_wall_from_black_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..9a4cf6a19f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_brick_wall_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_brick_wall_from_polished_black_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_brick_wall_from_polished_black_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_bricks.json new file mode 100644 index 0000000000..25249c0ab0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_bricks.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_bricks" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_bricks" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..8ac338d10b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..af1fa71e14 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/black_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:black_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:black_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks.json new file mode 100644 index 0000000000..789c41743a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_black_tumblestone_bricks" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_brick_slab" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_black_tumblestone_bricks" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..101b94c382 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks_from_black_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks_from_black_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..4ed013f6ad --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks_from_black_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_black_tumblestone_bricks_from_black_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_black_tumblestone_bricks_from_black_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..579d02e5b5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_black_tumblestone_bricks_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_black_tumblestone_bricks_from_polished_black_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_black_tumblestone_bricks_from_polished_black_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_black_tumblestone.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_black_tumblestone.json new file mode 100644 index 0000000000..69fa91a7f0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_black_tumblestone.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_polished_black_tumblestone" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone_slab" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_polished_black_tumblestone" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_black_tumblestone_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_black_tumblestone_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..0ac856f4a6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_black_tumblestone_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_polished_black_tumblestone_from_black_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_polished_black_tumblestone_from_black_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_black_tumblestone_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_black_tumblestone_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..0bd281cdf0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_black_tumblestone_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_polished_black_tumblestone_from_polished_black_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_polished_black_tumblestone_from_polished_black_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_sky_tumblestone.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_sky_tumblestone.json new file mode 100644 index 0000000000..74587f0380 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_sky_tumblestone.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_polished_sky_tumblestone" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone_slab" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_polished_sky_tumblestone" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_sky_tumblestone_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_sky_tumblestone_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..c5031b4353 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_sky_tumblestone_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_polished_sky_tumblestone_from_polished_sky_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_polished_sky_tumblestone_from_polished_sky_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_sky_tumblestone_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_sky_tumblestone_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..99998d4d05 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_sky_tumblestone_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_polished_sky_tumblestone_from_sky_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_polished_sky_tumblestone_from_sky_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_tumblestone.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_tumblestone.json new file mode 100644 index 0000000000..282b45bb2a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_tumblestone.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_polished_tumblestone" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone_slab" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_polished_tumblestone" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_tumblestone_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_tumblestone_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..97fa966938 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_tumblestone_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_polished_tumblestone_from_polished_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_polished_tumblestone_from_polished_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_tumblestone_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_tumblestone_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..457c58ea37 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_polished_tumblestone_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_polished_tumblestone_from_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_polished_tumblestone_from_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks.json new file mode 100644 index 0000000000..bfeef557ab --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_sky_tumblestone_bricks" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_brick_slab" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_sky_tumblestone_bricks" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..a46bd8ddd2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_sky_tumblestone_bricks_from_polished_sky_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_sky_tumblestone_bricks_from_polished_sky_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..3ca0721076 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..923746bc36 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_sky_tumblestone_bricks_from_sky_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_sky_tumblestone_bricks_from_sky_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks.json new file mode 100644 index 0000000000..36c692132a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_tumblestone_bricks" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_brick_slab" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_tumblestone_bricks" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..09de27b923 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_tumblestone_bricks_from_polished_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_tumblestone_bricks_from_polished_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..6a152166d7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_tumblestone_bricks_from_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_tumblestone_bricks_from_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks_from_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks_from_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..f9b749cf50 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/chiseled_tumblestone_bricks_from_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:chiseled_tumblestone_bricks_from_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:chiseled_tumblestone_bricks_from_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone.json new file mode 100644 index 0000000000..58bc6f7165 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..e3d6421e6b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_slab.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_slab.json new file mode 100644 index 0000000000..368cfa5c51 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone_slab" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone_slab" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_slab_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_slab_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..5d2b0bc0a1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_slab_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone_slab_from_black_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone_slab_from_black_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_slab_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_slab_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..b084f7c35c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_slab_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone_slab_from_polished_black_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone_slab_from_polished_black_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_stairs.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_stairs.json new file mode 100644 index 0000000000..a42fdb0cef --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone_stairs" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone_stairs" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_stairs_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_stairs_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..7811930618 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_stairs_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone_stairs_from_black_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone_stairs_from_black_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_stairs_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_stairs_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..ee6e102901 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_stairs_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone_stairs_from_polished_black_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone_stairs_from_polished_black_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_wall.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_wall.json new file mode 100644 index 0000000000..6ed3a12d04 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_wall.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone_wall" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone_wall" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_wall_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_wall_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..8b40d41d86 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_wall_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone_wall_from_black_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:black_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone_wall_from_black_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_wall_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_wall_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..67f2db8085 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_black_tumblestone_wall_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_black_tumblestone_wall_from_polished_black_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_black_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_black_tumblestone_wall_from_polished_black_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone.json new file mode 100644 index 0000000000..9166af077b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..12697ed44c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_slab.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_slab.json new file mode 100644 index 0000000000..c221d2712a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone_slab" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone_slab" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_slab_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_slab_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..82ec7a1aeb --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_slab_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone_slab_from_polished_sky_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone_slab_from_polished_sky_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_slab_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_slab_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..ba91fd9c59 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_slab_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone_slab_from_sky_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone_slab_from_sky_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_stairs.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_stairs.json new file mode 100644 index 0000000000..fb6744c714 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone_stairs" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone_stairs" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_stairs_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_stairs_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..f805d23a89 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_stairs_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone_stairs_from_polished_sky_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone_stairs_from_polished_sky_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_stairs_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_stairs_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..768e102e48 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_stairs_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone_stairs_from_sky_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone_stairs_from_sky_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_wall.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_wall.json new file mode 100644 index 0000000000..f62efb2b33 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_wall.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone_wall" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone_wall" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_wall_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_wall_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..f144866277 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_wall_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone_wall_from_polished_sky_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone_wall_from_polished_sky_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_wall_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_wall_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..d94c60057a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_sky_tumblestone_wall_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_sky_tumblestone_wall_from_sky_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_sky_tumblestone_wall_from_sky_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone.json new file mode 100644 index 0000000000..dcce94bc24 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..281d3d08ec --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_slab.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_slab.json new file mode 100644 index 0000000000..3db6958ca6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone_slab" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone_slab" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_slab_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_slab_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..84355b8b9b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_slab_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone_slab_from_polished_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone_slab_from_polished_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_slab_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_slab_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..8ff666c9d5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_slab_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone_slab_from_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone_slab_from_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_stairs.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_stairs.json new file mode 100644 index 0000000000..507364e84f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone_stairs" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone_stairs" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_stairs_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_stairs_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..af80f595e9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_stairs_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone_stairs_from_polished_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone_stairs_from_polished_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_stairs_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_stairs_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..9cce4ac19a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_stairs_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone_stairs_from_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone_stairs_from_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_wall.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_wall.json new file mode 100644 index 0000000000..51a1a14113 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_wall.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone_wall" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone_wall" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_wall_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_wall_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..213bba4f47 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_wall_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone_wall_from_polished_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone_wall_from_polished_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_wall_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_wall_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..17b2860165 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/polished_tumblestone_wall_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:polished_tumblestone_wall_from_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:polished_tumblestone_wall_from_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab.json new file mode 100644 index 0000000000..07a2028eee --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_slab" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_slab" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..85ab70f5dd --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_slab_from_polished_sky_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_slab_from_polished_sky_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..d1a5b098a7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_slab_from_sky_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_slab_from_sky_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab_from_sky_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab_from_sky_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..835e83fdae --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_slab_from_sky_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_slab_from_sky_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_slab_from_sky_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..38d725159e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_stairs" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_stairs" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..646baf6553 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_stairs_from_polished_sky_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_stairs_from_polished_sky_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..49ab3ff7c8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_stairs_from_sky_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_stairs_from_sky_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs_from_sky_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs_from_sky_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..6097bfd714 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_stairs_from_sky_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_stairs_from_sky_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_stairs_from_sky_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall.json new file mode 100644 index 0000000000..05a189330e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_wall" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_wall" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..f8feebc55e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_wall_from_polished_sky_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_wall_from_polished_sky_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..69a91b299e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_wall_from_sky_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_wall_from_sky_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall_from_sky_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall_from_sky_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..0f3df66381 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_brick_wall_from_sky_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_brick_wall_from_sky_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_brick_wall_from_sky_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_bricks.json new file mode 100644 index 0000000000..c911443cba --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_bricks.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_bricks" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_bricks" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..5a78182571 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:sky_tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..bb1a63cda1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/sky_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:sky_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_sky_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:sky_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab.json new file mode 100644 index 0000000000..b9e96b952a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_slab" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_slab" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..bbc68c71c2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_slab_from_polished_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_slab_from_polished_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..1fe05cf8db --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_slab_from_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_slab_from_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab_from_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab_from_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..47558bd08b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_slab_from_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_slab_from_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_slab_from_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs.json new file mode 100644 index 0000000000..b802d0d1a5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_stairs" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_stairs" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..c06d880f0c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_stairs_from_polished_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_stairs_from_polished_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..6ea5661793 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_stairs_from_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_stairs_from_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs_from_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs_from_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..df4e761136 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_stairs_from_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_stairs_from_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_stairs_from_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall.json new file mode 100644 index 0000000000..db42a9f7ea --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_wall" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_wall" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..2cf8bd36ba --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_wall_from_polished_tumblestone_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_wall_from_polished_tumblestone_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..316b10676f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_wall_from_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_wall_from_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall_from_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall_from_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..54905d854b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_brick_wall_from_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_brick_wall_from_tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_bricks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_brick_wall_from_tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_bricks.json new file mode 100644 index 0000000000..4c79440c9a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_bricks.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_bricks" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_bricks" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_bricks_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_bricks_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..7009a2ab06 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_bricks_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_bricks_from_tumblestone_block_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:tumblestone_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_bricks_from_tumblestone_block_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..40ed3e935d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/advancements/recipes/blocks/tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,34 @@ +{ + "parent": "cobblemon:recipes/root", + "rewards": { + "recipes": [ + "cobblemon:tumblestone_bricks_in_stonecutter" + ] + }, + "criteria": { + "has_tumblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "cobblemon:polished_tumblestone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "cobblemon:tumblestone_bricks_in_stonecutter" + } + } + }, + "requirements": [ + [ + "has_tumblestone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/aguav_berry.json b/common/src/main/resources/data/cobblemon/berries/aguav_berry.json index e79c91a1e5..0d179efe0b 100644 --- a/common/src/main/resources/data/cobblemon/berries/aguav_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/aguav_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 2, - "max": 4 + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_jungle", "cobblemon:is_swamp" ], "growthTime": { - "min": 55, - "max": 65 + "min": 41, + "max": 49 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 20, + "max": 24 }, "favoriteMulches": [ "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -103,6 +95,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:lum_berry": "cobblemon:sitrus_berry", "cobblemon:wepear_berry": "cobblemon:rabuta_berry" @@ -117,5 +121,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:aguav_berry.geo", - "fruitTexture": "cobblemon:aguav" + "fruitTexture": "cobblemon:aguav", + "boneMealChance": 0.48 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/apicot_berry.json b/common/src/main/resources/data/cobblemon/berries/apicot_berry.json index 6fc37f6462..c5279ca86b 100644 --- a/common/src/main/resources/data/cobblemon/berries/apicot_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/apicot_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_mountain", "cobblemon:is_taiga" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 18, - "max": 28 + "min": 27, + "max": 33 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -127,6 +119,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "tall-sprout", "matureShape": "tall-mature", @@ -140,5 +144,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:apicot_berry.geo", - "fruitTexture": "cobblemon:apicot" + "fruitTexture": "cobblemon:apicot", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/aspear_berry.json b/common/src/main/resources/data/cobblemon/berries/aspear_berry.json index 075c936e7c..daaad10fb4 100644 --- a/common/src/main/resources/data/cobblemon/berries/aspear_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/aspear_berry.json @@ -1,32 +1,24 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_mountain", "cobblemon:is_taiga" ], "growthTime": { - "min": 45, - "max": 55 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 18, + "max": 22 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -157,6 +149,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:oran_berry": "cobblemon:lum_berry", "cobblemon:persim_berry": "cobblemon:iapapa_berry" @@ -171,5 +175,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:aspear_berry.geo", - "fruitTexture": "cobblemon:aspear" + "fruitTexture": "cobblemon:aspear", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/babiri_berry.json b/common/src/main/resources/data/cobblemon/berries/babiri_berry.json index ece85cc6a1..4a10fd7b1b 100644 --- a/common/src/main/resources/data/cobblemon/berries/babiri_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/babiri_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -9,25 +9,18 @@ "cobblemon:is_taiga" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], + "randomizedGrowthPoints": true, "spawnConditions": [ { "variant": "cobblemon:preferred_biome", @@ -133,6 +126,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:rabuta_berry": "cobblemon:durin_berry" @@ -148,5 +153,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:babiri_berry.geo", - "fruitTexture": "cobblemon:babiri" + "fruitTexture": "cobblemon:babiri", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/belue_berry.json b/common/src/main/resources/data/cobblemon/berries/belue_berry.json index d963f63009..ca696adeb9 100644 --- a/common/src/main/resources/data/cobblemon/berries/belue_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/belue_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 2 }, "preferredBiomeTags": [ "cobblemon:is_mountain", "cobblemon:is_taiga" ], "growthTime": { - "min": 75, - "max": 85 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 25, + "max": 29 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -91,6 +83,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:grepa_berry": "cobblemon:apicot_berry", "cobblemon:coba_berry": "cobblemon:rowap_berry" @@ -106,5 +110,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:belue_berry.geo", - "fruitTexture": "cobblemon:belue" + "fruitTexture": "cobblemon:belue", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/bluk_berry.json b/common/src/main/resources/data/cobblemon/berries/bluk_berry.json index b5f016f8ba..71a89e0c1e 100644 --- a/common/src/main/resources/data/cobblemon/berries/bluk_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/bluk_berry.json @@ -1,32 +1,24 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_mountain", "cobblemon:is_taiga" ], "growthTime": { - "min": 45, - "max": 55 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 18, + "max": 22 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -157,6 +149,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:oran_berry": "cobblemon:leppa_berry", "cobblemon:wiki_berry": "cobblemon:cornn_berry" @@ -164,7 +168,7 @@ "sproutShape": "tall-sprout", "matureShape": "tall-mature", "flavors": { - "DRY": 10, + "DRY": 20, "SWEET": 10 }, "weight": 15.0, @@ -172,5 +176,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:bluk_berry.geo", - "fruitTexture": "cobblemon:bluk" + "fruitTexture": "cobblemon:bluk", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/charti_berry.json b/common/src/main/resources/data/cobblemon/berries/charti_berry.json index 11c57a23fc..f5c71d00a9 100644 --- a/common/src/main/resources/data/cobblemon/berries/charti_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/charti_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -10,26 +10,18 @@ "cobblemon:is_volcanic" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "coarse", "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -136,6 +128,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.75, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:durin_berry": "cobblemon:jaboca_berry" @@ -151,5 +155,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:charti_berry.geo", - "fruitTexture": "cobblemon:charti" + "fruitTexture": "cobblemon:charti", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/cheri_berry.json b/common/src/main/resources/data/cobblemon/berries/cheri_berry.json index 6c452b17c8..6ff17d6a47 100644 --- a/common/src/main/resources/data/cobblemon/berries/cheri_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/cheri_berry.json @@ -1,31 +1,23 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_plains" ], "growthTime": { - "min": 45, - "max": 55 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 18, + "max": 22 }, "favoriteMulches": [ "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -132,6 +124,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.2, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:oran_berry": "cobblemon:lum_berry", "cobblemon:persim_berry": "cobblemon:figy_berry" @@ -146,5 +150,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:cheri_berry.geo", - "fruitTexture": "cobblemon:cheri" + "fruitTexture": "cobblemon:cheri", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/chesto_berry.json b/common/src/main/resources/data/cobblemon/berries/chesto_berry.json index a822158fb0..8721e186f8 100644 --- a/common/src/main/resources/data/cobblemon/berries/chesto_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/chesto_berry.json @@ -1,31 +1,23 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_forest" ], "growthTime": { - "min": 45, - "max": 55 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 18, + "max": 22 }, "favoriteMulches": [ "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -156,6 +148,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:oran_berry": "cobblemon:lum_berry", "cobblemon:persim_berry": "cobblemon:wiki_berry" @@ -170,5 +174,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:chesto_berry.geo", - "fruitTexture": "cobblemon:chesto" + "fruitTexture": "cobblemon:chesto", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/chilan_berry.json b/common/src/main/resources/data/cobblemon/berries/chilan_berry.json index 3d86e54222..d9f7dd4733 100644 --- a/common/src/main/resources/data/cobblemon/berries/chilan_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/chilan_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -8,26 +8,18 @@ "cobblemon:is_grassland" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "loamy", "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -134,6 +126,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 9.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:watmel_berry": "cobblemon:custap_berry" @@ -149,5 +153,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:chilan_berry.geo", - "fruitTexture": "cobblemon:chilan" + "fruitTexture": "cobblemon:chilan", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/chople_berry.json b/common/src/main/resources/data/cobblemon/berries/chople_berry.json index bcaf750202..575b54310c 100644 --- a/common/src/main/resources/data/cobblemon/berries/chople_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/chople_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -9,25 +9,17 @@ "cobblemon:is_taiga" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -134,6 +126,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:spelon_berry": "cobblemon:lansat_berry" @@ -149,5 +153,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:chople_berry.geo", - "fruitTexture": "cobblemon:chople" + "fruitTexture": "cobblemon:chople", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/coba_berry.json b/common/src/main/resources/data/cobblemon/berries/coba_berry.json index b2c899e2f9..89c0136396 100644 --- a/common/src/main/resources/data/cobblemon/berries/coba_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/coba_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -9,26 +9,18 @@ "cobblemon:is_sky" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "loamy", "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -111,6 +103,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.75, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:belue_berry": "cobblemon:rowap_berry" @@ -126,5 +130,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:coba_berry.geo", - "fruitTexture": "cobblemon:coba" + "fruitTexture": "cobblemon:coba", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/colbur_berry.json b/common/src/main/resources/data/cobblemon/berries/colbur_berry.json index 78c21f765c..103147ec32 100644 --- a/common/src/main/resources/data/cobblemon/berries/colbur_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/colbur_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -9,26 +9,18 @@ "cobblemon:is_taiga" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "coarse", "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -111,6 +103,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.75, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:touga_berry": "cobblemon:spelon_berry" @@ -126,5 +130,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:colbur_berry.geo", - "fruitTexture": "cobblemon:colbur" + "fruitTexture": "cobblemon:colbur", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/cornn_berry.json b/common/src/main/resources/data/cobblemon/berries/cornn_berry.json index fada8a8f20..7887e7001e 100644 --- a/common/src/main/resources/data/cobblemon/berries/cornn_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/cornn_berry.json @@ -1,31 +1,23 @@ { "baseYield": { - "min": 2, - "max": 4 + "min": 1, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_plains" ], "growthTime": { - "min": 55, - "max": 65 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 23, + "max": 27 }, "favoriteMulches": [ "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -126,6 +118,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:rindo_berry": "cobblemon:kelpsy_berry", "cobblemon:passho_berry": "cobblemon:pamtre_berry" @@ -133,7 +137,7 @@ "sproutShape": "short-sprout", "matureShape": "short-mature", "flavors": { - "DRY": 20, + "DRY": 30, "SWEET": 10 }, "weight": 1.0, @@ -141,5 +145,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:cornn_berry.geo", - "fruitTexture": "cobblemon:cornn" + "fruitTexture": "cobblemon:cornn", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/custap_berry.json b/common/src/main/resources/data/cobblemon/berries/custap_berry.json index dd14233f51..b6a63d8349 100644 --- a/common/src/main/resources/data/cobblemon/berries/custap_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/custap_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_forest" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 27, + "max": 33 }, "favoriteMulches": [ "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -78,6 +70,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.25, + "z": 9.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "tail-sprout", "matureShape": "tail-mature", @@ -90,5 +94,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:custap_berry.geo", - "fruitTexture": "cobblemon:custap" + "fruitTexture": "cobblemon:custap", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/durin_berry.json b/common/src/main/resources/data/cobblemon/berries/durin_berry.json index fde64a757b..900e64b2fe 100644 --- a/common/src/main/resources/data/cobblemon/berries/durin_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/durin_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 2 }, "preferredBiomeTags": [ "cobblemon:is_forest" ], "growthTime": { - "min": 75, - "max": 85 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 25, + "max": 29 }, "favoriteMulches": [ "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -126,6 +118,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hondew_berry": "cobblemon:petaya_berry", "cobblemon:charti_berry": "cobblemon:jaboca_berry" @@ -133,7 +137,7 @@ "sproutShape": "cone-sprout", "matureShape": "cone-mature", "flavors": { - "BITTER": 30, + "BITTER": 40, "SOUR": 10 }, "weight": 1.0, @@ -141,5 +145,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:durin_berry.geo", - "fruitTexture": "cobblemon:durin" + "fruitTexture": "cobblemon:durin", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/enigma_berry.json b/common/src/main/resources/data/cobblemon/berries/enigma_berry.json index cbeebbb13b..de447e3269 100644 --- a/common/src/main/resources/data/cobblemon/berries/enigma_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/enigma_berry.json @@ -1,31 +1,23 @@ { "baseYield": { - "min": 2, - "max": 3 + "min": 1, + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_forest" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 27, + "max": 33 }, "favoriteMulches": [ "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -102,8 +94,19 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { - "cobblemon:haban_berry": "cobblemon:pomeg_berry", "cobblemon:kasib_berry": "cobblemon:kee_berry", "cobblemon:wacan_berry": "cobblemon:maranga_berry" }, @@ -118,5 +121,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:enigma_berry.geo", - "fruitTexture": "cobblemon:enigma" + "fruitTexture": "cobblemon:enigma", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/figy_berry.json b/common/src/main/resources/data/cobblemon/berries/figy_berry.json index a38b9f810e..35c0c88c06 100644 --- a/common/src/main/resources/data/cobblemon/berries/figy_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/figy_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 2, - "max": 4 + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_plains" ], "growthTime": { - "min": 55, - "max": 65 + "min": 41, + "max": 49 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 20, + "max": 24 }, "favoriteMulches": [ "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -102,6 +94,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 4.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:lum_berry": "cobblemon:sitrus_berry", "cobblemon:razz_berry": "cobblemon:touga_berry" @@ -116,5 +120,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:figy_berry.geo", - "fruitTexture": "cobblemon:figy" + "fruitTexture": "cobblemon:figy", + "boneMealChance": 0.48 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/ganlon_berry.json b/common/src/main/resources/data/cobblemon/berries/ganlon_berry.json index 8fb84f3660..ab6ea2c5b0 100644 --- a/common/src/main/resources/data/cobblemon/berries/ganlon_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/ganlon_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_plains" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 18, - "max": 28 + "min": 27, + "max": 33 }, "favoriteMulches": [ "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -90,6 +82,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.75, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "platform-sprout", "matureShape": "platform-mature", @@ -103,5 +107,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:ganlon_berry.geo", - "fruitTexture": "cobblemon:ganlon" + "fruitTexture": "cobblemon:ganlon", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/grepa_berry.json b/common/src/main/resources/data/cobblemon/berries/grepa_berry.json index 3823922fd6..f259e214c9 100644 --- a/common/src/main/resources/data/cobblemon/berries/grepa_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/grepa_berry.json @@ -7,25 +7,17 @@ "cobblemon:is_forest" ], "growthTime": { - "min": 95, - "max": 105 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 20, - "max": 30 + "min": 25, + "max": 29 }, "favoriteMulches": [ "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -150,6 +142,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.75, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:belue_berry": "cobblemon:apicot_berry", "cobblemon:pomeg_berry": "cobblemon:starf_berry" @@ -157,14 +161,16 @@ "sproutShape": "tall-sprout", "matureShape": "tall-mature", "flavors": { + "SPICY": 10, "DRY": 10, - "SWEET": 10, - "SOUR": 10 + "SWEET": 15, + "SOUR": 25 }, "weight": 1.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:grepa_berry.geo", - "fruitTexture": "cobblemon:grepa" + "fruitTexture": "cobblemon:grepa", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/haban_berry.json b/common/src/main/resources/data/cobblemon/berries/haban_berry.json index e944a57225..915b18f3be 100644 --- a/common/src/main/resources/data/cobblemon/berries/haban_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/haban_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -11,26 +11,19 @@ "cobblemon:is_volcanic" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "coarse", "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], + "randomizedGrowthPoints": true, "spawnConditions": [ { "variant": "cobblemon:preferred_biome", @@ -136,8 +129,21 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { - "cobblemon:hopo_berry": "cobblemon:enigma_berry" + "cobblemon:hopo_berry": "cobblemon:enigma_berry", + "cobblemon:sitrus_berry": "cobblemon:pomeg_berry" }, "sproutShape": "short-sprout", "matureShape": "short-mature", @@ -150,5 +156,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:haban_berry.geo", - "fruitTexture": "cobblemon:haban" + "fruitTexture": "cobblemon:haban", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/hondew_berry.json b/common/src/main/resources/data/cobblemon/berries/hondew_berry.json index 1ac1116ba7..106a04e200 100644 --- a/common/src/main/resources/data/cobblemon/berries/hondew_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/hondew_berry.json @@ -7,25 +7,17 @@ "cobblemon:is_arid" ], "growthTime": { - "min": 95, - "max": 105 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 20, - "max": 30 + "min": 25, + "max": 29 }, "favoriteMulches": [ "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -90,6 +82,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:durin_berry": "cobblemon:petaya_berry", "cobblemon:pomeg_berry": "cobblemon:starf_berry" @@ -98,13 +102,15 @@ "matureShape": "platform-mature", "flavors": { "SPICY": 10, - "DRY": 10, - "BITTER": 10 + "SWEET": 10, + "BITTER": 25, + "SOUR": 15 }, "weight": 1.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:hondew_berry.geo", - "fruitTexture": "cobblemon:hondew" + "fruitTexture": "cobblemon:hondew", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/hopo_berry.json b/common/src/main/resources/data/cobblemon/berries/hopo_berry.json index cf99bec70c..c4851c37f9 100644 --- a/common/src/main/resources/data/cobblemon/berries/hopo_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/hopo_berry.json @@ -8,25 +8,17 @@ "cobblemon:is_taiga" ], "growthTime": { - "min": 115, - "max": 125 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 20, - "max": 30 + "min": 25, + "max": 29 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -127,6 +119,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:occa_berry": "cobblemon:enigma_berry", "cobblemon:passho_berry": "cobblemon:enigma_berry", @@ -149,11 +153,18 @@ }, "sproutShape": "tall-sprout", "matureShape": "tall-mature", - "flavors": {}, + "flavors": { + "SPICY": 20, + "DRY": 20, + "SWEET": 20, + "BITTER": 20, + "SOUR": 20 + }, "weight": 1.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:hopo_berry.geo", - "fruitTexture": "cobblemon:hopo" + "fruitTexture": "cobblemon:hopo", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/iapapa_berry.json b/common/src/main/resources/data/cobblemon/berries/iapapa_berry.json index b09169164f..ff3cd3cf78 100644 --- a/common/src/main/resources/data/cobblemon/berries/iapapa_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/iapapa_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 2, - "max": 4 + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_arid" ], "growthTime": { - "min": 55, - "max": 65 + "min": 41, + "max": 49 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 20, + "max": 24 }, "favoriteMulches": [ "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], - "randomizedGrowthPoints": false, + "growthFactors": [], + "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ { @@ -150,6 +142,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:lum_berry": "cobblemon:sitrus_berry", "cobblemon:pinap_berry": "cobblemon:nomel_berry" @@ -164,5 +168,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:iapapa_berry.geo", - "fruitTexture": "cobblemon:iapapa" + "fruitTexture": "cobblemon:iapapa", + "boneMealChance": 0.48 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/jaboca_berry.json b/common/src/main/resources/data/cobblemon/berries/jaboca_berry.json index e5cbf072a2..cf716298ff 100644 --- a/common/src/main/resources/data/cobblemon/berries/jaboca_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/jaboca_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_plains" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 27, + "max": 33 }, "favoriteMulches": [ "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -126,6 +118,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.75, + "z": 7.85 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "short-sprout", "matureShape": "short-mature", @@ -138,5 +142,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:jaboca_berry.geo", - "fruitTexture": "cobblemon:jaboca" + "fruitTexture": "cobblemon:jaboca", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/kasib_berry.json b/common/src/main/resources/data/cobblemon/berries/kasib_berry.json index 70216cdd1c..86072f98ff 100644 --- a/common/src/main/resources/data/cobblemon/berries/kasib_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/kasib_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -11,26 +11,18 @@ "cobblemon:is_taiga" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "coarse", "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -101,6 +93,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:enigma_berry": "cobblemon:kee_berry" @@ -116,5 +120,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:kasib_berry.geo", - "fruitTexture": "cobblemon:kasib" + "fruitTexture": "cobblemon:kasib", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/kebia_berry.json b/common/src/main/resources/data/cobblemon/berries/kebia_berry.json index 2bd0bd6727..e1657bc4fa 100644 --- a/common/src/main/resources/data/cobblemon/berries/kebia_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/kebia_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -10,26 +10,18 @@ "cobblemon:is_swamp" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "humid", "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -124,6 +116,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:pamtre_berry": "cobblemon:micle_berry" @@ -139,5 +143,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:kebia_berry.geo", - "fruitTexture": "cobblemon:kebia" + "fruitTexture": "cobblemon:kebia", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/kee_berry.json b/common/src/main/resources/data/cobblemon/berries/kee_berry.json index 31ed31beb5..0faedd276c 100644 --- a/common/src/main/resources/data/cobblemon/berries/kee_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/kee_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 2 }, "preferredBiomeTags": [ "cobblemon:is_forest" ], "growthTime": { - "min": 75, - "max": 85 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 25, + "max": 29 }, "favoriteMulches": [ "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -126,14 +118,26 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "tall-sprout", "matureShape": "tall-mature", "flavors": { "SPICY": 30, - "DRY": 30, + "DRY": 10, "SWEET": 10, - "BITTER": 10, + "BITTER": 30, "SOUR": 10 }, "weight": 1.0, @@ -141,5 +145,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:kee_berry.geo", - "fruitTexture": "cobblemon:kee" + "fruitTexture": "cobblemon:kee", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/kelpsy_berry.json b/common/src/main/resources/data/cobblemon/berries/kelpsy_berry.json index 791a460f6c..22452e2ade 100644 --- a/common/src/main/resources/data/cobblemon/berries/kelpsy_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/kelpsy_berry.json @@ -8,25 +8,17 @@ "cobblemon:is_taiga" ], "growthTime": { - "min": 95, - "max": 105 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 20, - "max": 30 + "min": 25, + "max": 29 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -151,6 +143,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:pamtre_berry": "cobblemon:liechi_berry", "cobblemon:pomeg_berry": "cobblemon:starf_berry" @@ -158,8 +162,9 @@ "sproutShape": "blossom-sprout", "matureShape": "blossom-mature", "flavors": { - "DRY": 10, - "BITTER": 10, + "DRY": 25, + "SWEET": 10, + "BITTER": 15, "SOUR": 10 }, "weight": 1.0, @@ -167,5 +172,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:kelpsy_berry.geo", - "fruitTexture": "cobblemon:kelpsy" + "fruitTexture": "cobblemon:kelpsy", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/lansat_berry.json b/common/src/main/resources/data/cobblemon/berries/lansat_berry.json index 214e96a853..c99ff275da 100644 --- a/common/src/main/resources/data/cobblemon/berries/lansat_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/lansat_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_mountain", "cobblemon:is_taiga" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 18, - "max": 28 + "min": 27, + "max": 33 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -151,14 +143,26 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "squat-sprout", "matureShape": "squat-mature", "flavors": { "SPICY": 30, - "DRY": 10, + "DRY": 30, "SWEET": 30, - "BITTER": 10, + "BITTER": 30, "SOUR": 30 }, "weight": 1.0, @@ -166,5 +170,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:lansat_berry.geo", - "fruitTexture": "cobblemon:lansat" + "fruitTexture": "cobblemon:lansat", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/leppa_berry.json b/common/src/main/resources/data/cobblemon/berries/leppa_berry.json index 8eee7252b1..cdaf37887e 100644 --- a/common/src/main/resources/data/cobblemon/berries/leppa_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/leppa_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 2 }, "preferredBiomeTags": [ "cobblemon:is_plains" ], "growthTime": { - "min": 75, - "max": 85 + "min": 41, + "max": 49 }, "refreshRate": { - "min": 17, - "max": 27 + "min": 20, + "max": 24 }, "favoriteMulches": [ "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -78,6 +70,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.2, + "y": 2.75, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:lum_berry": "cobblemon:hopo_berry" }, @@ -95,5 +99,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:leppa_berry.geo", - "fruitTexture": "cobblemon:leppa" + "fruitTexture": "cobblemon:leppa", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/liechi_berry.json b/common/src/main/resources/data/cobblemon/berries/liechi_berry.json index da33c7a9e8..374e5f0874 100644 --- a/common/src/main/resources/data/cobblemon/berries/liechi_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/liechi_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_jungle", "cobblemon:is_swamp" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 18, - "max": 28 + "min": 27, + "max": 33 }, "favoriteMulches": [ "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -79,6 +71,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "tail-sprout", "matureShape": "tail-mature", @@ -92,5 +96,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:liechi_berry.geo", - "fruitTexture": "cobblemon:liechi" + "fruitTexture": "cobblemon:liechi", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/lum_berry.json b/common/src/main/resources/data/cobblemon/berries/lum_berry.json index 6aa719ce39..de6c349789 100644 --- a/common/src/main/resources/data/cobblemon/berries/lum_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/lum_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 2 }, "preferredBiomeTags": [ "cobblemon:is_jungle", "cobblemon:is_swamp" ], "growthTime": { - "min": 75, - "max": 85 + "min": 41, + "max": 49 }, "refreshRate": { - "min": 17, - "max": 27 + "min": 20, + "max": 24 }, "favoriteMulches": [ "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -79,6 +71,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.75, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:figy_berry": "cobblemon:sitrus_berry", "cobblemon:wiki_berry": "cobblemon:sitrus_berry", @@ -87,26 +91,8 @@ "cobblemon:iapapa_berry": "cobblemon:sitrus_berry", "cobblemon:leppa_berry": "cobblemon:hopo_berry" }, - "sproutShape": [ - { - "minX": 0, - "minY": -1, - "minZ": 0, - "maxX": 16, - "maxY": 16, - "maxZ": 16 - } - ], - "matureShape": [ - { - "minX": 0, - "minY": -1, - "minZ": 0, - "maxX": 16, - "maxY": 24, - "maxZ": 16 - } - ], + "sproutShape": "tall-sprout", + "matureShape": "tall-mature", "flavors": { "SPICY": 10, "DRY": 10, @@ -119,5 +105,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:lum_berry.geo", - "fruitTexture": "cobblemon:lum" + "fruitTexture": "cobblemon:lum", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/mago_berry.json b/common/src/main/resources/data/cobblemon/berries/mago_berry.json index ca41b1478f..092856c81a 100644 --- a/common/src/main/resources/data/cobblemon/berries/mago_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/mago_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 2, - "max": 4 + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_forest" ], "growthTime": { - "min": 55, - "max": 65 + "min": 41, + "max": 49 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 20, + "max": 24 }, "favoriteMulches": [ "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -138,6 +130,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:lum_berry": "cobblemon:sitrus_berry", "cobblemon:nanab_berry": "cobblemon:magost_berry" @@ -152,5 +156,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:mago_berry.geo", - "fruitTexture": "cobblemon:mago" + "fruitTexture": "cobblemon:mago", + "boneMealChance": 0.48 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/magost_berry.json b/common/src/main/resources/data/cobblemon/berries/magost_berry.json index 97aa7f2328..1dc76bae8c 100644 --- a/common/src/main/resources/data/cobblemon/berries/magost_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/magost_berry.json @@ -1,32 +1,24 @@ { "baseYield": { - "min": 2, - "max": 4 + "min": 1, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_jungle", "cobblemon:is_swamp" ], "growthTime": { - "min": 55, - "max": 65 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 23, + "max": 27 }, "favoriteMulches": [ "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -115,6 +107,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:roseli_berry": "cobblemon:qualot_berry", "cobblemon:tanga_berry": "cobblemon:watmel_berry" @@ -122,7 +126,7 @@ "sproutShape": "frill-sprout", "matureShape": "frill-mature", "flavors": { - "SWEET": 20, + "SWEET": 30, "BITTER": 10 }, "weight": 1.0, @@ -130,5 +134,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:magost_berry.geo", - "fruitTexture": "cobblemon:magost" + "fruitTexture": "cobblemon:magost", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/maranga_berry.json b/common/src/main/resources/data/cobblemon/berries/maranga_berry.json index b16d9335ac..f65030d75a 100644 --- a/common/src/main/resources/data/cobblemon/berries/maranga_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/maranga_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 2 }, "preferredBiomeTags": [ "cobblemon:is_jungle", "cobblemon:is_swamp" ], "growthTime": { - "min": 75, - "max": 85 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 25, + "max": 29 }, "favoriteMulches": [ "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -91,6 +83,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "short-sprout", "matureShape": "short-mature", @@ -106,5 +110,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:maranga_berry.geo", - "fruitTexture": "cobblemon:maranga" + "fruitTexture": "cobblemon:maranga", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/micle_berry.json b/common/src/main/resources/data/cobblemon/berries/micle_berry.json index 27b9b58e82..884a310b3b 100644 --- a/common/src/main/resources/data/cobblemon/berries/micle_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/micle_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_plains" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 27, + "max": 33 }, "favoriteMulches": [ "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -138,6 +130,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.2, + "y": 2.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "pyramid-sprout", "matureShape": "pyramid-mature", @@ -150,5 +154,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:micle_berry.geo", - "fruitTexture": "cobblemon:micle" + "fruitTexture": "cobblemon:micle", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/nanab_berry.json b/common/src/main/resources/data/cobblemon/berries/nanab_berry.json index 7dc62856f3..e1d15cebf4 100644 --- a/common/src/main/resources/data/cobblemon/berries/nanab_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/nanab_berry.json @@ -1,32 +1,24 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_jungle", "cobblemon:is_swamp" ], "growthTime": { - "min": 39, - "max": 49 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 13, - "max": 23 + "min": 18, + "max": 22 }, "favoriteMulches": [ "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -157,6 +149,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:oran_berry": "cobblemon:leppa_berry", "cobblemon:mago_berry": "cobblemon:magost_berry" @@ -164,7 +168,7 @@ "sproutShape": "tall-sprout", "matureShape": "tall-mature", "flavors": { - "SWEET": 10, + "SWEET": 20, "BITTER": 10 }, "weight": 15.0, @@ -172,5 +176,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:nanab_berry.geo", - "fruitTexture": "cobblemon:nanab" + "fruitTexture": "cobblemon:nanab", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/nomel_berry.json b/common/src/main/resources/data/cobblemon/berries/nomel_berry.json index a2957e4f90..ed465878ee 100644 --- a/common/src/main/resources/data/cobblemon/berries/nomel_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/nomel_berry.json @@ -1,32 +1,24 @@ { "baseYield": { - "min": 2, - "max": 4 + "min": 1, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_mountain", "cobblemon:is_taiga" ], "growthTime": { - "min": 55, - "max": 65 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 23, + "max": 27 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -103,6 +95,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:yache_berry": "cobblemon:grepa_berry", "cobblemon:payapa_berry": "cobblemon:belue_berry" @@ -111,12 +115,13 @@ "matureShape": "short-mature", "flavors": { "SPICY": 10, - "SOUR": 20 + "SOUR": 30 }, "weight": 1.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:nomel_berry.geo", - "fruitTexture": "cobblemon:nomel" + "fruitTexture": "cobblemon:nomel", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/occa_berry.json b/common/src/main/resources/data/cobblemon/berries/occa_berry.json index cf8c83752a..07fc0a53e4 100644 --- a/common/src/main/resources/data/cobblemon/berries/occa_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/occa_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -10,26 +10,18 @@ "cobblemon:is_volcanic" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "humid", "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -136,6 +128,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:touga_berry": "cobblemon:tamato_berry" @@ -151,5 +155,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:occa_berry.geo", - "fruitTexture": "cobblemon:occa" + "fruitTexture": "cobblemon:occa", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/oran_berry.json b/common/src/main/resources/data/cobblemon/berries/oran_berry.json index 6ab80f5135..0813335059 100644 --- a/common/src/main/resources/data/cobblemon/berries/oran_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/oran_berry.json @@ -1,32 +1,24 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_temperate" ], "growthTime": { - "min": 35, - "max": 45 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 12, + "min": 18, "max": 22 }, "favoriteMulches": [ "peat", "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -157,6 +149,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:cheri_berry": "cobblemon:lum_berry", "cobblemon:chesto_berry": "cobblemon:lum_berry", @@ -172,16 +176,17 @@ "sproutShape": "tall-sprout", "matureShape": "tall-mature", "flavors": { - "SPICY": 10, - "DRY": 10, - "SWEET": 10, - "BITTER": 10, - "SOUR": 10 + "SPICY": 5, + "DRY": 5, + "SWEET": 5, + "BITTER": 5, + "SOUR": 5 }, "weight": 25.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:oran_berry.geo", - "fruitTexture": "cobblemon:oran" + "fruitTexture": "cobblemon:oran", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/pamtre_berry.json b/common/src/main/resources/data/cobblemon/berries/pamtre_berry.json index 746985ed59..769bf8f8a5 100644 --- a/common/src/main/resources/data/cobblemon/berries/pamtre_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/pamtre_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 2 }, "preferredBiomeTags": [ "cobblemon:is_jungle", "cobblemon:is_swamp" ], "growthTime": { - "min": 75, - "max": 85 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 25, + "max": 29 }, "favoriteMulches": [ "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -127,6 +119,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:kelpsy_berry": "cobblemon:liechi_berry", "cobblemon:kebia_berry": "cobblemon:micle_berry" @@ -134,7 +138,7 @@ "sproutShape": "lantern-sprout", "matureShape": "lantern-mature", "flavors": { - "DRY": 30, + "DRY": 40, "SWEET": 10 }, "weight": 1.0, @@ -142,5 +146,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:pamtre_berry.geo", - "fruitTexture": "cobblemon:pamtre" + "fruitTexture": "cobblemon:pamtre", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/passho_berry.json b/common/src/main/resources/data/cobblemon/berries/passho_berry.json index b189681713..e5fbcccc08 100644 --- a/common/src/main/resources/data/cobblemon/berries/passho_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/passho_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -10,26 +10,18 @@ "cobblemon:is_ocean" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "humid", "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -100,6 +92,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:cornn_berry": "cobblemon:pamtre_berry" @@ -115,5 +119,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:passho_berry.geo", - "fruitTexture": "cobblemon:passho" + "fruitTexture": "cobblemon:passho", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/payapa_berry.json b/common/src/main/resources/data/cobblemon/berries/payapa_berry.json index 6873e05f1a..61b8f6b015 100644 --- a/common/src/main/resources/data/cobblemon/berries/payapa_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/payapa_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -11,26 +11,18 @@ "cobblemon:is_spooky" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "loamy", "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -101,6 +93,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:nomel_berry": "cobblemon:belue_berry" @@ -116,5 +120,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:payapa_berry.geo", - "fruitTexture": "cobblemon:payapa" + "fruitTexture": "cobblemon:payapa", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/pecha_berry.json b/common/src/main/resources/data/cobblemon/berries/pecha_berry.json index c2fbabea52..3277b2fe76 100644 --- a/common/src/main/resources/data/cobblemon/berries/pecha_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/pecha_berry.json @@ -1,32 +1,24 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_jungle", "cobblemon:is_swamp" ], "growthTime": { - "min": 45, - "max": 55 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 18, + "max": 22 }, "favoriteMulches": [ "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -157,6 +149,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:oran_berry": "cobblemon:lum_berry", "cobblemon:persim_berry": "cobblemon:mago_berry" @@ -171,5 +175,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:pecha_berry.geo", - "fruitTexture": "cobblemon:pecha" + "fruitTexture": "cobblemon:pecha", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/persim_berry.json b/common/src/main/resources/data/cobblemon/berries/persim_berry.json index 30db77bcf2..40b43b0936 100644 --- a/common/src/main/resources/data/cobblemon/berries/persim_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/persim_berry.json @@ -1,31 +1,23 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_arid" ], "growthTime": { - "min": 45, - "max": 55 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 18, + "max": 22 }, "favoriteMulches": [ "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -132,6 +124,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:cheri_berry": "cobblemon:figy_berry", "cobblemon:chesto_berry": "cobblemon:wiki_berry", @@ -142,16 +146,17 @@ "sproutShape": "short-sprout", "matureShape": "short-mature", "flavors": { - "SPICY": 10, - "DRY": 10, - "SWEET": 10, - "BITTER": 10, - "SOUR": 10 + "SPICY": 5, + "DRY": 5, + "SWEET": 5, + "BITTER": 5, + "SOUR": 5 }, "weight": 20.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:persim_berry.geo", - "fruitTexture": "cobblemon:persim" + "fruitTexture": "cobblemon:persim", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/petaya_berry.json b/common/src/main/resources/data/cobblemon/berries/petaya_berry.json index b709d0a092..b73a5c1b69 100644 --- a/common/src/main/resources/data/cobblemon/berries/petaya_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/petaya_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_arid" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 18, - "max": 28 + "min": 27, + "max": 33 }, "favoriteMulches": [ "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -126,6 +118,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "frill-sprout", "matureShape": "frill-mature", @@ -139,5 +143,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:petaya_berry.geo", - "fruitTexture": "cobblemon:petaya" + "fruitTexture": "cobblemon:petaya", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/pinap_berry.json b/common/src/main/resources/data/cobblemon/berries/pinap_berry.json index dd5a096e74..788f42db91 100644 --- a/common/src/main/resources/data/cobblemon/berries/pinap_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/pinap_berry.json @@ -1,32 +1,24 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_arid" ], "growthTime": { - "min": 42, - "max": 52 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 14, - "max": 24 + "min": 18, + "max": 22 }, "favoriteMulches": [ "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], - "randomizedGrowthPoints": false, + "growthFactors": [], + "randomizedGrowthPoints": true, "spawnConditions": [ { "variant": "cobblemon:preferred_biome", @@ -156,6 +148,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:oran_berry": "cobblemon:leppa_berry", "cobblemon:iapapa_berry": "cobblemon:nomel_berry" @@ -164,12 +168,13 @@ "matureShape": "sword-mature", "flavors": { "SPICY": 10, - "SOUR": 10 + "SOUR": 20 }, "weight": 15.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:pinap_berry.geo", - "fruitTexture": "cobblemon:pinap" + "fruitTexture": "cobblemon:pinap", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json b/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json index 4c86a617e8..4cd9e7d61f 100644 --- a/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json @@ -7,25 +7,17 @@ "cobblemon:is_forest" ], "growthTime": { - "min": 95, - "max": 105 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 20, - "max": 30 + "min": 25, + "max": 29 }, "favoriteMulches": [ "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -79,7 +71,7 @@ }, { "position": { - "x": 6.6, + "x": -2.5, "y": 12.5, "z": 8.0 }, @@ -102,6 +94,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:kelpsy_berry": "cobblemon:starf_berry", "cobblemon:qualot_berry": "cobblemon:starf_berry", @@ -112,14 +116,17 @@ "sproutShape": "frill-sprout", "matureShape": "frill-mature", "flavors": { - "SPICY": 10, - "SWEET": 10, - "BITTER": 10 + "SPICY": 15, + "DRY": 15, + "SWEET": 15, + "BITTER": 15, + "SOUR": 15 }, "weight": 1.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:pomeg_berry.geo", - "fruitTexture": "cobblemon:pomeg" + "fruitTexture": "cobblemon:pomeg", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/qualot_berry.json b/common/src/main/resources/data/cobblemon/berries/qualot_berry.json index 9cab8a5519..2d1c1b6ed1 100644 --- a/common/src/main/resources/data/cobblemon/berries/qualot_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/qualot_berry.json @@ -8,25 +8,17 @@ "cobblemon:is_swamp" ], "growthTime": { - "min": 95, - "max": 105 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 20, - "max": 30 + "min": 25, + "max": 29 }, "favoriteMulches": [ "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -151,6 +143,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:watmel_berry": "cobblemon:ganlon_berry", "cobblemon:pomeg_berry": "cobblemon:starf_berry" @@ -158,14 +162,16 @@ "sproutShape": "pyramid-sprout", "matureShape": "pyramid-mature", "flavors": { - "SPICY": 10, - "SWEET": 10, - "SOUR": 10 + "SPICY": 15, + "DRY": 10, + "SWEET": 25, + "BITTER": 10 }, "weight": 1.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:qualot_berry.geo", - "fruitTexture": "cobblemon:qualot" + "fruitTexture": "cobblemon:qualot", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/rabuta_berry.json b/common/src/main/resources/data/cobblemon/berries/rabuta_berry.json index 7a443586df..6d00fb1dec 100644 --- a/common/src/main/resources/data/cobblemon/berries/rabuta_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/rabuta_berry.json @@ -1,31 +1,23 @@ { "baseYield": { - "min": 2, - "max": 4 + "min": 1, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_arid" ], "growthTime": { - "min": 55, - "max": 65 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 23, + "max": 27 }, "favoriteMulches": [ "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -102,6 +94,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:shuca_berry": "cobblemon:hondew_berry", "cobblemon:babiri_berry": "cobblemon:durin_berry" @@ -109,7 +113,7 @@ "sproutShape": "lilypad-sprout", "matureShape": "lilypad-mature", "flavors": { - "BITTER": 20, + "BITTER": 30, "SOUR": 10 }, "weight": 1.0, @@ -117,5 +121,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:rabuta_berry.geo", - "fruitTexture": "cobblemon:rabuta" + "fruitTexture": "cobblemon:rabuta", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/rawst_berry.json b/common/src/main/resources/data/cobblemon/berries/rawst_berry.json index ea95c7e3ae..c4e6d073d8 100644 --- a/common/src/main/resources/data/cobblemon/berries/rawst_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/rawst_berry.json @@ -1,31 +1,23 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_arid" ], "growthTime": { - "min": 45, - "max": 55 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 18, + "max": 22 }, "favoriteMulches": [ "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -144,6 +136,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:oran_berry": "cobblemon:lum_berry", "cobblemon:persim_berry": "cobblemon:aguav_berry" @@ -158,5 +162,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:rawst_berry.geo", - "fruitTexture": "cobblemon:rawst" + "fruitTexture": "cobblemon:rawst", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/razz_berry.json b/common/src/main/resources/data/cobblemon/berries/razz_berry.json index 47044e829c..429f0bd01f 100644 --- a/common/src/main/resources/data/cobblemon/berries/razz_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/razz_berry.json @@ -1,31 +1,23 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_forest" ], "growthTime": { - "min": 39, - "max": 49 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 13, - "max": 23 + "min": 18, + "max": 22 }, "favoriteMulches": [ "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -156,6 +148,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:oran_berry": "cobblemon:leppa_berry", "cobblemon:figy_berry": "cobblemon:touga_berry" @@ -163,7 +167,7 @@ "sproutShape": "tall-sprout", "matureShape": "tall-mature", "flavors": { - "SPICY": 10, + "SPICY": 20, "DRY": 10 }, "weight": 15.0, @@ -171,5 +175,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:razz_berry.geo", - "fruitTexture": "cobblemon:razz" + "fruitTexture": "cobblemon:razz", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/rindo_berry.json b/common/src/main/resources/data/cobblemon/berries/rindo_berry.json index fc90af9a9d..04337ada0c 100644 --- a/common/src/main/resources/data/cobblemon/berries/rindo_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/rindo_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -9,27 +9,19 @@ "cobblemon:is_lush" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "humid", "loamy", "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -136,6 +128,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:cornn_berry": "cobblemon:kelpsy_berry" @@ -151,5 +155,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:rindo_berry.geo", - "fruitTexture": "cobblemon:rindo" + "fruitTexture": "cobblemon:rindo", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/roseli_berry.json b/common/src/main/resources/data/cobblemon/berries/roseli_berry.json index 0dbab9db88..84a1b09b95 100644 --- a/common/src/main/resources/data/cobblemon/berries/roseli_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/roseli_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -10,26 +10,18 @@ "cobblemon:is_mushroom" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "loamy", "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -130,6 +122,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:magost_berry": "cobblemon:qualot_berry" @@ -145,5 +149,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:roseli_berry.geo", - "fruitTexture": "cobblemon:roseli" + "fruitTexture": "cobblemon:roseli", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/rowap_berry.json b/common/src/main/resources/data/cobblemon/berries/rowap_berry.json index b4f1fa363b..fef545cd12 100644 --- a/common/src/main/resources/data/cobblemon/berries/rowap_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/rowap_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_mountain", "cobblemon:is_taiga" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 27, + "max": 33 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -79,6 +71,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "volcano-sprout", "matureShape": "volcano-mature", @@ -91,5 +95,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:rowap_berry.geo", - "fruitTexture": "cobblemon:rowap" + "fruitTexture": "cobblemon:rowap", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/salac_berry.json b/common/src/main/resources/data/cobblemon/berries/salac_berry.json index 88356470e6..0e7881b397 100644 --- a/common/src/main/resources/data/cobblemon/berries/salac_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/salac_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_arid" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 18, - "max": 28 + "min": 27, + "max": 33 }, "favoriteMulches": [ "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -102,9 +94,21 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, - "sproutShape": "stand-sprout", - "matureShape": "stand-mature", + "sproutShape": "tall-sprout", + "matureShape": "tall-mature", "flavors": { "SWEET": 30, "BITTER": 10, @@ -115,5 +119,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:salac_berry.geo", - "fruitTexture": "cobblemon:salac" + "fruitTexture": "cobblemon:salac", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/shuca_berry.json b/common/src/main/resources/data/cobblemon/berries/shuca_berry.json index 51433fd1c0..951837d45e 100644 --- a/common/src/main/resources/data/cobblemon/berries/shuca_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/shuca_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -8,26 +8,18 @@ "cobblemon:is_grassland" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "loamy", "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -134,6 +126,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:rabuta_berry": "cobblemon:hondew_berry" @@ -149,5 +153,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:shuca_berry.geo", - "fruitTexture": "cobblemon:shuca" + "fruitTexture": "cobblemon:shuca", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/sitrus_berry.json b/common/src/main/resources/data/cobblemon/berries/sitrus_berry.json index 818c496b7a..1b8e6cac2c 100644 --- a/common/src/main/resources/data/cobblemon/berries/sitrus_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/sitrus_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -8,25 +8,17 @@ "cobblemon:is_taiga" ], "growthTime": { - "min": 75, - "max": 85 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 17, + "min": 23, "max": 27 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -151,6 +143,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:haban_berry": "cobblemon:pomeg_berry" }, @@ -168,5 +172,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:sitrus_berry.geo", - "fruitTexture": "cobblemon:sitrus" + "fruitTexture": "cobblemon:sitrus", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/spelon_berry.json b/common/src/main/resources/data/cobblemon/berries/spelon_berry.json index f75b246044..139d380099 100644 --- a/common/src/main/resources/data/cobblemon/berries/spelon_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/spelon_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 2 }, "preferredBiomeTags": [ "cobblemon:is_arid" ], "growthTime": { - "min": 75, - "max": 85 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 25, + "max": 29 }, "favoriteMulches": [ "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -126,6 +118,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:tamato_berry": "cobblemon:salac_berry", "cobblemon:chople_berry": "cobblemon:lansat_berry" @@ -133,7 +137,7 @@ "sproutShape": "blossom-sprout", "matureShape": "blossom-mature", "flavors": { - "SPICY": 30, + "SPICY": 40, "DRY": 10 }, "weight": 1.0, @@ -141,5 +145,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:spelon_berry.geo", - "fruitTexture": "cobblemon:spelon" + "fruitTexture": "cobblemon:spelon", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/starf_berry.json b/common/src/main/resources/data/cobblemon/berries/starf_berry.json index 826fab7060..546ba7f381 100644 --- a/common/src/main/resources/data/cobblemon/berries/starf_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/starf_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 1 }, "preferredBiomeTags": [ "cobblemon:is_plains" ], "growthTime": { - "min": 75, - "max": 85 + "min": 54, + "max": 66 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 27, + "max": 33 }, "favoriteMulches": [ "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -102,14 +94,26 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": {}, "sproutShape": "short-sprout", "matureShape": "short-mature", "flavors": { "SPICY": 30, - "DRY": 10, + "DRY": 30, "SWEET": 30, - "BITTER": 10, + "BITTER": 30, "SOUR": 30 }, "weight": 1.0, @@ -117,5 +121,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:starf_berry.geo", - "fruitTexture": "cobblemon:starf" + "fruitTexture": "cobblemon:starf", + "boneMealChance": 0.24 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/tamato_berry.json b/common/src/main/resources/data/cobblemon/berries/tamato_berry.json index 0bd75ea370..94193325f6 100644 --- a/common/src/main/resources/data/cobblemon/berries/tamato_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/tamato_berry.json @@ -7,25 +7,17 @@ "cobblemon:is_plains" ], "growthTime": { - "min": 95, - "max": 105 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 20, - "max": 30 + "min": 25, + "max": 29 }, "favoriteMulches": [ "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -150,6 +142,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:spelon_berry": "cobblemon:salac_berry", "cobblemon:pomeg_berry": "cobblemon:starf_berry" @@ -157,13 +161,16 @@ "sproutShape": "box-sprout", "matureShape": "box-mature", "flavors": { - "SPICY": 20, - "DRY": 10 + "SPICY": 25, + "DRY": 15, + "BITTER": 10, + "SOUR": 10 }, "weight": 1.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:tamato_berry.geo", - "fruitTexture": "cobblemon:tamato" + "fruitTexture": "cobblemon:tamato", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/tanga_berry.json b/common/src/main/resources/data/cobblemon/berries/tanga_berry.json index 9cbe6db12b..8b8510fcf8 100644 --- a/common/src/main/resources/data/cobblemon/berries/tanga_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/tanga_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -9,26 +9,18 @@ "cobblemon:is_swamp" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "humid", "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -135,6 +127,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 4.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:magost_berry": "cobblemon:watmel_berry" @@ -150,5 +154,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:tanga_berry.geo", - "fruitTexture": "cobblemon:tanga" + "fruitTexture": "cobblemon:tanga", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/touga_berry.json b/common/src/main/resources/data/cobblemon/berries/touga_berry.json index a11f3e5478..aff1629d67 100644 --- a/common/src/main/resources/data/cobblemon/berries/touga_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/touga_berry.json @@ -1,31 +1,23 @@ { "baseYield": { - "min": 2, - "max": 4 + "min": 1, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_forest" ], "growthTime": { - "min": 55, - "max": 65 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 23, + "max": 27 }, "favoriteMulches": [ "peat" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -80,7 +72,7 @@ { "position": { "x": 8.0, - "y": 0, + "y": 0.0, "z": 8.0 }, "rotation": { @@ -92,7 +84,7 @@ { "position": { "x": 8.0, - "y": 0, + "y": 0.0, "z": 8.0 }, "rotation": { @@ -104,7 +96,7 @@ { "position": { "x": 8.0, - "y": 0, + "y": 0.0, "z": 7.75 }, "rotation": { @@ -150,6 +142,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:occa_berry": "cobblemon:tamato_berry", "cobblemon:colbur_berry": "cobblemon:spelon_berry" @@ -157,12 +161,14 @@ "sproutShape": "blossom-sprout", "matureShape": "blossom-mature", "flavors": { - "SPICY": 40 + "SPICY": 30, + "DRY": 10 }, "weight": 1.0, "tintIndexes": [], "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:touga_berry.geo", - "fruitTexture": "cobblemon:touga" + "fruitTexture": "cobblemon:touga", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/wacan_berry.json b/common/src/main/resources/data/cobblemon/berries/wacan_berry.json index 3e180cbd5a..fa6357388c 100644 --- a/common/src/main/resources/data/cobblemon/berries/wacan_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/wacan_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -9,27 +9,19 @@ "cobblemon:is_sky" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "coarse", "loamy", "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -148,6 +140,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.2, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:enigma_berry": "cobblemon:maranga_berry" @@ -163,5 +167,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:wacan_berry.geo", - "fruitTexture": "cobblemon:wacan" + "fruitTexture": "cobblemon:wacan", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/watmel_berry.json b/common/src/main/resources/data/cobblemon/berries/watmel_berry.json index 3294dcc143..4e7f167d6a 100644 --- a/common/src/main/resources/data/cobblemon/berries/watmel_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/watmel_berry.json @@ -1,32 +1,24 @@ { "baseYield": { "min": 1, - "max": 3 + "max": 2 }, "preferredBiomeTags": [ "cobblemon:is_jungle", "cobblemon:is_swamp" ], "growthTime": { - "min": 75, - "max": 85 + "min": 50, + "max": 60 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 25, + "max": 29 }, "favoriteMulches": [ "humid" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 1 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -79,6 +71,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.25, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:qualot_berry": "cobblemon:ganlon_berry", "cobblemon:chilan_berry": "cobblemon:custap_berry" @@ -94,5 +98,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:watmel_berry.geo", - "fruitTexture": "cobblemon:watmel" + "fruitTexture": "cobblemon:watmel", + "boneMealChance": 0.32 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/wepear_berry.json b/common/src/main/resources/data/cobblemon/berries/wepear_berry.json index 6be234279b..04e4d70d0c 100644 --- a/common/src/main/resources/data/cobblemon/berries/wepear_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/wepear_berry.json @@ -1,31 +1,23 @@ { "baseYield": { - "min": 3, - "max": 6 + "min": 2, + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_plains" ], "growthTime": { - "min": 45, - "max": 55 + "min": 36, + "max": 44 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 18, + "max": 22 }, "favoriteMulches": [ "loamy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [ { @@ -156,6 +148,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.75, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:oran_berry": "cobblemon:leppa_berry", "cobblemon:aguav_berry": "cobblemon:rabuta_berry" @@ -163,7 +167,7 @@ "sproutShape": "pyramid-sprout", "matureShape": "pyramid-mature", "flavors": { - "BITTER": 10, + "BITTER": 20, "SOUR": 10 }, "weight": 15.0, @@ -171,5 +175,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:wepear_berry.geo", - "fruitTexture": "cobblemon:wepear" + "fruitTexture": "cobblemon:wepear", + "boneMealChance": 0.56 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/wiki_berry.json b/common/src/main/resources/data/cobblemon/berries/wiki_berry.json index 5e8409375f..70012dc299 100644 --- a/common/src/main/resources/data/cobblemon/berries/wiki_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/wiki_berry.json @@ -1,31 +1,23 @@ { "baseYield": { "min": 2, - "max": 4 + "max": 3 }, "preferredBiomeTags": [ "cobblemon:is_arid" ], "growthTime": { - "min": 55, - "max": 65 + "min": 41, + "max": 49 }, "refreshRate": { - "min": 15, - "max": 25 + "min": 20, + "max": 24 }, "favoriteMulches": [ "sandy" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], + "growthFactors": [], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -102,6 +94,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 2.5, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:lum_berry": "cobblemon:sitrus_berry", "cobblemon:bluk_berry": "cobblemon:cornn_berry" @@ -116,5 +120,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:wiki_berry.geo", - "fruitTexture": "cobblemon:wiki" + "fruitTexture": "cobblemon:wiki", + "boneMealChance": 0.48 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/berries/yache_berry.json b/common/src/main/resources/data/cobblemon/berries/yache_berry.json index bbe0b0cb38..b323956660 100644 --- a/common/src/main/resources/data/cobblemon/berries/yache_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/yache_berry.json @@ -1,6 +1,6 @@ { "baseYield": { - "min": 2, + "min": 1, "max": 3 }, "preferredBiomeTags": [ @@ -8,26 +8,18 @@ "cobblemon:is_taiga" ], "growthTime": { - "min": 50, - "max": 60 + "min": 45, + "max": 55 }, "refreshRate": { - "min": 16, - "max": 26 + "min": 23, + "max": 27 }, "favoriteMulches": [ "coarse" ], - "growthFactors": [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": 1, - "max": 2 - } - } - ], - "randomizedGrowthPoints": false, + "growthFactors": [], + "randomizedGrowthPoints": true, "spawnConditions": [ { "variant": "cobblemon:preferred_biome", @@ -157,6 +149,18 @@ } } ], + "stageOnePositioning": { + "position": { + "x": 8.15, + "y": 3.0, + "z": 8.1 + }, + "rotation": { + "x": 5.0, + "y": -10.0, + "z": -7.5 + } + }, "mutations": { "cobblemon:hopo_berry": "cobblemon:enigma_berry", "cobblemon:nomel_berry": "cobblemon:grepa_berry" @@ -172,5 +176,6 @@ "flowerModel": "cobblemon:flower.geo", "flowerTexture": "cobblemon:flower", "fruitModel": "cobblemon:yache_berry.geo", - "fruitTexture": "cobblemon:yache" + "fruitTexture": "cobblemon:yache", + "boneMealChance": 0.4 } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_brick_slab.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_brick_slab.json new file mode 100644 index 0000000000..bf25e160db --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "cobblemon:black_tumblestone_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "cobblemon:black_tumblestone_brick_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_brick_stairs.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..d125ce6f7d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_brick_stairs.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:black_tumblestone_brick_stairs" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_brick_wall.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_brick_wall.json new file mode 100644 index 0000000000..86dd11282e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_brick_wall.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:black_tumblestone_brick_wall" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_bricks.json new file mode 100644 index 0000000000..49786c1a00 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/black_tumblestone_bricks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:black_tumblestone_bricks" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_black_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_black_tumblestone_bricks.json new file mode 100644 index 0000000000..c17cd5e4d0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_black_tumblestone_bricks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:chiseled_black_tumblestone_bricks" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_polished_black_tumblestone.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_polished_black_tumblestone.json new file mode 100644 index 0000000000..9f0df6b98a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_polished_black_tumblestone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:chiseled_polished_black_tumblestone" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_polished_sky_tumblestone.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_polished_sky_tumblestone.json new file mode 100644 index 0000000000..7e02cfdce0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_polished_sky_tumblestone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:chiseled_polished_sky_tumblestone" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_polished_tumblestone.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_polished_tumblestone.json new file mode 100644 index 0000000000..19f6f55a9a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_polished_tumblestone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:chiseled_polished_tumblestone" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_sky_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_sky_tumblestone_bricks.json new file mode 100644 index 0000000000..1ab49f237d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_sky_tumblestone_bricks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:chiseled_sky_tumblestone_bricks" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_tumblestone_bricks.json new file mode 100644 index 0000000000..4092e21fb1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/chiseled_tumblestone_bricks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:chiseled_tumblestone_bricks" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone.json new file mode 100644 index 0000000000..9184cae6f6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:polished_black_tumblestone" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone_slab.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone_slab.json new file mode 100644 index 0000000000..5c8579bdc9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "cobblemon:polished_black_tumblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "cobblemon:polished_black_tumblestone_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone_stairs.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone_stairs.json new file mode 100644 index 0000000000..685a91224f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone_stairs.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:polished_black_tumblestone_stairs" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone_wall.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone_wall.json new file mode 100644 index 0000000000..ea9a55189b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_black_tumblestone_wall.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:polished_black_tumblestone_wall" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone.json new file mode 100644 index 0000000000..49bee571e8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:polished_sky_tumblestone" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone_slab.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone_slab.json new file mode 100644 index 0000000000..e851e79197 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "cobblemon:polished_sky_tumblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "cobblemon:polished_sky_tumblestone_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone_stairs.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone_stairs.json new file mode 100644 index 0000000000..a836a969e6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone_stairs.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:polished_sky_tumblestone_stairs" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone_wall.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone_wall.json new file mode 100644 index 0000000000..42970c7412 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_sky_tumblestone_wall.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:polished_sky_tumblestone_wall" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone.json new file mode 100644 index 0000000000..0465aeb026 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:polished_tumblestone" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone_slab.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone_slab.json new file mode 100644 index 0000000000..47d53174fe --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "cobblemon:polished_tumblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "cobblemon:polished_tumblestone_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone_stairs.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone_stairs.json new file mode 100644 index 0000000000..0ee2ed68ea --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone_stairs.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:polished_tumblestone_stairs" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone_wall.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone_wall.json new file mode 100644 index 0000000000..0e2d0ab281 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/polished_tumblestone_wall.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:polished_tumblestone_wall" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_brick_slab.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_brick_slab.json new file mode 100644 index 0000000000..cf3726440a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "cobblemon:sky_tumblestone_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "cobblemon:sky_tumblestone_brick_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_brick_stairs.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..6e323a88b1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_brick_stairs.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:sky_tumblestone_brick_stairs" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_brick_wall.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_brick_wall.json new file mode 100644 index 0000000000..646d909f10 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_brick_wall.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:sky_tumblestone_brick_wall" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_bricks.json new file mode 100644 index 0000000000..2ea218e5c1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/sky_tumblestone_bricks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:sky_tumblestone_bricks" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_brick_slab.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_brick_slab.json new file mode 100644 index 0000000000..202f8480f7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "cobblemon:tumblestone_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "cobblemon:tumblestone_brick_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_brick_stairs.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_brick_stairs.json new file mode 100644 index 0000000000..b5a8a263c0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_brick_stairs.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:tumblestone_brick_stairs" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_brick_wall.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_brick_wall.json new file mode 100644 index 0000000000..018be6d35d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_brick_wall.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:tumblestone_brick_wall" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_bricks.json new file mode 100644 index 0000000000..1c3f9b3c3b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_tables/blocks/tumblestone_bricks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "cobblemon:tumblestone_bricks" + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_tables/fossils/common/prehistoric_preserved_skeleton.json b/common/src/main/resources/data/cobblemon/loot_tables/fossils/common/prehistoric_preserved_skeleton.json index b6536e37c2..5808619873 100644 --- a/common/src/main/resources/data/cobblemon/loot_tables/fossils/common/prehistoric_preserved_skeleton.json +++ b/common/src/main/resources/data/cobblemon/loot_tables/fossils/common/prehistoric_preserved_skeleton.json @@ -29,11 +29,6 @@ "name": "minecraft:coal", "weight": 6 }, - { - "type": "minecraft:item", - "name": "minecraft:bone", - "weight": 6 - }, { "type": "minecraft:item", "name": "cobblemon:big_root", diff --git a/common/src/main/resources/data/cobblemon/natural_materials/vanilla.json b/common/src/main/resources/data/cobblemon/natural_materials/vanilla.json index a5717dcee4..eeb6a62533 100644 --- a/common/src/main/resources/data/cobblemon/natural_materials/vanilla.json +++ b/common/src/main/resources/data/cobblemon/natural_materials/vanilla.json @@ -354,12 +354,56 @@ }, { "content": 8, - "tag": "#minecraft:corals" + "item": "minecraft:tube_coral" + }, + { + "content": 8, + "item": "minecraft:brain_coral" + }, + { + "content": 8, + "item": "minecraft:bubble_coral" + }, + { + "content": 8, + "item": "minecraft:fire_coral" + }, + { + "content": 8, + "item": "minecraft:horn_coral" + }, + { + "content": 8, + "item": "minecraft:tube_coral_fan" + }, + { + "content": 8, + "item": "minecraft:brain_coral_fan" + }, + { + "content": 8, + "item": "minecraft:bubble_coral_fan" + }, + { + "content": 8, + "item": "minecraft:fire_coral_fan" + }, + { + "content": 8, + "item": "minecraft:horn_coral_fan" }, { "content": 4, "tag": "#minecraft:mushrooms" }, + { + "content": 4, + "item": "minecraft:brown_mushroom" + }, + { + "content": 4, + "item": "minecraft:red_mushroom" + }, { "content": 16, "item": "minecraft:cake" @@ -483,5 +527,21 @@ { "content": 256, "item": "minecraft:dragon_egg" + }, + { + "content": 8, + "item": "minecraft:dried_kelp_block" + }, + { + "content": 8, + "item": "minecraft:melon" + }, + { + "content": 2, + "item": "minecraft:vine" + }, + { + "content": 4, + "item": "minecraft:sea_pickle" } ] \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab.json new file mode 100644 index 0000000000..4fa34c4820 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:black_tumblestone_bricks" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:black_tumblestone_brick_slab" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..88fc7aa166 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_block" + }, + "result": "cobblemon:black_tumblestone_brick_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab_from_black_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab_from_black_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..ae2f9d9634 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab_from_black_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_bricks" + }, + "result": "cobblemon:black_tumblestone_brick_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..6762ba6582 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_slab_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_black_tumblestone" + }, + "result": "cobblemon:black_tumblestone_brick_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..d9b5d80264 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:black_tumblestone_bricks" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "cobblemon:black_tumblestone_brick_stairs" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..f9432f5d4b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_block" + }, + "result": "cobblemon:black_tumblestone_brick_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs_from_black_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs_from_black_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..a2be9e6680 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs_from_black_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_bricks" + }, + "result": "cobblemon:black_tumblestone_brick_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..5d104fd6e8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_stairs_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_black_tumblestone" + }, + "result": "cobblemon:black_tumblestone_brick_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall.json new file mode 100644 index 0000000000..c5a6e0da37 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "cobblemon:black_tumblestone_bricks" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:black_tumblestone_brick_wall" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..c130cb1eee --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_block" + }, + "result": "cobblemon:black_tumblestone_brick_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall_from_black_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall_from_black_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..09b1e0be25 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall_from_black_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_bricks" + }, + "result": "cobblemon:black_tumblestone_brick_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..4ab24924f5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_brick_wall_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_black_tumblestone" + }, + "result": "cobblemon:black_tumblestone_brick_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_bricks.json new file mode 100644 index 0000000000..75af23709c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "cobblemon:polished_black_tumblestone" + } + }, + "result": { + "item": "cobblemon:black_tumblestone_bricks", + "count": 4 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..dff67446b7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_block" + }, + "result": "cobblemon:black_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..0b3c8917f3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/black_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_black_tumblestone" + }, + "result": "cobblemon:black_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks.json new file mode 100644 index 0000000000..b8e05c197c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:black_tumblestone_brick_slab" + } + }, + "pattern": [ + "#", + "#" + ], + "result": { + "count": 1, + "item": "cobblemon:chiseled_black_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..de634319fb --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_block" + }, + "result": "cobblemon:chiseled_black_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks_from_black_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks_from_black_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..e07daaad64 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks_from_black_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_bricks" + }, + "result": "cobblemon:chiseled_black_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..a00ff82988 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_black_tumblestone_bricks_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_black_tumblestone" + }, + "result": "cobblemon:chiseled_black_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_black_tumblestone.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_black_tumblestone.json new file mode 100644 index 0000000000..8d4110eb6b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_black_tumblestone.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:polished_black_tumblestone_slab" + } + }, + "pattern": [ + "#", + "#" + ], + "result": { + "count": 1, + "item": "cobblemon:chiseled_polished_black_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_black_tumblestone_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_black_tumblestone_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..09bea54b07 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_black_tumblestone_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_block" + }, + "result": "cobblemon:chiseled_polished_black_tumblestone", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_black_tumblestone_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_black_tumblestone_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..80363d54d1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_black_tumblestone_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_black_tumblestone" + }, + "result": "cobblemon:chiseled_polished_black_tumblestone", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_sky_tumblestone.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_sky_tumblestone.json new file mode 100644 index 0000000000..9bae6927db --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_sky_tumblestone.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:polished_sky_tumblestone_slab" + } + }, + "pattern": [ + "#", + "#" + ], + "result": { + "count": 1, + "item": "cobblemon:chiseled_polished_sky_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_sky_tumblestone_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_sky_tumblestone_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..d54959a59b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_sky_tumblestone_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_sky_tumblestone" + }, + "result": "cobblemon:chiseled_polished_sky_tumblestone", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_sky_tumblestone_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_sky_tumblestone_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..0ea990a6c2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_sky_tumblestone_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_block" + }, + "result": "cobblemon:chiseled_polished_sky_tumblestone", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_tumblestone.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_tumblestone.json new file mode 100644 index 0000000000..416fa94496 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_tumblestone.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:polished_tumblestone_slab" + } + }, + "pattern": [ + "#", + "#" + ], + "result": { + "count": 1, + "item": "cobblemon:chiseled_polished_tumblestone" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_tumblestone_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_tumblestone_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..5483ad6d15 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_tumblestone_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_tumblestone" + }, + "result": "cobblemon:chiseled_polished_tumblestone", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_tumblestone_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_tumblestone_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..234f07f6be --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_polished_tumblestone_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_block" + }, + "result": "cobblemon:chiseled_polished_tumblestone", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks.json new file mode 100644 index 0000000000..76d72c87b2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:sky_tumblestone_brick_slab" + } + }, + "pattern": [ + "#", + "#" + ], + "result": { + "count": 1, + "item": "cobblemon:chiseled_sky_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..9ca862ff11 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_sky_tumblestone" + }, + "result": "cobblemon:chiseled_sky_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..70129a8f87 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_block" + }, + "result": "cobblemon:chiseled_sky_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..3d76e596f6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_sky_tumblestone_bricks_from_sky_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_bricks" + }, + "result": "cobblemon:chiseled_sky_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks.json new file mode 100644 index 0000000000..e69b8abdf3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:tumblestone_brick_slab" + } + }, + "pattern": [ + "#", + "#" + ], + "result": { + "count": 1, + "item": "cobblemon:chiseled_tumblestone_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..94f492e6ab --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_tumblestone" + }, + "result": "cobblemon:chiseled_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..02fdd83a6c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_block" + }, + "result": "cobblemon:chiseled_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks_from_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks_from_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..220e005247 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/chiseled_tumblestone_bricks_from_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_bricks" + }, + "result": "cobblemon:chiseled_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/coarse_mulch.json b/common/src/main/resources/data/cobblemon/recipes/coarse_mulch.json index 9b8515fdb8..b685e27ffb 100644 --- a/common/src/main/resources/data/cobblemon/recipes/coarse_mulch.json +++ b/common/src/main/resources/data/cobblemon/recipes/coarse_mulch.json @@ -1,12 +1,6 @@ { "type": "minecraft:crafting_shapeless", "ingredients": [ - { - "item": "minecraft:coarse_dirt" - }, - { - "item": "minecraft:coarse_dirt" - }, { "item": "minecraft:coarse_dirt" }, diff --git a/common/src/main/resources/data/cobblemon/recipes/growth_mulch.json b/common/src/main/resources/data/cobblemon/recipes/growth_mulch.json index 67b103676e..1edb6ae64d 100644 --- a/common/src/main/resources/data/cobblemon/recipes/growth_mulch.json +++ b/common/src/main/resources/data/cobblemon/recipes/growth_mulch.json @@ -1,12 +1,6 @@ { "type": "minecraft:crafting_shapeless", "ingredients": [ - { - "item": "minecraft:bone_meal" - }, - { - "item": "minecraft:bone_meal" - }, { "item": "minecraft:bone_meal" }, diff --git a/common/src/main/resources/data/cobblemon/recipes/humid_mulch.json b/common/src/main/resources/data/cobblemon/recipes/humid_mulch.json index 9b67a5d7a2..52c73cb535 100644 --- a/common/src/main/resources/data/cobblemon/recipes/humid_mulch.json +++ b/common/src/main/resources/data/cobblemon/recipes/humid_mulch.json @@ -1,12 +1,6 @@ { "type": "minecraft:crafting_shapeless", "ingredients": [ - { - "item": "minecraft:mud" - }, - { - "item": "minecraft:mud" - }, { "item": "minecraft:mud" }, diff --git a/common/src/main/resources/data/cobblemon/recipes/loamy_mulch.json b/common/src/main/resources/data/cobblemon/recipes/loamy_mulch.json index 619e31fbf8..985360de33 100644 --- a/common/src/main/resources/data/cobblemon/recipes/loamy_mulch.json +++ b/common/src/main/resources/data/cobblemon/recipes/loamy_mulch.json @@ -1,12 +1,6 @@ { "type": "minecraft:crafting_shapeless", "ingredients": [ - { - "item": "minecraft:dirt" - }, - { - "item": "minecraft:dirt" - }, { "item": "minecraft:dirt" }, diff --git a/common/src/main/resources/data/cobblemon/recipes/mulch_base.json b/common/src/main/resources/data/cobblemon/recipes/mulch_base.json index 281ae42350..6f35bd31e9 100644 --- a/common/src/main/resources/data/cobblemon/recipes/mulch_base.json +++ b/common/src/main/resources/data/cobblemon/recipes/mulch_base.json @@ -15,6 +15,7 @@ } ], "result": { - "item": "cobblemon:mulch_base" + "item": "cobblemon:mulch_base", + "count": 3 } } diff --git a/common/src/main/resources/data/cobblemon/recipes/peat_mulch.json b/common/src/main/resources/data/cobblemon/recipes/peat_mulch.json index dd95b3d161..40c2784020 100644 --- a/common/src/main/resources/data/cobblemon/recipes/peat_mulch.json +++ b/common/src/main/resources/data/cobblemon/recipes/peat_mulch.json @@ -1,12 +1,6 @@ { "type": "minecraft:crafting_shapeless", "ingredients": [ - { - "item": "minecraft:moss_block" - }, - { - "item": "minecraft:moss_block" - }, { "item": "minecraft:moss_block" }, diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone.json new file mode 100644 index 0000000000..75d3bca1ae --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "cobblemon:black_tumblestone_block" + } + }, + "result": { + "item": "cobblemon:polished_black_tumblestone", + "count": 4 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..da95f5d7a4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_block" + }, + "result": "cobblemon:polished_black_tumblestone", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_slab.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_slab.json new file mode 100644 index 0000000000..a1eaadd3ae --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:polished_black_tumblestone" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:polished_black_tumblestone_slab" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_slab_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_slab_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..74e6876c88 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_slab_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_block" + }, + "result": "cobblemon:polished_black_tumblestone_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_slab_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_slab_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..b972ca1978 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_slab_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_black_tumblestone" + }, + "result": "cobblemon:polished_black_tumblestone_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_stairs.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_stairs.json new file mode 100644 index 0000000000..7fd74a6749 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:polished_black_tumblestone" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "cobblemon:polished_black_tumblestone_stairs" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_stairs_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_stairs_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..f912417adc --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_stairs_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_block" + }, + "result": "cobblemon:polished_black_tumblestone_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_stairs_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_stairs_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..c88298eeda --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_stairs_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_black_tumblestone" + }, + "result": "cobblemon:polished_black_tumblestone_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_wall.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_wall.json new file mode 100644 index 0000000000..9545774555 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_wall.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "cobblemon:polished_black_tumblestone" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:polished_black_tumblestone_wall" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_wall_from_black_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_wall_from_black_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..7ef9f8af5f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_wall_from_black_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:black_tumblestone_block" + }, + "result": "cobblemon:polished_black_tumblestone_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_wall_from_polished_black_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_wall_from_polished_black_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..431e59875a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_black_tumblestone_wall_from_polished_black_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_black_tumblestone" + }, + "result": "cobblemon:polished_black_tumblestone_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone.json new file mode 100644 index 0000000000..644b931610 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "cobblemon:sky_tumblestone_block" + } + }, + "result": { + "item": "cobblemon:polished_sky_tumblestone", + "count": 4 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..b951e62b42 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_block" + }, + "result": "cobblemon:polished_sky_tumblestone", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_slab.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_slab.json new file mode 100644 index 0000000000..9e316a3812 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:polished_sky_tumblestone" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:polished_sky_tumblestone_slab" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_slab_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_slab_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..16368a7eba --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_slab_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_sky_tumblestone" + }, + "result": "cobblemon:polished_sky_tumblestone_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_slab_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_slab_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..67adddcc13 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_slab_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_block" + }, + "result": "cobblemon:polished_sky_tumblestone_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_stairs.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_stairs.json new file mode 100644 index 0000000000..211809485a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:polished_sky_tumblestone" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "cobblemon:polished_sky_tumblestone_stairs" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_stairs_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_stairs_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..a08efe72df --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_stairs_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_sky_tumblestone" + }, + "result": "cobblemon:polished_sky_tumblestone_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_stairs_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_stairs_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..d85820014f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_stairs_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_block" + }, + "result": "cobblemon:polished_sky_tumblestone_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_wall.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_wall.json new file mode 100644 index 0000000000..940e488055 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_wall.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "cobblemon:polished_sky_tumblestone" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:polished_sky_tumblestone_wall" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_wall_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_wall_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..e90e7cd651 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_wall_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_sky_tumblestone" + }, + "result": "cobblemon:polished_sky_tumblestone_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_wall_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_wall_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..bf95e9f85f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_sky_tumblestone_wall_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_block" + }, + "result": "cobblemon:polished_sky_tumblestone_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone.json new file mode 100644 index 0000000000..e01a1e959e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "cobblemon:tumblestone_block" + } + }, + "result": { + "item": "cobblemon:polished_tumblestone", + "count": 4 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..bc01553095 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_block" + }, + "result": "cobblemon:polished_tumblestone", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_slab.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_slab.json new file mode 100644 index 0000000000..12642af827 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:polished_tumblestone" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:polished_tumblestone_slab" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_slab_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_slab_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..22e68a7188 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_slab_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_tumblestone" + }, + "result": "cobblemon:polished_tumblestone_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_slab_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_slab_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..071caade56 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_slab_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_block" + }, + "result": "cobblemon:polished_tumblestone_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_stairs.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_stairs.json new file mode 100644 index 0000000000..134dfd53bf --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:polished_tumblestone" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "cobblemon:polished_tumblestone_stairs" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_stairs_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_stairs_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..eae3ea2b41 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_stairs_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_tumblestone" + }, + "result": "cobblemon:polished_tumblestone_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_stairs_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_stairs_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..a9ef3ea0f3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_stairs_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_block" + }, + "result": "cobblemon:polished_tumblestone_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_wall.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_wall.json new file mode 100644 index 0000000000..e9a37f512e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_wall.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "cobblemon:polished_tumblestone" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:polished_tumblestone_wall" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_wall_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_wall_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..f79f6a02ae --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_wall_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_tumblestone" + }, + "result": "cobblemon:polished_tumblestone_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_wall_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_wall_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..9bbdc0693d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/polished_tumblestone_wall_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_block" + }, + "result": "cobblemon:polished_tumblestone_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/rich_mulch.json b/common/src/main/resources/data/cobblemon/recipes/rich_mulch.json index 44a7f463a6..2020942edd 100644 --- a/common/src/main/resources/data/cobblemon/recipes/rich_mulch.json +++ b/common/src/main/resources/data/cobblemon/recipes/rich_mulch.json @@ -1,12 +1,6 @@ { "type": "minecraft:crafting_shapeless", "ingredients": [ - { - "item": "minecraft:blaze_powder" - }, - { - "item": "minecraft:blaze_powder" - }, { "item": "minecraft:blaze_powder" }, diff --git a/common/src/main/resources/data/cobblemon/recipes/sandy_mulch.json b/common/src/main/resources/data/cobblemon/recipes/sandy_mulch.json index d06fd382e9..33f1eb694c 100644 --- a/common/src/main/resources/data/cobblemon/recipes/sandy_mulch.json +++ b/common/src/main/resources/data/cobblemon/recipes/sandy_mulch.json @@ -1,12 +1,6 @@ { "type": "minecraft:crafting_shapeless", "ingredients": [ - { - "item": "minecraft:sand" - }, - { - "item": "minecraft:sand" - }, { "item": "minecraft:sand" }, diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab.json new file mode 100644 index 0000000000..465883479e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:sky_tumblestone_bricks" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:sky_tumblestone_brick_slab" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..050779ef0d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_sky_tumblestone" + }, + "result": "cobblemon:sky_tumblestone_brick_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..df0d1712a7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_block" + }, + "result": "cobblemon:sky_tumblestone_brick_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab_from_sky_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab_from_sky_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..af67f0cd05 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_slab_from_sky_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_bricks" + }, + "result": "cobblemon:sky_tumblestone_brick_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs.json new file mode 100644 index 0000000000..8192ef9eb9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:sky_tumblestone_bricks" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "cobblemon:sky_tumblestone_brick_stairs" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..34cbc82ec2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_sky_tumblestone" + }, + "result": "cobblemon:sky_tumblestone_brick_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..bad409e274 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_block" + }, + "result": "cobblemon:sky_tumblestone_brick_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs_from_sky_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs_from_sky_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..4280e33ce5 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_stairs_from_sky_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_bricks" + }, + "result": "cobblemon:sky_tumblestone_brick_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall.json new file mode 100644 index 0000000000..172ab47410 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "cobblemon:sky_tumblestone_bricks" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:sky_tumblestone_brick_wall" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall_from_polished_sky_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall_from_polished_sky_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..aad71f2c04 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall_from_polished_sky_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_sky_tumblestone" + }, + "result": "cobblemon:sky_tumblestone_brick_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..564d309e5a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_block" + }, + "result": "cobblemon:sky_tumblestone_brick_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall_from_sky_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall_from_sky_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..02bd83313d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_brick_wall_from_sky_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_bricks" + }, + "result": "cobblemon:sky_tumblestone_brick_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_bricks.json new file mode 100644 index 0000000000..b9b07811fd --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "cobblemon:polished_sky_tumblestone" + } + }, + "result": { + "item": "cobblemon:sky_tumblestone_bricks", + "count": 4 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..242349ed27 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_bricks_from_sky_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:sky_tumblestone_block" + }, + "result": "cobblemon:sky_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..e4b12365e2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/sky_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_sky_tumblestone" + }, + "result": "cobblemon:sky_tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/surprise_mulch.json b/common/src/main/resources/data/cobblemon/recipes/surprise_mulch.json index 41ac9fe7b2..32d25c56ef 100644 --- a/common/src/main/resources/data/cobblemon/recipes/surprise_mulch.json +++ b/common/src/main/resources/data/cobblemon/recipes/surprise_mulch.json @@ -1,12 +1,6 @@ { "type": "minecraft:crafting_shapeless", "ingredients": [ - { - "item": "minecraft:glistering_melon_slice" - }, - { - "item": "minecraft:glistering_melon_slice" - }, { "item": "minecraft:glistering_melon_slice" }, diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab.json new file mode 100644 index 0000000000..b797c6f7dc --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:tumblestone_bricks" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:tumblestone_brick_slab" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..0d78a1e7d4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_tumblestone" + }, + "result": "cobblemon:tumblestone_brick_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..ac2a9703e1 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_block" + }, + "result": "cobblemon:tumblestone_brick_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab_from_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab_from_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..3c0d8d5bf6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_slab_from_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_bricks" + }, + "result": "cobblemon:tumblestone_brick_slab", + "count": 2 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs.json new file mode 100644 index 0000000000..56e0bb4057 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "cobblemon:tumblestone_bricks" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "cobblemon:tumblestone_brick_stairs" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..c3c75f0dcd --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_tumblestone" + }, + "result": "cobblemon:tumblestone_brick_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..e9063c085c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_block" + }, + "result": "cobblemon:tumblestone_brick_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs_from_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs_from_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..40248d1bbf --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_stairs_from_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_bricks" + }, + "result": "cobblemon:tumblestone_brick_stairs", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall.json new file mode 100644 index 0000000000..436da6eeba --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "cobblemon:tumblestone_bricks" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "item": "cobblemon:tumblestone_brick_wall" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall_from_polished_tumblestone_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall_from_polished_tumblestone_in_stonecutter.json new file mode 100644 index 0000000000..0524f862ad --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall_from_polished_tumblestone_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_tumblestone" + }, + "result": "cobblemon:tumblestone_brick_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..3f0933fbb2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_block" + }, + "result": "cobblemon:tumblestone_brick_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall_from_tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall_from_tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..34c5d341d9 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_brick_wall_from_tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_bricks" + }, + "result": "cobblemon:tumblestone_brick_wall", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_bricks.json new file mode 100644 index 0000000000..588793207b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "cobblemon:polished_tumblestone" + } + }, + "result": { + "item": "cobblemon:tumblestone_bricks", + "count": 4 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_bricks_from_tumblestone_block_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_bricks_from_tumblestone_block_in_stonecutter.json new file mode 100644 index 0000000000..312b99c97d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_bricks_from_tumblestone_block_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:tumblestone_block" + }, + "result": "cobblemon:tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/recipes/tumblestone_bricks_in_stonecutter.json b/common/src/main/resources/data/cobblemon/recipes/tumblestone_bricks_in_stonecutter.json new file mode 100644 index 0000000000..51e7a3a4fc --- /dev/null +++ b/common/src/main/resources/data/cobblemon/recipes/tumblestone_bricks_in_stonecutter.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "cobblemon:polished_tumblestone" + }, + "result": "cobblemon:tumblestone_bricks", + "count": 1 +} diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json index b9e5fc583e..be0b716e4e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/jungle_pyramid.json @@ -5,7 +5,7 @@ ], "minY": 62, "neededBaseBlocks": [ - "#minecraft:cobblestone", + "minecraft:cobblestone", "#minecraft:mossy_cobblestone" ], "neededNearbyBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_detail_presets/underwater.json b/common/src/main/resources/data/cobblemon/spawn_detail_presets/underwater.json index 252bad4f63..a7511ae4e2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_detail_presets/underwater.json +++ b/common/src/main/resources/data/cobblemon/spawn_detail_presets/underwater.json @@ -1,5 +1,4 @@ { - "context": "submerged", "condition": { "fluid": "#minecraft:water" } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json index ea2b6e668b..9995f06f17 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json @@ -26,7 +26,8 @@ "id": "slowpoke-2", "pokemon": "slowpoke", "presets": [ - "natural" + "natural", + "river" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json index 096b108f3d..5ff78f95da 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json @@ -11,9 +11,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "8-33", - "weight": 0.18, + "weight": 1.8, "weightMultiplier": { "multiplier": 1.5, "condition": { @@ -37,9 +37,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "8-33", - "weight": 0.54, + "weight": 5.4, "weightMultiplier": { "multiplier": 1.5, "condition": { @@ -63,9 +63,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "8-33", - "weight": 0.54, + "weight": 5.4, "weightMultiplier": { "multiplier": 1.5, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json index 23e94dfd69..fe19a3eaf3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json @@ -11,9 +11,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "38-50", - "weight": 0.02, + "weight": 0.2, "weightMultiplier": { "multiplier": 1.5, "condition": { @@ -37,9 +37,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "38-50", - "weight": 0.06, + "weight": 0.6, "weightMultiplier": { "multiplier": 1.5, "condition": { @@ -63,9 +63,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "38-50", - "weight": 0.06, + "weight": 0.6, "weightMultiplier": { "multiplier": 1.5, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json index 7f27a96ffd..49a983cc9b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json @@ -16,7 +16,10 @@ "level": "1-20", "weight": 9.9, "condition": { - "canSeeSky": true + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_freshwater" + ] } }, { @@ -28,12 +31,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "1-20", - "weight": 0.18, + "weight": 1.8, "condition": { "minSkyLight": 8, - "maxSkyLight": 15 + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] } }, { @@ -62,9 +68,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "1-20", - "weight": 0.18, + "weight": 1.8, "condition": { "minSkyLight": 8, "maxSkyLight": 15, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json index 09e8750511..04fd5c2883 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json @@ -16,7 +16,10 @@ "level": "20-54", "weight": 0.1, "condition": { - "canSeeSky": true + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_freshwater" + ] } }, { @@ -28,12 +31,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "20-54", - "weight": 0.02, + "weight": 0.2, "condition": { "minSkyLight": 8, - "maxSkyLight": 15 + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] } }, { @@ -62,9 +68,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "20-54", - "weight": 0.02, + "weight": 0.2, "condition": { "minSkyLight": 8, "maxSkyLight": 15, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json index 4bda153b6d..75c9ec9dd9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json @@ -13,7 +13,7 @@ "context": "surface", "bucket": "uncommon", "level": "29-54", - "weight": 0.2, + "weight": 2.0, "condition": { "minSkyLight": 8, "maxSkyLight": 15, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0185_sudowoodo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0185_sudowoodo.json new file mode 100644 index 0000000000..2efa590f84 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0185_sudowoodo.json @@ -0,0 +1,32 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "sudowoodo-1", + "pokemon": "sudowoodo", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "16-41", + "weight": 0.6, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_forest" + ], + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_spooky" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json index 083acbbe32..7c5b0501c8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json @@ -12,12 +12,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "14-39", - "weight": 0.54, + "weight": 5.4, "condition": { "minSkyLight": 8, "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ], "timeRange": "day", "isRaining": false } @@ -30,9 +33,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "14-39", - "weight": 0.18, + "weight": 1.8, "condition": { "minSkyLight": 0, "maxSkyLight": 7, @@ -49,9 +52,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "14-39", - "weight": 0.18, + "weight": 1.8, "condition": { "biomes": [ "#the_bumblezone:the_bumblezone" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json index 207ff77dcd..6ac6d3fd13 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json @@ -31,9 +31,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "1-22", - "weight": 0.54, + "weight": 5.4, "condition": { "minSkyLight": 8, "maxSkyLight": 15, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0271_lombre.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0271_lombre.json index 5f00102f27..95f1b3b63e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0271_lombre.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0271_lombre.json @@ -31,9 +31,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "14-34", - "weight": 0.054, + "weight": 0.54, "condition": { "minSkyLight": 8, "maxSkyLight": 15, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json index 061da13b30..79e6540800 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json @@ -31,9 +31,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "29-48", - "weight": 0.006, + "weight": 0.06, "condition": { "minSkyLight": 8, "maxSkyLight": 15, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json index ed622b24a6..a3ffd7eefa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0283_surskit.json @@ -12,13 +12,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "2-27", - "weight": 0.18, + "weight": 5.4, "condition": { "minSkyLight": 8, "maxSkyLight": 15, - "timeRange": "night", + "biomes": [ + "#cobblemon:is_freshwater" + ], "isRaining": false } }, @@ -30,9 +32,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "2-27", - "weight": 0.9, + "weight": 9.0, "condition": { "biomes": [ "#the_bumblezone:the_bumblezone" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json index 63b27c6d34..3dcaa0a662 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0284_masquerain.json @@ -12,13 +12,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "22-45", - "weight": 0.02, + "weight": 0.6, "condition": { "minSkyLight": 8, "maxSkyLight": 15, - "timeRange": "night", + "biomes": [ + "#cobblemon:is_freshwater" + ], "isRaining": false } }, @@ -30,9 +32,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "22-45", - "weight": 0.1, + "weight": 1.0, "condition": { "biomes": [ "#the_bumblezone:the_bumblezone" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json index 135c22dff9..6a0e6101fd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0313_volbeat.json @@ -19,6 +19,9 @@ "condition": { "minSkyLight": 8, "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ], "timeRange": "night", "isRaining": false } @@ -32,12 +35,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "18-43", - "weight": 0.5, + "weight": 5.0, "condition": { "minSkyLight": 8, "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ], "timeRange": "night", "isRaining": false } @@ -69,9 +75,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "18-43", - "weight": 0.3, + "weight": 3.0, "condition": { "biomes": [ "#the_bumblezone:the_bumblezone" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json index 55e03c5774..4e0f1c336f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0314_illumise.json @@ -19,6 +19,9 @@ "condition": { "minSkyLight": 8, "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ], "timeRange": "night", "isRaining": false } @@ -32,12 +35,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "18-43", - "weight": 0.5, + "weight": 5.0, "condition": { "minSkyLight": 8, "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ], "timeRange": "night", "isRaining": false } @@ -69,9 +75,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "18-43", - "weight": 0.3, + "weight": 3.0, "condition": { "biomes": [ "#the_bumblezone:the_bumblezone" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json index d977dc963a..924208c247 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0358_chimecho.json @@ -45,6 +45,25 @@ ], "timeRange": "night" } + }, + { + "id": "chimecho-3", + "pokemon": "chimecho", + "presets": [], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "24-46", + "weight": 10, + "condition": { + "timeRange": "night", + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:bell" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0399_bidoof.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0399_bidoof.json index af0780b1ee..fd67e5f1bd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0399_bidoof.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0399_bidoof.json @@ -12,12 +12,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "1-25", - "weight": 0.9, + "weight": 9.0, "condition": { "minSkyLight": 8, - "maxSkyLight": 15 + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] } }, { @@ -34,7 +37,10 @@ "weight": 9.0, "condition": { "minSkyLight": 8, - "maxSkyLight": 15 + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0400_bibarel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0400_bibarel.json index 293d0cb655..b6f211185a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0400_bibarel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0400_bibarel.json @@ -17,7 +17,10 @@ "weight": 1.0, "condition": { "minSkyLight": 8, - "maxSkyLight": 15 + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] } }, { @@ -25,16 +28,19 @@ "pokemon": "bibarel", "presets": [ "freshwater", - "underwater" + "water_surface" ], "type": "pokemon", - "context": "submerged", - "bucket": "common", + "context": "surface", + "bucket": "uncommon", "level": "15-41", "weight": 1.0, "condition": { "minSkyLight": 8, - "maxSkyLight": 15 + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json index 1cbd77b5e4..29af928f01 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json @@ -17,7 +17,10 @@ "weight": 1.8, "condition": { "minSkyLight": 8, - "maxSkyLight": 15 + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] } }, { @@ -33,7 +36,10 @@ "level": "8-33", "weight": 1.8, "condition": { - "canSeeSky": true + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_freshwater" + ] } }, { @@ -45,12 +51,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "8-33", - "weight": 0.18, + "weight": 1.8, "condition": { "minSkyLight": 8, - "maxSkyLight": 15 + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json index 1f3d6fd9c0..0d14b03486 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json @@ -17,7 +17,10 @@ "weight": 0.2, "condition": { "minSkyLight": 8, - "maxSkyLight": 15 + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] } }, { @@ -33,7 +36,10 @@ "level": "26-50", "weight": 0.2, "condition": { - "canSeeSky": true + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_freshwater" + ] } }, { @@ -45,12 +51,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "26-50", - "weight": 0.02, + "weight": 0.2, "condition": { "minSkyLight": 8, - "maxSkyLight": 15 + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0433_chingling.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0433_chingling.json index 89bf2bbcab..8e6d5bb65f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0433_chingling.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0433_chingling.json @@ -45,6 +45,25 @@ ], "timeRange": "night" } + }, + { + "id": "chingling-3", + "pokemon": "chingling", + "presets": [], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "4-29", + "weight": 90, + "condition": { + "timeRange": "night", + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:bell" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0438_bonsly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0438_bonsly.json new file mode 100644 index 0000000000..aee993523d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0438_bonsly.json @@ -0,0 +1,32 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "bonsly-1", + "pokemon": "bonsly", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "4-29", + "weight": 5.4, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_forest" + ], + "isRaining": false + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_spooky" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0455_carnivine.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0455_carnivine.json index 3009c4f43e..89265e2c0d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0455_carnivine.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0455_carnivine.json @@ -8,7 +8,8 @@ "pokemon": "carnivine", "presets": [ "natural", - "treetop" + "treetop", + "foliage" ], "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json index b442dd6256..432d98c0ea 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json @@ -12,12 +12,15 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "33-52", - "weight": 0.06, + "weight": 0.6, "condition": { "minSkyLight": 8, "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ], "timeRange": "day", "isRaining": false } @@ -30,9 +33,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "33-52", - "weight": 0.02, + "weight": 0.2, "condition": { "minSkyLight": 0, "maxSkyLight": 7, @@ -49,9 +52,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "33-52", - "weight": 0.02, + "weight": 0.2, "condition": { "biomes": [ "#the_bumblezone:the_bumblezone" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0550_basculin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0550_basculin.json index 38f7676128..3a96dcd220 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0550_basculin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0550_basculin.json @@ -31,7 +31,7 @@ "context": "submerged", "bucket": "uncommon", "level": "21-46", - "weight": 10.0, + "weight": 0.1, "condition": { "canSeeSky": true, "moonPhase": "6,7,8" @@ -82,7 +82,7 @@ "context": "submerged", "bucket": "uncommon", "level": "21-46", - "weight": 10.0, + "weight": 0.1, "condition": { "canSeeSky": true, "moonPhase": "2,3,4" @@ -116,7 +116,7 @@ "context": "submerged", "bucket": "uncommon", "level": "21-46", - "weight": 9.0, + "weight": 0.09, "condition": { "canSeeSky": true, "moonPhase": "1,5" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0592_frillish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0592_frillish.json index 554b556549..8a3616fc72 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0592_frillish.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0592_frillish.json @@ -36,9 +36,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "9-34", - "weight": 0.54, + "weight": 5.4, "condition": { "minSkyLight": 8, "maxSkyLight": 15, @@ -56,15 +56,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "9-34", - "weight": 0.54, - "weightMultiplier": { - "multiplier": 5.0, - "condition": { - "moonPhase": "1" - } - }, + "weight": 5.4, "condition": { "minSkyLight": 8, "maxSkyLight": 15, @@ -72,6 +66,30 @@ "#cobblemon:is_ocean" ], "timeRange": "night" + }, + "anticondition": { + "moonPhase": "1" + } + }, + { + "id": "frillish-4", + "pokemon": "frillish", + "presets": [ + "water_surface" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "9-34", + "weight": 5.4, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_ocean" + ], + "timeRange": "night", + "moonPhase": "1" } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0593_jellicent.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0593_jellicent.json index d34d313a74..072a2b7453 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0593_jellicent.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0593_jellicent.json @@ -36,9 +36,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "40-48", - "weight": 0.06, + "weight": 0.6, "condition": { "minSkyLight": 8, "maxSkyLight": 15, @@ -56,15 +56,9 @@ ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "40-48", - "weight": 0.06, - "weightMultiplier": { - "multiplier": 5.0, - "condition": { - "moonPhase": "1" - } - }, + "weight": 0.6, "condition": { "minSkyLight": 8, "maxSkyLight": 15, @@ -72,6 +66,30 @@ "#cobblemon:is_ocean" ], "timeRange": "night" + }, + "anticondition": { + "moonPhase": "1" + } + }, + { + "id": "jellicent-4", + "pokemon": "jellicent", + "presets": [ + "water_surface" + ], + "type": "pokemon", + "context": "surface", + "bucket": "common", + "level": "40-48", + "weight": 0.6, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_ocean" + ], + "timeRange": "night", + "moonPhase": "1" } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json index f68ee4c5d7..1479cb61da 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json @@ -22,6 +22,11 @@ "#cobblemon:is_badlands" ], "timeRange": "day" + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] } }, { @@ -44,6 +49,11 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] } }, { @@ -67,6 +77,17 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_cold_ocean", + "#cobblemon:is_frozen_ocean", + "#cobblemon:is_lukewarm_ocean", + "#cobblemon:is_temperate_ocean" + ] } }, { @@ -88,6 +109,14 @@ "#cobblemon:is_desert" ], "timeRange": "day" + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_badlands" + ] } }, { @@ -110,6 +139,16 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_cherry_blossom", + "#cobblemon:is_magical", + "minecraft:sunflower_plains" + ] } }, { @@ -151,6 +190,22 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_cherry_blossom", + "#cobblemon:is_floral", + "#cobblemon:is_jungle", + "#cobblemon:is_magical", + "#cobblemon:is_mountain", + "#cobblemon:is_mushroom", + "#cobblemon:is_plains", + "#cobblemon:is_spooky", + "#cobblemon:is_swamp" + ] } }, { @@ -171,6 +226,17 @@ "maxSkyLight": 15, "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_jungle", + "#cobblemon:is_magical", + "#cobblemon:is_spooky" + ] } }, { @@ -193,6 +259,11 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] } }, { @@ -213,11 +284,18 @@ "biomes": [ "#cobblemon:is_glacial", "#cobblemon:is_snowy_forest", - "#cobblemon:is_snowy_taiga", "#cobblemon:is_tundra" ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_mountain" + ] } }, { @@ -240,6 +318,14 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_mountain" + ] } }, { @@ -262,6 +348,18 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_badlands", + "#cobblemon:is_floral", + "#cobblemon:is_desert", + "#cobblemon:is_mushroom", + "#cobblemon:is_tropical_island" + ] } }, { @@ -284,6 +382,16 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_magical", + "#cobblemon:is_spooky", + "#cobblemon:is_swamp" + ] } }, { @@ -306,6 +414,15 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_frozen_ocean", + "#cobblemon:is_warm_ocean" + ] } }, { @@ -313,7 +430,31 @@ "pokemon": "vivillon vivillon_wings=modern", "presets": [ "natural", - "flowers" + "flowers", + "village" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_overworld" + ], + "timeRange": "day", + "isRaining": false + } + }, + { + "id": "vivillon-modern-15", + "pokemon": "vivillon vivillon_wings=modern", + "presets": [ + "natural", + "flowers", + "urban" ], "type": "pokemon", "context": "grounded", @@ -350,6 +491,17 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_floral", + "#cobblemon:is_mushroom", + "#cobblemon:is_savanna", + "minecraft:sunflower_plains" + ] } }, { @@ -371,6 +523,17 @@ "#cobblemon:is_savanna" ], "timeRange": "day" + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_badlands", + "#cobblemon:is_desert", + "#cobblemon:is_floral", + "#cobblemon:is_mountain" + ] } }, { @@ -395,6 +558,11 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ] } }, { @@ -418,6 +586,14 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_mountain" + ] } }, { @@ -440,6 +616,14 @@ ], "timeRange": "day", "isRaining": false + }, + "anticondition": { + "structures": [ + "#minecraft:village" + ], + "biomes": [ + "#cobblemon:is_mountain" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json index 7f0a5ea42b..2badc3cf32 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json @@ -32,7 +32,7 @@ "context": "surface", "bucket": "common", "level": "5-30", - "weight": 0.9, + "weight": 9.0, "condition": { "minSkyLight": 8, "maxSkyLight": 15, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json index b60d635c3e..f869a04f43 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json @@ -32,7 +32,7 @@ "context": "surface", "bucket": "common", "level": "37-51", - "weight": 0.1, + "weight": 1.0, "condition": { "minSkyLight": 8, "maxSkyLight": 15, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json index c3f7494bcb..d2743869f0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json @@ -32,7 +32,7 @@ "context": "surface", "bucket": "common", "level": "22-47", - "weight": 0.6, + "weight": 6.0, "condition": { "minSkyLight": 8, "maxSkyLight": 15, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0902_basculegion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0902_basculegion.json index 28e130e2f3..c5559b22b4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0902_basculegion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0902_basculegion.json @@ -14,7 +14,7 @@ "context": "submerged", "bucket": "uncommon", "level": "41-53", - "weight": 1.0, + "weight": 0.01, "condition": { "canSeeSky": true, "moonPhase": "1,5" diff --git a/common/src/main/resources/data/cobblemon/species/generation1/abra.json b/common/src/main/resources/data/cobblemon/species/generation1/abra.json index 47c4df9abc..5e16c4ba8b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/abra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/abra.json @@ -261,4 +261,4 @@ "weight": 195, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json index a87994d19e..21beb0fbf9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json @@ -299,4 +299,4 @@ "weight": 590, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json b/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json index 8d68a87fc9..2c22a6b343 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json @@ -303,4 +303,4 @@ "weight": 480, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/arbok.json b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json index 86c1e940e6..392a9dfd74 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/arbok.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json @@ -139,6 +139,8 @@ "tm:thunderfang", "tm:torment", "tm:toxic", + "tm:toxicspikes", + "tm:trailblaze", "tm:venoshock", "tutor:acid", "tutor:aquatail", @@ -227,4 +229,4 @@ "weight": 650, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json b/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json index 891f4fa226..50b9461838 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json @@ -269,12 +269,10 @@ "tutor:dragonrage", "tutor:ember", "tutor:endure", - "tutor:extremespeed", "tutor:facade", "tutor:fireblast", "tutor:flamethrower", "tutor:flamewheel", - "tutor:flareblitz", "tutor:frustration", "tutor:headbutt", "tutor:heatwave", @@ -289,7 +287,6 @@ "tutor:mudslap", "tutor:outrage", "tutor:playrough", - "tutor:protect", "tutor:rage", "tutor:reflect", "tutor:rest", @@ -309,8 +306,7 @@ "tutor:takedown", "tutor:teleport", "tutor:thunderfang", - "tutor:toxic", - "tutor:willowisp" + "tutor:toxic" ], "labels": [ "gen1", @@ -340,4 +336,4 @@ "weight": 1550, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/articuno.json b/common/src/main/resources/data/cobblemon/species/generation1/articuno.json index 16ff49f452..c89e7c5e3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/articuno.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/articuno.json @@ -269,7 +269,6 @@ "tutor:aircutter", "tutor:ancientpower", "tutor:bide", - "tutor:blizzard", "tutor:bubblebeam", "tutor:curse", "tutor:defog", @@ -285,11 +284,9 @@ "tutor:frustration", "tutor:gust", "tutor:hail", - "tutor:haze", "tutor:headbutt", "tutor:healbell", "tutor:hiddenpower", - "tutor:hurricane", "tutor:hyperbeam", "tutor:icebeam", "tutor:iceshard", @@ -362,4 +359,4 @@ "weight": 554, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json index 7d07c6e2ed..d4ac6aac83 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json @@ -248,4 +248,4 @@ "weight": 295, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json b/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json index f8665d7652..71dab3baae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json @@ -214,4 +214,4 @@ "weight": 40, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json index 3cbfb574af..e3cee8e4bf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json @@ -354,4 +354,4 @@ "weight": 855, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json b/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json index 7ad95df119..5e6fb25909 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json @@ -242,4 +242,4 @@ "weight": 69, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json index 4264912c31..c5c95d26c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json @@ -271,4 +271,4 @@ "weight": 320, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json b/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json index 98e13fd37c..c4fc461a47 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json @@ -105,4 +105,4 @@ "weight": 29, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/chansey.json b/common/src/main/resources/data/cobblemon/species/generation1/chansey.json index 6dab1c0615..36eb3edfd5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/chansey.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/chansey.json @@ -339,4 +339,4 @@ "weight": 346, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json index 7ecb3177a3..1b6f53cf81 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json @@ -306,17 +306,14 @@ "tm:weatherball", "tm:willowisp", "tm:workup", - "tutor:acrobatics", "tutor:aircutter", "tutor:airslash", "tutor:attract", - "tutor:bellydrum", "tutor:bide", "tutor:blastburn", "tutor:bodyslam", "tutor:brickbreak", "tutor:counter", - "tutor:crunch", "tutor:curse", "tutor:cut", "tutor:defensecurl", @@ -344,7 +341,6 @@ "tutor:fissure", "tutor:flameburst", "tutor:flamethrower", - "tutor:flareblitz", "tutor:fly", "tutor:focusblast", "tutor:focuspunch", @@ -431,4 +427,4 @@ "weight": 905, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charmander.json b/common/src/main/resources/data/cobblemon/species/generation1/charmander.json index f4dd466774..c831a01ed9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charmander.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charmander.json @@ -276,4 +276,4 @@ "weight": 85, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json b/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json index 194d2754e2..fb2af015bf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json @@ -247,4 +247,4 @@ "weight": 190, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json index 738ae24ffc..85558c836f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json @@ -320,4 +320,4 @@ "weight": 400, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json index 1859319825..592dbb3256 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json @@ -334,4 +334,4 @@ "weight": 75, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json b/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json index eb2cf9fc8f..7044d49943 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json @@ -215,4 +215,4 @@ "weight": 1325, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/cubone.json b/common/src/main/resources/data/cobblemon/species/generation1/cubone.json index bbf2846dee..d4dae12132 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/cubone.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/cubone.json @@ -231,7 +231,7 @@ ] }, { - "id": "cubone_marowak_alolan", + "id": "cubone_marowak", "variant": "level_up", "result": "marowak alolan", "consumeHeldItem": false, @@ -269,4 +269,4 @@ "weight": 65, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json index 4e2ae8b318..db40f0923b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json @@ -133,6 +133,7 @@ "tm:uproar", "tm:waterfall", "tm:waterpulse", + "tm:weatherball", "tm:whirlpool", "tutor:aquajet", "tutor:aquatail", @@ -214,4 +215,4 @@ "weight": 1200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/diglett.json b/common/src/main/resources/data/cobblemon/species/generation1/diglett.json index 215a39b4c3..8363d7db21 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/diglett.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/diglett.json @@ -431,4 +431,4 @@ "weight": 8, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ditto.json b/common/src/main/resources/data/cobblemon/species/generation1/ditto.json index 38da036ecb..46f54618fd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ditto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ditto.json @@ -46,8 +46,7 @@ "ditto" ], "moves": [ - "1:transform", - "tutor:transform" + "1:transform" ], "labels": [ "gen1" @@ -75,4 +74,4 @@ "weight": 40, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json b/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json index f679b00358..9cb6841473 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json @@ -217,4 +217,4 @@ "weight": 852, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/doduo.json b/common/src/main/resources/data/cobblemon/species/generation1/doduo.json index e574f98a9a..4187646d76 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/doduo.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/doduo.json @@ -136,6 +136,7 @@ "tm:thief", "tm:throatchop", "tm:toxic", + "tm:uproar", "tm:workup", "tutor:agility", "tutor:aircutter", @@ -230,4 +231,4 @@ "weight": 392, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json b/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json index 655cd39383..17433cee01 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json @@ -244,4 +244,4 @@ "weight": 165, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json b/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json index d554ce08db..7e65b8d1da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json @@ -316,4 +316,4 @@ "weight": 2100, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dratini.json b/common/src/main/resources/data/cobblemon/species/generation1/dratini.json index 9b37a559ae..3b33e6bcc6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dratini.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dratini.json @@ -255,4 +255,4 @@ "weight": 33, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json b/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json index f4649f0f00..60e4c3bc06 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json @@ -278,4 +278,4 @@ "weight": 324, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json index d6f0b0ee83..f4eca6f1ce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json @@ -396,4 +396,4 @@ "weight": 333, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/eevee.json b/common/src/main/resources/data/cobblemon/species/generation1/eevee.json index 8c50468a40..0cbbb48361 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/eevee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/eevee.json @@ -452,4 +452,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ekans.json b/common/src/main/resources/data/cobblemon/species/generation1/ekans.json index 35a5b1cd2e..501a1af029 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ekans.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ekans.json @@ -235,4 +235,4 @@ "weight": 69, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json b/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json index 9039ddd363..71420cbc29 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json @@ -251,4 +251,4 @@ "weight": 300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/electrode.json b/common/src/main/resources/data/cobblemon/species/generation1/electrode.json index 3dd29e1c6a..0a69a0f688 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/electrode.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/electrode.json @@ -308,4 +308,4 @@ "weight": 666, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json index cc7355dd8a..efdd3cbecd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json @@ -30,17 +30,6 @@ "region-bias-alola" ], "evolutions": [ - { - "id": "alola_exeggcute_alola_exeggutor", - "variant": "item_interact", - "result": "exeggutor alolan", - "consumeHeldItem": false, - "learnableMoves": [ - "dragonhammer" - ], - "requirements": [], - "requiredContext": "cobblemon:leaf_stone" - }, { "id": "alola_exeggcute_exeggutor", "variant": "item_interact", @@ -56,6 +45,17 @@ } ], "requiredContext": "cobblemon:leaf_stone" + }, + { + "id": "alola_exeggcute_alola_exeggutor", + "variant": "item_interact", + "result": "exeggutor alolan", + "consumeHeldItem": false, + "learnableMoves": [ + "dragonhammer" + ], + "requirements": [], + "requiredContext": "cobblemon:leaf_stone" } ] } @@ -263,17 +263,6 @@ "region_bias" ], "evolutions": [ - { - "id": "exeggcute_exeggutor", - "variant": "item_interact", - "result": "exeggutor alolan=false", - "consumeHeldItem": false, - "learnableMoves": [ - "stomp" - ], - "requirements": [], - "requiredContext": "cobblemon:leaf_stone" - }, { "id": "exeggcute_alola_exeggutor", "variant": "item_interact", @@ -285,7 +274,7 @@ "requirements": [ { "variant": "biome", - "biomeCondition": "#cobblemon:regional_bias_evolutions/alolan" + "biomeCondition": "#cobblemon:evolution/alolan" }, { "variant": "biome", @@ -293,6 +282,17 @@ } ], "requiredContext": "cobblemon:leaf_stone" + }, + { + "id": "exeggcute_exeggutor", + "variant": "item_interact", + "result": "exeggutor alolan=false", + "consumeHeldItem": false, + "learnableMoves": [ + "stomp" + ], + "requirements": [], + "requiredContext": "cobblemon:leaf_stone" } ], "baseScale": 1.0, @@ -314,4 +314,4 @@ "weight": 25, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json index 8b6fe32097..194b906f75 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json @@ -33,9 +33,6 @@ "maleRatio": 0.5, "shoulderMountable": false, "forms": [ - { - "name": "base" - }, { "name": "Alola", "primaryType": "grass", @@ -467,4 +464,4 @@ "weight": 1200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json index ff1ae43f0f..2e8b3c8d3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json @@ -403,4 +403,4 @@ "aspects": [], "evolutions": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/fearow.json b/common/src/main/resources/data/cobblemon/species/generation1/fearow.json index 3a1c12bd90..6495f8a1c0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/fearow.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/fearow.json @@ -192,4 +192,4 @@ "weight": 380, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json index 6bf6196084..37b853a4f9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json @@ -224,4 +224,4 @@ "weight": 250, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gastly.json b/common/src/main/resources/data/cobblemon/species/generation1/gastly.json index 72e40d75ae..c57d29880b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gastly.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gastly.json @@ -270,4 +270,4 @@ "weight": 1, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gengar.json b/common/src/main/resources/data/cobblemon/species/generation1/gengar.json index d8c444a92a..4a309b894a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gengar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gengar.json @@ -367,4 +367,4 @@ "weight": 405, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/geodude.json b/common/src/main/resources/data/cobblemon/species/generation1/geodude.json index 65fb688573..ff5f8d983f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/geodude.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/geodude.json @@ -455,4 +455,4 @@ "weight": 200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gloom.json b/common/src/main/resources/data/cobblemon/species/generation1/gloom.json index 37d7262d72..133385e768 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gloom.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gloom.json @@ -212,4 +212,4 @@ "weight": 86, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golbat.json b/common/src/main/resources/data/cobblemon/species/generation1/golbat.json index 660550fe2b..253e432d32 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golbat.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golbat.json @@ -231,4 +231,4 @@ "weight": 550, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json b/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json index 6ff291bcf8..4c2c3a6c01 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json @@ -227,4 +227,4 @@ "weight": 150, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golduck.json b/common/src/main/resources/data/cobblemon/species/generation1/golduck.json index 97bd71007a..76c041b230 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golduck.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golduck.json @@ -277,4 +277,4 @@ "weight": 766, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golem.json b/common/src/main/resources/data/cobblemon/species/generation1/golem.json index ddb63986a1..7259a9917a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golem.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golem.json @@ -430,4 +430,4 @@ "weight": 3000, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json index 252ac33241..9aaa9618c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json @@ -429,4 +429,4 @@ "weight": 1050, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/grimer.json b/common/src/main/resources/data/cobblemon/species/generation1/grimer.json index 6d8df799ab..5ff17ea590 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/grimer.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/grimer.json @@ -473,4 +473,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json b/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json index f8755dae64..95611ed58b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json @@ -120,6 +120,7 @@ "tm:temperflare", "tm:terablast", "tm:thunderfang", + "tm:wildcharge", "tm:willowisp" ], "labels": [ @@ -364,4 +365,4 @@ "weight": 190, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json index 4a3cca9fad..5d8dd26b83 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json @@ -308,4 +308,4 @@ "weight": 2350, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/haunter.json b/common/src/main/resources/data/cobblemon/species/generation1/haunter.json index 56a7f90823..7e9529438d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/haunter.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/haunter.json @@ -251,4 +251,4 @@ "weight": 1, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json b/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json index 0ed87c4970..10bea12818 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json @@ -239,4 +239,4 @@ "weight": 502, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json b/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json index 89ea6ad256..cd62d5eca1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json @@ -239,4 +239,4 @@ "weight": 498, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/horsea.json b/common/src/main/resources/data/cobblemon/species/generation1/horsea.json index 017f2d857a..dd037b2b2e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/horsea.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/horsea.json @@ -222,4 +222,4 @@ "weight": 80, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hypno.json b/common/src/main/resources/data/cobblemon/species/generation1/hypno.json index 084283b6b8..aa080bd24b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hypno.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hypno.json @@ -254,4 +254,4 @@ "weight": 756, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json b/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json index 1abed9eed1..c264ffde3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json @@ -218,4 +218,4 @@ "weight": 130, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json b/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json index fff674b988..2c5df6c0c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json @@ -318,4 +318,4 @@ "weight": 55, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json index 8baeb731f1..ef6d6b55cf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json @@ -223,4 +223,4 @@ "weight": 245, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json index 7e5d7eee1d..c1a903fcf8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json @@ -248,4 +248,4 @@ "weight": 406, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json b/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json index aee6b9457a..50707b21e1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json @@ -244,4 +244,4 @@ "weight": 115, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json b/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json index c7e6d45138..b59f1f4269 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json @@ -253,4 +253,4 @@ "weight": 405, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json b/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json index ac46dfb538..09e6652622 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json @@ -250,4 +250,4 @@ "weight": 565, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json b/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json index 153ce467e8..c3a7dd10ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json @@ -5,7 +5,8 @@ "primaryType": "bug", "secondaryType": "poison", "abilities": [ - "shedskin" + "shedskin", + "h:shedskin" ], "baseStats": { "hp": 45, @@ -102,4 +103,4 @@ "weight": 100, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json index 4f14170a65..45400e738d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json @@ -312,4 +312,4 @@ "weight": 800, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kingler.json b/common/src/main/resources/data/cobblemon/species/generation1/kingler.json index e8aa10832c..5b7c6e50b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kingler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kingler.json @@ -264,4 +264,4 @@ "weight": 600, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/koffing.json b/common/src/main/resources/data/cobblemon/species/generation1/koffing.json index b0f185235a..17b901c0b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/koffing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/koffing.json @@ -246,4 +246,4 @@ "weight": 10, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/krabby.json b/common/src/main/resources/data/cobblemon/species/generation1/krabby.json index 8fc6ec4e8e..92eab0a6a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/krabby.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/krabby.json @@ -238,4 +238,4 @@ "weight": 65, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json index ec049e85d6..0ef620a264 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json @@ -328,4 +328,4 @@ "weight": 2200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json b/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json index 9f51169ddd..f4194cd456 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json @@ -284,4 +284,4 @@ "weight": 655, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json index 3c17137f04..ddf8cd9fe2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json @@ -284,4 +284,4 @@ "weight": 1300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json index d7cddad7e0..3d8b13a249 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json @@ -231,4 +231,4 @@ "weight": 705, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machop.json b/common/src/main/resources/data/cobblemon/species/generation1/machop.json index dd950acacc..094ae9e1f3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machop.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machop.json @@ -253,4 +253,4 @@ "weight": 195, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json b/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json index 97d068391d..2900fdc9c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json @@ -110,4 +110,4 @@ "weight": 100, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json index 58ded69ceb..4337e9fbd9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json @@ -238,4 +238,4 @@ "weight": 445, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json b/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json index 9ff54493f4..1555de8884 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json @@ -229,4 +229,4 @@ "weight": 60, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magneton.json b/common/src/main/resources/data/cobblemon/species/generation1/magneton.json index 7defe2ade9..e4c1ecd120 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magneton.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magneton.json @@ -228,4 +228,4 @@ "weight": 600, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mankey.json b/common/src/main/resources/data/cobblemon/species/generation1/mankey.json index ffb25ec57b..b4740fd49d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mankey.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mankey.json @@ -281,4 +281,4 @@ "weight": 280, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/marowak.json b/common/src/main/resources/data/cobblemon/species/generation1/marowak.json index 251d1db60d..efc1ef6a1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/marowak.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/marowak.json @@ -581,4 +581,4 @@ "weight": 450, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json index 46a4dddb0d..a278406f09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json @@ -737,4 +737,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/metapod.json b/common/src/main/resources/data/cobblemon/species/generation1/metapod.json index 0eb967c382..44b52fd782 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/metapod.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/metapod.json @@ -4,7 +4,8 @@ "nationalPokedexNumber": 11, "primaryType": "bug", "abilities": [ - "shedskin" + "shedskin", + "h:shedskin" ], "baseStats": { "hp": 50, @@ -108,4 +109,4 @@ "weight": 99, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mew.json b/common/src/main/resources/data/cobblemon/species/generation1/mew.json index d82e215273..361cac287b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mew.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mew.json @@ -356,7 +356,6 @@ "tm:workup", "tm:xscissor", "tm:zenheadbutt", - "tutor:airslash", "tutor:afteryou", "tutor:aircutter", "tutor:allyswitch", @@ -364,7 +363,6 @@ "tutor:ancientpower", "tutor:aquatail", "tutor:attract", - "tutor:aurasphere", "tutor:barrier", "tutor:bide", "tutor:bind", @@ -385,8 +383,6 @@ "tutor:covet", "tutor:curse", "tutor:cut", - "tutor:darkpulse", - "tutor:dazzlinggleam", "tutor:defensecurl", "tutor:defog", "tutor:detect", @@ -395,7 +391,6 @@ "tutor:doubleedge", "tutor:doubleteam", "tutor:dragonbreath", - "tutor:dragonpulse", "tutor:dragonrage", "tutor:dragontail", "tutor:drainpunch", @@ -404,12 +399,10 @@ "tutor:dualchop", "tutor:dualwingbeat", "tutor:dynamicpunch", - "tutor:earthpower", "tutor:earthquake", "tutor:eggbomb", "tutor:electroweb", "tutor:endeavor", - "tutor:energyball", "tutor:endure", "tutor:expandingforce", "tutor:explosion", @@ -419,9 +412,7 @@ "tutor:fireblast", "tutor:firepunch", "tutor:fissure", - "tutor:flamethrower", "tutor:flash", - "tutor:flashcannon", "tutor:flipturn", "tutor:fly", "tutor:focuspunch", @@ -440,9 +431,7 @@ "tutor:hiddenpower", "tutor:horndrill", "tutor:hyperbeam", - "tutor:hypervoice", "tutor:hypnosis", - "tutor:icebeam", "tutor:icepunch", "tutor:icywind", "tutor:irondefense", @@ -452,8 +441,6 @@ "tutor:laserfocus", "tutor:lashout", "tutor:lastresort", - "tutor:lifedew", - "tutor:lightscreen", "tutor:liquidation", "tutor:lowkick", "tutor:magiccoat", @@ -477,14 +464,11 @@ "tutor:payday", "tutor:playrough", "tutor:poisonjab", - "tutor:pollenpuff", "tutor:poltergeist", "tutor:pound", - "tutor:powergem", "tutor:protect", "tutor:psychic", "tutor:psychup", - "tutor:psyshock", "tutor:psywave", "tutor:rage", "tutor:raindance", @@ -507,7 +491,6 @@ "tutor:seedbomb", "tutor:seismictoss", "tutor:selfdestruct", - "tutor:shadowball", "tutor:shockwave", "tutor:signalbeam", "tutor:skillswap", @@ -515,7 +498,6 @@ "tutor:skullbash", "tutor:skyattack", "tutor:sleeptalk", - "tutor:sludgebomb", "tutor:snatch", "tutor:snore", "tutor:softboiled", @@ -533,10 +515,8 @@ "tutor:sunnyday", "tutor:superfang", "tutor:superpower", - "tutor:surf", "tutor:swagger", "tutor:sweetscent", - "tutor:swift", "tutor:swordsdance", "tutor:synthesis", "tutor:tailwind", @@ -548,7 +528,6 @@ "tutor:thief", "tutor:throatchop", "tutor:thunder", - "tutor:thunderbolt", "tutor:thunderpunch", "tutor:thunderwave", "tutor:toxic", @@ -600,4 +579,4 @@ "weight": 40, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json b/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json index 495c98aa0f..a0c37dcc61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json @@ -291,7 +291,6 @@ "tutor:agility", "tutor:amnesia", "tutor:aquatail", - "tutor:aurasphere", "tutor:barrier", "tutor:bide", "tutor:blizzard", @@ -299,7 +298,6 @@ "tutor:brickbreak", "tutor:bubblebeam", "tutor:bulkup", - "tutor:calmmind", "tutor:confuseray", "tutor:confusion", "tutor:counter", @@ -331,7 +329,6 @@ "tutor:hiddenpower", "tutor:hurricane", "tutor:hyperbeam", - "tutor:icebeam", "tutor:icepunch", "tutor:icywind", "tutor:irontail", @@ -355,7 +352,6 @@ "tutor:psychic", "tutor:psychocut", "tutor:psychup", - "tutor:psystrike", "tutor:psywave", "tutor:rage", "tutor:raindance", @@ -430,4 +426,4 @@ "weight": 1220, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/moltres.json b/common/src/main/resources/data/cobblemon/species/generation1/moltres.json index abd9fddac0..a2d7bbec7b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/moltres.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/moltres.json @@ -261,7 +261,6 @@ "tutor:doubleteam", "tutor:dualwingbeat", "tutor:ember", - "tutor:endure", "tutor:extrasensory", "tutor:facade", "tutor:fireblast", @@ -293,7 +292,6 @@ "tutor:safeguard", "tutor:sandstorm", "tutor:scorchingsands", - "tutor:skyattack", "tutor:sleeptalk", "tutor:snore", "tutor:solarbeam", @@ -354,4 +352,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json b/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json index 01f2bdb8e0..6241ffb908 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json @@ -473,4 +473,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/muk.json b/common/src/main/resources/data/cobblemon/species/generation1/muk.json index e535d22f07..221980a42e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/muk.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/muk.json @@ -448,4 +448,4 @@ "weight": 300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json index 33a7bf436f..16e21fa404 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json @@ -286,4 +286,4 @@ "weight": 620, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json index 0744eeff3c..a36d6a69a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json @@ -281,4 +281,4 @@ "weight": 600, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json index 512c9daaa5..a93df9e06e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json @@ -226,4 +226,4 @@ "weight": 70, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json index 61aee14c36..c2a6acb90e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json @@ -228,4 +228,4 @@ "weight": 90, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json b/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json index e3921284a5..c6d6a9d59d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json @@ -210,4 +210,4 @@ "weight": 200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json b/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json index b2f9c6c406..2c51d8d052 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json @@ -212,4 +212,4 @@ "weight": 195, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json index 7cff733f6d..9f2d864f63 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json @@ -421,4 +421,4 @@ "weight": 199, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/oddish.json b/common/src/main/resources/data/cobblemon/species/generation1/oddish.json index 0621bff749..e901928c6a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/oddish.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/oddish.json @@ -214,4 +214,4 @@ "weight": 54, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json b/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json index c6017bb5a8..e5c200ab65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json @@ -244,4 +244,4 @@ "weight": 75, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/omastar.json b/common/src/main/resources/data/cobblemon/species/generation1/omastar.json index 3b7bf74f82..fe800eb5b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/omastar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/omastar.json @@ -221,4 +221,4 @@ "weight": 350, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/onix.json b/common/src/main/resources/data/cobblemon/species/generation1/onix.json index 20da16ad3e..b6856b38da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/onix.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/onix.json @@ -254,4 +254,4 @@ "weight": 2100, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/paras.json b/common/src/main/resources/data/cobblemon/species/generation1/paras.json index ee31c75dec..23c772831f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/paras.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/paras.json @@ -231,4 +231,4 @@ "weight": 54, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/parasect.json b/common/src/main/resources/data/cobblemon/species/generation1/parasect.json index 20f2f61c73..3bea0900b3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/parasect.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/parasect.json @@ -202,4 +202,4 @@ "weight": 295, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/persian.json b/common/src/main/resources/data/cobblemon/species/generation1/persian.json index c806e7b791..f7790f698c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/persian.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/persian.json @@ -476,4 +476,4 @@ "weight": 320, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json index acbb468208..a29b0ac587 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json @@ -233,4 +233,4 @@ "weight": 395, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json index a2b0a2de38..96c1b9c111 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json @@ -196,4 +196,4 @@ "weight": 300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json index 37934240b4..b24ca3ad8e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json @@ -202,4 +202,4 @@ "weight": 18, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json index c0ce2008e6..c73032b4f3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json @@ -1770,17 +1770,6 @@ "region-bias-alola" ], "evolutions": [ - { - "id": "alola_pikachu_alola_raichu", - "variant": "item_interact", - "result": "raichu alolan", - "consumeHeldItem": false, - "learnableMoves": [ - "psychic" - ], - "requirements": [], - "requiredContext": "cobblemon:thunder_stone" - }, { "id": "alola_pikachu_raichu", "variant": "item_interact", @@ -1800,6 +1789,17 @@ } ], "requiredContext": "cobblemon:thunder_stone" + }, + { + "id": "alola_pikachu_alola_raichu", + "variant": "item_interact", + "result": "raichu alolan", + "consumeHeldItem": false, + "learnableMoves": [ + "psychic" + ], + "requirements": [], + "requiredContext": "cobblemon:thunder_stone" } ] } @@ -1911,7 +1911,6 @@ "tutor:bodyslam", "tutor:brickbreak", "tutor:calmmind", - "tutor:celebrate", "tutor:charm", "tutor:counter", "tutor:covet", @@ -1934,7 +1933,6 @@ "tutor:fakeout", "tutor:feint", "tutor:flash", - "tutor:fly", "tutor:focuspunch", "tutor:frustration", "tutor:grassknot", @@ -1945,7 +1943,6 @@ "tutor:helpinghand", "tutor:hiddenpower", "tutor:holdhands", - "tutor:irontail", "tutor:knockoff", "tutor:laserfocus", "tutor:lastresort", @@ -1957,11 +1954,7 @@ "tutor:mudslap", "tutor:nuzzle", "tutor:payday", - "tutor:playnice", - "tutor:playrough", - "tutor:present", "tutor:protect", - "tutor:quickattack", "tutor:rage", "tutor:raindance", "tutor:reflect", @@ -1981,7 +1974,6 @@ "tutor:strength", "tutor:submission", "tutor:substitute", - "tutor:surf", "tutor:swagger", "tutor:sweetkiss", "tutor:sweetscent", @@ -1989,10 +1981,7 @@ "tutor:tailwhip", "tutor:takedown", "tutor:teeterdance", - "tutor:thunder", - "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:thundershock", "tutor:thunderwave", "tutor:toxic", "tutor:voltswitch", @@ -2010,17 +1999,6 @@ ], "preEvolution": "pichu", "evolutions": [ - { - "id": "pikachu_raichu", - "variant": "item_interact", - "result": "raichu alolan=false", - "consumeHeldItem": false, - "learnableMoves": [ - "thunderpunch" - ], - "requirements": [], - "requiredContext": "cobblemon:thunder_stone" - }, { "id": "pikachu_alola_raichu", "variant": "item_interact", @@ -2032,7 +2010,7 @@ "requirements": [ { "variant": "biome", - "biomeCondition": "#cobblemon:regional_bias_evolutions/alolan" + "biomeCondition": "#cobblemon:evolution/alolan" }, { "variant": "biome", @@ -2040,6 +2018,17 @@ } ], "requiredContext": "cobblemon:thunder_stone" + }, + { + "id": "pikachu_raichu", + "variant": "item_interact", + "result": "raichu alolan=false", + "consumeHeldItem": false, + "learnableMoves": [ + "thunderpunch" + ], + "requirements": [], + "requiredContext": "cobblemon:thunder_stone" } ], "baseScale": 0.5, @@ -2061,4 +2050,4 @@ "weight": 60, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json b/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json index 6517c4d995..54b92f3441 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json @@ -276,4 +276,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json index 91bd3f5b75..4fb923155a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json @@ -136,6 +136,7 @@ "tm:toxic", "tm:waterfall", "tm:waterpulse", + "tm:weatherball", "tm:whirlpool", "tutor:amnesia", "tutor:attract", @@ -233,4 +234,4 @@ "weight": 124, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json index a625f47951..354f45bc38 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json @@ -253,4 +253,4 @@ "weight": 200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json index 6538719e01..c5fb90ba05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json @@ -263,4 +263,4 @@ "weight": 540, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json b/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json index 31e554ae5c..5bcbc1b001 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json @@ -356,4 +356,4 @@ "weight": 300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/porygon.json b/common/src/main/resources/data/cobblemon/species/generation1/porygon.json index b0f4d55a96..5a1166518f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/porygon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/porygon.json @@ -225,4 +225,4 @@ "weight": 365, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/primeape.json b/common/src/main/resources/data/cobblemon/species/generation1/primeape.json index c8e6a12c0d..7d7fa5190e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/primeape.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/primeape.json @@ -244,7 +244,9 @@ "variant": "level_up", "result": "annihilape", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "shadowpunch" + ], "requirements": [ { "variant": "use_move", @@ -273,4 +275,4 @@ "weight": 320, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json b/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json index c269edbac9..ff9e9a3a10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json @@ -297,4 +297,4 @@ "weight": 196, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/raichu.json b/common/src/main/resources/data/cobblemon/species/generation1/raichu.json index cbf60fb7fc..6b244ef9ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raichu.json @@ -465,4 +465,4 @@ "weight": 300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json b/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json index f0e1b2e30f..b79042c226 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json @@ -352,4 +352,4 @@ "weight": 950, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json index ddd368e593..1d05d4daba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json @@ -487,4 +487,4 @@ "weight": 185, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rattata.json b/common/src/main/resources/data/cobblemon/species/generation1/rattata.json index e474ce95e7..62f3b1e120 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rattata.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rattata.json @@ -396,4 +396,4 @@ "weight": 35, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json b/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json index 5dc47f0ba4..2beae0d1cf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json @@ -295,4 +295,4 @@ "weight": 1200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json b/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json index 1d113a988a..aea05e2168 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json @@ -270,4 +270,4 @@ "weight": 1150, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json b/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json index 00c2acc46d..41ebd09983 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json @@ -486,4 +486,4 @@ "weight": 120, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json index eed0bad312..894583a9fb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json @@ -435,4 +435,4 @@ "weight": 295, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/scyther.json b/common/src/main/resources/data/cobblemon/species/generation1/scyther.json index a86b0bc2f7..82524e16b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/scyther.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/scyther.json @@ -219,7 +219,9 @@ "variant": "item_interact", "result": "kleavor", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "stoneaxe" + ], "requirements": [], "requiredContext": "cobblemon:black_augurite" } @@ -252,4 +254,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seadra.json b/common/src/main/resources/data/cobblemon/species/generation1/seadra.json index 64731c49a1..4c89f5d719 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seadra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seadra.json @@ -211,4 +211,4 @@ "weight": 250, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seaking.json b/common/src/main/resources/data/cobblemon/species/generation1/seaking.json index 97946f2cab..e7d663fc20 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seaking.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seaking.json @@ -204,4 +204,4 @@ "weight": 390, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seel.json b/common/src/main/resources/data/cobblemon/species/generation1/seel.json index 9995728cf9..f7006c2c6a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seel.json @@ -239,4 +239,4 @@ "weight": 900, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/shellder.json b/common/src/main/resources/data/cobblemon/species/generation1/shellder.json index 446ea905f1..7d71749b7f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/shellder.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/shellder.json @@ -42,7 +42,7 @@ "moving": { "swim": { "swimSpeed": 0.1, - "canSwimInWater": false, + "canSwimInWater": true, "canBreatheUnderwater": true } } @@ -222,4 +222,4 @@ "weight": 40, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json b/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json index 477b169ba9..7099a44534 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json @@ -522,4 +522,4 @@ "weight": 785, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json index 7b5648720e..6a7e596dea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json @@ -477,4 +477,4 @@ "weight": 360, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json index 2b3ad25b8c..68c7a3dad4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json @@ -338,7 +338,7 @@ ], "preEvolution": "munchlax", "evolutions": [], - "baseScale": 1, + "baseScale": 2, "hitbox": { "width": 1.2, "height": 1.7, @@ -357,4 +357,4 @@ "weight": 4600, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/spearow.json b/common/src/main/resources/data/cobblemon/species/generation1/spearow.json index 7208a67cd7..d068085e13 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/spearow.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/spearow.json @@ -212,4 +212,4 @@ "weight": 20, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json b/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json index 3bed2b8d37..1e0fdcf8d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json @@ -273,4 +273,4 @@ "weight": 90, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/starmie.json b/common/src/main/resources/data/cobblemon/species/generation1/starmie.json index 556a80c5d6..9c7650214a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/starmie.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/starmie.json @@ -220,4 +220,4 @@ "weight": 800, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/staryu.json b/common/src/main/resources/data/cobblemon/species/generation1/staryu.json index 32fc322ecb..d72cc12118 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/staryu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/staryu.json @@ -210,4 +210,4 @@ "weight": 345, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tangela.json b/common/src/main/resources/data/cobblemon/species/generation1/tangela.json index c3d61a3087..9f17ce0122 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tangela.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tangela.json @@ -219,4 +219,4 @@ "weight": 350, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tauros.json b/common/src/main/resources/data/cobblemon/species/generation1/tauros.json index c98aa3e0d3..d90b42f7cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tauros.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tauros.json @@ -557,4 +557,4 @@ "weight": 884, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json b/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json index a274b73c9b..d1dbb6c710 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json @@ -258,4 +258,4 @@ "weight": 455, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json b/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json index a1c6e88df9..3a406eef20 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json @@ -238,4 +238,4 @@ "weight": 550, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json b/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json index fddcfa5cd0..6f2a355534 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json @@ -235,4 +235,4 @@ "weight": 290, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json b/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json index f16bfcd02c..71223eabab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json @@ -234,4 +234,4 @@ "weight": 125, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venonat.json b/common/src/main/resources/data/cobblemon/species/generation1/venonat.json index 022b2236bf..18543e39f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venonat.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venonat.json @@ -217,4 +217,4 @@ "weight": 300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json index 4d3101fc24..e9ee88edd7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json @@ -323,4 +323,4 @@ "weight": 1000, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json b/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json index 9246f95478..7f07d73808 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json @@ -187,4 +187,4 @@ "weight": 155, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json b/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json index 7ca9410c5f..837d6a4f44 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json @@ -198,4 +198,4 @@ "weight": 186, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json b/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json index 0a6c980adb..2a3be4421b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json @@ -328,4 +328,4 @@ "weight": 104, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json b/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json index cc9b4f2701..ddd549579d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json @@ -462,4 +462,4 @@ "weight": 99, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json b/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json index fa02510ed9..28b1e1ddb9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json @@ -247,4 +247,4 @@ "weight": 225, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weedle.json b/common/src/main/resources/data/cobblemon/species/generation1/weedle.json index be30e4c7fa..4fe446c8f3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weedle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weedle.json @@ -99,4 +99,4 @@ "weight": 32, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json b/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json index 686eff2892..d1872f1c41 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json @@ -195,4 +195,4 @@ "weight": 64, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json index 3a79dc1b55..dbb1ffc843 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json @@ -350,4 +350,4 @@ "weight": 95, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json b/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json index 2e63834896..d5abe300fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json @@ -315,4 +315,4 @@ "weight": 120, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json b/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json index 4239625d2a..e768a39fba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json @@ -277,7 +277,6 @@ "tutor:charge", "tutor:curse", "tutor:defog", - "tutor:detect", "tutor:discharge", "tutor:doubleedge", "tutor:doubleteam", @@ -326,15 +325,13 @@ "tutor:swift", "tutor:tailwind", "tutor:takedown", - "tutor:thunder", "tutor:thunderbolt", "tutor:thundershock", "tutor:thunderwave", "tutor:toxic", "tutor:twister", "tutor:uturn", - "tutor:whirlwind", - "tutor:zapcannon" + "tutor:whirlwind" ], "labels": [ "gen1", @@ -364,4 +361,4 @@ "weight": 526, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/zubat.json b/common/src/main/resources/data/cobblemon/species/generation1/zubat.json index 17ad66caa9..98144f38c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/zubat.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/zubat.json @@ -242,4 +242,4 @@ "weight": 75, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/aipom.json b/common/src/main/resources/data/cobblemon/species/generation2/aipom.json index deaad6d9ac..dbbac5f837 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/aipom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/aipom.json @@ -266,4 +266,4 @@ "weight": 115, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json index 9999de4c7d..dea3ca3a2f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json @@ -275,4 +275,4 @@ "weight": 615, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json index 4c5f521f77..d79873e66d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json @@ -64,17 +64,17 @@ "19:shadowsneak", "23:furyswipes", "28:suckerpunch", + "31:agility", "32:spiderweb", - "37:agility", - "41:pinmissile", - "46:psychic", - "50:poisonjab", - "55:crosspoison", - "58:stickyweb", - "63:toxicthread", - "tm:attract", + "35:pinmissile", + "41:psychic", + "46:poisonjab", + "50:crosspoison", + "54:stickyweb", + "59:toxicthread", "tm:acidspray", "tm:agility", + "tm:attract", "tm:batonpass", "tm:bugbite", "tm:bugbuzz", @@ -135,7 +135,6 @@ "tutor:bounce", "tutor:bugbite", "tutor:constrict", - "tutor:crosspoison", "tutor:curse", "tutor:dig", "tutor:doubleedge", @@ -152,7 +151,6 @@ "tutor:leechlife", "tutor:mimic", "tutor:nightshade", - "tutor:poisonjab", "tutor:poisonsting", "tutor:protect", "tutor:psychic", @@ -166,7 +164,6 @@ "tutor:snore", "tutor:solarbeam", "tutor:spiderweb", - "tutor:stickyweb", "tutor:stompingtantrum", "tutor:stringshot", "tutor:substitute", @@ -175,8 +172,7 @@ "tutor:swagger", "tutor:thief", "tutor:throatchop", - "tutor:toxic", - "tutor:toxicthread" + "tutor:toxic" ], "labels": [ "gen2" @@ -205,4 +201,4 @@ "weight": 335, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json index d0499e6b7e..9727925f97 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json @@ -218,4 +218,4 @@ "weight": 285, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json b/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json index 03a0208aac..929f68b641 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json @@ -208,4 +208,4 @@ "weight": 158, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json index 824cd2d9d5..c42bc45d6a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json @@ -185,4 +185,4 @@ "weight": 58, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/blissey.json b/common/src/main/resources/data/cobblemon/species/generation2/blissey.json index 8e202c8ca7..5e97e79b18 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/blissey.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/blissey.json @@ -284,4 +284,4 @@ "weight": 468, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/celebi.json b/common/src/main/resources/data/cobblemon/species/generation2/celebi.json index b623f0ec4c..2eea53def9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/celebi.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/celebi.json @@ -225,4 +225,4 @@ "weight": 50, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json b/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json index 02371a036a..30912514a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json @@ -219,4 +219,4 @@ "weight": 64, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json b/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json index 038be57595..3ce4ed740d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json @@ -239,4 +239,4 @@ "weight": 120, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json b/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json index fe29ece4db..22597c0ef5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json @@ -254,4 +254,4 @@ "weight": 30, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/corsola.json b/common/src/main/resources/data/cobblemon/species/generation2/corsola.json index a5f2b0010e..d4cef6bbbb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/corsola.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/corsola.json @@ -371,4 +371,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/crobat.json b/common/src/main/resources/data/cobblemon/species/generation2/crobat.json index ebd7d80057..a56bd2c686 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/crobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/crobat.json @@ -213,4 +213,4 @@ "weight": 750, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json b/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json index 5ad8efa7f9..f2f187ab52 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json @@ -243,4 +243,4 @@ "weight": 250, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json b/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json index 49f8c67316..558db2c5eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json @@ -442,7 +442,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:regional_bias_evolutions/cyndaquil_quilava_hisui_bias" + "biomeCondition": "#cobblemon:evolution/cyndaquil_quilava_hisui_bias" } ] } @@ -466,4 +466,4 @@ "weight": 79, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/delibird.json b/common/src/main/resources/data/cobblemon/species/generation2/delibird.json index 06addba4b8..81e024bfb7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/delibird.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/delibird.json @@ -217,4 +217,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/donphan.json b/common/src/main/resources/data/cobblemon/species/generation2/donphan.json index 448448dcf1..6bc0540a89 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/donphan.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/donphan.json @@ -225,4 +225,4 @@ "weight": 1200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json b/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json index ab547d1189..3c1ee7175e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json @@ -284,4 +284,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/elekid.json b/common/src/main/resources/data/cobblemon/species/generation2/elekid.json index 2d7ee74276..49ee579680 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/elekid.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/elekid.json @@ -241,4 +241,4 @@ "weight": 235, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/entei.json b/common/src/main/resources/data/cobblemon/species/generation2/entei.json index 9b7236951b..f756e1f134 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/entei.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/entei.json @@ -138,7 +138,6 @@ "tutor:ironhead", "tutor:irontail", "tutor:laserfocus", - "tutor:lavaplume", "tutor:leer", "tutor:mimic", "tutor:mudslap", @@ -161,8 +160,6 @@ "tutor:stoneedge", "tutor:strength", "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", "tutor:swift", "tutor:toxic" ], @@ -204,4 +201,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json index d2ed20d62b..3bb3ab5333 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json @@ -227,4 +227,4 @@ "weight": 265, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json b/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json index 6e6c067151..8f0ca4a944 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json @@ -256,4 +256,4 @@ "weight": 888, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json index 8119e41abf..6b84d97ed1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json @@ -223,4 +223,4 @@ "weight": 133, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/forretress.json b/common/src/main/resources/data/cobblemon/species/generation2/forretress.json index 092bc3cb6e..f7c4f2a1d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/forretress.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/forretress.json @@ -230,4 +230,4 @@ "weight": 1258, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/furret.json b/common/src/main/resources/data/cobblemon/species/generation2/furret.json index ed8b09297a..8a30348b0e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/furret.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/furret.json @@ -217,4 +217,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json b/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json index 4821dde2b0..394b8d865d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json @@ -266,4 +266,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json index 151775644f..16f2b9b741 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json @@ -263,4 +263,4 @@ "weight": 648, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/granbull.json b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json index 7b46b82485..d7043cbb02 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/granbull.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json @@ -260,4 +260,4 @@ "weight": 487, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/heracross.json b/common/src/main/resources/data/cobblemon/species/generation2/heracross.json index b42f75ffc4..cb2a3e417b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/heracross.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/heracross.json @@ -283,4 +283,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json index 9c02f7cceb..6641847d07 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json @@ -212,4 +212,4 @@ "weight": 480, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hooh.json b/common/src/main/resources/data/cobblemon/species/generation2/hooh.json index d2b4b630a3..ab45dcae94 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hooh.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hooh.json @@ -142,7 +142,6 @@ "tutor:earthpower", "tutor:earthquake", "tutor:endure", - "tutor:extrasensory", "tutor:fireblast", "tutor:flareblitz", "tutor:flash", @@ -166,13 +165,11 @@ "tutor:psychup", "tutor:punishment", "tutor:raindance", - "tutor:recover", "tutor:rest", "tutor:return", "tutor:roar", "tutor:rocksmash", "tutor:roost", - "tutor:sacredfire", "tutor:safeguard", "tutor:sandstorm", "tutor:scorchingsands", @@ -186,7 +183,6 @@ "tutor:steelwing", "tutor:strength", "tutor:substitute", - "tutor:sunnyday", "tutor:swagger", "tutor:swift", "tutor:tailwind", @@ -238,4 +234,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json b/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json index d4ddf92609..8c7308c913 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json @@ -252,4 +252,4 @@ "weight": 212, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json b/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json index 253692649c..bc0ad6220d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json @@ -211,4 +211,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json b/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json index 6765d7004c..22275aa231 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json @@ -268,4 +268,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/houndour.json b/common/src/main/resources/data/cobblemon/species/generation2/houndour.json index 57329c46be..f08d155c9c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/houndour.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/houndour.json @@ -248,4 +248,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json b/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json index 25e4fac646..f2757f7393 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json @@ -240,4 +240,4 @@ "weight": 10, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json b/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json index b89019287a..690f658cf3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json @@ -185,4 +185,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json b/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json index 4ee2455254..ed52bb33b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json @@ -204,4 +204,4 @@ "weight": 1520, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json index 7eb0831fe3..1a4ca60216 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json @@ -215,4 +215,4 @@ "weight": 225, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/larvitar.json b/common/src/main/resources/data/cobblemon/species/generation2/larvitar.json index e8337a194c..f0e3c9e700 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/larvitar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/larvitar.json @@ -235,4 +235,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ledian.json b/common/src/main/resources/data/cobblemon/species/generation2/ledian.json index 54d1017715..3228f6cd6d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ledian.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ledian.json @@ -173,4 +173,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json b/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json index 22eda7cfe5..081132a1d1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json @@ -197,4 +197,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/lugia.json b/common/src/main/resources/data/cobblemon/species/generation2/lugia.json index fcaab006b7..1248abb8da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/lugia.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/lugia.json @@ -138,7 +138,6 @@ "tm:whirlpool", "tm:wonderroom", "tm:zenheadbutt", - "tutor:aeroblast", "tutor:aircutter", "tutor:ancientpower", "tutor:aquatail", @@ -158,7 +157,6 @@ "tutor:earthpower", "tutor:earthquake", "tutor:endure", - "tutor:extrasensory", "tutor:featherdance", "tutor:fly", "tutor:frustration", @@ -185,8 +183,6 @@ "tutor:psychoboost", "tutor:psychup", "tutor:punishment", - "tutor:raindance", - "tutor:recover", "tutor:rest", "tutor:return", "tutor:roar", @@ -261,4 +257,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/magby.json b/common/src/main/resources/data/cobblemon/species/generation2/magby.json index 946d20187b..f46cd5db19 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/magby.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/magby.json @@ -223,4 +223,4 @@ "weight": 214, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json b/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json index 158fc89db5..3174fc0451 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json @@ -218,4 +218,4 @@ "weight": 550, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/mantine.json b/common/src/main/resources/data/cobblemon/species/generation2/mantine.json index 08549e49f9..4cadd3b559 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/mantine.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/mantine.json @@ -212,4 +212,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/mareep.json b/common/src/main/resources/data/cobblemon/species/generation2/mareep.json index c9f692a5cb..47288d0d25 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/mareep.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/mareep.json @@ -223,4 +223,4 @@ "weight": 78, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/marill.json b/common/src/main/resources/data/cobblemon/species/generation2/marill.json index 059c14f08b..0e98ec02e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/marill.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/marill.json @@ -253,4 +253,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/meganium.json b/common/src/main/resources/data/cobblemon/species/generation2/meganium.json index 1f997e697a..ee6940fd3c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/meganium.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/meganium.json @@ -215,4 +215,4 @@ "weight": 1005, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/miltank.json b/common/src/main/resources/data/cobblemon/species/generation2/miltank.json index 299144fcbe..163da32144 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/miltank.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/miltank.json @@ -252,4 +252,4 @@ "weight": 755, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json b/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json index 46f4049491..38f94abe7c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json @@ -245,4 +245,4 @@ "weight": 10, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json b/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json index f24a920349..d27565add7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json @@ -251,4 +251,4 @@ "weight": 21, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/natu.json b/common/src/main/resources/data/cobblemon/species/generation2/natu.json index 711bb794bd..9665fd6c23 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/natu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/natu.json @@ -247,4 +247,4 @@ "weight": 20, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json index f6eea53262..ec6944e4ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json @@ -226,4 +226,4 @@ "weight": 408, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/octillery.json b/common/src/main/resources/data/cobblemon/species/generation2/octillery.json index c4c75fb003..a3878cea7a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/octillery.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/octillery.json @@ -190,4 +190,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json b/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json index 032de96f1f..8a1f901f6d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json @@ -225,4 +225,4 @@ "weight": 335, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json index 4f87965b5d..f83d284d64 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json @@ -214,7 +214,6 @@ "tutor:attract", "tutor:bide", "tutor:bodyslam", - "tutor:charge", "tutor:charm", "tutor:counter", "tutor:covet", @@ -227,13 +226,11 @@ "tutor:electroweb", "tutor:encore", "tutor:endeavor", - "tutor:endure", "tutor:flash", "tutor:followme", "tutor:frustration", "tutor:grassknot", "tutor:headbutt", - "tutor:helpinghand", "tutor:hiddenpower", "tutor:irontail", "tutor:magnetrise", @@ -267,7 +264,6 @@ "tutor:thunderwave", "tutor:toxic", "tutor:uproar", - "tutor:volttackle", "tutor:wish", "tutor:zapcannon" ], @@ -312,4 +308,4 @@ "weight": 20, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json index 4d4a4a8a69..6940d881fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json @@ -224,4 +224,4 @@ "weight": 558, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pineco.json b/common/src/main/resources/data/cobblemon/species/generation2/pineco.json index 2fd658d292..798d14db38 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pineco.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pineco.json @@ -215,6 +215,7 @@ "variant": "level_up", "result": "forretress shulker", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "heavyslam" ], @@ -249,4 +250,4 @@ "weight": 72, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/politoed.json b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json index ad89e17253..1c82f217ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/politoed.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json @@ -222,4 +222,4 @@ "weight": 339, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json b/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json index 43513ee64e..265ff80168 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json @@ -227,4 +227,4 @@ "weight": 325, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json b/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json index 4b20f6bef3..6b82bc6fea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json @@ -5,7 +5,8 @@ "primaryType": "rock", "secondaryType": "ground", "abilities": [ - "shedskin" + "shedskin", + "h:shedskin" ], "baseStats": { "hp": 70, @@ -220,4 +221,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json b/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json index 5a3e4f821c..e64536b8dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json @@ -231,4 +231,4 @@ "weight": 750, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/quilava.json b/common/src/main/resources/data/cobblemon/species/generation2/quilava.json index cf02dad391..c9b63a742b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/quilava.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/quilava.json @@ -426,7 +426,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:regional_bias_evolutions/cyndaquil_quilava_hisui_bias" + "biomeCondition": "#cobblemon:evolution/cyndaquil_quilava_hisui_bias" } ] } @@ -450,4 +450,4 @@ "weight": 190, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json b/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json index 5d34d7f9c5..b6bbac3dca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json @@ -417,4 +417,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/raikou.json b/common/src/main/resources/data/cobblemon/species/generation2/raikou.json index 3cb23ad919..c9dab7d8c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/raikou.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/raikou.json @@ -119,11 +119,9 @@ "tutor:cut", "tutor:detect", "tutor:dig", - "tutor:discharge", "tutor:doubleedge", "tutor:doubleteam", "tutor:endure", - "tutor:extrasensory", "tutor:extremespeed", "tutor:flash", "tutor:frustration", @@ -141,8 +139,6 @@ "tutor:protect", "tutor:psychup", "tutor:quickattack", - "tutor:raindance", - "tutor:reflect", "tutor:rest", "tutor:return", "tutor:risingvoltage", @@ -205,4 +201,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json b/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json index b45565a4df..0088f691a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json @@ -224,4 +224,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json index 1e08f5c994..74bda8dd26 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json @@ -275,4 +275,4 @@ "weight": 1180, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sentret.json b/common/src/main/resources/data/cobblemon/species/generation2/sentret.json index 8637b1edea..c4de429805 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sentret.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sentret.json @@ -240,4 +240,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json b/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json index 62a3f94dde..b671855d86 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json @@ -207,4 +207,4 @@ "weight": 205, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json b/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json index 0cc5f48b52..a53fd1fee1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json @@ -237,4 +237,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json b/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json index 76d035fc1d..f332e2bbb5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json @@ -193,4 +193,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/slowking.json b/common/src/main/resources/data/cobblemon/species/generation2/slowking.json index 7d43d4a25e..302b3f37ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/slowking.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/slowking.json @@ -480,4 +480,4 @@ "weight": 795, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/slugma.json b/common/src/main/resources/data/cobblemon/species/generation2/slugma.json index 3fb179b185..858f953563 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/slugma.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/slugma.json @@ -223,4 +223,4 @@ "weight": 350, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/smeargle.json b/common/src/main/resources/data/cobblemon/species/generation2/smeargle.json index 7db24ec282..c763dda122 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/smeargle.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/smeargle.json @@ -1,4 +1,5 @@ { + "implemented": true, "name": "Smeargle", "nationalPokedexNumber": 235, "primaryType": "normal", @@ -15,6 +16,14 @@ "special_defence": 45, "speed": 75 }, + "behaviour": { + "resting": { + "canSleep": true, + "willSleepOnBed": false, + "depth": "normal", + "light": "0-4" + } + }, "catchRate": 45, "maleRatio": 0.5, "shoulderMountable": false, @@ -44,10 +53,10 @@ "cobblemon.species.smeargle.desc" ], "evolutions": [], - "baseScale": 1, + "baseScale": 0.6, "hitbox": { - "width": 1, - "height": 1, + "width": 0.8, + "height": 1.8, "fixed": false }, "baseFriendship": 70, @@ -63,4 +72,4 @@ "weight": 580, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json b/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json index c49a689a84..365c58fe33 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json @@ -226,4 +226,4 @@ "weight": 60, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json index 1e47d9fa42..f8b3372f3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json @@ -163,7 +163,9 @@ "result": "sneasler", "consumeHeldItem": true, "permanent": true, - "learnableMoves": [], + "learnableMoves": [ + "direclaw" + ], "requirements": [ { "variant": "held_item", @@ -443,4 +445,4 @@ "weight": 280, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json b/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json index d4fc00b4cf..94f8237641 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json @@ -281,4 +281,4 @@ "weight": 78, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json b/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json index a05fae4100..47a2040fdd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json @@ -66,6 +66,7 @@ "36:psychic", "40:poisonjab", "44:crosspoison", + "47:stickyweb", "51:toxicthread", "egg:batonpass", "egg:disable", @@ -221,4 +222,4 @@ "weight": 85, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/stantler.json b/common/src/main/resources/data/cobblemon/species/generation2/stantler.json index d6f184eb62..f511e83b2d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/stantler.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/stantler.json @@ -220,7 +220,9 @@ "variant": "level_up", "result": "wyrdeer", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "psyshieldbash" + ], "requirements": [ { "variant": "use_move", @@ -249,4 +251,4 @@ "weight": 712, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json index 46e9918d1a..f744cde32d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json @@ -283,4 +283,4 @@ "weight": 4000, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json index e71ccd3382..ecd51f4e7d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json @@ -231,4 +231,4 @@ "weight": 380, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/suicune.json b/common/src/main/resources/data/cobblemon/species/generation2/suicune.json index 5d1badcd74..29ebcc0ede 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/suicune.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/suicune.json @@ -126,7 +126,6 @@ "tutor:doubleedge", "tutor:doubleteam", "tutor:endure", - "tutor:extrasensory", "tutor:extremespeed", "tutor:frustration", "tutor:gust", @@ -142,13 +141,11 @@ "tutor:leer", "tutor:liquidation", "tutor:mimic", - "tutor:mirrorcoat", "tutor:mist", "tutor:mudslap", "tutor:ominouswind", "tutor:protect", "tutor:psychup", - "tutor:raindance", "tutor:rest", "tutor:return", "tutor:roar", @@ -160,7 +157,6 @@ "tutor:snore", "tutor:substitute", "tutor:sunnyday", - "tutor:surf", "tutor:swagger", "tutor:swift", "tutor:tailwind", @@ -205,4 +201,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json b/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json index fafd8e4ea0..2a529a1205 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json @@ -174,4 +174,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json b/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json index 13268c1309..33f068d11f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json @@ -185,4 +185,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/swinub.json b/common/src/main/resources/data/cobblemon/species/generation2/swinub.json index 7692839274..8502337357 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/swinub.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/swinub.json @@ -231,4 +231,4 @@ "weight": 65, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json b/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json index 7ce0d6c4c4..cf6e9b5e94 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json @@ -260,4 +260,4 @@ "weight": 88, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/togepi.json b/common/src/main/resources/data/cobblemon/species/generation2/togepi.json index 8ec7c810c4..6899f749e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/togepi.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/togepi.json @@ -253,4 +253,4 @@ "weight": 15, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json b/common/src/main/resources/data/cobblemon/species/generation2/togetic.json index 082b2b14ee..8b4cda3871 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/togetic.json @@ -255,4 +255,4 @@ "weight": 32, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/totodile.json b/common/src/main/resources/data/cobblemon/species/generation2/totodile.json index 49d689d4ba..162be36df2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/totodile.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/totodile.json @@ -256,4 +256,4 @@ "weight": 95, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json index a886f7513a..8110d2e56a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json @@ -363,4 +363,4 @@ "weight": 795, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json b/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json index b11aa88c58..da19e4f403 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json @@ -336,4 +336,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json b/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json index 61358ae34e..b87869fca3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json @@ -171,8 +171,9 @@ "minLevel": 20 }, { - "variant": "attack_defence_ratio", - "ratio": "ATTACK_HIGHER" + "variant": "stat_compare", + "highStat": "atk", + "lowStat": "def" } ] }, @@ -188,8 +189,9 @@ "minLevel": 20 }, { - "variant": "attack_defence_ratio", - "ratio": "DEFENCE_HIGHER" + "variant": "stat_compare", + "highStat": "def", + "lowStat": "atk" } ] }, @@ -207,8 +209,9 @@ "minLevel": 20 }, { - "variant": "attack_defence_ratio", - "ratio": "EQUAL" + "variant": "stat_equal", + "statOne": "atk", + "statTwo": "def" } ] } @@ -232,4 +235,4 @@ "weight": 210, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json index 475b36d05a..ccdaec9c36 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json @@ -226,4 +226,4 @@ "weight": 270, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/unown.json b/common/src/main/resources/data/cobblemon/species/generation2/unown.json index 993f24337d..fa27d38d31 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/unown.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/unown.json @@ -62,4 +62,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json b/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json index a13f54bb9e..77834487b7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json @@ -140,6 +140,7 @@ "tm:torment", "tm:toxic", "tm:trailblaze", + "tm:uproar", "tm:workup", "tutor:attract", "tutor:bodyslam", @@ -218,7 +219,9 @@ "variant": "item_interact", "result": "ursaluna", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "headlongrush" + ], "requirements": [ { "variant": "moon_phase", @@ -251,4 +254,4 @@ "weight": 1258, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json b/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json index 52be8a93f7..a9feadfc3a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json @@ -79,4 +79,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/wooper.json b/common/src/main/resources/data/cobblemon/species/generation2/wooper.json index cef862718d..16a5c296ee 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/wooper.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/wooper.json @@ -143,7 +143,9 @@ "variant": "level_up", "result": "clodsire", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "amnesia" + ], "requirements": [ { "variant": "level", @@ -400,4 +402,4 @@ "weight": 85, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/xatu.json b/common/src/main/resources/data/cobblemon/species/generation2/xatu.json index e68935dec4..8249179820 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/xatu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/xatu.json @@ -229,4 +229,4 @@ "weight": 150, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/yanma.json b/common/src/main/resources/data/cobblemon/species/generation2/yanma.json index 66ef396ebb..1afd359a26 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/yanma.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/yanma.json @@ -212,4 +212,4 @@ "weight": 380, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/absol.json b/common/src/main/resources/data/cobblemon/species/generation3/absol.json index dc89593021..2464772573 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/absol.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/absol.json @@ -278,4 +278,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/aggron.json b/common/src/main/resources/data/cobblemon/species/generation3/aggron.json index e302e7acdc..5e3dc01cff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/aggron.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/aggron.json @@ -283,4 +283,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json index 2e64bc7dca..be0a62e731 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json @@ -173,6 +173,7 @@ "tm:uproar", "tm:willowisp", "tm:weatherball", + "tm:willowisp", "tm:wonderroom", "tutor:aerialace", "tutor:agility", @@ -258,4 +259,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/anorith.json b/common/src/main/resources/data/cobblemon/species/generation3/anorith.json index e1d30a1d9e..efc73196d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/anorith.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/anorith.json @@ -194,4 +194,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json b/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json index b5497fff55..c387a85e2f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json @@ -187,4 +187,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/aron.json b/common/src/main/resources/data/cobblemon/species/generation3/aron.json index 0ceee114cc..4a5334a1fd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/aron.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/aron.json @@ -196,4 +196,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/azurill.json b/common/src/main/resources/data/cobblemon/species/generation3/azurill.json index 8a0f585c60..69dea59999 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/azurill.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/azurill.json @@ -174,4 +174,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/bagon.json b/common/src/main/resources/data/cobblemon/species/generation3/bagon.json index 3793cd71a8..5703e5300a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/bagon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/bagon.json @@ -191,4 +191,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json b/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json index 7cbd6de9f7..425bb9714b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json @@ -201,4 +201,4 @@ "weight": 215, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/banette.json b/common/src/main/resources/data/cobblemon/species/generation3/banette.json index 115ec8fd1e..741949ee30 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/banette.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/banette.json @@ -240,4 +240,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/barboach.json b/common/src/main/resources/data/cobblemon/species/generation3/barboach.json index 077a1706d9..a0090c4563 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/barboach.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/barboach.json @@ -195,4 +195,4 @@ "weight": 19, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json b/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json index 0da4d01d59..c54157dfe5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json @@ -137,4 +137,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/beldum.json b/common/src/main/resources/data/cobblemon/species/generation3/beldum.json index de2805e66f..b57fd05c3a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/beldum.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/beldum.json @@ -111,4 +111,4 @@ "weight": 952, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json index e3e160463d..c4e7821a39 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json @@ -283,4 +283,4 @@ "weight": 520, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/breloom.json b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json index c5abc42c9e..b7b6bdf54e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/breloom.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json @@ -208,4 +208,4 @@ "weight": 392, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json b/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json index a5e7249299..aadf1c852a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json @@ -240,4 +240,4 @@ "weight": 513, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json b/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json index 70ca852d68..7e1c522741 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json @@ -226,4 +226,4 @@ "weight": 774, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json index 27ada34684..ad0815ecba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json @@ -229,4 +229,4 @@ "weight": 2200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json b/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json index 4ed79571ac..ca9f2d3212 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json @@ -199,4 +199,4 @@ "weight": 208, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cascoon.json b/common/src/main/resources/data/cobblemon/species/generation3/cascoon.json index 0c49303c06..3c3b1f9430 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cascoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cascoon.json @@ -3,7 +3,8 @@ "nationalPokedexNumber": 268, "primaryType": "bug", "abilities": [ - "shedskin" + "shedskin", + "h:shedskin" ], "baseStats": { "hp": 50, @@ -95,4 +96,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/castform.json b/common/src/main/resources/data/cobblemon/species/generation3/castform.json index 3d2edd8aeb..51e49f37be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/castform.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/castform.json @@ -304,4 +304,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json index 17ea017c51..ef0dbb4abb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json @@ -218,4 +218,4 @@ "weight": 10, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json b/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json index 6ec2ecc037..dc350a2085 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json @@ -167,4 +167,4 @@ "weight": 525, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/claydol.json b/common/src/main/resources/data/cobblemon/species/generation3/claydol.json index fdf9c95263..dca0f64abe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/claydol.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/claydol.json @@ -202,4 +202,4 @@ "weight": 1080, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/combusken.json b/common/src/main/resources/data/cobblemon/species/generation3/combusken.json index 69b60a4d31..555f617e61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/combusken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/combusken.json @@ -214,4 +214,4 @@ "weight": 195, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/corphish.json b/common/src/main/resources/data/cobblemon/species/generation3/corphish.json index 21e808e3b7..ec9dd0ef7c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/corphish.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/corphish.json @@ -187,4 +187,4 @@ "weight": 115, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cradily.json b/common/src/main/resources/data/cobblemon/species/generation3/cradily.json index ca7e7f48d1..7b73b88548 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cradily.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cradily.json @@ -177,4 +177,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json b/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json index 78caaa8b1a..8a57491e8f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json @@ -181,4 +181,4 @@ "weight": 328, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json b/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json index 4e88c89b1d..1c99212c3a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json @@ -152,4 +152,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json index 4611ecbe3b..b967813428 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json @@ -411,4 +411,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json b/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json index a25a11e835..67f8012db1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json @@ -240,4 +240,4 @@ "weight": 306, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/duskull.json b/common/src/main/resources/data/cobblemon/species/generation3/duskull.json index 4f1447ec83..847e60b7ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/duskull.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/duskull.json @@ -224,4 +224,4 @@ "weight": 150, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/dustox.json b/common/src/main/resources/data/cobblemon/species/generation3/dustox.json index 785733ad57..e41a025688 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dustox.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dustox.json @@ -138,4 +138,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/electrike.json b/common/src/main/resources/data/cobblemon/species/generation3/electrike.json index 79a0afa62e..449b8dc5bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/electrike.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/electrike.json @@ -178,4 +178,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json index d01c578a88..5a00906e2d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json @@ -195,4 +195,4 @@ "weight": 840, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/feebas.json b/common/src/main/resources/data/cobblemon/species/generation3/feebas.json index 883e063670..91bdf770cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/feebas.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/feebas.json @@ -161,4 +161,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/flygon.json b/common/src/main/resources/data/cobblemon/species/generation3/flygon.json index 2dc6697aba..fc9ac2a68f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/flygon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/flygon.json @@ -245,4 +245,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json index 5d4999664e..6583477016 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json @@ -303,4 +303,4 @@ "weight": 484, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/glalie.json b/common/src/main/resources/data/cobblemon/species/generation3/glalie.json index b37c30abdc..307dd92b03 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/glalie.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/glalie.json @@ -224,4 +224,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json index b3aa4558b8..5f6bffefe2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json @@ -148,4 +148,4 @@ "weight": 226, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/groudon.json b/common/src/main/resources/data/cobblemon/species/generation3/groudon.json index 455ba50aa6..ec36a3f5b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/groudon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/groudon.json @@ -186,14 +186,11 @@ "tutor:dragonpulse", "tutor:dynamicpunch", "tutor:earthpower", - "tutor:earthquake", "tutor:endure", "tutor:eruption", "tutor:fireblast", "tutor:firepunch", - "tutor:fissure", "tutor:furycutter", - "tutor:hammerarm", "tutor:headbutt", "tutor:ironhead", "tutor:irontail", @@ -204,7 +201,6 @@ "tutor:mudslap", "tutor:precipiceblades", "tutor:psychup", - "tutor:rest", "tutor:rockslide", "tutor:rollout", "tutor:scaryface", @@ -260,4 +256,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json b/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json index b82caf4bfd..f0be1e209f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json @@ -218,4 +218,4 @@ "weight": 216, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json b/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json index f65d4904ac..c54f5f60db 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json @@ -225,4 +225,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gulpin.json b/common/src/main/resources/data/cobblemon/species/generation3/gulpin.json index 8e3c95db02..4a767d1635 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gulpin.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gulpin.json @@ -202,4 +202,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json b/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json index 685f392719..53dc20dfae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json @@ -201,4 +201,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/huntail.json b/common/src/main/resources/data/cobblemon/species/generation3/huntail.json index c1583a1d0a..fcae5976bf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/huntail.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/huntail.json @@ -148,4 +148,4 @@ "weight": 270, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/illumise.json b/common/src/main/resources/data/cobblemon/species/generation3/illumise.json index bdc86a2ed9..b875e4071b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/illumise.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/illumise.json @@ -219,4 +219,4 @@ "weight": 177, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json b/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json index b0d90c47c8..20739214ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json @@ -221,4 +221,4 @@ "weight": 11, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json b/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json index b404db1906..b3fc203d49 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json @@ -201,4 +201,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json b/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json index 202764ae6a..dcde286a8d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json @@ -259,4 +259,4 @@ "weight": 202, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json b/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json index a832d01e0e..776bb6af20 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json @@ -145,7 +145,6 @@ "tm:waterpulse", "tm:whirlpool", "tutor:ancientpower", - "tutor:aquaring", "tutor:aquatail", "tutor:block", "tutor:bodyslam", @@ -156,18 +155,15 @@ "tutor:endure", "tutor:headbutt", "tutor:hydropump", - "tutor:icebeam", "tutor:icywind", "tutor:ironhead", "tutor:liquidation", "tutor:mimic", - "tutor:muddywater", "tutor:mudslap", "tutor:originpulse", "tutor:psychup", "tutor:rest", "tutor:rockslide", - "tutor:sheercold", "tutor:shockwave", "tutor:signalbeam", "tutor:sleeptalk", @@ -217,4 +213,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lairon.json b/common/src/main/resources/data/cobblemon/species/generation3/lairon.json index 7ff53fb280..019047cd35 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lairon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lairon.json @@ -187,4 +187,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/latias.json b/common/src/main/resources/data/cobblemon/species/generation3/latias.json index b599a0c409..589c2702df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/latias.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/latias.json @@ -216,11 +216,9 @@ "tutor:mistball", "tutor:mudslap", "tutor:outrage", - "tutor:psychic", "tutor:psychoshift", "tutor:psychup", "tutor:recover", - "tutor:reflecttype", "tutor:refresh", "tutor:roleplay", "tutor:roost", @@ -280,4 +278,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/latios.json b/common/src/main/resources/data/cobblemon/species/generation3/latios.json index bd667a6dbf..f87fa7b52e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/latios.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/latios.json @@ -198,9 +198,7 @@ "tutor:dive", "tutor:doubleedge", "tutor:dracometeor", - "tutor:dragonbreath", "tutor:dragondance", - "tutor:dragonpulse", "tutor:dreameater", "tutor:dualwingbeat", "tutor:endure", @@ -210,7 +208,6 @@ "tutor:icywind", "tutor:laserfocus", "tutor:lastresort", - "tutor:lusterpurge", "tutor:magiccoat", "tutor:mimic", "tutor:mudslap", @@ -235,8 +232,7 @@ "tutor:trick", "tutor:twister", "tutor:waterpulse", - "tutor:wonderroom", - "tutor:zenheadbutt" + "tutor:wonderroom" ], "labels": [ "gen3", @@ -274,4 +270,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lileep.json b/common/src/main/resources/data/cobblemon/species/generation3/lileep.json index 0e6c3bf9e7..e467d6e6cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lileep.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lileep.json @@ -191,4 +191,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/linoone.json b/common/src/main/resources/data/cobblemon/species/generation3/linoone.json index 408913d6ee..793d801fd8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/linoone.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/linoone.json @@ -344,4 +344,4 @@ "aspects": [], "evolutions": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lombre.json b/common/src/main/resources/data/cobblemon/species/generation3/lombre.json index 0321dc9d6c..6fdaf94565 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lombre.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lombre.json @@ -223,4 +223,4 @@ "weight": 325, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lotad.json b/common/src/main/resources/data/cobblemon/species/generation3/lotad.json index 59944059c5..d5ae4d8117 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lotad.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lotad.json @@ -207,4 +207,4 @@ "weight": 26, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json index 8ac8bb89a6..dc07370407 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json @@ -185,4 +185,4 @@ "weight": 405, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json b/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json index 9db038156e..719d02bfb0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json @@ -227,4 +227,4 @@ "weight": 550, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json b/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json index 1b1046d5b2..09ef970698 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json @@ -213,4 +213,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json b/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json index 7e0d673d84..70104c98f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json @@ -167,4 +167,4 @@ "weight": 87, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json b/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json index bcf05bd9c6..4138cdb3e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json @@ -218,4 +218,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/manectric.json b/common/src/main/resources/data/cobblemon/species/generation3/manectric.json index c2d906cac7..45435963e1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/manectric.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/manectric.json @@ -211,4 +211,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json b/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json index bb1ee4885d..5151ad9956 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json @@ -217,4 +217,4 @@ "weight": 280, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json b/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json index f79508fa1b..449d8b0742 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json @@ -197,4 +197,4 @@ "weight": 36, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json index 06a92e92c2..0e7fba7076 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json @@ -280,4 +280,4 @@ "weight": 115, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json b/common/src/main/resources/data/cobblemon/species/generation3/medicham.json index 9aaa296504..c77ef405f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/medicham.json @@ -261,4 +261,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/meditite.json b/common/src/main/resources/data/cobblemon/species/generation3/meditite.json index 6824db7cf2..f47e968926 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/meditite.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/meditite.json @@ -235,4 +235,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/metagross.json b/common/src/main/resources/data/cobblemon/species/generation3/metagross.json index 2370b471d9..c26e8010ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/metagross.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/metagross.json @@ -278,4 +278,4 @@ "weight": 5500, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/metang.json b/common/src/main/resources/data/cobblemon/species/generation3/metang.json index 1d82a4d2e9..ce5e0a083b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/metang.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/metang.json @@ -230,4 +230,4 @@ "weight": 2025, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json b/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json index 64a505852e..6c9a90f5da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json @@ -196,4 +196,4 @@ "weight": 370, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/milotic.json b/common/src/main/resources/data/cobblemon/species/generation3/milotic.json index 0db80d2fc4..44267c99ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/milotic.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/milotic.json @@ -189,4 +189,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/minun.json b/common/src/main/resources/data/cobblemon/species/generation3/minun.json index cde76d5377..d1a729b552 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/minun.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/minun.json @@ -188,4 +188,4 @@ "weight": 42, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json b/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json index ccd6dd0842..3e974a2d38 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json @@ -215,4 +215,4 @@ "weight": 76, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nincada.json b/common/src/main/resources/data/cobblemon/species/generation3/nincada.json index 36fc63f95b..2e15a5b7fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nincada.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nincada.json @@ -129,6 +129,7 @@ "id": "nincada_ninjask", "variant": "level_up", "result": "ninjask", + "shedder": "shedinja", "consumeHeldItem": false, "learnableMoves": [ "doubleteam", @@ -162,4 +163,4 @@ "weight": 55, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/ninjask.json b/common/src/main/resources/data/cobblemon/species/generation3/ninjask.json index 2a2379b13c..837027be32 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/ninjask.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/ninjask.json @@ -160,4 +160,4 @@ "weight": 120, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json b/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json index 2c73701852..6ba22b8988 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json @@ -216,4 +216,4 @@ "weight": 970, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/numel.json b/common/src/main/resources/data/cobblemon/species/generation3/numel.json index 5cb0e90905..5159f4455b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/numel.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/numel.json @@ -215,4 +215,4 @@ "weight": 240, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json b/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json index 6ce0debfd7..6828bc2032 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json @@ -201,8 +201,8 @@ ], "baseScale": 1, "hitbox": { - "width": 1, - "height": 1, + "width": 0.6, + "height": 1.2, "fixed": false }, "baseFriendship": 50, @@ -218,4 +218,4 @@ "weight": 280, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json index e682ebd4dc..542ac0fd7f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json @@ -206,4 +206,4 @@ "weight": 280, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json index 0faa3ee08d..d2794e8b91 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json @@ -190,4 +190,4 @@ "weight": 42, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json b/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json index 0a128fa79b..9ff2309073 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json @@ -198,4 +198,4 @@ "weight": 136, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/ralts.json b/common/src/main/resources/data/cobblemon/species/generation3/ralts.json index 306d002aee..210b9595db 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/ralts.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/ralts.json @@ -262,4 +262,4 @@ "weight": 66, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json b/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json index b6a876ec4e..75e70ccf8e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json @@ -206,15 +206,12 @@ "tutor:dragonascent", "tutor:dragonclaw", "tutor:dragondance", - "tutor:dragonpulse", "tutor:earthpower", "tutor:endure", "tutor:extremespeed", - "tutor:fly", "tutor:furycutter", "tutor:headbutt", "tutor:hyperbeam", - "tutor:hypervoice", "tutor:icywind", "tutor:ironhead", "tutor:irontail", @@ -223,7 +220,6 @@ "tutor:mudslap", "tutor:outrage", "tutor:psychup", - "tutor:rest", "tutor:rockslide", "tutor:scaleshot", "tutor:shockwave", @@ -267,4 +263,4 @@ "weight": 2065, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/regice.json b/common/src/main/resources/data/cobblemon/species/generation3/regice.json index 637608a5ea..5cb78b37b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/regice.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/regice.json @@ -188,4 +188,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/regirock.json b/common/src/main/resources/data/cobblemon/species/generation3/regirock.json index 988b0862a8..3619b975e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/regirock.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/regirock.json @@ -195,4 +195,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/registeel.json b/common/src/main/resources/data/cobblemon/species/generation3/registeel.json index 747bfb201f..a0ac95e2f9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/registeel.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/registeel.json @@ -199,4 +199,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json index 00923d8052..59790aa661 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json @@ -193,4 +193,4 @@ "weight": 234, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/roselia.json b/common/src/main/resources/data/cobblemon/species/generation3/roselia.json index 1221d1e201..473fcfaee5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/roselia.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/roselia.json @@ -208,4 +208,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sableye.json b/common/src/main/resources/data/cobblemon/species/generation3/sableye.json index ac06c73c30..899cebdb61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sableye.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sableye.json @@ -320,4 +320,4 @@ "weight": 110, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/salamence.json b/common/src/main/resources/data/cobblemon/species/generation3/salamence.json index 3920144822..8bbf4ec6dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/salamence.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/salamence.json @@ -259,4 +259,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json index c7eed4aef8..809e94e53e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json @@ -281,4 +281,4 @@ "weight": 522, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json b/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json index 34079fe946..84649035a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json @@ -163,4 +163,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/seedot.json b/common/src/main/resources/data/cobblemon/species/generation3/seedot.json index c9c3cd9584..6c734c274d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/seedot.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/seedot.json @@ -179,8 +179,8 @@ ], "baseScale": 1, "hitbox": { - "width": 1, - "height": 1, + "width": 0.6, + "height": 0.65, "fixed": false }, "baseFriendship": 50, @@ -196,4 +196,4 @@ "weight": 40, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/seviper.json b/common/src/main/resources/data/cobblemon/species/generation3/seviper.json index 8ba95e18e5..60b7f405c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/seviper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/seviper.json @@ -206,4 +206,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json index 92ddb24f1a..7f4df3584d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json @@ -239,4 +239,4 @@ "weight": 888, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shedinja.json b/common/src/main/resources/data/cobblemon/species/generation3/shedinja.json index cf0b60e409..3ae5837bbe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shedinja.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shedinja.json @@ -158,4 +158,4 @@ "weight": 12, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json b/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json index 9a44c007c7..b30a4c9255 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json @@ -180,4 +180,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json b/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json index b23e78fcd8..8b633132f7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json @@ -6,7 +6,7 @@ "secondaryType": "dark", "abilities": [ "chlorophyll", - "earlybird", + "windrider", "h:pickpocket" ], "drops": { @@ -229,7 +229,7 @@ "baseScale": 1, "hitbox": { "width": 1, - "height": 1, + "height": 1.7, "fixed": false }, "baseFriendship": 50, @@ -245,4 +245,4 @@ "weight": 596, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json b/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json index 60c51ae607..209186ae7f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json @@ -185,4 +185,4 @@ "weight": 45, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json b/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json index b145ed40b2..72dcb99ce4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json @@ -213,4 +213,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/silcoon.json b/common/src/main/resources/data/cobblemon/species/generation3/silcoon.json index 1b802aa6d2..1635d62c12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/silcoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/silcoon.json @@ -3,7 +3,8 @@ "nationalPokedexNumber": 266, "primaryType": "bug", "abilities": [ - "shedskin" + "shedskin", + "h:shedskin" ], "baseStats": { "hp": 50, @@ -95,4 +96,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/skitty.json b/common/src/main/resources/data/cobblemon/species/generation3/skitty.json index 62ec245119..d749ebb27f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/skitty.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/skitty.json @@ -190,4 +190,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/slaking.json b/common/src/main/resources/data/cobblemon/species/generation3/slaking.json index bfc41e519a..e097f5dfe4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/slaking.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/slaking.json @@ -215,4 +215,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json b/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json index e58fa91bc9..db2846d13d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json @@ -198,4 +198,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json b/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json index ca6f59764a..81ab80aba5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json @@ -197,4 +197,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/solrock.json b/common/src/main/resources/data/cobblemon/species/generation3/solrock.json index b31932e968..e2d28f9bcc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/solrock.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/solrock.json @@ -218,4 +218,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/spheal.json b/common/src/main/resources/data/cobblemon/species/generation3/spheal.json index 32f1aa0680..eec8e8fd8d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/spheal.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/spheal.json @@ -180,4 +180,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/spinda.json b/common/src/main/resources/data/cobblemon/species/generation3/spinda.json index 43d566a4a2..83a91fa8ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/spinda.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/spinda.json @@ -195,4 +195,4 @@ "weight": 50, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/spoink.json b/common/src/main/resources/data/cobblemon/species/generation3/spoink.json index 83bb64daaf..8af9718792 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/spoink.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/spoink.json @@ -216,4 +216,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/surskit.json b/common/src/main/resources/data/cobblemon/species/generation3/surskit.json index 5e4e873ca6..97c50ae36e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/surskit.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/surskit.json @@ -193,4 +193,4 @@ "weight": 17, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swablu.json b/common/src/main/resources/data/cobblemon/species/generation3/swablu.json index e3e3eecaad..7a6056cc07 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swablu.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swablu.json @@ -206,4 +206,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swalot.json b/common/src/main/resources/data/cobblemon/species/generation3/swalot.json index e8e7e66b6d..8dba113476 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swalot.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swalot.json @@ -183,4 +183,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json index b8516baee0..e501afbebd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json @@ -279,4 +279,4 @@ "weight": 819, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json index 841d41864c..35d624e970 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json @@ -156,4 +156,4 @@ "weight": 198, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/taillow.json b/common/src/main/resources/data/cobblemon/species/generation3/taillow.json index 64bfc13aab..a89a2944bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/taillow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/taillow.json @@ -177,4 +177,4 @@ "weight": 23, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/torchic.json b/common/src/main/resources/data/cobblemon/species/generation3/torchic.json index 32dbea5fd1..5db9eba526 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/torchic.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/torchic.json @@ -209,4 +209,4 @@ "weight": 25, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json b/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json index 68b7ee0135..dea571200e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json @@ -201,4 +201,4 @@ "weight": 804, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/trapinch.json b/common/src/main/resources/data/cobblemon/species/generation3/trapinch.json index d3aab7ba29..441b9e2ca4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/trapinch.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/trapinch.json @@ -186,4 +186,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/treecko.json b/common/src/main/resources/data/cobblemon/species/generation3/treecko.json index 030924c41a..a505a3790a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/treecko.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/treecko.json @@ -227,4 +227,4 @@ "weight": 50, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/tropius.json b/common/src/main/resources/data/cobblemon/species/generation3/tropius.json index 3ada4bd6d4..6970eab2ec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/tropius.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/tropius.json @@ -198,4 +198,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json b/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json index 5cd022a356..f88b55d81c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json @@ -224,4 +224,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json b/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json index 21edc871b7..5647241c4d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json @@ -211,4 +211,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json b/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json index f1231f46de..9159e627b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json @@ -219,4 +219,4 @@ "weight": 177, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json b/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json index 447502f6e8..846ba12633 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json @@ -195,4 +195,4 @@ "weight": 1300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wailord.json b/common/src/main/resources/data/cobblemon/species/generation3/wailord.json index 7492ec2579..5b8a4d7c18 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wailord.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wailord.json @@ -186,4 +186,4 @@ "weight": 3980, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/walrein.json b/common/src/main/resources/data/cobblemon/species/generation3/walrein.json index 7b1a5ec2bc..a5d83fe3c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/walrein.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/walrein.json @@ -171,4 +171,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json b/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json index c526b36e4f..bc00644f64 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json @@ -187,4 +187,4 @@ "weight": 236, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/whismur.json b/common/src/main/resources/data/cobblemon/species/generation3/whismur.json index 8a07cdf7ca..34660d6f7f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/whismur.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/whismur.json @@ -180,4 +180,4 @@ "weight": 163, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wingull.json b/common/src/main/resources/data/cobblemon/species/generation3/wingull.json index e0d3d7cafa..bab83a9c95 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wingull.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wingull.json @@ -217,4 +217,4 @@ "weight": 95, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json b/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json index 9fdca60265..b57d276b45 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json @@ -100,4 +100,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json b/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json index cd162fc595..2bc535dbc1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json @@ -91,4 +91,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json b/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json index df89fce87d..a0fbe09773 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json @@ -247,4 +247,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json b/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json index 52a6923f40..4c0e9a4bbf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json @@ -347,4 +347,4 @@ "weight": 175, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json b/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json index 33019ad04d..ef994565af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json @@ -238,4 +238,4 @@ "weight": 1355, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json b/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json index a45d94dc4e..ec2dc63b9a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json @@ -196,4 +196,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/arceus.json b/common/src/main/resources/data/cobblemon/species/generation4/arceus.json index 055f3727d8..f40e5e3add 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/arceus.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/arceus.json @@ -813,6 +813,7 @@ "tm:dazzlinggleam", "tm:defog", "tm:dive", + "tm:doubleedge", "tm:doubleteam", "tm:dracometeor", "tm:dragonclaw", @@ -836,10 +837,12 @@ "tm:focusblast", "tm:foulplay", "tm:frustration", + "tm:futuresight", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", + "tm:gravity", "tm:gunkshot", "tm:hail", "tm:heatwave", @@ -861,6 +864,7 @@ "tm:lightscreen", "tm:liquidation", "tm:magicalleaf", + "tm:meteorbeam", "tm:mistyterrain", "tm:naturalgift", "tm:outrage", @@ -890,6 +894,7 @@ "tm:safeguard", "tm:sandstorm", "tm:scaryface", + "tm:scorchingsands", "tm:secretpower", "tm:shadowball", "tm:shadowclaw", @@ -907,6 +912,7 @@ "tm:strength", "tm:substitute", "tm:sunnyday", + "tm:supercellslam", "tm:surf", "tm:swagger", "tm:swift", @@ -1008,4 +1014,4 @@ "weight": 3200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/azelf.json b/common/src/main/resources/data/cobblemon/species/generation4/azelf.json index 1766210eb1..52a114efa7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/azelf.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/azelf.json @@ -217,4 +217,4 @@ "weight": 3, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json b/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json index 084f1de24d..36a2a46a66 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json @@ -176,4 +176,4 @@ "weight": 1495, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json b/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json index f61adfa6bd..c66495e3c0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json @@ -182,4 +182,4 @@ "weight": 315, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json b/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json index fb37de9866..fcd98ed7d2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json @@ -197,4 +197,4 @@ "weight": 200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json b/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json index 7ee8755bf8..63044ebbef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json @@ -219,4 +219,4 @@ "weight": 150, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json b/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json index 75a86eb074..ecc9c05490 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json @@ -178,17 +178,10 @@ "tutor:allyswitch", "tutor:ancientpower", "tutor:block", - "tutor:bodypress", "tutor:expandingforce", - "tutor:flashcannon", "tutor:gravity", - "tutor:gyroball", - "tutor:hypnosis", - "tutor:irondefense", "tutor:ironhead", "tutor:meteorbeam", - "tutor:protect", - "tutor:psychic", "tutor:recycle", "tutor:rollout", "tutor:signalbeam", @@ -200,7 +193,6 @@ "tutor:steelroller", "tutor:telekinesis", "tutor:trick", - "tutor:trickroom", "tutor:wonderroom", "tutor:zenheadbutt" ], @@ -231,4 +223,4 @@ "weight": 1870, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json b/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json index dfdc7fcdcb..0e7434f2e5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json @@ -220,4 +220,4 @@ "weight": 605, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/budew.json b/common/src/main/resources/data/cobblemon/species/generation4/budew.json index c2d2b7ca6a..15bc854e50 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/budew.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/budew.json @@ -34,7 +34,7 @@ }, "moving": { "walk": { - "walkSpeed": 0.11 + "walkSpeed": 0.12 } } }, @@ -178,4 +178,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/buizel.json b/common/src/main/resources/data/cobblemon/species/generation4/buizel.json index 83fc356ccf..2602678765 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/buizel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/buizel.json @@ -221,4 +221,4 @@ "weight": 295, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/buneary.json b/common/src/main/resources/data/cobblemon/species/generation4/buneary.json index 1d19c910f7..a65c929cbe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/buneary.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/buneary.json @@ -235,4 +235,4 @@ "weight": 55, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/burmy.json b/common/src/main/resources/data/cobblemon/species/generation4/burmy.json index 5d8a116ebb..ddc61afc7d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/burmy.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/burmy.json @@ -144,4 +144,4 @@ "weight": 34, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json index c7b5f77513..3ebbd68d3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json @@ -162,4 +162,4 @@ "weight": 270, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json index 3df1619a1a..d29bdcf8af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json @@ -164,4 +164,4 @@ "weight": 19, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json index 702eb3855e..1ab67d3392 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json @@ -186,4 +186,4 @@ "weight": 93, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json b/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json index e6275bcf1d..ece3553999 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json @@ -165,4 +165,4 @@ "weight": 33, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json b/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json index c000ad15f6..880872b521 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json @@ -172,7 +172,6 @@ "tutor:mudslap", "tutor:roleplay", "tutor:rollout", - "tutor:scratch", "tutor:sleeptalk", "tutor:snore", "tutor:stealthrock", @@ -224,4 +223,4 @@ "weight": 62, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chingling.json b/common/src/main/resources/data/cobblemon/species/generation4/chingling.json index b70faf2503..d0c259ea2b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chingling.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chingling.json @@ -54,6 +54,7 @@ "22:lastresort", "25:entrainment", "32:uproar", + "egg:allyswitch", "egg:cosmicpower", "egg:curse", "egg:disable", @@ -210,4 +211,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/combee.json b/common/src/main/resources/data/cobblemon/species/generation4/combee.json index 0d47e35310..244fb83441 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/combee.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/combee.json @@ -133,4 +133,4 @@ "weight": 55, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json b/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json index 8c9b9e419e..2f180fe2c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json @@ -208,4 +208,4 @@ "weight": 315, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json b/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json index 3cced9b667..45a6e4c270 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json @@ -179,4 +179,4 @@ "weight": 856, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json b/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json index aedad72847..d9ef9ee448 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json @@ -246,4 +246,4 @@ "weight": 230, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json b/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json index 50adeda955..924a3b779e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json @@ -131,16 +131,13 @@ "tm:trick", "tm:willowisp", "tm:xscissor", - "tutor:darkpulse", "tutor:darkvoid", "tutor:doubleteam", "tutor:drainpunch", - "tutor:dreameater", "tutor:feintattack", "tutor:focuspunch", "tutor:foulplay", "tutor:headbutt", - "tutor:hypnosis", "tutor:icywind", "tutor:knockoff", "tutor:lastresort", @@ -151,7 +148,6 @@ "tutor:pursuit", "tutor:quickattack", "tutor:roaroftime", - "tutor:shadowball", "tutor:shockwave", "tutor:sleeptalk", "tutor:snatch", @@ -192,4 +188,4 @@ "weight": 505, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/dialga.json b/common/src/main/resources/data/cobblemon/species/generation4/dialga.json index c4822aff5f..f4155eaef4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/dialga.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/dialga.json @@ -183,12 +183,9 @@ "tm:trickroom", "tutor:ancientpower", "tutor:aurasphere", - "tutor:dracometeor", "tutor:dragonbreath", "tutor:dragonclaw", "tutor:dragonpulse", - "tutor:earthpower", - "tutor:fireblast", "tutor:flashcannon", "tutor:furycutter", "tutor:gravity", @@ -212,7 +209,6 @@ "tutor:sleeptalk", "tutor:snore", "tutor:stealthrock", - "tutor:steelbeam", "tutor:stompingtantrum", "tutor:swift", "tutor:twister" @@ -244,4 +240,4 @@ "weight": 6830, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json index 2ea3f6c092..8e761eeaf8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json @@ -204,4 +204,4 @@ "weight": 615, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json b/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json index 621bdaabac..87fe14d8b4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json @@ -232,4 +232,4 @@ "weight": 150, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json b/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json index dea42cf1c3..c8a996ca46 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json @@ -238,7 +238,7 @@ ] } ], - "baseScale": 1, + "baseScale": 0.75, "hitbox": { "width": 0.7, "height": 2, @@ -257,4 +257,4 @@ "weight": 12, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json b/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json index 01b771a494..526425c190 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json @@ -240,4 +240,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json index c7ec2fa28d..946b6f2495 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json @@ -219,4 +219,4 @@ "weight": 1386, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json b/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json index ee2cc63d73..e7b2f15205 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json @@ -226,4 +226,4 @@ "weight": 845, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json index 76e61e1682..5f74d52ad3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json @@ -184,4 +184,4 @@ "weight": 70, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json index 38cafa86a0..41698ee58f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json @@ -192,4 +192,4 @@ "weight": 335, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/froslass.json b/common/src/main/resources/data/cobblemon/species/generation4/froslass.json index 56df0a660f..ba56e7fe63 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/froslass.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/froslass.json @@ -218,4 +218,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gabite.json b/common/src/main/resources/data/cobblemon/species/generation4/gabite.json index 85a2071d9d..82322cf475 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gabite.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gabite.json @@ -189,4 +189,4 @@ "weight": 560, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gallade.json b/common/src/main/resources/data/cobblemon/species/generation4/gallade.json index 2eca1d865a..2b1dd946be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gallade.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gallade.json @@ -356,4 +356,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json index 7ecb60d81b..2c70a7d7d5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json @@ -261,4 +261,4 @@ "weight": 950, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json index 01ac751171..c097807137 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json @@ -172,4 +172,4 @@ "weight": 299, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gible.json b/common/src/main/resources/data/cobblemon/species/generation4/gible.json index 87f60ee02e..387641364b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gible.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gible.json @@ -198,4 +198,4 @@ "weight": 205, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/giratina.json b/common/src/main/resources/data/cobblemon/species/generation4/giratina.json index 52685020bf..98a0c66fb7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/giratina.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/giratina.json @@ -233,4 +233,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json index ce57594c66..363f81b80e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json @@ -185,4 +185,4 @@ "weight": 259, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json index ce3c9edc14..299eafa1b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json @@ -163,4 +163,4 @@ "weight": 39, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json index 5358bc30f5..559dd7a6a4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json @@ -203,4 +203,4 @@ "weight": 425, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json index aeaf47f41e..2ed73299c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json @@ -363,4 +363,4 @@ "weight": 970, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json index 7c44c245c8..28e371e00b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json @@ -194,4 +194,4 @@ "weight": 244, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/heatran.json b/common/src/main/resources/data/cobblemon/species/generation4/heatran.json index 8bfe3140a8..d603ffc002 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/heatran.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/heatran.json @@ -188,4 +188,4 @@ "weight": 4300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json b/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json index 1c7c1faf99..b1c4fe80f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json @@ -188,4 +188,4 @@ "weight": 495, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json b/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json index e9a9cae5e2..64f848d8f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json @@ -172,4 +172,4 @@ "weight": 3000, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json b/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json index 3a36a8abde..46049819c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json @@ -193,4 +193,4 @@ "weight": 273, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/infernape.json b/common/src/main/resources/data/cobblemon/species/generation4/infernape.json index cfe23ccf66..3e6873d531 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/infernape.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/infernape.json @@ -226,4 +226,4 @@ "weight": 550, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json b/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json index 5cc592907c..535f86c6b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json @@ -103,4 +103,4 @@ "weight": 22, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json b/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json index c4a55cb996..fac03dceed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json @@ -165,4 +165,4 @@ "weight": 255, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json index d9815f7a6b..f0776d32a4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json @@ -208,4 +208,4 @@ "weight": 255, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json b/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json index 38af1e5de0..b468e6fd42 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json @@ -215,4 +215,4 @@ "weight": 1400, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json index 844806b5d2..54e1c42f40 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json @@ -265,4 +265,4 @@ "weight": 333, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json index ed11aeec5f..0b038556f0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json @@ -236,10 +236,8 @@ "tm:waterpulse", "tm:workup", "tm:zenheadbutt", - "tutor:aurasphere", "tutor:blazekick", "tutor:bonerush", - "tutor:bulletpunch", "tutor:closecombat", "tutor:coaching", "tutor:counter", @@ -249,14 +247,12 @@ "tutor:drainpunch", "tutor:dualchop", "tutor:extremespeed", - "tutor:flashcannon", "tutor:focuspunch", "tutor:forcepalm", "tutor:furycutter", "tutor:headbutt", "tutor:helpinghand", "tutor:highjumpkick", - "tutor:icepunch", "tutor:irondefense", "tutor:irontail", "tutor:laserfocus", @@ -307,4 +303,4 @@ "weight": 540, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json index 806b215642..efccc95d5a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json @@ -163,4 +163,4 @@ "weight": 240, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json index 4abc715895..10df5e1f92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json @@ -182,4 +182,4 @@ "weight": 305, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json index 08addfe266..86abee85a4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json @@ -170,4 +170,4 @@ "weight": 420, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json index 7b5a19d016..df4bb3929d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json @@ -195,4 +195,4 @@ "weight": 680, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json b/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json index 03b469f11d..1c718d23ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json @@ -223,4 +223,4 @@ "weight": 1800, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json index a562264a5f..ed544731ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json @@ -219,4 +219,4 @@ "weight": 2910, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/manaphy.json b/common/src/main/resources/data/cobblemon/species/generation4/manaphy.json index 7c96030fb4..2d69a24e37 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/manaphy.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/manaphy.json @@ -25,7 +25,9 @@ ], "moves": [ "1:bubble", + "1:heartswap", "1:tailglow", + "1:watergun", "1:watersport", "9:charm", "16:supersonic", @@ -163,4 +165,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mantyke.json b/common/src/main/resources/data/cobblemon/species/generation4/mantyke.json index 338b4f3bfe..c669eed08b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mantyke.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mantyke.json @@ -187,4 +187,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json b/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json index 8f740ab1b5..f34e2f81a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json @@ -23,6 +23,7 @@ "undiscovered" ], "moves": [ + "1:allyswitch", "1:confusion", "1:copycat", "1:expandingforce", @@ -208,4 +209,4 @@ "weight": 3, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json index 00c45d9132..2b095cb5ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json @@ -239,4 +239,4 @@ "weight": 130, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json index c39d76f021..b64556f4ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json @@ -166,7 +166,7 @@ "baseScale": 0.8, "hitbox": { "width": 1, - "height": 1.65, + "height": 2.2, "fixed": false }, "baseFriendship": 35, @@ -182,4 +182,4 @@ "weight": 44, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/monferno.json b/common/src/main/resources/data/cobblemon/species/generation4/monferno.json index a75aefaf50..80011daee1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/monferno.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/monferno.json @@ -213,4 +213,4 @@ "weight": 220, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json index 74ee86974c..40a17a84e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json @@ -143,4 +143,4 @@ "weight": 233, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json index 29179f2202..7253695781 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json @@ -200,7 +200,6 @@ "tutor:icepunch", "tutor:icywind", "tutor:lastresort", - "tutor:lick", "tutor:metronome", "tutor:mudslap", "tutor:odorsleuth", @@ -214,7 +213,6 @@ "tutor:snore", "tutor:stompingtantrum", "tutor:superpower", - "tutor:tackle", "tutor:thunderpunch", "tutor:uproar", "tutor:waterpulse", @@ -261,4 +259,4 @@ "weight": 1050, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json index de0f164fd4..bf3abfd9a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json @@ -186,4 +186,4 @@ "weight": 39, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/palkia.json b/common/src/main/resources/data/cobblemon/species/generation4/palkia.json index 7a275e75b7..0574c6b6b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/palkia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/palkia.json @@ -191,19 +191,16 @@ "tutor:aquatail", "tutor:aurasphere", "tutor:dive", - "tutor:dracometeor", "tutor:dragonbreath", "tutor:dragonclaw", "tutor:dragonpulse", "tutor:dualwingbeat", "tutor:earthpower", - "tutor:fireblast", "tutor:focuspunch", "tutor:furycutter", "tutor:gravity", "tutor:headbutt", "tutor:healblock", - "tutor:hydropump", "tutor:hypervoice", "tutor:liquidation", "tutor:mudslap", @@ -218,7 +215,6 @@ "tutor:stompingtantrum", "tutor:surf", "tutor:swift", - "tutor:thunder", "tutor:twister", "tutor:waterpulse" ], @@ -249,4 +245,4 @@ "weight": 3360, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/phione.json b/common/src/main/resources/data/cobblemon/species/generation4/phione.json index e54fa6b7fa..3807fa9590 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/phione.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/phione.json @@ -144,4 +144,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/piplup.json b/common/src/main/resources/data/cobblemon/species/generation4/piplup.json index 1f7a3e0e03..a6f313bde2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/piplup.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/piplup.json @@ -165,7 +165,6 @@ "tutor:icywind", "tutor:mudslap", "tutor:peck", - "tutor:pound", "tutor:return", "tutor:round", "tutor:signalbeam", @@ -220,4 +219,4 @@ "weight": 52, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json index 828a622ca6..d94d7ecf3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json @@ -199,4 +199,4 @@ "weight": 340, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json b/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json index 3caf6c45e7..1569b2cf6c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json @@ -5,7 +5,7 @@ "primaryType": "water", "abilities": [ "torrent", - "h:defiant" + "h:competitive" ], "drops": { "amount": 4, @@ -203,4 +203,4 @@ "weight": 230, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/probopass.json b/common/src/main/resources/data/cobblemon/species/generation4/probopass.json index 02174e4084..73f6f0fb05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/probopass.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/probopass.json @@ -212,4 +212,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json index 9238a911cf..cc78bbb667 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json @@ -145,4 +145,4 @@ "weight": 438, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json b/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json index 04ea47d9c9..21071552db 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json @@ -204,4 +204,4 @@ "weight": 1025, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json b/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json index 7c975ae13f..f9f96691df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json @@ -190,4 +190,4 @@ "weight": 4200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json b/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json index 1486f6c3bc..e35ff7da1a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json @@ -259,4 +259,4 @@ "weight": 2828, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/riolu.json b/common/src/main/resources/data/cobblemon/species/generation4/riolu.json index 02c0e8f208..9772262c5a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/riolu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/riolu.json @@ -230,4 +230,4 @@ "weight": 202, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/roserade.json b/common/src/main/resources/data/cobblemon/species/generation4/roserade.json index 487ee074e0..36ab8cc721 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/roserade.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/roserade.json @@ -172,4 +172,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rotom.json b/common/src/main/resources/data/cobblemon/species/generation4/rotom.json index 4204731b9f..847e3c8dde 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rotom.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rotom.json @@ -288,9 +288,9 @@ "50:discharge", "50:hex", "55:uproar", - "57:charge", "64:discharge", "tm:allyswitch", + "tm:charge", "tm:chargebeam", "tm:confide", "tm:confuseray", @@ -314,6 +314,8 @@ "tm:nastyplot", "tm:naturalgift", "tm:nightshade", + "tm:painsplit", + "tm:poltergeist", "tm:protect", "tm:psychup", "tm:raindance", @@ -325,8 +327,7 @@ "tm:shadowball", "tm:shockwave", "tm:sleeptalk", - "tm:snatch", - "tm:snore", + "tm:spite", "tm:storedpower", "tm:substitute", "tm:sunnyday", @@ -396,4 +397,4 @@ "weight": 3, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json b/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json index f9a5778f77..55908fc54d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json @@ -193,4 +193,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json index 5e66805718..3bf87e4c99 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json @@ -184,4 +184,4 @@ "weight": 63, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json b/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json index c4fd42410d..1d7c6d00c0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json @@ -194,4 +194,4 @@ "weight": 570, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json index 8a4e14d167..d7c2bca818 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json @@ -192,4 +192,4 @@ "weight": 95, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json index 7537dae23d..7abda00ad4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json @@ -206,4 +206,4 @@ "weight": 120, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json index bfc30d979a..43a0a277d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json @@ -203,4 +203,4 @@ "weight": 380, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/snover.json b/common/src/main/resources/data/cobblemon/species/generation4/snover.json index 45196e483e..1aeab482be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/snover.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/snover.json @@ -193,4 +193,4 @@ "weight": 505, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json index 008591cca8..02b60e57a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json @@ -199,4 +199,4 @@ "weight": 1080, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json index 1321714812..01b3dd290d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json @@ -162,4 +162,4 @@ "weight": 249, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json index 2997fdf149..8b002d4d13 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json @@ -172,4 +172,4 @@ "weight": 155, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/starly.json b/common/src/main/resources/data/cobblemon/species/generation4/starly.json index 78e6d88541..a927367091 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/starly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/starly.json @@ -177,4 +177,4 @@ "weight": 20, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/stunky.json b/common/src/main/resources/data/cobblemon/species/generation4/stunky.json index 37f0fea569..f967785596 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/stunky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/stunky.json @@ -224,4 +224,4 @@ "weight": 192, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json index ee9220e1cf..a2dac6b22f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json @@ -199,4 +199,4 @@ "weight": 1286, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json b/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json index 96c2382395..6378626d84 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json @@ -214,4 +214,4 @@ "weight": 380, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/torterra.json b/common/src/main/resources/data/cobblemon/species/generation4/torterra.json index abed8c57ca..a715e73eb9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/torterra.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/torterra.json @@ -194,4 +194,4 @@ "weight": 3100, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json index 2974e45c02..ee8f8768c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json @@ -221,4 +221,4 @@ "weight": 444, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json b/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json index 744a5eab49..5b016c4561 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json @@ -153,7 +153,6 @@ "tutor:stockpile", "tutor:superpower", "tutor:synthesis", - "tutor:tackle", "tutor:withdraw", "tutor:worryseed" ], @@ -197,4 +196,4 @@ "weight": 102, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/uxie.json b/common/src/main/resources/data/cobblemon/species/generation4/uxie.json index f1d1a6515b..60ebd20664 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/uxie.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/uxie.json @@ -212,4 +212,4 @@ "weight": 3, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json index 6da9d17bed..6771c82f09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json @@ -224,4 +224,4 @@ "weight": 385, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json index 3a7bc4e626..c2b53344be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json @@ -235,4 +235,4 @@ "weight": 340, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json b/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json index f705a1462b..a67de46089 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json @@ -372,4 +372,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json b/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json index 479cb5005a..f37f1f7803 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json @@ -175,4 +175,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json b/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json index 4b3bf2c331..0364f544e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json @@ -130,4 +130,4 @@ "weight": 253, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json b/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json index be88d484bb..662f3bd005 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json @@ -177,4 +177,4 @@ "height": 12, "weight": 316, "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json b/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json index 6b5484b531..069dd57dc5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json @@ -138,4 +138,4 @@ "weight": 105, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/archen.json b/common/src/main/resources/data/cobblemon/species/generation5/archen.json index 1f5c6777e1..1e2dcffc0e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/archen.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/archen.json @@ -198,4 +198,4 @@ "weight": 95, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/archeops.json b/common/src/main/resources/data/cobblemon/species/generation5/archeops.json index 4c3ced0654..753ca4dac2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/archeops.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/archeops.json @@ -178,4 +178,4 @@ "weight": 320, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/audino.json b/common/src/main/resources/data/cobblemon/species/generation5/audino.json index 9eb160cc5c..6d61c7ef0c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/audino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/audino.json @@ -258,4 +258,4 @@ "weight": 310, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/axew.json b/common/src/main/resources/data/cobblemon/species/generation5/axew.json index d41f4def71..505e0fc674 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/axew.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/axew.json @@ -198,4 +198,4 @@ "weight": 180, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/basculin.json b/common/src/main/resources/data/cobblemon/species/generation5/basculin.json index 9f0a9ee943..0841dd470e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/basculin.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/basculin.json @@ -345,4 +345,4 @@ "redstriped" ], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/beartic.json b/common/src/main/resources/data/cobblemon/species/generation5/beartic.json index 004cb1681c..f6b7a693ee 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/beartic.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/beartic.json @@ -206,4 +206,4 @@ "weight": 2600, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json b/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json index 1f18e6d1df..ef2433ab2a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json @@ -181,4 +181,4 @@ "weight": 345, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json index 28ecb5d52b..45ff8fc3b8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json @@ -161,7 +161,9 @@ "variant": "level_up", "result": "kingambit", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "kowtowcleave" + ], "requirements": [ { "variant": "defeat", @@ -190,4 +192,4 @@ "weight": 700, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json b/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json index d5619f5dab..a84049018b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json @@ -157,4 +157,4 @@ "weight": 298, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/boldore.json b/common/src/main/resources/data/cobblemon/species/generation5/boldore.json index e131bc3c6f..fa063e9a00 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/boldore.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/boldore.json @@ -162,4 +162,4 @@ "weight": 1020, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json index 1819a07f60..659dee2e21 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json @@ -171,4 +171,4 @@ "weight": 946, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json b/common/src/main/resources/data/cobblemon/species/generation5/braviary.json index 0de0bc6f44..d1700611e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/braviary.json @@ -106,9 +106,14 @@ "tm:closecombat", "tm:confuseray", "tm:dazzlinggleam", + "tm:doubleedge", + "tm:dualwingbeat", "tm:endure", + "tm:expandingforce", "tm:facade", + "tm:featherdance", "tm:fly", + "tm:futuresight", "tm:gigaimpact", "tm:heatwave", "tm:helpinghand", @@ -121,7 +126,9 @@ "tm:protect", "tm:psybeam", "tm:psychic", + "tm:psychicnoise", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:raindance", "tm:rest", @@ -141,6 +148,7 @@ "tm:takedown", "tm:terablast", "tm:uturn", + "tm:vacuumwave", "tm:zenheadbutt" ], "labels": [ @@ -215,9 +223,12 @@ "tm:closecombat", "tm:confide", "tm:cut", + "tm:doubleedge", "tm:doubleteam", + "tm:dualwingbeat", "tm:endure", "tm:facade", + "tm:featherdance", "tm:fly", "tm:frustration", "tm:gigaimpact", @@ -305,4 +316,4 @@ "weight": 410, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json b/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json index a082b82ff5..6c5d7bbfc2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json @@ -178,4 +178,4 @@ "weight": 810, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json b/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json index bf5bc1b3c0..e164469672 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json @@ -181,4 +181,4 @@ "weight": 343, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json index 81da9b8b9d..c336ff45b4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json @@ -162,4 +162,4 @@ "weight": 75, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json b/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json index 1f08753888..6b9ecd9901 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json @@ -121,23 +121,19 @@ "tm:zenheadbutt", "tutor:block", "tutor:bounce", - "tutor:closecombat", "tutor:coaching", "tutor:helpinghand", "tutor:irondefense", - "tutor:ironhead", "tutor:laserfocus", "tutor:magnetrise", "tutor:quickattack", "tutor:quickguard", "tutor:retaliate", - "tutor:sacredsword", "tutor:sleeptalk", "tutor:snore", "tutor:stealthrock", "tutor:steelbeam", "tutor:superpower", - "tutor:swordsdance", "tutor:workup", "tutor:zenheadbutt" ], @@ -168,4 +164,4 @@ "weight": 2500, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json b/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json index 549f78c773..533546ef10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json @@ -171,4 +171,4 @@ "weight": 765, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json b/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json index bca16c780c..9fde45fd56 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json @@ -181,4 +181,4 @@ "weight": 870, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json b/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json index d85d4afa80..d2b88b62f3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json @@ -171,4 +171,4 @@ "weight": 6, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json index defe225463..fd56466110 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json @@ -142,4 +142,4 @@ "weight": 2000, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json b/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json index 6d8055b47e..427c0710bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json @@ -114,6 +114,7 @@ "tm:swagger", "tm:takedown", "tm:terablast", + "tm:tripleaxel", "tm:toxic", "tm:waterpulse", "tutor:bind", @@ -155,4 +156,4 @@ "weight": 1480, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json b/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json index 76917db7ba..380a5a3cc1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json @@ -204,4 +204,4 @@ "weight": 85, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json b/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json index c312f2169f..9fc49775c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json @@ -420,4 +420,4 @@ }, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json b/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json index 62e5372ba9..6d41c07b94 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json @@ -323,4 +323,4 @@ "weight": 375, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/deerling.json b/common/src/main/resources/data/cobblemon/species/generation5/deerling.json index 8f2e3f2835..aa19948996 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/deerling.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/deerling.json @@ -178,4 +178,4 @@ "weight": 195, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/deino.json b/common/src/main/resources/data/cobblemon/species/generation5/deino.json index d62582d824..62c7140d1d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/deino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/deino.json @@ -178,4 +178,4 @@ "weight": 173, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/dewott.json b/common/src/main/resources/data/cobblemon/species/generation5/dewott.json index 305f11e81e..0252b9c2b3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/dewott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/dewott.json @@ -378,7 +378,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:regional_bias_evolutions/oshawott_dewott_hisui_bias" + "biomeCondition": "#cobblemon:evolution/oshawott_dewott_hisui_bias" } ] } @@ -402,4 +402,4 @@ "weight": 245, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json b/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json index b43eec6283..9ef1b5c35f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json @@ -169,4 +169,4 @@ "weight": 85, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json b/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json index 25a66ffb70..a0a9ca32c0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json @@ -191,4 +191,4 @@ "weight": 1390, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json b/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json index a7568eae8d..417de857a4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json @@ -167,4 +167,4 @@ "weight": 55, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json index 0911e93513..a2b5e0dcd2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json @@ -190,4 +190,4 @@ "weight": 80, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/durant.json b/common/src/main/resources/data/cobblemon/species/generation5/durant.json index 7f200997a2..1c0fc24e1b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/durant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/durant.json @@ -153,4 +153,4 @@ "weight": 330, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json b/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json index ced1a6287f..d8059c1bf8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json @@ -155,4 +155,4 @@ "weight": 145, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json b/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json index f508589e23..e261a92c66 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json @@ -144,4 +144,4 @@ "weight": 220, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json b/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json index 0751755d94..2e2bbcf593 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json @@ -171,4 +171,4 @@ "weight": 805, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json b/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json index 7e6b0df279..aa292551cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json @@ -202,4 +202,4 @@ "weight": 90, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/emboar.json b/common/src/main/resources/data/cobblemon/species/generation5/emboar.json index be7c9b4414..5b5bc171d4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/emboar.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/emboar.json @@ -200,4 +200,4 @@ "weight": 1500, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/emolga.json b/common/src/main/resources/data/cobblemon/species/generation5/emolga.json index 5097aec29e..adbcf8d347 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/emolga.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/emolga.json @@ -162,4 +162,4 @@ "weight": 50, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json index 5582b57dcb..2656c9af66 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json @@ -150,4 +150,4 @@ "weight": 330, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json index e0d50573ea..2fcbbcffe6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json @@ -160,4 +160,4 @@ "weight": 404, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json b/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json index 50a94ec3ba..7bcd40fd7a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json @@ -5,7 +5,8 @@ "primaryType": "grass", "secondaryType": "steel", "abilities": [ - "ironbarbs" + "ironbarbs", + "h:ironbarbs" ], "drops": { "amount": 3, @@ -176,4 +177,4 @@ "weight": 188, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json b/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json index 865b978f09..946173ea3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json @@ -174,4 +174,4 @@ "weight": 1100, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/foongus.json b/common/src/main/resources/data/cobblemon/species/generation5/foongus.json index 0c135db284..29e00c6e05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/foongus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/foongus.json @@ -150,4 +150,4 @@ "weight": 10, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json b/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json index 20c7857f38..986424906b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json @@ -182,4 +182,4 @@ "weight": 360, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/frillish.json b/common/src/main/resources/data/cobblemon/species/generation5/frillish.json index 4d94527832..48b0695fb9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/frillish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/frillish.json @@ -186,4 +186,4 @@ "weight": 330, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json b/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json index 97338d7db6..81b01ce1d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json @@ -172,4 +172,4 @@ "weight": 143, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json index 2346d73d6b..076637d08d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json @@ -204,4 +204,4 @@ "weight": 1073, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/genesect.json b/common/src/main/resources/data/cobblemon/species/generation5/genesect.json index 9390204ae4..256b399d00 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/genesect.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/genesect.json @@ -343,4 +343,4 @@ "weight": 825, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json b/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json index 557dcd6942..fd40c08831 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json @@ -162,4 +162,4 @@ "weight": 2600, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/golett.json b/common/src/main/resources/data/cobblemon/species/generation5/golett.json index 1f613768e4..a7588e9b20 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/golett.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/golett.json @@ -212,4 +212,4 @@ "weight": 920, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/golurk.json b/common/src/main/resources/data/cobblemon/species/generation5/golurk.json index 5d06ccb6ee..744f46e795 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/golurk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/golurk.json @@ -226,4 +226,4 @@ "weight": 3300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json index a8d8bf91db..a7c1475a1a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json @@ -198,4 +198,4 @@ "weight": 58, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json index 6654f9dc73..a5054672a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json @@ -186,4 +186,4 @@ "weight": 440, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json index 43ba56105a..63dd473f69 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json @@ -196,4 +196,4 @@ "weight": 180, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json b/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json index 9ce92771c9..3cc1558400 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json @@ -181,4 +181,4 @@ "weight": 400, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json b/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json index 3d9c9ebd74..85a95d9d9b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json @@ -182,4 +182,4 @@ "weight": 1055, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json b/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json index 9efdb95ce8..c7642e0525 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json @@ -181,4 +181,4 @@ "weight": 580, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json index 58e67ac4cd..6fc380220d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json @@ -155,4 +155,4 @@ "weight": 147, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json b/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json index 1a453e04a8..a460d3392b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json @@ -222,4 +222,4 @@ "weight": 1600, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json b/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json index ce071569fe..8b869b17d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json @@ -172,4 +172,4 @@ "weight": 1350, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/joltik.json b/common/src/main/resources/data/cobblemon/species/generation5/joltik.json index 28f5712203..a9eec84848 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/joltik.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/joltik.json @@ -183,4 +183,4 @@ "weight": 6, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json index fea4b0d07e..e98b7f261f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json @@ -150,4 +150,4 @@ "weight": 59, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json b/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json index e1eb45507c..91de4bfffa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json @@ -202,4 +202,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/klang.json b/common/src/main/resources/data/cobblemon/species/generation5/klang.json index 7f1551bf11..321c90f829 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/klang.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/klang.json @@ -149,4 +149,4 @@ "weight": 510, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/klink.json b/common/src/main/resources/data/cobblemon/species/generation5/klink.json index 7b1b273bc9..9382e078fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/klink.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/klink.json @@ -145,4 +145,4 @@ "weight": 210, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json b/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json index 841e28d94b..45987bc0da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json @@ -141,4 +141,4 @@ "weight": 810, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json b/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json index 4ba28be74d..f91d3c0195 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json @@ -214,4 +214,4 @@ "weight": 334, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json b/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json index 457f4b2d82..3ffe59362f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json @@ -224,4 +224,4 @@ "weight": 963, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json b/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json index e617fe11f0..b3403df198 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json @@ -68,19 +68,26 @@ "72:outrage", "80:freezeshock", "88:sheercold", + "tm:aerialace", + "tm:avalanche", "tm:blizzard", "tm:bodypress", + "tm:bodyslam", "tm:breakingswipe", "tm:brutalswing", "tm:confide", "tm:cut", "tm:doubleteam", + "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", + "tm:dualwingbeat", "tm:earthpower", "tm:echoedvoice", + "tm:endeavor", "tm:endure", "tm:facade", "tm:flashcannon", @@ -96,6 +103,7 @@ "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", + "tm:icefang", "tm:iciclespear", "tm:icywind", "tm:imprison", @@ -109,18 +117,21 @@ "tm:reflect", "tm:rest", "tm:return", + "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", "tm:round", "tm:safeguard", + "tm:scaleshot", "tm:scaryface", "tm:secretpower", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", "tm:snore", + "tm:snowscape", "tm:steelwing", "tm:stoneedge", "tm:strength", @@ -128,6 +139,8 @@ "tm:sunnyday", "tm:swagger", "tm:swift", + "tm:takedown", + "tm:terablast", "tm:toxic", "tm:weatherball", "tm:zenheadbutt", @@ -138,11 +151,8 @@ "tutor:earthpower", "tutor:endeavor", "tutor:freezeshock", - "tutor:fusionbolt", - "tutor:hypervoice", "tutor:icebeam", "tutor:icywind", - "tutor:imprison", "tutor:ironhead", "tutor:laserfocus", "tutor:outrage", @@ -217,19 +227,26 @@ "72:outrage", "80:iceburn", "88:sheercold", + "tm:aerialace", + "tm:avalanche", "tm:blizzard", "tm:bodypress", + "tm:bodyslam", "tm:breakingswipe", "tm:brutalswing", "tm:confide", "tm:cut", "tm:doubleteam", + "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", + "tm:dualwingbeat", "tm:earthpower", "tm:echoedvoice", + "tm:endeavor", "tm:endure", "tm:facade", "tm:flashcannon", @@ -245,6 +262,7 @@ "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", + "tm:icefang", "tm:iciclespear", "tm:icywind", "tm:imprison", @@ -258,18 +276,21 @@ "tm:reflect", "tm:rest", "tm:return", + "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", "tm:round", "tm:safeguard", + "tm:scaleshot", "tm:scaryface", "tm:secretpower", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", "tm:snore", + "tm:snowscape", "tm:steelwing", "tm:stoneedge", "tm:strength", @@ -277,6 +298,8 @@ "tm:sunnyday", "tm:swagger", "tm:swift", + "tm:takedown", + "tm:terablast", "tm:toxic", "tm:weatherball", "tm:zenheadbutt", @@ -341,19 +364,26 @@ "72:outrage", "80:glaciate", "88:sheercold", + "tm:aerialace", + "tm:avalanche", "tm:blizzard", "tm:bodypress", + "tm:bodyslam", "tm:breakingswipe", "tm:brutalswing", "tm:confide", "tm:cut", "tm:doubleteam", + "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", + "tm:dualwingbeat", "tm:earthpower", "tm:echoedvoice", + "tm:endeavor", "tm:endure", "tm:facade", "tm:flashcannon", @@ -369,6 +399,7 @@ "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", + "tm:icefang", "tm:iciclespear", "tm:icywind", "tm:imprison", @@ -382,18 +413,21 @@ "tm:reflect", "tm:rest", "tm:return", + "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", "tm:round", "tm:safeguard", + "tm:scaleshot", "tm:scaryface", "tm:secretpower", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", "tm:snore", + "tm:snowscape", "tm:steelwing", "tm:stoneedge", "tm:strength", @@ -401,6 +435,8 @@ "tm:sunnyday", "tm:swagger", "tm:swift", + "tm:takedown", + "tm:terablast", "tm:toxic", "tm:weatherball", "tm:zenheadbutt", @@ -411,16 +447,13 @@ "tutor:earthpower", "tutor:endeavor", "tutor:glaciate", - "tutor:hypervoice", "tutor:icebeam", "tutor:icywind", - "tutor:imprison", "tutor:ironhead", "tutor:laserfocus", "tutor:outrage", "tutor:roost", "tutor:scaleshot", - "tutor:scaryface", "tutor:shadowball", "tutor:signalbeam", "tutor:slash", @@ -455,4 +488,4 @@ "weight": 3250, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lampent.json b/common/src/main/resources/data/cobblemon/species/generation5/lampent.json index 4e9486fcf6..7069af3714 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lampent.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lampent.json @@ -183,4 +183,4 @@ "weight": 130, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/landorus.json b/common/src/main/resources/data/cobblemon/species/generation5/landorus.json index 36d5ca2ade..98763622e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/landorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/landorus.json @@ -206,4 +206,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json b/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json index 14e155a09d..e10862c562 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json @@ -174,4 +174,4 @@ "weight": 288, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json index ac5f7f55b4..c978bc8dab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json @@ -174,4 +174,4 @@ "weight": 205, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json index d58c3ed988..a5888957fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json @@ -163,4 +163,4 @@ "weight": 375, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json index 34a62e140c..8d6710303a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json @@ -104,6 +104,7 @@ "tm:bulletseed", "tm:charm", "tm:closecombat", + "tm:coaching", "tm:encore", "tm:endure", "tm:energyball", @@ -111,6 +112,7 @@ "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", "tm:hurricane", @@ -121,20 +123,27 @@ "tm:lowsweep", "tm:magicalleaf", "tm:metronome", + "tm:petalblizzard", "tm:poisonjab", "tm:pollenpuff", "tm:protect", + "tm:psychup", "tm:raindance", "tm:rest", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", + "tm:solarblade", "tm:substitute", "tm:sunnyday", "tm:swordsdance", "tm:takedown", "tm:terablast", - "tm:trailblaze" + "tm:trailblaze", + "tm:tripleaxel", + "tm:upperhand", + "tm:vacuumwave", + "tm:weatherball" ], "labels": [ "gen8", @@ -197,6 +206,7 @@ "1:teeterdance", "5:magicalleaf", "46:petaldance", + "tm:alluringvoice", "tm:attract", "tm:bulletseed", "tm:charm", @@ -213,6 +223,7 @@ "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", "tm:hiddenpower", @@ -222,8 +233,10 @@ "tm:lightscreen", "tm:magicalleaf", "tm:naturepower", + "tm:petalblizzard", "tm:pollenpuff", "tm:protect", + "tm:psychup", "tm:rest", "tm:return", "tm:round", @@ -241,6 +254,7 @@ "tm:terablast", "tm:toxic", "tm:trailblaze", + "tm:weatherball", "tutor:afteryou", "tutor:covet", "tutor:gigadrain", @@ -283,4 +297,4 @@ "weight": 163, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json b/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json index d796044156..aec94e3519 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json @@ -165,4 +165,4 @@ "weight": 41, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/litwick.json b/common/src/main/resources/data/cobblemon/species/generation5/litwick.json index eb890ff95e..410659055c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/litwick.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/litwick.json @@ -189,4 +189,4 @@ "weight": 31, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json index 11f50768d8..cd12a11f83 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json @@ -185,4 +185,4 @@ "weight": 395, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json index 79b814bd7a..c618699943 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json @@ -161,4 +161,4 @@ "weight": 280, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json b/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json index 2b6ffdf519..977999859e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json @@ -143,7 +143,6 @@ "tutor:gravity", "tutor:healbell", "tutor:helpinghand", - "tutor:hypervoice", "tutor:icepunch", "tutor:knockoff", "tutor:laserfocus", @@ -151,15 +150,12 @@ "tutor:lowkick", "tutor:magiccoat", "tutor:magicroom", - "tutor:psychic", "tutor:quickattack", "tutor:recycle", - "tutor:relicsong", "tutor:roleplay", "tutor:round", "tutor:shockwave", "tutor:signalbeam", - "tutor:sing", "tutor:skillswap", "tutor:sleeptalk", "tutor:snatch", @@ -232,4 +228,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json b/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json index 5658ae1905..b326beb7e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json @@ -186,4 +186,4 @@ "weight": 200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json index 6ebe8b901f..f2ade0cd20 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json @@ -177,4 +177,4 @@ "weight": 355, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/minccino.json b/common/src/main/resources/data/cobblemon/species/generation5/minccino.json index a42c24614b..e49f09cb9b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/minccino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/minccino.json @@ -176,4 +176,4 @@ "weight": 58, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/munna.json b/common/src/main/resources/data/cobblemon/species/generation5/munna.json index 6fd0573289..4a3b13039c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/munna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/munna.json @@ -173,4 +173,4 @@ "weight": 233, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json index 0aa0313952..aba88c8ea2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json @@ -156,4 +156,4 @@ "weight": 605, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json b/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json index 636c7d747f..91068a1767 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json @@ -386,7 +386,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:regional_bias_evolutions/oshawott_dewott_hisui_bias" + "biomeCondition": "#cobblemon:evolution/oshawott_dewott_hisui_bias" } ] } @@ -410,4 +410,4 @@ "weight": 59, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json b/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json index 3404911f66..329a6960d1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json @@ -151,4 +151,4 @@ "weight": 170, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/panpour.json b/common/src/main/resources/data/cobblemon/species/generation5/panpour.json index a7bdd67ad5..2bb3ff45fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/panpour.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/panpour.json @@ -166,4 +166,4 @@ "weight": 135, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pansage.json b/common/src/main/resources/data/cobblemon/species/generation5/pansage.json index f01e935407..f38948e60b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pansage.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pansage.json @@ -169,4 +169,4 @@ "weight": 105, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pansear.json b/common/src/main/resources/data/cobblemon/species/generation5/pansear.json index 436d350510..814b76e64e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pansear.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pansear.json @@ -165,4 +165,4 @@ "weight": 110, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/patrat.json b/common/src/main/resources/data/cobblemon/species/generation5/patrat.json index 1fc215bb1f..9ac6e08ed2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/patrat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/patrat.json @@ -152,4 +152,4 @@ "weight": 116, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json b/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json index e97208c0b4..c7ef404928 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json @@ -191,4 +191,4 @@ "weight": 102, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/petilil.json b/common/src/main/resources/data/cobblemon/species/generation5/petilil.json index 1d5c830d34..221d46dca0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/petilil.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/petilil.json @@ -177,17 +177,6 @@ "hisui_regional" ], "evolutions": [ - { - "id": "hisui_petilil_hisui_lilligant", - "variant": "item_interact", - "result": "lilligant hisuian", - "consumeHeldItem": false, - "learnableMoves": [ - "victorydance" - ], - "requirements": [], - "requiredContext": "cobblemon:sun_stone" - }, { "id": "hisui_petilil_lilligant", "variant": "item_interact", @@ -199,19 +188,7 @@ "requirements": [ { "variant": "biome", - "biomeCondition": "#cobblemon:is_floral" - }, - { - "variant": "biome", - "biomeCondition": "#cobblemon:is_forest" - }, - { - "variant": "biome", - "biomeCondition": "#cobblemon:is_tropical_island" - }, - { - "variant": "biome", - "biomeAnticondition": "#cobblemon:is_hills" + "biomeCondition": "#cobblemon:evolution/lilligant_unovan" }, { "variant": "biome", @@ -227,6 +204,17 @@ } ], "requiredContext": "cobblemon:sun_stone" + }, + { + "id": "hisui_petilil_hisui_lilligant", + "variant": "item_interact", + "result": "lilligant hisuian", + "consumeHeldItem": false, + "learnableMoves": [ + "victorydance" + ], + "requirements": [], + "requiredContext": "cobblemon:sun_stone" } ], "baseScale": 0.5, @@ -348,17 +336,6 @@ "cobblemon.species.petilil.desc" ], "evolutions": [ - { - "id": "petilil_lilligant", - "variant": "item_interact", - "result": "lilligant", - "consumeHeldItem": false, - "learnableMoves": [ - "petaldance" - ], - "requirements": [], - "requiredContext": "cobblemon:sun_stone" - }, { "id": "petilil_hisui_lilligant", "variant": "item_interact", @@ -386,6 +363,17 @@ } ], "requiredContext": "cobblemon:sun_stone" + }, + { + "id": "petilil_lilligant", + "variant": "item_interact", + "result": "lilligant", + "consumeHeldItem": false, + "learnableMoves": [ + "petaldance" + ], + "requirements": [], + "requiredContext": "cobblemon:sun_stone" } ], "baseScale": 0.5, @@ -407,4 +395,4 @@ "weight": 66, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pidove.json b/common/src/main/resources/data/cobblemon/species/generation5/pidove.json index 3f483fe6b1..64f1cd1cf2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pidove.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pidove.json @@ -163,4 +163,4 @@ "weight": 21, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pignite.json b/common/src/main/resources/data/cobblemon/species/generation5/pignite.json index 71d5f9e073..993c17d54f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pignite.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pignite.json @@ -195,4 +195,4 @@ "weight": 555, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json b/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json index 420c4bab6a..81f7481cfa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json @@ -176,4 +176,4 @@ "weight": 101, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json b/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json index 3371230042..7b5c577f86 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json @@ -130,9 +130,7 @@ "tutor:dualwingbeat", "tutor:earthpower", "tutor:extrasensory", - "tutor:fusionflare", "tutor:heatwave", - "tutor:hypervoice", "tutor:imprison", "tutor:laserfocus", "tutor:mist", @@ -174,4 +172,4 @@ "weight": 3300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json b/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json index 9adce6ae3e..5a5551521f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json @@ -199,4 +199,4 @@ "weight": 201, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json b/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json index e27db89339..c2b08d9da4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json @@ -170,4 +170,4 @@ "weight": 180, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json b/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json index fbd093ae24..d52799b497 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json @@ -183,4 +183,4 @@ "weight": 105, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json index bf8575e2b1..c0006342bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json @@ -116,6 +116,7 @@ "tm:facade", "tm:falseswipe", "tm:fling", + "tm:flipturn", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", @@ -124,6 +125,8 @@ "tm:hyperbeam", "tm:icebeam", "tm:icywind", + "tm:knockoff", + "tm:lashout", "tm:liquidation", "tm:protect", "tm:raindance", @@ -141,9 +144,13 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", + "tm:upperhand", + "tm:vacuumwave", "tm:waterfall", "tm:waterpledge", "tm:waterpulse", + "tm:whirlpool", "tm:xscissor" ], "labels": [ @@ -240,6 +247,7 @@ "tm:facade", "tm:falseswipe", "tm:fling", + "tm:flipturn", "tm:frustration", "tm:gigaimpact", "tm:grassknot", @@ -251,6 +259,7 @@ "tm:hyperbeam", "tm:icebeam", "tm:icywind", + "tm:knockoff", "tm:liquidation", "tm:protect", "tm:raindance", @@ -276,9 +285,12 @@ "tm:terablast", "tm:thief", "tm:toxic", + "tm:upperhand", + "tm:vacuumwave", "tm:waterfall", "tm:waterpledge", "tm:waterpulse", + "tm:whirlpool", "tm:workup", "tm:xscissor", "tutor:aquatail", @@ -330,4 +342,4 @@ "weight": 946, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sandile.json b/common/src/main/resources/data/cobblemon/species/generation5/sandile.json index c11af7a41e..34093938ce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sandile.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sandile.json @@ -207,4 +207,4 @@ "weight": 152, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json index 600c4c42b2..249a606d33 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json @@ -157,4 +157,4 @@ "weight": 510, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json index 8385ebcd10..5158280227 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json @@ -163,4 +163,4 @@ "weight": 925, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json b/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json index 4d9330554b..2fd3ec2614 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json @@ -171,4 +171,4 @@ "weight": 2005, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json index 3a256ab13a..0317132d6b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json @@ -207,4 +207,4 @@ "weight": 300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json b/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json index 95a56e6a82..aee0a2a566 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json @@ -226,4 +226,4 @@ "weight": 118, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json b/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json index 08673a31c9..7e148f0fe4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json @@ -165,4 +165,4 @@ "weight": 620, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/serperior.json b/common/src/main/resources/data/cobblemon/species/generation5/serperior.json index 5f51231e8f..644acfff13 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/serperior.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/serperior.json @@ -170,4 +170,4 @@ "weight": 630, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/servine.json b/common/src/main/resources/data/cobblemon/species/generation5/servine.json index 77b1f5767b..05b6bff833 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/servine.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/servine.json @@ -163,4 +163,4 @@ "weight": 160, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json b/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json index eb29bf86ec..47e1d53e7c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json @@ -171,4 +171,4 @@ "weight": 25, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json index 859b30fde6..560a3701ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json @@ -147,4 +147,4 @@ "weight": 77, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json b/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json index ccb79e2c60..3f94d41d2b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json @@ -194,4 +194,4 @@ "weight": 140, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json index 2dd98df18a..1764f1abc4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json @@ -138,4 +138,4 @@ "weight": 290, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json index 0cd272b27c..04f809af28 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json @@ -135,4 +135,4 @@ "weight": 305, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json index 513fb00b52..8963ce780f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json @@ -140,4 +140,4 @@ "weight": 280, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/snivy.json b/common/src/main/resources/data/cobblemon/species/generation5/snivy.json index 853942d880..8a6757fc85 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/snivy.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/snivy.json @@ -177,4 +177,4 @@ "weight": 81, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/solosis.json b/common/src/main/resources/data/cobblemon/species/generation5/solosis.json index e1ed62f944..3975692b15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/solosis.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/solosis.json @@ -193,4 +193,4 @@ "weight": 10, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json index 7dc99fbc18..02355db07c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json @@ -152,4 +152,4 @@ "weight": 610, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json index bfe47e5175..441841f379 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json @@ -282,4 +282,4 @@ "weight": 110, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json index 152a259710..efda07877d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json @@ -160,4 +160,4 @@ "weight": 73, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json index f180d48da3..1d550c7481 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json @@ -154,4 +154,4 @@ "weight": 242, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json b/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json index 441483dc5a..20107ad255 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json @@ -186,4 +186,4 @@ "weight": 105, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tepig.json b/common/src/main/resources/data/cobblemon/species/generation5/tepig.json index 318d61a958..21d30d8b6b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tepig.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tepig.json @@ -182,4 +182,4 @@ "weight": 99, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json b/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json index c072765d18..40b6e1e5c9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json @@ -115,7 +115,6 @@ "tm:xscissor", "tm:zenheadbutt", "tutor:block", - "tutor:closecombat", "tutor:coaching", "tutor:earthpower", "tutor:helpinghand", @@ -124,14 +123,11 @@ "tutor:quickguard", "tutor:retaliate", "tutor:rockslide", - "tutor:sacredsword", "tutor:sleeptalk", "tutor:snore", "tutor:stealthrock", "tutor:stompingtantrum", - "tutor:stoneedge", "tutor:superpower", - "tutor:swordsdance", "tutor:workup", "tutor:zenheadbutt" ], @@ -162,4 +158,4 @@ "weight": 2600, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/throh.json b/common/src/main/resources/data/cobblemon/species/generation5/throh.json index 890b506465..43e681b401 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/throh.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/throh.json @@ -157,4 +157,4 @@ "weight": 555, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json b/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json index e32b0ae769..b7650f2d0c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json @@ -224,4 +224,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/timburr.json b/common/src/main/resources/data/cobblemon/species/generation5/timburr.json index 8aec9d52b2..b2e236c91a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/timburr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/timburr.json @@ -196,4 +196,4 @@ "weight": 125, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json b/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json index 108bdca309..09031c8391 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json @@ -200,4 +200,4 @@ "weight": 165, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json b/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json index 59459396c6..9d52b98abb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json @@ -209,4 +209,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json index fdd9c6f80a..58995f63ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json @@ -154,4 +154,4 @@ "weight": 150, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json b/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json index e16a1ea677..c7ff57351a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json @@ -162,4 +162,4 @@ "weight": 310, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tympole.json b/common/src/main/resources/data/cobblemon/species/generation5/tympole.json index e0ddad985b..b2dffdb963 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tympole.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tympole.json @@ -153,4 +153,4 @@ "weight": 45, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json b/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json index 0a916dcf9b..4fbeef0c91 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json @@ -85,4 +85,4 @@ "weight": 3, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json b/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json index affb4bdf10..3283c2dfc1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json @@ -145,4 +145,4 @@ "weight": 290, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json b/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json index aaaae07464..69a0321026 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json @@ -147,4 +147,4 @@ "weight": 410, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json b/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json index 4ae925397f..844f8338ec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json @@ -154,4 +154,4 @@ "weight": 57, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json b/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json index 2ca7a32801..bf556e54bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json @@ -137,4 +137,4 @@ "weight": 575, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/venipede.json b/common/src/main/resources/data/cobblemon/species/generation5/venipede.json index b379834e24..fdbcd74f17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/venipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/venipede.json @@ -158,4 +158,4 @@ "weight": 53, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/victini.json b/common/src/main/resources/data/cobblemon/species/generation5/victini.json index 664ee5b091..a6ddccf36e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/victini.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/victini.json @@ -186,4 +186,4 @@ "weight": 40, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/virizion.json b/common/src/main/resources/data/cobblemon/species/generation5/virizion.json index 38b1eb59cc..681dc78c6b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/virizion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/virizion.json @@ -122,21 +122,17 @@ "tm:zenheadbutt", "tutor:block", "tutor:bounce", - "tutor:closecombat", "tutor:coaching", "tutor:gigadrain", "tutor:grassyglide", "tutor:helpinghand", "tutor:laserfocus", - "tutor:leafblade", "tutor:quickguard", "tutor:retaliate", - "tutor:sacredsword", "tutor:seedbomb", "tutor:sleeptalk", "tutor:snore", "tutor:superpower", - "tutor:swordsdance", "tutor:synthesis", "tutor:workup", "tutor:worryseed", @@ -169,4 +165,4 @@ "weight": 2000, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json b/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json index 6575985a9a..13e84ddf12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json @@ -188,4 +188,4 @@ "weight": 460, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json b/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json index 40ad0c6634..8787a5bd52 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json @@ -191,4 +191,4 @@ "weight": 90, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/watchog.json b/common/src/main/resources/data/cobblemon/species/generation5/watchog.json index d520803bb4..4050e11276 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/watchog.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/watchog.json @@ -153,4 +153,4 @@ "weight": 270, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json b/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json index 5c656654f8..a895378c56 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json @@ -168,4 +168,4 @@ "weight": 66, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json b/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json index f1020d3504..ac11029817 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json @@ -155,4 +155,4 @@ "weight": 585, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/woobat.json b/common/src/main/resources/data/cobblemon/species/generation5/woobat.json index 620b27f1a7..8fd5a26a55 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/woobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/woobat.json @@ -205,4 +205,4 @@ "weight": 21, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/yamask.json b/common/src/main/resources/data/cobblemon/species/generation5/yamask.json index a87594e1b0..2cbef4cbbb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/yamask.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/yamask.json @@ -312,4 +312,4 @@ "weight": 15, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json index f7220a169a..7491630365 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json @@ -144,4 +144,4 @@ "weight": 795, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json b/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json index f72f8d286f..0ee829b5a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json @@ -133,9 +133,7 @@ "tutor:dragonpulse", "tutor:dualwingbeat", "tutor:earthpower", - "tutor:fusionbolt", "tutor:haze", - "tutor:hypervoice", "tutor:imprison", "tutor:laserfocus", "tutor:magnetrise", @@ -181,4 +179,4 @@ "weight": 3450, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json b/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json index 4d0f51a820..fb4b3c7517 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json @@ -86,9 +86,11 @@ "tm:agility", "tm:bodyslam", "tm:brickbreak", + "tm:burningjealousy", "tm:calmmind", "tm:confuseray", "tm:crunch", + "tm:curse", "tm:darkpulse", "tm:dig", "tm:endure", @@ -97,6 +99,7 @@ "tm:flamethrower", "tm:fling", "tm:focusblast", + "tm:focuspunch", "tm:foulplay", "tm:gigaimpact", "tm:grassknot", @@ -106,22 +109,30 @@ "tm:hypervoice", "tm:icywind", "tm:imprison", + "tm:knockoff", + "tm:lashout", "tm:lowkick", "tm:lowsweep", "tm:nastyplot", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", + "tm:poltergeist", "tm:protect", "tm:psychic", + "tm:psychup", "tm:raindance", "tm:rest", + "tm:roar", "tm:scaryface", "tm:shadowball", "tm:shadowclaw", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:snarl", "tm:snowscape", + "tm:spite", "tm:substitute", "tm:swift", "tm:swordsdance", @@ -129,6 +140,7 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:trick", "tm:uturn", "tm:willowisp" @@ -200,6 +212,7 @@ "tm:bodyslam", "tm:bounce", "tm:brickbreak", + "tm:burningjealousy", "tm:calmmind", "tm:confide", "tm:confuseray", @@ -228,12 +241,15 @@ "tm:hypervoice", "tm:imprison", "tm:incinerate", + "tm:knockoff", + "tm:lashout", "tm:lowkick", "tm:lowsweep", "tm:megakick", "tm:megapunch", "tm:nastyplot", "tm:nightshade", + "tm:painsplit", "tm:payback", "tm:protect", "tm:psychic", @@ -250,10 +266,12 @@ "tm:secretpower", "tm:shadowball", "tm:shadowclaw", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:snarl", "tm:snore", + "tm:spite", "tm:substitute", "tm:sunnyday", "tm:swagger", @@ -326,4 +344,4 @@ "weight": 811, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json index 3fee73b50c..c1aa6e3253 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json @@ -86,32 +86,42 @@ "egg:extrasensory", "egg:memento", "tm:agility", + "tm:burningjealousy", "tm:calmmind", "tm:confuseray", + "tm:curse", "tm:darkpulse", "tm:dig", "tm:endure", "tm:facade", "tm:faketears", "tm:fling", + "tm:focuspunch", "tm:foulplay", "tm:gigaimpact", "tm:hex", "tm:hyperbeam", "tm:icywind", "tm:imprison", + "tm:knockoff", + "tm:lashout", "tm:nastyplot", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", "tm:protect", + "tm:psychup", "tm:raindance", "tm:rest", + "tm:roar", "tm:shadowball", "tm:shadowclaw", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:snarl", "tm:snowscape", + "tm:spite", "tm:substitute", "tm:swift", "tm:takedown", @@ -204,6 +214,7 @@ "tm:assurance", "tm:attract", "tm:bounce", + "tm:burningjealousy", "tm:calmmind", "tm:confide", "tm:confuseray", @@ -227,8 +238,11 @@ "tm:hypervoice", "tm:imprison", "tm:incinerate", + "tm:knockoff", + "tm:lashout", "tm:nastyplot", "tm:nightshade", + "tm:painsplit", "tm:payback", "tm:protect", "tm:psychup", @@ -243,10 +257,12 @@ "tm:secretpower", "tm:shadowball", "tm:shadowclaw", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:snarl", "tm:snore", + "tm:spite", "tm:substitute", "tm:sunnyday", "tm:swagger", @@ -320,4 +336,4 @@ "weight": 125, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json b/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json index bf01fc2828..80e72fc3fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json @@ -171,4 +171,4 @@ "weight": 500, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json index 6bfcce001c..6a84129356 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json @@ -189,4 +189,4 @@ }, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/amaura.json b/common/src/main/resources/data/cobblemon/species/generation6/amaura.json index f90205f485..6cb9702f41 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/amaura.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/amaura.json @@ -198,4 +198,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json index 140e40807f..355f1dfd5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json @@ -151,4 +151,4 @@ "weight": 155, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json b/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json index 3edac933d5..86d29536ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json @@ -174,4 +174,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json index 5791b68558..ac310e09b3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json @@ -98,19 +98,26 @@ "tm:bulldoze", "tm:chillingwater", "tm:crunch", + "tm:curse", "tm:dig", + "tm:doubleedge", "tm:earthquake", "tm:endure", "tm:facade", "tm:gigaimpact", + "tm:gyroball", + "tm:hardpress", "tm:heavyslam", + "tm:highhorsepower", "tm:hyperbeam", "tm:icebeam", "tm:icefang", "tm:icespinner", + "tm:iciclespear", "tm:icywind", "tm:irondefense", "tm:ironhead", + "tm:meteorbeam", "tm:protect", "tm:raindance", "tm:rest", @@ -213,6 +220,8 @@ "tm:chillingwater", "tm:confide", "tm:crunch", + "tm:curse", + "tm:doubleedge", "tm:doubleteam", "tm:earthquake", "tm:endure", @@ -300,4 +309,4 @@ "weight": 5050, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json b/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json index 02f4b3a5af..6a635776b2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json @@ -174,4 +174,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json index a22f310db9..47c0d14a17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json @@ -193,4 +193,4 @@ "weight": 995, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/binacle.json b/common/src/main/resources/data/cobblemon/species/generation6/binacle.json index 298bffbc05..b9a7f86ca0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/binacle.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/binacle.json @@ -174,4 +174,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/braixen.json b/common/src/main/resources/data/cobblemon/species/generation6/braixen.json index 8be6fd39e7..3a6bea707d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/braixen.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/braixen.json @@ -194,4 +194,4 @@ "weight": 145, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json b/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json index 0a366e4c9f..cd9d38d907 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json @@ -183,4 +183,4 @@ "weight": 50, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/carbink.json b/common/src/main/resources/data/cobblemon/species/generation6/carbink.json index 049deea1bf..9a493d784f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/carbink.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/carbink.json @@ -171,4 +171,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json b/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json index 4e087884a5..dcf283715f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json @@ -209,4 +209,4 @@ "weight": 900, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/chespin.json b/common/src/main/resources/data/cobblemon/species/generation6/chespin.json index 8d179d9637..a145a0daa2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/chespin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/chespin.json @@ -205,4 +205,4 @@ "weight": 90, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json b/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json index af3118a1df..b9144273d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json @@ -151,4 +151,4 @@ "weight": 83, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json b/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json index 5355bd5424..575701a9c1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json @@ -142,4 +142,4 @@ "weight": 353, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json b/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json index dde55a758f..425c826328 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json @@ -159,4 +159,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/delphox.json b/common/src/main/resources/data/cobblemon/species/generation6/delphox.json index b1ce46ff3f..b10331960a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/delphox.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/delphox.json @@ -204,4 +204,4 @@ "weight": 390, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/diancie.json b/common/src/main/resources/data/cobblemon/species/generation6/diancie.json index 9c0ec67748..895b2fa6a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diancie.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diancie.json @@ -217,4 +217,4 @@ "weight": 88, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json index 82b01fab0b..f767481297 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json @@ -203,4 +203,4 @@ "weight": 424, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/doublade.json b/common/src/main/resources/data/cobblemon/species/generation6/doublade.json index 1f20e120d3..38df859bef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/doublade.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/doublade.json @@ -144,4 +144,4 @@ "weight": 45, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json b/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json index 1072d87f47..c258edd718 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json @@ -174,4 +174,4 @@ "weight": 815, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/espurr.json b/common/src/main/resources/data/cobblemon/species/generation6/espurr.json index e0312d2e5d..531be791b7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/espurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/espurr.json @@ -183,4 +183,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json b/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json index f2c58757d6..9849ad6a16 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json @@ -181,4 +181,4 @@ "weight": 94, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json b/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json index e7c5fb21bd..56934b214e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json @@ -172,4 +172,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json index bdfc39dba2..202f54818d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json @@ -170,4 +170,4 @@ "weight": 160, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json b/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json index da449e68a2..fbe745e4b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json @@ -166,4 +166,4 @@ "weight": 17, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/floette.json b/common/src/main/resources/data/cobblemon/species/generation6/floette.json index f7ea1fc4b8..f2485ed890 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/floette.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/floette.json @@ -279,4 +279,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/florges.json b/common/src/main/resources/data/cobblemon/species/generation6/florges.json index e26f94b370..577733a609 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/florges.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/florges.json @@ -162,4 +162,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/froakie.json b/common/src/main/resources/data/cobblemon/species/generation6/froakie.json index 3044a1d76f..0cf0fc2ef3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/froakie.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/froakie.json @@ -188,4 +188,4 @@ "weight": 70, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json b/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json index 1c6eab09a5..bfd0f430b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json @@ -184,4 +184,4 @@ "weight": 109, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json b/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json index 235f8950ea..34bb425260 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json @@ -127,4 +127,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json b/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json index e2819a6fb3..c1ddf75f6b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json @@ -153,4 +153,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/goodra.json b/common/src/main/resources/data/cobblemon/species/generation6/goodra.json index 54d8ef67f5..de993b770b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/goodra.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/goodra.json @@ -80,10 +80,13 @@ "tm:blizzard", "tm:bodypress", "tm:bodyslam", + "tm:breakingswipe", "tm:bulldoze", "tm:charm", "tm:chillingwater", + "tm:curse", "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -95,12 +98,16 @@ "tm:flamethrower", "tm:flashcannon", "tm:gigaimpact", + "tm:gyroball", "tm:heavyslam", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", "tm:icespinner", "tm:ironhead", + "tm:knockoff", + "tm:lashout", + "tm:muddywater", "tm:mudshot", "tm:outrage", "tm:protect", @@ -110,8 +117,10 @@ "tm:rocktomb", "tm:sandstorm", "tm:scaryface", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", "tm:steelbeam", "tm:stompingtantrum", "tm:substitute", @@ -122,7 +131,8 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:waterpulse" + "tm:waterpulse", + "tm:weatherball" ], "labels": [ "gen8", @@ -202,8 +212,10 @@ "tm:charm", "tm:chillingwater", "tm:confide", + "tm:curse", "tm:doubleteam", "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -214,6 +226,7 @@ "tm:firepunch", "tm:flamethrower", "tm:focusblast", + "tm:focuspunch", "tm:frustration", "tm:gigaimpact", "tm:hail", @@ -224,6 +237,7 @@ "tm:incinerate", "tm:infestation", "tm:irontail", + "tm:knockoff", "tm:megakick", "tm:megapunch", "tm:muddywater", @@ -238,7 +252,9 @@ "tm:rockslide", "tm:rocksmash", "tm:round", + "tm:scald", "tm:secretpower", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -316,4 +332,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/goomy.json b/common/src/main/resources/data/cobblemon/species/generation6/goomy.json index 1c494def3e..51f7788b7f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/goomy.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/goomy.json @@ -152,7 +152,7 @@ }, { "variant": "biome", - "biomeCondition": "#minecraft:is_swamp" + "biomeCondition": "#cobblemon:is_swamp" } ] } @@ -305,11 +305,7 @@ }, { "variant": "biome", - "biomeCondition": "#minecraft:is_dripstone" - }, - { - "variant": "biome", - "biomeCondition": "#minecraft:is_lush" + "biomeCondition": "#cobblemon:evolution/sliggoo_hisuian" } ] } @@ -346,4 +342,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json index 3e45791978..a05ea32834 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json @@ -325,4 +325,4 @@ "pumpkin-size-average" ], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json index b9d87cf805..e6e42ee843 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json @@ -101,6 +101,11 @@ "49:extrasensory", "56:doubleteam", "68:hydropump", + "egg:counter", + "egg:retaliate", + "egg:spikes", + "egg:switcheroo", + "egg:toxicspikes", "tm:acrobatics", "tm:aerialace", "tm:attract", @@ -121,6 +126,7 @@ "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", + "tm:haze", "tm:helpinghand", "tm:hiddenpower", "tm:hydrocannon", @@ -143,6 +149,7 @@ "tm:round", "tm:scald", "tm:sleeptalk", + "tm:sludgewave", "tm:smackdown", "tm:snowscape", "tm:spikes", @@ -158,10 +165,12 @@ "tm:toxic", "tm:toxicspikes", "tm:trailblaze", + "tm:upperhand", "tm:uturn", "tm:waterfall", "tm:waterpledge", "tm:waterpulse", + "tm:weatherball", "tm:workup", "tutor:aerialace", "tutor:bounce", @@ -242,6 +251,7 @@ "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", + "tm:haze", "tm:helpinghand", "tm:hiddenpower", "tm:hydrocannon", @@ -267,6 +277,7 @@ "tm:scald", "tm:secretpower", "tm:sleeptalk", + "tm:sludgewave", "tm:smackdown", "tm:snowscape", "tm:spikes", @@ -283,10 +294,12 @@ "tm:toxic", "tm:toxicspikes", "tm:trailblaze", + "tm:upperhand", "tm:uturn", "tm:waterfall", "tm:waterpledge", "tm:waterpulse", + "tm:weatherball", "tm:workup", "tutor:bounce", "tutor:gunkshot", @@ -334,4 +347,4 @@ "weight": 400, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json b/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json index 2160592477..60d9565c97 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json @@ -212,4 +212,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json b/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json index 0422172d6b..08f8ab3fa6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json @@ -147,4 +147,4 @@ "weight": 210, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json b/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json index 50b815295e..918a1c9c88 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json @@ -139,4 +139,4 @@ "weight": 60, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/honedge.json b/common/src/main/resources/data/cobblemon/species/generation6/honedge.json index a10dbd36fb..b0de50eeac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/honedge.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/honedge.json @@ -150,4 +150,4 @@ "weight": 20, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json b/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json index a2dc2801c3..dff7ab410a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json @@ -230,4 +230,4 @@ "weight": 90, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/inkay.json b/common/src/main/resources/data/cobblemon/species/generation6/inkay.json index 76dc6cbf17..97fa7cf82a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/inkay.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/inkay.json @@ -207,4 +207,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/klefki.json b/common/src/main/resources/data/cobblemon/species/generation6/klefki.json index 1e63a809d5..4639cebc05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/klefki.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/klefki.json @@ -153,4 +153,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/litleo.json b/common/src/main/resources/data/cobblemon/species/generation6/litleo.json index ad1b0d59ae..43986e72a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/litleo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/litleo.json @@ -168,4 +168,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/malamar.json b/common/src/main/resources/data/cobblemon/species/generation6/malamar.json index 4cc6d21b9f..d5c26a7cf6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/malamar.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/malamar.json @@ -176,4 +176,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json b/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json index 236edca952..7038f093e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json @@ -338,4 +338,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/noibat.json b/common/src/main/resources/data/cobblemon/species/generation6/noibat.json index 9e10eab0bd..f0d0a6cceb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/noibat.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/noibat.json @@ -180,4 +180,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/noivern.json b/common/src/main/resources/data/cobblemon/species/generation6/noivern.json index 1488a52a78..642f8be696 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/noivern.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/noivern.json @@ -177,4 +177,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pancham.json b/common/src/main/resources/data/cobblemon/species/generation6/pancham.json index 787b0fae36..b0123ca463 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pancham.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pancham.json @@ -205,4 +205,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json index a6ec0c7471..64393e5fdf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json @@ -205,4 +205,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/phantump.json b/common/src/main/resources/data/cobblemon/species/generation6/phantump.json index 1cb20a576c..d5aaee97ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/phantump.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/phantump.json @@ -191,4 +191,4 @@ "weight": 70, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json b/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json index 591ab7d9c0..c2fab1584d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json @@ -443,4 +443,4 @@ "pumpkin-size-average" ], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json index 6494ce798c..7de3f14f4e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json @@ -158,4 +158,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json b/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json index 8681d415df..8d8c58d648 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json @@ -201,4 +201,4 @@ "weight": 290, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json b/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json index aed65c6ce7..d9d8f233a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json @@ -111,4 +111,4 @@ "weight": 25, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json b/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json index a3e283abc9..748913d6d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json @@ -161,4 +161,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json b/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json index c499e77604..2eb1b04cb0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json @@ -185,4 +185,4 @@ "weight": 73, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json b/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json index 7ad0943867..1e38cc1ad0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json @@ -76,15 +76,18 @@ "tm:bodyslam", "tm:charm", "tm:chillingwater", + "tm:curse", "tm:dracometeor", "tm:dragonpulse", "tm:endure", "tm:facade", "tm:flashcannon", + "tm:gyroball", "tm:heavyslam", "tm:icebeam", "tm:icespinner", "tm:ironhead", + "tm:muddywater", "tm:mudshot", "tm:outrage", "tm:protect", @@ -93,8 +96,10 @@ "tm:rockslide", "tm:rocktomb", "tm:sandstorm", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", "tm:steelbeam", "tm:substitute", "tm:sunnyday", @@ -139,29 +144,6 @@ "isRaining": true } ] - }, - { - "id": "hisui_sliggoo_goodra", - "variant": "level_up", - "result": "goodra", - "consumeHeldItem": false, - "learnableMoves": [ - "aquatail" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 50 - }, - { - "variant": "weather", - "isRaining": true - }, - { - "variant": "biome", - "biomeCondition": "#minecraft:is_swamp" - } - ] } ], "cannotDynamax": false, @@ -214,6 +196,7 @@ "tm:charm", "tm:chillingwater", "tm:confide", + "tm:curse", "tm:doubleteam", "tm:dracometeor", "tm:dragonpulse", @@ -234,6 +217,7 @@ "tm:rockslide", "tm:round", "tm:secretpower", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -283,33 +267,6 @@ "isRaining": true } ] - }, - { - "id": "sliggoo_hisui_goodra", - "variant": "level_up", - "result": "goodra hisuian", - "consumeHeldItem": false, - "learnableMoves": [ - "irontail" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 50 - }, - { - "variant": "weather", - "isRaining": true - }, - { - "variant": "biome", - "biomeCondition": "#minecraft:is_dripstone" - }, - { - "variant": "biome", - "biomeCondition": "#minecraft:is_lush" - } - ] } ], "baseScale": 0.65, @@ -344,4 +301,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json index 48819ddfc4..f3e2c16eeb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json @@ -140,4 +140,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json b/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json index 0420c4f6d3..cdd362e809 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json @@ -95,6 +95,22 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_mushroom" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_magical" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_spooky" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_swamp" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -114,6 +130,26 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_plains" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_floral" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_mushroom" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_savanna" + }, + { + "variant": "biome", + "biomeAnticondition": "minecraft:sunflower_plains" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -132,11 +168,15 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_spooky" + "biomeCondition": "#cobblemon:evolution/vivillon_elegant" }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_magical" + "biomeAnticondition": "#cobblemon:is_mountain" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -155,7 +195,11 @@ }, { "variant": "biome", - "biomeCondition": "minecraft:cherry_grove" + "biomeCondition": "#cobblemon:is_cherry_blossom" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -175,6 +219,46 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_forest" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_cherry_blossom" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_floral" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_jungle" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_magical" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_mountain" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_mushroom" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_plains" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_spooky" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_swamp" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -194,6 +278,10 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_badlands" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -213,6 +301,14 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_taiga" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_mountain" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -232,6 +328,14 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_jungle" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_mountain" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -255,6 +359,14 @@ { "variant": "biome", "biomeAnticondition": "#cobblemon:is_warm_ocean" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_frozen_ocean" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -274,6 +386,22 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_floral" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_cherry_blossom" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_magical" + }, + { + "variant": "biome", + "biomeAnticondition": "minecraft:sunflower_plains" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -311,11 +439,31 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_mountain" + "biomeCondition": "#cobblemon:evolution/vivillon_monsoon" }, { "variant": "biome", - "biomeCondition": "#cobblemon:is_peak" + "biomeAnticondition": "#cobblemon:is_badlands" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_floral" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_desert" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_mushroom" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_tropical_island" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -334,7 +482,27 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:vivillon_evolutions/ocean" + "biomeCondition": "#cobblemon:evolution/vivillon_ocean" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_cold_ocean" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_frozen_ocean" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_lukewarm_ocean" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_temperate_ocean" } ] }, @@ -354,6 +522,10 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_frozen_ocean" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -372,7 +544,27 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:vivillon_evolutions/river" + "biomeCondition": "#cobblemon:evolution/vivillon_river" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_forest" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_jungle" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_magical" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_spooky" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -392,6 +584,14 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_desert" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_badlands" } ] }, @@ -411,6 +611,26 @@ { "variant": "biome", "biomeCondition": "#cobblemon:is_savanna" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_badlands" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_desert" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_floral" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_mountain" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -429,7 +649,11 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:vivillon_evolutions/sun" + "biomeCondition": "#cobblemon:evolution/vivillon_sun" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" } ] }, @@ -448,7 +672,15 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:vivillon_evolutions/tundra" + "biomeCondition": "#cobblemon:evolution/vivillon_tundra" + }, + { + "variant": "structure", + "structureAnticondition": "#minecraft:village" + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_mountain" } ] }, @@ -548,4 +780,4 @@ "weight": 84, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json b/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json index aa61f9e09a..3ac700c85a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json @@ -155,4 +155,4 @@ "weight": 5, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json b/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json index 59b6f8d378..f5bb8d76b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json @@ -151,4 +151,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json index cbfef914d8..33c1ce246f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json @@ -176,4 +176,4 @@ "weight": 235, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json b/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json index 17631b65d2..4a832d8fe4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json @@ -164,4 +164,4 @@ "weight": 245, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json b/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json index 2989c821e6..5781f4dc19 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json @@ -198,4 +198,4 @@ "weight": 710, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json b/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json index cb94dc7a62..32e240f9d4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json @@ -175,4 +175,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json b/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json index 35ad421d67..248e39d355 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json @@ -197,4 +197,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json index 917c7463d3..e81811c570 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json @@ -33,7 +33,193 @@ "catchRate": 45, "maleRatio": 0.5, "shoulderMountable": false, - "forms": [], + "forms": [ + { + "name": "Fancy", + "primaryType": "bug", + "secondaryType": "flying", + "abilities": [ + "shielddust", + "compoundeyes", + "h:friendguard" + ], + "baseStats": { + "hp": 80, + "attack": 52, + "defence": 50, + "special_attack": 90, + "special_defence": 50, + "speed": 89 + }, + "catchRate": 45, + "maleRatio": 0.5, + "baseExperienceYield": 185, + "baseFriendship": 70, + "evYield": { + "hp": 1, + "attack": 0, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 1 + }, + "experienceGroup": "medium_fast", + "eggCycles": 15, + "eggGroups": [ + "bug" + ], + "moves": [ + "1:poisonpowder", + "1:sleeppowder", + "1:strugglebug", + "1:stunspore", + "12:lightscreen", + "17:psybeam", + "21:supersonic", + "25:drainingkiss", + "31:safeguard", + "35:bugbuzz", + "45:quiverdance", + "50:hurricane", + "tm:acrobatics", + "tm:aircutter", + "tm:airslash", + "tm:bugbuzz", + "tm:confuseray", + "tm:drainingkiss", + "tm:endure", + "tm:energyball", + "tm:facade", + "tm:gigadrain", + "tm:gigaimpact", + "tm:hurricane", + "tm:hyperbeam", + "tm:irondefense", + "tm:lightscreen", + "tm:pollenpuff", + "tm:pounce", + "tm:protect", + "tm:psybeam", + "tm:psychic", + "tm:raindance", + "tm:rest", + "tm:sleeptalk", + "tm:solarbeam", + "tm:strugglebug", + "tm:substitute", + "tm:sunnyday", + "tm:swift", + "tm:tailwind", + "tm:terablast", + "tm:thief", + "tm:uturn" + ], + "labels": [ + "gen6" + ], + "aspects": [ + "fancy" + ], + "height": 12, + "weight": 170, + "preEvolution": "spewpa", + "evolutions": [], + "cannotDynamax": false, + "battleOnly": false + }, + { + "name": "Pokeball", + "primaryType": "bug", + "secondaryType": "flying", + "abilities": [ + "shielddust", + "compoundeyes", + "h:friendguard" + ], + "baseStats": { + "hp": 80, + "attack": 52, + "defence": 50, + "special_attack": 90, + "special_defence": 50, + "speed": 89 + }, + "catchRate": 45, + "maleRatio": 0.5, + "baseExperienceYield": 185, + "baseFriendship": 70, + "evYield": { + "hp": 1, + "attack": 0, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 1 + }, + "experienceGroup": "medium_fast", + "eggCycles": 15, + "eggGroups": [ + "bug" + ], + "moves": [ + "1:poisonpowder", + "1:sleeppowder", + "1:strugglebug", + "1:stunspore", + "12:lightscreen", + "17:psybeam", + "21:supersonic", + "25:drainingkiss", + "31:safeguard", + "35:bugbuzz", + "45:quiverdance", + "50:hurricane", + "tm:acrobatics", + "tm:aircutter", + "tm:airslash", + "tm:bugbuzz", + "tm:confuseray", + "tm:drainingkiss", + "tm:endure", + "tm:energyball", + "tm:facade", + "tm:gigadrain", + "tm:gigaimpact", + "tm:hurricane", + "tm:hyperbeam", + "tm:irondefense", + "tm:lightscreen", + "tm:pollenpuff", + "tm:pounce", + "tm:protect", + "tm:psybeam", + "tm:psychic", + "tm:raindance", + "tm:rest", + "tm:sleeptalk", + "tm:solarbeam", + "tm:strugglebug", + "tm:substitute", + "tm:sunnyday", + "tm:swift", + "tm:tailwind", + "tm:terablast", + "tm:thief", + "tm:uturn" + ], + "labels": [ + "gen6" + ], + "aspects": [ + "pokeball" + ], + "height": 12, + "weight": 170, + "evolutions": [], + "cannotDynamax": false, + "battleOnly": false + } + ], "baseExperienceYield": 185, "experienceGroup": "medium_fast", "eggCycles": 15, @@ -164,4 +350,4 @@ "weight": 170, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json b/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json index 0316c1d1f2..5fd94a4f1a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json @@ -166,4 +166,4 @@ "weight": 1950, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json b/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json index 4c04105fce..f9925446d1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json @@ -190,4 +190,4 @@ "weight": 2150, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json b/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json index 016635c5da..102661abe2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json @@ -153,4 +153,4 @@ "weight": 2030, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json b/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json index 7798f502a3..492d61c288 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json @@ -255,4 +255,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json b/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json index f0c463046c..630f740026 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json @@ -211,6 +211,7 @@ "tm:toxic", "tm:trailblaze", "tm:waterfall", + "tm:waterpulse", "tm:wonderroom", "tm:xscissor", "tutor:bugbite", @@ -254,4 +255,4 @@ "weight": 820, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bewear.json b/common/src/main/resources/data/cobblemon/species/generation7/bewear.json index b074d48ab1..b916222863 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bewear.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bewear.json @@ -159,4 +159,4 @@ "weight": 1350, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json b/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json index f16ed0da73..277de67b16 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json @@ -147,4 +147,4 @@ "weight": 130, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json b/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json index 9930d5c7f7..fe98a927f8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json @@ -147,4 +147,4 @@ "weight": 32, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/brionne.json b/common/src/main/resources/data/cobblemon/species/generation7/brionne.json index 13417710b9..cb7d1ef151 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/brionne.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/brionne.json @@ -177,4 +177,4 @@ "weight": 175, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json b/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json index 2c3a394919..f955b12b6b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json @@ -163,4 +163,4 @@ "weight": 190, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json b/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json index a9c16dc231..5659e1bd9e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json @@ -153,4 +153,4 @@ "weight": 3336, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json b/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json index d41bdc89cc..72e8cdac89 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json @@ -148,4 +148,4 @@ "weight": 9999, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json b/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json index 404cdb47b7..9666f840da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json @@ -149,4 +149,4 @@ "weight": 105, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/comfey.json b/common/src/main/resources/data/cobblemon/species/generation7/comfey.json index 827f3e2eb3..372cbe1c5a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/comfey.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/comfey.json @@ -188,4 +188,4 @@ "weight": 3, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json b/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json index 30da843e80..fe981ebc92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json @@ -86,4 +86,4 @@ "weight": 9999, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json b/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json index 9b846ed4d6..47b96f5dee 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json @@ -71,4 +71,4 @@ "weight": 1, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json b/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json index 4ac76459d4..3cdd4ef5d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json @@ -164,4 +164,4 @@ "weight": 1800, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json b/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json index e7b1da80cc..cad6555599 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json @@ -165,4 +165,4 @@ "weight": 70, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json b/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json index 23903bef4c..54dac64b5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json @@ -195,4 +195,4 @@ "weight": 2, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json b/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json index 43b7e22a17..084eb36bac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json @@ -182,7 +182,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:regional_bias_evolutions/rowlet_dartrix_alolan" + "biomeCondition": "#cobblemon:evolution/rowlet_dartrix_alolan" }, { "variant": "biome", @@ -378,7 +378,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:regional_bias_evolutions/rowlet_dartrix_hisui_bias" + "biomeCondition": "#cobblemon:evolution/rowlet_dartrix_hisui_bias" } ] } @@ -402,4 +402,4 @@ "weight": 160, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json index c4ca5c7055..44f3f2bd12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json @@ -17,8 +17,7 @@ "speed": 70 }, "features": [ - "hisuian", - "regional" + "hisuian" ], "catchRate": 45, "maleRatio": 0.875, @@ -63,7 +62,6 @@ "1:leafstorm", "1:tackle", "1:uturn", - "1:spiritshackle", "9:peck", "12:shadowsneak", "15:razorleaf", @@ -84,24 +82,34 @@ "tm:bulkup", "tm:bulletseed", "tm:closecombat", + "tm:coaching", + "tm:confuseray", + "tm:dualwingbeat", "tm:endure", "tm:energyball", "tm:facade", "tm:falseswipe", + "tm:featherdance", "tm:focusblast", + "tm:focuspunch", "tm:frenzyplant", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grasspledge", + "tm:grassyglide", "tm:grassyterrain", + "tm:haze", "tm:helpinghand", "tm:hyperbeam", + "tm:knockoff", "tm:leafstorm", + "tm:lightscreen", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", "tm:nastyplot", + "tm:nightshade", "tm:protect", "tm:raindance", "tm:rest", @@ -111,6 +119,7 @@ "tm:seedbomb", "tm:shadowclaw", "tm:sleeptalk", + "tm:smackdown", "tm:solarbeam", "tm:substitute", "tm:sunnyday", @@ -121,6 +130,7 @@ "tm:taunt", "tm:terablast", "tm:trailblaze", + "tm:upperhand", "tm:uturn" ], "labels": [ @@ -128,8 +138,7 @@ "hisui_regional" ], "aspects": [ - "hisuian", - "regional-hisui" + "hisuian" ], "height": 16, "weight": 370, @@ -179,7 +188,6 @@ "1:leafage", "1:leafstorm", "1:phantomforce", - "1:spiritshackle", "1:spite", "1:tackle", "1:uturn", @@ -206,25 +214,31 @@ "tm:bulletseed", "tm:confide", "tm:confuseray", + "tm:curse", "tm:doubleteam", + "tm:dualwingbeat", "tm:echoedvoice", "tm:endure", "tm:energyball", "tm:facade", "tm:falseswipe", + "tm:featherdance", "tm:frenzyplant", "tm:frustration", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grasspledge", + "tm:grassyglide", "tm:grassyterrain", + "tm:haze", "tm:helpinghand", "tm:hex", "tm:hiddenpower", "tm:hurricane", "tm:hyperbeam", "tm:imprison", + "tm:knockoff", "tm:leafblade", "tm:leafstorm", "tm:lightscreen", @@ -235,6 +249,7 @@ "tm:naturepower", "tm:nightshade", "tm:phantomforce", + "tm:poltergeist", "tm:protect", "tm:psychocut", "tm:raindance", @@ -246,11 +261,13 @@ "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", + "tm:skittersmack", "tm:sleeptalk", "tm:smackdown", "tm:snore", "tm:solarbeam", "tm:solarblade", + "tm:spite", "tm:steelwing", "tm:substitute", "tm:sunnyday", @@ -314,4 +331,4 @@ "weight": 366, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json b/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json index a5b7e53e3a..3929a29616 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json @@ -159,4 +159,4 @@ "weight": 40, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json b/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json index 1be31fa750..cda303700c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json @@ -174,4 +174,4 @@ "weight": 2100, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/drampa.json b/common/src/main/resources/data/cobblemon/species/generation7/drampa.json index c91f42b524..0e0a8acc44 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/drampa.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/drampa.json @@ -178,4 +178,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/fomantis.json b/common/src/main/resources/data/cobblemon/species/generation7/fomantis.json index 33f2df77b2..ae57d553e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/fomantis.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/fomantis.json @@ -158,4 +158,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json b/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json index 1240da74b1..0798817697 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json @@ -173,4 +173,4 @@ "weight": 1080, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json b/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json index 38fdf6cdac..a86fdcac1b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json @@ -148,4 +148,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json b/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json index 71b1e7bb68..c386cff550 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json @@ -267,4 +267,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json b/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json index 633ca36b61..4c7e7a9701 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json @@ -163,4 +163,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json b/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json index e149967970..a2532868aa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json @@ -192,4 +192,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json b/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json index 34cde516fc..0a47c259a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json @@ -204,4 +204,4 @@ "weight": 830, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json b/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json index 7656ebcd7a..d41609bb10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json @@ -175,4 +175,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/kartana.json b/common/src/main/resources/data/cobblemon/species/generation7/kartana.json index 70791384c1..86420b2a14 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/kartana.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/kartana.json @@ -126,4 +126,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/komala.json b/common/src/main/resources/data/cobblemon/species/generation7/komala.json index 525fa16b7b..746676ff9a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/komala.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/komala.json @@ -156,4 +156,4 @@ "weight": 199, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json b/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json index 80f3b3e262..d7b965ccbf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json @@ -351,4 +351,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/litten.json b/common/src/main/resources/data/cobblemon/species/generation7/litten.json index ffc6cd032e..44e5ef202d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/litten.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/litten.json @@ -160,4 +160,4 @@ "weight": 43, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/lunala.json b/common/src/main/resources/data/cobblemon/species/generation7/lunala.json index 826be5a487..53b00fb589 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lunala.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lunala.json @@ -122,7 +122,6 @@ "tutor:magiccoat", "tutor:magicroom", "tutor:meteorbeam", - "tutor:moonblast", "tutor:moongeistbeam", "tutor:moonlight", "tutor:nightdaze", @@ -177,4 +176,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json b/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json index 2113cc1c06..cd2fa054c1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json @@ -260,4 +260,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json b/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json index d898154e07..54c2aa007c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json @@ -479,4 +479,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/magearna.json b/common/src/main/resources/data/cobblemon/species/generation7/magearna.json index 1e7fe72f8d..46d815bb98 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/magearna.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/magearna.json @@ -94,6 +94,7 @@ "tm:focusblast", "tm:gigaimpact", "tm:grassknot", + "tm:gravity", "tm:guardswap", "tm:gyroball", "tm:heavyslam", @@ -105,7 +106,10 @@ "tm:irondefense", "tm:ironhead", "tm:lightscreen", + "tm:metalsound", + "tm:mistyexplosion", "tm:mistyterrain", + "tm:painsplit", "tm:playrough", "tm:powerswap", "tm:protect", @@ -222,6 +226,7 @@ "tm:frustration", "tm:gigaimpact", "tm:grassknot", + "tm:gravity", "tm:guardswap", "tm:gyroball", "tm:heavyslam", @@ -234,7 +239,10 @@ "tm:irondefense", "tm:ironhead", "tm:lightscreen", + "tm:metalsound", + "tm:mistyexplosion", "tm:mistyterrain", + "tm:painsplit", "tm:playrough", "tm:powerswap", "tm:protect", @@ -316,4 +324,4 @@ "weight": 805, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json b/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json index 1a2cce4820..cbf6783da1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json @@ -172,4 +172,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json b/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json index 6085d9ce90..87c0f81f38 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json @@ -165,4 +165,4 @@ "weight": 222, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/melmetal.json b/common/src/main/resources/data/cobblemon/species/generation7/melmetal.json index 2752335a3f..4bcdf11410 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/melmetal.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/melmetal.json @@ -180,4 +180,4 @@ "weight": 8000, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/meltan.json b/common/src/main/resources/data/cobblemon/species/generation7/meltan.json index 2458b8b02e..77043ce87d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/meltan.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/meltan.json @@ -87,4 +87,4 @@ "weight": 80, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json index 92d367c69d..2ca0887999 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json @@ -132,15 +132,12 @@ "tutor:burningjealousy", "tutor:copycat", "tutor:covet", - "tutor:curse", - "tutor:destinybond", "tutor:drainpunch", "tutor:gigadrain", "tutor:lastresort", "tutor:magicroom", "tutor:mimic", "tutor:painsplit", - "tutor:phantomforce", "tutor:playrough", "tutor:snatch", "tutor:snore", @@ -148,7 +145,6 @@ "tutor:splash", "tutor:substitute", "tutor:telekinesis", - "tutor:thunderbolt", "tutor:trick" ], "labels": [ @@ -385,4 +381,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/minior.json b/common/src/main/resources/data/cobblemon/species/generation7/minior.json index ad244eff52..0a152b4dcc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/minior.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/minior.json @@ -182,4 +182,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/morelull.json b/common/src/main/resources/data/cobblemon/species/generation7/morelull.json index 662135ce11..cc22d56e59 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/morelull.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/morelull.json @@ -146,4 +146,4 @@ "weight": 15, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json b/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json index e04672f077..83d5892650 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json @@ -181,4 +181,4 @@ "weight": 1100, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json b/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json index d64b63bb2c..4f2466b350 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json @@ -168,4 +168,4 @@ "weight": 9200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json b/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json index 915f991710..2e0ef59f0b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json @@ -160,4 +160,4 @@ "weight": 1500, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json b/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json index 6a7d0894bb..301274937b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json @@ -185,9 +185,11 @@ "67:wringout", "72:photongeyser", "80:autotomize", + "80:gravity", "88:prismaticlaser", "tm:aerialace", "tm:allyswitch", + "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:brutalswing", @@ -204,12 +206,14 @@ "tm:earthquake", "tm:embargo", "tm:endure", + "tm:expandingforce", "tm:facade", "tm:flashcannon", "tm:fling", "tm:frustration", "tm:futuresight", "tm:gigaimpact", + "tm:gravity", "tm:gyroball", "tm:heatwave", "tm:hiddenpower", @@ -218,7 +222,10 @@ "tm:imprison", "tm:irondefense", "tm:ironhead", + "tm:knockoff", "tm:lightscreen", + "tm:metalclaw", + "tm:meteorbeam", "tm:outrage", "tm:powergem", "tm:protect", @@ -234,6 +241,7 @@ "tm:rockslide", "tm:rocktomb", "tm:round", + "tm:sandstorm", "tm:scaryface", "tm:shadowclaw", "tm:sleeptalk", @@ -244,8 +252,11 @@ "tm:stoneedge", "tm:storedpower", "tm:substitute", + "tm:sunnyday", "tm:swagger", + "tm:swift", "tm:swordsdance", + "tm:terablast", "tm:thief", "tm:thunderwave", "tm:toxic", @@ -260,7 +271,6 @@ "tutor:gravity", "tutor:heatwave", "tutor:hypervoice", - "tutor:irondefense", "tutor:ironhead", "tutor:knockoff", "tutor:lightscreen", @@ -270,7 +280,6 @@ "tutor:nightslash", "tutor:outrage", "tutor:photongeyser", - "tutor:powergem", "tutor:prismaticlaser", "tutor:psychocut", "tutor:recycle", @@ -309,4 +318,4 @@ "weight": 2300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json b/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json index 078891d8c7..f1bf3e6a22 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json @@ -154,4 +154,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json index bd0a4512e2..6239322dbf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json @@ -187,4 +187,4 @@ "weight": 760, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json index 6b097c4781..a0ee8f19e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json @@ -278,4 +278,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/palossand.json b/common/src/main/resources/data/cobblemon/species/generation7/palossand.json index a7a33eacd4..bebbc8f588 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/palossand.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/palossand.json @@ -158,4 +158,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/passimian.json b/common/src/main/resources/data/cobblemon/species/generation7/passimian.json index b8977e06a8..44a7830aca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/passimian.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/passimian.json @@ -184,4 +184,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json b/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json index 97b41da3e1..aeeb5c2290 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json @@ -149,4 +149,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/pikipek.json b/common/src/main/resources/data/cobblemon/species/generation7/pikipek.json index a0e5ab212a..cdd53845dd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/pikipek.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/pikipek.json @@ -153,4 +153,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/poipole.json b/common/src/main/resources/data/cobblemon/species/generation7/poipole.json index bf22a87a33..1382fe078b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/poipole.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/poipole.json @@ -136,4 +136,4 @@ "weight": 18, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/popplio.json b/common/src/main/resources/data/cobblemon/species/generation7/popplio.json index 5ce43796d9..465e8e4a46 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/popplio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/popplio.json @@ -180,4 +180,4 @@ "weight": 75, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/primarina.json b/common/src/main/resources/data/cobblemon/species/generation7/primarina.json index e152404290..6a58aa85b4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/primarina.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/primarina.json @@ -188,4 +188,4 @@ "weight": 440, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json b/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json index 2520f6d771..b5964b0a15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json @@ -126,4 +126,4 @@ "weight": 12, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json b/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json index febd08548a..c8c56dd281 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json @@ -304,4 +304,4 @@ "weight": 5, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json b/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json index 5d9b765f3b..036a6754bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json @@ -217,4 +217,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json b/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json index ca6a42b421..0a36db8b6e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json @@ -185,7 +185,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:regional_bias_evolutions/rowlet_dartrix_alolan" + "biomeCondition": "#cobblemon:evolution/rowlet_dartrix_alolan" }, { "variant": "biome", @@ -384,7 +384,7 @@ }, { "variant": "biome", - "biomeCondition": "#cobblemon:regional_bias_evolutions/rowlet_dartrix_hisui_bias" + "biomeCondition": "#cobblemon:evolution/rowlet_dartrix_hisui_bias" } ] } @@ -408,4 +408,4 @@ "weight": 15, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/salandit.json b/common/src/main/resources/data/cobblemon/species/generation7/salandit.json index 120fa0a278..4176c99874 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/salandit.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/salandit.json @@ -188,4 +188,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json b/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json index f884439900..b0d6b50679 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json @@ -300,4 +300,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json b/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json index d4999f3082..0f9227d043 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json @@ -172,4 +172,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json b/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json index b9c0f42876..3cb6cdc06f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json @@ -134,4 +134,4 @@ "weight": 115, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/silvally.json b/common/src/main/resources/data/cobblemon/species/generation7/silvally.json index 28aeface3a..9ec7b4c150 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/silvally.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/silvally.json @@ -895,4 +895,4 @@ "weight": 1005, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json b/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json index 59a19b3674..8cd68ff63e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json @@ -170,4 +170,4 @@ "weight": 2300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json b/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json index d4d9746552..b9a2b69bd4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json @@ -152,4 +152,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json index 1cdaf1c824..f88cdd77bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json @@ -157,4 +157,4 @@ "weight": 82, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/stufful.json b/common/src/main/resources/data/cobblemon/species/generation7/stufful.json index ed793435a1..f84155a6da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/stufful.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/stufful.json @@ -166,4 +166,4 @@ "weight": 68, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json b/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json index a67cbbfb63..d6bb66b439 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json @@ -151,4 +151,4 @@ "weight": 455, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json b/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json index b9fda77ae9..d77808cc00 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json @@ -146,4 +146,4 @@ "weight": 212, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json b/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json index 5eb2be8cc9..5447e61998 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json @@ -152,4 +152,4 @@ "weight": 205, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json b/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json index 353c21b29c..c3869339d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json @@ -141,4 +141,4 @@ "weight": 186, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json b/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json index 7fb02ac89b..670a43593d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json @@ -267,4 +267,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/torracat.json b/common/src/main/resources/data/cobblemon/species/generation7/torracat.json index 8ee8f619fb..5864c394a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/torracat.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/torracat.json @@ -156,4 +156,4 @@ "weight": 250, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json b/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json index 613de1c075..de7465af5a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json @@ -153,4 +153,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json b/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json index 575b4fe874..c64eb4080e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json @@ -159,4 +159,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json b/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json index 145ce11c83..c6c5023ba5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json @@ -156,4 +156,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json index 0f4bd02356..bfe30728b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json @@ -155,4 +155,4 @@ "weight": 214, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json b/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json index b220553f3f..4f7031e319 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json @@ -175,4 +175,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/typenull.json b/common/src/main/resources/data/cobblemon/species/generation7/typenull.json index 5a5b44976e..5da2e1e849 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/typenull.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/typenull.json @@ -142,4 +142,4 @@ "weight": 1205, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json b/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json index e7d1e0f062..c1f0273d56 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json @@ -260,4 +260,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json b/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json index 29d55cb6e9..d0bd91bf98 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json @@ -132,4 +132,4 @@ "weight": 120, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json b/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json index 39f1a474d0..8304c19e98 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json @@ -207,4 +207,4 @@ }, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json b/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json index 7d5cb7c9a7..7443078e09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json @@ -136,4 +136,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json b/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json index 7b80799266..268127408f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json @@ -161,4 +161,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json b/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json index e93f5c480d..ffaefd0292 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json @@ -156,4 +156,4 @@ "weight": 445, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json index d4527a6062..f8c6815d74 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json @@ -180,4 +180,4 @@ "weight": 5, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/appletun.json b/common/src/main/resources/data/cobblemon/species/generation8/appletun.json index 3f3e8ed9c8..235e902a5f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/appletun.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/appletun.json @@ -184,4 +184,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/applin.json b/common/src/main/resources/data/cobblemon/species/generation8/applin.json index 70e229229c..27a8f9cc28 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/applin.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/applin.json @@ -111,4 +111,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/arctovish.json b/common/src/main/resources/data/cobblemon/species/generation8/arctovish.json index 5a487d5d1c..78c10ec88e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/arctovish.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/arctovish.json @@ -124,4 +124,4 @@ "weight": 1750, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/arctozolt.json b/common/src/main/resources/data/cobblemon/species/generation8/arctozolt.json index 656e4a1695..edf4f46504 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/arctozolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/arctozolt.json @@ -132,4 +132,4 @@ "weight": 1500, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json b/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json index c5f2531b46..ec887c43bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json @@ -149,4 +149,4 @@ "weight": 10, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json b/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json index ba56e6c282..a54aee0a62 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json @@ -139,4 +139,4 @@ "weight": 300, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/basculegion.json b/common/src/main/resources/data/cobblemon/species/generation8/basculegion.json index 2a70f2ccb9..43a669c6ec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/basculegion.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/basculegion.json @@ -156,6 +156,7 @@ } }, "catchRate": 135, + "maleRatio": 0, "baseExperienceYield": 265, "baseFriendship": 0, "evYield": { @@ -270,4 +271,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json b/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json index 32b477604e..e8948dd976 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json @@ -84,4 +84,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/boltund.json b/common/src/main/resources/data/cobblemon/species/generation8/boltund.json index 3c0c22cc36..7bed4f2b6e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/boltund.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/boltund.json @@ -127,4 +127,4 @@ "weight": 340, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json b/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json index a3aff1a43b..4c37cfcbbf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json @@ -283,7 +283,9 @@ "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", + "tm:gravity", "tm:guardswap", + "tm:haze", "tm:helpinghand", "tm:hex", "tm:hyperbeam", @@ -393,12 +395,14 @@ "tm:encore", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:facade", "tm:futuresight", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", + "tm:gravity", "tm:guardswap", "tm:helpinghand", "tm:hyperbeam", @@ -416,6 +420,7 @@ "tm:psybeam", "tm:psychic", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:reflect", "tm:rest", @@ -472,4 +477,4 @@ "weight": 77, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/carkol.json b/common/src/main/resources/data/cobblemon/species/generation8/carkol.json index 2ee3196846..ddd0137191 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/carkol.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/carkol.json @@ -149,4 +149,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json index 120ecb83bc..d7db199bcd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json @@ -177,4 +177,4 @@ "weight": 1200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json b/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json index efe3d7fc37..d5c557874e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json @@ -130,4 +130,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json index 861d3eb58f..545ebe5c27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json @@ -204,4 +204,4 @@ "weight": 330, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json b/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json index d856adf464..9c37d39637 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json @@ -128,4 +128,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json b/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json index 25043e6419..a096e2263c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json @@ -190,4 +190,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json b/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json index 7926f7e3ff..180811557d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json @@ -198,4 +198,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json index 9aad53141c..3e4ad2d3b4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json @@ -207,4 +207,4 @@ "weight": 750, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json index 1dce8dea2b..7e19160e5e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json @@ -151,4 +151,4 @@ "weight": 160, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json b/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json index 4bbbd65b51..dd0b302269 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json @@ -129,20 +129,28 @@ "49:thrash", "56:hydropump", "egg:aerialace", + "egg:aquacutter", "egg:aquaring", "egg:defog", "egg:featherdance", "egg:roost", + "tm:acrobatics", + "tm:aerialace", "tm:agility", + "tm:aircutter", "tm:airslash", "tm:amnesia", "tm:assurance", "tm:attract", "tm:blizzard", "tm:bravebird", + "tm:chillingwater", "tm:dive", + "tm:dualwingbeat", + "tm:endeavor", "tm:endure", "tm:facade", + "tm:featherdance", "tm:fly", "tm:gigaimpact", "tm:hurricane", @@ -151,6 +159,7 @@ "tm:icebeam", "tm:icywind", "tm:liquidation", + "tm:pounce", "tm:protect", "tm:raindance", "tm:rest", @@ -163,9 +172,13 @@ "tm:substitute", "tm:superpower", "tm:surf", + "tm:tailwind", + "tm:takedown", + "tm:terablast", "tm:thief", "tm:throatchop", "tm:uproar", + "tm:waterpulse", "tm:weatherball", "tm:whirlpool", "tutor:dualwingbeat" @@ -216,4 +229,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cufant.json b/common/src/main/resources/data/cobblemon/species/generation8/cufant.json index f5d3d12f55..7968c43fa4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cufant.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cufant.json @@ -161,4 +161,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cursola.json b/common/src/main/resources/data/cobblemon/species/generation8/cursola.json index 90b6559a95..7d4ca35007 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cursola.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cursola.json @@ -133,4 +133,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dottler.json b/common/src/main/resources/data/cobblemon/species/generation8/dottler.json index dd1d2c2f0c..5fee5f9552 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dottler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dottler.json @@ -116,4 +116,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dracovish.json b/common/src/main/resources/data/cobblemon/species/generation8/dracovish.json index 3c597c6c14..2184999065 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dracovish.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dracovish.json @@ -132,4 +132,4 @@ "weight": 2150, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dracozolt.json b/common/src/main/resources/data/cobblemon/species/generation8/dracozolt.json index 9deb79b8d1..e290010f0a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dracozolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dracozolt.json @@ -132,4 +132,4 @@ "weight": 1900, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json b/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json index e8475c0dbf..d3481f7a3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json @@ -47,6 +47,7 @@ "dragon" ], "moves": [ + "1:dragondarts", "1:astonish", "1:bite", "1:dragonbreath", @@ -124,11 +125,7 @@ "tm:triattack", "tm:uturn", "tm:willowisp", - "tutor:dracometeor", - "tutor:dragondarts", - "tutor:phantomforce", - "tutor:terablast", - "tutor:uturn" + "tutor:dracometeor" ], "labels": [ "gen8", @@ -171,4 +168,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json b/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json index 0ce50160c8..6d48393a4c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json @@ -173,4 +173,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json b/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json index 3ce25a00e6..b2770633ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json @@ -197,4 +197,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dreepy.json b/common/src/main/resources/data/cobblemon/species/generation8/dreepy.json index ff82053fc5..98b754210a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dreepy.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dreepy.json @@ -133,4 +133,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json b/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json index 58b40273c8..5968ef1624 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json @@ -139,4 +139,4 @@ "weight": 115, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json b/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json index d593a1f9a4..d74b458811 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json @@ -118,4 +118,4 @@ "weight": 430, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json b/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json index 9d0d97c173..bafa1b16ce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json @@ -153,7 +153,19 @@ "pokedex": [ "cobblemon.species.duraludon.desc" ], - "evolutions": [], + "evolutions": [ + { + "id": "duralodon_archaludon", + "variant": "item_interact", + "result": "archaludon", + "consumeHeldItem": false, + "learnableMoves": [ + "electroshot" + ], + "requirements": [], + "requiredContext": "cobblemon:metal_alloy" + } + ], "baseScale": 1, "hitbox": { "width": 1, @@ -182,4 +194,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json index 3c4f3ee305..94421d1d1d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json @@ -205,4 +205,4 @@ "pokedex": [ "cobblemon.species.eiscue.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json b/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json index 82e4cb6a2b..1df4831a80 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json @@ -107,4 +107,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/enamorus.json b/common/src/main/resources/data/cobblemon/species/generation8/enamorus.json index d4df246ee3..a025f65a47 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/enamorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/enamorus.json @@ -209,4 +209,4 @@ ], "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json b/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json index ab761b3ac2..b36ab86d92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json @@ -173,4 +173,4 @@ "dynamaxBlocked": true, "aspects": [], "cannotDynamax": true -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json index 8843cdffbc..1a5551cd39 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json @@ -140,4 +140,4 @@ "weight": 620, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/flapple.json b/common/src/main/resources/data/cobblemon/species/generation8/flapple.json index 975881e604..bed1c2e8bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/flapple.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/flapple.json @@ -177,4 +177,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json b/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json index 79684187b9..6faa6cd945 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json @@ -137,4 +137,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json b/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json index 6b129b5d5d..8e5bc8daab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json @@ -84,11 +84,9 @@ "tm:trailblaze", "tm:uproar", "tm:zenheadbutt", - "tutor:doubleedge", "tutor:iciclecrash", "tutor:lashout", - "tutor:swordsdance", - "tutor:taunt" + "tutor:swordsdance" ], "labels": [ "gen8", @@ -117,4 +115,4 @@ "weight": 8000, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json b/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json index cb1859a28c..0e759bb7df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json @@ -119,4 +119,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json b/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json index 95d45c2722..e737b99355 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json @@ -120,4 +120,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/greedent.json b/common/src/main/resources/data/cobblemon/species/generation8/greedent.json index 715b985f5e..982d1eda37 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/greedent.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/greedent.json @@ -125,4 +125,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json b/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json index 334da74b2c..1ee9196178 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json @@ -166,11 +166,7 @@ "tm:uproar", "tm:wonderroom", "tutor:burningjealousy", - "tutor:lashout", - "tutor:lightscreen", - "tutor:reflect", - "tutor:spiritbreak", - "tutor:thunderwave" + "tutor:lashout" ], "labels": [ "gen8" @@ -208,4 +204,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json index e2a903c2bc..3e43d44c8d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json @@ -63,6 +63,7 @@ "tm:bodyslam", "tm:bulletseed", "tm:drainpunch", + "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", @@ -146,4 +147,4 @@ "weight": 50, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json b/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json index ccccf81c37..26a0b725ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json @@ -136,4 +136,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json b/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json index e3ae17bc44..1d03a0326c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json @@ -185,4 +185,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json b/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json index ad919d3300..01c4e23c34 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json @@ -133,4 +133,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/impidimp.json b/common/src/main/resources/data/cobblemon/species/generation8/impidimp.json index 2dce63de45..ce238a762f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/impidimp.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/impidimp.json @@ -145,4 +145,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json b/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json index 331dab9da5..104a3335c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json @@ -72,6 +72,7 @@ "egg:healpulse", "egg:psychoshift", "egg:psychup", + "tm:alluringvoice", "tm:allyswitch", "tm:attract", "tm:batonpass", @@ -100,6 +101,7 @@ "tm:psybeam", "tm:psychic", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:reflect", "tm:rest", @@ -115,13 +117,10 @@ "tm:takedown", "tm:terablast", "tm:trick", + "tm:trickroom", "tm:zenheadbutt", "tutor:expandingforce", - "tutor:hypervoice", - "tutor:psychic", - "tutor:shadowball", - "tutor:terrainpulse", - "tutor:trickroom" + "tutor:terrainpulse" ], "labels": [ "gen8" @@ -170,8 +169,10 @@ "tm:encore", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:facade", "tm:futuresight", + "tm:gravity", "tm:helpinghand", "tm:hypervoice", "tm:imprison", @@ -185,7 +186,9 @@ "tm:protect", "tm:psybeam", "tm:psychic", + "tm:psychicnoise", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:rest", "tm:round", @@ -241,4 +244,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json index fffd3bc297..9ff0f5a703 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json @@ -200,4 +200,4 @@ "weight": 452, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json b/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json index 53837f131a..3d6b07e56f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/kleavor.json @@ -129,4 +129,4 @@ "weight": 890, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json b/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json index 827e9e9194..c9e095d3f9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json @@ -136,4 +136,4 @@ "weight": 120, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/milcery.json b/common/src/main/resources/data/cobblemon/species/generation8/milcery.json index a451fdd053..c42a9bdb70 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/milcery.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/milcery.json @@ -1779,4 +1779,4 @@ "weight": 3, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json b/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json index 656c52ab43..78323cc1fb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json @@ -147,4 +147,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json b/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json index 8cce0a97e3..86733e4c3c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json @@ -187,4 +187,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json b/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json index 2f81187f6a..681b982baa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json @@ -164,4 +164,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/nickit.json b/common/src/main/resources/data/cobblemon/species/generation8/nickit.json index f15fd81cfb..14328ae110 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/nickit.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/nickit.json @@ -135,4 +135,4 @@ "weight": 89, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json b/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json index 461e6f3a8e..da1a1a2e77 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json @@ -161,4 +161,4 @@ "weight": 460, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json b/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json index 7c0d251c84..8afa0f34c1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json @@ -172,4 +172,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/overqwil.json b/common/src/main/resources/data/cobblemon/species/generation8/overqwil.json index 9638b73d1a..22bf6b4032 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/overqwil.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/overqwil.json @@ -120,7 +120,8 @@ "tm:toxic", "tm:toxicspikes", "tm:venoshock", - "tm:waterfall" + "tm:waterfall", + "tm:waterpulse" ], "labels": [ "gen8" @@ -156,4 +157,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json index 39a66759ca..aaae8cadcc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json @@ -155,4 +155,4 @@ "weight": 280, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json b/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json index 1efdd2f81b..8a00eef083 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json @@ -116,4 +116,4 @@ "weight": 10, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json b/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json index b4afcfe27e..a9f75b6f7f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json @@ -167,4 +167,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/raboot.json b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json index ef20f956f2..3392a9bdac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/raboot.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json @@ -158,4 +158,4 @@ "weight": 90, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json b/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json index a9282e8933..d0a3bbf888 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json @@ -105,4 +105,4 @@ "weight": 2000, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json b/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json index 16a816d941..282c0924fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json @@ -106,4 +106,4 @@ "weight": 1450, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json index 3ac4d8bcdb..4e203c657b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json @@ -200,4 +200,4 @@ "weight": 900, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rolycoly.json b/common/src/main/resources/data/cobblemon/species/generation8/rolycoly.json index 5813b43948..b086393c0b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rolycoly.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rolycoly.json @@ -134,4 +134,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json b/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json index a53b48a50a..0559f00b24 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json @@ -149,4 +149,4 @@ "weight": 18, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json b/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json index 16d4839520..fd44cc6d54 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json @@ -135,4 +135,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json b/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json index 2d398ac9fc..2c840339e5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json @@ -172,4 +172,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json index bc42f50fff..6d3aee9fec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json @@ -149,4 +149,4 @@ "weight": 45, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json b/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json index c502f9809a..b788692e9a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json @@ -129,4 +129,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json b/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json index 9817af3853..091e201b8f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json @@ -66,6 +66,7 @@ "tm:batonpass", "tm:calmmind", "tm:confuseray", + "tm:curse", "tm:darkpulse", "tm:endure", "tm:facade", @@ -78,6 +79,7 @@ "tm:nastyplot", "tm:nightshade", "tm:phantomforce", + "tm:poltergeist", "tm:protect", "tm:psybeam", "tm:psychic", @@ -86,6 +88,7 @@ "tm:shadowball", "tm:skillswap", "tm:sleeptalk", + "tm:spite", "tm:storedpower", "tm:substitute", "tm:terablast", @@ -146,6 +149,7 @@ "tm:batonpass", "tm:calmmind", "tm:confuseray", + "tm:curse", "tm:darkpulse", "tm:endure", "tm:facade", @@ -159,6 +163,7 @@ "tm:nightshade", "tm:payback", "tm:phantomforce", + "tm:poltergeist", "tm:protect", "tm:psybeam", "tm:psychic", @@ -169,6 +174,7 @@ "tm:skillswap", "tm:sleeptalk", "tm:snore", + "tm:spite", "tm:storedpower", "tm:substitute", "tm:terablast", @@ -225,4 +231,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json index 13c5a7b50d..80125c696c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json @@ -126,4 +126,4 @@ "weight": 1170, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json b/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json index abee5269d2..4f9ba8dd10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json @@ -133,4 +133,4 @@ "weight": 10, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json b/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json index 0153c3355f..9f8e9e2e85 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json @@ -127,4 +127,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sneasler.json b/common/src/main/resources/data/cobblemon/species/generation8/sneasler.json index caf5721fd4..f28c28751a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sneasler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sneasler.json @@ -143,4 +143,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/snom.json b/common/src/main/resources/data/cobblemon/species/generation8/snom.json index 55a67f97bd..7d04fe32d5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/snom.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/snom.json @@ -113,4 +113,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sobble.json b/common/src/main/resources/data/cobblemon/species/generation8/sobble.json index b4fa5a6eae..cb01e0f66e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sobble.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sobble.json @@ -142,4 +142,4 @@ "weight": 40, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json b/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json index 0629e83049..d8f2ad72c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json @@ -81,11 +81,8 @@ "tm:terablast", "tm:uproar", "tm:willowisp", - "tutor:disable", - "tutor:doubleedge", "tutor:lashout", - "tutor:nastyplot", - "tutor:thrash" + "tutor:nastyplot" ], "labels": [ "gen8", @@ -114,4 +111,4 @@ "weight": 445, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/stonjourner.json b/common/src/main/resources/data/cobblemon/species/generation8/stonjourner.json index 7b93605efa..25f7826429 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/stonjourner.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/stonjourner.json @@ -128,4 +128,4 @@ "weight": 5200, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thievul.json b/common/src/main/resources/data/cobblemon/species/generation8/thievul.json index 40f8e1b382..5eb9d4686d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thievul.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thievul.json @@ -131,4 +131,4 @@ "weight": 199, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json index 64ade1beb8..606a789454 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json @@ -143,4 +143,4 @@ "weight": 140, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/toxel.json b/common/src/main/resources/data/cobblemon/species/generation8/toxel.json index e6eb6609b7..fa7afaa8ab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxel.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/toxel.json @@ -121,4 +121,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json b/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json index cd7b04dbfa..89ddf7b3db 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json @@ -82,13 +82,16 @@ "tm:acidspray", "tm:attract", "tm:brickbreak", + "tm:charge", "tm:chargebeam", "tm:charm", "tm:drainpunch", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", "tm:encore", + "tm:endeavor", "tm:endure", "tm:facade", "tm:firepunch", @@ -101,11 +104,13 @@ "tm:hypervoice", "tm:megakick", "tm:megapunch", + "tm:metalsound", "tm:metronome", "tm:payback", "tm:poisonjab", "tm:poisontail", "tm:protect", + "tm:psychicnoise", "tm:raindance", "tm:rest", "tm:round", @@ -130,6 +135,7 @@ "tm:thunderfang", "tm:thunderpunch", "tm:thunderwave", + "tm:toxic", "tm:toxicspikes", "tm:trailblaze", "tm:uproar", @@ -278,13 +284,16 @@ "tm:acidspray", "tm:attract", "tm:brickbreak", + "tm:charge", "tm:chargebeam", "tm:charm", "tm:drainpunch", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", "tm:encore", + "tm:endeavor", "tm:endure", "tm:facade", "tm:firepunch", @@ -297,11 +306,13 @@ "tm:hypervoice", "tm:megakick", "tm:megapunch", + "tm:metalsound", "tm:metronome", "tm:payback", "tm:poisonjab", "tm:poisontail", "tm:protect", + "tm:psychicnoise", "tm:raindance", "tm:rest", "tm:round", @@ -326,6 +337,7 @@ "tm:thunderfang", "tm:thunderpunch", "tm:thunderwave", + "tm:toxic", "tm:toxicspikes", "tm:trailblaze", "tm:uproar", @@ -373,4 +385,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/ursaluna.json b/common/src/main/resources/data/cobblemon/species/generation8/ursaluna.json index 93dda1fe96..72bb37b144 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/ursaluna.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/ursaluna.json @@ -270,11 +270,7 @@ "tm:thunderpunch", "tm:trailblaze", "tm:uproar", - "tm:vacuumwave", - "tutor:bloodmoon", - "tutor:calmmind", - "tutor:earthpower", - "tutor:slash" + "tm:vacuumwave" ], "labels": [ "gen9" @@ -289,4 +285,4 @@ "battleOnly": false } ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json b/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json index 58366fde91..1042b712dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json @@ -78,8 +78,10 @@ "tm:bulkup", "tm:chillingwater", "tm:closecombat", + "tm:coaching", "tm:dig", "tm:dive", + "tm:doubleedge", "tm:drainpunch", "tm:endure", "tm:facade", @@ -88,6 +90,7 @@ "tm:fling", "tm:focusblast", "tm:focusenergy", + "tm:focuspunch", "tm:gigaimpact", "tm:helpinghand", "tm:icepunch", @@ -268,10 +271,12 @@ "tm:brickbreak", "tm:bulkup", "tm:closecombat", + "tm:coaching", "tm:crunch", "tm:darkestlariat", "tm:darkpulse", "tm:dig", + "tm:doubleedge", "tm:drainpunch", "tm:endure", "tm:facade", @@ -280,12 +285,14 @@ "tm:fling", "tm:focusblast", "tm:focusenergy", + "tm:focuspunch", "tm:foulplay", "tm:gigaimpact", "tm:helpinghand", "tm:icepunch", "tm:irondefense", "tm:ironhead", + "tm:lashout", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -298,6 +305,7 @@ "tm:retaliate", "tm:revenge", "tm:reversal", + "tm:roar", "tm:rockslide", "tm:rocktomb", "tm:round", @@ -350,4 +358,4 @@ "weight": 1050, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json b/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json index 4b21b12a91..b853693fe8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json @@ -114,4 +114,4 @@ "weight": 60, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json b/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json index 1c1f05ec73..f439faaf18 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/wyrdeer.json @@ -147,4 +147,4 @@ }, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/yamper.json b/common/src/main/resources/data/cobblemon/species/generation8/yamper.json index 4cc9eb24d9..d9704f4875 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/yamper.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/yamper.json @@ -121,4 +121,4 @@ "weight": 135, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json index 2d0a352812..13a53d6b2c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json @@ -184,4 +184,4 @@ "dynamaxBlocked": true, "aspects": [], "cannotDynamax": true -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json index e77838f660..a56d0221fd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json @@ -191,4 +191,4 @@ "dynamaxBlocked": true, "aspects": [], "cannotDynamax": true -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zarude.json b/common/src/main/resources/data/cobblemon/species/generation8/zarude.json index 14a2e6c321..79ba86cd42 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zarude.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zarude.json @@ -81,20 +81,25 @@ "tm:darkestlariat", "tm:darkpulse", "tm:dig", + "tm:doubleedge", "tm:drainpunch", "tm:encore", "tm:endure", "tm:energyball", "tm:facade", "tm:fling", + "tm:focuspunch", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", "tm:irontail", + "tm:knockoff", + "tm:lashout", "tm:leafstorm", "tm:lowkick", "tm:lowsweep", @@ -104,10 +109,12 @@ "tm:mudshot", "tm:nastyplot", "tm:payback", + "tm:petalblizzard", "tm:powerwhip", "tm:protect", "tm:rest", "tm:revenge", + "tm:roar", "tm:rockslide", "tm:rocktomb", "tm:round", @@ -189,20 +196,25 @@ "tm:darkestlariat", "tm:darkpulse", "tm:dig", + "tm:doubleedge", "tm:drainpunch", "tm:encore", "tm:endure", "tm:energyball", "tm:facade", "tm:fling", + "tm:focuspunch", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", "tm:irontail", + "tm:knockoff", + "tm:lashout", "tm:leafstorm", "tm:lowkick", "tm:lowsweep", @@ -212,10 +224,12 @@ "tm:mudshot", "tm:nastyplot", "tm:payback", + "tm:petalblizzard", "tm:powerwhip", "tm:protect", "tm:rest", "tm:revenge", + "tm:roar", "tm:rockslide", "tm:rocktomb", "tm:round", @@ -274,4 +288,4 @@ "weight": 700, "aspects": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json b/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json index bece987faa..cc93aad061 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json @@ -86,20 +86,26 @@ "tm:bulkup", "tm:bulldoze", "tm:closecombat", + "tm:coaching", + "tm:curse", "tm:dig", + "tm:doubleedge", "tm:drainpunch", "tm:earthquake", "tm:encore", + "tm:endeavor", "tm:endure", "tm:facade", "tm:firepunch", "tm:fling", "tm:focusblast", + "tm:focuspunch", "tm:gigaimpact", "tm:gunkshot", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", + "tm:lashout", "tm:lowkick", "tm:lowsweep", "tm:metronome", @@ -119,6 +125,8 @@ "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", + "tm:smackdown", + "tm:spite", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -129,10 +137,13 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:uturn" + "tm:uproar", + "tm:uturn", + "tm:vacuumwave" ], "labels": [ "gen9" @@ -152,4 +163,4 @@ "pokedex": [ "cobblemon.species.annihilape.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json b/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json index fe144c664d..7972f703a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json @@ -50,6 +50,7 @@ "46:terrainpulse", "52:petalblizzard", "58:petaldance", + "tm:alluringvoice", "tm:bulletseed", "tm:charm", "tm:dazzlinggleam", @@ -70,18 +71,22 @@ "tm:lightscreen", "tm:magicalleaf", "tm:metronome", + "tm:petalblizzard", "tm:pollenpuff", "tm:protect", + "tm:psychup", "tm:reflect", "tm:rest", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", + "tm:solarblade", "tm:substitute", "tm:sunnyday", "tm:swift", "tm:terablast", - "tm:trailblaze" + "tm:trailblaze", + "tm:weatherball" ], "labels": [ "gen9" @@ -108,4 +113,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json b/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json new file mode 100644 index 0000000000..62931d9497 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json @@ -0,0 +1,111 @@ +{ + "name": "Archaludon", + "nationalPokedexNumber": 1018, + "primaryType": "steel", + "secondaryType": "dragon", + "abilities": [ + "stamina", + "sturdy", + "h:stalwart" + ], + "baseStats": { + "hp": 90, + "attack": 105, + "defence": 130, + "special_attack": 125, + "special_defence": 65, + "speed": 85 + }, + "catchRate": 10, + "maleRatio": 0.5, + "baseExperienceYield": 0, + "baseFriendship": 50, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 3, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "experienceGroup": "medium_fast", + "eggCycles": 30, + "eggGroups": [ + "mineral", + "dragon" + ], + "moves": [ + "1:leer", + "1:metalclaw", + "6:rocksmash", + "12:honeclaws", + "18:metalsound", + "24:breakingswipe", + "30:dragontail", + "36:irondefense", + "42:focusenergy", + "48:dragonclaw", + "54:flashcannon", + "60:metalburst", + "66:hyperbeam", + "tm:aurasphere", + "tm:bodypress", + "tm:bodyslam", + "tm:breakingswipe", + "tm:brickbreak", + "tm:darkpulse", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragoncheer", + "tm:dragonclaw", + "tm:dragonpulse", + "tm:dragontail", + "tm:earthquake", + "tm:endure", + "tm:facade", + "tm:flashcannon", + "tm:foulplay", + "tm:gigaimpact", + "tm:gyroball", + "tm:hardpress", + "tm:heavyslam", + "tm:hyperbeam", + "tm:irondefense", + "tm:ironhead", + "tm:lightscreen", + "tm:metalclaw", + "tm:metalsound", + "tm:meteorbeam", + "tm:outrage", + "tm:protect", + "tm:reflect", + "tm:rest", + "tm:roar", + "tm:rockslide", + "tm:rocktomb", + "tm:scaryface", + "tm:sleeptalk", + "tm:smackdown", + "tm:snarl", + "tm:solarbeam", + "tm:stealthrock", + "tm:steelbeam", + "tm:stoneedge", + "tm:substitute", + "tm:swordsdance", + "tm:takedown", + "tm:terablast", + "tm:thunder", + "tm:thunderbolt", + "tm:thunderwave" + ], + "labels": [ + "gen9" + ], + "aspects": [], + "height": 20, + "weight": 600, + "preEvolution": "duraludon", + "evolutions": [], + "cannotDynamax": false +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json b/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json index 7576d340bd..dfa97d4bf9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json @@ -62,6 +62,7 @@ "tm:helpinghand", "tm:icebeam", "tm:icefang", + "tm:iciclespear", "tm:icywind", "tm:ironhead", "tm:outrage", @@ -113,4 +114,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json b/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json index c4c4afbc29..9913858398 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json @@ -100,6 +100,7 @@ "tm:dragonpulse", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:facade", "tm:fireblast", "tm:firespin", @@ -113,18 +114,22 @@ "tm:helpinghand", "tm:irondefense", "tm:lightscreen", + "tm:meteorbeam", "tm:nightshade", "tm:overheat", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:reflect", "tm:rest", + "tm:scorchingsands", "tm:shadowball", "tm:sleeptalk", "tm:solarbeam", + "tm:spite", "tm:storedpower", "tm:substitute", "tm:sunnyday", @@ -133,6 +138,7 @@ "tm:terablast", "tm:trick", "tm:trickroom", + "tm:weatherball", "tm:willowisp" ], "labels": [ @@ -147,4 +153,4 @@ "pokedex": [ "cobblemon.species.armarouge.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json b/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json index 7435c59e01..b44f130c0f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json @@ -56,11 +56,14 @@ "tm:blizzard", "tm:bodypress", "tm:bodyslam", + "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", "tm:crunch", "tm:dig", + "tm:doubleedge", "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", @@ -71,15 +74,18 @@ "tm:falseswipe", "tm:gigaimpact", "tm:helpinghand", + "tm:highhorsepower", "tm:hyperbeam", "tm:icebeam", "tm:icefang", + "tm:iciclespear", "tm:icywind", "tm:ironhead", "tm:outrage", "tm:protect", "tm:raindance", "tm:rest", + "tm:scaleshot", "tm:scaryface", "tm:sleeptalk", "tm:snowscape", @@ -113,4 +119,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json b/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json index 77e6afde49..0bd80052b2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json @@ -48,17 +48,20 @@ "45:suckerpunch", "50:zapcannon", "tm:acidspray", + "tm:charge", "tm:chargebeam", "tm:chillingwater", "tm:confuseray", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", "tm:endure", "tm:gigaimpact", "tm:hyperbeam", "tm:hypervoice", "tm:lightscreen", + "tm:muddywater", "tm:mudshot", "tm:mudslap", "tm:protect", @@ -67,13 +70,16 @@ "tm:rest", "tm:sleeptalk", "tm:substitute", + "tm:supercellslam", "tm:swift", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", + "tm:toxic", "tm:voltswitch", "tm:waterpulse", + "tm:weatherball", "tm:wildcharge" ], "labels": [ @@ -101,4 +107,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json b/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json index 4a5c7a6687..b8b95b245e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json @@ -60,10 +60,14 @@ "tm:aircutter", "tm:airslash", "tm:bravebird", + "tm:curse", "tm:darkpulse", "tm:drillrun", + "tm:dualwingbeat", + "tm:endeavor", "tm:endure", "tm:facade", + "tm:featherdance", "tm:fly", "tm:foulplay", "tm:gigaimpact", @@ -72,10 +76,14 @@ "tm:hyperbeam", "tm:hypervoice", "tm:icywind", + "tm:knockoff", + "tm:lashout", "tm:nastyplot", "tm:powergem", "tm:protect", + "tm:psychup", "tm:raindance", + "tm:rest", "tm:rockblast", "tm:rockslide", "tm:rocktomb", @@ -92,11 +100,7 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:uturn", - "tutor:pluck", - "tutor:rockthrow", - "tutor:torment", - "tutor:wingattack" + "tm:uturn" ], "labels": [ "gen9" @@ -125,4 +129,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json b/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json index d064fafb7c..6d351a5396 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json @@ -50,27 +50,33 @@ "55:powerwhip", "tm:bulletseed", "tm:confuseray", + "tm:curse", "tm:endure", "tm:energyball", "tm:facade", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:hex", "tm:hyperbeam", "tm:leafstorm", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", + "tm:poltergeist", "tm:pounce", "tm:protect", "tm:rest", "tm:scaryface", "tm:seedbomb", "tm:shadowball", + "tm:skittersmack", "tm:sleeptalk", "tm:solarbeam", "tm:spikes", + "tm:spite", "tm:substitute", "tm:terablast", "tm:thief", @@ -101,4 +107,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json b/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json index f5237c0ef7..6934874ab4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json @@ -55,16 +55,20 @@ "egg:strengthsap", "tm:bulletseed", "tm:confuseray", + "tm:curse", "tm:endure", "tm:energyball", "tm:facade", "tm:gigadrain", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:hex", "tm:leafstorm", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", + "tm:poltergeist", "tm:pounce", "tm:protect", "tm:rest", @@ -74,6 +78,7 @@ "tm:sleeptalk", "tm:solarbeam", "tm:spikes", + "tm:spite", "tm:substitute", "tm:terablast", "tm:thief", @@ -117,4 +122,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json b/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json index d7f920a48e..dabeb57668 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json @@ -55,6 +55,7 @@ "tm:confuseray", "tm:crunch", "tm:darkpulse", + "tm:doubleedge", "tm:earthpower", "tm:endure", "tm:energyball", @@ -65,6 +66,7 @@ "tm:grassyterrain", "tm:hex", "tm:hyperbeam", + "tm:lashout", "tm:leafstorm", "tm:magicalleaf", "tm:outrage", @@ -83,11 +85,7 @@ "tm:thief", "tm:trailblaze", "tm:venoshock", - "tm:zenheadbutt", - "tutor:clearsmog", - "tutor:gigadrain", - "tutor:payback", - "tutor:thrash" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -101,4 +99,4 @@ "pokedex": [ "cobblemon.species.brutebonnet.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json b/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json index 1959997527..56b467be5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json @@ -52,11 +52,13 @@ "egg:worryseed", "tm:bulletseed", "tm:crunch", + "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:gigadrain", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", "tm:leafstorm", @@ -70,6 +72,7 @@ "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:takedown", "tm:terablast", "tm:thief", @@ -113,4 +116,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json b/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json index df75241ce2..3340e9cee8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json @@ -93,6 +93,7 @@ "tm:bulkup", "tm:closecombat", "tm:confuseray", + "tm:curse", "tm:dragonclaw", "tm:endure", "tm:facade", @@ -113,12 +114,16 @@ "tm:overheat", "tm:phantomforce", "tm:poisonjab", + "tm:poltergeist", "tm:protect", + "tm:psychup", "tm:reflect", "tm:rest", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", + "tm:solarblade", + "tm:spite", "tm:storedpower", "tm:substitute", "tm:sunnyday", @@ -126,6 +131,8 @@ "tm:takedown", "tm:taunt", "tm:terablast", + "tm:throatchop", + "tm:vacuumwave", "tm:willowisp", "tm:xscissor" ], @@ -141,4 +148,4 @@ "pokedex": [ "cobblemon.species.ceruledge.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json b/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json index af6ba672ed..afc553c035 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json @@ -83,19 +83,25 @@ "tm:bulldoze", "tm:charm", "tm:chillingwater", + "tm:curse", + "tm:doubleedge", "tm:earthquake", "tm:endure", "tm:facade", "tm:gigaimpact", + "tm:hardpress", "tm:heavyslam", "tm:helpinghand", + "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", "tm:icefang", "tm:icepunch", "tm:icespinner", + "tm:iciclespear", "tm:icywind", + "tm:knockoff", "tm:liquidation", "tm:playrough", "tm:protect", @@ -127,4 +133,4 @@ "pokedex": [ "cobblemon.species.cetitan.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json b/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json index 48335d127b..6d5d17f1ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json @@ -88,17 +88,22 @@ "tm:bulldoze", "tm:charm", "tm:chillingwater", + "tm:curse", + "tm:doubleedge", "tm:earthquake", "tm:endure", "tm:facade", "tm:heavyslam", "tm:helpinghand", + "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", "tm:icefang", "tm:icespinner", + "tm:iciclespear", "tm:icywind", + "tm:knockoff", "tm:liquidation", "tm:playrough", "tm:protect", @@ -139,4 +144,4 @@ "pokedex": [ "cobblemon.species.cetoddle.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json b/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json index 4135f8d9e6..cdc2ea42ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json @@ -91,7 +91,9 @@ "tm:nightshade", "tm:overheat", "tm:protect", + "tm:rest", "tm:sleeptalk", + "tm:spite", "tm:substitute", "tm:sunnyday", "tm:takedown", @@ -138,4 +140,4 @@ "pokedex": [ "cobblemon.species.charcadet.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json b/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json index d6e87bcf19..71819c0166 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json @@ -62,11 +62,13 @@ "tm:facade", "tm:falseswipe", "tm:gigaimpact", + "tm:haze", "tm:hex", "tm:hyperbeam", "tm:icefang", "tm:icespinner", "tm:icywind", + "tm:lashout", "tm:protect", "tm:psychicfangs", "tm:raindance", @@ -75,15 +77,13 @@ "tm:sleeptalk", "tm:snarl", "tm:snowscape", + "tm:spite", "tm:substitute", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", - "tutor:iciclecrash", - "tutor:ruination", - "tutor:sacredsword", - "tutor:suckerpunch" + "tm:throatchop" ], "labels": [ "gen9", @@ -97,4 +97,4 @@ "pokedex": [ "cobblemon.species.chienpao.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json b/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json index 8ed5bce076..6a011e88f2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json @@ -50,6 +50,7 @@ "65:inferno", "70:memento", "75:overheat", + "tm:burningjealousy", "tm:confuseray", "tm:crunch", "tm:darkpulse", @@ -64,6 +65,7 @@ "tm:heatwave", "tm:hex", "tm:hyperbeam", + "tm:lashout", "tm:lightscreen", "tm:nastyplot", "tm:overheat", @@ -74,17 +76,15 @@ "tm:scaryface", "tm:sleeptalk", "tm:snarl", + "tm:spite", "tm:substitute", "tm:sunnyday", "tm:takedown", "tm:taunt", + "tm:temperflare", "tm:terablast", "tm:willowisp", - "tm:zenheadbutt", - "tutor:bounce", - "tutor:lavaplume", - "tutor:ruination", - "tutor:swagger" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -98,4 +98,4 @@ "pokedex": [ "cobblemon.species.chiyu.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json b/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json index 441424005e..4bcd912100 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json @@ -76,20 +76,25 @@ "tm:bodyslam", "tm:bulldoze", "tm:chillingwater", + "tm:curse", "tm:dig", + "tm:doubleedge", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:facade", "tm:gigaimpact", "tm:gunkshot", + "tm:haze", "tm:heavyslam", "tm:helpinghand", + "tm:highhorsepower", "tm:hydropump", "tm:hyperbeam", "tm:ironhead", "tm:liquidation", "tm:lowkick", + "tm:muddywater", "tm:mudshot", "tm:mudslap", "tm:poisonjab", @@ -102,6 +107,7 @@ "tm:sandstorm", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", "tm:spikes", "tm:stealthrock", "tm:stompingtantrum", @@ -110,6 +116,7 @@ "tm:surf", "tm:takedown", "tm:terablast", + "tm:toxic", "tm:toxicspikes", "tm:trailblaze", "tm:venoshock", @@ -135,4 +142,4 @@ "pokedex": [ "cobblemon.species.clodsire.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json b/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json index afe079282f..104aba3e46 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json @@ -66,8 +66,10 @@ "47:fireblast", "tm:bodyslam", "tm:crunch", + "tm:curse", "tm:dig", "tm:disarmingvoice", + "tm:encore", "tm:endure", "tm:facade", "tm:fireblast", @@ -85,6 +87,7 @@ "tm:overheat", "tm:protect", "tm:rest", + "tm:roar", "tm:seedbomb", "tm:sleeptalk", "tm:snarl", @@ -92,6 +95,7 @@ "tm:substitute", "tm:sunnyday", "tm:takedown", + "tm:temperflare", "tm:terablast", "tm:thunderfang", "tm:willowisp", @@ -131,4 +135,4 @@ "pokedex": [ "cobblemon.species.crocalor.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json b/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json index 054b23e40b..4871a77d3a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json @@ -55,11 +55,15 @@ "tm:aerialace", "tm:agility", "tm:bodyslam", + "tm:breakingswipe", "tm:crunch", + "tm:doubleedge", "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", + "tm:endeavor", "tm:endure", "tm:facade", "tm:firefang", @@ -68,6 +72,7 @@ "tm:hypervoice", "tm:icespinner", "tm:ironhead", + "tm:knockoff", "tm:mudshot", "tm:mudslap", "tm:outrage", @@ -75,16 +80,20 @@ "tm:protect", "tm:raindance", "tm:rest", + "tm:scaleshot", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", + "tm:supercellslam", "tm:takedown", "tm:taunt", + "tm:temperflare", "tm:terablast", "tm:thief", "tm:thunderbolt", "tm:thunderfang", "tm:trailblaze", + "tm:uproar", "tm:uturn", "tm:wildcharge" ], @@ -108,4 +117,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json b/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json index 22f65044c4..2576e8a39f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json @@ -63,6 +63,7 @@ "47:crunch", "53:lastresort", "tm:agility", + "tm:alluringvoice", "tm:batonpass", "tm:bodypress", "tm:bodyslam", @@ -70,7 +71,9 @@ "tm:crunch", "tm:dazzlinggleam", "tm:dig", + "tm:doubleedge", "tm:drainingkiss", + "tm:endeavor", "tm:endure", "tm:facade", "tm:firefang", @@ -84,8 +87,10 @@ "tm:playrough", "tm:protect", "tm:psychicfangs", + "tm:psychup", "tm:raindance", "tm:rest", + "tm:roar", "tm:scaryface", "tm:sleeptalk", "tm:snarl", @@ -128,4 +133,4 @@ "pokedex": [ "cobblemon.species.dachsbun.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json b/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json index c5d531f98d..fe70946ce2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json @@ -89,6 +89,22 @@ "height": 4, "weight": 44, "preEvolution": "applin", - "evolutions": [], + "evolutions": [ + { + "id": "dipplin_hydrapple", + "variant": "level_up", + "result": "hydrapple", + "consumeHeldItem": false, + "learnableMoves": [ + "ficklebeam" + ], + "requirements": [ + { + "variant": "has_move", + "type": "dragoncheer" + } + ] + } + ], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json b/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json index 11c691287c..4946bf3ac8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json @@ -63,11 +63,13 @@ "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", + "tm:solarblade", "tm:substitute", "tm:sunnyday", "tm:swift", "tm:terablast", - "tm:trailblaze" + "tm:trailblaze", + "tm:weatherball" ], "labels": [ "gen9" @@ -108,4 +110,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json b/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json index 47dd8c9864..f20c192df2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json @@ -60,6 +60,8 @@ "tm:bulldoze", "tm:chillingwater", "tm:crunch", + "tm:curse", + "tm:doubleedge", "tm:earthquake", "tm:endure", "tm:facade", @@ -108,4 +110,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json b/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json index 0a5380c90e..670511481a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json @@ -57,19 +57,25 @@ "tm:blizzard", "tm:bodypress", "tm:bodyslam", + "tm:breakingswipe", "tm:bulldoze", "tm:calmmind", "tm:chillingwater", + "tm:curse", "tm:dig", + "tm:doubleedge", "tm:dragontail", "tm:drillrun", + "tm:dualwingbeat", "tm:earthpower", "tm:earthquake", + "tm:endeavor", "tm:endure", "tm:facade", "tm:fireblast", "tm:flamethrower", "tm:gigaimpact", + "tm:gyroball", "tm:heavyslam", "tm:helpinghand", "tm:hex", @@ -78,23 +84,29 @@ "tm:hypervoice", "tm:icebeam", "tm:icespinner", + "tm:lunge", "tm:mudshot", "tm:mudslap", "tm:outrage", + "tm:painsplit", "tm:poisonjab", "tm:poisontail", "tm:pounce", "tm:protect", + "tm:psychup", "tm:raindance", "tm:rest", "tm:rockslide", "tm:rocktomb", "tm:sandstorm", + "tm:scaleshot", "tm:scaryface", "tm:shadowball", + "tm:skittersmack", "tm:sleeptalk", "tm:smartstrike", "tm:solarbeam", + "tm:spite", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -105,8 +117,11 @@ "tm:takedown", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:thunder", "tm:thunderbolt", + "tm:toxic", + "tm:uproar", "tm:wildcharge", "tm:zenheadbutt" ], @@ -138,6 +153,7 @@ }, "catchRate": 45, "maleRatio": 0.5, + "baseExperienceYield": 0, "baseFriendship": 50, "evYield": { "hp": 2, @@ -182,4 +198,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/espathra.json b/common/src/main/resources/data/cobblemon/species/generation9/espathra.json index 57da9222ce..0f129bf3d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/espathra.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/espathra.json @@ -90,9 +90,12 @@ "tm:confuseray", "tm:dazzlinggleam", "tm:disarmingvoice", + "tm:doubleedge", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:facade", + "tm:featherdance", "tm:flashcannon", "tm:foulplay", "tm:gigaimpact", @@ -109,6 +112,7 @@ "tm:psybeam", "tm:psychic", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:raindance", "tm:reflect", @@ -127,6 +131,7 @@ "tm:thief", "tm:trick", "tm:trickroom", + "tm:uproar", "tm:uturn", "tm:zenheadbutt" ], @@ -142,4 +147,4 @@ "pokedex": [ "cobblemon.species.espathra.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json b/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json index 4c46f8133c..9600f46b8e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json @@ -59,15 +59,22 @@ "tm:chargebeam", "tm:confuseray", "tm:crunch", + "tm:curse", "tm:dazzlinggleam", + "tm:doubleedge", "tm:earthquake", + "tm:endeavor", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:facade", "tm:foulplay", + "tm:futuresight", "tm:gigaimpact", "tm:grassknot", + "tm:gravity", "tm:helpinghand", + "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:imprison", @@ -80,11 +87,14 @@ "tm:psybeam", "tm:psychic", "tm:psychicfangs", + "tm:psychicnoise", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:raindance", "tm:reflect", "tm:rest", + "tm:roar", "tm:shadowball", "tm:skillswap", "tm:sleeptalk", @@ -102,6 +112,7 @@ "tm:trailblaze", "tm:trick", "tm:trickroom", + "tm:uproar", "tm:zenheadbutt" ], "labels": [ @@ -133,4 +144,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json b/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json index bd1e41d1f7..6e25eb956a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json @@ -53,6 +53,7 @@ "tm:agility", "tm:aircutter", "tm:airslash", + "tm:alluringvoice", "tm:bravebird", "tm:calmmind", "tm:charm", @@ -77,6 +78,7 @@ "tm:poisonjab", "tm:poisontail", "tm:protect", + "tm:psychup", "tm:rest", "tm:shadowball", "tm:shadowclaw", @@ -94,14 +96,11 @@ "tm:toxic", "tm:uproar", "tm:uturn", - "tm:venoshock", - "tutor:beatup", - "tutor:flatter", - "tutor:roost", - "tutor:swagger" + "tm:venoshock" ], "labels": [ - "gen9" + "gen9", + "legendary" ], "aspects": [], "height": 14, @@ -116,4 +115,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fidough.json b/common/src/main/resources/data/cobblemon/species/generation9/fidough.json index 434865131e..522fdc9322 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fidough.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fidough.json @@ -68,12 +68,15 @@ "egg:wish", "egg:yawn", "tm:agility", + "tm:alluringvoice", "tm:batonpass", "tm:bodyslam", "tm:charm", "tm:crunch", "tm:dazzlinggleam", "tm:dig", + "tm:doubleedge", + "tm:endeavor", "tm:endure", "tm:facade", "tm:firefang", @@ -85,8 +88,10 @@ "tm:playrough", "tm:protect", "tm:psychicfangs", + "tm:psychup", "tm:raindance", "tm:rest", + "tm:roar", "tm:sleeptalk", "tm:snarl", "tm:stompingtantrum", @@ -141,4 +146,4 @@ "pokedex": [ "cobblemon.species.fidough.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/finizen.json b/common/src/main/resources/data/cobblemon/species/generation9/finizen.json index 1fd311236d..ac71916112 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/finizen.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/finizen.json @@ -62,12 +62,14 @@ "tm:endure", "tm:facade", "tm:fling", + "tm:haze", "tm:helpinghand", "tm:hydropump", "tm:icebeam", "tm:icywind", "tm:liquidation", "tm:protect", + "tm:psychup", "tm:raindance", "tm:rest", "tm:sleeptalk", @@ -116,4 +118,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json b/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json index 87c1abd72c..a987040823 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json @@ -81,8 +81,11 @@ "tm:bulkup", "tm:chillingwater", "tm:closecombat", + "tm:dualwingbeat", + "tm:endeavor", "tm:endure", "tm:facade", + "tm:featherdance", "tm:fling", "tm:fly", "tm:gigaimpact", @@ -91,8 +94,10 @@ "tm:liquidation", "tm:lowkick", "tm:lowsweep", + "tm:lunge", "tm:pounce", "tm:protect", + "tm:psychup", "tm:rest", "tm:reversal", "tm:sleeptalk", @@ -103,6 +108,8 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", + "tm:upperhand", "tm:uturn", "tm:waterpulse" ], @@ -117,4 +124,4 @@ "pokedex": [ "cobblemon.species.flamigo.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/flittle.json b/common/src/main/resources/data/cobblemon/species/generation9/flittle.json index 2278355d6f..8ee32819ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/flittle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/flittle.json @@ -112,6 +112,7 @@ "tm:thief", "tm:trick", "tm:trickroom", + "tm:uproar", "tm:uturn", "tm:zenheadbutt" ], @@ -142,4 +143,4 @@ "pokedex": [ "cobblemon.species.flittle.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/floragato.json b/common/src/main/resources/data/cobblemon/species/generation9/floragato.json index 2bd5609835..cb92431425 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/floragato.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/floragato.json @@ -84,6 +84,7 @@ "tm:gigadrain", "tm:grassknot", "tm:grasspledge", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", "tm:leafstorm", @@ -92,6 +93,7 @@ "tm:magicalleaf", "tm:mudslap", "tm:nastyplot", + "tm:petalblizzard", "tm:playrough", "tm:protect", "tm:rest", @@ -142,4 +144,4 @@ "pokedex": [ "cobblemon.species.floragato.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json b/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json index 4e4ee27c47..aaed1083c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json @@ -70,7 +70,9 @@ "tm:magicalleaf", "tm:mistyterrain", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", + "tm:poltergeist", "tm:powergem", "tm:protect", "tm:psybeam", @@ -78,6 +80,7 @@ "tm:rest", "tm:shadowball", "tm:sleeptalk", + "tm:spite", "tm:storedpower", "tm:substitute", "tm:sunnyday", @@ -87,11 +90,7 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:trickroom", - "tutor:dazzlinggleam", - "tutor:mysticalfire", - "tutor:shadowball", - "tutor:wish" + "tm:trickroom" ], "labels": [ "gen9", @@ -117,4 +116,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json b/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json index a51325255d..8e21706890 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json @@ -65,6 +65,7 @@ "tm:helpinghand", "tm:icebeam", "tm:icefang", + "tm:iciclespear", "tm:icywind", "tm:outrage", "tm:protect", @@ -111,4 +112,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json b/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json index 6b61076d60..929bae22c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json @@ -68,6 +68,7 @@ "egg:slackoff", "tm:bodyslam", "tm:crunch", + "tm:curse", "tm:dig", "tm:disarmingvoice", "tm:encore", @@ -88,6 +89,7 @@ "tm:overheat", "tm:protect", "tm:rest", + "tm:roar", "tm:seedbomb", "tm:sleeptalk", "tm:snarl", @@ -95,6 +97,7 @@ "tm:substitute", "tm:sunnyday", "tm:takedown", + "tm:temperflare", "tm:terablast", "tm:thunderfang", "tm:willowisp", @@ -131,4 +134,4 @@ "pokedex": [ "cobblemon.species.fuecoco.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json b/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json index a30a42e368..cc767b5aa6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json @@ -85,7 +85,9 @@ "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", + "tm:curse", "tm:dig", + "tm:doubleedge", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -93,13 +95,17 @@ "tm:firepunch", "tm:flashcannon", "tm:fling", + "tm:focuspunch", "tm:gigaimpact", + "tm:gravity", + "tm:hardpress", "tm:heavyslam", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", "tm:irondefense", "tm:ironhead", + "tm:meteorbeam", "tm:mudshot", "tm:powergem", "tm:protect", @@ -110,6 +116,7 @@ "tm:rocktomb", "tm:sandstorm", "tm:sleeptalk", + "tm:smackdown", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -138,4 +145,4 @@ "pokedex": [ "cobblemon.species.garganacl.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/gholdengo.json b/common/src/main/resources/data/cobblemon/species/generation9/gholdengo.json index d95796073f..2a29f676ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/gholdengo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/gholdengo.json @@ -68,6 +68,7 @@ "tm:flashcannon", "tm:fling", "tm:focusblast", + "tm:focuspunch", "tm:gigaimpact", "tm:heavyslam", "tm:hex", @@ -76,8 +77,10 @@ "tm:lightscreen", "tm:lowkick", "tm:lowsweep", + "tm:metalsound", "tm:nastyplot", "tm:nightshade", + "tm:poltergeist", "tm:powergem", "tm:protect", "tm:psychic", @@ -125,4 +128,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json b/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json index e5a57ba36e..406f628bdb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json @@ -72,9 +72,7 @@ "tm:substitute", "tm:takedown", "tm:terablast", - "tm:thief", - "tutor:astonish", - "tutor:tackle" + "tm:thief" ], "labels": [ "gen9" @@ -258,6 +256,7 @@ }, "catchRate": 45, "maleRatio": -1, + "baseExperienceYield": 0, "baseFriendship": 50, "behaviour": { "moving": { @@ -495,4 +494,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json b/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json index 6f1133b953..d7f9a92b4c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json @@ -89,6 +89,7 @@ "tm:gunkshot", "tm:irondefense", "tm:lightscreen", + "tm:meteorbeam", "tm:mudshot", "tm:powergem", "tm:protect", @@ -99,14 +100,18 @@ "tm:rockslide", "tm:rocktomb", "tm:sandstorm", + "tm:sandtomb", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", + "tm:smackdown", "tm:spikes", "tm:stealthrock", "tm:stoneedge", "tm:substitute", "tm:sunnyday", "tm:terablast", + "tm:toxic", "tm:toxicspikes", "tm:venoshock" ], @@ -143,4 +148,4 @@ "pokedex": [ "cobblemon.species.glimmet.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json b/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json index a87d580719..de814f086f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json @@ -94,6 +94,7 @@ "tm:hyperbeam", "tm:irondefense", "tm:lightscreen", + "tm:meteorbeam", "tm:mudshot", "tm:powergem", "tm:protect", @@ -104,8 +105,11 @@ "tm:rockslide", "tm:rocktomb", "tm:sandstorm", + "tm:sandtomb", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", + "tm:smackdown", "tm:solarbeam", "tm:spikes", "tm:stealthrock", @@ -113,6 +117,7 @@ "tm:substitute", "tm:sunnyday", "tm:terablast", + "tm:toxic", "tm:toxicspikes", "tm:venoshock" ], @@ -134,4 +139,4 @@ "pokedex": [ "cobblemon.species.glimmora.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json b/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json new file mode 100644 index 0000000000..2bed111541 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json @@ -0,0 +1,112 @@ +{ + "name": "Gouging Fire", + "nationalPokedexNumber": 1020, + "primaryType": "fire", + "secondaryType": "dragon", + "abilities": [ + "protosynthesis" + ], + "baseStats": { + "hp": 105, + "attack": 115, + "defence": 121, + "special_attack": 65, + "special_defence": 93, + "speed": 91 + }, + "catchRate": 10, + "maleRatio": -1, + "baseExperienceYield": 0, + "baseFriendship": 0, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 3, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "experienceGroup": "slow", + "eggCycles": 50, + "eggGroups": [ + "undiscovered" + ], + "moves": [ + "1:ancientpower", + "1:doublekick", + "1:incinerate", + "1:leer", + "1:nobleroar", + "1:stomp", + "1:sunnyday", + "7:firefang", + "14:howl", + "21:bite", + "28:dragonclaw", + "35:crushclaw", + "42:morningsun", + "49:burningbulwark", + "56:dragonrush", + "63:fireblast", + "70:lavaplume", + "77:outrage", + "84:flareblitz", + "91:ragingfury", + "tm:bodyslam", + "tm:breakingswipe", + "tm:bulldoze", + "tm:crunch", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragoncheer", + "tm:dragonclaw", + "tm:dragondance", + "tm:dragonpulse", + "tm:dragontail", + "tm:earthquake", + "tm:endure", + "tm:facade", + "tm:fireblast", + "tm:firefang", + "tm:firespin", + "tm:flamecharge", + "tm:flamethrower", + "tm:flareblitz", + "tm:gigaimpact", + "tm:heatcrash", + "tm:heatwave", + "tm:hyperbeam", + "tm:ironhead", + "tm:outrage", + "tm:overheat", + "tm:protect", + "tm:psychicfangs", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:scaleshot", + "tm:scaryface", + "tm:scorchingsands", + "tm:sleeptalk", + "tm:smartstrike", + "tm:snarl", + "tm:stompingtantrum", + "tm:stoneedge", + "tm:substitute", + "tm:sunnyday", + "tm:takedown", + "tm:temperflare", + "tm:terablast", + "tm:thunderfang", + "tm:weatherball" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], + "height": 35, + "weight": 5900, + "evolutions": [], + "cannotDynamax": false +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json b/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json index 90624fbb50..5366ebc121 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json @@ -71,7 +71,9 @@ "tm:acrobatics", "tm:batonpass", "tm:dig", + "tm:doubleedge", "tm:encore", + "tm:endeavor", "tm:endure", "tm:facade", "tm:fling", @@ -79,6 +81,7 @@ "tm:gigaimpact", "tm:gunkshot", "tm:helpinghand", + "tm:knockoff", "tm:lowkick", "tm:lowsweep", "tm:metronome", @@ -89,19 +92,25 @@ "tm:poisontail", "tm:pounce", "tm:protect", + "tm:psychup", "tm:raindance", "tm:rest", "tm:scaryface", "tm:shadowclaw", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", + "tm:toxic", "tm:trailblaze", "tm:uturn", "tm:venoshock", @@ -125,4 +134,4 @@ "pokedex": [ "cobblemon.species.grafaiai.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json b/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json index e2be21675d..008bdbce21 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json @@ -56,18 +56,22 @@ "tm:bulldoze", "tm:closecombat", "tm:dig", + "tm:doubleedge", "tm:earthpower", "tm:earthquake", + "tm:endeavor", "tm:endure", "tm:facade", "tm:firefang", "tm:flashcannon", "tm:gigaimpact", "tm:heavyslam", + "tm:highhorsepower", "tm:hyperbeam", "tm:icefang", "tm:icespinner", "tm:ironhead", + "tm:knockoff", "tm:mudshot", "tm:mudslap", "tm:playrough", @@ -75,28 +79,27 @@ "tm:psyshock", "tm:rest", "tm:reversal", + "tm:roar", "tm:rockslide", "tm:rocktomb", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", + "tm:smackdown", "tm:smartstrike", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:sunnyday", + "tm:supercellslam", "tm:takedown", "tm:taunt", + "tm:temperflare", "tm:terablast", + "tm:throatchop", "tm:thunderfang", - "tm:zenheadbutt", - "tutor:brickbreak", - "tutor:earthquake", - "tutor:gigaimpact", - "tutor:knockoff", - "tutor:rapidspin", - "tutor:stompingtantrum" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -110,4 +113,4 @@ "pokedex": [ "cobblemon.species.greattusk.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/greavard.json b/common/src/main/resources/data/cobblemon/species/generation9/greavard.json index 3589d439c3..be0ea5fcc8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/greavard.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/greavard.json @@ -59,6 +59,8 @@ "tm:confuseray", "tm:crunch", "tm:dig", + "tm:doubleedge", + "tm:endeavor", "tm:endure", "tm:facade", "tm:firefang", @@ -68,12 +70,15 @@ "tm:mudshot", "tm:mudslap", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", "tm:playrough", + "tm:poltergeist", "tm:protect", "tm:psychicfangs", "tm:raindance", "tm:rest", + "tm:roar", "tm:sandstorm", "tm:scaryface", "tm:shadowball", @@ -86,7 +91,8 @@ "tm:terablast", "tm:thief", "tm:thunderfang", - "tm:trick" + "tm:trick", + "tm:uproar" ], "labels": [ "gen9" @@ -140,4 +146,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json b/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json index ef5ff2426d..2686fbe2c1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json @@ -54,6 +54,8 @@ "tm:confuseray", "tm:crunch", "tm:dig", + "tm:doubleedge", + "tm:endeavor", "tm:endure", "tm:facade", "tm:firefang", @@ -65,12 +67,15 @@ "tm:mudshot", "tm:mudslap", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", "tm:playrough", + "tm:poltergeist", "tm:protect", "tm:psychicfangs", "tm:raindance", "tm:rest", + "tm:roar", "tm:sandstorm", "tm:scaryface", "tm:shadowball", @@ -84,6 +89,7 @@ "tm:thief", "tm:thunderfang", "tm:trick", + "tm:uproar", "tm:willowisp" ], "labels": [ @@ -115,4 +121,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json b/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json new file mode 100644 index 0000000000..0b1c39c7e6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json @@ -0,0 +1,109 @@ +{ + "name": "Hydrapple", + "nationalPokedexNumber": 1019, + "primaryType": "grass", + "secondaryType": "dragon", + "abilities": [ + "supersweetsyrup", + "regenerator", + "h:stickyhold" + ], + "baseStats": { + "hp": 106, + "attack": 80, + "defence": 110, + "special_attack": 120, + "special_defence": 80, + "speed": 44 + }, + "catchRate": 10, + "maleRatio": 0.5, + "baseExperienceYield": 0, + "baseFriendship": 50, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, + "experienceGroup": "erratic", + "eggCycles": 20, + "eggGroups": [ + "grass", + "dragon" + ], + "moves": [ + "1:astonish", + "1:doublehit", + "1:infestation", + "1:recycle", + "1:sweetscent", + "1:withdraw", + "1:yawn", + "4:dragontail", + "8:growth", + "12:dragonbreath", + "16:protect", + "20:bulletseed", + "28:syrupbomb", + "32:dragonpulse", + "36:recover", + "40:energyball", + "44:substitute", + "54:powerwhip", + "tm:bodypress", + "tm:bodyslam", + "tm:breakingswipe", + "tm:bugbite", + "tm:bulletseed", + "tm:curse", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragoncheer", + "tm:dragonpulse", + "tm:dragontail", + "tm:earthpower", + "tm:earthquake", + "tm:endure", + "tm:energyball", + "tm:facade", + "tm:gigadrain", + "tm:gigaimpact", + "tm:grassknot", + "tm:grassyglide", + "tm:grassyterrain", + "tm:gyroball", + "tm:heavyslam", + "tm:hydropump", + "tm:hyperbeam", + "tm:leafstorm", + "tm:magicalleaf", + "tm:nastyplot", + "tm:outrage", + "tm:pollenpuff", + "tm:pounce", + "tm:protect", + "tm:raindance", + "tm:reflect", + "tm:rest", + "tm:seedbomb", + "tm:sleeptalk", + "tm:solarbeam", + "tm:substitute", + "tm:sunnyday", + "tm:takedown", + "tm:terablast", + "tm:uproar" + ], + "labels": [ + "gen9" + ], + "aspects": [], + "height": 18, + "weight": 930, + "preEvolution": "dipplin", + "evolutions": [], + "cannotDynamax": false +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json b/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json new file mode 100644 index 0000000000..84fde55bfb --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json @@ -0,0 +1,100 @@ +{ + "name": "Iron Boulder", + "nationalPokedexNumber": 1022, + "primaryType": "rock", + "secondaryType": "psychic", + "abilities": [ + "quarkdrive" + ], + "baseStats": { + "hp": 90, + "attack": 120, + "defence": 80, + "special_attack": 68, + "special_defence": 108, + "speed": 124 + }, + "catchRate": 10, + "maleRatio": -1, + "baseExperienceYield": 0, + "baseFriendship": 0, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 3 + }, + "experienceGroup": "slow", + "eggCycles": 50, + "eggGroups": [ + "undiscovered" + ], + "moves": [ + "1:electricterrain", + "1:hornattack", + "1:leer", + "1:rockthrow", + "7:quickattack", + "14:slash", + "21:agility", + "28:psychocut", + "35:counter", + "42:rocktomb", + "49:sacredsword", + "56:mightycleave", + "63:swordsdance", + "70:megahorn", + "77:quickguard", + "84:stoneedge", + "91:gigaimpact", + "tm:aerialace", + "tm:agility", + "tm:airslash", + "tm:bodyslam", + "tm:brickbreak", + "tm:bulldoze", + "tm:closecombat", + "tm:doubleedge", + "tm:earthquake", + "tm:electricterrain", + "tm:endure", + "tm:facade", + "tm:gigaimpact", + "tm:hyperbeam", + "tm:irondefense", + "tm:ironhead", + "tm:meteorbeam", + "tm:poisonjab", + "tm:protect", + "tm:psychic", + "tm:psyshock", + "tm:rest", + "tm:rockblast", + "tm:rocktomb", + "tm:sandstorm", + "tm:scaryface", + "tm:sleeptalk", + "tm:solarblade", + "tm:stoneedge", + "tm:substitute", + "tm:swordsdance", + "tm:takedown", + "tm:taunt", + "tm:terablast", + "tm:throatchop", + "tm:wildcharge", + "tm:xscissor", + "tm:zenheadbutt" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], + "height": 15, + "weight": 1625, + "evolutions": [], + "cannotDynamax": false +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json b/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json index 728592f41a..195e781c63 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json @@ -59,6 +59,7 @@ "tm:endure", "tm:facade", "tm:fling", + "tm:flipturn", "tm:gigaimpact", "tm:helpinghand", "tm:hydropump", @@ -81,10 +82,7 @@ "tm:thief", "tm:uturn", "tm:waterpulse", - "tutor:drillpeck", - "tutor:flipturn", - "tutor:freezedry", - "tutor:helpinghand" + "tm:whirlpool" ], "labels": [ "gen9", @@ -98,4 +96,4 @@ "pokedex": [ "cobblemon.species.ironbundle.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json b/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json new file mode 100644 index 0000000000..5b87ef955d --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json @@ -0,0 +1,103 @@ +{ + "name": "Iron Crown", + "nationalPokedexNumber": 1023, + "primaryType": "steel", + "secondaryType": "psychic", + "abilities": [ + "quarkdrive" + ], + "baseStats": { + "hp": 90, + "attack": 72, + "defence": 100, + "special_attack": 122, + "special_defence": 108, + "speed": 98 + }, + "catchRate": 10, + "maleRatio": -1, + "baseExperienceYield": 0, + "baseFriendship": 0, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, + "experienceGroup": "slow", + "eggCycles": 50, + "eggGroups": [ + "undiscovered" + ], + "moves": [ + "1:confusion", + "1:electricterrain", + "1:leer", + "1:metalclaw", + "7:smartstrike", + "14:slash", + "21:irondefense", + "28:psyshock", + "35:psychocut", + "42:flashcannon", + "49:sacredsword", + "56:tachyoncutter", + "63:futuresight", + "70:voltswitch", + "77:quickguard", + "84:metalburst", + "91:hyperbeam", + "tm:agility", + "tm:airslash", + "tm:bodyslam", + "tm:brickbreak", + "tm:bulldoze", + "tm:calmmind", + "tm:doubleedge", + "tm:electricterrain", + "tm:endure", + "tm:expandingforce", + "tm:facade", + "tm:flashcannon", + "tm:focusblast", + "tm:futuresight", + "tm:gigaimpact", + "tm:gravity", + "tm:heavyslam", + "tm:hyperbeam", + "tm:irondefense", + "tm:ironhead", + "tm:metalclaw", + "tm:metalsound", + "tm:protect", + "tm:psychic", + "tm:psychicnoise", + "tm:psyshock", + "tm:rest", + "tm:scaryface", + "tm:sleeptalk", + "tm:smartstrike", + "tm:solarblade", + "tm:steelbeam", + "tm:storedpower", + "tm:substitute", + "tm:supercellslam", + "tm:swordsdance", + "tm:takedown", + "tm:terablast", + "tm:voltswitch", + "tm:xscissor", + "tm:zenheadbutt" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], + "height": 16, + "weight": 1560, + "evolutions": [], + "cannotDynamax": false +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json b/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json index 13c3c92691..7638315f44 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json @@ -54,7 +54,9 @@ "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", + "tm:charge", "tm:closecombat", + "tm:doubleedge", "tm:drainpunch", "tm:earthquake", "tm:electricterrain", @@ -63,7 +65,9 @@ "tm:firepunch", "tm:fling", "tm:focusblast", + "tm:focuspunch", "tm:gigaimpact", + "tm:hardpress", "tm:heavyslam", "tm:hyperbeam", "tm:icepunch", @@ -82,6 +86,7 @@ "tm:sleeptalk", "tm:stompingtantrum", "tm:substitute", + "tm:supercellslam", "tm:swordsdance", "tm:takedown", "tm:terablast", @@ -89,11 +94,7 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:voltswitch", - "tm:wildcharge", - "tutor:charge", - "tutor:forcepalm", - "tutor:seismictoss", - "tutor:slam" + "tm:wildcharge" ], "labels": [ "gen9", @@ -107,4 +108,4 @@ "pokedex": [ "cobblemon.species.ironhands.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json b/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json index f79ea42cc0..cc961a1241 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json @@ -56,8 +56,11 @@ "tm:chargebeam", "tm:crunch", "tm:darkpulse", + "tm:doubleedge", + "tm:dragoncheer", "tm:dragonpulse", "tm:dragontail", + "tm:dualwingbeat", "tm:earthpower", "tm:electricterrain", "tm:endure", @@ -75,10 +78,15 @@ "tm:hyperbeam", "tm:hypervoice", "tm:ironhead", + "tm:knockoff", + "tm:lashout", + "tm:metalsound", + "tm:meteorbeam", "tm:outrage", "tm:protect", "tm:raindance", "tm:rest", + "tm:roar", "tm:rocktomb", "tm:scaryface", "tm:sleeptalk", @@ -89,12 +97,9 @@ "tm:takedown", "tm:taunt", "tm:terablast", + "tm:throatchop", "tm:uturn", - "tm:zenheadbutt", - "tutor:crunch", - "tutor:dragonbreath", - "tutor:hypervoice", - "tutor:snarl" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -108,4 +113,4 @@ "pokedex": [ "cobblemon.species.ironjugulis.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironleaves.json b/common/src/main/resources/data/cobblemon/species/generation9/ironleaves.json index f56ff90f55..a7c1677889 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironleaves.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironleaves.json @@ -66,6 +66,8 @@ "tm:brickbreak", "tm:calmmind", "tm:closecombat", + "tm:coaching", + "tm:doubleedge", "tm:electricterrain", "tm:endure", "tm:energyball", @@ -76,12 +78,14 @@ "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", + "tm:gravity", "tm:helpinghand", "tm:hyperbeam", "tm:imprison", "tm:irondefense", "tm:leafstorm", "tm:magicalleaf", + "tm:metalsound", "tm:protect", "tm:psychicterrain", "tm:rest", @@ -90,19 +94,17 @@ "tm:sleeptalk", "tm:smartstrike", "tm:solarbeam", + "tm:solarblade", "tm:substitute", "tm:swift", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", + "tm:throatchop", "tm:trailblaze", "tm:wildcharge", - "tm:xscissor", - "tutor:leafblade", - "tutor:megahorn", - "tutor:psyblade", - "tutor:swordsdance" + "tm:xscissor" ], "labels": [ "gen9", @@ -119,4 +121,4 @@ "fixed": false }, "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json b/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json index 6ee6506540..e53fb8a560 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json @@ -74,12 +74,16 @@ "tm:hurricane", "tm:hyperbeam", "tm:lightscreen", + "tm:lunge", + "tm:metalsound", + "tm:meteorbeam", "tm:overheat", "tm:pounce", "tm:protect", "tm:psychic", "tm:rest", "tm:sleeptalk", + "tm:sludgewave", "tm:solarbeam", "tm:strugglebug", "tm:substitute", @@ -87,13 +91,10 @@ "tm:swift", "tm:takedown", "tm:terablast", + "tm:toxic", "tm:toxicspikes", "tm:uturn", - "tm:venoshock", - "tutor:discharge", - "tutor:lunge", - "tutor:screech", - "tutor:sludgewave" + "tm:venoshock" ], "labels": [ "gen9", @@ -107,4 +108,4 @@ "pokedex": [ "cobblemon.species.ironmoth.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json b/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json index 5b7d5c05ac..6a7f12c25b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json @@ -53,11 +53,15 @@ "tm:blizzard", "tm:bodypress", "tm:bodyslam", + "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", + "tm:charge", "tm:chargebeam", "tm:crunch", + "tm:curse", "tm:dig", + "tm:doubleedge", "tm:dragonclaw", "tm:dragondance", "tm:dragontail", @@ -66,6 +70,7 @@ "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", "tm:endure", "tm:facade", "tm:fireblast", @@ -76,6 +81,7 @@ "tm:focusblast", "tm:gigaimpact", "tm:heavyslam", + "tm:highhorsepower", "tm:hyperbeam", "tm:icebeam", "tm:icefang", @@ -84,6 +90,7 @@ "tm:ironhead", "tm:lowkick", "tm:metalclaw", + "tm:meteorbeam", "tm:powergem", "tm:protect", "tm:raindance", @@ -92,7 +99,10 @@ "tm:rockslide", "tm:rocktomb", "tm:sandstorm", + "tm:sandtomb", "tm:scaryface", + "tm:sleeptalk", + "tm:smackdown", "tm:snarl", "tm:spikes", "tm:stealthrock", @@ -100,6 +110,7 @@ "tm:stoneedge", "tm:substitute", "tm:sunnyday", + "tm:supercellslam", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -110,11 +121,7 @@ "tm:thunderpunch", "tm:thunderwave", "tm:voltswitch", - "tm:wildcharge", - "tutor:bite", - "tutor:charge", - "tutor:rockslide", - "tutor:sandstorm" + "tm:wildcharge" ], "labels": [ "gen9", @@ -128,4 +135,4 @@ "pokedex": [ "cobblemon.species.ironthorns.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json b/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json index c2454e1815..f59c4b08aa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json @@ -51,19 +51,26 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", + "tm:doubleedge", "tm:earthpower", "tm:earthquake", "tm:electricterrain", "tm:electroball", + "tm:endeavor", "tm:facade", "tm:flashcannon", "tm:gigaimpact", + "tm:gyroball", + "tm:hardpress", "tm:heavyslam", + "tm:highhorsepower", "tm:hyperbeam", "tm:icefang", "tm:icespinner", "tm:irondefense", "tm:ironhead", + "tm:knockoff", + "tm:metalsound", "tm:mudshot", "tm:mudslap", "tm:protect", @@ -72,25 +79,21 @@ "tm:rocktomb", "tm:sandstorm", "tm:scaryface", + "tm:sleeptalk", "tm:smartstrike", "tm:stealthrock", "tm:steelbeam", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", + "tm:supercellslam", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderfang", "tm:voltswitch", "tm:wildcharge", - "tm:zenheadbutt", - "tutor:earthquake", - "tutor:heavyslam", - "tutor:ironhead", - "tutor:knockoff", - "tutor:rapidspin", - "tutor:stompingtantrum" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -104,4 +107,4 @@ "pokedex": [ "cobblemon.species.irontreads.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json b/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json index c53e26b578..98bd1b64ce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json @@ -58,6 +58,7 @@ "tm:calmmind", "tm:chargebeam", "tm:closecombat", + "tm:coaching", "tm:confuseray", "tm:dazzlinggleam", "tm:drainpunch", @@ -65,10 +66,12 @@ "tm:encore", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:falseswipe", "tm:firepunch", "tm:fling", "tm:focusblast", + "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", @@ -78,6 +81,7 @@ "tm:icepunch", "tm:icywind", "tm:imprison", + "tm:knockoff", "tm:lightscreen", "tm:liquidation", "tm:lowkick", @@ -89,6 +93,7 @@ "tm:psybeam", "tm:psychic", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:reflect", "tm:rest", @@ -103,17 +108,15 @@ "tm:swordsdance", "tm:taunt", "tm:terablast", + "tm:throatchop", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", "tm:trick", "tm:trickroom", + "tm:vacuumwave", "tm:xscissor", - "tm:zenheadbutt", - "tutor:dazzlinggleam", - "tutor:leafblade", - "tutor:nightslash", - "tutor:psychocut" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -127,4 +130,4 @@ "pokedex": [ "cobblemon.species.ironvaliant.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json b/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json index ea7db58892..febe5bd386 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json @@ -55,12 +55,17 @@ "tm:aircutter", "tm:airslash", "tm:bravebird", + "tm:charge", "tm:chargebeam", + "tm:dualwingbeat", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", + "tm:endeavor", "tm:endure", "tm:facade", + "tm:featherdance", "tm:fly", "tm:gigaimpact", "tm:hurricane", @@ -70,6 +75,7 @@ "tm:scaryface", "tm:sleeptalk", "tm:substitute", + "tm:supercellslam", "tm:swift", "tm:tailwind", "tm:takedown", @@ -77,8 +83,10 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", + "tm:uproar", "tm:uturn", "tm:voltswitch", + "tm:weatherball", "tm:wildcharge" ], "labels": [ @@ -113,4 +121,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json b/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json index 6e386c76ed..6f61e93b06 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json @@ -68,9 +68,11 @@ "tm:hyperbeam", "tm:irondefense", "tm:ironhead", + "tm:lashout", "tm:lowkick", "tm:lowsweep", "tm:metalclaw", + "tm:metalsound", "tm:poisonjab", "tm:protect", "tm:raindance", @@ -82,6 +84,7 @@ "tm:shadowclaw", "tm:sleeptalk", "tm:snarl", + "tm:spite", "tm:stealthrock", "tm:steelbeam", "tm:stoneedge", @@ -91,6 +94,7 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:thunderwave", "tm:xscissor", "tm:zenheadbutt" @@ -120,4 +124,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/klawf.json b/common/src/main/resources/data/cobblemon/species/generation9/klawf.json index 22643dd2a2..ea61b07b56 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/klawf.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/klawf.json @@ -57,14 +57,18 @@ "tm:bulldoze", "tm:dig", "tm:earthpower", + "tm:endeavor", "tm:endure", "tm:facade", "tm:fling", "tm:gigaimpact", "tm:helpinghand", + "tm:highhorsepower", "tm:hyperbeam", "tm:irondefense", + "tm:knockoff", "tm:metalclaw", + "tm:meteorbeam", "tm:mudshot", "tm:mudslap", "tm:powergem", @@ -78,7 +82,9 @@ "tm:sandstorm", "tm:scaryface", "tm:shadowclaw", + "tm:skittersmack", "tm:sleeptalk", + "tm:smackdown", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -86,14 +92,12 @@ "tm:sunnyday", "tm:swordsdance", "tm:takedown", + "tm:temperflare", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:trailblaze", - "tm:xscissor", - "tutor:block", - "tutor:rocksmash", - "tutor:rocktomb", - "tutor:visegrip" + "tm:xscissor" ], "labels": [ "gen9" @@ -115,4 +119,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json b/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json index 150a4afc3d..d34b9bdcac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json @@ -52,17 +52,21 @@ "tm:agility", "tm:bodypress", "tm:bodyslam", + "tm:breakingswipe", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:closecombat", "tm:crunch", "tm:dig", + "tm:doubleedge", "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", "tm:drainpunch", + "tm:dualwingbeat", "tm:endure", "tm:facade", "tm:fireblast", @@ -72,7 +76,9 @@ "tm:flamethrower", "tm:flareblitz", "tm:focusblast", + "tm:focuspunch", "tm:gigaimpact", + "tm:heatcrash", "tm:heatwave", "tm:heavyslam", "tm:helpinghand", @@ -81,6 +87,7 @@ "tm:ironhead", "tm:lowkick", "tm:lowsweep", + "tm:meteorbeam", "tm:mudshot", "tm:mudslap", "tm:outrage", @@ -88,6 +95,8 @@ "tm:protect", "tm:rest", "tm:reversal", + "tm:roar", + "tm:scaleshot", "tm:scaryface", "tm:shadowclaw", "tm:sleeptalk", @@ -99,17 +108,13 @@ "tm:swordsdance", "tm:takedown", "tm:taunt", + "tm:temperflare", "tm:terablast", "tm:thunderfang", + "tm:uproar", "tm:uturn", "tm:wildcharge", - "tm:zenheadbutt", - "tutor:bulkup", - "tutor:collisioncourse", - "tutor:endure", - "tutor:flamethrower", - "tutor:gigaimpact", - "tutor:terablast" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -123,4 +128,4 @@ "pokedex": [ "cobblemon.species.koraidon.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json b/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json index 305886a1dd..1eafffb5f7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json @@ -55,7 +55,7 @@ }, "moving": { "walk": { - "walkSpeed": 0.11 + "walkSpeed": 0.12 } } }, @@ -82,8 +82,11 @@ "tm:bulldoze", "tm:bulletseed", "tm:chillingwater", + "tm:curse", "tm:dig", "tm:disarmingvoice", + "tm:doubleedge", + "tm:endeavor", "tm:endure", "tm:facade", "tm:helpinghand", @@ -99,10 +102,12 @@ "tm:sleeptalk", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:takedown", "tm:terablast", "tm:thief", "tm:trailblaze", + "tm:uproar", "tm:zenheadbutt" ], "labels": [ @@ -149,4 +154,4 @@ "pokedex": [ "cobblemon.species.lechonk.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/lokix.json b/common/src/main/resources/data/cobblemon/species/generation9/lokix.json index d98645a42e..810540ba12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/lokix.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/lokix.json @@ -55,22 +55,29 @@ "tm:aerialace", "tm:agility", "tm:brickbreak", + "tm:bugbite", "tm:bugbuzz", "tm:darkpulse", + "tm:doubleedge", "tm:endure", "tm:facade", "tm:fling", "tm:gigaimpact", + "tm:knockoff", + "tm:lashout", "tm:leechlife", "tm:lowkick", "tm:lowsweep", + "tm:lunge", "tm:pounce", "tm:protect", "tm:raindance", "tm:rest", "tm:reversal", "tm:scaryface", + "tm:skittersmack", "tm:sleeptalk", + "tm:spite", "tm:strugglebug", "tm:substitute", "tm:sunnyday", @@ -79,6 +86,7 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:trailblaze", "tm:uturn", "tm:xscissor" @@ -104,4 +112,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json b/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json index cda73807f7..1d8c64a34e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json @@ -71,8 +71,11 @@ "tm:bodyslam", "tm:charm", "tm:crunch", + "tm:curse", "tm:darkpulse", "tm:dig", + "tm:doubleedge", + "tm:endeavor", "tm:endure", "tm:facade", "tm:faketears", @@ -82,16 +85,20 @@ "tm:hyperbeam", "tm:hypervoice", "tm:icefang", + "tm:lashout", "tm:outrage", + "tm:painsplit", "tm:playrough", "tm:protect", "tm:psychicfangs", "tm:raindance", "tm:rest", "tm:reversal", + "tm:roar", "tm:scaryface", "tm:sleeptalk", "tm:snarl", + "tm:spite", "tm:substitute", "tm:sunnyday", "tm:takedown", @@ -120,4 +127,4 @@ "pokedex": [ "cobblemon.species.mabosstiff.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json b/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json index d2d5596eb8..c9e8b8379c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json @@ -75,18 +75,22 @@ "tm:crunch", "tm:darkpulse", "tm:dig", + "tm:doubleedge", + "tm:endeavor", "tm:endure", "tm:facade", "tm:faketears", "tm:firefang", "tm:helpinghand", "tm:icefang", + "tm:lashout", "tm:playrough", "tm:protect", "tm:psychicfangs", "tm:raindance", "tm:rest", "tm:reversal", + "tm:roar", "tm:scaryface", "tm:sleeptalk", "tm:snarl", @@ -132,4 +136,4 @@ "pokedex": [ "cobblemon.species.maschiff.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/maushold.json b/common/src/main/resources/data/cobblemon/species/generation9/maushold.json index 997c6bc08a..8bcc28d5e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/maushold.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/maushold.json @@ -74,11 +74,13 @@ "53:populationbomb", "tm:aerialace", "tm:agility", + "tm:batonpass", "tm:bulletseed", "tm:charm", "tm:chillingwater", "tm:crunch", "tm:dig", + "tm:doubleedge", "tm:encore", "tm:endure", "tm:facade", @@ -101,6 +103,7 @@ "tm:sleeptalk", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:swift", "tm:takedown", "tm:taunt", @@ -234,4 +237,4 @@ "pokedex": [ "cobblemon.species.maushold.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json b/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json index 156f1b987d..74a1d19ab1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json @@ -57,10 +57,12 @@ } }, "moves": [ + "1:doubleteam", + "1:flowertrick", "1:leafage", "1:scratch", "1:tailwhip", - "1:flowertrick", + "1:trick", "7:bite", "10:honeclaws", "13:magicalleaf", @@ -97,19 +99,24 @@ "tm:gigaimpact", "tm:grassknot", "tm:grasspledge", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", "tm:hyperbeam", + "tm:knockoff", + "tm:lashout", "tm:leafstorm", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", "tm:mudslap", "tm:nastyplot", + "tm:petalblizzard", "tm:playrough", "tm:pollenpuff", "tm:powergem", "tm:protect", + "tm:psychup", "tm:rest", "tm:seedbomb", "tm:shadowball", @@ -124,11 +131,13 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:thunderpunch", "tm:toxicspikes", "tm:trailblaze", "tm:trick", "tm:trickroom", + "tm:tripleaxel", "tm:uturn" ], "labels": [ @@ -149,4 +158,4 @@ "pokedex": [ "cobblemon.species.meowscarada.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json b/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json index 3edd97ce49..2420bab436 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json @@ -52,11 +52,13 @@ "tm:agility", "tm:bodyslam", "tm:calmmind", + "tm:charge", "tm:chargebeam", "tm:confuseray", "tm:crunch", "tm:dazzlinggleam", "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -71,6 +73,7 @@ "tm:helpinghand", "tm:hyperbeam", "tm:lightscreen", + "tm:metalsound", "tm:outrage", "tm:overheat", "tm:powergem", @@ -82,6 +85,7 @@ "tm:snarl", "tm:solarbeam", "tm:substitute", + "tm:supercellslam", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -92,13 +96,7 @@ "tm:uturn", "tm:voltswitch", "tm:wildcharge", - "tm:zenheadbutt", - "tutor:charge", - "tutor:electrodrift", - "tutor:endure", - "tutor:hyperbeam", - "tutor:powergem", - "tutor:terablast" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -112,4 +110,4 @@ "pokedex": [ "cobblemon.species.miraidon.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json b/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json index f33bf953f2..f6097a1942 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json @@ -54,6 +54,7 @@ "tm:facade", "tm:fling", "tm:focusblast", + "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", @@ -72,13 +73,16 @@ "tm:protect", "tm:psybeam", "tm:psychic", + "tm:psychicnoise", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:rest", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", "tm:spite", "tm:storedpower", "tm:substitute", @@ -91,18 +95,15 @@ "tm:trick", "tm:uproar", "tm:uturn", - "tm:venoshock", - "tutor:futuresight", - "tutor:nastyplot", - "tutor:psychic", - "tutor:sludgewave" + "tm:venoshock" ], "labels": [ - "gen9" + "gen9", + "legendary" ], "aspects": [], "height": 10, "weight": 122, "evolutions": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/nacli.json b/common/src/main/resources/data/cobblemon/species/generation9/nacli.json index a2e2620f98..2bf38f0c08 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/nacli.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/nacli.json @@ -80,6 +80,7 @@ "egg:powergem", "tm:bodyslam", "tm:bulldoze", + "tm:curse", "tm:dig", "tm:earthpower", "tm:earthquake", @@ -90,6 +91,7 @@ "tm:helpinghand", "tm:irondefense", "tm:ironhead", + "tm:meteorbeam", "tm:mudshot", "tm:powergem", "tm:protect", @@ -98,6 +100,7 @@ "tm:rockslide", "tm:sandstorm", "tm:sleeptalk", + "tm:smackdown", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -140,4 +143,4 @@ "pokedex": [ "cobblemon.species.nacli.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json b/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json index a748371400..5360f41dab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json @@ -78,7 +78,9 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", + "tm:curse", "tm:dig", + "tm:doubleedge", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -90,6 +92,7 @@ "tm:hyperbeam", "tm:irondefense", "tm:ironhead", + "tm:meteorbeam", "tm:mudshot", "tm:powergem", "tm:protect", @@ -98,6 +101,7 @@ "tm:rockslide", "tm:sandstorm", "tm:sleeptalk", + "tm:smackdown", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -141,4 +145,4 @@ "pokedex": [ "cobblemon.species.naclstack.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/nymble.json b/common/src/main/resources/data/cobblemon/species/generation9/nymble.json index 3df86bf9ce..49f750c78c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/nymble.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/nymble.json @@ -48,6 +48,7 @@ "egg:counter", "egg:skittersmack", "tm:agility", + "tm:bugbite", "tm:bugbuzz", "tm:endure", "tm:facade", @@ -56,6 +57,7 @@ "tm:protect", "tm:raindance", "tm:rest", + "tm:skittersmack", "tm:sleeptalk", "tm:strugglebug", "tm:substitute", @@ -103,4 +105,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json b/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json index 89cb03e2bf..c7c01ecfc3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json @@ -91,15 +91,10 @@ "tm:takedown", "tm:taunt", "tm:terablast", + "tm:throatchop", "tm:trailblaze", "tm:uturn", - "tm:zenheadbutt", - "tutor:grassyterrain", - "tutor:growth", - "tutor:ivycudgel", - "tutor:lowkick", - "tutor:slam", - "tutor:vinewhip" + "tm:zenheadbutt" ], "labels": [ "gen9" @@ -253,20 +248,20 @@ "special_defence": 96, "speed": 110 }, - "catchRate": 0, + "catchRate": 5, "maleRatio": 0, "baseExperienceYield": 0, "baseFriendship": 0, "evYield": { "hp": 0, - "attack": 0, + "attack": 3, "defence": 0, "special_attack": 0, "special_defence": 0, "speed": 0 }, "experienceGroup": "slow", - "eggCycles": 0, + "eggCycles": 50, "eggGroups": [ "undiscovered" ], @@ -296,20 +291,20 @@ "special_defence": 96, "speed": 110 }, - "catchRate": 0, + "catchRate": 5, "maleRatio": 0, "baseExperienceYield": 0, "baseFriendship": 0, "evYield": { "hp": 0, - "attack": 0, + "attack": 3, "defence": 0, "special_attack": 0, "special_defence": 0, "speed": 0 }, "experienceGroup": "slow", - "eggCycles": 0, + "eggCycles": 50, "eggGroups": [ "undiscovered" ], @@ -339,20 +334,20 @@ "special_defence": 96, "speed": 110 }, - "catchRate": 0, + "catchRate": 5, "maleRatio": 0, "baseExperienceYield": 0, "baseFriendship": 0, "evYield": { "hp": 0, - "attack": 0, + "attack": 3, "defence": 0, "special_attack": 0, "special_defence": 0, "speed": 0 }, "experienceGroup": "slow", - "eggCycles": 0, + "eggCycles": 50, "eggGroups": [ "undiscovered" ], @@ -382,25 +377,26 @@ "special_defence": 96, "speed": 110 }, - "catchRate": 0, + "catchRate": 5, "maleRatio": 0, "baseExperienceYield": 0, "baseFriendship": 0, "evYield": { "hp": 0, - "attack": 0, + "attack": 3, "defence": 0, "special_attack": 0, "special_defence": 0, "speed": 0 }, "experienceGroup": "slow", - "eggCycles": 0, + "eggCycles": 50, "eggGroups": [ "undiscovered" ], "labels": [ - "gen9" + "gen9", + "legendary" ], "aspects": [ "cornerstone-tera" @@ -411,4 +407,4 @@ "battleOnly": true } ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json index 6687319eeb..befacd49c1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json @@ -30,7 +30,7 @@ "speed": 65 }, "catchRate": 100, - "maleRatio": 0.5, + "maleRatio": 1, "baseExperienceYield": 171, "baseFriendship": 50, "evYield": { @@ -67,17 +67,22 @@ "tm:bulldoze", "tm:bulletseed", "tm:chillingwater", + "tm:curse", "tm:dig", "tm:disarmingvoice", + "tm:doubleedge", "tm:earthpower", + "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:gigaimpact", "tm:helpinghand", + "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:ironhead", + "tm:lashout", "tm:mudshot", "tm:mudslap", "tm:playrough", @@ -89,10 +94,12 @@ "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:takedown", "tm:terablast", "tm:thief", "tm:trailblaze", + "tm:uproar", "tm:zenheadbutt" ], "labels": [ @@ -122,6 +129,8 @@ "speed": 65 }, "catchRate": 100, + "maleRatio": 0, + "baseExperienceYield": 171, "baseFriendship": 50, "evYield": { "hp": 2, @@ -157,17 +166,22 @@ "tm:bulldoze", "tm:bulletseed", "tm:chillingwater", + "tm:curse", "tm:dig", "tm:disarmingvoice", + "tm:doubleedge", "tm:earthpower", + "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:gigaimpact", "tm:helpinghand", + "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:ironhead", + "tm:lashout", "tm:mudshot", "tm:mudslap", "tm:playrough", @@ -179,10 +193,12 @@ "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:takedown", "tm:terablast", "tm:thief", "tm:trailblaze", + "tm:uproar", "tm:zenheadbutt" ], "labels": [ @@ -194,11 +210,9 @@ "height": 10, "weight": 1200, "preEvolution": "lechonk", + "evolutions": [], "cannotDynamax": false, "battleOnly": false - }, - { - "name": "base" } ], "baseScale": 1.0, @@ -210,4 +224,4 @@ "pokedex": [ "cobblemon.species.oinkologne.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json b/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json index 2f31804d0f..0d766d0321 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json @@ -51,7 +51,9 @@ "tm:bulkup", "tm:closecombat", "tm:crunch", + "tm:curse", "tm:dig", + "tm:doubleedge", "tm:drainpunch", "tm:endure", "tm:facade", @@ -62,6 +64,7 @@ "tm:focuspunch", "tm:gigaimpact", "tm:gunkshot", + "tm:hardpress", "tm:highhorsepower", "tm:hyperbeam", "tm:icefang", @@ -85,6 +88,7 @@ "tm:shadowclaw", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", "tm:snarl", "tm:spite", "tm:stompingtantrum", @@ -93,21 +97,20 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:thunderfang", "tm:thunderpunch", "tm:toxic", - "tm:uproar", - "tutor:brutalswing", - "tutor:crunch", - "tutor:poisonjab", - "tutor:superpower" + "tm:upperhand", + "tm:uproar" ], "labels": [ - "gen9" + "gen9", + "legendary" ], "aspects": [], "height": 18, "weight": 920, "evolutions": [], "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json b/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json index b694165d70..4a446885e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json @@ -52,7 +52,9 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", + "tm:curse", "tm:dig", + "tm:doubleedge", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -61,9 +63,11 @@ "tm:gigaimpact", "tm:heavyslam", "tm:helpinghand", + "tm:highhorsepower", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", + "tm:metalsound", "tm:mudshot", "tm:mudslap", "tm:protect", @@ -72,18 +76,16 @@ "tm:rockslide", "tm:rocktomb", "tm:sandstorm", + "tm:sandtomb", "tm:sleeptalk", + "tm:smackdown", "tm:spikes", "tm:stealthrock", "tm:steelbeam", "tm:stompingtantrum", "tm:substitute", "tm:takedown", - "tm:terablast", - "tutor:headbutt", - "tutor:irontail", - "tutor:sandstorm", - "tutor:wrap" + "tm:terablast" ], "labels": [ "gen9" @@ -109,4 +111,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/palafin.json b/common/src/main/resources/data/cobblemon/species/generation9/palafin.json index 13db8089e5..7dc9964f15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/palafin.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/palafin.json @@ -62,12 +62,17 @@ "tm:drainingkiss", "tm:drainpunch", "tm:encore", + "tm:endeavor", "tm:endure", "tm:facade", "tm:fling", + "tm:flipturn", "tm:focusblast", + "tm:focuspunch", "tm:gigaimpact", "tm:grassknot", + "tm:hardpress", + "tm:haze", "tm:helpinghand", "tm:hydropump", "tm:hyperbeam", @@ -79,6 +84,7 @@ "tm:liquidation", "tm:outrage", "tm:protect", + "tm:psychup", "tm:raindance", "tm:rest", "tm:reversal", @@ -89,8 +95,10 @@ "tm:takedown", "tm:taunt", "tm:terablast", + "tm:throatchop", "tm:waterfall", "tm:waterpulse", + "tm:whirlpool", "tm:zenheadbutt" ], "labels": [ @@ -119,6 +127,7 @@ }, "catchRate": 45, "maleRatio": 0.5, + "baseExperienceYield": 160, "baseFriendship": 50, "evYield": { "hp": 2, @@ -134,7 +143,6 @@ "field", "water_2" ], - "moves": [], "labels": [ "gen9" ], @@ -159,4 +167,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json index 3ecb3b3203..fb0b915744 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json @@ -54,6 +54,7 @@ "egg:wish", "tm:agility", "tm:batonpass", + "tm:charge", "tm:chargebeam", "tm:charm", "tm:crunch", @@ -61,6 +62,7 @@ "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", "tm:encore", "tm:endure", "tm:facade", @@ -74,6 +76,7 @@ "tm:sleeptalk", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:swift", "tm:takedown", "tm:terablast", @@ -121,4 +124,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json index d18d96e042..8c5e5f1094 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json @@ -52,18 +52,23 @@ "52:wildcharge", "tm:agility", "tm:batonpass", + "tm:charge", "tm:chargebeam", "tm:charm", + "tm:coaching", "tm:crunch", "tm:dig", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", "tm:encore", "tm:endure", "tm:facade", "tm:fling", + "tm:focuspunch", "tm:helpinghand", + "tm:knockoff", "tm:lowkick", "tm:lowsweep", "tm:metalclaw", @@ -74,6 +79,7 @@ "tm:sleeptalk", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:swift", "tm:takedown", "tm:terablast", @@ -83,6 +89,7 @@ "tm:thunderfang", "tm:thunderpunch", "tm:thunderwave", + "tm:upperhand", "tm:voltswitch", "tm:wildcharge" ], @@ -123,4 +130,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json index 9e4d93bb4f..89754aed3a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json @@ -59,25 +59,31 @@ "tm:bodypress", "tm:brickbreak", "tm:bulkup", + "tm:charge", "tm:chargebeam", "tm:charm", "tm:closecombat", + "tm:coaching", "tm:crunch", "tm:dig", + "tm:doubleedge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", "tm:encore", "tm:endure", "tm:facade", "tm:firepunch", "tm:fling", "tm:focusblast", + "tm:focuspunch", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", + "tm:knockoff", "tm:lowkick", "tm:lowsweep", "tm:metalclaw", @@ -91,15 +97,19 @@ "tm:sleeptalk", "tm:substitute", "tm:sunnyday", + "tm:supercellslam", + "tm:superfang", "tm:swift", "tm:takedown", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:thunder", "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", "tm:thunderwave", + "tm:upperhand", "tm:voltswitch", "tm:wildcharge" ], @@ -124,4 +134,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json b/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json new file mode 100644 index 0000000000..d847b3c08f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json @@ -0,0 +1,85 @@ +{ + "name": "Pecharunt", + "nationalPokedexNumber": 1025, + "primaryType": "poison", + "secondaryType": "ghost", + "abilities": [ + "poisonpuppeteer" + ], + "baseStats": { + "hp": 88, + "attack": 88, + "defence": 160, + "special_attack": 88, + "special_defence": 88, + "speed": 88 + }, + "catchRate": 3, + "maleRatio": -1, + "baseExperienceYield": 0, + "baseFriendship": 0, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 3, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "experienceGroup": "slow", + "eggCycles": 20, + "eggGroups": [ + "undiscovered" + ], + "moves": [ + "1:astonish", + "1:defensecurl", + "1:meanlook", + "1:memento", + "1:poisongas", + "1:rollout", + "1:smog", + "8:withdraw", + "16:destinybond", + "24:faketears", + "32:partingshot", + "40:shadowball", + "48:malignantchain", + "56:toxic", + "64:nastyplot", + "72:recover", + "tm:acidspray", + "tm:curse", + "tm:endure", + "tm:faketears", + "tm:foulplay", + "tm:gunkshot", + "tm:hex", + "tm:imprison", + "tm:nastyplot", + "tm:nightshade", + "tm:phantomforce", + "tm:poltergeist", + "tm:protect", + "tm:rest", + "tm:shadowball", + "tm:sleeptalk", + "tm:sludgebomb", + "tm:sludgewave", + "tm:spite", + "tm:substitute", + "tm:terablast", + "tm:toxic", + "tm:venoshock" + ], + "labels": [ + "gen9", + "mythical", + "legendary" + ], + "aspects": [], + "height": 3, + "weight": 3, + "evolutions": [], + "cannotDynamax": false +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json b/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json index 6e7c876b5e..e527d31b61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json @@ -48,6 +48,7 @@ "54:memento", "60:leafstorm", "tm:calmmind", + "tm:curse", "tm:endure", "tm:energyball", "tm:foulplay", @@ -60,9 +61,11 @@ "tm:magicalleaf", "tm:nastyplot", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", "tm:poltergeist", "tm:protect", + "tm:psychup", "tm:reflect", "tm:rest", "tm:scald", @@ -144,6 +147,7 @@ "54:memento", "60:leafstorm", "tm:calmmind", + "tm:curse", "tm:endure", "tm:energyball", "tm:foulplay", @@ -156,9 +160,11 @@ "tm:magicalleaf", "tm:nastyplot", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", "tm:poltergeist", "tm:protect", + "tm:psychup", "tm:reflect", "tm:rest", "tm:scald", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json b/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json index 20c064a8dc..0a300448b2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json @@ -87,11 +87,15 @@ "tm:bulkup", "tm:chillingwater", "tm:closecombat", + "tm:coaching", "tm:disarmingvoice", "tm:encore", + "tm:endeavor", "tm:endure", "tm:facade", + "tm:featherdance", "tm:fling", + "tm:flipturn", "tm:gigaimpact", "tm:helpinghand", "tm:hurricane", @@ -100,11 +104,13 @@ "tm:hyperbeam", "tm:icespinner", "tm:icywind", + "tm:knockoff", "tm:liquidation", "tm:lowkick", "tm:lowsweep", "tm:mistyterrain", "tm:protect", + "tm:psychup", "tm:raindance", "tm:rest", "tm:reversal", @@ -116,9 +122,12 @@ "tm:takedown", "tm:taunt", "tm:terablast", + "tm:tripleaxel", + "tm:upperhand", "tm:uturn", "tm:waterpledge", - "tm:waterpulse" + "tm:waterpulse", + "tm:whirlpool" ], "labels": [ "gen9" @@ -138,4 +147,4 @@ "pokedex": [ "cobblemon.species.quaquaval.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json b/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json index 63c35d8efe..bd59df4186 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json @@ -95,13 +95,17 @@ "tm:lowkick", "tm:mistyterrain", "tm:protect", + "tm:psychup", "tm:raindance", "tm:rest", + "tm:sleeptalk", + "tm:substitute", "tm:surf", "tm:swift", "tm:takedown", "tm:terablast", - "tm:waterpledge" + "tm:waterpledge", + "tm:whirlpool" ], "labels": [ "gen9" @@ -134,4 +138,4 @@ "pokedex": [ "cobblemon.species.quaxly.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json b/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json index bba50d4cf2..87ee2a2898 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json @@ -87,6 +87,8 @@ "tm:encore", "tm:endure", "tm:facade", + "tm:featherdance", + "tm:flipturn", "tm:helpinghand", "tm:hydropump", "tm:liquidation", @@ -94,14 +96,19 @@ "tm:lowsweep", "tm:mistyterrain", "tm:protect", + "tm:psychup", "tm:raindance", "tm:rest", + "tm:sleeptalk", + "tm:substitute", "tm:surf", "tm:swift", "tm:takedown", "tm:terablast", + "tm:tripleaxel", "tm:waterpledge", - "tm:waterpulse" + "tm:waterpulse", + "tm:whirlpool" ], "labels": [ "gen9" @@ -137,4 +144,4 @@ "pokedex": [ "cobblemon.species.quaxwell.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json b/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json index 4efa020f3d..25395dd386 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json @@ -52,6 +52,7 @@ "40:speedswap", "45:bugbuzz", "50:psychic", + "tm:bugbite", "tm:bugbuzz", "tm:calmmind", "tm:confuseray", @@ -61,23 +62,30 @@ "tm:electroball", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:facade", "tm:fling", + "tm:futuresight", "tm:gigaimpact", + "tm:gravity", "tm:gunkshot", "tm:hyperbeam", "tm:imprison", "tm:irondefense", "tm:leechlife", "tm:lightscreen", + "tm:lunge", "tm:mudshot", "tm:mudslap", + "tm:poltergeist", "tm:pounce", "tm:powergem", "tm:protect", "tm:psybeam", "tm:psychic", + "tm:psychicnoise", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:raindance", "tm:reflect", @@ -86,6 +94,7 @@ "tm:sandstorm", "tm:shadowball", "tm:skillswap", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:storedpower", @@ -97,6 +106,7 @@ "tm:thief", "tm:trick", "tm:trickroom", + "tm:weatherball", "tm:xscissor", "tm:zenheadbutt" ], @@ -120,4 +130,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json b/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json new file mode 100644 index 0000000000..08effefa15 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json @@ -0,0 +1,108 @@ +{ + "name": "Raging Bolt", + "nationalPokedexNumber": 1021, + "primaryType": "electric", + "secondaryType": "dragon", + "abilities": [ + "protosynthesis" + ], + "baseStats": { + "hp": 125, + "attack": 73, + "defence": 91, + "special_attack": 137, + "special_defence": 89, + "speed": 75 + }, + "catchRate": 10, + "maleRatio": -1, + "baseExperienceYield": 0, + "baseFriendship": 0, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, + "experienceGroup": "slow", + "eggCycles": 50, + "eggGroups": [ + "undiscovered" + ], + "moves": [ + "1:ancientpower", + "1:shockwave", + "1:stomp", + "1:sunnyday", + "1:twister", + "7:charge", + "14:dragonbreath", + "21:electricterrain", + "28:discharge", + "35:dragontail", + "42:calmmind", + "49:thunderclap", + "56:dragonhammer", + "63:risingvoltage", + "70:dragonpulse", + "77:zapcannon", + "84:bodypress", + "91:thunder", + "tm:bodypress", + "tm:bodyslam", + "tm:breakingswipe", + "tm:calmmind", + "tm:charge", + "tm:chargebeam", + "tm:crunch", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragoncheer", + "tm:dragonpulse", + "tm:dragontail", + "tm:earthquake", + "tm:eerieimpulse", + "tm:electricterrain", + "tm:electroball", + "tm:electroweb", + "tm:endure", + "tm:facade", + "tm:gigaimpact", + "tm:heavyslam", + "tm:hyperbeam", + "tm:hypervoice", + "tm:outrage", + "tm:protect", + "tm:rest", + "tm:roar", + "tm:scaryface", + "tm:sleeptalk", + "tm:snarl", + "tm:solarbeam", + "tm:stompingtantrum", + "tm:substitute", + "tm:sunnyday", + "tm:supercellslam", + "tm:takedown", + "tm:taunt", + "tm:terablast", + "tm:thunder", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:voltswitch", + "tm:weatherball", + "tm:wildcharge" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], + "height": 52, + "weight": 4800, + "evolutions": [], + "cannotDynamax": false +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/rellor.json b/common/src/main/resources/data/cobblemon/species/generation9/rellor.json index 10e49bfdb0..dc1a2a2a4f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/rellor.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/rellor.json @@ -46,6 +46,7 @@ "egg:memento", "egg:recover", "egg:weatherball", + "tm:bugbite", "tm:bugbuzz", "tm:dig", "tm:endure", @@ -54,12 +55,14 @@ "tm:gunkshot", "tm:irondefense", "tm:leechlife", + "tm:lunge", "tm:mudshot", "tm:mudslap", "tm:pounce", "tm:protect", "tm:rest", "tm:rocktomb", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:strugglebug", @@ -67,6 +70,7 @@ "tm:takedown", "tm:terablast", "tm:thief", + "tm:weatherball", "tm:xscissor" ], "labels": [ @@ -104,4 +108,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json b/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json index e7f91d7004..3b6b0c888a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json @@ -79,15 +79,24 @@ "tm:acidspray", "tm:bodyslam", "tm:bulldoze", + "tm:curse", + "tm:doubleedge", + "tm:endeavor", "tm:endure", "tm:facade", "tm:flashcannon", "tm:gigaimpact", "tm:gunkshot", + "tm:gyroball", + "tm:hardpress", + "tm:haze", "tm:heavyslam", + "tm:highhorsepower", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", + "tm:lashout", + "tm:metalsound", "tm:overheat", "tm:poisonjab", "tm:protect", @@ -97,14 +106,18 @@ "tm:scaryface", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", "tm:steelbeam", "tm:substitute", "tm:sunnyday", "tm:takedown", "tm:taunt", + "tm:temperflare", "tm:terablast", "tm:thief", + "tm:toxic", "tm:toxicspikes", + "tm:uproar", "tm:venoshock", "tm:zenheadbutt" ], @@ -120,4 +133,4 @@ "pokedex": [ "cobblemon.species.revavroom.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json b/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json index a9f5946e05..889aa8ff42 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json @@ -58,11 +58,14 @@ "tm:airslash", "tm:bodypress", "tm:bodyslam", + "tm:breakingswipe", "tm:brickbreak", "tm:crunch", "tm:darkpulse", "tm:dig", + "tm:doubleedge", "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", @@ -82,11 +85,15 @@ "tm:hyperbeam", "tm:hypervoice", "tm:ironhead", + "tm:knockoff", + "tm:lashout", "tm:metalclaw", "tm:outrage", "tm:protect", "tm:rest", + "tm:roar", "tm:rockslide", + "tm:scaleshot", "tm:scaryface", "tm:shadowclaw", "tm:sleeptalk", @@ -99,14 +106,11 @@ "tm:takedown", "tm:taunt", "tm:terablast", + "tm:throatchop", "tm:thunderfang", "tm:uturn", "tm:xscissor", - "tm:zenheadbutt", - "tutor:dragonclaw", - "tutor:flamethrower", - "tutor:nightslash", - "tutor:zenheadbutt" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -120,4 +124,4 @@ "pokedex": [ "cobblemon.species.roaringmoon.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json b/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json index b4af0447e1..a324938411 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json @@ -53,32 +53,40 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", + "tm:charge", "tm:chargebeam", "tm:earthpower", "tm:earthquake", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", "tm:endure", "tm:facade", "tm:flashcannon", "tm:gigaimpact", + "tm:gravity", "tm:heavyslam", + "tm:highhorsepower", "tm:hyperbeam", "tm:irondefense", "tm:lightscreen", + "tm:metalsound", "tm:mudshot", "tm:powergem", "tm:protect", "tm:reflect", "tm:rest", "tm:sandstorm", + "tm:sandtomb", + "tm:scorchingsands", "tm:sleeptalk", "tm:spikes", "tm:stealthrock", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", + "tm:supercellslam", "tm:swift", "tm:takedown", "tm:terablast", @@ -86,11 +94,7 @@ "tm:thunderbolt", "tm:thunderwave", "tm:voltswitch", - "tm:wildcharge", - "tutor:heavyslam", - "tutor:metalsound", - "tutor:screech", - "tutor:triattack" + "tm:wildcharge" ], "labels": [ "gen9", @@ -104,4 +108,4 @@ "pokedex": [ "cobblemon.species.sandyshocks.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json b/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json index 66c6cd6c64..db1d859306 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json @@ -52,7 +52,9 @@ "48:overheat", "48:solarbeam", "tm:bulletseed", + "tm:burningjealousy", "tm:crunch", + "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", @@ -62,9 +64,11 @@ "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", "tm:hyperbeam", + "tm:lashout", "tm:leafstorm", "tm:magicalleaf", "tm:overheat", @@ -78,7 +82,9 @@ "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:takedown", + "tm:temperflare", "tm:terablast", "tm:thief", "tm:trailblaze", @@ -110,4 +116,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json b/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json index 49977b6e5f..a2395a86be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json @@ -58,9 +58,11 @@ "tm:crunch", "tm:dazzlinggleam", "tm:dig", + "tm:doubleedge", "tm:drainpunch", "tm:encore", "tm:endure", + "tm:expandingforce", "tm:facade", "tm:faketears", "tm:fireblast", @@ -71,6 +73,7 @@ "tm:focusblast", "tm:gigaimpact", "tm:grassknot", + "tm:gyroball", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", @@ -80,17 +83,21 @@ "tm:imprison", "tm:lightscreen", "tm:metronome", + "tm:mistyexplosion", "tm:mistyterrain", "tm:playrough", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicfangs", + "tm:psychicnoise", "tm:psychicterrain", + "tm:psychup", "tm:psyshock", "tm:raindance", "tm:reflect", "tm:rest", + "tm:roar", "tm:rocktomb", "tm:sandstorm", "tm:scaryface", @@ -110,12 +117,9 @@ "tm:thunderwave", "tm:trick", "tm:trickroom", + "tm:uproar", "tm:waterpulse", - "tm:zenheadbutt", - "tutor:bodyslam", - "tutor:hypervoice", - "tutor:playrough", - "tutor:rest" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -129,4 +133,4 @@ "pokedex": [ "cobblemon.species.screamtail.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json b/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json index 4c71968f01..ee0362b86d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json @@ -77,13 +77,16 @@ "tm:acrobatics", "tm:batonpass", "tm:dig", + "tm:doubleedge", "tm:encore", + "tm:endeavor", "tm:endure", "tm:facade", "tm:fling", "tm:foulplay", "tm:gunkshot", "tm:helpinghand", + "tm:knockoff", "tm:metronome", "tm:mudshot", "tm:mudslap", @@ -91,17 +94,23 @@ "tm:poisonjab", "tm:pounce", "tm:protect", + "tm:psychup", "tm:raindance", "tm:rest", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", + "tm:toxic", "tm:trailblaze", "tm:uturn", "tm:venoshock" @@ -139,4 +148,4 @@ "pokedex": [ "cobblemon.species.shroodle.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json b/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json index ba425e8490..27ba625a0f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json @@ -48,6 +48,7 @@ "54:memento", "60:leafstorm", "tm:calmmind", + "tm:curse", "tm:endure", "tm:energyball", "tm:foulplay", @@ -61,9 +62,11 @@ "tm:magicalleaf", "tm:nastyplot", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", "tm:poltergeist", "tm:protect", + "tm:psychup", "tm:reflect", "tm:rest", "tm:scald", @@ -134,6 +137,7 @@ "54:memento", "60:leafstorm", "tm:calmmind", + "tm:curse", "tm:endure", "tm:energyball", "tm:foulplay", @@ -147,9 +151,11 @@ "tm:magicalleaf", "tm:nastyplot", "tm:nightshade", + "tm:painsplit", "tm:phantomforce", "tm:poltergeist", "tm:protect", + "tm:psychup", "tm:reflect", "tm:rest", "tm:scald", @@ -184,4 +190,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json b/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json index 371d1215e7..0fb4dcdb01 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json @@ -56,6 +56,7 @@ "1:sing", "1:tackle", "1:torchsong", + "1:yawn", "7:lick", "10:round", "12:scaryface", @@ -70,9 +71,11 @@ "47:willowisp", "58:fireblast", "64:overheat", + "tm:alluringvoice", "tm:blastburn", "tm:bodyslam", "tm:crunch", + "tm:curse", "tm:dig", "tm:disarmingvoice", "tm:earthpower", @@ -88,6 +91,7 @@ "tm:flamethrower", "tm:flareblitz", "tm:gigaimpact", + "tm:heatcrash", "tm:heatwave", "tm:helpinghand", "tm:hex", @@ -98,9 +102,12 @@ "tm:nightshade", "tm:outrage", "tm:overheat", + "tm:poltergeist", "tm:protect", "tm:rest", + "tm:roar", "tm:scaryface", + "tm:scorchingsands", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", @@ -111,6 +118,7 @@ "tm:substitute", "tm:sunnyday", "tm:takedown", + "tm:temperflare", "tm:terablast", "tm:thunderfang", "tm:willowisp", @@ -134,4 +142,4 @@ "pokedex": [ "cobblemon.species.skeledirge.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json b/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json index 81f426816c..39e97f3ed7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json @@ -55,9 +55,13 @@ "tm:bodypress", "tm:bodyslam", "tm:brickbreak", + "tm:bugbite", "tm:bugbuzz", "tm:bulkup", "tm:closecombat", + "tm:curse", + "tm:doubleedge", + "tm:dualwingbeat", "tm:earthquake", "tm:endure", "tm:facade", @@ -65,33 +69,34 @@ "tm:flareblitz", "tm:gigadrain", "tm:gigaimpact", + "tm:heatcrash", "tm:heatwave", "tm:heavyslam", + "tm:highhorsepower", "tm:hurricane", "tm:hyperbeam", "tm:leechlife", "tm:lowkick", "tm:lowsweep", + "tm:lunge", "tm:protect", "tm:raindance", "tm:rest", "tm:reversal", "tm:sandstorm", + "tm:skittersmack", "tm:sleeptalk", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", "tm:takedown", + "tm:temperflare", "tm:terablast", "tm:trailblaze", "tm:uturn", "tm:wildcharge", "tm:willowisp", - "tm:zenheadbutt", - "tutor:lowsweep", - "tutor:lunge", - "tutor:morningsun", - "tutor:superpower" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -105,4 +110,4 @@ "pokedex": [ "cobblemon.species.slitherwing.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json b/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json index 7011760b7f..8436430693 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json @@ -67,11 +67,13 @@ "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", + "tm:solarblade", "tm:substitute", "tm:sunnyday", "tm:swift", "tm:terablast", - "tm:trailblaze" + "tm:trailblaze", + "tm:weatherball" ], "labels": [ "gen9" @@ -111,4 +113,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/spidops.json b/common/src/main/resources/data/cobblemon/species/generation9/spidops.json index e4eadf6f35..763e7f71e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/spidops.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/spidops.json @@ -50,8 +50,10 @@ "tm:aerialace", "tm:bodyslam", "tm:brickbreak", + "tm:bugbite", "tm:bugbuzz", "tm:bulletseed", + "tm:electroweb", "tm:endure", "tm:facade", "tm:falseswipe", @@ -59,8 +61,11 @@ "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:knockoff", "tm:leechlife", "tm:lowkick", + "tm:lunge", + "tm:painsplit", "tm:poisonjab", "tm:pounce", "tm:protect", @@ -70,6 +75,7 @@ "tm:rocktomb", "tm:scaryface", "tm:shadowclaw", + "tm:skittersmack", "tm:sleeptalk", "tm:spikes", "tm:strugglebug", @@ -79,8 +85,10 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:toxicspikes", "tm:trailblaze", + "tm:upperhand", "tm:uturn", "tm:xscissor" ], @@ -109,4 +117,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json b/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json index 94ad84ee77..4021299a27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json @@ -86,12 +86,14 @@ "tm:gigadrain", "tm:grassknot", "tm:grasspledge", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", "tm:leafstorm", "tm:magicalleaf", "tm:mudslap", "tm:nastyplot", + "tm:petalblizzard", "tm:playrough", "tm:protect", "tm:rest", @@ -138,4 +140,4 @@ "pokedex": [ "cobblemon.species.sprigatito.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json b/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json index 3982ba4b1f..4ec80e685b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json @@ -83,9 +83,13 @@ "tm:aircutter", "tm:airslash", "tm:bravebird", + "tm:doubleedge", + "tm:dualwingbeat", + "tm:endeavor", "tm:endure", "tm:facade", "tm:faketears", + "tm:featherdance", "tm:fly", "tm:foulplay", "tm:gigaimpact", @@ -94,6 +98,7 @@ "tm:hurricane", "tm:hyperbeam", "tm:hypervoice", + "tm:lashout", "tm:pounce", "tm:protect", "tm:rest", @@ -107,6 +112,7 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:uproar", "tm:uturn" ], "labels": [ @@ -157,7 +163,6 @@ "eggGroups": [ "flying" ], - "moves": [], "labels": [ "gen9" ], @@ -202,7 +207,6 @@ "eggGroups": [ "flying" ], - "moves": [], "labels": [ "gen9" ], @@ -247,7 +251,6 @@ "eggGroups": [ "flying" ], - "moves": [], "labels": [ "gen9" ], @@ -263,4 +266,4 @@ "pokedex": [ "cobblemon.species.squawkabilly.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json b/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json index 23aadcdfb0..99b23f330b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json @@ -50,15 +50,18 @@ "egg:paraboliccharge", "egg:soak", "tm:acidspray", + "tm:charge", "tm:chargebeam", "tm:chillingwater", "tm:confuseray", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", "tm:endure", "tm:hypervoice", "tm:lightscreen", + "tm:muddywater", "tm:mudshot", "tm:mudslap", "tm:protect", @@ -74,6 +77,7 @@ "tm:thunderwave", "tm:voltswitch", "tm:waterpulse", + "tm:weatherball", "tm:wildcharge" ], "labels": [ @@ -110,4 +114,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json b/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json index 40c817f5ce..51f305ce53 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json @@ -75,6 +75,7 @@ "tm:charm", "tm:crunch", "tm:dig", + "tm:doubleedge", "tm:encore", "tm:endure", "tm:facade", @@ -95,6 +96,7 @@ "tm:sleeptalk", "tm:substitute", "tm:sunnyday", + "tm:superfang", "tm:swift", "tm:takedown", "tm:taunt", @@ -135,4 +137,4 @@ "pokedex": [ "cobblemon.species.tandemaus.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json b/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json index 23f9f9c756..44de986138 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json @@ -51,6 +51,7 @@ "egg:memento", "egg:suckerpunch", "tm:bodyslam", + "tm:bugbite", "tm:bugbuzz", "tm:bulletseed", "tm:endure", @@ -58,13 +59,16 @@ "tm:falseswipe", "tm:gigadrain", "tm:grassknot", + "tm:knockoff", "tm:leechlife", + "tm:lunge", "tm:poisonjab", "tm:pounce", "tm:protect", "tm:raindance", "tm:rest", "tm:shadowclaw", + "tm:skittersmack", "tm:sleeptalk", "tm:spikes", "tm:strugglebug", @@ -73,6 +77,7 @@ "tm:takedown", "tm:terablast", "tm:thief", + "tm:throatchop", "tm:toxicspikes", "tm:trailblaze", "tm:xscissor" @@ -117,4 +122,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json index 0a9c462d63..9c929a431e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json @@ -79,6 +79,7 @@ "tm:batonpass", "tm:chillingwater", "tm:dracometeor", + "tm:dragoncheer", "tm:dragondance", "tm:dragonpulse", "tm:endure", @@ -88,6 +89,8 @@ "tm:hydropump", "tm:hyperbeam", "tm:icywind", + "tm:lunge", + "tm:muddywater", "tm:nastyplot", "tm:outrage", "tm:protect", @@ -100,10 +103,7 @@ "tm:taunt", "tm:terablast", "tm:waterpulse", - "tutor:dragonpulse", - "tutor:icywind", - "tutor:muddywater", - "tutor:taunt" + "tm:whirlpool" ], "labels": [ "gen9" @@ -122,4 +122,4 @@ "pokedex": [ "cobblemon.species.tatsugiri.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json b/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json new file mode 100644 index 0000000000..60434b0912 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json @@ -0,0 +1,198 @@ +{ + "name": "Terapagos", + "nationalPokedexNumber": 1024, + "primaryType": "normal", + "abilities": [ + "terashift" + ], + "baseStats": { + "hp": 90, + "attack": 65, + "defence": 85, + "special_attack": 65, + "special_defence": 85, + "speed": 60 + }, + "catchRate": 255, + "maleRatio": 0.5, + "baseExperienceYield": 0, + "baseFriendship": 50, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 1, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "experienceGroup": "slow", + "eggCycles": 5, + "eggGroups": [ + "undiscovered" + ], + "moves": [ + "1:rapidspin", + "1:triattack", + "1:withdraw", + "10:ancientpower", + "20:headbutt", + "30:protect", + "40:earthpower", + "50:heavyslam", + "60:terastarstorm", + "70:doubleedge", + "80:rockpolish", + "90:gyroball", + "tm:aurasphere", + "tm:bodypress", + "tm:bodyslam", + "tm:bugbuzz", + "tm:calmmind", + "tm:crunch", + "tm:darkpulse", + "tm:dazzlinggleam", + "tm:doubleedge", + "tm:dragonpulse", + "tm:earthpower", + "tm:earthquake", + "tm:endure", + "tm:energyball", + "tm:facade", + "tm:flamethrower", + "tm:flareblitz", + "tm:flashcannon", + "tm:gigaimpact", + "tm:gravity", + "tm:gyroball", + "tm:heatcrash", + "tm:heavyslam", + "tm:hyperbeam", + "tm:icebeam", + "tm:icespinner", + "tm:ironhead", + "tm:meteorbeam", + "tm:powergem", + "tm:protect", + "tm:raindance", + "tm:rest", + "tm:roar", + "tm:rockslide", + "tm:scorchingsands", + "tm:sleeptalk", + "tm:solarbeam", + "tm:stealthrock", + "tm:stoneedge", + "tm:storedpower", + "tm:substitute", + "tm:sunnyday", + "tm:supercellslam", + "tm:surf", + "tm:takedown", + "tm:thunder", + "tm:thunderbolt", + "tm:toxic", + "tm:waterpulse", + "tm:weatherball", + "tm:wildcharge", + "tm:zenheadbutt" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [], + "height": 2, + "weight": 65, + "evolutions": [], + "cannotDynamax": false, + "forms": [ + { + "name": "Terastal", + "primaryType": "normal", + "abilities": [ + "terashell" + ], + "baseStats": { + "hp": 95, + "attack": 95, + "defence": 110, + "special_attack": 105, + "special_defence": 110, + "speed": 85 + }, + "catchRate": 255, + "maleRatio": 0.5, + "baseExperienceYield": 0, + "baseFriendship": 50, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 2, + "speed": 0 + }, + "experienceGroup": "slow", + "eggCycles": 5, + "eggGroups": [ + "undiscovered" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [ + "terastal" + ], + "height": 3, + "weight": 160, + "evolutions": [], + "cannotDynamax": false, + "battleOnly": true + }, + { + "name": "Stellar", + "primaryType": "normal", + "abilities": [ + "teraformzero" + ], + "baseStats": { + "hp": 160, + "attack": 105, + "defence": 110, + "special_attack": 130, + "special_defence": 110, + "speed": 85 + }, + "catchRate": 255, + "maleRatio": 0.5, + "baseExperienceYield": 0, + "baseFriendship": 50, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "experienceGroup": "slow", + "eggCycles": 5, + "eggGroups": [ + "undiscovered" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [ + "stellar" + ], + "height": 17, + "weight": 770, + "evolutions": [], + "cannotDynamax": false, + "battleOnly": true + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json b/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json index 24d6ec80e3..3a828c98c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json @@ -55,6 +55,7 @@ "tm:bulldoze", "tm:darkpulse", "tm:dig", + "tm:doubleedge", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -63,6 +64,7 @@ "tm:heavyslam", "tm:hex", "tm:hyperbeam", + "tm:lashout", "tm:mudshot", "tm:mudslap", "tm:protect", @@ -70,10 +72,12 @@ "tm:rockslide", "tm:rocktomb", "tm:sandstorm", + "tm:sandtomb", "tm:scaryface", "tm:sleeptalk", "tm:snarl", "tm:spikes", + "tm:spite", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -82,11 +86,8 @@ "tm:takedown", "tm:taunt", "tm:terablast", - "tm:zenheadbutt", - "tutor:rockslide", - "tutor:ruination", - "tutor:stompingtantrum", - "tutor:throatchop" + "tm:throatchop", + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -100,4 +101,4 @@ "pokedex": [ "cobblemon.species.tinglu.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json index acbd9e9cca..f40d13a28c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json @@ -77,6 +77,7 @@ "egg:quash", "tm:drainingkiss", "tm:encore", + "tm:endeavor", "tm:endure", "tm:facade", "tm:faketears", @@ -84,8 +85,10 @@ "tm:fling", "tm:foulplay", "tm:helpinghand", + "tm:knockoff", "tm:lightscreen", "tm:metalclaw", + "tm:metalsound", "tm:metronome", "tm:playrough", "tm:pounce", @@ -95,6 +98,7 @@ "tm:rockslide", "tm:rocktomb", "tm:skillswap", + "tm:skittersmack", "tm:sleeptalk", "tm:stealthrock", "tm:steelbeam", @@ -136,4 +140,4 @@ "pokedex": [ "cobblemon.species.tinkatink.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json index 32c56314a7..e68cd85d7b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json @@ -77,16 +77,20 @@ "tm:bulldoze", "tm:drainingkiss", "tm:encore", + "tm:endeavor", "tm:endure", "tm:facade", "tm:faketears", "tm:flashcannon", "tm:fling", "tm:foulplay", + "tm:hardpress", "tm:heavyslam", "tm:helpinghand", + "tm:knockoff", "tm:lightscreen", "tm:metalclaw", + "tm:metalsound", "tm:metronome", "tm:playrough", "tm:pounce", @@ -96,7 +100,9 @@ "tm:rockslide", "tm:rocktomb", "tm:skillswap", + "tm:skittersmack", "tm:sleeptalk", + "tm:smackdown", "tm:stealthrock", "tm:steelbeam", "tm:stoneedge", @@ -124,4 +130,4 @@ "pokedex": [ "cobblemon.species.tinkaton.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json index 1000bdb9f9..0a8338a48c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json @@ -75,6 +75,7 @@ "tm:brickbreak", "tm:drainingkiss", "tm:encore", + "tm:endeavor", "tm:endure", "tm:facade", "tm:faketears", @@ -82,8 +83,10 @@ "tm:fling", "tm:foulplay", "tm:helpinghand", + "tm:knockoff", "tm:lightscreen", "tm:metalclaw", + "tm:metalsound", "tm:metronome", "tm:playrough", "tm:pounce", @@ -93,6 +96,7 @@ "tm:rockslide", "tm:rocktomb", "tm:skillswap", + "tm:skittersmack", "tm:sleeptalk", "tm:stealthrock", "tm:steelbeam", @@ -137,4 +141,4 @@ "pokedex": [ "cobblemon.species.tinkatuff.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json b/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json index 5c163ce106..4c642f77c0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json @@ -68,13 +68,17 @@ "tm:foulplay", "tm:gigadrain", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:hex", + "tm:knockoff", "tm:leafstorm", "tm:lightscreen", + "tm:lunge", "tm:magicalleaf", "tm:mudshot", "tm:mudslap", + "tm:painsplit", "tm:protect", "tm:raindance", "tm:reflect", @@ -89,6 +93,7 @@ "tm:swift", "tm:taunt", "tm:terablast", + "tm:toxic", "tm:toxicspikes", "tm:trailblaze", "tm:trickroom", @@ -132,4 +137,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json b/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json index 479bc170a7..1cde654593 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json @@ -62,20 +62,25 @@ "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:hex", "tm:hyperbeam", + "tm:knockoff", "tm:leafstorm", "tm:lightscreen", + "tm:lunge", "tm:magicalleaf", "tm:mudshot", "tm:mudslap", + "tm:painsplit", "tm:protect", "tm:raindance", "tm:reflect", "tm:rest", "tm:scaryface", "tm:seedbomb", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", @@ -84,6 +89,7 @@ "tm:swift", "tm:taunt", "tm:terablast", + "tm:toxic", "tm:toxicspikes", "tm:trailblaze", "tm:trickroom", @@ -114,4 +120,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/varoom.json b/common/src/main/resources/data/cobblemon/species/generation9/varoom.json index 19a68ee815..4a3304979a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/varoom.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/varoom.json @@ -82,19 +82,26 @@ "tm:acidspray", "tm:bodyslam", "tm:bulldoze", + "tm:curse", + "tm:doubleedge", "tm:endure", "tm:facade", "tm:flashcannon", "tm:gunkshot", + "tm:gyroball", + "tm:haze", "tm:irondefense", "tm:ironhead", + "tm:metalsound", "tm:poisonjab", "tm:protect", "tm:raindance", + "tm:rest", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", "tm:sludgebomb", + "tm:sludgewave", "tm:steelbeam", "tm:substitute", "tm:sunnyday", @@ -102,7 +109,9 @@ "tm:taunt", "tm:terablast", "tm:thief", + "tm:toxic", "tm:toxicspikes", + "tm:uproar", "tm:venoshock", "tm:zenheadbutt" ], @@ -139,4 +148,4 @@ "pokedex": [ "cobblemon.species.varoom.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/veluza.json b/common/src/main/resources/data/cobblemon/species/generation9/veluza.json index 9fe665671c..26603790e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/veluza.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/veluza.json @@ -53,8 +53,12 @@ "tm:bodyslam", "tm:chillingwater", "tm:crunch", + "tm:doubleedge", "tm:drillrun", + "tm:endeavor", "tm:endure", + "tm:expandingforce", + "tm:flipturn", "tm:gigaimpact", "tm:hydropump", "tm:hyperbeam", @@ -62,12 +66,14 @@ "tm:icefang", "tm:icywind", "tm:liquidation", + "tm:painsplit", "tm:protect", "tm:psychic", "tm:psychicfangs", "tm:psychicterrain", "tm:raindance", "tm:rest", + "tm:scaleshot", "tm:sleeptalk", "tm:snowscape", "tm:storedpower", @@ -103,4 +109,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/walkingwake.json b/common/src/main/resources/data/cobblemon/species/generation9/walkingwake.json index 84942516b5..7a544948c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/walkingwake.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/walkingwake.json @@ -66,9 +66,12 @@ "84:hydropump", "tm:agility", "tm:bodyslam", + "tm:breakingswipe", "tm:chillingwater", "tm:crunch", + "tm:doubleedge", "tm:dracometeor", + "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", @@ -77,10 +80,12 @@ "tm:facade", "tm:firefang", "tm:flamethrower", + "tm:flipturn", "tm:gigaimpact", "tm:hurricane", "tm:hydropump", "tm:hyperbeam", + "tm:knockoff", "tm:liquidation", "tm:lowkick", "tm:mudshot", @@ -88,6 +93,8 @@ "tm:protect", "tm:raindance", "tm:rest", + "tm:roar", + "tm:scald", "tm:scaryface", "tm:sleeptalk", "tm:snarl", @@ -99,10 +106,8 @@ "tm:terablast", "tm:waterfall", "tm:waterpulse", - "tutor:dragonpulse", - "tutor:flamethrower", - "tutor:hydrosteam", - "tutor:nobleroar" + "tm:weatherball", + "tm:whirlpool" ], "labels": [ "gen9", @@ -119,4 +124,4 @@ "fixed": false }, "cannotDynamax": false -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/wattrel.json b/common/src/main/resources/data/cobblemon/species/generation9/wattrel.json index bcd711c180..d68d74cdb0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/wattrel.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/wattrel.json @@ -59,12 +59,17 @@ "tm:aircutter", "tm:airslash", "tm:bravebird", + "tm:charge", "tm:chargebeam", + "tm:dualwingbeat", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", + "tm:electroweb", + "tm:endeavor", "tm:endure", "tm:facade", + "tm:featherdance", "tm:fly", "tm:hurricane", "tm:protect", @@ -78,8 +83,10 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", + "tm:uproar", "tm:uturn", "tm:voltswitch", + "tm:weatherball", "tm:wildcharge" ], "labels": [ @@ -125,4 +132,4 @@ } ] } -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json b/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json index 7d890f742d..18c39dd627 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json @@ -60,6 +60,7 @@ "tm:hydropump", "tm:icebeam", "tm:liquidation", + "tm:muddywater", "tm:mudshot", "tm:mudslap", "tm:protect", @@ -73,7 +74,9 @@ "tm:swift", "tm:takedown", "tm:terablast", - "tm:waterpulse" + "tm:throatchop", + "tm:waterpulse", + "tm:whirlpool" ], "labels": [ "gen9" @@ -100,4 +103,4 @@ "pokedex": [ "cobblemon.species.wiglett.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/wochien.json b/common/src/main/resources/data/cobblemon/species/generation9/wochien.json index 1efcf63137..b6fdef4e5a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/wochien.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/wochien.json @@ -65,6 +65,8 @@ "tm:grassyterrain", "tm:hex", "tm:hyperbeam", + "tm:knockoff", + "tm:lashout", "tm:leafstorm", "tm:lightscreen", "tm:magicalleaf", @@ -80,17 +82,15 @@ "tm:sleeptalk", "tm:snarl", "tm:solarbeam", + "tm:solarblade", + "tm:spite", "tm:substitute", "tm:sunnyday", "tm:takedown", "tm:taunt", "tm:terablast", "tm:trailblaze", - "tm:zenheadbutt", - "tutor:foulplay", - "tutor:gigadrain", - "tutor:powerwhip", - "tutor:ruination" + "tm:zenheadbutt" ], "labels": [ "gen9", @@ -104,4 +104,4 @@ "pokedex": [ "cobblemon.species.wochien.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species/generation9/wugtrio.json b/common/src/main/resources/data/cobblemon/species/generation9/wugtrio.json index 07c46ae883..ab41d2bdc9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/wugtrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/wugtrio.json @@ -61,8 +61,10 @@ "tm:hyperbeam", "tm:icebeam", "tm:liquidation", + "tm:muddywater", "tm:mudshot", "tm:mudslap", + "tm:painsplit", "tm:protect", "tm:raindance", "tm:rest", @@ -74,7 +76,9 @@ "tm:swift", "tm:takedown", "tm:terablast", - "tm:waterpulse" + "tm:throatchop", + "tm:waterpulse", + "tm:whirlpool" ], "labels": [ "gen9" @@ -88,4 +92,4 @@ "pokedex": [ "cobblemon.species.wugtrio.desc" ] -} \ No newline at end of file +} diff --git a/common/src/main/resources/data/cobblemon/species_feature_assignments/color.json b/common/src/main/resources/data/cobblemon/species_feature_assignments/color.json index d9d9296cf1..aac0f95bf3 100644 --- a/common/src/main/resources/data/cobblemon/species_feature_assignments/color.json +++ b/common/src/main/resources/data/cobblemon/species_feature_assignments/color.json @@ -1,4 +1,4 @@ { - "pokemon": ["conkeldurr"], + "pokemon": ["conkeldurr", "wooloo", "dubwool", "smeargle"], "features": ["color"] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species_feature_assignments/roaming.json b/common/src/main/resources/data/cobblemon/species_feature_assignments/roaming.json index e1c1468117..ea4ee061e3 100644 --- a/common/src/main/resources/data/cobblemon/species_feature_assignments/roaming.json +++ b/common/src/main/resources/data/cobblemon/species_feature_assignments/roaming.json @@ -1,4 +1,4 @@ { - "pokemon": ["gimmighoul"], + "pokemon": ["gimmighoul", "gholdengo"], "features": ["roaming"] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species_features/color.json b/common/src/main/resources/data/cobblemon/species_features/color.json index 9e563854ac..98cf212c35 100644 --- a/common/src/main/resources/data/cobblemon/species_features/color.json +++ b/common/src/main/resources/data/cobblemon/species_features/color.json @@ -1,7 +1,7 @@ { "type": "choice", - "keys": ["color"], - "default": "false", + "keys": ["color", "colour"], + "default": "none", "choices": [ "white", "orange", @@ -21,5 +21,6 @@ "black" ], "isAspect": true, + "visible": true, "aspectFormat": "color-{{choice}}" } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar1.nbt b/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar1.nbt index 50252ca4ee..a679c0543a 100644 Binary files a/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar1.nbt and b/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar2.nbt b/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar2.nbt index b833118e0a..750526815e 100644 Binary files a/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar2.nbt and b/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar3.nbt b/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar3.nbt index 3ea7a0a7eb..6b79265a0f 100644 Binary files a/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar3.nbt and b/common/src/main/resources/data/cobblemon/structures/fossils/eroded_pillar3.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit1.nbt b/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit1.nbt index f271772a2d..0ab276d0ae 100644 Binary files a/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit1.nbt and b/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit1.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit2.nbt b/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit2.nbt index 90a1ad35ae..362f237c4a 100644 Binary files a/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit2.nbt and b/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit2.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit3.nbt b/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit3.nbt index 7b4af244de..39dbc8ab3c 100644 Binary files a/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit3.nbt and b/common/src/main/resources/data/cobblemon/structures/fossils/rooted_pit3.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structures/ruins/crumbling_arch.nbt b/common/src/main/resources/data/cobblemon/structures/ruins/crumbling_arch.nbt index 1324390392..b9d9e06177 100644 Binary files a/common/src/main/resources/data/cobblemon/structures/ruins/crumbling_arch.nbt and b/common/src/main/resources/data/cobblemon/structures/ruins/crumbling_arch.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structures/ruins/decorations/bell_junk.nbt b/common/src/main/resources/data/cobblemon/structures/ruins/decorations/bell_junk.nbt new file mode 100644 index 0000000000..50a9387deb Binary files /dev/null and b/common/src/main/resources/data/cobblemon/structures/ruins/decorations/bell_junk.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structures/ruins/decorations/campfire_junk.nbt b/common/src/main/resources/data/cobblemon/structures/ruins/decorations/campfire_junk.nbt new file mode 100644 index 0000000000..15bb8a3a5c Binary files /dev/null and b/common/src/main/resources/data/cobblemon/structures/ruins/decorations/campfire_junk.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structures/ruins/decorations/cauldron_junk.nbt b/common/src/main/resources/data/cobblemon/structures/ruins/decorations/cauldron_junk.nbt new file mode 100644 index 0000000000..e4c1058381 Binary files /dev/null and b/common/src/main/resources/data/cobblemon/structures/ruins/decorations/cauldron_junk.nbt differ diff --git a/common/src/main/resources/data/cobblemon/structures/ruins/decorations/crafting_junk.nbt b/common/src/main/resources/data/cobblemon/structures/ruins/decorations/crafting_junk.nbt new file mode 100644 index 0000000000..6feed6c211 Binary files /dev/null and b/common/src/main/resources/data/cobblemon/structures/ruins/decorations/crafting_junk.nbt differ diff --git a/common/src/main/resources/data/cobblemon/tags/blocks/berry_wild_soil.json b/common/src/main/resources/data/cobblemon/tags/blocks/berry_wild_soil.json index d9bf38fe77..76b24f3a90 100644 --- a/common/src/main/resources/data/cobblemon/tags/blocks/berry_wild_soil.json +++ b/common/src/main/resources/data/cobblemon/tags/blocks/berry_wild_soil.json @@ -2,6 +2,7 @@ "values": [ "#minecraft:dirt", "#minecraft:sand", + "#minecraft:terracotta", "#cobblemon:snow_block" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/blocks/black_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/tags/blocks/black_tumblestone_bricks.json new file mode 100644 index 0000000000..a0ae304d1a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/blocks/black_tumblestone_bricks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "cobblemon:black_tumblestone_bricks", + "cobblemon:chiseled_black_tumblestone_bricks" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/blocks/black_tumblestones.json b/common/src/main/resources/data/cobblemon/tags/blocks/black_tumblestones.json index 111564256d..bb5e0fe550 100644 --- a/common/src/main/resources/data/cobblemon/tags/blocks/black_tumblestones.json +++ b/common/src/main/resources/data/cobblemon/tags/blocks/black_tumblestones.json @@ -4,6 +4,16 @@ "cobblemon:medium_budding_black_tumblestone", "cobblemon:large_budding_black_tumblestone", "cobblemon:black_tumblestone_cluster", - "cobblemon:black_tumblestone_block" + "cobblemon:black_tumblestone_block", + "cobblemon:polished_black_tumblestone", + "cobblemon:polished_black_tumblestone_stairs", + "cobblemon:polished_black_tumblestone_slab", + "cobblemon:polished_black_tumblestone_wall", + "cobblemon:chiseled_polished_black_tumblestone", + "cobblemon:black_tumblestone_bricks", + "cobblemon:black_tumblestone_brick_stairs", + "cobblemon:black_tumblestone_brick_slab", + "cobblemon:black_tumblestone_brick_wall", + "cobblemon:chiseled_black_tumblestone_bricks" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/blocks/red_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/tags/blocks/red_tumblestone_bricks.json new file mode 100644 index 0000000000..50d6f03379 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/blocks/red_tumblestone_bricks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "cobblemon:tumblestone_bricks", + "cobblemon:chiseled_tumblestone_bricks" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/blocks/red_tumblestones.json b/common/src/main/resources/data/cobblemon/tags/blocks/red_tumblestones.json index 51b6b5a08c..79a02673f1 100644 --- a/common/src/main/resources/data/cobblemon/tags/blocks/red_tumblestones.json +++ b/common/src/main/resources/data/cobblemon/tags/blocks/red_tumblestones.json @@ -4,6 +4,16 @@ "cobblemon:medium_budding_tumblestone", "cobblemon:large_budding_tumblestone", "cobblemon:tumblestone_cluster", - "cobblemon:tumblestone_block" + "cobblemon:tumblestone_block", + "cobblemon:polished_tumblestone", + "cobblemon:polished_tumblestone_stairs", + "cobblemon:polished_tumblestone_slab", + "cobblemon:polished_tumblestone_wall", + "cobblemon:chiseled_polished_tumblestone", + "cobblemon:tumblestone_bricks", + "cobblemon:tumblestone_brick_stairs", + "cobblemon:tumblestone_brick_slab", + "cobblemon:tumblestone_brick_wall", + "cobblemon:chiseled_tumblestone_bricks" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/blocks/sky_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/tags/blocks/sky_tumblestone_bricks.json new file mode 100644 index 0000000000..4d400fe802 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/blocks/sky_tumblestone_bricks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "cobblemon:sky_tumblestone_bricks", + "cobblemon:chiseled_sky_tumblestone_bricks" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/blocks/sky_tumblestones.json b/common/src/main/resources/data/cobblemon/tags/blocks/sky_tumblestones.json index ae7b9a4415..3367f603ea 100644 --- a/common/src/main/resources/data/cobblemon/tags/blocks/sky_tumblestones.json +++ b/common/src/main/resources/data/cobblemon/tags/blocks/sky_tumblestones.json @@ -4,6 +4,16 @@ "cobblemon:medium_budding_sky_tumblestone", "cobblemon:large_budding_sky_tumblestone", "cobblemon:sky_tumblestone_cluster", - "cobblemon:sky_tumblestone_block" + "cobblemon:sky_tumblestone_block", + "cobblemon:polished_sky_tumblestone", + "cobblemon:polished_sky_tumblestone_stairs", + "cobblemon:polished_sky_tumblestone_slab", + "cobblemon:polished_sky_tumblestone_wall", + "cobblemon:chiseled_polished_sky_tumblestone", + "cobblemon:sky_tumblestone_bricks", + "cobblemon:sky_tumblestone_brick_stairs", + "cobblemon:sky_tumblestone_brick_slab", + "cobblemon:sky_tumblestone_brick_wall", + "cobblemon:chiseled_sky_tumblestone_bricks" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/blocks/tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/tags/blocks/tumblestone_bricks.json new file mode 100644 index 0000000000..f623f9fe94 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/blocks/tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#cobblemon:red_tumblestone_bricks", + "#cobblemon:black_tumblestone_bricks", + "#cobblemon:sky_tumblestone_bricks" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/items/black_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/tags/items/black_tumblestone_bricks.json new file mode 100644 index 0000000000..a0ae304d1a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/items/black_tumblestone_bricks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "cobblemon:black_tumblestone_bricks", + "cobblemon:chiseled_black_tumblestone_bricks" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/items/black_tumblestones.json b/common/src/main/resources/data/cobblemon/tags/items/black_tumblestones.json index 749a062922..1f2f818761 100644 --- a/common/src/main/resources/data/cobblemon/tags/items/black_tumblestones.json +++ b/common/src/main/resources/data/cobblemon/tags/items/black_tumblestones.json @@ -5,6 +5,16 @@ "cobblemon:large_budding_black_tumblestone", "cobblemon:black_tumblestone_cluster", "cobblemon:black_tumblestone_block", - "cobblemon:black_tumblestone" + "cobblemon:black_tumblestone", + "cobblemon:polished_black_tumblestone", + "cobblemon:polished_black_tumblestone_stairs", + "cobblemon:polished_black_tumblestone_slab", + "cobblemon:polished_black_tumblestone_wall", + "cobblemon:chiseled_polished_black_tumblestone", + "cobblemon:black_tumblestone_bricks", + "cobblemon:black_tumblestone_brick_stairs", + "cobblemon:black_tumblestone_brick_slab", + "cobblemon:black_tumblestone_brick_wall", + "cobblemon:chiseled_black_tumblestone_bricks" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/items/fossils.json b/common/src/main/resources/data/cobblemon/tags/items/fossils.json index 06134dc57e..90f1a65d03 100644 --- a/common/src/main/resources/data/cobblemon/tags/items/fossils.json +++ b/common/src/main/resources/data/cobblemon/tags/items/fossils.json @@ -1,19 +1,20 @@ { "replace": false, "values": [ - "cobblemon:armor_fossil", - "cobblemon:fossilized_bird", - "cobblemon:claw_fossil", - "cobblemon:cover_fossil", - "cobblemon:fossilized_dino", - "cobblemon:dome_fossil", - "cobblemon:fossilized_fish", "cobblemon:helix_fossil", - "cobblemon:jaw_fossil", + "cobblemon:dome_fossil", "cobblemon:old_amber_fossil", - "cobblemon:plume_fossil", "cobblemon:root_fossil", + "cobblemon:claw_fossil", + "cobblemon:skull_fossil", + "cobblemon:armor_fossil", + "cobblemon:cover_fossil", + "cobblemon:plume_fossil", + "cobblemon:jaw_fossil", "cobblemon:sail_fossil", - "cobblemon:skull_fossil" + "cobblemon:fossilized_bird", + "cobblemon:fossilized_fish", + "cobblemon:fossilized_drake", + "cobblemon:fossilized_dino" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/items/held/is_held_item.json b/common/src/main/resources/data/cobblemon/tags/items/held/is_held_item.json index e371e31ec4..f733644779 100644 --- a/common/src/main/resources/data/cobblemon/tags/items/held/is_held_item.json +++ b/common/src/main/resources/data/cobblemon/tags/items/held/is_held_item.json @@ -17,7 +17,7 @@ "cobblemon:choice_scarf", "cobblemon:choice_specs", "cobblemon:cleanse_tag", - "cobblemon:clear_amulet", + "cobblemon:covert_cloak", "cobblemon:destiny_knot", "cobblemon:deep_sea_scale", @@ -34,22 +34,22 @@ "cobblemon:float_stone", "cobblemon:focus_band", "cobblemon:focus_sash", - "cobblemon:grip_claw", + "cobblemon:hard_stone", "cobblemon:heavy_duty_boots", "cobblemon:iron_ball", "cobblemon:kings_rock", - "cobblemon:lagging_tail", + "cobblemon:leftovers", "cobblemon:life_orb", "cobblemon:light_ball", "cobblemon:light_clay", "cobblemon:loaded_dice", "cobblemon:lucky_egg", - "cobblemon:luminous_moss", + "cobblemon:magnet", "cobblemon:metal_coat", - "cobblemon:metronome", + "cobblemon:miracle_seed", "cobblemon:muscle_band", "cobblemon:mystic_water", @@ -61,19 +61,19 @@ "cobblemon:power_bracer", "cobblemon:power_lens", "cobblemon:power_weight", - "cobblemon:protective_pads", - "cobblemon:punching_glove", + + "cobblemon:quick_claw", "cobblemon:razor_claw", "cobblemon:razor_fang", "cobblemon:red_card", "cobblemon:ring_target", "cobblemon:rocky_helmet", - "cobblemon:room_service", + "cobblemon:safety_goggles", - "cobblemon:scope_lens", + "cobblemon:sharp_beak", - "cobblemon:shed_shell", + "cobblemon:shell_bell", "cobblemon:silk_scarf", "cobblemon:silver_powder", @@ -81,15 +81,15 @@ "cobblemon:soft_sand", "cobblemon:spell_tag", "cobblemon:sticky_barb", - "cobblemon:terrain_extender", - "cobblemon:throat_spray", + + "cobblemon:toxic_orb", "cobblemon:twisted_spoon", - "cobblemon:utility_umbrella", + "cobblemon:weakness_policy", - "cobblemon:wide_lens", + "cobblemon:wise_glasses", - "cobblemon:zoom_lens", + "cobblemon:bright_powder", "cobblemon:metal_powder", "cobblemon:quick_powder", diff --git a/common/src/main/resources/data/cobblemon/tags/items/red_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/tags/items/red_tumblestone_bricks.json new file mode 100644 index 0000000000..50d6f03379 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/items/red_tumblestone_bricks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "cobblemon:tumblestone_bricks", + "cobblemon:chiseled_tumblestone_bricks" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/items/red_tumblestones.json b/common/src/main/resources/data/cobblemon/tags/items/red_tumblestones.json index be7c24bf1b..582dffa2c4 100644 --- a/common/src/main/resources/data/cobblemon/tags/items/red_tumblestones.json +++ b/common/src/main/resources/data/cobblemon/tags/items/red_tumblestones.json @@ -5,6 +5,16 @@ "cobblemon:large_budding_tumblestone", "cobblemon:tumblestone_cluster", "cobblemon:tumblestone_block", - "cobblemon:tumblestone" + "cobblemon:tumblestone", + "cobblemon:polished_tumblestone", + "cobblemon:polished_tumblestone_stairs", + "cobblemon:polished_tumblestone_slab", + "cobblemon:polished_tumblestone_wall", + "cobblemon:chiseled_polished_tumblestone", + "cobblemon:tumblestone_bricks", + "cobblemon:tumblestone_brick_stairs", + "cobblemon:tumblestone_brick_slab", + "cobblemon:tumblestone_brick_wall", + "cobblemon:chiseled_tumblestone_bricks" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/items/sky_tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/tags/items/sky_tumblestone_bricks.json new file mode 100644 index 0000000000..4d400fe802 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/items/sky_tumblestone_bricks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "cobblemon:sky_tumblestone_bricks", + "cobblemon:chiseled_sky_tumblestone_bricks" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/items/sky_tumblestones.json b/common/src/main/resources/data/cobblemon/tags/items/sky_tumblestones.json index 02814cfef0..50e83d0472 100644 --- a/common/src/main/resources/data/cobblemon/tags/items/sky_tumblestones.json +++ b/common/src/main/resources/data/cobblemon/tags/items/sky_tumblestones.json @@ -5,6 +5,16 @@ "cobblemon:large_budding_sky_tumblestone", "cobblemon:sky_tumblestone_cluster", "cobblemon:sky_tumblestone_block", - "cobblemon:sky_tumblestone" + "cobblemon:sky_tumblestone", + "cobblemon:polished_sky_tumblestone", + "cobblemon:polished_sky_tumblestone_stairs", + "cobblemon:polished_sky_tumblestone_slab", + "cobblemon:polished_sky_tumblestone_wall", + "cobblemon:chiseled_polished_sky_tumblestone", + "cobblemon:sky_tumblestone_bricks", + "cobblemon:sky_tumblestone_brick_stairs", + "cobblemon:sky_tumblestone_brick_slab", + "cobblemon:sky_tumblestone_brick_wall", + "cobblemon:chiseled_sky_tumblestone_bricks" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/items/tumblestone_bricks.json b/common/src/main/resources/data/cobblemon/tags/items/tumblestone_bricks.json new file mode 100644 index 0000000000..f623f9fe94 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/items/tumblestone_bricks.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#cobblemon:red_tumblestone_bricks", + "#cobblemon:black_tumblestone_bricks", + "#cobblemon:sky_tumblestone_bricks" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/alolan.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/alolan.json new file mode 100644 index 0000000000..56725b53dd --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/alolan.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#minecraft:is_beach", + "#cobblemon:is_tropical_island" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/cyndaquil_quilava_hisui_bias.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/cyndaquil_quilava_hisui_bias.json new file mode 100644 index 0000000000..ada7d9c585 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/cyndaquil_quilava_hisui_bias.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#cobblemon:is_taiga", + "#cobblemon:nether/is_crimson", + "#cobblemon:nether/is_forest", + "#cobblemon:nether/is_overgrowth" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/lilligant_unovan.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/lilligant_unovan.json new file mode 100644 index 0000000000..28a045352e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/lilligant_unovan.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#cobblemon:is_forest", + "#cobblemon:is_floral", + "#cobblemon:is_tropical_island" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/oshawott_dewott_hisui_bias.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/oshawott_dewott_hisui_bias.json new file mode 100644 index 0000000000..123c4ecd66 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/oshawott_dewott_hisui_bias.json @@ -0,0 +1,55 @@ +{ + "replace": false, + "values": [ + "minecraft:stony_shore", + "minecraft:snowy_beach", + { + "id": "#c:stony_shores", + "required": false + }, + { + "id": "terralith:basalt_cliffs", + "required": false + }, + { + "id": "terralith:granite_cliffs", + "required": false + }, + { + "id": "terralith:white_cliffs", + "required": false + }, + { + "id": "wythers:calcite_coast", + "required": false + }, + { + "id": "wythers:cold_island", + "required": false + }, + { + "id": "wythers:cold_stony_shore", + "required": false + }, + { + "id": "wythers:deepslate_shore", + "required": false + }, + { + "id": "wythers:frigid_island", + "required": false + }, + { + "id": "wythers:frozen_island", + "required": false + }, + { + "id": "wythers:gravelly_beach", + "required": false + }, + { + "id": "wythers:icy_shore", + "required": false + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/rowlet_dartrix_alolan.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/rowlet_dartrix_alolan.json new file mode 100644 index 0000000000..4bcb328982 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/rowlet_dartrix_alolan.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#cobblemon:is_forest", + "#cobblemon:is_taiga" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/rowlet_dartrix_hisui_bias.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/rowlet_dartrix_hisui_bias.json new file mode 100644 index 0000000000..6a9cf2f3eb --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/rowlet_dartrix_hisui_bias.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#cobblemon:is_snowy_forest", + "#cobblemon:is_snowy_taiga" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/sliggoo_hisuian.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/sliggoo_hisuian.json new file mode 100644 index 0000000000..57543ff49a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/sliggoo_hisuian.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#cobblemon:is_lush", + "#cobblemon:is_dripstone" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_elegant.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_elegant.json new file mode 100644 index 0000000000..19aaad5116 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_elegant.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#cobblemon:is_spooky", + "#cobblemon:is_magical" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_monsoon.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_monsoon.json new file mode 100644 index 0000000000..9daf0e3675 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_monsoon.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#cobblemon:is_mountain", + "#cobblemon:is_peak" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/vivillon_evolutions/ocean.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_ocean.json similarity index 100% rename from common/src/main/resources/data/cobblemon/tags/worldgen/biome/vivillon_evolutions/ocean.json rename to common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_ocean.json diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/vivillon_evolutions/river.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_river.json similarity index 100% rename from common/src/main/resources/data/cobblemon/tags/worldgen/biome/vivillon_evolutions/river.json rename to common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_river.json diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/vivillon_evolutions/sun.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_sun.json similarity index 100% rename from common/src/main/resources/data/cobblemon/tags/worldgen/biome/vivillon_evolutions/sun.json rename to common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_sun.json diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/vivillon_evolutions/tundra.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_tundra.json similarity index 100% rename from common/src/main/resources/data/cobblemon/tags/worldgen/biome/vivillon_evolutions/tundra.json rename to common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/vivillon_tundra.json diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/dead_coral.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/dead_coral.json deleted file mode 100644 index 3a20692c49..0000000000 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/dead_coral.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "processors": [ - { - "processor_type": "gravity", - "heightmap": "OCEAN_FLOOR_WG", - "offset": 0 - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/desert_ruins_house.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/desert_ruins_house.json deleted file mode 100644 index 3d20a3ad0c..0000000000 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/desert_ruins_house.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ - { - "block_entity_modifier": { - "type": "minecraft:append_loot", - "loot_table": "cobblemon:placeholder" - }, - "input_predicate": { - "block": "minecraft:sand", - "predicate_type": "minecraft:random_block_match", - "probability": 0.25 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:suspicious_sand" - } - }, - { - "input_predicate": { - "block": "minecraft:smooth_sandstone", - "predicate_type": "minecraft:random_block_match", - "probability": 0.6 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:sandstone" - } - } - ] - }, - { - "processor_type": "minecraft:block_rot", - "integrity": 0.9, - "rottable_blocks": [ - "minecraft:smooth_sandstone", - "minecraft:sandstone", - "minecraft:terracotta", - "minecraft:chiseled_sandstone", - "minecraft:smooth_sandstone_stairs", - "minecraft:smooth_sandstone_slab", - "minecraft:sandstone_stairs", - "minecraft:sandstone_slab" - ] - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/desert_ruins_tower.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/desert_ruins_tower.json deleted file mode 100644 index 9bc0749f45..0000000000 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/desert_ruins_tower.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ - { - "block_entity_modifier": { - "type": "minecraft:append_loot", - "loot_table": "cobblemon:placeholder" - }, - "input_predicate": { - "block": "minecraft:sand", - "predicate_type": "minecraft:random_block_match", - "probability": 0.1 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:suspicious_sand" - } - }, - { - "input_predicate": { - "block": "minecraft:smooth_sandstone", - "predicate_type": "minecraft:random_block_match", - "probability": 0.6 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:sandstone" - } - } - ] - }, - { - "processor_type": "minecraft:block_rot", - "integrity": 0.9, - "rottable_blocks": [ - "minecraft:smooth_sandstone", - "minecraft:sandstone", - "minecraft:terracotta", - "minecraft:red_terracotta", - "minecraft:pink_terracotta", - "minecraft:yellow_terracotta", - "minecraft:chiseled_sandstone", - "minecraft:red_terracotta", - "minecraft:smooth_sandstone_stairs", - "minecraft:smooth_sandstone_slab" - ] - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/fossils/prehistoric_suspicious_mound.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/fossils/prehistoric_suspicious_mound.json index 2b828e8548..98a9c2fdcc 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/fossils/prehistoric_suspicious_mound.json +++ b/common/src/main/resources/data/cobblemon/worldgen/processor_list/fossils/prehistoric_suspicious_mound.json @@ -99,6 +99,11 @@ }, "limit": 1, "processor_type": "minecraft:capped" + }, + { + "processor_type": "gravity", + "heightmap": "WORLD_SURFACE_WG", + "offset": -2 } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/jungle_fossils_pit.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/jungle_fossils_pit.json deleted file mode 100644 index 9f8af0c84c..0000000000 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/jungle_fossils_pit.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ - { - "block_entity_modifier": { - "type": "minecraft:append_loot", - "loot_table": "cobblemon:placeholder" - }, - "input_predicate": { - "block": "minecraft:gravel", - "predicate_type": "minecraft:random_block_match", - "probability": 0.25 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:suspicious_gravel" - } - }, - { - "input_predicate": { - "block": "minecraft:mud", - "predicate_type": "minecraft:random_block_match", - "probability": 0.3 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:muddy_mangrove_roots" - } - }, - { - "input_predicate": { - "block": "minecraft:packed_mud", - "predicate_type": "minecraft:random_block_match", - "probability": 0.3 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:mud" - } - }, - { - "input_predicate": { - "block": "minecraft:coarse_dirt", - "predicate_type": "minecraft:random_block_match", - "probability": 0.3 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:packed_mud" - } - } - ] - }, - { - "processor_type": "gravity", - "heightmap": "WORLD_SURFACE_WG", - "offset": -10 - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/lush_fossils_pond.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/lush_fossils_pond.json deleted file mode 100644 index 65f1e7a37a..0000000000 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/lush_fossils_pond.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ - { - "block_entity_modifier": { - "type": "minecraft:append_loot", - "loot_table": "cobblemon:placeholder" - }, - "input_predicate": { - "block": "minecraft:gravel", - "predicate_type": "minecraft:random_block_match", - "probability": 0.25 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:suspicious_gravel" - } - }, - { - "input_predicate": { - "block": "minecraft:granite", - "predicate_type": "minecraft:random_block_match", - "probability": 0.2 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "cobblemon:deepslate_water_stone_ore" - } - }, - { - "input_predicate": { - "block": "minecraft:granite", - "predicate_type": "minecraft:random_block_match", - "probability": 1 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:mossy_cobblestone" - } - } - ] - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/lush_fossils_watergeode.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/lush_fossils_watergeode.json deleted file mode 100644 index ccf630be1a..0000000000 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/lush_fossils_watergeode.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ - { - "block_entity_modifier": { - "type": "minecraft:append_loot", - "loot_table": "cobblemon:placeholder" - }, - "input_predicate": { - "block": "minecraft:gravel", - "predicate_type": "minecraft:random_block_match", - "probability": 0.25 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:suspicious_gravel" - } - }, - { - "input_predicate": { - "block": "minecraft:stone", - "predicate_type": "minecraft:random_block_match", - "probability": 0.15 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "cobblemon:water_stone_ore" - } - }, - { - "input_predicate": { - "block": "minecraft:tuff", - "predicate_type": "minecraft:random_block_match", - "probability": 0.3 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:mossy_cobblestone" - } - } - ] - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/ocean_fossils_vents.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/ocean_fossils_vents.json deleted file mode 100644 index 4ca1ed66eb..0000000000 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/ocean_fossils_vents.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ - { - "block_entity_modifier": { - "type": "minecraft:append_loot", - "loot_table": "cobblemon:placeholder" - }, - "input_predicate": { - "block": "minecraft:gravel", - "predicate_type": "minecraft:random_block_match", - "probability": 0.15 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:suspicious_gravel" - } - } - ] - }, - { - "processor_type": "gravity", - "heightmap": "OCEAN_FLOOR_WG", - "offset": -3 - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/ruins/deserted_gimmi_tower.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/ruins/deserted_gimmi_tower.json index 2b68427eac..06e50391ac 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/ruins/deserted_gimmi_tower.json +++ b/common/src/main/resources/data/cobblemon/worldgen/processor_list/ruins/deserted_gimmi_tower.json @@ -538,7 +538,33 @@ } ] }, - "limit": 4, + "limit": 5, + "processor_type": "minecraft:capped" + }, + { + "delegate": { + "processor_type": "minecraft:rule", + "rules": [ + { + "block_entity_modifier": { + "type": "minecraft:append_loot", + "loot_table": "cobblemon:ruins/rare/sky_tumblestone" + }, + "input_predicate": { + "block": "minecraft:suspicious_sand", + "predicate_type": "minecraft:random_block_match", + "probability": 1.0 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:suspicious_sand" + } + } + ] + }, + "limit": 1, "processor_type": "minecraft:capped" } ] diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/ruins/unstable_cave_ruins.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/ruins/unstable_cave_ruins.json index 033ff92683..0504d57f38 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/ruins/unstable_cave_ruins.json +++ b/common/src/main/resources/data/cobblemon/worldgen/processor_list/ruins/unstable_cave_ruins.json @@ -543,7 +543,7 @@ "loot_table": "cobblemon:ruins/uncommon/unstable_cave_ruins" }, "input_predicate": { - "block": "minecraft:suspicious_gravel", + "block": "minecraft:suspicious_sand", "predicate_type": "minecraft:random_block_match", "probability": 0.5 }, @@ -551,7 +551,7 @@ "predicate_type": "minecraft:always_true" }, "output_state": { - "Name": "minecraft:suspicious_gravel" + "Name": "minecraft:suspicious_sand" } } ] @@ -591,7 +591,7 @@ "loot_table": "cobblemon:ruins/rare/black_tumblestone" }, "input_predicate": { - "block": "minecraft:suspicious_gravel", + "block": "minecraft:suspicious_sand", "predicate_type": "minecraft:random_block_match", "probability": 1.0 }, @@ -599,7 +599,7 @@ "predicate_type": "minecraft:always_true" }, "output_state": { - "Name": "minecraft:suspicious_gravel" + "Name": "minecraft:suspicious_sand" } } ] @@ -933,6 +933,123 @@ }, "limit": 1, "processor_type": "minecraft:capped" + }, + { + "delegate": { + "processor_type": "minecraft:rule", + "rules": [ + { + "block_entity_modifier": { + "type": "minecraft:append_loot", + "loot_table": "cobblemon:ruins/vanilla_loot/vanilla_loot" + }, + "input_predicate": { + "block_state": { + "Name": "minecraft:trapped_chest", + "Properties": { + "facing": "north", + "type": "single", + "waterlogged": "false" + } + }, + "predicate_type": "minecraft:random_blockstate_match", + "probability": 1.0 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:trapped_chest", + "Properties": { + "facing": "north" + } + } + }, + { + "block_entity_modifier": { + "type": "minecraft:append_loot", + "loot_table": "cobblemon:ruins/vanilla_loot/vanilla_loot" + }, + "input_predicate": { + "block_state": { + "Name": "minecraft:trapped_chest", + "Properties": { + "facing": "south", + "type": "single", + "waterlogged": "false" + } + }, + "predicate_type": "minecraft:random_blockstate_match", + "probability": 1.0 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:trapped_chest", + "Properties": { + "facing": "south" + } + } + }, + { + "block_entity_modifier": { + "type": "minecraft:append_loot", + "loot_table": "cobblemon:ruins/vanilla_loot/vanilla_loot" + }, + "input_predicate": { + "block_state": { + "Name": "minecraft:trapped_chest", + "Properties": { + "facing": "east", + "type": "single", + "waterlogged": "false" + } + }, + "predicate_type": "minecraft:random_blockstate_match", + "probability": 1.0 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:trapped_chest", + "Properties": { + "facing": "east" + } + } + }, + { + "block_entity_modifier": { + "type": "minecraft:append_loot", + "loot_table": "cobblemon:ruins/vanilla_loot/vanilla_loot" + }, + "input_predicate": { + "block_state": { + "Name": "minecraft:trapped_chest", + "Properties": { + "facing": "west", + "type": "single", + "waterlogged": "false" + } + }, + "predicate_type": "minecraft:random_blockstate_match", + "probability": 1.0 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:trapped_chest", + "Properties": { + "facing": "west" + } + } + } + ] + }, + "limit": 1, + "processor_type": "minecraft:capped" } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/worldgen/processor_list/warm_ocean_fossil_vents.json b/common/src/main/resources/data/cobblemon/worldgen/processor_list/warm_ocean_fossil_vents.json deleted file mode 100644 index 5a06279ead..0000000000 --- a/common/src/main/resources/data/cobblemon/worldgen/processor_list/warm_ocean_fossil_vents.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ - { - "block_entity_modifier": { - "type": "minecraft:append_loot", - "loot_table": "cobblemon:placeholder" - }, - "input_predicate": { - "block": "minecraft:sand", - "predicate_type": "minecraft:random_block_match", - "probability": 0.15 - }, - "location_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:suspicious_sand" - } - } - ] - }, - { - "processor_type": "gravity", - "heightmap": "OCEAN_FLOOR_WG", - "offset": -3 - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/worldgen/structure/fossils/prehistoric_suspicious_mound.json b/common/src/main/resources/data/cobblemon/worldgen/structure/fossils/prehistoric_suspicious_mound.json index 1a6d5b7599..f689e9c66e 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/structure/fossils/prehistoric_suspicious_mound.json +++ b/common/src/main/resources/data/cobblemon/worldgen/structure/fossils/prehistoric_suspicious_mound.json @@ -7,7 +7,7 @@ "size": 7, "step": "surface_structures", "start_height": { - "absolute": -5 + "absolute": -2 }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 116, diff --git a/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/deserted_gimmi_tower.json b/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/deserted_gimmi_tower.json index 4bb63284c8..86ca966d3c 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/deserted_gimmi_tower.json +++ b/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/deserted_gimmi_tower.json @@ -11,6 +11,6 @@ }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 100, - "terrain_adaptation": "beard_box", + "terrain_adaptation": "beard_thin", "use_expansion_hack": false } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/frozen_gimmi_tower.json b/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/frozen_gimmi_tower.json index 47eb58c552..4366ecaa73 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/frozen_gimmi_tower.json +++ b/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/frozen_gimmi_tower.json @@ -11,6 +11,6 @@ }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 100, - "terrain_adaptation": "beard_box", + "terrain_adaptation": "beard_thin", "use_expansion_hack": false } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/lush_gimmi_tower.json b/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/lush_gimmi_tower.json index 314177675a..b1810956ef 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/lush_gimmi_tower.json +++ b/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/lush_gimmi_tower.json @@ -11,6 +11,6 @@ }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 100, - "terrain_adaptation": "beard_box", + "terrain_adaptation": "beard_thin", "use_expansion_hack": false } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/sunscorched_gimmi_tower.json b/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/sunscorched_gimmi_tower.json index cd1d6ed615..d957a638b3 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/sunscorched_gimmi_tower.json +++ b/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/sunscorched_gimmi_tower.json @@ -11,6 +11,6 @@ }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 100, - "terrain_adaptation": "beard_box", + "terrain_adaptation": "beard_thin", "use_expansion_hack": false } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/temperate_gimmi_tower.json b/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/temperate_gimmi_tower.json index b6d15f45a0..a97fdd653b 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/temperate_gimmi_tower.json +++ b/common/src/main/resources/data/cobblemon/worldgen/structure/ruins/temperate_gimmi_tower.json @@ -11,6 +11,6 @@ }, "project_start_to_heightmap": "WORLD_SURFACE_WG", "max_distance_from_center": 100, - "terrain_adaptation": "beard_box", + "terrain_adaptation": "beard_thin", "use_expansion_hack": false } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/cave_support.json b/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/cave_support.json new file mode 100644 index 0000000000..927a333714 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/cave_support.json @@ -0,0 +1,15 @@ +{ + "name": "cobblemon:ruins/cave_support", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "location": "cobblemon:fossils/decorations/stone_pillar1", + "element_type": "minecraft:single_pool_element", + "processors": "cobblemon:fossils/prehistoric_enhydro_agate", + "projection": "rigid" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/forest_ruins_gate.json b/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/forest_ruins_gate.json index 57a7fb3f30..ef1b28e7b9 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/forest_ruins_gate.json +++ b/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/forest_ruins_gate.json @@ -5,33 +5,7 @@ { "weight": 1, "element": { - "location": "cobblemon:ruins/decorations/forest_gate1", - "element_type": "minecraft:single_pool_element", - "processors": "cobblemon:ruins/toppled_pillars_ruins", - "projection": "rigid" - } - }, - { - "weight": 2, - "element": { - "location": "cobblemon:ruins/decorations/forest_gate2", - "element_type": "minecraft:single_pool_element", - "processors": "cobblemon:ruins/toppled_pillars_ruins", - "projection": "rigid" - } - }, - { - "weight": 2, - "element": { - "location": "cobblemon:ruins/decorations/forest_gate3", - "element_type": "minecraft:single_pool_element", - "processors": "cobblemon:ruins/toppled_pillars_ruins", - "projection": "rigid" - } - }, - { - "weight": 2, - "element": { + "location": "minecraft:empty", "element_type": "minecraft:empty_pool_element" } } diff --git a/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/junk.json b/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/junk.json index 66cf459b35..09da060057 100644 --- a/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/junk.json +++ b/common/src/main/resources/data/cobblemon/worldgen/template_pool/ruins/junk.json @@ -84,7 +84,43 @@ } }, { - "weight": 3, + "weight": 1, + "element": { + "location": "cobblemon:ruins/decorations/cauldron_junk", + "element_type": "minecraft:single_pool_element", + "processors": "cobblemon:ruins/decorations/junk", + "projection": "rigid" + } + }, + { + "weight": 1, + "element": { + "location": "cobblemon:ruins/decorations/crafting_junk", + "element_type": "minecraft:single_pool_element", + "processors": "cobblemon:ruins/decorations/junk", + "projection": "rigid" + } + }, + { + "weight": 1, + "element": { + "location": "cobblemon:ruins/decorations/bell_junk", + "element_type": "minecraft:single_pool_element", + "processors": "cobblemon:ruins/decorations/junk", + "projection": "rigid" + } + }, + { + "weight": 1, + "element": { + "location": "cobblemon:ruins/decorations/campfire_junk", + "element_type": "minecraft:single_pool_element", + "processors": "cobblemon:ruins/decorations/junk", + "projection": "rigid" + } + }, + { + "weight": 5, "element": { "element_type": "minecraft:empty_pool_element" } diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 4bab942053..5c1a8b1c61 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,48 +1,78 @@ { "replace": false, "values": [ - "cobblemon:dawn_stone_ore", - "cobblemon:dusk_stone_ore", - "cobblemon:fire_stone_ore", - "cobblemon:ice_stone_ore", - "cobblemon:leaf_stone_ore", - "cobblemon:moon_stone_ore", - "cobblemon:shiny_stone_ore", - "cobblemon:sun_stone_ore", - "cobblemon:thunder_stone_ore", - "cobblemon:water_stone_ore", - "cobblemon:deepslate_dawn_stone_ore", - "cobblemon:deepslate_dusk_stone_ore", - "cobblemon:deepslate_fire_stone_ore", - "cobblemon:deepslate_ice_stone_ore", - "cobblemon:deepslate_leaf_stone_ore", - "cobblemon:deepslate_moon_stone_ore", - "cobblemon:deepslate_shiny_stone_ore", - "cobblemon:deepslate_sun_stone_ore", - "cobblemon:deepslate_thunder_stone_ore", - "cobblemon:deepslate_water_stone_ore", - "cobblemon:dripstone_moon_stone_ore", - "cobblemon:nether_fire_stone_ore", - "cobblemon:terracotta_sun_stone_ore", - "cobblemon:healing_machine", - "cobblemon:pc", - "cobblemon:restoration_tank", - "cobblemon:monitor", - "cobblemon:fossil_analyzer", - "cobblemon:tumblestone_block", - "cobblemon:black_tumblestone_block", - "cobblemon:sky_tumblestone_block", - "cobblemon:small_budding_tumblestone", - "cobblemon:medium_budding_tumblestone", - "cobblemon:large_budding_tumblestone", - "cobblemon:tumblestone_cluster", - "cobblemon:small_budding_black_tumblestone", - "cobblemon:medium_budding_black_tumblestone", - "cobblemon:large_budding_black_tumblestone", - "cobblemon:black_tumblestone_cluster", - "cobblemon:small_budding_sky_tumblestone", - "cobblemon:medium_budding_sky_tumblestone", - "cobblemon:large_budding_sky_tumblestone", - "cobblemon:sky_tumblestone_cluster" + "cobblemon:dawn_stone_ore", + "cobblemon:dusk_stone_ore", + "cobblemon:fire_stone_ore", + "cobblemon:ice_stone_ore", + "cobblemon:leaf_stone_ore", + "cobblemon:moon_stone_ore", + "cobblemon:shiny_stone_ore", + "cobblemon:sun_stone_ore", + "cobblemon:thunder_stone_ore", + "cobblemon:water_stone_ore", + "cobblemon:deepslate_dawn_stone_ore", + "cobblemon:deepslate_dusk_stone_ore", + "cobblemon:deepslate_fire_stone_ore", + "cobblemon:deepslate_ice_stone_ore", + "cobblemon:deepslate_leaf_stone_ore", + "cobblemon:deepslate_moon_stone_ore", + "cobblemon:deepslate_shiny_stone_ore", + "cobblemon:deepslate_sun_stone_ore", + "cobblemon:deepslate_thunder_stone_ore", + "cobblemon:deepslate_water_stone_ore", + "cobblemon:dripstone_moon_stone_ore", + "cobblemon:nether_fire_stone_ore", + "cobblemon:terracotta_sun_stone_ore", + "cobblemon:healing_machine", + "cobblemon:pc", + "cobblemon:restoration_tank", + "cobblemon:monitor", + "cobblemon:fossil_analyzer", + "cobblemon:tumblestone_block", + "cobblemon:polished_tumblestone", + "cobblemon:polished_tumblestone_stairs", + "cobblemon:polished_tumblestone_slab", + "cobblemon:polished_tumblestone_wall", + "cobblemon:chiseled_polished_tumblestone", + "cobblemon:tumblestone_bricks", + "cobblemon:tumblestone_brick_stairs", + "cobblemon:tumblestone_brick_slab", + "cobblemon:tumblestone_brick_wall", + "cobblemon:chiseled_tumblestone_bricks", + "cobblemon:black_tumblestone_block", + "cobblemon:polished_black_tumblestone", + "cobblemon:polished_black_tumblestone_stairs", + "cobblemon:polished_black_tumblestone_slab", + "cobblemon:polished_black_tumblestone_wall", + "cobblemon:chiseled_polished_black_tumblestone", + "cobblemon:black_tumblestone_bricks", + "cobblemon:black_tumblestone_brick_stairs", + "cobblemon:black_tumblestone_brick_slab", + "cobblemon:black_tumblestone_brick_wall", + "cobblemon:chiseled_black_tumblestone_bricks", + "cobblemon:sky_tumblestone_block", + "cobblemon:polished_sky_tumblestone", + "cobblemon:polished_sky_tumblestone_stairs", + "cobblemon:polished_sky_tumblestone_slab", + "cobblemon:polished_sky_tumblestone_wall", + "cobblemon:chiseled_polished_sky_tumblestone", + "cobblemon:sky_tumblestone_bricks", + "cobblemon:sky_tumblestone_brick_stairs", + "cobblemon:sky_tumblestone_brick_slab", + "cobblemon:sky_tumblestone_brick_wall", + "cobblemon:chiseled_sky_tumblestone_bricks", + "cobblemon:small_budding_tumblestone", + "cobblemon:medium_budding_tumblestone", + "cobblemon:large_budding_tumblestone", + "cobblemon:tumblestone_cluster", + "cobblemon:small_budding_black_tumblestone", + "cobblemon:medium_budding_black_tumblestone", + "cobblemon:large_budding_black_tumblestone", + "cobblemon:black_tumblestone_cluster", + "cobblemon:small_budding_sky_tumblestone", + "cobblemon:medium_budding_sky_tumblestone", + "cobblemon:large_budding_sky_tumblestone", + "cobblemon:sky_tumblestone_cluster" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/slabs.json b/common/src/main/resources/data/minecraft/tags/blocks/slabs.json new file mode 100644 index 0000000000..854c90fe1f --- /dev/null +++ b/common/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "cobblemon:polished_tumblestone_slab", + "cobblemon:polished_black_tumblestone_slab", + "cobblemon:polished_sky_tumblestone_slab", + "cobblemon:tumblestone_brick_slab", + "cobblemon:black_tumblestone_brick_slab", + "cobblemon:sky_tumblestone_brick_slab" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/stairs.json b/common/src/main/resources/data/minecraft/tags/blocks/stairs.json new file mode 100644 index 0000000000..45ad123fd9 --- /dev/null +++ b/common/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "cobblemon:polished_tumblestone_stairs", + "cobblemon:polished_black_tumblestone_stairs", + "cobblemon:polished_sky_tumblestone_stairs", + "cobblemon:tumblestone_brick_stairs", + "cobblemon:black_tumblestone_brick_stairs", + "cobblemon:sky_tumblestone_brick_stairs" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/walls.json b/common/src/main/resources/data/minecraft/tags/blocks/walls.json new file mode 100644 index 0000000000..a7a44fa220 --- /dev/null +++ b/common/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "cobblemon:polished_tumblestone_wall", + "cobblemon:polished_black_tumblestone_wall", + "cobblemon:polished_sky_tumblestone_wall", + "cobblemon:tumblestone_brick_wall", + "cobblemon:black_tumblestone_brick_wall", + "cobblemon:sky_tumblestone_brick_wall" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/items/walls.json b/common/src/main/resources/data/minecraft/tags/items/walls.json new file mode 100644 index 0000000000..a7a44fa220 --- /dev/null +++ b/common/src/main/resources/data/minecraft/tags/items/walls.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "cobblemon:polished_tumblestone_wall", + "cobblemon:polished_black_tumblestone_wall", + "cobblemon:polished_sky_tumblestone_wall", + "cobblemon:tumblestone_brick_wall", + "cobblemon:black_tumblestone_brick_wall", + "cobblemon:sky_tumblestone_brick_wall" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/mixins.cobblemon-common.json b/common/src/main/resources/mixins.cobblemon-common.json index ff48338627..3d37148dbf 100644 --- a/common/src/main/resources/mixins.cobblemon-common.json +++ b/common/src/main/resources/mixins.cobblemon-common.json @@ -1,7 +1,7 @@ { "required": true, "package": "com.cobblemon.mod.common.mixin", - "compatibilityLevel": "JAVA_16", + "compatibilityLevel": "JAVA_17", "minVersion": "0.8", "client": [ "BuiltinModelItemRendererMixin", @@ -37,6 +37,7 @@ "accessor.BoatEntityAccessor", "accessor.StatusEffectInstanceAccessor", "entity.TameableEntityMixin", + "invoker.AdornRegisterInvoker", "invoker.BlocksInvoker", "invoker.BooleanRuleInvoker", "invoker.DoorBlockInvoker", diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 351a7262e0..b61fec02d4 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -10,7 +10,7 @@ configurations.all { resolutionStrategy { - force(libs.fabricLoader) + force(libs.fabric.loader) } } @@ -52,20 +52,20 @@ dependencies { isTransitive = false } - modImplementation(libs.fabricLoader) - modApi(libs.fabricApi) - modApi(libs.fabricKotlin) - modApi(libs.fabricPermissionsApi) - modCompileOnly(libs.lambDynamicLights) { isTransitive = false } - //modImplementation(libs.flywheelFabric) - //include(libs.flywheelFabric) + modImplementation(libs.fabric.loader) + modApi(libs.fabric.api) + modApi(libs.bundles.fabric) + + modCompileOnly(libs.bundles.fabric.integrations.compileOnly) { + isTransitive = false + } + modRuntimeOnly(libs.jei.fabric) +// modImplementation(libs.flywheelFabric) +// include(libs.flywheelFabric) listOf( - libs.stdlib, - libs.reflect, - libs.jetbrainsAnnotations, - libs.serializationCore, - libs.serializationJson, + libs.bundles.kotlin, + libs.bundles.fabric.kotlin.deps, libs.graal, libs.molang ).forEach { @@ -73,6 +73,8 @@ dependencies { runtimeOnly(it) } + minecraftServerLibraries(libs.icu4j) + } tasks { @@ -86,13 +88,13 @@ tasks { processResources { dependsOn(copyAccessWidener) inputs.property("version", rootProject.version) - inputs.property("fabric_loader_version", libs.fabricLoader.get().version) + inputs.property("fabric_loader_version", libs.fabric.loader.get().version) inputs.property("minecraft_version", rootProject.property("mc_version").toString()) filesMatching("fabric.mod.json") { expand( "version" to rootProject.version, - "fabric_loader_version" to libs.fabricLoader.get().version, + "fabric_loader_version" to libs.fabric.loader.get().version, "minecraft_version" to rootProject.property("mc_version").toString() ) } @@ -101,4 +103,4 @@ tasks { sourcesJar { dependsOn(copyAccessWidener) } -} \ No newline at end of file +} diff --git a/fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt b/fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt index be1c763124..853815b9c0 100644 --- a/fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt +++ b/fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt @@ -14,6 +14,7 @@ import com.cobblemon.mod.common.item.group.CobblemonItemGroups import com.cobblemon.mod.common.loot.LootInjector import com.cobblemon.mod.common.particle.CobblemonParticles import com.cobblemon.mod.common.platform.events.* +import com.cobblemon.mod.common.sherds.CobblemonSherds import com.cobblemon.mod.common.util.cobblemonResource import com.cobblemon.mod.common.util.didSleep import com.cobblemon.mod.common.util.endsWith @@ -97,6 +98,9 @@ object CobblemonFabric : CobblemonImplementation { networkManager.registerMessages() networkManager.registerServerHandlers() + //This has to be registered elsewhere on forge so we cant do it in common + CobblemonSherds.registerSherds() + CobblemonBlockPredicates.touch() CobblemonPlacementModifierTypes.touch() CobblemonProcessorTypes.touch() diff --git a/gradle.properties b/gradle.properties index c3d10cbcdb..1a1c6f80c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,9 @@ org.gradle.jvmargs=-Xmx8G org.gradle.daemon=false org.gradle.parallel=true +org.gradle.caching=true + +group=com.cobblemon.mod # API mc_version = 1.20.5 diff --git a/build-logic/build.gradle.kts b/gradle/build-logic/build.gradle.kts similarity index 84% rename from build-logic/build.gradle.kts rename to gradle/build-logic/build.gradle.kts index ec42ce7eb3..f463c7c91a 100644 --- a/build-logic/build.gradle.kts +++ b/gradle/build-logic/build.gradle.kts @@ -11,10 +11,12 @@ repositories { dependencies { implementation(libs.kotlin) + implementation(libs.indra.common) + implementation(libs.licenser) implementation(libs.shadow) implementation(libs.loom) - implementation(libs.architecturyPlugin) + implementation(libs.architectury) implementation(libs.blossom) implementation(libs.ideaExt) diff --git a/gradle/build-logic/settings.gradle.kts b/gradle/build-logic/settings.gradle.kts new file mode 100644 index 0000000000..1939cd0fba --- /dev/null +++ b/gradle/build-logic/settings.gradle.kts @@ -0,0 +1,20 @@ +rootProject.name = "build-logic" + +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + maven("https://maven.architectury.dev/") + maven("https://maven.fabricmc.net/") + maven("https://maven.minecraftforge.net/") + maven("https://repo.papermc.io/repository/maven-public/") + } +} + +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../libs.versions.toml")) + } + } +} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts b/gradle/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts similarity index 79% rename from build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts rename to gradle/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts index a43a8ee885..78447cf3cb 100644 --- a/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts +++ b/gradle/build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts @@ -9,18 +9,31 @@ */ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -val accessWidenerFile = "src/main/resources/cobblemon-common.accesswidener" +import utilities.ACCESS_WIDENER plugins { - java - `java-library` + id("java") + id("java-library") + id("net.kyori.indra") + id("net.kyori.indra.git") + id("org.cadixdev.licenser") id("dev.architectury.loom") id("architectury-plugin") kotlin("jvm") } +group = rootProject.group +version = rootProject.version +description = rootProject.description + +indra { + javaVersions { + minimumToolchain(17) + target(17) + } +} + repositories { mavenCentral() //JEI @@ -32,11 +45,6 @@ license { header(rootProject.file("HEADER")) } -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - architectury { minecraft = project.property("mc_version").toString() } @@ -59,6 +67,7 @@ tasks { withType { options.encoding = "UTF-8" options.release.set(21) + options.compilerArgs.add("-Xlint:-processing,-classfile,-serial") } withType { diff --git a/gradle/build-logic/src/main/kotlin/cobblemon.platform-conventions.gradle.kts b/gradle/build-logic/src/main/kotlin/cobblemon.platform-conventions.gradle.kts new file mode 100644 index 0000000000..6465d1d543 --- /dev/null +++ b/gradle/build-logic/src/main/kotlin/cobblemon.platform-conventions.gradle.kts @@ -0,0 +1,59 @@ +import utilities.VersionType +import utilities.writeVersion + +plugins { + id("cobblemon.base-conventions") + id("com.github.johnrengelman.shadow") +} + +writeVersion(type = VersionType.FULL) + +val bundle: Configuration by configurations.creating { + isCanBeConsumed = false + isCanBeResolved = true +} + +loom { + val clientConfig = runConfigs.getByName("client") + clientConfig.runDir = "runClient" + clientConfig.programArg("--username=CobblemonDev") + //This is AshKetchum's UUID so you get an Ash Ketchum skin + clientConfig.programArg("--uuid=93e4e551-589a-41cb-ab2d-435266c8e035") + val serverConfig = runConfigs.getByName("server") + serverConfig.runDir = "runServer" +} + +tasks { + + jar { + archiveBaseName.set("Cobblemon-${project.name}") + archiveClassifier.set("dev-slim") + } + + shadowJar { + archiveClassifier.set("dev-shadow") + archiveBaseName.set("Cobblemon-${project.name}") + configurations = listOf(bundle) + mergeServiceFiles() + } + + remapJar { + dependsOn(shadowJar) + inputFile.set(shadowJar.flatMap { it.archiveFile }) + archiveBaseName.set("Cobblemon-${project.name}") + archiveVersion.set("${rootProject.version}") + } + + val copyJar by registering(CopyFile::class) { + val productionJar = tasks.remapJar.flatMap { it.archiveFile } + fileToCopy = productionJar + destination = productionJar.flatMap { + rootProject.layout.buildDirectory.file("libs/${it.asFile.name}") + } + } + + assemble { + dependsOn(copyJar) + } + +} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/cobblemon.publish-conventions.gradle.kts b/gradle/build-logic/src/main/kotlin/cobblemon.publish-conventions.gradle.kts similarity index 90% rename from build-logic/src/main/kotlin/cobblemon.publish-conventions.gradle.kts rename to gradle/build-logic/src/main/kotlin/cobblemon.publish-conventions.gradle.kts index 2b030585cb..444d4895b2 100644 --- a/build-logic/src/main/kotlin/cobblemon.publish-conventions.gradle.kts +++ b/gradle/build-logic/src/main/kotlin/cobblemon.publish-conventions.gradle.kts @@ -1,9 +1,9 @@ -import extensions.VersionType -import extensions.writeVersion +import utilities.VersionType +import utilities.writeVersion plugins { - java - `java-library` + id("java") + id("java-library") id("maven-publish") id("dev.architectury.loom") } diff --git a/gradle/build-logic/src/main/kotlin/cobblemon.root-conventions.gradle.kts b/gradle/build-logic/src/main/kotlin/cobblemon.root-conventions.gradle.kts new file mode 100644 index 0000000000..e8ea4d58ab --- /dev/null +++ b/gradle/build-logic/src/main/kotlin/cobblemon.root-conventions.gradle.kts @@ -0,0 +1,9 @@ +plugins { + base +} + +tasks { + withType { + useJUnitPlatform() + } +} diff --git a/gradle/build-logic/src/main/kotlin/utilities/CopyFile.kt b/gradle/build-logic/src/main/kotlin/utilities/CopyFile.kt new file mode 100644 index 0000000000..0aa0d3027b --- /dev/null +++ b/gradle/build-logic/src/main/kotlin/utilities/CopyFile.kt @@ -0,0 +1,21 @@ +import org.gradle.api.DefaultTask +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.tasks.InputFile +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction +import org.gradle.work.DisableCachingByDefault + +@DisableCachingByDefault(because = "Not worth caching") +abstract class CopyFile : DefaultTask() { + @get:InputFile + abstract val fileToCopy: RegularFileProperty + + @get:OutputFile + abstract val destination: RegularFileProperty + + @TaskAction + private fun copyFile() { + destination.get().asFile.parentFile.mkdirs() + fileToCopy.get().asFile.copyTo(destination.get().asFile, overwrite = true) + } +} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/extensions/Versioning.kt b/gradle/build-logic/src/main/kotlin/utilities/Versioning.kt similarity index 97% rename from build-logic/src/main/kotlin/extensions/Versioning.kt rename to gradle/build-logic/src/main/kotlin/utilities/Versioning.kt index 64df62f0fc..52a95b7675 100644 --- a/build-logic/src/main/kotlin/extensions/Versioning.kt +++ b/gradle/build-logic/src/main/kotlin/utilities/Versioning.kt @@ -1,4 +1,4 @@ -package extensions +package utilities import org.gradle.api.Project diff --git a/build-logic/src/main/kotlin/constants.kt b/gradle/build-logic/src/main/kotlin/utilities/constants.kt similarity index 81% rename from build-logic/src/main/kotlin/constants.kt rename to gradle/build-logic/src/main/kotlin/utilities/constants.kt index a4523c2a42..be44dbebe6 100644 --- a/build-logic/src/main/kotlin/constants.kt +++ b/gradle/build-logic/src/main/kotlin/utilities/constants.kt @@ -1,2 +1,3 @@ +package utilities const val ACCESS_WIDENER = "src/main/resources/cobblemon-common.accesswidener" \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000000..63dc0f0e8a --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,101 @@ +[versions] +# Kotlin +kotlin = "1.8.20" +annotations = "23.0.0" +serialization = "1.5.0" + +# Plugins +indra = "3.1.3" +licenser = "0.6.1" +shadow = "8.1.1" +blossom = "2.1.0" +idea-ext = "1.1.7" + +# Loom +loom = "1.1-SNAPSHOT" +architectury-plugin = "3.4-SNAPSHOT" + +# Common +molang = "1.1.11" +graal = "22.3.0" +icu4j = "71.1" +jei-api = "15.2.0.25" + +# Fabric +fabric-loader = "0.15.10" +fabric-api = "0.89.0+1.20.1" +fabric-kotlin = "1.9.3+kotlin.1.8.20" +fabric-permissions-api = "0.2-SNAPSHOT" +lambDynamicLights = "2.3.2+1.20.1" + +# Forge +forge = "1.20.1-47.1.0" +kotlin-for-forge = "4.10.0" +flywheel = "0.6.10-7" + +# Data Storage +mongo = "4.10.2" + +# Testing +junit = "5.9.0" +mockito = "5.2.0" +mockk = "1.12.1" +classgraph = "4.8.153" + +[libraries] +# General Buildscript Plugins +indra-common = { group = "net.kyori", name = "indra-common", version.ref = "indra" } +kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } +loom = { group = "dev.architectury", name = "architectury-loom", version.ref = "loom" } +architectury = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury-plugin" } +shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" } +blossom = { group = "net.kyori", name = "blossom", version.ref = "blossom" } +ideaExt = { group = "org.jetbrains.gradle.plugin.idea-ext", name = "org.jetbrains.gradle.plugin.idea-ext.gradle.plugin", version.ref = "idea-ext"} +licenser = { group = "gradle.plugin.org.cadixdev.gradle", name = "licenser", version.ref = "licenser" } + +# Kotlin +kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" } +kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" } +jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" } +serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core-jvm", version.ref = "serialization" } +serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json-jvm", version.ref = "serialization" } + +# Common +jei-api = { group = "local.mezz.jei", name = "common-api", version.ref = "jei-api"} +molang = { group = "local.com.bedrockk", name = "molang", version.ref = "molang" } +graal = { group = "org.graalvm.js", name = "js", version.ref = "graal" } +icu4j = { group = "com.ibm.icu", name = "icu4j", version.ref = "icu4j" } + +# Fabric +fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric-loader" } +fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" } +fabric-kotlin = { group = "net.fabricmc", name = "fabric-language-kotlin", version.ref = "fabric-kotlin" } +fabric-permissions = { group = "me.lucko", name = "fabric-permissions-api", version.ref = "fabric-permissions-api" } +adorn-fabric = { group = "maven.modrinth", name = "adorn", version = "5.0.0-fabric"} +lambDynamicLights = { group = "maven.modrinth", name = "lambdynamiclights", version.ref = "lambDynamicLights"} +jei-fabric = { group = "mezz.jei", name = "jei-1.20.1-fabric", version.ref = "jei-api"} + +# Forge +forge = { group = "net.minecraftforge", name = "forge", version.ref = "forge" } +kotlin-forge = { group = "thedarkcolour", name = "kotlinforforge", version.ref = "kotlin-for-forge" } +adorn-forge = { group = "maven.modrinth", name = "adorn", version = "5.0.0-forge"} + +# Data Storage +mongo-driver-core = { group = "org.mongodb", name = "mongodb-driver-core", version.ref = "mongo" } +mongo-driver-sync = { group = "org.mongodb", name = "mongodb-driver-sync", version.ref = "mongo" } + +# Testing +junit-fabric = { group = "net.fabricmc", name = "fabric-loader-junit", version.ref = "fabric-loader" } +junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" } +mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } +mock-kotlin = { group = "io.mockk", name = "mockk", version.ref = "mockk" } +classgraph = { group = "io.github.classgraph", name = "classgraph", version.ref = "classgraph" } + +[bundles] +kotlin = [ "kotlin-stdlib", "kotlin-reflect" ] +fabric = [ "fabric-kotlin", "fabric-permissions" ] +fabric-kotlin-deps = [ "jetbrains-annotations", "serialization-core", "serialization-json" ] +fabric-integrations-compileOnly = [ "adorn-fabric", "lambDynamicLights" ] +fabric-integrations-runtimeOnly = [ "jei-fabric" ] +mongo = [ "mongo-driver-core", "mongo-driver-sync" ] +unitTesting = [ "junit-fabric", "junit-params", "mockito-core", "mock-kotlin", "classgraph" ] \ No newline at end of file diff --git a/gradle/libs.versions.yml b/gradle/libs.versions.yml deleted file mode 100644 index f3bb9566e9..0000000000 --- a/gradle/libs.versions.yml +++ /dev/null @@ -1,171 +0,0 @@ -versions: - - # jetbrains - kotlin: 1.9.23 - coroutines: 1.7.3 - annotations: 23.0.0 - serialization: 1.6.2 - - # other - licenser: 0.6.1 - shadow: 7.1.2 - blossom: 2.1.0 - idea-ext: 1.1.7 - - # fabric/remap - loom: 1.6-SNAPSHOT - fabric-loader: 0.15.10 - fabric-api: 0.97.6+1.20.5 - fabric-kotlin: 1.10.19+kotlin.1.9.23 - architectury-plugin: 3.4-SNAPSHOT - flywheelFabric: 0.6.9-1 - fabric-permissions-api: 0.2-SNAPSHOT - lamb-dynamic-lights: 2.3.4+1.20.4 - - # neoforge - neoforge: 20.5.3-beta - kotlinForForge: 4.10.0 - flywheelForge: 0.6.10-7 - - # common - graal: 22.3.0 - molang: 1.1.11 - - # test - junit: 5.9.0 - mockito: 5.2.0 - mockk: 1.12.1 - classgraph: 4.8.153 - - -dependencies: - - # build-logic - kotlin: - group: org.jetbrains.kotlin - name: kotlin-gradle-plugin - version: { ref: kotlin } - licenser: - group: gradle.plugin.org.cadixdev.gradle - name: licenser - version: { ref: licenser } - shadow: - group: gradle.plugin.com.github.johnrengelman - name: shadow - version: { ref: shadow } - blossom: - group: net.kyori - name: blossom - version: { ref: blossom } - ideaExt: - group: org.jetbrains.gradle.plugin.idea-ext - name: org.jetbrains.gradle.plugin.idea-ext.gradle.plugin - version: { ref: idea-ext } - loom: - group: dev.architectury - name: architectury-loom - version: { ref: loom } - architecturyPlugin: - group: architectury-plugin - name: architectury-plugin.gradle.plugin - version: { ref: architectury-plugin } - - # Jetbrains // Core Stuff - stdlib: - group: org.jetbrains.kotlin - name: kotlin-stdlib-jdk8 - version: { ref: kotlin } - reflect: - group: org.jetbrains.kotlin - name: kotlin-reflect - version: { ref: kotlin } - jetbrainsAnnotations: - group: org.jetbrains - name: annotations - version: { ref: annotations } - serializationCore: - group: org.jetbrains.kotlinx - name: kotlinx-serialization-core-jvm - version: { ref: serialization } - serializationJson: - group: org.jetbrains.kotlinx - name: kotlinx-serialization-json-jvm - version: { ref: serialization } - graal: - group: org.graalvm.js - name: js - version: { ref: graal } - molang: - group: local.com.bedrockk - name: molang - version: { ref: molang } - fabricLoader: - group: net.fabricmc - name: fabric-loader - version: { ref: fabric-loader } - - - # fabric - fabricApi: - group: net.fabricmc.fabric-api - name: fabric-api - version: { ref: fabric-api } - fabricKotlin: - group: net.fabricmc - name: fabric-language-kotlin - version: { ref: fabric-kotlin } - fabricPermissionsApi: - group: me.lucko - name: fabric-permissions-api - version: { ref: fabric-permissions-api } - flywheelFabric: - group: com.jozufozu.flywheel - name: flywheel-fabric-1.20.1 - version: { ref: flywheelFabric } - lambDynamicLights: - group: maven.modrinth - name: lambdynamiclights - version: { ref: lamb-dynamic-lights } - - # forge - neoforge: - group: net.neoforged - name: neoforge - version: { ref: neoforge } - kotlinForForge: - group: thedarkcolour - name: kotlinforforge-neoforge - version: { ref: kotlinForForge } - - # datastore - mongoDriverCore: - group: org.mongodb - name: mongodb-driver-core - version: 4.10.2 - - mongoDriverSync: - group: org.mongodb - name: mongodb-driver-sync - version: 4.10.2 - - # test - fabricJunit: - group: net.fabricmc - name: fabric-loader-junit - version: { ref: fabric-loader } - junitParams: - group: org.junit.jupiter - name: junit-jupiter-params - version: { ref: junit } - mockito: - group: org.mockito - name: mockito-core - version: { ref: mockito } - mockk: - group: io.mockk - name: mockk - version: { ref: mockk } - classgraph: - group: io.github.classgraph - name: classgraph - version: { ref: classgraph } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2a..e6441136f3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7bb0436b5f..81c736bb3d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew b/gradlew index c53aefaa5f..1aa94a4269 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions $var, ${var}, ${var:-default}, ${var+SET}, -# ${var#prefix}, ${var%suffix}, and $( cmd ); -# * compound commands having a testable exit status, especially case; -# * various built-in commands including command, set, and ulimit. +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c4..7101f8e467 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,92 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lang-last-updates.txt b/lang-last-updates.txt index c9d39651ad..0b561cbf14 100644 --- a/lang-last-updates.txt +++ b/lang-last-updates.txt @@ -18,7 +18,7 @@ ja_jp 6291 ko_kr 1878 en_pt 6291 pl_pl 5105 -pt_pt 5905 +pt_pt 6291 pt_br 5452 ru_ru 6291 es_es 5445 diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts index 597045185e..1c77736450 100644 --- a/neoforge/build.gradle.kts +++ b/neoforge/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { implementation(project(":common", configuration = "namedElements")) { isTransitive = false } - implementation(libs.kotlinForForge) + implementation(libs.kotlin.forge) "developmentForge"(project(":common", configuration = "namedElements")) { isTransitive = false } diff --git a/neoforge/src/main/java/com/cobblemon/mod/neoforge/mixin/LootManagerMixin.java b/neoforge/src/main/java/com/cobblemon/mod/neoforge/mixin/LootManagerMixin.java index 64c35a56cc..c3a564248f 100644 --- a/neoforge/src/main/java/com/cobblemon/mod/neoforge/mixin/LootManagerMixin.java +++ b/neoforge/src/main/java/com/cobblemon/mod/neoforge/mixin/LootManagerMixin.java @@ -28,10 +28,17 @@ public class LootManagerMixin { /*@Redirect(method = "m_278660_", at = @At(value = "INVOKE", target = "Ljava/util/Map;forEach(Ljava/util/function/BiConsumer;)V"), remap = false) private static void cobblemon$supportICondition(Map map, BiConsumer consumer) { map.forEach((identifier, jsonElement) -> { - // If the element isn't present the result is true as well, also, it's safe to cast as JsonObject - if (CraftingHelper.processConditions(jsonElement.getAsJsonObject(), LOAD_CONDITIONS, ICondition.IContext.EMPTY)) { - consumer.accept(identifier, jsonElement); + // If the element isn't present the result is true as well, + // It is not in fact safe to cast to JsonObject, breaks Incendium + if (jsonElement.isJsonObject()) { + if (CraftingHelper.processConditions(jsonElement.getAsJsonObject(), LOAD_CONDITIONS, ICondition.IContext.EMPTY)) { + consumer.accept(identifier, jsonElement); + return; + } } + //Still need to do stuff if not obj + consumer.accept(identifier, jsonElement); + }); }*/ diff --git a/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt b/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt index 288e790e8a..6700544273 100644 --- a/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt +++ b/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt @@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.data.JsonDataRegistry import com.cobblemon.mod.common.item.group.CobblemonItemGroups import com.cobblemon.mod.common.loot.LootInjector import com.cobblemon.mod.common.particle.CobblemonParticles +import com.cobblemon.mod.common.sherds.CobblemonSherds import com.cobblemon.mod.common.util.cobblemonResource import com.cobblemon.mod.common.util.didSleep import com.cobblemon.mod.common.util.endsWith @@ -156,6 +157,9 @@ class CobblemonNeoForge : CobblemonImplementation { event.register(RegistryKeys.PLACEMENT_MODIFIER_TYPE) { CobblemonPlacementModifierTypes.touch() } + event.register(RegistryKeys.DECORATED_POT_PATTERN) { + CobblemonSherds.registerSherds() + } event.register(RegistryKeys.STRUCTURE_PROCESSOR) { CobblemonProcessorTypes.touch() @@ -353,10 +357,17 @@ class CobblemonNeoForge : CobblemonImplementation { } //TODO: I dont really know wtf is happening here, someone needs to check + //This event gets fired before init, so we need to put resource packs in EARLY fun onAddPackFindersEvent(event: AddPackFindersEvent) { if (event.packType != ResourceType.CLIENT_RESOURCES) { return } + + if (this.isModInstalled("adorn")) { + //AdornCompatibility.register() + registerBuiltinResourcePack(cobblemonResource("adorncompatibility"), Text.literal("Adorn Compatibility"), ResourcePackActivationBehaviour.ALWAYS_ENABLED) + } + val modFile = ModList.get().getModFileById(Cobblemon.MODID).file this.queuedBuiltinResourcePacks.forEach { (id, title, activationBehaviour) -> // Fabric expects resourcepacks as the root so we do too here diff --git a/settings.gradle.kts b/settings.gradle.kts index e8622c8e3b..873c887acd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,18 +1,19 @@ -rootProject.name = "cobblemon" +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement { repositories { + gradlePluginPortal() + mavenCentral() + maven("https://maven.fabricmc.net/") maven("https://maven.architectury.dev/") maven("https://maven.minecraftforge.net/") - gradlePluginPortal() } - includeBuild("build-logic") + + includeBuild("gradle/build-logic") } -plugins { - id("ca.stellardrift.polyglot-version-catalogs") version "6.1.0" -} +rootProject.name = "cobblemon" listOf( "common", diff --git a/utilityscripts/berry_spreadsheet_to_json.py b/utilityscripts/berry_spreadsheet_to_json.py index a29eedf516..02e2d2ea61 100644 --- a/utilityscripts/berry_spreadsheet_to_json.py +++ b/utilityscripts/berry_spreadsheet_to_json.py @@ -9,7 +9,7 @@ def stuff(): berry_data_wb = load_workbook(filename="Cobblemon Berry Data.xlsx", data_only=True) berry_dict = {} berry_file_name = "" - for row in berry_data_wb.active.iter_rows(3): + for row in berry_data_wb.active.iter_rows(2): berry_num = int(row[0].value) berry_name = row[1].value berry_prefix = berry_name[:-6].lower() @@ -35,16 +35,8 @@ def stuff(): } fav_mulches = [i.lower() for i in row[3].value.split(", ")] berry_dict["favoriteMulches"] = fav_mulches - betterYields = row[5].value.split("-") - berry_dict["growthFactors"] = [ - { - "variant": "cobblemon:preferred_biome", - "bonusYield": { - "min": int(betterYields[0]) - int(baseYields[0]), - "max": int(betterYields[1]) - int(baseYields[1]) - } - } - ] + berry_dict["growthFactors"] = [] + berry_dict["randomizedGrowthPoints"] = True spawn_type = row[11].value if spawn_type == "PREFERRED_BIOME": berry_dict["spawnConditions"] = [ @@ -65,32 +57,15 @@ def stuff(): else: berry_dict["spawnConditions"] = [] berry_dict["growthPoints"] = get_growth_points(row[0].row) + berry_dict["stageOnePositioning"] = get_stage_one_y_pos(row[0].row) berry_dict["mutations"] = get_mutations(berry_prefix) - berry_dict["sproutShape"] = [ - { - "minX": 7, - "minY": -1, - "minZ": 7, - "maxX": 9, - "maxY": 0, - "maxZ": 9 - } - ] - berry_dict["matureShape"] = [ - { - "minX": 0, - "minY": 0, - "minZ": 0, - "maxX": 16, - "maxY": 32, - "maxZ": 16 - } - ] - spicyVal = int(row[13].value) - dryVal = int(row[14].value) - sweetVal = int(row[15].value) - bitterVal = int(row[16].value) - sourVal = int(row[17].value) + berry_dict["sproutShape"] = f"{row[19].value.lower()}-sprout" + berry_dict["matureShape"] = f"{row[20].value.lower()}-mature" + spicyVal = int(row[14].value) + dryVal = int(row[15].value) + sweetVal = int(row[16].value) + bitterVal = int(row[17].value) + sourVal = int(row[18].value) flavorDict = {} if spicyVal > 0: flavorDict["SPICY"] = spicyVal @@ -103,11 +78,16 @@ def stuff(): if sourVal > 0: flavorDict["SOUR"] = sourVal berry_dict["flavors"] = flavorDict + if row[12].value != "N/A": + berry_dict["weight"] = float(row[12].value) + else: + berry_dict["weight"] = 1.0 berry_dict["tintIndexes"] = [] - berry_dict["flowerModel"] = f"cobblemon:{berry_prefix}_flower.geo" - berry_dict["flowerTexture"] = f"cobblemon:textures/berries/{berry_prefix}.png" + berry_dict["flowerModel"] = f"cobblemon:flower.geo" + berry_dict["flowerTexture"] = f"cobblemon:flower" berry_dict["fruitModel"] = f"cobblemon:{berry_prefix}_berry.geo" - berry_dict["fruitTexture"] = f"cobblemon:textures/berries/{berry_prefix}.png" + berry_dict["fruitTexture"] = f"cobblemon:{berry_prefix}" + berry_dict["boneMealChance"] = int(row[21].value) / 100.0 with open(f"berries/{berry_file_name}", "w+") as file: file.write(json.dumps(berry_dict, indent=2)) @@ -137,6 +117,22 @@ def get_growth_points(rowNum): ] return result +def get_stage_one_y_pos(rowNum): + berry_placements_wb = load_workbook(filename="Berry Placements.xlsx", data_only=True) + row = berry_placements_wb.active[rowNum + 1] + return { + "position": { + "x": float(row[66].value), + "y": float(row[67].value), + "z": float(row[68].value) + }, + "rotation": { + "x": float(row[69].value), + "y": float(row[70].value), + "z": float(row[71].value) + } + } + def get_mutations(berry_name): berry_mutations_wb = load_workbook(filename="Berry Mutations (v2).xlsx", data_only=True) result = {} diff --git a/utilityscripts/cobblemon_spawn_csv_to_json.py b/utilityscripts/cobblemon_spawn_csv_to_json.py index 09ef55fced..bea43a19eb 100644 --- a/utilityscripts/cobblemon_spawn_csv_to_json.py +++ b/utilityscripts/cobblemon_spawn_csv_to_json.py @@ -19,7 +19,7 @@ def init_filters(): global pokemon_numbers, included_groups, known_contexts, bucket_mapping, included_generations # Define what kind of pokémon should be included, if nothing is specified (empty array), all will be included. # filter by number ranges (dex range) - pokemon_numbers = range(79, 81) + pokemon_numbers = range(875, 876) # filter by group included_groups = ['basic', 'boss', 'fossil'] # filter by context @@ -67,6 +67,7 @@ biome_mapping = { 'floral meadow': 'the_bumblezone:floral_meadow', 'forest': '#cobblemon:is_forest', 'freezing': '#cobblemon:is_freezing', + 'freshwater':'#cobblemon:is_freshwater', 'frozen ocean': '#cobblemon:is_frozen_ocean', 'glacial': '#cobblemon:is_glacial', 'grassland': '#cobblemon:is_grassland', @@ -104,6 +105,7 @@ biome_mapping = { 'plains': '#cobblemon:is_plains', 'plateau': '#cobblemon:is_plateau', 'pollinated fields': 'the_bumblezone:pollinated_fields', + 'river': '#cobblemon:is_river', 'sandy': '#cobblemon:is_sandy', 'savanna': '#cobblemon:is_savanna', 'shrubland': '#cobblemon:is_shrubland', @@ -323,9 +325,7 @@ def validateAndFilterData(csv_df, only_update_existing_files=False, ignore_filte 'included_groups': 'Group', 'known_contexts': 'Context', 'bucket_mapping': 'Bucket', - 'included_generations': 'Gen', - 'custom_dirs': 'Folder', - 'custom_files': 'File Name' + 'included_generations': 'Gen' } # Iterate over the dictionary and apply the filters diff --git a/utilityscripts/gen_berry_blockstates.py b/utilityscripts/gen_berry_blockstates.py new file mode 100644 index 0000000000..514aa7a930 --- /dev/null +++ b/utilityscripts/gen_berry_blockstates.py @@ -0,0 +1,70 @@ +import os +import json + +def gen_age_mod(age, rooted, berry_name): + model_dict = { + 0: "cobblemon:block/berries/planted_bound" if rooted else "cobblemon:block/berries/planted", + 1: "cobblemon:block/berries/sprout", + 2: f"cobblemon:block/berries/{berry_name}_young", + 3: f"cobblemon:block/berries/{berry_name}_mature", + 4: f"cobblemon:block/berries/{berry_name}_mature", + 5: f"cobblemon:block/berries/{berry_name}_mature" + } + result = dict() + when_dict = dict() + and_list = list() + and_list.append({ + "age": age + }) + and_list.append({ + "rooted": rooted + }) + when_dict["AND"] = and_list + apply_dict = { + "model": model_dict[age], + "uvlock": False + } + result["when"] = when_dict + result["apply"] = apply_dict + return result + +def gen_mulch_mod(mulch): + result = dict() + when_dict = { + "mulch": mulch + } + + apply_dict = { + "model": f"cobblemon:block/{mulch}_mulch" + } + result["when"] = when_dict + result["apply"] = apply_dict + return result + + + +if __name__ == "__main__": + berry_files = os.listdir("../common/src/main/resources/data/cobblemon/berries") + for f in berry_files: + berry_name = f[:-11] + file = open(f"blockstate/{f}", "w+") + multipart_list = list() + for i in range(0, 6): + multipart_list.append(gen_age_mod(i, False, berry_name)) + multipart_list.append(gen_age_mod(i, True, berry_name)) + mulch_list = ( + "coarse", + "growth", + "humid", + "loamy", + "peat", + "rich", + "sandy", + "surprise" + ) + for mulch in mulch_list: + multipart_list.append(gen_mulch_mod(mulch)) + file.write(json.dumps({ + "multipart": multipart_list + }, indent=2)) + file.close() \ No newline at end of file