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

Fixed wrong pointers towards JPG files, applied script safeguards for auto potions

Browse Source
This commit is contained in:
Mind Rapist
2025-12-27 10:01:45 +02:00
parent 0bc66e1566
commit 0440e53e87
32 changed files with 143 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/Effect/ymir work/effect/affect/damagevalue/nontarget.mse
View File

@@ -126,7 +126,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"0.jpg" "0.dds"
} }
} }
} }

2
assets/guild/ymir work/guild/effect/gasokhwa_loop.mse
View File

@@ -124,7 +124,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\jigam_ring.jpg" "D:\Ymir Work\pc\shaman\effect\jigam_ring.dds"
} }
} }
} }

2
assets/guild/ymir work/guild/effect/gasokhwa_make.mse
View File

@@ -122,7 +122,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\assassin\effect\16-bottom.jpg" "D:\Ymir Work\pc\assassin\effect\16-bottom.dds"
} }
} }
} }

2
assets/guild/ymir work/guild/effect/jumunsul_loop.mse
View File

@@ -123,7 +123,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\shaman\effect\jigam.jpg" "D:\YMIR WORK\pc\shaman\effect\jigam.dds"
} }
} }
} }

18
assets/guild/ymir work/guild/effect/jumunsul_make.mse
View File

@@ -254,7 +254,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\jigam.jpg" "D:\Ymir Work\pc\shaman\effect\jigam.dds"
} }
} }
} }
@@ -378,7 +378,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\w_ring.jpg" "D:\Ymir Work\pc\shaman\effect\w_ring.dds"
} }
} }
} }
@@ -500,7 +500,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\white_sphere.jpg" "D:\Ymir Work\pc\shaman\effect\white_sphere.dds"
} }
} }
} }
@@ -633,7 +633,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\white_sphere.jpg" "D:\Ymir Work\pc\shaman\effect\white_sphere.dds"
} }
} }
} }
@@ -756,7 +756,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\wind.jpg" "D:\Ymir Work\pc\shaman\effect\wind.dds"
} }
} }
} }
@@ -880,7 +880,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\W_star.jpg" "D:\Ymir Work\pc\shaman\effect\W_star.dds"
} }
} }
} }
@@ -1008,7 +1008,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\jigam_ring.jpg" "D:\Ymir Work\pc\shaman\effect\jigam_ring.dds"
} }
} }
} }
@@ -1133,7 +1133,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\gyeokgong_triple_loop_2.jpg" "D:\Ymir Work\pc\shaman\effect\gyeokgong_triple_loop_2.dds"
} }
} }
} }
@@ -1273,7 +1273,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\noe_w_ring.jpg" "D:\Ymir Work\pc\shaman\effect\noe_w_ring.dds"
} }
} }
} }

20
assets/pc2/ymir work/pc2/common/effect/horse_charge.mse
View File

@@ -548,7 +548,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\mine_edge.jpg" "D:\YMIR WORK\pc\warrior\effect\mine_edge.dds"
} }
} }
} }
@@ -675,7 +675,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.jpg" "D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.dds"
} }
} }
} }
@@ -804,7 +804,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\sa_za_hu_inter_pasthit6.jpg" "D:\YMIR WORK\pc\warrior\effect\sa_za_hu_inter_pasthit6.dds"
} }
} }
} }
@@ -932,7 +932,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\cure.jpg" "D:\YMIR WORK\pc\warrior\effect\cure.dds"
} }
} }
} }
@@ -1059,7 +1059,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\gihyeol_spash.jpg" "D:\YMIR WORK\pc\warrior\effect\gihyeol_spash.dds"
} }
} }
} }
@@ -1181,7 +1181,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\half_ring_rainbow_line.jpg" "D:\YMIR WORK\pc\warrior\effect\half_ring_rainbow_line.dds"
} }
} }
} }
@@ -1308,7 +1308,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\nwegeomsplash.jpg" "D:\YMIR WORK\pc\warrior\effect\nwegeomsplash.dds"
} }
} }
} }
@@ -1437,7 +1437,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.jpg" "D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.dds"
} }
} }
} }
@@ -1563,7 +1563,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.jpg" "D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.dds"
} }
} }
} }
@@ -1689,7 +1689,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.jpg" "D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.dds"
} }
} }
} }

2
assets/pc2/ymir work/pc2/common/effect/sword/sword_7.mse
View File

@@ -135,7 +135,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg" "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds"
} }
} }
} }

