Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-13 15:34:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix healing ability of some characters to some extent (#1201)

Browse Source 
* fix healing ability of some characters to some extent

* using SerialName to replace replaceAll in avatar ability files reading

* add class HealAbilityManager

* move codes in onAbilityInvoke of class AbilityManager to class HealAbilityManager
This commit is contained in:
saucebing
2022-06-14 19:36:53 +08:00
committed by GitHub
parent 95bc88202a
commit 458aadc2ff
3 changed files with 204 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/emu/grasscutter/game/ability/AbilityManager.java
View File

@@ -1,6 +1,8 @@
package emu.grasscutter.game.ability;
import java.util.*;
import java.util.Optional;
import java.util.Map.Entry;
import com.google.protobuf.InvalidProtocolBufferException;
@@ -28,12 +30,15 @@ import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalar
import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
import emu.grasscutter.utils.Position;
import emu.grasscutter.utils.Utils;
import emu.grasscutter.game.props.FightProperty;
public class AbilityManager {
private Player player;
HealAbilityManager healAbilityManager;
public AbilityManager(Player player) {
this.player = player;
this.healAbilityManager = new HealAbilityManager(player);
}
public Player getPlayer() {
@@ -41,7 +46,9 @@ public class AbilityManager {
}
public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception {
// Grasscutter.getLogger().info(invoke.getArgumentType() + " (" + invoke.getArgumentTypeValue() + "): " + Utils.bytesToHex(invoke.toByteArray()));
healAbilityManager.healHandler(invoke);
//Grasscutter.getLogger().info(invoke.getArgumentType() + " (" + invoke.getArgumentTypeValue() + "): " + Utils.bytesToHex(invoke.toByteArray()));
switch (invoke.getArgumentType()) {
case ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM:
handleOverrideParam(invoke);
@@ -61,6 +68,7 @@ public class AbilityManager {
default:
break;
}
}
private void handleOverrideParam(AbilityInvokeEntry invoke) throws Exception {
@@ -109,7 +117,7 @@ public class AbilityManager {
if (sourceEntity == null) {
return;
}
// This is not how it works but we will keep it for now since healing abilities dont work properly anyways
if (data.getAction() == ModifierAction.ADDED && data.getParentAbilityName() != null) {
// Handle add modifier here
@@ -155,19 +163,6 @@ public class AbilityManager {
private void invokeAction(AbilityModifierAction action, GameEntity target, GameEntity sourceEntity) {
switch (action.type) {
case HealHP -> {
if (action.amount == null) {
return;
}
float healAmount = 0;
if (action.amount.isDynamic && action.amount.dynamicKey != null) {
healAmount = sourceEntity.getMetaOverrideMap().getOrDefault(action.amount.dynamicKey, 0f);
}
if (healAmount > 0) {
target.heal(healAmount);
}
}
case LoseHP -> {
if (action.amountByTargetCurrentHPRatio == null) {