diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables index 86455f56c5a0196893ec52dededc2057eb3e4350..fcfd3191353fbfa8881812b125ac5d47d6744d19 100644 --- a/devTools/javaSanityCheck/ignoredVariables +++ b/devTools/javaSanityCheck/ignoredVariables @@ -3,98 +3,33 @@ AGrowth # MIN -brokenSlaves -toString -toFixed -LivingRule -PersonalAttention -marriages -weeksLeft -normalOvaMin -normalOvaMax -rejects -expCheck -interactionLink -minDomActionDelay -upgrade W;O;L -FSGenderFundamentalistResearch;FSPaternalistResearch;FSDegradationistResearch;FSBodyPuristResearch;FSMaturityPreferentialistResearch;FSPastoralistResearch;FSPhysicalIdealistResearch;FSRepopulationFocusResearch 0 -maleSurnamePoolSelector -nationalityPoolSelector -Him -anCup -linkHandlers -op -unborn -facilityRemove -boobsWombVolume;emptyDefaultRule;rule;removeImplant;changeImplant -assign;commit; -Std -htmlFor -Possessive;PossessivePronoun -whip;burn;cutting;chain;exotic -firstChild -true -missingLegs;missingArms; -toy -plural -bimboMaleNames -canGrow;canImplant;implantError;growOrgan;removeOrgan -totalChildTime -toStringExt -northAmericaNationalities;middleEastNationalities;africaNationalities;australiaNationalities -surnamePoolSelector -assignmentVisible -attendingClasses;confinement;gloryHole;milking;publicService;sexualServitude;servitude -cx -menialTrades;menialTransfer;fuckdollsTransfer;menialBioreactorsTransfer;menialRetirement;slaveMod;slaveSurgery;school;citizenOrphanage;environment;privateOrphanage;schoolBacking;personalLivingExpenses;PCtraining;PCmedical;PCskills;stocksTraded;fines;stocks;concubine;slavesViewOfPC;vignette;prestigiousSlave;publicServantClub;architecture;PCappearance;PCactions;PCRelationships;SlaveRelationships;multiplier -REReductionCheckinIDs -modestClothes -gangCriminalPool;militaryCriminalPool;whiteCollarCriminalPool;pettyCriminalPool -multiple;selectedOptions; -sluttyClothes -naturalNippleColors -POSITIVE -assistantPronouns;marketAssistantPronouns;ai -bodyDesire -Assistant;Extra1 -ArcologyNamesCummunism;ArcologyNamesIncestFetishist -royalNationalities -hostageGiveIn -r -SlaveSummaryFiler -sacrificeType -cellName;BaseCell;cellPath;Section;Building;ground;code -Upkeep;SexSlaveCount;GSP;Rep -debugModeCustomFunction +#re-added below 11/14 +############################ +#corp +perUnit +DivLegal +DivWhoreDev +acquire +#tabs####################### +IntroSummary +Assistant +############################ societyChanged +totalMerc +securityHQ +waterwayTime +dickSize +bodyDesire +Extra1 newModelUI seeArcology dinnerParty -showAppraisal -IntroSummary -two -totalMerc -hasFoughtMajorBattleOnce -barren +badOutcome RESSMuscles -# PC -criticalDamage -marriage -lovers -FWBs -BFFs -friends -likes -dislikes -hates -loathes -obsession -# corporation -canFoundCorporation;startingPrice;maintenanceSlaves;room;slaveRevenue;divisionLedger;freeDevelopment;developmentCost;maintenanceCategory;corporate;roll;divisionCategories;divisionCategoriesList;endweek;hasDividend;hasPayout;perUnit;acquire;DivLegal;DivWhoreDev -# porn -focusedViewershipFactor -unfocusedViewershipFactor -viewershipSoakingFactor -muscle;incest +royalNationalities +tempEventToggle +showAppraisal +Him +sacrificeType \ No newline at end of file diff --git a/src/endWeek/death.js b/src/endWeek/death.js index 87d3da2de6df821eef954c3392623db3d5598606..78cf2bfb8290c555cafd81559a07b48f30b0a7d6 100644 --- a/src/endWeek/death.js +++ b/src/endWeek/death.js @@ -47,7 +47,7 @@ globalThis.death = function(slave, deathType) { switch (deathType) { case "oldAge": { if (slave.assignment === "be confined in the arcade") { - r.push(`You are notified by ${V.arcadeName} staff that one of the cabinets has broken down and will need to be replaced. It would seem <span class="pink bold">${slave.slaveName}</span>, the fucktoy encased in it, died`); + r.push(`You are notified by ${V.arcadeName} staff that one of the cabinets has broken down and will need to be replaced. It would seem <span class="pink bold">${slave.slaveName},</span> the fucktoy encased in it, died`); if (slave.physicalAge >= 70) { r.push(`naturally of old age despite`); } else { @@ -55,7 +55,7 @@ globalThis.death = function(slave, deathType) { } r.push(`${his} living conditions. ${He} was a good unit; logs show ${he} was taking dick up until the very end.`); } else if (slave.assignment === "work in the dairy" && V.dairyRestraintsSetting > 1) { - r.push(`You are notified by ${V.dairyName} staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem <span class="pink bold">${slave.slaveName}</span>, the cow restrained in it, died`); + r.push(`You are notified by ${V.dairyName} staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem <span class="pink bold">${slave.slaveName},</span> the cow restrained in it, died`); if (slave.physicalAge >= 70) { r.push(`naturally of old age despite`); } else { @@ -108,9 +108,9 @@ globalThis.death = function(slave, deathType) { case "overdosed": { if (slave.assignment === "be confined in the arcade") { - r.push(`You are notified by ${V.arcadeName} staff that one of the cabinets has broken down and will need to be replaced. It would seem <span class="pink bold">${slave.slaveName}</span>, the fucktoy encased in it, died of an aphrodisiac overdose from the constant aphrodisiac injections. ${He} was a good unit; logs show ${he} was taking dick up until the very end.`); + r.push(`You are notified by ${V.arcadeName} staff that one of the cabinets has broken down and will need to be replaced. It would seem <span class="pink bold">${slave.slaveName},</span> the fucktoy encased in it, died of an aphrodisiac overdose from the constant aphrodisiac injections. ${He} was a good unit; logs show ${he} was taking dick up until the very end.`); } else if (slave.assignment === "work in the dairy" && V.dairyRestraintsSetting > 1) { - r.push(`You are notified by ${V.dairyName} staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem <span class="pink bold">${slave.slaveName}</span>, the cow restrained in it, died of an aphrodisiac overdose. How ${he} managed to get them is unknown, but ${he} was a good cow; ${he} gave milk up until ${his} death.`); + r.push(`You are notified by ${V.dairyName} staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem <span class="pink bold">${slave.slaveName},</span> the cow restrained in it, died of an aphrodisiac overdose. How ${he} managed to get them is unknown, but ${he} was a good cow; ${he} gave milk up until ${his} death.`); } else if (slave.fuckdoll > 0) { r.push(`One of your Fuckdolls' monitoring systems alerts you that the slave contained within has died. It would seem <span class="pink bold">${slave.slaveName}</span> has died of an aphrodisiac overdose. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally. It does little to deal with the resulting mess of the orgasm ${he} died during, however.`); } else { @@ -137,9 +137,9 @@ globalThis.death = function(slave, deathType) { case "lowHealth": { if (slave.assignment === "be confined in the arcade") { - r.push(`You are notified by ${V.arcadeName} staff that one of the cabinets has broken down and will need to be replaced. It would seem <span class="pink bold">${slave.slaveName}</span>, the fucktoy encased in it, died to poor health caused by ${his} living conditions. ${He} was a good unit; logs show ${he} was taking dick up until the very end.`); + r.push(`You are notified by ${V.arcadeName} staff that one of the cabinets has broken down and will need to be replaced. It would seem <span class="pink bold">${slave.slaveName},</span> the fucktoy encased in it, died to poor health caused by ${his} living conditions. ${He} was a good unit; logs show ${he} was taking dick up until the very end.`); } else if (slave.assignment === "work in the dairy" && V.dairyRestraintsSetting > 1) { - r.push(`You are notified by ${V.dairyName} staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem <span class="pink bold">${slave.slaveName}</span>, the cow restrained in it, died to poor health caused by ${his} living conditions. ${He} was a good cow; ${he} gave milk up until ${his} death.`); + r.push(`You are notified by ${V.dairyName} staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem <span class="pink bold">${slave.slaveName},</span> the cow restrained in it, died to poor health caused by ${his} living conditions. ${He} was a good cow; ${he} gave milk up until ${his} death.`); } else if (slave.fuckdoll > 0) { r.push(`One of your Fuckdolls' monitoring systems alerts you that the slave contained within has died. It would seem <span class="pink bold">${slave.slaveName}</span> has died of general poor health. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally. Clean up is easy enough, however.`); } else { diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js index 9b1fecf75c178889b95de58de7c3f3f7753fd8d1..116d22fb8cb645cfbaac9d5e86c50062d2a65d52 100644 --- a/src/endWeek/saStayConfined.js +++ b/src/endWeek/saStayConfined.js @@ -127,9 +127,6 @@ App.SlaveAssignment.stayConfined = function(slave) { } t += ` <span class="noteworthy">`; - if (slave.assignment === Job.CELLBLOCK) { - State.temporary.brokenSlaves++; - } if (V.assignmentRecords[slave.ID]) { let oldJob = V.assignmentRecords[slave.ID]; assignJobSafely(slave, oldJob); diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw index 002b1ddecc9b030e4464f4ece09993e48faf2158..ac6e10d3c29e71e89e7018f723d8df9b95be39ed 100644 --- a/src/uncategorized/newGamePlus.tw +++ b/src/uncategorized/newGamePlus.tw @@ -1,6 +1,6 @@ :: New Game Plus [nobr] -<<set $ui = "start">> <<unset $SlaveSummaryFiler>> +<<set $ui = "start">> <<if ndef $slavesToImportMax>><<set $slavesToImportMax = 5>><</if>> <<set _fee = 50000+($slavesToImportMax*10000)>>