From 87f81e3b19074b03e46c8cde0d8fe6bfe3860140 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 31 May 2025 23:48:40 -0700 Subject: [PATCH] Add Sandslash data entries --- LATEST_VERSION | 2 +- lib/Consts.dart | 2 +- lib/dexMisc.dart | 1 + lib/generations/Gen1Data.dart | 83 +++++++++++++++++++++++++++++++++++ lib/pokemon.dart | 10 ++++- pubspec.yaml | 2 +- 6 files changed, 96 insertions(+), 4 deletions(-) diff --git a/LATEST_VERSION b/LATEST_VERSION index a1fa19c..ad14a93 100644 --- a/LATEST_VERSION +++ b/LATEST_VERSION @@ -1 +1 @@ -1.0.053125+2326 \ No newline at end of file +1.0.053125+2347 \ No newline at end of file diff --git a/lib/Consts.dart b/lib/Consts.dart index e3803da..1aa7a56 100644 --- a/lib/Consts.dart +++ b/lib/Consts.dart @@ -1,5 +1,5 @@ class Constants { - static const VERSION = "1.0.053125+2326"; + static const VERSION = "1.0.053125+2347"; //static bool get isMobile => Platform.isAndroid || Platform.isIOS; } diff --git a/lib/dexMisc.dart b/lib/dexMisc.dart index fbbd99f..64b5da7 100644 --- a/lib/dexMisc.dart +++ b/lib/dexMisc.dart @@ -67,6 +67,7 @@ enum GameRoute { BogsunkCavern(commonName: "Bogsunk Cavern"), PalletTown(commonName: "Pallet Town"), CeruleanCity(commonName: "Cerulean City"), + CeruleanCave(commonName: "Cerulean Cave"), VermilionCity(commonName: "Vermilion City"), LumioseCity(commonName: "Lumiose City"), SeawardCave(commonName: "Seaward Cave"), diff --git a/lib/generations/Gen1Data.dart b/lib/generations/Gen1Data.dart index 03e4f21..fa88884 100644 --- a/lib/generations/Gen1Data.dart +++ b/lib/generations/Gen1Data.dart @@ -1270,6 +1270,36 @@ class Gen1Locations { GameRoute.MirageTower, ], Generation.Three), ]; + static const List Sandslash = [ + Location(Game.Red, [GameRoute.TradeOrMigrate], Generation.One), + Location(Game.Blue, [ + GameRoute.RT23, + GameRoute.CeruleanCave, + ], Generation.One), + Location(Game.Yellow, [GameRoute.CeruleanCave], Generation.One), + Location(Game.Gold, [ + GameRoute.RT26, + GameRoute.RT27, + GameRoute.MtMoon, + ], Generation.Two), + Location(Game.Silver, [GameRoute.Evolve], Generation.Two), + Location(Game.Crystal, [ + GameRoute.RT26, + GameRoute.VictoryRoad, + ], Generation.Two), + Location( + Game.Ruby, + [GameRoute.Evolve], + Generation.Three, + additionalGames: [Game.Sapphire], + ), + Location(Game.FireRed, [GameRoute.TradeOrMigrate], Generation.Three), + Location(Game.LeafGreen, [ + GameRoute.RT23, + GameRoute.VictoryRoad, + ], Generation.Three), + Location(Game.Emerald, [GameRoute.Evolve], Generation.Three), + ]; } class Gen1DexData { @@ -2610,4 +2640,57 @@ class Gen1DexData { additionalGames: [Game.Pearl, Game.Platinum], ), ]; + static const List Sandslash = [ + DexEntry( + Game.Red, + "Curls up into a spiny ball when threatened. It can roll while curled up to attack or escape.", + Generation.One, + additionalGames: [Game.Blue], + ), + DexEntry( + Game.Yellow, + "It is skilled at slashing enemies with its claws. If broken, they start to grow back in a day.", + Generation.One, + ), + DexEntry( + Game.Gold, + "In an attempt to hide itself, it will run around at top speed to kick up a blinding dust storm.", + Generation.Two, + ), + DexEntry( + Game.Silver, + "If it digs at an incredible pace, it may snap off its spikes and claws. They grow back in a day.", + Generation.Two, + ), + DexEntry( + Game.Crystal, + "Adept at climbing trees, it rolls into a spiny ball, then attacks its enemies from above.", + Generation.Two, + ), + DexEntry( + Game.Ruby, + "SANDSLASH's body is covered by tough spikes, which are hardened sections of its hide. Once a year, the old spikes fall out, to be replaced with new spikes that grow out from beneath the old ones.", + Generation.Three, + ), + DexEntry( + Game.Sapphire, + "SANDSLASH can roll up its body as if it were a ball covered with large spikes. In battle, this POKéMON will try to make the foe flinch by jabbing it with its spines. It then leaps at the stunned foe to tear wildly with its sharp claws.", + Generation.Three, + ), + DexEntry( + Game.FireRed, + "It is adept at attacking with the spines on its back and its sharp claws while quickly scurrying about.", + Generation.Three, + ), + DexEntry( + Game.LeafGreen, + "Curls up into a spiny ball when threatened. It can roll while curled up to attack or escape.", + Generation.Three, + ), + DexEntry( + Game.Emerald, + "It curls up in a ball to protect itself from enemy attacks. It also curls up to prevent heatstroke during the daytime when temperatures rise sharply.", + Generation.Three, + ), + ]; } diff --git a/lib/pokemon.dart b/lib/pokemon.dart index 056d655..bdabebd 100644 --- a/lib/pokemon.dart +++ b/lib/pokemon.dart @@ -330,7 +330,15 @@ enum Pokemon { locations: Gen1Locations.Sandshrew, dexEntries: Gen1DexData.Sandshrew, ), - Sandslash(28, Generation.One, [Type.Ground], null, previousPokemon: 27), + Sandslash( + 28, + Generation.One, + [Type.Ground], + null, + previousPokemon: 27, + locations: Gen1Locations.Sandslash, + dexEntries: Gen1DexData.Sandslash, + ), NidoranF(29, Generation.One, [Type.Poison], SingleEvolution(30, 16)), Nidorina( 30, diff --git a/pubspec.yaml b/pubspec.yaml index 3e291dc..df54747 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.053125+2326 +version: 1.0.053125+2347 environment: sdk: ^3.7.0