diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index a55c854f33f1a2e8f7ba880b21286480c32b1872..94026f56c35bc21483cff86afdd58fd3d0868f77 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -581,7 +581,7 @@ window.DefaultRules = (function() { r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length huge dildo for her pussy.`; slave.vaginalAccessory = "huge dildo"; } else { - r += `<br>slave.slaveName is a virgin and has been given a `; + r += `<br>${slave.slaveName} is a virgin and has been given a `; if (slave.vagina >= 2) r += `massive and oversized dildo to permanently gape her cunt.`; else { @@ -650,11 +650,11 @@ window.DefaultRules = (function() { break; case "none": - r += `<br>slave.slaveName is a virgin and has been instructed not to use a vaginal accessory.`; + r += `<br>${slave.slaveName} is a virgin and has been instructed not to use a vaginal accessory.`; break; default: - r += `<br>slave.slaveName is a virgin and has been given a ${slave.vaginalAccessory} for her pussy.`; + r += `<br>${slave.slaveName} is a virgin and has been given a ${slave.vaginalAccessory} for her pussy.`; break; } } @@ -834,7 +834,7 @@ window.DefaultRules = (function() { r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length huge plug for her anus.`; slave.buttplug = "huge plug"; } else { - r += `<br>slave.slaveName is an anal virgin and has been given a `; + r += `<br>${slave.slaveName} is an anal virgin and has been given a `; if (slave.anus >= 2) r += `massive and oversized plug to permanently gape her asshole.`; else { diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw index 5803bd691f59d8c92e08632acdef6459be6ebe85..e33f73943ad780dfb198d69ffd0a27a7080101f8 100644 --- a/src/pregmod/manageCorporation.tw +++ b/src/pregmod/manageCorporation.tw @@ -1465,7 +1465,7 @@ __Slave specialization__ <<if ndef $corpSpecImplants && $corpDivSurgery > 0>> /*This used to be $surgicalUpgradeImplants, it is the surgery specialization*/ <br>Slave implants are [[Applied|Manage Corporation][$corpSpecImplants = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Not Applied|Manage Corporation][$corpSpecImplants = 0, $corpSpecTimer = 2]] <</if>> - <<if ndef $corpSpecGenitalia && $corpDivSurgery > 100>> /*This used to be $surgicalUpgradeGenitalia, it is the surgery specialization*/ + <<if ndef $corpSpecGenitalia && $corpDivSurgeryDev > 100>> /*This used to be $surgicalUpgradeGenitalia, it is the surgery specialization*/ <br>Slaves get their genitalia reconfigured [[Add Pussy|Manage Corporation][$corpSpecPussy = 1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Remove Pussy|Manage Corporation][$corpSpecPussy = -1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Add Dick|Manage Corporation][$corpSpecDick = 1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Remove Dick|Manage Corporation][$corpSpecDick = -1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Add Balls|Manage Corporation][$corpSpecBalls = 1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Remove Balls|Manage Corporation][$corpSpecBalls = -1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] <</if>> <<if ndef $corpSpecTrust && $corpDivBreak > 0>> /*This used to be $generalUpgradeBreaking, it is the slave breaking specific specialization*/ @@ -1876,7 +1876,7 @@ __Slave specialization__ <<elseif $corpSpecMuscle == 4>> <br>The corporation aims for toned muscles. <<if $corpSpecTimer == 0>> - <<if $corpSpecToken > 0 && ($corpDivBreakDev + $corpDivSurgery + $corpDivTrainDev > 100)>> + <<if $corpSpecToken > 0 && ($corpDivBreakDev + $corpDivSurgeryDev + $corpDivTrainDev > 100)>> [[Aim for Ripped|Manage Corporation][$corpSpecMuscle = 5, $corpSpecToken -= 1, $corpSpecTimer = 2]] | <</if>> [[Aim for Soft][$corpSpecMuscle = 3, $corpSpecTimer = 2]] | <<link "No Focus">><<unset $corpSpecWeight>><<set $corpSpecToken += 1, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>> @@ -1955,7 +1955,7 @@ __Slave specialization__ <<elseif $corpSpecEducation == 1>> <br>The corporation makes sure all slaves have a basic education. <<if $corpSpecTimer == 0>> - <<if $corpDivTrain > 200 && $corpSpecToken > 0>> + <<if $corpDivTrainDev > 200 && $corpSpecToken > 0>> [[Advanced Education|Manage Corporation][$corpSpecEducation = 2, $corpSpecToken -= 1, $corpSpecTimer = 2]] | <</if>> [[No Education|Manage Corporation][$corpSpecEducation = 1, $corpSpecTimer = 2]] | <<link "No Focus">><<unset $corpSpecEducation>><<set $corpSpecToken += 1, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>> diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw index 4380a19173e268d3061888ae760bd27bc6ca8b35..c5cefdf7c8718fd7d0a15a7a0c220f6e3843733a 100644 --- a/src/uncategorized/genericPlotEvents.tw +++ b/src/uncategorized/genericPlotEvents.tw @@ -880,7 +880,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your <<run SetBellySize($slaves[$i])>> <<elseif $slaves[$i].drugs == "breast injections">> <<set $slaves[$i].lactation = 1>> - <<set $activeSlave.lactationDuration = 2>> + <<set $slaves[$i].lactationDuration = 2>> <<if ($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].hips < 1)>> <<set $slaves[$i].hips += 1>> <<set $slaves[$i].butt += 1>> @@ -913,7 +913,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your <<run SetBellySize($slaves[$i])>> <<elseif $slaves[$i].drugs == "intensive breast injections">> <<set $slaves[$i].lactation = 1>> - <<set $activeSlave.lactationDuration = 2>> + <<set $slaves[$i].lactationDuration = 2>> <<if ($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].hips < 1)>> <<set $slaves[$i].hips += 1>> <<set $slaves[$i].butt += 1>> @@ -946,7 +946,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your <<run SetBellySize($slaves[$i])>> <<elseif $slaves[$i].drugs == "hyper breast injections">> <<set $slaves[$i].lactation = 1>> - <<set $activeSlave.lactationDuration = 2>> + <<set $slaves[$i].lactationDuration = 2>> <<if ($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].hips < 1)>> <<set $slaves[$i].hips += 1>> <<set $slaves[$i].butt += 2>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 56ed6e7001aae723009d8637d1c325170392b8a3..0bb68500f687419618fa9d61ee2f3538377fa2c1 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -348,11 +348,10 @@ <</if>> <<set _ML = $marrying.length>> <<if (($MixedMarriage == 1 || $cheatMode == 1) && $activeSlave.relationship != 5 && $activeSlave.relationship != -3)>> + <<set _eligible = 1>> <<for _m = 0; _m < _ML; _m++>> <<if $marrying[_m] == $activeSlave.ID>> <<set _eligible = 0>> - <<else>> - <<set _eligible = 1>> <</if>> <</for>> <<if _eligible != 0>>