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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
View File

@@ -604,14 +604,16 @@ module Compiler
end
end
# Construct species hash
types = contents["Types"] || [contents["Type1"], contents["Type2"]]
types = [types] if !types.is_a?(Array)
types = types.uniq.compact
species_hash = {
:id => contents["InternalName"].to_sym,
:name => contents["Name"],
:form_name => contents["FormName"],
:category => contents["Category"] || contents["Kind"],
:pokedex_entry => contents["Pokedex"],
:type1 => contents["Type1"],
:type2 => contents["Type2"],
:types => types,
:base_stats => contents["BaseStats"],
:evs => contents["EVs"] || contents["EffortPoints"],
:base_exp => contents["BaseExp"] || contents["BaseEXP"],
@@ -791,6 +793,11 @@ module Compiler
end
# Construct species hash
form_symbol = sprintf("%s_%d", species_symbol.to_s, form).to_sym
types = contents["Types"]
types ||= [contents["Type1"], contents["Type2"]] if contents["Type1"]
types ||= base_data.types.clone
types = [types] if !types.is_a?(Array)
types = types.uniq.compact
moves = contents["Moves"]
if !moves
moves = []
@@ -810,8 +817,7 @@ module Compiler
:category => contents["Category"] || contents["Kind"] || base_data.real_category,
:pokedex_entry => contents["Pokedex"] || base_data.real_pokedex_entry,
:pokedex_form => contents["PokedexForm"],
:type1 => contents["Type1"] || base_data.type1,
:type2 => contents["Type2"] || base_data.type2,
:types => types,
:base_stats => contents["BaseStats"] || base_data.base_stats,
:evs => contents["EVs"] || contents["EffortPoints"] || base_data.evs,
:base_exp => contents["BaseExp"] || contents["BaseEXP"] || base_data.base_exp,
@@ -844,8 +850,6 @@ module Compiler
:unmega_form => contents["UnmegaForm"],
:mega_message => contents["MegaMessage"]
}
# If form is single-typed, ensure it remains so if base species is dual-typed
species_hash[:type2] = contents["Type1"] if contents["Type1"] && !contents["Type2"]
# If form has any wild items, ensure none are inherited from base species
if (contents["WildItemCommon"] && !contents["WildItemCommon"].empty?) ||
(contents["WildItemUncommon"] && !contents["WildItemUncommon"].empty?) ||