diff --git a/lib/Consts.dart b/lib/Consts.dart index 2115843..7332291 100644 --- a/lib/Consts.dart +++ b/lib/Consts.dart @@ -1,7 +1,7 @@ import 'dart:io'; class Constants { - static const VERSION = "1.0.032825+1921"; + static const VERSION = "1.0.032825+2029"; //static bool get isMobile => Platform.isAndroid || Platform.isIOS; } diff --git a/lib/dexMisc.dart b/lib/dexMisc.dart index 1b13aad..5936e76 100644 --- a/lib/dexMisc.dart +++ b/lib/dexMisc.dart @@ -89,6 +89,9 @@ enum GameRoute { GoldenrodCity(commonName: "Goldenrod City"), MtSilver(commonName: "Mt. Silver"), VictoryRoad(commonName: "Victory Road"), + PowerPlant(commonName: "Power Plant"), + CeladonCity(commonName: "Celadon City"), + SafariZone(commonName: "Safari Zone"), // The following mark the pokemon as not usually obtainable TradeOrMigrate(commonName: "Trade or Migrate from another game"), diff --git a/lib/generations/Gen1Data.dart b/lib/generations/Gen1Data.dart index 5af6187..bf8821f 100644 --- a/lib/generations/Gen1Data.dart +++ b/lib/generations/Gen1Data.dart @@ -1165,6 +1165,62 @@ class Gen1Locations { GameRoute.VictoryRoad, ], Generation.Three), ]; + static const List Pikachu = [ + Location( + Game.Red, + [GameRoute.PowerPlant, GameRoute.ViridianForest], + Generation.One, + additionalGames: [Game.Blue], + ), + Location(Game.Yellow, [GameRoute.PalletTown], Generation.One), + Location( + Game.Gold, + [GameRoute.RT2], + Generation.Two, + additionalGames: [Game.Silver], + ), + Location(Game.Crystal, [ + GameRoute.RT2, + GameRoute.CeladonCity, + ], Generation.Two), + Location( + Game.Ruby, + [GameRoute.SafariZone], + Generation.Three, + additionalGames: [Game.Sapphire, Game.Emerald], + ), + Location( + Game.FireRed, + [GameRoute.PowerPlant, GameRoute.ViridianForest], + Generation.Three, + additionalGames: [Game.LeafGreen], + ), + ]; + static const List Raichu = [ + Location(Game.Red, [GameRoute.CeruleanCity], Generation.One), + Location(Game.Blue, [ + GameRoute.CeruleanCity, + GameRoute.PowerPlant, + ], Generation.One), + Location(Game.Yellow, [GameRoute.Evolve], Generation.One), + Location( + Game.Gold, + [GameRoute.Evolve], + Generation.Two, + additionalGames: [Game.Silver, Game.Crystal], + ), + Location( + Game.Ruby, + [GameRoute.Evolve], + Generation.Three, + additionalGames: [ + Game.Sapphire, + Game.Emerald, + Game.FireRed, + Game.LeafGreen, + ], + ), + ]; } class Gen1DexData { @@ -2340,4 +2396,110 @@ class Gen1DexData { Generation.Three, ), ]; + static const List Pikachu = [ + DexEntry( + Game.Red, + "When several of these POKéMON gather, their electricity could build and cause lightning storms.", + Generation.One, + additionalGames: [Game.Blue], + ), + DexEntry( + Game.Yellow, + "It keeps its tail raised to monitor its surroundings. If you yank its tail, it will try to bite you.", + Generation.One, + ), + DexEntry( + Game.Gold, + "This intelligent POKéMON roasts hard BERRIES with electricity to make them tender enough to eat.", + Generation.Two, + ), + DexEntry( + Game.Silver, + "It raises its tail to check its surroundings. The tail is sometimes struck by lightning in this pose.", + Generation.Two, + ), + DexEntry( + Game.Crystal, + "When it is angered, it immediately discharges the energy stored in the pouches in its cheeks.", + Generation.Two, + ), + DexEntry( + Game.Ruby, + "Whenever PIKACHU comes across something new, it blasts it with a jolt of electricity. If you come across a blackened berry, it’s evidence that this POKéMON mistook the intensity of its charge.", + Generation.Three, + ), + DexEntry( + Game.Sapphire, + "This POKéMON has electricity-storing pouches on its cheeks. These appear to become electrically charged during the night while PIKACHU sleeps. It occasionally discharges electricity when it is dozy after waking up.", + Generation.Three, + ), + DexEntry( + Game.Emerald, + "It stores electricity in the electric sacs on its cheeks. When it releases pent-up energy in a burst, the electric power is equal to a lightning bolt.", + Generation.Three, + ), + DexEntry( + Game.FireRed, + "It has small electric sacs on both its cheeks. If threatened, it looses electric charges from the sacs.", + Generation.Three, + ), + DexEntry( + Game.LeafGreen, + "When several of these POKéMON gather, their electricity can build and cause lightning storms.", + Generation.Three, + ), + ]; + static const List Raichu = [ + DexEntry( + Game.Red, + "Its long tail serves as a ground to protect itself from its own high voltage power.", + Generation.One, + additionalGames: [Game.Blue], + ), + DexEntry( + Game.Yellow, + "When electricity builds up inside its body, it becomes feisty. It also glows in the dark.", + Generation.One, + ), + DexEntry( + Game.Gold, + "When its electricity builds, its muscles are stimulated, and it becomes more aggressive than usual.", + Generation.Two, + ), + DexEntry( + Game.Silver, + "If the electric pouches in its cheeks become fully charged, both ears will stand straight up.", + Generation.Two, + ), + DexEntry( + Game.Crystal, + "If its electric pouches run empty, it raises its tail to gather electricity from the atmosphere.", + Generation.Two, + ), + DexEntry( + Game.Ruby, + "If the electrical sacks become excessively charged, RAICHU plants its tail in the ground and discharges. Scorched patches of ground will be found near this POKéMON’s nest.", + Generation.Three, + ), + DexEntry( + Game.Sapphire, + "This POKéMON exudes a weak electrical charge from all over its body that makes it take on a slight glow in darkness. RAICHU searches for electricity by planting its tail in the ground.", + Generation.Three, + ), + DexEntry( + Game.Emerald, + "If it stores too much electricity, its behavior turns aggressive. To avoid this, it occasionally discharges excess energy and calms itself down.", + Generation.Three, + ), + DexEntry( + Game.FireRed, + "Its electric charges can reach even 100,000 volts. Careless contact can cause even an Indian elephant to faint.", + Generation.Three, + ), + DexEntry( + Game.LeafGreen, + "Its long tail serves as a ground to protect itself from its own high-voltage power.", + Generation.Three, + ), + ]; } diff --git a/lib/pokemon.dart b/lib/pokemon.dart index 662f24e..7b17566 100644 --- a/lib/pokemon.dart +++ b/lib/pokemon.dart @@ -309,8 +309,18 @@ enum Pokemon { [Type.Electric], SingleEvolution(26, -1, condition: [EvolutionCondition.ThunderStone]), previousPokemon: 172, + locations: Gen1Locations.Pikachu, + dexEntries: Gen1DexData.Pikachu, + ), + Raichu( + 26, + Generation.One, + [Type.Electric], + null, + previousPokemon: 25, + locations: Gen1Locations.Raichu, + dexEntries: Gen1DexData.Raichu, ), - Raichu(26, Generation.One, [Type.Electric], null, previousPokemon: 25), Sandshrew(27, Generation.One, [Type.Ground], SingleEvolution(28, 22)), Sandslash(28, Generation.One, [Type.Ground], null, previousPokemon: 27), NidoranF(29, Generation.One, [Type.Poison], SingleEvolution(30, 16)), diff --git a/pubspec.yaml b/pubspec.yaml index 4d360bc..d9f1c6b 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.032825+1921 +version: 1.0.032825+2029 environment: sdk: ^3.7.0