Skip to content
Snippets Groups Projects
Commit 55e5ffe8 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-dev' into 'pregmod-master'

remove $activeArcology

See merge request pregmodfan/fc-pregmod!4679
parents 2ec28bd8 1012825e
No related branches found
No related tags found
No related merge requests found
......@@ -75,90 +75,90 @@
<<set $neighboringArcologies = variableAsNumber($neighboringArcologies, 0, 8, 3)>>
<<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, CyberEconomic: 1, CyberEconomicTarget: -1, CyberReputation: 1, CyberReputationTarget: -1, 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}>>
<<set _newArcology = {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, CyberEconomic: 1, CyberEconomicTarget: -1, CyberReputation: 1, CyberReputationTarget: -1, 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, $activeArcology.FSIncestFetishistDecoration = 20>>
<<set _newArcology.direction = 0>>
<<set _newArcology.name = "Arcology X-4">>
<<set _newArcology.FSSupremacistDecoration = 20, _newArcology.FSSubjugationistDecoration = 20, _newArcology.FSGenderRadicalistDecoration = 20, _newArcology.FSGenderFundamentalistDecoration = 20, _newArcology.FSPaternalistDecoration = 20, _newArcology.FSDegradationistDecoration = 20, _newArcology.FSBodyPuristDecoration = 20, _newArcology.FSTransformationFetishistDecoration = 20, _newArcology.FSYouthPreferentialistDecoration = 20, _newArcology.FSMaturityPreferentialistDecoration = 20, _newArcology.FSSlimnessEnthusiastDecoration = 20, _newArcology.FSAssetExpansionistDecoration = 20, _newArcology.FSPastoralistDecoration = 20, _newArcology.FSPhysicalIdealistDecoration = 20, _newArcology.FSChattelReligionistDecoration = 20, _newArcology.FSRomanRevivalistDecoration = 20, _newArcology.FSAztecRevivalistDecoration = 20, _newArcology.FSEgyptianRevivalistDecoration = 20, _newArcology.FSEdoRevivalistDecoration = 20, _newArcology.FSArabianRevivalistDecoration = 20, _newArcology.FSChineseRevivalistDecoration = 20, _newArcology.FSRepopulationFocusDecoration = 20, _newArcology.FSRestartDecoration = 20, _newArcology.FSHedonisticDecadenceDecoration = 20, _newArcology.FSCummunismDecoration = 20, _newArcology.FSIncestFetishistDecoration = 20>>
<<if $targetArcology.type != "New">>
<<set $FSAnnounced = 1>>
<<set $FSGotRepCredits = 1>>
<<set $activeArcology.name = $targetArcology.name, $activeArcology.prosperity = $targetArcology.prosperity, $ACitizens += $targetArcology.citizens*500>>
<<set _newArcology.name = $targetArcology.name, _newArcology.prosperity = $targetArcology.prosperity, $ACitizens += $targetArcology.citizens*500>>
<<set _decoration = $targetArcology.FSProgress + 10>>
<<switch $targetArcology.type>>
<<case "Supremacist">>
<<set $activeArcology.FSSupremacist = $targetArcology.FSProgress, $activeArcology.FSSupremacistDecoration = _decoration, $activeArcology.FSSupremacistRace = $targetArcology.race>>
<<set _newArcology.FSSupremacist = $targetArcology.FSProgress, _newArcology.FSSupremacistDecoration = _decoration, _newArcology.FSSupremacistRace = $targetArcology.race>>
<<case "Subjugationist">>
<<set $activeArcology.FSSubjugationist = $targetArcology.FSProgress, $activeArcology.FSSubjugationistDecoration = _decoration, $activeArcology.FSSubjugationistRace = $targetArcology.race>>
<<set _newArcology.FSSubjugationist = $targetArcology.FSProgress, _newArcology.FSSubjugationistDecoration = _decoration, _newArcology.FSSubjugationistRace = $targetArcology.race>>
<<case "GenderRadicalist">>
<<set $activeArcology.FSGenderRadicalist = $targetArcology.FSProgress, $activeArcology.FSGenderRadicalistDecoration = _decoration>>
<<set _newArcology.FSGenderRadicalist = $targetArcology.FSProgress, _newArcology.FSGenderRadicalistDecoration = _decoration>>
<<case "GenderFundamentalist">>
<<set $activeArcology.FSGenderFundamentalist = $targetArcology.FSProgress, $activeArcology.FSGenderFundamentalistDecoration = _decoration>>
<<set _newArcology.FSGenderFundamentalist = $targetArcology.FSProgress, _newArcology.FSGenderFundamentalistDecoration = _decoration>>
<<case "Paternalist">>
<<set $activeArcology.FSPaternalist = $targetArcology.FSProgress, $activeArcology.FSPaternalistDecoration = _decoration>>
<<set _newArcology.FSPaternalist = $targetArcology.FSProgress, _newArcology.FSPaternalistDecoration = _decoration>>
<<case "Degradationist">>
<<set $activeArcology.FSDegradationist = $targetArcology.FSProgress, $activeArcology.FSDegradationistDecoration = _decoration>>
<<set _newArcology.FSDegradationist = $targetArcology.FSProgress, _newArcology.FSDegradationistDecoration = _decoration>>
<<case "AssetExpansionist">>
<<set $activeArcology.FSAssetExpansionist = $targetArcology.FSProgress, $activeArcology.FSAssetExpansionistDecoration = _decoration>>
<<set _newArcology.FSAssetExpansionist = $targetArcology.FSProgress, _newArcology.FSAssetExpansionistDecoration = _decoration>>
<<case "SlimnessEnthusiast">>
<<set $activeArcology.FSSlimnessEnthusiast = $targetArcology.FSProgress, $activeArcology.FSSlimnessEnthusiastDecoration = _decoration>>
<<set _newArcology.FSSlimnessEnthusiast = $targetArcology.FSProgress, _newArcology.FSSlimnessEnthusiastDecoration = _decoration>>
<<case "TransformationFetishist">>
<<set $activeArcology.FSTransformationFetishist = $targetArcology.FSProgress, $activeArcology.FSTransformationFetishistDecoration = _decoration>>
<<set _newArcology.FSTransformationFetishist = $targetArcology.FSProgress, _newArcology.FSTransformationFetishistDecoration = _decoration>>
<<case "BodyPurist">>
<<set $activeArcology.FSBodyPurist = $targetArcology.FSProgress, $activeArcology.FSBodyPuristDecoration = _decoration>>
<<set _newArcology.FSBodyPurist = $targetArcology.FSProgress, _newArcology.FSBodyPuristDecoration = _decoration>>
<<case "MaturityPreferentialist">>
<<set $activeArcology.FSMaturityPreferentialist = $targetArcology.FSProgress, $activeArcology.FSMaturityPreferentialistDecoration = _decoration>>
<<set _newArcology.FSMaturityPreferentialist = $targetArcology.FSProgress, _newArcology.FSMaturityPreferentialistDecoration = _decoration>>
<<case "YouthPreferentialist">>
<<set $activeArcology.FSYouthPreferentialist = $targetArcology.FSProgress, $activeArcology.FSYouthPreferentialistDecoration = _decoration>>
<<set _newArcology.FSYouthPreferentialist = $targetArcology.FSProgress, _newArcology.FSYouthPreferentialistDecoration = _decoration>>
<<case "Pastoralist">>
<<set $activeArcology.FSPastoralist = $targetArcology.FSProgress, $activeArcology.FSPastoralistDecoration = _decoration>>
<<set _newArcology.FSPastoralist = $targetArcology.FSProgress, _newArcology.FSPastoralistDecoration = _decoration>>
<<case "PhysicalIdealist">>
<<set $activeArcology.FSPhysicalIdealist = $targetArcology.FSProgress, $activeArcology.FSPhysicalIdealistDecoration = _decoration>>
<<set _newArcology.FSPhysicalIdealist = $targetArcology.FSProgress, _newArcology.FSPhysicalIdealistDecoration = _decoration>>
<<case "ChattelReligionist">>
<<set $activeArcology.FSChattelReligionist = $targetArcology.FSProgress, $activeArcology.FSChattelReligionistDecoration = _decoration>>
<<set _newArcology.FSChattelReligionist = $targetArcology.FSProgress, _newArcology.FSChattelReligionistDecoration = _decoration>>
<<case "RomanRevivalist">>
<<set $activeArcology.FSRomanRevivalist = $targetArcology.FSProgress, $activeArcology.FSRomanRevivalistDecoration = _decoration>>
<<set _newArcology.FSRomanRevivalist = $targetArcology.FSProgress, _newArcology.FSRomanRevivalistDecoration = _decoration>>
<<case "AztecRevivalist">>
<<set $activeArcology.FSAztecRevivalist = $targetArcology.FSProgress, $activeArcology.FSAztecRevivalistDecoration = _decoration>>
<<set _newArcology.FSAztecRevivalist = $targetArcology.FSProgress, _newArcology.FSAztecRevivalistDecoration = _decoration>>
<<case "EgyptianRevivalist">>
<<set $activeArcology.FSEgyptianRevivalist = $targetArcology.FSProgress, $activeArcology.FSEgyptianRevivalistDecoration = _decoration>>
<<set _newArcology.FSEgyptianRevivalist = $targetArcology.FSProgress, _newArcology.FSEgyptianRevivalistDecoration = _decoration>>
<<case "EdoRevivalist">>
<<set $activeArcology.FSEdoRevivalist = $targetArcology.FSProgress, $activeArcology.FSEdoRevivalistDecoration = _decoration>>
<<set _newArcology.FSEdoRevivalist = $targetArcology.FSProgress, _newArcology.FSEdoRevivalistDecoration = _decoration>>
<<case "ArabianRevivalist">>
<<set $activeArcology.FSArabianRevivalist = $targetArcology.FSProgress, $activeArcology.FSArabianRevivalistDecoration = _decoration>>
<<set _newArcology.FSArabianRevivalist = $targetArcology.FSProgress, _newArcology.FSArabianRevivalistDecoration = _decoration>>
<<case "ChineseRevivalist">>
<<set $activeArcology.FSChineseRevivalist = $targetArcology.FSProgress, $activeArcology.FSChineseRevivalistDecoration = _decoration>>
<<set _newArcology.FSChineseRevivalist = $targetArcology.FSProgress, _newArcology.FSChineseRevivalistDecoration = _decoration>>
<<case "Eugenics">>
<<set $activeArcology.FSRestart = $targetArcology.FSProgress, $activeArcology.FSRestartDecoration = _decoration>>
<<set _newArcology.FSRestart = $targetArcology.FSProgress, _newArcology.FSRestartDecoration = _decoration>>
<<case "Repopulationist">>
<<set $activeArcology.FSRepopulationFocus = $targetArcology.FSProgress, $activeArcology.FSRepopulationFocusDecoration = _decoration>>
<<set _newArcology.FSRepopulationFocus = $targetArcology.FSProgress, _newArcology.FSRepopulationFocusDecoration = _decoration>>
<<case "HedonisticDecadence">>
<<set $activeArcology.FSHedonisticDecadence = $targetArcology.FSProgress, $activeArcology.FSHedonisticDecadenceDecoration = _decoration>>
<<set _newArcology.FSHedonisticDecadence = $targetArcology.FSProgress, _newArcology.FSHedonisticDecadenceDecoration = _decoration>>
<<default>>
<<set $activeArcology.FSNull = 20>>
<<set _newArcology.FSNull = 20>>
<</switch>>
<<if $PC.rumor == "social engineering">>
<<set $FSGotRepCredits += 1>>
<</if>>
<<else>>
<<set $activeArcology.honeymoon = 20>>
<<set _newArcology.honeymoon = 20>>
<<if $PC.rumor == "social engineering">>
<<set $FSGotRepCredits += 1>>
<</if>>
<</if>>
<<else>>
<<if $i < 4>> /* X-4 is reserved for player's arcology, so X-1 is available */
<<set $activeArcology.name = $activeArcology.name+($i)>>
<<set _newArcology.name = _newArcology.name+($i)>>
<<else>>
<<set $activeArcology.name = $activeArcology.name+($i+1)>>
<<set _newArcology.name = _newArcology.name+($i+1)>>
<</if>>
<<set $activeArcology.direction = _seed.pluck()>>
<<set $activeArcology.government = _govtypes.random()>>
<<set $activeArcology.prosperity += random(-20,20)>>
<<set $activeArcology.ownership += random(-10,0)>>
<<set $activeArcology.minority += random(-5,5)>>
<<set _newArcology.direction = _seed.pluck()>>
<<set _newArcology.government = _govtypes.random()>>
<<set _newArcology.prosperity += random(-20,20)>>
<<set _newArcology.ownership += random(-10,0)>>
<<set _newArcology.minority += random(-5,5)>>
<</if>>
<<set $arcologies.push($activeArcology)>>
<<set $arcologies.push(_newArcology)>>
<</for>>
<<set $arcologies[0].FSSupremacistLawME = 0>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment