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

Merge branch 'dev' into ai

Browse Source
This commit is contained in:
Maruno17
2023-02-05 19:10:25 +00:00
parent d0c39a3e89 4749bd5201
commit 3f5c1f0974
208 changed files with 3123 additions and 3331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb
View File

@@ -62,7 +62,7 @@ end
def pbConvertTrainerData
tr_type_names = []
GameData::TrainerType.each { |t| tr_type_names.push(t.real_name) }
MessageTypes.setMessagesAsHash(MessageTypes::TrainerTypes, tr_type_names)
MessageTypes.setMessagesAsHash(MessageTypes::TRAINER_TYPE_NAMES, tr_type_names)
Compiler.write_trainer_types
Compiler.write_trainers
end

14
Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb
View File

@@ -139,7 +139,7 @@ class Player < Trainer
@last_seen_forms[species] = [gender, form, shiny]
end
#===========================================================================
#---------------------------------------------------------------------------
# Sets the given species as owned in the Pokédex.
# @param species [Symbol, GameData::Species] species to set as owned
@@ -185,7 +185,7 @@ class Player < Trainer
return self.count_species(@owned, dex)
end
#===========================================================================
#---------------------------------------------------------------------------
# @param species [Pokemon, Symbol, GameData::Species] Pokemon to register as seen
# @param gender [Integer] gender to register (0=male, 1=female, 2=genderless)
@@ -227,7 +227,7 @@ class Player < Trainer
@last_seen_forms[pkmn.species] = [pkmn.gender, form, pkmn.shiny?]
end
#===========================================================================
#---------------------------------------------------------------------------
# @param species [Symbol, GameData::Species] species to check
# @return [Integer] the number of Pokémon of the given species that have
@@ -272,7 +272,7 @@ class Player < Trainer
@defeated_counts[species_id] += 1
end
#===========================================================================
#---------------------------------------------------------------------------
# Unlocks the given Dex, -1 being the National Dex.
# @param dex [Integer] Dex ID (-1 is the National Dex)
@@ -321,9 +321,7 @@ class Player < Trainer
return
end
if dexes_count == 1 # Only National Dex is defined
if self.unlocked?(0) && self.seen_any?
@accessible_dexes.push(-1)
end
@accessible_dexes.push(-1) if self.unlocked?(0) && self.seen_any?
else # Regional Dexes + National Dex
dexes_count.times do |i|
dex_list_to_check = (i == dexes_count - 1) ? -1 : i
@@ -334,7 +332,7 @@ class Player < Trainer
end
end
#===========================================================================
#---------------------------------------------------------------------------
private