From c62bb593642eca8b3e3bce2fb590e5e60425fbf3 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Sat, 21 Apr 2018 03:28:25 +1200 Subject: [PATCH] Encyclopedia update and compiler fixes --- src/gui/Encyclopedia/encyclopedia.tw | 4 ++-- src/pregmod/seFCTVshows.tw | 2 +- src/uncategorized/saLongTermEffects.tw | 2 +- src/uncategorized/wardrobeUse.tw | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index 49d0e8413a2..37d6bc088ae 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -57,7 +57,7 @@ PLAYING FREE CITIES <br> @@.hotpink;Hot pink text@@ means an increase in a slave's regard for to you. <br> @@.mediumorchid;Orchid text@@ means a decrease in a slave's regard for to you. <br> @@.mediumaquamarine;Aquamarine text@@ means an increase in a slave's <br> @@.mediumaquamarine;[[trust|Encyclopedia][$encyclopedia = "Trust"]]@@ of to you, and a reduction in her fear of you. - <br> @@.gold;Gold text@@ means a decrease in a slave's <br> @@.mediumaquamarine;[[trust|Encyclopedia][$encyclopedia = "Trust"]]@@ of you, and an increase in her fear of you. + <br> @@.gold;Gold text@@ means a decrease in a slave's <br> @@.gold;[[trust|Encyclopedia][$encyclopedia = "Trust"]]@@ of you, and an increase in her fear of you. <br> @@.orangered;Orange-red text@@ means a decrease in a hateful slave's fear of you. <br> @@.lime;Lime text@@ means something has grown or improved, which is usually, but not always, good. <br> @@.orange;Orange text@@ means something has shrunk or degraded, which is usually, but not always, bad. @@ -1715,7 +1715,7 @@ FUTURE SOCIETIES <br><br>-- Lawrence, W. G., //Guide to Modern Slavery, Online Edition. Accessed April 2, 2032.//// - <br><br>''Future Society Models'' are societal goals the player can select and pursue for the arcology. It is possible to maintain four future society goals at once. The first is unlocked after week 11 for players with minimal @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@, or at game start with the Social Engineering character option; the rest unlock as the player achieves higher @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@ levels. + <br><br>''Future Society Models'' are societal goals the player can select and pursue for the arcology. It is possible to maintain four future society goals at once. The first is unlocked after week 5 for players with greater than rumored(<<print commaNum(3000)>>) @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@, or at game start with the Social Engineering character option; the rest unlock as the player achieves higher @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@ levels. <br><br>All societies approve of specific things, usually slaves with specific characteristics; some societies also have dislikes. All societies are advanced by the things they approve of and slowed by the things they disapprove of, and all societies give and take @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@ when approving and disapproving. All societies unlock unique events, arcology upgrades, and slave behaviors; some even unlock special clothing. diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw index 4bb37dabc16..791d1e00cad 100644 --- a/src/pregmod/seFCTVshows.tw +++ b/src/pregmod/seFCTVshows.tw @@ -857,7 +857,7 @@ The offered price is <<print cashFormat($slaveCost)>>. <<elseif $showThirteen == 3>> The random function seems to have selected a program about the nuances of slave life. <br><br> - The screen fades in with a a fly-through shot of what is undoubtedly an arcology penthouse littered with slaves accompanied by a somewhat upbeat piano melody. You recognize many of the traditional additions to a penthouse, though there are some stylistic differences. After a short time the show identifies itself as "The Other Hand" before fading out. + The screen fades in with a fly-through shot of what is undoubtedly an arcology penthouse littered with slaves accompanied by a somewhat upbeat piano melody. You recognize many of the traditional additions to a penthouse, though there are some stylistic differences. After a short time the show identifies itself as "The Other Hand" before fading out. <br><br> The show returns after a brief moment to a shot of a penthouse slave cafeteria that is absolutely filled with slaves. Most are nude but there are a few in maid's uniforms that look to be the current shift of house servants. The low murmur of slaves talking can be heard as a man's voice starts narrating over it. <br><br> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index e48ea9b1be1..2353e99a738 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -4371,7 +4371,7 @@ <<set $slaves[$i].pregSource = -1>> <<elseif ($slaves[$i].relationship > 2) && canImpreg($slaves[$i], _tempLover)>> /* erection not needed for impregnation via consensual sex play (FWB or better) */ <<set $slaves[$i].pregSource = _tempLover.ID>> - <<elseif ($slaves[$i].subTarget != 0) && ($slaves[$i].assignment == "be a subordinate slave") && canAchieveErection($tempSub) && canImpreg($slaves[$i], _tempSub)>> /* subordinate must have erection to impregnate target */ + <<elseif ($slaves[$i].subTarget != 0) && ($slaves[$i].assignment == "be a subordinate slave") && canAchieveErection(_tempSub) && canImpreg($slaves[$i], _tempSub)>> /* subordinate must have erection to impregnate target */ <<set $slaves[$i].pregSource = _tempSub.ID>> <<elseif (random(1,100) > 95) && ($slaves[$i].rivalry > 2) && canAchieveErection(_tempRival) && canImpreg($slaves[$i], _tempRival)>> /* 5% chance to be raped and knocked up by bitter rival - erection needed */ Driven by the bitter rivalry between them, _tempRival.slaveName successfully overpowers $slaves[$i].slaveName and rapes $object, cumming deep in $possessive fertile <<if $slaves[$i].mpreg == 1>>asshole<<else>>pussy<</if>> whenever she chooses. By the end of the week, $slaves[$i].slaveName is vowing revenge as $pronoun regains confidence. diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw index df78ef21a82..beabd16b471 100644 --- a/src/uncategorized/wardrobeUse.tw +++ b/src/uncategorized/wardrobeUse.tw @@ -479,7 +479,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.'' <<if $activeSlave.amp != 1>> <br>Shoes: ''<span id="shoes">$activeSlave.shoes</span>.'' - <span id="shoeDescription"><br>//$pronounCap is <<if $activSlave.shoes == "none">>bare foot<<else>>wearing<<footwearDescription>><<heelDescription>><</if>>//</span> + <span id="shoeDescription"><br>//$pronounCap is <<if $activeSlave.shoes == "none">>bare foot<<else>>wearing<<footwearDescription>><<heelDescription>><</if>>//</span> <br> -- GitLab