DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-08 13:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added underscore in DefaultForm species flag for consistency

Browse Source
This commit is contained in:
Maruno17
2022-03-31 20:20:29 +01:00
parent c012a7323a
commit e87d55f56f
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/010_Data/002_PBS data/008_Species.rb
View File

@@ -214,7 +214,7 @@ module GameData
def base_form def base_form
@flags.each do |flag| @flags.each do |flag|
return $~[1].to_i if flag[/^DefaultForm(\d+)$/i] return $~[1].to_i if flag[/^DefaultForm_(\d+)$/i]
end end
return @form return @form
end end

2
Data/Scripts/011_Battle/003_Move/011_MoveEffects_Items.rb
View File

@@ -422,7 +422,7 @@ class Battle::Move::ThrowUserItemAtTarget < Battle::Move
def pbBaseDamage(baseDmg, user, target) def pbBaseDamage(baseDmg, user, target)
return 0 if !user.item return 0 if !user.item
user.item.flags.each do |flag| 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 end
return 10 return 10
end end

12
PBS/Gen 8/pokemon.txt
View File

@@ -22104,7 +22104,7 @@ Shape = BipedalTail
Category = Blocking Category = Blocking
Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch. Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch.
Generation = 8 Generation = 8
Flags = DefaultForm1,InheritFormWithEverStone Flags = DefaultForm_1,InheritFormWithEverStone
#------------------------------- #-------------------------------
[PERRSERKER] [PERRSERKER]
Name = Perrserker Name = Perrserker
@@ -22130,7 +22130,7 @@ Shape = BipedalTail
Category = Viking Category = Viking
Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle. Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle.
Generation = 8 Generation = 8
Flags = DefaultForm2,InheritFormWithEverStone Flags = DefaultForm_2,InheritFormWithEverStone
#------------------------------- #-------------------------------
[CURSOLA] [CURSOLA]
Name = Cursola Name = Cursola
@@ -22156,7 +22156,7 @@ Shape = HeadArms
Category = Coral Category = Coral
Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit. Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit.
Generation = 8 Generation = 8
Flags = DefaultForm1,InheritFormWithEverStone Flags = DefaultForm_1,InheritFormWithEverStone
#------------------------------- #-------------------------------
[SIRFETCHD] [SIRFETCHD]
Name = Sirfetch'd Name = Sirfetch'd
@@ -22182,7 +22182,7 @@ Shape = Winged
Category = Wild Duck 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. 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 Generation = 8
Flags = DefaultForm1,InheritFormWithEverStone Flags = DefaultForm_1,InheritFormWithEverStone
WildItemUncommon = LEEK WildItemUncommon = LEEK
#------------------------------- #-------------------------------
[MRRIME] [MRRIME]
@@ -22209,7 +22209,7 @@ Shape = Bipedal
Category = Comedian Category = Comedian
Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly. Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly.
Generation = 8 Generation = 8
Flags = DefaultForm1,InheritFormWithEverStone Flags = DefaultForm_1,InheritFormWithEverStone
#------------------------------- #-------------------------------
[RUNERIGUS] [RUNERIGUS]
Name = Runerigus Name = Runerigus
@@ -22234,7 +22234,7 @@ Shape = HeadBase
Category = Grudge Category = Grudge
Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move. Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move.
Generation = 8 Generation = 8
Flags = DefaultForm1,InheritFormWithEverStone Flags = DefaultForm_1,InheritFormWithEverStone
#------------------------------- #-------------------------------
[MILCERY] [MILCERY]
Name = Milcery Name = Milcery

12
PBS/pokemon.txt
View File

@@ -22104,7 +22104,7 @@ Shape = BipedalTail
Category = Blocking Category = Blocking
Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch. Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch.
Generation = 8 Generation = 8
Flags = DefaultForm1,InheritFormWithEverStone Flags = DefaultForm_1,InheritFormWithEverStone
#------------------------------- #-------------------------------
[PERRSERKER] [PERRSERKER]
Name = Perrserker Name = Perrserker
@@ -22130,7 +22130,7 @@ Shape = BipedalTail
Category = Viking Category = Viking
Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle. Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle.
Generation = 8 Generation = 8
Flags = DefaultForm2,InheritFormWithEverStone Flags = DefaultForm_2,InheritFormWithEverStone
#------------------------------- #-------------------------------
[CURSOLA] [CURSOLA]
Name = Cursola Name = Cursola
@@ -22156,7 +22156,7 @@ Shape = HeadArms
Category = Coral Category = Coral
Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit. Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit.
Generation = 8 Generation = 8
Flags = DefaultForm1,InheritFormWithEverStone Flags = DefaultForm_1,InheritFormWithEverStone
#------------------------------- #-------------------------------
[SIRFETCHD] [SIRFETCHD]
Name = Sirfetch'd Name = Sirfetch'd
@@ -22182,7 +22182,7 @@ Shape = Winged
Category = Wild Duck 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. 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 Generation = 8
Flags = DefaultForm1,InheritFormWithEverStone Flags = DefaultForm_1,InheritFormWithEverStone
WildItemUncommon = LEEK WildItemUncommon = LEEK
#------------------------------- #-------------------------------
[MRRIME] [MRRIME]
@@ -22209,7 +22209,7 @@ Shape = Bipedal
Category = Comedian Category = Comedian
Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly. Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly.
Generation = 8 Generation = 8
Flags = DefaultForm1,InheritFormWithEverStone Flags = DefaultForm_1,InheritFormWithEverStone
#------------------------------- #-------------------------------
[RUNERIGUS] [RUNERIGUS]
Name = Runerigus Name = Runerigus
@@ -22234,7 +22234,7 @@ Shape = HeadBase
Category = Grudge Category = Grudge
Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move. Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move.
Generation = 8 Generation = 8
Flags = DefaultForm1,InheritFormWithEverStone Flags = DefaultForm_1,InheritFormWithEverStone
#------------------------------- #-------------------------------
[MILCERY] [MILCERY]
Name = Milcery Name = Milcery