diff --git a/assets/Effect/ymir work/effect/affect/damagevalue/nontarget.mse b/assets/Effect/ymir work/effect/affect/damagevalue/nontarget.mse index 66efeb9d..96bbc805 100644 --- a/assets/Effect/ymir work/effect/affect/damagevalue/nontarget.mse +++ b/assets/Effect/ymir work/effect/affect/damagevalue/nontarget.mse @@ -126,7 +126,7 @@ Group Particle } List TextureFiles { - "0.jpg" + "0.dds" } } } diff --git a/assets/guild/ymir work/guild/effect/gasokhwa_loop.mse b/assets/guild/ymir work/guild/effect/gasokhwa_loop.mse index 6ae514e4..34e769da 100644 --- a/assets/guild/ymir work/guild/effect/gasokhwa_loop.mse +++ b/assets/guild/ymir work/guild/effect/gasokhwa_loop.mse @@ -124,7 +124,7 @@ Group Particle } List TextureFiles { - "D:\Ymir Work\pc\shaman\effect\jigam_ring.jpg" + "D:\Ymir Work\pc\shaman\effect\jigam_ring.dds" } } } diff --git a/assets/guild/ymir work/guild/effect/gasokhwa_make.mse b/assets/guild/ymir work/guild/effect/gasokhwa_make.mse index e04090a5..94357e19 100644 --- a/assets/guild/ymir work/guild/effect/gasokhwa_make.mse +++ b/assets/guild/ymir work/guild/effect/gasokhwa_make.mse @@ -122,7 +122,7 @@ Group Particle } List TextureFiles { - "D:\Ymir Work\pc\assassin\effect\16-bottom.jpg" + "D:\Ymir Work\pc\assassin\effect\16-bottom.dds" } } } diff --git a/assets/guild/ymir work/guild/effect/jumunsul_loop.mse b/assets/guild/ymir work/guild/effect/jumunsul_loop.mse index 737d498f..99ade6f3 100644 --- a/assets/guild/ymir work/guild/effect/jumunsul_loop.mse +++ b/assets/guild/ymir work/guild/effect/jumunsul_loop.mse @@ -123,7 +123,7 @@ Group Particle } List TextureFiles { - "D:\YMIR WORK\pc\shaman\effect\jigam.jpg" + "D:\YMIR WORK\pc\shaman\effect\jigam.dds" } } } diff --git a/assets/guild/ymir work/guild/effect/jumunsul_make.mse b/assets/guild/ymir work/guild/effect/jumunsul_make.mse index 6d1ce45a..362ea249 100644 --- a/assets/guild/ymir work/guild/effect/jumunsul_make.mse +++ b/assets/guild/ymir work/guild/effect/jumunsul_make.mse @@ -254,7 +254,7 @@ Group Particle } 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 { - "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 { - "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 { - "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 { - "D:\Ymir Work\pc\shaman\effect\wind.jpg" + "D:\Ymir Work\pc\shaman\effect\wind.dds" } } } @@ -880,7 +880,7 @@ Group Particle } 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 { - "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 { - "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 { - "D:\Ymir Work\pc\shaman\effect\noe_w_ring.jpg" + "D:\Ymir Work\pc\shaman\effect\noe_w_ring.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/horse_charge.mse b/assets/pc2/ymir work/pc2/common/effect/horse_charge.mse index 9158828d..e43329e2 100644 --- a/assets/pc2/ymir work/pc2/common/effect/horse_charge.mse +++ b/assets/pc2/ymir work/pc2/common/effect/horse_charge.mse @@ -548,7 +548,7 @@ Group Particle } 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 { - "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 { - "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 { - "D:\YMIR WORK\pc\warrior\effect\cure.jpg" + "D:\YMIR WORK\pc\warrior\effect\cure.dds" } } } @@ -1059,7 +1059,7 @@ Group Particle } 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 { - "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 { - "D:\YMIR WORK\pc\warrior\effect\nwegeomsplash.jpg" + "D:\YMIR WORK\pc\warrior\effect\nwegeomsplash.dds" } } } @@ -1437,7 +1437,7 @@ Group Particle } 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 { - "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 { - "D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.jpg" + "D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_7.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_7.mse index 16e77693..7df699e2 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_7.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_7.mse @@ -135,7 +135,7 @@ Group Particle } List TextureFiles { - "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg" + "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_b.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_b.mse index 06043ce5..c38b3215 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_b.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_b.mse @@ -135,7 +135,7 @@ Group Particle } 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 { - "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg" + "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_f.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_f.mse index dfeb57cc..d488cec6 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_f.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_f.mse @@ -135,7 +135,7 @@ Group Particle } List TextureFiles { - "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg" + "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_s.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_s.mse index e5a1de33..587c4d0f 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_s.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_7_s.mse @@ -135,7 +135,7 @@ Group Particle } List TextureFiles { - "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg" + "D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_8.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_8.mse index c8ddf86d..b11fe7e9 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_8.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_8.mse @@ -264,7 +264,7 @@ Group Particle } List TextureFiles { - "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" + "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_b.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_b.mse index abda839d..6cc90509 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_b.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_b.mse @@ -264,7 +264,7 @@ Group Particle } 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 { - "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" + "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_f.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_f.mse index 794bfe80..ca2d5db0 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_f.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_f.mse @@ -265,7 +265,7 @@ Group Particle } List TextureFiles { - "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" + "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_s.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_s.mse index 64f93b77..eab6fb61 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_s.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_8_s.mse @@ -264,7 +264,7 @@ Group Particle } List TextureFiles { - "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" + "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_9.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_9.mse index ac1e245b..2c214394 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_9.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_9.mse @@ -261,7 +261,7 @@ Group Particle } List TextureFiles { - "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" + "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_b.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_b.mse index 01bb0831..29331d6a 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_b.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_b.mse @@ -394,7 +394,7 @@ Group Particle } 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 { - "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" + "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_f.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_f.mse index 3a5a78da..39ac4dd7 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_f.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_f.mse @@ -261,7 +261,7 @@ Group Particle } List TextureFiles { - "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" + "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds" } } } diff --git a/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_s.mse b/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_s.mse index 780528d7..c13cffaf 100644 --- a/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_s.mse +++ b/assets/pc2/ymir work/pc2/common/effect/sword/sword_9_s.mse @@ -261,7 +261,7 @@ Group Particle } List TextureFiles { - "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg" + "D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds" } } } diff --git a/assets/root/game.py b/assets/root/game.py index da240c1c..dce69c98 100644 --- a/assets/root/game.py +++ b/assets/root/game.py @@ -51,10 +51,22 @@ import stringCommander from _weakref import proxy +# TEXTTAIL_LIVINGTIME_CONTROL +#if localeInfo.IsJAPAN(): +# app.SetTextTailLivingTime(8.0) +# END_OF_TEXTTAIL_LIVINGTIME_CONTROL + # SCREENSHOT_CWDSAVE SCREENSHOT_CWDSAVE = False SCREENSHOT_DIR = None +if localeInfo.IsEUROPE(): + SCREENSHOT_CWDSAVE = True + +if localeInfo.IsCIBN10(): + SCREENSHOT_CWDSAVE = False + SCREENSHOT_DIR = "YT2W" + cameraDistance = 1550.0 cameraPitch = 27.0 cameraRotation = 0.0 @@ -105,7 +117,7 @@ class GameWindow(ui.ScriptWindow): self.playerGauge = uiPlayerGauge.PlayerGauge(self) self.playerGauge.Hide() - #wj 2014.1.2. ESC키를 누를 시 우선적으로 DropQuestionDialog를 끄도록 만들었다. 하지만 처음에 itemDropQuestionDialog가 선언되어 있지 않아 ERROR가 발생하여 init에서 선언과 동시에 초기화 시킴. + #wj 2014.1.2. ESCŰ�� ���� �� �켱������ DropQuestionDialog�� ������ �������. ������ ó���� itemDropQuestionDialog�� ����Ǿ� ���� �ʾ� ERROR�� �߻��Ͽ� init���� ����� ���ÿ� �ʱ�ȭ ��Ŵ. self.itemDropQuestionDialog = None self.__SetQuickSlotMode() @@ -214,7 +226,7 @@ class GameWindow(ui.ScriptWindow): exception.Abort("GameWindow.Open") # END_OF_START_GAME_ERROR_EXIT - # NPC가 큐브시스템으로 만들 수 있는 아이템들의 목록을 캐싱 + # NPC�� ť��ý������� ���� �� �ִ� �����۵��� ����� ij�� # ex) cubeInformation[20383] = [ {"rewordVNUM": 72723, "rewordCount": 1, "materialInfo": "101,1&102,2", "price": 999 }, ... ] self.cubeInformation = {} self.currentCubeNPC = 0 @@ -302,10 +314,10 @@ class GameWindow(ui.ScriptWindow): def __BuildKeyDict(self): onPressKeyDict = {} - ##PressKey 는 누르고 있는 동안 계속 적용되는 키이다. + ##PressKey �� ������ �ִ� ���� ��� ����Ǵ� Ű�̴�. - ## 숫자 단축키 퀵슬롯에 이용된다.(이후 숫자들도 퀵 슬롯용 예약) - ## F12 는 클라 디버그용 키이므로 쓰지 않는 게 좋다. + ## ���� ����Ű �����Կ� �̿�ȴ�.(���� ���ڵ鵵 �� ���Կ� ����) + ## F12 �� Ŭ�� ����׿� Ű�̹Ƿ� ���� �ʴ� �� ����. onPressKeyDict[app.DIK_1] = lambda : self.__PressNumKey(1) onPressKeyDict[app.DIK_2] = lambda : self.__PressNumKey(2) 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_SPACE] = lambda : self.StartAttack() - #캐릭터 이동키 + #ij���� �̵�Ű onPressKeyDict[app.DIK_UP] = lambda : self.MoveUp() onPressKeyDict[app.DIK_DOWN] = lambda : self.MoveDown() onPressKeyDict[app.DIK_LEFT] = lambda : self.MoveLeft() @@ -430,7 +442,6 @@ class GameWindow(ui.ScriptWindow): def __PressNumKey(self,num): if app.IsPressed(app.DIK_LCONTROL) or app.IsPressed(app.DIK_RCONTROL): - if num >= 1 and num <= 9: if(chrmgr.IsPossibleEmoticon(-1)): chrmgr.SetEmoticon(-1,int(num)-1) @@ -507,13 +518,13 @@ class GameWindow(ui.ScriptWindow): self.pressNumber=ui.__mem_func__(self.__SelectQuickPage) def __PressQuickSlot(self, localSlotIndex): - if app.IsRTL(): + if localeInfo.IsARABIC(): if 0 <= localSlotIndex and localSlotIndex < 4: player.RequestUseLocalQuickSlot(3-localSlotIndex) else: player.RequestUseLocalQuickSlot(11-localSlotIndex) else: - player.RequestUseLocalQuickSlot(localSlotIndex) + player.RequestUseLocalQuickSlot(localSlotIndex) def __SelectQuickPage(self, pageIndex): self.quickSlotPageIndex = pageIndex @@ -572,12 +583,12 @@ class GameWindow(ui.ScriptWindow): self.TextureNum.SetFontName(localeInfo.UI_DEF_FONT) self.TextureNum.SetPosition(wndMgr.GetScreenWidth() - 270, 100) - # 오브젝트 그리는 개수 + # ������Ʈ �׸��� ���� self.ObjectNum = ui.TextLine() self.ObjectNum.SetFontName(localeInfo.UI_DEF_FONT) self.ObjectNum.SetPosition(wndMgr.GetScreenWidth() - 270, 120) - # 시야거리 + # �þ߰Ÿ� self.ViewDistance = ui.TextLine() self.ViewDistance.SetFontName(localeInfo.UI_DEF_FONT) self.ViewDistance.SetPosition(0, 0) @@ -1304,6 +1315,18 @@ class GameWindow(ui.ScriptWindow): self.stream.popupWindow.Close() self.stream.popupWindow.Open(localeInfo.EXCHANGE_FAILURE_EQUIP_ITEM, 0, localeInfo.UI_OK) 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): net.SendGiveItemPacket(dstChrID, attachedInvenType, attachedItemSlotPos, attachedItemCount) else: @@ -1320,7 +1343,7 @@ class GameWindow(ui.ScriptWindow): self.__DropMoney(attachedType, attachedMoney) def __DropMoney(self, attachedType, attachedMoney): - # PRIVATESHOP_DISABLE_ITEM_DROP - 개인상점 열고 있는 동안 아이템 버림 방지 + # PRIVATESHOP_DISABLE_ITEM_DROP - ���λ��� ���� �ִ� ���� ������ ���� ���� if uiPrivateShopBuilder.IsBuildingPrivateShop(): chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.DROP_ITEM_FAILURE_PRIVATE_SHOP) return @@ -1342,7 +1365,7 @@ class GameWindow(ui.ScriptWindow): self.itemDropQuestionDialog = itemDropQuestionDialog def __DropItem(self, attachedType, attachedItemIndex, attachedItemSlotPos, attachedItemCount): - # PRIVATESHOP_DISABLE_ITEM_DROP - 개인상점 열고 있는 동안 아이템 버림 방지 + # PRIVATESHOP_DISABLE_ITEM_DROP - ���λ��� ���� �ִ� ���� ������ ���� ���� if uiPrivateShopBuilder.IsBuildingPrivateShop(): chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.DROP_ITEM_FAILURE_PRIVATE_SHOP) return @@ -1474,7 +1497,7 @@ class GameWindow(ui.ScriptWindow): def UpdateDebugInfo(self): # - # 캐릭터 좌표 및 FPS 출력 + # ij���� ��ǥ �� FPS ��� (x, y, z) = player.GetMainCharacterPosition() nUpdateTime = app.GetUpdateTime() nUpdateFPS = app.GetUpdateFPS() @@ -1637,22 +1660,22 @@ class GameWindow(ui.ScriptWindow): def BINARY_Cube_Close(self): self.interface.CloseCubeWindow() - # 제작에 필요한 골드, 예상되는 완성품의 VNUM과 개수 정보 update + # ���ۿ� �ʿ��� ���, ����Ǵ� �ϼ�ǰ�� VNUM�� ���� ���� update def BINARY_Cube_UpdateInfo(self, gold, itemVnum, count): self.interface.UpdateCubeInfo(gold, itemVnum, count) def BINARY_Cube_Succeed(self, itemVnum, count): - print "큐브 제작 성공" + print "ť�� ���� ����" self.interface.SucceedCubeWork(itemVnum, count) pass def BINARY_Cube_Failed(self): - print "큐브 제작 실패" + print "ť�� ���� ����" self.interface.FailedCubeWork() pass 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 �̷������� "/" ���ڷ� ���е� ����Ʈ�� �� #print listText if npcVNUM == 0: @@ -1753,7 +1776,7 @@ class GameWindow(ui.ScriptWindow): # END_OF_CUBE - # 용혼석 + # ��ȥ�� def BINARY_Highlight_Item(self, inven_type, inven_pos): self.interface.Highligt_Item(inven_type, inven_pos) diff --git a/assets/root/uiexchange.py b/assets/root/uiexchange.py index 66885a41..ed23abc1 100644 --- a/assets/root/uiexchange.py +++ b/assets/root/uiexchange.py @@ -4,7 +4,7 @@ import net import localeInfo import chat import item - +import constInfo import ui import mouseModule import uiPickMoney @@ -116,7 +116,6 @@ class ExchangeDialog(ui.ScriptWindow): self.AcceptButton.Disable() def SelectOwnerEmptySlot(self, SlotIndex): - if False == mouseModule.mouseController.isAttached(): return @@ -124,19 +123,33 @@ class ExchangeDialog(ui.ScriptWindow): net.SendExchangeElkAddPacket(mouseModule.mouseController.GetAttachedMoneyAmount()) else: attachedSlotType = mouseModule.mouseController.GetAttachedType() + if (player.SLOT_TYPE_INVENTORY == attachedSlotType or player.SLOT_TYPE_DRAGON_SOUL_INVENTORY == attachedSlotType): attachedInvenType = player.SlotTypeToInvenType(attachedSlotType) SrcSlotNumber = mouseModule.mouseController.GetAttachedSlotNumber() DstSlotNumber = SlotIndex - 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) if item.IsAntiFlag(item.ANTIFLAG_GIVE): chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.EXCHANGE_CANNOT_GIVE) mouseModule.mouseController.DeattachObject() + return net.SendExchangeItemAddPacket(attachedInvenType, SrcSlotNumber, DstSlotNumber) diff --git a/assets/root/uisafebox.py b/assets/root/uisafebox.py index a0db7e38..496a52e9 100644 --- a/assets/root/uisafebox.py +++ b/assets/root/uisafebox.py @@ -22,7 +22,10 @@ class PasswordDialog(ui.ScriptWindow): def __LoadDialog(self): try: 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: import exception exception.Abort("PasswordDialog.__LoadDialog.LoadObject") diff --git a/assets/season1/season1/effect/pc/common/effect/ourora.mse b/assets/season1/season1/effect/pc/common/effect/ourora.mse index 89a31355..625a18d7 100644 --- a/assets/season1/season1/effect/pc/common/effect/ourora.mse +++ b/assets/season1/season1/effect/pc/common/effect/ourora.mse @@ -120,7 +120,7 @@ Group Particle } List TextureFiles { - "D:\Ymir Work\pc\warrior\effect\inter_pasthit6.jpg" + "D:\Ymir Work\pc\warrior\effect\inter_pasthit6.dds" } } } diff --git a/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop.mse b/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop.mse index 79a21238..1a01e489 100644 --- a/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop.mse +++ b/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop.mse @@ -122,7 +122,7 @@ Group Particle } List TextureFiles { - "D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg" + "D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds" } } } diff --git a/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_2.mse b/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_2.mse index 1e32a87e..c15bbf6f 100644 --- a/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_2.mse +++ b/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_2.mse @@ -122,7 +122,7 @@ Group Particle } List TextureFiles { - "D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg" + "D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds" } } } diff --git a/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_3.mse b/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_3.mse index 4b133a5d..37e56020 100644 --- a/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_3.mse +++ b/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_3.mse @@ -122,7 +122,7 @@ Group Particle } List TextureFiles { - "D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg" + "D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds" } } } diff --git a/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_4.mse b/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_4.mse index dc638114..34840571 100644 --- a/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_4.mse +++ b/assets/season1/season1/effect/pc/warrior/effect/noegeomdorae_loop_4.mse @@ -122,7 +122,7 @@ Group Particle } List TextureFiles { - "D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg" + "D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds" } } } diff --git a/assets/season1/season1/effect/success.mse b/assets/season1/season1/effect/success.mse index 5af36ddc..fffcb35f 100644 --- a/assets/season1/season1/effect/success.mse +++ b/assets/season1/season1/effect/success.mse @@ -128,7 +128,7 @@ Group Particle } 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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "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 { - "D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg" + "D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds" } } } diff --git a/assets/season1/season1/effect/victory.mse b/assets/season1/season1/effect/victory.mse index 40ec4d4a..12101b7f 100644 --- a/assets/season1/season1/effect/victory.mse +++ b/assets/season1/season1/effect/victory.mse @@ -138,7 +138,7 @@ Group Particle } 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 { - "D:\Ymir Work\pc\shaman\effect\sa_za_hu_inter_pasthit6.jpg" + "D:\Ymir Work\pc\shaman\effect\sa_za_hu_inter_pasthit6.dds" } } } diff --git a/assets/season1/season1/monster/ch_general/general_skill2.mse b/assets/season1/season1/monster/ch_general/general_skill2.mse index 3bd16d17..acc2e836 100644 --- a/assets/season1/season1/monster/ch_general/general_skill2.mse +++ b/assets/season1/season1/monster/ch_general/general_skill2.mse @@ -122,7 +122,7 @@ Group Particle } 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 { - "D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.jpg" + "D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.dds" } } } diff --git a/assets/season1/season1/monster/ch_magician/skipia_fire.mse b/assets/season1/season1/monster/ch_magician/skipia_fire.mse index 8e3ba2a5..e4d50f98 100644 --- a/assets/season1/season1/monster/ch_magician/skipia_fire.mse +++ b/assets/season1/season1/monster/ch_magician/skipia_fire.mse @@ -129,7 +129,7 @@ Group Particle } List TextureFiles { - "D:\Ymir work\effect\monster2\flame.jpg" + "D:\Ymir work\effect\monster2\flame.dds" } } } diff --git a/assets/season1/season1/monster/ch_magician/torpedo_blow.mse b/assets/season1/season1/monster/ch_magician/torpedo_blow.mse index e6b4f192..7918edd8 100644 --- a/assets/season1/season1/monster/ch_magician/torpedo_blow.mse +++ b/assets/season1/season1/monster/ch_magician/torpedo_blow.mse @@ -119,7 +119,7 @@ Group Particle } 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 { - "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 { - "D:\Ymir work\pc\shaman\effect\shamandust.jpg" + "D:\Ymir work\pc\shaman\effect\shamandust.dds" } } } @@ -502,7 +502,7 @@ Group Particle } 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 { - "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 { - "D:\Ymir work\pc\shaman\effect\gatein.jpg" + "D:\Ymir work\pc\shaman\effect\gatein.dds" } } } @@ -884,7 +884,7 @@ Group Particle } List TextureFiles { - "D:\Ymir work\pc\shaman\effect\gatein.jpg" + "D:\Ymir work\pc\shaman\effect\gatein.dds" } } } diff --git a/assets/season2/season2/monster/ch_general/general_skill2.mse b/assets/season2/season2/monster/ch_general/general_skill2.mse index 3bd16d17..acc2e836 100644 --- a/assets/season2/season2/monster/ch_general/general_skill2.mse +++ b/assets/season2/season2/monster/ch_general/general_skill2.mse @@ -122,7 +122,7 @@ Group Particle } 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 { - "D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.jpg" + "D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.dds" } } }