4
assets/pc2/ymir work/pc2/common/effect/sword/sword_7_b.mse
View File

@@ -135,7 +135,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg" "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds"
} }
} }
} }
@@ -273,7 +273,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg" "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds"
} }
} }
} }

2
assets/pc2/ymir work/pc2/common/effect/sword/sword_7_f.mse
View File

@@ -135,7 +135,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg" "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds"
} }
} }
} }

2
assets/pc2/ymir work/pc2/common/effect/sword/sword_7_s.mse
View File

@@ -135,7 +135,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg" "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds"
} }
} }
} }

2
assets/pc2/ymir work/pc2/common/effect/sword/sword_8.mse
View File

@@ -264,7 +264,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
} }
} }
} }

4
assets/pc2/ymir work/pc2/common/effect/sword/sword_8_b.mse
View File

@@ -264,7 +264,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
} }
} }
} }
@@ -391,7 +391,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
} }
} }
} }

2
assets/pc2/ymir work/pc2/common/effect/sword/sword_8_f.mse
View File

@@ -265,7 +265,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
} }
} }
} }

2
assets/pc2/ymir work/pc2/common/effect/sword/sword_8_s.mse
View File

@@ -264,7 +264,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
} }
} }
} }

2
assets/pc2/ymir work/pc2/common/effect/sword/sword_9.mse
View File

@@ -261,7 +261,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
} }
} }
} }

4
assets/pc2/ymir work/pc2/common/effect/sword/sword_9_b.mse
View File

@@ -394,7 +394,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
} }
} }
} }
@@ -525,7 +525,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
} }
} }
} }

2
assets/pc2/ymir work/pc2/common/effect/sword/sword_9_f.mse
View File

@@ -261,7 +261,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
} }
} }
} }

2
assets/pc2/ymir work/pc2/common/effect/sword/sword_9_s.mse
View File

@@ -261,7 +261,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
} }
} }
} }

61
assets/root/game.py
View File

