Changed calculation from Base Cost per Income to Return on Investment (Issue #3 (partly), #28, #52) with the formula from @svschouw and minor README edit
This commit is contained in:
73
src/Cache.js
73
src/Cache.js
@@ -24,70 +24,72 @@ CM.Cache.RemakeIncome = function() {
|
||||
CM.Sim.BuyBuildings(100, 'Objects100');
|
||||
}
|
||||
|
||||
CM.Cache.RemakeBuildingsBCI = function() {
|
||||
CM.Disp.min = -1;
|
||||
CM.Disp.max = -1;
|
||||
CM.Disp.mid = -1;
|
||||
CM.Cache.RemakeBuildingsROI = function() {
|
||||
CM.Cache.min = -1;
|
||||
CM.Cache.max = -1;
|
||||
CM.Cache.mid = -1;
|
||||
for (var i in CM.Cache.Objects) {
|
||||
CM.Cache.Objects[i].bci = Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus;
|
||||
if (CM.Disp.min == -1 || CM.Cache.Objects[i].bci < CM.Disp.min) CM.Disp.min = CM.Cache.Objects[i].bci;
|
||||
if (CM.Disp.max == -1 || CM.Cache.Objects[i].bci > CM.Disp.max) CM.Disp.max = CM.Cache.Objects[i].bci;
|
||||
//CM.Cache.Objects[i].roi = Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus;
|
||||
CM.Cache.Objects[i].roi = (Math.max(Game.Objects[i].getPrice() - Game.cookies, 0) / Game.cookiesPs) + (Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus);
|
||||
if (CM.Cache.min == -1 || CM.Cache.Objects[i].roi < CM.Cache.min) CM.Cache.min = CM.Cache.Objects[i].roi;
|
||||
if (CM.Cache.max == -1 || CM.Cache.Objects[i].roi > CM.Cache.max) CM.Cache.max = CM.Cache.Objects[i].roi;
|
||||
}
|
||||
CM.Disp.mid = ((CM.Disp.max - CM.Disp.min) / 2) + CM.Disp.min;
|
||||
CM.Cache.mid = ((CM.Cache.max - CM.Cache.min) / 2) + CM.Cache.min;
|
||||
for (var i in CM.Cache.Objects) {
|
||||
var color = '';
|
||||
if (CM.Cache.Objects[i].bci == CM.Disp.min) color = CM.Disp.colorGreen;
|
||||
else if (CM.Cache.Objects[i].bci == CM.Disp.max) color = CM.Disp.colorRed;
|
||||
else if (CM.Cache.Objects[i].bci > CM.Disp.mid) color = CM.Disp.colorOrange;
|
||||
if (CM.Cache.Objects[i].roi == CM.Cache.min) color = CM.Disp.colorGreen;
|
||||
else if (CM.Cache.Objects[i].roi == CM.Cache.max) color = CM.Disp.colorRed;
|
||||
else if (CM.Cache.Objects[i].roi > CM.Cache.mid) color = CM.Disp.colorOrange;
|
||||
else color = CM.Disp.colorYellow;
|
||||
CM.Cache.Objects[i].color = color;
|
||||
}
|
||||
}
|
||||
|
||||
CM.Cache.RemakeUpgradeBCI = function() {
|
||||
CM.Cache.RemakeUpgradeROI = function() {
|
||||
for (var i in CM.Cache.Upgrades) {
|
||||
CM.Cache.Upgrades[i].bci = Game.Upgrades[i].getPrice() / CM.Cache.Upgrades[i].bonus;
|
||||
if (isNaN(CM.Cache.Upgrades[i].bci)) CM.Cache.Upgrades[i].bci = 'Infinity';
|
||||
//CM.Cache.Upgrades[i].roi = Game.Upgrades[i].getPrice() / CM.Cache.Upgrades[i].bonus;
|
||||
CM.Cache.Upgrades[i].roi = (Math.max(Game.Upgrades[i].getPrice() - Game.cookies, 0) / Game.cookiesPs) + (Game.Upgrades[i].getPrice() / CM.Cache.Upgrades[i].bonus);
|
||||
if (isNaN(CM.Cache.Upgrades[i].roi)) CM.Cache.Upgrades[i].roi = 'Infinity';
|
||||
var color = '';
|
||||
if (CM.Cache.Upgrades[i].bci <= 0 || CM.Cache.Upgrades[i].bci == 'Infinity') color = CM.Disp.colorGray;
|
||||
else if (CM.Cache.Upgrades[i].bci < CM.Disp.min) color = CM.Disp.colorBlue;
|
||||
else if (CM.Cache.Upgrades[i].bci == CM.Disp.min) color = CM.Disp.colorGreen;
|
||||
else if (CM.Cache.Upgrades[i].bci == CM.Disp.max) color = CM.Disp.colorRed;
|
||||
else if (CM.Cache.Upgrades[i].bci > CM.Disp.max) color = CM.Disp.colorPurple;
|
||||
else if (CM.Cache.Upgrades[i].bci > CM.Disp.mid) color = CM.Disp.colorOrange;
|
||||
if (CM.Cache.Upgrades[i].roi <= 0 || CM.Cache.Upgrades[i].roi == 'Infinity') color = CM.Disp.colorGray;
|
||||
else if (CM.Cache.Upgrades[i].roi < CM.Cache.min) color = CM.Disp.colorBlue;
|
||||
else if (CM.Cache.Upgrades[i].roi == CM.Cache.min) color = CM.Disp.colorGreen;
|
||||
else if (CM.Cache.Upgrades[i].roi == CM.Cache.max) color = CM.Disp.colorRed;
|
||||
else if (CM.Cache.Upgrades[i].roi > CM.Cache.max) color = CM.Disp.colorPurple;
|
||||
else if (CM.Cache.Upgrades[i].roi > CM.Cache.mid) color = CM.Disp.colorOrange;
|
||||
else color = CM.Disp.colorYellow;
|
||||
CM.Cache.Upgrades[i].color = color;
|
||||
}
|
||||
}
|
||||
|
||||
CM.Cache.RemakeBuildingsOtherBCI = function(amount, target) {
|
||||
CM.Cache.RemakeBuildingsOtherROI = function(amount, target) {
|
||||
for (var i in CM.Cache[target]) {
|
||||
CM.Cache[target][i].price = CM.Sim.BuildingGetPrice(Game.Objects[i].basePrice, Game.Objects[i].amount, Game.Objects[i].free, amount);
|
||||
CM.Cache[target][i].bci = CM.Cache[target][i].price / CM.Cache[target][i].bonus;
|
||||
//CM.Cache[target][i].roi = CM.Cache[target][i].price / CM.Cache[target][i].bonus;
|
||||
CM.Cache[target][i].roi = (Math.max(CM.Cache[target][i].price - Game.cookies, 0) / Game.cookiesPs) + (CM.Cache[target][i].price / CM.Cache[target][i].bonus);
|
||||
var color = '';
|
||||
if (CM.Cache[target][i].bci <= 0 || CM.Cache[target][i].bci == 'Infinity') color = CM.Disp.colorGray;
|
||||
else if (CM.Cache[target][i].bci < CM.Disp.min) color = CM.Disp.colorBlue;
|
||||
else if (CM.Cache[target][i].bci == CM.Disp.min) color = CM.Disp.colorGreen;
|
||||
else if (CM.Cache[target][i].bci == CM.Disp.max) color = CM.Disp.colorRed;
|
||||
else if (CM.Cache[target][i].bci > CM.Disp.max) color = CM.Disp.colorPurple;
|
||||
else if (CM.Cache[target][i].bci > CM.Disp.mid) color = CM.Disp.colorOrange;
|
||||
if (CM.Cache[target][i].roi <= 0 || CM.Cache[target][i].roi == 'Infinity') color = CM.Disp.colorGray;
|
||||
else if (CM.Cache[target][i].roi < CM.Cache.min) color = CM.Disp.colorBlue;
|
||||
else if (CM.Cache[target][i].roi == CM.Cache.min) color = CM.Disp.colorGreen;
|
||||
else if (CM.Cache[target][i].roi == CM.Cache.max) color = CM.Disp.colorRed;
|
||||
else if (CM.Cache[target][i].roi > CM.Cache.max) color = CM.Disp.colorPurple;
|
||||
else if (CM.Cache[target][i].roi > CM.Cache.mid) color = CM.Disp.colorOrange;
|
||||
else color = CM.Disp.colorYellow;
|
||||
CM.Cache[target][i].color = color;
|
||||
}
|
||||
}
|
||||
|
||||
CM.Cache.RemakeBCI = function() {
|
||||
CM.Cache.RemakeROI = function() {
|
||||
// Buildings for 1 amount
|
||||
CM.Cache.RemakeBuildingsBCI();
|
||||
CM.Cache.RemakeBuildingsROI();
|
||||
|
||||
// Upgrades
|
||||
CM.Cache.RemakeUpgradeBCI();
|
||||
CM.Cache.RemakeUpgradeROI();
|
||||
|
||||
// Buildings for 10 amount
|
||||
CM.Cache.RemakeBuildingsOtherBCI(10, 'Objects10');
|
||||
CM.Cache.RemakeBuildingsOtherROI(10, 'Objects10');
|
||||
|
||||
// Buildings for 100 amount
|
||||
CM.Cache.RemakeBuildingsOtherBCI(100, 'Objects100');
|
||||
CM.Cache.RemakeBuildingsOtherROI(100, 'Objects100');
|
||||
}
|
||||
|
||||
CM.Cache.RemakeLucky = function() {
|
||||
@@ -189,6 +191,9 @@ CM.Cache.RemakeSellForChoEgg = function() {
|
||||
CM.Cache.SellForChoEgg = sellTotal;
|
||||
}
|
||||
|
||||
CM.Cache.min = -1;
|
||||
CM.Cache.max = -1;
|
||||
CM.Cache.mid = -1;
|
||||
CM.Cache.Lucky = 0;
|
||||
CM.Cache.LuckyReward = 0;
|
||||
CM.Cache.LuckyFrenzy = 0;
|
||||
|
||||
Reference in New Issue
Block a user