From 0321464f6e806c29a945883e6c174d9cc79a64fb Mon Sep 17 00:00:00 2001
From: Anu <anulithic@gmail.com>
Date: Sat, 15 Mar 2025 01:31:45 -0700
Subject: [PATCH 1/4] Use same pronoun standard in pcSurgDeg as in electSurg
---
src/player/pcSurgeryDegradation.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/player/pcSurgeryDegradation.js b/src/player/pcSurgeryDegradation.js
index d9c4c88164b..d9dad042eb7 100644
--- a/src/player/pcSurgeryDegradation.js
+++ b/src/player/pcSurgeryDegradation.js
@@ -10,7 +10,7 @@ App.UI.PCSurgeryDegradation = function(surgeryType) {
const {
HeU, HisU,
heU, hisU, himU, himselfU
- } = getNonlocalPronouns(V.seeDicks).appendSuffix("U");
+ } = getNonlocalPronouns(V.seeDicks === 100 ? 100 : 0).appendSuffix("U");
switch (surgeryType) {
case "skinTone":
--
GitLab
From 6f5cf57b4b52c84023c8edc3345e59de7b37d8ce Mon Sep 17 00:00:00 2001
From: Anu <anulithic@gmail.com>
Date: Sat, 15 Mar 2025 01:56:24 -0700
Subject: [PATCH 2/4] Reword "fondle her breasts" for flat chests
---
src/endWeek/saRulesFunctions.js | 6 +++++-
src/npc/interaction/fSuckDick.js | 6 +++++-
src/npc/interaction/fondleVagina.js | 4 +++-
src/npc/surgery/bodySwap/bodySwapReaction.js | 6 +++++-
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/endWeek/saRulesFunctions.js b/src/endWeek/saRulesFunctions.js
index bff6dd43f64..547e32f1675 100644
--- a/src/endWeek/saRulesFunctions.js
+++ b/src/endWeek/saRulesFunctions.js
@@ -1156,7 +1156,11 @@ App.EndWeek.Rules.consentDiscoversFetish = function(slave) {
}
App.UI.DOM.appendNewElement("span", el, `${he}'s an anal slut!`, ["lightcoral"]);
} else if (slave.fetish === Fetish.BOOBS) {
- el.append(`fondles ${his} breasts, and ${he} loves it; `);
+ if (slave.boobs >= 300) {
+ el.append(`fondles ${his} breasts, and ${he} loves it; `);
+ } else {
+ el.append(`plays with ${his} nipples, and ${he} loves it; `);
+ }
App.UI.DOM.appendNewElement("span", el, `${he}'s a boob fetishist!`, ["lightcoral"]);
if (slave.lactation > 0) {
slave.lactationDuration = 2;
diff --git a/src/npc/interaction/fSuckDick.js b/src/npc/interaction/fSuckDick.js
index 979958e8793..17bc0e9be14 100644
--- a/src/npc/interaction/fSuckDick.js
+++ b/src/npc/interaction/fSuckDick.js
@@ -153,7 +153,11 @@ App.Interact.fSuckDick = function(slave) {
break;
case Fetish.BOOBS:
if (hasAnyArms(slave)) {
- r.push(`The slave fondles ${his} breasts, while`);
+ if (slave.boobs >= 300) {
+ r.push(`The slave fondles ${his} breasts, while`);
+ } else {
+ r.push(`The slave plays with ${his} nipples, while`);
+ }
}
break;
case Fetish.BUTTSLUT:
diff --git a/src/npc/interaction/fondleVagina.js b/src/npc/interaction/fondleVagina.js
index ddee4a9449a..ce49de8ef53 100644
--- a/src/npc/interaction/fondleVagina.js
+++ b/src/npc/interaction/fondleVagina.js
@@ -166,8 +166,10 @@ App.Interact.fondleVagina = function(slave) {
}
r.push(`with your outstretched fingers, strumming up and down the edges of ${his} pussylips, then softly rub your fingers along the inner walls with a tender touch, starting slow but gradually increasing the speed of your movements.`);
if (hasAnyArms(slave)) {
- if (slave.fetish === "boobs") {
+ if (slave.fetish === "boobs" && slave.boobs >= 300) {
r.push(`${He} fondles ${his} breasts and plays with ${his} nipples at the same time.`);
+ } else if (slave.fetish === "boobs") {
+ r.push(`${He} plays with ${his} nipples at the same time.`);
} else if ((slave.fetish === "pregnancy") && slave.belly >= 1500) {
r.push(`${He} strokes the curve of ${his} belly at the same time.`);
}
diff --git a/src/npc/surgery/bodySwap/bodySwapReaction.js b/src/npc/surgery/bodySwap/bodySwapReaction.js
index 16fbfd08c9d..6576df0194e 100644
--- a/src/npc/surgery/bodySwap/bodySwapReaction.js
+++ b/src/npc/surgery/bodySwap/bodySwapReaction.js
@@ -722,7 +722,11 @@ globalThis.bodySwapReaction = function(body, soul) {
/* (if lactation status has changed)*/
if (body.lactation > 0 && soul.lactation === 0) { /* (lactating now, wasn't before)*/
- r.push(`As ${he} fondles ${his} breasts,`);
+ if (slave.boobs >= 300) {
+ r.push(`As ${he} fondles ${his} breasts,`);
+ } else {
+ r.push(`As ${he} gropes ${his} flat chest,`);
+ }
if (body.lactation === 1) {
r.push(`<span class="coral">solitary drops of milk begin to drop from ${his} nipples.</span>`);
} else {
--
GitLab
From 8c665ca8fdbdf2664642cb7eebb7aca20c439360 Mon Sep 17 00:00:00 2001
From: Anu <anulithic@gmail.com>
Date: Sat, 15 Mar 2025 02:00:14 -0700
Subject: [PATCH 3/4] Don't say "in approximately no weeks"
---
src/endWeek/saTakeClasses.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index b99fd4af180..95e221f2013 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -745,7 +745,7 @@ App.SlaveAssignment.takeClasses = function saTakeClasses(slave) {
}
if (tutorForSlave(slave)) {
const skill = slave.skill[tutorKeyToSkillKey(tutorForSlave(slave))];
- r += ` ${He} is currently ${Math.round((skill / Constant.MASTERED_XP) * 100)}% through training and should be finished in approximately ${numberWithPluralOne(Math.round((Constant.MASTERED_XP - skill) / lessonSkillIncrease(slave)), "week")}.`;
+ r += ` ${He} is currently ${Math.round((skill / Constant.MASTERED_XP) * 100)}% through training and should be finished in approximately ${numberWithPluralOne(Math.ceil((Constant.MASTERED_XP - skill) / lessonSkillIncrease(slave)), "week")}.`;
}
}
--
GitLab
From 543b4fce76399a031f49841850e29de2c6111a30 Mon Sep 17 00:00:00 2001
From: Anu <anulithic@gmail.com>
Date: Sat, 15 Mar 2025 02:12:53 -0700
Subject: [PATCH 4/4] body, not slave
---
src/npc/surgery/bodySwap/bodySwapReaction.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/npc/surgery/bodySwap/bodySwapReaction.js b/src/npc/surgery/bodySwap/bodySwapReaction.js
index 6576df0194e..037cf87f1fb 100644
--- a/src/npc/surgery/bodySwap/bodySwapReaction.js
+++ b/src/npc/surgery/bodySwap/bodySwapReaction.js
@@ -722,7 +722,7 @@ globalThis.bodySwapReaction = function(body, soul) {
/* (if lactation status has changed)*/
if (body.lactation > 0 && soul.lactation === 0) { /* (lactating now, wasn't before)*/
- if (slave.boobs >= 300) {
+ if (body.boobs >= 300) {
r.push(`As ${he} fondles ${his} breasts,`);
} else {
r.push(`As ${he} gropes ${his} flat chest,`);
--
GitLab