@@ -51,10 +51,22 @@ import stringCommander
from _weakref import proxy from _weakref import proxy
# TEXTTAIL_LIVINGTIME_CONTROL
#if localeInfo.IsJAPAN():
# app.SetTextTailLivingTime(8.0)
# END_OF_TEXTTAIL_LIVINGTIME_CONTROL
# SCREENSHOT_CWDSAVE # SCREENSHOT_CWDSAVE
SCREENSHOT_CWDSAVE = False SCREENSHOT_CWDSAVE = False
SCREENSHOT_DIR = None SCREENSHOT_DIR = None
if localeInfo.IsEUROPE():
SCREENSHOT_CWDSAVE = True
if localeInfo.IsCIBN10():
SCREENSHOT_CWDSAVE = False
SCREENSHOT_DIR = "YT2W"
cameraDistance = 1550.0 cameraDistance = 1550.0
cameraPitch = 27.0 cameraPitch = 27.0
cameraRotation = 0.0 cameraRotation = 0.0
@@ -105,7 +117,7 @@ class GameWindow(ui.ScriptWindow):
self.playerGauge = uiPlayerGauge.PlayerGauge(self) self.playerGauge = uiPlayerGauge.PlayerGauge(self)
self.playerGauge.Hide() self.playerGauge.Hide()
#wj 2014.1.2. ESC키를 누를 시 우선적으로 DropQuestionDialog를 끄도록 만들었다. 하지만 처음에 itemDropQuestionDialog가 선언되어 있지 않아 ERROR가 발생하여 init에서 선언과 동시에 초기화 시킴. #wj 2014.1.2. ESCŰ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20>켱<EFBFBD><ECBCB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DropQuestionDialog<6F><67> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ó<><C3B3><EFBFBD><EFBFBD> itemDropQuestionDialog<6F><67> <20><><EFBFBD><EFBFBD>Ǿ<EFBFBD> <20><><EFBFBD><EFBFBD> <20>ʾ<EFBFBD> ERROR<4F><52> <20>߻<EFBFBD><DFBB>Ͽ<EFBFBD> init<69><74><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ÿ<EFBFBD> <20>ʱ<EFBFBD>ȭ <20><>Ŵ.
self.itemDropQuestionDialog = None self.itemDropQuestionDialog = None
self.__SetQuickSlotMode() self.__SetQuickSlotMode()
@@ -214,7 +226,7 @@ class GameWindow(ui.ScriptWindow):
exception.Abort("GameWindow.Open") exception.Abort("GameWindow.Open")
# END_OF_START_GAME_ERROR_EXIT # END_OF_START_GAME_ERROR_EXIT
# NPC가 큐브시스템으로 만들 수 있는 아이템들의 목록을 캐싱 # NPC<EFBFBD><EFBFBD> ť<><C5A5>ý<EFBFBD><C3BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20>ִ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD><DBB5><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ij<><C4B3>
# ex) cubeInformation[20383] = [ {"rewordVNUM": 72723, "rewordCount": 1, "materialInfo": "101,1&102,2", "price": 999 }, ... ] # ex) cubeInformation[20383] = [ {"rewordVNUM": 72723, "rewordCount": 1, "materialInfo": "101,1&102,2", "price": 999 }, ... ]
self.cubeInformation = {} self.cubeInformation = {}
self.currentCubeNPC = 0 self.currentCubeNPC = 0
@@ -302,10 +314,10 @@ class GameWindow(ui.ScriptWindow):
def __BuildKeyDict(self): def __BuildKeyDict(self):
onPressKeyDict = {} onPressKeyDict = {}
##PressKey 는 누르고 있는 동안 계속 적용되는 키이다. ##PressKey <EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ִ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>Ǵ<EFBFBD> Ű<>̴<EFBFBD>.
## 숫자 단축키 퀵슬롯에 이용된다.(이후 숫자들도 퀵 슬롯용 예약) ## <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ű <20><><EFBFBD><EFBFBD><EFBFBD>Կ<EFBFBD> <20>̿<EFBFBD>ȴ<EFBFBD>.(<28><><EFBFBD><EFBFBD> <20><><EFBFBD>ڵ鵵 <20><> <20><><EFBFBD>Կ<EFBFBD> <20><><EFBFBD><EFBFBD>)
## F12 는 클라 디버그용 키이므로 쓰지 않는 게 좋다. ## F12 <EFBFBD><EFBFBD> Ŭ<><C5AC> <20><><EFBFBD><EFBFBD>׿<EFBFBD> Ű<>̹Ƿ<CCB9> <20><><EFBFBD><EFBFBD> <20>ʴ<EFBFBD> <20><> <20><><EFBFBD><EFBFBD>.
onPressKeyDict[app.DIK_1] = lambda : self.__PressNumKey(1) onPressKeyDict[app.DIK_1] = lambda : self.__PressNumKey(1)
onPressKeyDict[app.DIK_2] = lambda : self.__PressNumKey(2) onPressKeyDict[app.DIK_2] = lambda : self.__PressNumKey(2)
onPressKeyDict[app.DIK_3] = lambda : self.__PressNumKey(3) onPressKeyDict[app.DIK_3] = lambda : self.__PressNumKey(3)
@@ -325,7 +337,7 @@ class GameWindow(ui.ScriptWindow):
onPressKeyDict[app.DIK_SYSRQ] = lambda : self.SaveScreen() onPressKeyDict[app.DIK_SYSRQ] = lambda : self.SaveScreen()
onPressKeyDict[app.DIK_SPACE] = lambda : self.StartAttack() onPressKeyDict[app.DIK_SPACE] = lambda : self.StartAttack()
#캐릭터 이동키 #ij<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>̵<EFBFBD>Ű
onPressKeyDict[app.DIK_UP] = lambda : self.MoveUp() onPressKeyDict[app.DIK_UP] = lambda : self.MoveUp()
onPressKeyDict[app.DIK_DOWN] = lambda : self.MoveDown() onPressKeyDict[app.DIK_DOWN] = lambda : self.MoveDown()
onPressKeyDict[app.DIK_LEFT] = lambda : self.MoveLeft() onPressKeyDict[app.DIK_LEFT] = lambda : self.MoveLeft()
@@ -430,7 +442,6 @@ class GameWindow(ui.ScriptWindow):
def __PressNumKey(self,num): def __PressNumKey(self,num):
if app.IsPressed(app.DIK_LCONTROL) or app.IsPressed(app.DIK_RCONTROL): if app.IsPressed(app.DIK_LCONTROL) or app.IsPressed(app.DIK_RCONTROL):
if num >= 1 and num <= 9: if num >= 1 and num <= 9:
if(chrmgr.IsPossibleEmoticon(-1)): if(chrmgr.IsPossibleEmoticon(-1)):
chrmgr.SetEmoticon(-1,int(num)-1) chrmgr.SetEmoticon(-1,int(num)-1)
@@ -507,13 +518,13 @@ class GameWindow(ui.ScriptWindow):
self.pressNumber=ui.__mem_func__(self.__SelectQuickPage) self.pressNumber=ui.__mem_func__(self.__SelectQuickPage)
def __PressQuickSlot(self, localSlotIndex): def __PressQuickSlot(self, localSlotIndex):
if app.IsRTL(): if localeInfo.IsARABIC():
if 0 <= localSlotIndex and localSlotIndex < 4: if 0 <= localSlotIndex and localSlotIndex < 4:
player.RequestUseLocalQuickSlot(3-localSlotIndex) player.RequestUseLocalQuickSlot(3-localSlotIndex)
else: else:
player.RequestUseLocalQuickSlot(11-localSlotIndex) player.RequestUseLocalQuickSlot(11-localSlotIndex)
else: else:
player.RequestUseLocalQuickSlot(localSlotIndex) player.RequestUseLocalQuickSlot(localSlotIndex)
def __SelectQuickPage(self, pageIndex): def __SelectQuickPage(self, pageIndex):
self.quickSlotPageIndex = pageIndex self.quickSlotPageIndex = pageIndex
@@ -572,12 +583,12 @@ class GameWindow(ui.ScriptWindow):
self.TextureNum.SetFontName(localeInfo.UI_DEF_FONT) self.TextureNum.SetFontName(localeInfo.UI_DEF_FONT)
self.TextureNum.SetPosition(wndMgr.GetScreenWidth() - 270, 100) self.TextureNum.SetPosition(wndMgr.GetScreenWidth() - 270, 100)
# 오브젝트 그리는 개수 # <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʈ <20>׸<EFBFBD><D7B8><EFBFBD> <20><><EFBFBD><EFBFBD>
self.ObjectNum = ui.TextLine() self.ObjectNum = ui.TextLine()
self.ObjectNum.SetFontName(localeInfo.UI_DEF_FONT) self.ObjectNum.SetFontName(localeInfo.UI_DEF_FONT)
self.ObjectNum.SetPosition(wndMgr.GetScreenWidth() - 270, 120) self.ObjectNum.SetPosition(wndMgr.GetScreenWidth() - 270, 120)
# 시야거리 # <EFBFBD>þ߰Ÿ<EFBFBD>
self.ViewDistance = ui.TextLine() self.ViewDistance = ui.TextLine()
self.ViewDistance.SetFontName(localeInfo.UI_DEF_FONT) self.ViewDistance.SetFontName(localeInfo.UI_DEF_FONT)
self.ViewDistance.SetPosition(0, 0) self.ViewDistance.SetPosition(0, 0)
@@ -1304,6 +1315,18 @@ class GameWindow(ui.ScriptWindow):
self.stream.popupWindow.Close() self.stream.popupWindow.Close()
self.stream.popupWindow.Open(localeInfo.EXCHANGE_FAILURE_EQUIP_ITEM, 0, localeInfo.UI_OK) self.stream.popupWindow.Open(localeInfo.EXCHANGE_FAILURE_EQUIP_ITEM, 0, localeInfo.UI_OK)
else: else:
# MR-3: Auto-deactivate auto potions before moving out (dragging onto character)
if attachedType == player.SLOT_TYPE_INVENTORY:
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)]
isActivated = (0 != int(metinSocket[0]))
if isActivated:
net.SendItemUsePacket(attachedItemSlotPos)
# MR-3: -- END OF -- Auto-deactivate auto potions before moving out
if chr.IsNPC(dstChrID): if chr.IsNPC(dstChrID):
net.SendGiveItemPacket(dstChrID, attachedInvenType, attachedItemSlotPos, attachedItemCount) net.SendGiveItemPacket(dstChrID, attachedInvenType, attachedItemSlotPos, attachedItemCount)
else: else:
@@ -1320,7 +1343,7 @@ class GameWindow(ui.ScriptWindow):
self.__DropMoney(attachedType, attachedMoney) self.__DropMoney(attachedType, attachedMoney)
def __DropMoney(self, attachedType, attachedMoney): def __DropMoney(self, attachedType, attachedMoney):
# PRIVATESHOP_DISABLE_ITEM_DROP - 개인상점 열고 있는 동안 아이템 버림 방지 # PRIVATESHOP_DISABLE_ITEM_DROP - <EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ִ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
if uiPrivateShopBuilder.IsBuildingPrivateShop(): if uiPrivateShopBuilder.IsBuildingPrivateShop():
chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.DROP_ITEM_FAILURE_PRIVATE_SHOP) chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.DROP_ITEM_FAILURE_PRIVATE_SHOP)
return return
@@ -1342,7 +1365,7 @@ class GameWindow(ui.ScriptWindow):
self.itemDropQuestionDialog = itemDropQuestionDialog self.itemDropQuestionDialog = itemDropQuestionDialog
def __DropItem(self, attachedType, attachedItemIndex, attachedItemSlotPos, attachedItemCount): def __DropItem(self, attachedType, attachedItemIndex, attachedItemSlotPos, attachedItemCount):
# PRIVATESHOP_DISABLE_ITEM_DROP - 개인상점 열고 있는 동안 아이템 버림 방지 # PRIVATESHOP_DISABLE_ITEM_DROP - <EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ִ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
if uiPrivateShopBuilder.IsBuildingPrivateShop(): if uiPrivateShopBuilder.IsBuildingPrivateShop():
chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.DROP_ITEM_FAILURE_PRIVATE_SHOP) chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.DROP_ITEM_FAILURE_PRIVATE_SHOP)
return return
@@ -1474,7 +1497,7 @@ class GameWindow(ui.ScriptWindow):
def UpdateDebugInfo(self): def UpdateDebugInfo(self):
# #
# 캐릭터 좌표 및 FPS 출력 # ij<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ǥ <20><> FPS <EFBFBD><EFBFBD><EFBFBD>
(x, y, z) = player.GetMainCharacterPosition() (x, y, z) = player.GetMainCharacterPosition()
nUpdateTime = app.GetUpdateTime() nUpdateTime = app.GetUpdateTime()
nUpdateFPS = app.GetUpdateFPS() nUpdateFPS = app.GetUpdateFPS()
@@ -1637,22 +1660,22 @@ class GameWindow(ui.ScriptWindow):
def BINARY_Cube_Close(self): def BINARY_Cube_Close(self):
self.interface.CloseCubeWindow() self.interface.CloseCubeWindow()
# 제작에 필요한 골드, 예상되는 완성품의 VNUM과 개수 정보 update # <EFBFBD><EFBFBD><EFBFBD>ۿ<EFBFBD> <20>ʿ<EFBFBD><CABF><EFBFBD> <20><><EFBFBD>, <20><><EFBFBD><EFBFBD>Ǵ<EFBFBD> <20>ϼ<EFBFBD>ǰ<EFBFBD><C7B0> VNUM<55><4D> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> update
def BINARY_Cube_UpdateInfo(self, gold, itemVnum, count): def BINARY_Cube_UpdateInfo(self, gold, itemVnum, count):
self.interface.UpdateCubeInfo(gold, itemVnum, count) self.interface.UpdateCubeInfo(gold, itemVnum, count)
def BINARY_Cube_Succeed(self, itemVnum, count): def BINARY_Cube_Succeed(self, itemVnum, count):
print "큐브 제작 성공" print "ť<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
self.interface.SucceedCubeWork(itemVnum, count) self.interface.SucceedCubeWork(itemVnum, count)
pass pass
def BINARY_Cube_Failed(self): def BINARY_Cube_Failed(self):
print "큐브 제작 실패" print "ť<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
self.interface.FailedCubeWork() self.interface.FailedCubeWork()
pass pass
def BINARY_Cube_ResultList(self, npcVNUM, listText): def BINARY_Cube_ResultList(self, npcVNUM, listText):
# ResultList Text Format : 72723,1/72725,1/72730.1/50001,5 이런식으로 "/" 문자로 구분된 리스트를 줌 # ResultList Text Format : 72723,1/72725,1/72730.1/50001,5 <EFBFBD>̷<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "/" <20><><EFBFBD>ڷ<EFBFBD> <20><><EFBFBD>е<EFBFBD> <20><><EFBFBD><EFBFBD>Ʈ<EFBFBD><C6AE> <20><>
#print listText #print listText
if npcVNUM == 0: if npcVNUM == 0:
@@ -1753,7 +1776,7 @@ class GameWindow(ui.ScriptWindow):
# END_OF_CUBE # END_OF_CUBE
# 용혼석 # <EFBFBD><EFBFBD>ȥ<EFBFBD><EFBFBD>
def BINARY_Highlight_Item(self, inven_type, inven_pos): def BINARY_Highlight_Item(self, inven_type, inven_pos):
self.interface.Highligt_Item(inven_type, inven_pos) self.interface.Highligt_Item(inven_type, inven_pos)

