diff --git a/hwe/func.php b/hwe/func.php index 7e1e4a36..09a18484 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -667,9 +667,9 @@ function generalInfo(General $generalObj) { $horsename = $generalObj->getItem('horse')->getName(); $itemname = $generalObj->getItem('item')->getName(); - $leadership = $generalObj->getLeadership(true, false, true); - $strength = $generalObj->getStrength(true, false, true); - $intel = $generalObj->getIntel(true, false, true); + $leadership = $generalObj->getLeadership(true, false, false); + $strength = $generalObj->getStrength(true, false, false); + $intel = $generalObj->getIntel(true, false, false); $injury = $generalObj->getVar('injury'); diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php index 55b5970b..7d04b984 100644 --- a/hwe/sammo/General.php +++ b/hwe/sammo/General.php @@ -228,10 +228,10 @@ class General implements iAction{ if($withStatAdjust){ if($statName === 'strength'){ - $statValue *= Util::round($this->getStatValue('intel', $withInjury, $withItem, false, false) / 4); + $statValue += Util::round($this->getStatValue('intel', $withInjury, $withItem, false, false) / 4); } else if($statName === 'intel'){ - $statValue *= Util::round($this->getStatValue('strength', $withInjury, $withItem, false, false) / 4); + $statValue += Util::round($this->getStatValue('strength', $withInjury, $withItem, false, false) / 4); } }