Merge remote-tracking branch 'origin/development' into development

src/main/resources/languages/zh-CN.json

@@ -70,6 +70,8 @@
       "command_exist_error": "未找到命令。",
       "no_usage_specified": "未指定用法",
       "no_description_specified": "未指定说明",
+      "set_to": "%s 已设为 %s。",
+      "set_for_to": "%s [来自 %s] 已设为 %s。",
       "invalid": {
         "amount": "无效的数量。",
         "artifactId": "无效的圣遗物ID。",
@@ -79,6 +81,8 @@
         "itemId": "无效的物品ID。",
         "itemLevel": "无效的物品等级。",
         "itemRefinement": "无效的物品精炼等级。",
+        "statValue": "无效的属性值。",
+        "value_between": "Invalid value: %s must be between %s and %s.",
         "playerId": "无效的玩家ID。",
         "uid": "无效的UID。",
         "id": "无效的ID。"
@@ -113,18 +117,6 @@
       "no_account": "账号不存在。",
       "description": "创建或删除账号"
     },
-    "broadcast": {
-      "command_usage": "用法：broadcast <消息>",
-      "message_sent": "公告已发送。",
-      "description": "向所有玩家发送公告"
-    },
-    "changescene": {
-      "usage": "用法：changescene <场景ID>",
-      "already_in_scene": "你已经在这个场景中了。",
-      "success": "已切换至场景 %s。",
-      "exists_error": "场景不存在。",
-      "description": "切换指定场景"
-    },
     "clear": {
       "command_usage": "用法：clear <all|wp|art|mat>\nall: 所有, wp: 武器, art: 圣遗物, mat: 材料",
       "weapons": "已清除 %s 的武器。",
@@ -141,11 +133,6 @@
       "success": "已强制传送 %s 到 %s 的世界。",
       "description": "强制传送指定玩家到他人的世界。如果没有指定玩家，则会使你进入多人游戏状态"
     },
-    "drop": {
-      "command_usage": "用法：drop <物品ID|物品名称> [数量]",
-      "success": "已丢下 %s 个 %s。",
-      "description": "在你附近丢下物品"
-    },
     "enter_dungeon": {
       "usage": "用法：enterdungeon <秘境ID>",
       "changed": "已进入秘境 %s。",
@@ -166,21 +153,14 @@
       "success": "已将 %s 给予 %s。",
       "description": "给予指定圣遗物"
     },
-    "giveChar": {
-      "usage": "用法：givechar <玩家> <角色ID> [等级]",
-      "given": "已将角色 %s [等级 %s] 给与 %s。",
-      "invalid_avatar_id": "无效的角色ID。",
-      "invalid_avatar_level": "无效的角色等级。",
-      "invalid_avatar_or_player_id": "无效的角色ID/玩家ID。",
-      "description": "给予指定角色"
-    },
     "give": {
-      "usage": "用法：give <玩家> <物品ID|物品名> [数量] [等级] [精炼等级]",
+          "usage": "用法：give <玩家> <物品ID|角色ID> [数量] [等级] [精炼等级]",
       "refinement_only_applicable_weapons": "只有武器可以设置精炼等级。",
       "refinement_must_between_1_and_5": "精炼等级必须在 1-5 之间。",
       "given": "已将 %s 个 %s 给予 %s。",
       "given_with_level_and_refinement": "已将 %s [等级 %s, 精炼 %s] %s 个给予 %s。",
       "given_level": "已将 %s [等级 %s] %s 个给予 %s。",
+          "given_avatar": "已将角色 %s [等级 %s] 给与 %s。",
       "description": "给予指定物品"
     },
     "godmode": {
@@ -263,9 +243,6 @@
       "success": "重置完成。",
       "description": "重置指定玩家的商店刷新时间"
     },
-    "restart": {
-      "description": "重新启动服务器"
-    },
     "sendMail": {
       "usage": "用法：sendmail <用户ID|all|help> [模板ID]",
       "user_not_exist": "用户 '%s' 不存在。",
@@ -301,24 +278,13 @@
       "level_error": "无效的好感度等级。",
       "description": "设置当前角色的好感度等级"
     },
