|
|
|
@ -742,13 +742,18 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo |
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
$scope.attributeShade[attrName] = 'G'; |
|
|
|
|
if('Grief' == attrName) { |
|
|
|
|
$scope.attributeShade['Spite'] = 'G'; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
else if (attr.shade == 'G'){ |
|
|
|
|
$scope.attributeShade[attrName] = 'B'; |
|
|
|
|
if('Spite' == attrName) { |
|
|
|
|
$scope.attributeShade['Grief'] = 'B'; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
console.log("Error: changing shade of attribute failed: unknown shade " + stat.shade); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$scope.incrementSkill = function(skill){ |
|
|
|
@ -1105,7 +1110,8 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo |
|
|
|
|
} |
|
|
|
|
else if ( "Spite" == 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 += bonus; |
|
|
|
|