diff --git a/src/facilities/nursery/nurseryDatatypeCleanup.js b/src/facilities/nursery/nurseryDatatypeCleanup.js
index f0e48554fc86cfceb49a73b4f825af872c32be6c..9514db7467763821cf82224d042a017a7f346925 100644
--- a/src/facilities/nursery/nurseryDatatypeCleanup.js
+++ b/src/facilities/nursery/nurseryDatatypeCleanup.js
@@ -368,40 +368,9 @@ App.Facilities.Nursery.ChildDatatypeCleanup = function(child) {
// if (typeof child.porn.focus !== "string") {
// child.porn.focus = "none";
// }
- // child.porn.fame.general = Math.max(+child.porn.fame.general, 0) || 0;
- // child.porn.fame.rape = Math.max(+child.porn.fame.rape, 0) || 0;
- // child.porn.fame.preggo = Math.max(+child.porn.fame.preggo, 0) || 0;
- // child.porn.fame.BBW = Math.max(+child.porn.fame.BBW, 0) || 0;
- // child.porn.fame.gainer = Math.max(+child.porn.fame.gainer, 0) || 0;
- // child.porn.fame.stud = Math.max(+child.porn.fame.stud, 0) || 0;
- // child.porn.fame.loli = Math.max(+child.porn.fame.loli, 0) || 0;
- // child.porn.fame.deepThroat = Math.max(+child.porn.fame.deepThroat, 0) || 0;
- // child.porn.fame.struggleFuck = Math.max(+child.porn.fame.struggleFuck, 0) || 0;
- // child.porn.fame.painal = Math.max(+child.porn.fame.painal, 0) || 0;
- // child.porn.fame.tease = Math.max(+child.porn.fame.tease, 0) || 0;
- // child.porn.fame.romantic = Math.max(+child.porn.fame.romantic, 0) || 0;
- // child.porn.fame.pervert = Math.max(+child.porn.fame.pervert, 0) || 0;
- // child.porn.fame.caring = Math.max(+child.porn.fame.caring, 0) || 0;
- // child.porn.fame.unflinching = Math.max(+child.porn.fame.unflinching, 0) || 0;
- // child.porn.fame.sizeQueen = Math.max(+child.porn.fame.sizeQueen, 0) || 0;
- // child.porn.fame.neglectful = Math.max(+child.porn.fame.neglectful, 0) || 0;
- // child.porn.fame.cumAddict = Math.max(+child.porn.fame.cumAddict, 0) || 0;
- // child.porn.fame.analAddict = Math.max(+child.porn.fame.analAddict, 0) || 0;
- // child.porn.fame.attentionWhore = Math.max(+child.porn.fame.attentionWhore, 0) || 0;
- // child.porn.fame.breastGrowth = Math.max(+child.porn.fame.breastGrowth, 0) || 0;
- // child.porn.fame.abusive = Math.max(+child.porn.fame.abusive, 0) || 0;
- // child.porn.fame.malicious = Math.max(+child.porn.fame.malicious, 0) || 0;
- // child.porn.fame.selfHating = Math.max(+child.porn.fame.selfHating, 0) || 0;
- // child.porn.fame.breeder = Math.max(+child.porn.fame.breeder, 0) || 0;
- // child.porn.fame.sub = Math.max(+child.porn.fame.sub, 0) || 0;
- // child.porn.fame.cumSlut = Math.max(+child.porn.fame.cumSlut, 0) || 0;
- // child.porn.fame.anal = Math.max(+child.porn.fame.anal, 0) || 0;
- // child.porn.fame.humiliation = Math.max(+child.porn.fame.humiliation, 0) || 0;
- // child.porn.fame.boobs = Math.max(+child.porn.fame.boobs, 0) || 0;
- // child.porn.fame.dom = Math.max(+child.porn.fame.dom, 0) || 0;
- // child.porn.fame.sadist = Math.max(+child.porn.fame.sadist, 0) || 0;
- // child.porn.fame.masochist = Math.max(+child.porn.fame.masochist, 0) || 0;
- // child.porn.fame.pregnancy = Math.max(+child.porn.fame.pregnancy, 0) || 0;
+ // for (const genre in App.Porn.getAllGenres()) {
+ // child.porn.fame[genre.fameVar] = Math.max(+child.porn.fame[genre.fameVar], 0) || 0;
+ // }
// }
function childRelationDatatypeCleanup(child) {
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index aa6492d2481869f0a3bd812679cca87f0f4443e6..bba1fc89a4b0e339b394c68ad81c9b9df75a9d1d 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -104,78 +104,12 @@ App.Entity.SlavePornPerformanceState = class {
this.fameType = "none";
/** what aspect of her the upgraded studio is focusing on for porn */
this.focus = "none";
- this.fame = {
- /** generic porn fame */
- general: 0,
- /** Fuckdoll porn fame */
- fuckdoll: 0,
- /** rape porn fame */
- rape: 0,
- /** preggo porn fame */
- preggo: 0,
- /** BBW porn fame */
- BBW: 0,
- /** weight gain porn fame */
- gainer: 0,
- /** well hung porn fame */
- stud: 0,
- /** underage porn fame */
- loli: 0,
- /** gagfuck queen porn fame */
- deepThroat: 0,
- /** strugglefuck queen porn fame */
- struggleFuck: 0,
- /** painal queen porn fame */
- painal: 0,
- /** tease porn fame */
- tease: 0,
- /** romantic porn fame */
- romantic: 0,
- /** pervert porn fame */
- pervert: 0,
- /** caring porn fame */
- caring: 0,
- /** unflinching porn fame */
- unflinching: 0,
- /** size queen porn fame */
- sizeQueen: 0,
- /** neglectful porn fame */
- neglectful: 0,
- /** cum addict porn fame */
- cumAddict: 0,
- /** anal addict porn fame */
- analAddict: 0,
- /** attention whore porn fame */
- attentionWhore: 0,
- /** breast growth porn fame */
- breastGrowth: 0,
- /** abusive porn fame */
- abusive: 0,
- /** malicious porn fame */
- malicious: 0,
- /** self hating porn fame */
- selfHating: 0,
- /** breeder porn fame */
- breeder: 0,
- /** submissive porn fame */
- sub: 0,
- /** cumslut porn fame */
- cumSlut: 0,
- /** buttslut porn fame */
- anal: 0,
- /** humiliation porn fame */
- humiliation: 0,
- /** boob porn fame */
- boobs: 0,
- /** dom porn fame */
- dom: 0,
- /** sadist porn fame */
- sadist: 0,
- /** masochist porn fame */
- masochist: 0,
- /** pregnancy porn fame*/
- pregnancy: 0
- };
+
+ /** fame values for each porn genre */
+ this.fame = { };
+ for (const genre in App.Porn.getAllGenres()) {
+ this.fame[genre.fameVar] = 0;
+ }
}
};
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index b50b926f6f788bb3e36cc289495ffb99a9d5ddba..f2d19006d337dd918114f2a7af8f61a1038f087e 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -910,41 +910,9 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
if (typeof slave.porn.focus !== "string") {
slave.porn.focus = "none";
}
- slave.porn.fame.general = Math.max(+slave.porn.fame.general, 0) || 0;
- slave.porn.fame.fuckdoll = Math.max(+slave.porn.fame.fuckdoll, 0) || 0;
- slave.porn.fame.rape = Math.max(+slave.porn.fame.rape, 0) || 0;
- slave.porn.fame.preggo = Math.max(+slave.porn.fame.preggo, 0) || 0;
- slave.porn.fame.BBW = Math.max(+slave.porn.fame.BBW, 0) || 0;
- slave.porn.fame.gainer = Math.max(+slave.porn.fame.gainer, 0) || 0;
- slave.porn.fame.stud = Math.max(+slave.porn.fame.stud, 0) || 0;
- slave.porn.fame.loli = Math.max(+slave.porn.fame.loli, 0) || 0;
- slave.porn.fame.deepThroat = Math.max(+slave.porn.fame.deepThroat, 0) || 0;
- slave.porn.fame.struggleFuck = Math.max(+slave.porn.fame.struggleFuck, 0) || 0;
- slave.porn.fame.painal = Math.max(+slave.porn.fame.painal, 0) || 0;
- slave.porn.fame.tease = Math.max(+slave.porn.fame.tease, 0) || 0;
- slave.porn.fame.romantic = Math.max(+slave.porn.fame.romantic, 0) || 0;
- slave.porn.fame.pervert = Math.max(+slave.porn.fame.pervert, 0) || 0;
- slave.porn.fame.caring = Math.max(+slave.porn.fame.caring, 0) || 0;
- slave.porn.fame.unflinching = Math.max(+slave.porn.fame.unflinching, 0) || 0;
- slave.porn.fame.sizeQueen = Math.max(+slave.porn.fame.sizeQueen, 0) || 0;
- slave.porn.fame.neglectful = Math.max(+slave.porn.fame.neglectful, 0) || 0;
- slave.porn.fame.cumAddict = Math.max(+slave.porn.fame.cumAddict, 0) || 0;
- slave.porn.fame.analAddict = Math.max(+slave.porn.fame.analAddict, 0) || 0;
- slave.porn.fame.attentionWhore = Math.max(+slave.porn.fame.attentionWhore, 0) || 0;
- slave.porn.fame.breastGrowth = Math.max(+slave.porn.fame.breastGrowth, 0) || 0;
- slave.porn.fame.abusive = Math.max(+slave.porn.fame.abusive, 0) || 0;
- slave.porn.fame.malicious = Math.max(+slave.porn.fame.malicious, 0) || 0;
- slave.porn.fame.selfHating = Math.max(+slave.porn.fame.selfHating, 0) || 0;
- slave.porn.fame.breeder = Math.max(+slave.porn.fame.breeder, 0) || 0;
- slave.porn.fame.sub = Math.max(+slave.porn.fame.sub, 0) || 0;
- slave.porn.fame.cumSlut = Math.max(+slave.porn.fame.cumSlut, 0) || 0;
- slave.porn.fame.anal = Math.max(+slave.porn.fame.anal, 0) || 0;
- slave.porn.fame.humiliation = Math.max(+slave.porn.fame.humiliation, 0) || 0;
- slave.porn.fame.boobs = Math.max(+slave.porn.fame.boobs, 0) || 0;
- slave.porn.fame.dom = Math.max(+slave.porn.fame.dom, 0) || 0;
- slave.porn.fame.sadist = Math.max(+slave.porn.fame.sadist, 0) || 0;
- slave.porn.fame.masochist = Math.max(+slave.porn.fame.masochist, 0) || 0;
- slave.porn.fame.pregnancy = Math.max(+slave.porn.fame.pregnancy, 0) || 0;
+ for (const genre in App.Porn.getAllGenres()) {
+ slave.porn.fame[genre.fameVar] = Math.max(+slave.porn.fame[genre.fameVar], 0) || 0;
+ }
}
/**
@@ -1492,41 +1460,9 @@ window.childPornDatatypeCleanup = function childPornDatatypeCleanup(child) {
if (typeof child.porn.focus !== "string") {
child.porn.focus = "none";
}
- child.porn.fame.general = Math.max(+child.porn.fame.general, 0) || 0;
- child.porn.fame.fuckdoll = Math.max(+child.porn.fame.fuckdoll, 0) || 0;
- child.porn.fame.rape = Math.max(+child.porn.fame.rape, 0) || 0;
- child.porn.fame.preggo = Math.max(+child.porn.fame.preggo, 0) || 0;
- child.porn.fame.BBW = Math.max(+child.porn.fame.BBW, 0) || 0;
- child.porn.fame.gainer = Math.max(+child.porn.fame.gainer, 0) || 0;
- child.porn.fame.stud = Math.max(+child.porn.fame.stud, 0) || 0;
- child.porn.fame.loli = Math.max(+child.porn.fame.loli, 0) || 0;
- child.porn.fame.deepThroat = Math.max(+child.porn.fame.deepThroat, 0) || 0;
- child.porn.fame.struggleFuck = Math.max(+child.porn.fame.struggleFuck, 0) || 0;
- child.porn.fame.painal = Math.max(+child.porn.fame.painal, 0) || 0;
- child.porn.fame.tease = Math.max(+child.porn.fame.tease, 0) || 0;
- child.porn.fame.romantic = Math.max(+child.porn.fame.romantic, 0) || 0;
- child.porn.fame.pervert = Math.max(+child.porn.fame.pervert, 0) || 0;
- child.porn.fame.caring = Math.max(+child.porn.fame.caring, 0) || 0;
- child.porn.fame.unflinching = Math.max(+child.porn.fame.unflinching, 0) || 0;
- child.porn.fame.sizeQueen = Math.max(+child.porn.fame.sizeQueen, 0) || 0;
- child.porn.fame.neglectful = Math.max(+child.porn.fame.neglectful, 0) || 0;
- child.porn.fame.cumAddict = Math.max(+child.porn.fame.cumAddict, 0) || 0;
- child.porn.fame.analAddict = Math.max(+child.porn.fame.analAddict, 0) || 0;
- child.porn.fame.attentionWhore = Math.max(+child.porn.fame.attentionWhore, 0) || 0;
- child.porn.fame.breastGrowth = Math.max(+child.porn.fame.breastGrowth, 0) || 0;
- child.porn.fame.abusive = Math.max(+child.porn.fame.abusive, 0) || 0;
- child.porn.fame.malicious = Math.max(+child.porn.fame.malicious, 0) || 0;
- child.porn.fame.selfHating = Math.max(+child.porn.fame.selfHating, 0) || 0;
- child.porn.fame.breeder = Math.max(+child.porn.fame.breeder, 0) || 0;
- child.porn.fame.sub = Math.max(+child.porn.fame.sub, 0) || 0;
- child.porn.fame.cumSlut = Math.max(+child.porn.fame.cumSlut, 0) || 0;
- child.porn.fame.anal = Math.max(+child.porn.fame.anal, 0) || 0;
- child.porn.fame.humiliation = Math.max(+child.porn.fame.humiliation, 0) || 0;
- child.porn.fame.boobs = Math.max(+child.porn.fame.boobs, 0) || 0;
- child.porn.fame.dom = Math.max(+child.porn.fame.dom, 0) || 0;
- child.porn.fame.sadist = Math.max(+child.porn.fame.sadist, 0) || 0;
- child.porn.fame.masochist = Math.max(+child.porn.fame.masochist, 0) || 0;
- child.porn.fame.pregnancy = Math.max(+child.porn.fame.pregnancy, 0) || 0;
+ for (const genre in App.Porn.getAllGenres()) {
+ child.porn.fame[genre.fameVar] = Math.max(+child.porn.fame[genre.fameVar], 0) || 0;
+ }
};
window.childRelationDatatypeCleanup = function childRelationDatatypeCleanup(child) {
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index 43c337679ae5f1063daa87851bed3985e8b296af..13f84ce2f4f1a6bca17c686cdde03921453da4e1 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -226,78 +226,11 @@ App.Entity.PlayerPornPerformanceState = class {
this.fameType = "none";
/** what aspect of you is being focused on for porn */
this.focus = "none";
- this.fame = {
- /** generic porn fame */
- general: 0,
- /** Fuckdoll porn fame */
- fuckdoll: 0,
- /** rape porn fame */
- rape: 0,
- /** preggo porn fame */
- preggo: 0,
- /** BBW porn fame */
- BBW: 0,
- /** weight gain porn fame */
- gainer: 0,
- /** well hung porn fame */
- stud: 0,
- /** underage porn fame */
- loli: 0,
- /** gagfuck queen porn fame */
- deepThroat: 0,
- /** strugglefuck queen porn fame */
- struggleFuck: 0,
- /** painal queen porn fame */
- painal: 0,
- /** tease porn fame */
- tease: 0,
- /** romantic porn fame */
- romantic: 0,
- /** pervert porn fame */
- pervert: 0,
- /** caring porn fame */
- caring: 0,
- /** unflinching porn fame */
- unflinching: 0,
- /** size queen porn fame */
- sizeQueen: 0,
- /** neglectful porn fame */
- neglectful: 0,
- /** cum addict porn fame */
- cumAddict: 0,
- /** anal addict porn fame */
- analAddict: 0,
- /** attention whore porn fame */
- attentionWhore: 0,
- /** breast growth porn fame */
- breastGrowth: 0,
- /** abusive porn fame */
- abusive: 0,
- /** malicious porn fame */
- malicious: 0,
- /** self hating porn fame */
- selfHating: 0,
- /** breeder porn fame */
- breeder: 0,
- /** submissive porn fame */
- sub: 0,
- /** cumslut porn fame */
- cumSlut: 0,
- /** buttslut porn fame */
- anal: 0,
- /** humiliation porn fame */
- humiliation: 0,
- /** boob porn fame */
- boobs: 0,
- /** dom porn fame */
- dom: 0,
- /** sadist porn fame */
- sadist: 0,
- /** masochist porn fame */
- masochist: 0,
- /** pregnancy porn fame*/
- pregnancy: 0
- };
+ /** your fame in each porn genre */
+ this.fame = { };
+ for (const genre in App.Porn.getAllGenres()) {
+ this.fame[genre.fameVar] = 0;
+ }
}
};
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index de5800c254e4814231e0bf808a9dec37c18431fd..647753158fd4a1f3c0158b61c428f97651987ba8 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -391,48 +391,7 @@
<<set $activeSlave.hormones = 0>>
<<set $activeSlave.waist = 0>>
<<set $activeSlave.prestige = 0>>
-<<set $activeSlave.porn.viewerCount = 0>>
-<<set $activeSlave.porn.spending = 0>>
-<<set $activeSlave.porn.feed = 0>>
-<<set $activeSlave.porn.prestige = 0>>
-<<set $activeSlave.porn.prestigeDesc = 0>>
-<<set $activeSlave.porn.fameType = "none">>
-<<set $activeSlave.porn.focus = "none">>
-<<set $activeSlave.porn.fame.general = 0>>
-<<set $activeSlave.porn.fame.fuckdoll = 0>>
-<<set $activeSlave.porn.fame.rape = 0>>
-<<set $activeSlave.porn.fame.preggo = 0>>
-<<set $activeSlave.porn.fame.BBW = 0>>
-<<set $activeSlave.porn.fame.gainer = 0>>
-<<set $activeSlave.porn.fame.stud = 0>>
-<<set $activeSlave.porn.fame.loli = 0>>
-<<set $activeSlave.porn.fame.deepThroat = 0>>
-<<set $activeSlave.porn.fame.struggleFuck = 0>>
-<<set $activeSlave.porn.fame.painal = 0>>
-<<set $activeSlave.porn.fame.tease = 0>>
-<<set $activeSlave.porn.fame.romantic = 0>>
-<<set $activeSlave.porn.fame.pervert = 0>>
-<<set $activeSlave.porn.fame.caring = 0>>
-<<set $activeSlave.porn.fame.unflinching = 0>>
-<<set $activeSlave.porn.fame.sizeQueen = 0>>
-<<set $activeSlave.porn.fame.neglectful = 0>>
-<<set $activeSlave.porn.fame.cumAddict = 0>>
-<<set $activeSlave.porn.fame.analAddict = 0>>
-<<set $activeSlave.porn.fame.attentionWhore = 0>>
-<<set $activeSlave.porn.fame.breastGrowth = 0>>
-<<set $activeSlave.porn.fame.abusive = 0>>
-<<set $activeSlave.porn.fame.malicious = 0>>
-<<set $activeSlave.porn.fame.selfHating = 0>>
-<<set $activeSlave.porn.fame.breeder = 0>>
-<<set $activeSlave.porn.fame.sub = 0>>
-<<set $activeSlave.porn.fame.cumSlut = 0>>
-<<set $activeSlave.porn.fame.anal = 0>>
-<<set $activeSlave.porn.fame.humiliation = 0>>
-<<set $activeSlave.porn.fame.boobs = 50>>
-<<set $activeSlave.porn.fame.dom = 0>>
-<<set $activeSlave.porn.fame.sadist = 0>>
-<<set $activeSlave.porn.fame.masochist = 0>>
-<<set $activeSlave.porn.fame.pregnancy = 0>>
+<<set $activeSlave.porn = new App.Entity.SlavePornPerformanceState()>>
<<set $activeSlave.prestigeDesc = "">>
<<set $activeSlave.rivalry = 0>>
<<set $activeSlave.rivalryTarget = 0>>
@@ -1026,48 +985,7 @@ You look up the _relationType. _He2 costs <<print cashFormat(_slaveCost)>>, a ba
<<set $activeSlave.nipples = either("cute", "inverted", "partially inverted", "puffy")>>
<</if>>
<<set $activeSlave.prestige = 0>>
-<<set $activeSlave.porn.viewerCount = 0>>
-<<set $activeSlave.porn.spending = 0>>
-<<set $activeSlave.porn.feed = 0>>
-<<set $activeSlave.porn.prestige = 0>>
-<<set $activeSlave.porn.prestigeDesc = 0>>
-<<set $activeSlave.porn.fameType = "none">>
-<<set $activeSlave.porn.focus = "none">>
-<<set $activeSlave.porn.fame.general = 0>>
-<<set $activeSlave.porn.fame.fuckdoll = 0>>
-<<set $activeSlave.porn.fame.rape = 0>>
-<<set $activeSlave.porn.fame.preggo = 0>>
-<<set $activeSlave.porn.fame.BBW = 0>>
-<<set $activeSlave.porn.fame.gainer = 0>>
-<<set $activeSlave.porn.fame.stud = 0>>
-<<set $activeSlave.porn.fame.loli = 0>>
-<<set $activeSlave.porn.fame.deepThroat = 0>>
-<<set $activeSlave.porn.fame.struggleFuck = 0>>
-<<set $activeSlave.porn.fame.painal = 0>>
-<<set $activeSlave.porn.fame.tease = 0>>
-<<set $activeSlave.porn.fame.romantic = 0>>
-<<set $activeSlave.porn.fame.pervert = 0>>
-<<set $activeSlave.porn.fame.caring = 0>>
-<<set $activeSlave.porn.fame.unflinching = 0>>
-<<set $activeSlave.porn.fame.sizeQueen = 0>>
-<<set $activeSlave.porn.fame.neglectful = 0>>
-<<set $activeSlave.porn.fame.cumAddict = 0>>
-<<set $activeSlave.porn.fame.analAddict = 0>>
-<<set $activeSlave.porn.fame.attentionWhore = 0>>
-<<set $activeSlave.porn.fame.breastGrowth = 0>>
-<<set $activeSlave.porn.fame.abusive = 0>>
-<<set $activeSlave.porn.fame.malicious = 0>>
-<<set $activeSlave.porn.fame.selfHating = 0>>
-<<set $activeSlave.porn.fame.breeder = 0>>
-<<set $activeSlave.porn.fame.sub = 0>>
-<<set $activeSlave.porn.fame.cumSlut = 0>>
-<<set $activeSlave.porn.fame.anal = 0>>
-<<set $activeSlave.porn.fame.humiliation = 0>>
-<<set $activeSlave.porn.fame.boobs = 50>>
-<<set $activeSlave.porn.fame.dom = 0>>
-<<set $activeSlave.porn.fame.sadist = 0>>
-<<set $activeSlave.porn.fame.masochist = 0>>
-<<set $activeSlave.porn.fame.pregnancy = 0>>
+<<set $activeSlave.porn = new App.Entity.SlavePornPerformanceState()>>
<<set $activeSlave.prestigeDesc = "">>
<<if ndef $activeSlave.geneMods>>
<<set $activeSlave.geneMods = {NCS: 0, rapidCellGrowth: 0}>>