From ee902a19f2e5d85d29d483231b71d1afb358c8a9 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Thu, 1 Oct 2020 19:12:20 -0400
Subject: [PATCH] Fixed Pit virginities logic, added documentation
---
devTools/types/FC.d.ts | 1 +
src/events/scheduled/pitFight.js | 10 +++++-----
src/facilities/pit/pit.js | 14 +++++---------
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/devTools/types/FC.d.ts b/devTools/types/FC.d.ts
index 7335a6c7a98..c07da2681e6 100644
--- a/devTools/types/FC.d.ts
+++ b/devTools/types/FC.d.ts
@@ -613,6 +613,7 @@ declare global {
fought: boolean;
lethal: boolean;
slaveFightingBodyguard: number;
+ /** The virginities of the loser allowed to be taken. */
virginities: "neither" | "vaginal" | "anal" | "all"
}
diff --git a/src/events/scheduled/pitFight.js b/src/events/scheduled/pitFight.js
index adbeb2ba38a..5995fbac46d 100644
--- a/src/events/scheduled/pitFight.js
+++ b/src/events/scheduled/pitFight.js
@@ -117,18 +117,18 @@ App.Facilities.Pit.fight = function(lethal) {
mainDiv.append(`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 "all":
- mainDiv.append(`even take virginities, `);
- break;
- case "anal":
+ case "neither":
mainDiv.append(`except take their virginity, `);
break;
- case "neither":
+ case "anal":
mainDiv.append(`except take their anal virginity, `);
break;
case "vaginal":
mainDiv.append(`except take virginities, `);
break;
+ case "all":
+ mainDiv.append(`even take virginities, `);
+ break;
default:
throw new Error(`Unexpected V.pit.virginities value of '${V.pit.virginities}' found in App.Facilities.Pit.fight.intro()`);
}
diff --git a/src/facilities/pit/pit.js b/src/facilities/pit/pit.js
index 7e83e70db00..36ec8cc4427 100644
--- a/src/facilities/pit/pit.js
+++ b/src/facilities/pit/pit.js
@@ -266,15 +266,14 @@ App.Facilities.Pit.pit = function() {
function virginities() {
const mainDiv = document.createElement("div");
- const boldSpan = App.UI.DOM.makeElement("span", '', "bold");
+ const boldSpan = App.UI.DOM.makeElement("span", ``, "bold");
const linkSpan = document.createElement("span");
const links = [];
if (V.pit.virginities === "neither") {
boldSpan.append(`No`);
-
- mainDiv.append(boldSpan, ` virginities of the loser will be respected.`);
+ mainDiv.append(boldSpan, ` virginities of the loser will be allowed to be taken.`);
links.push(
App.UI.DOM.link("Vaginal", () => {
@@ -295,8 +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 respected.`);
+ mainDiv.append(boldSpan, ` virginity of the loser will be allowed to be taken.`);
links.push(
App.UI.DOM.link("Neither", () => {
@@ -317,8 +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 respected.`);
+ mainDiv.append(boldSpan, ` virginity of the loser will be allowed to be taken.`);
links.push(
App.UI.DOM.link("Neither", () => {
@@ -339,8 +336,7 @@ App.Facilities.Pit.pit = function() {
);
} else {
boldSpan.append(`All`);
-
- mainDiv.append(boldSpan, ` virginities of the loser will be respected.`);
+ mainDiv.append(boldSpan, ` virginities of the loser will be allowed to be taken.`);
links.push(
App.UI.DOM.link("Neither", () => {
--
GitLab