diff --git a/sanityCheck b/sanityCheck index 07d94b78d3a737bfb834e74ef34abdf0d4b99582..bf95103d3fa27a7b4b8a6ed7bbaa7bb5930d3a0b 100755 --- a/sanityCheck +++ b/sanityCheck @@ -50,8 +50,8 @@ $GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets" # Check for too many <<<. e.g.: <<</if>> $GREP "<<<[^<>]*[<>]\?[^<>]*>>" -- "src/*.tw" | myprint "TooManyAngleBrackets" # Check for wrong capitalization on 'activeslave' and other common typos -$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|bellyimplant\|bellyfluid\)" -- "src/*" | myprint "WrongCapitilization" -$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\)" -- 'src/*' | myprint "SpellCheck" +$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\)" -- "src/*" | myprint "WrongCapitilization" +$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|bellyimplant\|bellyfluid\|pronounCaps\)" -- 'src/*' | myprint "SpellCheck" $GREP "\$slave\[" -- 'src/*' | myprint "ShouldBeSlaves" # Check for strange spaces e.g. $slaves[$i]. lips $GREP "\$slaves\[\$i\]\. " -- 'src/*' | myprint "MissingPropertyAfterSlaves" diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw index 9e0c82f90b957c191a63f62bdec851298012e6d8..aafb41109e2c3da3fcc5420f87459a0c4b868077 100644 --- a/src/npc/acquisition.tw +++ b/src/npc/acquisition.tw @@ -50,6 +50,7 @@ <<set $PC.belly = getPregBellySize($PC)>> <</if>> <</if>> + <<set $PC.ovaryAge = $PC.physicalAge>> <<else>> /*testtest*/ <<set $PC.sisters = 0>> <<set $PC.daughters = 0>> @@ -122,7 +123,6 @@ <</if>> <</for>> <</if>> -<<set $PC.ovaryAge = $PC.physicalAge>> You've done it. <br><br> diff --git a/src/player/actions/fondleDick.tw b/src/player/actions/fondleDick.tw index 5ab36996f4c47b1b9eb335d01a14cede279ac365..d6d1761e6fa35c732d3b0fcf7f95979a377cc349 100644 --- a/src/player/actions/fondleDick.tw +++ b/src/player/actions/fondleDick.tw @@ -213,7 +213,7 @@ You call her over so you can fondle her Her dick remains flaccid as it cannot get stiff and you continue tenderly stroking her soft dick. <<else>> Her prick stiffens like a rod in your hands and you continue your expert strokes along the erect shaft. - <</if>> Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands and get cleaned up. + <</if>> Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands before submissively avoiding your gaze as you get cleaned up. <<elseif $activeSlave.devotion < -20>> She clearly dislikes the thought of getting her dick fondled by you. Her lower lip quivers with trepidation as she watches your hands move towards her. She has no choice but to obey if she wants to avoid punishment. She gasps and shakes as you gently trace along her <<if $activeSlave.dick == 1>> @@ -314,7 +314,7 @@ You call her over so you can fondle her Her dick remains flaccid as it cannot get stiff and you continue tenderly stroking her soft dick. <<else>> Her prick stiffens like a rod in your hands and you continue your expert strokes along the erect shaft. - <</if>> Your rough play leaves red marks on her breasts and nipples and she becomes even more aroused. Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands and get cleaned up. She rubs the marks on her dick and balls with her hands, an ecstatic look on her $activeSlave.skin face. She looks at you longingly, hungry for more. + <</if>> Your rough play leaves red marks on her breasts and nipples and she becomes even more aroused. Soon, her movements indicate that she is orgasming. She shudders and leaks her cockmilk as she orgasms in your hands. She rubs the marks on her dick and balls with her hands, an ecstatic look on her $activeSlave.skin face. She looks at you longingly as you get cleaned up, hungry for more. <<elseif $activeSlave.devotion <= 20>> She obeys silently, standing in front of you as you move your hands towards her. You gently trace your fingers along her <<if $activeSlave.dick == 1>> diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw index a21480a636264a3a227169bbd85b5a6b58814f80..f7d8f030ea23bffd11be8f150bcb2e464befc349 100644 --- a/src/uncategorized/REroyalblood.tw +++ b/src/uncategorized/REroyalblood.tw @@ -592,7 +592,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad <</if>> <<if $cash >= 500000>> -<br><<link "Send a harge amount of credits and goods to retrieve both the Princess and Queen.">> +<br><<link "Send a large amount of credits and goods to retrieve both the Princess and Queen.">> <<replace "#result">> <<set $cash -= 500000>> You take a tablet and transmit a communication request to the new arcology owner with your intent. Once his shock wears off, he readily accepts with little need for neogation. Soon, a flight of VTOLs land in the new arcology laden with goods. When they take off again they have the princess and the Queen who is resigned to her fate, clad in chains then bound face to face in a forced embrace. @@ -787,7 +787,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad <</if>> <<set _queen = clone($activeSlave)>> <<AddSlave _queen>> /* skip New Slave Intro */ - <</for>> <</replace>> <</if>> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index c3ca928dabac7fbc2f30751e22b8bea79b431c6c..93e1fcc2eb12dfa6f74e469ee0d3e88f68ef0757 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -61,7 +61,7 @@ <</if>> <</if>> <<if $activeSlave.sexualFlaw == "hates oral">> - $pronounCaps has trouble thinking of her mouth as a warm, wet, playful hole, so her new piercings will be theraputic. Having something to suck on at all times should force her past her hangups. + $pronounCap has trouble thinking of her mouth as a warm, wet, playful hole, so her new piercings will be theraputic. Having something to suck on at all times should force her past her hangups. <</if>> <</if>> <</if>> @@ -112,7 +112,7 @@ <</if>> <</if>> <<if $activeSlave.sexualFlaw == "hates penetration">> - $pronounCaps has trouble thinking of her vagina as a fuckhole rather than something special to protect and cherish, so her new piercings will be theraputic. The constant, inescapable stimulation of her labia should force her past her hangups. + $pronounCap has trouble thinking of her vagina as a fuckhole rather than something special to protect and cherish, so her new piercings will be theraputic. The constant, inescapable stimulation of her labia should force her past her hangups. <</if>> <</if>> <</if>> @@ -147,7 +147,7 @@ <</if>> <</if>> <<if $activeSlave.sexualFlaw == "hates anal">> - $pronounCaps has trouble thinking of her asshole as a sexy, fuckable hole, so her new piercings will be theraputic. The constant tickling back there should force her past her hangups. + $pronounCap has trouble thinking of her asshole as a sexy, fuckable hole, so her new piercings will be theraputic. The constant tickling back there should force her past her hangups. <</if>> <</if>> <</if>> diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw index 7501c9ec69adda8bf0e8fb3fd3dd673e4bdea4d1..2d1b5c9f599092a54f5b94601a42cec8aa1b1bc0 100644 --- a/src/uncategorized/options.tw +++ b/src/uncategorized/options.tw @@ -187,6 +187,8 @@ Master Suite report details such as slave changes are @@.red;DISABLED@@. [[Enable|Options][$verboseDescriptions = 1]] <</if>> +<br> + Detailed corporation controls are <<if ($detailedCorpControls == 1)>> @@.cyan;ENABLED@@. [[Disable|Options][$detailedCorpControls = 0]] @@ -194,8 +196,6 @@ Detailed corporation controls are @@.red;DISABLED@@. [[Enable|Options][$detailedCorpControls = 1]] <</if>> -<br> - /* Accordion 000-250-006 */ <br /> Accordion effects on weekly reports are diff --git a/src/uncategorized/pMercenaries.tw b/src/uncategorized/pMercenaries.tw index 4d2d85426858116e3916344fd6482d52ab197c61..222b683c8dab5f4fad236e44c9d26af82f70f71e 100644 --- a/src/uncategorized/pMercenaries.tw +++ b/src/uncategorized/pMercenaries.tw @@ -2,6 +2,14 @@ <<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $mercenaries = 0, $mercenariesTitle = "mercenaries">> +<<if ($PC.warfare >= 100)>> + <<set _price = 2500>> +<<elseif ($PC.warfare >= 50)>> + <<set _price = 3725>> +<<else>> + <<set _price = 5000>> +<</if>> + Another wave of security hysteria is sweeping the Free Cities. And this time, it's not based on rumor and alarmism. On the other side of the globe, a Free City was sacked by an old world army today. The Free City's handful of high-technology defenders and multitude of drones caused heavy casualties among the attackers, but eventually sheer weight of numbers wore them down. <br><br> @@ -19,13 +27,6 @@ The budgetary difficulty many old world countries are in has resulted in unemplo <<replace "#result">> You hire some reputable mercenaries, kit them in excellent gear, and quarter them in $arcologies[0].name. The sight of armed men on patrol has @@.red;offended some of the more free-spirited citizens@@ of $arcologies[0].name. <<set $rep -= 500>> - <<if ($PC.warfare >= 100)>> - <<set _price = 2500>> - <<elseif ($PC.warfare >= 50)>> - <<set _price = 3500>> - <<else>> - <<set _price = 5000>> - <</if>> <<set $cash -= _price>> <<set $mercenaries = 1>> <</replace>> @@ -34,17 +35,10 @@ The budgetary difficulty many old world countries are in has resulted in unemplo <<replace "#result">> You hire a full platoon of reputable mercenaries with a veteran officer to command them, kit them in excellent gear, and quarter them in $arcologies[0].name. The sight of many armed men on patrol has @@.red;deeply offended some of the more free-spirited citizens@@ of $arcologies[0].name. <<set $rep -= 1000>> - <<if ($PC.warfare >= 100)>> - <<set _price = 5000>> - <<elseif ($PC.warfare >= 50)>> - <<set _price = 7500>> - <<else>> - <<set _price = 10000>> - <</if>> - <<set $cash -= _price>> + <<set $cash -= (_price*2)>> <<set $mercenaries = 3>> <</replace>> -<</link>> <<if ($PC.warfare >= 50) || ($PC.career == "arcology owner")>>//This will cost ¤<<print _price>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>> +<</link>> <<if ($PC.warfare >= 50) || ($PC.career == "arcology owner")>>//This will cost ¤<<print (_price*2)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤10000 and incur significant upkeep costs//<</if>> <br><<link "Do not quarter troops in your arcology">> <<replace "#result">> Having armed men on permanent watch is a step too far. $arcologies[0].name's security systems are formidable and will have to serve. diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw index 83277f1fbab5cbb3a344ebebf9c5b6192680aef9..963e286309d36c6f51c374a3bef187499f9d1b2f 100644 --- a/src/uncategorized/randomIndividualEvent.tw +++ b/src/uncategorized/randomIndividualEvent.tw @@ -389,7 +389,7 @@ <<if ($weatherToday.severity <= 1)>> <<if ($eventSlave.trust > 50)>> <<if ($eventSlave.devotion > 20)>> -<<if ($eventSlave.anus != 0)>> +<<if ($eventSlave.anus != 0) && canDoAnal($activeSlave)>> <<if ($eventSlave.vagina != 0)>> <<set $RESSevent.push("confident tanning")>> <</if>> @@ -993,6 +993,8 @@ <<if $seeAge == 1>> +<<if $eventSlave.actualAge < 18>> +<<if $eventSlave.ovaries == 1>> <<if ($eventSlave.devotion >= 20)>> <<if ($eventSlave.physicalAge == Math.round($eventSlave.pubertyAgeXX))>> <<if canGetPregnant($eventSlave)>> @@ -1002,7 +1004,10 @@ <</if>> <</if>> <</if>> +<</if>> +<</if>> +<<if $eventSlave.actualAge < 18>> <<if ($eventSlave.devotion >= 20)>> <<if canAchieveErection($eventSlave)>> <<if ($eventSlave.physicalAge == Math.round($eventSlave.pubertyAgeXY))>> @@ -1014,6 +1019,7 @@ <</if>> <</if>> <</if>> +<</if>> <</if>> /* closes aging exemption */ diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index ef24b954c1629dbcfdbb473cad0297f6e37c9c4f..604a1a49ef68d81fb442849c56fd3fd257bd29a3 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -1211,7 +1211,7 @@ <<set $slaves[$i].dick = Math.clamp($slaves[$i].dick,0,10), $slaves[$i].drugs = "no drugs">> <<elseif $slaves[$i].clit >= 5 && $slaves[$i].dick == 0>> $possessiveCap clit is now so huge that further drug enhancement will not increase its size. @@.yellow;$possessiveCap drug regimen has been ended.@@ - <<set $slaves[$i].clit = Math.clamp($slaves[$i].dick,0,5), $slaves[$i].drugs = "no drugs">> + <<set $slaves[$i].clit = Math.clamp($slaves[$i].clit,0,5), $slaves[$i].drugs = "no drugs">> <</if>> <<case "testicle enhancement" "intensive testicle enhancement">> <<if ($slaves[$i].balls >= 10)>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 2652a3a74ffcee1c5246910707a4443f4ffb16f0..df31043d7d1e587308e00433acfdff5a160828bc 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -4105,17 +4105,19 @@ <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = -1, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1>><<SetPregType $slaves[$i]>> <<else>> /% look for a random father among master suite slaves %/ - <<for _m = 0; _m < $MastSiIDs.length; _m++>> - <<if canImpreg($slaves[$i], $MastSiIDs[_m])>> + <<set _tempMastSiIDs = $MastSiIDs.randomMany($MastSiIDs.length)>> + <<set _tempMastSiIDs = _tempMastSiIDs.shuffle()>> + <<for _m = 0; _m < _tempMastSiIDs.length; _m++>> + <<if canImpreg($slaves[$i], _tempMastSiIDs[_m])>> /* catch for self-impregnation */ - <<if $slaves[$i].ID == $MastSiIDs[_m].ID>> + <<if $slaves[$i].ID == _tempMastSiIDs[_m].ID>> <<if (_conceptionSeed <= 95)>> <<continue>> /* 95% chance not to self-impregnate */ <</if>> <</if>> /* found eligible father */ After all the unprotected sex $pronoun had this week, it's really no surprise when @@.lime;$pronoun ends up pregnant@@. - <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $MastSiIDs[_m].ID, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1>><<SetPregType $slaves[$i]>> + <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = _tempMastSiIDs[_m].ID, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1>><<SetPregType $slaves[$i]>> <<break>> <</if>> <</for>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index f7ec8980069f264c32bd27966d8383c7daeacf0b..55d33d90ec076814805ebd71dec2a40768553347 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -2728,7 +2728,7 @@ $pronounCap's got a <</if>> <<if $activeSlave.balls > 0 && $activeSlave.vasectomy == 1>> - $possessiveCap shoots blanks thanks to $possessive vasectomy. + $pronounCap shoots blanks thanks to $possessive vasectomy. <</if>> <<if $activeSlave.physicalAge <= 3>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 6f1ca22b881f5da327e21088d0f49e19c69aacf7..e6c75d4e2361c57dc6320a535567c176d4aeba79 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -63,7 +63,7 @@ <</if>> <<if canDoAnal($activeSlave)>> <<if $PC.dick == 1 && canGetPregnant($activeSlave) && ($activeSlave.eggType == "human")>> - <<KnockMeUp $activeSlave 20 1 -1>> + <<KnockMeUp $activeSlave 10 1 -1>> <</if>> <<if $args[0]>> <<set $analTotal += $args[0], @@ -110,7 +110,7 @@ $activeSlave.vaginalCount++>> <</if>> <<if $PC.dick == 1 && canGetPregnant($activeSlave) && ($activeSlave.eggType == "human")>> - <<KnockMeUp $activeSlave 20 0 -1>> + <<KnockMeUp $activeSlave 10 0 -1>> <</if>> <</if>> <</widget>> @@ -190,7 +190,7 @@ <<set $vaginalTotal++, $analTotal++, $activeSlave.vaginalCount++, $activeSlave.analCount++>> <</if>> <<if $PC.dick == 1 && canGetPregnant($activeSlave) && ($activeSlave.eggType == "human")>> - <<KnockMeUp $activeSlave 20 1 -1>> + <<KnockMeUp $activeSlave 10 1 -1>> <</if>> <<else>> <<if $args[1]>> @@ -199,7 +199,7 @@ <<set $vaginalTotal++, $activeSlave.vaginalCount++>> <</if>> <<if $PC.dick == 1 && canGetPregnant($activeSlave) && ($activeSlave.eggType == "human")>> - <<KnockMeUp $activeSlave 20 0 -1>> + <<KnockMeUp $activeSlave 10 0 -1>> <</if>> <</if>> <<elseif canDoAnal($activeSlave)>> @@ -232,7 +232,7 @@ $activeSlave.analCount++>> <</if>> <<if $PC.dick == 1 && canGetPregnant($activeSlave) && ($activeSlave.eggType == "human")>> - <<KnockMeUp $activeSlave 20 1 -1>> + <<KnockMeUp $activeSlave 10 1 -1>> <</if>> <</if>> <</widget>> @@ -270,7 +270,7 @@ $activeSlave.vaginalCount++>> <</if>> <<if $PC.dick == 1 && canGetPregnant($activeSlave) && ($activeSlave.eggType == "human")>> - <<KnockMeUp $activeSlave 20 0 -1>> + <<KnockMeUp $activeSlave 10 0 -1>> <</if>> <<elseif canDoAnal($activeSlave)>> <<if ($activeSlave.anus == 0)>> @@ -302,7 +302,7 @@ $activeSlave.analCount++>> <</if>> <<if $PC.dick == 1 && canGetPregnant($activeSlave) && ($activeSlave.eggType == "human")>> - <<KnockMeUp $activeSlave 20 1 -1>> + <<KnockMeUp $activeSlave 10 1 -1>> <</if>> <</if>> <</widget>> @@ -340,7 +340,7 @@ <<set $vaginalTotal++, $analTotal++, $slaves[$partner].vaginalCount++, $slaves[$partner].analCount++>> <</if>> <<if $PC.dick == 1 && canGetPregnant($slaves[$partner]) && ($slaves[$partner].eggType == "human")>> - <<KnockMeUp $slaves[$partner] 20 2 -1>> + <<KnockMeUp $slaves[$partner] 10 2 -1>> <</if>> <<else>> <<if $args[1]>> @@ -349,7 +349,7 @@ <<set $vaginalTotal++, $slaves[$partner].vaginalCount++>> <</if>> <<if $PC.dick == 1 && canGetPregnant($slaves[$partner]) && ($slaves[$partner].eggType == "human")>> - <<KnockMeUp $slaves[$partner] 20 0 -1>> + <<KnockMeUp $slaves[$partner] 10 0 -1>> <</if>> <</if>> <<elseif canDoAnal($slaves[$partner])>> @@ -365,7 +365,7 @@ $slaves[$partner].analCount++>> <</if>> <<if $PC.dick == 1 && canGetPregnant($slaves[$partner]) && ($slaves[$partner].eggType == "human")>> - <<KnockMeUp $slaves[$partner] 20 1 -1>> + <<KnockMeUp $slaves[$partner] 10 1 -1>> <</if>> <</if>> @@ diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index 186289dccdc22e12a67c89b3df9af19c8ce3de37..27b97216a1ba53aaadc37e5b0c39a1b7d507dc0e 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -4063,14 +4063,17 @@ Your brand design is ''$brandDesign.'' <</if>> <<if (def _combinedRule.hColor) && (_combinedRule.hColor !== "no default setting")>> +<<if $args[0].bald != 1>> <<if ($args[0].hColor !== _combinedRule.hColor)>> <<set $args[0].hColor = _combinedRule.hColor>> <<set $cash -= $modCost>> <br>$args[0].slaveName's hair has been dyed _combinedRule.hColor. <</if>> <</if>> +<</if>> <<if (def _combinedRule.hStyle) && (_combinedRule.hStyle !== "no default setting")>> +<<if $args[0].bald != 1>> <<if ($args[0].hStyle !== _combinedRule.hStyle)>> <<set $args[0].hStyle = _combinedRule.hStyle>> <<set $cash -= $modCost>> @@ -4082,8 +4085,10 @@ Your brand design is ''$brandDesign.'' <</if>> <</if>> <</if>> +<</if>> <<if (def _combinedRule.hLength) && (_combinedRule.hLength !== "no default setting")>> +<<if $args[0].bald != 1>> <<if ($args[0].hLength !== _combinedRule.hLength)>> <<if ($args[0].hLength > _combinedRule.hLength)>> <<set $cash -= $modCost>> @@ -4096,38 +4101,47 @@ is now _combinedRule.hLength cm long. <<set $args[0].hLength = _combinedRule.hLength>> <</if>> <</if>> +<</if>> <<if (def _combinedRule.pubicHColor) && (_combinedRule.pubicHColor !== "no default setting")>> +<<if $args[0].pubicHStyle != "bald" && $args[0].pubicHStyle != "hairless">> <<if ($args[0].pubicHColor !== _combinedRule.pubicHColor)>> <<set $args[0].pubicHColor = _combinedRule.pubicHColor>> <<set $cash -= $modCost>> <br>$args[0].slaveName's pubic hair, if present, has been dyed _combinedRule.pubicHColor. <</if>> <</if>> +<</if>> <<if (def _combinedRule.pubicHStyle) && (_combinedRule.pubicHStyle !== "no default setting")>> +<<if $args[0].pubicHStyle != "bald" && $args[0].pubicHStyle != "hairless">> <<if ($args[0].pubicHStyle !== _combinedRule.pubicHStyle)>> <<set $args[0].pubicHStyle = _combinedRule.pubicHStyle>> <<set $cash -= $modCost>> <br>$args[0].slaveName's pubic hair has been restyled; it is now _combinedRule.pubicHStyle. <</if>> <</if>> +<</if>> <<if (def _combinedRule.underArmHColor) && (_combinedRule.underArmHColor !== "no default setting")>> +<<if $args[0].underArmHStyle != "bald" && $args[0].underArmHStyle != "hairless">> <<if ($args[0].underArmHColor !== _combinedRule.underArmHColor)>> <<set $args[0].underArmHColor = _combinedRule.underArmHColor>> <<set $cash -= $modCost>> <br>$args[0].slaveName's underarm hair, if present, has been dyed _combinedRule.underArmHColor. <</if>> <</if>> +<</if>> <<if (def _combinedRule.underArmHStyle) && (_combinedRule.underArmHStyle !== "no default setting")>> +<<if $args[0].underArmHStyle != "bald" && $args[0].underArmHStyle != "hairless">> <<if ($args[0].underArmHStyle !== _combinedRule.underArmHStyle)>> <<set $args[0].underArmHStyle = _combinedRule.underArmHStyle>> <<set $cash -= $modCost>> <br>$args[0].slaveName's underarm hair has been restyled; it is now _combinedRule.underArmHStyle. <</if>> <</if>> +<</if>> <<if (def _combinedRule.nipplesPiercing) && (_combinedRule.nipplesPiercing !== "no default setting")>> <<if ($args[0].nipplesPiercing !== _combinedRule.nipplesPiercing)>>