From 339ea8c3b35bb5f57010b86383a992b1b1778f0c Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Sun, 10 Dec 2017 05:14:05 +1300 Subject: [PATCH] fixes. --- src/SecExp/attackReport.tw | 12 ++++++------ src/SecExp/rebellionReport.tw | 18 +++++++++--------- src/uncategorized/arcmgmt.tw | 4 ++-- src/uncategorized/persBusiness.tw | 14 +++++++------- src/uncategorized/personalAssistantOptions.tw | 4 ++-- src/uncategorized/servantsQuarters.tw | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 490d909d2a2..f45911fc808 100644 --- a/src/SecExp/attackReport.tw +++ b/src/SecExp/attackReport.tw @@ -452,7 +452,7 @@ <<set $cash += _loot>> <br> Damage to the infrastructure was @@.yellow;virtually non-existent@@, costing only pocket cash to bring the structure back to normal. The inhabitants as well reported little to no injuries, because of this the prosperity of the arcology did not suffer. - <<set $cash -= 1000 * _majorBattleMod,$PC.engineering+= .1>>>> + <<set $cash -= 1000 * _majorBattleMod,$PC.engineering += .1>>>> <<if $PCvictoryStreak >= 3>> It seems your victories over the constant threats directed your way is having @@.green;a positive effect on the prosperity of the arcology@@, due to the security your leadership affords. <<set $arcologies[0].prosperity += 5 * _majorBattleMod>> @@ -474,7 +474,7 @@ <</if>> <br> In the raiding following the battle @@.red;the arcology sustained heavy damage@@, which will cost quite the amount of cash to fix. Reports of @@.red;citizens or slaves killed or missing@@ flood your office for a few days following the defeat. - <<set $cash -= 5000 * _majorBattleMod,$PC.engineering+= .1>>>> + <<set $cash -= 5000 * _majorBattleMod,$PC.engineering += .1>>>> <<if $week <= 30>> <<set $ACitizens -= random(100) * _majorBattleMod>> <<set $ASlaves -= random(150) * _majorBattleMod>> @@ -539,7 +539,7 @@ <<set $cash += _loot>> <br> Damage to the city was @@.red;limited@@, it won't take much to rebuild. Very few citizens or slaves were involved in the fight and even fewer met their end, safeguarding the prosperity of the arcology. - <<set $cash -= 2000 * _majorBattleMod,$PC.engineering+= .1>> + <<set $cash -= 2000 * _majorBattleMod,$PC.engineering += .1>> <<set $ACitizens -= random(10) * _majorBattleMod>> <<set $ASlaves -= random(20) * _majorBattleMod>> <<elseif $battleResult == -2>> @@ -560,7 +560,7 @@ <br> The enemy did not have the strength to raid the arcology for long, still @@.red;the arcology sustained some damage damage@@, which will cost a moderate amount of cash to fix. Some citizens and slaves found themselves on the wrong end of a gun and met their demise. Some business sustained heavy damage, slightly impacting the arcology's prosperity. - <<set $cash -= 3000 * _majorBattleMod,$PC.engineering+= .1>> + <<set $cash -= 3000 * _majorBattleMod,$PC.engineering += .1>> <<if $week <= 30>> <<set $ACitizens -= random(50) * _majorBattleMod>> <<set $ASlaves -= random(75) * _majorBattleMod>> @@ -599,7 +599,7 @@ <</if>> <br> The surrender allows the arcology to survive @@.red;mostly intact@@, however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days. - <<set $cash -= 1000 * _majorBattleMod,$PC.engineering+= .1>> + <<set $cash -= 1000 * _majorBattleMod,$PC.engineering += .1>> <<if $week <= 30>> <<set $ACitizens -= random(80) * _majorBattleMod>> <<set $ASlaves -= random(120) * _majorBattleMod>> @@ -639,7 +639,7 @@ <</if>> <br> Fortunately the arcology survives @@.yellow;mostly intact@@, however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days. - <<set $cash -= 1000,$PC.engineering+= .1>> + <<set $cash -= 1000,$PC.engineering += .1>> <<if $week <= 30>> <<set $ACitizens -= random(80) * _majorBattleMod>> <<set $ASlaves -= random(120) * _majorBattleMod>> diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw index e3061a2ae64..d7826d2dbb3 100644 --- a/src/SecExp/rebellionReport.tw +++ b/src/SecExp/rebellionReport.tw @@ -276,7 +276,7 @@ <<if $engageRule == 0>> Since you ordered your troops to limit their weaponry to low caliber or non lethal, the arcology reported only @@.red;minor damage@@. Most citizens and non involved slaves remained unharmed, though some casualties between the civilians were inevitable. A few businesses were looted and burned, but the damage was pretty limited. - <<set $arcRepairTime += 3,$PC.engineering+= .1>>>> + <<set $arcRepairTime += 3,$PC.engineering += .1>>>> <<if $week <= 30>> <<set $ACitizens -= random(40)>> <<set $ASlaves -= random(65)>> @@ -301,7 +301,7 @@ <<elseif $engageRule == 1>> You ordered your troops to limit their weaponry to non-heavy, non-explosive, because of this the arcology reported @@.red;moderate damage@@. Most citizens and non involved slaves remained unharmed or only lightly wounded, but many others did not make it. Unfortunately casualties between the civilians were inevitable. A few businesses were looted and burned, but the damage was pretty limited. - <<set $arcRepairTime += 5,$PC.engineering+= .1>>>> + <<set $arcRepairTime += 5,$PC.engineering += .1>>>> <<if $week <= 30>> <<set $ACitizens -= random(60)>> <<set $ASlaves -= random(85)>> @@ -326,7 +326,7 @@ <<elseif $engageRule == 2>> Since you did not apply any restriction on the weapons your forces should use, the arcology reported @@.red;heavy damage@@. Many citizens and uninvolved slaves are reported killed or missing. Casualties between the civilians were inevitable. Many businesses were damaged during the battle either by the fight itself, by fires which spread unchecked for hours or by looters. - <<set $arcRepairTime += 7,$PC.engineering+= .1>>>> + <<set $arcRepairTime += 7,$PC.engineering += .1>>>> <<if $week <= 30>> <<set $ACitizens -= random(100)>> <<set $ASlaves -= random(150)>> @@ -351,7 +351,7 @@ <<else>> Thanks to the advance riot control weaponry developed by your experts, the rebels were mostly subdued or killed with @@.yellow;little to no collateral damage to the arcology@@ and its inhabitants. A few businesses were looted, but the damage was very limited. - <<set $arcRepairTime += 2,$PC.engineering+= .1>>>> + <<set $arcRepairTime += 2,$PC.engineering += .1>>>> <<set $cash -= 1000>> <<if $week <= 30>> <<set $ACitizens -= random(20)>> @@ -388,7 +388,7 @@ <<if random(1,100) <= (75 - ($fort.reactor * 25))>> Unfortunately during the fighting a group of slaves infiltrated the reactor complex and sabotaged it, causing massive power fluctuations and blackouts. It will take @@.red;time and money to repair the damage@@. - <<set $garrison.reactorTime = $repairTime + random(1) - $fort.reactor,$PC.engineering+= .1>>>> + <<set $garrison.reactorTime = $repairTime + random(1) - $fort.reactor,$PC.engineering += .1>>>> <<set $cash -= 2000>> <<else>> While the reactor was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky. @@ -400,7 +400,7 @@ <<if random(1,100) <= (75 - ($fort.waterway * 25))>> Unfortunately during the fighting a group of slaves infiltrated the water management complex and sabotaged it, causing huge water leaks throughout the arcology and severely limiting the water supply. It will take @@.red;time and money to repair the damage@@. - <<set $garrison.waterwayTime = $repairTime + random(1) - $fort.waterway,$PC.engineering+= .1>>>> + <<set $garrison.waterwayTime = $repairTime + random(1) - $fort.waterway,$PC.engineering += .1>>>> <<set $cash -= 2000>> <<else>> While the water management complex was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky. @@ -412,7 +412,7 @@ <<if random(1,100) <= (75 - ($fort.assistant * 25))>> Unfortunately during the fighting a group of slaves infiltrated the facility housing $assistantName's mainframe and sabotaged it. Without its AI the arcology will be next to impossible to manage. It will take @@.red;time and money to repair the damage@@. - <<set $garrison.assistantTime = $repairTime + random(1) - $fort.assistant,$PC.engineering+= .1>>>> + <<set $garrison.assistantTime = $repairTime + random(1) - $fort.assistant,$PC.engineering += .1>>>> <<set $cash -= 2000>> <<else>> While the $assistantName's mainframe was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky. @@ -587,7 +587,7 @@ <</if>> <</if>> The damage to the structure will be @@.red;costly to repair@@. - <<set $cash -= 2000,$PC.engineering+= .1>>>> + <<set $cash -= 2000,$PC.engineering += .1>>>> <<else>> While the penthouse was left without a sizeable garrison, there was no dangerous assault against it. Let's hope we'll always be this lucky. <</if>> @@ -695,7 +695,7 @@ <</if>> <</if>> The damage to the structure will be @@.red;costly to repair@@. - <<set $cash -= 2000,$PC.engineering+= .1>>>> + <<set $cash -= 2000,$PC.engineering += .1>>>> <<else>> There was no sizeable assault against the penthouse. Let's hope we'll always be this lucky. <</if>> diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index e30203fc694..22a263a8d00 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -127,7 +127,7 @@ This week, <<if _flux > 0>>few to none<<else>>many<</if>> of $arcologies[0].name <<set _immigrants = Math.clamp(_immigrants - random(40,60), 0 , _immigrants)>> <<set $ACitizens -= random(10,20), $ASlaves -= random(10,20)>> <<set $garrison.waterwayTime-->> - <<set $PC.engineering+= .1>> + <<set $PC.engineering += .1>> <</if>> <</if>> <</if>> @@ -594,7 +594,7 @@ earning you @@.yellowgreen;¤_earnings.@@ The damage to the reactor caused by the last rebellion is extensive. Businesses and private citizens struggle to operate with the unreliable and limited energy production offered by the auxiliary generators. It will still take <<if $garrison.reactorTime> 1>>$garrison.reactorTime weeks<<else>>a week<</if>> to finish repair works. <<set _AWeekGrowth -= random(1,2)>> - <<set $garrison.reactorTime--,$PC.engineering+= .1>>>> + <<set $garrison.reactorTime--,$PC.engineering += .1>>>> <</if>> <</if>> <<set _AWeekGrowth = Math.trunc(0.5*_AWeekGrowth)>> diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw index 823aae92c03..8d04b9a1fa5 100644 --- a/src/uncategorized/persBusiness.tw +++ b/src/uncategorized/persBusiness.tw @@ -653,7 +653,7 @@ <<if $arcRepairTime > 0>> The recent rebellion left the arcology wounded and it falls to its owner to fix it. It will still take <<if $arcRepairTime > 1>>$arcRepairTime weeks<<else>>a week<</if>> to finish repair works. <<set $cash -= 5000>> - <<set $arcRepairTime--,$PC.engineering+= .1>> + <<set $arcRepairTime--,$PC.engineering += .1>> <</if>> <</if>> @@ -663,15 +663,15 @@ Routine upkeep of your demesne costs @@.yellow;¤$costs.@@ <<if $weatherToday.severity-$weatherCladding > 2>> <<set $weatherAwareness = 1>> <<if $weatherCladding == 1>> - <<set $seed = Math.trunc((($weatherToday.severity-3)*($arcologies[0].prosperity*random(50,100)))+random(1,100)),$PC.engineering+= .1>> + <<set $seed = Math.trunc((($weatherToday.severity-3)*($arcologies[0].prosperity*random(50,100)))+random(1,100)),$PC.engineering += .1>> $arcologies[0].name's hardened exterior only partially resisted the extreme weather this week, and it requires repairs costing @@.yellow;¤$seed.@@ Your citizens are @@.green;grateful@@ to you for upgrading $arcologies[0].name to provide a safe haven from the terrible climate. <<set $rep += 100>> <<elseif $weatherCladding == 2>> - <<set $seed to Math.trunc((($weatherToday.severity-4)*($arcologies[0].prosperity*random(50,100)))+random(1,100)),$PC.engineering+= .1>> + <<set $seed to Math.trunc((($weatherToday.severity-4)*($arcologies[0].prosperity*random(50,100)))+random(1,100)),$PC.engineering += .1>> $arcologies[0].name's hardened exterior only partially resisted the extreme weather this week, and it requires repairs costing @@.yellow;¤$seed.@@ Your citizens are @@.green;grateful@@ to you for upgrading $arcologies[0].name to provide a safe haven from the terrible climate. <<set $rep += 100>> <<else>> - <<set $seed = Math.trunc((($weatherToday.severity-2)*($arcologies[0].prosperity*random(50,100)))+random(1,100)),$PC.engineering+= .1>> + <<set $seed = Math.trunc((($weatherToday.severity-2)*($arcologies[0].prosperity*random(50,100)))+random(1,100)),$PC.engineering += .1>> Severe weather damaged the arcology this week, requiring repairs costing @@.yellow;¤$seed.@@ Your citizens are @@.red;unhappy@@ that the arcology has proven vulnerable to the terrible climate. <<set $rep -= 100>> <</if>> @@ -680,17 +680,17 @@ Routine upkeep of your demesne costs @@.yellow;¤$costs.@@ <<elseif $arcologies[0].FSRestartDecoration == 100>> Since you lack the resources to effect prompt repairs yourself, the Societal Elite cover for you. The arcology's prosperity is @@.red;is damaged@@, but your public rep is left intact. The Societal Elite @@.red;are troubled by your failure@@. <<if $arcologies[0].prosperity > 50>> - <<set $arcologies[0].prosperity -= random(5,10),$PC.engineering+= .1>> + <<set $arcologies[0].prosperity -= random(5,10),$PC.engineering += .1>> <</if>> <<set $failedElite += 100>> <<set $cash -= Math.trunc($seed/4)>> <<else>> Since you lack the resources to effect prompt repairs yourself, prominent citizens step in to repair their own parts of the arcology. This is @@.red;terrible for your reputation,@@ and it also @@.red;severely reduces the arcology's prosperity.@@ <<if $arcologies[0].prosperity > 50>> - <<set $arcologies[0].prosperity -= random(5,10),$PC.engineering+= .1>> + <<set $arcologies[0].prosperity -= random(5,10),$PC.engineering += .1>> <</if>> <<set $rep = Math.trunc($rep*0.8)>> - <<set $cash -= Math.trunc($seed/4),$PC.engineering+= .1>> + <<set $cash -= Math.trunc($seed/4),$PC.engineering += .1>> <</if>> <<elseif $weatherToday.severity-$weatherCladding == 2>> <<if $weatherCladding >= 1>> diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw index eefe495eb37..2ccc188846e 100644 --- a/src/uncategorized/personalAssistantOptions.tw +++ b/src/uncategorized/personalAssistantOptions.tw @@ -30,9 +30,9 @@ __Computer Core Upgrades__ <br> <<if $assistantPower == 0>> - //The first upgrade needed is a switch to a holographic memory core to store the immense quantity of data $assistantName gathers. This upgrade will cost ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $assistantPower += 1,$PC.engineering+= 1]] + //The first upgrade needed is a switch to a holographic memory core to store the immense quantity of data $assistantName gathers. This upgrade will cost ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $assistantPower += 1,$PC.engineering += 1]] <<elseif $assistantPower == 1>> - //The final upgrade needed is a transition to optical RAM. This huge project will cost ¤<<print Math.trunc(50000*$upgradeMultiplierArcology)>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $assistantPower += 1,$PC.engineering+= 1]] + //The final upgrade needed is a transition to optical RAM. This huge project will cost ¤<<print Math.trunc(50000*$upgradeMultiplierArcology)>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $assistantPower += 1,$PC.engineering += 1]] <<else>> //The arcology's computer core is fully upgraded.// <</if>> diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw index f672126eaf2..3eaeb50bd15 100644 --- a/src/uncategorized/servantsQuarters.tw +++ b/src/uncategorized/servantsQuarters.tw @@ -72,7 +72,7 @@ $servantsQuartersNameCaps <<set _Tmult0 = Math.trunc($servantsQuarters*1000*$upgradeMultiplierArcology)>> <br>$servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve. -[[Expand the Servants' Quarters|Servants' Quarters][$cash -= _Tmult0, $servantsQuarters += 5,,$PC.engineering += .1]] //Costs ¤_Tmult0// +[[Expand the Servants' Quarters|Servants' Quarters][$cash -= _Tmult0, $servantsQuarters += 5,$PC.engineering += .1]] //Costs ¤_Tmult0// <br> <<if $servantsQuartersUpgradeMonitoring == 1>> -- GitLab