sn off支持自定义

MX-fox · Aug 13, 2024 · 2b2e231 · 2b2e231
1 parent d5189ea
commit 2b2e231
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/dice/config.go b/dice/config.go
@@ -1103,11 +1103,11 @@ 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},
+			"名片_取消设置": {
+				{`已关闭对{$t玩家}的名片自动修改。`, 1},
 			},
 		},
 	}
@@ -1831,10 +1831,10 @@ func setupBaseTextTemplate(d *Dice) {
 			},
 
 			// 1.5.0+
-			"名片_规则模板": {
+			"名片_自动设置": {
 				SubType: ".sn",
 			},
-			"名片_玩家自设": {
+			"名片_取消设置": {
 				SubType: ".sn",
 			},
 		},

diff --git a/dice/ext_log.go b/dice/ext_log.go
@@ -616,7 +616,7 @@ func RegisterBuiltinExtLog(self *Dice) {
 				VarSetValueStr(ctx, "$t名片格式", val)
 				VarSetValueStr(ctx, "$t名片预览", text)
 				// 玩家 SAN60 HP10/10 DEX65
-				ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_规则模板"))
+				ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_自动设置"))
 			case "dnd", "dnd5e":
 				// PW{pw}
 				ctx.Player.AutoSetNameTemplate = "{$t玩家_RAW} HP{hp}/{hpmax} AC{ac} DC{dc} PP{pp}"
@@ -628,22 +628,22 @@ func RegisterBuiltinExtLog(self *Dice) {
 				VarSetValueStr(ctx, "$t名片格式", val)
 				VarSetValueStr(ctx, "$t名片预览", text)
 				// 玩家 HP10/10 AC15 DC15 PW10
-				ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_规则模板"))
+				ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_自动设置"))
 			case "none":
 				ctx.Player.AutoSetNameTemplate = "{$t玩家_RAW}"
 				ctx.Player.UpdatedAtTime = time.Now().Unix()
 				text, err := SetPlayerGroupCardByTemplate(ctx, "{$t玩家_RAW}")
 				if errors.Is(err, ErrGroupCardOverlong) { // 大约不至于会走到这里，但是为了统一也这样写了
 					return handleOverlong(ctx, msg, text)
 				}
-				VarSetValueStr(ctx, "$t名片格式", val)
+				VarSetValueStr(ctx, "$t名片格式", "空白")
 				VarSetValueStr(ctx, "$t名片预览", text)
-				ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_规则模板"))
+				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 {
@@ -665,8 +665,9 @@ func RegisterBuiltinExtLog(self *Dice) {
 						return handleOverlong(ctx, msg, text)
 					} else {
 						ctx.Player.UpdatedAtTime = time.Now().Unix()
+						VarSetValueStr(ctx, "$t名片格式", "玩家自设")
 						VarSetValueStr(ctx, "$t名片预览", text)
-						ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_玩家自设"))
+						ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:名片_自动设置"))
 					}
 				}
 			default: