From 6d4611457ae6b2618a06cdd4aa379f72b3677af9 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Fri, 2 Oct 2020 21:17:11 -0400
Subject: [PATCH] Fixed bad logic
---
devTools/types/FC.d.ts | 2 +-
src/events/scheduled/pitFight.js | 28 ++++++++++++++--------------
src/facilities/pit/pit.js | 8 ++++----
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/devTools/types/FC.d.ts b/devTools/types/FC.d.ts
index 227fea3ae25..62dfb445d64 100644
--- a/devTools/types/FC.d.ts
+++ b/devTools/types/FC.d.ts
@@ -621,7 +621,7 @@ declare global {
lethal: boolean;
/** The ID of the slave fighting the bodyguard for their life. */
slaveFightingBodyguard: number;
- /** The virginities of the loser allowed to be taken. */
+ /** The virginities of the loser not allowed to be taken. */
virginities: "neither" | "vaginal" | "anal" | "all"
}
diff --git a/src/events/scheduled/pitFight.js b/src/events/scheduled/pitFight.js
index 59b9f6e77fb..8fa367f199c 100644
--- a/src/events/scheduled/pitFight.js
+++ b/src/events/scheduled/pitFight.js
@@ -118,20 +118,20 @@ App.Facilities.Pit.fight = function(lethal) {
V.arcologies[0].FSRomanRevivalist += (0.2 * V.FSSingleSlaveRep);
}
- r.push(`You review the rules — the combatants are wearing light gloves, and the fight will be nonlethal, with you as the judge. The winner will have the right to do anything they wish to the loser, `);
+ r.push(`You review the rules — the combatants are wearing light gloves, and the fight will be nonlethal, with you as the judge. The winner will have the right to do anything they wish to the loser,`);
switch (V.pit.virginities) {
- case "neither":
- r.push(`except take their virginity, `);
+ case "all":
+ r.push(`except take their virginity,`);
break;
case "anal":
- r.push(`except take their anal virginity, `);
+ r.push(`except take their anal virginity,`);
break;
case "vaginal":
- r.push(`except take virginities, `);
+ r.push(`except take virginities,`);
break;
- case "all":
- r.push(`even take virginities, `);
+ case "neither":
+ r.push(`even take virginities,`);
break;
default:
throw new Error(`Unexpected V.pit.virginities value of '${V.pit.virginities}' found in App.Facilities.Pit.fight.intro()`);
@@ -1019,7 +1019,7 @@ App.Facilities.Pit.fight = function(lethal) {
actX(loser, oral);
} else if (loser.vagina === 0 && canDoVaginal(loser) && canDoAnal(loser)) {
- r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`}, `);
+ r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`},`);
if (winner.fetish === "pregnancy") {
r.push(`and, after ${canSee(winner) ? `eyeing` : `feeling up`} ${his2} virgin vagina with desire, penetrates the loser's anus.`);
@@ -1035,7 +1035,7 @@ App.Facilities.Pit.fight = function(lethal) {
actX(loser, anal);
} else if (loser.anus === 0 && canDoVaginal(loser) && canDoAnal(loser)) {
- r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`}, `);
+ r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`},`);
if (winner.fetish === "buttslut" || (canPenetrate(winner) && canImpreg(loser, winner) && loser.mpreg && winner.fetish === "pregnancy")) {
r.push(`and, after ${canSee(winner) ? `eyeing` : `feeling up`} ${his2} virgin anus with desire, penetrates the loser's cunt.`);
@@ -1077,7 +1077,7 @@ App.Facilities.Pit.fight = function(lethal) {
}
} else if (V.pit.virginities === "anal") {
if (loser.vagina === 0 && canDoVaginal(loser)) {
- r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`}, `);
+ r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`},`);
if (winner.fetish === "pregnancy") {
virginitySpan.append(`take ${his2} virginity.`);
@@ -1145,7 +1145,7 @@ App.Facilities.Pit.fight = function(lethal) {
}
} else if (V.pit.virginities === "vaginal") {
if (loser.vagina === 0 && canDoVaginal(loser)) {
- r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`}, `);
+ r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`},`);
if (winner.fetish === "pregnancy") {
if (canDoAnal(loser)) {
@@ -1181,7 +1181,7 @@ App.Facilities.Pit.fight = function(lethal) {
}
}
} else if (loser.anus === 0 && canDoAnal(loser)) {
- r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`}, `);
+ r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`},`);
if (winner.fetish === "buttslut" || (canPenetrate(winner) && canImpreg(loser, winner) && loser.mpreg && winner.fetish === "pregnancy")) {
virginitySpan.append(`take ${his2} anal virginity.`);
@@ -1226,7 +1226,7 @@ App.Facilities.Pit.fight = function(lethal) {
}
} else {
if (loser.vagina === 0 && canDoVaginal(loser)) {
- r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`}, `);
+ r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`},`);
if (winner.fetish === "pregnancy") {
virginitySpan.append(`take ${his2} virginity.`);
@@ -1245,7 +1245,7 @@ App.Facilities.Pit.fight = function(lethal) {
loser.vagina++;
actX(loser, vaginal);
} else if (loser.anus === 0 && canDoAnal(loser)) {
- r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`}, `);
+ r.push(`${He} pushes ${loser.slaveName}'s back down onto the mat, forces ${his2} ${hasBothLegs(loser) ? `legs apart` : !hasAnyLegs(loser) ? `hips steady` : `leg aside`},`);
if (winner.fetish === "buttslut" || (canPenetrate(winner) && canImpreg(loser, winner) && loser.mpreg && winner.fetish === "pregnancy")) {
virginitySpan.append(`take ${his2} anal virginity.`);
diff --git a/src/facilities/pit/pit.js b/src/facilities/pit/pit.js
index 36ec8cc4427..d2880cff739 100644
--- a/src/facilities/pit/pit.js
+++ b/src/facilities/pit/pit.js
@@ -273,7 +273,7 @@ App.Facilities.Pit.pit = function() {
if (V.pit.virginities === "neither") {
boldSpan.append(`No`);
- mainDiv.append(boldSpan, ` virginities of the loser will be allowed to be taken.`);
+ mainDiv.append(boldSpan, ` virginities of the loser will be respected.`);
links.push(
App.UI.DOM.link("Vaginal", () => {
@@ -294,7 +294,7 @@ App.Facilities.Pit.pit = function() {
);
} else if (V.pit.virginities === "vaginal") {
boldSpan.append(`Vaginal`);
- mainDiv.append(boldSpan, ` virginity of the loser will be allowed to be taken.`);
+ mainDiv.append(boldSpan, ` virginity of the loser will be respected.`);
links.push(
App.UI.DOM.link("Neither", () => {
@@ -315,7 +315,7 @@ App.Facilities.Pit.pit = function() {
);
} else if (V.pit.virginities === "anal") {
boldSpan.append(`Anal`);
- mainDiv.append(boldSpan, ` virginity of the loser will be allowed to be taken.`);
+ mainDiv.append(boldSpan, ` virginity of the loser will be respected.`);
links.push(
App.UI.DOM.link("Neither", () => {
@@ -336,7 +336,7 @@ App.Facilities.Pit.pit = function() {
);
} else {
boldSpan.append(`All`);
- mainDiv.append(boldSpan, ` virginities of the loser will be allowed to be taken.`);
+ mainDiv.append(boldSpan, ` virginities of the loser will be respected.`);
links.push(
App.UI.DOM.link("Neither", () => {
--
GitLab