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

Made "DefaultForm_X" flag apply when changing a Pokémon's species

Browse Source
This commit is contained in:
Maruno17
2022-04-24 12:04:34 +01:00
parent a85ec1e51a
commit 8062b8ed6c
8 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,11 +212,16 @@ module GameData
return GameData::GenderRatio.get(@gender_ratio).single_gendered? return GameData::GenderRatio.get(@gender_ratio).single_gendered?
end end
def base_form def default_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 -1
end
def base_form
default = default_form
return (default >= 0) ? default : @form
end end
def has_flag?(flag) def has_flag?(flag)

7
Data/Scripts/014_Pokemon/001_Pokemon.rb
View File

@@ -124,7 +124,12 @@ class Pokemon
new_species_data = GameData::Species.get(species_id) new_species_data = GameData::Species.get(species_id)
return if @species == new_species_data.species return if @species == new_species_data.species
@species = new_species_data.species @species = new_species_data.species
@form = new_species_data.form if new_species_data.form != 0 default_form = new_species_data.default_form
if default_form >= 0
@form = default_form
elsif new_species_data.form > 0
@form = new_species_data.form
end
@forced_form = nil @forced_form = nil
@gender = nil if singleGendered? @gender = nil if singleGendered?
@level = nil # In case growth rate is different for the new species @level = nil # In case growth rate is different for the new species

1
Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb
View File

@@ -598,7 +598,6 @@ class PokemonEvolutionScene
pbEvolutionMethodAfterEvolution pbEvolutionMethodAfterEvolution
# Modify Pokémon to make it evolved # Modify Pokémon to make it evolved
@pokemon.species = @newspecies @pokemon.species = @newspecies
@pokemon.form = 0 if @pokemon.isSpecies?(:MOTHIM)
@pokemon.calc_stats @pokemon.calc_stats
@pokemon.ready_to_evolve = false @pokemon.ready_to_evolve = false
# See and own evolved species # See and own evolved species

1
PBS/Gen 5/pokemon.txt
View File

@@ -10889,6 +10889,7 @@ Shape = MultiWinged
Category = Moth Category = Moth
Pokedex = It loves the honey of flowers and steals honey collected by Combee. Pokedex = It loves the honey of flowers and steals honey collected by Combee.
Generation = 4 Generation = 4
Flags = DefaultForm_0
WildItemUncommon = SILVERPOWDER WildItemUncommon = SILVERPOWDER
#------------------------------- #-------------------------------
[COMBEE] [COMBEE]

1
PBS/Gen 6/pokemon.txt
View File

@@ -10878,6 +10878,7 @@ Shape = MultiWinged
Category = Moth Category = Moth
Pokedex = It loves the honey of flowers and steals honey collected by Combee. Pokedex = It loves the honey of flowers and steals honey collected by Combee.
Generation = 4 Generation = 4
Flags = DefaultForm_0
WildItemUncommon = SILVERPOWDER WildItemUncommon = SILVERPOWDER
#------------------------------- #-------------------------------
[COMBEE] [COMBEE]

1
PBS/Gen 7/pokemon.txt
View File

@@ -10879,6 +10879,7 @@ Shape = MultiWinged
Category = Moth Category = Moth
Pokedex = It loves the honey of flowers and steals honey collected by Combee. Pokedex = It loves the honey of flowers and steals honey collected by Combee.
Generation = 4 Generation = 4
Flags = DefaultForm_0
WildItemUncommon = SILVERPOWDER WildItemUncommon = SILVERPOWDER
#------------------------------- #-------------------------------
[COMBEE] [COMBEE]

1
PBS/Gen 8/pokemon.txt
View File

@@ -10885,6 +10885,7 @@ Shape = MultiWinged
Category = Moth Category = Moth
Pokedex = It loves the honey of flowers and steals honey collected by Combee. Pokedex = It loves the honey of flowers and steals honey collected by Combee.
Generation = 4 Generation = 4
Flags = DefaultForm_0
WildItemUncommon = SILVERPOWDER WildItemUncommon = SILVERPOWDER
#------------------------------- #-------------------------------
[COMBEE] [COMBEE]

1
PBS/pokemon.txt
View File

@@ -10885,6 +10885,7 @@ Shape = MultiWinged
Category = Moth Category = Moth
Pokedex = It loves the honey of flowers and steals honey collected by Combee. Pokedex = It loves the honey of flowers and steals honey collected by Combee.
Generation = 4 Generation = 4
Flags = DefaultForm_0
WildItemUncommon = SILVERPOWDER WildItemUncommon = SILVERPOWDER
#------------------------------- #-------------------------------
[COMBEE] [COMBEE]