From b17e7ed2c841a1073d2aa93fffa83f91acb485b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E6=98=9F?= <106176511+MX-fox@users.noreply.github.com> Date: Tue, 13 Aug 2024 13:43:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(log):=20sn=E5=9B=9E=E5=A4=8D=E8=AF=AD?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=20(#998)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dice/config.go | 15 +++++++++++++++ dice/ext_log.go | 22 ++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dice/config.go b/dice/config.go index 6d27a702..7136ae94 100644 --- a/dice/config.go +++ b/dice/config.go @@ -1102,6 +1102,13 @@ func setupBaseTextTemplate(d *Dice) { "记录_上传_失败": { {`跑团日志上传失败：{$t错误原因}\n若未出现线上日志地址，可换时间重试，或联系骰主在data/default/log-exports路径下取出日志\n文件名: 群号_日志名_随机数.zip\n注意此文件log end/get后才会生成`, 1}, }, + // 1.5.0+ + "名片_自动设置": { + {`已自动设置名片格式为{$t名片格式}：{$t名片预览}\n如有权限会在属性更新时自动更新名片。使用.sn off可关闭。`, 1}, + }, + "名片_取消设置": { + {`已关闭对{$t玩家}的名片自动修改。`, 1}, + }, }, } @@ -1822,6 +1829,14 @@ func setupBaseTextTemplate(d *Dice) { SubType: ".log end", Vars: []string{"$t错误原因"}, }, + + // 1.5.0+ + "名片_自动设置": { + SubType: ".sn", + }, + "名片_取消设置": { + SubType: ".sn", + }, }, } d.TextMapRaw = texts diff --git a/dice/ext_log.go b/dice/ext_log.go index 1905ea82..13e651ca 100644 --- a/dice/ext_log.go +++ b/dice/ext_log.go @@ -613,8 +613,10 @@ func RegisterBuiltinExtLog(self *Dice) { if errors.Is(err, ErrGroupCardOverlong) { return handleOverlong(ctx, msg, text) } + VarSetValueStr(ctx, "$t名片格式", val) + VarSetValueStr(ctx, "$t名片预览", text) // 玩家 SAN60 HP10/10 DEX65 - ReplyToSender(ctx, msg, "已自动设置名片为COC7格式: "+text+"\n如有权限会持续自动改名片。使用.sn off可关闭") + ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_自动设置")) case "dnd", "dnd5e": // PW{pw} ctx.Player.AutoSetNameTemplate = "{$t玩家_RAW} HP{hp}/{hpmax} AC{ac} DC{dc} PP{pp}" @@ -623,8 +625,10 @@ func RegisterBuiltinExtLog(self *Dice) { if errors.Is(err, ErrGroupCardOverlong) { return handleOverlong(ctx, msg, text) } + VarSetValueStr(ctx, "$t名片格式", val) + VarSetValueStr(ctx, "$t名片预览", text) // 玩家 HP10/10 AC15 DC15 PW10 - ReplyToSender(ctx, msg, "已自动设置名片为DND5E格式: "+text+"\n如有权限会持续自动改名片。使用.sn off可关闭") + ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_自动设置")) case "none": ctx.Player.AutoSetNameTemplate = "{$t玩家_RAW}" ctx.Player.UpdatedAtTime = time.Now().Unix() @@ -632,12 +636,14 @@ func RegisterBuiltinExtLog(self *Dice) { if errors.Is(err, ErrGroupCardOverlong) { // 大约不至于会走到这里，但是为了统一也这样写了 return handleOverlong(ctx, msg, text) } - ReplyToSender(ctx, msg, "已自动设置名片为空白格式: "+text+"\n如有权限会持续自动改名片。使用.sn off可关闭") + VarSetValueStr(ctx, "$t名片格式", "空白") + VarSetValueStr(ctx, "$t名片预览", text) + ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_自动设置")) case "off", "cancel": _, _ = SetPlayerGroupCardByTemplate(ctx, "{$t玩家_RAW}") ctx.Player.AutoSetNameTemplate = "" ctx.Player.UpdatedAtTime = time.Now().Unix() - ReplyToSender(ctx, msg, fmt.Sprintf("已关闭对%s的名片自动修改", getPlayerNameTempFunc(ctx))) + ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_取消设置")) case "expr": t := cmdArgs.GetRestArgsFrom(2) if len(t) > 80 { @@ -659,7 +665,9 @@ func RegisterBuiltinExtLog(self *Dice) { return handleOverlong(ctx, msg, text) } else { ctx.Player.UpdatedAtTime = time.Now().Unix() - ReplyToSender(ctx, msg, "应用玩家自设，预览文本: "+text) + VarSetValueStr(ctx, "$t名片格式", "玩家自设") + VarSetValueStr(ctx, "$t名片预览", text) + ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_自动设置")) } } default: @@ -679,7 +687,9 @@ func RegisterBuiltinExtLog(self *Dice) { text, _ := SetPlayerGroupCardByTemplate(ctx, t.Template) ctx.Player.AutoSetNameTemplate = t.Template - ReplyToSender(ctx, msg, "已自动设置名片为"+val+"格式: "+text+"\n如有权限会持续自动改名片。使用.sn off可关闭") + VarSetValueStr(ctx, "$t名片格式", val) + VarSetValueStr(ctx, "$t名片预览", text) + ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_自动设置")) ok = true return false })