From 6c6ca8e0564dcf64d5ae5675c6454c7a454049cf Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 19 Jan 2018 12:28:51 -0500
Subject: [PATCH] fixes, cleanup and tweaks
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 9 +++++++++
.../SpecialForceBarracksCheatEdit.tw | 1 +
src/pregmod/breederProposal.tw | 9 +++++++--
src/pregmod/managePersonalAffairs.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 2 +-
src/uncategorized/rulesAssistant.tw | 18 +++++++++---------
src/uncategorized/slaveInteract.tw | 8 ++++----
src/uncategorized/wardrobeUse.tw | 14 +++++++-------
8 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 92e06178bed..75d3eeaf90c 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,15 @@
0.10.7.0/1
+1/19/18
+
+ 282
+ -Crimeanon's tweaks
+ -SFanon's tweaks and SF cheat edit
+ -minor fixes
+ -tweaked eugenics breeding proposal to reflect post SE rebellion
+ -refiled chains under harsh clothing
+
1/18/18
281
diff --git a/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw b/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw
index 166378448d3..9b6c4d21087 100644
--- a/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw
+++ b/src/pregmod/SecForceEX/SpecialForceBarracksCheatEdit.tw
@@ -1,4 +1,5 @@
:: SpecialForceBarracksCheatEdit
+
<<set $nextButton = "Back to SF Barracks", $nextLink = "SFM Barracks", $returnTo = "SFM Barracks">>
<<include "SpecialForceUpgradeTree">>
__Values__
diff --git a/src/pregmod/breederProposal.tw b/src/pregmod/breederProposal.tw
index 8886e3ff98b..942b5921efb 100644
--- a/src/pregmod/breederProposal.tw
+++ b/src/pregmod/breederProposal.tw
@@ -4,9 +4,14 @@
You draft a proposal to the Societal Elite proposing the use of specially tested slaves as breeding stock. If they can pass the tests required to join the societal elite; even as slaves, their bodies can prove valuable to furthering eugenics. They will gain no additional rights, but their wombs will be used to birth elite children; helping stave off potential threats of inbreeding and adding possible missed beneficial traits into the Elite's gene pool.
<br><br>
-Within the hour, you are called before The Societal Elite.
+Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's left of <</if>>The Societal Elite.
<br>
-<<if $PC.pregSource == -1>>
+<<if $eugenicsFullControl == 1>>
+ "That sounds like an acceptable proposal. We'll draft the standards for breeding stock and notify you shortly."
+ <<set $propOutcome = 1>>
+ <<InitStandards>>
+ <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+<<elseif $PC.pregSource == -1>>
"Since you are doing your part and carrying an elite child, we will gladly reward you by granting your proposal. We shall decide upon the standards for breeding stock and notify you shortly."
<<set $propOutcome = 1>>
<<InitStandards>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index f9db5669646..bcf672ed685 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -639,7 +639,7 @@ __Drugs__
You are not on any stamina enhancers. [[More stamina means more sex|Manage Personal Affairs][$PC.staminaPills = 1]]
<</if>>
-<<if $propOutcome == 1>>
+<<if $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
<br><br>
__Elite Breeder Qualifications__
<<if ndef $activeStandard>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 55f0eb51e9f..7f9f4417173 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -58,7 +58,7 @@ $possessiveCap $activeSlave.faceShape face is
<<elseif $activeSlave.faceImplant > 95>>
//$possessiveCap's face cannot sustain further cosmetic surgery//
<<else>>
- <<set _artificiality = 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
+ <<set _artificiality = 25-5*Math.trunc($PC.medicine/50)-5*$surgeryUpgrade>>
//Facial surgery can either rework it and improve its attractiveness, or simply make it more attractive. No facial surgery is perfect and each surgery will make it look less natural.
<<if $PC.medicine >= 100 && $surgeryUpgrade>>
Your surgical skills and the advanced surgical suite will minimize this effect as much as possible.
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index d18eb219516..66370cc658b 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -579,15 +579,6 @@ Clothes:
<</link>>
|
<</if>>
-<<if ($arcologies[0].FSDegradationist != "unset") || ($cheatMode == 1) || ($clothesBoughtChains == 1)>>
- //FS//
- <<link "Chains">>
- <<set $currentRule.clothes = "chains">>
- <<RAChangeClothes>>
- <<RARuleModified>>
- <</link>>
- |
-<</if>>
<<if ($arcologies[0].FSChattelReligionist != "unset") || ($cheatMode == 1) || ($clothesBoughtHabit == 1)>>
//FS//
<<link "Chattel habit">>
@@ -694,6 +685,15 @@ Clothes:
<<RAChangeClothes>>
<<RARuleModified>>
<</link>>
+<<if ($arcologies[0].FSDegradationist != "unset") || ($cheatMode == 1) || ($clothesBoughtChains == 1)>>
+ | //FS//
+ <<link "Chains">>
+ <<set $currentRule.clothes = "chains">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+ <</link>>
+ |
+<</if>>
|
<<link "Penitent nun">>
<<set $currentRule.clothes = "a penitent nuns habit">>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 884cc64382d..02a21169c42 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -649,9 +649,6 @@
<<if isItemAccessible("body oil")>>
| //FS// <<link "Body oil">><<set $activeSlave.clothes = "body oil",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<</if>>
- <<if isItemAccessible("chains")>>
- | //FS// <<link "Chains">><<set $activeSlave.clothes = "chains",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
- <</if>>
<<if isItemAccessible("a chattel habit")>>
| //FS// <<link "Chattel habit">><<set $activeSlave.clothes = "a chattel habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<</if>>
@@ -685,6 +682,9 @@
<br> //Harsh://
<<link "Go naked">><<set $activeSlave.clothes = "no clothing", $activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+ <<if isItemAccessible("chains")>>
+ | //FS// <<link "Chains">><<set $activeSlave.clothes = "chains",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+ <</if>>
| <<link "Penitent nun">><<set $activeSlave.clothes = "a penitent nuns habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Restrictive latex">><<set $activeSlave.clothes = "restrictive latex",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Shibari ropes">><<set $activeSlave.clothes = "shibari ropes",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
@@ -1144,7 +1144,7 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<
<</if>>
<</if>>
-<<if $propOutcome == 1>>
+<<if $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
<<if $activeSlave.breedingMark == 0 && $activeSlave.fuckdoll == 0 && $activeSlave.eggType == "human" && isFertile($activeSlave)>>
<br>
[[Breeder Eligibility Exam|BreedingTest]]
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 4ba047e083e..21166aaaa22 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -196,13 +196,6 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>>
<</link>>
<</if>>
-<<if isItemAccessible("chains")>>
- | //FS// <<link "Chains">>
- <<set $activeSlave.clothes = "chains",$activeSlave.choosesOwnClothes = 0>>
- <<replace "#clothes">>$activeSlave.clothes<</replace>>
- <<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>>
- <</link>>
-<</if>>
<<if isItemAccessible("a chattel habit")>>
| //FS// <<link "Chattel habit">>
<<set $activeSlave.clothes = "a chattel habit",$activeSlave.choosesOwnClothes = 0>>
@@ -280,6 +273,13 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<replace "#clothes">>$activeSlave.clothes<</replace>>
<<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>>
<</link>>
+<<if isItemAccessible("chains")>>
+ | //FS// <<link "Chains">>
+ <<set $activeSlave.clothes = "chains",$activeSlave.choosesOwnClothes = 0>>
+ <<replace "#clothes">>$activeSlave.clothes<</replace>>
+ <<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>>
+ <</link>>
+<</if>>
| <<link "Penitent nun">>
<<set $activeSlave.clothes = "a penitent nuns habit",$activeSlave.choosesOwnClothes = 0>>
<<replace "#clothes">>$activeSlave.clothes<</replace>>
--
GitLab