Merge branch 'master' of github.com:sealdice/sealdice-core into logex…

…port
MX-fox · Aug 13, 2024 · c031012 · c031012
2 parents ae6febd + b17e7ed
commit c031012
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/dice/config.go b/dice/config.go
@@ -1102,8 +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},
+			},
 			"记录_导出_成功": {
 				{`日志文件《{$t文件名字}》已上传至群文件，请自行到群文件查看。`, 1},
 			},
@@ -1829,6 +1834,12 @@ func setupBaseTextTemplate(d *Dice) {
 			},
 
 			// 1.5.0+
+			"名片_自动设置": {
+				SubType: ".sn",
+			},
+			"名片_取消设置": {
+				SubType: ".sn",
+			},
 			"记录_导出_成功": {
 				SubType: ".log export",
 			},

diff --git a/dice/ext_log.go b/dice/ext_log.go
@@ -615,8 +615,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}"
@@ -625,21 +627,25 @@ 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()
 				text, err := SetPlayerGroupCardByTemplate(ctx, "{$t玩家_RAW}")
 				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 {
@@ -661,7 +667,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:
@@ -681,7 +689,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
 				})