DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-22 14:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

More Rubocop changes

Browse Source
This commit is contained in:
Maruno17
2022-02-13 00:57:54 +00:00
parent cca5989746
commit f68e699cc9
108 changed files with 708 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Data/Scripts/002_Save data/001_SaveData.rb
View File

@@ -6,9 +6,9 @@
module SaveData
# Contains the file path of the save file.
FILE_PATH = if File.directory?(System.data_directory)
System.data_directory + '/Game.rxdata'
System.data_directory + "/Game.rxdata"
else
'./Game.rxdata'
"./Game.rxdata"
end
# @return [Boolean] whether the save file exists
@@ -45,7 +45,7 @@ module SaveData
save_data = get_data_from_file(file_path)
save_data = to_hash_format(save_data) if save_data.is_a?(Array)
if !save_data.empty? && run_conversions(save_data)
File.open(file_path, 'wb') { |file| Marshal.dump(save_data, file) }
File.open(file_path, "wb") { |file| Marshal.dump(save_data, file) }
end
return save_data
end
@@ -57,14 +57,14 @@ module SaveData
def self.save_to_file(file_path)
validate file_path => String
save_data = self.compile_save_hash
File.open(file_path, 'wb') { |file| Marshal.dump(save_data, file) }
File.open(file_path, "wb") { |file| Marshal.dump(save_data, file) }
end
# Deletes the save file (and a possible .bak backup file if one exists)
# @raise [Error::ENOENT]
def self.delete_file
File.delete(FILE_PATH)
File.delete(FILE_PATH + '.bak') if File.file?(FILE_PATH + '.bak')
File.delete(FILE_PATH + ".bak") if File.file?(FILE_PATH + ".bak")
end
# Converts the pre-v19 format data to the new format.
@@ -85,12 +85,12 @@ module SaveData
# already exists in {FILE_PATH}.
def self.move_old_windows_save
return if File.file?(FILE_PATH)
game_title = System.game_title.gsub(/[^\w ]/, '_')
home = ENV['HOME'] || ENV['HOMEPATH']
game_title = System.game_title.gsub(/[^\w ]/, "_")
home = ENV["HOME"] || ENV["HOMEPATH"]
return if home.nil?
old_location = File.join(home, 'Saved Games', game_title)
old_location = File.join(home, "Saved Games", game_title)
return unless File.directory?(old_location)
old_file = File.join(old_location, 'Game.rxdata')
old_file = File.join(old_location, "Game.rxdata")
return unless File.file?(old_file)
File.move(old_file, FILE_PATH)
end

10
Data/Scripts/002_Save data/002_SaveData_Value.rb
View File

@@ -114,21 +114,21 @@ module SaveData
# Requires a block with the loaded value as its parameter.
# @see SaveData.register
def load_value(&block)
raise ArgumentError, 'No block given to load_value' unless block_given?
raise ArgumentError, "No block given to load_value" unless block_given?
@load_proc = block
end
# Defines what is saved into save data. Requires a block.
# @see SaveData.register
def save_value(&block)
raise ArgumentError, 'No block given to save_value' unless block_given?
raise ArgumentError, "No block given to save_value" unless block_given?
@save_proc = block
end
# If present, defines what the value is set to at the start of a new game.
# @see SaveData.register
def new_game_value(&block)
raise ArgumentError, 'No block given to new_game_value' unless block_given?
raise ArgumentError, "No block given to new_game_value" unless block_given?
@new_game_value_proc = block
end
@@ -142,7 +142,7 @@ module SaveData
# save format. Requires a block with the old format array as its parameter.
# @see SaveData.register
def from_old_format(&block)
raise ArgumentError, 'No block given to from_old_format' unless block_given?
raise ArgumentError, "No block given to from_old_format" unless block_given?
@old_format_get_proc = block
end
@@ -185,7 +185,7 @@ module SaveData
def self.register(id, &block)
validate id => Symbol
unless block_given?
raise ArgumentError, 'No block given to SaveData.register'
raise ArgumentError, "No block given to SaveData.register"
end
@values << Value.new(id, &block)
end

12
Data/Scripts/002_Save data/003_SaveData_Conversion.rb
View File

