Merge branch 'pokeclicker:develop' into develop

EatPant2nd · Jun 22, 2024 · 867c5f0 · 867c5f0
2 parents 2973ce5 + c9f2fc1
commit 867c5f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/scripts/breeding/Breeding.ts b/src/scripts/breeding/Breeding.ts
@@ -413,7 +413,7 @@ class Breeding implements Feature {
         let fossilEgg: Egg;
         if (pokemonNativeRegion > player.highestRegion()) {
             Notifier.notify({
-                message: 'You must progress further before you can uncover this fossil Pokémon!',
+                message: `You must reach ${GameConstants.camelCaseToString(GameConstants.Region[pokemonNativeRegion])} before you can uncover this fossil Pokémon!`,
                 type: NotificationConstants.NotificationOption.warning,
                 timeout: 5e3,
             });

diff --git a/src/scripts/items/HeldItem.ts b/src/scripts/items/HeldItem.ts
@@ -169,7 +169,7 @@ ItemList.Muscle_Band = new AttackBonusHeldItem('Muscle_Band', 1000, GameConstant
 // Pokemon specific items
 ItemList.Light_Ball = new PokemonRestrictedAttackBonusHeldItem('Light_Ball', 10000, GameConstants.Currency.money, undefined, 'Light Ball', 1.3, GameConstants.Region.johto, 'Pikachu',
     (pokemon) => Math.floor(pokemon.id) == 25);
-ItemList.Lucky_Punch = new PokemonRestrictedAttackBonusHeldItem('Lucky_Punch', 10000, GameConstants.Currency.money, undefined, 'Lucky Punch', 1.3, GameConstants.Region.galar, 'Happiny, Chansey or Blissey',
+ItemList.Lucky_Punch = new PokemonRestrictedAttackBonusHeldItem('Lucky_Punch', 10000, GameConstants.Currency.money, undefined, 'Lucky Punch', 1.3, GameConstants.Region.sinnoh, 'Happiny, Chansey or Blissey',
     (pokemon) => Math.floor(pokemon.id) == 440 ||  Math.floor(pokemon.id) == 113 || Math.floor(pokemon.id) == 242);
 ItemList.Quick_Powder = new PokemonRestrictedAttackBonusHeldItem('Quick_Powder', 10000, GameConstants.Currency.money, undefined, 'Quick Powder', 1.3, GameConstants.Region.kalos, 'Ditto',
     (pokemon) => Math.floor(pokemon.id) == 132);