Fix bug with ultimate calculation

Sasky [04-26-15 - 01:01]
Fix bug with ultimate calculation
Filename
html/skillData.js
html/skillFormulas.html
diff --git a/html/skillData.js b/html/skillData.js
index 5404720..af5ffac 100644
--- a/html/skillData.js
+++ b/html/skillData.js
@@ -124,8 +124,8 @@ SkillData.controller('LoadoutController', ['$scope', function ($scope) {
 				power = $scope.weaponpower
 				break
 			case 'Ultimate':
-				main = Max($scope.magicka, $scope.stamina)
-				power = Max($scope.spellpower, $scope.weaponpower)
+				main = Math.max($scope.magicka, $scope.stamina)
+				power = Math.max($scope.spellpower, $scope.weaponpower)
 		}
 		return Math.round(main*fit.mainCoef + power*fit.powerCoef + $scope.health*fit.healthCoef + fit.intercept)
 	}
diff --git a/html/skillFormulas.html b/html/skillFormulas.html
index 9c91ebf..1eddf16 100644
--- a/html/skillFormulas.html
+++ b/html/skillFormulas.html
@@ -39,7 +39,7 @@
 	<label class="col-md-4">Health:</label>	<label class="col-md-4">Magicka:</label><label class="col-md-4">Stamina:</label>
 	</div><div class="row">
 	<input class="col-md-4" ng-model="health"/><input class="col-md-4" ng-model="magicka"/><input class="col-md-4" ng-model="stamina"/>
-	</div><div class="row">
+	</div><br><div class="row">
 	<label class="col-md-4">Spell Power:</label><input class="col-md-2" ng-model="spellpower"/>
 	<label class="col-md-4">Weapon Dmg:</label><input class="col-md-2" ng-model="weaponpower"/>
 	</div>
@@ -57,6 +57,7 @@
 	<hr>
 	<h3>Changelog</h3>
 	<ul>
+	<li>4/25 - Add all class data and werewolf. Fix bug on ultimate calculation.</li>
 	<li>4/24 - Add value calculation for formulas</li>
 	<li>4/23 - Add drag &amp; drop to collect skills</li>
 	<li>4/23 - Add health info. NOTE: Only templar skills currently.</li>