From 5d0eba3e89113430edbb9f93d7470eebb5307ce7 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 30 Apr 2018 16:07:20 -0400
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +++++++
devNotes/twine JS | 10 ++++++++--
src/gui/Encyclopedia/encyclopedia.tw | 6 +++---
src/uncategorized/walkPast.tw | 2 +-
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 3aa9bd00b65..f976c506234 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-0.1.x
+4/30/2018
+
+ 78
+ -Deepmurks vector art pack update
+ -Deepmurks slutty schutzstaffel outfit and porcelain mask accessory
+ -various fixes
+
4/29/2018
77
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 4c975449b7f..df160de4954 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -4538,7 +4538,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.devotion > 20) {
if(eventSlave.butt > 5) {
- if(!["no clothing", "body oil", "a toga", "a kimono", "shibari ropes", "a slutty maid outfit", "a string bikini", "a scalemail bikini", "a chattel habit", "a slave gown", "a halter top dress", "a ball gown", "a mini dress", "harem gauze", "a schutzstaffel uniform", "a red army uniform", "a monokini"].includes(eventSlave.clothes)) {
+ if(!["no clothing", "body oil", "a toga", "a kimono", "shibari ropes", "a slutty maid outfit", "a string bikini", "a scalemail bikini", "a chattel habit", "a slave gown", "a halter top dress", "a ball gown", "a mini dress", "harem gauze", "a schutzstaffel uniform", "a slutty schutzstaffel uniform", "a red army uniform", "a monokini"].includes(eventSlave.clothes)) {
State.variables.RESSevent.push("ass fitting");
}
}
@@ -7327,7 +7327,7 @@ window.todaysOutfit = function(slave) {
selection = {text: "she commonly sees others wearing chains and is drawn to doing so herself.", clothes: jsEither(['chains', 'uncomfortable straps', 'shibari ropes'])};
break;
case 'mature':
- selection = {text: "she commonly sees others wearing suits and is drawn to doing so herself.", clothes: jsEither(['slutty business attire', 'a nice maid outfit', 'a military uniform', 'a schutzstaffel uniform', 'a red army uniform', 'nice business attire'])};
+ selection = {text: "she commonly sees others wearing suits and is drawn to doing so herself.", clothes: jsEither(['slutty business attire', 'a nice maid outfit', 'a military uniform', 'a schutzstaffel uniform', 'a slutty schutzstaffel uniform', 'a red army uniform', 'nice business attire'])};
break;
case 'youth':
selection = {text: "she commonly sees schoolgirls around and instinctually follows along.", clothes: jsEither(['a schoolgirl outfit', 'a cheerleader outfit'])};
@@ -7415,6 +7415,7 @@ window.todaysOutfit = function(slave) {
} else if(slave.assignment == "be your Head Girl") {
wardrobeAssignment.push({text: "and wears a military uniform to give her that extra touch of authority.", clothes: "a military uniform"});
wardrobeAssignment.push({text: "and wears a schutzstaffel uniform to give her that extra touch of authority.", clothes: "a schutzstaffel uniform"});
+ wardrobeAssignment.push({text: "and wears a slutty schutzstaffel uniform to give her that extra touch of authority.", clothes: "a slutty schutzstaffel uniform"});
wardrobeAssignment.push({text: "and wears a red army uniform to give her that extra touch of authority.", clothes: "a red army uniform"});
wardrobeAssignment.push({text: "and wears a handsome suit to give her that extra touch of authority.", clothes: "nice business attire"});
if(canPenetrate(slave)){
@@ -7474,6 +7475,7 @@ window.todaysOutfit = function(slave) {
wardrobeAssignment.push({text: "and wears a bodysuit to show off her curves without hindering her deadliness.", clothes: "a comfortable bodysuit"});
wardrobeAssignment.push({text: "and wears a military uniform to look the part of the honor guard.", clothes: "a military uniform"});
wardrobeAssignment.push({text: "and wears a schutzstaffel uniform to look the part of the honor guard.", clothes: "a schutzstaffel uniform"});
+ wardrobeAssignment.push({text: "and wears a slutty schutzstaffel uniform to look the part of the honor guard.", clothes: "a slutty schutzstaffel uniform"});
wardrobeAssignment.push({text: "and wears a red army uniform to look the part of the honor guard.", clothes: "a red army uniform"});
wardrobeAssignment.push({text: "and wears a nice suit to make it clear you mean business.", clothes: "nice business attire"});
wardrobeAssignment.push({text: "and wears a scalemail bikini to make herself look fierce.", clothes: "a scalemail bikini"});
@@ -9183,7 +9185,11 @@ window.extractHairColor = function(hColor) {
["hazel", "#8d6f1f"],
["pink", "#D18CBC"],
["red", "#BB2027"],
+ ["deep red", "#6D1318"],
+ ["blue-violet", "#8790B7"],
["silver", "#cdc9c6"],
+ ["light olive", "#d4c6bb"],
+ ["dark", "#a46237"],
/* these are not actually FreeCities canon, but like to appear in custom descriptions */
["dark", "#463325"],
["brunette", "#8D4F21"]
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 4c0a8fceee8..f7f67e9f694 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -797,7 +797,7 @@ Choose a more particular entry below:
<<case "Nurse">>
- An ''Nurse'' can be selected once the [[Clinic|Encyclopedia][$encyclopedia = "Clinic"]] facility is built. Nurses increase [[health|Encyclopedia][$encyclopedia = "Health"]] gains in the Clinic. Good Nurses are [[nymphomaniacs|Encyclopedia][$encyclopedia = "Nymphomania"]], highly @@cyan;intelligent@@, physically fit, and very beautiful.
+ An ''Nurse'' can be selected once the [[Clinic|Encyclopedia][$encyclopedia = "Clinic"]] facility is built. Nurses increase [[health|Encyclopedia][$encyclopedia = "Health"]] gains in the Clinic. Good Nurses are [[nymphomaniacs|Encyclopedia][$encyclopedia = "Nymphomania"]], highly @@.cyan;intelligent@@, physically fit, and very beautiful.
<<case "Recruiter">>
@@ -812,7 +812,7 @@ Choose a more particular entry below:
<<case "Schoolteacher">>
- A ''schoolteacher'' can be selected once the [[Schoolroom|Encyclopedia][$encyclopedia = "Schoolroom"]] facility is built. Schoolteachers increase the rate at which students in the schoolroom learn. Good Schoolteachers are older than 35, beautiful, @@ctan;intelligent@@, and educated.
+ A ''schoolteacher'' can be selected once the [[Schoolroom|Encyclopedia][$encyclopedia = "Schoolroom"]] facility is built. Schoolteachers increase the rate at which students in the schoolroom learn. Good Schoolteachers are older than 35, beautiful, @@cyan;intelligent@@, and educated.
<<case "Stewardess">>
@@ -826,7 +826,7 @@ Choose a more particular entry below:
<<case "Wardeness">>
- A ''Wardeness'' can be selected once the [[Cellblock|Encyclopedia][$encyclopedia = "Cellblock"]] facility is built. Wardenesses increase the rate at which slaves in the cellblock are broken. Very high [[@@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@, [[nymphomania|Encyclopedia][$encyclopedia = "Nymphomania"]] or [[sadism|Encyclopedia][$encyclopedia = "Sadists"]], strong [[muscles|Encyclopedia][$encyclopedia = "Musculature"]], applicable [[career experience|Encyclopedia][$encyclopedia = "Career Experience"]], and a solid dick make a powerful Wardeness.
+ A ''Wardeness'' can be selected once the [[Cellblock|Encyclopedia][$encyclopedia = "Cellblock"]] facility is built. Wardenesses increase the rate at which slaves in the cellblock are broken. Very high [[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]], [[nymphomania|Encyclopedia][$encyclopedia = "Nymphomania"]] or [[sadism|Encyclopedia][$encyclopedia = "Sadists"]], strong [[muscles|Encyclopedia][$encyclopedia = "Musculature"]], applicable [[career experience|Encyclopedia][$encyclopedia = "Career Experience"]], and a solid dick make a powerful Wardeness.
/**********
SLAVE ASSIGNMENTS (COMMON):
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index e174686aa5e..4c3eb914f05 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -2555,7 +2555,7 @@
The buttons on her staining jacket struggle to hold back her big jiggling gut.
<<case "a schutzstaffel uniform">>
The buttons on her staining jacket struggle to hold back her big jiggling gut.
- <<case "a a slutty schutzstaffel uniform">>
+ <<case "a slutty schutzstaffel uniform">>
The buttons on her staining jacket struggle to hold back her big jiggling gut.
<<case "a red army uniform">>
The buttons on her staining jacket struggle to hold back her big jiggling gut.
--
GitLab