diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index d7430655cc6b05cd55a28fa7c4d81a9534c23497..380f413d05c185193bdff48ead7e85a945c74784 100644 --- a/js/003-data/gameVariableData.js +++ b/js/003-data/gameVariableData.js @@ -545,7 +545,6 @@ App.Data.resetOnNGPlus = { fluid: 0, cumSale: 0, revivalistLanguage: 0, - assistant: {}, localEcon: 0, econRate: 0, drugsCost: 0, @@ -553,7 +552,6 @@ App.Data.resetOnNGPlus = { modCost: 0, surgeryCost: 0, arcologies: [], - leaders: [], HackingSkillMultiplier: 0, upgradeMultiplierArcology: 0, upgradeMultiplierMedicine: 0, @@ -608,7 +606,7 @@ App.Data.resetOnNGPlus = { brothelNameCaps: "The Brothel", brothel: 0, brothelBoost: { - selected: 0, eligible: 0 + selected: 0, eligible: 0 }, dairyDecoration: "standard", dairyPrepUpgrade: 0, @@ -939,7 +937,6 @@ App.Data.resetOnNGPlus = { bodyswapAnnounced: 0, surnamesForbidden: 0, menstruation: 0, - FCTV: {}, FCNNstation: 0, MercenariesMessageSent: 0, SpecialForcesMessageSent: 0, diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index 9fc833beb010545807784914912eeb1f96d91c7e..acf42d2833dcbc1b4c3f812553d01d4e318929c5 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -1179,10 +1179,6 @@ App.Update.slaveRecords = function(node) { V.slaves.forEach((slave) => { App.Entity.Utils.SlaveDataSchemeCleanup(slave); SlaveDatatypeCleanup(slave); - let leaderIdx = V.leaders.findIndex(function(s) { return s.ID === slave.ID; }); - if (leaderIdx !== -1) { - V.leaders[leaderIdx] = slave; - } }); if (V.hostage !== 0) { App.Update.Slave(V.hostage); diff --git a/src/js/assignJS.js b/src/js/assignJS.js index 41a6f112e47371648b24a2e0782b100d55683fe0..f6c681253fea29ea714e4aad7655ebdab1d3ce06 100644 --- a/src/js/assignJS.js +++ b/src/js/assignJS.js @@ -377,7 +377,6 @@ window.assignJob = function assignJob(slave, job) { WombCleanGenericReserve(slave, 'incubator', 9999); WombCleanGenericReserve(slave, 'nursery', 9999); if (job === "be your agent") { - V.leaders.push(slave); App.activeArcology().leaderID = slave.ID; App.activeArcology().government = "your agent"; } @@ -631,7 +630,6 @@ window.removeJob = function removeJob(slave, assignment, saveRecord) { arc.government = "your trustees"; } slave.assignment = "rest"; - V.leaders.deleteWith(s => s.ID === slave.ID); if (slave.relationshipTarget > 0) { /* following code assumes there can be at most one companion */ const _lover = V.slaves.findIndex(s => haveRelationshipP(s, slave) && s.assignment === "live with your agent"); @@ -876,7 +874,7 @@ App.activeArcology = function() { }; App.currentAgent = function(arcology) { - return V.leaders.find((f) => f.ID === V.arcologies[arcology].leaderID); + return getSlave(V.arcologies[arcology].leaderID); }; /** diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw index 640fe8b230458efc44a994e03eac08acdd95655c..e41634247d5b836d190cbaf07bd1949513222d2b 100644 --- a/src/uncategorized/neighborsFSAdoption.tw +++ b/src/uncategorized/neighborsFSAdoption.tw @@ -355,49 +355,49 @@ societal development. <<for _adopted == 0>> <<if ($arcologies[$i].government == "your agent")>> <<set _adopted = 1>> /* breaking out of the for loop will preserve this */ -<<set $j = $leaders.findIndex(function(s) { return s.ID == $arcologies[$i].leaderID; })>> -<<setLocalPronouns $leaders[$j]>> +<<set _leader = App.currentAgent($i)>> +<<setLocalPronouns _leader>> <<if ($arcologies[$i].FSRepopulationFocus == "unset")>> <<if ($arcologies[$i].FSRestart == "unset")>> - <<if $leaders[$j].fetish == "pregnancy" && $seePreg == 1>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Repopulationism,@@ since as a pregnancy fetishist, $he can't wait to see the female population's bellies swell with life. + <<if _leader.fetish == "pregnancy" && $seePreg == 1>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Repopulationism,@@ since as a pregnancy fetishist, $he can't wait to see the female population's bellies swell with life. <<set $arcologies[$i].FSRepopulationFocus = 5>><<break>> - <<elseif ($leaders[$j].preg < -1 || ($leaders[$j].ovaries == 0 && $leaders[$j].mpreg != 1)) && $leaders[$j].genes == "XX">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Eugenics,@@ since if no-one can get pregnant, $he won't be alone. + <<elseif (_leader.preg < -1 || (_leader.ovaries == 0 && _leader.mpreg != 1)) && _leader.genes == "XX">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Eugenics,@@ since if no-one can get pregnant, $he won't be alone. <<set $arcologies[$i].FSRestart = 5>><<break>> <</if>> <</if>> <</if>> <<if ($arcologies[$i].FSGenderRadicalist == "unset")>> <<if ($arcologies[$i].FSGenderFundamentalist == "unset")>> - <<if $leaders[$j].dick > 0>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Gender Radicalism,@@ since $he's a walking, swinging argument for dickgirls. + <<if _leader.dick > 0>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Gender Radicalism,@@ since $he's a walking, swinging argument for dickgirls. <<set $arcologies[$i].FSGenderRadicalist = 5>><<break>> - <<elseif $leaders[$j].pregKnown == 1 || $leaders[$j].bellyPreg > 1500>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Gender Fundamentalism,@@ since its citizens find leadership by a pregnant $woman fascinating. + <<elseif _leader.pregKnown == 1 || _leader.bellyPreg > 1500>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Gender Fundamentalism,@@ since its citizens find leadership by a pregnant $woman fascinating. <<set $arcologies[$i].FSGenderFundamentalist = 5>><<break>> <</if>> <</if>> <</if>> <<if ($arcologies[$i].FSPaternalist == "unset")>> <<if ($arcologies[$i].FSDegradationist == "unset")>> - <<if $leaders[$j].behavioralQuirk == "advocate">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Paternalism,@@ since as an advocate for slavery, $he believes in its benefits. + <<if _leader.behavioralQuirk == "advocate">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Paternalism,@@ since as an advocate for slavery, $he believes in its benefits. <<set $arcologies[$i].FSPaternalist = 5>><<break>> - <<elseif $leaders[$j].fetish == "sadist">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Degradationism,@@ since as a sexual sadist, $he's excited by the idea of leading a society that applauds $his cruelest impulses. + <<elseif _leader.fetish == "sadist">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Degradationism,@@ since as a sexual sadist, $he's excited by the idea of leading a society that applauds $his cruelest impulses. <<set $arcologies[$i].FSDegradationist = 5>><<break>> <</if>> <</if>> <</if>> <<if ($arcologies[$i].FSIntellectualDependency == "unset")>> <<if ($arcologies[$i].FSSlaveProfessionalism == "unset")>> - <<if ($leaders[$j].intelligence+$leaders[$j].intelligenceImplant >= 120) && ($leaders[$j].skill.vagina+$leaders[$j].skill.oral+$leaders[$j].skill.anal+$leaders[$j].skill.whoring+$leaders[$j].skill.entertainment >= 400)>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Slave Professionalism,@@ since $he wishes to produce slaves you can be proud of. + <<if (_leader.intelligence+_leader.intelligenceImplant >= 120) && (_leader.skill.vagina+_leader.skill.oral+_leader.skill.anal+_leader.skill.whoring+_leader.skill.entertainment >= 400)>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Slave Professionalism,@@ since $he wishes to produce slaves you can be proud of. <<set $arcologies[$i].FSSlaveProfessionalism = 5>><<break>> - <<elseif ($leaders[$j].intelligence+$leaders[$j].intelligenceImplant >= 120) && ($leaders[$j].behavioralFlaw == "arrogant" || $leaders[$j].behavioralQuirk == "insecure")>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Intellectual Dependency,@@ <<if $leaders[$j].behavioralQuirk == "insecure">> + <<elseif (_leader.intelligence+_leader.intelligenceImplant >= 120) && (_leader.behavioralFlaw == "arrogant" || _leader.behavioralQuirk == "insecure")>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Intellectual Dependency,@@ <<if _leader.behavioralQuirk == "insecure">> since, due to $his own insecurities, needs to be frequently reassured that $he is smarter than the masses. <<else>> since $he absolutely needs to feel intellectually superior to $his chattel. @@ -408,90 +408,90 @@ societal development. <</if>> <<if ($arcologies[$i].FSBodyPurist == "unset")>> <<if ($arcologies[$i].FSTransformationFetishist == "unset")>> - <<if $leaders[$j].chem > 50>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Body Purism,@@ since $he knows what long term drug damage feels like, and doesn't want any slave to ever experience it again. + <<if _leader.chem > 50>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Body Purism,@@ since $he knows what long term drug damage feels like, and doesn't want any slave to ever experience it again. <<set $arcologies[$i].FSBodyPurist = 5>><<break>> - <<elseif $leaders[$j].boobsImplant > 1000>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Transformation Fetishism,@@ out of a perverse desire to subject all slaves to massive implants like $hers. + <<elseif _leader.boobsImplant > 1000>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Transformation Fetishism,@@ out of a perverse desire to subject all slaves to massive implants like $hers. <<set $arcologies[$i].FSTransformationFetishist = 5>><<break>> <</if>> <</if>> <</if>> <<if ($arcologies[$i].FSYouthPreferentialist == "unset")>> <<if ($arcologies[$i].FSMaturityPreferentialist == "unset")>> - <<if $leaders[$j].actualAge <= 25>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Youth Preferentialism,@@ to buttress acceptance of $his own young age. + <<if _leader.actualAge <= 25>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Youth Preferentialism,@@ to buttress acceptance of $his own young age. <<set $arcologies[$i].FSYouthPreferentialist = 5>><<break>> - <<elseif $leaders[$j].actualAge > 35>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Maturity Preferentialism,@@ since $he has a certain personal interest in promoting the idea that MILFs are sexy. + <<elseif _leader.actualAge > 35>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Maturity Preferentialism,@@ since $he has a certain personal interest in promoting the idea that MILFs are sexy. <<set $arcologies[$i].FSMaturityPreferentialist = 5>><<break>> <</if>> <</if>> <</if>> <<if ($arcologies[$i].FSSlimnessEnthusiast == "unset")>> <<if ($arcologies[$i].FSAssetExpansionist == "unset")>> - <<if $leaders[$j].behavioralQuirk == "insecure">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Slimness Enthusiasm,@@ since $his history of anorexia has deeply impacted $his idea of beauty. + <<if _leader.behavioralQuirk == "insecure">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Slimness Enthusiasm,@@ since $his history of anorexia has deeply impacted $his idea of beauty. <<set $arcologies[$i].FSSlimnessEnthusiast = 5>><<break>> - <<elseif $leaders[$j].fetish == "boobs">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Asset Expansionism,@@ since $he's a breast expansion fetishist in addition to being a mere breast fetishist. + <<elseif _leader.fetish == "boobs">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Asset Expansionism,@@ since $he's a breast expansion fetishist in addition to being a mere breast fetishist. <<set $arcologies[$i].FSAssetExpansionist = 5>><<break>> - <<elseif $leaders[$j].sexualQuirk == "size queen" && $leaders[$j].vagina > 3>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Asset Expansionism,@@ since $he's a stickler for big dicks and seeks to find one large enough to push $him to $his very limit. + <<elseif _leader.sexualQuirk == "size queen" && _leader.vagina > 3>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Asset Expansionism,@@ since $he's a stickler for big dicks and seeks to find one large enough to push $him to $his very limit. <<set $arcologies[$i].FSAssetExpansionist = 5>><<break>> <</if>> <</if>> <</if>> <<if ($arcologies[$i].FSPastoralist == "unset")>> <<if ($arcologies[$i].FSCummunism == "unset")>> - <<if $leaders[$j].fetish == "cumslut">> /* this will become the cum focused condition, being replaced with breast focus for milk */ - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Cummunism,@@ since $he already loves sucking down huge loads of cum. + <<if _leader.fetish == "cumslut">> /* this will become the cum focused condition, being replaced with breast focus for milk */ + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Cummunism,@@ since $he already loves sucking down huge loads of cum. <<set $arcologies[$i].FSCummunism = 5>><<break>> - <<elseif $leaders[$j].fetish == "boobs">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Pastoralism,@@ since $he loves boobs and adores suckling them. + <<elseif _leader.fetish == "boobs">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Pastoralism,@@ since $he loves boobs and adores suckling them. <<set $arcologies[$i].FSPastoralist = 5>><<break>> <</if>> <</if>> <</if>> <<if ($arcologies[$i].FSHedonisticDecadence == "unset")>> <<if ($arcologies[$i].FSPhysicalIdealist == "unset")>> - <<if $leaders[$j].behavioralFlaw == "gluttonous">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Decadent Hedonism,@@ since $he already loves over-eating. + <<if _leader.behavioralFlaw == "gluttonous">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Decadent Hedonism,@@ since $he already loves over-eating. <<set $arcologies[$i].FSHedonisticDecadence = 5>><<break>> - <<elseif $leaders[$j].behavioralQuirk == "fitness">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Physical Idealism,@@ since $he's a fitness fanatic $himself. + <<elseif _leader.behavioralQuirk == "fitness">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Physical Idealism,@@ since $he's a fitness fanatic $himself. <<set $arcologies[$i].FSPhysicalIdealist = 5>><<break>> - <<elseif $leaders[$j].fetish != "none" && $leaders[$j].fetishStrength >= 100>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Decadent Hedonism,@@ since $he seeks to satisfy $his powerful fetish. + <<elseif _leader.fetish != "none" && _leader.fetishStrength >= 100>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Decadent Hedonism,@@ since $he seeks to satisfy $his powerful fetish. <<set $arcologies[$i].FSHedonisticDecadence = 5>><<break>> <</if>> <</if>> <</if>> <<if ($arcologies[$i].FSPetiteAdmiration == "unset")>> <<if ($arcologies[$i].FSStatuesqueGlorification == "unset")>> - <<if $leaders[$j].height >= 200>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Statuesque Glorification,@@ since $he is tired of being one of the tallest in arcology. + <<if _leader.height >= 200>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Statuesque Glorification,@@ since $he is tired of being one of the tallest in arcology. <<set $arcologies[$i].FSStatuesqueGlorification = 5>><<break>> - <<elseif $leaders[$j].height >= 170 && $leaders[$j].fetish == "dom">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Petite Admiration,@@ since it is far easier to dominate someone much smaller than oneself. + <<elseif _leader.height >= 170 && _leader.fetish == "dom">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Petite Admiration,@@ since it is far easier to dominate someone much smaller than oneself. <<set $arcologies[$i].FSPetiteAdmiration = 5>><<break>> <</if>> <</if>> <</if>> <<if ($arcologies[$i].FSIncestFetishist == "unset")>> - <<set _lover = $slaves.find(function(s) { return s.ID == $leaders[$j].relationshipTarget && areRelated(s, $leaders[$j]) && s.assignment == "live with your agent"; })>> - <<if ($leaders[$j].behavioralQuirk == "sinful" || $leaders[$j].sexualQuirk == "perverted") && def _lover && $seeIncest == 1>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Incest Festishism,@@ to share the love and joy $he holds with $his <<print relativeTerm($leaders[$j], _lover)>>. + <<set _lover = $slaves.find(function(s) { return s.ID == _leader.relationshipTarget && areRelated(s, _leader) && s.assignment == "live with your agent"; })>> + <<if (_leader.behavioralQuirk == "sinful" || _leader.sexualQuirk == "perverted") && def _lover && $seeIncest == 1>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Incest Festishism,@@ to share the love and joy $he holds with $his <<print relativeTerm(_leader, _lover)>>. <<set $arcologies[$i].FSIncestFetishist = 5>><<break>> <</if>> <</if>> <<if ($arcologies[$i].FSChattelReligionist == "unset")>> <<if ($arcologies[$i].FSNull == "unset")>> - <<if $leaders[$j].behavioralQuirk == "devout">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Chattel Religionism,@@ to share and spread $his deeply held beliefs about the holiness of sexual service. + <<if _leader.behavioralQuirk == "devout">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Chattel Religionism,@@ to share and spread $his deeply held beliefs about the holiness of sexual service. <<set $arcologies[$i].FSChattelReligionist = 5>><<break>> - <<elseif $leaders[$j].behavioralQuirk == "sinful">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Chattel Religionism,@@ since $he's excited by the prospect of getting away with horrible sins against old religions in public. + <<elseif _leader.behavioralQuirk == "sinful">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Chattel Religionism,@@ since $he's excited by the prospect of getting away with horrible sins against old religions in public. <<set $arcologies[$i].FSChattelReligionist = 5>><<break>> <</if>> <</if>> @@ -502,26 +502,26 @@ societal development. <<if ($arcologies[$i].FSEdoRevivalist == "unset")>> <<if ($arcologies[$i].FSArabianRevivalist == "unset")>> <<if ($arcologies[$i].FSChineseRevivalist == "unset")>> - <<if ($leaders[$j].relationshipTarget != 0)>> - <<set _lover = getSlave($leaders[$j].relationshipTarget)>> - <<if (def _lover) && areRelated($leaders[$j], _lover)>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Egyptian Revivalism,@@ since $he's already part of a gloriously incestuous relationship. + <<if (_leader.relationshipTarget != 0)>> + <<set _lover = getSlave(_leader.relationshipTarget)>> + <<if (def _lover) && areRelated(_leader, _lover)>> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Egyptian Revivalism,@@ since $he's already part of a gloriously incestuous relationship. <<set $arcologies[$i].FSEgyptianRevivalist = 5>><<break>> <</if>> - <<elseif $leaders[$j].nationality == "Chinese">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Chinese Revivalism,@@ since $he's Chinese $himself and can claim high honor in such a society. + <<elseif _leader.nationality == "Chinese">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Chinese Revivalism,@@ since $he's Chinese $himself and can claim high honor in such a society. <<set $arcologies[$i].FSChineseRevivalist = 5>><<break>> - <<elseif $leaders[$j].nationality == "Japanese">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Edo Revivalism,@@ since $he's Japanese $himself and can claim high honor in such a society. + <<elseif _leader.nationality == "Japanese">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Edo Revivalism,@@ since $he's Japanese $himself and can claim high honor in such a society. <<set $arcologies[$i].FSEdoRevivalist = 5>><<break>> - <<elseif $leaders[$j].nationality == "Mexican">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Aztec Revivalism,@@ since $he's Mexican $himself and can claim high honor in such a society. + <<elseif _leader.nationality == "Mexican">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Aztec Revivalism,@@ since $he's Mexican $himself and can claim high honor in such a society. <<set $arcologies[$i].FSAztecRevivalist = 5>><<break>> - <<elseif $leaders[$j].behavioralQuirk == "confident">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Roman Revivalism,@@ since it appeals to $his confident, patrician nature. + <<elseif _leader.behavioralQuirk == "confident">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Roman Revivalism,@@ since it appeals to $his confident, patrician nature. <<set $arcologies[$i].FSRomanRevivalist = 5>><<break>> - <<elseif $leaders[$j].fetish == "dom">> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Arabian Revivalism,@@ since $he's sexually dominant and quite likes the idea of overseeing slave bazaars. + <<elseif _leader.fetish == "dom">> + Your agent @@.pink;_leader.slaveName@@ successfully pushes it to @@.yellow;adopt Arabian Revivalism,@@ since $he's sexually dominant and quite likes the idea of overseeing slave bazaars. <<set $arcologies[$i].FSArabianRevivalist = 5>><<break>> <</if>> <</if>>