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

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

11
Data/Scripts/010_Data/001_GameData.rb
View File

@@ -266,13 +266,12 @@ module GameData
self.constants.each do |c|
next if !self.const_get(c).is_a?(Class)
ret[c] = self.const_get(c)::PBS_BASE_FILENAME if self.const_get(c).const_defined?(:PBS_BASE_FILENAME)
if ret[c].is_a?(Array)
ret[c].length.times do |i|
next if i == 0
ret[(c.to_s + i.to_s).to_sym] = ret[c][i] # :Species1 => "pokemon_forms"
end
ret[c] = ret[c][0] # :Species => "pokemon"
next if !ret[c].is_a?(Array)
ret[c].length.times do |i|
next if i == 0
ret[(c.to_s + i.to_s).to_sym] = ret[c][i] # :Species1 => "pokemon_forms"
end
ret[c] = ret[c][0] # :Species => "pokemon"
end
return ret
end

2
Data/Scripts/010_Data/002_PBS data/002_TownMap.rb
View File

@@ -33,7 +33,7 @@ module GameData
# @return [String] the translated name of this region
def name
return pbGetMessageFromHash(MessageTypes::Regions, @real_name)
return pbGetMessageFromHash(MessageTypes::REGION_NAMES, @real_name)
end
def has_flag?(flag)

2
Data/Scripts/010_Data/002_PBS data/003_Type.rb
View File

@@ -48,7 +48,7 @@ module GameData
# @return [String] the translated name of this item
def name
return pbGetMessageFromHash(MessageTypes::Types, @real_name)
return pbGetMessageFromHash(MessageTypes::TYPE_NAMES, @real_name)
end
def physical?; return !@special_type; end

12
Data/Scripts/010_Data/002_PBS data/004_Ability.rb
View File

@@ -14,10 +14,10 @@ module GameData
include InstanceMethods
SCHEMA = {
"SectionName" => [:id, "m"],
"Name" => [:real_name, "s"],
"Description" => [:real_description, "q"],
"Flags" => [:flags, "*s"]
"SectionName" => [:id, "m"],
"Name" => [:real_name, "s"],
"Description" => [:real_description, "q"],
"Flags" => [:flags, "*s"]
}
def initialize(hash)
@@ -30,12 +30,12 @@ module GameData
# @return [String] the translated name of this ability
def name
return pbGetMessageFromHash(MessageTypes::Abilities, @real_name)
return pbGetMessageFromHash(MessageTypes::ABILITY_NAMES, @real_name)
end
# @return [String] the translated description of this ability
def description
return pbGetMessageFromHash(MessageTypes::AbilityDescriptions, @real_description)
return pbGetMessageFromHash(MessageTypes::ABILITY_DESCRIPTIONS, @real_description)
end
def has_flag?(flag)

4
Data/Scripts/010_Data/002_PBS data/005_Move.rb
View File

@@ -60,12 +60,12 @@ module GameData
# @return [String] the translated name of this move
def name
return pbGetMessageFromHash(MessageTypes::Moves, @real_name)
return pbGetMessageFromHash(MessageTypes::MOVE_NAMES, @real_name)
end
# @return [String] the translated description of this move
def description
return pbGetMessageFromHash(MessageTypes::MoveDescriptions, @real_description)
return pbGetMessageFromHash(MessageTypes::MOVE_DESCRIPTIONS, @real_description)
end
def has_flag?(flag)

18
Data/Scripts/010_Data/002_PBS data/006_Item.rb
View File

@@ -31,10 +31,10 @@ module GameData
"Price" => [:price, "u"],
"SellPrice" => [:sell_price, "u"],
"BPPrice" => [:bp_price, "u"],
"FieldUse" => [:field_use, "e", { "OnPokemon" => 1, "Direct" => 2,
"TM" => 3, "HM" => 4, "TR" => 5 }],
"BattleUse" => [:battle_use, "e", { "OnPokemon" => 1, "OnMove" => 2,
"OnBattler" => 3, "OnFoe" => 4, "Direct" => 5 }],
"FieldUse" => [:field_use, "e", {"OnPokemon" => 1, "Direct" => 2,
"TM" => 3, "HM" => 4, "TR" => 5}],
"BattleUse" => [:battle_use, "e", {"OnPokemon" => 1, "OnMove" => 2,
"OnBattler" => 3, "OnFoe" => 4, "Direct" => 5}],
"Flags" => [:flags, "*s"],
"Consumable" => [:consumable, "b"],
"Move" => [:move, "e", :Move],
@@ -133,29 +133,29 @@ module GameData
# @return [String] the translated name of this item
def name
return pbGetMessageFromHash(MessageTypes::Items, @real_name)
return pbGetMessageFromHash(MessageTypes::ITEM_NAMES, @real_name)
end
# @return [String] the translated plural version of the name of this item
def name_plural
return pbGetMessageFromHash(MessageTypes::ItemPlurals, @real_name_plural)
return pbGetMessageFromHash(MessageTypes::ITEM_NAME_PLURALS, @real_name_plural)
end
# @return [String] the translated portion name of this item
def portion_name
return pbGetMessageFromHash(MessageTypes::ItemPortions, @real_portion_name) if @real_portion_name
return pbGetMessageFromHash(MessageTypes::ITEM_PORTION_NAMES, @real_portion_name) if @real_portion_name
return name
end
# @return [String] the translated plural version of the portion name of this item
def portion_name_plural
return pbGetMessageFromHash(MessageTypes::ItemPortionPlurals, @real_portion_name_plural) if @real_portion_name_plural
return pbGetMessageFromHash(MessageTypes::ITEM_PORTION_NAME_PLURALS, @real_portion_name_plural) if @real_portion_name_plural
return name_plural
end
# @return [String] the translated description of this item
def description
return pbGetMessageFromHash(MessageTypes::ItemDescriptions, @real_description)
return pbGetMessageFromHash(MessageTypes::ITEM_DESCRIPTIONS, @real_description)
end
def has_flag?(flag)

