mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2026-07-22 07:37:00 +00:00
Update 6.8
This commit is contained in:
@@ -55,7 +55,7 @@ module GameData
|
||||
|
||||
if !self::DATA.has_key?(other)
|
||||
if self == GameData::Item
|
||||
return nil
|
||||
return self::get(:UNKNOWN)
|
||||
else
|
||||
return self::get(:PIKACHU)
|
||||
end
|
||||
@@ -108,12 +108,25 @@ module GameData
|
||||
keys.each { |key| yield self::DATA[key] if !key.is_a?(Integer) }
|
||||
end
|
||||
|
||||
def load
|
||||
const_set(:DATA, load_data("Data/#{self::DATA_FILENAME}"))
|
||||
end
|
||||
|
||||
|
||||
def load
|
||||
filename = "Data/#{self::DATA_FILENAME}"
|
||||
raw = File.open(filename, "rb") { |f| f.read }
|
||||
begin
|
||||
const_set(:DATA, Marshal.load(Encryption.xor(raw)))
|
||||
rescue TypeError, ArgumentError => e
|
||||
echoln "Encrypted load failed for #{filename}: #{e.message}, trying plain..."
|
||||
begin
|
||||
const_set(:DATA, Marshal.load(raw))
|
||||
rescue => e2
|
||||
echoln "Plain load also failed for #{filename}: #{e2.message}"
|
||||
end
|
||||
end
|
||||
end
|
||||
def save
|
||||
save_data(self::DATA, "Data/#{self::DATA_FILENAME}")
|
||||
raw = Marshal.dump(self::DATA)
|
||||
File.open("Data/#{self::DATA_FILENAME}", "wb") { |f| f.write(Encryption.xor(raw)) }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -171,11 +184,22 @@ module GameData
|
||||
end
|
||||
|
||||
def load
|
||||
const_set(:DATA, load_data("Data/#{self::DATA_FILENAME}"))
|
||||
filename = "Data/#{self::DATA_FILENAME}"
|
||||
raw = File.open(filename, "rb") { |f| f.read }
|
||||
begin
|
||||
const_set(:DATA, Marshal.load(Encryption.xor(raw)))
|
||||
rescue TypeError, ArgumentError => e
|
||||
echoln "Encrypted load failed for #{filename}: #{e.message}, trying plain..."
|
||||
begin
|
||||
const_set(:DATA, Marshal.load(raw))
|
||||
rescue => e2
|
||||
echoln "Plain load also failed for #{filename}: #{e2.message}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def save
|
||||
save_data(self::DATA, "Data/#{self::DATA_FILENAME}")
|
||||
raw = Marshal.dump(self::DATA)
|
||||
File.open("Data/#{self::DATA_FILENAME}", "wb") { |f| f.write(Encryption.xor(raw)) }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -228,11 +252,22 @@ module GameData
|
||||
end
|
||||
|
||||
def load
|
||||
const_set(:DATA, load_data("Data/#{self::DATA_FILENAME}"))
|
||||
filename = "Data/#{self::DATA_FILENAME}"
|
||||
raw = File.open(filename, "rb") { |f| f.read }
|
||||
begin
|
||||
const_set(:DATA, Marshal.load(Encryption.xor(raw)))
|
||||
rescue TypeError, ArgumentError => e
|
||||
echoln "Encrypted load failed for #{filename}: #{e.message}, trying plain..."
|
||||
begin
|
||||
const_set(:DATA, Marshal.load(raw))
|
||||
rescue => e2
|
||||
echoln "Plain load also failed for #{filename}: #{e2.message}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def save
|
||||
save_data(self::DATA, "Data/#{self::DATA_FILENAME}")
|
||||
raw = Marshal.dump(self::DATA)
|
||||
File.open("Data/#{self::DATA_FILENAME}", "wb") { |f| f.write(Encryption.xor(raw)) }
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user