From 4870fb8943c8b5f69ce2d789c954e8fd025b5ee5 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Fri, 15 Feb 2019 19:31:26 -0500
Subject: [PATCH] remove repX curving for cheat changes
---
src/js/economyJS.js | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 1ff71a07f7f..6beed17cf10 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -269,21 +269,21 @@ window.getSecurityExpansionCost = function() {
}
if (State.variables.militiaUnits != null) {
for (var i = 0; i < State.variables.militiaUnits.length; i++) {
- if( !(State.variables.militiaUnits[i] === null) ){
+ if( !(State.variables.militiaUnits[i] === null) ) {
secExpCost += State.variables.militiaUnits[i].troops * State.variables.soldierUpkeep * soldierMod;
}
}
}
if (State.variables.slaveUnits != null) {
for (var i = 0; i < State.variables.slaveUnits.length; i++) {
- if( !( State.variables.slaveUnits[i] === null) ){
+ if( !( State.variables.slaveUnits[i] === null) ) {
secExpCost += State.variables.slaveUnits[i].troops * State.variables.soldierUpkeep * 0.5 * soldierMod;
}
}
}
if (State.variables.mercUnits != null) {
for (var i = 0; i < State.variables.mercUnits.length; i++) {
- if( !(State.variables.mercUnits[i] === null) ){
+ if( !(State.variables.mercUnits[i] === null) ) {
secExpCost += State.variables.mercUnits[i].troops * State.variables.soldierUpkeep * 1.5 * soldierMod;
}
}
@@ -1122,7 +1122,7 @@ window.cashX = function(cost, what, who) {
}
//record the slave, if available
- if (typeof who !== 'undefined'){
+ if (typeof who !== 'undefined') {
who.lastWeeksCashIncome += cost;
who.lifetimeCashIncome += cost;
}
@@ -1139,8 +1139,8 @@ window.cashX = function(cost, what, who) {
}
//record the slave, if available
- if (typeof who !== 'undefined'){
- if (what === "slaveTransfer"){
+ if (typeof who !== 'undefined') {
+ if (what === "slaveTransfer") {
who.slaveCost = cost;
} else {
who.lifetimeCashExpenses += cost;
@@ -1166,13 +1166,15 @@ window.repX = function(rep, what, who) {
if(rep > 0) {
//record the slave, if available
- if (typeof who !== 'undefined'){
+ if (typeof who !== 'undefined') {
who.lastWeeksRepIncome += rep;
who.lifetimeRepIncome += rep;
}
//record the action
- if (typeof V.lastWeeksRepIncome[what] !== 'undefined') {
+ if (what === "cheating") {
+ V.lastWeeksRepIncome[what] += rep;
+ } else if (typeof V.lastWeeksRepIncome[what] !== 'undefined') {
rep = Math.round(Math.pow(1000 * rep + Math.pow(V.rep, 2), 0.5) - V.rep)* (V.corpEasy + 1);
V.lastWeeksRepIncome[what] += rep;
} else {
@@ -1191,7 +1193,7 @@ window.repX = function(rep, what, who) {
}
//record the slave, if available
- if (typeof who !== 'undefined'){
+ if (typeof who !== 'undefined') {
who.lastWeeksRepExpenses += rep;
who.lifetimeRepExpenses += rep;
}
--
GitLab