diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw index 942d6670a7173c28d8da8dbab99aa1251edb2dae..00f939a22712ce1ff1669cbe5aa1b431b94c2018 100644 --- a/src/npc/acquisition.tw +++ b/src/npc/acquisition.tw @@ -125,6 +125,17 @@ <</if>> <</for>> <</if>> +<<if $plot == 1 && $neighboringArcologies > 0>> + <<set _bestProsperity = 0, _bestProsperityIndex = 1>> + <<for _acq = 1; _acq < $arcologies.length; _acq++>> + <<if $arcologies[_acq].prosperity > _bestProsperity>> + <<set _bestProsperity = $arcologies[_acq].prosperity>> + <<set _bestProsperityIndex = _acq>> + <</if>> + <</for>> + <<set $rivalSet = 1>> + <<set $arcologies[_bestProsperityIndex].rival = 1>> +<</if>> You've done it. <br><br> diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw index 344e73d7f4c2b756dd13fe157d0cac84176dc632..7347b94396e1bb3c5efaf4f3156eabfdd14b79c0 100644 --- a/src/uncategorized/neighborsDevelopment.tw +++ b/src/uncategorized/neighborsDevelopment.tw @@ -399,14 +399,6 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <<elseif $arcologies[$i].prosperity > $averageProsperity + 10>> much more prosperous than the rest of the Free City, limiting its economic development. <<set $arcologies[$i].prosperity -= 1>> - <<if $arcologies[$i].direction != 0>> - <<if $rivalSet == 0>> - <<if $rivalryFS != 0>> - <<set $arcologies[$i].rival = 1>> - <<set $rivalSet = 1>> - <</if>> - <</if>> - <</if>> <<elseif $arcologies[$i].prosperity >= $averageProsperity - 10>> about as prosperous as the rest of the Free City. <<else>> diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw index a4730457609b01b829183362afe86da4308c4d4a..e1e876623f1c744051d165d8b791b73b1eef63a5 100644 --- a/src/uncategorized/neighborsFSAdoption.tw +++ b/src/uncategorized/neighborsFSAdoption.tw @@ -133,10 +133,12 @@ societal development. <<if $arcologies[$i].FSChineseRevivalist != "unset">><<set $arcologies[$i].FSChineseRevivalist = "unset">><</if>> $desc fascinated by Japanese history, leading the arcology to @@.yellow;adopt Edo Revivalism.@@ <<set $arcologies[$i].FSEdoRevivalist = 5>><<set _adopted = 1>> - <<case "Aztec Revivalism">> + <<case "Aztec Revivalism">> <<if $arcologies[$i].FSAztecRevivalist != "unset">><<set $arcologies[$i].FSAztecRevivalist = "unset">><</if>> $desc fascinated by classical Roman history, leading the arcology to @@.yellow;adopt Roman Revivalism.@@ <<set $arcologies[$i].FSRomanRevivalist = 5>><<set _adopted = 1>> + <<default>> + <<set $rivalryFSAdopted = 0>> <</switch>> <<else>> diff --git a/src/uncategorized/pCoupAftermath.tw b/src/uncategorized/pCoupAftermath.tw index 3df68be957fa1542c1e1c9d9023b70a7d5b78c48..c7e62f385bcb3734a3bbfd5c57ca5cdf940f6ae9 100644 --- a/src/uncategorized/pCoupAftermath.tw +++ b/src/uncategorized/pCoupAftermath.tw @@ -2,10 +2,6 @@ <<set $nextButton = " ", $nextLink = "Random Nonindividual Event", $rivalOwner = 0, $rivalryPower = 0, _num = random(0,99)>> /* hide button until user makes a selection */ -<<if $rivalryFS == 0>> - <<set $hostage = 0, $hostageAnnounced = 0>> -<</if>> - <<if $mercenaries == 0>>Your security drones<<elseif $mercenaries <= 3>>Your mercenaries<<else>>Your $mercenariesTitle<</if>> perform the grisly task of disposing of the bodies of the Daughters killed in the assault. They strip them of anything that might be of use in cleaning up after the attempted coup - communication devices, PDAs, computers, even handwritten notes. The raw intel is scanned and passed to $assistantName. Most of it is rubbish. <br><br> Some of it is not. There is evidence of payments from a <<if $rivalSet == 0>>nearby Free City<<else>>neighboring arcology<</if>> to the leadership of the Daughters. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> is silent for a long time, crosschecking records to assemble a complete picture despite your enemies' attempts to disguise the transactions. Finally, $assistantName finishes and displays a picture, using nearly the entire surface of your desk for effect. <<if $assistant > 0>>"This," she says in a tone of satisfaction, "is the <<if _num < $seeDicks>>bastard<<elseif (_num-25) < $seeDicks>>bitch<<else>>cunt<</if>> you want, <<if $PC.title == 0>>Ma'am<<else>>Sir<</if>>."<<else>>"This," it says neutrally, "is the culprit, <<if $PC.title == 0>>Ma'am<<else>>Sir<</if>>."<</if>> diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw index a967b8c03143df5fde2eb190cbe1ccbb5ce423a8..12b13eecd6d8fc792bd607549c8d7ee64c4d71d0 100644 --- a/src/uncategorized/pRivalryHostage.tw +++ b/src/uncategorized/pRivalryHostage.tw @@ -275,6 +275,8 @@ but you do remember her, and your rival knows it. This is obviously the best the your hookah sucking, <<case "Chinese Revivalism">> your footbinding, +<<default>> + whatever it is you do with your spare time, <</switch>> but look what I have here! I just acquired her recently. Lovely, isn't she? I know she wasn't important to you, but she //is// a reminder of who you were. I think she must have been your type." Your rival turns to the slave and continues. "While we have our little war, <<switch $rivalryFS>>