jann/m2dev-client
1
0
Fork 0
forked from metin-server/m2dev-client
Code Pull Requests Activity

Merge pull request #62 from onurcan488/main

Browse Source 
A few edits and bug fixes.
This commit is contained in:
rtw1x1
2026-02-15 20:47:18 +00:00
committed by GitHub
parent 9ea759fbe9 b7818387c0
commit 205ae5fb4b
4 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
assets/locale/locale/tr/guildbuildinglist.txt
View File

@@ -1,61 +1,61 @@
VNUM TYPE MODEL NAME REG_1 REG_2 REG_3 REG_4 XROT_LIMIT YROT_LIMIT ZROT_LIMIT PRICE MATERIALS NPC GROUP DEPEND_GROUP ???????
14013 FACILITY jedan Silah Ustası -525 -525 525 525 0 0 360 20000000 90010,20/90011,30/90012,20 20044 2 1 1
14014 FACILITY jedan Zırh Ustası -525 -525 525 525 0 0 360 20000000 90010,20/90011,30/90012,20 20045 2 1 1
14013 FACILITY jedan Silah Ustası -525 -525 525 525 0 0 360 20000000 90010,20/90011,30/90012,20 20044 2 1 1
14014 FACILITY jedan Zırh Ustası -525 -525 525 525 0 0 360 20000000 90010,20/90011,30/90012,20 20045 2 1 1
14015 FACILITY jedan Kuyumcu -525 -525 525 525 0 0 360 20000000 90010,20/90011,30/90012,20 20046 2 1 1
14033 FACILITY suryeonjang Egitim Merkezi -832.57 -472.99 832.57 472.99 0 0 360 20000000 90010,25/90011,25/90012,25 0 0 0 2
14043 FACILITY yonggwangro Elmas İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20060 3 1 1
14045 FACILITY yonggwangro Fosil Tahta İşleyici -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20062 3 1 1
14046 FACILITY yonggwangro Bakır İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20063 3 1 1
14047 FACILITY yonggwangro Gümüş İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20064 3 1 1
14048 FACILITY yonggwangro Altın İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20065 3 1 1
14049 FACILITY yonggwangro Yesim Taşı İşleyici -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20066 3 1 1
14050 FACILITY yonggwangro Abanoz İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20067 3 1 1
14051 FACILITY yonggwangro İnci İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20068 3 1 1
14052 FACILITY yonggwangro B.Altın İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20069 3 1 1
14053 FACILITY yonggwangro Kristal İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20070 3 1 1
14054 FACILITY yonggwangro Ametist İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20071 3 1 1
14055 FACILITY yonggwangro C. Gözü İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20072 3 1 1
14043 FACILITY yonggwangro Elmas İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20060 3 1 1
14045 FACILITY yonggwangro Fosil Tahta İşleyici -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20062 3 1 1
14046 FACILITY yonggwangro Bakır İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20063 3 1 1
14047 FACILITY yonggwangro Gümüş İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20064 3 1 1
14048 FACILITY yonggwangro Altın İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20065 3 1 1
14049 FACILITY yonggwangro Yesim Taşı İşleyici -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20066 3 1 1
14050 FACILITY yonggwangro Abanoz İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20067 3 1 1
14051 FACILITY yonggwangro İnci İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20068 3 1 1
14052 FACILITY yonggwangro B.Altın İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20069 3 1 1
14053 FACILITY yonggwangro Kristal İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20070 3 1 1
14054 FACILITY yonggwangro Ametist İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20071 3 1 1
14055 FACILITY yonggwangro C. Gözü İşleyicisi -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20072 3 1 1
26992 FACILITY yonggwangro Soul Crystal -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20072 3 1 1
26993 FACILITY yonggwangro Rubin -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20072 3 1 1
26994 FACILITY yonggwangro Garnet -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20072 3 1 1
26995 FACILITY yonggwangro Smaragd -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20072 3 1 1
26996 FACILITY yonggwangro Saphire -179.63 -199.89 179.63 199.89 0 0 360 20000000 90010,15/90011,20/90012,25 20072 3 1 1
14061 FACILITY himuijedan_01 Güç Sunağı -523.91 -995.84 527.55 750.99 0 0 360 25000000 90010,25/90011,25/90012,25 20077 4 1 1
14062 FACILITY himuijedan_02 Güç Sunağı -586.17 -995.84 587.18 818.56 0 0 360 500000000 90010,50/90011,50/90012,50 20078 4 4 2
14063 FACILITY himuijedan_03 Güç Sunağı -664.7 -995.84 665.7 896.57 0 0 360 750000000 90010,75/90011,75/90012,75 20079 4 4 2
14061 FACILITY himuijedan_01 Güç Sunağı -523.91 -995.84 527.55 750.99 0 0 360 25000000 90010,25/90011,25/90012,25 20077 4 1 1
14062 FACILITY himuijedan_02 Güç Sunağı -586.17 -995.84 587.18 818.56 0 0 360 500000000 90010,50/90011,50/90012,50 20078 4 4 2
14063 FACILITY himuijedan_03 Güç Sunağı -664.7 -995.84 665.7 896.57 0 0 360 750000000 90010,75/90011,75/90012,75 20079 4 4 2
14100 HEADQUARTER a1-011-workhouse Ev(1) -676.52 -894.26 690.18 749.32 0 0 360 20000000 90010,20/90011,30/90012,25 0 1 0 1
14101 OBJECT a1-038-wall-corner Taş Duvar(1-1) -400 -153.53 156.48 400 0 0 360 2000000 90010,15/90011,5/90012,5 0 5 0 2
14102 OBJECT a1-038-wall-lin Taş Duvar(1-2) -200 -106.73 300 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14103 OBJECT a1-038-wall-lin2 Taş Duvar(1-3) -500 -106.73 500 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14104 OBJECT a1-038-wall-door Kapı(1) -1000 -274.73 1000 274.73 0 0 360 2500000 90010,5/90011,15/90012,10 0 5 0 2
14101 OBJECT a1-038-wall-corner Taş Duvar(1-1) -400 -153.53 156.48 400 0 0 360 2000000 90010,15/90011,5/90012,5 0 5 0 2
14102 OBJECT a1-038-wall-lin Taş Duvar(1-2) -200 -106.73 300 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14103 OBJECT a1-038-wall-lin2 Taş Duvar(1-3) -500 -106.73 500 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14104 OBJECT a1-038-wall-door Kapı(1) -1000 -274.73 1000 274.73 0 0 360 2500000 90010,5/90011,15/90012,10 0 5 0 2
14105 BUILDING a1-set Duvar(1) -1000 -274.73 1000 274.73 0 0 360 2500000 90010,5/90011,15/90012,10 0 5 0 1
14110 HEADQUARTER b1-011-workhouse Ev(2) -678.76 -894.26 687.94 749.32 0 0 360 20000000 90010,20/90011,30/90012,25 0 1 0 1
14111 OBJECT b1-038-wall-corner Taş Duvar(2-1) -400 -153.53 156.48 400 0 0 360 2000000 90010,15/90011,5/90012,5 0 5 0 2
14112 OBJECT b1-038-wall-lin Taş Duvar(2-2) -200 -106.73 300 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14113 OBJECT b1-038-wall-lin2 Taş Duvar(2-3) -500 -106.73 500 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14114 OBJECT b1-038-wall-door Kapı(2) -1000 -274.73 1000 274.73 0 0 360 2500000 90010,5/90011,15/90012,10 0 5 0 2
14111 OBJECT b1-038-wall-corner Taş Duvar(2-1) -400 -153.53 156.48 400 0 0 360 2000000 90010,15/90011,5/90012,5 0 5 0 2
14112 OBJECT b1-038-wall-lin Taş Duvar(2-2) -200 -106.73 300 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14113 OBJECT b1-038-wall-lin2 Taş Duvar(2-3) -500 -106.73 500 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14114 OBJECT b1-038-wall-door Kapı(2) -1000 -274.73 1000 274.73 0 0 360 2500000 90010,5/90011,15/90012,10 0 5 0 2
14115 BUILDING b1-set Duvar(2) -1000 -274.73 1000 274.73 0 0 360 2500000 90010,5/90011,15/90012,10 0 5 0 1
14120 HEADQUARTER c1-011-workhouse Ev(3) -676.52 -894.26 690.18 749.32 0 0 360 20000000 90010,20/90011,30/90012,25 0 1 0 1
14121 OBJECT c1-038-wall-corner Taş Duvar(3-1) -400 -153.53 156.48 400 0 0 360 2000000 90010,15/90011,5/90012,5 0 5 0 2
14122 OBJECT c1-038-wall-lin Taş Duvar(3-2) -200 -106.73 300 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14123 OBJECT c1-038-wall-lin2 Taş Duvar(3-3) -500 -106.73 500 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14124 OBJECT c1-038-wall-door Kapı(3) -1000 -274.73 1000 274.73 0 0 360 2500000 90010,5/90011,15/90012,10 0 5 0 2
14121 OBJECT c1-038-wall-corner Taş Duvar(3-1) -400 -153.53 156.48 400 0 0 360 2000000 90010,15/90011,5/90012,5 0 5 0 2
14122 OBJECT c1-038-wall-lin Taş Duvar(3-2) -200 -106.73 300 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14123 OBJECT c1-038-wall-lin2 Taş Duvar(3-3) -500 -106.73 500 106.73 0 0 360 1000000 90010,15/90011,5/90012,5 0 5 0 2
14124 OBJECT c1-038-wall-door Kapı(3) -1000 -274.73 1000 274.73 0 0 360 2500000 90010,5/90011,15/90012,10 0 5 0 2
14125 BUILDING c1-set Duvar(3) -1000 -274.73 1000 274.73 0 0 360 2500000 90010,5/90011,15/90012,10 0 5 0 1
14200 OBJECT guild_symbol Lonca İşareti -45.9 -9.44 42.68 40.13 0 0 360 3000000 90011,5/90012,5 0 0 1 1
14201 WALL fence01_door01 Duvarın Ön Yüzü -1000 -54 1000 20 0 0 360 3000000 "90010.50" 0 0 1 1
14202 WALL fence01_back01 Duvarın Arka Yüzü -1000 -18 1000 18 0 0 360 3000000 "90010.50" 0 0 1 1
14203 WALL fence01_left01 Duvarın Sol Tarafı -19 -1362 19 1362 0 0 360 3000000 "90010.50" 0 0 1 1
14204 WALL fence01_right01 Duvarın Sağ Tarafı -18 -1362 18 1362 0 0 360 3000000 "90010.50" 0 0 1 1
14300 OBJECT general_obj_stone01 Taş1 -116.04 -118.44 116.04 118.44 0 0 360 300000 90010,5 0 0 0 1
14301 OBJECT general_obj_stone02 Taş2 -118.05 -132.67 118.05 132.67 0 0 360 300000 90010,5 0 0 0 1
14302 OBJECT general_obj_stone03 Taş3 -133.43 -102.96 133.43 102.96 0 0 360 300000 90010,7 0 0 0 1
14303 OBJECT general_obj_stone04 Taş4 -104.21 -117.82 104.21 117.82 0 0 360 300000 90010,7 0 0 0 1
14304 OBJECT general_obj_stone05 Taş5 -171.59 -145.52 171.59 145.52 0 0 360 300000 90010,7 0 0 0 1
14305 OBJECT general_obj_stone06 Taş6 -192.74 -201.58 192.74 201.58 0 0 360 300000 90010,8 0 0 0 1
14306 OBJECT general_obj_stone07 Taş7 -183.58 -184.01 183.58 184.01 0 0 360 300000 90010,8 0 0 0 1
14307 OBJECT general_obj_stone08 Taş8 -66.89 -56.67 66.89 56.67 0 0 360 300000 90010,8 0 0 0 1
14308 OBJECT general_obj_stone09 Taş9 -65.87 -53.47 65.87 53.47 0 0 360 300000 90010,9 0 0 0 1
14309 OBJECT general_obj_stone10 Taş10 -182.17 -123.03 182.17 123.03 0 0 360 300000 90010,9 0 0 0 1
14200 OBJECT guild_symbol Lonca İşareti -45.9 -9.44 42.68 40.13 0 0 360 3000000 90011,5/90012,5 0 0 1 1
14201 WALL fence01_door01 Duvarın Ön Yüzü -1000 -54 1000 20 0 0 360 3000000 "90010.50" 0 0 1 1
14202 WALL fence01_back01 Duvarın Arka Yüzü -1000 -18 1000 18 0 0 360 3000000 "90010.50" 0 0 1 1
14203 WALL fence01_left01 Duvarın Sol Tarafı -19 -1362 19 1362 0 0 360 3000000 "90010.50" 0 0 1 1
14204 WALL fence01_right01 Duvarın Sağ Tarafı -18 -1362 18 1362 0 0 360 3000000 "90010.50" 0 0 1 1
14300 OBJECT general_obj_stone01 Taş1 -116.04 -118.44 116.04 118.44 0 0 360 300000 90010,5 0 0 0 1
14301 OBJECT general_obj_stone02 Taş2 -118.05 -132.67 118.05 132.67 0 0 360 300000 90010,5 0 0 0 1
14302 OBJECT general_obj_stone03 Taş3 -133.43 -102.96 133.43 102.96 0 0 360 300000 90010,7 0 0 0 1
14303 OBJECT general_obj_stone04 Taş4 -104.21 -117.82 104.21 117.82 0 0 360 300000 90010,7 0 0 0 1
14304 OBJECT general_obj_stone05 Taş5 -171.59 -145.52 171.59 145.52 0 0 360 300000 90010,7 0 0 0 1
14305 OBJECT general_obj_stone06 Taş6 -192.74 -201.58 192.74 201.58 0 0 360 300000 90010,8 0 0 0 1
14306 OBJECT general_obj_stone07 Taş7 -183.58 -184.01 183.58 184.01 0 0 360 300000 90010,8 0 0 0 1
14307 OBJECT general_obj_stone08 Taş8 -66.89 -56.67 66.89 56.67 0 0 360 300000 90010,8 0 0 0 1
14308 OBJECT general_obj_stone09 Taş9 -65.87 -53.47 65.87 53.47 0 0 360 300000 90010,9 0 0 0 1
14309 OBJECT general_obj_stone10 Taş10 -182.17 -123.03 182.17 123.03 0 0 360 300000 90010,9 0 0 0 1
14400 OBJECT B1_PagodaTree_RT Tahta1 0 0 360 2000000 90011,5 0 0 0 1
14401 OBJECT B1_PagodaTree_RT3 Tahta2 0 0 360 2000000 90011,5 0 0 0 1
14402 OBJECT B1_Sassafras_RT_Fall Tahta3 0 0 360 2000000 90011,7 0 0 0 1

