From d672a9c89f5c0c69ac0cfd162cad48b6d7b0f96c Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 6 Nov 2022 22:19:39 -0600 Subject: [PATCH] base in AttributeInstance --- azalea-world/src/entity/attributes.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/azalea-world/src/entity/attributes.rs b/azalea-world/src/entity/attributes.rs index 4b2c9eba..baa27a2b 100644 --- a/azalea-world/src/entity/attributes.rs +++ b/azalea-world/src/entity/attributes.rs @@ -11,17 +11,18 @@ pub struct AttributeModifiers { } #[derive(Clone, Debug, Default)] -pub struct AttributeInstance { +pub struct AttributeInstance { + pub base: f64, pub modifiers: Vec, } -impl AttributeInstance { +impl AttributeInstance { pub fn calculate(&self) -> f64 { - let mut total = BASE; + let mut total = self.base; for modifier in self.modifiers { match modifier.operation { AttributeModifierOperation::Addition => total += modifier.amount, - AttributeModifierOperation::MultiplyBase => total += BASE * modifier.amount, + AttributeModifierOperation::MultiplyBase => total += self.base * modifier.amount, _ => {} } match modifier.operation {