From 12b6628457726781fa9da3733b0a00d7d14a8cc8 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 29 Jun 2018 21:01:06 -0400
Subject: [PATCH] fixes and refreshment changing
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 +++-
devNotes/twine JS.txt | 30 ++++++++++++++++++++
src/js/clothingSelectionJS.tw | 30 ++++++++++++++++++++
src/pregmod/theBlackMarket.tw | 14 +++++++++
4 files changed, 78 insertions(+), 1 deletion(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 8afb2b4ddc2..2bb21b07e07 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,9 +4,12 @@
6/29/2018
+ 9
+ -you can now change your refreshment choice at the black market
+
8
-fixes
- -physical idealist SMR now better suits your muscle perference
+ -physical idealist SMR now better suits your muscle preference
7
-more fixes to the RA
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index ca4f1ce34cc..c8e63a7b1ea 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -8241,6 +8241,16 @@ window.todaysShoes = function(slave) {
var player = State.variables.PC;
var shoes = [];
+ const pronouns = getPronouns(slave);
+ const he = pronouns.pronoun;
+ const him = pronouns.object;
+ const his = pronouns.possessive;
+ const hers = pronouns.posessivePronoun;
+ const himself = pronouns.objectReflexive;
+ const boy = pronouns.noun;
+ const He = capFirstChar(he);
+ const His = capFirstChar(his);
+
if(slave.fetish == 'mindbroken') {
if(slave.amp != 1 && slave.heels == 1) {
shoes.push({text: `${He} finds ${he} can inexplicably walk if ${he} wears heels; a daily lesson for ${him}, as ${he} forgets shortly after leaving.`, shoes: jsEither(["heels", "pumps", "extreme heels", "boots"])});
@@ -8285,6 +8295,16 @@ window.todaysCollar = function(slave) {
var player = State.variables.PC;
var neck = [];
+ const pronouns = getPronouns(slave);
+ const he = pronouns.pronoun;
+ const him = pronouns.object;
+ const his = pronouns.possessive;
+ const hers = pronouns.posessivePronoun;
+ const himself = pronouns.objectReflexive;
+ const boy = pronouns.noun;
+ const He = capFirstChar(he);
+ const His = capFirstChar(his);
+
if(slave.fetish == 'mindbroken') {
} else if(slave.devotion <= 20) {
@@ -8316,6 +8336,16 @@ window.todaysCorset = function(slave) {
var belly = [];
var empathyBellies = ["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"];
+ const pronouns = getPronouns(slave);
+ const he = pronouns.pronoun;
+ const him = pronouns.object;
+ const his = pronouns.possessive;
+ const hers = pronouns.posessivePronoun;
+ const himself = pronouns.objectReflexive;
+ const boy = pronouns.noun;
+ const He = capFirstChar(he);
+ const His = capFirstChar(his);
+
if(slave.fetish == 'mindbroken') {
if(ArcologyZero.FSRepopulationFocus > 0 && slave.belly < 1500) {
if(slave.weight > 130) {
diff --git a/src/js/clothingSelectionJS.tw b/src/js/clothingSelectionJS.tw
index eaf25295824..e1337301652 100644
--- a/src/js/clothingSelectionJS.tw
+++ b/src/js/clothingSelectionJS.tw
@@ -614,6 +614,16 @@ window.todaysShoes = function(slave) {
var player = State.variables.PC;
var shoes = [];
+ const pronouns = getPronouns(slave);
+ const he = pronouns.pronoun;
+ const him = pronouns.object;
+ const his = pronouns.possessive;
+ const hers = pronouns.posessivePronoun;
+ const himself = pronouns.objectReflexive;
+ const boy = pronouns.noun;
+ const He = capFirstChar(he);
+ const His = capFirstChar(his);
+
if(slave.fetish == 'mindbroken') {
if(slave.amp != 1 && slave.heels == 1) {
shoes.push({text: `${He} finds ${he} can inexplicably walk if ${he} wears heels; a daily lesson for ${him}, as ${he} forgets shortly after leaving.`, shoes: jsEither(["heels", "pumps", "extreme heels", "boots"])});
@@ -658,6 +668,16 @@ window.todaysCollar = function(slave) {
var player = State.variables.PC;
var neck = [];
+ const pronouns = getPronouns(slave);
+ const he = pronouns.pronoun;
+ const him = pronouns.object;
+ const his = pronouns.possessive;
+ const hers = pronouns.posessivePronoun;
+ const himself = pronouns.objectReflexive;
+ const boy = pronouns.noun;
+ const He = capFirstChar(he);
+ const His = capFirstChar(his);
+
if(slave.fetish == 'mindbroken') {
} else if(slave.devotion <= 20) {
@@ -689,6 +709,16 @@ window.todaysCorset = function(slave) {
var belly = [];
var empathyBellies = ["a small empathy belly", "a medium empathy belly", "a large empathy belly", "a huge empathy belly"];
+ const pronouns = getPronouns(slave);
+ const he = pronouns.pronoun;
+ const him = pronouns.object;
+ const his = pronouns.possessive;
+ const hers = pronouns.posessivePronoun;
+ const himself = pronouns.objectReflexive;
+ const boy = pronouns.noun;
+ const He = capFirstChar(he);
+ const His = capFirstChar(his);
+
if(slave.fetish == 'mindbroken') {
if(ArcologyZero.FSRepopulationFocus > 0 && slave.belly < 1500) {
if(slave.weight > 130) {
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index e4418b4b5c7..73577857f86 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -7,6 +7,20 @@ You board your VTOL bird for the trip to the current location of the particularl
<br><br>
Once inside, you are able to fully absorb in the sights and sounds of the market proper. All sorts of items are available for purchase, from exotic beasts that may very well be the last of their kind, to the most lethal of weaponry both old and new, and even luxuries long gone. Despite the overbearing security, one's wallet can easily be emptied in this place.
+<br>There is quite the selection of refreshments available, you could always shift your orders from $PC.refreshment to something new. You want <<textbox "$PC.refreshment" $PC.refreshment "The Black Market">> and you want to
+''<<if $PC.refreshmentType == 0>>smoke<<elseif $PC.refreshmentType == 1>>drink<<elseif $PC.refreshmentType == 2>>eat<<elseif $PC.refreshmentType == 3>>snort<<elseif $PC.refreshmentType == 4>>inject<<elseif $PC.refreshmentType == 5>>pop<<else>>orally disolve<</if>> it.'' |
+<<if $PC.refreshmentType != 0>>[[smoke it.|The Black Market][$PC.refreshmentType = 0]] |<</if>>
+<<if $PC.refreshmentType != 1>>[[drink it.|The Black Market][$PC.refreshmentType = 1]] |<</if>>
+<<if $PC.refreshmentType != 2>>[[eat it.|The Black Market][$PC.refreshmentType = 2]] |<</if>>
+<<if $PC.refreshmentType != 3>>[[snort it.|The Black Market][$PC.refreshmentType = 3]] |<</if>>
+<<if $PC.refreshmentType != 4>>[[inject it.|The Black Market][$PC.refreshmentType = 4]] |<</if>>
+<<if $PC.refreshmentType != 5>>[[pop it.|The Black Market][$PC.refreshmentType = 5]]<<if $PC.refreshmentType != 6>> | <</if>><</if>>
+<<if $PC.refreshmentType != 6>>[[orally disolve it.|The Black Market][$PC.refreshmentType = 6]]<</if>>
+<br>
+<<if $PC.refreshmentType == 0>>//"Smoke" must fit into the following sentence: "I smoked a $PC.refreshment" to fit events properly
+<<elseif $PC.refreshmentType == 5>>//"Popped" must fit into the following sentence: "I shook the bottle of $PC.refreshment" to fit events properly
+<<elseif $PC.refreshmentType == 6>>//"Orally Dissolved" must fit into the following sentence: "I placed a tab of $PC.refreshment under my tongue" to fit events properly
+<</if>>
<br><br>
--
GitLab