DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-10 14:44:58 +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

9
Data/Scripts/011_Battle/002_Battler/003_Battler_ChangeSelf.rb
View File

@@ -127,13 +127,11 @@ class Battle::Battler
newTypes.push(:NORMAL) if newTypes.length == 0
newType3 = newType.effects[PBEffects::Type3]
newType3 = nil if newTypes.include?(newType3)
@type1 = newTypes[0]
@type2 = (newTypes.length == 1) ? newTypes[0] : newTypes[1]
@types = newTypes.clone
@effects[PBEffects::Type3] = newType3
else
newType = GameData::Type.get(newType).id
@type1 = newType
@type2 = newType
@types = [newType]
@effects[PBEffects::Type3] = nil
end
@effects[PBEffects::BurnUp] = false
@@ -141,8 +139,7 @@ class Battle::Battler
end
def pbResetTypes
@type1 = @pokemon.type1
@type2 = @pokemon.type2
@types = @pokemon.types
@effects[PBEffects::Type3] = nil
@effects[PBEffects::BurnUp] = false
@effects[PBEffects::Roost] = false