From cc1e783fb36221d16194e605f411d542c4edb56c Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 17 Jun 2017 00:32:20 -0400
Subject: [PATCH] Vanilla update.
---
src/init/storyInit.tw | 4 ++--
src/uncategorized/PESS.tw | 2 +-
src/uncategorized/PETS.tw | 2 +-
src/uncategorized/RECI.tw | 2 +-
src/uncategorized/REFI.tw | 2 +-
src/uncategorized/REFS.tw | 2 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/RESSTR.tw | 2 +-
src/uncategorized/RETS.tw | 2 +-
src/uncategorized/personalAttentionSelect.tw | 4 ++--
src/uncategorized/recETS.tw | 2 +-
src/utility/descriptionWidgets.tw | 8 ++++----
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 1ea7fa9c2a0..fdb92acd25d 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -13,8 +13,8 @@ You should have received a copy of the GNU General Public License along with thi
*/
<<unset $releaseID>>
-<<set $ver = "0.10.5", $releaseID = 1016>>
-<<if ndef $releaseID>><<set $releaseID = 1016>><</if>>
+<<set $ver = "0.10.4", $releaseID = 1017>>
+<<if ndef $releaseID>><<set $releaseID = 1017>><</if>>
/* This needs to be broken down into individual files that can be added to StoryInit instead. */
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 9af391c28c5..0ba1db0f81c 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($PESSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index a761bb010ba..6cf8d3ac5e2 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($PETSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 22001caf190..05d6510ab05 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($RECIevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index c5e9981e8da..33f0cecbd7d 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -38,7 +38,7 @@
<<set $activeSlave = $slaves.find(function(s) { return s.ID == $humiliationInterestTargetID; })>>
<</switch>>
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($REFIevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index ffd7fd324b4..ec98cf81fdb 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -22,7 +22,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($REFSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 85b3ad134ab..e3ce3320c91 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($RESSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 7e72f756dbb..d43dc4ffadc 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($RESSTRevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index d6f2b360759..4d8ab0151c9 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($RETSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index f5e30075167..235df2469cc 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -153,8 +153,8 @@ Your training will seek to <span id="training"><strong>$trainingRegimen</strong>
<</if>>
<br>
-<<if $activeSlave.fetishKnown == 0>>
- <<link "Explore her sexuality">><<set $trainingRegimen = "explore her sexuality">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>>
+<<if $activeSlave.fetishKnown == 0 || $activeSlave.attrKnown == 0>>
+ <<link "Explore her sexuality and fetishes">><<set $trainingRegimen = "explore her sexuality">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>>
<<else>>
//You already understand her sexuality//
<</if>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 4c309497fae..2aef340fba5 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1,6 +1,6 @@
:: RecETS [nobr]
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($RecETSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 7d235ed2e29..07845e20dbe 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -14,13 +14,13 @@
<<elseif ($personalAttention == "medicine")>>This week you will learn medicine.
<<else>>
<<if _PA > -1>>
- You plan to train ''__@@.pink;$slaves[_PA].slaveName@@__'' to $trainingRegimen this week.
+ You plan to train ''__@@.pink;<<SlaveFullName $slaves[_PA]>>@@__'' to $trainingRegimen this week.
<</if>>
<</if>>
<span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@
<br>
<<if _HG > -1>>
- ''__@@.pink;$HeadGirl.slaveName@@__'' is <<if ndef $headGirlFocus>>serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.<<else>>your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort,<</if>> and is focusing on your slaves' $headGirlFocus.<</if>>
+ ''__@@.pink;<<SlaveFullName $HeadGirl>>@@__'' is <<if ndef $headGirlFocus>>serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.<<else>>your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort,<</if>> and is focusing on your slaves' $headGirlFocus.<</if>>
<span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
<<elseif (_HG == -1) && ($slaves.length > 1)>>
You have not selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
@@ -29,7 +29,7 @@
<</if>>
<br>
<<if _RC > -1>>
- ''__@@.pink;$Recruiter.slaveName@@__'' is working to recruit girls.
+ ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is working to recruit girls.
<span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
<<else>>
You have not selected a Recruiter.
@@ -38,7 +38,7 @@
<<if ($dojo != 0)>>
<br>
<<if _BG > -1>>
- ''__@@.pink;$Bodyguard.slaveName@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ ''__@@.pink;<<SlaveFullName $Bodyguard>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<<else>>
You have not selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<</if>>
--
GitLab