metin-server/m2dev-client
3
0
Fork 1
Code Issues 7 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

py2 -> py3

Browse Source
This commit is contained in:
d1str4ught
2026-02-08 23:40:50 +01:00
parent 98d2c1afb9
commit 36602f7ad9
61 changed files with 618 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
assets/root/game.py
View File

@@ -297,7 +297,7 @@ class GameWindow(ui.ScriptWindow):
self.KillFocus()
app.HideCursor()
print "---------------------------------------------------------------------------- CLOSE GAME WINDOW"
print("---------------------------------------------------------------------------- CLOSE GAME WINDOW")
def __BuildKeyDict(self):
onPressKeyDict = {}
@@ -454,7 +454,7 @@ class GameWindow(ui.ScriptWindow):
else:
#net.SendChatPacket("/user_horse_ride")
if not uiPrivateShopBuilder.IsBuildingPrivateShop():
for i in xrange(player.INVENTORY_PAGE_SIZE):
for i in range(player.INVENTORY_PAGE_SIZE):
if player.GetItemIndex(i) in (71114, 71116, 71118, 71120):
net.SendItemUsePacket(i)
break
@@ -613,7 +613,7 @@ class GameWindow(ui.ScriptWindow):
nextPKMode = 0
net.SendChatPacket("/PKMode " + str(nextPKMode))
print "/PKMode " + str(nextPKMode)
print(("/PKMode " + str(nextPKMode)))
def OnChangePKMode(self):
@@ -622,7 +622,7 @@ class GameWindow(ui.ScriptWindow):
try:
self.__NotifyError(localeInfo.OPTION_PVPMODE_MESSAGE_DICT[player.GetPKMode()])
except KeyError:
print "UNKNOWN PVPMode[%d]" % (player.GetPKMode())
print(("UNKNOWN PVPMode[%d]" % (player.GetPKMode())))
if constInfo.PVPMODE_TEST_ENABLE:
curPKMode = player.GetPKMode()
@@ -878,7 +878,7 @@ class GameWindow(ui.ScriptWindow):
self.interface.RecvWhisper(name)
def OnRecvWhisperError(self, mode, name, line):
if localeInfo.WHISPER_ERROR.has_key(mode):
if mode in localeInfo.WHISPER_ERROR:
chat.AppendWhisper(chat.WHISPER_TYPE_SYSTEM, name, localeInfo.WHISPER_ERROR[mode](name))
else:
chat.AppendWhisper(chat.WHISPER_TYPE_SYSTEM, name, "Whisper Unknown Error(mode=%d, name=%s)" % (mode, name))
@@ -925,10 +925,10 @@ class GameWindow(ui.ScriptWindow):
# END_OF_MINING
def OnCannotUseSkill(self, vid, type):
if localeInfo.USE_SKILL_ERROR_TAIL_DICT.has_key(type):
if type in localeInfo.USE_SKILL_ERROR_TAIL_DICT:
textTail.RegisterInfoTail(vid, localeInfo.USE_SKILL_ERROR_TAIL_DICT[type])
if localeInfo.USE_SKILL_ERROR_CHAT_DICT.has_key(type):
if type in localeInfo.USE_SKILL_ERROR_CHAT_DICT:
chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.USE_SKILL_ERROR_CHAT_DICT[type])
def OnCannotShotError(self, vid, type):
@@ -1111,7 +1111,7 @@ class GameWindow(ui.ScriptWindow):
self.SetFocus()
def SaveScreen(self):
print "save screen"
print("save screen")
# SCREENSHOT_CWDSAVE
if SCREENSHOT_CWDSAVE:
@@ -1305,7 +1305,7 @@ class GameWindow(ui.ScriptWindow):
itemVnum = player.GetItemIndex(attachedInvenType, attachedItemSlotPos)
if constInfo.IS_AUTO_POTION(itemVnum):
metinSocket = [player.GetItemMetinSocket(attachedInvenType, attachedItemSlotPos, j) for j in xrange(player.METIN_SOCKET_MAX_NUM)]
metinSocket = [player.GetItemMetinSocket(attachedInvenType, attachedItemSlotPos, j) for j in range(player.METIN_SOCKET_MAX_NUM)]
isActivated = (0 != int(metinSocket[0]))
if isActivated:
@@ -1649,12 +1649,12 @@ class GameWindow(ui.ScriptWindow):
self.interface.UpdateCubeInfo(gold, itemVnum, count)
def BINARY_Cube_Succeed(self, itemVnum, count):
print "Cube crafting successful"
print("Cube crafting successful")
self.interface.SucceedCubeWork(itemVnum, count)
pass
def BINARY_Cube_Failed(self):
print "Cube crafting failed"
print("Cube crafting failed")
self.interface.FailedCubeWork()
pass
@@ -1680,7 +1680,7 @@ class GameWindow(ui.ScriptWindow):
requestCount = 7
modCount = resultCount % requestCount
splitCount = resultCount / requestCount
for i in xrange(splitCount):
for i in range(splitCount):
#print("/cube r_info %d %d" % (i * requestCount, requestCount))
net.SendChatPacket("/cube r_info %d %d" % (i * requestCount, requestCount))
@@ -1688,7 +1688,7 @@ class GameWindow(ui.ScriptWindow):
#print("/cube r_info %d %d" % (splitCount * requestCount, modCount))
net.SendChatPacket("/cube r_info %d %d" % (splitCount * requestCount, modCount))
except RuntimeError, msg:
except RuntimeError as msg:
dbg.TraceError(msg)
return 0
@@ -1752,7 +1752,7 @@ class GameWindow(ui.ScriptWindow):
self.interface.wndCube.Refresh()
except RuntimeError, msg:
except RuntimeError as msg:
dbg.TraceError(msg)
return 0
@@ -1926,7 +1926,7 @@ class GameWindow(ui.ScriptWindow):
}
self.serverCommander=stringCommander.Analyzer()
for serverCommandItem in serverCommandList.items():
for serverCommandItem in list(serverCommandList.items()):
self.serverCommander.SAFE_RegisterCallBack(
serverCommandItem[0], serverCommandItem[1]
)
@@ -1936,7 +1936,7 @@ class GameWindow(ui.ScriptWindow):
try:
#print " BINARY_ServerCommand_Run", line
return self.serverCommander.Run(line)
except RuntimeError, msg:
except RuntimeError as msg:
dbg.TraceError(msg)
return 0
@@ -1944,10 +1944,10 @@ class GameWindow(ui.ScriptWindow):
try:
command = net.GetPreservedServerCommand()
while command:
print " __ProcessPreservedServerCommand", command
print((" __ProcessPreservedServerCommand", command))
self.serverCommander.Run(command)
command = net.GetPreservedServerCommand()
except RuntimeError, msg:
except RuntimeError as msg:
dbg.TraceError(msg)
return 0
@@ -2010,11 +2010,11 @@ class GameWindow(ui.ScriptWindow):
if not self.__IsXMasMap():
return
print "XMAS_SNOW ON"
print("XMAS_SNOW ON")
background.EnableSnow(1)
else:
print "XMAS_SNOW OFF"
print("XMAS_SNOW OFF")
background.EnableSnow(0)
def __XMasBoom_Enable(self, mode):
@@ -2023,23 +2023,23 @@ class GameWindow(ui.ScriptWindow):
if not self.__IsXMasMap():
return
print "XMAS_BOOM ON"
print("XMAS_BOOM ON")
self.__DayMode_Update("dark")
self.enableXMasBoom = True
self.startTimeXMasBoom = app.GetTime()
else:
print "XMAS_BOOM OFF"
print("XMAS_BOOM OFF")
self.__DayMode_Update("light")
self.enableXMasBoom = False
def __XMasTree_Enable(self, grade):
print "XMAS_TREE ", grade
print(("XMAS_TREE ", grade))
background.SetXMasTree(int(grade))
def __XMasSong_Enable(self, mode):
if "1"==mode:
print "XMAS_SONG ON"
print("XMAS_SONG ON")
XMAS_BGM = "xmas.mp3"
@@ -2051,7 +2051,7 @@ class GameWindow(ui.ScriptWindow):
snd.FadeInMusic("BGM/" + musicInfo.fieldMusic)
else:
print "XMAS_SONG OFF"
print("XMAS_SONG OFF")
if musicInfo.fieldMusic != "":
snd.FadeOutMusic("BGM/" + musicInfo.fieldMusic)
@@ -2123,7 +2123,7 @@ class GameWindow(ui.ScriptWindow):
self.indexXMasBoom += 1
for i in xrange(boomCount):
for i in range(boomCount):
self.__XMasBoom_Boom()
def __XMasBoom_Boom(self):