19
assets/root/uiexchange.py
View File

@@ -4,7 +4,7 @@ import net
import localeInfo import localeInfo
import chat import chat
import item import item
import constInfo
import ui import ui
import mouseModule import mouseModule
import uiPickMoney import uiPickMoney
@@ -116,7 +116,6 @@ class ExchangeDialog(ui.ScriptWindow):
self.AcceptButton.Disable() self.AcceptButton.Disable()
def SelectOwnerEmptySlot(self, SlotIndex): def SelectOwnerEmptySlot(self, SlotIndex):
if False == mouseModule.mouseController.isAttached(): if False == mouseModule.mouseController.isAttached():
return return
@@ -124,19 +123,33 @@ class ExchangeDialog(ui.ScriptWindow):
net.SendExchangeElkAddPacket(mouseModule.mouseController.GetAttachedMoneyAmount()) net.SendExchangeElkAddPacket(mouseModule.mouseController.GetAttachedMoneyAmount())
else: else:
attachedSlotType = mouseModule.mouseController.GetAttachedType() attachedSlotType = mouseModule.mouseController.GetAttachedType()
if (player.SLOT_TYPE_INVENTORY == attachedSlotType if (player.SLOT_TYPE_INVENTORY == attachedSlotType
or player.SLOT_TYPE_DRAGON_SOUL_INVENTORY == attachedSlotType): or player.SLOT_TYPE_DRAGON_SOUL_INVENTORY == attachedSlotType):
attachedInvenType = player.SlotTypeToInvenType(attachedSlotType) attachedInvenType = player.SlotTypeToInvenType(attachedSlotType)
SrcSlotNumber = mouseModule.mouseController.GetAttachedSlotNumber() SrcSlotNumber = mouseModule.mouseController.GetAttachedSlotNumber()
DstSlotNumber = SlotIndex DstSlotNumber = SlotIndex
itemID = player.GetItemIndex(attachedInvenType, SrcSlotNumber) itemID = player.GetItemIndex(attachedInvenType, SrcSlotNumber)
# MR-3: Auto-deactivate auto potions before moving out
if attachedSlotType == player.SLOT_TYPE_INVENTORY:
itemVnum = player.GetItemIndex(attachedInvenType, SrcSlotNumber)
if constInfo.IS_AUTO_POTION(itemVnum):
metinSocket = [player.GetItemMetinSocket(attachedInvenType, SrcSlotNumber, j) for j in xrange(player.METIN_SOCKET_MAX_NUM)]
isActivated = (0 != int(metinSocket[0]))
if isActivated:
net.SendItemUsePacket(SrcSlotNumber)
# MR-3: -- END OF -- Auto-deactivate auto potions before moving out
item.SelectItem(itemID) item.SelectItem(itemID)
if item.IsAntiFlag(item.ANTIFLAG_GIVE): if item.IsAntiFlag(item.ANTIFLAG_GIVE):
chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.EXCHANGE_CANNOT_GIVE) chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.EXCHANGE_CANNOT_GIVE)
mouseModule.mouseController.DeattachObject() mouseModule.mouseController.DeattachObject()
return return
net.SendExchangeItemAddPacket(attachedInvenType, SrcSlotNumber, DstSlotNumber) net.SendExchangeItemAddPacket(attachedInvenType, SrcSlotNumber, DstSlotNumber)

