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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2021-01-30 21:56:29 +00:00
parent 6d3ff0c724 f3f21d4679
commit d678a8b821
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Data/Scripts/001_Technical/006_Sockets.rb
View File

@@ -568,25 +568,28 @@ def pbPostData(url, postdata, filename=nil, depth=0)
return "" return ""
end end
def pbDownloadData(url, filename=nil, depth=0) def pbDownloadData(url, filename = nil, authorization = nil, depth = 0, &block)
raise "Redirection level too deep" if depth>10 raise "Redirection level too deep" if depth > 10
if url[/^http:\/\/([^\/]+)(.*)$/] if url[/^(([^:\/?#]+):(?=\/\/))?(\/\/)?((([^:]+)(?::([^@]+)?)?@)?([^@\/?#:]*)(?::(\d+)?)?)?([^?#]*)(\?([^#]*))?(#(.*))?/]
host = $1 host = $8
path = $2 path = $10
path = "/" if path.length==0 parameters = $11
port = $9 ? $9.to_i : 80
path = "/" if path.length == 0
userAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.14) Gecko/2009082707 Firefox/3.0.14" userAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.14) Gecko/2009082707 Firefox/3.0.14"
request = "GET #{path} HTTP/1.1\r\n" request = "GET #{path}#{parameters} HTTP/1.1\r\n"
request += "User-Agent: #{userAgent}\r\n" request += "User-Agent: #{userAgent}\r\n"
request += "Pragma: no-cache\r\n" request += "Pragma: no-cache\r\n"
request += "Host: #{host}\r\n" request += "Host: #{host}\r\n"
request += "Proxy-Connection: Close\r\n" request += "Proxy-Connection: Close\r\n"
request += "Authorization: #{authorization}\r\n" if authorization
request += "\r\n" request += "\r\n"
return pbHttpRequest(host, request, filename, depth) return pbHttpRequest(host, request, filename, depth, port, &block)
end end
return "" return ""
end end
def pbHttpRequest(host, request, filename=nil, depth=0) def pbHttpRequest(host, request, filename = nil, depth = 0, port = nil)
raise "Redirection level too deep" if depth>10 raise "Redirection level too deep" if depth>10
socket = ::TCPSocket.new(host, 80) socket = ::TCPSocket.new(host, 80)
time = Time.now.to_i time = Time.now.to_i
@@ -617,7 +620,7 @@ def pbHttpRequest(host, request, filename=nil, depth=0)
end end
if headers["Location"] && errorcode>=300 && errorcode<400 if headers["Location"] && errorcode>=300 && errorcode<400
socket.close rescue socket = nil socket.close rescue socket = nil
return pbDownloadData(headers["Location"],filename,depth+1) return pbDownloadData(headers["Location"],filename,nil,depth+1)
end end
if chunked if chunked
# Chunked content # Chunked content

2
Data/Scripts/003_Game classes/009_Game_Map.rb
View File

@@ -9,7 +9,7 @@ class Game_Map
attr_accessor :tileset_name # tileset file name attr_accessor :tileset_name # tileset file name
attr_accessor :autotile_names # autotile file name attr_accessor :autotile_names # autotile file name
attr_reader :passages # passage table attr_reader :passages # passage table
attr_reader :priorities # prioroty table attr_reader :priorities # priority table
attr_reader :terrain_tags # terrain tag table attr_reader :terrain_tags # terrain tag table
attr_reader :events # events attr_reader :events # events
attr_accessor :panorama_name # panorama file name attr_accessor :panorama_name # panorama file name

3
Data/Scripts/013_Overworld/010_PField_RandomDungeons.rb
View File

@@ -147,9 +147,6 @@ end
# Dungeon generation algorithm found at:
# http://members.gamedev.net/potentialwell/ProceduralDungeonGeneration-JTippets.pdf
class MazeNode class MazeNode
def initialize def initialize
@edges=0 @edges=0