diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 07f6b0018abc588471391ec63ed46ee5c531e112..990641400c1aa3ffb33339b580b625ecd17f8477 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -1975,11 +1975,11 @@ window.cumAmount = function(slave) {
return null;
} else {
if (slave.drugs == "testicle enhancement") {
- cum = ((slave.balls*3.5)+random(0,2))
+ cum = ((slave.balls*3.5)+1)
} else if (slave.drugs == "hyper testicle enhancement") {
- cum = ((slave.balls*5)+random(0,2))
+ cum = ((slave.balls*5)+1)
} else {
- cum = ((slave.balls*2.5)+random(0,2))
+ cum = ((slave.balls*2.5)+1)
}
if (slave.prostateImplant == 1) {
cum *= 1.2
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index fdd3f80a55b9b6aca31bebc63091c81e87bc4ec8..e3abe45b352e04a290426b57fc293fb1e1e42e36 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -878,7 +878,7 @@ Her nationality is $activeSlave.nationality.
<<else>>Gaping.
<</if>>
</span>
-<<if $activeSlave.dick > 0>><<link "No vagina">><<set $activeSlave.vagina = -1,$activeSlave.preg = 0,$activeSlave.pregSource = 0,$activeSlave.pubertyXX = 0,$activeSlave.pubertyAgeXX = $fertilityAge, $activeSlave.ovaries = 0>><<replace "#vagina">>//No vagina.//<</replace>><<StartingGirlsCost>><</link>><<else>>//No vagina//<</if>> |
+<<if $activeSlave.dick > 0>><<link "No vagina">><<set $activeSlave.vagina = -1, $activeSlave.preg = 0,$activeSlave.pregSource = 0,$activeSlave.pubertyXX = 0,$activeSlave.pubertyAgeXX = $fertilityAge, $activeSlave.ovaries = 0>><<replace "#vagina">>//No vagina.//<</replace>><<StartingGirlsCost>><</link>><<else>>//No vagina//<</if>> |
<<link "Virgin">><<set $activeSlave.vagina = 0, $activeSlave.preg = -1, $activeSlave.ovaries = 1>><<replace "#vagina">>@@color:lime;Virgin.@@<</replace>><<StartingGirlsVaginalSkill>><<StartingGirlsCost>><</link>> |
<<link "Normal">><<set $activeSlave.vagina = 1, $activeSlave.preg = -1, $activeSlave.ovaries = 1>><<replace "#vagina">>Normal.<</replace>><<StartingGirlsVaginalSkill>><<StartingGirlsCost>><</link>> |
<<link "Veteran">><<set $activeSlave.vagina = 2, $activeSlave.preg = -1, $activeSlave.ovaries = 1>><<replace "#vagina">>Veteran.<</replace>><<StartingGirlsVaginalSkill>><<StartingGirlsCost>><</link>> |
@@ -1041,6 +1041,15 @@ Her nationality is $activeSlave.nationality.
<</if>>
</span>
+<br>
+''Prostate:''
+<span id="prostate">
+<<if $activeSlave.prostate == 1>>Has a prostate.
+<<else>>No prostate.
+<</if>>
+</span>
+<<link "Add Prostate">><<set $activeSlave.prostate = 1>><<replace "#prostate">>Has a prostate.<</replace>><<StartingGirlsCost>><</link>> | <<link "Remove Prostate">><<set $activeSlave.prostate = 0>><<replace "#prostate">>No prostate.<</replace>><<StartingGirlsCost>><</link>>
+
<br><br>
<span id="analSkillsBlock">
@@ -1234,7 +1243,6 @@ Her nationality is $activeSlave.nationality.
</span>
<br>
-
''Sexuality:''
<span id="sexuality">
<span id="attrXY">
@@ -1283,7 +1291,6 @@ Her nationality is $activeSlave.nationality.
<</link>>
<br>
-
XY attraction:
<span id="decreaseXY">
<<link "Decrease">>
@@ -1513,7 +1520,7 @@ __Archetypes:__ //Convenient combinations of slave attrib
<<link "Wellspring">>
<<StartingGirlsWorkaround>>
<<StartingGirlsRefresh>>
- <<set $activeSlave.analSkill = 0, $activeSlave.oralSkill = 0, $activeSlave.vaginalSkill = 0, $activeSlave.whoreSkill = 0, $activeSlave.entertainSkill = 0, $activeSlave.combatSkill = 0, $activeSlave.actualAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0, $activeSlave.health = 10, $activeSlave.intelligence = -3, $activeSlave.intelligenceImplant = 0, $activeSlave.vagina = 3, $activeSlave.anus = 3, $activeSlave.ovaries = 1, $activeSlave.dick = 5, $activeSlave.balls = 5, $activeSlave.lactation = 2, $activeSlave.nipples = "huge", $activeSlave.boobs = 10000>>
+ <<set $activeSlave.analSkill = 0, $activeSlave.oralSkill = 0, $activeSlave.vaginalSkill = 0, $activeSlave.whoreSkill = 0, $activeSlave.entertainSkill = 0, $activeSlave.combatSkill = 0, $activeSlave.actualAge = 18, $activeSlave.fetishKnown = 0, $activeSlave.attrKnown = 0, $activeSlave.health = 10, $activeSlave.intelligence = -3, $activeSlave.intelligenceImplant = 0, $activeSlave.vagina = 3, $activeSlave.anus = 3, $activeSlave.ovaries = 1, $activeSlave.dick = 5, $activeSlave.balls = 5, $activeSlave.prostate = 1, $activeSlave.lactation = 2, $activeSlave.nipples = "huge", $activeSlave.boobs = 10000>>
<<SaleDescription>>
<<StartingGirlsCost>>
<</link>>
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index 34e2c7277217d4d7d092858eee661f59a90d33cc..63631f62e24aff35558ec37caf1fe632a4e39b94 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -152,33 +152,23 @@ He's yours for the taking, if you want him, and if his praise and proximity were
<<case "Slimness Enthusiast">>
turn from side to side as he flirts with you in a way that shows off his lithe, flexible body.
<<case "Asset Expansionist">>
- arch her back with such warm propinquity that her huge breasts spill out of her tight little dress, springing clear to offer themselves glorious and nude.
+ shift his stance enough that his enormous, beachball-like testicles and forearm sized cock tear the seam of his pants, springing clear to offer themselves glorious and nude.
<<case "Pastoralist">>
- let you know that she's almost entirely milk-fed, while giving you quite an eyeful of her straining cleavage.
+ let you know that she's almost entirely milk-fed, while pressing his chubby against yours.
<<case "Physical Idealist">>
- get a pretty good flex going without being obvious about it, outlining her abs against the sheer midsection of her tight dress.
+ sweep you off your feet into a bridal carry, demonstrating his strength.
<<case "Chattel Religionist">>
- assume just a hint of a Chattel Religionist devotional pose used to request penetration. It's heavy flirting, of a modern religious sort.
-<<case "Roman Revivalist">>
- hint that her pudicitia, that is her purity, would be if anything enhanced by sexual commerce with someone as powerful as you.
-<<case "Egyptian Revivalist">>
- hint that she would like nothing better than to bask in the pharaonic light in the arcology, very close to its source, while loosening her linen dress a little.
-<<case "Edo Revivalist">>
- allude to the refined pleasures, while assuming a slightly less dignified posture in her gorgeous kimono.
-<<case "Arabian Revivalist">>
- reference young Scheherazade and mighty Shahryar in a way that suggests she's quite willing to play the former.
-<<case "Chinese Revivalist">>
- allude to the divinity that resides with the powerful, implying that she'd very much like to come closer to it.
+ assume just a hint of a Chattel Religionist devotional pose used to request to penetrate. It's heavy flirting, of a modern religious sort.
<<default>>
flirt with you quite hard without crossing any lines between a citizen and an arcology owner.
<</switch>>
-He's clearly attracted to you; even the most consummate actress would have difficulty fooling you, and her breath is a little quick, her pupils are a bit dilated, and she's blushing cutely. But she's no fool, either. A casual liasion with <<PCTitle>>$PCTitle would be a tremendous social boost for her.
+He's clearly attracted to you; even the most consummate actor would have difficulty fooling you, and his breath is a little quick, his pupils are a bit dilated, and he's blushing cutely. But he's no fool, either. A casual liasion with <<PCTitle>>$PCTitle would be a tremendous social boost for him.
<br><br>
<span id="result">
-<<link "Keep aloof without offending her">>
+<<link "Keep aloof without offending him">>
<<replace "#result">>
- You thank her for her praise, weighting the words in just the right way to communicate that you consider her flirtations worthy compliments, and nothing more. She understands immediately, communicating acceptance and pleasure at her own daring with nothing more than a thankful look in your eyes. This is how you approach matters like this. You are the ruler of this place and it behooves you to maintain a balance atop all your citizens without showing any susceptibility to solicitation. A little incident like this has little effect on its own, but your habit of maintaining proper reserve creates a reputation for judiciousness that @@color:green;businesspeople consider attractive for arcology investment.@@
+ You thank him for his praise, weighting the words in just the right way to communicate that you consider his flirtations worthy compliments, and nothing more. He understands immediately, communicating acceptance and pleasure at his own daring with nothing more than a thankful look in your eyes. This is how you approach matters like this. You are the ruler of this place and it behooves you to maintain a balance atop all your citizens without showing any susceptibility to solicitation. A little incident like this has little effect on its own, but your habit of maintaining proper reserve creates a reputation for judiciousness that @@color:green;businesspeople consider attractive for arcology investment.@@
<<set $arcologies[0].prosperity += 3>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index b63cc7635f56b5275cd2d56be21d78707af0370c..56d9d461d6ab8dd1d74a6cb1a6a17c6bc941c001 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -809,16 +809,6 @@ On formal occasions, you are announced as $PCTitle.
<</if>>
<</if>>
-<<if $publiclyouted == 1>>
- <<if $arcologies[0].FSDegradationist != "unset">>
- You are a known fetishist who abused their power to manipulate society. Your citizens are amused by your low-balled efforts and @@color:green;take pleasure@@ in society blue-balling you.
- <<FSChange "Degradationist" 2>>
- <<else>>
- You are a known fetishist who abused their power to manipulate society. Your citizens @@color:red;fail to find solace@@ in your leadership.
- <<set $rep -= 5*$FSSingleSlaveRep>>
- <</if>>
-<</if>>
-
<<if $Cash4Babies == 1>>
<<if $arcologies[0].FSDegradationist != "unset">>
Society @@color:green;approves@@ of your poor treatment of slave infants.
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index a83513f672530c4aa91737c8e53d14a8ec940644..2379bcca5bf935c30160ea1c596da189babdd609 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3090,7 +3090,7 @@ You remind yourself that success in this conflict will not be defined by the tra
<<else>>
<<replace "#result">>
Since you are not so uncouth as to, for example, help fund a coup attempt, you fund traditional acts of corporate sabotage, including hacking, slander, and actual, physical thievery. Unfortunately, you seem to be a step behind this week. Your enemy @@color:red;prevents@@ many of your attacks, and even manages to turn a few minor players into public confessions that @@color:red;damage@@ your reputation.
- <<set $cash -= 25000>>
+ <<set $cash -= 10000>>
<<set $rep -= 500>>
<<set $rivalryPower += 2>>
<</replace>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index fcf896bce2f06bbae5a784f5226f854999288548..9b8d7bde56f7457c3bbe81cc4b2bbe8474965c19 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1755,7 +1755,7 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
<<if $activeSlave.underArmHStyle != "bald" && $activeSlave.underArmHStyle != "hairless" && $activeSlave.pubicHStyle != "bald" && $activeSlave.pubicHStyle != "hairless">>
<br>
- $pronounCap <<$activeSlave.physicalAge >= 12>>naturally grows<<else>>will someday grow<</if>> $activeSlave.origHColor body hair.
+ $pronounCap <<if $activeSlave.physicalAge >= 12>>naturally grows<<else>>will someday grow<</if>> $activeSlave.origHColor body hair.
[["Surgically remove " + $possessive + " ability to grow body hair"|Surgery Degradation][$cash -= $surgeryCost,$surgeryType = "body hair removal"]]
<</if>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index be7db60c74a6004666468c5c78a8336b89e99c7d..40caaea1ff767f91d6c5514141b3bce472ccaf9a 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1206,26 +1206,26 @@
<<SlavePronouns $args[0]>>
<<if $args[0].face <= -95>>
- @@color:green;$pronounCap's face is no longer horrifying,@@ and is now merely ugly.
+ @@color:green;$possessiveCap face is no longer horrifying,@@ and is now merely ugly.
<<elseif $args[0].face <= -40>>
<<if $args[0].face+$args[1] > -40>>
- @@color:green;$pronounCap's face is no longer ugly,@@ and is now merely unattractive.
+ @@color:green;$possessiveCap face is no longer ugly,@@ and is now merely unattractive.
<</if>>
<<elseif $args[0].face <= -10>>
<<if $args[0].face+$args[1] > -10>>
- @@color:green;$pronounCap's face is no longer unattractive,@@ and is now somewhat tolerable.
+ @@color:green;$possessiveCap face is no longer unattractive,@@ and is now somewhat tolerable.
<</if>>
<<elseif $args[0].face <= 10>>
<<if $args[0].face+$args[1] > 10>>
- @@color:green;$pronounCap's face is now decently attractive,@@ rather than merely tolerable.
+ @@color:green;$possessiveCap face is now decently attractive,@@ rather than merely tolerable.
<</if>>
<<elseif $args[0].face <= 40>>
<<if $args[0].face+$args[1] > 40>>
- @@color:green;$pronounCap's face is now quite beautiful,@@ rather than merely pretty.
+ @@color:green;$possessiveCap face is now quite beautiful,@@ rather than merely pretty.
<</if>>
-<<else $args[0].face <= 95>>
+<<elseif $args[0].face <= 95>>
<<if $args[0].face+$args[1] > 95>>
- @@color:green;$pronounCap's face is now perfect.@@ It's difficult to imagine how it could be any more beautiful.
+ @@color:green;$possessiveCap face is now perfect.@@ It's difficult to imagine how it could be any more beautiful.
<</if>>
<</if>>
<<set $args[0].face = Math.clamp($args[0].face+$args[1],-100,100)>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index f773b2b67fa02a14c44e06a9aaa8926df6eb8652..b41ee3ea84b35e10ee040e237dab2a7a8ec33336 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -270,21 +270,21 @@
<</if>>
</span>
<<link "Normal">>
- <<set $activeSlave.clit to 0>>
+ <<set $activeSlave.clit = 0>>
<<replace #clit>>
Normal.
<</replace>>
<</link>>
|
<<link "Large">>
- <<set $activeSlave.clit to 1>>
+ <<set $activeSlave.clit = 1>>
<<replace #clit>>
Large.
<</replace>>
<</link>>
|
<<link "Huge">>
- <<set $activeSlave.clit to 2>>
+ <<set $activeSlave.clit = 2>>
<<replace #clit>>
Huge.
<</replace>>
@@ -294,27 +294,27 @@
''Labia:''
<span id="labia">
- <<if $activeSlave.labia is 2>>Huge.
+ <<if $activeSlave.labia == 2>>Huge.
<<elseif $activeSlave.labia == 1>>Large.
<<else>>Normal.
<</if>>
</span>
<<link "Normal">>
- <<set $activeSlave.labia to 0>>
+ <<set $activeSlave.labia = 0>>
<<replace #labia>>
Normal.
<</replace>>
<</link>>
|
<<link "Large">>
- <<set $activeSlave.labia to 1>>
+ <<set $activeSlave.labia = 1>>
<<replace #labia>>
Large.
<</replace>>
<</link>>
|
<<link "Huge">>
- <<set $activeSlave.labia to 2>>
+ <<set $activeSlave.labia = 2>>
<<replace #labia>>
Huge.
<</replace>>
@@ -454,6 +454,12 @@
<</if>>
<</replace>>
+ <<replace "#prostate">>
+ <<if $activeSlave.prostate == 1>>Has a prostate.
+ <<else>>No prostate.
+ <</if>>
+ <</replace>>
+
<<replace "#analSkillsBlock">>
<<if $activeSlave.anus == 0>>
//Anal virgins cannot be given anal skills//
@@ -1056,8 +1062,6 @@
<</if>>
<</widget>>
-
-
/%
Call as <<ChangeAttr 1 1>>
$arg[0] is whether XX or XY.
@@ -1066,10 +1070,8 @@
<<widget "ChangeAttr">>
<<if ($args[0] == 0) && ($args[1] == 0)>>
- <<if $activeSlave.attrXX-10 >= 0>>
+ <<if $activeSlave.attrXX > 0>>
<<set $activeSlave.attrXX -= 10>>
- <<else>>
- <<set $activeSlave.attrXX = 0>>
<</if>>
<<set $activeSlave.attrXX = Math.clamp($activeSlave.attrXX, 0, 100)>>
<<set $activeSlave.attrKnown = 1>>
@@ -1122,12 +1124,10 @@
<</replace>>
<</if>>
<<elseif ($args[0] == 0) && ($args[1] == 1)>>
- <<if $activeSlave.attrXX+10 <= 100>>
+ <<if $activeSlave.attrXX < 100>>
<<set $activeSlave.attrXX += 10>>
- <<else>>
- <<set $activeSlave.attrXX = 100>>
<</if>>
- <<set $activeSlave.attrXX = Math.clamp(0, 100)>>
+ <<set $activeSlave.attrXX = Math.clamp($activeSlave.attrXX, 0, 100)>>
<<set $activeSlave.attrKnown = 1>>
<<replace "#attrXX">>
<<if $activeSlave.attrXX <= 5>>
@@ -1147,44 +1147,41 @@
<</if>>
<</replace>>
<<StartingGirlsCost>>
-<<if $activeSlave.attrXX == 100>>
- <<replace "#increaseXX">>
- <</replace>>
- <<replace "#decreaseXX">>
- <<link "Decrease">>
- <<ChangeAttr 0 0>>
- <</link>>
- <</replace>>
-<<elseif $activeSlave.attrXX == 0>>
- <<replace "#decreaseXX">>
-
- <</replace>>
- <<replace "#increaseXX">>
- <<link "Increase">>
- <<ChangeAttr 0 1>>
- <</link>>
- <</replace>>
-<<else>>
- <<replace "#decreaseXX">>
- <<link "Decrease">>
- <<ChangeAttr 0 0>>
- <</link>>
- <</replace>>
- <<replace "#increaseXX">>
- |
- <<link "Increase">>
- <<ChangeAttr 0 1>>
- <</link>>
- <</replace>>
-<</if>>
+ <<if $activeSlave.attrXX == 100>>
+ <<replace "#increaseXX">>
+ <</replace>>
+ <<replace "#decreaseXX">>
+ <<link "Decrease">>
+ <<ChangeAttr 0 0>>
+ <</link>>
+ <</replace>>
+ <<elseif $activeSlave.attrXX == 0>>
+ <<replace "#decreaseXX">>
+
+ <</replace>>
+ <<replace "#increaseXX">>
+ <<link "Increase">>
+ <<ChangeAttr 0 1>>
+ <</link>>
+ <</replace>>
+ <<else>>
+ <<replace "#decreaseXX">>
+ <<link "Decrease">>
+ <<ChangeAttr 0 0>>
+ <</link>>
+ <</replace>>
+ <<replace "#increaseXX">>
+ |
+ <<link "Increase">>
+ <<ChangeAttr 0 1>>
+ <</link>>
+ <</replace>>
+ <</if>>
<<elseif ($args[0] == 1) && ($args[1] == 0)>>
- <<if $activeSlave.attrXY-10 >= 0>>
+ <<if $activeSlave.attrXY > 0>>
<<set $activeSlave.attrXY -= 10>>
- <<else>>
- <<set $activeSlave.attrXY = 0>>
<</if>>
-
- <<set $activeSlave.attrXY = Math.clamp(0, 100)>>
+ <<set $activeSlave.attrXY = Math.clamp($activeSlave.attrXY, 0, 100)>>
<<set $activeSlave.attrKnown = 1>>
<<replace "#attrXY">>
<<if $activeSlave.attrXY <= 5>>
@@ -1236,12 +1233,10 @@
<</replace>>
<</if>>
<<elseif ($args[0] == 1) && ($args[1] == 1)>>
- <<if $activeSlave.attrXY+10 <= 100>>
+ <<if $activeSlave.attrXY < 100>>
<<set $activeSlave.attrXY += 10>>
- <<else>>
- <<set $activeSlave.attrXY = 100>>
<</if>>
- <<set $activeSlave.attrXY = Math.clamp(0, 100)>>
+ <<set $activeSlave.attrXY = Math.clamp($activeSlave.attrXY, 0, 100)>>
<<set $activeSlave.attrKnown = 1>>
<<replace "#attrXY">>
<<if $activeSlave.attrXY <= 5>>
@@ -1261,7 +1256,6 @@
<</if>>
<</replace>>
<<StartingGirlsCost>>
-
<<if $activeSlave.attrXY == 100>>
<<replace "#increaseXY">>