diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 5ffba1b218dc71c6b894fef9b0459a8199a4eea2..1ec8289b1e0018b9228bf7042f0e0275b981a083 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4743,4 +4743,12 @@ Pregmod 0.10.3.0 -disabled broken vector -escorts now have a slight edge when it comes to teaching slaves sex skills - \ No newline at end of file + 11/30/17 + + 169 + -SFanon's fixes + -Doubled non size related bonuses in GR's big butt policy for slimness societies to offset the negative of big butts + + 170 + -added vector art anon's bushy pits + -tweaked childgen \ No newline at end of file diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw index b62ce04d863e77227d9acab83aeacc32e994ce94..0a63bae58cb6579a3b1fbd03abc44131b407be19 100644 --- a/src/art/artWidgets.tw +++ b/src/art/artWidgets.tw @@ -141,46 +141,41 @@ vector art added later is drawn over previously added art /% Shoulder width and arm or no arm %/ <<if $args[0].amp != 1>> -<<if $args[0].devotion > 50>> - <<set _leftArmType = "high">> - <<set _rightArmType = "high">> -<<elseif $args[0].trust >= -20>> - <<if $args[0].devotion < -20>> - <<set _leftArmType = "rebel">> - <<set _rightArmType = "low">> - <<elseif $args[0].devotion <= 20>> - <<set _leftArmType = "low">> - <<set _rightArmType = "low">> + <<if $args[0].devotion > 50>> + <<set _leftArmType = "high">> + <<set _rightArmType = "high">> + <<elseif $args[0].trust >= -20>> + <<if $args[0].devotion < -20>> + <<set _leftArmType = "rebel">> + <<set _rightArmType = "low">> + <<elseif $args[0].devotion <= 20>> + <<set _leftArmType = "low">> + <<set _rightArmType = "low">> + <<else>> + <<set _leftArmType = "mid">> + <<set _rightArmType = "high">> + <</if>> <<else>> <<set _leftArmType = "mid">> - <<set _rightArmType = "high">> + <<set _rightArmType = "mid">> <</if>> -<<else>> - <<set _leftArmType = "mid">> - <<set _rightArmType = "mid">> -<</if>> -<<if $args[0].fuckdoll == 0 && $args[0].clothes != "restrictive latex" && $args[0].clothes != "a latex catsuit">> - <<if _leftArmType == "high">> + <<if $args[0].fuckdoll == 0 && $args[0].clothes != "restrictive latex" && $args[0].clothes != "a latex catsuit">> <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm right " + _rightArmType + ".svg'" + " style='"+ _skinFilter + "'>">> <<if $args[0].underArmHStyle == "bushy">> - <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underarm " + _underArmHStyle + ".svg' style='" + _underArmFilter + "'/>">> + <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underArm " + _underArmHStyle + " right.svg'" + " style='" + _underArmFilter + "'/>">> <</if>> <<else>> - <<if $args[0].underArmHStyle == "bushy">> - <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underarm " + _underArmHStyle + ".svg' style='" + _underArmFilter + "'/>">> + <<if $args[0].fuckdoll != 0>> + <<set _rightArmType = "mid">> <</if>> - <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm right " + _rightArmType + ".svg'" + " style='"+ _skinFilter + "'>">> + <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/arm right " + _rightArmType + " latex.svg'" + "/>">> <</if>> - <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm left " + _leftArmType + ".svg'" + " style='"+ _skinFilter + "'>">> + <<else>> - <<if $args[0].fuckdoll != 0>> - <<set _leftArmType = "mid">> - <<set _rightArmType = "mid">> + <<if $args[0].fuckdoll == 0 && $args[0].clothes != "restrictive latex" && $args[0].clothes != "a latex catsuit" && $args[0].underArmHStyle == "bushy">> + <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underArm " + _underArmHStyle + " right.svg'" + " style='" + _underArmFilter + "'/>">> <</if>> - <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/arm left " + _leftArmType + " latex.svg'" + "/>">> - <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/arm right " + _rightArmType + " latex.svg'" + "/>">> -<</if>> <</if>> /% Hair Aft %/ @@ -301,6 +296,32 @@ vector art added later is drawn over previously added art <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/torso " + _torsoSize + _torsoOutfit + ".svg'" + "/>">> <</if>> +<<if $args[0].amp != 1>> + <<if $args[0].fuckdoll == 0 && $args[0].clothes != "restrictive latex" && $args[0].clothes != "a latex catsuit">> + <<if _leftArmType == "high">> + <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm left " + _leftArmType + ".svg'" + " style='"+ _skinFilter + "'>">> + <<if $args[0].underArmHStyle == "bushy">> + <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underArm " + _underArmHStyle + " left.svg'" + " style='" + _underArmFilter + "'/>">> + <</if>> + <<else>> + <<if $args[0].underArmHStyle == "bushy">> + <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underArm " + _underArmHStyle + " left.svg'" + " style='" + _underArmFilter + "'/>">> + <</if>> + <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm left " + _leftArmType + ".svg'" + " style='"+ _skinFilter + "'>">> + <</if>> + <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/arm left " + _leftArmType + ".svg'" + " style='"+ _skinFilter + "'>">> + <<else>> + <<if $args[0].fuckdoll != 0>> + <<set _leftArmType = "mid">> + <</if>> + <<print "<img class='paperdoll' src=" + _folderLoc + "/outfit/arm left " + _leftArmType + " latex.svg'" + "/>">> + <</if>> +<<else>> + <<if $args[0].fuckdoll == 0 && $args[0].clothes != "restrictive latex" && $args[0].clothes != "a latex catsuit" && $args[0].underArmHStyle == "bushy">> + <<= "<img class='paperdoll' src=" + _folderLoc + "/hair/underArm " + _underArmHStyle + " left.svg'" + " style='" + _underArmFilter + "'/>">> + <</if>> +<</if>> + /% Vagina %/ <<if $args[0].vagina >= 0>> <<print "<img class='paperdoll' src=" + _imgSkinLoc + "/vagina.svg'" + " style='"+ _skinFilter + "'>">> diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw index c7435e9cf2e718f729403cd4551ab0d48b06bd2c..f7ae13ece727eebe1d11b4299094e1a08a4c9e04 100644 --- a/src/pregmod/generateChild.tw +++ b/src/pregmod/generateChild.tw @@ -363,13 +363,13 @@ <<if $mergeMom.origHColor == $mergeDad.origHColor>> <<set $activeSlave.hColor = $mergeMom.origHColor>> <<elseif $mergeMom.origHColor == "black">> - <<set $activeSlave.hColor = $mergeMom.origHColor>> + <<set $activeSlave.hColor = either($mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeDad.origHColor)>> <<elseif $mergeDad.origHColor == "black">> - <<set $activeSlave.hColor = $mergeDad.origHColor>> + <<set $activeSlave.hColor = either($mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeMom.origHColor)>> <<elseif $mergeMom.origHColor == "brown">> - <<set $activeSlave.hColor = $mergeMom.origHColor>> + <<set $activeSlave.hColor = either($mergeMom.origHColor, $mergeMom.origHColor, $mergeMom.origHColor, $mergeDad.origHColor)>> <<elseif $mergeDad.origHColor == "brown">> - <<set $activeSlave.hColor = $mergeDad.origHColor>> + <<set $activeSlave.hColor = either($mergeDad.origHColor, $mergeDad.origHColor, $mergeDad.origHColor, $mergeMom.origHColor)>> <<elseif $mergeMom.origHColor == "white">> <<if random(1,100) == 69>> <<set $activeSlave.hColor = $mergeMom.origHColor>>