diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 219b82b07b99c656901288489ac9aed075a56463..081296405b02a775e3cd3ea8e43dd297e7617003 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,17 @@ 0.10.7.1-0.2.x +5/26/2018 + + 5 + -various fixes to issues created with v4 + + 4 + -more tweaks to bodyswapping + -fPat cleaning + -tweaks to face shapes and beauty + -fixes + 5/23/2018 3 diff --git a/src/SecExp/transportHub.tw b/src/SecExp/transportHub.tw index 556ac1fdee4396cabe35846fa9621604b8ef2301..c92320209f1161f61d1acff5c8bde78318de3710 100644 --- a/src/SecExp/transportHub.tw +++ b/src/SecExp/transportHub.tw @@ -188,5 +188,5 @@ You quickly reach the transport hub, where a constant stream of vehicles, people The hub security is fully upgraded <</if>> -<br>[[Return this sector to standard markets|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $sectors[$AS].type = "Markets", $transportHub = 0, $hubSecurity = 1]] +<br><br>[[Return this sector to standard markets|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $sectors[$AS].type = "Markets", $transportHub = 0, $hubSecurity = 1]] //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>// diff --git a/src/pregmod/assistantAppearancePackTwo.tw b/src/pregmod/assistantAppearancePackTwo.tw index ee1dd2dbdd49e3294a2b6e3c4be95523d8dc8d57..2caa2c8d0d0adf574dfdc1f3de5511e692a257f4 100644 --- a/src/pregmod/assistantAppearancePackTwo.tw +++ b/src/pregmod/assistantAppearancePackTwo.tw @@ -61,7 +61,6 @@ __Personal assistant appearances:__ <br><<link "Your current appearance will do">> <<replace "#app">> At your order, she maintains the $assistantAppearance appearance as her avatar. "Yes, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," she confirms, and adds "if you reconsider, I can be customized from the arcology management menu." - <<set $assistantAppearance = "normal">> <</replace>> <</link>> </span> \ No newline at end of file diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw index 28e7a4286beedd82ff038da836af385ab6879a6c..a7fdee604ddf6f78f73935db5ce5c586b8fb0e63 100644 --- a/src/pregmod/fPat.tw +++ b/src/pregmod/fPat.tw @@ -117,8 +117,8 @@ You tell $activeSlave.slaveName to You walk around $him, drawing closer and slowly resting your hand on $his head. You let it lean for a few seconds for $him to get accustomed to your touch. <<if ($activeSlave.fetish == "mindbroken")>> Tenderly and lovingly you brush your fingers along $his head again and again. $He initially reacts slightly to your physical touch, but soon stops reacting completely. Nevertheless, you continue to gingerly stroke $his <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>shaven scalp <<else>>hair <</if>>, as you gently press his body into your chest. The warmth from your slaves body, and the action of petting $his head, combinded with the sound of $his breathing, allow you to feel more relaxed by the minute. -<<elseif ($activeSlave.relationship == -3)>> -Tenderly and lovingly you brush your fingers along $his head, again and again. $He slowly leans $his body closer and closer to you, relaxing as $he feels your caress. As $he leans into you, $he feels all of the daily stresses of the day melt away, and a deep, happy sigh escapes $his lips. You smile fondly, allowing all of the troubles of being an arcology owner dissipate, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her<</if>>devoted and content $husband.//Does this work? +<<elseif ($activeSlave.relationship == -3)>> /* needs to be broken down into the various subsets of wives */ +Tenderly and lovingly you brush your fingers along $his head, again and again. $He slowly leans $his body closer and closer to you, relaxing as $he feels your caress. As $he leans into you, $he feels all of the daily stresses of the day melt away, and a deep, happy sigh escapes $his lips. You smile fondly, allowing all of the troubles of being an arcology owner dissipate, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her<</if>>devoted and content slave wife. <<elseif ($activeSlave.relationship == -2)>> Tenderly and lovingly you brush your fingers along $his head, again and again. $He slowly leans $his body closer and closer to you, relaxing as $he feels your caress. As $he leans into you, $he feels all of the daily stresses of the day melt away, and a small, respectful sigh escapes $his pursed lips. You smile fondly, allowing all of your troubled thoughts of being an arcology owner to drift away, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her<</if>>devoted and content servant. <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.amp != 1)>> @@ -126,7 +126,7 @@ As you start to touch $him $he smiles at you and takes your hand, following its <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>> $He stiffens at your touch but slowly relaxes at the feeling of your hand on $his head. You tenderly and lovingly stroke your fingers along $his scalp again and again. $He gently, submissively, presses $his head against your hand, like a dog. As you continue <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>kneading $his shaved scalp<<else>>stroking $his hair<</if>>, $he starts to clutch $his thighs, and if you listen you can hear subdued whimpers. $He looks up at you with adoring eyes, as $he enjoys the feeling of being a pet to $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>. <<elseif ($activeSlave.devotion > 50)>> -$He accepts your touch with devotion, leaning $his head back at your gentle caress. You tenderly and lovingly brush your fingers along $his head again and again. $He leans $his body forward, pressing $himself against you. You can feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. You take your time enjoying the feeling of <<if $activeSlave.hstyle == "shaved bald" || $activeSlave.bald == 1>>rubbing your slave's smooth scalp<<else>>gently running your fingers through your slave's hair<</if>>, and your slave smiles happily as you do. As you continue with your ministrations, you can see all of the stress present in your slave's shoulders dissipate, and you feel a good deal of your own tention start to melt away as well. +$He accepts your touch with devotion, leaning $his head back at your gentle caress. You tenderly and lovingly brush your fingers along $his head again and again. $He leans $his body forward, pressing $himself against you. You can feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. You take your time enjoying the feeling of <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>rubbing your slave's smooth scalp<<else>>gently running your fingers through your slave's hair<</if>>, and your slave smiles happily as you do. As you continue with your ministrations, you can see all of the stress present in your slave's shoulders dissipate, and you feel a good deal of your own tention start to melt away as well. <<elseif ($activeSlave.devotion > 20)>> $He accepts your touch willingly. As you tenderly and lovingly brush your fingers along $his head again and again, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch. As you continue your ministrations, your slave slowly, and with more then a bit of uncertainty, finally starts to relax. $He looks at you with confusion and trepidation. Your eyes betray nothing however, you simply smile and press $his head into your <<if $PC.boobs == 1>>soft breasts<<else>>masculine chest<</if>>, all the while enjoying the feeling of your <<if $activeSlave.hStyle == "shaven bald" || $activeSlave.bald == 1>>hands gliding over $his smooth head<<else>>fingers gliding through $his hair<</if>>. <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>> diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw index 25557c70fe22d18737042f4ca75386190c449fdf..15140ec8d9599c0042f4e7de1e812f935c461fb1 100644 --- a/src/uncategorized/pSlaveMedic.tw +++ b/src/uncategorized/pSlaveMedic.tw @@ -102,7 +102,7 @@ When you enter the lounge of their <<if $barracks>>barracks<<else>>main living a <</if>> <span id="result"> -<br><<link "Offer <<print cashFormat(10000)>> for her">> +<br><br><<link "Offer <<print cashFormat(10000)>> for her">> <<replace "#result">> The mercenary laughs at your offered price. "No offense, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, but no. Even if I wanted to sell her on everyone's behalf for that price, my buddies would kill me for that. She's popular, that $activeSlave.slaveName." <</replace>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index 22050f2531d397184145f70467295640d72d5e26..e242de7e74abbb7be4c48f7daf083e33bd602f58 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -5,7 +5,7 @@ <<if ($showClothing == 1) && ($saleDescription == 0)>> $activeSlave.slaveName is -<<if ($activeSlave.clothes == "choosing $his own clothes")>> +<<if ($activeSlave.clothes == "choosing her own clothes")>> allowed to choose $his own clothes, but hasn't made a selection yet, <<else>> wearing $activeSlave.clothes, diff --git a/src/utility/slaveGenerationWidgets.tw b/src/utility/slaveGenerationWidgets.tw index 6f84f3aff4b8e9622a7de1b4493f0a2e45d8aa6c..b26c54402fc864a9eb12a1c716519389d80f192e 100644 --- a/src/utility/slaveGenerationWidgets.tw +++ b/src/utility/slaveGenerationWidgets.tw @@ -54,17 +54,16 @@ <<set $args[0].accent = _naturalAccent>> <</if>> <<case "American">> - <<if $language == "English">> - <<set $args[0].accent = either(0,0,0,1)>> - <<elseif $language == "Spanish" && $args[0].race == "latina">> - <<set $args[0].accent = either(0,1,2,2,2,3,3)>> - <<elseif $language == "Chinese" && $args[0].race == "asian">> - <<set $args[0].accent = either(0,1,2,2,2,3,3)>> - <<elseif $language == "Arabic" && $args[0].race == "middle eastern">> - <<set $args[0].accent = either(0,1,2,2,2,3,3)>> - <<else>> - <<set $args[0].accent = _naturalAccent>> - <</if>> + <<if $language == "English">> + <<set $args[0].accent = either(0,0,0,1)>> + <<elseif $language == "Spanish" && $args[0].race == "latina">> + <<set $args[0].accent = either(0,1,2,2,2,3,3)>> + <<elseif $language == "Chinese" && $args[0].race == "asian">> + <<set $args[0].accent = either(0,1,2,2,2,3,3)>> + <<elseif $language == "Arabic" && $args[0].race == "middle eastern">> + <<set $args[0].accent = either(0,1,2,2,2,3,3)>> + <<else>> + <<set $args[0].accent = _naturalAccent>> <</if>> <<case "Andorran">> <<if $language == "Catalan">>