Unverified Commit 95327248 authored by natsu's avatar natsu Committed by GitHub
Browse files

Extend talent command "all" (#1850)



* Extend talent command "all":
Added talent option to set all talents (n, e, q) at once
Modified error message to cover edge cases when player entered talent level lower than 1

* Update src/main/java/emu/grasscutter/command/commands/TalentCommand.java

some suggested changes
Co-authored-by: default avatarLuke H-W <Birdulon@users.noreply.github.com>
parent ec3cdc04
...@@ -12,7 +12,7 @@ import java.util.List; ...@@ -12,7 +12,7 @@ import java.util.List;
@Command( @Command(
label = "talent", label = "talent",
usage = {"set <talentId> <level>", "(n|e|q) <level>", "getid"}, usage = {"set <talentId> <level>", "(n|e|q|all) <level>", "getid"},
permission = "player.settalent", permission = "player.settalent",
permissionTargeted = "player.settalent.others") permissionTargeted = "player.settalent.others")
public final class TalentCommand implements CommandHandler { public final class TalentCommand implements CommandHandler {
...@@ -22,7 +22,7 @@ public final class TalentCommand implements CommandHandler { ...@@ -22,7 +22,7 @@ public final class TalentCommand implements CommandHandler {
var name = Language.getTextMapKey(nameHash); var name = Language.getTextMapKey(nameHash);
CommandHandler.sendTranslatedMessage(sender, "commands.talent.set_id", skillId, name, newLevel); CommandHandler.sendTranslatedMessage(sender, "commands.talent.set_id", skillId, name, newLevel);
} else { } else {
CommandHandler.sendTranslatedMessage(sender, "commands.talent.lower_16"); CommandHandler.sendTranslatedMessage(sender, "commands.talent.out_of_range");
} }
} }
...@@ -87,6 +87,27 @@ public final class TalentCommand implements CommandHandler { ...@@ -87,6 +87,27 @@ public final class TalentCommand implements CommandHandler {
}; };
setTalentLevel(sender, avatar, skillId, newLevel); setTalentLevel(sender, avatar, skillId, newLevel);
} }
case "all" -> {
if (args.size() < 2) {
sendUsageMessage(sender);
return;
}
try {
newLevel = Integer.parseInt(args.get(1));
} catch (NumberFormatException ignored) {
CommandHandler.sendTranslatedMessage(sender, "commands.talent.invalid_level");
return;
}
// This stops setTalentLevel from outputting 3 "levels out of range" messages
if (newLevel < 1 || newLevel > 15) {
CommandHandler.sendTranslatedMessage(sender, "commands.talent.out_of_range");
return;
}
// This is small so array is not needed imo
setTalentLevel(sender, avatar, skillDepot.getSkills().get(0), newLevel);
setTalentLevel(sender, avatar, skillDepot.getSkills().get(1), newLevel);
setTalentLevel(sender, avatar, skillDepot.getEnergySkill(), newLevel);
}
case "getid" -> { case "getid" -> {
var map = GameData.getAvatarSkillDataMap(); var map = GameData.getAvatarSkillDataMap();
skillDepot.getSkillsAndEnergySkill().forEach(id -> { skillDepot.getSkillsAndEnergySkill().forEach(id -> {
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
"description": "Stops the server" "description": "Stops the server"
}, },
"talent": { "talent": {
"lower_16": "Invalid talent level. Level should be lower than 16.", "out_of_range": "Invalid talent level. Level should be in range of 1-15.",
"set_id": "Set talent %s - \"%s\" to %s.", "set_id": "Set talent %s - \"%s\" to %s.",
"id_desc": "Talent %s - \"%s\" - \"%s\"", "id_desc": "Talent %s - \"%s\" - \"%s\"",
"invalid_skill_id": "Invalid skill ID.", "invalid_skill_id": "Invalid skill ID.",
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
"description": "Detiene el servidor" "description": "Detiene el servidor"
}, },
"talent": { "talent": {
"lower_16": "Nivel de talento inválido. El nivel debe ser menor que 16.", "out_of_range": "🇺🇸Invalid talent level. Level should be in range of 1-15.",
"set_id": "🇺🇸Set talent %s - \"%s\" to %s.", "set_id": "🇺🇸Set talent %s - \"%s\" to %s.",
"id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"", "id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"",
"invalid_skill_id": "ID de habilidad inválido.", "invalid_skill_id": "ID de habilidad inválido.",
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
"description": "Arrête le serveur" "description": "Arrête le serveur"
}, },
"talent": { "talent": {
"lower_16": "Niveau de talent invalide. Le niveau doit être inférieur a 16.", "out_of_range": "🇺🇸Invalid talent level. Level should be in range of 1-15.",
"set_id": "🇺🇸Set talent %s - \"%s\" to %s.", "set_id": "🇺🇸Set talent %s - \"%s\" to %s.",
"id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"", "id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"",
"invalid_skill_id": "ID de talent invalide.", "invalid_skill_id": "ID de talent invalide.",
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
"description": "サーバーを停止中" "description": "サーバーを停止中"
}, },
"talent": { "talent": {
"lower_16": "天賦レベルが無効です。 レベルは16未満である必要があります。", "out_of_range": "🇺🇸Invalid talent level. Level should be in range of 1-15.",
"set_id": "%s - の天賦\"%s\" を %s に設定しました", "set_id": "%s - の天賦\"%s\" を %s に設定しました",
"id_desc": "天賦 %s - \"%s\" - \"%s\"", "id_desc": "天賦 %s - \"%s\" - \"%s\"",
"invalid_skill_id": "スキル ID が無効です。", "invalid_skill_id": "スキル ID が無効です。",
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
"description": "서버를 중지합니다" "description": "서버를 중지합니다"
}, },
"talent": { "talent": {
"lower_16": "불분명한 특성 레벨. 특성의 레벨은 16 미만이여야합니다.", "out_of_range": "🇺🇸Invalid talent level. Level should be in range of 1-15.",
"set_id": "🇺🇸Set talent %s - \"%s\" to %s.", "set_id": "🇺🇸Set talent %s - \"%s\" to %s.",
"id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"", "id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"",
"invalid_skill_id": "잘못된 스킬ID.", "invalid_skill_id": "잘못된 스킬ID.",
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
"description": "Zatrzymaj serwer." "description": "Zatrzymaj serwer."
}, },
"talent": { "talent": {
"lower_16": "Błędny poziom talentu. Poziom ten powinien być mniejszy niż 16.", "out_of_range": "🇺🇸Invalid talent level. Level should be in range of 1-15.",
"set_id": "🇺🇸Set talent %s - \"%s\" to %s.", "set_id": "🇺🇸Set talent %s - \"%s\" to %s.",
"id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"", "id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"",
"invalid_skill_id": "Błędne ID umiejętności.", "invalid_skill_id": "Błędne ID umiejętności.",
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
"description": "Oprește serverul" "description": "Oprește serverul"
}, },
"talent": { "talent": {
"lower_16": "Nivel de talent nevalabil. Nivelul trebuie să fie mai mic ca 16.", "out_of_range": "🇺🇸Invalid talent level. Level should be in range of 1-15.",
"set_id": "🇺🇸Set talent %s - \"%s\" to %s.", "set_id": "🇺🇸Set talent %s - \"%s\" to %s.",
"id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"", "id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"",
"invalid_skill_id": "Skill ID nevalabil.", "invalid_skill_id": "Skill ID nevalabil.",
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
"description": "Останавливает работу сервера" "description": "Останавливает работу сервера"
}, },
"talent": { "talent": {
"lower_16": "Некорректный уровень таланта. Уровень должен быть ниже 16.", "out_of_range": "🇺🇸Invalid talent level. Level should be in range of 1-15.",
"set_id": "Уровень таланта %s - \"%s\" установлен на %s.", "set_id": "Уровень таланта %s - \"%s\" установлен на %s.",
"id_desc": "Талант %s - \"%s\" - \"%s\"", "id_desc": "Талант %s - \"%s\" - \"%s\"",
"invalid_skill_id": "Некорректный ID способности.", "invalid_skill_id": "Некорректный ID способности.",
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
"description": "停止服务器" "description": "停止服务器"
}, },
"talent": { "talent": {
"lower_16": "无效的天赋等级,天赋等级应在 1-15 之间。", "out_of_range": "🇺🇸Invalid talent level. Level should be in range of 1-15.",
"set_id": "修改技能 %s - \"%s\" 至 %s。", "set_id": "修改技能 %s - \"%s\" 至 %s。",
"id_desc": "技能 %s - \"%s\" - \"%s\"", "id_desc": "技能 %s - \"%s\" - \"%s\"",
"invalid_skill_id": "无效的技能ID。", "invalid_skill_id": "无效的技能ID。",
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
"description": "以正常的方式關閉伺服器。" "description": "以正常的方式關閉伺服器。"
}, },
"talent": { "talent": {
"lower_16": "無效的天賦等級,技能等級應低於 16。", "out_of_range": "🇺🇸Invalid talent level. Level should be in range of 1-15.",
"set_id": "🇺🇸Set talent %s - \"%s\" to %s.", "set_id": "🇺🇸Set talent %s - \"%s\" to %s.",
"id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"", "id_desc": "🇺🇸Talent %s - \"%s\" - \"%s\"",
"invalid_skill_id": "無效的技能ID。", "invalid_skill_id": "無效的技能ID。",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment