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

Merge pull request #58 from Florin311295/main

Browse Source 
Fixing horse image showing and some integer division
This commit is contained in:
rtw1x1
2026-02-12 22:55:11 +00:00
committed by GitHub
parent 5aba50f71e 6ef4da3af0
commit 9def5d8f52
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/root/system.py
View File

@@ -18,11 +18,17 @@ class TraceFile:
def write(self, msg): def write(self, msg):
dbg.Trace(msg) dbg.Trace(msg)
def flush(self):
pass
class TraceErrorFile: class TraceErrorFile:
def write(self, msg): def write(self, msg):
dbg.TraceError(msg) dbg.TraceError(msg)
dbg.RegisterExceptionString(msg) dbg.RegisterExceptionString(msg)
def flush(self):
pass
class LogBoxFile: class LogBoxFile:
def __init__(self): def __init__(self):
self.stderrSave = sys.stderr self.stderrSave = sys.stderr

12
assets/root/uiaffectshower.py
View File

@@ -49,7 +49,7 @@ class LovePointImage(ui.ExpandedImageBox):
if 0 == self.lovePoint: if 0 == self.lovePoint:
loveGrade = 0 loveGrade = 0
else: else:
loveGrade = self.lovePoint / 25 + 1 loveGrade = self.lovePoint // 25 + 1
fileName = self.FILE_DICT.get(loveGrade, self.FILE_PATH+"00.dds") fileName = self.FILE_DICT.get(loveGrade, self.FILE_PATH+"00.dds")
try: try:
@@ -79,9 +79,9 @@ class HorseImage(ui.ExpandedImageBox):
FILE_DICT = { FILE_DICT = {
00 : FILE_PATH+"00.dds", 00 : FILE_PATH+"00.dds",
0o1 : FILE_PATH+"00.dds", 1 : FILE_PATH+"00.dds",
0o2 : FILE_PATH+"00.dds", 2 : FILE_PATH+"00.dds",
0o3 : FILE_PATH+"00.dds", 3 : FILE_PATH+"00.dds",
10 : FILE_PATH+"10.dds", 10 : FILE_PATH+"10.dds",
11 : FILE_PATH+"11.dds", 11 : FILE_PATH+"11.dds",
12 : FILE_PATH+"12.dds", 12 : FILE_PATH+"12.dds",
@@ -107,7 +107,7 @@ class HorseImage(ui.ExpandedImageBox):
if 0 == level: if 0 == level:
return 0 return 0
return (level-1)/10 + 1 return (level-1)//10 + 1
def SetState(self, level, health, battery): def SetState(self, level, health, battery):
#self.textLineList=[] #self.textLineList=[]
@@ -305,7 +305,7 @@ class AffectImage(ui.ExpandedImageBox):
self.toolTipText.SetText(text) self.toolTipText.SetText(text)
w, h = self.toolTipText.GetTextSize() w, h = self.toolTipText.GetTextSize()
self.toolTipText.SetPosition(max(0, x + self.GetWidth()/2 - w/2), y) self.toolTipText.SetPosition(max(0, x + self.GetWidth()//2 - w//2), y)
def SetDescription(self, description): def SetDescription(self, description):
self.description = description self.description = description