diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 42cc4585ad59425129ac4e224898221880a044a6..377e444007fa07d6ee571abcb8a10821691aefd3 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -33,7 +33,7 @@ window.saServeThePublic = (function saServeThePublic() {
he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, girl = pronouns.noun;
He = capFirstChar(he), His = capFirstChar(his);
girl === "girl" ? loli = "loli" : loli = "shota";
-
+
gatherStatistics(slave);
if (slave.assignment === "serve in the club") {
// By being at the end, every slave after the first will get a bonus. By moving it up, the first can enjoy it too. updateNonSlaveVariables() checks Edo Rivalist, so here we are.
@@ -71,14 +71,14 @@ window.saServeThePublic = (function saServeThePublic() {
const facility = slave.assignment === Job.CLUB ? V.facility.club : undefined;
T.incomeStats = getSlaveStatisticData(slave, facility);
}
-
+
// I suspect this one will mostly be cut out in the overhauling
/** @param {App.Entity.SlaveState} slave */
function updateNonSlaveVariables(slave) {
if (slave.assignment === "serve in the club" || slave.assignment === "serve the public") {
V.publicServants += 1;
}
-
+
// FResult setting
FuckResult = FResult(slave);
//slave needs release
@@ -102,7 +102,7 @@ window.saServeThePublic = (function saServeThePublic() {
if (canDoAnal(slave) && slave.anus === 0) {
FuckResult += 10;
}
-
+
// Beauty setting
beauty = Beauty(slave);
if (V.ACitizens > (V.ASlaves * 4)) {
@@ -127,7 +127,7 @@ window.saServeThePublic = (function saServeThePublic() {
if (slave.minorInjury !== 0) {
beauty -= 1;
}
-
+
// Beauty multipliers
if (arcology.FSEdoRevivalist === "unset") {
beautyMultiplier = 1;
@@ -318,7 +318,7 @@ window.saServeThePublic = (function saServeThePublic() {
r += ` ${His} inability to move to the rhythm of the music is very off putting to those looking to party.`;
}
if (V.DJ !== 0) {
- let DJpronouns = getPronouns(V.DJ);
+ const DJpronouns = getPronouns(V.DJ);
if (V.DJRepBonus > 0) {
if (slave.assignment === "serve the public") {
r += ` Working`;
@@ -444,7 +444,7 @@ window.saServeThePublic = (function saServeThePublic() {
if (slave.curatives > 0 || slave.inflationType === "curative") {
r += ` The drugs `;
if (slave.inflationType === "curative") {
- r += `${he} holds within ${his} gut`;
+ r += `${he} holds within ${his} gut`;
} else {
r += `${he}'s on`;
}
@@ -642,7 +642,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
r += ` pussy,`;
} else if (beauty > 70 && jsRandom(1, 3) === 1) {
- r += `getting gangbanged,`
+ r += `getting gangbanged,`;
} else if (jsRandom(1, 2) === 1) {
r += `giving away one of ${his} `;
if (slave.prestige > 1 || slave.pornPrestige > 2) {
@@ -681,7 +681,7 @@ window.saServeThePublic = (function saServeThePublic() {
if (slave.amp !== 1) {
if (slave.entertainSkill < 100) {
r += ` ${He} gains experience as a public slut.`;
- skillIncrease = (10 + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))
+ skillIncrease = (10 + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32));
r += `${SkillIncrease.Entertain(slave, skillIncrease)}`;
}
}
@@ -695,14 +695,14 @@ window.saServeThePublic = (function saServeThePublic() {
if (slave.releaseRules === "restrictive" && slave.standardReward !== "orgasm") {
r += ` ${He}'s a better slut because public service is ${his} main sexual outlet.`;
}
-
+
//Someone double check this block
if (V.familyTesting === 1) {
if (totalRelatives(slave) > 0) {
let children = [];
children = V.slaves.filter(
- function(s) {
- return ((slave.ID == s.father || slave.ID == s.mother || s.ID == slave.father || s.ID == slave.mother || areSisters(slave, s) > 0) && (s.assignment === slave.assignment));
+ function(s) {
+ return ((slave.ID === s.father || slave.ID === s.mother || s.ID === slave.father || s.ID === slave.mother || areSisters(slave, s) > 0) && (s.assignment === slave.assignment));
}
);
if (children.length > 2) {
@@ -828,7 +828,7 @@ window.saServeThePublic = (function saServeThePublic() {
if (slave.butt > 4 && slave.boobs > 800) {
if (arcology.FSAssetExpansionist !== "unset") {
r += ` ${His} huge, fashionable assets are immensely popular.`;
- if (canTalk(slave)){
+ if (canTalk(slave)) {
if (slave.voice > 2) {
r += ` ${His} high voice contributes to ${his} bimbo image, so ${he} does even better.`;
}
@@ -916,7 +916,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
}
} else if (arcology.FSHedonisticDecadence !== "unset" && slave.weight <= 30) { // reduced weight malus for fat loving societies
- if (arcology.FSHedonisticDecadenceStrongFat === 1) { // no muscle malus for muscle loving societies
+ if (arcology.FSHedonisticDecadenceStrongFat === 1) { // no muscle malus for muscle loving societies
if (arcology.FSSlimnessEnthusiast > 20) {
r += ` The public enjoys ${his} fashionably sleek little body.`;
} else {
@@ -1360,7 +1360,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
T.incomeStats.income += Math.trunc((beauty * FuckResult) * (1 + (0.003 * slave.entertainSkill)) * 0.15);
}
-
+
function applyFSDecoration() {
/* FACILITY DECORATION IMPACTS */
const fsBeauty = (0.0005 * V.FSSingleSlaveRep * beauty);
@@ -1442,9 +1442,8 @@ window.saServeThePublic = (function saServeThePublic() {
/** @param {App.Entity.SlaveState} slave */
function sexCounts(slave) {
-
/* SEX ACT COUNTS AND SEXUAL SATISFACTION */
-
+
oralUse = (V.oralUseWeight + (slave.oralSkill / 30) + (slave.lips / 20));
analUse = 0;
if (canDoAnal(slave)) {
@@ -1553,7 +1552,7 @@ window.saServeThePublic = (function saServeThePublic() {
break;
case "boobs":
if (mammaryUse > 0) {
- r += ` ${He} enjoys `
+ r += ` ${He} enjoys `;
if (slave.nipples === "fuckable") {
r += `having ${his} tits fucked,`;
} else {
@@ -1685,4 +1684,4 @@ window.saServeThePublic = (function saServeThePublic() {
}
}
}
-})();
\ No newline at end of file
+})();
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index f3a2959ecaf417a7df026611f03a0e57550edfbc..f98e96e379d9ade463eb8a9ebc8179e7b22fdb67 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -1,15 +1,13 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWorkTheFarm(slave) {
"use strict";
const V = State.variables;
const arcology = V.arcologies[0];
- var pronouns = getPronouns(slave);
- var he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
- var He = capFirstChar(he), His = capFirstChar(his);
- var incomeStats = getSlaveStatisticData(slave, V.facility.farmyard);
+ const pronouns = getPronouns(slave);
+ const he = pronouns.pronoun; const him = pronouns.object; const his = pronouns.possessive; const hers = pronouns.possessivePronoun; const himself = pronouns.objectReflexive; const boy = pronouns.noun;
+ const He = capFirstChar(he); const His = capFirstChar(his);
+ const incomeStats = getSlaveStatisticData(slave, V.facility.farmyard);
- var t = `works as a farmhand this week. `;
+ let t = `works as a farmhand this week. `;
if (V.Farmer !== 0) {
t += `While there, ${he} benefits from ${V.Farmer.slaveName}'s `;
@@ -85,7 +83,7 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
if (slave.tired === 1) {
t += `${He} is so tired that ${he} doesn't have the energy to work efficiently, impacting ${his} production. `;
}
- t += `As a result, ${he} produces @@.chocolate;` + massFormat(food) + `@@ of food over the week. `;
+ t += `As a result, ${he} produces @@.chocolate;${ massFormat(food) }@@ of food over the week. `;
// Close Food Production
@@ -105,9 +103,9 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
}
if (arcology.FSSubjugationist !== "unset") {
if (slave.race === arcology.FSSubjugationistRace) {
- t += `Society @@.green;approves@@ of the degradation you submit your ` + arcology.FSSubjugationistRace + ` slaves to, and so ${he} earns you a bit more. `;
+ t += `Society @@.green;approves@@ of the degradation you submit your ${ arcology.FSSubjugationistRace } slaves to, and so ${he} earns you a bit more. `;
} else {
- t += `Society doesn't disapprove of ${him} not being ` + arcology.FSSubjugationistRace + `, but ${he} doesn't earn as much as ${he} would if ${he} was ` + arcology.FSSubjugationistRace + `. `;
+ t += `Society doesn't disapprove of ${him} not being ${ arcology.FSSubjugationistRace }, but ${he} doesn't earn as much as ${he} would if ${he} was ${ arcology.FSSubjugationistRace }. `;
}
}
if (arcology.FSRepopulationFocus !== "unset") {
@@ -203,16 +201,16 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
}
if (arcology.FSYouthPreferentialist !== "unset") {
if (slave.visualAge > 25) { // TODO: not sure about this age
- t += arcology.name + `'s citizens @@.red;disapprove@@ of your using such old slaves to put on shows. `;
+ t += `${arcology.name }'s citizens @@.red;disapprove@@ of your using such old slaves to put on shows. `;
} else {
- t += arcology.name + `'s citizens @@.green;approve@@ of your using young slaves to put on shows. `;
+ t += `${arcology.name }'s citizens @@.green;approve@@ of your using young slaves to put on shows. `;
}
}
if (arcology.FSMaturityPreferentialist !== "unset") {
if (slave.visualAge > 25) { // TODO: not sure about this age
- t += arcology.name + `'s citizens @@.green;approve@@ of your using mature slaves to put on shows. `;
+ t += `${arcology.name }'s citizens @@.green;approve@@ of your using mature slaves to put on shows. `;
} else {
- t += arcology.name + `'s citizens @@.red;disapprove@@ of your using such young slaves to put on shows. `;
+ t += `${arcology.name }'s citizens @@.red;disapprove@@ of your using such young slaves to put on shows. `;
}
}
if (arcology.FSSlimnessEnthusiast !== "unset") {
@@ -418,7 +416,7 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
}
}
if (slave.behavioralQuirk === "fitness") {
- t += slave.slaveName + ` @@.hotpink;privately enjoys@@ the exercise ${he} receives while working in ${farmyardName}. `;
+ t += `${slave.slaveName } @@.hotpink;privately enjoys@@ the exercise ${he} receives while working in ${farmyardName}. `;
slave.devotion += 1;
}
@@ -427,14 +425,14 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
// Open Vignettes
if (V.showVignettes) {
- let vignette = GetVignette(slave);
- t += `__This week__ ` + vignette.text;
+ const vignette = GetVignette(slave);
+ t += `__This week__ ${ vignette.text}`;
if (vignette.type === "cash") {
FResult(slave);
if (vignette.effect > 0) {
- t += ` @@.yellowgreen;making you an extra ` + cashFormat(Math.trunc(V.FResult*vignette.effect)) + `.@@ `;
+ t += ` @@.yellowgreen;making you an extra ${ cashFormat(Math.trunc(V.FResult*vignette.effect)) }.@@ `;
} else if (vignette.effect < 0) {
- t += ` @@.red;losing you ` + cashFormat(Math.abs(Math.trunc(V.FResult*vignette.effect))) + `.@@ `;
+ t += ` @@.red;losing you ${ cashFormat(Math.abs(Math.trunc(V.FResult*vignette.effect))) }.@@ `;
} else {
t += ` an incident without lasting effect. `;
}
@@ -514,82 +512,82 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
// Open Facility Decorations
if (V.farmyardDecoration !== "standard") {
- let fsGain = Math.min(0.0001*V.FSSingleSlaveRep*(food), 1);
+ const fsGain = Math.min(0.0001*V.FSSingleSlaveRep*(food), 1);
switch (V.farmyardDecoration) {
case "Roman Revivalist":
- arcology.FSRomanRevivalist = Math.clamp(arcology.FSRomanRevivalist += fsGain,0,100);
+ arcology.FSRomanRevivalist = Math.clamp(arcology.FSRomanRevivalist += fsGain, 0, 100);
break;
case "Aztec Revivalist":
- arcology.FSAztecRevivalist = Math.clamp(arcology.FSAztecRevivalist += fsGain,0,100);
+ arcology.FSAztecRevivalist = Math.clamp(arcology.FSAztecRevivalist += fsGain, 0, 100);
break;
case "Egyptian Revivalist":
- arcology.FSEgyptianRevivalist = Math.clamp(arcology.FSEgyptianRevivalist += fsGain,0,100);
+ arcology.FSEgyptianRevivalist = Math.clamp(arcology.FSEgyptianRevivalist += fsGain, 0, 100);
break;
case "Edo Revivalist":
- arcology.FSEdoRevivalist = Math.clamp(arcology.FSEdoRevivalist += fsGain,0,100);
+ arcology.FSEdoRevivalist = Math.clamp(arcology.FSEdoRevivalist += fsGain, 0, 100);
break;
case "Arabian Revivalist":
- arcology.FSArabianRevivalist = Math.clamp(arcology.FSArabianRevivalist += fsGain,0,100);
+ arcology.FSArabianRevivalist = Math.clamp(arcology.FSArabianRevivalist += fsGain, 0, 100);
break;
case "Chinese Revivalist":
- arcology.FSChineseRevivalist = Math.clamp(arcology.FSChineseRevivalist += fsGain,0,100);
+ arcology.FSChineseRevivalist = Math.clamp(arcology.FSChineseRevivalist += fsGain, 0, 100);
break;
case "Chattel Religionist":
- arcology.FSChattelReligionist = Math.clamp(arcology.FSChattelReligionist += fsGain,0,100);
+ arcology.FSChattelReligionist = Math.clamp(arcology.FSChattelReligionist += fsGain, 0, 100);
break;
case "Degradationist":
- arcology.FSDegradationist = Math.clamp(arcology.FSDegradationist += fsGain,0,100);
+ arcology.FSDegradationist = Math.clamp(arcology.FSDegradationist += fsGain, 0, 100);
break;
case "Repopulation Focus":
- arcology.FSRepopulationFocus = Math.clamp(arcology.FSRepopulationFocus += fsGain,0,100);
+ arcology.FSRepopulationFocus = Math.clamp(arcology.FSRepopulationFocus += fsGain, 0, 100);
break;
case "Eugenics":
- arcology.FSRestart = Math.clamp(arcology.FSRestart += fsGain,0,100);
+ arcology.FSRestart = Math.clamp(arcology.FSRestart += fsGain, 0, 100);
break;
case "Asset Expansionist":
- arcology.FSAssetExpansionist = Math.clamp(arcology.FSAssetExpansionist += fsGain,0,100);
+ arcology.FSAssetExpansionist = Math.clamp(arcology.FSAssetExpansionist += fsGain, 0, 100);
break;
case "Transformation Fetishist":
- arcology.FSTransformationFetishist = Math.clamp(arcology.FSTransformationFetishist += fsGain,0,100);
+ arcology.FSTransformationFetishist = Math.clamp(arcology.FSTransformationFetishist += fsGain, 0, 100);
break;
case "Gender Radicalist":
- arcology.FSGenderRadicalist = Math.clamp(arcology.FSGenderRadicalist += fsGain,0,100);
+ arcology.FSGenderRadicalist = Math.clamp(arcology.FSGenderRadicalist += fsGain, 0, 100);
break;
case "Gender Fundamentalist":
- arcology.FSGenderFundamentalist = Math.clamp(arcology.FSGenderFundamentalist += fsGain,0,100);
+ arcology.FSGenderFundamentalist = Math.clamp(arcology.FSGenderFundamentalist += fsGain, 0, 100);
break;
case "Physical Idealist":
- arcology.FSPhysicalIdealist = Math.clamp(arcology.FSPhysicalIdealist += fsGain,0,100);
+ arcology.FSPhysicalIdealist = Math.clamp(arcology.FSPhysicalIdealist += fsGain, 0, 100);
break;
case "Hedonistic":
- arcology.FSHedonisticDecadence = Math.clamp(arcology.FSHedonisticDecadence += fsGain,0,100);
+ arcology.FSHedonisticDecadence = Math.clamp(arcology.FSHedonisticDecadence += fsGain, 0, 100);
break;
case "Supremacist":
- arcology.FSSupremacist = Math.clamp(arcology.FSSupremacist += fsGain,0,100);
+ arcology.FSSupremacist = Math.clamp(arcology.FSSupremacist += fsGain, 0, 100);
break;
case "Subjugationist":
- arcology.FSSubjugationist = Math.clamp(arcology.FSSubjugationist += fsGain,0,100);
+ arcology.FSSubjugationist = Math.clamp(arcology.FSSubjugationist += fsGain, 0, 100);
break;
case "Paternalist":
- arcology.FSPaternalist = Math.clamp(arcology.FSPaternalist += fsGain,0,100);
+ arcology.FSPaternalist = Math.clamp(arcology.FSPaternalist += fsGain, 0, 100);
break;
case "Pastoralist":
- arcology.FSPastoralist = Math.clamp(arcology.FSPastoralist += fsGain,0,100);
+ arcology.FSPastoralist = Math.clamp(arcology.FSPastoralist += fsGain, 0, 100);
break;
case "Maturity Preferentialist":
- arcology.FSMaturityPreferentialist = Math.clamp(arcology.FSMaturityPreferentialist += fsGain,0,100);
+ arcology.FSMaturityPreferentialist = Math.clamp(arcology.FSMaturityPreferentialist += fsGain, 0, 100);
break;
case "Youth Preferentialist":
- arcology.FSYouthPreferentialist = Math.clamp(arcology.FSYouthPreferentialist += fsGain,0,100);
+ arcology.FSYouthPreferentialist = Math.clamp(arcology.FSYouthPreferentialist += fsGain, 0, 100);
break;
case "Body Purist":
- arcology.FSBodyPurist = Math.clamp(arcology.FSBodyPurist += fsGain,0,100);
+ arcology.FSBodyPurist = Math.clamp(arcology.FSBodyPurist += fsGain, 0, 100);
break;
case "Slimness Enthusiast":
- arcology.FSSlimnessEnthusiast = Math.clamp(arcology.FSSlimnessEnthusiast += fsGain,0,100);
+ arcology.FSSlimnessEnthusiast = Math.clamp(arcology.FSSlimnessEnthusiast += fsGain, 0, 100);
break;
}
}
return t;
-};
\ No newline at end of file
+};
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 23b8176725df44325b5676247a5e487bc3033900..e5a14c55c1dffaf782551a294595862614ad992a 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1820,7 +1820,7 @@ App.Entity.SlaveState = class SlaveState {
/** constantly loses weight unless gaining, easier to lose weight. wGain + wLoss - weight gain/loss fluctuates randomly */
wLoss: 0,
/** body attempts to normalize to an androgynous state */
- androgyny: 0
+ androgyny: 0,
/** slave can only ever birth girls */
girlsOnly: 0
};
diff --git a/src/js/accordianJS.js b/src/js/accordianJS.js
index cce8bdfbaaa63d8d6d64a952d02ab793c4c2b21d..88c9f9abd3903366b41f8945ccdbcb55f4b88078 100644
--- a/src/js/accordianJS.js
+++ b/src/js/accordianJS.js
@@ -1,5 +1,3 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
/* Accordion 000-250-006 */
/*
@@ -17,33 +15,32 @@
postdisplay["doAccordionSet"] = function (content) {
if (variables().useAccordion === 1) {
- Array.prototype.slice.call(document.querySelectorAll('.macro-include'))
+ Array.prototype.slice.call(document.querySelectorAll(".macro-include"))
.forEach(function (element) {
- element.classList.add('accHidden');
+ element.classList.add("accHidden");
});
}
};
postdisplay["doAccordion"] = function (content) {
- var acc = document.getElementsByClassName("accordion");
- var i;
+ const acc = document.getElementsByClassName("accordion");
- for (i = 0; i < acc.length; i += 1) {
+ for (let i = 0; i < acc.length; i += 1) {
acc[i].onclick = function () {
this.classList.toggle("active");
- var panel = this.nextElementSibling;
- if(panel === null || panel === undefined){
- panel = document.getElementById(this.id + "accHidden");
- if( panel.style.display === 'none' ) {
- panel.style.display = '';
- }else{
- panel.style.display = 'none';
+ let panel = this.nextElementSibling;
+ if (panel === null || panel === undefined) {
+ panel = document.getElementById(`${this.id }accHidden`);
+ if ( panel.style.display === "none" ) {
+ panel.style.display = "";
+ } else {
+ panel.style.display = "none";
}
- }else{
+ } else {
if (panel.style.maxHeight) {
panel.style.maxHeight = null;
} else {
- panel.style.maxHeight = 2 * panel.scrollHeight + "px";
+ panel.style.maxHeight = `${2 * panel.scrollHeight }px`;
}
}
};
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index d85afc345baa3747d54ca7dab343582f0c0bf9ab..1341b39758b54e17ee4ff8821c9a84cb9cc5c0da 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -1168,76 +1168,80 @@
<</if>>
<<set $RESMove = []>>
- <<if $TSS.schoolUpgrade != 0>>
- <<if $TSS.schoolPresent == 0>>
- <<if $TSS.schoolAnnexed == 0>>
- <<set $events.push("RES Move")>>
- <<set $events.push("RES Move")>>
- <<set $RESMove.push("TSS")>>
+ <<if ($seeDicks != 100)>> /* is the player ok with seeing vaginas? */
+ <<if $TSS.schoolUpgrade != 0>>
+ <<if $TSS.schoolPresent == 0>>
+ <<if $TSS.schoolAnnexed == 0>>
+ <<set $events.push("RES Move")>>
+ <<set $events.push("RES Move")>>
+ <<set $RESMove.push("TSS")>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<if $GRI.schoolUpgrade != 0>>
- <<if $GRI.schoolPresent == 0>>
- <<if $GRI.schoolAnnexed == 0>>
- <<set $events.push("RES Move")>>
- <<set $events.push("RES Move")>>
- <<set $RESMove.push("GRI")>>
+ <<if $GRI.schoolUpgrade != 0>>
+ <<if $GRI.schoolPresent == 0>>
+ <<if $GRI.schoolAnnexed == 0>>
+ <<set $events.push("RES Move")>>
+ <<set $events.push("RES Move")>>
+ <<set $RESMove.push("GRI")>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<if $SCP.schoolUpgrade != 0>>
- <<if $SCP.schoolPresent == 0>>
- <<if $SCP.schoolAnnexed == 0>>
- <<set $events.push("RES Move")>>
- <<set $events.push("RES Move")>>
- <<set $RESMove.push("SCP")>>
+ <<if $SCP.schoolUpgrade != 0>>
+ <<if $SCP.schoolPresent == 0>>
+ <<if $SCP.schoolAnnexed == 0>>
+ <<set $events.push("RES Move")>>
+ <<set $events.push("RES Move")>>
+ <<set $RESMove.push("SCP")>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<if $LDE.schoolUpgrade != 0>>
- <<if $LDE.schoolPresent == 0>>
- <<if $LDE.schoolAnnexed == 0>>
- <<set $events.push("RES Move")>>
- <<set $events.push("RES Move")>>
- <<set $RESMove.push("LDE")>>
+ <<if $HA.schoolUpgrade != 0>>
+ <<if $HA.schoolPresent == 0>>
+ <<if $HA.schoolAnnexed == 0>>
+ <<set $events.push("RES Move")>>
+ <<set $events.push("RES Move")>>
+ <<set $RESMove.push("HA")>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<if $TGA.schoolUpgrade != 0>>
- <<if $TGA.schoolPresent == 0>>
- <<if $TGA.schoolAnnexed == 0>>
- <<set $events.push("RES Move")>>
- <<set $events.push("RES Move")>>
- <<set $RESMove.push("TGA")>>
+ <<if $TCR.schoolUpgrade != 0 && $TCR.schoolPresent == 0 && $TCR.schoolAnnexed == 0>>
+ <<set $events.push("RES Move")>>
+ <<set $events.push("RES Move")>>
+ <<set $RESMove.push("TCR")>>
+ <</if>>
+ <</if>> /* end "player is okay with vaginas" check */
+ <<if ($seeDicks != 0)>> /* begin "player is ok with dick" check */
+ <<if $LDE.schoolUpgrade != 0>>
+ <<if $LDE.schoolPresent == 0>>
+ <<if $LDE.schoolAnnexed == 0>>
+ <<set $events.push("RES Move")>>
+ <<set $events.push("RES Move")>>
+ <<set $RESMove.push("LDE")>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<if $HA.schoolUpgrade != 0>>
- <<if $HA.schoolPresent == 0>>
- <<if $HA.schoolAnnexed == 0>>
- <<set $events.push("RES Move")>>
- <<set $events.push("RES Move")>>
- <<set $RESMove.push("HA")>>
+ <<if $TGA.schoolUpgrade != 0>>
+ <<if $TGA.schoolPresent == 0>>
+ <<if $TGA.schoolAnnexed == 0>>
+ <<set $events.push("RES Move")>>
+ <<set $events.push("RES Move")>>
+ <<set $RESMove.push("TGA")>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<if $TCR.schoolUpgrade != 0 && $TCR.schoolPresent == 0 && $TCR.schoolAnnexed == 0>>
- <<set $events.push("RES Move")>>
- <<set $events.push("RES Move")>>
- <<set $RESMove.push("TCR")>>
- <</if>>
- <<if $TFS.schoolUpgrade != 0>>
- <<if $TFS.schoolPresent == 0>>
- <<if $TFS.schoolAnnexed == 0>>
- <<set $events.push("RES Move")>>
- <<set $events.push("RES Move")>>
- <<set $RESMove.push("TFS")>>
- <<if ($PC.dick == 1) && ($PC.vagina == 1) && ($PC.boobs == 1)>>
+ <<if $TFS.schoolUpgrade != 0>>
+ <<if $TFS.schoolPresent == 0>>
+ <<if $TFS.schoolAnnexed == 0>>
<<set $events.push("RES Move")>>
<<set $events.push("RES Move")>>
<<set $RESMove.push("TFS")>>
- <<set $RESMove.push("TFS")>>
+ <<if ($PC.dick == 1) && ($PC.vagina == 1) && ($PC.boobs == 1)>>
+ <<set $events.push("RES Move")>>
+ <<set $events.push("RES Move")>>
+ <<set $RESMove.push("TFS")>>
+ <<set $RESMove.push("TFS")>>
+ <</if>>
<</if>>
<</if>>
<</if>>