diff --git a/devNotes/twine CSS b/devNotes/twine CSS index 54d41b71a390b25659e3d0244c65eae228f9bbff..ff4365aaf12b1339790023de42277dc82c799bba 100644 --- a/devNotes/twine CSS +++ b/devNotes/twine CSS @@ -183,6 +183,7 @@ span.zeroButton > a:hover { text-decoration: none; } .green { color: green } .hotpink { color: hotpink } .lawngreen { color: lawngreen } +.lightblue { color: lightblue } .lightcoral { color: lightcoral } .lightgreen { color: lightgreen } .lightpink { color: lightpink } @@ -201,6 +202,7 @@ span.zeroButton > a:hover { text-decoration: none; } .seagreen { color: seagreen } .springgreen { color: springgreen } .tan { color: tan } +.teal { color: teal } .yellow { color: yellow } .yellowgreen { color: yellowgreen } @@ -219,6 +221,7 @@ span.zeroButton > a:hover { text-decoration: none; } .green a { color: green } .hotpink a { color: hotpink } .lawngreen a { color: lawngreen } +.lightblue a { color: lightblue } .lightcoral a { color: lightcoral } .lightgreen a { color: lightgreen } .lightpink a { color: lightpink } @@ -237,6 +240,7 @@ span.zeroButton > a:hover { text-decoration: none; } .seagreen a { color: seagreen } .springgreen a { color: springgreen } .tan a { color: tan } +.teal a { color: teal } .yellow a { color: yellow } .yellowgreen a { color: yellowgreen } diff --git a/src/gui/css/mainStyleSheet.tw b/src/gui/css/mainStyleSheet.tw index a6d3dde4b8aa00f4f5ff92c334bc9b9b550c608d..c3c247055cd5b75aafac4c9c186fe4785be56806 100644 --- a/src/gui/css/mainStyleSheet.tw +++ b/src/gui/css/mainStyleSheet.tw @@ -184,6 +184,7 @@ span.zeroButton > a:hover { text-decoration: none; } .green { color: green } .hotpink { color: hotpink } .lawngreen { color: lawngreen } +.lightblue { color: lightblue } .lightcoral { color: lightcoral } .lightgreen { color: lightgreen } .lightpink { color: lightpink } @@ -202,6 +203,7 @@ span.zeroButton > a:hover { text-decoration: none; } .seagreen { color: seagreen } .springgreen { color: springgreen } .tan { color: tan } +.teal { color: teal } .yellow { color: yellow } .yellowgreen { color: yellowgreen } @@ -220,6 +222,7 @@ span.zeroButton > a:hover { text-decoration: none; } .green a { color: green } .hotpink a { color: hotpink } .lawngreen a { color: lawngreen } +.lightblue a { color: lightblue } .lightcoral a { color: lightcoral } .lightgreen a { color: lightgreen } .lightpink a { color: lightpink } @@ -238,6 +241,7 @@ span.zeroButton > a:hover { text-decoration: none; } .seagreen a { color: seagreen } .springgreen a { color: springgreen } .tan a { color: tan } +.teal a { color: teal } .yellow a { color: yellow } .yellowgreen a { color: yellowgreen } diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw index c3aca3748bb57d60191f8463f45d105dca5a1f73..9866567a967f73d102aa936831df071408daa144 100644 --- a/src/init/setupVars.tw +++ b/src/init/setupVars.tw @@ -1565,6 +1565,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do "gray":"gray", "hotpink":"hotpink", "lawngreen":"darkgreen", +"lightblue": "lightblue", "lightcoral":"lightcoral", "lightgreen":"lightgreen", "lightpink":"lightpink", @@ -1627,6 +1628,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do "gray":"gray", "hotpink":"hotpink", "lawngreen":"lawngreen", +"lightblue": "lightblue", "lightcoral":"lightcoral", "lightgreen":"lightgreen", "lightpink":"lightpink", diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw index ae094223d238093800b822243ec0ec5d43d57917..ff06ce7499e8e112e43e7eb626bfdbc2165cf3fd 100644 --- a/src/pregmod/widgets/bodySwapReaction.tw +++ b/src/pregmod/widgets/bodySwapReaction.tw @@ -824,7 +824,7 @@ Now you only have to wait for her to wake up. <</if>> /*(age)*/ - <<if $args[0].visualAge >= $args[1].visualAge+5 || ($args[0].physicalAge > 18 && $args[1].physicalAge < 16)>> /*(older)*/ + <<if $args[0].physicalAge >= $args[1].physicalAge+5 || ($args[0].physicalAge > 18 && $args[1].physicalAge < 16)>> /*(older)*/ <<if $args[0].physicalAge > 18 && $args[1].physicalAge < 16>> She starts at just how much @@.red;older her <<if canSee($args[0])>>face and body are<<else>>body is<</if>>.@@ <<if $args[0].physicalAge > 100>> @@ -846,12 +846,12 @@ Now you only have to wait for her to wake up. life. She does her best to shrug this off and tries to think of all the fun things a lewd older body can do. <<else>> as that means she will be @@.mediumorchid;unable to spend as much time on this earth.@@ - <<set $args[0].devotion -= ($args[1].physicalAge-$args[0].physicalAge*5)>> + <<set $args[0].devotion -= ($args[0].physicalAge-$args[1].physicalAge)*2>> <<if $PhysicalRetirementAgePolicy == 1>> On the other hand, it means she won’t have as much time to spend with you before she is retired. <<else>> This is compounded with the fact that she @@.gold;may well die before she becomes a freed slave.@@ - <<set $args[0].trust -= ($args[1].physicalAge-$args[0].physicalAge*5)>> + <<set $args[0].trust -= ($args[0].physicalAge-$args[1].physicalAge*2)>> <</if>> <</if>> <<if ($args[0].ovaries == 1 || $args[0].mpreg == 1) && $args[0].pubertyXX == 1 && $args[1].pubertyXX == 0 && isFertile($args[0])>> @@ -871,12 +871,12 @@ Now you only have to wait for her to wake up. life. She does her best to shrug this off and tries to think of all the fun things a lewd older body can do. <<else>> as that means she will be @@.mediumorchid;unable to spend as much time on this earth.@@ - <<set $args[0].devotion -= ($args[1].visualAge-$args[0].visualAge*5)>> + <<set $args[0].devotion -= ($args[0].physicalAge-$args[1].physicalAge)*2>> <<if $PhysicalRetirementAgePolicy == 1>> On the other hand, it means she won’t have as much time to spend with you before she is retired. <<else>> This is compounded with the fact that she @@.gold;may well die before she becomes a freed slave.@@ - <<set $args[0].trust -= ($args[1].visualAge-$args[0].visualAge*5)>> + <<set $args[0].trust -= ($args[0].physicalAge-$args[1].physicalAge*2)>> <</if>> <</if>> <</if>> @@ -2296,12 +2296,12 @@ Now you only have to wait for her to wake up. life. She does her best to shrug this off and tries to think of all the fun things a lewd older body can do. <<else>> as that means she will be @@.mediumorchid;unable to spend as much time on this earth.@@ - <<set $args[0].devotion -= ($args[0].physicalAge-$args[1].physicalAge)>> + <<set $args[0].devotion -= ($args[0].physicalAge-$args[1].physicalAge)*2>> <<if $PhysicalRetirementAgePolicy == 1>> On the other hand, it means she won’t have as much time to spend with you before she is retired. <<else>> This is compounded with the fact that she @@.gold;may well die before she becomes a freed slave.@@ - <<set $args[0].trust -= ($args[0].physicalAge-$args[1].physicalAge)>> + <<set $args[0].trust -= ($args[0].physicalAge-$args[1].physicalAge)*2>> <</if>> <</if>> <<if ($args[0].ovaries == 1 || $args[0].mpreg == 1) && $args[0].pubertyXX == 1 && $args[1].pubertyXX == 0 && isFertile($args[0])>> @@ -2321,12 +2321,12 @@ Now you only have to wait for her to wake up. life. She does her best to shrug this off and tries to think of all the fun things a lewd older body can do. <<else>> as that means she will be @@.mediumorchid;unable to spend as much time on this earth.@@ - <<set $args[0].devotion -= ($args[0].physicalAge-$args[1].physicalAge)>> + <<set $args[0].devotion -= ($args[0].physicalAge-$args[1].physicalAge)*2>> <<if $PhysicalRetirementAgePolicy == 1>> On the other hand, it means she won’t have as much time to spend with you before she is retired. <<else>> This is compounded with the fact that she @@.gold;may well die before she becomes a freed slave.@@ - <<set $args[0].trust -= ($args[0].physicalAge-$args[1].physicalAge)>> + <<set $args[0].trust -= ($args[0].physicalAge-$args[1].physicalAge)*2>> <</if>> <</if>> <</if>> diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw index c6e714fe52fab0ba436e5b6e4b23ed027e5aff79..1b674d6780cfaa40309a3a014e5082b9fe5494c9 100644 --- a/src/pregmod/widgets/slaveSummaryWidgets.tw +++ b/src/pregmod/widgets/slaveSummaryWidgets.tw @@ -273,6 +273,7 @@ Release rules: _Slave.releaseRules. <</if>> <<if $abbreviateDiet == 1>> + @@.teal; <<switch _Slave.diet>> <<case "restricted">> ''Di:W-'' @@ -295,6 +296,8 @@ Release rules: _Slave.releaseRules. <<case "fertility">> ''Di:F+'' <</switch>> + @@ + @@.cyan; <<if _Slave.dietCum == 2>> ''Cum++'' <<elseif ((_Slave.dietCum == 1) && (_Slave.dietMilk == 0))>> @@ -306,7 +309,9 @@ Release rules: _Slave.releaseRules. <<elseif (_Slave.dietMilk == 2)>> ''Milk++'' <</if>> + @@ <<elseif $abbreviateDiet == 2>> + @@.teal; <<switch _Slave.diet>> <<case "restricted">> Dieting. @@ -329,14 +334,15 @@ Release rules: _Slave.releaseRules. <<case "fertility">> Fertility. <</switch>> + @@ <<if _Slave.dietCum == 2>> Diet Base: @@.cyan;Cum Based.@@ <<elseif ((_Slave.dietCum == 1) && (_Slave.dietMilk == 0))>> - Diet Base: Cum Added. + Diet Base: @@.cyan;Cum Added.@@ <<elseif ((_Slave.dietCum == 1) && (_Slave.dietMilk == 1))>> - Diet Base: Milk & Cum Added. + Diet Base: @@.cyan;Milk & Cum Added.@@ <<elseif ((_Slave.dietCum == 0) && (_Slave.dietMilk == 1))>> - Diet Base: Milk Added. + Diet Base: @@.cyan;Milk Added.@@ <<elseif (_Slave.dietMilk == 2)>> Diet Base: @@.cyan;Milk Based.@@ <</if>> @@ -369,6 +375,7 @@ Release rules: _Slave.releaseRules. <</if>> <<if $abbreviateDrugs == 1>> + @@.tan; <<switch _Slave.drugs>> <<case "breast injections">> ''Dr:Boobs+'' @@ -437,12 +444,16 @@ Release rules: _Slave.releaseRules. <<case "growth stimulants">> ''Dr:groStim'' <</switch>> + @@ + @@.lightgreen; <<if _Slave.curatives == 2>> ''Cura'' <<elseif _Slave.curatives == 1>> ''Prev'' <</if>> + @@ <<if _Slave.aphrodisiacs != 0>> + @@.lightblue; <<if _Slave.aphrodisiacs == 1>> ''Aph'' <<elseif _Slave.aphrodisiacs == 2>> @@ -450,10 +461,12 @@ Release rules: _Slave.releaseRules. <<else>> ''Anaph'' <</if>> + @@ <</if>> <<if _Slave.addict != 0>> @@.cyan;Add@@ <</if>> + @@.lightsalmon; <<if _Slave.hormones > 1>> ''Ho:F+'' <<elseif _Slave.hormones > 0>> @@ -463,6 +476,8 @@ Release rules: _Slave.releaseRules. <<elseif _Slave.hormones < 0>> ''Ho:M'' <</if>> + @@ + @@.mediumseagreen; <<if (_Slave.bellyImplant > -1)>> ''Belly Imp'' <<elseif ((_Slave.preg <= -2) || (_Slave.ovaries == 0)) && (_Slave.vagina != -1)>> @@ -484,8 +499,9 @@ Release rules: _Slave.releaseRules. <<elseif _Slave.pregKnown == 1>> ''_Slave.pregWeek wks preg'' <</if>> + @@ <<if _Slave.induce == 1>> - ''Early Labor'' + @@.orange;''Early Labor''@@ <</if>> <<if _Slave.pubertyXY == 0 && _Slave.balls > 0>> ''Prepub balls'' @@ -493,6 +509,7 @@ Release rules: _Slave.releaseRules. <<if _Slave.balls > 0 && _Slave.vasectomy == 1>> ''Vasect'' <</if>> + @@.springgreen; <<if _Slave.inflation == 3>> ''8 ltr _Slave.inflationType'' <<elseif _Slave.inflation == 2>> @@ -502,32 +519,40 @@ Release rules: _Slave.releaseRules. <<elseif _Slave.bellyFluid > 0>> ''<<print _Slave.bellyFluid>>ccs _Slave.inflationType'' <</if>> + @@ <<elseif $abbreviateDrugs == 2>> <<if (_Slave.drugs != "no drugs") && (_Slave.drugs != "none")>> - On _Slave.drugs. + @@.tan;On _Slave.drugs.@@ <</if>> + @@.lightgreen; <<if _Slave.curatives == 2>> On curatives. <<elseif _Slave.curatives == 1>> On preventatives. <</if>> + @@ + @@.lightblue; <<if _Slave.aphrodisiacs > 0>> On <<if _Slave.aphrodisiacs > 1>>extreme <</if>>aphrodisiacs. <<elseif _Slave.aphrodisiacs === -1>> On anaphrodisiacs. <</if>> + @@ <<if _Slave.addict != 0>> @@.cyan;Addict.@@ <</if>> + @@.lightsalmon; <<if _Slave.hormones > 1>> - ''Heavy female hormones.'' + Heavy female hormones. <<elseif _Slave.hormones > 0>> - ''Female hormones.'' + Female hormones. <<elseif _Slave.hormones < -1>> - ''Heavy male hormones.'' + Heavy male hormones. <<elseif _Slave.hormones < 0>> - ''Male hormones.'' + Male hormones. <</if>> + @@ + @@.mediumseagreen; <<if (_Slave.bellyImplant > -1)>> Belly Implant. <<elseif ((_Slave.preg <= -2) || (_Slave.ovaries == 0)) && (_Slave.vagina != -1)>> @@ -576,8 +601,9 @@ Release rules: _Slave.releaseRules. <</if>> <</if>> <</if>> + @@ <<if _Slave.induce == 1>> - Showing signs of early labor. + @@.orange;Showing signs of early labor.@@ <</if>> <<if _Slave.pubertyXY == 0 && _Slave.balls > 0>> Has not had first ejaculation. @@ -585,15 +611,17 @@ Release rules: _Slave.releaseRules. <<if _Slave.balls > 0 && _Slave.vasectomy == 1>> Vasectomy. <</if>> + @@.springgreen; <<if _Slave.inflation == 3>> - ''Filled with 8 liters of _Slave.inflationType.'' + Filled with 8 liters of _Slave.inflationType. <<elseif _Slave.inflation == 2>> - ''Filled with 4 liters of _Slave.inflationType.'' + Filled with 4 liters of _Slave.inflationType. <<elseif _Slave.inflation == 1>> - ''Filled with 2 liters of _Slave.inflationType.'' + Filled with 2 liters of _Slave.inflationType. <<elseif _Slave.bellyFluid > 0>> - ''Stuffed with <<print _Slave.bellyFluid>>ccs of _Slave.inflationType.'' + Stuffed with <<print _Slave.bellyFluid>>ccs of _Slave.inflationType. <</if>> + @@ <</if>> <<if $abbreviateNationality+$abbreviateGenitalia+$abbreviatePhysicals+$abbreviateSkills+$abbreviateMental != 0>> diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw index 1f24007743d0ca70b6f43c667eb840dc8fda1c13..15befd37c833b3f287cf717bbc8da87b57789f46 100644 --- a/src/uncategorized/pRivalryHostage.tw +++ b/src/uncategorized/pRivalryHostage.tw @@ -19,6 +19,7 @@ <<set $activeSlave.dick = 0>> <<set $activeSlave.balls = 0>> <<set $activeSlave.scrotum = 0>> +<<set $activeSlave.prostate = 0>> <<set $activeSlave.waist = Math.clamp($activeSlave.waist,-55,15)>> <<set $activeSlave.hips = 0>> <<set $activeSlave.shoulders = -1>>