diff --git a/lib/Consts.dart b/lib/Consts.dart index 27a50ce..b771f6d 100644 --- a/lib/Consts.dart +++ b/lib/Consts.dart @@ -1,7 +1,7 @@ import 'dart:io'; class Constants { - static const VERSION = "1.0.032625+0330"; + static const VERSION = "1.0.032625+1410"; //static bool get isMobile => Platform.isAndroid || Platform.isIOS; } diff --git a/lib/dexMisc.dart b/lib/dexMisc.dart index fc2f211..c7cf174 100644 --- a/lib/dexMisc.dart +++ b/lib/dexMisc.dart @@ -4,13 +4,25 @@ import 'package:pokedex/pokemon.dart'; enum GameRoute { RT1, RT2, + RT3, RT5, + RT6, + RT7, + RT8, + RT11, + RT12, + RT13, + RT14, + RT15, + RT21, RT24, RT25, RT26, RT27, + RT29, RT30, RT31, + RT32, RT34, RT35, RT36, @@ -41,6 +53,9 @@ enum GameRoute { VermilionCity(commonName: "Vermilion City"), LumioseCity(commonName: "Lumiose City"), SeawardCave(commonName: "Seaward Cave"), + BerryForest(commonName: "Berry Forest"), + BondBridge(commonName: "Bond Bridge"), + FiveIsleMeadow(commonName: "Five Isle Meadow"), // The following mark the pokemon as not usually obtainable TradeOrMigrate(commonName: "Trade or Migrate from another game"), diff --git a/lib/pokemon.dart b/lib/pokemon.dart index 803eb42..ad4054e 100644 --- a/lib/pokemon.dart +++ b/lib/pokemon.dart @@ -1456,10 +1456,159 @@ enum Pokemon { ), ], ), - Pidgey(16, Generation.One, [ - Type.Normal, - Type.Flying, - ], SingleEvolution(17, 18)), + Pidgey( + 16, + Generation.One, + [Type.Normal, Type.Flying], + SingleEvolution(17, 18), + locations: [ + Location( + Game.Red, + [ + GameRoute.RT1, + GameRoute.RT2, + GameRoute.RT3, + GameRoute.RT5, + GameRoute.RT6, + GameRoute.RT7, + GameRoute.RT8, + GameRoute.RT12, + GameRoute.RT13, + GameRoute.RT14, + GameRoute.RT15, + GameRoute.RT21, + GameRoute.RT24, + GameRoute.RT25, + ], + Generation.One, + additionalGames: [Game.Blue], + ), + Location(Game.Yellow, [ + GameRoute.RT1, + GameRoute.RT2, + GameRoute.RT5, + GameRoute.RT6, + GameRoute.RT7, + GameRoute.RT8, + GameRoute.RT11, + GameRoute.RT12, + GameRoute.RT13, + GameRoute.RT21, + GameRoute.RT24, + GameRoute.RT25, + GameRoute.ViridianForest, + ], Generation.One), + Location( + Game.Gold, + [ + GameRoute.RT1, + GameRoute.RT2, + GameRoute.RT5, + GameRoute.RT6, + GameRoute.RT25, + GameRoute.RT29, + GameRoute.RT30, + GameRoute.RT31, + GameRoute.RT35, + GameRoute.RT36, + GameRoute.RT37, + GameRoute.NationalPark, + ], + Generation.Two, + additionalGames: [Game.Silver], + ), + Location(Game.Crystal, [ + GameRoute.RT1, + GameRoute.RT2, + GameRoute.RT5, + GameRoute.RT25, + GameRoute.RT29, + GameRoute.RT30, + GameRoute.RT31, + GameRoute.RT32, + GameRoute.RT34, + GameRoute.RT35, + GameRoute.RT36, + GameRoute.RT37, + GameRoute.IlexForest, + GameRoute.NationalPark, + ], Generation.Two), + Location( + Game.Ruby, + [GameRoute.TradeOrMigrate], + Generation.Three, + additionalGames: [Game.Sapphire, Game.Emerald], + ), + Location(Game.FireRed, [ + GameRoute.RT1, + GameRoute.RT2, + GameRoute.RT3, + GameRoute.RT5, + GameRoute.RT6, + GameRoute.RT7, + GameRoute.RT8, + GameRoute.RT12, + GameRoute.RT13, + GameRoute.RT14, + GameRoute.RT15, + GameRoute.RT24, + GameRoute.RT25, + GameRoute.BerryForest, + GameRoute.BondBridge, + GameRoute.FiveIsleMeadow, + ], Generation.Three), + ], + + dexEntries: [ + DexEntry( + Game.Red, + "A common sight in forests and woods. It flaps its wings at ground level to kick up blinding sand.", + Generation.One, + additionalGames: [Game.Blue], + ), + DexEntry( + Game.Yellow, + "Very docile. If attacked, it will often kick up sand to protect itself rather than fight back.", + Generation.One, + ), + DexEntry( + Game.Gold, + "It usually hides in tall grass. Because it dislikes fighting, it protects itself by kicking up sand.", + Generation.Two, + ), + DexEntry( + Game.Silver, + "Common in grassy areas and forests, it is very docile and will chase off enemies by flapping up sand.", + Generation.Two, + ), + DexEntry( + Game.Crystal, + "It rapidly flaps its wings in the grass, stirring up a dust cloud that drives insect prey out into the open.", + Generation.Two, + ), + DexEntry( + Game.Ruby, + "PIDGEY has an extremely sharp sense of direction. It is capable of unerringly returning home to its nest, however far it may be removed from its familiar surroundings.", + Generation.Three, + additionalGames: [Game.Sapphire], + ), + DexEntry( + Game.FireRed, + "Does not like to fight. It hides in tall grass and so on, foraging for food such as small bugs.", + Generation.Three, + ), + DexEntry( + Game.LeafGreen, + "A common sight in forests and woods. It flaps its wings at ground level to kick up blinding sand.", + Generation.Three, + ), + DexEntry( + Game.Emerald, + "It has an extremely sharp sense of direction. It can unerringly return home to its nest, however far it may be removed from its familiar surroundings.", + Generation.Three, + ), + ], + ), Pidgeotto( 17, Generation.One, diff --git a/pubspec.yaml b/pubspec.yaml index 8a44a08..5a948ca 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.032625+0330 +version: 1.0.032625+1410 environment: sdk: ^3.7.0