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

Added class GameStats, added Pokédex records for eggs seen and expanded seen_forms to include shinies

Browse Source
This commit is contained in:
Maruno17
2021-11-13 23:13:28 +00:00
parent 12fd500dbc
commit c6ecf60172
39 changed files with 443 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,13 +22,15 @@ class Player < Trainer
# Clears the Pokédex.
def clear
@seen = {}
@owned = {}
@seen_forms = {}
@last_seen_forms = {}
@owned_shadow = {}
@caught_counts = {}
@defeated_counts = {}
@seen = {}
@owned = {}
@seen_forms = {} # Gender (0 or 1), shiny (0 or 1), form number
@seen_shiny_forms = {}
@seen_eggs = {}
@last_seen_forms = {}
@owned_shadow = {}
@caught_counts = {}
@defeated_counts = {}
self.refresh_accessible_dexes
end
@@ -55,12 +57,33 @@ class Player < Trainer
# @param species [Symbol, GameData::Species] species to check
# @param gender [Integer] gender to check
# @param form [Integer] form to check
# @return [Boolean] whether the species of the given gender and form is seen
def seen_form?(species, gender, form)
# @param shiny [Boolean, nil] shininess to check (checks both if nil)
# @return [Boolean] whether the species of the given gender/form/shininess is seen
def seen_form?(species, gender, form, shiny = nil)
species_id = GameData::Species.try_get(species)&.species
return false if species_id.nil?
@seen_forms[species_id] ||= [[], []]
return @seen_forms[species_id][gender][form] == true
@seen_forms[species_id] ||= [[[], []], [[], []]]
if shiny.nil?
return @seen_forms[species_id][gender][0][form] || @seen_forms[species_id][gender][1][form]
end
shin = (shiny) ? 1 : 0
return @seen_forms[species_id][gender][shin][form] == true
end
# Sets the egg for the given species as seen.
# @param species [Symbol, GameData::Species] species to set as seen
def set_seen_egg(species)
species_id = GameData::Species.try_get(species)&.species
return if species_id.nil?
@seen_eggs[species_id] = true
end
# @param species [Symbol, GameData::Species] species to check
# @return [Boolean] whether the egg for the given species is seen
def seen_egg?(species)
species_id = GameData::Species.try_get(species)&.species
return false if species_id.nil?
return @seen_eggs[species_id] == true
end
# Returns the amount of seen Pokémon.
@@ -94,10 +117,11 @@ class Player < Trainer
species_id = GameData::Species.try_get(species)&.species
return 0 if species_id.nil?
ret = 0
@seen_forms[species_id] ||= [[], []]
@seen_forms[species_id] ||= [[[], []], [[], []]]
array = @seen_forms[species_id]
for i in 0...[array[0].length, array[1].length].max
ret += 1 if array[0][i] || array[1][i]
ret += 1 if array[0][0][i] || array[0][1][i] || # male or genderless shiny/non-shiny
array[1][0][i] || array[1][1][i] # female shiny/non-shiny
end
return ret
end
@@ -166,16 +190,20 @@ class Player < Trainer
# @param species [Pokemon, Symbol, GameData::Species] Pokemon to register as seen
# @param gender [Integer] gender to register (0=male, 1=female, 2=genderless)
# @param form [Integer] form to register
def register(species, gender = 0, form = 0, should_refresh_dexes = true)
# @param shiny [Boolean] shininess to register
# @param should_refresh_dexes [Boolean] whether to recalculate accessible Dex lists
def register(species, gender = 0, form = 0, shiny = false, should_refresh_dexes = true)
if species.is_a?(Pokemon)
species_data = species.species_data
gender = species.gender
shiny = species.shiny?
else
species_data = GameData::Species.get_species_form(species, form)
end
species = species_data.species
gender = 0 if gender >= 2
form = species_data.form
shin = (shiny) ? 1 : 0
if form != species_data.pokedex_form
species_data = GameData::Species.get_species_form(species, species_data.pokedex_form)
form = species_data.form
@@ -183,8 +211,8 @@ class Player < Trainer
form = 0 if species_data.form_name.nil? || species_data.form_name.empty?
# Register as seen
@seen[species] = true
@seen_forms[species] ||= [[], []]
@seen_forms[species][gender][form] = true
@seen_forms[species] ||= [[[], []], [[], []]]
@seen_forms[species][gender][shin][form] = true
@last_seen_forms[species] ||= []
@last_seen_forms[species] = [gender, form] if @last_seen_forms[species] == []
self.refresh_accessible_dexes if should_refresh_dexes
@@ -207,7 +235,7 @@ class Player < Trainer
def caught_count(species)
species_id = GameData::Species.try_get(species)&.species
return 0 if species_id.nil?
return @caught_counts[species] || 0
return @caught_counts[species_id] || 0
end
# @param species [Symbol, GameData::Species] species to check
@@ -216,7 +244,7 @@ class Player < Trainer
def defeated_count(species)
species_id = GameData::Species.try_get(species)&.species
return 0 if species_id.nil?
return @defeated_counts[species] || 0
return @defeated_counts[species_id] || 0
end
# @param species [Symbol, GameData::Species] species to check
@@ -225,23 +253,23 @@ class Player < Trainer
def battled_count(species)
species_id = GameData::Species.try_get(species)&.species
return 0 if species_id.nil?
return (@defeated_counts[species] || 0) + (@caught_counts[species] || 0)
return (@defeated_counts[species_id] || 0) + (@caught_counts[species_id] || 0)
end
# @param species [Symbol, GameData::Species] species to count as caught
def register_caught(species)
species_id = GameData::Species.try_get(species)&.species
return if species_id.nil?
@caught_counts[species] = 0 if @caught_counts[species].nil?
@caught_counts[species] += 1
@caught_counts[species_id] = 0 if @caught_counts[species_id].nil?
@caught_counts[species_id] += 1
end
# @param species [Symbol, GameData::Species] species to count as defeated
def register_defeated(species)
species_id = GameData::Species.try_get(species)&.species
return if species_id.nil?
@defeated_counts[species] = 0 if @defeated_counts[species].nil?
@defeated_counts[species] += 1
@defeated_counts[species_id] = 0 if @defeated_counts[species_id].nil?
@defeated_counts[species_id] += 1
end
#===========================================================================