diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 92f704d94447b43f1718ced70de98991ac168599..6f56174be5bb74148da64a9336f5c81f4c23b66c 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -744,6 +744,16 @@ App.Update.globalVariables = function(node) {
V.arcologies[0].FSNeoImperialist = V.FSNeoImperialist;
} else if (typeof V.arcologies[0].FSNeoImperialist === "undefined") {
V.arcologies[0].FSNeoImperialist = "unset";
+ }
+ if ((typeof V.FSNeoImperialistLaw1 !== "undefined") && V.FSNeoImperialistLaw1 !== 0) {
+ V.arcologies[0].FSNeoImperialistLaw1 = V.FSNeoImperialistLaw1;
+ } else if (typeof V.arcologies[0].FSNeoImperialistLaw1 === "undefined") {
+ V.arcologies[0].FSNeoImperialistLaw1 = 0;
+ }
+ if ((typeof V.FSNeoImperialistLaw2 !== "undefined") && V.FSNeoImperialistLaw2 !== 0) {
+ V.arcologies[0].FSNeoImperialistLaw2 = V.FSNeoImperialistLaw2;
+ } else if (typeof V.arcologies[0].FSNeoImperialistLaw2 === "undefined") {
+ V.arcologies[0].FSNeoImperialistLaw2 = 0;
}
if ((typeof V.FSEgyptianRevivalist !== "undefined") && V.FSEgyptianRevivalist !== "unset") {
V.arcologies[0].FSEgyptianRevivalist = V.FSEgyptianRevivalist;
@@ -865,6 +875,10 @@ App.Update.globalVariables = function(node) {
V.arcologies[0].FSRomanRevivalist = 10;
App.UI.DOM.appendNewElement("div", node, `Fixed NaN FS value for FSRomanRevivalist`);
}
+ if (V.arcologies[0].FSNeoImperialist !== "unset" && !Number.isFinite(V.arcologies[0].FSNeoImperialist)) {
+ V.arcologies[0].FSNeoImperialist = 10;
+ App.UI.DOM.appendNewElement("div", node, `Fixed NaN FS value for FSNeoImperialist`);
+ }
if (V.arcologies[0].FSChattelReligionist !== "unset" && !Number.isFinite(V.arcologies[0].FSChattelReligionist)) {
V.arcologies[0].FSChattelReligionist = 10;
App.UI.DOM.appendNewElement("div", node, `Fixed NaN FS value for FSChattelReligionist`);
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 78ee379db30041b3f587d75ada8504cec2899c64..81a8425f80e4ec9ed6029cc524b554a78485bde1 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -2292,7 +2292,8 @@ App.Update.FScheatDatatypeCleanup = function() {
if (V.arcologies[0].FSNeoImperialist !== "unset") {
V.arcologies[0].FSNeoImperialist = Number(V.arcologies[0].FSNeoImperialist) || "unset";
V.arcologies[0].FSNeoImperialistDecoration = Number(V.arcologies[0].FSNeoImperialistDecoration) || 0;
- V.arcologies[0].FSNeoImperialistLaw = Number(V.arcologies[0].FSNeoImperialistLaw) || 0;
+ V.arcologies[0].FSNeoImperialistLaw1 = Number(V.arcologies[0].FSNeoImperialistLaw1) || 0;
+ V.arcologies[0].FSNeoImperialistLaw2 = Number(V.arcologies[0].FSNeoImperialistLaw2) || 0;
}
if (V.arcologies[0].FSAztecRevivalist !== "unset") {
V.arcologies[0].FSAztecRevivalist = Number(V.arcologies[0].FSAztecRevivalist) || "unset";
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index df0b601b5e3ef01f6cabf208cb982c74e1654961..ad02f3e424738508faca2af24970e82fb56e4fad 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -58,7 +58,7 @@
<<case "Roman Revivalist">>
as a Roman emperor's apartment. There is a small shrine to the old gods the <<= properMaster()>> favors in a side room, and the flooring is erotic mosaic. Pride of place is given to a set of low couches placed together, capable of accommodating many nude bodies.
<<case "Neo Imperialist">>
- as an apartment worthy of a modern-day Emperor. The highest of technology decorates every space, allowing you to remain in constant communication with the rest of the arcology - your fledgling empire - even when in your room. The <<= properMaster()>>'s suite is an elaborate shrine to your many victories, fitted with a large bed with hanging golden bedposts, and the banners of your house hang around you on every side. The centerpiece of your personal apartment is a massive tapestry, designed in ancient style and depicting the creation of your Arcology from the collapsing Old World, all the way up to the modern day, with you standing over a great cheering crowd in your golden crown. You wonder for a moment if you'll have to commission more tapestries as the Arcology advances further.
+ as an apartment worthy of a modern-day Emperor. The highest of technology decorates every space, allowing you to remain in constant communication with the rest of the arcology - your fledgling empire - even when in your room. The <<= properMaster()>>'s suite is an elaborate shrine to your many victories, fitted with many low couches to fit a whole harem inside, and the banners of your house hang around you on every side. The centerpiece of your personal apartment is a massive tapestry, designed in ancient style and depicting the creation of your Arcology from the collapsing Old World, all the way up to the modern day, with you standing over a great cheering crowd in your golden crown. You wonder for a moment if you'll have to commission more tapestries as the Arcology advances further.
<<case "Aztec Revivalist">>
as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<= properMaster()>>'s room is created to gratify you as a true god of the people.
<<case "Egyptian Revivalist">>
@@ -145,6 +145,8 @@ _masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman emperor's apartment. There is a small shrine to the old gods the <<= properTitle()>> favors in a side room, and the flooring is erotic mosaic.
+<<case "Neo Imperialist">>
+ as an apartment worthy of a modern-day Emperor. The highest of technology decorates every space, allowing you to remain in constant communication with the rest of the arcology - your fledgling empire - even when in your room. The <<= properMaster()>>'s suite is an elaborate shrine to your many victories, fitted with a large bed with hanging golden bedposts, and the banners of your house hang around you on every side. The centerpiece of your personal apartment is a massive tapestry, designed in ancient style and depicting the creation of your Arcology from the collapsing Old World, all the way up to the modern day, with you standing over a great cheering crowd in your golden crown. You wonder for a moment if you'll have to commission more tapestries as the Arcology advances further.
<<case "Aztec Revivalist">>
as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<= properTitle()>>'s room is created to gratify you as a true god of the people.
<<case "Egyptian Revivalist">>
@@ -244,6 +246,8 @@ _masterSuiteNameCaps is furnished
<<switch $masterSuiteDecoration>>
<<case "Roman Revivalist">>
as a Roman patrician's apartment. There is a small shrine to the old gods the <<= properTitle()>> favors in a side room, and the flooring is erotic mosaic.
+<<case "Neo Imperialist">>
+ as an apartment worthy of a modern-day King. The highest of technology decorates every space, allowing you to remain in constant communication with the rest of the arcology - your fledgling empire - even when in your room. The <<= properMaster()>>'s suite is an elaborate shrine to your many victories, fitted with a king-sized pod-bed, and the banners of your house hang around you on every side. The centerpiece of your personal apartment is a massive tapestry, designed in ancient style and depicting the creation of your Arcology from the collapsing Old World, all the way up to the modern day, with you standing over a great cheering crowd in your golden crown. You wonder for a moment if you'll have to commission more tapestries as the Arcology advances further.
<<case "Aztec Revivalist">>
as an Aztec cultural, spiritual and military leader of the city you're allowed great leniency. The <<= properTitle()>>'s room is created to gratify you as a true god of the people.
<<case "Egyptian Revivalist">>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 7eb078e0a77d61c8d448f11e706e43898557109c..b25d9f1cc5924284bc08a6958f7eef03ffe75255 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -67,6 +67,8 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<if ($mercenaries == 0) && ($arcologies[0].FSRomanRevivalistLaw == 0)>>
You are alone in contributing to the defense of your home.
+<<elseif ($mercenaries == 0) && ($arcologies[0].FSNeoImperialistLaw1 == 0)>>
+ You are alone in contributing to the defense of your home.
<<elseif $mercenaries == 1>>
Your mercenaries desperately defend their barracks but manage little else.
<<elseif $mercenaries == 3>>
@@ -77,11 +79,14 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<if $arcologies[0].FSRomanRevivalistLaw == 1>>
As the crisis is reached and passed, lower-class citizens armed as Hastati, with lighter weapons and personal armor, begin to sweep the arcology to ensure no one escapes. Middle-class citizens, meanwhile, heavily armored as Principes, methodically grind out pockets of armed resistance. The toughest rebel groups are left to the exoskeleton-armored Triarii.
<</if>>
+<<if $arcologies[0].FSNeoImperialistLaw1 == 1>>
+ As the rebels reel back from the shockingly organized initial resistance of your always-ready Imperial Knights and their lightly-armed but fanatically determined guardsmen, it becomes increasingly clear just how well prepared your arcology was for this exact event. Even as fires rage through the streets of your home, Knights clamber forward through the rebel lines practically undisturbed by the fire that clatters off their enormously thick plate, laying down explosive volleys with enormous heavy guns and launching themselves into outright melee with their holographic weapons.
+<</if>>
<br><br>
<<set _newSlaves = []>>
-<<if $arcologies[0].FSRomanRevivalistLaw + $mercenaries + $personalArms + $hackerSupport + _doubleAgent > 8>>
+<<if $arcologies[0].FSRomanRevivalistLaw + $arcologies[0].FSNeoImperialistLaw1 + $mercenaries + $personalArms + $hackerSupport + _doubleAgent > 8>>
@@.yellow;The Daughters of Liberty are utterly crushed.@@ $arcologies[0].name has been slightly damaged, but even as the last pockets of resistance are crushed, your citizens begin repairs themselves. The effect on your reputation is @@.green;immensely positive,@@ since your victory was insultingly easy and barely set the arcology's prosperity back at all. You also took a truly impressive bag of prisoners.
<<set $daughtersVictory = 3>>
<<run cashX(-2000, "war")>>
@@ -158,6 +163,53 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<</for>>
<<set $desc = "a Daughters of Liberty flag that once hung in their forward command post within your arcology">>
<<set $trinkets.push($desc)>>
+<<elseif $arcologies[0].FSNeoImperialistLaw1 == 1>>
+ @@.yellow;The Daughters of Liberty are annihilated.@@ @@.red;$arcologies[0].name has been damaged,@@ and the repairs will be quite costly. However, the effect on your reputation is @@.green;very positive,@@ since though your victory was hard-fought and set the arcology's prosperity back @@.red;considerably,@@ you did better than other arcology owners have done when faced with similar well-armed unrest. You also took a truly impressive bag of prisoners.
+ <<set $daughtersVictory = 3>>
+ <<run cashX(-5000, "war")>>
+ <<run cashX(forceNeg(Math.trunc($cash*0.2)), "war")>>
+ <<set $arcologies[0].prosperity = Math.trunc($arcologies[0].prosperity*0.7)>>
+ <<run repX(1000, "war")>>
+ <<if $seeDicks >= 50>>
+ <<set _pcaj = 5>>
+ <<elseif $seeDicks > 0>>
+ <<set _pcaj = 2>>
+ <<else>>
+ <<set _pcaj = 0>>
+ <</if>>
+ <<for _pca = 0; _pca <= _pcaj; _pca++>>
+ <<set $activeSlaveOneTimeMinAge = 16>>
+ <<set $activeSlaveOneTimeMaxAge = 32>>
+ <<set $oneTimeDisableDisability = 1>>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
+ <<run generateSalonModifications($activeSlave)>>
+ <<set $activeSlave.origin = "$He is an enslaved Daughter of Liberty.">>
+ <<set $activeSlave.weight = random(-20,30)>>
+ <<set $activeSlave.muscles = random(20,80)>>
+ <<set $activeSlave.waist = random(10,80)>>
+ <<set _newSlaves.push($activeSlave)>>
+ <</for>>
+ <<if $seeDicks < 50>>
+ <<set _pcaj = 5>>
+ <<elseif $seeDicks < 100>>
+ <<set _pcaj = 3>>
+ <<else>>
+ <<set _pcaj = 0>>
+ <</if>>
+ <<for _pca = 0; _pca <= _pcaj; _pca++>>
+ <<set $activeSlaveOneTimeMinAge = 16>>
+ <<set $activeSlaveOneTimeMaxAge = 32>>
+ <<set $oneTimeDisableDisability = 1>>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<run generateSalonModifications($activeSlave)>>
+ <<set $activeSlave.origin = "$He is an enslaved Daughter of Liberty.">>
+ <<set $activeSlave.weight = random(-50,30)>>
+ <<set $activeSlave.muscles = random(0,80)>>
+ <<set $activeSlave.waist = random(-20,20)>>
+ <<set _newSlaves.push($activeSlave)>>
+ <</for>>
+ <<set $desc = "a Daughters of Liberty flag that once hung in their forward command post within your arcology">>
+ <<set $trinkets.push($desc)>>
<<else>>
@@.yellow;The Daughters of Liberty are defeated.@@ @@.red;$arcologies[0].name is heavily damaged,@@ and the repairs will be very costly. The effect on your reputation is @@.green;muted, but positive,@@ since though you won, your victory was hard-fought and set the arcology's prosperity back @@.red;a long way.@@
<<if $traitor != 0 && !["agent", "trapper"].includes($traitorType)>>
diff --git a/src/uncategorized/pMercsHelpCorp.tw b/src/uncategorized/pMercsHelpCorp.tw
index 2d8983aa809f02e0e140bae39e07dc8b0bd084ad..896ae780bb1629b4a8ed453bb510cd1aa06bf1cd 100644
--- a/src/uncategorized/pMercsHelpCorp.tw
+++ b/src/uncategorized/pMercsHelpCorp.tw
@@ -2,7 +2,7 @@
<<set $nextButton = "Decline", $nextLink = "Random Nonindividual Event", $mercenariesHelpCorp = -1>> /* hide button until user makes a selection */
-Your weekly meeting with your $mercenariesTitle commander finishes with unusual speed. With the arcology owner who set the Daughters on you enslaved, all other immediate threats defused or smashed,<<if $arcologies[0].FSRomanRevivalistLaw > 0>> your citizens serving in the urban cohorts with enthusiasm,<</if>> and the $mercenariesTitle in excellent fighting condition, there just weren't enough concerns from either of your perspectives to fill the time. You sit across your desk from each other, discussing the global situation over $PC.refreshment.
+Your weekly meeting with your $mercenariesTitle commander finishes with unusual speed. With the arcology owner who set the Daughters on you enslaved, all other immediate threats defused or smashed,<<if $arcologies[0].FSRomanRevivalistLaw > 0>> your citizens serving in the urban cohorts with enthusiasm,<</if>><<if $arcologies[0].FSNeoImperialistLaw1 > 0>> your Knights vigilantly watching the streets for any possible threat,<</if>> and the $mercenariesTitle in excellent fighting condition, there just weren't enough concerns from either of your perspectives to fill the time. You sit across your desk from each other, discussing the global situation over $PC.refreshment.
<br><br>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 586adf148d97e4c19c888f030d626f3098a584d2..b3bb0e21a1c2ef8b534e9da9ded58fcc69cf5aa8 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -193,6 +193,10 @@
<<set _qualifiedFS.push("aztec law")>>
<<elseif $arcologies[0].FSAztecRevivalistDecoration >= 80>>
<<set _qualifiedFS.push("aztec")>>
+ <<elseif $arcologies[0].FSNeoImperialistLaw1 == 1>>
+ <<set _qualifiedFS.push("imperial law")>>
+ <<elseif $arcologies[0].FSNeoImperialistDecoration >= 80>>
+ <<set _qualifiedFS.push("imperial")>>
<<elseif $arcologies[0].FSArabianRevivalistLaw == 1>>
<<set _qualifiedFS.push("arabian law")>>
<<elseif $arcologies[0].FSArabianRevivalistDecoration >= 80>>
@@ -304,6 +308,12 @@
<<case "aztec">>
<<set _income += random(1500,2500)>>
There are a lot of slaveowners in your arcology that tend to grow quickly attached to the slaves they planned on sacrificing to sate the blood thirst of other important citizens, and such owners often come to you, begging you to swap two of their slaves' appearance. You accept, but not for free. After the surgery, this has made you @@.yellowgreen;<<print cashFormat(_income)>>.@@
+ <<case "imperial law">>
+ <<set _income += random(2000,3000)>>
+ With Imperial Knights contantly patrolling the streets and a strict noble hierarchy flowing up from your Barons directly to you, you have a great deal of room to play with legal codes and edifices - which, of course, are constantly being modified to be eternally in your favor. The Barons and Knights who maintain your arcology happily turn a blind eye as you skim trade income directly into your pockets - after all, they're going to benefit from your success too. Sly manipulation of trade codes has earned you @@.yellowgreen;<<print cashFormat(_income)>>@@.
+ <<case "imperial">>
+ <<set _income += random(1500,2500)>>
+ Your new Imperial culture fosters a particularly large amount of trade, given its fascination with high technology and old world culture. The constant influx of new fashions, materials, and technologies allows for one of the rarest oppurtunities for an ultra-wealthy plutocrat such as yourself; the chance to earn an honest dollar. By spending time at the bustling marketplace and trading in fashion, you've made @@.yellowgreen;<<print cashFormat(_income)>>@@.
<<case "arabian law">>
<<set _income += random(2000,3000)>>
You have a lot of persons scared of the consequences of not being a part of your society; even if they pay the Jizya, other citizens are not forced to accept them. So if they were to get mugged in some dark alley, people would not get outraged, and there probably wouldn't be any investigations. After buying everyone's silence, you still had @@.yellowgreen;<<print cashFormat(_income)>>@@ to put in your pockets.