From 37604c02612f712a691b2dc5ac4dacd11c9dad59 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 16 Dec 2019 20:50:26 -0600
Subject: [PATCH] Fixes
---
player variables documentation - Pregmod.txt | 12 ++++++++++++
src/js/eventSelectionJS.js | 2 +-
src/player/actions/fondleDick.tw | 9 ++++-----
src/player/actions/fondleVagina.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 4 +++-
src/uncategorized/reputation.tw | 2 +-
6 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 9ccb208d258..48b54feced0 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -137,6 +137,18 @@ births:
how many children you've had
accepts int
+boobsBonus:
+
+(rare in events)
+breast size
+-3 - B-cup
+-2 - C-cup
+-1 - D-cup
+ 0 - DD-cup
+ 1 - F-cup
+ 2 - G-cup
+ 3 - H-cup
+
degeneracy:
How strong/are there rumors about you doing unsavory things with your slaves
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 438c4af32fd..c85304a7de7 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1806,7 +1806,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
}
- if (eventSlave.career === "a breeding bull" && eventSlave.assignment === "serve in the master suite" && canPenetrate(eventSlave) && eventSlave.dick >= 5 && hasAllLimbs(eventSlave) && State.variables.PC.vagina > -1 && State.variables.PC.preg === 0 && (eventSlave.muscles > 30 || eventSlave.weight > 30)) {
+ if (eventSlave.career === "a breeding bull" && eventSlave.assignment === "serve in the master suite" && canPenetrate(eventSlave) && eventSlave.dick >= 5 && hasAnyArms(eventSlave) && State.variables.PC.vagina > -1 && State.variables.PC.preg === 0 && (eventSlave.muscles > 30 || eventSlave.weight > 30)) {
State.variables.RESSevent.push("breeding bull");
if (State.variables.PC.fertDrugs > 0) {
State.variables.RESSevent.push("breeding bull");
diff --git a/src/player/actions/fondleDick.tw b/src/player/actions/fondleDick.tw
index 38fb3315dfb..e52d28cccf7 100644
--- a/src/player/actions/fondleDick.tw
+++ b/src/player/actions/fondleDick.tw
@@ -1,7 +1,7 @@
:: FondleDick [nobr]
You call $him over so you can fondle $his
-<<if $activeSlave.dick <= 1>>
+<<if $activeSlave.dick == 1>>
tiny dick
<<elseif $activeSlave.dick == 2>>
cute dick
@@ -24,10 +24,9 @@ You call $him over so you can fondle $his
<<else>>
hypertrophied dick
<</if>>
-
+and
<<if $activeSlave.scrotum > 0>>
- and
- <<if $activeSlave.balls <= 0>>
+ <<if $activeSlave.balls == 0>>
soft scrotum.
<<elseif $activeSlave.balls == 1>>
tiny balls.
@@ -43,7 +42,7 @@ You call $him over so you can fondle $his
monstrous balls.
<</if>>
<<else>>
- and soft perineum.
+ soft perineum.
<</if>>
<<if ($activeSlave.vaginaTat == "tribal patterns")>>
diff --git a/src/player/actions/fondleVagina.tw b/src/player/actions/fondleVagina.tw
index 20ed93b0e16..019308082d2 100644
--- a/src/player/actions/fondleVagina.tw
+++ b/src/player/actions/fondleVagina.tw
@@ -312,7 +312,7 @@ You call $him over so you can fondle $his
<<else>>
pretty little clit
<</if>>
- and rub it with your fingertips as your hand nears it. $He looks into your eyes furtively while<<if hasAnyArms($activeSlave)>> $he grabs your wrist with $his hand and<</if>> $he squeezes $his thighs together as $he moans and shudders in an orgasm.
+ and rub it with your fingertips as your hand nears it. $He <<if canSee($activeSlave)>>looks into your eyes<<else>>faces you<</if>> furtively while<<if hasAnyArms($activeSlave)>> $he grabs your wrist with $his hand and<</if>> $he squeezes $his thighs together as $he moans and shudders in an orgasm.
<</if>>
$He dutifully <<if canSee($activeSlave)>>looks at you<<else>>faces<</if>> as you stop moving your hand.
<<else>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index e391bb71f96..347f56a35c3 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -486,6 +486,9 @@
<<if ndef $PC.nationality>>
<<set $PC.nationality = "Stateless">>
<</if>>
+ <<if $PC.boobsBonus == -0.5>>
+ <<set $PC.boobsBonus = -1>>
+ <</if>>
<<if ndef $PC.sclerae>>
<<set $PC.sclerae = "white">>
<</if>>
@@ -3141,7 +3144,6 @@ Setting missing global variables:
<<if ndef $lastWeeksCashIncome>>
<<setupLastWeeksCash>>
<</if>>
-
<<if ndef $lastWeeksRepIncome>>
<<setupLastWeeksRep>>
<</if>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index f419cba4aaa..76053863c80 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -358,7 +358,7 @@ _enduringRep = $enduringRep>>
<<elseif $arcologies[0].FSSlimnessEnthusiast != "unset">>
<<if $PC.boobs >= 1000>>
Society finds big breasts unsightly and you are no exception; your <<if $PC.boobsImplant > 0>>chest balloons<<else>>fat tits<</if>> @@.red;harm@@ your public image.
- <<run repX(forceNeg(10*$PC.boobs), "PCappearance")>>
+ <<run repX(forceNeg(($PC.boobs/100)*3), "PCappearance")>>
<</if>>
<<if $PC.butt >= 5>>
Society finds big butts unsightly and you are no exception; your <<if $PC.buttImplant > 0>>inflated ass<<else>>fat ass<</if>> @@.red;harms@@ your public image.
--
GitLab