From 7bc14c54735042a389f3184c40617e8669b32fc1 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 3 Dec 2018 18:17:50 -0500
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +
src/SecExp/unitsRebellionReport.tw | 61 +++----
src/uncategorized/pMercenaryRomeo.tw | 177 ++++++++++---------
src/uncategorized/recETS.tw | 1 +
4 files changed, 133 insertions(+), 113 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 57a78fd95ac..cffd137b950 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-1.2.x
+12/03/2018
+
+ 1
+ -fixes
+ -general pronoun work
+ -cleaning
+
12/02/2018
0
diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw
index 29da0b465f1..6243b92079b 100644
--- a/src/SecExp/unitsRebellionReport.tw
+++ b/src/SecExp/unitsRebellionReport.tw
@@ -301,42 +301,43 @@
<br>
<<set _loss = _lossesList.pluck()>>
<<if _loss > $ACitizens * 0.95>>
- <<set _loss = Math.trunc($ACitizens * 0.95>> /* this is unlikely to happen, but might as well be safe*/
- The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology:
- <<if _loss <= 0>>
- no casualties
- <<elseif _loss <= 10>>
- light casualties
- <<elseif _loss <= 30>>
- moderate casualties
- <<elseif _loss <= 60>>
- heavy casualties
- <<else>>
- catastrophic casualties
- <</if>>
- suffered.
- <<if _loss > $lowerClass * 0.95>> /*I suspect only lower class ever get to fight/die, but being safe*/
- <<set $lowerClass = Math.trunc($lowerClass * 0.05),
- _loss -= $lowerClass * 0.95>>
- <<if _loss > $middleClass * 0.95>>
- <<set $middleClass = Math.trunc($middleClass * 0.05),
- _loss -= $middleClass *0.95>>
- <<if _loss > $upperClass * 0.95>>
- <<set $upperClass = Math.trunc($upperClass * 0.05),
- _loss -= $upperClass * 0.95>>
- <<if _loss > $topClass * 0.95>>
- <<set $topClass = Math.trunc($topClass * 0.05)>>
+ <<set _loss = Math.trunc($ACitizens * 0.95)>> /* this is unlikely to happen, but might as well be safe*/
+ The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology:
+ <<if _loss <= 0>>
+ no casualties
+ <<elseif _loss <= 10>>
+ light casualties
+ <<elseif _loss <= 30>>
+ moderate casualties
+ <<elseif _loss <= 60>>
+ heavy casualties
+ <<else>>
+ catastrophic casualties
+ <</if>>
+ suffered.
+ <<if _loss > $lowerClass * 0.95>> /*I suspect only lower class ever get to fight/die, but being safe*/
+ <<set $lowerClass = Math.trunc($lowerClass * 0.05),
+ _loss -= $lowerClass * 0.95>>
+ <<if _loss > $middleClass * 0.95>>
+ <<set $middleClass = Math.trunc($middleClass * 0.05),
+ _loss -= $middleClass *0.95>>
+ <<if _loss > $upperClass * 0.95>>
+ <<set $upperClass = Math.trunc($upperClass * 0.05),
+ _loss -= $upperClass * 0.95>>
+ <<if _loss > $topClass * 0.95>>
+ <<set $topClass = Math.trunc($topClass * 0.05)>>
+ <<else>>
+ <<set $topClass -= _loss>>
+ <</if>>
<<else>>
- <<set $topClass -= _loss>>
+ <<set $upperClass -= _loss>>
<</if>>
<<else>>
- <<set $upperClass -= _loss>>
+ <<set $middleClass -= _loss>>
<</if>>
<<else>>
- <<set $middleClass -= _loss>>
+ <<set $lowerClass -= _loss>>
<</if>>
- <<else>>
- <<set $lowerClass -= _loss>>
<</if>>
<</if>>
<<if $secBots.active == 1>>
diff --git a/src/uncategorized/pMercenaryRomeo.tw b/src/uncategorized/pMercenaryRomeo.tw
index 4e35c2d1ab9..58d96a51647 100644
--- a/src/uncategorized/pMercenaryRomeo.tw
+++ b/src/uncategorized/pMercenaryRomeo.tw
@@ -1,13 +1,13 @@
:: P mercenary romeo [nobr]
-<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", _name = 0>>
<<if ndef $romeoID>>
<<set _romeoSlaves = $slaves.filter(function(s) { return s.fetish != "mindbroken" && s.fuckdoll == 0 && ["serve the public", "serve in the club", "whore", "work in the brothel"].includes(s.assignment); })>>
<<if _romeoSlaves.length == 0>>
<<set _romeoSlaves = $slaves.filter(function(s) { return (s.publicCount > 0) && (s.newGamePlus == 0) && (s.relationship > -3) && !["be your Concubine", "serve in the master suite"].includes(s.assignment); })>>
<<if _romeoSlaves.length == 0>>
- <<set $activeSlave = $slaves.random()>>
+ <<set _name = setup.whiteAmericanSlaveNames.random()>>
<<else>>
<<set $activeSlave = _romeoSlaves.random()>>
<</if>>
@@ -18,10 +18,15 @@
<<else>>
<<set $activeSlave = getSlave($romeoID)>>
<</if>>
+<<if ndef $activeSlave>>
+ <<set _name = setup.whiteAmericanSlaveNames.random()>>
+<</if>>
-<<slaveCost $activeSlave>>
-<<set $slaveCost = (random(60,70)*Math.trunc($slaveCost/100))>>
-<<set $slaveCost = 100*Math.trunc($slaveCost/100)>>
+<<if _name == 0>>
+ <<slaveCost $activeSlave>>
+ <<set $slaveCost = (random(60,70)*Math.trunc($slaveCost/100))>>
+ <<set $slaveCost = 100*Math.trunc($slaveCost/100)>>
+<</if>>
One of your mercenaries requests an interview. He's a worn, grey-haired tank of a man, made bulkier still by heavy ceramic plate armor and lots of ammunition and gear. The murderous submachine gun favored for city fighting looks like a toy in his hands. But as he sits at your invitation and accepts a
<<if $PC.refreshmentType == 0>>
@@ -43,88 +48,94 @@ proffered by an attentive slave girl, he seems almost bashful.
<br><br>
-"<<= properTitle()>>, I'll say this straight. I'd like to buy one of your slaves.
-<<if ["serve the public", "serve in the club", "whore", "work in the brothel"].includes($activeSlave.assignment)>>
- I've been seeing <<EventNameLink $activeSlave>> a lot, and she makes the years sit a little lighter on me.
+"<<= properTitle()>>, I'll say this straight. I'd like to buy one of your slaves.
+<<if _name != 0>>
+ I've been seeing _name a lot, and she makes the years sit a little lighter on me. I've scraped together what I can, and I can pay <<print cashFormat(50000)>>."It's a huge sum for a mercenary; it's probably his entire savings, but there is a slight problem; the slave he is looking for isn't one of yours. "Well then," he says in embarrassment, "Have to say this is a little awkward." He gives a fake cough, "You wouldn't happen to, you know, know who her owner is?" You shake your head. A run in with a girl named _name isn't much to go by and it really isn't your problem. "Ah well, I'm sure I'll see her around again. Anyway, that was a fine victory the other day, <<= properTitle()>>; come down to the bar and join the boys and I. We'll buy you a drink. Devil knows, thanks to you we can afford to. Hell, maybe you'll even get to meet _name too, get to see just how much of a looker she is."
+ <<unset $romeoID>>
<<else>>
- I've seen <<EventNameLink $activeSlave>> here and there and I can't stop thinking about her. I feel she'd make the years sit a little lighter on me.
-<</if>>
-I've scraped together what I can, and I can pay <<print cashFormat($slaveCost)>>." It's a decent price, probably a little less than you could get at auction. It's a huge sum for a mercenary; it's probably his entire savings. You ask what he would do with her. "Well," he says, actually blushing, "I'd free her. And marry her, if she'd have me."
+ <<if ["serve the public", "serve in the club", "whore", "work in the brothel"].includes($activeSlave.assignment)>>
+ I've been seeing <<EventNameLink $activeSlave>> a lot, and she makes the years sit a little lighter on me.
+ <<else>>
+ I've seen <<EventNameLink $activeSlave>> here and there and I can't stop thinking about her. I feel she'd make the years sit a little lighter on me.
+ <</if>>
+ I've scraped together what I can, and I can pay <<print cashFormat($slaveCost)>>." It's a decent price, probably a little less than you could get at auction. It's a huge sum for a mercenary; it's probably his entire savings. You ask what he would do with her. "Well," he says, actually blushing, "I'd free her. And marry her, if she'd have me."
-<br><br>
+ <br><br>
-<span id="result">
-<<link "Decline, and tell her not to see him">>
- <<EventNameDelink $activeSlave>>
- <<replace "#result">>
- $activeSlave.slaveName obeys your orders not to see the old mercenary. Though neither he or $activeSlave.slaveName says a word about it, his squadmates are not so closemouthed. Soon the tragic story of The Mercenary and the Slave Girl is being told in bars and brothels across the Free City, with you naturally playing @@.red;the role of the villain.@@
- <<set $rep -= 1000>>
- <<unset $romeoID>>
- <</replace>>
-<</link>>
-<br><<link "Politely decline">>
- <<EventNameDelink $activeSlave>>
- <<replace "#result">>
- "Ah well," he says, "didn't think you would, but I had to ask. If you'd be so kind as to keep her assigned so's I can see her, I would be grateful. That was a fine victory, <<= properTitle()>>; come down to the bar and join the boys and I. We'll buy you a drink. Devil knows, thanks to you we can afford to."
- <<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>$activeSlave.slaveName politely thanks you for not letting him take her away.<</if>>
- <<unset $romeoID>>
- <</replace>>
-<</link>>
-<br><<link "Accept">>
- <<EventNameDelink $activeSlave>>
- <<replace "#result">>
- The mercenary leaves to collect his purchase. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's
- <<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>
- happening. You can't hear what he says as he takes out a ring, but her reaction speaks clearly. She says "No."
- <<if $activeSlave.amp != 1>>
- She points back into your penthouse and returns to her home.
+ <span id="result">
+ <<link "Decline, and tell her not to see him">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ $activeSlave.slaveName obeys your orders not to see the old mercenary. Though neither he or $activeSlave.slaveName says a word about it, his squadmates are not so closemouthed. Soon the tragic story of The Mercenary and the Slave Girl is being told in bars and brothels across the Free City, with you naturally playing @@.red;the role of the villain.@@
+ <<set $rep -= 1000>>
+ <<unset $romeoID>>
+ <</replace>>
+ <</link>>
+ <br><<link "Politely decline">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ "Ah well," he says, "didn't think you would, but I had to ask. If you'd be so kind as to keep her assigned so's I can see her, I would be grateful. That was a fine victory, <<= properTitle()>>; come down to the bar and join the boys and I. We'll buy you a drink. Devil knows, thanks to you we can afford to."
+ <<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>$activeSlave.slaveName politely thanks you for not letting him take her away.<</if>>
+ <<unset $romeoID>>
+ <</replace>>
+ <</link>>
+ <br><<link "Accept">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ The mercenary leaves to collect his purchase. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's
+ <<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>
+ happening. You can't hear what he says as he takes out a ring, but her reaction speaks clearly. She says "No."
+ <<if $activeSlave.amp != 1>>
+ She points back into your penthouse and returns to her home.
+ <<else>>
+ She gestures towards the nearest camera and he helps her back into your penthouse.
+ <</if>>
+ The only thing she wants after being freed is to return to your side.
+ "I thought I was giving her a better life... But she already had everything she wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
+ Since she returned to slavery, it's only fair to return the credits he paid for her. He thanks you hollowly before heading on his way.
<<else>>
- She gestures towards the nearest camera and he helps her back into your penthouse.
+ happened.
+ <<if $activeSlave.amp != 1>>
+ She hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
+ <<else>>
+ As he picks up her limbless form to give her a hug,
+ <</if>>
+ she gives the nearest camera a little nod and silently mouths the words "Thank you, <<= WrittenMaster($activeSlave)>>." Soon the romantic story of The Mercenary and the Slave Girl is being told in bars and brothels across the Free City, with you naturally playing @@.green;a supporting role.@@
+ <<set $rep += 500, $cash += $slaveCost>>
+ <<include "Remove activeSlave">>
<</if>>
- The only thing she wants after being freed is to return to your side.
- "I thought I was giving her a better life... But she already had everything she wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
- Since she returned to slavery, it's only fair to return the credits he paid for her. He thanks you hollowly before heading on his way.
- <<else>>
- happened.
- <<if $activeSlave.amp != 1>>
- She hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
+ <<unset $romeoID>>
+ <</replace>>
+ <</link>>
+ <br><<link "Give her to him as a gift">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ The mercenary cannot believe his ears. After you repeat yourself twice, he leaves to collect your gift, thanking you clumsily. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's
+ <<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>
+ happening. You can't hear what he says as he takes out a ring, but her reaction speaks clearly. She says "No."
+ <<if $activeSlave.amp != 1>>
+ She points back into your penthouse and returns to her home.
+ <<else>>
+ She gestures towards the nearest camera and he helps her back into your penthouse.
+ <</if>>
+ The only thing she wants after being freed is to return to your side.
+ "I thought I was giving her a better life... But she already had everything she wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
<<else>>
- As he picks up her limbless form to give her a hug,
+ happened.
+ <<if $activeSlave.amp != 1>>
+ She hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
+ <<else>>
+ As he picks up her limbless form to give her a hug,
+ <</if>>
+ she gives the nearest camera a little nod and silently mouths the words "Thank you, <<= WrittenMaster($activeSlave)>>." You smile to yourself; when they get there they'll find flowers and a paid reservation at the arcology's best restaurant. Soon the story is being told in bars and brothels across the Free City, with you naturally playing @@.green;a starring role.@@ Some days later, you hear a dramatization is being filmed, with an aging action star playing the mercenary, a rising starlet playing $activeSlave.slaveName, and a noted character actor playing you.
+ <<set $rep += 3000>>
+ <<set _poster = "a poster for the movie that was made about the love between one of your mercenaries and " + $activeSlave.slaveName>>
+ <<set $trinkets.push(_poster)>>
+ <<include "Remove activeSlave">>
<</if>>
- she gives the nearest camera a little nod and silently mouths the words "Thank you, <<= WrittenMaster($activeSlave)>>." Soon the romantic story of The Mercenary and the Slave Girl is being told in bars and brothels across the Free City, with you naturally playing @@.green;a supporting role.@@
- <<set $rep += 500, $cash += $slaveCost>>
- <<include "Remove activeSlave">>
- <</if>>
- <<unset $romeoID>>
- <</replace>>
-<</link>>
-<br><<link "Give her to him as a gift">>
- <<EventNameDelink $activeSlave>>
- <<replace "#result">>
- The mercenary cannot believe his ears. After you repeat yourself twice, he leaves to collect your gift, thanking you clumsily. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's
- <<if $activeSlave.relationship == -3 && $activeSlave.fetish != "mindbroken" && $activeSlave.devotion+$activeSlave.trust > 190>>
- happening. You can't hear what he says as he takes out a ring, but her reaction speaks clearly. She says "No."
- <<if $activeSlave.amp != 1>>
- She points back into your penthouse and returns to her home.
- <<else>>
- She gestures towards the nearest camera and he helps her back into your penthouse.
- <</if>>
- The only thing she wants after being freed is to return to your side.
- "I thought I was giving her a better life... But she already had everything she wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
- <<else>>
- happened.
- <<if $activeSlave.amp != 1>>
- She hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
- <<else>>
- As he picks up her limbless form to give her a hug,
- <</if>>
- she gives the nearest camera a little nod and silently mouths the words "Thank you, <<= WrittenMaster($activeSlave)>>." You smile to yourself; when they get there they'll find flowers and a paid reservation at the arcology's best restaurant. Soon the story is being told in bars and brothels across the Free City, with you naturally playing @@.green;a starring role.@@ Some days later, you hear a dramatization is being filmed, with an aging action star playing the mercenary, a rising starlet playing $activeSlave.slaveName, and a noted character actor playing you.
- <<set $rep += 3000>>
- <<set _poster = "a poster for the movie that was made about the love between one of your mercenaries and " + $activeSlave.slaveName>>
- <<set $trinkets.push(_poster)>>
- <<include "Remove activeSlave">>
- <</if>>
- <<unset $romeoID>>
- <</replace>>
-<</link>>
-</span>
+ <<unset $romeoID>>
+ <</replace>>
+ <</link>>
+ </span>
+
+<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index e4a7bb354fe..a597af7adb1 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1699,6 +1699,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<if $minimumSlaveAge <= 3>>
<<link "Accept $his offer">>
<<set $cash -= ($contractCost*2)>>
+ <<replace "#result">>
You have the needy girl immediately bought to your penthouse where you help $his laboring body into an available bed or inspection. $He asks where $his other babies were taken, to which you reply somewhere they can be raised properly. They'll be taken care of and won't have to grow up on the streets, plus they were sucking the life out of $him. $He's a little depressed at the news, but understands your reasons. You take the opportunity to give $him a good look over; $he is really dilated! Apart from that, between all the births and dicks, $his vagina is rather worn out, though $he seems to understand how to use it. $His anus has also seen use, but not nearly as much.
<br><br>
You turn to the child clutching $his mother's grotesque belly. _He2 is in better shape than _his2 mother and tries to hide behind $his belly when you look at _him2. _He2'll be broken into a good little _girl2 for you soon enough.
--
GitLab