4
assets/root/intrologin.py
View File

@@ -317,14 +317,14 @@ class LoginWindow(ui.ScriptWindow):
def __SaveChannelInfo(self):
try:
with open("channel.inf", "w") as file:
with open("config/channel.inf", "w") as file:
file.write("%d %d %d" % (self.__GetServerID(), self.__GetChannelID(), self.__GetRegionID()))
except:
print("LoginWindow.__SaveChannelInfo - SaveError")
def __LoadChannelInfo(self):
try:
with open("channel.inf") as file:
with open("config/channel.inf") as file:
lines=file.readlines()
if len(lines)>0:

2
assets/root/uiguild.py
View File

@@ -2378,7 +2378,7 @@ class BuildGuildBuildingWindow(ui.ScriptWindow):
self.__RefreshItem()
def __SetBuildingData(self, data):
self.buildingPriceValue.SetText(NumberToMoneyString(data["PRICE"]))
self.buildingPriceValue.SetText(NumberToMoneyString(int(data["PRICE"])))
self.needMoney = int(data["PRICE"])

4
assets/root/uitaskbar.py
View File

@@ -26,12 +26,12 @@ def GetMouseButtonSettings():
def SaveMouseButtonSettings():
global MOUSE_SETTINGS
with open("mouse.cfg", "w") as f:
with open("config/mouse.cfg", "w") as f:
f.write("%s\t%s" % tuple(MOUSE_SETTINGS))
def LoadMouseButtonSettings():
global MOUSE_SETTINGS
with open("mouse.cfg", "r") as f:
with open("config/mouse.cfg", "r") as f:
tokens = f.read().split()
if len(tokens) != 2: