DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-04-30 21:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from Marin-MK/master

Browse Source 
Error message improvements
This commit is contained in:
Maruno17
2020-09-05 20:26:23 +01:00
committed by GitHub
parent dffb5de19d 240af4e5e7
commit 09cf282e58
221 changed files with 942 additions and 941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Data/Scripts.rxdata
View File

Binary file not shown.

2
Data/Scripts/017_Other battles/004_PBattle_OrgBattleRules.rb
View File

@@ -1550,7 +1550,7 @@ PokemonChallengeRules.new
# Battle Time (includes animations) # Battle Time (includes animations)
If the time runs out, the team with the most Pokémon left wins. If both teams have If the time runs out, the team with the most Pok<EFBFBD>mon left wins. If both teams have
the same number of Pokémon left, total HP remaining breaks the tie. If both HP the same number of Pokémon left, total HP remaining breaks the tie. If both HP
totals are identical, the battle is a draw. totals are identical, the battle is a draw.

9
Data/Scripts/021_Compiler/001_Compiler.rb
View File

@@ -61,10 +61,11 @@ def pbPrintException(e)
errorlog = RTP.getSaveFileName("errorlog.txt") errorlog = RTP.getSaveFileName("errorlog.txt")
end end
File.open(errorlog,"ab") { |f| f.write(premessage); f.write(message) } File.open(errorlog,"ab") { |f| f.write(premessage); f.write(message) }
errorlogline = errorlog.sub(Dir.pwd+"\\","") errorlogline = errorlog.sub("/", "\\")
errorlogline = errorlogline.sub(Dir.pwd+"/","") errorlogline.sub!(Dir.pwd + "\\", "")
errorlogline = errorlogline.gsub("/","\\") errorlogline.sub!(pbGetUserName, "USERNAME")
errorlogline = "\r\n"+errorlogline if errorlogline.length>20 errorlogline = "\r\n" + errorlogline if errorlogline.length > 20
errorlogline.gsub!("/", "\\")
print("#{message}\r\nThis exception was logged in #{errorlogline}.\r\nPress Ctrl+C to copy this message to the clipboard.") print("#{message}\r\nThis exception was logged in #{errorlogline}.\r\nPress Ctrl+C to copy this message to the clipboard.")
end end