From fa1530e01a5227bf86403b2bacb85c94ddbed00d Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 3 Dec 2019 20:59:36 -0500
Subject: [PATCH] migrated $girls, $playerGetsMilked and $PCWounded to player
object
---
Changelog.txt | 2 +
devTools/javaSanityCheck/ignoredVariables | 6 +
src/SecExp/attackHandler.tw | 2 +-
src/SecExp/attackReport.tw | 2 +-
src/SecExp/rebellionReport.tw | 6 +-
src/events/intro/introSummary.tw | 14 +-
src/js/economyJS.js | 8 +-
src/player/js/PlayerState.js | 32 +++-
src/player/js/enslavePlayer.js | 162 ++++++++++++++++++++
src/pregmod/managePersonalAffairs.tw | 10 +-
src/pregmod/personalNotes.tw | 4 +-
src/pregmod/sePlayerBirth.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 28 +++-
src/uncategorized/costsBudget.tw | 4 +-
src/uncategorized/costsReport.tw | 11 +-
src/uncategorized/persBusiness.tw | 12 +-
16 files changed, 267 insertions(+), 38 deletions(-)
create mode 100644 src/player/js/enslavePlayer.js
diff --git a/Changelog.txt b/Changelog.txt
index 323c279aee7..c08e2255c0f 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -5,6 +5,8 @@ Pregmod
0
-standardized player and slave objects
-cheat edit player and player testicle enhancement disabled for cleaning
+ -whoring added to citizen satisfaction
+ -rule and porn slave variables objectified
-FS naming is now player selectable instead of a priority
-minor fixes and JSification
diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables
index 328b8a63f02..e5d3b7e7318 100644
--- a/devTools/javaSanityCheck/ignoredVariables
+++ b/devTools/javaSanityCheck/ignoredVariables
@@ -96,6 +96,12 @@ dislikes
hates
loathes
obsession
+speech
+punishment
+reward
+feed
+viewerCount
+spending
# corporation
canFoundCorporation;startingPrice;maintenanceSlaves;room;slaveRevenue;divisionLedger;freeDevelopment;developmentCost;maintenanceCategory;corporate;easyMode;roll;divisionCategories;divisionCategoriesList;getStored;setStored;endweek;corpDivSurgeryFounded;hasDividend;hasPayout;perUnit;acquire
# corporation - newgame+
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index a140acc8110..470fd99e5cd 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -191,7 +191,7 @@
<<set _mercMod -= 0.2>>
<<set _SFMod -= 0.2>>
<<set _enemyMod += 0.2>>
- <<set $PCWounded = 3>>
+ <<set $PC.majorInjury = 3>>
<</if>>
<<elseif $leadingTroops == "assistant">>
<<if $rep < 10000 && $SecExp.core.authority < 10000>>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 863246322d9..b4027ad62e2 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -854,7 +854,7 @@
<<if $gainedWarfare == 1>>
Battlefield experience increased your understanding of warfare, making you a better commander.
<</if>>
- <<if $PCWounded > 0>>
+ <<if $PC.majorInjury > 0>>
During the fighting @@.red;you were wounded.@@ Your medics assure you it's nothing life threatening, but you'll be weakened for a few weeks.
<</if>>
<<elseif $leadingTroops == "assistant">>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 18fe35634fa..cb2eebbb597 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -556,7 +556,7 @@
<</if>>
<<if random(1,100) <= _woundChance>>
A lucky shot managed to find its way to you, leaving a painful, but thankfully not lethal, wound.
- <<set $PCWounded = 3>>
+ <<set $PC.majorInjury = 3>>
<<else>>
Fortunately you managed to avoid injury.
<</if>>
@@ -725,7 +725,7 @@
<<set _woundChance *= random(1,2)>>
<<if random(1,100) <= _woundChance>>
A lucky shot managed to find its way to you, leaving a painful, but thankfully nonlethal, wound.
- <<set $PCWounded = 3>>
+ <<set $PC.majorInjury = 3>>
<<else>>
Fortunately you managed to avoid injury.
<</if>>
@@ -834,7 +834,7 @@
<<set _woundChance *= random(1,2)>>
<<if random(1,100) <= _woundChance>>
A lucky shot managed to find its way to you, leaving a painful, but thankfully nonlethal, wound.
- <<set $PCWounded = 3>>
+ <<set $PC.majorInjury = 3>>
<<else>>
Fortunately you managed to avoid injury.
<</if>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 70826dc7786..165ee484eb7 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -1386,12 +1386,16 @@ __''Mods''__
<<set $PC.skill.trading = 50, $PC.skill.warfare = 50, $PC.skill.slaving = 50, $PC.skill.engineering = -100, $PC.skill.medicine = 0, $PC.skill.hacking = 50>>
<</switch>>
<</if>>
- <<if $saveImported == 1 && $freshPC == 0 && $girls < 3>>
- <<set $girls++>>
+ <<if $saveImported == 1 && $freshPC == 0 && $PC.rules.living != "luxurious">>
+ <<if $PC.rules.living == "spare">>
+ <<set $PC.rules.living = "normal">>
+ <<else>>
+ <<set $PC.rules.living = "luxurious">>
+ <</if>>
<<elseif $PC.career == "wealth" || $PC.career == "celebrity">>
- <<set $girls = 2>>
+ <<set $PC.rules.living = "normal">>
<<else>>
- <<set $girls = 1>>
+ <<set $PC.rules.living = "spare">>
<</if>>
<<if $secExpEnabled > 0>>
<<set $wasToggledBefore = 1>>
@@ -1403,4 +1407,4 @@ __''Mods''__
<</if>>
<br><br>
-[[Cheat Start|init Nationalities][cashX(1000000, "cheating"),$girls = 3,repX(20000, "cheating"),$dojo += 1,$cheatMode = 1,$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateNationality = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 2,$PC.skill.trading = 100,$PC.skill.warfare = 100,$PC.skill.slaving = 100,$PC.skill.engineering = 100,$PC.skill.medicine = 100,$PC.skill.hacking = 100]] | //Intended for debugging: may have unexpected effects//
+[[Cheat Start|init Nationalities][cashX(1000000, "cheating"),$PC.rules.living = "luxurious",repX(20000, "cheating"),$dojo += 1,$cheatMode = 1,$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateNationality = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 2,$PC.skill.trading = 100,$PC.skill.warfare = 100,$PC.skill.slaving = 100,$PC.skill.engineering = 100,$PC.skill.medicine = 100,$PC.skill.hacking = 100]] | //Intended for debugging: may have unexpected effects//
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 9f90a59a4c9..a344082bae9 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -267,7 +267,13 @@ window.calculateCosts = (function() {
// general arcology costs
function getLifestyleCosts() {
- return (State.variables.girls * (250 + (50000 / State.variables.localEcon)));
+ let ownerExpense = 1;
+ if (V.PC.rules.living === "luxurious") {
+ ownerExpense = 3;
+ } else if (V.PC.rules.living === "normal") {
+ ownerExpense = 2;
+ }
+ return (ownerExpense * (250 + (50000 / State.variables.localEcon)));
}
function getFSCosts() {
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index e7a5557cd90..bcd52993894 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -28,6 +28,30 @@ App.Entity.PlayerSkillsState = class {
}
};
+/**
+ * Encapsulates your preferences. Used inside of the
+ * App.Entity.PlayerState class.
+ * @ref App.Entity.PlayerState
+ */
+App.Entity.PlayerRulesState = class {
+ constructor() {
+ this.living = "luxurious";
+ this.speech = "permissive";
+ this.release = "permissive";
+ this.relationship = "permissive";
+ /**
+ * How you are handling your lactation
+ * * "none"
+ * * "induce"
+ * * "maintain"
+ * * "sell"
+ */
+ this.lactation = "none";
+ this.punishment = "situational";
+ this.reward = "relaxation";
+ }
+};
+
App.Entity.PlayerActionsCountersState = class {
constructor() {
/** exclusive variables */
@@ -155,9 +179,13 @@ App.Entity.PlayerRelationshipsState = class PlayerRelationshipsState {
}
};
-
App.Entity.PlayerPornPerformanceState = class {
constructor() {
+ this.feed = 0;
+ this.viewerCount = 0;
+ this.spending = 0;
+ this.prestige = 0;
+ this.prestigeDesc = 0;
/** what porn you are known for */
this.fameType = "none";
/** what aspect of you is being focused on for porn */
@@ -1909,6 +1937,8 @@ App.Entity.PlayerState = class PlayerState {
this.vasectomy = 0;
/** Your skills */
this.skill = new App.Entity.PlayerSkillsState();
+ /** Your Preferences */
+ this.rules = new App.Entity.PlayerRulesState();
/** Whether she was put in the incubator at birth
*
* 0: no; 1: yes, comforting; 2: yes, terrifying */
diff --git a/src/player/js/enslavePlayer.js b/src/player/js/enslavePlayer.js
new file mode 100644
index 00000000000..03b3d443f14
--- /dev/null
+++ b/src/player/js/enslavePlayer.js
@@ -0,0 +1,162 @@
+/* This function adds the missing slave object variables to the player object and prunes player exclusive variables. You can only imagine what this is used for. */
+window.convertPlayerToSlave = function(slave, badEnd) {
+ /* add slave variables */
+ slave.skill.vaginal = 100;
+ slave.skill.oral = 100;
+ slave.skill.anal = 100;
+ slave.skill.whoring = 0;
+ slave.skill.entertainment = 100;
+ slave.skill.combat = 1;
+ slave.skill.headGirl = 200;
+ slave.skill.recruiter = 200;
+ slave.skill.bodyguard = 0;
+ slave.skill.madam = 100;
+ slave.skill.DJ = 0;
+ slave.skill.nurse = 0;
+ slave.skill.teacher = 0;
+ slave.skill.attendant = 0;
+ slave.skill.matron = 0;
+ slave.skill.stewardess = 0;
+ slave.skill.milkmaid = 0;
+ slave.skill.farmer = 0;
+ slave.skill.wardeness = 200;
+ slave.skill.servant = 0;
+ slave.skill.entertainer = 100;
+ slave.skill.whore = 0;
+ /* small skill adjustments */
+ if (slave.career === "medicine") {
+ slave.skill.nurse = 200;
+ } else if (slave.career === "escort") {
+ slave.skill.whoring = 100;
+ slave.skill.whore = 100;
+ } else if (slave.career === "servant") {
+ slave.skill.stewardess = 200;
+ }
+ slave.career = "an arcology owner";
+ slave.pronoun = App.Data.Pronouns.Kind.female;
+ slave.counter.births = 0;
+ slave.counter.oral = 0;
+ slave.counter.vaginal = 0;
+ slave.counter.anal = 0;
+ slave.counter.mammary = 0;
+ slave.counter.penetrative = 0;
+ slave.counter.publicUse = 0;
+ slave.counter.pitKills = 0;
+ slave.counter.PCChildrenFathered = 0;
+ slave.counter.PCKnockedUp = 0;
+ slave.counter.slavesFathered = 0;
+ slave.counter.slavesKnockedUp = 0;
+ slave.tattoo = "";
+ slave.label = "";
+ slave.desc = "";
+ slave.title = "";
+ slave.titleLisp = "";
+ slave.image = null;
+ slave.hairVector = 0;
+ slave.weekAcquired = 0;
+ slave.origin = "A former arcology owner that made some poor decisions in $his life.";
+ slave.porn = new App.Entity.PlayerPornPerformanceState();
+ slave.recruiter = 0;
+ slave.relation = 0;
+ slave.relationTarget = 0;
+ slave.relationship = 0;
+ slave.relationshipTarget = 0;
+ slave.rivalry = 0;
+ slave.rivalryTarget = 0;
+ slave.subTarget = 0;
+ slave.father = 0;
+ slave.mother = 0;
+ slave.daughters = 0;
+ slave.sisters = 0;
+ slave.canRecruit = 0;
+ slave.choosesOwnAssignment = 0;
+ slave.assignment = "rest";
+ slave.assignmentVisible = 1;
+ slave.sentence = 0;
+ slave.training = 0;
+ slave.toyHole = "all her holes";
+ slave.indenture = -1;
+ slave.indentureRestrictions = 0;
+ slave.trust = 0;
+ slave.oldTrust = 0;
+ slave.devotion = -100;
+ slave.oldDevotion = -100;
+ slave.clitSetting = "vanilla";
+ slave.rules = new App.Entity.PlayerRulesState();
+ slave.useRulesAssistant = 1;
+ slave.dietCum = 0;
+ slave.dietMilk = 0;
+ slave.tired = 0;
+ slave.fuckdoll = 0;
+ slave.choosesOwnClothes = 0;
+ slave.clothes = "no clothing";
+ slave.sexAmount = 0;
+ slave.sexQuality = 0;
+ slave.attrKnown = 0;
+ slave.fetishKnown = 0;
+ slave.rudeTitle = 0;
+ slave.currentRules = [];
+ slave.HGExclude = 0;
+ slave.choosesOwnChastity = 0;
+ slave.pregControl = "none";
+ slave.readyProsthetics = [];
+ slave.death = "";
+ slave.onDiet = 0;
+ slave.haircuts = 0;
+ slave.newGamePlus = 0;
+ /* eslint-disable camelcase*/
+ slave.NCSyouthening = 0;
+ slave.override_Race = 0;
+ slave.override_Skin = 0;
+ slave.override_Eye_Color = 0;
+ slave.override_H_Color = 0;
+ slave.override_Pubic_H_Color = 0;
+ slave.override_Arm_H_Color = 0;
+ slave.override_Brow_H_Color = 0;
+ /* eslint-enable */
+ slave.albinismOverride = null;
+ slave.slaveCost = 0;
+ slave.lifetimeCashExpenses = 0;
+ slave.lifetimeCashIncome = 0;
+ slave.lastWeeksCashIncome = 0;
+ slave.lifetimeRepExpenses = 0;
+ slave.lifetimeRepIncome = 0;
+ slave.lastWeeksRepIncome = 0;
+ slave.lastWeeksRepExpenses = 0;
+ slave.reservedChildren = 0;
+ slave.reservedChildrenNursery = 0;
+
+ /* remove player variables */
+ delete slave.skill.trading;
+ delete slave.skill.warfare;
+ delete slave.skill.slaving;
+ delete slave.skill.engineering;
+ delete slave.skill.medicine;
+ delete slave.skill.hacking;
+ delete slave.skill.cumTap;
+ delete slave.counter.birthElite;
+ delete slave.counter.birthMaster;
+ delete slave.counter.birthDegenerate;
+ delete slave.counter.birthClient;
+ delete slave.counter.birthArcOwner;
+ delete slave.counter.birthCitizen;
+ delete slave.counter.birthFutaSis;
+ delete slave.counter.birthSelf;
+ delete slave.counter.birthLab;
+ delete slave.counter.birthOther;
+ delete slave.counter.storedCum;
+ delete slave.relationships;
+ delete slave.title;
+ delete slave.degeneracy;
+ delete slave.refreshment;
+ delete slave.refreshmentType;
+ delete slave.rumor;
+ delete slave.physicalImpairment;
+ delete slave.fertDrugs;
+ delete slave.forcedFertDrugs;
+ delete slave.staminaPills;
+
+ /* badEnd will be used here to apply unique effects depending on the ending */
+
+ return slave;
+};
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 4266821abc8..a50c4aa7cc4 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -598,12 +598,12 @@ In total, you have given birth to:
__Lactation__
<br>
Your breasts are laden with milk.
- <<if $playerGetsMilked == 2>>
- You are spending time with the penthouse milkers and making a quick ¤ from your efforts. [[Stop milking yourself|Manage Personal Affairs][$playerGetsMilked = 0]] | [[Stop using the milkers|Manage Personal Affairs][$playerGetsMilked = 1]]
- <<elseif $playerGetsMilked == 1>>
- You are taking the time to keep yourself lactating. [[Stop milking yourself|Manage Personal Affairs][$playerGetsMilked = 0]]<<if $servantMilkers == 1>> | [[Use the penthouse milkers|Manage Personal Affairs][$playerGetsMilked = 2]]<</if>>
+ <<if $PC.rules.lactation == "sell">>
+ You are spending time with the penthouse milkers and making a quick ¤ from your efforts. [[Stop milking yourself|Manage Personal Affairs][$PC.rules.lactation = "none"]] | [[Stop using the milkers|Manage Personal Affairs][$PC.rules.lactation = "maintain"]]
+ <<elseif $PC.rules.lactation == "maintain">>
+ You are taking the time to keep yourself lactating. [[Stop milking yourself|Manage Personal Affairs][$PC.rules.lactation = "none"]]<<if $servantMilkers == 1>> | [[Use the penthouse milkers|Manage Personal Affairs][$PC.rules.lactation = "sell"]]<</if>>
<<else>>
- You are currently letting nature run its course. [[Keep yourself milked|Manage Personal Affairs][$playerGetsMilked = 1]]<<if $servantMilkers == 1>> | [[Use the penthouse milkers|Manage Personal Affairs][$playerGetsMilked = 2]]<</if>>
+ You are currently letting nature run its course. [[Keep yourself milked|Manage Personal Affairs][$PC.rules.lactation = "maintain"]]<<if $servantMilkers == 1>> | [[Use the penthouse milkers|Manage Personal Affairs][$PC.rules.lactation = "sell"]]<</if>>
<</if>>
<</if>>
diff --git a/src/pregmod/personalNotes.tw b/src/pregmod/personalNotes.tw
index d0e8aaf773a..f47bfa80c8b 100644
--- a/src/pregmod/personalNotes.tw
+++ b/src/pregmod/personalNotes.tw
@@ -45,9 +45,9 @@
<</if>>
*/
<<if $PC.lactation > 0>>
- <<if $playerGetsMilked > 0>>
+ <<if $PC.rules.lactation != "none" && $PC.rules.lactation != "induce">>
<<set $PC.lactationDuration = 2>>
- <<if $playerGetsMilked == 2>>
+ <<if $PC.rules.lactation == "sell">>
/* watch this be a disaster */
<<set _milk = milkAmount($PC)>>
Whenever you have a free moment and a chest swollen with milk, you spend your time attached to the nearest milker. As a result, you produce _milk liters of sellable milk over the week.
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index cacf6225680..b71e31ebbf8 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -554,7 +554,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<if _wounded == 1>>
Things didn't quite go as planned, leaving you @@.red;weak and wounded.@@ You'll need a couple weeks to recover from the ordeal before you're back on your feet.
- <<set $PCWounded = 2>>
+ <<set $PC.majorInjury = 2>>
<</if>>
<</if>> /*closes gaveBirth*/
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 37b961640a1..7cf83424311 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -724,6 +724,28 @@
<<set _newPC.clothes = "a nice maid outfit">>
<<set _newPC.intelligenceImplant = 0>>
<</if>>
+ <<if def $PCWounded>>
+ <<set _newPC.majorInjury = $PCWounded>>
+ <<unset $PCWounded>>
+ <</if>>
+ <<if def $girls>>
+ <<if $girls == 1>>
+ <<set _newPC.rules.living = "spare">>
+ <<elseif $girls == 2>>
+ <<set _newPC.rules.living = "normal">>
+ <<else>>
+ <<set _newPC.rules.living = "luxurious">>
+ <</if>>
+ <<unset $girls>>
+ <</if>>
+ <<if def $playerGetsMilked>>
+ <<if $playerGetsMilked == 2>>
+ <<set $PC.rules.lactation = "sell">>
+ <<elseif $playerGetsMilked == 1>>
+ <<set $PC.rules.lactation = "maintain">>
+ <</if>>
+ <<unset $playerGetsMilked>>
+ <</if>>
<<set WombInit(_newPC)>>
@@ -731,9 +753,6 @@
Standardizing player object... Done!<br>
<</if>>
-<<if ndef $PCWounded>>
- <<set $PCWounded = 0>>
-<</if>>
<<if ndef $NPCSexSupply>>
<<set $NPCSexSupply = {lowerClass: 3000}>>
<</if>>
@@ -951,9 +970,6 @@
<<if ndef $playerSurgery>>
<<set $playerSurgery = 0>>
<</if>>
-<<if ndef $playerGetsMilked>>
- <<set $playerGetsMilked = 0>>
-<</if>>
<<if ndef $bodyswapAnnounced>>
<<set $bodyswapAnnounced = 0>>
<</if>>
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 752ce48deab..0c875674e45 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -231,9 +231,9 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<print budgetLine("personalBusiness", "Personal business")>>
<<print budgetLine("personalLivingExpenses",
- "<<if $girls == 3>>
+ "<<if $PC.rules.living == "luxurious">>
Since you are accustomed to luxury, your personal living expenses are:
- <<elseif $girls == 2>>
+ <<elseif $PC.rules.living == "normal">>
Since you are used to living well, your personal living expenses are:
<<else>>
Since you are used to a fairly normal life, your personal living expenses are:
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index b26e162e683..3ddb0b7294a 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -9,15 +9,18 @@
<br><br>
Since you are
-<<if $girls >= 3>>
+<<if $PC.rules.living == "luxurious">>
accustomed to luxury,
-<<elseif $girls == 2>>
+ <<set _ownerExpense = 3>>
+<<elseif $PC.rules.living == "normal">>
used to living well,
+ <<set _ownerExpense = 2>>
<<else>>
used to a fairly normal life,
+ <<set _ownerExpense = 1>>
<</if>>
-your personal living expenses are @@.yellowgreen;<<print cashFormat(Math.trunc($girls*(250+(50000/$localEcon))))>>.@@
-<<set _arcologyCosts += Math.trunc($girls*(250+(50000/$localEcon)))>>
+your personal living expenses are @@.yellowgreen;<<print cashFormat(Math.trunc(_ownerExpense*(250+(50000/$localEcon))))>>.@@
+<<set _arcologyCosts += Math.trunc(_ownerExpense*(250+(50000/$localEcon)))>>
<<if $arcologies[0].FSRepopulationFocusLaw == 1 && $PC.pregKnown == 1>>
<br>Rent promotion for being a pregnant citizen under ''Universal Pregnancy Subsidy:'' @@.yellowgreen;<<print cashFormat(500)>>@@
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 047888cce25..0caab6920d4 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -27,13 +27,13 @@
<<set $gameover = "debt">><<goto "Gameover">>
<</if>>
<</if>>
-<<elseif $PCWounded>>
- <<if $PCWounded > 0>>
- <<set $PCWounded-->>
+<<elseif $PC.majorInjury>>
+ <<if $PC.majorInjury > 0>>
+ <<set $PC.majorInjury-->>
The injuries received in the recent battle prevents you from engaging in tiring endeavors.
- <<if $PCWounded > 1>>
+ <<if $PC.majorInjury > 1>>
Your trusted physician believes it will still take a few weeks to fully recover.
- <<elseif $PCWounded == 1>>
+ <<elseif $PC.majorInjury == 1>>
You are starting to feel better. It's very likely you will be back to full working order within the next week.
<<else>>
You have finally recovered from your injuries.
@@ -421,7 +421,7 @@
/* <<set _X = 0>> */
/* <</if>> */
-<<if $PCWounded == 0>>
+<<if $PC.majorInjury == 0>>
<<switch $personalAttention>>
<<case "trading">>
<<set _oldSkill = $PC.skill.trading>>
--
GitLab