diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 952aba16132d642ec727927d32197d9dc000ceee..c892976e4002dc8e34d7a1843c7d320c437d2abe 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -3,7 +3,12 @@ 0.10.7.0/1 12/27/17 - 234 + + 236 + -fixes + RA XXY diets, scalemail bikini errors, bad engineering training and straps/latex showing up inappropriately in the vector art. + + 235 -saRules now applies to the HG's slave -HG and BG no longer consume dormitory capacity if they have their own room -SFanon's fixes diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw index 0a63bae58cb6579a3b1fbd03abc44131b407be19..5626b80aa09011c27834555a13854f056d112bec 100644 --- a/src/art/artWidgets.tw +++ b/src/art/artWidgets.tw @@ -287,6 +287,7 @@ vector art added later is drawn over previously added art <<set _torsoSize = "normal">> <</if>> <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/torso " + _torsoSize + ".svg'" + " style='"+ _skinFilter + "'>">> +<<set _torsoOutfit = false>> <<if $args[0].fuckdoll != 0 || $args[0].clothes == "restrictive latex" || $args[0].clothes == "a latex catsuit">> <<set _torsoOutfit = " latex">> <<elseif $args[0].clothes == "uncomfortable straps">> diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw index ff32caa1ea1e47512ab581e5529d99eddf0e3ac0..6dfe37e1afcb7d4d62731a566426ec0a215f26fb 100644 --- a/src/uncategorized/persBusiness.tw +++ b/src/uncategorized/persBusiness.tw @@ -520,7 +520,11 @@ <<case engineering>> <<set _oldSkill = $PC.engineering>> - <<set $PC.engineering _Cal>> + <<if _X == 1>> + <<set $PC.engineering += _Cal>> + <<else>> + <<set $PC.engineering -= _Cal>> + <</if>> <<if _oldSkill <= 10>> <<if $PC.engineering > 10>> You now have @@.green;basic knowledge@@ about how to be an arcology engineer. diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index c9bf22f5b379565983ee19000e5bba2730054da7..5c0e15ad22bd08fdd20adf4e3e10736bf135c653 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -9203,7 +9203,7 @@ she's $pronounCap looks absolutely blasphemous in a habit with such a hugely swollen belly. The coarse cloth aggravates $possessive sensitive stretched skin. <<case "a string bikini">> $activeSlave.slaveName's hugely swollen belly parts $possessive string bikini to either side. -<<case "a string bikini">> +<<case "a scalemail bikini">> $activeSlave.slaveName's hugely swollen belly juts out underneath $possessive scalemail bikini. <<case "clubslut netting">> $activeSlave.slaveName's clubslut netting is stretched to the breaking point by $possessive hugely swollen belly. @@ -9475,7 +9475,7 @@ she's $possessiveCap fat belly fills out $possessive habit. The coarse cloth has plenty of extra skin to aggravate. <<case "a string bikini">> $activeSlave.slaveName's fat belly parts $possessive string bikini to either side. -<<case "a string bikini">> +<<case "a scalemail bikini">> $activeSlave.slaveName's fat belly juts out underneath $possessive scalemail bikini. <<case "clubslut netting">> $activeSlave.slaveName's clubslut netting is stretched out by $possessive fat belly, forcing flab to poke through the mesh. diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index e835f42f423abc5dcb61d5273c6c028e3e48a62c..3331c15d8af29e9bec69071f1464138a42b55f1b 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -4051,9 +4051,16 @@ Your brand design is ''$brandDesign.'' <br>$args[0].slaveName has been put on a diet that favors masculine development. <</if>> <<elseif (_combinedRule.diet == "XXY")>> - <<if ($args[0].diet !== "XXY")>> - <<set $args[0].diet = "XXY">> - <br>$args[0].slaveName has been put on a diet that enhances a herm's unique sexuality. + <<if $args[0].balls > 0 && ($args[0].ovaries == 1 || $args[0].mpreg == 1)>> + <<if ($args[0].diet !== "XXY")>> + <<set $args[0].diet = "XXY">> + <br>$args[0].slaveName has been put on a diet that enhances a herm's unique sexuality. + <</if>> + <<else>> + <<if ($args[0].diet !== "healthy")>> + <<set $args[0].diet = "healthy">> + <br>$args[0].slaveName has been put on a standard diet since she is not a hermaphrodite. + <</if>> <</if>> <<elseif (_combinedRule.diet == "cleansing")>> <<if (($args[0].diet !== "cleansing") && ($args[0].health < 100))>>