diff --git a/devTools/javaSanityCheck/htmlTags b/devTools/javaSanityCheck/htmlTags index 466a9b301e715f5b896bd84c38941bf61c4ec985..d6797ca12f38ec785c0e45c7f4df696643408c0e 100644 --- a/devTools/javaSanityCheck/htmlTags +++ b/devTools/javaSanityCheck/htmlTags @@ -29,7 +29,7 @@ h4;1 hr;0 html;1 i;1 -img;1 +img;0 input;0 li;1 option;1 diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 0ad9c8ad6dddd5ef6aba4b8629265557ad3f0991..8b371369cf73fe48375b9a6c965a6b6929259857 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -887,12 +887,12 @@ __''Player Character''__ <<options $PC.preg>> You are ''<<print $PC.preg>> weeks pregnant with octuplets'' and your water just broke. - <<options 0 "Not pregnant" "$PC.pregType = 0, $PC.labor = 0">> + <<option 0 "Not pregnant" "$PC.pregType = 0, $PC.labor = 0">> <</options>> <<elseif $PC.preg > 37>> <<options $PC.preg>> You are ''<<print $PC.preg>> weeks pregnant'' and going to go into labor soon. - <<options 0 "Not pregnant" "$PC.pregType = 0, $PC.labor = 0">> + <<option 0 "Not pregnant" "$PC.pregType = 0, $PC.labor = 0">> <<option 43 "Stuffed to capacity" "$PC.pregType = 8, $PC.labor = 1">> <</options>> <<elseif $PC.preg > 0>> diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw index cb9b5b4480c95246f81cd62e64c35eee5e06ceba..84c6aee5d00bbceba96b0526d03fd5a24f7c9e7e 100644 --- a/src/facilities/nursery/childInteract.tw +++ b/src/facilities/nursery/childInteract.tw @@ -151,7 +151,6 @@ <</if>> <</if>> <</if>> - </span> <<if canDoVaginal($activeChild)>> | <<link "Have another slave fuck $his pussy" "FSlaveSlaveVag">><</link>> <</if>> diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index c95cf083c73cae40f2ee5ce6b514a17f2de67055..bc2456aba20b55ccf0013dafca7decbf142bbb83 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -555,9 +555,9 @@ __You are customizing this slave:__ <<options $activeSlave.genes>> ''Genes:'' - <<option "XX" "XX" "$activeSlave.dick = 0, $activeSlave.balls = 0,$activeSlave.clit = 0,$activeSlave.pubertyXY = 0,$activeSlave.pubertyAgeXY = $potencyAge, $activeSlave.pubertyXX=($activeSlave.pubertyAgeXX<$activeSlave.actualAge?1:0),$activeSlave.vagina=Math.max(0, $activeSlave.vagina),$activeSlave.boobs=Math.max(500,$activeSlave.boobs), $activeSlave.balls=0, $activeSlave.scrotum=0, $activeSlave.prostate=0,$activeSlave.shoulders=either(-2,-1,0),$activeSlave.hips=either(-2,-1,0)">> + <<option "XX" "XX" "$activeSlave.dick = 0, $activeSlave.balls = 0, $activeSlave.clit = 0, $activeSlave.pubertyXY = 0, $activeSlave.pubertyAgeXY = $potencyAge, $activeSlave.pubertyXX = ($activeSlave.pubertyAgeXX < $activeSlave.actualAge ? 1 : 0), $activeSlave.vagina = Math.max(0, $activeSlave.vagina), $activeSlave.boobs = Math.max(500, $activeSlave.boobs), $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.prostate = 0, $activeSlave.shoulders = either(-2,-1,0), $activeSlave.hips = either(-2,-1,0)">> @@.yellow;XX@@ (Female) - <<option "XY" "XY" "$activeSlave.dick = 3, $activeSlave.vagina=-1, $activeSlave.preg = 0, WombFlush($activeSlave), $activeSlave.belly = 0,$activeSlave.bellyPreg = 0,$activeSlave.pubertyXY=($activeSlave.pubertyAgeXY<$activeSlave.actualAge?1:0), $activeSlave.pregType = 0, $activeSlave.pregSource = 0, $activeSlave.pregWeek = 0, $activeSlave.pregKnown = 0,$activeSlave.pubertyXX = 0,$activeSlave.pubertyAgeXX = $fertilityAge, $activeSlave.ovaries = 0, $activeSlave.boobs=0, $activeSlave.balls=3, $activeSlave.scrotum=3, $activeSlave.prostate=1,$activeSlave.shoulders=either(0,1,2),$activeSlave.hips=either(0,1,2)">> + <<option "XY" "XY" "$activeSlave.dick = 3, $activeSlave.vagina = -1, $activeSlave.preg = 0, WombFlush($activeSlave), $activeSlave.belly = 0, $activeSlave.bellyPreg = 0, $activeSlave.pubertyXY = ($activeSlave.pubertyAgeXY < $activeSlave.actualAge ? 1 : 0), $activeSlave.pregType = 0, $activeSlave.pregSource = 0, $activeSlave.pregWeek = 0, $activeSlave.pregKnown = 0, $activeSlave.pubertyXX = 0, $activeSlave.pubertyAgeXX = $fertilityAge, $activeSlave.ovaries = 0, $activeSlave.boobs = 0, $activeSlave.balls = 3, $activeSlave.scrotum = 3, $activeSlave.prostate = 1, $activeSlave.shoulders = either(0,1,2), $activeSlave.hips = either(0,1,2)">> @@.yellow;XY@@ (Male) <</options>> diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw index 329ed2cd00b98e4c237e79eed28274f96972a4e5..564e1f4ca8643ad9ed5dc70012426d9a5ec83507 100644 --- a/src/uncategorized/costsBudget.tw +++ b/src/uncategorized/costsBudget.tw @@ -11,7 +11,7 @@ //Here you can view many of the financial details of your arcology, <<= properTitle()>>. The detailed list of slaves and their costs (food, hormones) that you may remember can now be found in the "Slave maintenance" link. Other links will allow you to directly control areas of your arcology to adjust spending to suit your tastes.// -<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>> +<br style="clear:both"><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>> <<if $difficultySwitch == 1>> //The Local Economy score effects some prices in your ecology. The lower the score, the higher the prices. The base score is ''100''.// @@ -59,7 +59,7 @@ <<set _econPercent = Math.trunc(100000/$localEcon-1000)/10>> increasing prices by @@.red;''<<print _econPercent>>%.''@@ <</if>> - <br style="clear:both" /><<if $lineSeparations == 0>><br><br><<else>><hr style="margin:0"><</if>> + <br style="clear:both"><<if $lineSeparations == 0>><br><br><<else>><hr style="margin:0"><</if>> <</if>> //Your weekly costs are as follows://