5
assets/root/uisafebox.py
View File

@@ -22,7 +22,10 @@ class PasswordDialog(ui.ScriptWindow):
def __LoadDialog(self): def __LoadDialog(self):
try: try:
pyScrLoader = ui.PythonScriptLoader() pyScrLoader = ui.PythonScriptLoader()
pyScrLoader.LoadScriptFile(self, "uiscript/passworddialog.py") # if localeInfo.IsEUROPE()and app.GetLocalePath() != "locale/ca"and app.GetLocalePath() != "locale/sg" :
pyScrLoader.LoadScriptFile(self, uiScriptLocale.LOCALE_UISCRIPT_PATH + "passworddialog.py")
# else:
# pyScrLoader.LoadScriptFile(self, "uiscript/passworddialog.py")
except: except:
import exception import exception
exception.Abort("PasswordDialog.__LoadDialog.LoadObject") exception.Abort("PasswordDialog.__LoadDialog.LoadObject")

2
assets/season1/season1/effect/pc/common/effect/ourora.mse
View File

@@ -120,7 +120,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\warrior\effect\inter_pasthit6.jpg" "D:\Ymir Work\pc\warrior\effect\inter_pasthit6.dds"
} }
} }
} }

2
assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop.mse
View File

@@ -122,7 +122,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg" "D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds"
} }
} }
} }

