DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-28 09:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged species Type1/Type2 into Types, did the same for Pokemon and Battler

Browse Source
This commit is contained in:
Maruno17
2021-11-22 23:55:28 +00:00
parent a5f91f62ea
commit 00c2df5772
33 changed files with 3756 additions and 5552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Data/Scripts/011_Battle/002_Battler/002_Battler_Initialize.rb
View File

@@ -20,7 +20,7 @@ class Battle::Battler
@form = 0
@level = 0
@hp = @totalhp = 0
@type1 = @type2 = nil
@types = []
@ability_id = nil
@item_id = nil
@gender = 0
@@ -44,8 +44,7 @@ class Battle::Battler
@level = pkmn.level
@hp = pkmn.hp
@totalhp = pkmn.totalhp
@type1 = pkmn.type1
@type2 = pkmn.type2
@types = pkmn.types
# ability and item intentionally not copied across here
@gender = pkmn.gender
@attack = pkmn.attack
@@ -78,8 +77,7 @@ class Battle::Battler
@level = pkmn.level
@hp = pkmn.hp
@totalhp = pkmn.totalhp
@type1 = pkmn.type1
@type2 = pkmn.type2
@types = pkmn.types
@ability_id = pkmn.ability_id
@item_id = pkmn.item_id
@gender = pkmn.gender
@@ -312,8 +310,7 @@ class Battle::Battler
@spdef = @pokemon.spdef
@speed = @pokemon.speed
if fullChange
@type1 = @pokemon.type1
@type2 = @pokemon.type2
@types = @pokemon.types
@ability_id = @pokemon.ability_id
end
end