Merge pull request 'Fix spite shade calculation' (#7) from fix-spite-shade into main

Reviewed-on: #7
pull/15/head
silverwizard 2 years ago
commit bc14e42e94
  1. 10
      src/public/js/burning.js

@ -742,13 +742,18 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
return; return;
$scope.attributeShade[attrName] = 'G'; $scope.attributeShade[attrName] = 'G';
if('Grief' == attrName) {
$scope.attributeShade['Spite'] = 'G';
}
} }
else if (attr.shade == 'G'){ else if (attr.shade == 'G'){
$scope.attributeShade[attrName] = 'B'; $scope.attributeShade[attrName] = 'B';
if('Spite' == attrName) {
$scope.attributeShade['Grief'] = 'B';
}
} }
else else
console.log("Error: changing shade of attribute failed: unknown shade " + stat.shade); console.log("Error: changing shade of attribute failed: unknown shade " + stat.shade);
} }
$scope.incrementSkill = function(skill){ $scope.incrementSkill = function(skill){
@ -1105,7 +1110,8 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
} }
else if ( "Spite" == name ){ else if ( "Spite" == name ){
var spite = computeModifiers(name); var spite = computeModifiers(name);
if($scope.attributeShade[name] == 'G'){ // If Grief is grey, the shadeshift cost has already been payed in the Grief exponent calculation
if($scope.attributeShade[name] == 'G' && $scope.attributeShade["Grief"] == 'B'){
spite -= 5; spite -= 5;
} }
spite += bonus; spite += bonus;

Loading…
Cancel
Save