diff --git a/app/optimizer.js b/app/optimizer.js index 997b376..71eb1cf 100644 --- a/app/optimizer.js +++ b/app/optimizer.js @@ -25,12 +25,18 @@ var OptimizationEngine = (function () { for (var ih = curHeadIndex; ih < Context.Armory.Head.length; ih++) { if (Context.Armory.Head[ih].Enabled == false) continue; + if (Context.Armory.Head[ih].Weight > Context.Armory.AvailableWeight) + continue; for (var ic = 0; ic < Context.Armory.Chest.length; ic++) { if (Context.Armory.Chest[ic].Enabled == false) continue; + if (Context.Armory.Head[ih].Weight + Context.Armory.Chest[ic].Weight > Context.Armory.AvailableWeight) + continue; for (var ia = 0; ia < Context.Armory.Arms.length; ia++) { if (Context.Armory.Arms[ia].Enabled == false) continue; + if (Context.Armory.Head[ih].Weight + Context.Armory.Chest[ic].Weight + Context.Armory.Arms[ia].Weight > Context.Armory.AvailableWeight) + continue; for (var il = 0; il < Context.Armory.Legs.length; il++) { if (Context.Armory.Legs[il].Enabled == false) continue; diff --git a/app/optimizer.js.map b/app/optimizer.js.map index d943960..a50a96e 100644 --- a/app/optimizer.js.map +++ b/app/optimizer.js.map @@ -1 +1 @@ -{"version":3,"file":"optimizer.js","sourceRoot":"","sources":["optimizer.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"optimizer.js","sourceRoot":"","sources":["optimizer.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app/optimizer.ts b/app/optimizer.ts index ba18b4a..d9cc574 100644 --- a/app/optimizer.ts +++ b/app/optimizer.ts @@ -44,14 +44,20 @@ export class OptimizationEngine { for(var ih = curHeadIndex; ih < Context.Armory.Head.length; ih++) { if(Context.Armory.Head[ih].Enabled == false) continue; + if(Context.Armory.Head[ih].Weight > Context.Armory.AvailableWeight) + continue; for(var ic = 0; ic < Context.Armory.Chest.length; ic++) { if(Context.Armory.Chest[ic].Enabled == false) continue; + if(Context.Armory.Head[ih].Weight + Context.Armory.Chest[ic].Weight > Context.Armory.AvailableWeight) + continue; for(var ia = 0; ia < Context.Armory.Arms.length; ia++) { if(Context.Armory.Arms[ia].Enabled == false) continue; + if(Context.Armory.Head[ih].Weight + Context.Armory.Chest[ic].Weight + Context.Armory.Arms[ia].Weight > Context.Armory.AvailableWeight) + continue; for(var il = 0; il < Context.Armory.Legs.length; il++) { @@ -209,4 +215,4 @@ export interface IOptimizertContext { InnatePoise: number; -} \ No newline at end of file +}