From f7baa1dbebf1b8694483a0b8a9247604f093ed11 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Tue, 19 Apr 2022 00:15:10 -0700 Subject: [PATCH 1/6] Give character command base --- .../grasscutter/commands/PlayerCommands.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/main/java/emu/grasscutter/commands/PlayerCommands.java b/src/main/java/emu/grasscutter/commands/PlayerCommands.java index ae80c5d25..52f179e30 100644 --- a/src/main/java/emu/grasscutter/commands/PlayerCommands.java +++ b/src/main/java/emu/grasscutter/commands/PlayerCommands.java @@ -176,6 +176,35 @@ public final class PlayerCommands { } } } + + @Command(label = "givechar", aliases = { "givec" }, usage = "Usage: givechar [avatar id] [level]") + public static class GiveCharCommand implements CommandHandler { + + @Override + public void execute(GenshinPlayer player, List args) { + int avatarID = Integer.parseInt(args.get(0)); + int level = Integer.parseInt(args.get(1)); + + if(player == null) { + CommandHandler.sendMessage(null, "Player not found."); return; + } + + AvatarData avatarData = GenshinData.getAvatarDataMap().get(avatarID); + if(avatarData == null) { + CommandHandler.sendMessage(null, "Invalid avatar id."); return; + } + + if (args.size() == 0) { + CommandHandler.sendMessage(player, "Usage: givechar [avatar id] [level]"); + return; + } + + GenshinAvatar avatar = new GenshinAvatar(avatarID); + avatar.setLevel(level); + + player.addAvatar(avatar); + } + } @Command(label = "spawn", execution = Command.Execution.PLAYER, usage = "Usage: spawn [level] [amount]") From 5c6578a2f876aadbcc06fa19043848b5d5c69552 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Tue, 19 Apr 2022 00:41:40 -0700 Subject: [PATCH 2/6] fix conventions to match other commands --- .../grasscutter/commands/PlayerCommands.java | 104 +++++++++++++++--- 1 file changed, 90 insertions(+), 14 deletions(-) diff --git a/src/main/java/emu/grasscutter/commands/PlayerCommands.java b/src/main/java/emu/grasscutter/commands/PlayerCommands.java index 52f179e30..757e46562 100644 --- a/src/main/java/emu/grasscutter/commands/PlayerCommands.java +++ b/src/main/java/emu/grasscutter/commands/PlayerCommands.java @@ -3,6 +3,7 @@ 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.MonsterData; import emu.grasscutter.game.GenshinPlayer; import emu.grasscutter.game.World; @@ -177,32 +178,107 @@ public final class PlayerCommands { } } - @Command(label = "givechar", aliases = { "givec" }, usage = "Usage: givechar [avatar id] [level]") + @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; - @Override - public void execute(GenshinPlayer player, List args) { - int avatarID = Integer.parseInt(args.get(0)); - int level = Integer.parseInt(args.get(1)); - - if(player == null) { - CommandHandler.sendMessage(null, "Player not found."); return; + if(args.size() < 2) { + CommandHandler.sendMessage(null, "Usage: give [level]"); + return; } + switch(args.size()) { + default: + CommandHandler.sendMessage(null, "Usage: give [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; } - if (args.size() == 0) { - CommandHandler.sendMessage(player, "Usage: givechar [avatar id] [level]"); + GenshinAvatar avatar = new GenshinAvatar(avatarID); + avatar.setLevel(level); + + targetPlayer.addAvatar(avatar); + } + + @Override + public void execute(List args) { + if(args.size() < 2) { + CommandHandler.sendMessage(null, "Usage: give [amount]"); return; } - GenshinAvatar avatar = new GenshinAvatar(avatarID); - avatar.setLevel(level); - - player.addAvatar(avatar); + 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)); + + 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; + } + + GenshinAvatar avatar = new GenshinAvatar(avatarID); + avatar.setLevel(level); + + targetPlayer.addAvatar(avatar); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(null, "Invalid item or player ID."); + } } } From dea28d164eddabc5fbd4d486d4ea57b8220fa160 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Tue, 19 Apr 2022 01:00:49 -0700 Subject: [PATCH 3/6] add command to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) 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` From 5bf2e5d9352bf248f1197b8e24c3753613641e0e Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Tue, 19 Apr 2022 01:01:40 -0700 Subject: [PATCH 4/6] fix references to givechar --- src/main/java/emu/grasscutter/commands/PlayerCommands.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/emu/grasscutter/commands/PlayerCommands.java b/src/main/java/emu/grasscutter/commands/PlayerCommands.java index 757e46562..4175688de 100644 --- a/src/main/java/emu/grasscutter/commands/PlayerCommands.java +++ b/src/main/java/emu/grasscutter/commands/PlayerCommands.java @@ -184,13 +184,13 @@ public final class PlayerCommands { int target, avatarID, level = 1; if(args.size() < 2) { - CommandHandler.sendMessage(null, "Usage: give [level]"); + CommandHandler.sendMessage(null, "Usage: givechar [level]"); return; } switch(args.size()) { default: - CommandHandler.sendMessage(null, "Usage: give [level]"); + CommandHandler.sendMessage(null, "Usage: givechar [level]"); return; case 1: try { @@ -253,7 +253,7 @@ public final class PlayerCommands { @Override public void execute(List args) { if(args.size() < 2) { - CommandHandler.sendMessage(null, "Usage: give [amount]"); + CommandHandler.sendMessage(null, "Usage: givechar [amount]"); return; } From 535a9167cf1f2ff4d91524774cbb37df5d91ccf7 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Tue, 19 Apr 2022 01:37:52 -0700 Subject: [PATCH 5/6] calculate ascension based on level provided to givechar command --- .../grasscutter/commands/PlayerCommands.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/emu/grasscutter/commands/PlayerCommands.java b/src/main/java/emu/grasscutter/commands/PlayerCommands.java index 4175688de..53b558755 100644 --- a/src/main/java/emu/grasscutter/commands/PlayerCommands.java +++ b/src/main/java/emu/grasscutter/commands/PlayerCommands.java @@ -181,7 +181,7 @@ 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; + int target, avatarID, level = 1, ascension = 1; if(args.size() < 2) { CommandHandler.sendMessage(null, "Usage: givechar [level]"); @@ -244,8 +244,16 @@ public final class PlayerCommands { 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); targetPlayer.addAvatar(avatar); } @@ -261,6 +269,7 @@ public final class PlayerCommands { 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) { @@ -272,8 +281,16 @@ public final class PlayerCommands { 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); targetPlayer.addAvatar(avatar); } catch (NumberFormatException ignored) { From 61e03bdc8cd05c8d441ff0f51e5ce1049538cb88 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Tue, 19 Apr 2022 02:06:58 -0700 Subject: [PATCH 6/6] properly add ascension-locked talents --- .../emu/grasscutter/commands/PlayerCommands.java | 7 +++++++ .../grasscutter/game/avatar/GenshinAvatar.java | 15 +++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/main/java/emu/grasscutter/commands/PlayerCommands.java b/src/main/java/emu/grasscutter/commands/PlayerCommands.java index 53b558755..42317e63b 100644 --- a/src/main/java/emu/grasscutter/commands/PlayerCommands.java +++ b/src/main/java/emu/grasscutter/commands/PlayerCommands.java @@ -4,6 +4,7 @@ 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; @@ -254,6 +255,9 @@ public final class PlayerCommands { GenshinAvatar avatar = new GenshinAvatar(avatarID); avatar.setLevel(level); avatar.setPromoteLevel(ascension); + + // This will handle stats and talents + avatar.recalcStats(); targetPlayer.addAvatar(avatar); } @@ -291,6 +295,9 @@ public final class PlayerCommands { 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) { 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);