diff --git a/Jenkinsfile b/Jenkinsfile index c84776d..994aeb2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -63,6 +63,7 @@ pipeline { bat "build\\windows\\x64\\runner\\release\\pokedex.exe" stash includes: "COMPLETED.md", name: "md" + stash includes: "LATEST_VERSION", name: "ver" } } post { @@ -83,11 +84,13 @@ pipeline { script { sh 'git checkout main' unstash "md" + unstack "ver" sh ''' #!/bin/bash git add COMPLETED.md - git commit -m "[BOT] Update completed.md" || true + git add LATEST_VERSION + git commit -m "[BOT] Update datagen files" || true git push || true ''' } diff --git a/lib/Consts.dart b/lib/Consts.dart index 849795f..925a60f 100644 --- a/lib/Consts.dart +++ b/lib/Consts.dart @@ -1,5 +1,5 @@ class Constants { - static const VERSION = "1.0.060125+0139"; + static const VERSION = "1.0.060125+0216"; //static bool get isMobile => Platform.isAndroid || Platform.isIOS; } diff --git a/lib/dexMisc.dart b/lib/dexMisc.dart index db4dc87..e97dce3 100644 --- a/lib/dexMisc.dart +++ b/lib/dexMisc.dart @@ -46,6 +46,7 @@ enum GameRoute { RT46, RT111, RT113, + RT115, RT204, ViridianForest(commonName: "Viridian Forest"), AzaleaTown(commonName: "Azalea Town"), diff --git a/lib/generations/Gen1Data.dart b/lib/generations/Gen1Data.dart index eb00800..713ec60 100644 --- a/lib/generations/Gen1Data.dart +++ b/lib/generations/Gen1Data.dart @@ -1616,6 +1616,72 @@ class Gen1Locations { ), Location(Game.FireRed, [GameRoute.TradeOrMigrate], Generation.Three), ]; + static const List Jigglypuff = [ + Location( + Game.Red, + [GameRoute.RT3], + Generation.One, + additionalGames: [Game.Blue], + ), + Location(Game.Yellow, [ + GameRoute.RT5, + GameRoute.RT6, + GameRoute.RT7, + GameRoute.RT8, + ], Generation.One), + Location( + Game.Gold, + [GameRoute.RT3, GameRoute.RT4, GameRoute.RT46], + Generation.Two, + additionalGames: [Game.Silver], + ), + Location(Game.Crystal, [ + GameRoute.RT5, + GameRoute.RT6, + GameRoute.RT7, + GameRoute.RT8, + GameRoute.RT34, + GameRoute.RT35, + ], Generation.Two), + Location( + Game.Ruby, + [GameRoute.RT115], + Generation.Three, + additionalGames: [Game.Sapphire, Game.Emerald], + ), + Location( + Game.FireRed, + [GameRoute.RT3], + Generation.Three, + additionalGames: [Game.LeafGreen], + ), + ]; + static const List Wigglytuff = [ + Location( + Game.Red, + [GameRoute.CeruleanCave], + Generation.One, + additionalGames: [Game.Blue], + ), + Location(Game.Yellow, [GameRoute.CeladonCity], 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 { @@ -3507,4 +3573,110 @@ class Gen1DexData { Generation.Three, ), ]; + static const List Jigglypuff = [ + DexEntry( + Game.Red, + "When its huge eyes light up, it sings a mysteriously soothing melody that lulls its enemies to sleep.", + Generation.One, + additionalGames: [Game.Blue], + ), + DexEntry( + Game.Yellow, + "Uses its alluring eyes to enrapture its foe. It then sings a pleasing melody that lulls the foe to sleep.", + Generation.One, + ), + DexEntry( + Game.Gold, + "If it inflates to SING a lullaby, it can perform longer and cause sure drowsiness in its audience.", + Generation.Two, + ), + DexEntry( + Game.Silver, + "Looking into its cute, round eyes causes it to sing a relaxing melody, inducing its enemies to sleep.", + Generation.Two, + ), + DexEntry( + Game.Crystal, + "It rolls its cute eyes as it sings a soothing lullaby. Its gentle song puts anyone who hears it to sleep.", + Generation.Two, + ), + DexEntry( + Game.Ruby, + "JIGGLYPUFF’s vocal chords can freely adjust the wavelength of its voice. This POKéMON uses this ability to sing at precisely the right wavelength to make its foes most drowsy.", + Generation.Three, + ), + DexEntry( + Game.Sapphire, + "When this POKéMON sings, it never pauses to breathe. If it is in a battle against an opponent that does not easily fall asleep, JIGGLYPUFF cannot breathe, endangering its life.", + Generation.Three, + ), + DexEntry( + Game.FireRed, + "It captivates foes with its huge, round eyes, then lulls them to sleep by singing a soothing melody.", + Generation.Three, + ), + DexEntry( + Game.LeafGreen, + "When its huge eyes waver, it sings a mysteriously soothing melody that lulls its enemies to sleep.", + Generation.Three, + ), + DexEntry( + Game.Emerald, + "Nothing can avoid falling asleep hearing a JIGGLYPUFF’s song. The sound waves of its singing voice match the brain waves of someone in a deep sleep.", + Generation.Three, + ), + ]; + static const List Wigglytuff = [ + DexEntry( + Game.Red, + "The body is soft and rubbery. When angered, it will suck in air and inflate itself to an enormous size.", + Generation.One, + additionalGames: [Game.Blue], + ), + DexEntry( + Game.Yellow, + "Its body is full of elasticity. By inhaling deeply, it can continue to inflate itself without limit.", + Generation.One, + ), + DexEntry( + Game.Gold, + "Their fur feels so good that if two of them snuggle together, they won’t want to be separated.", + Generation.Two, + ), + DexEntry( + Game.Silver, + "It has a very fine fur. Take care not to make it angry, or it may inflate steadily and hit with a BODY SLAM.", + Generation.Two, + ), + DexEntry( + Game.Crystal, + "The rich, fluffy fur that covers its body feels so good that anyone who feels it can’t stop touching it.", + Generation.Two, + ), + DexEntry( + Game.Ruby, + "WIGGLYTUFF has large, saucerlike eyes. The surfaces of its eyes are always covered with a thin layer of tears. If any dust gets in this POKéMON’s eyes, it is quickly washed away.", + Generation.Three, + ), + DexEntry( + Game.Sapphire, + "WIGGLYTUFF’s body is very flexible. By inhaling deeply, this POKéMON can inflate itself seemingly without end. Once inflated, WIGGLYTUFF bounces along lightly like a balloon.", + Generation.Three, + ), + DexEntry( + Game.FireRed, + " Its fur is extremely fine, dense, and supple. The exquisitely pleasant fur conveys an image of luxury.", + Generation.Three, + ), + DexEntry( + Game.LeafGreen, + "The body is soft and rubbery. When angered, it will suck in air and inflate itself to an enormous size.", + Generation.Three, + ), + DexEntry( + Game.Emerald, + "Its fur is the ultimate in luxuriousness. Sleeping alongside a WIGGLYTUFF is simply divine. Its body expands seemingly without end when it inhales.", + Generation.Three, + ), + ]; } diff --git a/lib/pokemon.dart b/lib/pokemon.dart index 6db6cc8..baa0468 100644 --- a/lib/pokemon.dart +++ b/lib/pokemon.dart @@ -432,8 +432,18 @@ enum Pokemon { [Type.Fairy], SingleEvolution(40, -1, condition: [EvolutionCondition.MoonStone]), previousPokemon: 174, + locations: Gen1Locations.Jigglypuff, + dexEntries: Gen1DexData.Jigglypuff, + ), + WigglyTuff( + 40, + Generation.One, + [Type.Fairy], + null, + previousPokemon: 39, + locations: Gen1Locations.Wigglytuff, + dexEntries: Gen1DexData.Wigglytuff, ), - WigglyTuff(40, Generation.One, [Type.Fairy], null, previousPokemon: 39), Zubat(41, Generation.One, [ Type.Poison, Type.Flying, diff --git a/lib/updateTool.dart b/lib/updateTool.dart index 9cacfc7..673c6d0 100644 --- a/lib/updateTool.dart +++ b/lib/updateTool.dart @@ -200,6 +200,11 @@ class _main extends State { state++; setState(() {}); } else if (state - index == 8) { + statusMessage = "Updating Latest Version manifest..."; + await File("LATEST_VERSION").writeAsString("${Constants.VERSION}"); + state++; + setState(() {}); + } else if (state - index == 9) { x.cancel(); sleep(Duration(seconds: 10)); exit(0); diff --git a/pubspec.yaml b/pubspec.yaml index 9dbe2fd..1db3e99 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.060125+0139 +version: 1.0.060125+0216 environment: sdk: ^3.7.0