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

@@ -305,9 +305,7 @@ class PokemonEncounters
new_enc_list = []
enc_list.each do |enc|
species_data = GameData::Species.get(enc[1])
t1 = species_data.type1
t2 = species_data.type2
new_enc_list.push(enc) if t1 == favored_type || t2 == favored_type
new_enc_list.push(enc) if species_data.types.include?(favored_type)
end
enc_list = new_enc_list if new_enc_list.length > 0
end

View File

@@ -192,9 +192,9 @@ class BerryPlantMoistureSprite
def update_graphic
case @moisture_stage
when -1 then @sprite.setBitmap("")
when 0 then @sprite.setBitmap("Graphics/Characters/berrytreeDry")
when 1 then @sprite.setBitmap("Graphics/Characters/berrytreeDamp")
when 2 then @sprite.setBitmap("Graphics/Characters/berrytreeWet")
when 0 then @sprite.setBitmap("Graphics/Characters/berrytreedry")
when 1 then @sprite.setBitmap("Graphics/Characters/berrytreedamp")
when 2 then @sprite.setBitmap("Graphics/Characters/berrytreewet")
end
end