diff --git a/assets/sprites/arcanine.png b/assets/sprites/arcanine.png new file mode 100644 index 0000000..83c0a22 Binary files /dev/null and b/assets/sprites/arcanine.png differ diff --git a/assets/sprites/diglett.png b/assets/sprites/diglett.png new file mode 100644 index 0000000..1dd4b49 Binary files /dev/null and b/assets/sprites/diglett.png differ diff --git a/assets/sprites/dugtrio.png b/assets/sprites/dugtrio.png new file mode 100644 index 0000000..7453e11 Binary files /dev/null and b/assets/sprites/dugtrio.png differ diff --git a/assets/sprites/gloom.png b/assets/sprites/gloom.png new file mode 100644 index 0000000..fdcf3f5 Binary files /dev/null and b/assets/sprites/gloom.png differ diff --git a/assets/sprites/golbat.png b/assets/sprites/golbat.png new file mode 100644 index 0000000..fbe51cb Binary files /dev/null and b/assets/sprites/golbat.png differ diff --git a/assets/sprites/golduck.png b/assets/sprites/golduck.png new file mode 100644 index 0000000..f511467 Binary files /dev/null and b/assets/sprites/golduck.png differ diff --git a/assets/sprites/growlithe.png b/assets/sprites/growlithe.png new file mode 100644 index 0000000..4a0998d Binary files /dev/null and b/assets/sprites/growlithe.png differ diff --git a/assets/sprites/jigglypuff.png b/assets/sprites/jigglypuff.png new file mode 100644 index 0000000..c5665e3 Binary files /dev/null and b/assets/sprites/jigglypuff.png differ diff --git a/assets/sprites/mankey.png b/assets/sprites/mankey.png new file mode 100644 index 0000000..a9fccb8 Binary files /dev/null and b/assets/sprites/mankey.png differ diff --git a/assets/sprites/meowth.png b/assets/sprites/meowth.png new file mode 100644 index 0000000..90182bb Binary files /dev/null and b/assets/sprites/meowth.png differ diff --git a/assets/sprites/oddish.png b/assets/sprites/oddish.png new file mode 100644 index 0000000..9783308 Binary files /dev/null and b/assets/sprites/oddish.png differ diff --git a/assets/sprites/paras.png b/assets/sprites/paras.png new file mode 100644 index 0000000..5f96e40 Binary files /dev/null and b/assets/sprites/paras.png differ diff --git a/assets/sprites/parasect.png b/assets/sprites/parasect.png new file mode 100644 index 0000000..74f7c4e Binary files /dev/null and b/assets/sprites/parasect.png differ diff --git a/assets/sprites/persian.png b/assets/sprites/persian.png new file mode 100644 index 0000000..0b9ad6f Binary files /dev/null and b/assets/sprites/persian.png differ diff --git a/assets/sprites/poliwag.png b/assets/sprites/poliwag.png new file mode 100644 index 0000000..c84eba8 Binary files /dev/null and b/assets/sprites/poliwag.png differ diff --git a/assets/sprites/poliwhirl.png b/assets/sprites/poliwhirl.png new file mode 100644 index 0000000..f85ef04 Binary files /dev/null and b/assets/sprites/poliwhirl.png differ diff --git a/assets/sprites/poliwrath.png b/assets/sprites/poliwrath.png new file mode 100644 index 0000000..f3c1f5d Binary files /dev/null and b/assets/sprites/poliwrath.png differ diff --git a/assets/sprites/primeape.png b/assets/sprites/primeape.png new file mode 100644 index 0000000..7693b64 Binary files /dev/null and b/assets/sprites/primeape.png differ diff --git a/assets/sprites/psyduck.png b/assets/sprites/psyduck.png new file mode 100644 index 0000000..e807f58 Binary files /dev/null and b/assets/sprites/psyduck.png differ diff --git a/assets/sprites/venomoth.png b/assets/sprites/venomoth.png new file mode 100644 index 0000000..0fe2fb1 Binary files /dev/null and b/assets/sprites/venomoth.png differ diff --git a/assets/sprites/venonat.png b/assets/sprites/venonat.png new file mode 100644 index 0000000..04f16b5 Binary files /dev/null and b/assets/sprites/venonat.png differ diff --git a/assets/sprites/vileplume.png b/assets/sprites/vileplume.png new file mode 100644 index 0000000..0a53be8 Binary files /dev/null and b/assets/sprites/vileplume.png differ diff --git a/assets/sprites/wigglytuff.png b/assets/sprites/wigglytuff.png new file mode 100644 index 0000000..d134db9 Binary files /dev/null and b/assets/sprites/wigglytuff.png differ diff --git a/assets/sprites/zubat.png b/assets/sprites/zubat.png new file mode 100644 index 0000000..321ecd2 Binary files /dev/null and b/assets/sprites/zubat.png differ diff --git a/lib/Consts.dart b/lib/Consts.dart index 63f698d..9b2da5d 100644 --- a/lib/Consts.dart +++ b/lib/Consts.dart @@ -1,7 +1,7 @@ import 'dart:io'; class Constants { - static const VERSION = "1.0.032225+2127"; + static const VERSION = "1.0.032225+2230"; static bool get isMobile => Platform.isAndroid || Platform.isIOS; } diff --git a/lib/pokemon.dart b/lib/pokemon.dart index d86d76d..a5aa39d 100644 --- a/lib/pokemon.dart +++ b/lib/pokemon.dart @@ -39,12 +39,12 @@ enum Generation { enum Type { Normal(Color.fromARGB(255, 192, 192, 192), Colors.black), - Fire(Color.fromARGB(255, 255, 0, 0), Colors.black), + Fire(Color.fromARGB(255, 255, 0, 0), Color.fromARGB(255, 255, 255, 255)), Water(Color.fromARGB(255, 0, 174, 255), Colors.black), Electric(Color(0xffFFD700), Colors.black), Grass(Color.fromARGB(255, 0, 255, 0), Colors.black), Ice(Color.fromARGB(255, 0, 255, 255), Colors.black), - Fighting(Color.fromARGB(255, 255, 0, 0), Colors.black), + Fighting(Color.fromARGB(255, 255, 0, 0), Color.fromARGB(255, 255, 255, 255)), Poison(Color.fromARGB(255, 128, 0, 128), Colors.black), Ground(Color.fromARGB(255, 128, 126, 0), Colors.black), Flying(Color.fromARGB(255, 128, 128, 255), Colors.black), @@ -69,6 +69,7 @@ enum EvolutionCondition { Trading, MoonStone, FireStone, + LeafStone, } class Evolution { @@ -169,7 +170,40 @@ enum Pokemon { Vulpix(37, Generation.One, [ Type.Fire, ], Evolution(38, -1, condition: EvolutionCondition.FireStone)), - NineTales(38, Generation.One, [Type.Fire], null); + NineTales(38, Generation.One, [Type.Fire], null), + Jigglypuff(39, Generation.One, [ + Type.Fairy, + ], Evolution(40, -1, condition: EvolutionCondition.MoonStone)), + WigglyTuff(40, Generation.One, [Type.Fairy], null), + Zubat(41, Generation.One, [Type.Poison, Type.Flying], Evolution(42, 22)), + Golbat(42, Generation.One, [Type.Poison, Type.Flying], null), + Oddish(43, Generation.One, [Type.Poison, Type.Grass], Evolution(44, 21)), + Gloom(44, Generation.One, [ + Type.Poison, + Type.Grass, + ], Evolution(45, -1, condition: EvolutionCondition.LeafStone)), + Vileplume(45, Generation.One, [Type.Poison, Type.Grass], null), + Paras(46, Generation.One, [Type.Bug, Type.Grass], Evolution(47, 24)), + Parasect(47, Generation.One, [Type.Bug, Type.Grass], null), + Venonat(48, Generation.One, [Type.Bug, Type.Poison], Evolution(49, 31)), + Venomoth(49, Generation.One, [Type.Bug, Type.Poison], null), + Diglett(50, Generation.One, [Type.Ground], Evolution(51, 26)), + Dugtrio(51, Generation.One, [Type.Ground], null), + Meowth(52, Generation.One, [Type.Normal], Evolution(53, 28)), + Persian(53, Generation.One, [Type.Normal], null), + Psyduck(54, Generation.One, [Type.Water], Evolution(55, 33)), + Golduck(55, Generation.One, [Type.Water], null), + Mankey(56, Generation.One, [Type.Fighting], Evolution(57, 28)), + Primeape(57, Generation.One, [Type.Fighting], null), + Growlithe(58, Generation.One, [ + Type.Fire, + ], Evolution(59, -1, condition: EvolutionCondition.FireStone)), + Arcanine(59, Generation.One, [Type.Fire], null), + Poliwag(60, Generation.One, [Type.Water], Evolution(61, 25)), + Poliwhirl(61, Generation.One, [ + Type.Water, + ], Evolution(62, -1, condition: EvolutionCondition.WaterStone)), + Poliwrath(62, Generation.One, [Type.Water], null); final int id; final Generation generation; diff --git a/pubspec.yaml b/pubspec.yaml index 45bbdec..8004828 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.032225+2127 +version: 1.0.032225+2230 environment: sdk: ^3.7.0 @@ -102,6 +102,30 @@ flutter: - assets/sprites/clefable.png - assets/sprites/vulpix.png - assets/sprites/ninetales.png + - assets/sprites/jigglypuff.png + - assets/sprites/wigglytuff.png + - assets/sprites/zubat.png + - assets/sprites/golbat.png + - assets/sprites/oddish.png + - assets/sprites/gloom.png + - assets/sprites/vileplume.png + - assets/sprites/paras.png + - assets/sprites/parasect.png + - assets/sprites/venonat.png + - assets/sprites/venomoth.png + - assets/sprites/diglett.png + - assets/sprites/dugtrio.png + - assets/sprites/meowth.png + - assets/sprites/persian.png + - assets/sprites/psyduck.png + - assets/sprites/golduck.png + - assets/sprites/mankey.png + - assets/sprites/primeape.png + - assets/sprites/growlithe.png + - assets/sprites/arcanine.png + - assets/sprites/poliwag.png + - assets/sprites/poliwhirl.png + - assets/sprites/poliwrath.png # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/to/resolution-aware-images