diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index cda1e254b90241cadfe37e8ad67f458d9c22f218..cc7f9a0d9cba7769fb3258657cce8827d243207c 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -645,32 +645,6 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
Its lingua franca is $language.
-<span id="neighbors">
-<<link "View neighboring arcologies">>
- <<replace "#neighbors">>
-
- <<set $averageProsperity = 0>>
- <<set _neighboringArcologyCount = 0>>
- <<for $i = 0; $i < $arcologies.length; $i++>>
- <<set $averageProsperity += $arcologies[$i].prosperity>>
- <<set _neighboringArcologyCount += 1>>
- <</for>>
- <<set $averageProsperity = $averageProsperity/_neighboringArcologyCount>>
-
- <<for $i = 1; $i < $arcologies.length; $i++>>
- <<include "Neighbor Description">>
- <</for>>
-
- <<if $cheatMode == 1>>
- <br><br>[[Cheat Edit Neighboring Arcologies|MOD_Edit Neighbor Arcology Cheat]]
- <</if>>
-
- <br>
-
- <</replace>>
-<</link>>
-</span>
-
<<if $plot>>
<br>
<<if $peacekeepers != 0>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 8d00fdef4da1e3e3800e8fc1d28f97a908744f54..4487f3b491d16ae1fc4f31696c7f12ad28237abe 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -10,6 +10,17 @@
<<run delete $transaction>>
<</if>>
+<<set $averageProsperity = 0>>
+<<set _neighboringArcologyCount = 0>>
+<<for $i = 0; $i < $arcologies.length; $i++>>
+ <<set $averageProsperity += $arcologies[$i].prosperity>>
+ <<set _neighboringArcologyCount += 1>>
+<</for>>
+<<set $averageProsperity = $averageProsperity/_neighboringArcologyCount>>
+
+<<if $cheatMode == 1>>
+ [[Cheat Edit Neighboring Arcologies|MOD_Edit Neighbor Arcology Cheat]]<br><br>
+<</if>>
<<set $nextLink = "Manage Arcology", $nextButton = "Back">>
You have <<print $arcologies.length-1>> neighbors. <br><br>
@@ -154,7 +165,7 @@ You have <<print $arcologies.length-1>> neighbors. <br><br>
<<set $desc.push("Chinese Revivalism")>>
<</if>>
-<br><br>
+<br> <span id="Security"> <br>
<<if $desc.length == 0>>
Your arcology's culture has not developed to the point where it can meaningfully influence other arcologies.
<<elseif $desc.length > 2>>
@@ -173,7 +184,6 @@ You have <<print $arcologies.length-1>> neighbors. <br><br>
<</if>>
<br>
-<span id="Security">
<<for _currentNeighbor = 1; _currentNeighbor < $arcologies.length; _currentNeighbor++>>
<<capture _currentNeighbor>>
<<= App.currentAgent()>>
@@ -182,10 +192,13 @@ You have <<print $arcologies.length-1>> neighbors. <br><br>
<<link "$arcologies[_currentNeighbor].name">>
<<replace "#Security">>
<br>[[Back to the main diplomacy page|Neighbor Interact]]
+ <<set $i = _currentNeighbor>> <<include "Neighbor Description">><br>
- <br>You own ''$arcologies[_currentNeighbor].PCminority%'' of $arcologies[_currentNeighbor].name.
<<set _ownershipCost = 500*Math.trunc($arcologies[_currentNeighbor].prosperity*(1+($arcologies[_currentNeighbor].demandFactor/100)))>>
- A 1% interest in $arcologies[_currentNeighbor].name is worth <<print cashFormat(_ownershipCost)>> and will require a transaction cost of <<print cashFormat(10000)>> to acquire.
+ <br>A 1% interest in this arcology is worth <<print cashFormat(_ownershipCost)>>.
+ <<if ($arcologies[_currentNeighbor].ownership + $arcologies[_currentNeighbor].PCminority + $arcologies[_currentNeighbor].minority < 100)>>
+ The transaction fee is <<print cashFormat(10000)>>.
+ <</if>>
<<if ($arcologies[_currentNeighbor].ownership + $arcologies[_currentNeighbor].PCminority + $arcologies[_currentNeighbor].minority < 100)>>
<br>
<<link "Buy" "Neighbor Interact">>
@@ -193,7 +206,7 @@ You have <<print $arcologies.length-1>> neighbors. <br><br>
<<run cashX(-10000, "war")>>
<<set $arcologies[_currentNeighbor].PCminority += 1>>
<<set $arcologies[_currentNeighbor].demandFactor += 1*5>>
- <</link>>
+ <</link>>
<<if ($arcologies[_currentNeighbor].ownership + $arcologies[_currentNeighbor].PCminority + $arcologies[_currentNeighbor].minority <= 90)>>
<<if $cash > _ownershipCost*10>>
| <<link "10%" "Neighbor Interact">>
@@ -232,6 +245,7 @@ You have <<print $arcologies.length-1>> neighbors. <br><br>
<</link>>
<</if>>
<</if>>
+ <br>
<<if $arcologies[_currentNeighbor].direction !== $arcologies[0].embargoTarget>>
<br>[[Target them for economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = $arcologies[_currentNeighbor].direction]]
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 2a4e7b96ee1fcf7d0dfcc7ba4206cbdacd98858c..794c1dc399965ad5f2089494358f5aa24ceef6b3 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -1,20 +1,13 @@
:: Options [nobr]
-<<if ndef $storedLink>> <<set $storedLink = "Main">> <</if>>
-<<if ndef $storedButton>> <<set $storedButton = "Back">> <</if>>
<<if lastVisited("Slave Interact") === 1>>
<<set $storedLink = "Slave Interact">>
-<<elseif lastVisited("Slave Assignments Report") === 1>>
- <<set $storedLink = "Slave Assignments Report">>
<<else>>
<<set $storedLink = "Main">>
<</if>>
-<<if $storedLink === "Main" && $storedButton === "Back" && passage() === "Options">>
- <<set $storedButton = "Back to Main">>
-<</if>>
<<set $showEncyclopedia = 0>>
-<<set $nextButton = $storedButton, $nextLink = $storedLink>>
+<<set $nextButton = "Back", $nextLink = $storedLink>>
''SAVES''
<br>
This save was created using FC version $ver build $releaseID.
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index f099f7c765992a247382c90653fbce6c9ade7d1a..6e4cd897ba8cda9d3b741d4cb91dd410a0329fa8 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -666,7 +666,7 @@
<br> You lack the reputation to be invited to the underground Black Market.
<</if>>
<<if $secExp > 0 || $SF.Toggle && $SF.Active >= 1>> <br>
- <<link "Manage Security">> <<replace "#Security">> <br>
+ <<link "Manage Security">> <<replace "#Security">>
<<if $SF.Toggle && $SF.Active >= 1>>
<br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
<</if>>
@@ -688,7 +688,6 @@
<</if>>
</span>
<<elseif ["Dispensary", "Organ Farm", "Implant Manufactory", "Gene Lab", "Prosthetics Config"].includes(_Pass)>>
- <br>
<<if $dispensary && _Pass !== "Dispensary">> <br>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
<<if $organFarmUpgrade && _Pass !== "Organ Farm">> <br>[[Organ Farm|Organ Farm]]<</if>>
<<if $ImplantProductionUpgrade && _Pass !== "Implant Manufactory">> <br>[[Implant Manufactory|Implant Manufactory]]<</if>>
@@ -697,7 +696,6 @@
<<elseif _Pass == "Rules Assistant">>
<br><<link [[Rules Assistant Summary]]>><</link>>
<<elseif ["Firebase", "propagandaHub", "securityHQ", "secBarracks", "riotControlCenter"].includes(_Pass)>>
- <br>
<<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">>
<br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
<</if>>
@@ -717,7 +715,7 @@
<</if>>
<</if>>
-<<if $nextButton !== "Continue" || _Pass === "Slave Assignments Report">>
+<<if $nextButton !== "Continue">>
<br><br>
<<if !["Options", "Summary Options", "Description Options"].includes(_Pass)>>
<span id="optionsButton">