From ef20deeed5fb164fdd9ad93062ebc77cfc68898d Mon Sep 17 00:00:00 2001 From: DCoded <dicoded@email.com> Date: Fri, 23 Apr 2021 09:50:40 -0400 Subject: [PATCH] Added bestiality tracking to slave object, actX() --- devTools/types/FC/misc.d.ts | 2 +- src/js/SlaveState.js | 4 +++- src/js/sexActsJS.js | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/devTools/types/FC/misc.d.ts b/devTools/types/FC/misc.d.ts index dda79ab6dd6..5756b821a71 100644 --- a/devTools/types/FC/misc.d.ts +++ b/devTools/types/FC/misc.d.ts @@ -6,7 +6,7 @@ declare namespace FC { type SlaveMarketName = LawlessMarkets | OrdinaryMarkets; type Gingering = Zeroable<"antidepressant" | "depressant" | "stimulant" | "vasoconstrictor" | "vasodilator" | "aphrodisiac" | "ginger">; type GingeringDetection = Zeroable<"slaver" | "mercenary" | "force">; - type SlaveActs = "PCChildrenFathered" | "PCKnockedUp" | "anal" | "births" | "birthsTotal" | "cum" | "laborCount" | "mammary" | "milk" | "oral" | "penetrative" | "pitKills" | "miscarriages" | "publicUse" | "slavesFathered" | "slavesKnockedUp" | "vaginal" | "abortions" | "birth"; + type SlaveActs = "PCChildrenFathered" | "PCKnockedUp" | "anal" | "births" | "birthsTotal" | "cum" | "laborCount" | "mammary" | "milk" | "oral" | "penetrative" | "pitKills" | "miscarriages" | "publicUse" | "slavesFathered" | "slavesKnockedUp" | "vaginal" | "abortions" | "birth" | "bestiality"; interface SlaveSchool { title: string, diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js index 851170dcb05..02cce67777b 100644 --- a/src/js/SlaveState.js +++ b/src/js/SlaveState.js @@ -299,7 +299,7 @@ App.Entity.SlaveActionsCountersState = class { this.mammary = 0; /** penetrative sex count */ this.penetrative = 0; - /** */ + /** number of times used by the general public */ this.publicUse = 0; /** number of slaves killed in pit fights*/ this.pitKills = 0; @@ -307,6 +307,8 @@ App.Entity.SlaveActionsCountersState = class { this.pitWins = 0; /** number of pit fights lost */ this.pitLosses = 0; + /** number of bestiality encounters */ + this.bestiality = 0; /** How many slaves she has sired under your ownership. */ this.slavesFathered = 0; /** How many children she has fucked into you that you later birthed. */ diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js index 6665def27d9..e2b3b1fcc8c 100644 --- a/src/js/sexActsJS.js +++ b/src/js/sexActsJS.js @@ -473,6 +473,9 @@ globalThis.actX = function(slave, act, count = 1) { case "abortions": V.abortionsTotal += count; break; + case "bestiality": + V.bestialityTotal += count; + break; default: // Act was likely entered incorrectly. return; @@ -502,7 +505,7 @@ globalThis.seX = function(slave1, act1, slave2, act2, count = 1) { } else if (typeof slave2 === 'string') { // someday we may track "slaves" and "assistant" } else if (slave2 instanceof App.Entity.Animal) { - V.bestialityTotal++; + actX(slave1, "bestiality", count); addPartner(slave1, -8); } else { actX(slave2, act2, count); -- GitLab