@@ -112,7 +112,7 @@ module SaveData
# @see SaveData.register_conversion
def to_value(value_id, &block)
validate value_id => Symbol
raise ArgumentError, 'No block given to to_value' unless block_given?
raise ArgumentError, "No block given to to_value" unless block_given?
if @value_procs[value_id].is_a?(Proc)
raise "Multiple to_value definitions in conversion #{@id} for #{value_id}"
end
@@ -122,7 +122,7 @@ module SaveData
# Defines a conversion to the entire save data.
# @see SaveData.register_conversion
def to_all(&block)
raise ArgumentError, 'No block given to to_all' unless block_given?
raise ArgumentError, "No block given to to_all" unless block_given?
if @all_proc.is_a?(Proc)
raise "Multiple to_all definitions in conversion #{@id}"
end
@@ -156,7 +156,7 @@ module SaveData
def self.register_conversion(id, &block)
validate id => Symbol
unless block_given?
raise ArgumentError, 'No block given to SaveData.register_conversion'
raise ArgumentError, "No block given to SaveData.register_conversion"
end
conversion = Conversion.new(id, &block)
@conversions[conversion.trigger_type][conversion.version] ||= []
@@ -168,8 +168,8 @@ module SaveData
def self.get_conversions(save_data)
conversions_to_run = []
versions = {
essentials: save_data[:essentials_version] || '18.1',
game: save_data[:game_version] || '0.0.0'
essentials: save_data[:essentials_version] || "18.1",
game: save_data[:game_version] || "0.0.0"
}
[:essentials, :game].each do |trigger_type|
# Ensure the versions are sorted from lowest to highest
@@ -194,7 +194,7 @@ module SaveData
validate save_data => Hash
conversions_to_run = self.get_conversions(save_data)
return false if conversions_to_run.none?
File.open(SaveData::FILE_PATH + '.bak', 'wb') { |f| Marshal.dump(save_data, f) }
File.open(SaveData::FILE_PATH + ".bak", "wb") { |f| Marshal.dump(save_data, f) }
Console.echo_h1 "Running #{conversions_to_run.length} save file conversions"
conversions_to_run.each do |conversion|
Console.echo_li "#{conversion.title}..."

28
Data/Scripts/002_Save data/005_Game_SaveConversions.rb
View File

@@ -9,7 +9,7 @@
# of them in order to convert planted berry data properly.
SaveData.register_conversion(:v19_2_fix_planted_berry_numerical_ids) do
essentials_version 19.2
display_title 'Fixing berry plant IDs data'
display_title "Fixing berry plant IDs data"
to_value :global_metadata do |global|
berry_conversion = {
389 => :CHERIBERRY,
@@ -100,7 +100,7 @@ end
SaveData.register_conversion(:v20_refactor_planted_berries_data) do
essentials_version 20
display_title 'Updating berry plant data format'
display_title "Updating berry plant data format"
to_value :global_metadata do |global|
if global.eventvars
global.eventvars.each_pair do |key, value|
@@ -144,7 +144,7 @@ end
SaveData.register_conversion(:v20_refactor_follower_data) do
essentials_version 20
display_title 'Updating follower data format'
display_title "Updating follower data format"
to_value :global_metadata do |global|
# NOTE: dependentEvents is still defined in class PokemonGlobalMetadata just
# for the sake of this conversion. It will be removed in future.
@@ -167,7 +167,7 @@ end
SaveData.register_conversion(:v20_refactor_day_care_variables) do
essentials_version 20
display_title 'Refactoring Day Care variables'
display_title "Refactoring Day Care variables"
to_value :global_metadata do |global|
global.instance_eval do
@day_care = DayCare.new if @day_care.nil?
@@ -205,7 +205,7 @@ end
SaveData.register_conversion(:v20_rename_bag_variables) do
essentials_version 20
display_title 'Renaming Bag variables'
display_title "Renaming Bag variables"
to_value :bag do |bag|
bag.instance_eval do
if !@lastpocket.nil?
@@ -232,7 +232,7 @@ end
SaveData.register_conversion(:v20_increment_player_character_id) do
essentials_version 19.1
display_title 'Incrementing player character ID'
display_title "Incrementing player character ID"
to_value :player do |player|
player.character_ID += 1
end
@@ -242,7 +242,7 @@ end
SaveData.register_conversion(:v20_add_pokedex_records) do
essentials_version 20
display_title 'Adding more Pokédex records'
display_title "Adding more Pokédex records"
to_value :player do |player|
player.pokedex.instance_eval do
@caught_counts = {} if @caught_counts.nil?
@@ -261,7 +261,7 @@ end
SaveData.register_conversion(:v20_add_default_nicknaming_option) do
essentials_version 20
display_title 'Updating Options to include nicknaming setting'
display_title "Updating Options to include nicknaming setting"
to_value :pokemon_system do |option|
option.givenicknames = 0 if option.givenicknames.nil?
end
@@ -271,7 +271,7 @@ end
SaveData.register_conversion(:v20_fix_default_weather_type) do
essentials_version 20
display_title 'Fixing weather type 0 in effect'
display_title "Fixing weather type 0 in effect"
to_value :game_screen do |game_screen|
game_screen.instance_eval do
@weather_type = :None if @weather_type == 0
@@ -283,7 +283,7 @@ end
SaveData.register_conversion(:v20_add_stats) do
essentials_version 20
display_title 'Adding stats to save data'
display_title "Adding stats to save data"
to_all do |save_data|
unless save_data.has_key?(:stats)
save_data[:stats] = GameStats.new
@@ -298,7 +298,7 @@ end
SaveData.register_conversion(:v20_convert_pokemon_markings) do
essentials_version 20
display_title 'Updating format of Pokémon markings'
display_title "Updating format of Pokémon markings"
to_all do |save_data|
# Create a lambda function that updates a Pokémon's markings
update_markings = lambda do |pkmn|
@@ -338,10 +338,10 @@ SaveData.register_conversion(:v20_convert_pokemon_markings) do
variables = save_data[:variables]
(0..5000).each do |i|
value = variables[i]
next if value.nil?
if value.is_a?(Array)
case value
when Array
value.each { |value2| update_markings.call(value2) if value2.is_a?(Pokemon) }
elsif value.is_a?(Pokemon)
when Pokemon
update_markings.call(value)
end
end