From f75925e4e92fbf6ee3a5fc9735349e22759d81ac Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 18 Jul 2019 21:38:16 -0500
Subject: [PATCH] FixesIGuess
---
src/js/SlaveState.js | 4 ++--
src/js/extendedFamilyModeJS.js | 14 +++++++++-----
src/js/slaveListing.js | 2 +-
src/uncategorized/pRivalryActions.tw | 4 ++--
src/uncategorized/reAnalPunishment.tw | 2 +-
src/uncategorized/slaveSold.tw | 4 ++--
6 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 501e791b320..ba092ff85fd 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1997,9 +1997,9 @@ App.Entity.SlaveState = class SlaveState {
wLoss: 0,
/** body attempts to normalize to an androgynous state */
androgyny: 0,
- /** constantly gains muscle mass, easier to gain muscle. mGain + mLoss - muscle gain/loss aplified, passively lose muscle unless building */
+ /** constantly gains muscle mass, easier to gain muscle. mGain + mLoss - muscle gain/loss amplified, passively lose muscle unless building */
mGain: 0,
- /** constantly loses muscle mass, easier to gain muscle. mGain + mLoss - muscle gain/loss aplified, passively lose muscle unless building */
+ /** constantly loses muscle mass, easier to gain muscle. mGain + mLoss - muscle gain/loss amplified, passively lose muscle unless building */
mLoss: 0,
/** slave can only ever birth girls */
girlsOnly: 0
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index a0544f3791d..58f173346d5 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -35,19 +35,23 @@ window.isGrandparentP = function isGrandparentP(granddaughter, grandparent) {
};
window.sameDad = function(slave1, slave2) {
- if ((slave1.father === slave2.father) && (slave1.father !== 0 && slave1.father !== -2)) {
+ if ((slave1.father === slave2.father) && (specificDad(slave1))) {
return true;
}
return false;
};
window.sameMom = function(slave1, slave2) {
- if ((slave1.mother === slave2.mother) && (slave1.mother !== 0 && slave1.mother !== -2)) {
+ if ((slave1.mother === slave2.mother) && (specificMom(slave1))) {
return true;
}
return false;
};
+window.sameParent = function isParentP(slave1, slave2) {
+ return sameMom(slave1, slave2) || sameDad(slave1, slave2);
+};
+
window.specificDad = function(slave) {
return (slave.father !== 0 && slave.father !== -2 && slave.father !== -4 && slave.father !== -5 && slave.father !== -6 && slave.father !== -7 && slave.father !== -8 && slave.father !== -9);
};
@@ -84,9 +88,9 @@ window.isAunt = function(niece, aunt) {
window.sameTParent = function(slave1, slave2) {
if (slave1.mother === -1 && slave1.father === -1 && slave2.mother === -1 && slave2.father === -1) {
return 1;
- } else if (slave1.mother === slave2.father && slave1.father === slave2.mother && slave1.mother !== 0 && slave1.mother !== -2 && slave1.father !== 0 && slave1.father !== -2 && slave1.mother !== slave1.father) {
+ } else if (slave1.mother === slave2.father && slave1.father === slave2.mother && specificMom(slave1) && specificDad(slave1)) {
return 2;
- } else if ((slave1.mother === slave2.father || slave1.father === slave2.mother) && slave1.mother !== 0 && slave1.mother !== -2 && slave2.mother !== 0 && slave2.mother !== -2 && slave1.mother !== slave1.father) {
+ } else if ((slave1.mother === slave2.father || slave1.father === slave2.mother) && specificMom(slave1) && specificMom(slave2) && slave1.mother !== slave1.father) {
return 3;
}
return 0;
@@ -121,7 +125,7 @@ window.areTwins = function(slave1, slave2) {
window.areSisters = function(slave1, slave2) {
if (slave1.ID === slave2.ID) {
return 0; // you are not your own sister
- } else if (((slave1.father === 0) || (slave1.father === -2)) && ((slave1.mother === 0) || (slave1.mother === -2))) {
+ } else if (!specificDad(slave1) && !specificMom(slave1)) {
return 0; // not related
} else {
if (!sameDad(slave1, slave2) && sameMom(slave1, slave2)) {
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 23876e47e6f..ae793cf3975 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -188,7 +188,7 @@ App.UI.SlaveList.render = function() {
assignment.innerText += ` (${slave.sentence} weeks)`;
}
} else if (slave.choosesOwnAssignment === 1) {
- assignment.innerText = 'choose her own job';
+ assignment.innerText = `choose ${getPronouns(slave).possessive} own job`;
} else {
assignment.innerText = slave.assignment;
if (slave.sentence > 0) {
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 01ea8de2669..69a82112c52 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -1726,8 +1726,8 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set _hostageAction.push("moaning slightly as a man pounds $his pussy. $His belly has a notable roundness to it, most likely the spawn of a non-<<print $arcologies[0].FSSupremacistRace>> man.")>>
<<set _hostageAction.push("tied up with a downtrodden look in a line of $arcologies[0].FSSupremacist slaves, having $his new pregnancy examined.")>>
<<else>>
- <<set _hostageAction.push("moaning slightly as a man pounds $his pussy.")>>
- <<set _hostageAction.push("tied up with a downtrodden look in a line of $arcologies[0].FSSupremacist slaves, having $his overworked holes examined.")>>
+ <<set _hostageAction.push("moaning slightly as a man pounds $his pussy.")>>
+ <<set _hostageAction.push("tied up with a downtrodden look in a line of $arcologies[0].FSSupremacist slaves, having $his overworked holes examined.")>>
<</if>>
<<set _hostageAction.push("silently staring at $his feet as a dispassionate slave assayer goes down a line of $arcologies[0].FSSupremacist slaves, reciting prices.")>>
<<elseif $rivalryDuration <= 20>>
diff --git a/src/uncategorized/reAnalPunishment.tw b/src/uncategorized/reAnalPunishment.tw
index cddbcc8d87f..a72fed01d18 100644
--- a/src/uncategorized/reAnalPunishment.tw
+++ b/src/uncategorized/reAnalPunishment.tw
@@ -54,7 +54,7 @@ $HeadGirl.slaveName is very much acting within _his2 duties, and $activeSlave.sl
<br><br>
After enjoying the spectacle for a while, you judge that the slave's sphincter is loose enough and tell $HeadGirl.slaveName to flip the bitch over. @@.hotpink;_He2 obeys, chuckling,@@ sitting _himself2 down and hauling the reluctant slave onto _his2 lap by seizing a nipple and pulling it into position so the agonized slave is forced to follow. <<if canPenetrate($HeadGirl) && ($HeadGirl.dick > 2)>>$HeadGirl.slaveName reinserts _his2 dick, <<else>>$HeadGirl.slaveName maneuvers the dildo down over _his2 own crotch, approximating the position of a natural cock and using its base to stimulate _himself2. _He2 reinserts it,<</if>> intentionally missing twice to keep the experience unpleasant despite _his2 victim's well-fucked backdoor.
<br><br>
- $activeSlave.slaveName, now facing upward rather than having $his face ground into the floor, notices for the first time that <<if $PC.dick == 1>>you've got your dick out and hard<<else>>you've donned one of your punishment-sized strap-ons<</if>>. $His <<= App.Desc.eyeColor($activeSlave)>> eyes @@.gold;fly open with horror@@ as you kneel down and smack its head against $his <<if $activeSlave.vagina > -1>>poor pussy<<else>>stretched taint<</if>>, but $he doesn't realize how comprehensively fucked $he is until you press it against the top of $his already-stretched anal sphincter. "Plea<<s>>e no, <<Master>>! It won't fit! Plea<<s>>e <<if $activeSlave.vagina > 0>>put it in my pu<<ss>>y<<else>>let me <<s>>uck it<</if>> in<<s>>tead," $he begs desperately. "I p-promi<<s>>e I'll be a g-good giiAAIIEEHH," $he howls. $He gasps for air, tears streaming down $his $activeSlave.skin cheeks, and then continues: "AAAH! FUCK! TAKE IT OUUUT! N-NOOO, PLEA<<S>>E DON'T THRU<<S>>T — AAAH! AAAH! AAAH!"
+ $activeSlave.slaveName, now facing upward rather than having $his face ground into the floor, notices for the first time that <<if $PC.dick == 1>>you've got your dick out and hard<<else>>you've donned one of your punishment-sized strap-ons<</if>>. $His <<= App.Desc.eyeColor($activeSlave)>> eyes @@.gold;fly open with horror@@ as you kneel down and smack its head against $his <<if $activeSlave.vagina > -1>>poor pussy<<else>>stretched taint<</if>>, but $he doesn't realize how comprehensively fucked $he is until you press it against the top of $his already-stretched anal sphincter. "Plea<<s>>e no, <<Master>>! It won't fit! Plea<<s>>e <<if $activeSlave.vagina > 0>>put it in my pu<<ss>>y<<else>>let me <<s>>uck it<</if>> in<<s>>tead," $he begs desperately. "I p-promi<<s>>e I'll be a g-good $girl — AAIIEEHH," $he howls. $He gasps for air, tears streaming down $his $activeSlave.skin cheeks, and then continues: "AAAH! FUCK! TAKE IT OUUUT! N-NOOO, PLEA<<S>>E DON'T THRU<<S>>T — AAAH! AAAH! AAAH!"
<<set $activeSlave.trust -= 5, $activeSlave.counter.anal += 1>>
<<set $analTotal += 1>>
<<set $HeadGirl.devotion += 4, $HeadGirl.counter.penetrative += 1>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 03c1a2e6b50..ef103cfd7c4 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -1162,7 +1162,7 @@
energetically bouncing atop one young man while a muscular young woman standing over $him rides $his face. $He's got dicks in both of $his hands, and is stroking them eagerly. There's a note attached, stating superfluously that $he's very popular. General $peacekeepers.generalName's buyer is going to be looking for more horny MILFs in the future.
<<set $peacekeepers.tastes = "horny MILFs">>
<<elseif _influential && $activeSlave.physicalAge < 13 && $activeSlave.visualAge < 13 && $activeSlave.boobs > 2000>>
- kneeling over a soldier, putting $his proportionally massive breasts to work. There's a note attached, stating superfluously that $he's very popular. It's not surprising; $he's young, full of energy, and practically overflowing with tit flesh. General $peacekeepers.generalName's buyer is going to be looking for more busty little $girls in the future.
+ kneeling over a soldier, putting $his proportionally massive breasts to work. There's a note attached, stating superfluously that $he's very popular. It's not surprising; $he's young, full of energy, and practically overflowing with tit flesh. General $peacekeepers.generalName's buyer is going to be looking for more busty little <<= $girl>>s in the future.
<<set $peacekeepers.tastes = "oppai loli">>
<<elseif _influential && $activeSlave.physicalAge < 25 && $activeSlave.visualAge < 25 && $activeSlave.face > 95>>
striking a come-hither pose for an enormous crowd of cheering soldiers. There's a note attached, stating superfluously that $he's very popular. It's not surprising; $he's young, very beautiful, and able to handle a lot of devoted attention. General $peacekeepers.generalName's buyer is going to be looking for more beautiful young sex slaves in the future.
@@ -1212,7 +1212,7 @@
getting gangbanged at a comfort station at one of their rear area facilities, where $he's become the star attraction due to the erstwhile peacekeepers' preference for absolutely enormous assets.
<<if $peacekeepers.attitude < 100>><<set $peacekeepers.attitude++>><</if>>
<<case "oppai loli">>
- giving paizuri at a comfort station at one of their rear area facilities, where $he's become the star attraction due to the erstwhile peacekeepers' preference for top-heavy little $girls.
+ giving paizuri at a comfort station at one of their rear area facilities, where $he's become the star attraction due to the erstwhile peacekeepers' preference for top-heavy little <<= $girl>>s.
<</switch>>
<</if>>
<<if $peacekeepers.attitude+Math.ceil($slaveCost/10000) < 100>>
--
GitLab