2
assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_2.mse
View File

@@ -122,7 +122,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg" "D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds"
} }
} }
} }

2
assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_3.mse
View File

@@ -122,7 +122,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg" "D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds"
} }
} }
} }

2
assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_4.mse
View File

@@ -122,7 +122,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg" "D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds"
} }
} }
} }

48
assets/season1/season1/effect/success.mse
View File

@@ -128,7 +128,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -259,7 +259,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -409,7 +409,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -553,7 +553,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -684,7 +684,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -815,7 +815,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -965,7 +965,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -1109,7 +1109,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -1240,7 +1240,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -1371,7 +1371,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -1521,7 +1521,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -1665,7 +1665,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -1796,7 +1796,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -1931,7 +1931,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -2084,7 +2084,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -2228,7 +2228,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -2362,7 +2362,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -2493,7 +2493,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -2643,7 +2643,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -2787,7 +2787,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -2918,7 +2918,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -3049,7 +3049,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -3199,7 +3199,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }
@@ -3343,7 +3343,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
} }
} }
} }

4
assets/season1/season1/effect/victory.mse
View File

@@ -138,7 +138,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\Rotation of Rsotation of 3.jpg" "D:\Ymir Work\pc\shaman\effect\Rotation of Rsotation of 3.dds"
} }
} }
} }
@@ -264,7 +264,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir Work\pc\shaman\effect\sa_za_hu_inter_pasthit6.jpg" "D:\Ymir Work\pc\shaman\effect\sa_za_hu_inter_pasthit6.dds"
} }
} }
} }

