From 1fb656e93d7006b6e78993ed7b498e12e5e2b00d Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 8 Nov 2017 19:03:12 -0500 Subject: [PATCH] Fixes. --- slave variables documentation - Pregmod.txt | 6 +- src/uncategorized/arcmgmt.tw | 2 +- src/uncategorized/pMercenaryRomeo.tw | 75 +++++++++++---------- 3 files changed, 44 insertions(+), 39 deletions(-) diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index 499869ef74a..2fb2cf81571 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -505,7 +505,7 @@ slave's weight 10 - -10 - neither to fat nor to skinny -11 - -30 - thin -31 - -95 - very thin --95- - emaciated +-96- - emaciated muscles: @@ -516,7 +516,7 @@ slave's muscles -5 - 5 - none -30 - -6 - weak -95 - -31 - very weak ---95 - frail +-96- - frail height: @@ -526,7 +526,7 @@ slave's height in cm 150-159 - short 160-169 - average 170-185 - tall -185+ - very tall +186+ - very tall heightImplant: diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index 4c3c787482e..14cee2c462c 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -424,7 +424,7 @@ earning you @@.yellowgreen;¤_earnings.@@ <<set _AWeekGrowth += $desc.length>> <</if>> <<if $descNeg.length > 0>> - <<if $desc.length > 0>>Your arcology's economy<</if>> + <<if $desc.length == 0>>Your arcology's economy<</if>> is hindered by social conflicts with <<if $descNeg.length > 2>> ''$descNeg[0]'', diff --git a/src/uncategorized/pMercenaryRomeo.tw b/src/uncategorized/pMercenaryRomeo.tw index 444f025b410..c73378a4c20 100644 --- a/src/uncategorized/pMercenaryRomeo.tw +++ b/src/uncategorized/pMercenaryRomeo.tw @@ -1,37 +1,20 @@ -:: P mercenary romeo +:: P mercenary romeo [nobr] -<<nobr>> - -<<set $nextButton = "Continue">> -<<set $nextLink = "Random Nonindividual Event">> +<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">> <<if $activeSlave == 0>> - <<for $i = 0; $i < $slaves.length; $i++>> - <<if $slaves[$i].fetish != "mindbroken">> - <<if $slaves[$i].fuckdoll == 0>> - <<if ($slaves[$i].assignment == "serve the public")>> - <<set $activeSlave = $slaves[$i]>> - <<break>> - <</if>> - <<if ($slaves[$i].assignment == "serve in the club")>> - <<set $activeSlave = $slaves[$i]>> - <<break>> - <</if>> - <<if ($slaves[$i].assignment == "whore")>> - <<set $activeSlave = $slaves[$i]>> - <<break>> - <</if>> - <<if ($slaves[$i].assignment == "work in the brothel")>> - <<set $activeSlave = $slaves[$i]>> + <<for _pmr = 0; _pmr < $slaves.length; _pmr++>> + <<if $slaves[_pmr].fetish != "mindbroken" && $slaves[_pmr].fuckdoll == 0>> + <<if ["serve the public", "serve in the club", "whore", "work in the brothel"].includes($slaves[_pmr].assignment)>> + <<set $activeSlave = $slaves[_pmr]>> <<break>> <</if>> <</if>> - <</if>> <</for>> <<if $activeSlave == 0>> - <<for $i = $slaves.length - 1; $i >= 0; $i-->> - <<if ($slaves[$i].publicCount > 0) && (($activeSlave == 0) || (random(1,100) > 50))>> - <<set $activeSlave = $slaves[$i]>> + <<for _pmr = $slaves.length - 1; _pmr >= 0; _pmr-->> + <<if ($slaves[_pmr].publicCount > 0) && (($activeSlave == 0) || (random(1,100) > 50))>> + <<set $activeSlave = $slaves[_pmr]>> <<break>> <</if>> <</for>> @@ -45,35 +28,57 @@ <<set $slaveCost = (random(60,70)*Math.trunc($slaveCost/100))>> <<set $slaveCost = 100*Math.trunc($slaveCost/100)>> -<</nobr>>\ -\ -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>>$PC.refreshment<<elseif $PC.refreshmentType == 1>>glass of $PC.refreshment<<elseif $PC.refreshmentType == 2>>a plate of $PC.refreshment<<elseif $PC.refreshmentType == 3>>line of $PC.refreshment<<elseif $PC.refreshmentType == 4>>syringe of $PC.refreshment<<elseif $PC.refreshmentType == 5>>pill of $PC.refreshment<<elseif $PC.refreshmentType == 6>>tab of $PC.refreshment<</if>> proffered by an attentive slave girl, he seems almost bashful. + +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>> + $PC.refreshment +<<elseif $PC.refreshmentType == 1>> + glass of $PC.refreshment +<<elseif $PC.refreshmentType == 2>> + a plate of $PC.refreshment +<<elseif $PC.refreshmentType == 3>> + line of $PC.refreshment +<<elseif $PC.refreshmentType == 4>> + syringe of $PC.refreshment +<<elseif $PC.refreshmentType == 5>> + pill of $PC.refreshment +<<elseif $PC.refreshmentType == 6>> + tab of $PC.refreshment +<</if>> +proffered by an attentive slave girl, he seems almost bashful. + +<br><br> "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'll say this straight. I'd like to buy one of your slaves. I've been seeing <<EventNameLink $activeSlave>> a lot, and she makes the years sit a little lighter on me. I've scraped together what I can, and I can pay ¤$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> + <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>> <</replace>> <</link>> -<<link "Politely decline">> +<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, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>; 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." <</replace>> <</link>> -<<link "Accept">> +<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 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, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>>.' 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>> - <<set $cash += $slaveCost>> + <<set $rep += 500, $cash += $slaveCost>> <<include "Remove activeSlave">> <</replace>> <</link>> <<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 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, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>>.' 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. + 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 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)>> -- GitLab