diff --git a/src/004-base/organFarmBase.js b/src/004-base/organFarmBase.js
index f38973632a31e9984a8ca14ff3a1c9cfd90c60ea..1bcdf377c176122374a7ebb20b80a4d46cb0a8a3 100644
--- a/src/004-base/organFarmBase.js
+++ b/src/004-base/organFarmBase.js
@@ -99,5 +99,4 @@ App.Medicine.OrganFarm.OrganImplantAction = class {
autoImplantError(slave) {
return this.implantError(slave);
}
-
};
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index a990001b56d36c17112ca58d6c3d1916f5459da0..0e73e19e20c2a8bd49d65a0d768f95d43d11d587 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -318,17 +318,17 @@
<<set _i = $slaveIndices[$Bodyguard.ID]>>
<<if $woundType == 1>>
<<set $slaves[_i].voice = 0>>
- <<run healthDamage($slaves[$i], 60>>
+ <<run healthDamage($slaves[$i], 60)>>
<<elseif $woundType == 2>>
<<run eyeSurgery($slaves[_i], "both", "blind"), healthDamage($slaves[$i], 30)>>
<<elseif $woundType == 3>>
<<run removeLimbs($slaves[_i], "all")>>
- <<run healthDamage($slaves[$i], 80>>
+ <<run healthDamage($slaves[$i], 80)>>
<<elseif $woundType >= 4>>
<<if $slaves[_i].health.health >= -60>>
- <<run healthDamage($slaves[$i], 30>>
+ <<run healthDamage($slaves[$i], 30)>>
<<else>>
- <<run healthDamage($slaves[$i], -90 - $slaves[$i].health.health>>
+ <<run healthDamage($slaves[$i], -90 - $slaves[$i].health.health)>>
<</if>>
<</if>>
<</if>>
@@ -443,17 +443,17 @@
<<set _i = $slaveIndices[$HeadGirl.ID]>>
<<if $woundType == 1>>
<<set $slaves[_i].voice = 0>>
- <<run healthDamage($slaves[$i], 60>>
+ <<run healthDamage($slaves[$i], 60)>>
<<elseif $woundType == 2>>
<<set eyeSurgery($slaves[_i], "both", "blind"), healthDamage($slaves[$i], 30)>>
<<elseif $woundType == 3>>
<<run removeLimbs($slaves[_i], "all")>>
- <<run healthDamage($slaves[$i], 80>>
+ <<run healthDamage($slaves[$i], 80)>>
<<elseif $woundType >= 4>>
<<if $slaves[_i].health.health >= -60>>
- <<run healthDamage($slaves[$i], 30>>
+ <<run healthDamage($slaves[$i], 30)>>
<<else>>
- <<run healthDamage($slaves[$i], -90 - $slaves[$i].health.health>>
+ <<run healthDamage($slaves[$i], -90 - $slaves[$i].health.health)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 1a9986522eeeec43c783acb1c57cd0baa015950a..b35e466172a1b300fba621c5744367f9a7b29e2e 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -616,7 +616,7 @@
<<elseif $woundType >= 4>>
a stray shot severely wounded $him.
<<if $Concubine.health.health >= -60>>
- <<run healthDamage($Concubine, 30>>
+ <<run healthDamage($Concubine, 30)>>
<<else>>
<<run healthDamage($Concubine, 90)>>
<</if>>
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 713acc253532fe6fac5e03dc4028655d7e723eb3..a2117713ca01bcfbfeefa2784a5a866e05f4f8b6 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -23,7 +23,7 @@ Carcinogens
illness > 5 -- 3 11.6%
illness > 4 -- 4 2.8%
illness = 3 or 4 -- 5 1.8%
- Carcinogens substract Math.trunc(chem / 150) from the dice rolls for a max of -6 at >= 90
+ Carcinogens subtract Math.trunc(chem / 150) from the dice rolls for a max of -6 at >= 90
There should be a natural decay of carcinogens every week of 10% of the level. But at the price of 0.2 short term damage per point of chem.
Add carcinogen damage to serious medical procedures due to use of potent pharmaceuticals during them.
@@ -60,7 +60,7 @@ window.illness = function illness(slave) {
const random = jsRandom(1, 100); // high rolls are good
const H = slave.health;
let assignBonus = 0; // bonus for healthy assignments
- // On the macro side of things disease could also happen to the acrology's population as the arcology becomes crowded, killing citizens and putting slaves at greater risk of getting ill. Again with upgrades/policies to mitigate the issue made availble TODO?
+ // On the macro side of things disease could also happen to the acrology's population as the arcology becomes crowded, killing citizens and putting slaves at greater risk of getting ill. Again with upgrades/policies to mitigate the issue made available TODO?
if (slave.assignment !== "live with your agent" || slave.assignment !== "be your agent") { // Let's make sure agents don't get sick and accidentally die, they should take care of themselves
if (slave.assignment === "rest" || slave.assignment === "rest in the spa" || slave.assignment === "get treatment in the clinic" || slave.assignment === "serve in the master suite" || slave.assignment === "please you") {
assignBonus += 10;
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index c875fa0bacd9c8f7566fbf46c736269af9cf9e1f..54fc0d8bcea003268b5e97dcdc80eefaa9cf8444 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -107,25 +107,25 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
r += ` protect ${his} health from the stress of being used as a sexual appliance.`;
} else if (slave.health.condition < -50) {
r += ` The stress of being used while very in terrible condition <span class="red">damaged ${his} health.</span>`;
- damageHealth(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
+ healthDamage(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
} else if (slave.health.condition < -10) {
if (jsRandom(1, 100) < 10) {
r += ` The stress of being used while weak has <span class="red">damaged ${his} health.</span>`;
- damageHealth(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
+ healthDamage(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
}
} else if (!canDoVaginal(slave) && !canDoAnal(slave)) {
if (jsRandom(1, 100) < 75) {
r += ` The stress of being used repeatedly in only one hole has <span class="red">damaged ${his} health.</span>`;
- damageHealth(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
+ healthDamage(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
}
} else if (!canDoVaginal(slave)) {
if (jsRandom(1, 100) < 50) {
r += ` The stress of being used in only two holes has <span class="red">damaged ${his} health.</span>`;
- damageHealth(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
+ healthDamage(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
}
} else if (jsRandom(1, 100) < 25) {
r += ` The stress of being used has <span class="red">damaged ${his} health.</span>`;
- damageHealth(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
+ healthDamage(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
}
if (slave.health.illness > 0 || slave.health.tired > 50) {
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index 1ddacaa8be4ee1a4a8e280aa3aa97fce859f9cfb..a2b0eaccde3d5fd51bb13b85f8a0b409ec75b9a2 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -495,7 +495,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
improveCondition(slave, 2 * vignette.effect);
} else if (vignette.effect < 0) {
t += ` <span class="red">affecting ${his} health.</span> `;
- damageHealth(slave, 2 * vignette.effect);
+ healthDamage(slave, 2 * vignette.effect);
} else {
t += ` an incident without lasting effect. `;
}
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index c940f1ef6a4e396bc358c3349f8472f579f4a94c..7df289a8be36560cc1d2faee856a068485b0cb97 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -728,7 +728,7 @@ All in all,
<<run healthDamage($slaves[$i], Math.round(($birthDamage/2)*10))>>
<<if $birthDamage > 5 && _compoundCondition == 1 && _curBabies > 1>>
Or it would have been, were $he only having one. With each additional child that needed to be birthed, @@.red;the damage to $his health was compounded.@@
- <<run healthDamage($slaves[$i], _curBabies>>
+ <<run healthDamage($slaves[$i], _curBabies)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 679df555f6463dce02dbc45fb47db564cc1b5595..d4e995c66be08371f31959bc8398d1c43f796ae1 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -1179,7 +1179,7 @@ Or a custom site: <<textbox "$brandTarget.local" $brandTarget.local "Body Modifi
</div>
<<if $activeSlave.breedingMark == 1 && ($propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
- </div>
+ <div>
$He has an intricate tattoo on $his lower belly that suggests $he was made to be bred. [[Remove it|Body Modification][$activeSlave.breedingMark = 0]]
</div>
<</if>>
@@ -1376,5 +1376,5 @@ Or a custom site: <<textbox "$scarTarget.local" $scarTarget.local "Body Modifica
<</link>>
with $scarDesign.local on the $scarTarget.local<<if $activeSlave.scar[$scarTarget.local]>>, adding to the scars that are already there?<<else>>.<</if>>
<</if>>
-<div>
+</div>
</div> /* indent */
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 3437f240c7b53e0187999fe4ec1b8f8401eacbbe..aff87a370ec05f5a044dcef4155301c6782d1689 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -126,7 +126,7 @@
<<set $fixedRace = $arcologies[0].FSSubjugationistRace>>
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "$He came to your arcology to be enslaved out of a sense of self-loathing for $his kind.">>
-<<run setHealth($activeSlave, jsRandom(-70, -60)>>
+<<run setHealth($activeSlave, jsRandom(-70, -60))>>
<<set $activeSlave.trust = random(-25,-15)>>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.anus = random(1,2)>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index dcb7c149b96be6e9524ae0aa5eda4c7554311f61..48b482ffa0cf1b41675a0fabb935adcd5cdd1925 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -521,7 +521,7 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
<</if>>
<<if $seeExtreme > 0>>
<br><<link "Punitively amputate $his limbs, and then enslave $him">>
- <<run damageHealth($activeSlave, 20)>>
+ <<run healthDamage($activeSlave, 20)>>
<<run removeLimbs($activeSlave, "all")>>
<<set $activeSlave.behavioralFlaw = "odd">>
<<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index c6356381c7bebac3e61dfd64373437d19523e607..85a643500177a709fc0f6d9ef2981e9ce075d848 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1599,7 +1599,7 @@
<<set $activeSlave.origin = "$He offered to sell you $his body and you graciously accepted.">>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-15,0)>>
-<<run setHealth($activeSlave))>>
+<<run setHealth($activeSlave)>>
<<set $activeSlave.weight = -70>>
<<set $activeSlave.boobs = 100>>
<<set $activeSlave.origHColor = "silver">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index c113e27bc19024bf876e03703a3b68280d0e9144..4ebc7c8ce8ba935712e5ada33a54a1c158297169 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1437,7 +1437,7 @@
<<if $activeSlave.geneticQuirks.pFace == 2>>
[[Prevent passing of perfect faces|Surgery Degradation][$activeSlave.geneticQuirks.pFace = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), healthDamage($activeSlave,40), $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
<</if>>
- <div>
+ </div>
<div class="indent">
<<if $activeSlave.geneticQuirks.uFace == 2>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 3ce6396411d3cff9422c1a10a38b673ad3698401..a6e833027fae03a5513fbb55f19a1a5fb80fae87 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -172,7 +172,7 @@
<<set $activeSlave.trust = random(-25,-45)>>
<<set $activeSlave.chem = 100>>
<<if $GRI.schoolUpgrade == 1>>
- <<run setHealth($activeSlave, 200), 0, 0, 0)>>
+ <<run setHealth($activeSlave, 200, 0, 0, 0)>>
<<else>>
<<run setHealth($activeSlave, jsRandom(-70, 100), 0)>>
<</if>>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index 423737ff2463bb0421157d821e7719be27bcc96f..c6cd541c9e538b6e370e7d6708233da5ddff3c7f 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -1363,7 +1363,7 @@
<<else>>
and does $his best to continue with $his duties out of dedication to you, despite being sick.
<</if>>
-<<elseif $slaves[$i].illness > 1 && $slaves.assignment == "get treatment in the clinic">>
+<<elseif $slaves[$i].illness > 1 && $slaves[$i].assignment == "get treatment in the clinic">>
$He is<<if $slaves[$i].illness > 4>> deathly<<elseif $slaves[$i].illness > 3>> seriously<</if>> ill and receiving appropriate treatment. $He is @@.hotpink;grateful@@ you help $him get well.
<<set $slaves[$i].devotion += 2>>
<<elseif $slaves[$i].illness == 1>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 85272b27d0672ec194592eca56984a5b222cec1a..e8de9b282808a234f207759b4ba59094cd00536f 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6573,7 +6573,7 @@
$He is not allowed to get off as frequently as $his aphrodisiac fueled sex drive demands, and the constant frustration
<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
@@.red;stresses $his body considerably.@@
- <<run healthDamage($slaves[$i], 1+Math.trunc($slaves[$i].need/20)>>
+ <<run healthDamage($slaves[$i], 1+Math.trunc($slaves[$i].need/20))>>
<<else>>
drives $him mad with lust. $He @@.mediumorchid;blames you@@ for this @@.gold;cruelty.@@
<<set _decay = 1+Math.trunc($slaves[$i].need/20)>>
diff --git a/src/utility/saRulesWidgets.tw b/src/utility/saRulesWidgets.tw
index 9875b5bdd95078b45c87d543589992d0f77d843f..8238b0f8336c2e9269f26b5a6f9a85a7a64c86f2 100644
--- a/src/utility/saRulesWidgets.tw
+++ b/src/utility/saRulesWidgets.tw
@@ -486,7 +486,7 @@ and
rapes the poor slave's face<<if !canAchieveErection($slaves[$i])>> with <<if (hasAnyArms($slaves[$i]))>>$his fingers<<else>>a strap-on<</if>><</if>>. _rival.slaveName hates oral
<<elseif _rival.sexualFlaw == "hates penetration" && canDoVaginal(_rival)>>
rapes the poor slave's pussy<<if !canAchieveErection($slaves[$i])>> with <<if (hasAnyArms($slaves[$i]))>>$his fingers<<else>>a strap-on<</if>><</if>>. _rival.slaveName hates penetration
- <<elseif (_rival.sexualFlaw == "hates anal" || _rival.sexualFlaw == "hates penetration") && canDoAnal(_rival>>
+ <<elseif (_rival.sexualFlaw == "hates anal" || _rival.sexualFlaw == "hates penetration") && canDoAnal(_rival)>>
rapes the poor slave's ass<<if !canAchieveErection($slaves[$i])>> with <<if (hasAnyArms($slaves[$i]))>>$his fingers<<else>>a strap-on<</if>><</if>>. _rival.slaveName hates anal
<<elseif _rival.sexualFlaw == "shamefast">>
rapes the poor slave in public. _rival.slaveName is terribly shamefast