diff --git a/LATEST_VERSION b/LATEST_VERSION index ad14a93..a42fb95 100644 --- a/LATEST_VERSION +++ b/LATEST_VERSION @@ -1 +1 @@ -1.0.053125+2347 \ No newline at end of file +1.0.060125+0013 \ No newline at end of file diff --git a/lib/Consts.dart b/lib/Consts.dart index 1aa7a56..e4e8605 100644 --- a/lib/Consts.dart +++ b/lib/Consts.dart @@ -1,5 +1,5 @@ class Constants { - static const VERSION = "1.0.053125+2347"; + static const VERSION = "1.0.060125+0013"; //static bool get isMobile => Platform.isAndroid || Platform.isIOS; } diff --git a/lib/dexMisc.dart b/lib/dexMisc.dart index 64b5da7..af857e9 100644 --- a/lib/dexMisc.dart +++ b/lib/dexMisc.dart @@ -97,6 +97,7 @@ enum GameRoute { SafariZone(commonName: "Safari Zone"), MtMoon(commonName: "Mt. Moon"), MirageTower(commonName: "Mirage Tower"), + UndergroundPath5_6(commonName: "Underground Path 5-6"), // 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 fa88884..2d1bae9 100644 --- a/lib/generations/Gen1Data.dart +++ b/lib/generations/Gen1Data.dart @@ -1300,6 +1300,110 @@ class Gen1Locations { ], Generation.Three), Location(Game.Emerald, [GameRoute.Evolve], Generation.Three), ]; + static const List NidoranF = [ + Location( + Game.Red, + [ + GameRoute.RT5, + GameRoute.RT22, + GameRoute.UndergroundPath5_6, + GameRoute.SafariZone, + ], + Generation.One, + additionalGames: [Game.Blue], + ), + Location(Game.Yellow, [ + GameRoute.RT2, + GameRoute.RT9, + GameRoute.RT10, + GameRoute.RT22, + GameRoute.SafariZone, + ], Generation.One), + Location( + Game.Gold, + [GameRoute.RT35, GameRoute.RT36], + Generation.Two, + additionalGames: [Game.Silver], + ), + Location(Game.Crystal, [ + GameRoute.RT35, + GameRoute.NationalPark, + ], Generation.Two), + Location( + Game.Ruby, + [GameRoute.TradeOrMigrate], + Generation.Three, + additionalGames: [Game.Sapphire], + ), + Location(Game.FireRed, [ + GameRoute.RT3, + GameRoute.RT5, + GameRoute.UndergroundPath5_6, + GameRoute.SafariZone, + ], Generation.Three), + Location(Game.LeafGreen, [ + GameRoute.RT3, + GameRoute.SafariZone, + ], Generation.Three), + Location(Game.Emerald, [GameRoute.TradeOrMigrate], Generation.Three), + ]; + static const List Nidorina = [ + Location(Game.Red, [ + GameRoute.RT11, + GameRoute.CeladonCity, + GameRoute.SafariZone, + ], Generation.One), + Location(Game.Blue, [GameRoute.RT11, GameRoute.SafariZone], Generation.One), + Location(Game.Yellow, [ + GameRoute.RT9, + GameRoute.RT23, + GameRoute.SafariZone, + ], Generation.One), + Location(Game.Gold, [ + GameRoute.RT13, + GameRoute.RT14, + GameRoute.RT15, + ], Generation.Two), + Location( + Game.Ruby, + [GameRoute.TradeOrMigrate], + Generation.Three, + additionalGames: [Game.Sapphire], + ), + Location(Game.FireRed, [ + GameRoute.RT11, + GameRoute.SafariZone, + ], Generation.Three), + Location(Game.LeafGreen, [GameRoute.SafariZone], Generation.Three), + Location(Game.Emerald, [GameRoute.TradeOrMigrate], Generation.Three), + ]; + static const List Nidoqueen = [ + Location( + Game.Red, + [GameRoute.Evolve], + Generation.One, + additionalGames: [Game.Blue, Game.Yellow], + ), + Location( + Game.Gold, + [GameRoute.Evolve], + Generation.Two, + additionalGames: [Game.Silver, Game.Crystal], + ), + Location( + Game.Ruby, + [GameRoute.TradeOrMigrate], + Generation.Three, + additionalGames: [Game.Sapphire], + ), + Location( + Game.FireRed, + [GameRoute.Evolve], + Generation.Three, + additionalGames: [Game.LeafGreen], + ), + Location(Game.Emerald, [GameRoute.TradeOrMigrate], Generation.Three), + ]; } class Gen1DexData { @@ -2693,4 +2797,151 @@ class Gen1DexData { Generation.Three, ), ]; + static const List NidoranF = [ + DexEntry( + Game.Red, + "Although small, its venomous barbs render this POKéMON dangerous. The female has smaller horns.", + Generation.One, + additionalGames: [Game.Blue], + ), + DexEntry( + Game.Yellow, + "A mild-mannered POKéMON that does not like to fight. Beware, its small horns secrete venom.", + Generation.One, + ), + DexEntry( + Game.Gold, + "The poison hidden in its small horn is extremely potent. Even a tiny scratch can have fatal results.", + Generation.Two, + ), + DexEntry( + Game.Silver, + "Although not very combative, it will torment its foes with poison spikes if it is threatened in any way.", + Generation.Two, + ), + DexEntry( + Game.Crystal, + "Small and very docile, it protects itself with its small, poisonous horn when attacked.", + Generation.Two, + ), + DexEntry( + Game.Ruby, + "NIDORAN has barbs that secrete a powerful poison. They are thought to have developed as protection for this small-bodied POKéMON. When enraged, it releases a horrible toxin from its horn.", + Generation.Three, + additionalGames: [Game.Sapphire], + ), + DexEntry( + Game.FireRed, + "Though small, it must be treated with caution because of its powerfully toxic barbs. The female has smaller horns.", + Generation.Three, + ), + DexEntry( + Game.LeafGreen, + "Although small, its venomous barbs render this POKéMON dangerous. The female has smaller horns.", + Generation.Three, + ), + DexEntry( + Game.Emerald, + "Its highly toxic barbs are thought to have developed as protection for this small-bodied POKéMON. When enraged, it releases a horrible toxin from its horn.", + Generation.Three, + ), + ]; + static const List Nidorina = [ + DexEntry( + Game.Red, + "The female’s horn develops slowly. Prefers physical attacks such as clawing and biting.", + Generation.One, + additionalGames: [Game.Blue], + ), + DexEntry( + Game.Yellow, + "When resting deep in its burrow, its thorns always retract. This is proof that it is relaxed.", + Generation.One, + ), + DexEntry( + Game.Gold, + "When feeding its young, it first chews and tenderizes the food, then spits it out for the offspring.", + Generation.Two, + ), + DexEntry( + Game.Silver, + "It has a calm and caring nature. Because its horn grows slowly, it prefers not to fight.", + Generation.Two, + ), + DexEntry( + Game.Crystal, + "It has a docile nature. If it is threatened with attack, it raises the barbs that are all over its body.", + Generation.Two, + ), + DexEntry( + Game.Ruby, + "When NIDORINA are with their friends or family, they keep their barbs tucked away to prevent hurting each other. This POKéMON appears to become nervous if separated from the others.", + Generation.Three, + additionalGames: [Game.Sapphire], + ), + DexEntry( + Game.FireRed, + "The female has a gentle temperament. It emits ultrasonic cries that have the power to befuddle foes.", + Generation.Three, + ), + DexEntry( + Game.LeafGreen, + "The female’s horns develop slowly. Prefers physical attacks such as clawing and biting.", + Generation.Three, + ), + DexEntry( + Game.Emerald, + "When it is with its friends or family, its barbs are tucked away to prevent injury. It appears to become nervous if separated from the others.", + Generation.Three, + ), + ]; + static const List Nidoqueen = [ + DexEntry( + Game.Red, + "Its hard scales provide strong protection. It uses its hefty bulk to execute powerful moves.", + Generation.One, + additionalGames: [Game.Blue], + ), + DexEntry( + Game.Yellow, + "Tough scales cover the sturdy body of this POKéMON. It appears that the scales grow in cycles.", + Generation.One, + ), + DexEntry( + Game.Gold, + "Its body is covered with needle-like scales. It never shows signs of shrinking from any attack.", + Generation.Two, + ), + DexEntry( + Game.Silver, + "It uses its scaly, rugged body to seal the entrance of its nest and protect its young from predators.", + Generation.Two, + ), + DexEntry( + Game.Crystal, + "The hard scales that cover its strong body serve as excellent protection from any attack.", + Generation.Two, + ), + DexEntry( + Game.Ruby, + "NIDOQUEEN’s body is encased in extremely hard scales. It is adept at sending foes flying with harsh tackles. This POKéMON is at its strongest when it is defending its young.", + Generation.Three, + additionalGames: [Game.Sapphire], + ), + DexEntry( + Game.FireRed, + "The body is covered by stiff, needle-like scales. If it becomes excited, the needles bristle outwards.", + Generation.Three, + ), + DexEntry( + Game.LeafGreen, + "Its hard scales provide strong protection. It uses its hefty bulk to execute powerful moves.", + Generation.Three, + ), + DexEntry( + Game.Emerald, + "It is adept at sending foes flying with harsh tackles using its tough, scaly body. This POKéMON is at its strongest when it is defending its young.", + Generation.Three, + ), + ]; } diff --git a/lib/pokemon.dart b/lib/pokemon.dart index bdabebd..1fed3f9 100644 --- a/lib/pokemon.dart +++ b/lib/pokemon.dart @@ -339,13 +339,22 @@ enum Pokemon { locations: Gen1Locations.Sandslash, dexEntries: Gen1DexData.Sandslash, ), - NidoranF(29, Generation.One, [Type.Poison], SingleEvolution(30, 16)), + NidoranF( + 29, + Generation.One, + [Type.Poison], + SingleEvolution(30, 16), + locations: Gen1Locations.NidoranF, + dexEntries: Gen1DexData.NidoranF, + ), Nidorina( 30, Generation.One, [Type.Poison], SingleEvolution(31, 36), previousPokemon: 29, + locations: Gen1Locations.Nidorina, + dexEntries: Gen1DexData.Nidorina, ), NidoQueen( 31, @@ -353,6 +362,8 @@ enum Pokemon { [Type.Poison, Type.Ground], null, previousPokemon: 30, + locations: Gen1Locations.Nidoqueen, + dexEntries: Gen1DexData.Nidoqueen, ), NidoranM(32, Generation.One, [Type.Poison], SingleEvolution(33, 16)), Nidorino( diff --git a/pubspec.yaml b/pubspec.yaml index df54747..0838dfb 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+2347 +version: 1.0.060125+0013 environment: sdk: ^3.7.0