From d99b6bd565077b2b4c6117805c86cc61fcc43d37 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 26 Apr 2018 13:08:19 -0400
Subject: [PATCH] fixes, functioning apartments and less suicidal BGs
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +++++++
src/init/setupVars.tw | 4 ++--
src/pregmod/widgets/slaveSummaryWidgets.tw | 16 ---------------
src/uncategorized/RESS.tw | 12 ++++++-----
src/uncategorized/buildingWidgets.tw | 11 ++++++++++
src/uncategorized/pit.tw | 21 ++++++++++++--------
6 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index e7825d08ff7..63d9500c7ac 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-0.1.x
+4/26/2018
+
+ 73
+ -boduguard once again told to stop fighting herself in the pit
+ -spire apartments now work
+ -fixes
+
4/25/2018
72
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index fab1bfebd48..fe1e16e2abe 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -1184,10 +1184,10 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"São Toméan": setup.saoTomeanSlaveNames,
"Saudi": setup.saudiSlaveNames,
"Scottish": setup.scottishSlaveNames,
- "Senegalese": setup.senegaleseSlaveSurnames,
+ "Senegalese": setup.senegaleseSlaveNames,
"Serbian": setup.serbianSlaveNames,
"Seychellois": setup.seychelloisSlaveNames,
- "Sierra Leonean": setup.sierraLeoneanSlaveSurnames,
+ "Sierra Leonean": setup.sierraLeoneanSlaveNames,
"Singaporean": setup.singaporeanSlaveNames,
"Slovak": setup.slovakSlaveNames,
"Slovene": setup.sloveneSlaveNames,
diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw
index 698c06b2a4f..c932f6d15b4 100644
--- a/src/pregmod/widgets/slaveSummaryWidgets.tw
+++ b/src/pregmod/widgets/slaveSummaryWidgets.tw
@@ -452,23 +452,7 @@ Release rules: _Slave.releaseRules.
<</if>>
<</if>>
<<if _Slave.addict != 0>>
- <<switch _Slave.aphrodisiacs>>
- <<case 0>>
@@.cyan;Add@@
- <<case 1>>
- @@.cyan;Aph@@
- <<case 2>>
- @@.cyan;Aph++@@
- <</switch>>
- <<else>>
- <<switch _Slave.aphrodisiacs>>
- <<case 1>>
- Aph
- <<case 2>>
- Aph++
- <<case -1>>
- Anaph
- <</switch>>
<</if>>
<<if _Slave.hormones > 1>>
''Ho:F+''
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 0b53bb3c67f..21f4f0bca92 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -14313,16 +14313,18 @@ You tell her kindly that you understand, and that she'll be trained to address t
<br><<link "Never mind Friday night, the moon's out and it's romantic on the balcony">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You inform $activeSlave.slaveName of your plans and tell her to get dressed appropriately. She meets you at the door absolutely naked<<if $activeSlave.bellyPreg >= 1500>>, her motherly body on full display<</if>>. She has half a question on her face, wondering whether this is going too far, but it vanishes when you <<if canSee($activeSlave)>>smile reassuringly at<<else>>compliment<</if>> her. You take her by the hand and lead her out onto the private balcony outside your office. It's a cloudless night, and the moon is full. You order the arcology to play a classic dance medley, and $activeSlave.slaveName becomes all innocence and grace, the perfect dance partner<<if $activeSlave.bellyPreg >= 10000>>, despite her heavy pregnancy<<elseif $activeSlave.belly >= 10000 || $activeSlave.weight > 130>>, despite her weight<</if>>. The only real consequence of her nudity is the
+ You inform $activeSlave.slaveName of your plans and tell her to get dressed appropriately. She meets you at the door absolutely naked<<if $activeSlave.bellyPreg >= 1500>>, her motherly body on full display<</if>>. She has half a question on her face, wondering whether this is going too far, but it vanishes when you <<if canSee($activeSlave)>>smile reassuringly at<<else>>compliment<</if>> her. You take her by the hand and lead her out onto the private balcony outside your office. It's a cloudless night, and the moon is full. You order the arcology to play a classic dance medley, and $activeSlave.slaveName becomes all innocence and grace, the perfect dance partner<<if $activeSlave.bellyPreg >= 10000>>, despite her heavy pregnancy<<elseif $activeSlave.belly >= 10000 || $activeSlave.weight > 130>>, despite her weight<</if>>. The only real consequence of her nudity is
<<if $activeSlave.breasts >= 300>>
- extra sway of her breasts,
+ the extra sway of her breasts,
<</if>>
<<if canPenetrate($activeSlave)>>
- her visible erection,
+ her visible erection, and
<<elseif ($activeSlave.clit > 0)>>
- her visibly engorged clit
+ her visibly engorged clit and
+ <<elseif $activeSlave.breasts >= 300>>
+ and
<</if>>
- and the hardness of her nipples in the cool night when the dance brings you close. She enjoys herself immensely and in no time at all, she's meekly asking you to take her inside and dance with her on the bed. Naturally, you oblige.
+ the hardness of her nipples in the cool night when the dance brings you close. She enjoys herself immensely and in no time at all, she's meekly asking you to take her inside and dance with her on the bed. Naturally, you oblige.
<</replace>>
<<set $activeSlave.devotion += 3, $activeSlave.trust += 3>>
<<if ($activeSlave.toyHole == "dick" || $sexualOpeness == 1) && canPenetrate($activeSlave)>>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 63cee2db0ed..c0c894db567 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -222,6 +222,17 @@ Selling this sector would relinquish a 4% interest in $arcologies[0].name. Such
<<set $AProsperityCap = 150>>
<</if>>
<<set $ACitizenLimit = 0, $ASlaveLimit = 0, $Sweatshops = 0>>
+<<if $arcologyUpgrade.spire == 1>>
+ <<for _i = 1; _i <= 4; _i++>>
+ <<if $sectors[_i].type == "DenseApartments">>
+ <<set $ACitizenLimit += 600, $ASlaveLimit += 1000, $AProsperityCap += 10>>
+ <<elseif $sectors[_i].type == "LuxuryApartments">>
+ <<set $ACitizenLimit += 400, $ASlaveLimit += 2000, $AProsperityCap += 15>>
+ <<else>>
+ <<set $ACitizenLimit += 400, $ASlaveLimit += 1000, $AProsperityCap += 10>>
+ <</if>>
+ <</for>>
+<</if>>
<<for _i = 8; _i <= 19; _i++>>
<<if $sectors[_i].type == "DenseApartments">>
<<set $ACitizenLimit += 600, $ASlaveLimit += 1000, $AProsperityCap += 10>>
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index c1112a075fd..5e73ddcdb5c 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -5,6 +5,12 @@
<<if $pitName != "the Pit">>
<<set $pitNameCaps = $pitName.replace("the ", "The ")>>
<</if>>
+<<if $pitBG == 1>>
+ <<set _pit = $fighterIDs.findIndex(function(s) { return s == $Bodyguard.ID; })>>
+ <<if _pit != -1>>
+ <<set _dump = $fighterIDs.deleteAt(_pit), _DL-->>
+ <</if>>
+<</if>>
$pitNameCaps is clean and ready,
<<if _DL > 2>>
@@ -15,14 +21,13 @@ $pitNameCaps is clean and ready,
with slaves assigned to the week's bout.
<<else>>
but no slaves are assigned to fight.
- <<link "Decommission the pit">>
+ <<link "Decommission the pit" "Main">>
<<set $pit = 0>>
<<for _i = 0; _i < $sectors.length; _i++>>
<<if $sectors[_i].type == "Pit">>
<<set $sectors[_i].type = "Markets">><<break>>
<</if>>
<</for>>
- <<goto "Main">>
<</link>>
<</if>>
@@ -37,13 +42,13 @@ $pitNameCaps is clean and ready,
Admission is charged to the fights here. [[Close them|Pit][$pitAudience = "none"]] | [[Stop charging|Pit][$pitAudience = "free"]]
<</if>>
-<<if $dojo != 0>>
+<<if $Bodyguard != 0>>
<br>
-<<if $pitBG == 0>>
- Two fighters will be selected from the pool at random. [[Guarantee your Bodyguard a slot|Pit][$pitBG = 1]]
-<<else>>
- Your Bodyguard will fight a slave selected from the pool at random. [[Make both slots random|Pit][$pitBG = 0]]
-<</if>>
+ <<if $pitBG == 0>>
+ Two fighters will be selected from the pool at random. [[Guarantee your Bodyguard a slot|Pit][$pitBG = 1]]
+ <<else>>
+ Your Bodyguard will fight a slave selected from the pool at random. [[Make both slots random|Pit][$pitBG = 0]]
+ <</if>>
<</if>>
<br>
--
GitLab