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

Factor fight properties into healing calculation

Browse Source
This commit is contained in:
KingRainbow44
2023-09-16 18:32:01 -04:00
parent 1f15d6219b
commit 43467ebc85
1 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java
View File

@@ -6,6 +6,7 @@ import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.game.ability.Ability; import emu.grasscutter.game.ability.Ability;
import emu.grasscutter.game.entity.*; import emu.grasscutter.game.entity.*;
import emu.grasscutter.game.props.FightProperty; import emu.grasscutter.game.props.FightProperty;
import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
@AbilityAction(AbilityModifierAction.Type.HealHP) @AbilityAction(AbilityModifierAction.Type.HealHP)
public final class ActionHealHP extends AbilityActionHandler { public final class ActionHealHP extends AbilityActionHandler {
@@ -31,24 +32,25 @@ public final class ActionHealHP extends AbilityActionHandler {
if (owner == null) return false; if (owner == null) return false;
ability // Get all properties.
.getAbilitySpecials() var properties = new Object2FloatOpenHashMap<String>();
.forEach((k, v) -> Grasscutter.getLogger().trace(">>> {}: {}", k, v)); // Add entity fight properties.
for (var property : FightProperty.values()) {
var name = property.name();
var value = owner.getFightProperty(property);
properties.put(name, value);
}
// Add ability properties.
properties.putAll(ability.getAbilitySpecials());
var amountByCasterMaxHPRatio = action.amountByCasterMaxHPRatio.get(ability); // Calculate ratios from properties.
var amountByCasterAttackRatio = action.amountByCasterAttackRatio.get(ability); var amountByCasterMaxHPRatio = action.amountByCasterMaxHPRatio.get(properties, 0);
var amountByCasterCurrentHPRatio = action.amountByCasterCurrentHPRatio.get(ability); var amountByCasterAttackRatio = action.amountByCasterAttackRatio.get(properties, 0);
var amountByTargetCurrentHPRatio = action.amountByTargetCurrentHPRatio.get(ability); var amountByCasterCurrentHPRatio = action.amountByCasterCurrentHPRatio.get(properties, 0);
var amountByTargetMaxHPRatio = action.amountByTargetMaxHPRatio.get(ability); var amountByTargetCurrentHPRatio = action.amountByTargetCurrentHPRatio.get(properties, 0);
var amountByTargetMaxHPRatio = action.amountByTargetMaxHPRatio.get(properties, 0);
Grasscutter.getLogger().trace("amountByCasterMaxHPRatio: " + amountByCasterMaxHPRatio); var amountToRegenerate = action.amount.get(properties, 0);
Grasscutter.getLogger().trace("amountByCasterAttackRatio: " + amountByCasterAttackRatio);
Grasscutter.getLogger().trace("amountByCasterCurrentHPRatio: " + amountByCasterCurrentHPRatio);
Grasscutter.getLogger().trace("amountByTargetCurrentHPRatio: " + amountByTargetCurrentHPRatio);
Grasscutter.getLogger().trace("amountByTargetMaxHPRatio: " + amountByTargetMaxHPRatio);
var amountToRegenerate = action.amount.get(ability);
Grasscutter.getLogger().trace("Base amount: " + amountToRegenerate);
amountToRegenerate += amountToRegenerate +=
amountByCasterMaxHPRatio * owner.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP); amountByCasterMaxHPRatio * owner.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
@@ -57,25 +59,17 @@ public final class ActionHealHP extends AbilityActionHandler {
amountToRegenerate += amountToRegenerate +=
amountByCasterCurrentHPRatio * owner.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP); amountByCasterCurrentHPRatio * owner.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
Grasscutter.getLogger().trace("amountToRegenerate: " + amountToRegenerate);
var abilityRatio = 1.0f; var abilityRatio = 1.0f;
Grasscutter.getLogger().trace("Base abilityRatio: " + abilityRatio);
if (!action.ignoreAbilityProperty) if (!action.ignoreAbilityProperty)
abilityRatio += abilityRatio +=
target.getFightProperty(FightProperty.FIGHT_PROP_HEAL_ADD) target.getFightProperty(FightProperty.FIGHT_PROP_HEAL_ADD)
+ target.getFightProperty(FightProperty.FIGHT_PROP_HEALED_ADD); + target.getFightProperty(FightProperty.FIGHT_PROP_HEALED_ADD);
Grasscutter.getLogger().trace("abilityRatio: " + abilityRatio);
Grasscutter.getLogger().trace("Sub-regenerate amount: " + amountToRegenerate);
amountToRegenerate += amountToRegenerate +=
amountByTargetCurrentHPRatio * target.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP); amountByTargetCurrentHPRatio * target.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
amountToRegenerate += amountToRegenerate +=
amountByTargetMaxHPRatio * target.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP); amountByTargetMaxHPRatio * target.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
Grasscutter.getLogger().trace("Healing {} without ratios", amountToRegenerate);
target.heal( target.heal(
amountToRegenerate * abilityRatio * action.healRatio.get(ability, 1f), amountToRegenerate * abilityRatio * action.healRatio.get(ability, 1f),
action.muteHealEffect); action.muteHealEffect);