diff --git a/README.md b/README.md index f6c9dec21..3c6d111f6 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,8 @@ There is a dummy user named "Server" in every player's friends list that you can `!give [item id] [amount]` +`!givechar [avatar id] [level]` + `!drop [item id] [amount]` `!killall` diff --git a/src/main/java/emu/grasscutter/commands/PlayerCommands.java b/src/main/java/emu/grasscutter/commands/PlayerCommands.java index ae80c5d25..42317e63b 100644 --- a/src/main/java/emu/grasscutter/commands/PlayerCommands.java +++ b/src/main/java/emu/grasscutter/commands/PlayerCommands.java @@ -3,6 +3,8 @@ package emu.grasscutter.commands; import emu.grasscutter.Grasscutter; import emu.grasscutter.data.GenshinData; import emu.grasscutter.data.def.ItemData; +import emu.grasscutter.data.def.AvatarData; +import emu.grasscutter.data.def.AvatarSkillDepotData; import emu.grasscutter.data.def.MonsterData; import emu.grasscutter.game.GenshinPlayer; import emu.grasscutter.game.World; @@ -176,6 +178,133 @@ public final class PlayerCommands { } } } + + @Command(label = "givechar", aliases = { "givec" }, usage = "Usage: givechar [level]") + public static class GiveCharCommand implements CommandHandler { + @Override public void execute(GenshinPlayer player, List args) { + int target, avatarID, level = 1, ascension = 1; + + if(args.size() < 2) { + CommandHandler.sendMessage(null, "Usage: givechar [level]"); + return; + } + + switch(args.size()) { + default: + CommandHandler.sendMessage(null, "Usage: givechar [level]"); + return; + case 1: + try { + avatarID = Integer.parseInt(args.get(0)); + target = player.getAccount().getPlayerId(); + } catch (NumberFormatException ignored) { + // TODO: Parse from avatar name using GM Handbook. + CommandHandler.sendMessage(player, "Invalid avatar id."); + return; + } + break; + case 2: + try { + target = Integer.parseInt(args.get(0)); + if(Grasscutter.getGameServer().getPlayerById(target) == null) { + target = player.getId(); level = Integer.parseInt(args.get(1)); + avatarID = Integer.parseInt(args.get(0)); + } else { + avatarID = Integer.parseInt(args.get(1)); + } + } catch (NumberFormatException ignored) { + // TODO: Parse from avatar name using GM Handbook. + CommandHandler.sendMessage(player, "Invalid avatar or player ID."); + return; + } + break; + case 3: + try { + target = Integer.parseInt(args.get(0)); + if(Grasscutter.getGameServer().getPlayerById(target) == null) { + CommandHandler.sendMessage(player, "Invalid player ID."); return; + } + + avatarID = Integer.parseInt(args.get(1)); + level = Integer.parseInt(args.get(2)); + } catch (NumberFormatException ignored) { + // TODO: Parse from avatar name using GM Handbook. + CommandHandler.sendMessage(player, "Invalid avatar or player ID."); + return; + } + break; + } + + GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target); + if(targetPlayer == null) { + CommandHandler.sendMessage(null, "Player not found."); return; + } + + AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarID); + if(avatarData == null) { + CommandHandler.sendMessage(null, "Invalid avatar id."); return; + } + + // Calculate ascension level. + if (level <= 40) { + ascension = (int)Math.ceil(level / 20); + } else if (level > 20) { + ascension = (int)Math.ceil(level / 10) - 3; + } + + GenshinAvatar avatar = new GenshinAvatar(avatarID); + avatar.setLevel(level); + avatar.setPromoteLevel(ascension); + + // This will handle stats and talents + avatar.recalcStats(); + + targetPlayer.addAvatar(avatar); + } + + @Override + public void execute(List args) { + if(args.size() < 2) { + CommandHandler.sendMessage(null, "Usage: givechar [amount]"); + return; + } + + try { + int target = Integer.parseInt(args.get(0)); + int avatarID = Integer.parseInt(args.get(1)); + int level = 1; if(args.size() > 2) level = Integer.parseInt(args.get(2)); + int ascension = 1; + + GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target); + if(targetPlayer == null) { + CommandHandler.sendMessage(null, "Player not found."); return; + } + + AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarID); + if(avatarData == null) { + CommandHandler.sendMessage(null, "Invalid avatar id."); return; + } + + // Calculate ascension level. + if (level <= 40) { + ascension = (int)Math.ceil(level / 20); + } else if (level > 20) { + ascension = (int)Math.ceil(level / 10) - 3; + } + + GenshinAvatar avatar = new GenshinAvatar(avatarID); + avatar.setLevel(level); + avatar.setPromoteLevel(ascension); + + // This will handle stats and talents + avatar.recalcStats(); + + targetPlayer.addAvatar(avatar); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(null, "Invalid item or player ID."); + } + } + } @Command(label = "spawn", execution = Command.Execution.PLAYER, usage = "Usage: spawn [level] [amount]") diff --git a/src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java b/src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java index 414c73cfa..7c08d4bbc 100644 --- a/src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java +++ b/src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java @@ -510,6 +510,21 @@ public class GenshinAvatar { } } + // Add proud skills and unlock them if needed + AvatarSkillDepotData skillDepot = GenshinData.getAvatarSkillDepotDataMap().get(this.getSkillDepotId()); + this.getProudSkillList().clear(); + for (InherentProudSkillOpens openData : skillDepot.getInherentProudSkillOpens()) { + if (openData.getProudSkillGroupId() == 0) { + continue; + } + if (openData.getNeedAvatarPromoteLevel() <= this.getPromoteLevel()) { + int proudSkillId = (openData.getProudSkillGroupId() * 100) + 1; + if (GenshinData.getProudSkillDataMap().containsKey(proudSkillId)) { + this.getProudSkillList().add(proudSkillId); + } + } + } + // Proud skills for (int proudSkillId : this.getProudSkillList()) { ProudSkillData proudSkillData = GenshinData.getProudSkillDataMap().get(proudSkillId);