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

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

View File

@@ -21,8 +21,8 @@ class TriadCard
spAtk = baseStats[:SPECIAL_ATTACK]
spDef = baseStats[:SPECIAL_DEFENSE]
speed = baseStats[:SPEED]
@type = species_data.type1
@type = species_data.type2 if @type == :NORMAL && species_data.type2
@type = species_data.types[0]
@type = species_data.types[1] if @type == :NORMAL && species_data.types[1]
@west = baseStatToValue(attack + speed / 3)
@east = baseStatToValue(defense + hp / 3)
@north = baseStatToValue(spAtk + speed / 3)