4
assets/season1/season1/monster/ch_general/general_skill2.mse
View File

@@ -122,7 +122,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\warrior\effect\spark copy.jpg" "D:\Ymir work\pc\warrior\effect\spark copy.dds"
} }
} }
} }
@@ -249,7 +249,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.jpg" "D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.dds"
} }
} }
} }

2
assets/season1/season1/monster/ch_magician/skipia_fire.mse
View File

@@ -129,7 +129,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\effect\monster2\flame.jpg" "D:\Ymir work\effect\monster2\flame.dds"
} }
} }
} }

14
assets/season1/season1/monster/ch_magician/torpedo_blow.mse
View File

@@ -119,7 +119,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\shaman\effect\noejeon_light copy.jpg" "D:\Ymir work\pc\shaman\effect\noejeon_light copy.dds"
} }
} }
} }
@@ -242,7 +242,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\shaman\effect\W_star.jpg" "D:\Ymir work\pc\shaman\effect\W_star.dds"
} }
} }
} }
@@ -374,7 +374,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\shaman\effect\shamandust.jpg" "D:\Ymir work\pc\shaman\effect\shamandust.dds"
} }
} }
} }
@@ -502,7 +502,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\shaman\effect\chip.jpg" "D:\Ymir work\pc\shaman\effect\chip.dds"
} }
} }
} }
@@ -626,7 +626,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\shaman\effect\ls1_1 copy.jpg" "D:\Ymir work\pc\shaman\effect\ls1_1 copy.dds"
} }
} }
} }
@@ -755,7 +755,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\shaman\effect\gatein.jpg" "D:\Ymir work\pc\shaman\effect\gatein.dds"
} }
} }
} }
@@ -884,7 +884,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\shaman\effect\gatein.jpg" "D:\Ymir work\pc\shaman\effect\gatein.dds"
} }
} }
} }

4
assets/season2/season2/monster/ch_general/general_skill2.mse
View File

@@ -122,7 +122,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\warrior\effect\spark copy.jpg" "D:\Ymir work\pc\warrior\effect\spark copy.dds"
} }
} }
} }
@@ -249,7 +249,7 @@ Group Particle
} }
List TextureFiles List TextureFiles
{ {
"D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.jpg" "D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.dds"
} }
} }
} }