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

Some bug fixes, added PriorityChange item handler

Browse Source
This commit is contained in:
Maruno17
2024-11-22 00:38:20 +00:00
parent 012814f557
commit 00d1e431b4
11 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Data/Scripts/015_Trainers and player/001_Trainer.rb
View File

@@ -10,7 +10,7 @@ class Trainer
def inspect
str = super.chop
party_str = @party.map { |p| p.species_data.species }.inspect
party_str = @party.map { |pkmn| pkmn.species_data.species }.inspect
str << sprintf(" %s @party=%s>", self.full_name, party_str)
return str
end
@@ -56,11 +56,11 @@ class Trainer
#-----------------------------------------------------------------------------
def pokemon_party
return @party.find_all { |p| p && !p.egg? }
return @party.find_all { |pkmn| pkmn && !pkmn.egg? }
end
def able_party
return @party.find_all { |p| p && !p.egg? && !p.fainted? }
return @party.find_all { |pkmn| pkmn && !pkmn.egg? && !pkmn.fainted? }
end
def party_count
@@ -69,13 +69,13 @@ class Trainer
def pokemon_count
ret = 0
@party.each { |p| ret += 1 if p && !p.egg? }
@party.each { |pkmn| ret += 1 if pkmn && !pkmn.egg? }
return ret
end
def able_pokemon_count
ret = 0
@party.each { |p| ret += 1 if p && !p.egg? && !p.fainted? }
@party.each { |pkmn| ret += 1 if pkmn && !pkmn.egg? && !pkmn.fainted? }
return ret
end
@@ -105,13 +105,13 @@ class Trainer
end
def last_pokemon
p = pokemon_party
return (p.length > 0) ? p[p.length - 1] : nil
pkmn = pokemon_party
return (pkmn.length > 0) ? pkmn[pkmn.length - 1] : nil
end
def last_able_pokemon
p = able_party
return (p.length > 0) ? p[p.length - 1] : nil
pkmn = able_party
return (pkmn.length > 0) ? pkmn[pkmn.length - 1] : nil
end
def remove_pokemon_at_index(index)
@@ -136,21 +136,21 @@ class Trainer
# Returns true if there is a Pokémon of the given species in the trainer's
# party. You may also specify a particular form it should be.
def has_species?(species, form = -1)
return pokemon_party.any? { |p| p&.isSpecies?(species) && (form < 0 || p.form == form) }
return pokemon_party.any? { |pkmn| pkmn&.isSpecies?(species) && (form < 0 || pkmn.form == form) }
end
# Returns whether there is a fatefully met Pokémon of the given species in the
# trainer's party.
def has_fateful_species?(species)
return pokemon_party.any? { |p| p&.isSpecies?(species) && p.obtain_method == 4 }
return pokemon_party.any? { |pkmn| pkmn&.isSpecies?(species) && pkmn.obtain_method == 4 }
end
# Returns whether there is a Pokémon with the given type in the trainer's
# party.
def has_pokemon_of_type?(type)
# party. excluded_pokemon is an array of Pokemon objects to ignore.
def has_pokemon_of_type?(type, excluded_pokemon = [])
return false if !GameData::Type.exists?(type)
type = GameData::Type.get(type).id
return pokemon_party.any? { |p| p&.hasType?(type) }
return pokemon_party.any? { |pkmn| pkmn&.hasType?(type) && !excluded_pokemon.include?(pkmn) }
end
# Checks whether any Pokémon in the party knows the given move, and returns