From e87d55f56f2494b845f558fdf20bf3e078419abe Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 31 Mar 2022 20:20:29 +0100 Subject: [PATCH] Added underscore in DefaultForm species flag for consistency --- Data/Scripts/010_Data/002_PBS data/008_Species.rb | 2 +- .../011_Battle/003_Move/011_MoveEffects_Items.rb | 2 +- PBS/Gen 8/pokemon.txt | 12 ++++++------ PBS/pokemon.txt | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Data/Scripts/010_Data/002_PBS data/008_Species.rb b/Data/Scripts/010_Data/002_PBS data/008_Species.rb index 1547f5a41..08f61fc10 100644 --- a/Data/Scripts/010_Data/002_PBS data/008_Species.rb +++ b/Data/Scripts/010_Data/002_PBS data/008_Species.rb @@ -214,7 +214,7 @@ module GameData def base_form @flags.each do |flag| - return $~[1].to_i if flag[/^DefaultForm(\d+)$/i] + return $~[1].to_i if flag[/^DefaultForm_(\d+)$/i] end return @form end diff --git a/Data/Scripts/011_Battle/003_Move/011_MoveEffects_Items.rb b/Data/Scripts/011_Battle/003_Move/011_MoveEffects_Items.rb index dcc9c10dc..4c02d025d 100644 --- a/Data/Scripts/011_Battle/003_Move/011_MoveEffects_Items.rb +++ b/Data/Scripts/011_Battle/003_Move/011_MoveEffects_Items.rb @@ -422,7 +422,7 @@ class Battle::Move::ThrowUserItemAtTarget < Battle::Move def pbBaseDamage(baseDmg, user, target) return 0 if !user.item user.item.flags.each do |flag| - return [$~[1].to_i, 10].min if flag[/^Fling_(\d+)$/i] + return [$~[1].to_i, 10].max if flag[/^Fling_(\d+)$/i] end return 10 end diff --git a/PBS/Gen 8/pokemon.txt b/PBS/Gen 8/pokemon.txt index 754082ffa..a347ac4c9 100644 --- a/PBS/Gen 8/pokemon.txt +++ b/PBS/Gen 8/pokemon.txt @@ -22104,7 +22104,7 @@ Shape = BipedalTail Category = Blocking Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch. Generation = 8 -Flags = DefaultForm1,InheritFormWithEverStone +Flags = DefaultForm_1,InheritFormWithEverStone #------------------------------- [PERRSERKER] Name = Perrserker @@ -22130,7 +22130,7 @@ Shape = BipedalTail Category = Viking Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle. Generation = 8 -Flags = DefaultForm2,InheritFormWithEverStone +Flags = DefaultForm_2,InheritFormWithEverStone #------------------------------- [CURSOLA] Name = Cursola @@ -22156,7 +22156,7 @@ Shape = HeadArms Category = Coral Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit. Generation = 8 -Flags = DefaultForm1,InheritFormWithEverStone +Flags = DefaultForm_1,InheritFormWithEverStone #------------------------------- [SIRFETCHD] Name = Sirfetch'd @@ -22182,7 +22182,7 @@ Shape = Winged Category = Wild Duck Pokedex = After deflecting attacks with its hard leaf shield, it strikes back with its sharp leek stalk. The leek stalk is both weapon and food. Generation = 8 -Flags = DefaultForm1,InheritFormWithEverStone +Flags = DefaultForm_1,InheritFormWithEverStone WildItemUncommon = LEEK #------------------------------- [MRRIME] @@ -22209,7 +22209,7 @@ Shape = Bipedal Category = Comedian Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly. Generation = 8 -Flags = DefaultForm1,InheritFormWithEverStone +Flags = DefaultForm_1,InheritFormWithEverStone #------------------------------- [RUNERIGUS] Name = Runerigus @@ -22234,7 +22234,7 @@ Shape = HeadBase Category = Grudge Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move. Generation = 8 -Flags = DefaultForm1,InheritFormWithEverStone +Flags = DefaultForm_1,InheritFormWithEverStone #------------------------------- [MILCERY] Name = Milcery diff --git a/PBS/pokemon.txt b/PBS/pokemon.txt index 754082ffa..a347ac4c9 100644 --- a/PBS/pokemon.txt +++ b/PBS/pokemon.txt @@ -22104,7 +22104,7 @@ Shape = BipedalTail Category = Blocking Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch. Generation = 8 -Flags = DefaultForm1,InheritFormWithEverStone +Flags = DefaultForm_1,InheritFormWithEverStone #------------------------------- [PERRSERKER] Name = Perrserker @@ -22130,7 +22130,7 @@ Shape = BipedalTail Category = Viking Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle. Generation = 8 -Flags = DefaultForm2,InheritFormWithEverStone +Flags = DefaultForm_2,InheritFormWithEverStone #------------------------------- [CURSOLA] Name = Cursola @@ -22156,7 +22156,7 @@ Shape = HeadArms Category = Coral Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit. Generation = 8 -Flags = DefaultForm1,InheritFormWithEverStone +Flags = DefaultForm_1,InheritFormWithEverStone #------------------------------- [SIRFETCHD] Name = Sirfetch'd @@ -22182,7 +22182,7 @@ Shape = Winged Category = Wild Duck Pokedex = After deflecting attacks with its hard leaf shield, it strikes back with its sharp leek stalk. The leek stalk is both weapon and food. Generation = 8 -Flags = DefaultForm1,InheritFormWithEverStone +Flags = DefaultForm_1,InheritFormWithEverStone WildItemUncommon = LEEK #------------------------------- [MRRIME] @@ -22209,7 +22209,7 @@ Shape = Bipedal Category = Comedian Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly. Generation = 8 -Flags = DefaultForm1,InheritFormWithEverStone +Flags = DefaultForm_1,InheritFormWithEverStone #------------------------------- [RUNERIGUS] Name = Runerigus @@ -22234,7 +22234,7 @@ Shape = HeadBase Category = Grudge Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move. Generation = 8 -Flags = DefaultForm1,InheritFormWithEverStone +Flags = DefaultForm_1,InheritFormWithEverStone #------------------------------- [MILCERY] Name = Milcery