mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 13:15:01 +00:00
Fixed rendering of some tiles for certain sizes of tilesets, more rubocopping
This commit is contained in:
@@ -49,6 +49,6 @@ end
|
||||
|
||||
if System::VERSION != Essentials::MKXPZ_VERSION
|
||||
printf(sprintf("\e[1;33mWARNING: mkxp-z version %s detected, but this version of Pokémon Essentials was designed for mkxp-z version %s.\e[0m\r\n",
|
||||
System::VERSION, Essentials::MKXPZ_VERSION))
|
||||
System::VERSION, Essentials::MKXPZ_VERSION))
|
||||
printf("\e[1;33mWARNING: Pokémon Essentials may not work properly.\e[0m\r\n")
|
||||
end
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#############################
|
||||
#
|
||||
#===============================================================================
|
||||
# HTTP utility functions
|
||||
#
|
||||
#############################
|
||||
#===============================================================================
|
||||
def pbPostData(url, postdata, filename = nil, depth = 0)
|
||||
if url[/^http:\/\/([^\/]+)(.*)$/]
|
||||
host = $1
|
||||
@@ -21,11 +19,11 @@ def pbPostData(url, postdata, filename = nil, depth = 0)
|
||||
body,
|
||||
"application/x-www-form-urlencoded",
|
||||
{
|
||||
"Host" => host, # might not be necessary
|
||||
"Host" => host, # might not be necessary
|
||||
"Proxy-Connection" => "Close",
|
||||
"Content-Length" => body.bytesize.to_s,
|
||||
"Pragma" => "no-cache",
|
||||
"User-Agent" => userAgent
|
||||
"Content-Length" => body.bytesize.to_s,
|
||||
"Pragma" => "no-cache",
|
||||
"User-Agent" => userAgent
|
||||
}
|
||||
) rescue ""
|
||||
return ret if !ret.is_a?(Hash)
|
||||
@@ -40,8 +38,8 @@ end
|
||||
def pbDownloadData(url, filename = nil, authorization = nil, depth = 0, &block)
|
||||
headers = {
|
||||
"Proxy-Connection" => "Close",
|
||||
"Pragma" => "no-cache",
|
||||
"User-Agent" => "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.14) Gecko/2009082707 Firefox/3.0.14"
|
||||
"Pragma" => "no-cache",
|
||||
"User-Agent" => "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.14) Gecko/2009082707 Firefox/3.0.14"
|
||||
}
|
||||
headers["authorization"] = authorization if authorization
|
||||
ret = HTTPLite.get(url, headers) rescue ""
|
||||
|
||||
@@ -571,15 +571,17 @@ class Translation
|
||||
def setMapMessagesAsHash(map_id, array)
|
||||
load_default_messages
|
||||
@default_game_messages[MessageTypes::EVENT_TEXTS] ||= []
|
||||
@default_game_messages[MessageTypes::EVENT_TEXTS][map_id] = priv_add_to_hash(MessageTypes::EVENT_TEXTS,
|
||||
array, nil, map_id)
|
||||
@default_game_messages[MessageTypes::EVENT_TEXTS][map_id] = priv_add_to_hash(
|
||||
MessageTypes::EVENT_TEXTS, array, nil, map_id
|
||||
)
|
||||
end
|
||||
|
||||
def addMapMessagesAsHash(map_id, array)
|
||||
load_default_messages
|
||||
@default_game_messages[MessageTypes::EVENT_TEXTS] ||= []
|
||||
@default_game_messages[MessageTypes::EVENT_TEXTS][map_id] = priv_add_to_hash(MessageTypes::EVENT_TEXTS,
|
||||
array, @default_game_messages[MessageTypes::EVENT_TEXTS][map_id], map_id)
|
||||
@default_game_messages[MessageTypes::EVENT_TEXTS][map_id] = priv_add_to_hash(
|
||||
MessageTypes::EVENT_TEXTS, array, @default_game_messages[MessageTypes::EVENT_TEXTS][map_id], map_id
|
||||
)
|
||||
end
|
||||
|
||||
def get(type, id)
|
||||
|
||||
@@ -277,13 +277,13 @@ module PluginManager
|
||||
end
|
||||
# Add plugin to class variable
|
||||
@@Plugins[name] = {
|
||||
:name => name,
|
||||
:version => version,
|
||||
:essentials => essentials,
|
||||
:link => link,
|
||||
:dependencies => dependencies,
|
||||
:name => name,
|
||||
:version => version,
|
||||
:essentials => essentials,
|
||||
:link => link,
|
||||
:dependencies => dependencies,
|
||||
:incompatibilities => incompats,
|
||||
:credits => credits
|
||||
:credits => credits
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user