From 615846e5f9bca1defb4bbd9615b82faf395ad23a Mon Sep 17 00:00:00 2001
From: Blank <okp57855@psoxs.com>
Date: Sat, 23 Jun 2018 04:48:33 -0700
Subject: [PATCH] Revert "Inital commit"
This reverts commit 9ca8c3edae77f643d951850d47d51e1720bd60da
---
.../mod_EditNeighborArcologyCheatWidget.tw | 212 ++++++++----------
src/events/intro/initNationalities.tw | 4 +-
src/pregmod/managePersonalAffairs.tw | 23 +-
src/uncategorized/BackwardsCompatibility.tw | 6 -
src/uncategorized/endWeek.tw | 12 -
src/uncategorized/managePenthouse.tw | 8 +-
src/uncategorized/neighborInteract.tw | 19 +-
src/uncategorized/neighborsDevelopment.tw | 35 +--
src/uncategorized/persBusiness.tw | 32 +--
src/utility/slaveCreationWidgets.tw | 6 +-
10 files changed, 120 insertions(+), 237 deletions(-)
diff --git a/src/cheats/mod_EditNeighborArcologyCheatWidget.tw b/src/cheats/mod_EditNeighborArcologyCheatWidget.tw
index 04fd5662e44..897f49b9f4f 100644
--- a/src/cheats/mod_EditNeighborArcologyCheatWidget.tw
+++ b/src/cheats/mod_EditNeighborArcologyCheatWidget.tw
@@ -8,64 +8,64 @@
''Arcology _i name:'' $arcologies[_i].name
<br><<textbox "$arcologies[_i].name" $arcologies[_i].name "MOD_Edit Neighbor Arcology Cheat">>
-
+
<br>
'' $arcologies[_i].name direction:'' $arcologies[_i].direction
- <br><<radiobutton "$arcologies[_i].direction" "north">> north
- | <<radiobutton "$arcologies[_i].direction" "northeast">> northeast
- | <<radiobutton "$arcologies[_i].direction" "east">> east
- | <<radiobutton "$arcologies[_i].direction" "southeast">> southeast
- | <<radiobutton "$arcologies[_i].direction" "south">> south
- | <<radiobutton "$arcologies[_i].direction" "southwest">> southeast
- | <<radiobutton "$arcologies[_i].direction" "west">> west
- | <<radiobutton "$arcologies[_i].direction" "northwest">> northwest
-
- <br>
-
+ <br><<radiobutton "$arcologies[_i].direction" "north">> north
+ | <<radiobutton "$arcologies[_i].direction" "northeast">> northeast
+ | <<radiobutton "$arcologies[_i].direction" "east">> east
+ | <<radiobutton "$arcologies[_i].direction" "southeast">> southeast
+ | <<radiobutton "$arcologies[_i].direction" "south">> south
+ | <<radiobutton "$arcologies[_i].direction" "southwest">> southeast
+ | <<radiobutton "$arcologies[_i].direction" "west">> west
+ | <<radiobutton "$arcologies[_i].direction" "northwest">> northwest
+
+ <br>
+
'' $arcologies[_i].name government:'' $arcologies[_i].government
- <br><<radiobutton "$arcologies[_i].government" "elected officials">> elected officials
- | <<radiobutton "$arcologies[_i].government" "a committee">> a committee
- | <<radiobutton "$arcologies[_i].government" "an oligarchy">> an oligarchy
- | <<radiobutton "$arcologies[_i].government" "an individual">> an individual
- | <<radiobutton "$arcologies[_i].government" "a corporation">> a corporation
- | <<radiobutton "$arcologies[_i].government" "direct democracy">> direct democracy
- | <<radiobutton "$arcologies[_i].government" "your trustees">> your trustees
- | <<radiobutton "$arcologies[_i].government" "your agent">> your agent
-
- <br>
-
+ <br><<radiobutton "$arcologies[_i].government" "elected officials">> elected officials
+ | <<radiobutton "$arcologies[_i].government" "a committee">> a committee
+ | <<radiobutton "$arcologies[_i].government" "an oligarchy">> an oligarchy
+ | <<radiobutton "$arcologies[_i].government" "an individual">> an individual
+ | <<radiobutton "$arcologies[_i].government" "a corporation">> a corporation
+ | <<radiobutton "$arcologies[_i].government" "direct democracy">> direct democracy
+ | <<radiobutton "$arcologies[_i].government" "your trustees">> your trustees
+ | <<radiobutton "$arcologies[_i].government" "your agent">> your agent
+
+ <br>
+
'' $arcologies[_i].name honeymoon:'' $arcologies[_i].honeymoon
<br><<textbox "$arcologies[_i].honeymoon" $arcologies[_i].honeymoon>>
-
+
<br>
-
+
'' $arcologies[_i].name prosperity:'' $arcologies[_i].prosperity
<br><<textbox "$arcologies[_i].prosperity" $arcologies[_i].prosperity>>
-
+
<br>
-
+
'' $arcologies[_i].name ownership:'' $arcologies[_i].ownership
<br><<textbox "$arcologies[_i].ownership" $arcologies[_i].ownership>>
-
+
<br>
-
+
'' $arcologies[_i].name minority ownership:'' $arcologies[_i].minority
<br><<textbox "$arcologies[_i].minority" $arcologies[_i].minority>>
-
+
<br>
-
+
'' $arcologies[_i].name player ownership:'' $arcologies[_i].PCminority
<br><<textbox "$arcologies[_i].PCminority" $arcologies[_i].PCminority>>
<br>
'' $arcologies[_i].name demand factor:'' $arcologies[_i].demandFactor
<br><<textbox "$arcologies[_i].demandFactor" $arcologies[_i].demandFactor>>
-
+
<br>
'' $arcologies[_i].name Supremacist (unset or 1-100):'' $arcologies[_i].FSSupremacist
<br><<textbox "$arcologies[_i].FSSupremacist" $arcologies[_i].FSSupremacist>>
-
+
<br>
'' $arcologies[_i].name Supremacist race:'' $arcologies[_i].FSSupremacistRace
<br><<radiobutton "$arcologies[_i].FSSupremacistRace" white>> White |
@@ -79,14 +79,14 @@
<<radiobutton "$arcologies[_i].FSSupremacistRace" southern european>> Southern European |
<<radiobutton "$arcologies[_i].FSSupremacistRace" semitic>> Semitic |
<<radiobutton "$arcologies[_i].FSSupremacistRace" mixed race>> Mixed Race
-
+
<br>
-
+
'' $arcologies[_i].name Subjugationist (unset or 1-100):'' $arcologies[_i].FSSubjugationist
<br><<textbox "$arcologies[_i].FSSubjugationist" $arcologies[_i].FSSubjugationist>>
-
+
<br>
-
+
'' $arcologies[_i].name Subjugationist race:'' $arcologies[_i].FSSubjugationistRace
<br><<radiobutton "$arcologies[_i].FSSubjugationistRace" white>> White |
<<radiobutton "$arcologies[_i].FSSubjugationistRace" asian>> Asian |
@@ -99,170 +99,142 @@
<<radiobutton "$arcologies[_i].FSSubjugationistRace" southern european>> Southern European |
<<radiobutton "$arcologies[_i].FSSubjugationistRace" semitic>> Semitic |
<<radiobutton "$arcologies[_i].FSSubjugationistRace" mixed race>> Mixed Race
-
+
<br>
-
+
'' $arcologies[_i].name Gender Radicalist (unset or 1-100):'' $arcologies[_i].FSGenderRadicalist
<br><<textbox "$arcologies[_i].FSGenderRadicalist" $arcologies[_i].FSGenderRadicalist>>
-
+
<br>
-
+
'' $arcologies[_i].name Gender Fundamentalist (unset or 1-100):'' $arcologies[_i].FSGenderFundamentalist
<br><<textbox "$arcologies[_i].FSGenderFundamentalist" $arcologies[_i].FSGenderFundamentalist>>
-
+
<br>
-
+
'' $arcologies[_i].name Paternalist (unset or 1-100):'' $arcologies[_i].FSPaternalist
<br><<textbox "$arcologies[_i].FSPaternalist" $arcologies[_i].FSPaternalist>>
-
+
<br>
-
+
'' $arcologies[_i].name Degradationist (unset or 1-100):'' $arcologies[_i].FSDegradationist
<br><<textbox "$arcologies[_i].FSDegradationist" $arcologies[_i].FSDegradationist>>
-
+
<br>
-
+
'' $arcologies[_i].name Body Purist (unset or 1-100):'' $arcologies[_i].FSBodyPurist
<br><<textbox "$arcologies[_i].FSBodyPurist" $arcologies[_i].FSBodyPurist>>
-
+
<br>
-
+
'' $arcologies[_i].name Transformation Fetishist (unset or 1-100):'' $arcologies[_i].FSTransformationFetishist
<br><<textbox "$arcologies[_i].FSTransformationFetishist" $arcologies[_i].FSTransformationFetishist>>
-
+
<br>
-
+
'' $arcologies[_i].name Youth Preferentialist (unset or 1-100):'' $arcologies[_i].FSYouthPreferentialist
<br><<textbox "$arcologies[_i].FSYouthPreferentialist" $arcologies[_i].FSYouthPreferentialist>>
-
+
<br>
-
+
'' $arcologies[_i].name Maturity Preferentialist (unset or 1-100):'' $arcologies[_i].FSMaturityPreferentialist
<br><<textbox "$arcologies[_i].FSMaturityPreferentialist" $arcologies[_i].FSMaturityPreferentialist>>
-
+
<br>
-
+
'' $arcologies[_i].name Slimness Enthusiast (unset or 1-100):'' $arcologies[_i].FSSlimnessEnthusiast
<br><<textbox "$arcologies[_i].FSSlimnessEnthusiast" $arcologies[_i].FSSlimnessEnthusiast>>
-
+
<br>
-
+
'' $arcologies[_i].name Asset Expansionist (unset or 1-100):'' $arcologies[_i].FSAssetExpansionist
<br><<textbox "$arcologies[_i].FSAssetExpansionist" $arcologies[_i].FSAssetExpansionist>>
-
+
<br>
-
+
'' $arcologies[_i].name Pastoralist (unset or 1-100):'' $arcologies[_i].FSPastoralist
<br><<textbox "$arcologies[_i].FSPastoralist" $arcologies[_i].FSPastoralist>>
-
+
<br>
-
+
'' $arcologies[_i].name Physical Idealist (unset or 1-100):'' $arcologies[_i].FSPhysicalIdealist
<br><<textbox "$arcologies[_i].FSPhysicalIdealist" $arcologies[_i].FSPhysicalIdealist>>
-
+
<br>
-
+
'' $arcologies[_i].name Chattel Religionist (unset or 1-100):'' $arcologies[_i].FSChattelReligionist
<br><<textbox "$arcologies[_i].FSChattelReligionist" $arcologies[_i].FSChattelReligionist>>
-
+
<br>
-
+
'' $arcologies[_i].name Roman Revivalist (unset or 1-100):'' $arcologies[_i].FSRomanRevivalist
<br><<textbox "$arcologies[_i].FSRomanRevivalist" $arcologies[_i].FSRomanRevivalist>>
-
+
<br>
-
+
'' $arcologies[_i].name Aztec Revivalist (unset or 1-100):'' $arcologies[_i].FSAztecRevivalist
<br><<textbox "$arcologies[_i].FSAztecRevivalist" $arcologies[_i].FSAztecRevivalist>>
-
+
<br>
-
+
'' $arcologies[_i].name Egyptian Revivalist (unset or 1-100):'' $arcologies[_i].FSEgyptianRevivalist
<br><<textbox "$arcologies[_i].FSEgyptianRevivalist" $arcologies[_i].FSEgyptianRevivalist>>
-
+
<br>
-
+
'' $arcologies[_i].name Edo Revivalist (unset or 1-100):'' $arcologies[_i].FSEdoRevivalist
<br><<textbox "$arcologies[_i].FSEdoRevivalist" $arcologies[_i].FSEdoRevivalist>>
-
+
<br>
-
+
'' $arcologies[_i].name Arabian Revivalist (unset or 1-100):'' $arcologies[_i].FSArabianRevivalist
<br><<textbox "$arcologies[_i].FSArabianRevivalist" $arcologies[_i].FSArabianRevivalist>>
-
+
<br>
-
+
'' $arcologies[_i].name Chinese Revivalist (unset or 1-100):'' $arcologies[_i].FSChineseRevivalist
<br><<textbox "$arcologies[_i].FSChineseRevivalist" $arcologies[_i].FSChineseRevivalist>>
-
+
<br>
-
+
'' $arcologies[_i].name FSNull (unset or 1-100):'' $arcologies[_i].FSNull
<br><<textbox "$arcologies[_i].FSNull" $arcologies[_i].FSNull>>
-
+
<br>
-
+
'' $arcologies[_i].name Repopulation Focus (unset or 1-100):'' $arcologies[_i].FSRepopulationFocus
<br><<textbox "$arcologies[_i].FSRepopulationFocus" $arcologies[_i].FSRepopulationFocus>>
-
+
<br>
-
+
'' $arcologies[_i].name FSRestart (unset or 1-100):'' $arcologies[_i].FSRestart
<br><<textbox "$arcologies[_i].FSRestart" $arcologies[_i].FSRestart>>
-
+
<br>
-
+
'' $arcologies[_i].name embargo (1 to 3):'' $arcologies[_i].embargo
<br><<textbox "$arcologies[_i].embargo" $arcologies[_i].embargo>>
-
+
<br>
-
+
'' $arcologies[_i].name embargoTarget (0 to 7):'' $arcologies[_i].embargoTarget
<br><<textbox "$arcologies[_i].embargoTarget" $arcologies[_i].embargoTarget>>
-
+
<br>
-
+
'' $arcologies[_i].name influenceTarget:'' $arcologies[_i].influenceTarget
<br><<textbox "$arcologies[_i].influenceTarget" $arcologies[_i].influenceTarget>>
-
+
<br>
-
+
'' $arcologies[_i].name influenceBonus:'' $arcologies[_i].influenceBonus
<br><<textbox "$arcologies[_i].influenceBonus" $arcologies[_i].influenceBonus>>
-
+
<br>
-
+
'' $arcologies[_i].name rival (0 or 1):'' $arcologies[_i].rival
<br><<textbox "$arcologies[_i].rival" $arcologies[_i].rival>>
-
- <br>
-
- '' $arcologies[_i].name embargo (1 to 3):'' $arcologies[_i].CyberEconomic
- <br><<textbox "$arcologies[_i].embargo" $arcologies[_i].CyberEconomic>>
-
+
<br>
- '' $arcologies[_i].name embargoTarget (0 to 7):'' $arcologies[_i].CyberEconomicTarget
- <br><<textbox "$arcologies[_i].embargoTarget" $arcologies[_i].CyberEconomicTarget>>
-
- <br>
-
- '' $arcologies[_i].name embargo (1 to 3):'' $arcologies[_i].CyberReputation
- <br><<textbox "$arcologies[_i].embargo" $arcologies[_i].CyberReputation>>
-
- <br>
-
- '' $arcologies[_i].name embargoTarget (0 to 7):'' $arcologies[_i].CyberReputationTarget
- <br><<textbox "$arcologies[_i].embargoTarget" $arcologies[_i].CyberReputationTarget>>
-
- <br>
-
- '' $arcologies[_i].name embargo (1 to 3):'' $arcologies[_i].CumReciver
- <br><<textbox "$arcologies[_i].embargo" $arcologies[_i].CumReciver>>
-
- <br>
-
- '' $arcologies[_i].name embargoTarget (0 to 7):'' $arcologies[_i].CumTarget
- <br><<textbox "$arcologies[_i].embargoTarget" $arcologies[_i].CumTarget>>
-
<</widget>>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index f6b44ed6122..ad76b9edcae 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -96,10 +96,10 @@
<<set _seed = ["east", "north", "northeast", "northwest", "south", "southeast", "southwest", "west"]>>
<<set _govtypes = ["a committee", "a corporation", "an individual", "an oligarchy", "direct democracy", "elected officials"]>>
-
+
<<set $neighboringArcologies = Math.clamp($neighboringArcologies, 0, 8)>>
<<for $i = 0; $i <= $neighboringArcologies; $i++>>
- <<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", leaderID: 0, honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor: 0, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSAztecRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, CyberEconomic: 1, CyberEconomicTarget: -1, CyberReputation: 1, CyberReputationTarget: -1, CumReciver: 1, CumTarget: -1, rival: 0, FSRestart: "unset", FSRepopulationFocus: "unset", FSHedonisticDecadence: "unset", FSCummunism: "unset", FSIncestFetishist: "unset", FSGenderRadicalistResearch: 0, FSGenderFundamentalistResearch: 0, FSPaternalistResearch: 0, FSDegradationistResearch: 0, FSBodyPuristResearch: 0, FSTransformationFetishistResearch: 0, FSYouthPreferentialistResearch: 0, FSMaturityPreferentialistResearch: 0, FSSlimnessEnthusiastResearch: 0, FSAssetExpansionistResearch: 0, FSPastoralistResearch: 0, FSPhysicalIdealistResearch: 0, FSRepopulationFocusResearch: 0, FSRestartResearch: 0, FSHedonisticDecadenceResearch: 0, FSHedonisticDecadenceDietResearch: 0, FSCummunismResearch: 0, FSIncestFetishistResearch: 0}>>
+ <<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", leaderID: 0, honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor: 0, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSAztecRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, CyberEconomic: 1, CyberEconomicTarget: -1, CyberReputation: 1, CyberReputationTarget: -1, rival: 0, FSRestart: "unset", FSRepopulationFocus: "unset", FSHedonisticDecadence: "unset", FSCummunism: "unset", FSIncestFetishist: "unset", FSGenderRadicalistResearch: 0, FSGenderFundamentalistResearch: 0, FSPaternalistResearch: 0, FSDegradationistResearch: 0, FSBodyPuristResearch: 0, FSTransformationFetishistResearch: 0, FSYouthPreferentialistResearch: 0, FSMaturityPreferentialistResearch: 0, FSSlimnessEnthusiastResearch: 0, FSAssetExpansionistResearch: 0, FSPastoralistResearch: 0, FSPhysicalIdealistResearch: 0, FSRepopulationFocusResearch: 0, FSRestartResearch: 0, FSHedonisticDecadenceResearch: 0, FSHedonisticDecadenceDietResearch: 0, FSCummunismResearch: 0, FSIncestFetishistResearch: 0}>>
<<if $i == 0>>
<<set $activeArcology.direction = 0>>
<<set $activeArcology.name = "Arcology X-4">>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 05752a67470..c46da7508ce 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -1,5 +1,5 @@
-:: Manage Personal Affairs [nobr]
-
+:: Manage Personal Affairs [nobr]
+
<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 0>>
<<PCTitle>>
@@ -77,7 +77,7 @@ Around back;
<<if $PC.origHColor != "white">>| [[White|Manage Personal Affairs][$PC.hColor = "white"]]<</if>>
<<if $PC.origHColor != "blue-violet">>| [[Blue-Violet|Manage Personal Affairs][$PC.hColor = "blue-violet"]]<</if>>
-<<if $FCTVreceiver == 1>>
+<<if $FCTVreceiver == 1>>
<br><br>
<<if $FCTVrate == 1>>
You make sure to tune in to FCTV at least once a week. [[Watch every other week|Manage Personal Affairs][$FCTVrate = 2]] | [[Watch once a month|Manage Personal Affairs][$FCTVrate = 4]] | [[Ignore it|Manage Personal Affairs][$FCTVrate = -1]]
@@ -274,7 +274,7 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref
<br>
<span id="nameResult">
-<<link "Rename yourself">>
+<<link "Rename yourself">>
<<replace "#nameResult">>
New name: <<textbox "_PCNamet" $PC.name>>
<<link "Apply">>
@@ -408,7 +408,7 @@ In total, you have given birth to:
<<if $PC.preg >= 8>>
You're currently <<print $PC.preg>> week<<if $PC.preg > 1>>s<</if>> pregnant, so contraception doesn't matter right now.
<<elseif $PC.preg >= 6>>
- You're having morning sickness.
+ You're having morning sickness.
<<elseif $PC.preg > 1>>
You've missed your period. This could be bad.
<<elseif $PC.preg > 0 && $PC.pregSource != -1>>
@@ -424,7 +424,7 @@ In total, you have given birth to:
You're currently fertile.
[[Start taking birth control|Manage Personal Affairs][$PC.preg = -1, $PC.fertDrugs = 0]]
<br>
- <<if $PC.fertDrugs == 1>>
+ <<if $PC.fertDrugs == 1>>
You are currently taking fertility supplements.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>> [[Stop taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 0]]
<<else>>
You are not on any fertility supplements.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>> [[Start taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 1]]
@@ -516,17 +516,6 @@ In total, you have given birth to:
<</if>>
-<<if $TesticleCloner == 1>>
- <<if $TesticleSampleWeeklyAge >= 25 || $InitalClonerSetup == 1 || $ClonerFailed == 1>>
- [[Provide a fresh tissue sample|Manage Penthouse][$TesticleSampleWeeklyAge = 0]]
- <</if>>
- <<if $TesticleClonerSpeed == 1>>
- The cloner is working at the stock speed [[Speed up the cloning process by using after market parts|Manage Penthouse][$cash -= Math.trunc(4750000*$upgradeMultiplierArcology), TesticleClonerSpeed = 2]]//Costs <<print cashFormat(Math.trunc(4750000*$upgradeMultiplierArcology))>>//
- <<elseif $TesticleClonerSpeed == 2 && $PC.hacking > 75>>
- The cloner is working at a none factory speed [[Speed up the cloning process by overcloking|Manage Penthouse][$cash -= Math.trunc(4850000*$upgradeMultiplierArcology), TesticleClonerSpeed = 3]]//Costs <<print cashFormat(Math.trunc(4850000*$upgradeMultiplierArcology))>>//
- <<else>>
- The cloner is working outside official limits.
- <</if>>
<br><br>
__Drugs__
<br>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 5e65601c14e..c5c6985ff84 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1049,12 +1049,6 @@
<<if ndef $arcologies[0].CyberReputationTarget>>
<<set $arcologies[0].CyberReputationTarget = -1>>
<</if>>
-<<if ndef $arcologies[0].CumReciver>>
- <<set $arcologies[0].CumReciver = 1>>
-<</if>>
-<<if ndef $arcologies[0].CumTarget>>
- <<set $arcologies[0].CumTarget = -1>>
-<</if>>
<<if ndef $arcologies[0].rival>>
<<set $arcologies[0].rival = 0>>
<</if>>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index 62f6f1aedad..615f2868625 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -161,18 +161,6 @@
<<set $PC.pregWeek++>>
<</if>>
-<<if $TesticleClonerSpeed >= 1>>
- <<if $TesticleSampleWeeklyAge < 25>>
- <<set $PC.storedCum += 2*$TesticleClonerSpeed>>
- <<else>>
- <<set $PC.storedCum += .25*$TesticleClonerSpeed>>
- <</if>>
- <<set _ClonerFailureRate = 5*$TesticleClonerSpeed>>
- <<if _ClonerFailureRate > random(_ClonerFailureRate,100)>>
- <<set $ClonerFailed = 1>>
- <</if>>
-<</if>>
-
<<set $HGEnergy = 0, $HGCum = 0, $HGSlaveSuccess = 0, $HeadGirl = 0, $Recruiter = 0, $Madam = 0, $madamCashBonus = 0, $DJ = 0, $DJRepBonus = 0, $Milkmaid = 0, $Collectrix = 0, $Stewardess = 0, $Schoolteacher = 0, $Wardeness = 0, $Concubine = 0, $Attendant = 0, $Nurse = 0, $Bodyguard = 0, $fuckSlaves = 0, $freeSexualEnergy = 0, $publicServants = 0, $cumSlaves = 0, $averageDick = 0, $slavesWithWorkingDicks = 0>>
/* GAMEOVERS */
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index b6cc870e7ef..c735c868d6c 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -291,14 +291,8 @@ __Penthouse Upgrades__
<</if>>
<br>
-<<if ndef $TesticleCloner>> <<set $TesticleCloner = 0>> <</if>>
-<<if $TesticleCloner == 0>>
- [[Purchase an advanced testicle cloner|Manage Penthouse][$cash -= Math.trunc(4500000*$upgradeMultiplierArcology), $PC.engineering += .1 , $InitalClonerSetup == 1, $TesticleClonerSpeed == 1]]//Costs <<print cashFormat(Math.trunc(4500000*$upgradeMultiplierArcology))>>//
-<<else>>
- You have pruchased an advanced testicle cloner.
-<</if>>
-<br>
+
<<if $cyberMod == 0>>
<<switch $prostheticsUpgrade>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index d219ac067eb..f29fd3c3c20 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -52,13 +52,6 @@
You have targeted '' $arcologies[_nei].name'' for cultural influence.
<</if>>
-<<if $arcologies[0].CumTarget == -1>>
- You are not selling your cum to beighbours.
-<<else>>
- <<set _nei = $arcologies.findIndex(function(s) { return s.direction == $arcologies[0].CumTarget; })>>
- You have selected '' $arcologies[_nei].name'' to recive some of your cum, for a small fee of course.
-<</if>>
-
<<if $PC.hacking > 0>>
<br>
<<if $arcologies[0].CyberEconomicTarget == -1>>
@@ -206,13 +199,6 @@
<<if $desc.length > 0>>
| [[Set as influence target|Neighbor Interact][$arcologies[0].influenceTarget = $activeArcology.direction]]
<</if>>
-<<if
- <<if $PC.storedCum > 0>>
- | [[Sell your cum|Neighbor Interact][$arcologies[0].CumTarget = $activeArcology.direction]]
- <<else>>
- You do not have any cum to sell.
- <<set $arcologies[0].CyberReputationTarget = -1>>
- <</if>>
<br> You own ''$activeArcology.PCminority%'' of $activeArcology.name.
<<set $seed = 500*Math.trunc($activeArcology.prosperity*(1+($activeArcology.demandFactor/100)))>>
A 1% interest in $activeArcology.name is worth <<print cashFormat($seed)>> and will require a transaction cost of <<print cashFormat(10000)>> to acquire.
@@ -691,7 +677,4 @@ If $activeArcology.name has developed enough to begin exporting worthwhile goods
<br>
[[Cancel character assassination|Neighbor Interact][$arcologies[0].CyberReputationTarget = -1]]
<</if>>
-<<if $arcologies[0].CumTarget != -1>>
- <br>
- [[Stop seeling your cum|Neighbor Interact][$arcologies[0].CumTarget = -1]]
-<</if>>
+
\ No newline at end of file
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index a947d572c4e..a1b4d5f481a 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -78,7 +78,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
@@.red;Your ownership interest in $arcologies[$i].name has been annulled!@@
<<set $arcologies[$i].PCminority = 0>>
<</if>>
- @@.yellow;After a brief power struggle, it undergoes a change of government.@@
+ @@.yellow;After a brief power struggle, it undergoes a change of government.@@
<<if def _agentIndex && _agentIndex != -1>>
@@.deeppink;$slaves[_agentIndex].slaveName@@ manages to escape with the help of a few loyal citizens and returns to you @@.gold;fearing your displeasure at her failure.@@
<<set $slaves[_agentIndex].trust -= 40>>
@@ -490,39 +490,6 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
This week, you made @@.yellowgreen;<<print cashFormat($rents)>>@@ from your holdings in this arcology.
<</if>>
-/* Cum selling */
-<<if $arcologies[$i].direction == $arcologies[0].CumTarget>>
- <<set _WorthBonus = 1>>
- <<if $arcologies[0].FSCummunism > 60>>
- <<if $rep < 1000>>
- <<set _WorthBonus += 0.01>>
- <<elseif $rep >= 19000>>
- <<set _WorthBonus += 0.8>>
- <<elseif $rep > 15000>>
- <<set _WorthBonus += 0.5>>
- <<elseif $rep > 13000>>
- <<set _WorthBonus += 0.35>>
- <<else>>
- <<set _WorthBonus += 0.15>>
- <</if>>
- <</if>>
- <<if $arcologies[0].FSRepopulationFocus > 60>>
- <<if $rep < 1000>>
- <<set _WorthBonus += 0.001>>
- <<elseif $rep >= 19000>>
- <<set _WorthBonus += 0.75>>
- <<elseif $rep > 15000>>
- <<set _WorthBonus += 0.45>>
- <<elseif $rep > 13000>>
- <<set _WorthBonus += 0.25>>
- <<else>>
- <<set _WorthBonus += 0.9>>
- <</if>>
- <</if>>
- <<set _profit = 5000*$PC.storedCum*_WorthBonus>>
- This week, you made @@.yellowgreen;<<print cashFormat(_profit)>>@@ selling your cum to $arcologies[0].name.
-<</if>>
-
/* CYBER ECONOMIC WARFARE */
<<if $arcologies[$i].direction == $arcologies[0].CyberEconomicTarget>>
<<if $PC.hacking == -100>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 7088c4b4f2b..419b16aa379 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -376,7 +376,7 @@
<<set $proclamationsCooldown = 4, $personalAttention = "business">>
<</if>>
-
+
<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC>>
<<set _Cal = Math.ceil(random($AgeTrainingLowerBoundPC,$AgeTrainingUpperBoundPC)*$AgeEffectOnTrainerEffectivenessPC)>>
<<set _X = 1>>
@@ -458,7 +458,7 @@
<<case "slaving">>
<<set _oldSkill = $PC.slaving>>
- <<if _X == 1>>
+ <<if _X == 1>>
<<set $PC.slaving += _Cal>>
<<else>>
<<set $PC.slaving -= _Cal>>
@@ -492,7 +492,7 @@
<<case "engineering">>
<<set _oldSkill = $PC.engineering>>
- <<if _X == 1>>
+ <<if _X == 1>>
<<set $PC.engineering += _Cal>>
<<else>>
<<set $PC.engineering -= _Cal>>
@@ -560,7 +560,7 @@
<<case "hacking">>
<<set _oldSkill = $PC.hacking>>
- <<if _X == 1>>
+ <<if _X == 1>>
<<set $PC.hacking += _Cal>>
<<else>>
<<set $PC.hacking -= _Cal>>
@@ -591,7 +591,7 @@
You have made progress towards mastering hacking and data manipulation.
<</if>>
<</if>>
-
+
<<case "technical accidents">> /* needs work */
<<set _windfall = (150*$PC.hacking)+random(100,2500), _X = 0>>
<<if $PC.hacking == -100>>
@@ -613,18 +613,18 @@
<<elseif $PC.hacking >= 100>>
<<set _Catchtchance = 100>>
<</if>>
- This week your services to the highest bidder earned you @@.yellowgreen;<<print cashFormat(_windfall)>>.@@
- <<if random(0,100) >= _Catchtchance>>
- However, since the source of the attack was traced back to your arcology, your
- <<if $secExp == 1>> <<set _X = 1>>
+ This week your services to the highest bidder earned you @@.yellowgreen;<<print cashFormat(_windfall)>>.@@
+ <<if random(0,100) >= _Catchtchance>>
+ However, since the source of the attack was traced back to your arcology, your
+ <<if $secExp == 1>> <<set _X = 1>>
@@.red;authority@@, <<set $authority -= random(100,500)>> @@.red;crime rate@@ <<set $crime += random(10,25)>> and
- <</if>>
- @@.red;reputation@@ <<set $rep -= random (100,500)>>
- <<if _X != 1>>
- has
- <<else>>
+ <</if>>
+ @@.red;reputation@@ <<set $rep -= random (100,500)>>
+ <<if _X != 1>>
+ has
+ <<else>>
have all
- <</if>>
+ <</if>>
been negatively affected.
<</if>>
<<if $PC.hacking < 100>>
@@ -737,7 +737,7 @@
<</if>>
<</if>>
-Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@ <<if $PC.storedCum > 0>> You have $PC.storedCum liters of your cum in storage. <</if>>
+Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@
<<if $plot == 1>>
<<if $week > 10>>
<<if $weatherToday.severity-$weatherCladding > 2>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index ebf3bda0c13..9e34e87fea4 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2312,10 +2312,6 @@
<<set $activeSlave.fetishStrength = 10, $activeSlave.attrXY = 50, $activeSlave.attrXX = 50, $activeSlave.attrKnown = 1, $activeSlave.devotion = 40, $activeSlave.trust = -40, $activeSlave.vaginalSkill = 0, $activeSlave.oralSkill = 0, $activeSlave.analSkill = 0, $activeSlave.combatSkill = 0, $activeSlave.whoreSkill = 0, $activeSlave.entertainSkill = 0, $activeSlave.intelligence = -2, $activeSlave.intelligenceImplant = 0, $activeSlave.sexualFlaw = "none", $activeSlave.sexualQuirk = "none", $activeSlave.behavioralFlaw = "none", $activeSlave.behavioralQuirk = "none">>
<</if>>
-<<if $arcologies[0].FSRepopulationFocusSMR == 1 && $PC.storedCum > 0>>
- <<set $activeSlave.pregSource = -1, $PC.storedCum-->>
-<</if>>
-
<<case "neighbor">>
<<if ($numArcology < $arcologies.length) && ($numArcology > 0)>>
@@ -2818,7 +2814,7 @@
<<set $activeSlave.sexualQuirk = "none">>
<<set $activeSlave.fetish = "mindbroken">>
<<set $activeSlave.fetishStrength = 0>>
-
+
<<case "wetware">>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "You bought her from a wetware CPU farm, her body ruined but her mind subjected to a simulated career.">>
--
GitLab