mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-12 23:44:58 +00:00
Generalised a species' types to allow any number of types
This commit is contained in:
@@ -129,14 +129,14 @@ class Battle::Battler
|
||||
if newType.is_a?(Battle::Battler)
|
||||
newTypes = newType.pbTypes
|
||||
newTypes.push(:NORMAL) if newTypes.length == 0
|
||||
newType3 = newType.effects[PBEffects::Type3]
|
||||
newType3 = nil if newTypes.include?(newType3)
|
||||
newExtraType = newType.effects[PBEffects::ExtraType]
|
||||
newExtraType = nil if newTypes.include?(newExtraType)
|
||||
@types = newTypes.clone
|
||||
@effects[PBEffects::Type3] = newType3
|
||||
@effects[PBEffects::ExtraType] = newExtraType
|
||||
else
|
||||
newType = GameData::Type.get(newType).id
|
||||
@types = [newType]
|
||||
@effects[PBEffects::Type3] = nil
|
||||
@effects[PBEffects::ExtraType] = nil
|
||||
end
|
||||
@effects[PBEffects::BurnUp] = false
|
||||
@effects[PBEffects::Roost] = false
|
||||
@@ -144,7 +144,7 @@ class Battle::Battler
|
||||
|
||||
def pbResetTypes
|
||||
@types = @pokemon.types
|
||||
@effects[PBEffects::Type3] = nil
|
||||
@effects[PBEffects::ExtraType] = nil
|
||||
@effects[PBEffects::BurnUp] = false
|
||||
@effects[PBEffects::Roost] = false
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user