From 2168cc963dbb233d7382ad773041f37deafc74cc Mon Sep 17 00:00:00 2001 From: hexall90 <hexall90@gmail.com> Date: Thu, 16 Nov 2017 21:50:58 +0100 Subject: [PATCH] stuff --- TODO.txt | 1 + src/SecExp/SecExpBackwardCompatibility.tw | 4 ++-- src/SecExp/secInit.tw | 2 +- src/SecExp/widgets/miscSecExpWidgets.tw | 4 ++-- src/uncategorized/securityForceEOWReport.tw | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/TODO.txt b/TODO.txt index 7cefdbf0cf3..bca793be71f 100644 --- a/TODO.txt +++ b/TODO.txt @@ -7,6 +7,7 @@ further development: -security based careers should have discount on secHQ upgrades -celebrity on propHub -more levels for militia edict (further militarize society) +-conquering other arcologies? Events: -famous criminal escapes to the arcology, followed by another arcology police force diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw index 3d9980107da..eaf41592179 100644 --- a/src/SecExp/SecExpBackwardCompatibility.tw +++ b/src/SecExp/SecExpBackwardCompatibility.tw @@ -751,8 +751,8 @@ <<if $militiaBaseHp != 3>> <<set $militiaBaseHp = 3 + $humanUpgrade.hp>> <</if>> -<<if $slaveBaseAttack != 9>> -<<set $slaveBaseAttack = 9 + $humanUpgrade.attack>> +<<if $slaveBaseAttack != 8>> +<<set $slaveBaseAttack = 8 + $humanUpgrade.attack>> <</if>> <<if $slaveBaseDefense != 3>> <<set $slaveBaseDefense = 3 + $humanUpgrade.defense>> diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw index b3c8a22ed88..83ca6c607bd 100644 --- a/src/SecExp/secInit.tw +++ b/src/SecExp/secInit.tw @@ -287,7 +287,7 @@ <<set $militiaBaseDefense = 5>> <<set $militiaBaseMorale = 140>> <<set $militiaBaseHp = 3>> -<<set $slaveBaseAttack = 9>> +<<set $slaveBaseAttack = 8>> <<set $slaveBaseDefense = 3>> <<set $slaveBaseMorale = 110>> <<set $slaveBaseHp = 3>> diff --git a/src/SecExp/widgets/miscSecExpWidgets.tw b/src/SecExp/widgets/miscSecExpWidgets.tw index 80ff90091e2..361685997d1 100644 --- a/src/SecExp/widgets/miscSecExpWidgets.tw +++ b/src/SecExp/widgets/miscSecExpWidgets.tw @@ -504,8 +504,8 @@ <<if $militiaBaseHp != 3 + $humanUpgrade.hp>> <<set $militiaBaseHp = 3 + $humanUpgrade.hp>> <</if>> - <<if $slaveBaseAttack != 9 + $humanUpgrade.attack>> - <<set $slaveBaseAttack = 9 + $humanUpgrade.attack>> + <<if $slaveBaseAttack != 8 + $humanUpgrade.attack>> + <<set $slaveBaseAttack = 8 + $humanUpgrade.attack>> <</if>> <<if $slaveBaseDefense != 3 + $humanUpgrade.defense>> <<set $slaveBaseDefense = 3 + $humanUpgrade.defense>> diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index d0a8463aa50..272f0ee8518 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/src/uncategorized/securityForceEOWReport.tw @@ -169,13 +169,13 @@ securityForceX */ /* If focus is secure trade, 95% of the above is added to the players rep/prosperity. Else, 25%. */ <<if $securityForceFocus == "secure">> <<set $rep += (Math.trunc($rep*($securityForceTrade*0.95)))>> - <<set $arcologies[0].prosperity = (Math.trunc($arcologies[0].prosperity*($securityForceTrade*0.95)))>> + <<set $arcologies[0].prosperity += (Math.trunc($arcologies[0].prosperity*($securityForceTrade*0.95)))>> <<elseif $securityForceFocus == "recruit">> <<set $rep += (Math.trunc($rep*($securityForceTrade*0.25)))>> - <<set $arcologies[0].prosperity = (Math.trunc($arcologies[0].prosperity*($securityForceTrade*0.25)))>> + <<set $arcologies[0].prosperity += (Math.trunc($arcologies[0].prosperity*($securityForceTrade*0.25)))>> <<elseif $securityForceFocus == "raiding">> <<set $rep += (Math.trunc($rep*($securityForceTrade*0.25)))>> - <<set $arcologies[0].prosperity = (Math.trunc($arcologies[0].prosperity*($securityForceTrade*0.25)))>> + <<set $arcologies[0].prosperity += (Math.trunc($arcologies[0].prosperity*($securityForceTrade*0.25)))>> <</if>> /* If the rep or prosperity is now above the cap, set it to the cap. */ -- GitLab