From 5e9fc44fdb4dc74abeefc75740b082d224e51ea2 Mon Sep 17 00:00:00 2001
From: x <okp57855@psoxs.com>
Date: Sun, 5 Aug 2018 20:20:11 +1200
Subject: [PATCH] Drop upgrade.
---
devNotes/twine JS.txt | 4 ----
src/SecExp/attackGenerator.tw | 3 ---
src/init/storyInit.tw | 2 +-
src/js/economyJS.tw | 4 ----
src/uncategorized/BackwardsCompatibility.tw | 3 +--
src/uncategorized/buildingWidgets.tw | 4 +---
src/uncategorized/costsReport.tw | 3 ---
src/uncategorized/manageArcology.tw | 6 ------
8 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 857e7d1f2b5..e218df1664f 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -2085,10 +2085,6 @@ window.getCost = function(array) {
if(State.variables.SFMODToggle === 1 && State.variables.SubsidyActive === 1) {
costs += ((100000*(State.variables.SFTroops/10))*1+(State.variables.arcologies[0].prosperity/100)*1+(State.variables.SFU/100));
}
-
- if(State.variables.arcologyUpgrade.field === 1) {
- costs *= 0.75;
- }
// clean up
if(costs < 0) {
diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw
index 007bfcd171d..09f29059c73 100644
--- a/src/SecExp/attackGenerator.tw
+++ b/src/SecExp/attackGenerator.tw
@@ -22,9 +22,6 @@
<<if $lastAttackWeeks >= 10>>
<<set _attackChance += 5>>
<</if>>
- <<if $arcologyUpgrade.field == 1>>
- <<set _attackChance -= 5>>
- <</if>>
<</if>>
/* battle frequency */
<<set _attackChance *= $battleFrequency>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 58dc2fbd8c3..8dc7801c3f8 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1008,7 +1008,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $repLoss = 0>>
<<set $cashLastWeek = 0>>
-<<set $arcologyUpgrade = {drones: 0, hydro: 0, apron: 0, grid: 0, spire: 0, field: 0}>>
+<<set $arcologyUpgrade = {drones: 0, hydro: 0, apron: 0, grid: 0, spire: 0}>>
<<set $AGrowth = 2>>
<<set $ACitizens = 4000>>
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 86f3505df95..92cf814e287 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -320,10 +320,6 @@ window.getCost = function(array) {
costs += ((100000*(State.variables.SFTroops/10))*1+(State.variables.arcologies[0].prosperity/100)*1+(State.variables.SFU/100));
}
- if(State.variables.arcologyUpgrade.field === 1) {
- costs *= 0.75;
- }
-
// clean up
if(costs < 0) {
costs = 0;
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 874671cd1af..db3a7fccafb 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -891,13 +891,12 @@
<</if>>
<<if ndef $arcologyUpgrade>>
- <<set $arcologyUpgrade = {drones: 0, hydro: 0, apron: 0, grid: 0, spire: 0}, field: 0>>
+ <<set $arcologyUpgrade = {drones: 0, hydro: 0, apron: 0, grid: 0, spire: 0}>>
<<set $arcologyUpgrade.drones = ($AProsperityCap > 60) ? 1 : 0>>
<<set $arcologyUpgrade.hydro = ($AProsperityCap > 80) ? 1 : 0>>
<<set $arcologyUpgrade.apron = ($AProsperityCap > 100) ? 1 : 0>>
<<set $arcologyUpgrade.grid = ($AProsperityCap > 120) ? 1 : 0>>
<<set $arcologyUpgrade.spire = ($AProsperityCap > 240) ? 1 : 0>>
- <<set $arcologyUpgrade.field = ($AProsperityCap > 500) ? 1 : 0>>
<</if>>
<<if def $AHelots>>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 98359a92568..2cf2b6f5dd9 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -218,10 +218,8 @@ Selling this sector would relinquish a 4% interest in $arcologies[0].name. Such
<<set $AProsperityCap = 60>>
<<elseif $arcologyUpgrade.spire != 1>>
<<set $AProsperityCap = 100>>
-<<elseif $arcologyUpgrade.field != 1>>
- <<set $AProsperityCap = 150>>
<<else>>
- <<set $AProsperityCap = 260>>
+ <<set $AProsperityCap = 150>>
<</if>>
<<set $ACitizenLimit = 0, $ASlaveLimit = 0, $Sweatshops = 0>>
<<if $arcologyUpgrade.spire == 1>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 24b81eb8c64..acc1fadba3d 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -562,6 +562,3 @@ trainer fees: <<print cashFormat(_cost)>>
<</if>>
<</if>>
<</if>>
-<<if $arcologyUpgrade.field === 1>>
- <br>The additional solar power generation provided by $securityForceName's arcology wide electromagnetic force field reduces upkeep by 25%.
-<</if>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 254c9724c85..599f3b3cf06 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -54,16 +54,10 @@ __Construction__
//The next major upgrade needed is an improvement of the arcology's electrical transmission lines to make efficient use of the additional power from the solar apron. This upgrade will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.// [[Upgrade transmission lines|Manage Arcology][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $arcologyUpgrade.grid = 1, $PC.engineering += 1]]
<<elseif $arcologyUpgrade.spire != 1>>
//The next major upgrade needed is the addition of a spire at the top of the arcology to increase the space available for the wealthiest citizens to own whole floors. This huge project will cost <<print cashFormat(Math.trunc(250000*$upgradeMultiplierArcology))>>.// [[Add spire|Manage Arcology][$cash -= Math.trunc(250000*$upgradeMultiplierArcology), $arcologyUpgrade.spire = 1, $sectors[1].type = "Apartments", $sectors[2].type = "Apartments", $sectors[3].type = "Apartments", $sectors[4].type = "Apartments", $sectors[1].ownership = 1, $sectors[2].ownership = 1, $sectors[3].ownership = 1, $sectors[4].ownership = 1, $PC.engineering += 1]]
-<<elseif $arcologyUpgrade.field != 1 && $Firebase >= 8 && $SFMODToggle === 1>>
- //The next major upgrade needed is the upgrading of the arcology wide electromagnetic force field to cloak and provide additional solar power generation.
- <<if ndef $cost>> <<set $cost = 50>> <</if>>
- You are commiting <<textbox "$cost" $cost "Manage Arcology">>% (@@.yellowgreen;<<print cashFormat(Math.ceil($cash*$cost/100))>>@@) of your cash resreves to this project.
- [[Apply|Manage Arcology][$cash -= $cash*$cost/100, $arcologyUpgrade.field = 1]]
<<else>>
//The arcology's public areas are fully upgraded.//
<</if>>
-<<if $arcologyUpgrade.field === 1>> <<unset $cost>> <</if>>
<br>
<<if $weatherCladding == 0>>
--
GitLab