8
Data/Scripts/010_Data/002_PBS data/008_Species.rb
View File

@@ -220,22 +220,22 @@ module GameData
# @return [String] the translated name of this species
def name
return pbGetMessageFromHash(MessageTypes::Species, @real_name)
return pbGetMessageFromHash(MessageTypes::SPECIES_NAMES, @real_name)
end
# @return [String] the translated name of this form of this species
def form_name
return pbGetMessageFromHash(MessageTypes::SpeciesForms, @real_form_name)
return pbGetMessageFromHash(MessageTypes::SPECIES_FORM_NAMES, @real_form_name)
end
# @return [String] the translated Pokédex category of this species
def category
return pbGetMessageFromHash(MessageTypes::SpeciesCategories, @real_category)
return pbGetMessageFromHash(MessageTypes::SPECIES_CATEGORIES, @real_category)
end
# @return [String] the translated Pokédex entry of this species
def pokedex_entry
return pbGetMessageFromHash(MessageTypes::PokedexEntries, @real_pokedex_entry)
return pbGetMessageFromHash(MessageTypes::POKEDEX_ENTRIES, @real_pokedex_entry)
end
def default_form

8
Data/Scripts/010_Data/002_PBS data/010_SpeciesMetrics.rb
View File

@@ -38,7 +38,7 @@ module GameData
if form > 0
trial = sprintf("%s_%d", species, form).to_sym
if !DATA.has_key?(trial)
self.register({ :id => species }) if !DATA[species]
self.register({:id => species}) if !DATA[species]
self.register({
:id => trial,
:species => species,
@@ -52,7 +52,7 @@ module GameData
end
return DATA[trial]
end
self.register({ :id => species }) if !DATA[species]
self.register({:id => species}) if !DATA[species]
return DATA[species]
end
@@ -70,9 +70,7 @@ module GameData
def apply_metrics_to_sprite(sprite, index, shadow = false)
if shadow
if (index & 1) == 1 # Foe Pokémon
sprite.x += @shadow_x * 2
end
sprite.x += @shadow_x * 2 if (index & 1) == 1 # Foe Pokémon
elsif (index & 1) == 0 # Player's Pokémon
sprite.x += @back_sprite[0] * 2
sprite.y += @back_sprite[1] * 2

7
Data/Scripts/010_Data/002_PBS data/011_ShadowPokemon.rb
View File

@@ -13,7 +13,7 @@ module GameData
SCHEMA = {
"SectionName" => [:id, "e", :Species],
"GaugeSize" => [:gauge_size, "v"],
"Moves" => [:moves, "*m"], # Not enumerated when compiled
"Moves" => [:moves, "*e", :Move],
"Flags" => [:flags, "*s"]
}
HEART_GAUGE_SIZE = 4000 # Default gauge size
@@ -21,6 +21,11 @@ module GameData
extend ClassMethodsSymbols
include InstanceMethods
alias __orig__load load unless private_method_defined?(:__orig__load)
def self.load
__orig__load if safeExists?("Data/#{self::DATA_FILENAME}")
end
def initialize(hash)
@id = hash[:id]
@gauge_size = hash[:gauge_size] || HEART_GAUGE_SIZE

4
Data/Scripts/010_Data/002_PBS data/012_Ribbon.rb
View File

@@ -33,12 +33,12 @@ module GameData
# @return [String] the translated name of this ribbon
def name
return pbGetMessageFromHash(MessageTypes::RibbonNames, @real_name)
return pbGetMessageFromHash(MessageTypes::RIBBON_NAMES, @real_name)
end
# @return [String] the translated description of this ribbon
def description
return pbGetMessageFromHash(MessageTypes::RibbonDescriptions, @real_description)
return pbGetMessageFromHash(MessageTypes::RIBBON_DESCRIPTIONS, @real_description)
end
def has_flag?(flag)

10
Data/Scripts/010_Data/002_PBS data/014_TrainerType.rb
View File

@@ -18,10 +18,10 @@ module GameData
SCHEMA = {
"SectionName" => [:id, "m"],
"Name" => [:real_name, "s"],
"Gender" => [:gender, "e", { "Male" => 0, "male" => 0, "M" => 0, "m" => 0, "0" => 0,
"Female" => 1, "female" => 1, "F" => 1, "f" => 1, "1" => 1,
"Unknown" => 2, "unknown" => 2, "Other" => 2, "other" => 2,
"Mixed" => 2, "mixed" => 2, "X" => 2, "x" => 2, "2" => 2 }],
"Gender" => [:gender, "e", {"Male" => 0, "male" => 0, "M" => 0, "m" => 0, "0" => 0,
"Female" => 1, "female" => 1, "F" => 1, "f" => 1, "1" => 1,
"Unknown" => 2, "unknown" => 2, "Other" => 2, "other" => 2,
"Mixed" => 2, "mixed" => 2, "X" => 2, "x" => 2, "2" => 2}],
"BaseMoney" => [:base_money, "u"],
"SkillLevel" => [:skill_level, "u"],
"Flags" => [:flags, "*s"],
@@ -113,7 +113,7 @@ module GameData
# @return [String] the translated name of this trainer type
def name
return pbGetMessageFromHash(MessageTypes::TrainerTypes, @real_name)
return pbGetMessageFromHash(MessageTypes::TRAINER_TYPE_NAMES, @real_name)
end
def male?; return @gender == 0; end

8
Data/Scripts/010_Data/002_PBS data/015_Trainer.rb
View File

@@ -30,8 +30,8 @@ module GameData
"Ability" => [:ability, "e", :Ability],
"AbilityIndex" => [:ability_index, "u"],
"Item" => [:item, "e", :Item],
"Gender" => [:gender, "e", { "M" => 0, "m" => 0, "Male" => 0, "male" => 0, "0" => 0,
"F" => 1, "f" => 1, "Female" => 1, "female" => 1, "1" => 1 }],
"Gender" => [:gender, "e", {"M" => 0, "m" => 0, "Male" => 0, "male" => 0, "0" => 0,
"F" => 1, "f" => 1, "Female" => 1, "female" => 1, "1" => 1}],
"Nature" => [:nature, "e", :Nature],
"IV" => [:iv, "uUUUUU"],
"EV" => [:ev, "uUUUUU"],
@@ -102,12 +102,12 @@ module GameData
# @return [String] the translated name of this trainer
def name
return pbGetMessageFromHash(MessageTypes::TrainerNames, @real_name)
return pbGetMessageFromHash(MessageTypes::TRAINER_NAMES, @real_name)
end
# @return [String] the translated in-battle lose message of this trainer
def lose_text
return pbGetMessageFromHash(MessageTypes::TrainerLoseTexts, @real_lose_text)
return pbGetMessageFromHash(MessageTypes::TRAINER_SPEECHES_LOSE, @real_lose_text)
end
# Creates a battle-ready version of a trainer's data.

2
Data/Scripts/010_Data/002_PBS data/016_Metadata.rb
View File

@@ -74,7 +74,7 @@ module GameData
# @return [String] the translated name of the Pokémon Storage creator
def storage_creator
ret = pbGetMessageFromHash(MessageTypes::StorageCreator, @real_storage_creator)
ret = pbGetMessageFromHash(MessageTypes::STORAGE_CREATOR_NAME, @real_storage_creator)
return nil_or_empty?(ret) ? _INTL("Bill") : ret
end
end

2
Data/Scripts/010_Data/002_PBS data/018_MapMetadata.rb
View File

@@ -115,7 +115,7 @@ module GameData
# @return [String] the translated name of this map
def name
ret = pbGetMessageFromHash(MessageTypes::MapNames, @real_name)
ret = pbGetMessageFromHash(MessageTypes::MAP_NAMES, @real_name)
ret = pbGetBasicMapNameFromId(@id) if nil_or_empty?(ret)
ret.gsub!(/\\PN/, $player.name) if $player
return ret

2
Data/Scripts/010_Data/002_PBS data/021_PhoneMessage.rb
View File

@@ -42,7 +42,7 @@ module GameData
validate tr_type => [Symbol, String]
validate tr_name => [String, NilClass]
key = [tr_type.to_sym, tr_name, tr_version]
key = key[0] if key[1] == nil
key = key[0] if key[1].nil?
return !self::DATA[key].nil?
end