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

MR-3: Bunch of fixes

Browse Source
This commit is contained in:
Mind Rapist
2025-12-25 08:38:22 +02:00
parent c72c0c82f6
commit d810a6958c
7 changed files with 156 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
assets/root/constinfo.py
View File

@@ -54,6 +54,10 @@ LOGIN_COUNT_LIMIT_ENABLE = 0
PVPMODE_PROTECTED_LEVEL = 15
TWO_HANDED_WEAPON_ATT_SPEED_DECREASE_VALUE = 10
# MR-3: Define max quickslot slots number for scripts
QUICKSLOT_MAX_NUM = 36
# MR-3: -- END OF -- Define max quickslot slots number for scripts
isItemQuestionDialog = 0
def GET_ITEM_QUESTION_DIALOG_STATUS():
@@ -202,36 +206,36 @@ def GET_ACCESSORY_MATERIAL_VNUM(vnum, subType):
return ACCESSORY_MATERIAL_LIST[type]
##################################################################
## 새로 추가된 '벨트' 아이템 타입과, 벨트의 소켓에 꽂을 아이템 관련..
## 벨트의 소켓시스템은 악세서리와 동일하기 때문에, 위 악세서리 관련 하드코딩처럼 이런식으로 할 수밖에 없다..
## <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>߰<EFBFBD><DFB0><EFBFBD> '<27><>Ʈ' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ÿ<>԰<EFBFBD>, <20><>Ʈ<EFBFBD><C6AE> <20><><EFBFBD>Ͽ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>..
## <EFBFBD><EFBFBD>Ʈ<EFBFBD><EFBFBD> <20><><EFBFBD>Ͻý<CFBD><C3BD><EFBFBD><EFBFBD><EFBFBD> <20>Ǽ<EFBFBD><C7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20>Ǽ<EFBFBD><C7BC><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ϵ<EFBFBD><CFB5>ڵ<EFBFBD>ó<EFBFBD><C3B3> <20>̷<EFBFBD><CCB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>ۿ<EFBFBD> <20><><EFBFBD><EFBFBD>..
def GET_BELT_MATERIAL_VNUM(vnum, subType = 0):
# 현재는 모든 벨트에는 하나의 아이템(#18900)만 삽입 가능
# <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><>Ʈ<EFBFBD><C6AE><EFBFBD><EFBFBD> <20>ϳ<EFBFBD><CFB3><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(#18900)<29><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
return 18900
##################################################################
## 자동물약 (HP: #72723 ~ #72726, SP: #72727 ~ #72730)
## <EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (HP: #72723 ~ #72726, SP: #72727 ~ #72730)
# 해당 vnum이 자동물약인가?
# <EFBFBD>ش<EFBFBD> vnum<EFBFBD><EFBFBD> <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ΰ<EFBFBD>?
def IS_AUTO_POTION(itemVnum):
return IS_AUTO_POTION_HP(itemVnum) or IS_AUTO_POTION_SP(itemVnum)
# 해당 vnum이 HP 자동물약인가?
# <EFBFBD>ش<EFBFBD> vnum<EFBFBD><EFBFBD> HP <EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ΰ<EFBFBD>?
def IS_AUTO_POTION_HP(itemVnum):
if 72723 <= itemVnum and 72726 >= itemVnum:
return 1
elif itemVnum >= 76021 and itemVnum <= 76022: ## 새로 들어간 선물용 화룡의 축복
elif itemVnum >= 76021 and itemVnum <= 76022: ## <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ȭ<><C8AD><EFBFBD><EFBFBD> <20>ູ
return 1
elif itemVnum == 79012:
return 1
return 0
# 해당 vnum이 SP 자동물약인가?
# <EFBFBD>ش<EFBFBD> vnum<EFBFBD><EFBFBD> SP <EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ΰ<EFBFBD>?
def IS_AUTO_POTION_SP(itemVnum):
if 72727 <= itemVnum and 72730 >= itemVnum:
return 1
elif itemVnum >= 76004 and itemVnum <= 76005: ## 새로 들어간 선물용 수룡의 축복
elif itemVnum >= 76004 and itemVnum <= 76005: ## <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ູ
return 1
elif itemVnum == 79013:
return 1