Skip to content

Updated Base & Food health gain modifier #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zoruea wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated Base & Food health gain modifier #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions common/src/main/java/vice/sol_valheim/mixin/PlayerEntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ public abstract class PlayerEntityMixin extends LivingEntity implements PlayerEn
@Shadow
protected FoodData foodData;

@Unique
private AttributeModifier sol_valheim_hpmod = new AttributeModifier("Valheim Food HP Buff", 0, AttributeModifier.Operation.ADDITION);

@Override
@Unique
public ValheimFoodData sol_valheim$getFoodData() {
Expand Down Expand Up @@ -98,14 +101,28 @@ private void onTick(CallbackInfo info) {
sol_valheim$trackData();
}

float maxhp = Math.min(40, (SOLValheim.Config.common.startingHealth * 2) + sol_valheim$food_data.getTotalFoodNutrition());

Player player = (Player) (LivingEntity) this;
//New method for calculating player health, increasing compatibility with other sources of health gain
//bookkeeping stuff
Player player = (Player) (LivingEntity)this;
player.getFoodData().setSaturation(0);

player.getAttribute(Attributes.MAX_HEALTH).setBaseValue(maxhp);
//if (getHealth() > maxhp)
// setHealth(maxhp);
//set player base hp
double basehp = SOLValheim.Config.common.startingHealth * 2;
if (basehp > player.getAttribute(Attributes.MAX_HEALTH).getBaseValue()) {
player.getAttribute(Attributes.MAX_HEALTH).setBaseValue(basehp);
}

//build variable space for transform
double foodhp = Math.min(SOLValheim.Config.common.maxFoodHealth * 2, sol_valheim$food_data.getTotalFoodNutrition());


//Apply the transform to player health
if (player.getAttribute(Attributes.MAX_HEALTH).getModifier(sol_valheim_hpmod.getId()) == null) {
player.getAttribute(Attributes.MAX_HEALTH).addPermanentModifier(sol_valheim_hpmod);
} else if (player.getAttribute(Attributes.MAX_HEALTH).getModifier(sol_valheim_hpmod.getId()).getAmount() != foodhp) {
player.getAttribute(Attributes.MAX_HEALTH).removeModifier(sol_valheim_hpmod.getId());
sol_valheim_hpmod = new AttributeModifier("Valheim Food HP Buff", foodhp, AttributeModifier.Operation.ADDITION);
player.getAttribute(Attributes.MAX_HEALTH).addPermanentModifier(sol_valheim_hpmod);
}

if (SOLValheim.Config.common.speedBoost > 0.01f) {
var attr = player.getAttribute(Attributes.MOVEMENT_SPEED);
Expand Down Expand Up @@ -181,4 +198,4 @@ private void onInitDataTracker(CallbackInfo info) {

this.entityData.define(sol_valheim$DATA_ACCESSOR, sol_valheim$food_data);
}
}
}