Add batch gift box opening window (mt_chest)
Ctrl + right click on an ITEM_GIFTBOX opens a count window (1/10/50/all, max 200) that sends /mt_chest and sums the MTCH1 gains into chat. Without Ctrl or against a server without the command the original use runs. Exports item.ITEM_TYPE_GIFTBOX. Verified live on the 203 channel5 core. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
shenlei
co-authored by
Claude Opus 5.5
Claude Opus 5.5
parent
10f8c9760e
commit
b8363693f1
@@ -0,0 +1,44 @@
|
||||
# AVA2 批量开箱适配进度（v1）
|
||||
|
||||
2026-10-15。修改了 metin2-client 和 metin2-server，AVA2 代码只作参考（`ENABLE_MULTI_CHEST`：`uiinventory.py` 的 Ctrl + 右键、`uichestdropinfo.py`、服务端 `do_chest_drop` / `CHARACTER::OpenChest`）。服务端规则和协议见 `metin2-server/docs/FEATURE-CHEST.md`。
|
||||
|
||||
## 与 AVA2 的差异
|
||||
|
||||
| 项目 | AVA2 | 本实现 |
|
||||
| --- | --- | --- |
|
||||
| 触发 | Ctrl + 右键打开带滑块的窗口；Ctrl + Z + 右键直接开整叠 | Ctrl + 右键打开数量窗口（1 / 10 / 50 / 全部），点“开启”；没有直接开整叠的组合键 |
|
||||
| 命令 | `/chest_drop WINDOW CELL COUNT` | `/mt_chest 1 open CELL COUNT`，不新增包头 |
|
||||
| 开箱过程 | 重写的 `GiveItemFromSpecialItemGroupNew` / `AutoGiveItemChest`，单次最多 1000 | 每个礼盒都调用原 `UseItem` 礼盒路径，检查、奖励组抽取、金币/经验、日志、扣除都不变；单次最多 200 |
|
||||
| 范围 | 一叠 | 同一种礼盒，先开选中的格子，再开背包里其他格子（203 上多数礼盒不叠加） |
|
||||
| 背包满 | 由 AutoGiveItemChest 处理 | 每开一个前要求至少 3 格空位，不足就停止，奖励不会掉在地上 |
|
||||
| 不允许批量 | — | 奖励组含刷怪、怪物组、减速、中毒、吸血的礼盒，以及非 ITEM_GIFTBOX 的物品（例如带任务脚本的宝箱） |
|
||||
|
||||
## 客户端
|
||||
|
||||
- 模块 `mt_chest`（`src/platform/ScriptLib/ChestScript.inc`），在 `PythonBoot.cpp` 中安装。替换了 `uiInventory.InventoryWindow.UseItemSlot`：按住 Ctrl 右键 ITEM_GIFTBOX 时打开窗口，其他情况调用原方法。原方法本身不使用 Ctrl（联机时检查过它的 `co_names`）。
|
||||
- `PythonItemModule.cpp` 新导出 `item.ITEM_TYPE_GIFTBOX`。
|
||||
- 窗口显示礼盒名称、背包内总数、数量按钮（`【】` 表示已选；“全部”最多 200）、开启按钮和上次结果。选中格子里的礼盒被移走时，自动改用背包里同一种礼盒的其他格子。
|
||||
- 等待回复时，以及两次发送间隔不足 0.5 秒时，“开启”按钮不可用。
|
||||
- 结果：聊天框一行“开启 N 个，金币 +N（停止原因）”，之后每行最多 5 种获得的物品（名称 ×数量）。单个礼盒的提示由服务端暂存，不再逐条刷屏；被原路径拒绝时转发一次拒绝提示。
|
||||
- 3 秒没有回复：在聊天框提示一次“服务器尚未启用批量开启”，之后 Ctrl + 右键也走原来的单个使用；再收到回复会自动恢复。
|
||||
- 经验不在汇总里（服务端只汇报背包物品和金币变化）。
|
||||
|
||||
## 证据
|
||||
|
||||
- `tests/wiki/test_chest.py`（CTest：`port.chest`）共 6 项通过，覆盖：
|
||||
- 发送一次、等待回复、获得行累积到 done、数量上限 200、负的金币差、发送间隔；
|
||||
- error 解析，畸形行和其他前缀；
|
||||
- 超时后标记不支持，迟到的回复会恢复；
|
||||
- 聊天汇总行（停止原因、金币、每行 5 种）；
|
||||
- 钩子：不按 Ctrl 和非礼盒走原方法，Ctrl + 右键礼盒打开窗口，“全部”，选中格子消失后改用其他格子，命令拦截，超时后回退，窗口关闭；
|
||||
- 与服务端 `port_chest.h` 的常量、错误码和停止原因一致。
|
||||
- `tests/wiki` 全部 57 项通过（1 项跳过）。
|
||||
- 2026-10-15 在 203 channel5 测试核心（13040，独立二进制）用 macOS 客户端以 [SA]Admin 联机验收，礼盒用 `/item` 生成：
|
||||
- 50037（可叠加，30 个）开 10 个：`done 50037 10 10 done 0`，获得 6 种物品，背包差值与 `MTCH1 got` 完全一致；
|
||||
- 50070（不叠加，4 个分在 4 格）开全部：`done 50070 4 4 done 100000`，跨格子全部开启，金币 +100000 与余额变化一致；
|
||||
- 71036（奖励组刷怪）：`error kind`，没有扣除；
|
||||
- 连发两条命令：第二条 `error rate`；
|
||||
- 50037 剩余 20 个开全部：`done 50037 20 20 done 0`，获得 11 种；
|
||||
- 不按 Ctrl 右键：原单个使用，礼盒正常扣除；
|
||||
- 日志库只有原路径写的 `SYSTEM`、`TREASURE_EXP`、`TREASURE_GOLD` 行；syserr 没有新错误（只有原有的 `new_quest_lv52` LUA_ERROR）。
|
||||
- 未部署 203 正式环境，未做 Android 真机测试；触屏没有 Ctrl，暂无触屏入口。
|
||||
@@ -126,3 +126,5 @@
|
||||
2026-10-15 换线（计划外追加，参考 AVA2 ENABLE_CHANNEL_CHANGE）：仅客户端，按原流程 /logout → 登录目标频道（serverInfo 频道表 + 保存的账号）→ isAutoSelect 进入同一角色，不做服务端传送；macOS 客户端已在 203 正式频道 CH1↔CH2 联机验收，未做 Android 真机测试。见 AVA2-CHANNEL.md。
|
||||
2026-10-15 世界 Boss 追踪（AVA2 uitrack 世界 Boss 页，只读，不含传送）：服务端各核心用原 HEADER_GG_RELAY（名字 #mt_boss）共享定时 Boss 刷新点，旧核心忽略；客户端 mt_boss 窗口 + 刷新提醒，查询种类 bosses（能力位 256）；已在 203 两个 channel5 测试核心上做跨核心联机验收，正式核心尚未部署。见 AVA2-BOSS.md。
|
||||
2026-10-15 属性锁定（阶段 6 后半，参考 AVA2 ENABLE_LOCK_ATTR）：服务端新表 mt_item_attr_lock（按物品 ID 存锁定掩码，各核心启动时自动建表；不改动物品结构、db 缓存和客户端封包），CItem::ChangeAttribute 保留锁定槽位，手动、自动、GM 洗练全部生效；精炼时锁定随属性复制；最多 2 组，加成武器的 0/1 槽算一组；锁定免费。客户端在自动洗练窗口里加 5 个锁定按钮。已在 203 channel5 测试核心联机验收（洗 10 次锁定的 2 条不变，重新登录后仍在）；2026-10-15 16:08 部署到 203 正式环境（服务端 dc71593），CH1 复验通过；未做 Android 真机测试。见 AVA2-SWITCHBOT.md 和服务端 FEATURE-ATTR-LOCK.md。
|
||||
|
||||
2026-10-15 批量开箱（阶段 3 的交互子批，参考 AVA2 ENABLE_MULTI_CHEST /chest_drop）：服务端 mt_chest 对同一种礼盒（ITEM_GIFTBOX）逐个调用原 UseItem 开箱路径，可跨格子（203 上多数礼盒不叠加），单次最多 200 个，背包少于 3 格空位即停止；奖励组含刷怪/减速/中毒/吸血的礼盒不允许批量。客户端 Ctrl + 右键礼盒打开数量窗口（1/10/50/全部），结果汇总到聊天框。已在 203 channel5 测试核心联机验收；未部署 203 正式环境，未做 Android 真机测试和触屏入口。见 AVA2-CHEST.md 和服务端 FEATURE-CHEST.md。
|
||||
|
||||
@@ -0,0 +1,219 @@
|
||||
// PORT: AVA2-style batch chest opening (ENABLE_MULTI_CHEST, Ctrl + right click on a gift box), driven by the
|
||||
// server's /mt_chest command. Every box still goes through the original gift-box use path on the server; this
|
||||
// window only picks the box and the count and shows the summed gains. Without Ctrl, or against a server without
|
||||
// the command, the original single use runs. Protocol: metin2-server docs/FEATURE-CHEST.md.
|
||||
static const char c_szChestScript[] = R"PY(# -*- coding: utf-8 -*-
|
||||
import app
|
||||
import chat
|
||||
import grp
|
||||
import item
|
||||
import net
|
||||
import player
|
||||
import ui
|
||||
import uiInventory
|
||||
import game
|
||||
from mt_biolog import Action, Text, L
|
||||
from mt_wiki import B
|
||||
|
||||
g_window=None
|
||||
MAX=200
|
||||
COUNTS=(1,10,50)
|
||||
SEND_GAP=.5
|
||||
TIMEOUT=3.
|
||||
GIFTBOX=getattr(item,'ITEM_TYPE_GIFTBOX',23)
|
||||
CHAT_ITEMS=5
|
||||
ERRORS={'rate':'操作过快','invalid':'参数无效','busy':'当前状态不能开启宝箱','item':'宝箱已不在原位置',
|
||||
'kind':'这种宝箱不能批量开启，请单个开启','full':'背包空位不足，至少保留 3 格'}
|
||||
REASONS={'done':'','empty':'宝箱已全部开启','full':'背包空位不足，已停止','busy':'状态变化，已停止','rejected':'宝箱无法开启，已停止'}
|
||||
|
||||
|
||||
def Number(text,low=0,high=4294967295):
|
||||
sign=-1 if text[:1]=='-' else 1
|
||||
digits=text[1:] if sign<0 else text
|
||||
if not digits.isdigit() or len(digits)>12:raise ValueError(text)
|
||||
value=sign*int(digits)
|
||||
if not low<=value<=high:raise ValueError(text)
|
||||
return value
|
||||
|
||||
|
||||
class Opener(object):
|
||||
# Protocol state only. send(text) posts a chat command, now() is seconds.
|
||||
def __init__(self,send,now,listener=None):
|
||||
self.send=send;self.now=now;self.listener=listener
|
||||
self.waiting=None;self.nextSend=0;self.unsupported=False
|
||||
self.gains=[];self.result=None;self.error=None
|
||||
|
||||
def Busy(self):return self.waiting is not None or self.now()<self.nextSend
|
||||
|
||||
def Open(self,cell,count):
|
||||
self.Tick()
|
||||
if self.unsupported or self.Busy():return False
|
||||
now=self.now();count=max(1,min(MAX,int(count)))
|
||||
self.send('/mt_chest 1 open %d %d'%(cell,count))
|
||||
self.waiting=now+TIMEOUT;self.nextSend=now+SEND_GAP;self.gains=[];self.error=None
|
||||
return True
|
||||
|
||||
def Tick(self):
|
||||
if self.waiting is not None and self.now()>=self.waiting:
|
||||
self.waiting=None;self.unsupported=True;self.Notify('unsupported')
|
||||
|
||||
def Notify(self,kind):
|
||||
if self.listener:self.listener(kind)
|
||||
|
||||
def Receive(self,line):
|
||||
if not line.startswith('MTCH1 '):return False
|
||||
words=line.split()
|
||||
try:
|
||||
if words[1]=='got' and len(words)==4:
|
||||
self.gains.append((Number(words[2]),Number(words[3],1)));return True
|
||||
if words[1]=='done' and len(words)==7 and words[5] in REASONS:
|
||||
vnum,asked,opened=[Number(w,0,100000000) for w in words[2:5]]
|
||||
self.result=dict(vnum=vnum,asked=asked,opened=opened,reason=words[5],
|
||||
gold=Number(words[6],-2**62,2**62),gains=self.gains)
|
||||
self.gains=[];self.error=None;kind='done'
|
||||
elif words[1]=='error' and len(words)==3 and words[2] in ERRORS:self.error=words[2];kind='error'
|
||||
else:return True
|
||||
except ValueError:return True
|
||||
self.waiting=None;self.unsupported=False;self.Notify(kind)
|
||||
return True
|
||||
|
||||
|
||||
def ItemName(vnum):
|
||||
item.SelectItem(vnum);return item.GetItemName()
|
||||
|
||||
|
||||
def Batchable(vnum):
|
||||
if not vnum:return False
|
||||
item.SelectItem(vnum);return item.GetItemType()==GIFTBOX
|
||||
|
||||
|
||||
def Summary(result):
|
||||
# Chat lines for one finished batch: the count line, then the gains a few items per line.
|
||||
lines=['批量开启 %s：开启 %d 个'%(ItemName(result['vnum']),result['opened'])+
|
||||
('，金币 %+d'%result['gold'] if result['gold'] else '')+
|
||||
('（%s）'%REASONS[result['reason']] if REASONS[result['reason']] else '')]
|
||||
gains=['%s ×%d'%(ItemName(vnum),count) for vnum,count in result['gains']]
|
||||
for i in range(0,len(gains),CHAT_ITEMS):lines.append('获得：'+'，'.join(gains[i:i+CHAT_ITEMS]))
|
||||
return lines
|
||||
|
||||
|
||||
class ChestWindow(ui.Window):
|
||||
def __init__(self,opener):
|
||||
ui.Window.__init__(self);self.SetWindowName('ChestWindow');self.AddFlag('float');self.AddFlag('movable')
|
||||
self.opener=opener;self.cell=-1;self.vnum=0;self.count=1;self.SetSize(332,286)
|
||||
self.heading=Text(self,18,18,'批量开启宝箱',0xffffd68b)
|
||||
self.closeButton=Action(self,256,6,60,'关闭',self.Hide)
|
||||
self.name=Text(self,18,58,'',0xffe8dec8)
|
||||
self.owned=Text(self,18,82,'',0xffc3b7a1)
|
||||
self.countButtons=[Action(self,18+i*76,108,68,'',lambda count=count:self.SetCount(count)) for i,count in enumerate(COUNTS)]
|
||||
self.allButton=Action(self,246,108,68,'全部',lambda:self.SetCount(MAX))
|
||||
self.openButton=Action(self,18,170,296,'',self.OpenBoxes)
|
||||
self.status=Text(self,18,234,'',0xffc3b7a1)
|
||||
self.hint=Text(self,18,258,'Ctrl + 右键宝箱打开本窗口，单次最多 %d 个'%MAX,0xff8f8676)
|
||||
self.Hide()
|
||||
|
||||
def Buttons(self):return [self.closeButton,self.allButton,self.openButton]+self.countButtons
|
||||
|
||||
def Select(self,cell,vnum):
|
||||
if self.vnum!=vnum:self.count=1;self.opener.result=None;self.opener.error=None
|
||||
self.cell=cell;self.vnum=vnum;self.Refresh();self.SetCenterPosition();self.Show();self.SetTop()
|
||||
|
||||
def Owned(self):return player.GetItemCountByVnum(self.vnum) if self.vnum else 0
|
||||
|
||||
def Amount(self):return max(1,min(self.count,self.Owned(),MAX))
|
||||
|
||||
def SetCount(self,count):self.count=count;self.Refresh()
|
||||
|
||||
def Cell(self):
|
||||
# The chosen cell while it still holds the box, otherwise any bag cell that does (the server does the same).
|
||||
if player.GetItemIndex(self.cell)==self.vnum:return self.cell
|
||||
for cell in range(player.INVENTORY_PAGE_SIZE*player.INVENTORY_PAGE_COUNT):
|
||||
if player.GetItemIndex(cell)==self.vnum:return cell
|
||||
return -1
|
||||
|
||||
def OpenBoxes(self):
|
||||
cell=self.Cell()
|
||||
if cell<0:self.Refresh();return
|
||||
if self.opener.Open(cell,self.Amount()):self.cell=cell
|
||||
self.Refresh()
|
||||
|
||||
def Refresh(self):
|
||||
owned=self.Owned()
|
||||
self.name.SetText(L(B(ItemName(self.vnum)) if self.vnum else ''))
|
||||
self.owned.SetText(L('背包内共 %d 个'%owned))
|
||||
for button,count in zip(self.countButtons,COUNTS):
|
||||
button.SetText(L('【%d】'%count if self.count==count else '%d'%count));button.SetEnabled(owned>0)
|
||||
self.allButton.SetText(L('【全部】' if self.count==MAX else '全部'));self.allButton.SetEnabled(owned>0)
|
||||
self.openButton.SetText(L('开启 %d 个'%self.Amount() if owned else '没有宝箱'))
|
||||
self.openButton.SetEnabled(owned>0 and not self.opener.Busy() and not self.opener.unsupported)
|
||||
self.status.SetText(L(self.StatusText()))
|
||||
|
||||
def StatusText(self):
|
||||
o=self.opener
|
||||
if o.unsupported:return '！服务器尚未启用批量开启'
|
||||
if o.waiting is not None:return '正在开启……'
|
||||
if o.error:return '！'+ERRORS[o.error]
|
||||
r=o.result
|
||||
if r and r['vnum']==self.vnum:
|
||||
text='上次：开启 %d/%d 个，获得 %d 种物品'%(r['opened'],min(r['asked'],r['opened']+self.Owned()),len(r['gains']))
|
||||
return text+('，'+REASONS[r['reason']] if REASONS[r['reason']] else '')
|
||||
return '获得的物品会汇总显示在聊天框'
|
||||
|
||||
def OnRender(self):
|
||||
x,y=self.GetGlobalPosition();grp.SetColor(0xf51b1916);grp.RenderBar(x,y,self.GetWidth(),self.GetHeight());grp.SetColor(0xff9b7b48);grp.RenderBox(x,y,self.GetWidth(),self.GetHeight())
|
||||
|
||||
def OnUpdate(self):
|
||||
busy=self.opener.Busy();self.opener.Tick()
|
||||
if busy and not self.opener.Busy():self.Refresh() # the send gap ran out, or the request timed out
|
||||
|
||||
def OnPressEscapeKey(self):self.Hide();return True
|
||||
|
||||
def Destroy(self):
|
||||
self.Hide()
|
||||
for b in self.Buttons():b.event=None
|
||||
|
||||
|
||||
def OnOpener(kind):
|
||||
if kind=='unsupported':chat.AppendChat(chat.CHAT_TYPE_INFO,L('服务器尚未启用批量开启，请单个开启宝箱'))
|
||||
elif kind=='done':
|
||||
for line in Summary(g_opener.result):chat.AppendChat(chat.CHAT_TYPE_INFO,L(line))
|
||||
elif kind=='error':chat.AppendChat(chat.CHAT_TYPE_INFO,L(ERRORS[g_opener.error]))
|
||||
if g_window:g_window.Refresh()
|
||||
|
||||
|
||||
g_opener=Opener(net.SendChatPacket,app.GetTime,OnOpener)
|
||||
|
||||
|
||||
def CtrlPressed():return app.IsPressed(app.DIK_LCONTROL) or app.IsPressed(app.DIK_RCONTROL)
|
||||
|
||||
|
||||
_open=game.GameWindow.Open
|
||||
_close=game.GameWindow.Close
|
||||
_command=game.GameWindow.BINARY_ServerCommand_Run
|
||||
_use=uiInventory.InventoryWindow.UseItemSlot
|
||||
|
||||
def Open(self):
|
||||
global g_window
|
||||
_open(self);g_opener.waiting=None;g_window=ChestWindow(g_opener)
|
||||
|
||||
def Close(self):
|
||||
global g_window
|
||||
if g_window:g_window.Destroy();g_window=None
|
||||
_close(self)
|
||||
|
||||
def Command(self,line):
|
||||
if g_opener.Receive(line):return 1
|
||||
return _command(self,line)
|
||||
|
||||
def UseItemSlot(self,slot):
|
||||
if g_window and not g_opener.unsupported and CtrlPressed():
|
||||
cell=self._InventoryWindow__InventoryLocalSlotPosToGlobalSlotPos(slot)
|
||||
vnum=player.GetItemIndex(cell)
|
||||
if Batchable(vnum):g_window.Select(cell,vnum);return
|
||||
return _use(self,slot)
|
||||
|
||||
game.GameWindow.Open=Open
|
||||
game.GameWindow.Close=Close
|
||||
game.GameWindow.BINARY_ServerCommand_Run=Command
|
||||
uiInventory.InventoryWindow.UseItemSlot=UseItemSlot
|
||||
)PY";
|
||||
@@ -1001,6 +1001,7 @@ namespace PythonBoot
|
||||
#include "WikiEntryScript.inc"
|
||||
#include "SwitchbotScript.inc"
|
||||
#include "PickupScript.inc"
|
||||
#include "ChestScript.inc"
|
||||
#include "DisplayScript.inc"
|
||||
#include "ChannelScript.inc"
|
||||
#include "BossScript.inc"
|
||||
@@ -1079,6 +1080,7 @@ bool RunMainScript(const char* lpCmdLine, std::string* error)
|
||||
install_script_module("mt_wiki_entries", c_szWikiEntryScript);
|
||||
install_script_module("mt_switchbot", c_szSwitchbotScript);
|
||||
install_script_module("mt_pickup", c_szPickupScript);
|
||||
install_script_module("mt_chest", c_szChestScript);
|
||||
install_script_module("mt_display", c_szDisplayScript);
|
||||
install_script_module("mt_channel", c_szChannelScript);
|
||||
install_script_module("mt_boss", c_szBossScript);
|
||||
|
||||
@@ -326,6 +326,8 @@ if(BUILD_TESTING AND CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME)
|
||||
COMMAND ${MT_WIKI_PYTHON3} ${PROJECT_SOURCE_DIR}/tests/wiki/test_channel.py)
|
||||
add_test(NAME port.boss
|
||||
COMMAND ${MT_WIKI_PYTHON3} ${PROJECT_SOURCE_DIR}/tests/wiki/test_boss.py)
|
||||
add_test(NAME port.chest
|
||||
COMMAND ${MT_WIKI_PYTHON3} ${PROJECT_SOURCE_DIR}/tests/wiki/test_chest.py)
|
||||
endif()
|
||||
# Offline locale data builder: retains 40250 proto layout and gameplay fields.
|
||||
add_executable(locale_proto_patch ${PROJECT_SOURCE_DIR}/tests/port/locale_proto_patch.cpp)
|
||||
|
||||
@@ -618,6 +618,7 @@ void initItem()
|
||||
PyModule_AddIntConstant(poModule, "ITEM_TYPE_POLYMORPH", CItemData::ITEM_TYPE_POLYMORPH);
|
||||
PyModule_AddIntConstant(poModule, "ITEM_TYPE_TREASURE_BOX", CItemData::ITEM_TYPE_TREASURE_BOX);
|
||||
PyModule_AddIntConstant(poModule, "ITEM_TYPE_TREASURE_KEY", CItemData::ITEM_TYPE_TREASURE_KEY);
|
||||
PyModule_AddIntConstant(poModule, "ITEM_TYPE_GIFTBOX", CItemData::ITEM_TYPE_GIFTBOX); // PORT: batch chest opening
|
||||
PyModule_AddIntConstant(poModule, "ITEM_TYPE_PICK", CItemData::ITEM_TYPE_PICK);
|
||||
PyModule_AddIntConstant(poModule, "ITEM_TYPE_BLEND", CItemData::ITEM_TYPE_BLEND);
|
||||
PyModule_AddIntConstant(poModule, "ITEM_TYPE_DS", CItemData::ITEM_TYPE_DS);
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
import re
|
||||
import sys
|
||||
import types
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
|
||||
ROOT=Path(__file__).resolve().parents[2]
|
||||
|
||||
def script(name):return (ROOT/'src/platform/ScriptLib'/name).read_text().split('R"PY(',1)[1].rsplit(')PY";',1)[0]
|
||||
|
||||
|
||||
class Widget(object):
|
||||
def __init__(self,*a,**k):self.shown=False;self.text='';self.pos=(0,0);self.size=(0,0)
|
||||
def __getattr__(self,name):return lambda *a,**k:None
|
||||
def Show(self):self.shown=True
|
||||
def Hide(self):self.shown=False
|
||||
def IsShow(self):return self.shown
|
||||
def SetText(self,text):self.text=text
|
||||
def SetPosition(self,x,y):self.pos=(x,y)
|
||||
def GetGlobalPosition(self):return self.pos
|
||||
def SetSize(self,w,h):self.size=(w,h)
|
||||
def GetWidth(self):return self.size[0]
|
||||
def GetHeight(self):return self.size[1]
|
||||
|
||||
|
||||
class Action(Widget):
|
||||
def __init__(self,parent,x,y,width,text,event):
|
||||
Widget.__init__(self);self.pos=(x,y);self.event=event;self.enabled=True;self.text=text;self.shown=True
|
||||
def SetEnabled(self,enabled):self.enabled=enabled
|
||||
|
||||
|
||||
NAMES={50100:'Box',27001:'Potion',110000:'Soul',30000:'Ore'}
|
||||
TYPES={50100:23,27001:3,30000:5}
|
||||
|
||||
|
||||
class ChestTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.time=1.;self.sent=[];self.chat=[];self.used=[];self.ctrl=False;self.bag={}
|
||||
mods={n:types.ModuleType(n) for n in ('app','chat','game','grp','item','net','player','ui','uiInventory','mt_biolog','mt_wiki')}
|
||||
app=mods['app'];app.GetTime=lambda:self.time;app.DIK_LCONTROL=29;app.DIK_RCONTROL=157
|
||||
app.IsPressed=lambda key:self.ctrl and key==29
|
||||
mods['chat'].CHAT_TYPE_INFO=1;mods['chat'].AppendChat=lambda t,m:self.chat.append(m)
|
||||
mods['net'].SendChatPacket=self.sent.append
|
||||
selected=[0];it=mods['item']
|
||||
it.ITEM_TYPE_GIFTBOX=23;it.SelectItem=lambda v:selected.__setitem__(0,v)
|
||||
it.GetItemName=lambda:NAMES.get(selected[0],'?');it.GetItemType=lambda:TYPES.get(selected[0],0)
|
||||
pl=mods['player'];pl.INVENTORY_PAGE_SIZE=45;pl.INVENTORY_PAGE_COUNT=5
|
||||
pl.GetItemIndex=lambda c:self.bag.get(c,(0,0))[0]
|
||||
pl.GetItemCountByVnum=lambda v:sum(n for vnum,n in self.bag.values() if vnum==v)
|
||||
mods['game'].GameWindow=type('GameWindow',(),dict(Open=lambda s:None,Close=lambda s:None,
|
||||
BINARY_ServerCommand_Run=lambda s,line:7))
|
||||
mods['uiInventory'].InventoryWindow=type('InventoryWindow',(),dict(UseItemSlot=lambda s,slot:self.used.append(slot),
|
||||
_InventoryWindow__InventoryLocalSlotPosToGlobalSlotPos=lambda s,slot:slot+45))
|
||||
grp=mods['grp'];grp.SetColor=grp.RenderBar=grp.RenderBox=lambda *a:None
|
||||
mods['ui'].Window=Widget
|
||||
mods['mt_biolog'].Action=Action;mods['mt_biolog'].Text=lambda p,x,y,t='',c=0:Widget();mods['mt_biolog'].L=lambda t:t
|
||||
mods['mt_wiki'].B=lambda t,limit=0:t
|
||||
self.previous={n:sys.modules.get(n) for n in mods}
|
||||
sys.modules.update(mods)
|
||||
self.ns={'__name__':'mt_chest'};exec(script('ChestScript.inc'),self.ns)
|
||||
self.opener=self.ns['Opener'](self.sent.append,lambda:self.time)
|
||||
|
||||
def tearDown(self):
|
||||
for name,value in self.previous.items():
|
||||
if value is None:sys.modules.pop(name,None)
|
||||
else:sys.modules[name]=value
|
||||
|
||||
def test_open_sends_once_and_collects_gains_until_done(self):
|
||||
self.assertTrue(self.opener.Open(50,7));self.assertFalse(self.opener.Open(50,7))
|
||||
self.assertEqual(self.sent,['/mt_chest 1 open 50 7'])
|
||||
self.time+=1;self.assertFalse(self.opener.Open(50,7)) # still waiting for the reply
|
||||
for line in ('MTCH1 got 27001 7','MTCH1 got 110000 2','MTCH1 done 50100 7 7 done 700'):
|
||||
self.assertTrue(self.opener.Receive(line))
|
||||
r=self.opener.result
|
||||
self.assertEqual((r['vnum'],r['asked'],r['opened'],r['reason'],r['gold']),(50100,7,7,'done',700))
|
||||
self.assertEqual(r['gains'],[(27001,7),(110000,2)]);self.assertEqual(self.opener.gains,[])
|
||||
self.assertTrue(self.opener.Open(50,500));self.assertEqual(self.sent[-1],'/mt_chest 1 open 50 200') # capped
|
||||
self.opener.Receive('MTCH1 done 50100 200 0 rejected -50');self.assertEqual(self.opener.result['gold'],-50)
|
||||
self.time+=.1;self.assertFalse(self.opener.Open(50,1)) # inside the send gap
|
||||
|
||||
def test_errors_malformed_and_foreign_lines(self):
|
||||
self.opener.Open(1,1);self.opener.Receive('MTCH1 error kind')
|
||||
self.assertEqual(self.opener.error,'kind');self.assertIsNone(self.opener.waiting)
|
||||
for bad in ('MTCH1 done 1 1 1 done','MTCH1 done 1 1 1 boom 0','MTCH1 got x 1','MTCH1 got 1 0','MTCH1 error boom','MTCH1 done a 1 1 done 0'):
|
||||
self.assertTrue(self.opener.Receive(bad))
|
||||
self.assertEqual(self.opener.error,'kind');self.assertIsNone(self.opener.result)
|
||||
self.assertFalse(self.opener.Receive('MTPU1 done 1 1 0'))
|
||||
|
||||
def test_timeout_marks_unsupported(self):
|
||||
events=[];self.opener.listener=events.append
|
||||
self.opener.Open(1,1);self.time+=3.1;self.assertFalse(self.opener.Open(1,1))
|
||||
self.assertTrue(self.opener.unsupported);self.assertEqual(events,['unsupported'])
|
||||
self.opener.Receive('MTCH1 done 50100 1 1 done 0');self.assertFalse(self.opener.unsupported) # a late reply re-enables
|
||||
|
||||
def test_summary_lines(self):
|
||||
lines=self.ns['Summary'](dict(vnum=50100,opened=12,reason='full',gold=1200,gains=[(27001,12)]+[(30000,1)]*5))
|
||||
self.assertEqual(lines[0],'批量开启 Box：开启 12 个，金币 +1200（背包空位不足，已停止）')
|
||||
self.assertEqual(lines[1],'获得：Potion ×12，Ore ×1，Ore ×1，Ore ×1，Ore ×1');self.assertEqual(lines[2],'获得：Ore ×1')
|
||||
self.assertEqual(self.ns['Summary'](dict(vnum=50100,opened=1,reason='done',gold=0,gains=[])),['批量开启 Box：开启 1 个'])
|
||||
|
||||
def test_ctrl_right_click_opens_window_and_hooks(self):
|
||||
game=sys.modules['game'];inv=sys.modules['uiInventory'].InventoryWindow();gw=game.GameWindow()
|
||||
self.bag={50:(50100,1),51:(50100,1),52:(27001,3),90:(50100,1)}
|
||||
game.GameWindow.Open(gw);w=self.ns['g_window']
|
||||
inv.UseItemSlot(5);self.assertEqual(self.used,[5]);self.assertFalse(w.IsShow()) # no Ctrl: original use
|
||||
self.ctrl=True;inv.UseItemSlot(7);self.assertEqual(self.used,[5,7]) # Ctrl on a potion: original use
|
||||
inv.UseItemSlot(5);self.assertEqual(self.used,[5,7]);self.assertTrue(w.IsShow())
|
||||
self.assertEqual((w.cell,w.vnum),(50,50100));self.assertIn('3',w.owned.text);self.assertEqual(w.openButton.text,'开启 1 个')
|
||||
w.allButton.event();self.assertEqual(w.openButton.text,'开启 3 个')
|
||||
del self.bag[50];w.openButton.event();self.assertEqual(self.sent,['/mt_chest 1 open 51 2']) # chosen cell gone: next box, 2 left
|
||||
self.assertFalse(w.openButton.enabled)
|
||||
self.assertEqual(game.GameWindow.BINARY_ServerCommand_Run(gw,'MTCH1 got 27001 2'),1)
|
||||
self.bag={52:(27001,6)}
|
||||
self.assertEqual(game.GameWindow.BINARY_ServerCommand_Run(gw,'MTCH1 done 50100 2 2 done 200'),1)
|
||||
self.assertEqual(self.chat,['批量开启 Box：开启 2 个，金币 +200','获得：Potion ×2'])
|
||||
self.assertIn('2/2',w.status.text);self.assertEqual(w.openButton.text,'没有宝箱')
|
||||
self.assertEqual(game.GameWindow.BINARY_ServerCommand_Run(gw,'other'),7)
|
||||
self.bag={60:(50100,1)};self.time+=1;w.openButton.event();self.time+=3.1;w.OnUpdate()
|
||||
self.assertTrue(self.ns['g_opener'].unsupported);self.assertIn('单个开启',self.chat[-1])
|
||||
inv.UseItemSlot(15);self.assertEqual(self.used,[5,7,15]) # unsupported server: Ctrl falls back to normal use
|
||||
game.GameWindow.Close(gw);self.assertIsNone(self.ns['g_window'])
|
||||
|
||||
def test_server_constants_match(self):
|
||||
server=ROOT.parent/'metin2-server/src/server/game/src/port_chest.h'
|
||||
if not server.exists():self.skipTest('server checkout not installed')
|
||||
text=server.read_text(encoding='latin1')
|
||||
self.assertIn('kPortChestMax=200',text);self.assertEqual(self.ns['MAX'],200)
|
||||
self.assertIn('kPortChestGapMs=500',text);self.assertEqual(self.ns['SEND_GAP'],.5)
|
||||
self.assertTrue(set(re.findall(r'return "([a-z]+)";',text))<=set(self.ns['ERRORS']))
|
||||
self.assertTrue(set(re.findall(r'reason="([a-z]+)"',text))<=set(self.ns['REASONS']))
|
||||
|
||||
|
||||
if __name__=='__main__':unittest.main()
|
||||
Reference in New Issue
Block a user