From c5c7e388a06ff238736f082857af520841e4145a Mon Sep 17 00:00:00 2001 From: Tesutarin <105267106+Tesutarin@users.noreply.github.com> Date: Wed, 1 Jun 2022 21:14:44 +0800 Subject: [PATCH] WeatherCommand: Make it clear --- .../command/commands/WeatherCommand.java | 2 +- src/main/resources/languages/en-US.json | 6 +++--- src/main/resources/languages/pl-PL.json | 6 +++--- src/main/resources/languages/zh-CN.json | 18 +++++++++--------- src/main/resources/languages/zh-TW.json | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java b/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java index 18fef9293..78a284968 100644 --- a/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java @@ -11,7 +11,7 @@ import java.util.List; import static emu.grasscutter.utils.Language.translate; -@Command(label = "weather", usage = "weather ", aliases = {"w"}, permission = "player.weather", permissionTargeted = "player.weather.others", description = "commands.weather.description") +@Command(label = "weather", usage = "weather ", aliases = {"w"}, permission = "player.weather", permissionTargeted = "player.weather.others", description = "commands.weather.description") public final class WeatherCommand implements CommandHandler { @Override diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json index fec6b4d44..c747742bd 100644 --- a/src/main/resources/languages/en-US.json +++ b/src/main/resources/languages/en-US.json @@ -134,7 +134,7 @@ "description": "Deletes unequipped unlocked items, including yellow rarity ones from your inventory" }, "coop": { - "usage": "Usage: coop [host UID]", + "usage": "Usage: coop [host UID]", "success": "Summoned %s to %s's world.", "description": "Forces someone to join the world of others" }, @@ -362,8 +362,8 @@ "description": "Change the player's position" }, "weather": { - "usage": "Usage: weather ", - "success": "Changed weather to %s with climate %s.", + "usage": "Usage: weather \nWeather types: '0: None, 1: Sunny, 2: Cloudy, 3: Rain, 4: Thunderstorm, 5: Snow, 6: Mist'", + "success": "Changed climate type to %s with weather type %s.", "invalid_id": "Invalid ID.", "description": "Changes the weather" }, diff --git a/src/main/resources/languages/pl-PL.json b/src/main/resources/languages/pl-PL.json index f3853ab89..fbb077998 100644 --- a/src/main/resources/languages/pl-PL.json +++ b/src/main/resources/languages/pl-PL.json @@ -125,7 +125,7 @@ "everything": "Wyczyszczono wszystko dla %s." }, "coop": { - "usage": "Użycie: coop [host uid]", + "usage": "Użycie: coop [host uid]", "success": "Przyzwano %s do świata %s." }, "enter_dungeon": { @@ -290,8 +290,8 @@ "success": "Przeteleportowano %s do %s, %s, %s w scenie %s" }, "weather": { - "usage": "Użycie: weather ", - "success": "Zmieniono pogodę na %s z klimatem %s", + "usage": "Użycie: weather \nWeather types: '0: None, 1: Sunny, 2: Cloudy, 3: Rain, 4: Thunderstorm, 5: Snow, 6: Mist'", + "success": "Changed climate type to %s with weather type %s.", "invalid_id": "Błędne ID." }, "drop": { diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json index 40bdaa4cc..22023cdf7 100644 --- a/src/main/resources/languages/zh-CN.json +++ b/src/main/resources/languages/zh-CN.json @@ -88,11 +88,11 @@ "argument_error": "无效的参数。", "clear_target": "目标已清除。", "set_target": "随后的的命令都会以 @%s 为预设。", - "set_target_online": "@%s 在线。 某些命令可能需要离线目标。", - "set_target_offline": "@%s 离线。 某些命令可能需要在线目标。", + "set_target_online": "@%s 在线。某些命令可能需要离线目标。", + "set_target_offline": "@%s 离线。某些命令可能需要在线目标。", "need_target": "此命令需要一个目标 UID。添加 <@UID> 参数或使用 /target @UID 来指定默认目标。", - "need_target_online": "此命令需要在线目标 UID，但当前目标离线。 添加不同的 <@UID> 参数或使用 /target @UID 设置持久目标。", - "need_target_offline": "此命令需要离线目标 UID，但当前目标在线。 添加不同的 <@UID> 参数或使用 /target @UID 设置持久目标。" + "need_target_online": "此命令需要在线目标 UID，但当前目标离线。添加不同的 <@UID> 参数或使用 /target @UID 设置持久目标。", + "need_target_offline": "此命令需要离线目标 UID，但当前目标在线。添加不同的 <@UID> 参数或使用 /target @UID 设置持久目标。" }, "status": { "enabled": "已启用", @@ -134,7 +134,7 @@ "description": "从你的背包中删除所有未装备且已解锁的物品，包括稀有物品" }, "coop": { - "usage": "用法：coop <玩家ID> [目标玩家UID]", + "usage": "用法：coop [指定玩家UID]", "success": "已强制传送 %s 到 %s 的世界。", "description": "强制传送指定玩家到他人的世界" }, @@ -362,15 +362,15 @@ "description": "改变指定玩家的位置" }, "weather": { - "usage": "用法：weather <天气ID> <气候ID>", - "success": "已更改天气为 %s，气候为 %s。", - "invalid_id": "无效的天气ID。", + "usage": "用法：weather <气候类型(天气ID)> <天气类型(气候ID)>\n天气类型：'0: 无, 1: 晴天, 2: 多云, 3: 雨, 4: 雷雨, 5: 雪, 6: 雾'", + "success": "已更改气候类型为 %s，天气类型为 %s。", + "invalid_id": "无效的ID。", "description": "更改天气" }, "drop": { "command_usage": "用法：drop <物品ID|物品名称> [数量]", "success": "已丢下 %s 个 %s。", - "description": "在你的附近丢下物品" + "description": "在你附近丢下物品" }, "help": { "usage": "用法：", diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json index c8eeaffd2..25ff78c6d 100644 --- a/src/main/resources/languages/zh-TW.json +++ b/src/main/resources/languages/zh-TW.json @@ -134,7 +134,7 @@ "description": "從你的背包中刪除所有未裝備且未上鎖的物品，包括稀有物品。" }, "coop": { - "usage": "用法：coop [host uid]", + "usage": "用法：coop [host uid]", "success": "召喚了 %s 到 %s 的世界。", "description": "強制傳送指定用戶到他人的世界。" }, @@ -367,8 +367,8 @@ "description": "將玩家的位置傳送到你所指定的座標。" }, "weather": { - "usage": "用法：weather ", - "success": "已將當前天氣設定為 %s ，氣候則為 %s 。", + "usage": "用法：weather <氣候型別(天氣ID)> <天氣型別(氣候ID)>\n天氣型別：'0: 無, 1: 晴天, 2: 多雲, 3: 雨, 4: 雷雨, 5: 雪, 6: 霧'", + "success": "已將當前氣候型別設定為 %s，天氣型別為 %s。", "invalid_id": "無效的ID。", "description": "更改目前的天氣。" },