Implement food heal function

Co-authored-by: pris <lilch1022@hotmail.com>
GoJam11 · May 3, 2022 · b253e77 · b253e77
1 parent 765f569
commit b253e77
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/main/java/emu/grasscutter/game/managers/InventoryManager.java b/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
@@ -937,10 +937,20 @@ public GameItem useItem(Player player, long targetGuid, long itemGuid, int count
 					if (target == null) {
 						break;
 					}
-					
+
 					used = player.getTeamManager().reviveAvatar(target) ? 1 : 0;
 				}
 				break;
+			case MATERIAL_NOTICE_ADD_HP:
+				if (useItem.getItemData().getUseTarget().equals("ITEM_USE_TARGET_SPECIFY_ALIVE_AVATAR")) {
+					if (target == null) {
+						break;
+					}
+
+					int[] SatiationParams = useItem.getItemData().getSatiationParams();
+					used = player.getTeamManager().healAvatar(target, SatiationParams[0], SatiationParams[1]) ? 1 : 0;
+				}
+				break;
 			case MATERIAL_CHEST:
 				if (useItem.getRewardBoxId() > 0) {
 					used = handleRewardBox(player, useItem) ? 1 : 0;

diff --git a/src/main/java/emu/grasscutter/game/player/TeamManager.java b/src/main/java/emu/grasscutter/game/player/TeamManager.java
@@ -457,7 +457,31 @@ public boolean reviveAvatar(Avatar avatar) {
 
 		return false;
 	}
-
+
+	public boolean healAvatar(Avatar avatar, int healRate, int healAmount) {
+		for (EntityAvatar entity : getActiveTeam()) {
+			if (entity.getAvatar() == avatar) {
+				if (!entity.isAlive()) {
+					return false;
+				}
+
+				entity.setFightProperty(
+						FightProperty.FIGHT_PROP_CUR_HP,
+						(float) Math.min(
+								(entity.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) +
+										entity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) * (float) healRate / 100.0 +
+										(float) healAmount / 100.0),
+								entity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP)
+						)
+				);
+				getPlayer().sendPacket(new PacketAvatarFightPropUpdateNotify(entity.getAvatar(), FightProperty.FIGHT_PROP_CUR_HP));
+				getPlayer().sendPacket(new PacketAvatarLifeStateChangeNotify(entity.getAvatar()));
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public void respawnTeam() {
 		// Make sure all team members are dead
 		for (EntityAvatar entity : getActiveTeam()) {