diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw index 924aaadcd1371528479ebe7d7049db177df234e1..6b4bf3c8861b2b2f15fb36af313327125b6544de 100644 --- a/src/cheats/mod_EditSlaveCheat.tw +++ b/src/cheats/mod_EditSlaveCheat.tw @@ -690,8 +690,10 @@ Normal. | Big. | <<elseif $activeSlave.clit == 2>> Huge. | -<<else>> +<<elseif $activeSlave.clit == 3>> Enormous. | +<<else>> +Dick-like. | <</if>> <<textbox "$activeSlave.clit" $activeSlave.clit>> <br> @@ -699,6 +701,8 @@ Enormous. | <<radiobutton "$activeSlave.clit" 1>> Large <<radiobutton "$activeSlave.clit" 2>> Huge <<radiobutton "$activeSlave.clit" 3>> Enormous +<<radiobutton "$activeSlave.clit" 4>> Gigantic +<<radiobutton "$activeSlave.clit" 5>> That's no dick! <br> diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw index 58972bf83693109cda531f7d669eb3998c260469..efc16e45a974b647763a3973468ba1790f7c21ce 100644 --- a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw @@ -58,6 +58,7 @@ <<set $activeSlave.attrXY = Number($activeSlave.attrXY) || 0>> <<set $activeSlave.attrXX = Number($activeSlave.attrXX) || 0>> <<set $activeSlave.energy = Number($activeSlave.energy) || 0>> +<<set $activeSlave.clit = Number($activeSlave.clit) || 0>> <<SetBellySize $activeSlave>> You perform the dark rituals, pray to the dark gods and sold your soul for the power to change and mold slaves to your will. diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw index 6bbbafca9d19dc91cdbb8ce44350de536738b27b..0eed353c0c8f1a03e6f85f29cf785849526ff9fb 100644 --- a/src/cheats/mod_editSlaveCheatNew.tw +++ b/src/cheats/mod_editSlaveCheatNew.tw @@ -1699,13 +1699,19 @@ @@.yellow;Big@@. | <<elseif $tempSlave.clit == 2>> @@.yellow;Huge@@. | - <<else>> + <<elseif $tempSlave.clit == 3>> @@.yellow;Enormous@@. | + <<elseif $tempSlave.clit == 4>> + @@.yellow;Dick-like@@. | + <<else>> + @@.yellow;Might as well be a big dick@@. | <</if>> <<radiobutton "$tempSlave.clit" 0>> Normal <<radiobutton "$tempSlave.clit" 1>> Large <<radiobutton "$tempSlave.clit" 2>> Huge <<radiobutton "$tempSlave.clit" 3>> Enormous + <<radiobutton "$tempSlave.clit" 4>> Dick-like + <<radiobutton "$tempSlave.clit" 5>> Like a huge dick <br> diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw index c3f73be4d06c774ac79aa4af05c3649a5feb31ec..a3073e82f3a152129ffbdb8bb83a82d6425458ed 100644 --- a/src/js/storyJS.tw +++ b/src/js/storyJS.tw @@ -926,8 +926,28 @@ window.mergeRules = function(rules) { ); if (applies) + { combinedRule[prop] = rules[i][prop]; + + /*Some properties of rules now have second level properties. We need to check it, and change ones in combinedRule. (Good example - growth drugs. Breasts, butt, etc...) */ + if ( "object" == typeof rules[i][prop]) + { + for (var subprop in rules[i][prop]) + { + var subapplies = ( + combinedRule[prop][subprop] === undefined + || (rules[i][prop][subprop] !== "no default setting") + ); + + if (subapplies) + combinedRule[prop][subprop] = rules[i][prop][subprop]; + } + + } + } + } + } return combinedRule; diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw index 963e286309d36c6f51c374a3bef187499f9d1b2f..b9f09006fe3eab1565db2e21457c4afef22a9cc9 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) && canDoAnal($activeSlave)>> +<<if ($eventSlave.anus != 0) && canDoAnal($eventSlave)>> <<if ($eventSlave.vagina != 0)>> <<set $RESSevent.push("confident tanning")>> <</if>> @@ -437,7 +437,7 @@ <<set $RESSevent.push("devoted nympho")>> <</if>> <<if $eventSlave.releaseRules == "permissive">> - <<if ($eventSlave.dickAccessory != "chastity") || ($eventSlave.dick == 0)>> + <<if !["chastity", "combined chastity"].includes($eventSlave.dickAccessory) || ($eventSlave.dick == 0)>> <<set $RESSevent.push("permitted masturbation")>> <</if>> <</if>> @@ -530,7 +530,7 @@ <</if>> */ -<<if ($eventSlave.assignment == "be a servant")>> +<<if ($eventSlave.assignment == "be a servant") || ($eventSlave.assignment == "work as a servant")>> <<if ($eventSlave.devotion <= 95)>> <<if ($eventSlave.intelligence < -1)>> <<set $RESSevent.push("cooler lockin")>> @@ -1671,7 +1671,7 @@ <</if>> <<if ($eventSlave.releaseRules != "restrictive")>> -<<if $activeSlave.belly < 300000>> +<<if $eventSlave.belly < 300000>> <<if ($eventSlave.anus > 2)>> <<if ($eventSlave.fetish == "buttslut") || ($eventSlave.energy > 95)>> <<if ($eventSlave.fetish != "none")>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index df31043d7d1e587308e00433acfdff5a160828bc..daec02eb464e1e15c3046331f016fabfaff90323 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -3989,7 +3989,7 @@ <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = -1, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1>><<SetPregType $slaves[$i]>> <<set $activeSlave = $slaves[$i]>><<if $slaves[$i].mpreg == 1>><<AnalVCheck 10>><<else>><<VaginalVCheck 10>><</if>><<set $slaves[$i] = $activeSlave>> -<<elseif (($slaves[$i].vagina <= 0) || (($slaves[$i].anus <= 0) && ($slaves[$i].mpreg > 0)))>> +<<elseif (($slaves[$i].vagina == 0) || (($slaves[$i].anus == 0) && ($slaves[$i].mpreg > 0)))>> <<elseif ($HeadGirl != 0) && ($HeadGirl.dick > 0) && ($slaves[$i].ID != $HeadGirl.ID) && ($universalRulesImpregnation == "HG") && canPenetrate($HeadGirl)>> <<if $slaves[$i].HGExclude == 1>> It's $HeadGirl.slaveName's responsibility to impregnate fertile slaves, but your Head Girl is forbidden from impregnating $slaves[$i].slaveName. @@ -4007,7 +4007,7 @@ <<set $HeadGirl.fetishStrength += 4>> <</if>> <<elseif $HeadGirl.career == "a breeding bull">> - Head girl feels @@.hotpink;she was meant for.@@ + Head Girl feels @@.hotpink;she was meant for.@@ <<set $HeadGirl.devotion += 1>> <<elseif ($HeadGirl.attrXX > 65) && ($HeadGirl.attrKnown == 1)>> <<if $slaves[$i].mpreg == 1>>ass<<else>>pussy<</if>>-hungry Head Girl is @@.hotpink;happy@@ to take on.