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

Made more use of nil_or_empty?, fixed incorrect default species body shape, fixed Illusion, fixed potential foreign Pokémon with blank names

Browse Source
This commit is contained in:
Maruno17
2021-05-03 17:34:19 +01:00
parent 8e6ee21c20
commit 474281712b
30 changed files with 71 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -398,7 +398,7 @@ module Compiler
for key in schema.keys
# Skip empty properties, or raise an error if a required property is
# empty
if contents[key].nil? || contents[key] == ""
if nil_or_empty?(contents[key])
if ["Name", "InternalName"].include?(key)
raise _INTL("The entry {1} is required in PBS/pokemon.txt section {2}.", key, species_number)
end
@@ -583,7 +583,7 @@ module Compiler
# Go through schema hash of compilable data and compile this section
for key in schema.keys
# Skip empty properties (none are required)
if contents[key].nil? || contents[key] == ""
if nil_or_empty?(contents[key])
contents[key] = nil
next
end
@@ -922,7 +922,7 @@ module Compiler
end
new_format = true
values = $~[1].split(',').collect! { |v| v.strip.to_i }
values[1] = 0 if !values[1] || values[1] == ""
values[1] = 0 if nil_or_empty?(values[1])
map_number = values[0]
map_version = values[1]
# Add map encounter's data to records