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

Fixed previous commit always causing recompiling if shadow_pokemon.dat doesn't exist, also rubocopping

Browse Source
This commit is contained in:
Maruno17
2023-01-23 22:27:04 +00:00
parent f6213057d8
commit b0b6e675c3
103 changed files with 1099 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb
View File

@@ -339,8 +339,6 @@ def pbEncounterTypeEditor(enc_data, enc_type)
Input.update
end
#===============================================================================
# Trainer type editor
#===============================================================================
@@ -444,8 +442,6 @@ def pbTrainerTypeEditorNew(default_name)
return id.to_sym
end
#===============================================================================
# Individual trainer editor
#===============================================================================
@@ -476,8 +472,9 @@ module TrainerBattleProperty
end
end
#===============================================================================
#
#===============================================================================
def pbTrainerBattleEditor
modified = false
pbListScreenBlock(_INTL("Trainer Battles"), TrainerBattleLister.new(0, true)) { |button, trainer_id|
@@ -601,14 +598,12 @@ def pbTrainerBattleEditor
end
end
#===============================================================================
# Trainer Pokémon editor
#===============================================================================
module TrainerPokemonProperty
def self.set(settingname, initsetting)
initsetting = { :species => nil, :level => 10 } if !initsetting
initsetting = {:species => nil, :level => 10} if !initsetting
oldsetting = [
initsetting[:species],
initsetting[:level],
@@ -691,8 +686,6 @@ module TrainerPokemonProperty
end
end
#===============================================================================
# Metadata editor
#===============================================================================
@@ -747,7 +740,7 @@ def pbEditPlayerMetadata(player_id = 1)
player_id = i
break
end
metadata = GameData::PlayerMetadata.new({ :id => player_id })
metadata = GameData::PlayerMetadata.new({:id => player_id})
elsif !GameData::PlayerMetadata.exists?(player_id)
pbMessage(_INTL("Metadata for player character {1} was not found.", player_id))
return
@@ -780,8 +773,6 @@ def pbEditPlayerMetadata(player_id = 1)
end
end
#===============================================================================
# Map metadata editor
#===============================================================================
@@ -798,7 +789,7 @@ def pbEditMapMetadata(map_id)
data = []
map_name = mapinfos[map_id].name
metadata = GameData::MapMetadata.try_get(map_id)
metadata = GameData::MapMetadata.new({ :id => map_id }) if !metadata
metadata = GameData::MapMetadata.new({:id => map_id}) if !metadata
properties = GameData::MapMetadata.editor_properties
properties.each do |property|
val = metadata.get_property_for_PBS(property[0])
@@ -825,8 +816,6 @@ def pbEditMapMetadata(map_id)
end
end
#===============================================================================
# Item editor
#===============================================================================
@@ -931,8 +920,6 @@ def pbItemEditorNew(default_name)
pbMessage(_INTL("Put the item's graphic ({1}.png) in Graphics/Items, or it will be blank.", id.to_s))
end
#===============================================================================
# Pokémon species editor
#===============================================================================
@@ -999,8 +986,6 @@ def pbPokemonEditor
}
end
#===============================================================================
# Regional Dexes editor
#===============================================================================
@@ -1261,8 +1246,6 @@ def pbEvoFamiliesToStrings
return ret
end
#===============================================================================
# Battle animations rearranger
#===============================================================================