diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 72b7537b9c3852a3547af2669332a47126868508..28f8df841a6df378dadbdc5c5b595a04ede393ab 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.0/1 +3/18/2018 + + 400 + -added neighbor FS Incest Festishist + -more fixes + 3/17/2018 399.2 diff --git a/devNotes/twine JS b/devNotes/twine JS index e0330415f3b2c009596d449b8feae7bea60fb48c..d0ed34968a57662fcb7edbe7330777e363b73d22 100644 --- a/devNotes/twine JS +++ b/devNotes/twine JS @@ -1274,6 +1274,10 @@ window.areSisters = function(c1, c2) { } */ +window.areRelated = function(slave1, slave2) { + return (slave1.father == slave2.ID || slave1.mother == slave2.ID || slave2.father == slave1.ID || slave2.mother == slave1.ID || areSisters(slave1, slave2) > 0); +} + window.totalRelatives = function(slave) { var relatives = 0; if (slave.mother > 0) { @@ -1399,6 +1403,24 @@ window.totalPlayerRelatives = function(pc) { return relatives }; +window.relativeTerm = function(slave1, slave2) { + if(slave2.mother == slave1.ID || slave2.father == slave1.ID) { + return "daughter"; + } else if(slave1.mother == slave2.ID) { + return "mother"; + } else if(slave1.father == slave2.ID) { + return "father"; + } else if(areSisters(slave2, slave1) == 1) { + return "twin"; + } else if(areSisters(slave2, slave1) == 2) { + return "sister"; + } else if(areSisters(slave2, slave1) == 3) { + return "half-sister"; + } else { + return "some unknown blood connection"; + } +} + /*:: pregJS [script]*/ /*Major props to the anons who worked together to forge the Super Pregnancy Project. Let your legacy go unforgotten.*/ diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw index 0484cb90c475e5193073a979706c0a49f22aae8e..d1fed4b30b3a21b563f3e01f1b331664081ad669 100644 --- a/src/events/intro/initNationalities.tw +++ b/src/events/intro/initNationalities.tw @@ -524,11 +524,11 @@ <<set $neighboringArcologies = Math.clamp($neighboringArcologies, 0, 8)>> <<for $i = 0; $i <= $neighboringArcologies; $i++>> - <<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", leaderID: 0, honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor: 0, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSAztecRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0, FSRestart: "unset", FSRepopulationFocus: "unset", FSHedonisticDecadence: "unset", FSCummunism: "unset", FSGenderRadicalistResearch: 0, FSGenderFundamentalistResearch: 0, FSPaternalistResearch: 0, FSDegradationistResearch: 0, FSBodyPuristResearch: 0, FSTransformationFetishistResearch: 0, FSYouthPreferentialistResearch: 0, FSMaturityPreferentialistResearch: 0, FSSlimnessEnthusiastResearch: 0, FSAssetExpansionistResearch: 0, FSPastoralistResearch: 0, FSPhysicalIdealistResearch: 0, FSRepopulationFocusResearch: 0, FSRestartResearch: 0, FSHedonisticDecadenceResearch: 0, FSHedonisticDecadenceDietResearch: 0, FSCummunismResearch: 0}>> + <<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", leaderID: 0, honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor: 0, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSAztecRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0, FSRestart: "unset", FSRepopulationFocus: "unset", FSHedonisticDecadence: "unset", FSCummunism: "unset", FSIncestFetishist: "unset", FSGenderRadicalistResearch: 0, FSGenderFundamentalistResearch: 0, FSPaternalistResearch: 0, FSDegradationistResearch: 0, FSBodyPuristResearch: 0, FSTransformationFetishistResearch: 0, FSYouthPreferentialistResearch: 0, FSMaturityPreferentialistResearch: 0, FSSlimnessEnthusiastResearch: 0, FSAssetExpansionistResearch: 0, FSPastoralistResearch: 0, FSPhysicalIdealistResearch: 0, FSRepopulationFocusResearch: 0, FSRestartResearch: 0, FSHedonisticDecadenceResearch: 0, FSHedonisticDecadenceDietResearch: 0, FSCummunismResearch: 0, FSIncestFetishistResearch: 0}>> <<if $i == 0>> <<set $activeArcology.direction = 0>> <<set $activeArcology.name = "Arcology X-4">> - <<set $activeArcology.FSSupremacistDecoration = 20, $activeArcology.FSSubjugationistDecoration = 20, $activeArcology.FSGenderRadicalistDecoration = 20, $activeArcology.FSGenderFundamentalistDecoration = 20, $activeArcology.FSPaternalistDecoration = 20, $activeArcology.FSDegradationistDecoration = 20, $activeArcology.FSBodyPuristDecoration = 20, $activeArcology.FSTransformationFetishistDecoration = 20, $activeArcology.FSYouthPreferentialistDecoration = 20, $activeArcology.FSMaturityPreferentialistDecoration = 20, $activeArcology.FSSlimnessEnthusiastDecoration = 20, $activeArcology.FSAssetExpansionistDecoration = 20, $activeArcology.FSPastoralistDecoration = 20, $activeArcology.FSPhysicalIdealistDecoration = 20, $activeArcology.FSChattelReligionistDecoration = 20, $activeArcology.FSRomanRevivalistDecoration = 20, $activeArcology.FSAztecRevivalistDecoration = 20, $activeArcology.FSEgyptianRevivalistDecoration = 20, $activeArcology.FSEdoRevivalistDecoration = 20, $activeArcology.FSArabianRevivalistDecoration = 20, $activeArcology.FSChineseRevivalistDecoration = 20, $activeArcology.FSRepopulationFocusDecoration = 20, $activeArcology.FSRestartDecoration = 20, $activeArcology.FSHedonisticDecadenceDecoration = 20, $activeArcology.FSCummunismDecoration = 20>> + <<set $activeArcology.FSSupremacistDecoration = 20, $activeArcology.FSSubjugationistDecoration = 20, $activeArcology.FSGenderRadicalistDecoration = 20, $activeArcology.FSGenderFundamentalistDecoration = 20, $activeArcology.FSPaternalistDecoration = 20, $activeArcology.FSDegradationistDecoration = 20, $activeArcology.FSBodyPuristDecoration = 20, $activeArcology.FSTransformationFetishistDecoration = 20, $activeArcology.FSYouthPreferentialistDecoration = 20, $activeArcology.FSMaturityPreferentialistDecoration = 20, $activeArcology.FSSlimnessEnthusiastDecoration = 20, $activeArcology.FSAssetExpansionistDecoration = 20, $activeArcology.FSPastoralistDecoration = 20, $activeArcology.FSPhysicalIdealistDecoration = 20, $activeArcology.FSChattelReligionistDecoration = 20, $activeArcology.FSRomanRevivalistDecoration = 20, $activeArcology.FSAztecRevivalistDecoration = 20, $activeArcology.FSEgyptianRevivalistDecoration = 20, $activeArcology.FSEdoRevivalistDecoration = 20, $activeArcology.FSArabianRevivalistDecoration = 20, $activeArcology.FSChineseRevivalistDecoration = 20, $activeArcology.FSRepopulationFocusDecoration = 20, $activeArcology.FSRestartDecoration = 20, $activeArcology.FSHedonisticDecadenceDecoration = 20, $activeArcology.FSCummunismDecoration = 20, $activeArcology.FSIncestFetishistDecoration = 20>> <<if $targetArcology.type != "New">> <<set $FSAnnounced = 1>> <<set $FSGotRepCredits = 1>> @@ -676,6 +676,7 @@ <<set $arcologies[0].FSHedonisticDecadenceResearch = 0>> <<set $arcologies[0].FSHedonisticDecadenceDietResearch = 0>> <<set $arcologies[0].FSCummunismResearch = 0>> +<<set $arcologies[0].FSIncestFetishistResearch = 0>> <<set $arcologies[0].FSEgyptianRevivalistIncestPolicy = 0>> <<set $arcologies[0].FSEgyptianRevivalistInterest = 0>> diff --git a/src/js/extendedFamilyModeJS.tw b/src/js/extendedFamilyModeJS.tw index d88d678955b72a0c8184bd6b865dfd6eed7a17ce..917565f32cd89f3ed6a33caf6a1598d92462c63f 100644 --- a/src/js/extendedFamilyModeJS.tw +++ b/src/js/extendedFamilyModeJS.tw @@ -103,6 +103,10 @@ window.areSisters = function(c1, c2) { } */ +window.areRelated = function(slave1, slave2) { + return (slave1.father == slave2.ID || slave1.mother == slave2.ID || slave2.father == slave1.ID || slave2.mother == slave1.ID || areSisters(slave1, slave2) > 0); +} + window.totalRelatives = function(slave) { var relatives = 0; if (slave.mother > 0) { @@ -227,3 +231,21 @@ window.totalPlayerRelatives = function(pc) { } return relatives }; + +window.relativeTerm = function(slave1, slave2) { + if(slave2.mother == slave1.ID || slave2.father == slave1.ID) { + return "daughter"; + } else if(slave1.mother == slave2.ID) { + return "mother"; + } else if(slave1.father == slave2.ID) { + return "father"; + } else if(areSisters(slave2, slave1) == 1) { + return "twin"; + } else if(areSisters(slave2, slave1) == 2) { + return "sister"; + } else if(areSisters(slave2, slave1) == 3) { + return "half-sister"; + } else { + return "some unknown blood connection"; + } +} diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index dc1c009fa6d01614499715b7a2cf8afbfeb923fc..9eeca44eca37abdd839aa3e7762be1691bffc420 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -829,6 +829,12 @@ <</for>> <<set $arcologies[0].FSCummunismResearch = 0>> <</if>> +<<if ndef $arcologies[0].FSIncestFetishist>> + <<for _bci = 0; _bci < $arcologies.length; _bci++>> + <<set $arcologies[_bci].FSIncestFetishist = "unset", $arcologies[_bci].FSIncestFetishistDecoration = 0>> + <</for>> + <<set $arcologies[0].FSIncestFetishistResearch = 0>> +<</if>> <<for _bci = 0; _bci < $arcologies.length; _bci++>> <<if $arcologies[_bci].FSHedonisticDecadence == 0>> <<set $arcologies[_bci].FSHedonisticDecadence = "unset", $arcologies[_bci].FSHedonisticDecadenceDecoration = 0>> diff --git a/src/uncategorized/arcologyOpinion.tw b/src/uncategorized/arcologyOpinion.tw index 1f678d2d03250fcd1db9bd19e3f4e5572ec3e910..676c8bf799d2314e88249e82f14ecdef7b6ad757 100644 --- a/src/uncategorized/arcologyOpinion.tw +++ b/src/uncategorized/arcologyOpinion.tw @@ -236,23 +236,27 @@ <</if>> <<elseif $activeArcology.FSEgyptianRevivalist != "unset">> <<if $targetArcology.FSEgyptianRevivalist != "unset">> - <<set $opinion += $activeArcology.FSEgyptianRevivalist>> - <<set $opinion += $targetArcology.FSEgyptianRevivalist>> + <<set $opinion += $activeArcology.FSEgyptianRevivalist>> + <<set $opinion += $targetArcology.FSEgyptianRevivalist>> <<elseif $targetArcology.FSRomanRevivalist != "unset">> - <<set $opinion -= $activeArcology.FSEgyptianRevivalist>> - <<set $opinion -= $targetArcology.FSRomanRevivalist>> + <<set $opinion -= $activeArcology.FSEgyptianRevivalist>> + <<set $opinion -= $targetArcology.FSRomanRevivalist>> <<elseif $targetArcology.FSAztecRevivalist != "unset">> - <<set $opinion -= $activeArcology.FSEgyptianRevivalist>> - <<set $opinion -= $targetArcology.FSAztecRevivalist>> + <<set $opinion -= $activeArcology.FSEgyptianRevivalist>> + <<set $opinion -= $targetArcology.FSAztecRevivalist>> <<elseif $targetArcology.FSEdoRevivalist != "unset">> - <<set $opinion -= $activeArcology.FSEgyptianRevivalist>> - <<set $opinion -= $targetArcology.FSEdoRevivalist>> + <<set $opinion -= $activeArcology.FSEgyptianRevivalist>> + <<set $opinion -= $targetArcology.FSEdoRevivalist>> <<elseif $targetArcology.FSArabianRevivalist != "unset">> - <<set $opinion -= $activeArcology.FSEgyptianRevivalist>> - <<set $opinion -= $targetArcology.FSArabianRevivalist>> + <<set $opinion -= $activeArcology.FSEgyptianRevivalist>> + <<set $opinion -= $targetArcology.FSArabianRevivalist>> <<elseif $targetArcology.FSChineseRevivalist != "unset">> - <<set $opinion -= $activeArcology.FSEgyptianRevivalist>> - <<set $opinion -= $targetArcology.FSChineseRevivalist>> + <<set $opinion -= $activeArcology.FSEgyptianRevivalist>> + <<set $opinion -= $targetArcology.FSChineseRevivalist>> + <</if>> + <<if $targetArcology.FSIncestFetishist != "unset">> + <<set $opinion += $activeArcology.FSEgyptianRevivalist>> + <<set $opinion += $targetArcology.FSIncestFetishist>> <</if>> <<elseif $activeArcology.FSEdoRevivalist != "unset">> <<if $targetArcology.FSEdoRevivalist != "unset">> @@ -315,6 +319,16 @@ <<set $opinion -= $targetArcology.FSAztecRevivalist>> <</if>> <</if>> +<<if $activeArcology.FSIncestFetishist != "unset">> + <<if $targetArcology.FSIncestFetishist != "unset">> + <<set $opinion += $activeArcology.FSIncestFetishist>> + <<set $opinion += $targetArcology.FSIncestFetishist>> + <</if>> + <<if $targetArcology.FSEgyptianRevivalist != "unset">> + <<set $opinion += $activeArcology.FSIncestFetishist>> + <<set $opinion += $targetArcology.FSEgyptianRevivalist>> + <</if>> +<</if>> <<set $activeArcology = 0>> <<set $targetArcology = 0>> diff --git a/src/uncategorized/futureSocities.tw b/src/uncategorized/futureSocities.tw index 8f8feeb026c07158f4e5067834bafa2f4d83348c..8f40840ba71261a1a7ea324ac6e221426187e176 100644 --- a/src/uncategorized/futureSocities.tw +++ b/src/uncategorized/futureSocities.tw @@ -51,6 +51,9 @@ <<if ndef $arcologies[0].FSCummunism>> <<set $arcologies[0].FSCummunism = "unset">> <</if>> +<<if ndef $arcologies[0].FSIncestFetishist>> + <<set $arcologies[0].FSIncestFetishist = "unset">> +<</if>> <<if ndef $arcologies[0].FSPhysicalIdealist>> <<set $arcologies[0].FSPhysicalIdealist = "unset">> <</if>> diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw index 403220c55f7ea8ced76d2ce385c13a2641bc88ff..139e8d954348d3f462ce1b7fd8d653ede3ab6103 100644 --- a/src/uncategorized/neighborDescription.tw +++ b/src/uncategorized/neighborDescription.tw @@ -380,6 +380,24 @@ its neighbors. <</if>> <<set $seed.push($desc)>> <</if>> +<<if $arcologies[$i].FSIncestFetishist != "unset">> + <<if $arcologies[$i].FSIncestFetishist > 80>> + <<set $desc = "committed to ">> + <<elseif $arcologies[$i].FSIncestFetishist > 20>> + <<set $desc = "pursuing ">> + <<else>> + <<set $desc = "just establishing ">> + <</if>> + <<set $desc = $desc + "@@.gold;Incest Fetishism@@, and is ">> + <<if $arcologies[$i].FSIncestFetishist > 95>> + <<set $desc = $desc + "highly recomended as a place to stop by if you like threesomes with twins or familial gangbangs.">> + <<elseif $arcologies[$i].FSIncestFetishist > 40>> + <<set $desc = $desc + "attracting a substantial number of families.">> + <<else>> + <<set $desc = $desc + "devoting more and more of its resources into genealogy.">> + <</if>> + <<set $seed.push($desc)>> +<</if>> <<if $arcologies[$i].FSChattelReligionist != "unset">> <<if $arcologies[$i].FSChattelReligionist > 80>> <<set $desc = "committed to ">> diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw index bd792c47d7524ae507ce63246d961d8920d71031..76c3123fb596f80c97b1e4f872df0deb34820ec6 100644 --- a/src/uncategorized/neighborInteract.tw +++ b/src/uncategorized/neighborInteract.tw @@ -122,6 +122,9 @@ <<if $arcologies[0].FSHedonisticDecadence > 60>> <<set $desc.push("Hedonistic Decadence")>> <</if>> +<<if $arcologies[0].FSIncestFetishist > 60>> + <<set $desc.push("Incest Fetishism")>> +<</if>> <<if $arcologies[0].FSChattelReligionist > 60>> <<set $desc.push("Chattel Religionism")>> <</if>> @@ -280,6 +283,9 @@ A 1% interest in $activeArcology.name is worth <<print cashFormat($seed)>> and w <<if $activeArcology.FSHedonisticDecadence != "unset">> <br><<link "Force Abandonment of Hedonistic Decadence">><<set $activeArcology.FSHedonisticDecadence = "unset">><<goto "Neighbor Interact">><</link>> <</if>> +<<if $activeArcology.FSIncestFetishist != "unset">> + <br><<link "Force Abandonment of Incest Fetishism">><<set $activeArcology.FSIncestFetishist = "unset">><<goto "Neighbor Interact">><</link>> +<</if>> <<if $activeArcology.FSChattelReligionist != "unset">> <br><<link "Force Abandonment of Chattel Religionism">><<set $activeArcology.FSChattelReligionist = "unset">><<goto "Neighbor Interact">><</link>> <</if>> diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw index 87758d6a5096f41b362150e5fead85f0c9e5671c..39f4258f3943c78baa95c3856b70ebeff83774f5 100644 --- a/src/uncategorized/neighborsDevelopment.tw +++ b/src/uncategorized/neighborsDevelopment.tw @@ -316,6 +316,14 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <<set $arcologies[$i].FSHedonisticDecadence -= 10>> <</if>> <</if>> + <<if $arcologies[$i].FSIncestFetishist != "unset">> + <<if $arcologies[$i].FSIncestFetishist < random(10,150)>> + <<set $desc.push("Incest Fetishism")>> + <<set $arcologies[$i].FSIncestFetishist = "unset">> + <<else>> + <<set $arcologies[$i].FSIncestFetishist -= 10>> + <</if>> + <</if>> <<if $arcologies[$i].FSChattelReligionist != "unset">> <<if $arcologies[$i].FSChattelReligionist < random(10,150)>> <<set $desc.push("Chattel Religionism")>> @@ -1378,6 +1386,43 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <</if>> <</if>> +<<if $arcologies[$i].FSIncestFetishist != "unset">> + <<set _societiesAdopted += 1>> + <<if $arcologies[$i].direction != 0>> + <<set $arcologies[$i].FSIncestFetishist += $efficiency>> + <</if>> + <<for $j = 0; $j < $arcologies.length; $j++>> + <<if $arcologies[$i].direction != $arcologies[$j].direction>> + <<if $arcologies[$j].FSIncestFetishist > $arcologies[$i].FSIncestFetishist + _FSCrossThresh>> + <<if $showNeighborDetails != 0>>Incest Fetishism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>> + <<set $arcologies[$i].FSIncestFetishist += 1>> + <</if>> + <</if>> + <</for>> + <<if $arcologies[$i].direction != 0>> + <<if $arcologies[$i].FSIncestFetishist >= $FSLockinLevel>> + <<set $arcologies[$i].influenceBonus += $arcologies[$i].FSIncestFetishist - $FSLockinLevel>> + <<set $arcologies[$i].FSIncestFetishist = $FSLockinLevel>> + <<set $toSearch = $arcologies[$i].name>> + <<if ($toSearch.indexOf("Arcology") != -1) && (random(0,2) == 0)>> + Incest Fetishism has reached stability and acceptance there. The arcology has been renamed + <<set $arcologies[$i].name = setup.ArcologyNamesIncestFetishist.random()>> + ''$arcologies[$i].name'' to mark the occasion. + <</if>> + <<elseif $arcologies[$i].FSIncestFetishist < 0>> + $arcologies[$i].name @@.cyan;has given up@@ on Incest Fetishism. + <<set $arcologies[$i].FSIncestFetishist = "unset">> + <</if>> + <</if>> + <<if $corpIncorporated == 1>> + <<if $captureUpgradeAge == "young">> + It's a @@.lightgreen;good market@@ for your corporation's young slaves, improving sales and helping social progress. + <<set $arcologies[$i].FSIncestFetishist += 1>> + <<set $corpCash += _corpBonus>> + <</if>> + <</if>> +<</if>> + <<if $arcologies[$i].FSChattelReligionist != "unset">> <<set _societiesAdopted += 1>> <<if $arcologies[$i].direction != 0>> @@ -1943,6 +1988,13 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <<set $desc.push("attacking its Physical Idealism")>> <</if>> <</if>> +<<if $arcologies[$j].FSIncestFetishist > 60>> + <<if $arcologies[$i].FSIncestFetishist != "unset">> + <<set $arcologies[$i].FSIncestFetishist += Math.trunc(($arcologies[$j].FSIncestFetishist-60)/4)+$appliedInfluenceBonus>> + <<if $arcologies[$i].FSIncestFetishist > $FSLockinLevel>><<set _alignment += 1>><</if>> + <<set $desc.push("helping to advance its Incest Fetishism")>> + <</if>> +<</if>> <<if $arcologies[$j].FSChattelReligionist > 60>> <<if $arcologies[$i].FSChattelReligionist != "unset">> <<set $arcologies[$i].FSChattelReligionist += Math.trunc(($arcologies[$j].FSChattelReligionist-60)/4)+$appliedInfluenceBonus>> @@ -2172,6 +2224,9 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <<elseif $arcologies[$i].FSHedonisticDecadence > 60>> <<set _influential = 1>> <</if>> +<<if $arcologies[$i].FSIncestFetishist > 60>> + <<set _influential = 1>> +<</if>> <<if $arcologies[$i].FSChattelReligionist > 60>> <<set _influential = 1>> <</if>> @@ -2362,6 +2417,13 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <<set _eligibleTargets.push($arcologies[$j].direction)>> <</if>> <</if>> +<<if $arcologies[$i].FSIncestFetishist != "unset">> + <<if $arcologies[$j].FSIncestFetishist != "unset">> + <<if $arcologies[$j].FSIncestFetishist < $FSLockinLevel>> + <<set _eligibleTargets.push($arcologies[$j].direction)>> + <</if>> + <</if>> +<</if>> <<if $arcologies[$i].FSChattelReligionist != "unset">> <<if $arcologies[$j].FSChattelReligionist != "unset">> <<if $arcologies[$j].FSChattelReligionist < $FSLockinLevel>> diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw index f33c0a06dab9c2f10bb403ca80bd4a36ea9c4adf..14882cf00fc1cb49f4f951e8b3c1f90b54e0c427 100644 --- a/src/uncategorized/neighborsFSAdoption.tw +++ b/src/uncategorized/neighborsFSAdoption.tw @@ -400,6 +400,19 @@ societal development. <</if>> <</if>> <<if $adopted == 0>> +<<if ($arcologies[$i].FSIncestFetishist == "unset")>> + <<if $familyTesting == 1>> + <<set _lover = $slaves.find(function(s) { return s.ID == $leaders[$j].relationshipTaget && areRelated(s, $leaders[$j]) && s.assignment == "live with your agent"; })>> + <<else> + <<set _lover = $slaves.find(function(s) { return s.ID == $leaders[$j].relationshipTaget && s.ID == $leaders[$j].relationTaget && s.assignment == "live with your agent"; })>> + <</if>> + <<if ($leaders[$j].behavioralQuirk == "sinful" || $leaders[$j].sexualQuirk == "perverted") && def _lover>> + Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Incest Festishism@@, to share the love and joy she holds with her relativeTerm($leaders[$j], _lover). + <<set $arcologies[$i].FSIncestFetishist = 5>><<set $adopted = 1>> + <</if>> +<</if>> +<</if>> +<<if $adopted == 0>> <<if ($arcologies[$i].FSChattelReligionist == "unset")>> <<if ($arcologies[$i].FSNull == "unset")>> <<if $leaders[$j].behavioralQuirk == "devout">> @@ -421,39 +434,11 @@ societal development. <<if ($arcologies[$i].FSArabianRevivalist == "unset")>> <<if ($arcologies[$i].FSChineseRevivalist == "unset")>> <<if ($leaders[$j].relationshipTarget != 0)>> - <<for $k = 0; $k < $slaves.length; $k++>> - <<if $leaders[$j].mother == $slaves[$k].ID>> - <<if $leaders[$j].relationshipTarget == $slaves[$k].ID>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Egyptian Revivalism@@, since she's already part of a gloriously incestuous relationship. - <<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>> - <</if>> - <<break>> - <<elseif $leaders[$j].father == $slaves[$k].ID>> - <<if $leaders[$j].relationshipTarget == $slaves[$k].ID>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Egyptian Revivalism@@, since she's already part of a gloriously incestuous relationship. - <<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>> - <</if>> - <<break>> - <<elseif $leaders[$j].ID == $slaves[$k].father>> - <<if $leaders[$j].relationshipTarget == $slaves[$k].ID>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Egyptian Revivalism@@, since she's already part of a gloriously incestuous relationship. - <<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>> - <</if>> - <<break>> - <<elseif $leaders[$j].ID == $slaves[$k].mother>> - <<if $leaders[$j].relationshipTarget == $slaves[$k].ID>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Egyptian Revivalism@@, since she's already part of a gloriously incestuous relationship. - <<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>> - <</if>> - <<break>> - <<elseif areSisters($leaders[$j], $slaves[$k]) > 0>> - <<if $leaders[$j].relationshipTarget == $slaves[$k].ID>> - Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Egyptian Revivalism@@, since she's already part of a gloriously incestuous relationship. - <<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>> - <</if>> - <<break>> - <</if>> - <</for>> + <<set _lover = $slaves.findIndex(function(s) { return areRelated(s, $leaders[$j]) && $leaders[$j].relationshipTarget == s.ID; })>> + <<if _lover != -1>> + Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Egyptian Revivalism@@, since she's already part of a gloriously incestuous relationship. + <<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>> + <</if>> <<elseif $leaders[$j].nationality == "Chinese">> Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Chinese Revivalism@@, since she's Chinese herself and can claim high honor in such a society. <<set $arcologies[$i].FSChineseRevivalist = 5>><<set $adopted = 1>> @@ -640,7 +625,7 @@ societal development. The arcology's Youth Preferentialist culture @@.yellow;pushes it towards Slimness Enthusiasm,@@ since that's the kind of body many of its slaves have. <<set $arcologies[$i].FSSlimnessEnthusiast = 5>><<set $adopted = 1>> <<elseif ($arcologies[$i].FSRepopulationFocus == "unset") && ($arcologies[$i].FSRestart == "unset")>> - The arcology's Youth Preferentialist culture @@.yellow;pushes it towards Repopulation,@@ since many of its slaves are deliciously ripe for breeding. + The arcology's Youth Preferentialist culture @@.yellow;pushes it towards Repopulationism,@@ since many of its slaves are deliciously ripe for breeding. <<set $arcologies[$i].FSRepopulationFocus = 5>><<set $adopted = 1>> <</if>> <<elseif $arcologies[$i].FSMaturityPreferentialist > random(50,200)>> @@ -681,7 +666,7 @@ societal development. The arcology's Pastoralist culture @@.yellow;pushes it towards Asset Expansionism,@@ since they're convinced that there's no such thing as udders that are too big. <<set $arcologies[$i].FSAssetExpansionist = 5>><<set $adopted = 1>> <<elseif ($arcologies[$i].FSRepopulationFocus == "unset") && ($arcologies[$i].FSRestart == "unset")>> - The arcology's Pastoralist culture @@.yellow;pushes it towards Repopulation,@@ since pregnancy stimulates milk flow. + The arcology's Pastoralist culture @@.yellow;pushes it towards Repopulationisn,@@ since pregnancy stimulates milk flow. <<set $arcologies[$i].FSRepopulationFocus = 5>><<set $adopted = 1>> <</if>> <<elseif $arcologies[$i].FSCummunism > random(50,200)>> @@ -720,6 +705,23 @@ societal development. <</if>> <</if>> <<if $adopted == 0>> +<<if $arcologies[$i].FSIncestFetishist > random(50,200)>> + <<if ($arcologies[$i].FSRepopulationFocus == "unset") && ($arcologies[$i].FSRestart == "unset")>> + The arcology's Incest Fetishizing culture @@.yellow;pushes it towards Repopulationism,@@ in order to create many new future loving couples. + <<set $arcologies[$i].FSRepopulationFocus = 5>><<set $adopted = 1>> + <<elseif ($arcologies[$i].FSBodyPurist == "unset") && ($arcologies[$i].FSTransformationFetishist == "unset")>> + The arcology's Incest Fetishizing culture @@.yellow;pushes it towards Body Purism,@@ in order to keep its bloodlines pure. + <<set $arcologies[$i].FSBodyPurist = 5>><<set $adopted = 1>> + <<elseif ($arcologies[$i].FSPaternalist == "unset") && ($arcologies[$i].FSDegradationist == "unset")>> + The arcology's Incest Fetishizing culture @@.yellow;pushes it towards Paternalism,@@ as healthy slaves live longer allowing relationships to span generations. + <<set $arcologies[$i].FSPaternalist = 5>><<set $adopted = 1>> + <<elseif ($arcologies[$i].FSRomanRevivalist == "unset") && ($arcologies[$i].FSAztecRevivalist == "unset") && ($arcologies[$i].FSEgyptianRevivalist == "unset") && ($arcologies[$i].FSEdoRevivalist == "unset") && ($arcologies[$i].FSArabianRevivalist == "unset") && ($arcologies[$i].FSChineseRevivalist == "unset")>> + The arcology's Incest Fetishizing culture @@.yellow;pushes it towards Egyptian Revivalism,@@ as they naturally seek even more incestuous fun. + <<set $arcologies[$i].FSEgyptianRevivalist = 5>><<set $adopted = 1>> + <</if>> +<</if>> +<</if>> +<<if $adopted == 0>> <<if $arcologies[$i].FSChattelReligionist > random(50,200)>> <<if ($arcologies[$i].FSPaternalist == "unset") && ($arcologies[$i].FSDegradationist == "unset")>> The arcology's Chattel Religionist culture @@.yellow;pushes it towards Paternalism,@@ since charitable care for slaves' welfare has become widespread. @@ -749,8 +751,11 @@ societal development. <<if $adopted == 0>> <<if $arcologies[$i].FSEgyptianRevivalist > random(50,200)>> <<if ($arcologies[$i].FSChattelReligionist == "unset")>> - The arcology's Egyptian Revivalist culture @@.yellow;pushes it towards Chattel Religionism,@@ since worship is already becoming an established part of its life. - <<set $arcologies[$i].FSChattelReligionist = 5>><<set $adopted = 1>> + The arcology's Egyptian Revivalist culture @@.yellow;pushes it towards Chattel Religionism,@@ since worship is already becoming an established part of its life. + <<set $arcologies[$i].FSChattelReligionist = 5>><<set $adopted = 1>> + <<elseif $arcologies[$i].FSIncestFetishist == "unset">> + The arcology's Egyptian Revivalist culture @@.yellow;pushes it towards Incest Fetishism,@@ since more incest is only a good thing in its eyes. + <<set $arcologies[$i].FSIncestFetishist = 5>><<set $adopted = 1>> <</if>> <</if>> <</if>> @@ -980,7 +985,7 @@ societal development. <<default>> <<set $desc = "Its citizens are">> <</switch>> -<<switch random(1,25)>> +<<switch random(1,26)>> <<case 1>> <<set $seed = either("white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race")>> <<if ($arcologies[$i].FSSubjugationist == "unset")>> @@ -1114,6 +1119,11 @@ societal development. $desc obsessed with cum, leading the arcology to @@.yellow;adopt Cummunism.@@ <<set $arcologies[$i].FSCummunism = 5>><<set $adopted = 1>> <</if>> +<<case 26>> + <<if ($arcologies[$i].FSIncestFetishist == "unset")>> + $desc obsessed with their relatives, leading the arcology to @@.yellow;adopt Incest Fetishism.@@ + <<set $arcologies[$i].FSIncestFetishist = 5>><<set $adopted = 1>> + <</if>> <</switch>> <</if>> <</if>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index fc634e1afe61db4cbf23492779f53ac67a83ac86..55af475b4eb8bf7d3330bb743e454fe5f492bb4c 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -2724,6 +2724,21 @@ <</if>> <</if>> + <<if $arcologies[_market].FSIncestFetishist > 20>> + Incest is acceptable, if not preferable to them. + <<if $activeSlave.sexualQuirk == "none" && $activeSlave.behavioralQuirk == "none">> + <<if random(0,1) == 0>> + <<set $activeSlave.sexualQuirk = "perverted">> + <<else>> + <<set $activeSlave.behavioralQuirk = "sinful">> + <</if>> + <<elseif $activeSlave.sexualQuirk == "none" || $activeSlave.sexualQuirk == "perverted">> + <<set $activeSlave.sexualQuirk = "perverted">> + <<else>> + <<set $activeSlave.behavioralQuirk = "sinful">> + <</if>> + <</if>> + <<if ($arcologies[0].FSDegradationist != "unset") && ($arcologies[_market].FSPaternalist != "unset")>> <<set $activeSlave.devotion = random(-90,-60)>> <<set $activeSlave.trust = -20>>