From 9f1c50b1f5511381384739332adf5c19e3a4fc32 Mon Sep 17 00:00:00 2001
From: Blank <okp57855@psoxs.com>
Date: Wed, 14 Nov 2018 14:18:19 -0800
Subject: [PATCH] ITT-Fixes
---
src/gui/Encyclopedia/encyclopedia.tw | 6 ++---
src/js/eventSelectionJS.tw | 2 +-
src/pregmod/killSlave.tw | 35 +++++++-------------------
src/pregmod/killedSlave.tw | 20 +++++++--------
src/uncategorized/reRecruit.tw | 2 ++
src/uncategorized/saDrugs.tw | 4 +--
src/uncategorized/saLongTermEffects.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 4 +--
8 files changed, 29 insertions(+), 46 deletions(-)
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 52a589a1a65..bec57be06f6 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -56,12 +56,12 @@ PLAYING FREE CITIES
<br> @@.yellow;Yellow text@@ means something neutral but noteworthy.
<br> @@.hotpink;Hot pink text@@ means an increase in a slave's regard for to you.
<br> @@.mediumorchid;Orchid text@@ means a decrease in a slave's regard for to you.
- <br> @@.mediumaquamarine;Aquamarine text@@ means an increase in a slave's <br> @@.mediumaquamarine;[[trust|Encyclopedia][$encyclopedia = "Trust"]]@@ of to you, and a reduction in her fear of you.
- <br> @@.gold;Gold text@@ means a decrease in a slave's <br> @@.gold;[[trust|Encyclopedia][$encyclopedia = "Trust"]]@@ of you, and an increase in her fear of you.
+ <br> @@.mediumaquamarine;Aquamarine text@@ means an increase in a slave's @@.mediumaquamarine;[[trust|Encyclopedia][$encyclopedia = "Trust"]]@@ of to you, and a reduction in her fear of you.
+ <br> @@.gold;Gold text@@ means a decrease in the slave's @@.gold;[[trust|Encyclopedia][$encyclopedia = "Trust"]]@@ of you, and an increase in her fear of you.
<br> @@.orangered;Orange-red text@@ means a decrease in a hateful slave's fear of you.
<br> @@.lime;Lime text@@ means something has grown or improved, which is usually, but not always, good.
<br> @@.orange;Orange text@@ means something has shrunk or degraded, which is usually, but not always, bad.
- <br> @@.yellowgreen;Yellow-green text@@ indicates a @@.yellowgreen;[[money|Encyclopedia][$encyclopedia = "Money"]]@@-related event.
+ <br> @@.yellowgreen;Yellow-green text@@ is for a @@.yellowgreen;[[money|Encyclopedia][$encyclopedia = "Money"]]@@-related event.
<br> @@.coral;Coral text@@ is used for simple identifiers that can be used to check a slave's general type at a glance, also weakening fetishes.
<br> @@.lightcoral;Light coral text@@ is used when a slave's fetish strengthens or develops.
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index 828f4902f75..83c833a2c48 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -131,7 +131,7 @@ if(eventSlave.fetish != "mindbroken") {
}
}
if(eventSlave.ID != State.variables.HeadGirl.ID) {
- if(canSee(eventSlave)) {
+ if(canSee(eventSlave) && canWalk(eventSlave)) {
if(eventSlave.speechRules != "restrictive") {
if(eventSlave.trust > 75) {
if(eventSlave.devotion > 50) {
diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw
index ea2eb8b747d..64f78be1a99 100644
--- a/src/pregmod/killSlave.tw
+++ b/src/pregmod/killSlave.tw
@@ -3,40 +3,23 @@
<<set $killChoice = -1>>
<<set _qualifiedFS = []>>
-<<set _qualifiedFS.push("RND")>>
-
<<if $arcologies[0].FSRomanRevivalist != "unset">>
- <<set _qualifiedFS.push("roman revivalist")>>
+ <<set _qualifiedFS.push("roman revivalist"), _weapon = 'gladius'>>
<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
- <<set _qualifiedFS.push("aztec revivalist")>>
+ <<set _qualifiedFS.push("aztec revivalist"), _weapon = 'Tecpatl'>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
- <<set _qualifiedFS.push("egyptian revivalist")>>
+ <<set _qualifiedFS.push("egyptian revivalist"), _weapon = 'kopesh'>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- <<set _qualifiedFS.push("edo revivalist")>>
+ <<set _qualifiedFS.push("edo revivalist"), _weapon = 'katana'>>
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
- <<set _qualifiedFS.push("arabian revivalist")>>
+ <<set _qualifiedFS.push("arabian revivalist"), _weapon = 'scimitar'>>
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
- <<set _qualifiedFS.push("chinese revivalist")>>
+ <<set _qualifiedFS.push("chinese revivalist"), _weapon = 'jian'>>
<</if>>
-<<set _weapon = _qualifiedFS>>
-
-<<switch _weapon>>
-<<case "roman revivalist">>
- <<set _weapon = "gladius">>
-<<case "aztec revivalist">>
- <<set _weapon = "macuahuitl">>
-<<case "egyptian revivalist">>
- <<set _weapon = "kopesh">>
-<<case "edo revivalist">>
- <<set _weapon = "katana">>
-<<case "arabian revivalist">>
- <<set _weapon = "scimitar">>
-<<case "chinese revivalist">>
- <<set _weapon = "jian">>
-<<default>>
- <<set _weapon = "handgun">>
-<</switch>>
+<<if _qualifiedFS.length < 1>>
+ <<set _weapon = 'handgun'>>
+<</if>>
<<if canWalk($activeSlave)>>
You call $activeSlave.slaveName into your office.
diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw
index a59da06326d..3077bd98838 100644
--- a/src/pregmod/killedSlave.tw
+++ b/src/pregmod/killedSlave.tw
@@ -3,25 +3,23 @@
<<if $killChoice == 0>>
<<set _qualifiedFS = []>>
-<<set _qualifiedFS.push("RND")>>
-
<<if $arcologies[0].FSRomanRevivalist != "unset">>
- <<set _qualifiedFS.push("roman revivalist"), _weapon = gladius>>
+ <<set _qualifiedFS.push("roman revivalist"), _weapon = 'gladius'>>
<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
- <<set _qualifiedFS.push("aztec revivalist"), _weapon = Tecpatl>>
+ <<set _qualifiedFS.push("aztec revivalist"), _weapon = 'Tecpatl'>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
- <<set _qualifiedFS.push("egyptian revivalist"), _weapon = kopesh>>
+ <<set _qualifiedFS.push("egyptian revivalist"), _weapon = 'kopesh'>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- <<set _qualifiedFS.push("edo revivalist"), _weapon = katana>>
+ <<set _qualifiedFS.push("edo revivalist"), _weapon = 'katana'>>
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
- <<set _qualifiedFS.push("arabian revivalist"), _weapon = scimitar>>
+ <<set _qualifiedFS.push("arabian revivalist"), _weapon = 'scimitar'>>
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
- <<set _qualifiedFS.push("chinese revivalist"), _weapon = jian>>
+ <<set _qualifiedFS.push("chinese revivalist"), _weapon = 'jian'>>
<</if>>
You simply smile at $him and tell $him not to worry as you continue
-<<if _qualifiedFS > 0>>
+<<if _qualifiedFS.length > 0>>
sharpening your _weapon.
<<else>>
threading on a suppressor.
@@ -29,7 +27,7 @@ You simply smile at $him and tell $him not to worry as you continue
$activeSlave.slaveName gives an audible sigh of relief and begins to thank you profusely, though $his thanks are cut short as the sound of
-<<if _qualifiedFS > 0>>
+<<if _qualifiedFS.length > 0>>
a sharp edge slicing though flesh
<<else>>
a suppressed gunshot
@@ -127,7 +125,7 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
<</if>>
<<include "Remove activeSlave">>
- <<set $returnTo = "Main">>
+ <<set $nextLink = "AS Dump">>
/*this will DEFINTELY need balancing*/
<<elseif $killChoice == 1>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index a9373190242..c284f109173 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1596,6 +1596,7 @@
<<case "held POW">>
+<<set $activeSlave.PLimb = 1>>
<<set $activeSlaveOneTimeMinAge = Math.max($fertilityAge, 8)>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $one_time_age_overrides_pedo_mode = 1>>
@@ -1667,6 +1668,7 @@
<<case "rogue cyborg">>
+<<set $activeSlave.PLimb = 1>>
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $oneTimeDisableDisability = 1>>
<<include "Generate XX Slave">>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index 31092e4e110..a4496f8e940 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -784,7 +784,7 @@
<<case "super fertility drugs">>
<<if $slaves[$i].pregKnown == 1>>
- $He's already pregnant, so the fertility drugs $he's on do $him no good.
+ @@.yellow$He's already pregnant, so the fertility drugs $he's on do $him no good.@@
<<elseif $slaves[$i].pregWeek < 0>>
$He's still recovering from a recent pregnancy, so the fertility drugs $he's on do $him little good.
<<elseif ($slaves[$i].preg > 1)>>
@@ -824,7 +824,7 @@
<<case "fertility drugs">>
<<if $slaves[$i].pregKnown == 1>>
- $He's already pregnant, so the fertility drugs $he's on do $him no good.
+ @@.yellow$He's already pregnant, so the fertility drugs $he's on do $him no good.@@
<<elseif $slaves[$i].pregWeek < 0>>
$He's still recovering from a recent pregnancy, so the fertility drugs $he's on do $him little good.
<<elseif ($slaves[$i].preg > 1)>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index c476c108c5d..dd9f4df4f1f 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6999,7 +6999,7 @@
<<case 3>>
$He experiences a troublingly severe panic attack one morning. It passes with @@.red;a minor dose of medication,@@
<<case 4>>
- $He suffers a series of severe headaches. they pass with @@.red;a minor dose of medication,@@
+ $He suffers a series of severe headaches. They pass with @@.red;a minor dose of medication,@@
<<case 5>>
$He experiences recurrent nausea this week. It passes with @@.red;a minor dose of medication,@@
<<case 6>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 6bc1ebfef4a..1e6eb76b879 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -2514,8 +2514,6 @@ $He's got a
<<widget "AnusDescription">>
-<<buttplugDescription>>
-
<<if ($activeSlave.skin == "tanned") || ($activeSlave.skin == "fair") || ($activeSlave.skin == "pale") || ($activeSlave.race == "white")>>
<<set $skinDesc = "pink">>
<<elseif ($activeSlave.anusTat == "bleached")>>
@@ -2588,6 +2586,8 @@ $He's got a
$His asshole looks unusually puffy and sore. $He's either been cruelly assraped lately, or $he's had an irritant placed in $his anus.
<</if>>
+<<buttplugDescription>>
+
<<if $showBodyMods == 1>>
<<anusPiercingDescription>>
<<anusTatDescription>>
--
GitLab