diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 3aa9bd00b6536d72f0e13deb899782d54be0bfff..f976c50623494d72e15fe5112ef353085f64a779 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 4c975449b7f738bac283334d9546e64edf14fb83..df160de4954bdb2de6a277d36c1c3c97756046b8 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 4c0a8fceee84dfad9a27c275e20b3d5f7dff6c9f..f7f67e9f694c81fbd3c1c8f364cd8365d12c6045 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/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index 1b2ef4fdcbdbadd58df4771a91459dadd37ce1a4..3df4a180420b3a9f939e0afce80f7810f67ec9a6 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -126,13 +126,13 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<</if>>
<<elseif $PC.boobsBonus == -0.5>>
You have a @@.orange;pair of D-cup breasts.@@
- <br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobsBonus = 0, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobsBonus = -1, $cash -= 5000, $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $cash -= 5000, $surgeryType = "flatChest"]]
+ <br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobsBonus = 0, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobsBonus = -1, $cash -= 5000, $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "flatChest"]]
<<elseif $PC.boobsBonus == -1>>
You have a @@.orange;average pair of C-cup breasts.@@
- <br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobsBonus = -0.5, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $cash -= 5000, $surgeryType = "flatChest"]] | //You lack sufficient fatty tissue to permit additional size reduction short of total breast removal.//
+ <br>[[Add additional fatty tissue|PC Surgery Degradation][$PC.boobsBonus = -0.5, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "flatChest"]] | //You lack sufficient fatty tissue to permit additional size reduction short of total breast removal.//
<<elseif $PC.boobs == 1>>
You have a @@.orange;big pair of DD breasts.@@
- <br>[[Get a pair of breast implants|PC Surgery Degradation][$PC.boobsBonus = 1, $PC.boobsImplant = 1, $cash -= 10000, $surgeryType = "breastEnlargementImplant"]] | [[Add additional breast tissue|PC Surgery Degradation][$PC.boobsBonus = 1, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobsBonus = -0.5, $cash -= 5000, $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $cash -= 5000, $surgeryType = "flatChest"]]
+ <br>[[Get a pair of breast implants|PC Surgery Degradation][$PC.boobsBonus = 1, $PC.boobsImplant = 1, $cash -= 10000, $surgeryType = "breastEnlargementImplant"]] | [[Add additional breast tissue|PC Surgery Degradation][$PC.boobsBonus = 1, $cash -= 15000, $surgeryType = "breastEnlargement"]] | [[Have fatty tissue removed|PC Surgery Degradation][$PC.boobsBonus = -0.5, $cash -= 5000, $surgeryType = "breastShrinkage"]] | [[Have them removed|PC Surgery Degradation][$PC.boobs = 0, $PC.boobsBonus = 0, $cash -= 5000, $surgeryType = "flatChest"]]
<<elseif $PC.title == 1>>
You have a @@.orange;masculine chest.@@ At your request, breast tissue could be added until you have a healthy bust, though society is unlikely to approve.
<br>[[Get a pair of breasts|PC Surgery Degradation][$PC.boobs = 1, $PC.boobsBonus = -1, $cash -= 15000, $surgeryType = "breasts"]]
@@ -168,7 +168,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<</if>>
<br>
<<elseif $PC.belly >= 64000>>
- Oh wow! You're immense! I almost can't wrap my arms around it!." She says as she uses both hands to massage your
+ Oh wow! You're immense! I almost can't wrap my arms around it!" She says as she uses both hands to massage your
<<if $PC.preg > 40>>overdue quadruplet-filled belly, enjoying the kicks from your children within. "If you go into labor, we have everything you'll need, so don't worry."
<<else>>crowded belly.
<</if>>
diff --git a/src/uncategorized/pPeacekeepersIntro.tw b/src/uncategorized/pPeacekeepersIntro.tw
index c5e9437a82fb232221e98da414cbda0856a1dde1..7af89b0edd0d9e4c7e4cc17a23488799d3de089c 100644
--- a/src/uncategorized/pPeacekeepersIntro.tw
+++ b/src/uncategorized/pPeacekeepersIntro.tw
@@ -41,7 +41,7 @@ He spreads his hands. "I don't have anything to suggest, not yet. But if I see a
<br><br>
-As he spoke, you and $assistantName surreptitiously checked out what he said. He seems to be telling the truth, and he's correct that your interests won't be immediately affected. Nevertheless, this is a concerning development. General $peacekeepers.generalName will have a thousands of troops and a lot of military hardware under his able command, more or less right next door to the Free City. He might not intend to overstep the bounds of his peacekeeping mandate, but that's no guarantee that his civilian superiors back home won't decide to order him to. Worse, the politics of the Free Cities are almost unanimously hostile to old world power; there will be public resentment about this. On the other hand, General $peacekeepers.generalName has been successful in these difficult times in no small part due to his willingness to bend the rules. If he sees an opportunity to work with an ambitious arcology owner in furtherance of his goals, he'll probably take it.
+As he spoke, you and $assistantName surreptitiously checked out what he said. He seems to be telling the truth, and he's correct that your interests won't be immediately affected. Nevertheless, this is a concerning development. General $peacekeepers.generalName will have thousands of troops and a lot of military hardware under his able command, more or less right next door to the Free City. He might not intend to overstep the bounds of his peacekeeping mandate, but that's no guarantee that his civilian superiors back home won't decide to order him to. Worse, the politics of the Free Cities are almost unanimously hostile to old world power; there will be public resentment about this. On the other hand, General $peacekeepers.generalName has been successful in these difficult times in no small part due to his willingness to bend the rules. If he sees an opportunity to work with an ambitious arcology owner in furtherance of his goals, he'll probably take it.
<br><br>
<span id="result">
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index db5b3a01e665b240d087b180dfbbd6f5b2357aad..2ed4693fb3b3138cdef4351cc6dd27ab9c8718f4 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -800,9 +800,9 @@ serves you this week.
and _children[_spy].slaveName,
<</if>>
<</for>>
- as a sexual servants, you often enjoy them all at once, which leaves quite a public impression.
+ as sexual servants, you often enjoy them all at once, which leaves quite a public impression.
<<elseif _children.length > 1>>
- Since you are also keeping $possessive daughters, _children[0].slaveName and _children[1].slaveName, as a sexual servants, you often use them together, leaving quite a public impression.
+ Since you are also keeping $possessive daughters, _children[0].slaveName and _children[1].slaveName, as sexual servants, you often use them together, leaving quite a public impression.
<<elseif _children.length > 0>>
Since you are also keeping $possessive daughter as a sexual servant, you often use them together, which leaves quite a public impression.
<</if>>
@@ -817,9 +817,9 @@ serves you this week.
and _children[_spy].slaveName,
<</if>>
<</for>>
- as a sexual servants, you often enjoy them all at once, which leaves quite a public impression.
+ as sexual servants, you often enjoy them all at once, which leaves quite a public impression.
<<elseif _children.length > 1>>
- Since you are also keeping $possessive sisters, _children[0].slaveName and _children[1].slaveName, as a sexual servants, you often use them together, leaving quite a public impression.
+ Since you are also keeping $possessive sisters, _children[0].slaveName and _children[1].slaveName, as sexual servants, you often use them together, leaving quite a public impression.
<<elseif _children.length > 0>>
Since you are also keeping $possessive sister as a sexual servant, you often use them together, which leaves quite a public impression.
<</if>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index e174686aa5ea04a8320732c2875ce1cbf939263a..4c3eb914f05a335d62f0c0879a6e27178e41b6c9 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.
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index c573162f9ce7fe303a93fc2cfe383c71e9871a6c..9c4e51fdbdffefe90f1a902ecc6437e55460093b 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -12189,6 +12189,8 @@ $pronounCap has
disproportionately large for $possessive narrow hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
disproportionately large for $possessive narrow hips, but your transformation fetishist arcology considers this attractive.
+ <<elseif $arcologies[0].FSAssetExpansionist != "unset">>
+ disproportionately large for $possessive narrow hips, but that's just fine to your asset expansionist society.
<<else>>
@@.red;disproportionately large@@ for $possessive narrow hips.
<</if>>
@@ -12202,6 +12204,8 @@ $pronounCap has
disproportionately large for $possessive trim hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
disproportionately large for $possessive trim hips, but your transformation fetishist arcology considers this attractive.
+ <<elseif $arcologies[0].FSAssetExpansionist != "unset">>
+ disproportionately large for $possessive trim hips, but that's just fine to your asset expansionist society.
<<else>>
@@.red;disproportionately large@@ for $possessive trim hips.
<</if>>
@@ -12227,6 +12231,8 @@ $pronounCap has
disproportionately large for $possessive broad hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
disproportionately large for $possessive broad hips, but your transformation fetishist arcology considers this attractive.
+ <<elseif $arcologies[0].FSAssetExpansionist != "unset">>
+ disproportionately large for $possessive broad hips, but that's just fine to your asset expansionist society.
<<else>>
@@.red;disproportionately large@@ for $possessive broad hips.
<</if>>
@@ -12242,6 +12248,8 @@ $pronounCap has
disproportionately large for $possessive womanly hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
disproportionately large for $possessive womanly hips, but your transformation fetishist arcology considers this attractive.
+ <<elseif $arcologies[0].FSAssetExpansionist != "unset">>
+ disproportionately large for $possessive womanly hips, but that's just fine to your asset expansionist society.
<<else>>
@@.red;disproportionately large@@ for $possessive womanly hips.
<</if>>