From fec8d7adcddf8f6e41b367a0b03f6ddc68dbcee6 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 17 Jan 2021 21:49:05 +0000 Subject: [PATCH 1/4] Fixed crash in map rendering, fixed crash when resizing screen --- Data/Scripts/005_Map renderer/001_Tilemap_XP.rb | 8 ++++---- Data/Scripts/017_UI/015_PScreen_Options.rb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Data/Scripts/005_Map renderer/001_Tilemap_XP.rb b/Data/Scripts/005_Map renderer/001_Tilemap_XP.rb index 5f197cacf..185257a2e 100644 --- a/Data/Scripts/005_Map renderer/001_Tilemap_XP.rb +++ b/Data/Scripts/005_Map renderer/001_Tilemap_XP.rb @@ -804,13 +804,13 @@ class CustomTilemap xsize = @map_data.xsize ysize = @map_data.ysize minX = (@ox / @tileWidth) - 1 - minX.clamp(0, xsize - 1) + minX = minX.clamp(0, xsize - 1) maxX = ((@ox + @viewport.rect.width) / @tileWidth) + 1 - maxX.clamp(0, xsize - 1) + maxX = maxX.clamp(0, xsize - 1) minY = (@oy / @tileHeight) - 1 - minY.clamp(0, ysize - 1) + minY = minY.clamp(0, ysize - 1) maxY = ((@oy + @viewport.rect.height) / @tileHeight) + 1 - maxY.clamp(0, ysize - 1) + maxY = maxY.clamp(0, ysize - 1) count = 0 if minX < maxX && minY < maxY @usedsprites = usesprites || @usedsprites diff --git a/Data/Scripts/017_UI/015_PScreen_Options.rb b/Data/Scripts/017_UI/015_PScreen_Options.rb index 5de10c5df..a8f64c98b 100644 --- a/Data/Scripts/017_UI/015_PScreen_Options.rb +++ b/Data/Scripts/017_UI/015_PScreen_Options.rb @@ -486,14 +486,14 @@ class PokemonOption_Scene proc { $PokemonSystem.textskin }, proc { |value| $PokemonSystem.textskin = value - MessageConfig.pbSetSpeechFrame("Graphics/Windowskins/"+$SpeechFrames[value]) + MessageConfig.pbSetSpeechFrame("Graphics/Windowskins/" + $SpeechFrames[value]) } ), NumberOption.new(_INTL("Menu Frame"),1,$TextFrames.length, proc { $PokemonSystem.frame }, proc { |value| $PokemonSystem.frame = value - MessageConfig.pbSetSystemFrame($TextFrames[value]) + MessageConfig.pbSetSystemFrame("Graphics/Windowskins/" + $TextFrames[value]) } ), EnumOption.new(_INTL("Font Style"),[_INTL("Em"),_INTL("R/S"),_INTL("FRLG"),_INTL("DP")], From 400ad6e20812c8ff6b189b98b0769ae5039733b5 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Fri, 22 Jan 2021 20:04:08 +0000 Subject: [PATCH 2/4] Fixed error in previous commit --- Data/Scripts/017_UI/015_PScreen_Options.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/Scripts/017_UI/015_PScreen_Options.rb b/Data/Scripts/017_UI/015_PScreen_Options.rb index a8f64c98b..f89648128 100644 --- a/Data/Scripts/017_UI/015_PScreen_Options.rb +++ b/Data/Scripts/017_UI/015_PScreen_Options.rb @@ -493,7 +493,7 @@ class PokemonOption_Scene proc { $PokemonSystem.frame }, proc { |value| $PokemonSystem.frame = value - MessageConfig.pbSetSystemFrame("Graphics/Windowskins/" + $TextFrames[value]) + MessageConfig.pbSetSystemFrame($TextFrames[value]) } ), EnumOption.new(_INTL("Font Style"),[_INTL("Em"),_INTL("R/S"),_INTL("FRLG"),_INTL("DP")], From e70d89f457c2d98436f796a961c36da3e9ddf82b Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 30 Jan 2021 17:26:27 +0000 Subject: [PATCH 3/4] Minor fixes --- Data/Scripts/001_Technical/005_Sockets.rb | 3 ++- Data/Scripts/003_Game classes/009_Game_Map.rb | 2 +- Data/Scripts/013_Overworld/010_PField_RandomDungeons.rb | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Data/Scripts/001_Technical/005_Sockets.rb b/Data/Scripts/001_Technical/005_Sockets.rb index 47c7cf09a..a98de9074 100644 --- a/Data/Scripts/001_Technical/005_Sockets.rb +++ b/Data/Scripts/001_Technical/005_Sockets.rb @@ -570,7 +570,8 @@ end def pbDownloadData(url, filename=nil, depth=0) raise "Redirection level too deep" if depth>10 - if url[/^http:\/\/([^\/]+)(.*)$/] + if url[/^(([^:\/?#]+):(?=\/\/))?(\/\/)?((([^:]+)(?::([^@]+)?)?@)?([^@\/?#:]*)(?::(\d+)?)?)?([^?#]*)(\?([^#]*))?(#(.*))?/] +# if url[/^http:\/\/([^\/]+)(.*)$/] host = $1 path = $2 path = "/" if path.length==0 diff --git a/Data/Scripts/003_Game classes/009_Game_Map.rb b/Data/Scripts/003_Game classes/009_Game_Map.rb index 2ee6d0e1e..4c0971db6 100644 --- a/Data/Scripts/003_Game classes/009_Game_Map.rb +++ b/Data/Scripts/003_Game classes/009_Game_Map.rb @@ -9,7 +9,7 @@ class Game_Map attr_accessor :tileset_name # tileset file name attr_accessor :autotile_names # autotile file name attr_reader :passages # passage table - attr_reader :priorities # prioroty table + attr_reader :priorities # priority table attr_reader :terrain_tags # terrain tag table attr_reader :events # events attr_accessor :panorama_name # panorama file name diff --git a/Data/Scripts/013_Overworld/010_PField_RandomDungeons.rb b/Data/Scripts/013_Overworld/010_PField_RandomDungeons.rb index 5b479132e..bd58a2ce6 100644 --- a/Data/Scripts/013_Overworld/010_PField_RandomDungeons.rb +++ b/Data/Scripts/013_Overworld/010_PField_RandomDungeons.rb @@ -147,9 +147,6 @@ end -# Dungeon generation algorithm found at: -# http://members.gamedev.net/potentialwell/ProceduralDungeonGeneration-JTippets.pdf - class MazeNode def initialize @edges=0 From f3f21d4679a6d816aef7a1e57d79ab9e2992c5c1 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 30 Jan 2021 21:55:32 +0000 Subject: [PATCH 4/4] Change to pbDownloadData --- Data/Scripts/001_Technical/005_Sockets.rb | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Data/Scripts/001_Technical/005_Sockets.rb b/Data/Scripts/001_Technical/005_Sockets.rb index a98de9074..f52cc0043 100644 --- a/Data/Scripts/001_Technical/005_Sockets.rb +++ b/Data/Scripts/001_Technical/005_Sockets.rb @@ -568,26 +568,28 @@ def pbPostData(url, postdata, filename=nil, depth=0) return "" end -def pbDownloadData(url, filename=nil, depth=0) - raise "Redirection level too deep" if depth>10 +def pbDownloadData(url, filename = nil, authorization = nil, depth = 0, &block) + raise "Redirection level too deep" if depth > 10 if url[/^(([^:\/?#]+):(?=\/\/))?(\/\/)?((([^:]+)(?::([^@]+)?)?@)?([^@\/?#:]*)(?::(\d+)?)?)?([^?#]*)(\?([^#]*))?(#(.*))?/] -# if url[/^http:\/\/([^\/]+)(.*)$/] - host = $1 - path = $2 - path = "/" if path.length==0 + host = $8 + path = $10 + 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" - request = "GET #{path} HTTP/1.1\r\n" + request = "GET #{path}#{parameters} HTTP/1.1\r\n" request += "User-Agent: #{userAgent}\r\n" request += "Pragma: no-cache\r\n" request += "Host: #{host}\r\n" request += "Proxy-Connection: Close\r\n" + request += "Authorization: #{authorization}\r\n" if authorization request += "\r\n" - return pbHttpRequest(host, request, filename, depth) + return pbHttpRequest(host, request, filename, depth, port, &block) end return "" 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 socket = ::TCPSocket.new(host, 80) time = Time.now.to_i @@ -618,7 +620,7 @@ def pbHttpRequest(host, request, filename=nil, depth=0) end if headers["Location"] && errorcode>=300 && errorcode<400 socket.close rescue socket = nil - return pbDownloadData(headers["Location"],filename,depth+1) + return pbDownloadData(headers["Location"],filename,nil,depth+1) end if chunked # Chunked content