From 48a7391f8efe1d80fc75424c47c04a82919c75fe Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 25 Nov 2018 02:21:39 -0500
Subject: [PATCH] $seeDicks fix and another instance of respecting it.
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 4 +-
devNotes/twine JS.txt | 4 +-
src/js/vignettes.tw | 4 +-
src/uncategorized/rePokerNight.tw | 75 +++++++++++---------
4 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index ce5c5f1d8ea..2e7d5c8caad 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -1,6 +1,8 @@
Pregmod
- 1
+0.10.7.1-1.0.x
+
+ 0
-WIP content added to nursery/farmyard
-genetic sequencing moved out of dispensary
-added advanced pregnancy tracking
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 0d92046955c..57ebe8155f2 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -29394,7 +29394,7 @@ window.GetVignette = function GetVignette(slave) {
type: "rep",
effect: 0,
});
- if ($seeDicks != 100) {
+ if (V.seeDicks != 100) {
vignettes.push({
text: "a woman dragged her angry husband along so he could watch her get eaten out by a whore,",
type: "rep",
@@ -30971,7 +30971,7 @@ window.GetVignette = function GetVignette(slave) {
type: "rep",
effect: 0,
});
- if ($seeDicks != 100) {
+ if (V.seeDicks != 100) {
vignettes.push({
text: "a woman dragged her angry husband along so he could watch his wife get eaten out by a public slut,",
type: "rep",
diff --git a/src/js/vignettes.tw b/src/js/vignettes.tw
index 3b684ac691e..db6775f40dc 100644
--- a/src/js/vignettes.tw
+++ b/src/js/vignettes.tw
@@ -1565,7 +1565,7 @@ window.GetVignette = function GetVignette(slave) {
type: "rep",
effect: 0,
});
- if ($seeDicks != 100) {
+ if (V.seeDicks != 100) {
vignettes.push({
text: "a woman dragged her angry husband along so he could watch her get eaten out by a whore,",
type: "rep",
@@ -3142,7 +3142,7 @@ window.GetVignette = function GetVignette(slave) {
type: "rep",
effect: 0,
});
- if ($seeDicks != 100) {
+ if (V.seeDicks != 100) {
vignettes.push({
text: "a woman dragged her angry husband along so he could watch his wife get eaten out by a public slut,",
type: "rep",
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index 9d4b630685f..86b661f60cc 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -51,47 +51,54 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<br>
<<link "Up the ante">>
+
+ <<set $activeSlaveOneTimeMinAge = 38>>
+ <<set $activeSlaveOneTimeMaxAge = 43>>
+ <<set $one_time_age_overrides_pedo_mode = 1>>
+ <<set $oneTimeDisableDisability = 1>>
+ <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
+ <<if $seeDicks != 100>>
+ <<include "Generate XX Slave">>
+ <<else>>
+ <<include "Generate XY Slave">>
+ <</if>>
+ <<set $activeSlave.origin = "She put herself up as collateral at a poker game, and lost.">>
+ <<set $activeSlave.career = "a soldier">>
+ <<set $activeSlave.indentureRestrictions = 2>>
+ <<set $activeSlave.indenture = 52>>
+ <<if $activeSlave.eyes == -2>>
+ <<set $activeSlave.eyes = -1>>
+ <</if>>
+ <<set $activeSlave.devotion = random(25,40)>>
+ <<set $activeSlave.trust = random(35,45)>>
+ <<set $activeSlave.health = random(60,80)>>
+ <<set $activeSlave.muscles = 50>>
+ <<if $activeSlave.weight > 130>>
+ <<set $activeSlave.weight -= 100>>
+ <<set $activeSlave.waist = random(-10,50)>>
+ <</if>>
+ <<set $activeSlave.anus = 0>>
+ <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.behavioralFlaw = "arrogant">>
+ <<set $activeSlave.hStyle = "shaved into a mohawk">>
+ <<set $activeSlave.customTat = "She has a number of tattoos from a variety of mercenary companies.">>
+ <<setLocalPronouns $activeSlave>>
+
<<replace "#bountyresult">>
- Some aggressive play and an eye for riling up your fellow players has resulted in an immense payout, and all but one of your adversaries have folded as the situation has escalated. The only player still in contention is a wily old mercenary, the veteran of her fair share of battles on the battlefield and at the poker table. She's short on chips, however, and she'll have to buy in with something else as collateral.
+ Some aggressive play and an eye for riling up your fellow players has resulted in an immense payout, and all but one of your adversaries have folded as the situation has escalated. The only player still in contention is a wily old mercenary, the veteran of $his fair share of battles on the battlefield and at the poker table. $He's short on chips, however, and $he'll have to buy in with something else as collateral.
<br><br>
<span id="aliveresult">
<<link "A year of servitude">>
<<replace "#aliveresult">>
<<if random(1,100) > 50>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up her spoils, the other mercenaries clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other mercenaries clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
<<set $rep += 1000, $cash -= 5000>>
<<else>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. A silence falls over the room as the result is declared, but after some time your opponent breaks the hush by joking that life as your slave is probably easier than fighting for $arcologies[0].name. After some awkward laughter the night continues, and at the end your former mercenary joins you on your trip back to the penthouse to submit to processing and to begin her new life as your sexual servant. She's not young, but she's tough and not distrusting of you due to her service in the $mercenariesTitle.
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. A silence falls over the room as the result is declared, but after some time your opponent breaks the hush by joking that life as your slave is probably easier than fighting for $arcologies[0].name. After some awkward laughter the night continues, and at the end your former mercenary joins you on your trip back to the penthouse to submit to processing and to begin $his new life as your sexual servant. $He's not young, but $he's tough and not distrusting of you due to $his service in the $mercenariesTitle.
<br>
- <<set $activeSlaveOneTimeMinAge = 38>>
- <<set $activeSlaveOneTimeMaxAge = 43>>
- <<set $one_time_age_overrides_pedo_mode = 1>>
- <<set $oneTimeDisableDisability = 1>>
- <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
- <<include "Generate XX Slave">>
- <<set $activeSlave.origin = "She put herself up as collateral at a poker game, and lost.">>
- <<set $activeSlave.career = "a soldier">>
- <<set $activeSlave.indentureRestrictions = 2>>
- <<set $activeSlave.indenture = 52>>
- <<if $activeSlave.eyes == -2>>
- <<set $activeSlave.eyes = -1>>
- <</if>>
- <<set $activeSlave.devotion = random(25,40)>>
- <<set $activeSlave.trust = random(35,45)>>
- <<set $activeSlave.health = random(60,80)>>
- <<set $activeSlave.muscles = 50>>
- <<if $activeSlave.weight > 130>>
- <<set $activeSlave.weight -= 100>>
- <<set $activeSlave.waist = random(-10,50)>>
- <</if>>
- <<set $activeSlave.anus = 0>>
- <<set $activeSlave.analSkill = 0>>
- <<set $activeSlave.whoreSkill = 0>>
- <<set $activeSlave.combatSkill = 1>>
- <<set $activeSlave.behavioralFlaw = "arrogant">>
- <<set $activeSlave.hStyle = "shaved into a mohawk">>
- <<set $activeSlave.customTat = "She has a number of tattoos from a variety of mercenary companies.">>
<<include "New Slave Intro">>
<</if>>
<</replace>>
@@ -99,13 +106,13 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<br>
- <<link "Dock her wages">>
+ <<link "Dock $his wages">>
<<replace "#aliveresult">>
<<if random(1,100) > 50>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up her spoils, the other mercenaries clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other mercenaries clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
<<set $rep += 1000, $cash -= 5000>>
<<else>>
- For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. Your opponent accepts her defeat with grace and jokes to her comrades that she'll be fighting in her underwear for the next few months, and their uproar of laughter fills the room. Though you take the lion's share of the ¤, your mercenaries also @@.green;had a good time fraternizing with you.@@
+ For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck has rendered you the victor. Your opponent accepts $his defeat with grace and jokes to $his comrades that $he'll be fighting in $his underwear for the next few months, and their uproar of laughter fills the room. Though you take the lion's share of the ¤, your mercenaries also @@.green;had a good time fraternizing with you.@@
<<set $rep += 200, $cash += 5000>>
<</if>>
<</replace>>
--
GitLab