From 8292db9c3f2ff358fab6054927a7fddcf91a3ca9 Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Mon, 18 Dec 2017 06:03:23 +1300
Subject: [PATCH] Additonal minor reformatting,converting,fixes and a new
option.
---
src/uncategorized/arcmgmt.tw | 2 +-
src/uncategorized/corporationDevelopments.tw | 10 ++++++++++
src/uncategorized/manageArcology.tw | 9 +++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 995667fd4c2..aa324429a21 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -312,7 +312,7 @@ You own
<<set _earnings += $helots*10>>
<</if>>
<</if>>
- <<if $helots > 1>>$helots menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
+ <<if $helots > 1>><<if $FormattedWithCommas == 0>> $helots <<else>> <<print commaNum($helots)>> <</if>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
<</if>>
<<if $menialBioreactors > 0>>
<<set _earnings += $menialBioreactors*(10+(10*$arcologies[0].FSPastoralistLaw))>>
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index 2df4babc673..19751005380 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -132,6 +132,8 @@ Shares in your corporation are trading at ¤$sharePrice:
You hold $personalShares shares personally while $publicShares are publicly held.
<span id="CorpAction">
+<br><br>
+<<if $cash > 1000*$sharePrice>>
<br>Purchase shares from corporation:
<<if $cash > 1000*$sharePrice>>
<<link "1000">><<set $personalShares += 1000>><<set $cash -= 1000*$sharePrice>><<set $corpCash += 1000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 1000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>>
@@ -143,6 +145,9 @@ You hold $personalShares shares personally while $publicShares are publicly held
<<link "15000">><<set $personalShares += 15000>><<set $cash -= 15000*$sharePrice>><<set $corpCash += 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 15000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>>
<<if $cash > 20000*$sharePrice>>
<<link "20000">><<set $personalShares += 20000>><<set $cash -= 20000*$sharePrice>><<set $corpCash += 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 20000 shares from the corporation, driving the share price up massively.">><</replace>><</link>><</if>>
+<<else>>
+You are unable to purchase 1000 shares at the current share price.
+<</if>>
<br>Issue new shares:
<<if $personalShares-1000 > $publicShares>>
@@ -172,6 +177,7 @@ You hold $personalShares shares personally while $publicShares are publicly held
<<if $personalShares-20000 > $publicShares>>
<<link "20000">><<set $personalShares -= 20000>><<set $publicShares += 20000>><<set $cash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 20000 shares, driving the share price down massively.">><</replace>><</link>><</if>>
+<<if $cash > 1000*$sharePrice>>
<br>Buy publicly held shares:
<<if _PublicOwnershipPercentage <= 5>>//You cannot make the corporation privately held.//<</if>>
<<if _PublicOwnershipPercentage < 49 && $publicShares > 1000 && $cash >= 1000*$sharePrice>>
@@ -184,7 +190,11 @@ You hold $personalShares shares personally while $publicShares are publicly held
<<link "15000">><<set $personalShares += 15000>><<set $publicShares -= 15000>><<set $cash -= 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 15000 shares, driving the share price up slightly.">><</replace>><</link>><</if>>
<<if $publicShares >= 20000 && $cash >= 20000*$sharePrice>>
<<link "20000">><<set $personalShares += 20000>><<set $publicShares -= 20000>><<set $cash -= 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 20000 shares, driving the share price up massively.">><</replace>><</link>><</if>>
+<<else>>
+You are unable to purchase 1000 shares at the current share price.
+<</if>>
</span>
+<br><br>
<br>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 35539bc4017..33f7e199993 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -88,6 +88,15 @@ __Construction__
You have installed the FCTV receiver and have access to the full range of FCTV's programs. Low viewership rates amongst your citizens limits the impact of FCTV on your societal goals.
<</if>>
+<br>
+
+<<if $FormattedWithCommas == 0>>
+ <<set $GenericProsperityImporvementCost = Math.trunc($cash*.10)>> <<else>> <<set $GenericProsperityImporvementCost = cashFormat(Math.trunc($cash*.10))>>
+<</if>>
+<<link "Increase the maxium prosperity of $arcologies[0].name">>
+ <<set $AProsperityCap += 5, $cash -= $GenericProsperityImporvementCost>>
+ <<goto "Manage Arcology">>
+<</link>> <br>// This will cost 10% of your current cash which is <<print $GenericProsperityImporvementCost>>.
<<if $secExp == 1>>
<br>
<br>
--
GitLab