diff --git a/AndorsTrailEdit/controllers.js b/AndorsTrailEdit/controllers.js index 2084f61dd..4d8b11fe4 100644 --- a/AndorsTrailEdit/controllers.js +++ b/AndorsTrailEdit/controllers.js @@ -57,7 +57,109 @@ var ATEditor = (function(ATEditor, model, importExport) { }; controllers.ItemController = function($scope, $routeParams) { $scope.datasource = model.items; - $scope.obj = $scope.datasource.findById($routeParams.id); + var obj = $scope.datasource.findById($routeParams.id); + $scope.obj = obj; + if (_.isString($scope.obj.category)) { + $scope.obj.category = model.itemCategories.findById($scope.obj.category); + } + $scope.itemCategories = model.itemCategories.items; + + function calculateItemCost(o) { + var v = function(i) { return i ? i : 0; } + var sgn = function(v) { + if (v < 0) return -1; + else if (v > 0) return 1; + else return 0; + } + + var averageHPBoost = (v(o.useEffect.increaseCurrentHP.min) + v(o.useEffect.increaseCurrentHP.max)) / 2; + var costBoostHP = Math.round(0.1*sgn(averageHPBoost)*Math.pow(Math.abs(averageHPBoost), 2) + 3*averageHPBoost); + var itemUsageCost = costBoostHP; + + + var isWeapon = false; + if ($scope.obj.category) { + isWeapon = $scope.obj.category.inventorySlot == 0; + } + + var equip_blockChance = v(obj.equipEffect.increaseBlockChance); + var equip_attackChance = v(obj.equipEffect.increaseAttackChance); + var equip_attackCost = v(obj.equipEffect.increaseAttackCost); + var equip_damageResistance = v(obj.equipEffect.increaseDamageResistance); + var equip_attackDamage_Min = v(obj.equipEffect.increaseAttackDamage.min); + var equip_attackDamage_Max = v(obj.equipEffect.increaseAttackDamage.max); + var equip_criticalChance = v(obj.equipEffect.increaseCriticalSkill); + var equip_criticalMultiplier = v(obj.equipEffect.setCriticalMultiplier); + var costBC = Math.round(3*Math.pow(Math.max(0,equip_blockChance), 2.5) + 28*equip_blockChance); + var costAC = Math.round(0.4*Math.pow(Math.max(0,equip_attackChance), 2.5) - 6*Math.pow(Math.abs(Math.min(0,equip_attackChance)),2.7)); + var costAP = isWeapon ? + Math.round(0.2*Math.pow(10/equip_attackCost, 8) - 25*equip_attackCost) + : -3125 * equip_attackCost; + var costDR = 1325*equip_damageResistance; + var costDMG_Min = isWeapon ? + Math.round(10*Math.pow(equip_attackDamage_Min, 2.5)) + :Math.round(10*Math.pow(equip_attackDamage_Min, 3) + equip_attackDamage_Min*80); + var costDMG_Max = isWeapon ? + Math.round(2*Math.pow(equip_attackDamage_Max, 2.1)) + :Math.round(2*Math.pow(equip_attackDamage_Max, 3) + equip_attackDamage_Max*20); + var costCC = Math.round(2.2*Math.pow(equip_criticalChance, 3)); + var costCM = Math.round(50*Math.pow(Math.max(0, equip_criticalMultiplier), 2)); + if (!obj.equipEffect.hasCritical) { + costCC = 0; + costCM = 0; + } + var costCombat = costBC + costAC + costAP + costDR + costDMG_Min + costDMG_Max + costCC + costCM; + + var equip_boostMaxHP = v(obj.equipEffect.increaseMaxHP); + var equip_boostMaxAP = v(obj.equipEffect.increaseMaxAP); + var equip_moveCostPenalty = v(obj.equipEffect.increaseMoveCost); + var costMaxHP = Math.round(30*Math.pow(Math.max(0,equip_boostMaxHP), 1.2) + 70*equip_boostMaxHP); + var costMaxAP = Math.round(50*Math.pow(Math.max(0,equip_boostMaxAP), 3) + 750*equip_boostMaxAP); + var costMovement = Math.round(510*Math.pow(Math.max(0,-equip_moveCostPenalty), 2.5) - 350*equip_moveCostPenalty); + var itemEquipCost = costCombat + costMaxHP + costMaxAP + costMovement; + + if (!obj.hasEquipEffect) { itemEquipCost = 0; } + if (!obj.hasUseEffect) { itemUsageCost = 0; } + + return itemEquipCost + itemUsageCost; + } + + $scope.recalculateStorePrice = function() { + var val = parseInt(obj.baseMarketCost); + if (obj.hasManualPrice === "0") { + val = calculateItemCost(obj); + obj.baseMarketCost = val; + } + $scope.marketCost_Sell = Math.round(val * (100 + 15) / 100); + $scope.marketCost_Buy = Math.round(val * (100 - 15) / 100); + }; + $scope.recalculateStorePrice(); + $scope.$watch('obj.useEffect.increaseCurrentHP.min', $scope.recalculateStorePrice); + $scope.$watch('obj.useEffect.increaseCurrentHP.max', $scope.recalculateStorePrice); + $scope.$watch('obj.category', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.increaseBlockChance', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.increaseAttackChance', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.increaseAttackCost', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.increaseDamageResistance', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.increaseAttackDamage.min', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.increaseCriticalSkill', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.setCriticalMultiplier', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.hasCritical', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.increaseMaxHP', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.increaseMaxAP', $scope.recalculateStorePrice); + $scope.$watch('obj.equipEffect.increaseMoveCost', $scope.recalculateStorePrice); + $scope.$watch('obj.hasEquipEffect', $scope.recalculateStorePrice); + $scope.$watch('obj.hasUseEffect', $scope.recalculateStorePrice); + $scope.$watch('obj.baseMarketCost', $scope.recalculateStorePrice); + $scope.$watch('obj.hasManualPrice', $scope.recalculateStorePrice); + + $scope.addCondition = function(list) { + list.push({magnitude:1}); + }; + $scope.removeCondition = function(list, cond) { + var idx = list.indexOf(cond); + list.splice(idx, 1); + }; }; controllers.DropListController = function($scope, $routeParams) { $scope.datasource = model.droplists; @@ -88,7 +190,11 @@ var ATEditor = (function(ATEditor, model, importExport) { var attacksPerTurn = Math.floor(v(obj.maxAP) / v(obj.attackCost)); var avgDamagePotential = 0; if (obj.attackDamage) { avgDamagePotential = (v(obj.attackDamage.min) + v(obj.attackDamage.max)) / 2; } - var avgAttackHP = attacksPerTurn * div100(v(obj.attackChance)) * avgDamagePotential * (1 + div100(v(obj.criticalSkill)) * v(obj.criticalMultiplier)); + var avgCrit = 0; + if (obj.hasCritical) { + avgCrit = div100(v(obj.criticalSkill)) * v(obj.criticalMultiplier); + } + var avgAttackHP = attacksPerTurn * div100(v(obj.attackChance)) * avgDamagePotential * (1 + avgCrit); var avgDefenseHP = v(obj.maxHP) * (1 + div100(v(obj.blockChance))) + EXP_FACTOR_DAMAGERESISTANCE * v(obj.damageResistance); var attackConditionBonus = 0; if (obj.hitEffect && obj.hitEffect.conditionsTarget && v(obj.hitEffect.conditionsTarget.length) > 0) { @@ -107,6 +213,7 @@ var ATEditor = (function(ATEditor, model, importExport) { $scope.$watch('obj.attackDamage.min', $scope.recalculateExperience); $scope.$watch('obj.attackDamage.max', $scope.recalculateExperience); $scope.$watch('obj.attackChance', $scope.recalculateExperience); + $scope.$watch('obj.hasCritical', $scope.recalculateExperience); $scope.$watch('obj.criticalSkill', $scope.recalculateExperience); $scope.$watch('obj.criticalMultiplier', $scope.recalculateExperience); $scope.$watch('obj.maxHP', $scope.recalculateExperience); diff --git a/AndorsTrailEdit/defaults.js b/AndorsTrailEdit/defaults.js index 5929e69df..a3477dad6 100644 --- a/AndorsTrailEdit/defaults.js +++ b/AndorsTrailEdit/defaults.js @@ -46,9 +46,10 @@ var ATEditor = (function(ATEditor, _) { ATEditor.defaults = { addDefaults: function(type, o) { - if (defaults[type]) { - var copyOfDefaults = ATEditor.utils.deepClone(defaults[type]); - _.defaults(o, copyOfDefaults); + var def = defaults[type]; + if (def) { + var copyOfDefaults = ATEditor.utils.deepClone(def); + ATEditor.utils.copyDefaults(o, copyOfDefaults); } }, removeDefaults: function(type, o) { diff --git a/AndorsTrailEdit/edit_droplist.html b/AndorsTrailEdit/edit_droplist.html index d96a6c497..9b71f4ded 100644 --- a/AndorsTrailEdit/edit_droplist.html +++ b/AndorsTrailEdit/edit_droplist.html @@ -13,6 +13,7 @@ Min quantity Max quantity Chance + diff --git a/AndorsTrailEdit/edit_item.html b/AndorsTrailEdit/edit_item.html index 5ebda8664..0c861c974 100644 --- a/AndorsTrailEdit/edit_item.html +++ b/AndorsTrailEdit/edit_item.html @@ -1,5 +1,281 @@ -
-

id: {{obj.id}}

-
-
-
+
+

Item

+
+ General +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
Item has manually specified store price
+
+
+ +
+ Sell: + Buy: +
+
+
+
Has equip effect
+
+
+
Has use effect
+
+
+
Has effect on every hit
+
+
+
Has effect on every kill
+
+
+
+ When equipped +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
%
+
+
+ +
+ + - + +
+
+
+
Has critical chance
+
+
+
+ +
%
+
+
+ + +
+
+
+ +
%
+
+
+ + +
+
+ + + + + + + + + + + + + + +
ConditionMagnitude
X
+ +
+
+
+ When used +
+ +
+ + - + +
+
+
+ +
+ + - + +
+
+
+ + + + + + + + + + + + + + + + + + +
ConditionMagnitudeDurationChance
X
+ +
+
+
+ When making a successful hit +
+ +
+ + - + +
+
+
+ +
+ + - + +
+
+
+ + + + + + + + + + + + + + + + + + +
ConditionMagnitudeDurationChance
X
+ +
+
+ + + + + + + + + + + + + + + + + + +
ConditionMagnitudeDurationChance
X
+ +
+
+
+ On every kill +
+ +
+ + - + +
+
+
+ +
+ + - + +
+
+
+ + + + + + + + + + + + + + + + + + +
ConditionMagnitudeDurationChance
X
+ +
+
+
diff --git a/AndorsTrailEdit/edit_itemcategory.html b/AndorsTrailEdit/edit_itemcategory.html index 5ebda8664..aacdb2312 100644 --- a/AndorsTrailEdit/edit_itemcategory.html +++ b/AndorsTrailEdit/edit_itemcategory.html @@ -1,5 +1,44 @@ -
-

id: {{obj.id}}

-
-
-
+

Item Category

+
+ General +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
diff --git a/AndorsTrailEdit/edit_quest.html b/AndorsTrailEdit/edit_quest.html index 3a627db60..a7eb427a1 100644 --- a/AndorsTrailEdit/edit_quest.html +++ b/AndorsTrailEdit/edit_quest.html @@ -23,6 +23,7 @@ Logtext Experience Finishes quest + diff --git a/AndorsTrailEdit/editor.html b/AndorsTrailEdit/editor.html index 34044c048..30d31c87b 100644 --- a/AndorsTrailEdit/editor.html +++ b/AndorsTrailEdit/editor.html @@ -82,230 +82,6 @@