diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index d1bcc349c38f9ebe42f85f9e99e16efcfdc71658..962785e0e9daca3efc33fb141feef3f0c7615de3 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -81,17 +81,19 @@ window.saRest = function saRest(slave) {
}
if (V.showVignettes === 1 && slave.assignment === Job.REST) {
- const _vignette = GetVignette(slave);
+ const _vignette = GetVignette(slave),
+ FResultNumber = FResult(slave);
+
t += ` <span class="story-label">This week</span> ${_vignette.text} `;
if (_vignette.type === "cash") {
if (_vignette.effect > 0) {
- t += `<span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(V.FResult*_vignette.effect))}.</span>`;
+ t += `<span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(FResultNumber * _vignette.effect))}.</span>`;
} else if (_vignette.effect < 0) {
- t += `<span class="red">losing you ${cashFormat(Math.abs(Math.trunc(V.FResult*_vignette.effect)))}.</span>`;
+ t += `<span class="red">losing you ${cashFormat(Math.abs(Math.trunc(FResultNumber * _vignette.effect)))}.</span>`;
} else {
t += `an incident without lasting effect.`;
}
- cashX(Math.trunc(V.FResult * _vignette.effect), "rest", slave);
+ cashX(Math.trunc(FResultNumber * _vignette.effect), "rest", slave);
} else if (_vignette.type === "devotion") {
if (_vignette.effect > 0) {
if (slave.devotion > 50) {
@@ -156,7 +158,7 @@ window.saRest = function saRest(slave) {
} else {
t += `an incident without lasting effect.`;
}
- repX((V.FResult * _vignette.effect * 0.1), "vignette", slave);
+ repX((FResultNumber * _vignette.effect * 0.1), "vignette", slave);
}
}
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index 7d2a61a8aca977c2a6eb4e645fd09b7af87f0eee..913596d344d4701bcc1be693240595fcfa4e6597 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -455,16 +455,16 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
const vignette = GetVignette(slave);
t += `<span class="story-label">This week</span> ${vignette.text}`;
if (vignette.type === "cash") {
- FResult(slave);
+ let FResultNumber = FResult(slave);
if (vignette.effect > 0) {
- t += ` <span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(V.FResult*vignette.effect))}.</span> `;
+ t += ` <span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(FResultNumber * vignette.effect))}.</span> `;
} else if (vignette.effect < 0) {
- t += ` <span class="red">losing you ${cashFormat(Math.abs(Math.trunc(V.FResult*vignette.effect)))}.</span> `;
+ t += ` <span class="red">losing you ${cashFormat(Math.abs(Math.trunc(FResultNumber * vignette.effect)))}.</span> `;
} else {
t += ` an incident without lasting effect. `;
}
- cashX(Math.trunc(V.FResult * vignette.effect), "farmyard");
- incomeStats.income += (Math.trunc(V.FResult * vignette.effect));
+ cashX(Math.trunc(FResultNumber * vignette.effect), "farmyard");
+ incomeStats.income += (Math.trunc(FResultNumber * vignette.effect));
} else if (vignette.type === "devotion") {
if (vignette.effect > 0) {
if (slave.devotion > 50) {
@@ -522,7 +522,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
t += ` an incident without lasting effect. `;
}
} else {
- FResult(slave);
+ let FResultNumber = FResult(slave);
if (vignette.effect > 0) {
t += ` <span class="green">gaining you a bit of reputation.</span> `;
} else if (vignette.effect < 0) {
@@ -530,8 +530,8 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
} else {
t += ` an incident without lasting effect. `;
}
- repX(Math.trunc(V.FResult * vignette.effect * 0.1), "vignette", slave);
- incomeStats.rep += Math.trunc(V.FResult * vignette.effect * 0.1);
+ repX(Math.trunc(FResultNumber * vignette.effect * 0.1), "vignette", slave);
+ incomeStats.rep += Math.trunc(FResultNumber * vignette.effect * 0.1);
}
}
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 15f2900395ce9669e5666d77efbfb8b842fc9f3b..d80fb9cbea77c242fa4d0093e7204a119d7cb1db 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -151,9 +151,9 @@
<<else>>
<<silently>><<include "SA work the farm">><</silently>>
<</if>>
- <<set _seed = $cash-_oldCash, cashX(Math.trunc(0.5*_seed), "farmyard"), _seed = Math.trunc(1.5*_seed), _profits += _seed>>
+ <<set _seed = $cash-_oldCash, cashX(Math.trunc(0.5*_seed), "farmyard"), _seed = Math.trunc(1.5*_seed), _profits += _seed, _beauty = Beauty($activeSlave)>>
/* TODO: what will the Farmer do when $he isn't busy? */
- <br> Since $he doesn't have enough farmhands to manage to keep $him busy, $he sees $beauty customers $himself (<<print Math.trunc($beauty/7)>> a day), earning you @@.yellowgreen;<<print cashFormat(_seed)>>.@@ $He can charge more for $his time, since many citizens find it erotic to fuck the Farmer.
+ <br> Since $he doesn't have enough farmhands to manage to keep $him busy, $he sees _beauty customers $himself (<<= Math.trunc(_beauty/7)>> a day), earning you @@.yellowgreen;<<print cashFormat(_seed)>>.@@ $He can charge more for $his time, since many citizens find it erotic to fuck the Farmer.
<</if>>
<</if>>
<<if (_DL > 0)>><br><br><</if>>
diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index 6feadae4e9471de71e80375b11fb0d9851290c0c..f4e5887a8107b24b882bbbbb6dfad172b8ef86ed 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -450,9 +450,9 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
} else {
market = 1;
}
- V.opinion = arcologyOpinion(V.arcologies[0], V.arcologies[market]);
- V.opinion = Math.trunc(V.opinion/20);
- V.opinion = Math.clamp(V.opinion, -10, 10);
+ let opinion = arcologyOpinion(V.arcologies[0], V.arcologies[market]);
+ opinion = Math.trunc(opinion/20);
+ opinion = Math.clamp(opinion, -10, 10);
if (V.arcologies[market].FSSubjugationist > 20) {
V.fixedRace = V.arcologies[market].FSSubjugationistRace;
@@ -1061,14 +1061,14 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
V.activeSlave.devotion = jsRandom(60, 90);
V.activeSlave.trust = 20;
r += `<b>${V.arcologies[market].name}</b> is Degradationist, and your arcology is Paternalist. To its slaves, other niceties of social alignment are trivial. They view your arcology as a promised land. `;
- } else if (V.opinion !== 0) {
- V.activeSlave.devotion += V.opinion;
- V.activeSlave.trust += V.opinion;
+ } else if (opinion !== 0) {
+ V.activeSlave.devotion += opinion;
+ V.activeSlave.trust += opinion;
V.activeSlave.devotion = Math.clamp(V.activeSlave.devotion, -100, 75);
V.activeSlave.trust = Math.clamp(V.activeSlave.trust, -100, 75);
- if (V.opinion > 2) {
+ if (opinion > 2) {
r += `Your arcology's close social alignment with <b>${V.arcologies[market].name}</b> makes its slaves more accepting of the prospect of life in your arcology, and willing to trust that they'll know how to survive there. `;
- } else if (V.opinion < -2) {
+ } else if (opinion < -2) {
r += `Your arcology's very different culture from <b>${V.arcologies[market].name}</b>'s makes its slaves unhappy with the prospect of life in your arcology, and afraid of what will happen to them there. `;
}
}
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index d3a91b69792873710d575190f82966680f451384..c62bb18c2d6076a5d1fdb35417079bb9c403a5d2 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -381,7 +381,7 @@ $activeSlave.slaveName is up for review:
<br>$He @@.red;FAILED@@ the intelligence test.
<<set _passing-->>
<</if>>
-<<if $beauty >= $activeStandard.beauty>>
+<<if Beauty($activeSlave) >= $activeStandard.beauty>>
<br>$He @@.lime;PASSED@@ the beauty test.
<<else>>
<br>$He @@.red;FAILED@@ the beauty test.
diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw
index 1f671b0fb60cd47110c1b012365ee61a9cb8e4b8..f45535b08ee099b4e8efb2f941e9592549f9f73d 100644
--- a/src/uncategorized/bulkSlaveGenerate.tw
+++ b/src/uncategorized/bulkSlaveGenerate.tw
@@ -5,9 +5,6 @@
<<if ndef $numSlaves>>
<<set $numSlaves = 5>>
<</if>>
-<<if ndef $numArcology>>
- <<set $numArcology = 1>>
-<</if>>
/* Discount calculation. Gives 5% on top of slave school discount */
<<set $discount = 475>>
@@ -85,7 +82,7 @@
<<for _i = 0; _i < $numSlaves; _i++>>
<<run generateMarketSlave($slaveMarket, $numArcology)>>
- <<set $slavesSeen += 1>>
+ <<set $slavesSeen++>>
<<if $applyLaw == 0>>
<<set $slaveCost = slaveCost($activeSlave)>>
<<else>>
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index ce3e9ac6b2392371dced5af1bff75b33dd48d17f..f5a3b9159f67f5533afe45231c7f40b79ad310ca 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -1,9 +1,6 @@
:: Bulk Slave Intro [nobr]
-<<if ndef $introType>>
- <<set $introType = "">>
-<</if>>
-<<if $newSlaves.length == 0>>
+<<if ndef $introType || $newSlaves.length == 0>>
<<set $introType = "">>
<</if>>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 79e38b6e93267fe94115015edfc2bf4591cf4eaf..55ed7e7da340b89243150630503bd58e7247f30a 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -68,13 +68,13 @@
<<for _i = 0; _i < $arcologies.length; _i++>>
<<if $arcologies[_i].direction != 0>>
<div class="indent">
- <<capture _i>>[[Slaves from|Slave Markets][$slaveMarket = "neighbor", $numArcology = ' + _i + ']]<</capture>>
+ <<capture _i>>[[Slaves from|Slave Markets][$slaveMarket = "neighbor", $numArcology = _i]]<</capture>>
'' $arcologies[_i].name''
<<if $cash > _minimumFive>>
- | <<capture _i>>[[(x5)|Bulk Slave Generate][$slaveMarket = "neighbor", $introType = "bulk", $numSlaves = 5, $numArcology = '+_i+']]<</capture>>
+ | <<capture _i>>[[(x5)|Bulk Slave Generate][$slaveMarket = "neighbor", $introType = "bulk", $numSlaves = 5, $numArcology = _i]]<</capture>>
<</if>>
<<if $cash > _minimumTen>>
- | <<capture _i>>[[(x10)|Bulk Slave Generate][$slaveMarket = "neighbor", $introType = "bulk", $numSlaves = 10, $numArcology = '+_i+']]<</capture>>
+ | <<capture _i>>[[(x10)|Bulk Slave Generate][$slaveMarket = "neighbor", $introType = "bulk", $numSlaves = 10, $numArcology = _i]]<</capture>>
<</if>>
</div>
<</if>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 1ed45258d49b95d063c8f56c375b7f4f91690b2e..1e2a6ad5051cdca94482b7a5f327f3f3fded8001 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1,7 +1,6 @@
:: Long Slave Description [nobr]
<<run SlaveStatClamp($activeSlave)>>
-<<set $beauty = Beauty($activeSlave)>>
<<setLocalPronouns $activeSlave>>
/* 000-250-006 */
@@ -1654,8 +1653,7 @@ is
<</if>>
<<if ($showScores != 0)>>
- <<set $FResult = FResult($activeSlave)>>
- Currently, $he has an @@.pink;''attractiveness score'' of __''$beauty''__@@ and a @@.lightcoral;''sexual score'' of __''$FResult''__.@@
+ Currently, $he has an @@.pink;''attractiveness score'' of __''<<= Beauty($activeSlave)>>''__@@ and a @@.lightcoral;''sexual score'' of __''<<= FResult($activeSlave)>>''__.@@
<</if>>
<br>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 58ad5a27ae94d2af4919918c2155754076643009..c4bf79331c36d367d9f33455e7ac7409025c07fb 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -171,8 +171,7 @@
<<if $masterSuiteDecoration != "standard">>
<<set $slaves[$i].devotion++>>
<</if>>
- <<set $beauty = Beauty($Concubine)>>
- <<run repX($beauty * 5 + ($Concubine.skill.vaginal || 0) + $Concubine.skill.anal + $Concubine.skill.oral + $Concubine.skill.whoring + $Concubine.skill.entertainment, "concubine", $Concubine)>>
+ <<run repX(Beauty($Concubine) * 5 + ($Concubine.skill.vaginal || 0) + ($Concubine.skill.anal || 0) + ($Concubine.skill.oral || 0) + ($Concubine.skill.whoring || 0) + ($Concubine.skill.entertainment || 0), "concubine", $Concubine)>>
<<else>> /* not Concubine */
''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw
index b9f255e23455f66fc1af1a35376cf2cdc75d9555..243903eef8d02bbb66d2719b9e8467d8aba3966f 100644
--- a/src/uncategorized/neighborsFSAdoption.tw
+++ b/src/uncategorized/neighborsFSAdoption.tw
@@ -903,24 +903,24 @@ societal development.
<<for $j = 0; $j < $arcologies.length; $j++>>
<<if $arcologies[$i].direction != $arcologies[$j].direction>>
- <<set $influenceBonus = 0>>
+ <<set _influenceBonus = 0>>
<<if $arcologies[$i].direction == $arcologies[$j].influenceTarget>>
$arcologies[$j].name's directed cultural influence gives it some input $arcologies[$i].name's choice of direction.
- <<set $influenceBonus = 20>>
+ <<set _influenceBonus = 20>>
<</if>>
<<set _opinion = arcologyOpinion($arcologies[$i], $arcologies[$j])>>
<<if _opinion >= 50>>
$arcologies[$i].name is aligned with $arcologies[$j].name socially, encouraging it to consider adopting all its cultural values.
- <<set $influenceBonus += _opinion-50>>
+ <<set _influenceBonus += _opinion-50>>
<<elseif _opinion <= -50>>
$arcologies[$i].name is culturally opposed to $arcologies[$j].name, encouraging it to resist adopting its cultural values.
- <<set $influenceBonus += _opinion+50>>
+ <<set _influenceBonus += _opinion+50>>
<</if>>
<<if ($arcologies[$i].FSSubjugationist == "unset")>>
<<if ($arcologies[$i].FSSupremacist == "unset") || ($arcologies[$i].FSSupremacistRace != $arcologies[$j].FSSubjugationistRace)>>
- <<if $arcologies[$j].FSSubjugationist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSSubjugationist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts $arcologies[$j].FSSubjugationistRace Subjugation@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSSubjugationist = 5>><<set _adopted = 1>>
<<set $arcologies[$i].FSSubjugationistRace = $arcologies[$j].FSSubjugationistRace>>
@@ -930,7 +930,7 @@ societal development.
<</if>>
<<if ($arcologies[$i].FSSupremacist == "unset")>>
<<if ($arcologies[$i].FSSubjugationist == "unset") || ($arcologies[$i].FSSubjugationistRace != $arcologies[$j].FSSupremacistRace)>>
- <<if $arcologies[$j].FSSupremacist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSSupremacist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts $arcologies[$j].FSSupremacistRace Supremacy@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSSupremacist = 5>><<set _adopted = 1>>
<<set $arcologies[$i].FSSupremacistRace = $arcologies[$j].FSSupremacistRace>>
@@ -939,159 +939,159 @@ societal development.
<</if>>
<</if>>
<<if ($arcologies[$i].FSRepopulationFocus == "unset") && ($arcologies[$i].FSRestart == "unset") && ($seePreg == 1)>>
- <<if $arcologies[$j].FSRepopulationFocus > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSRepopulationFocus > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Repopulation@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSRepopulationFocus = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSRestart > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSRestart > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Eugenics@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSRestart = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSGenderRadicalist == "unset") && ($arcologies[$i].FSGenderFundamentalist == "unset")>>
- <<if $arcologies[$j].FSGenderRadicalist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSGenderRadicalist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Gender Radicalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSGenderRadicalist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSGenderFundamentalist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSGenderFundamentalist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Gender Fundamentalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSGenderFundamentalist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSPaternalist == "unset") && ($arcologies[$i].FSDegradationist == "unset")>>
- <<if $arcologies[$j].FSPaternalist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSPaternalist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Paternalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSPaternalist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSDegradationist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSDegradationist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Degradationism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSDegradationist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSIntellectualDependency == "unset") && ($arcologies[$i].FSSlaveProfessionalism == "unset")>>
- <<if $arcologies[$j].FSIntellectualDependency > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSIntellectualDependency > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Intellectual Dependency@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSIntellectualDependency = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSSlaveProfessionalism > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSSlaveProfessionalism > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Slave Professionalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSSlaveProfessionalism = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSBodyPurist == "unset") && ($arcologies[$i].FSTransformationFetishist == "unset")>>
- <<if $arcologies[$j].FSBodyPurist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSBodyPurist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Body Purism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSBodyPurist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSTransformationFetishist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSTransformationFetishist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Transformation Fetishism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSTransformationFetishist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSYouthPreferentialist == "unset") && ($arcologies[$i].FSMaturityPreferentialist == "unset")>>
- <<if $arcologies[$j].FSYouthPreferentialist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSYouthPreferentialist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Youth Preferentialism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSYouthPreferentialist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSMaturityPreferentialist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSMaturityPreferentialist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Maturity Preferentialism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSMaturityPreferentialist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSPetiteAdmiration == "unset") && ($arcologies[$i].FSStatuesqueGlorification == "unset")>>
- <<if $arcologies[$j].FSPetiteAdmiration > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSPetiteAdmiration > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Petite Admiration@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSPetiteAdmiration = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSStatuesqueGlorification > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSStatuesqueGlorification > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Statuesque Glorification@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSStatuesqueGlorification = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSSlimnessEnthusiast == "unset") && ($arcologies[$i].FSAssetExpansionist == "unset")>>
- <<if $arcologies[$j].FSSlimnessEnthusiast > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSSlimnessEnthusiast > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Slimness Enthusiasm@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSSlimnessEnthusiast = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSAssetExpansionist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSAssetExpansionist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Asset Expansionism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSAssetExpansionist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSPastoralist == "unset") && ($arcologies[$i].FSCummunism == "unset")>>
- <<if $arcologies[$j].FSPastoralist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSPastoralist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Pastoralism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSPastoralist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSCummunism > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSCummunism > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Cummunism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSCummunism = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSHedonisticDecadence == "unset") && ($arcologies[$i].FSPhysicalIdealist == "unset")>>
- <<if $arcologies[$j].FSHedonisticDecadence > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSHedonisticDecadence > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Decadent Hedonism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSHedonisticDecadence = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSPhysicalIdealist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSPhysicalIdealist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Physical Idealism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSPhysicalIdealist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSChattelReligionist == "unset") && ($arcologies[$i].FSNull == "unset")>>
- <<if $arcologies[$j].FSChattelReligionist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSChattelReligionist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Chattel Religionism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSChattelReligionist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
<</if>>
<<if ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>>
- <<if $arcologies[$j].FSRomanRevivalist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSRomanRevivalist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Roman Revivalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSRomanRevivalist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSAztecRevivalist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSAztecRevivalist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Aztec Revivalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSAztecRevivalist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSEgyptianRevivalist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSEgyptianRevivalist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Egyptian Revivalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSEdoRevivalist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSEdoRevivalist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Edo Revivalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSEdoRevivalist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSArabianRevivalist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSArabianRevivalist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Arabian Revivalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSArabianRevivalist = 5>><<set _adopted = 1>>
<<break>>
<</if>>
- <<if $arcologies[$j].FSChineseRevivalist > random(0,200)+(_adopted*100)-$influenceBonus>>
+ <<if $arcologies[$j].FSChineseRevivalist > random(0,200)+(_adopted*100)-_influenceBonus>>
It @@.yellow;adopts Chinese Revivalism@@ due to influence from its trading partner $arcologies[$j].name.
<<set $arcologies[$i].FSChineseRevivalist = 5>><<set _adopted = 1>>
<<break>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index c862c75dd1e0831ed0fbcdc1451271d3d174e1cf..b06cd839999ccb1574058388452e9465aa3c484b 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -373,7 +373,7 @@
/% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/
/% Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string. %/
-<<set $i = 0, $j = 0, $opinion = 0, $influenceBonus = 0, $averageProsperity = 0, $beauty = 0, $FResult = 0, $groomSlave = -1, $brideSlave = -1, $motherSlave = -1, $daughterSlave = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1, $recruiterSlave = -1>>
+<<set $i = 0, $j = 0, $averageProsperity = 0, $motherSlave = -1, $daughterSlave = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1, $recruiterSlave = -1>>
<<set $boobsID = -1, $boobsInterestTargetID = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $cumslutInterestTargetID = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $sadistID = -1, $sadistInterestTargetID = -1, $masochistID = -1, $masochistInterestTargetID = -1, $domID = -1, $dominantInterestTargetID = -1, $subID = -1, $submissiveInterestTargetID = -1>>
/% Other arrays %/
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index ba00ec8849a7621e9ca0be6fb914859d7928b71a..21b84fbd4f47420c384ab7c1bd5c1c0e8862867f 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -25,7 +25,7 @@
<<else>>
/* initialize event lists as arrays [], not objects {} */
- <<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $activeSlave = 0, $groomSlave = 0, $brideSlave = 0, $legendaryFacility = 0>>
+ <<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $activeSlave = 0, $legendaryFacility = 0>>
/* SUB CHECKS */
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 85c8012821481c0529533363ec278fad8d22f2da..130cbe412f23684029a6c035887a672f755e570e 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -22,7 +22,7 @@
<<else>>
<<silently>>
/* initialize event lists as arrays [], not objects {} */
- <<set $events = [], $RecETSevent = [], $REFIevent = [], $PESSevent = [], $PETSevent = [], $REFSevent = [], $activeSlave = 0, $groomSlave = 0, $brideSlave = 0, $recruiterSlave = 0, _recruitEvents = []>>
+ <<set $events = [], $RecETSevent = [], $REFIevent = [], $PESSevent = [], $PETSevent = [], $REFSevent = [], $activeSlave = 0, $recruiterSlave = 0, _recruitEvents = []>>
<<set $seed = 0>>
diff --git a/src/uncategorized/reSlaveMarriage.tw b/src/uncategorized/reSlaveMarriage.tw
index d93f63ede28e04edf9b6518a1d5e7571022d12ca..9ee98470e27678b8ee0e1d2776580919defa9482 100644
--- a/src/uncategorized/reSlaveMarriage.tw
+++ b/src/uncategorized/reSlaveMarriage.tw
@@ -2,16 +2,12 @@
<<set $nextButton = "Continue", $nextLink = "Next Week">>
-<<if $groomSlave == 0>>
- <<set $groomSlave = $eventSlave>>
-<</if>>
-<<run Enunciate($groomSlave)>>
-<<setLocalPronouns $groomSlave>>
+<<set _groomSlave = $eventSlave>>
+<<run Enunciate(_groomSlave)>>
+<<setLocalPronouns _groomSlave>>
-<<if $brideSlave == 0>>
- <<set $brideSlave = getSlave($groomSlave.relationshipTarget)>>
-<</if>>
-<<setLocalPronouns $brideSlave 2>>
+<<set _brideSlave = getSlave(_groomSlave.relationshipTarget)>>
+<<setLocalPronouns _brideSlave 2>>
<span id="artFrame">
@@ -19,18 +15,18 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<= SlaveArt($groomSlave, 2, 0)>>
+ <<= SlaveArt(_groomSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<= SlaveArt($brideSlave, 2, 0)>>
+ <<= SlaveArt(_brideSlave, 2, 0)>>
</div>
</div>
<</if>>
/* 000-250-006 */
</span>
-<<print "[[$groomSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1,$activeSlave = $groomSlave]]">> and <<print "[[$brideSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1,$activeSlave = $brideSlave]]">> come into your office
-<<if hasAnyArms($groomSlave) && hasAnyArms($brideSlave)>>holding hands<<else>>doing their best to stay close to one another despite their physical limitations<</if>>. $brideSlave.slaveName looks at $groomSlave.slaveName expectantly, but _he2's terribly nervous and makes several false starts before beginning. Finally $groomSlave.slaveName musters $his courage and <<if !canTalk($groomSlave)>>asks you with simple gestures to grant the two of them a slave marriage.<<else>>asks with $his voice cracking, "<<Master>>, would you plea<<s>>e grant u<<s>> a <<s>>lave marriage?"<</if>>
+<<print "[[_groomSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1,$activeSlave = _groomSlave]]">> and <<print "[[_brideSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1,$activeSlave = _brideSlave]]">> come into your office
+<<if hasAnyArms(_groomSlave) && hasAnyArms(_brideSlave)>>holding hands<<else>>doing their best to stay close to one another despite their physical limitations<</if>>. _brideSlave.slaveName looks at _groomSlave.slaveName expectantly, but _he2's terribly nervous and makes several false starts before beginning. Finally _groomSlave.slaveName musters $his courage and <<if !canTalk(_groomSlave)>>asks you with simple gestures to grant the two of them a slave marriage.<<else>>asks with $his voice cracking, "<<Master>>, would you plea<<s>>e grant u<<s>> a <<s>>lave marriage?"<</if>>
<br><br>
@@ -40,42 +36,42 @@
You inquire as to whether they understand the Free Cities slave marriage ceremony, and they nod, not trusting themselves to do anything more. You give them a few minutes to get dressed in special outfits you make available. When they come back, they're wearing lacy lingerie designed to resemble old world wedding dresses, but without concealing anything.
<br><br>
- <<if ($groomSlave.vagina == 0)>>
- $groomSlave.slaveName is a virgin, so $he's wearing white
- <<elseif ($groomSlave.pregKnown == 1)>>
- $groomSlave.slaveName is pregnant, so $he's wearing light pink
- <<elseif ($groomSlave.vagina < 0)>>
- $groomSlave.slaveName is a sissy slave, so $he's wearing light blue
+ <<if (_groomSlave.vagina == 0)>>
+ _groomSlave.slaveName is a virgin, so $he's wearing white
+ <<elseif (_groomSlave.pregKnown == 1)>>
+ _groomSlave.slaveName is pregnant, so $he's wearing light pink
+ <<elseif (_groomSlave.vagina < 0)>>
+ _groomSlave.slaveName is a sissy slave, so $he's wearing light blue
<<else>>
- $groomSlave.slaveName is an experienced sex slave, so $he's wearing light pink
+ _groomSlave.slaveName is an experienced sex slave, so $he's wearing light pink
<</if>>
- against $his $groomSlave.skin skin.
- <<if ($groomSlave.chastityPenis)>>
+ against $his _groomSlave.skin skin.
+ <<if (_groomSlave.chastityPenis)>>
$He has a little bow on $his chastity cage.
- <<elseif canAchieveErection($groomSlave)>>
- The <<if canSee($groomSlave)>>sight of $brideSlave.slaveName<<else>>anticipation<</if>> has $him stiffly erect, and $he's wearing a little bow around $his cockhead.
- <<elseif ($groomSlave.dick > 0)>>
+ <<elseif canAchieveErection(_groomSlave)>>
+ The <<if canSee(_groomSlave)>>sight of _brideSlave.slaveName<<else>>anticipation<</if>> has $him stiffly erect, and $he's wearing a little bow around $his cockhead.
+ <<elseif (_groomSlave.dick > 0)>>
$He's impotent, but $he's wearing a little bow around $his useless cockhead.
- <<elseif ($groomSlave.clit > 0)>>
+ <<elseif (_groomSlave.clit > 0)>>
$His prominent clit is engorged, and $he's wearing a tiny bow on it.
<<else>>
$He's wearing a demure little bow just over $his pussy.
<</if>>
- <<if ($groomSlave.anus > 1)>>
+ <<if (_groomSlave.anus > 1)>>
$His lacy panties are designed to spread $his buttocks a little and display $his big butthole.
- <<elseif ($groomSlave.anus == 0)>>
+ <<elseif (_groomSlave.anus == 0)>>
$His lacy panties cover $his virgin anus, for once.
<</if>>
- <<if ($groomSlave.boobs > 1000)>>
+ <<if (_groomSlave.boobs > 1000)>>
The bra makes no attempt to cover or even support $his huge breasts, simply letting them through holes in the lace to jut proudly out.
- <<elseif ($groomSlave.boobs > 500)>>
+ <<elseif (_groomSlave.boobs > 500)>>
The bra supports and presents $his big breasts, leaving $his stiffening nipples bare.
<<else>>
The bra supports and presents $his breasts, giving $him more cleavage than $he usually displays.
<</if>>
- <<if $groomSlave.belly >= 1500>>
+ <<if _groomSlave.belly >= 1500>>
$His
- <<if $groomSlave.preg > 0>>
+ <<if _groomSlave.preg > 0>>
growing pregnancy
<<else>>
rounded middle
@@ -84,42 +80,42 @@
<</if>>
<br><br>
- <<if ($brideSlave.vagina == 0)>>
- $brideSlave.slaveName is a virgin, so _he2's wearing white
- <<elseif ($groomSlave.pregKnown == 1)>>
- $brideSlave.slaveName is pregnant, so _he2's wearing light pink
- <<elseif ($brideSlave.vagina < 0)>>
- $brideSlave.slaveName is a sissy slave, so _he2's wearing light blue
+ <<if (_brideSlave.vagina == 0)>>
+ _brideSlave.slaveName is a virgin, so _he2's wearing white
+ <<elseif (_groomSlave.pregKnown == 1)>>
+ _brideSlave.slaveName is pregnant, so _he2's wearing light pink
+ <<elseif (_brideSlave.vagina < 0)>>
+ _brideSlave.slaveName is a sissy slave, so _he2's wearing light blue
<<else>>
- $brideSlave.slaveName is an experienced sex slave, so _he2's wearing light pink
+ _brideSlave.slaveName is an experienced sex slave, so _he2's wearing light pink
<</if>>
- against _his2 $brideSlave.skin skin.
- <<if ($brideSlave.chastityPenis)>>
+ against _his2 _brideSlave.skin skin.
+ <<if (_brideSlave.chastityPenis)>>
_He2 has a little bow on _his2 chastity cage.
- <<elseif canAchieveErection($brideSlave)>>
- The <<if canSee($brideSlave)>>sight of $groomSlave.slaveName<<else>>anticipation<</if>> has _him2 stiffly erect, and _he2's wearing a little bow around _his2 cockhead.
- <<elseif ($brideSlave.dick > 0)>>
+ <<elseif canAchieveErection(_brideSlave)>>
+ The <<if canSee(_brideSlave)>>sight of _groomSlave.slaveName<<else>>anticipation<</if>> has _him2 stiffly erect, and _he2's wearing a little bow around _his2 cockhead.
+ <<elseif (_brideSlave.dick > 0)>>
$He's impotent, but _he2's wearing a little bow around _his2 useless cockhead.
- <<elseif ($brideSlave.clit > 0)>>
+ <<elseif (_brideSlave.clit > 0)>>
_His2 prominent clit is engorged, and _he2's wearing a tiny bow on it.
<<else>>
_He2's wearing a demure little bow just over _his2 pussy.
<</if>>
- <<if ($brideSlave.anus > 1)>>
+ <<if (_brideSlave.anus > 1)>>
_His2 lacy panties are designed to spread _his2 buttocks a little and display _his2 big butthole.
- <<elseif ($brideSlave.anus == 0)>>
+ <<elseif (_brideSlave.anus == 0)>>
_His2 lacy panties cover _his2 virgin anus, for once.
<</if>>
- <<if ($brideSlave.boobs > 1000)>>
+ <<if (_brideSlave.boobs > 1000)>>
The bra makes no attempt to cover or even support _his2 huge breasts, simply letting them through holes in the lace to jut proudly out.
- <<elseif ($brideSlave.boobs > 500)>>
+ <<elseif (_brideSlave.boobs > 500)>>
The bra supports and presents _his2 big breasts, leaving _his2 stiffening nipples bare.
<<else>>
The bra supports and presents _his2 breasts, giving _him2 more cleavage than _he2 usually displays.
<</if>>
- <<if $brideSlave.belly >= 1500>>
+ <<if _brideSlave.belly >= 1500>>
_His2
- <<if $brideSlave.preg > 0>>
+ <<if _brideSlave.preg > 0>>
growing pregnancy
<<else>>
rounded middle
@@ -127,25 +123,25 @@
prominently bulges from the gap between _his2 lingerie.
<</if>>
- <br><br>The procedure is simple. The two of them prostrate themselves on the ground and beg your indulgence. You state that you grant it, and hand each of them a simple gold band to be worn on the little finger in advertisement of the inferiority of their union. In turn, each of them gives the other their ring, and they kiss. You pronounce them slave spouses, and offer them the couch for their honeymoon; they @@.mediumaquamarine;thank you profusely@@ through their building tears. It's always touching to see <<if $groomSlave.bellyPreg >= 5000 && $brideSlave.bellyPreg >= 5000>>two pregnant slaves <<if hasAnyArms($brideSlave) && hasAnyArms($groomSlave)>>fingering<<else>>fucking<</if>> each other<<else>>a 69<</if>> in which both participants are @@.hotpink;softly crying with happiness.@@
- <<if $groomSlave.pregSource == $brideSlave.ID && $brideSlave.pregSource == $groomSlave.ID>>
- When $groomSlave.slaveName and $brideSlave.slaveName tire, they rest, shoulder to shoulder, with a hand upon each other's bulging belly. Gently, they caress their growing pregnancies, knowing that they carry the other's love child.
- <<elseif $brideSlave.pregSource == $groomSlave.ID>>
- When they tire, $groomSlave.slaveName rests $his head upon $brideSlave.slaveName's lap and gently kisses $his lover's belly, knowing the child of their love is growing within.
- <<elseif $groomSlave.pregSource == $brideSlave.ID>>
- When they tire, $brideSlave.slaveName rests _his2 head upon $groomSlave.slaveName's lap and gently kisses _his2 lover's belly, knowing the child of their love is growing within.
+ <br><br>The procedure is simple. The two of them prostrate themselves on the ground and beg your indulgence. You state that you grant it, and hand each of them a simple gold band to be worn on the little finger in advertisement of the inferiority of their union. In turn, each of them gives the other their ring, and they kiss. You pronounce them slave spouses, and offer them the couch for their honeymoon; they @@.mediumaquamarine;thank you profusely@@ through their building tears. It's always touching to see <<if _groomSlave.bellyPreg >= 5000 && _brideSlave.bellyPreg >= 5000>>two pregnant slaves <<if hasAnyArms(_brideSlave) && hasAnyArms(_groomSlave)>>fingering<<else>>fucking<</if>> each other<<else>>a 69<</if>> in which both participants are @@.hotpink;softly crying with happiness.@@
+ <<if _groomSlave.pregSource == _brideSlave.ID && _brideSlave.pregSource == _groomSlave.ID>>
+ When _groomSlave.slaveName and _brideSlave.slaveName tire, they rest, shoulder to shoulder, with a hand upon each other's bulging belly. Gently, they caress their growing pregnancies, knowing that they carry the other's love child.
+ <<elseif _brideSlave.pregSource == _groomSlave.ID>>
+ When they tire, _groomSlave.slaveName rests $his head upon _brideSlave.slaveName's lap and gently kisses $his lover's belly, knowing the child of their love is growing within.
+ <<elseif _groomSlave.pregSource == _brideSlave.ID>>
+ When they tire, _brideSlave.slaveName rests _his2 head upon _groomSlave.slaveName's lap and gently kisses _his2 lover's belly, knowing the child of their love is growing within.
<</if>>
- <<set $groomSlave.devotion += 4>>
- <<set $brideSlave.devotion += 4>>
- <<set $groomSlave.trust += 4>>
- <<set $brideSlave.trust += 4>>
- <<set $groomSlave.counter.oral += 1>>
- <<set $brideSlave.counter.oral += 1>>
- <<set $groomSlave.relationship = 5>>
- <<set $brideSlave.relationship = 5>>
+ <<set _groomSlave.devotion += 4>>
+ <<set _brideSlave.devotion += 4>>
+ <<set _groomSlave.trust += 4>>
+ <<set _brideSlave.trust += 4>>
+ <<set _groomSlave.counter.oral += 1>>
+ <<set _brideSlave.counter.oral += 1>>
+ <<set _groomSlave.relationship = 5>>
+ <<set _brideSlave.relationship = 5>>
<<set $oralTotal += 2>>
- <<set $slaves[$slaveIndices[$brideSlave.ID]] = $brideSlave>>
- <<set $slaves[$slaveIndices[$groomSlave.ID]] = $groomSlave>>
+ <<set $slaves[$slaveIndices[_brideSlave.ID]] = _brideSlave>>
+ <<set $slaves[$slaveIndices[_groomSlave.ID]] = _groomSlave>>
<</replace>>
<</link>>
<br><<link "No">>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 323fae6cf3ae32ce718d998786c14c517cd820eb..fa3a60ea4a96ae9b8bbc9477da56879c2110881e 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -1222,9 +1222,6 @@ serves you this week.
<</if>>
<</if>>
-<<set $FResult = FResult($slaves[$i])>>
-<<set $beauty = Beauty($slaves[$i])>>
-
<<set _multiplier = 0.1>>
<<if $slaves[$i].relationship == -2>>
<<set _multiplier += 0.04>>
@@ -1251,11 +1248,7 @@ serves you this week.
<<set _multiplier += 0.03>>
<</if>>
-<<if $beauty>>
- <<run repX(Math.trunc(($beauty*$FResult)*_multiplier/4), "fucktoy", $slaves[$i])>>
-<<else>>
- <b>@@.red;Error: slaves' beauty undefined, report this issue!@@</b>
-<</if>>
+<<run repX(Math.trunc(( Beauty($slaves[$i]) * FResult($slaves[$i]) ) * _multiplier/4), "fucktoy", $slaves[$i])>>
Keeping $him as nothing but your personal
<<if ($slaves[$i].toyHole == "pussy")>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index adfebccd2a3b254179a464081bd7aabdb69066a3..150e248f1ad9f1589b31b035703bf2e883cc8815 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -23,7 +23,6 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<else>>
"If you are looking for a body to do unmentionable things to, you came to the right place! Though these in particular just barely fall under slave laws."
<</if>>
- <<= generateMarketSlave("heap")>>
<<case "wetware">>
<<setNonlocalPronouns $seeDicks>>
@@ -39,7 +38,6 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<else>>
Curious, you ask a technician why it's necessary for the merchandise to be so badly treated. He replies "Forcing stimulus on the hardware takes an enormous toll on their nervous and circulatory system. The nonfunctional components are disabled and removed as necessary to ensure optimal response to the imprinting process."
<</if>>
- <<= generateMarketSlave("wetware")>>
<<case "kidnappers">>
<<setNonlocalPronouns $seeDicks>>
@@ -60,8 +58,6 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<</if>>
at least one of the slavers is amusing himself<<if $arcologies[0].FSGenderFundamentalist == "unset">> (or herself)<</if>> back there.
<</if>>
- <<= generateMarketSlave("kidnappers")>>
-
<<case "indentures">>
<<setNonlocalPronouns $seeDicks>>
@@ -82,8 +78,6 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<</if>>
one of them is learning exactly what _hisU indenture allows.
<</if>>
- <<= generateMarketSlave("indentures")>>
-
<<case "hunters">>
<<setNonlocalPronouns $seeDicks>>
@@ -104,8 +98,6 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<</if>>
at least one of the runaway hunters is amusing himself<<if $arcologies[0].FSGenderFundamentalist == "unset">> (or herself)<</if>> back there.
<</if>>
- <<= generateMarketSlave("hunters")>>
-
<<case "underage raiders">>
You're in the seediest area of the slave market populated by the cradle robbers, a despised group of slavers known for raiding elementary schools, orphanages and even preschools. They specifically target those who have yet to experience their first period. The extreme risk of these raids makes the slavers here aggressive and confident,
@@ -125,8 +117,6 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<</if>>
at least one of the raiders is amusing himself<<if $arcologies[0].FSGenderFundamentalist == "unset">> (or herself)<</if>> back there.
<</if>>
- <<= generateMarketSlave("underage raiders")>>
-
<<case "raiders">>
You're in the area of the slave market populated by girl raiders, that daredevil subset of slave kidnappers that specifically target old world schools, preparatory institutions, religious groups, and other sources of slaves that can soon be sold right after they reach their majorities. The extreme risk of these raids makes the slavers here aggressive and confident,
@@ -146,13 +136,18 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<</if>>
at least one of the raiders is amusing himself<<if $arcologies[0].FSGenderFundamentalist == "unset">> (or herself)<</if>> back there.
<</if>>
- <<= generateMarketSlave("raiders")>>
-
<<case "neighbor">>
- You're in the area of the slave market that specializes in slaves from within the Free City, viewing slaves from ''<<print "$arcologies["+$numArcology+"].name">>''. Some were trained there, specifically for sale, while others are simply being sold.
- <<= generateMarketSlave("neighbor", $numArcology)>>
-
+ You're in the area of the slave market that specializes in slaves from within the Free City, viewing slaves from ''<<print "$arcologies[$numArcology].name">>''. Some were trained there, specifically for sale, while others are simply being sold.
+ <<set _opinion = arcologyOpinion($arcologies[0], $arcologies[$numArcology])>>
+ <<if _opinion != 0>>
+ <<set $slaveCost -= Math.trunc($slaveCost*$opinion*0.05)>>
+ <<if _opinion > 2>>
+ Your cultural ties with '' $arcologies[$numArcology].name'' helps keep the price reasonable.
+ <<elseif _opinion < -2>>
+ Your social misalignment with '' $arcologies[$numArcology].name'' drives up the price.
+ <</if>>
+ <</if>>
<<case "trainers">>
<<setNonlocalPronouns $seeDicks>>
@@ -173,26 +168,16 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<</if>>
at least one of them is applying some last-minute training to a slave in the holding pens nearby.
<</if>>
- <<= generateMarketSlave("trainers")>>
<</switch>>
+<<= generateMarketSlave($slaveMarket, ($numArcology || 1))>>
+
<br><br>
<<set $slaveCost = slaveCost($activeSlave)>>
<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += $slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1)>><</if>>
-<<if $slaveMarket == "neighbor">>
- <<if $opinion != 0>>
- <<set $slaveCost -= Math.trunc($slaveCost*$opinion*0.05)>>
- <<if $opinion > 2>>
- Your cultural ties with '' $arcologies[$numArcology].name'' helps keep the price reasonable.
- <<elseif $opinion < -2>>
- Your social misalignment with '' $arcologies[$numArcology].name'' drives up the price.
- <</if>>
- <</if>>
-<</if>>
-
<<set $slaveCost = 500*Math.trunc($slaveCost/500)>>
The offered price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>