diff --git a/devTools/types/FC.d.ts b/devTools/types/FC.d.ts index 4c7d40bd8915da2f4255e440818104c43fe4c012..f404b124e27885946686e48f990565710e853892 100644 --- a/devTools/types/FC.d.ts +++ b/devTools/types/FC.d.ts @@ -1,3 +1,5 @@ +import { namespace } from "d3"; + declare global { namespace App { namespace Art {} @@ -601,6 +603,22 @@ declare global { commissars: number } } + + namespace Facilities { + interface Pit { + name: string; + + animalFights: boolean; + animalType: string; + audience: string; + bodyguardFights: boolean; + fighterIDs: number[]; + fought: boolean; + lethal: boolean; + slaveFightingBodyguard: number | null + virginities: "neither" | "vaginal" | "anal"; + } + } } const V: FC.GameVariables; diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index 468899d3947022d224bc097747235fe3863add17..9f35a70c6e6e67f0db62dbeef8c5d710748e68d7 100644 --- a/js/003-data/gameVariableData.js +++ b/js/003-data/gameVariableData.js @@ -768,6 +768,7 @@ App.Data.resetOnNGPlus = { HGSuiteEquality: 0, HGSuiteName: "the Head Girl Suite", + /** @type {FC.Facilities.Pit} */ pit: null, dojo: 0, diff --git a/src/arcologyBuilding/markets.js b/src/arcologyBuilding/markets.js index a71d8f85ebef709141456185623cfcb9c746d4f4..375c0e772b3db034a3f59781a79d56f9009b4be5 100644 --- a/src/arcologyBuilding/markets.js +++ b/src/arcologyBuilding/markets.js @@ -106,15 +106,16 @@ App.Arcology.Cell.Market = class extends App.Arcology.Cell.BaseCell { "Build a pit to host proper slave fights", () => { this.type = "Pit"; + /** @type {FC.Facilities.Pit} */ V.pit = { name: "the Pit", - animal: false, + animalFights: false, animalType: null, audience: "none", bodyguardFights: false, fighterIDs: [], - fought: 0, + fought: false, lethal: false, slaveFightingBodyguard: null, virginities: "neither", diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index 9ba71a6b7b1b1fa48df653190beedeeada10e512..87b52840602b213afa27af71c5ee1cd1590393ca 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -783,7 +783,7 @@ App.Update.globalVariables = function(node) { V.arcologies[0].FSNeoImperialist = V.FSNeoImperialist; } else if (typeof V.arcologies[0].FSNeoImperialist === "undefined") { V.arcologies[0].FSNeoImperialist = "unset"; - } + } if ((typeof V.FSNeoImperialistLaw1 !== "undefined") && V.FSNeoImperialistLaw1 !== 0) { V.arcologies[0].FSNeoImperialistLaw1 = V.FSNeoImperialistLaw1; } else if (typeof V.arcologies[0].FSNeoImperialistLaw1 === "undefined") {