diff --git a/README.md b/README.md
index 185d093b0..0b24e8523 100644
--- a/README.md
+++ b/README.md
@@ -1,160 +1,162 @@
-![Grasscutter](https://socialify.git.ci/Grasscutters/Grasscutter/image?description=1&forks=1&issues=1&language=1&logo=https%3A%2F%2Fs2.loli.net%2F2022%2F04%2F25%2FxOiJn7lCdcT5Mw1.png&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
-
-
-
-
-EN | [中文](README_zh-CN.md)
-
-**Attention:** We always welcome contributors to the project. Before adding your contribution, please carefully read our [Code of Conduct](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
-
-## Current features
-
-* Logging in
-* Combat
-* Friends list
-* Teleportation
-* Gacha system
-* Co-op *partially* works
-* Spawning monsters via console
-* Inventory features (recieving items/characters, upgrading items/characters, etc)
-
-## Quick setup guide
-
-**Note:** For support please join our [Discord](https://discord.gg/T5vZU6UyeG).
-
-### Requirements
-
-* Java SE - 17 ([link](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html))
-
- **Note:** If you just want to **run it**, then **jre** only is fine.
-
-* MongoDB (recommended 4.0+)
-
-* Proxy daemon: mitmproxy (mitmdump, recommended), Fiddler Classic, etc.
-
-### Running
-
-**Note:** If you updated from an older version, delete `config.json` to regenerate it.
-
-1. Get `grasscutter.jar`
- - Download from [actions](https://nightly.link/Grasscutters/Grasscutter/workflows/build/stable/Grasscutter.zip)
- - [Build by yourself](#Building)
-2. Create a `resources` folder in the directory where grasscutter.jar is located and move your `BinOutput` and `ExcelBinOutput` folders there *(Check the [wiki](https://github.com/Grasscutters/Grasscutter/wiki) for more details how to get those.)*
-3. Run Grasscutter with `java -jar grasscutter.jar`. **Make sure mongodb service is running as well.**
-
-### Connecting with the client
-
-½. Create an account using [server console command](#Commands).
-
-1. Redirect traffic: (choose one)
- - mitmdump: `mitmdump -s proxy.py -k`
-
- Trust CA certificate:
-
- **Note:**The CA certificate is usually stored in `% USERPROFILE%\ .mitmproxy`, or you can download it from `http://mitm.it`
-
- Double click for [install](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) or ...
-
- - Via command line
-
- ```shell
- certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
- ```
-
- - Fiddler Classic: Run Fiddler Classic, turn on `Decrypt https traffic` in setting and change the default port there (Tools -> Options -> Connections) to anything other than `8888`, and load [this script](https://github.lunatic.moe/fiddlerscript).
-
- - [Hosts file](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
-
-2. Set network proxy to `127.0.0.1:8080` or the proxy port you specified.
-
-**you can also use `start.cmd` to start servers and proxy daemons automatically**
-
-### Building
-
-Grasscutter uses Gradle to handle dependencies & building.
-
-**Requirements:**
-
-- Java SE Development Kits - 17
-- Git
-
-##### Windows
-
-```shell
-git clone https://github.com/Grasscutters/Grasscutter.git
-cd Grasscutter
-.\gradlew.bat # Setting up environments
-.\gradlew jar # Compile
-```
-
-##### Linux
-
-```bash
-git clone https://github.com/Grasscutters/Grasscutter.git
-cd Grasscutter
-chmod +x gradlew
-./gradlew jar # Compile
-```
-
-You can find the output jar in the root of the project folder.
-
-## Commands
-
-You might want to use this command (`java -jar grasscutter.jar -handbook`) in a cmd that is in the grasscutter folder. It will create a handbook file (GM Handbook.txt) where you can find the item IDs for stuff you want
-
-You may want to use this command (`java -jar grasscutter.jar -gachamap`) to generate a mapping file for the gacha record subsystem. The file will be generated to `GRASSCUTTER_RESOURCE/gcstatic` folder. Otherwise you may only see number IDs in the gacha record page.
-
-There is a dummy user named "Server" in every player's friends list that you can message to use commands. Commands also work in other chat rooms, such as private/team chats. to run commands ingame, you need to add prefix `/` or `!` such as `/pos`
-
-| Commands | Usage | Permission node | Availability | description | Alias |
-| -------------- | ------------------------------------------------- | ------------------------- |--------------| ------------------------------------------------------------ | ----------------------------------------------- |
-| account | account \ [UID] | | Server only | Creates an account with the specified username and the in-game UID for that account. The UID will be auto generated if not set. | |
-| broadcast | broadcast \ | server.broadcast | Both side | Sends a message to all the players. | b |
-| coop | coop \ \ | server.coop | Both side | Forces someone to join the world of others. | |
-| changescene | changescene \ | player.changescene | Client only | Switch scenes by scene ID. | scene |
-| clear | clear [UID] | player.clearinv | Client only | Deletes all unequipped and unlocked level 0 artifacts(art)/weapons(wp)/material(all) or all, including 5-star rarity ones from your inventory. | clear |
-| drop | drop [amount] | server.drop | Client only | Drops an item around you. | `d` `dropitem` |
-| enterdungeon | enterdungeon \ | player.enterdungeon | Client only | Enter a dungeon by dungeon ID | |
-| give | give [player] [amount] [level] [finement] | player.give | Both side | Gives item(s) to you or the specified player. (finement option only weapon.) | `g` `item` `giveitem` |
-| givechar | givechar \ \ | player.givechar | Both side | Gives the player a specified character. | givec |
-| giveart | giveart [player] \ \ [\[,\]]... [level] | player.giveart | Both side | Gives the player a specified artifact. | gart |
-| giveall | giveall [uid] [amount] | player.giveall | Both side | Gives all items. | givea |
-| godmode | godmode [uid] | player.godmode | Client only | Prevents you from taking damage. | |
-| heal | heal | player.heal | Client only | Heals all characters in your current team. | h |
-| help | help [command] | | Both side | Sends the help message or shows information about a specified command. | |
-| kick | kick \ | server.kick | Both side | Kicks the specified player from the server. (WIP) | k |
-| killall | killall [playerUid] [sceneId] | server.killall | Both side | Kills all entities in the current scene or specified scene of the corresponding player. | |
-| list | list | | Both side | Lists online players. | |
-| permission | permission \ \ | permission | Both side | Grants or removes a permission for a user. | |
-| position | position | | Client only | Sends your current coordinates. | pos |
-| reload | reload | server.reload | Both side | Reloads the server config | |
-| resetconst | resetconst [all] | player.resetconstellation | Client only | Resets the constellation level on your currently selected character, will need to relog after using the command to see any changes. | resetconstellation |
-| restart | | | Both side | Restarts the current session | |
-| say | say \ \ | server.sendmessage | Both side | Sends a message to a player as the server | `sendservmsg` `sendservermessage` `sendmessage` |
-| setfetterlevel | setfetterlevel \ | player.setfetterlevel | Client only | Sets the friendship level for your currently selected character | setfetterlvl |
-| setstats | setstats \ \ | player.setstats | Client only | Sets a stat for your currently selected character | stats |
-| setworldlevel | setworldlevel \ | player.setworldlevel | Client only | Sets your world level (Relog to see proper effects) | setworldlvl |
-| spawn | spawn \ [amount] [level(monster only)] | server.spawn | Client only | Spawns some entities around you | |
-| stop | stop | server.stop | Both side | Stops the server | |
-| talent | talent \ \ | player.settalent | Client only | Sets talent level for your currently selected character | |
-| teleport | teleport [@playerUid] \ \ \ [sceneId] | player.teleport | Both side | Change the player's position. | tp |
-| tpall | | player.tpall | Client only | Teleports all players in your world to your position | |
-| unlocktower | | player.tower | Client only | Unlock the all floors of abyss | ut |
-| weather | weather \ \ | player.weather | Client only | Changes the weather | w |
-
-### Bonus
-
-- Teleporting
- - When you want to teleport to somewhere, use the in-game marking function on Map.
- - Mark a point on the map using the fish hook marking (the last one.)
- - (Optional) rename the map marker to a number to override the default Y coordinate (height, default 300.)
- - Confirm and close the map.
- - You will see your character falling from a very high destination, exact location that you marked.
-
-# Quick Troubleshooting
-
-* If compiling wasn't successful, please check your JDK installation (JDK 17 and validated JDK's bin PATH variable)
-* My client doesn't connect, doesn't login, 4206, etc... - Mostly your proxy daemon setup is *the issue*, if using
- Fiddler make sure it running on another port except 8888
-
-* Startup sequence: Mongodb > Grasscutter > Proxy daemon (mitmdump, fiddler, etc.) > Game
+![Grasscutter](https://socialify.git.ci/Grasscutters/Grasscutter/image?description=1&forks=1&issues=1&language=1&logo=https%3A%2F%2Fs2.loli.net%2F2022%2F04%2F25%2FxOiJn7lCdcT5Mw1.png&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
+
+
+
+
+EN | [中文](README_zh-CN.md)
+
+**Attention:** We always welcome contributors to the project. Before adding your contribution, please carefully read our [Code of Conduct](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md).
+
+## Current features
+
+* Logging in
+* Combat
+* Friends list
+* Teleportation
+* Gacha system
+* Co-op *partially* works
+* Spawning monsters via console
+* Inventory features (recieving items/characters, upgrading items/characters, etc)
+
+## Quick setup guide
+
+**Note:** For support please join our [Discord](https://discord.gg/T5vZU6UyeG).
+
+### Requirements
+
+* Java SE - 17 ([link](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html))
+
+ **Note:** If you just want to **run it**, then **jre** only is fine.
+
+* MongoDB (recommended 4.0+)
+
+* Proxy daemon: mitmproxy (mitmdump, recommended), Fiddler Classic, etc.
+
+### Running
+
+**Note:** If you updated from an older version, delete `config.json` to regenerate it.
+
+1. Get `grasscutter.jar`
+ - Download from [actions](https://nightly.link/Grasscutters/Grasscutter/workflows/build/stable/Grasscutter.zip)
+ - [Build by yourself](#Building)
+2. Create a `resources` folder in the directory where grasscutter.jar is located and move your `BinOutput` and `ExcelBinOutput` folders there *(Check the [wiki](https://github.com/Grasscutters/Grasscutter/wiki) for more details how to get those.)*
+3. Run Grasscutter with `java -jar grasscutter.jar`. **Make sure mongodb service is running as well.**
+
+### Connecting with the client
+
+½. Create an account using [server console command](#Commands).
+
+1. Redirect traffic: (choose one)
+ - mitmdump: `mitmdump -s proxy.py -k`
+
+ Trust CA certificate:
+
+ **Note:**The CA certificate is usually stored in `% USERPROFILE%\ .mitmproxy`, or you can download it from `http://mitm.it`
+
+ Double click for [install](https://docs.microsoft.com/en-us/skype-sdk/sdn/articles/installing-the-trusted-root-certificate#installing-a-trusted-root-certificate) or ...
+
+ - Via command line
+
+ ```shell
+ certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer
+ ```
+
+ - Fiddler Classic: Run Fiddler Classic, turn on `Decrypt https traffic` in setting and change the default port there (Tools -> Options -> Connections) to anything other than `8888`, and load [this script](https://github.lunatic.moe/fiddlerscript).
+
+ - [Hosts file](https://github.com/Melledy/Grasscutter/wiki/Running#traffic-route-map)
+
+2. Set network proxy to `127.0.0.1:8080` or the proxy port you specified.
+
+**you can also use `start.cmd` to start servers and proxy daemons automatically**
+
+### Building
+
+Grasscutter uses Gradle to handle dependencies & building.
+
+**Requirements:**
+
+- Java SE Development Kits - 17
+- Git
+
+##### Windows
+
+```shell
+git clone https://github.com/Grasscutters/Grasscutter.git
+cd Grasscutter
+.\gradlew.bat # Setting up environments
+.\gradlew jar # Compile
+```
+
+##### Linux
+
+```bash
+git clone https://github.com/Grasscutters/Grasscutter.git
+cd Grasscutter
+chmod +x gradlew
+./gradlew jar # Compile
+```
+
+You can find the output jar in the root of the project folder.
+
+## Commands
+
+You might want to use this command (`java -jar grasscutter.jar -handbook`) in a cmd that is in the grasscutter folder. It will create a handbook file (GM Handbook.txt) where you can find the item IDs for stuff you want
+
+You may want to use this command (`java -jar grasscutter.jar -gachamap`) to generate a mapping file for the gacha record subsystem. The file will be generated to `GRASSCUTTER_RESOURCE/gcstatic` folder. Otherwise you may only see number IDs in the gacha record page.
+
+There is a dummy user named "Server" in every player's friends list that you can message to use commands. Commands also work in other chat rooms, such as private/team chats. to run commands ingame, you need to add prefix `/` or `!` such as `/pos`
+
+| Commands | Usage | Permission node | Availability | description | Alias |
+| -------------- | ------------------------------------------------- | ------------------------- |--------------| ------------------------------------------------------------ | ----------------------------------------------- |
+| account | account \ [UID] | | Server only | Creates an account with the specified username and the in-game UID for that account. The UID will be auto generated if not set. | |
+| broadcast | broadcast \ | server.broadcast | Both side | Sends a message to all the players. | b |
+| coop | coop \ \ | server.coop | Both side | Forces someone to join the world of others. | |
+| changescene | changescene \ | player.changescene | Client only | Switch scenes by scene ID. | scene |
+| clear | clear [UID] | player.clearinv | Client only | Deletes all unequipped and unlocked level 0 artifacts(art)/weapons(wp)/material(all) or all, including 5-star rarity ones from your inventory. | clear |
+| drop | drop [amount] | server.drop | Client only | Drops an item around you. | `d` `dropitem` |
+| enterdungeon | enterdungeon \ | player.enterdungeon | Client only | Enter a dungeon by dungeon ID | |
+| give | give [player] [amount] [level] [finement] | player.give | Both side | Gives item(s) to you or the specified player. (finement option only weapon.) | `g` `item` `giveitem` |
+| givechar | givechar \ \ | player.givechar | Both side | Gives the player a specified character. | givec |
+| giveart | giveart [player] \ \ [\[,\]]... [level] | player.giveart | Both side | Gives the player a specified artifact. | gart |
+| giveall | giveall [uid] [amount] | player.giveall | Both side | Gives all items. | givea |
+| godmode | godmode [uid] | player.godmode | Client only | Prevents you from taking damage. | |
+| heal | heal | player.heal | Client only | Heals all characters in your current team. | h |
+| help | help [command] | | Both side | Sends the help message or shows information about a specified command. | |
+| join | join [avatarIds] | player.join | Client only | Force let avatars to join into your current team. Such as `join 10000020 10000021`. | |
+| kick | kick \ | server.kick | Both side | Kicks the specified player from the server. (WIP) | k |
+| killall | killall [playerUid] [sceneId] | server.killall | Both side | Kills all entities in the current scene or specified scene of the corresponding player. | |
+| list | list | | Both side | Lists online players. | |
+| permission | permission \ \ | permission | Both side | Grants or removes a permission for a user. | |
+| position | position | | Client only | Sends your current coordinates. | pos |
+| reload | reload | server.reload | Both side | Reloads the server config | |
+| remove | remove [avatarIndexInYourTeams] | player.remove | Client only | Force remove avatar in your current team. Index start from 1.Such as `remove 1 2`. | |
+| resetconst | resetconst [all] | player.resetconstellation | Client only | Resets the constellation level on your currently selected character, will need to relog after using the command to see any changes. | resetconstellation |
+| restart | | | Both side | Restarts the current session | |
+| say | say \ \ | server.sendmessage | Both side | Sends a message to a player as the server | `sendservmsg` `sendservermessage` `sendmessage` |
+| setfetterlevel | setfetterlevel \ | player.setfetterlevel | Client only | Sets the friendship level for your currently selected character | setfetterlvl |
+| setstats | setstats \ \ | player.setstats | Client only | Sets a stat for your currently selected character | stats |
+| setworldlevel | setworldlevel \ | player.setworldlevel | Client only | Sets your world level (Relog to see proper effects) | setworldlvl |
+| spawn | spawn \ [amount] [level(monster only)] | server.spawn | Client only | Spawns some entities around you | |
+| stop | stop | server.stop | Both side | Stops the server | |
+| talent | talent \ \ | player.settalent | Client only | Sets talent level for your currently selected character | |
+| teleport | teleport [@playerUid] \ \ \ [sceneId] | player.teleport | Both side | Change the player's position. | tp |
+| tpall | | player.tpall | Client only | Teleports all players in your world to your position | |
+| unlocktower | | player.tower | Client only | Unlock the all floors of abyss | ut |
+| weather | weather \ \ | player.weather | Client only | Changes the weather | w |
+
+### Bonus
+
+- Teleporting
+ - When you want to teleport to somewhere, use the in-game marking function on Map.
+ - Mark a point on the map using the fish hook marking (the last one.)
+ - (Optional) rename the map marker to a number to override the default Y coordinate (height, default 300.)
+ - Confirm and close the map.
+ - You will see your character falling from a very high destination, exact location that you marked.
+
+# Quick Troubleshooting
+
+* If compiling wasn't successful, please check your JDK installation (JDK 17 and validated JDK's bin PATH variable)
+* My client doesn't connect, doesn't login, 4206, etc... - Mostly your proxy daemon setup is *the issue*, if using
+ Fiddler make sure it running on another port except 8888
+
+* Startup sequence: Mongodb > Grasscutter > Proxy daemon (mitmdump, fiddler, etc.) > Game
diff --git a/README_zh-CN.md b/README_zh-CN.md
index 372377e4c..4c1705e93 100644
--- a/README_zh-CN.md
+++ b/README_zh-CN.md
@@ -123,11 +123,13 @@ chmod +x gradlew
| godmode | godmode [uid] | player.godmode | 仅客户端 | 保护你不受到任何伤害(依然会被击退) | |
| heal | heal | player.heal | 仅客户端 | 治疗队伍中所有角色 | h |
| help | help [命令] | | 均可使用 | 显示帮助或展示指定命令的帮助 | |
+| join | join [多个角色id] | player.join | 仅客户端 | 强制入队角色,跟config.json中的avatarLimits有关(跟队内角色数量上限有关)。用法:`join 10000021 10000022` | |
| kick | kick \ | server.kick | 均可使用 | 从服务器中踢出指定玩家 (WIP) | k |
| killall | killall [uid] [场景ID] | server.killall | 均可使用 | 杀死指定玩家世界中所在或指定场景的全部生物 | |
| list | list | | 均可使用 | 列出在线玩家 | |
| permission | permission <权限节点> | * | 均可使用 | 添加或移除玩家的权限 | |
| position | position | | 仅客户端 | 获取当前坐标 | pos |
+| remove | remove [多个角色在队伍中的序号] | player.remove | 仅客户端 | 强制将某个角色从当前队伍中移除。例如`remove 1 2`表示将1号和2号角色移除 | |
| reload | reload | server.reload | 均可使用 | 重载服务器配置 | |
| resetconst | resetconst [all] | player.resetconstellation | 仅客户端 | 重置当前角色的命座,重新登录即可生效 | resetconstellation |
| restart | restart | | 均可使用 | 重启服务端 | |
diff --git a/src/main/java/emu/grasscutter/command/commands/JoinCommand.java b/src/main/java/emu/grasscutter/command/commands/JoinCommand.java
index 4dac15dd7..0024403f4 100644
--- a/src/main/java/emu/grasscutter/command/commands/JoinCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/JoinCommand.java
@@ -33,10 +33,13 @@ public class JoinCommand implements CommandHandler {
for (int i = 0; i < args.size(); i++) {
Avatar avatar = sender.getAvatars().getAvatarById(avatarIds.get(i));
- if (avatar == null || sender.getTeamManager().getCurrentTeamInfo().contains(avatar)) {
+ if (avatar == null) {
CommandHandler.sendMessage(sender, translate("commands.generic.invalid.avatarId"));
return;
}
+ if (sender.getTeamManager().getCurrentTeamInfo().contains(avatar)){
+ continue;
+ }
sender.getTeamManager().getCurrentTeamInfo().addAvatar(avatar);
}
diff --git a/src/main/java/emu/grasscutter/command/commands/RemoveCommand.java b/src/main/java/emu/grasscutter/command/commands/RemoveCommand.java
index a40b42698..2d850e505 100644
--- a/src/main/java/emu/grasscutter/command/commands/RemoveCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/RemoveCommand.java
@@ -7,6 +7,8 @@ import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import static emu.grasscutter.utils.Language.translate;
@@ -17,11 +19,11 @@ public class RemoveCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List args) {
- List avatarIds = new ArrayList<>();
+ List avatarIndexList = new ArrayList<>();
for (String arg : args) {
try {
- int avatarId = Integer.parseInt(arg);
- avatarIds.add(avatarId);
+ int avatarIndex = Integer.parseInt(arg);
+ avatarIndexList.add(avatarIndex);
} catch (Exception ignored) {
ignored.printStackTrace();
CommandHandler.sendMessage(sender, translate("commands.remove.invalid_index"));
@@ -29,12 +31,14 @@ public class RemoveCommand implements CommandHandler {
}
}
- for (int i = 0; i < avatarIds.size(); i++) {
- if (avatarIds.get(i) > sender.getTeamManager().getCurrentTeamInfo().getAvatars().size() || avatarIds.get(i) <= 0) {
+ Collections.reverse(avatarIndexList);
+
+ for (int i = 0; i < avatarIndexList.size(); i++) {
+ if (avatarIndexList.get(i) > sender.getTeamManager().getCurrentTeamInfo().getAvatars().size() || avatarIndexList.get(i) <= 0) {
CommandHandler.sendMessage(sender, translate("commands.remove.invalid_index"));
return;
}
- sender.getTeamManager().getCurrentTeamInfo().removeAvatar(avatarIds.get(i) - 1);
+ sender.getTeamManager().getCurrentTeamInfo().removeAvatar(avatarIndexList.get(i) - 1);
}
// Packet
diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json
index 410038f73..3ac759d6b 100644
--- a/src/main/resources/languages/en-US.json
+++ b/src/main/resources/languages/en-US.json
@@ -238,9 +238,9 @@
"description": "Reload server config"
},
"remove": {
- "usage": "Usage: remove [indexOfYourTeams] index start from 1",
- "invalid_index": "index start from 1",
- "description": "force remove avatar into your team"
+ "usage": "Usage: remove [indexOfYourTeam] index start from 1",
+ "invalid_index": "The index number is illegal. It starts from 1 and the maximum value is the number of roles in the team",
+ "description": "force remove avatar into your team. Such as `remove 1 2`."
},
"resetConst": {
"reset_all": "Reset all avatars' constellations.",
@@ -380,7 +380,8 @@
"title": "Banner Details",
"available_five_stars": "Available 5-star Items",
"available_four_stars": "Available 4-star Items",
- "available_three_stars": "Available 3-star Items"
+ "available_three_stars": "Available 3-star Items",
+ "template_missing": "data/gacha_details.html is missing."
}
}
}
diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index 55ec2db45..ceec64d9b 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -237,9 +237,9 @@
"description": "重载配置文件和数据"
},
"remove": {
- "usage": "用法: remove [indexOfYourTeams] 从1开始",
- "invalid_index": "下标从1开始",
- "description": "强制移除队内角色"
+ "usage": "用法: remove [多个角色在队伍中的序号] 序号从1开始",
+ "invalid_index": "序号不合法,从1开始,最大值为队内角色数量",
+ "description": "强制将某个角色从当前队伍中移除。例如`remove 1 2`表示将1号和2号角色从队伍中移除"
},
"resetConst": {
"reset_all": "重置所有角色的命座。",
diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json
index 35475c722..00b77aac3 100644
--- a/src/main/resources/languages/zh-TW.json
+++ b/src/main/resources/languages/zh-TW.json
@@ -229,9 +229,9 @@
"description": "重新加載設定檔和數據。"
},
"remove": {
- "usage": "用法: remove [indexOfYourTeams] 从1开始",
- "invalid_index": "下標從1開始",
- "description": "强制移除對内角色"
+ "usage": "用法: remove [多個角色在隊伍中的序號] 序號从1开始",
+ "invalid_index": "序號不合法,從1開始,最大值為隊内角色數量",
+ "description": "强制移除對内角色,例如`remove 1 2`表示將1號和2號角色從隊伍中移除"
},
"resetConst": {
"reset_all": "重設所有角色的命座。",