-    "setStats": {
-      "usage_console": "用法：setstats|stats @<UID> <属性> <数值>",
-      "usage_ingame": "用法：setstats|stats [@UID] <属性> <数值>",
-      "help_message": "\n可更改的属性列表：hp(生命值)|maxhp(最大生命值)|def(防御力)|atk(攻击力)|em(元素精通)|er(元素充能效率)|crate(暴击率)|cdmg(暴击伤害)|cdr(冷却缩减)|heal(治疗加成)|heali(受治疗加成)|shield(护盾强效)|defi(无视防御)\n元素增伤：epyro(火)|ecryo(冰)|ehydro(水)|egeo(岩)|edendro(草)|eelectro(雷)|ephys(物理)\n元素抗性：respyro(火)|rescryo(冰)|reshydro(水)|resgeo(岩)|resdendro(草)|reselectro(雷)|resphys(物理)\n",
-      "value_error": "无效的属性值。",
-      "uid_error": "无效的UID。",
-      "player_error": "玩家不存在或已离线。",
-      "set_self": "%s 已设为 %s。",
-      "set_for_uid": "%s [来自 %s] 已设为 %s。",
-      "set_max_hp": "最大生命值已设为 %s。",
-      "description": "设置当前角色的属性"
+    "setProp": {
+      "usage": "Usage: setprop|prop <prop> <value>\n\tValues for <prop>: godmode | nostamina | unlimitedenergy | abyssfloor | worldlevel | bplevel\n\t(cont.) see PlayerProperty enum for other possible values, of form PROP_MAX_SPRING_VOLUME -> max_spring_volume",
+      "description": "Sets accountwide properties. Things like godmode can be enabled this way, as well as changing things like unlocked abyss floor and battle pass progress."
     },
-    "setWorldLevel": {
-      "usage": "用法：setworldlevel <等级>",
-      "value_error": "世界等级必须在 0-8 之间。",
-      "success": "世界等级已设为 %s。",
-      "invalid_world_level": "无效的世界等级。",
-      "description": "设置世界等级，执行命令后需重新登录以生效"
+    "setStats": {
+      "usage": "用法：setstats|stats <属性> <数值>\n可更改的属性列表：hp(生命值)|maxhp(最大生命值)|def(防御力)|atk(攻击力)|em(元素精通)|er(元素充能效率)|crate(暴击率)|cdmg(暴击伤害)|cdr(冷却缩减)|heal(治疗加成)|heali(受治疗加成)|shield(护盾强效)|defi(无视防御)\n元素增伤：epyro(火)|ecryo(冰)|ehydro(水)|egeo(岩)|edendro(草)|eelectro(雷)|ephys(物理)\n元素抗性：respyro(火)|rescryo(冰)|reshydro(水)|resgeo(岩)|resdendro(草)|reselectro(雷)|resphys(物理)\n",
+      "description": "设置当前角色的属性"
     },
     "spawn": {
       "usage": "用法：spawn <实体ID> [数量] [等级(仅怪物)] [<x> <y> <z>(仅怪物, 可选)]",
@@ -375,18 +341,10 @@
       "usage": "用法：tp [@<玩家ID>] <x> <y> <z> [场景ID]",
       "specify_player_id": "你必须指定一个玩家ID。",
       "invalid_position": "无效的位置。",
+            "exists_error": "此场景不存在。",
       "success": "传送 %s 到坐标 %s, %s, %s，场景为 %s。",
       "description": "改变指定玩家的位置"
     },
-    "unlimitenergy": {
-      "success": "UnlimitEnergy 已设为 %s。[用户：%s]",
-      "config_error": "命令不可用。因为 config.json 中 energyUsage 为 false。",
-      "description": "使用元素爆发而不消耗能量"
-    },
-    "unlocktower": {
-      "success": "现已解锁深境回廊(1-8层)。",
-      "description": "解锁深境螺旋"
-    },
     "weather": {
       "usage": "用法：weather [天气ID] [气候类型]\n天气ID可以在 WeatherExcelConfigData.json 中找到。\n气候类型：sunny(晴天), cloudy(多云), rain(雨), thunderstorm(雷雨), snow(雪), mist(雾)",
       "success": "已设置天气ID 为 %s，气候类型为 %s。",
@@ -394,18 +352,16 @@
       "description": "更改天气ID和气候类型。天气ID可以在 WeatherExcelConfigData.json 中找到。\n气候类型：sunny(晴天), cloudy(多云), rain(雨), thunderstorm(雷雨), snow(雪), mist(雾)"
     },
     "ban": {
-      "command_usage": "用法：ban <玩家ID> [时间] [原因]",
+      "command_usage": "用法：ban <@玩家ID> [时间] [原因]",
       "success": "成功封禁玩家。",
       "failure": "封禁玩家失败，因为玩家不存在。",
       "invalid_time": "无法解析时间戳。",
-      "invalid_player_id": "无法解析玩家ID。",
       "description": "封禁玩家"
     },
     "unban": {
-      "command_usage": "用法：unban <玩家ID>",
+      "command_usage": "用法：unban <@玩家ID>",
       "success": "成功取消玩家的封禁。",
       "failure": "取消玩家的封禁失败，因为玩家不存在。",
-      "invalid_player_id": "无法解析玩家ID。",
       "description": "取消玩家的封禁"
     }
   },