From d3e08119bab59964501e9330d1dc05245b5e9c57 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 4 Aug 2020 22:47:13 -0400
Subject: [PATCH] basic conversion
---
js/003-data/gameVariableData.js | 26 ++---
js/003-data/policiesData.js | 28 ++---
.../backwardsCompatibility.js | 16 +++
src/interaction/policies/policies.js | 2 +-
src/interaction/policies/policies.tw | 2 +-
src/js/slaveCostJS.js | 4 +-
src/uncategorized/arcmgmt.tw | 100 +++++++++---------
src/uncategorized/fsDevelopments.tw | 2 +-
src/uncategorized/reputation.tw | 6 +-
src/uncategorized/saDevotion.tw | 6 +-
src/uncategorized/scheduledEvent.tw | 16 +--
src/uncategorized/seNicaeaAnnouncement.tw | 8 +-
src/uncategorized/seNicaeaCouncil.tw | 70 ++++++------
src/uncategorized/seNicaeaPreperation.tw | 12 +--
14 files changed, 158 insertions(+), 140 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 34642f8503a..b06c98626d6 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1322,18 +1322,20 @@ App.Data.resetOnNGPlus = {
citizenRetirementTrigger: 0,
FSSupLawTrigger: 0,
FSSubLawTrigger: 0,
- nicaea: 0,
- nicaeaAnnounceable: 0,
- nicaeaAnnounced: 0,
- nicaeaPreparation: 0,
- nicaeaInvolvement: -2,
- nicaeaPower: 0,
- nicaeaHeld: 0,
- nicaeaFocus: "",
- nicaeaAssignment: "",
- nicaeaAchievement: "",
- nicaeaName: "",
- nicaeaInfluence: 0,
+ nicaea: {
+ announceable: 0,
+ announced: 0,
+ preparation: 0,
+ involvement: -2,
+ power: 0,
+ held: 0,
+ focus: "",
+ assignment: "",
+ achievement: "",
+ name: "",
+ influence: 0,
+ },
+
peacekeepers: 0,
peacekeepersFate: 0,
peacekeepersGone: 0,
diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js
index 7d464e5cbf0..b10cc19a9bc 100644
--- a/js/003-data/policiesData.js
+++ b/js/003-data/policiesData.js
@@ -1587,30 +1587,30 @@ App.Data.Policies.Selection = {
title: "Chattel Religionist Creed",
titleClass: "lime",
get text() {
- let t = `Chattel Religionism in your arcology will subscribe to the creed established by the ${V.nicaeaName}, which honors`;
- if (V.nicaeaFocus === "slaves") {
+ let t = `Chattel Religionism in your arcology will subscribe to the creed established by the ${V.nicaea.name}, which honors`;
+ if (V.nicaea.focus === "slaves") {
t += ` slaves,`;
} else {
t += ` slaveowners,`;
}
t += ` enhances`;
- if (V.nicaeaAssignment === "whore") {
+ if (V.nicaea.assignment === "whore") {
t += ` prostitution,`;
- } else if (V.nicaeaAssignment === "serve the public") {
+ } else if (V.nicaea.assignment === "serve the public") {
t += ` public service,`;
} else {
t += ` fucktoy duty,`;
}
t += ` and respects`;
- if (V.nicaeaAchievement === "slaves") {
+ if (V.nicaea.achievement === "slaves") {
t += ` owning many sex slaves`;
- } else if (V.nicaeaAchievement === "devotion") {
+ } else if (V.nicaea.achievement === "devotion") {
t += ` worshipful slaves.`;
} else {
t += ` trusting slaves.`;
}
t += ` The creed is`;
- if (V.nicaeaPower > 1) {
+ if (V.nicaea.power > 1) {
t += ` strong.`;
} else {
t += ` somewhat weak.`;
@@ -1618,30 +1618,30 @@ App.Data.Policies.Selection = {
return t;
},
get activatedText() {
- let t = `Chattel Religionism in your arcology subscribes to the creed established by the ${V.nicaeaName}, which honors`;
- if (V.nicaeaFocus === "slaves") {
+ let t = `Chattel Religionism in your arcology subscribes to the creed established by the ${V.nicaea.name}, which honors`;
+ if (V.nicaea.focus === "slaves") {
t += ` slaves,`;
} else {
t += ` slaveowners,`;
}
t += ` enhances`;
- if (V.nicaeaAssignment === "whore") {
+ if (V.nicaea.assignment === "whore") {
t += ` prostitution,`;
- } else if (V.nicaeaAssignment === "serve the public") {
+ } else if (V.nicaea.assignment === "serve the public") {
t += ` public service,`;
} else {
t += ` fucktoy duty,`;
}
t += ` and respects`;
- if (V.nicaeaAchievement === "slaves") {
+ if (V.nicaea.achievement === "slaves") {
t += ` owning many sex slaves`;
- } else if (V.nicaeaAchievement === "devotion") {
+ } else if (V.nicaea.achievement === "devotion") {
t += ` worshipful slaves.`;
} else {
t += ` trusting slaves.`;
}
t += ` The creed is`;
- if (V.nicaeaPower > 1) {
+ if (V.nicaea.power > 1) {
t += ` strong.`;
} else {
t += ` somewhat weak.`;
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index e595875d8c8..2a4d3662752 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -1181,6 +1181,22 @@ App.Update.globalVariables = function(node) {
}
}
+ // Nicaea
+ if (!(typeof V.nicaea === 'object' && V.nicaea !== null)) { // Taking over the old V.nicaea which defaulted to 0 and was unused.
+ V.nicaea = {};
+ }
+ V.nicaea.announceable = V.nicaea.announceable || V.nicaea.announceable || 0;
+ V.nicaea.announced = V.nicaea.announced || V.nicaea.announced || 0;
+ V.nicaea.preparation = V.nicaea.preparation || V.nicaea.preparation|| 0;
+ V.nicaea.involvement = V.nicaea.involvement || V.nicaea.involvement|| -2;
+ V.nicaea.power = V.nicaea.power || V.nicaea.power || 0;
+ V.nicaea.held = V.nicaea.held || V.nicaea.held || 0;
+ V.nicaea.focus = V.nicaea.focus || V.nicaea.focus || "";
+ V.nicaea.assignment = V.nicaea.assignment || V.nicaea.assignment || "";
+ V.nicaea.achievement = V.nicaea.achievement || V.nicaea.achievement || "";
+ V.nicaea.name = V.nicaea.name || V.nicaea.name || "";
+ V.nicaea.influence = V.nicaea.influence || V.nicaea.influence || 0;
+
EconomyDatatypeCleanup();
ArcologyDatatypeCleanup();
diff --git a/src/interaction/policies/policies.js b/src/interaction/policies/policies.js
index b2e5ee597a9..4ce8bbfc749 100644
--- a/src/interaction/policies/policies.js
+++ b/src/interaction/policies/policies.js
@@ -73,7 +73,7 @@ globalThis.policy = function(category) {
if (req === true) {
div.append(implement(p, enable));
} else {
- link = App.UI.DOM.disabledLink("Implement", [`You do not meet the requirments, or passed a conflicting policy already`]);
+ link = App.UI.DOM.disabledLink("Implement", [`You do not meet the requirements, or passed a conflicting policy already`]);
link.style.color = "white";
div.append(link);
}
diff --git a/src/interaction/policies/policies.tw b/src/interaction/policies/policies.tw
index f4382c6bb73..42e0b874f80 100644
--- a/src/interaction/policies/policies.tw
+++ b/src/interaction/policies/policies.tw
@@ -257,7 +257,7 @@
</script>
<</if>>
- <<if $nicaeaHeld>>
+ <<if $nicaea.held>>
<h2>Nicaea</h2>
<span id="nicaea"></span>
<script>
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 7335971c3fe..064e183ef1f 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1353,8 +1353,8 @@ globalThis.BeautyArray = (function() {
}
}
if (arcology.FSChattelReligionistCreed === 1) {
- if (V.nicaeaAssignment === slave.assignment) {
- adjustBeauty("Nicaea Assignment: Chattel Religionist Creed", (2 * V.nicaeaPower));
+ if (V.nicaea.assignment === slave.assignment) {
+ adjustBeauty("Nicaea Assignment: Chattel Religionist Creed", (2 * V.nicaea.power));
}
}
if (arcology.FSChattelReligionist > 40 && arcology.FSBodyPurist === "unset") {
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index f04a755a5ce..34179715f73 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -599,54 +599,54 @@ _enslaveChance = 0.2>>
<</if>>
<</if>>
<<if $arcologies[0].FSChattelReligionistCreed == 1>>
- <<if $nicaeaFocus == "slaves">>
- <<set _slaveDemandU *= 1 + $nicaeaPower * -0.05,
- _slaveDemandT *= 1 + $nicaeaPower * -0.0625,
- _slaveProductivity += $nicaeaPower * 0.025,
- _expirationFS *= 1 + $nicaeaPower * -0.125,
- _lowerClass += $nicaeaPower * 100,
- _lowerClassP *= 1 + $nicaeaPower * 0.005,
- _topClass += $nicaeaPower * -2.5,
- _topClassP *= 1 + $nicaeaPower * -0.005>>
- <<elseif $nicaeaFocus == "owners">>
- <<set _slaveDemandU *= 1 + $nicaeaPower * 0.05,
- _slaveDemandT *= 1 + $nicaeaPower * 0.0625,
- _lowerClass += $nicaeaPower * -100,
- _lowerClassP *= 1 + $nicaeaPower * -0.005,
- _middleClass += $nicaeaPower * -20,
- _middleClassP *= 1 + $nicaeaPower * -0.0025,
- _upperClass += $nicaeaPower * 6.75,
- _upperClassP *= 1 + $nicaeaPower * 0.0025,
- _topClass += $nicaeaPower * 2.5,
- _topClassP *= 1 + $nicaeaPower * 0.005>>
- <</if>>
- <<if $nicaeaAssignment == "whore">>
- <<set _upperClass += $nicaeaPower * 6.75,
- _upperClassP *= 1 + $nicaeaPower * 0.0025,
- _topClass += $nicaeaPower * 1.25,
- _topClassP *= 1 + $nicaeaPower * 0.0025>>
- <<elseif $nicaeaAssignment == "serve the public">>
- <<set _lowerClass += $nicaeaPower * 50,
- _lowerClassP *= 1 + $nicaeaPower * 0.0025,
- _middleClass += $nicaeaPower * 20,
- _middleClassP *= 1 + $nicaeaPower * 0.0025>>
+ <<if $nicaea.focus == "slaves">>
+ <<set _slaveDemandU *= 1 + $nicaea.power * -0.05,
+ _slaveDemandT *= 1 + $nicaea.power * -0.0625,
+ _slaveProductivity += $nicaea.power * 0.025,
+ _expirationFS *= 1 + $nicaea.power * -0.125,
+ _lowerClass += $nicaea.power * 100,
+ _lowerClassP *= 1 + $nicaea.power * 0.005,
+ _topClass += $nicaea.power * -2.5,
+ _topClassP *= 1 + $nicaea.power * -0.005>>
+ <<elseif $nicaea.focus == "owners">>
+ <<set _slaveDemandU *= 1 + $nicaea.power * 0.05,
+ _slaveDemandT *= 1 + $nicaea.power * 0.0625,
+ _lowerClass += $nicaea.power * -100,
+ _lowerClassP *= 1 + $nicaea.power * -0.005,
+ _middleClass += $nicaea.power * -20,
+ _middleClassP *= 1 + $nicaea.power * -0.0025,
+ _upperClass += $nicaea.power * 6.75,
+ _upperClassP *= 1 + $nicaea.power * 0.0025,
+ _topClass += $nicaea.power * 2.5,
+ _topClassP *= 1 + $nicaea.power * 0.005>>
+ <</if>>
+ <<if $nicaea.assignment == "whore">>
+ <<set _upperClass += $nicaea.power * 6.75,
+ _upperClassP *= 1 + $nicaea.power * 0.0025,
+ _topClass += $nicaea.power * 1.25,
+ _topClassP *= 1 + $nicaea.power * 0.0025>>
+ <<elseif $nicaea.assignment == "serve the public">>
+ <<set _lowerClass += $nicaea.power * 50,
+ _lowerClassP *= 1 + $nicaea.power * 0.0025,
+ _middleClass += $nicaea.power * 20,
+ _middleClassP *= 1 + $nicaea.power * 0.0025>>
<<else>>
- <<set _slaveDemandU *= 1 + $nicaeaPower * 0.05,
- _slaveDemandT *= 1 + $nicaeaPower * 0.0625,
- _lowerClass += $nicaeaPower * -50,
- _lowerClassP *= 1 + $nicaeaPower * -0.0025,
- _middleClass += $nicaeaPower * -20,
- _middleClassP *= 1 + $nicaeaPower * -0.0025,
- _upperClass += $nicaeaPower * 13.5,
- _upperClassP *= 1 + $nicaeaPower * 0.005,
- _topClass += $nicaeaPower * 2.5,
- _topClassP *= 1 + $nicaeaPower * 0.005>>
- <</if>>
- <<if $nicaeaAchievement == "slaves">>
- <<set _slaveDemandU *= 1 + $nicaeaPower * 0.2,
- _slaveDemandT *= 1 + $nicaeaPower * 0.25,
- _lowerClass += $nicaeaPower * -200,
- _lowerClassP *= 1 + $nicaeaPower * -0.01>>
+ <<set _slaveDemandU *= 1 + $nicaea.power * 0.05,
+ _slaveDemandT *= 1 + $nicaea.power * 0.0625,
+ _lowerClass += $nicaea.power * -50,
+ _lowerClassP *= 1 + $nicaea.power * -0.0025,
+ _middleClass += $nicaea.power * -20,
+ _middleClassP *= 1 + $nicaea.power * -0.0025,
+ _upperClass += $nicaea.power * 13.5,
+ _upperClassP *= 1 + $nicaea.power * 0.005,
+ _topClass += $nicaea.power * 2.5,
+ _topClassP *= 1 + $nicaea.power * 0.005>>
+ <</if>>
+ <<if $nicaea.achievement == "slaves">>
+ <<set _slaveDemandU *= 1 + $nicaea.power * 0.2,
+ _slaveDemandT *= 1 + $nicaea.power * 0.25,
+ _lowerClass += $nicaea.power * -200,
+ _lowerClassP *= 1 + $nicaea.power * -0.01>>
<</if>>
<</if>>
<<if $arcologies[0].FSAztecRevivalistLaw == 1>>
@@ -1428,9 +1428,9 @@ You own
<<set _AWeekGrowth += 2>>
<</if>>
<<if $arcologies[0].FSChattelReligionistCreed == 1>>
- <<if $nicaeaFocus == "owners">>
- The focus on slaveowners' whims in the creed of $nicaeaName interests the rich and powerful, increasing prosperity.
- <<set _AWeekGrowth += $nicaeaPower>>
+ <<if $nicaea.focus == "owners">>
+ The focus on slaveowners' whims in the creed of $nicaea.name interests the rich and powerful, increasing prosperity.
+ <<set _AWeekGrowth += $nicaea.power>>
<</if>>
<</if>>
<<if $arcologies[0].FSSlaveProfessionalismLaw == 1>>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index ce6e951d448..46344b7eeda 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -1098,7 +1098,7 @@
<<if $arcologies[0].FSChattelReligionist != "unset">>
<<if $arcologies[0].FSChattelReligionist >= $FSLockinLevel>>
$arcologies[0].name believes implicitly in a version of religion that emphasizes slaveholding traditions.
- <<set $independenceDay = 1, $nicaeaAnnounceable = 1>>
+ <<set $independenceDay = 1, $nicaea.announceable = 1>>
<<elseif $arcologies[0].FSChattelReligionist >= $FSLockinLevel*0.6>>
$arcologies[0].name agrees strongly with a version of religion that emphasizes slaveholding traditions.
<<set $independenceDay = 1>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 3ff287fcf7f..6b52431268b 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -9,8 +9,8 @@ On formal occasions, you are announced as $PCTitle.
<<if $arcologies[0].FSChattelReligionist != "unset">>
<<if $arcologies[0].FSChattelReligionistCreed == 1>>
- $arcologies[0].name keeps the creed of the $nicaeaName. The faithful
- <<if $nicaeaAchievement == "slaves">>
+ $arcologies[0].name keeps the creed of the $nicaea.name. The faithful
+ <<if $nicaea.achievement == "slaves">>
<<if $slaves.length > 50>>
@@.green;strongly approve@@ of the large
<<= FutureSocieties.Change("ChattelReligionist", 5)>>
@@ -21,7 +21,7 @@ On formal occasions, you are announced as $PCTitle.
are not impressed by the
<</if>>
number of people you're giving the honor of sexual servitude.
- <<elseif $nicaeaAchievement == "devotion">>
+ <<elseif $nicaea.achievement == "devotion">>
<<if $averageDevotion > 80>>
@@.green;strongly approve@@ of the worshipfulness
<<= FutureSocieties.Change("ChattelReligionist", 5)>>
diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw
index cb6906ccd3a..5f483224984 100644
--- a/src/uncategorized/saDevotion.tw
+++ b/src/uncategorized/saDevotion.tw
@@ -170,9 +170,9 @@
<</if>>
<</if>>
<<if $arcologies[0].FSChattelReligionistCreed == 1>>
- <<if $nicaeaFocus == "slaves">>
- The creed of $nicaeaName @@.hotpink;focuses on slaves@@ and is repeated constantly all around $him.
- <<set $slaves[$i].devotion += $nicaeaPower>>
+ <<if $nicaea.focus == "slaves">>
+ The creed of $nicaea.name @@.hotpink;focuses on slaves@@ and is repeated constantly all around $him.
+ <<set $slaves[$i].devotion += $nicaea.power>>
<</if>>
<</if>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index cb1c4c0e405..26f93cd7cf5 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -169,19 +169,19 @@
<<goto "TFS Farm Upgrade">>
/* Nicaea */
-<<elseif ($nicaeaHeld != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaeaAnnounceable == 1) && ($nicaeaAnnounced != 1)>>
+<<elseif ($nicaea.held != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaea.announceable == 1) && ($nicaea.announced != 1)>>
<<goto "SE nicaea announcement">>
-<<elseif ($nicaeaHeld != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaeaPreparation == 1)>>
- <<if $nicaeaInvolvement != 0>>
+<<elseif ($nicaea.held != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaea.preparation == 1)>>
+ <<if $nicaea.involvement != 0>>
<<goto "SE nicaea preparation">>
<<else>>
- <<set $nicaeaPreparation = 0>>
+ <<set $nicaea.preparation = 0>>
<<if $plot == 1>><<goto "Nonrandom Event">><<else>><<goto "Random Nonindividual Event">><</if>>
<</if>>
-<<elseif ($nicaeaHeld != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaeaInvolvement >= 0)>>
- <<set $nicaeaFocus = either("owners", "slaves")>>
- <<set $nicaeaAssignment = either("please you", "serve the public", "whore")>>
- <<set $nicaeaAchievement = either("devotion", "slaves", "trust")>>
+<<elseif ($nicaea.held != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaea.involvement >= 0)>>
+ <<set $nicaea.focus = either("owners", "slaves")>>
+ <<set $nicaea.assignment = either("please you", "serve the public", "whore")>>
+ <<set $nicaea.achievement = either("devotion", "slaves", "trust")>>
<<goto "SE nicaea council">>
<<else>>
<<run delete $JFCReorder>>
diff --git a/src/uncategorized/seNicaeaAnnouncement.tw b/src/uncategorized/seNicaeaAnnouncement.tw
index 1a0aa067ba5..157f943d79e 100644
--- a/src/uncategorized/seNicaeaAnnouncement.tw
+++ b/src/uncategorized/seNicaeaAnnouncement.tw
@@ -2,8 +2,8 @@
<<if $plot == 1>><<set $nextLink = "Nonrandom Event">><<else>><<set $nextLink = "Random Nonindividual Event">><</if>>
<<set $nextButton = "Continue">>
-<<set $nicaeaAnnounced = 1, $nicaeaPreparation = 1, $nicaeaInvolvement = 0, $nicaeaPower = 1>>
-<<set $nicaeaName = "Council of " + setup.ArcologyNamesChattelReligionist.random()>>
+<<set $nicaea.announced = 1, $nicaea.preparation = 1, $nicaea.involvement = 0, $nicaea.power = 1>>
+<<set $nicaea.name = "Council of " + setup.ArcologyNamesChattelReligionist.random()>>
<<if $PC.title == 1>><<set _advocate = "male">><<elseif $PC.dick != 0>><<set _advocate = "futa">><<else>><<set _advocate = "female">><</if>>
@@ -36,7 +36,7 @@ Hosting a new religion's first synod will be expensive and time-consuming, but w
"Wonderful," says the evangelistic lady slaveowner. She orders that the newly consecrated slave approach her, and ends the call.
<</if>>
You have a tremendous amount of work to do, and not much time to do it. You immediately set aside a sizable sum as an initial budget for the event itself. The first major decision you'll need to make about the council is who to invite. As one of Chattel Religionism's most prominent figures, you have a good idea of who you'd have to include to ensure that the council's agreements have as much weight as possible; $assistant.name immediately begins collating background information on potential attendees, to assist you further.
- <<set $nicaeaInvolvement = 1, $nicaeaPower += 1, $nicaeaInfluence = 1, $nicaeaName = "Council of " + $arcologies[0].name>>
+ <<set $nicaea.involvement = 1, $nicaea.power += 1, $nicaea.influence = 1, $nicaea.name = "Council of " + $arcologies[0].name>>
<<run cashX(-10000, "event")>>
<</replace>>
<</link>> //This will cost <<print cashFormat(10000)>>, and influencing the outcome will likely require further investment//
@@ -51,7 +51,7 @@ Hosting a new religion's first synod will be expensive and time-consuming, but w
evangelistic lady slaveowner, "though I must stand against it." She orders the newly consecrated slave whipped in penance for this reverse, and ends the call.
<</if>>
You announce your opposition to the planned council publicly, using your considerable influence within the developing religion to make your opinion known. Your arguments are couched in the language of the new faith, and emphasize its welcoming and open nature to anyone willing to experience the holy institution of sexual slavery, be it as a slave or a slaveowner. Your force and vigor in the debate @@.green;enhances your reputation,@@ and helps sway other prominent Chattel Religionists away from attending the council. It's not yet clear whether a weakened council will manage to meet and get anything done, or if you've successfully prevented the idea from coalescing. You'll have to keep working at it and wait at least a week to see what the results of the controversy will be.
- <<set $nicaeaInvolvement = -1>>
+ <<set $nicaea.involvement = -1>>
<<run repX(5000, "event")>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/seNicaeaCouncil.tw b/src/uncategorized/seNicaeaCouncil.tw
index cbc22206acf..7353504fe50 100644
--- a/src/uncategorized/seNicaeaCouncil.tw
+++ b/src/uncategorized/seNicaeaCouncil.tw
@@ -2,35 +2,35 @@
<<if $plot == 1>><<set $nextLink = "Nonrandom Event">><<else>><<set $nextLink = "Random Nonindividual Event">><</if>>
<<set $nextButton = "Continue">>
-<<set _nicaeaRollA = random(-1,0), _nicaeaRollB = random(-1,0), _nicaeaRollC = random(-1,0)>>
+<<set _nicaea.RollA = random(-1,0), _nicaea.RollB = random(-1,0), _nicaea.RollC = random(-1,0)>>
-<<set $nicaeaHeld = 1, $arcologies[0].FSChattelReligionistCreed = 1>>
+<<set $nicaea.held = 1, $arcologies[0].FSChattelReligionistCreed = 1>>
-<<if $nicaeaInvolvement == 0>>
+<<if $nicaea.involvement == 0>>
<<set $arcologies[0].FSChattelReligionistCreed = 1>>
-The $nicaeaName is held in another arcology, without your involvement. Your abstention has weakened it. It authored a creed which the Council claims all good Chattel Religionists should subscribe. Most of it is uncontroversial, giving beliefs about slavery and faith that virtually all Chattel Religionists agree on. However, the new creed does purport to settle three major points of contention.
+The $nicaea.name is held in another arcology, without your involvement. Your abstention has weakened it. It authored a creed which the Council claims all good Chattel Religionists should subscribe. Most of it is uncontroversial, giving beliefs about slavery and faith that virtually all Chattel Religionists agree on. However, the new creed does purport to settle three major points of contention.
<br><br>
First, it emphasizes
-<<if $nicaeaFocus == "slaves">>
+<<if $nicaea.focus == "slaves">>
slaves throughout. The creed goes so far as to imply that slaveowners have a duty to slaves, which they fulfill by providing them the opportunity to enjoy the holy and pure state of being a sex slave.
<<else>>
reverence for and obedience to slaveowners. This is not likely to have a great impact on slaves, but it affirms the total superiority of slaveowners and is likely to attract wealthy religious people from the old world.
<</if>>
<br><br>
Second, one of the ways it states that free people can make their devotions is to
-<<if $nicaeaAssignment == "whore">>
+<<if $nicaea.assignment == "whore">>
fuck a slave whore. Not surprisingly, this will increase demand for prostitutes.
-<<elseif $nicaeaAssignment == "serve the public">>
+<<elseif $nicaea.assignment == "serve the public">>
fuck a public slut. Not surprisingly, this will increase demand for public servants.
<<else>>
have sex with one's slaves. This will likely increase respect for those that keep their own fucktoys.
<</if>>
<br><br>
Third, the aspirational part of the creed for slaveowners focuses on
-<<if $nicaeaAchievement == "slaves">>
+<<if $nicaea.achievement == "slaves">>
owning many slaves to spread the gift of sexual slavery as widely as possible. This will increase respect for people who own many sex slaves, regardless of how they're used.
-<<elseif $nicaeaAchievement == "devotion">>
+<<elseif $nicaea.achievement == "devotion">>
making slaves worshipful. Naturally, this will increase respect for people with many devoted slaves.
<<else>>
building slaves' trust. Naturally, this will increase respect for people with many trusting slaves.
@@ -40,82 +40,82 @@ Third, the aspirational part of the creed for slaveowners focuses on
<<else>>
-The $nicaeaName is held in your arcology. Everyone in attendance is agreed that a Chattel Religionist creed should be created to give the faith a set of shared beliefs to unify and drive it. Many parts of the creed are uncontroversial, but there are three great controversies to be decided: whose role in slavery is most important in Chattel Religionism, which assignment best exemplifies a Chattel Religionist slave's sacred sexual servitude, and what a Chattel Religionist slaveowner should most aspire to achieve. All the slaveowners who are participating have committed to support whatever the Council decides collectively, <<if $nicaeaPower > 1>>and the strong Council should be able to promulgate a strong creed<<else>>but the weak Council may lead to a weak creed<</if>>. The Council
+The $nicaea.name is held in your arcology. Everyone in attendance is agreed that a Chattel Religionist creed should be created to give the faith a set of shared beliefs to unify and drive it. Many parts of the creed are uncontroversial, but there are three great controversies to be decided: whose role in slavery is most important in Chattel Religionism, which assignment best exemplifies a Chattel Religionist slave's sacred sexual servitude, and what a Chattel Religionist slaveowner should most aspire to achieve. All the slaveowners who are participating have committed to support whatever the Council decides collectively, <<if $nicaea.power > 1>>and the strong Council should be able to promulgate a strong creed<<else>>but the weak Council may lead to a weak creed<</if>>. The Council
-<<if $nicaeaInfluence > 0>>
+<<if $nicaea.influence > 0>>
-is ongoing, and you have <<if $nicaeaInfluence > 2>>an immense<<elseif $nicaeaInfluence > 1>>a large<<else>>some<</if>> leverage with the rest of the Council to influence the Council's decisions.
+is ongoing, and you have <<if $nicaea.influence > 2>>an immense<<elseif $nicaea.influence > 1>>a large<<else>>some<</if>> leverage with the rest of the Council to influence the Council's decisions.
<br><br>
On the first question, the great debate is between those Chattel Religionists who focus on their slaves and those who think that the focus should be on the slaveowner. The former vaunt the pure, holy state of grace to which a well trained slave can attain, and describe slaveowning as a positive duty, arguing that slaveowners must work to help their slaves attain purity, not exploit or torment them. The latter consider this belief inverted and dangerous, and think that slaves' primary role is to serve and revere their owners, making the whim and caprice of the owner sacred. The group whose role is placed centrally in the creed will likely get more enjoyment from its role in Chattel Religionism.
<br>
-A majority of the Council currently supports deciding this question in favor of ''the <<if $nicaeaFocus == "slaves">>slave<<else>>slaveowner<</if>> centrality.''
+A majority of the Council currently supports deciding this question in favor of ''the <<if $nicaea.focus == "slaves">>slave<<else>>slaveowner<</if>> centrality.''
<br>
<<link "Support the slave centrality">>
- <<set $nicaeaInfluence -= 1, _nicaeaRollA += 1>>
- <<if _nicaeaRollA > 0>><<set $nicaeaFocus = "slaves">><</if>>
+ <<set $nicaea.influence -= 1, _nicaea.RollA += 1>>
+ <<if _nicaea.RollA > 0>><<set $nicaea.focus = "slaves">><</if>>
<<goto "SE nicaea council">>
<</link>>
| <<link "Support the slaveowner centrality">>
- <<set $nicaeaInfluence -= 1, _nicaeaRollA += 1>>
- <<if _nicaeaRollA > 0>><<set $nicaeaFocus = "owners">><</if>>
+ <<set $nicaea.influence -= 1, _nicaea.RollA += 1>>
+ <<if _nicaea.RollA > 0>><<set $nicaea.focus = "owners">><</if>>
<<goto "SE nicaea council">>
<</link>>
<br><br>
On the second question, there are advocates for holy prostitution, sacred public sluts, and pure private harems. Whatever is decided, Chattel Religionism will continue to support and advocate for slaves performing all these roles. This decision will be most important in how it affects Chattel Religionist citizens. The question is whether the creed should encourage free people to patronize slave whores, have sex with public sluts, or purchase and keep their own sex slaves and respect those who have large harems of them? The effectiveness of slaves on the emphasized assignment will be improved.
<br>
-A majority of the Council currently supports deciding this question in favor of ''<<if $nicaeaAssignment == "whore">>prostitution<<elseif $nicaeaAssignment == "serve the public">>public service<<else>>fucktoy duty<</if>>.''
+A majority of the Council currently supports deciding this question in favor of ''<<if $nicaea.assignment == "whore">>prostitution<<elseif $nicaea.assignment == "serve the public">>public service<<else>>fucktoy duty<</if>>.''
<br>
<<link "Support prostitution">>
- <<set $nicaeaInfluence -= 1, _nicaeaRollB += 1>>
- <<if _nicaeaRollB > 0>><<set $nicaeaAssignment = "whore">><</if>>
+ <<set $nicaea.influence -= 1, _nicaea.RollB += 1>>
+ <<if _nicaea.RollB > 0>><<set $nicaea.assignment = "whore">><</if>>
<<goto "SE nicaea council">>
<</link>>
| <<link "Support public service">>
- <<set $nicaeaInfluence -= 1, _nicaeaRollB += 1>>
- <<if _nicaeaRollB > 0>><<set $nicaeaAssignment = "serve the public">><</if>>
+ <<set $nicaea.influence -= 1, _nicaea.RollB += 1>>
+ <<if _nicaea.RollB > 0>><<set $nicaea.assignment = "serve the public">><</if>>
<<goto "SE nicaea council">>
<</link>>
| <<link "Support fucktoy duty">>
- <<set $nicaeaInfluence -= 1, _nicaeaRollB += 1>>
- <<if _nicaeaRollB > 0>><<set $nicaeaAssignment = "please you">><</if>>
+ <<set $nicaea.influence -= 1, _nicaea.RollB += 1>>
+ <<if _nicaea.RollB > 0>><<set $nicaea.assignment = "please you">><</if>>
<<goto "SE nicaea council">>
<</link>>
<br><br>
On the third question, some with seats on the Council think owning sex slaves is the crux of being a good Chattel Religionist, because it gives the slaves the proper and pure experience of sexual slavery. Owning many sex slaves would therefore confer respect. Others believe in good works, and think that trust in slaves is the surest indication of a good slaveowner, and the only proper mark worth looking up to. Finally, and inevitably, some think worshipful slaves are a more appropriate measure of how righteous a slaveowner is.
<br>
-A majority of the Council currently supports deciding this question in favor of ''<<if $nicaeaAchievement == "slaves">>owning slaves<<else>>$nicaeaAchievement<</if>>.''
+A majority of the Council currently supports deciding this question in favor of ''<<if $nicaea.achievement == "slaves">>owning slaves<<else>>$nicaea.achievement<</if>>.''
<br>
<<link "Support owning many slaves">>
- <<set $nicaeaInfluence -= 1, _nicaeaRollC += 1>>
- <<if _nicaeaRollC > 0>><<set $nicaeaAchievement = "slaves">><</if>>
+ <<set $nicaea.influence -= 1, _nicaea.RollC += 1>>
+ <<if _nicaea.RollC > 0>><<set $nicaea.achievement = "slaves">><</if>>
<<goto "SE nicaea council">>
<</link>>
| <<link "Support trust">>
- <<set $nicaeaInfluence -= 1, _nicaeaRollC += 1>>
- <<if _nicaeaRollC > 0>><<set $nicaeaAchievement = "trust">><</if>>
+ <<set $nicaea.influence -= 1, _nicaea.RollC += 1>>
+ <<if _nicaea.RollC > 0>><<set $nicaea.achievement = "trust">><</if>>
<<goto "SE nicaea council">>
<</link>>
| <<link "Support devotion">>
- <<set $nicaeaInfluence -= 1, _nicaeaRollC += 1>>
- <<if _nicaeaRollC > 0>><<set $nicaeaAchievement = "devotion">><</if>>
+ <<set $nicaea.influence -= 1, _nicaea.RollC += 1>>
+ <<if _nicaea.RollC > 0>><<set $nicaea.achievement = "devotion">><</if>>
<<goto "SE nicaea council">>
<</link>>
<br><br>
-[[Conclude the Council|SE nicaea council][repX($nicaeaInfluence*10000, "event"), $nicaeaInfluence = 0]] //This will let the currently prevailing views stand, and convert your remaining influence with the Council into general reputation//
+[[Conclude the Council|SE nicaea council][repX($nicaea.influence*10000, "event"), $nicaea.influence = 0]] //This will let the currently prevailing views stand, and convert your remaining influence with the Council into general reputation//
<<else>>
has concluded.
<br><br>
-The first question was decided in favor of ''the <<if $nicaeaFocus == "slaves">>slave<<else>>slaveowner<</if>> centrality.''
+The first question was decided in favor of ''the <<if $nicaea.focus == "slaves">>slave<<else>>slaveowner<</if>> centrality.''
<br><br>
-The second question was decided in favor of ''<<if $nicaeaAssignment == "whore">>prostitution<<elseif $nicaeaAssignment == "serve the public">>public service<<else>>fucktoy duty<</if>>.''
+The second question was decided in favor of ''<<if $nicaea.assignment == "whore">>prostitution<<elseif $nicaea.assignment == "serve the public">>public service<<else>>fucktoy duty<</if>>.''
<br><br>
-The third question was decided in favor of ''<<if $nicaeaAchievement == "slaves">>owning slaves<<else>>$nicaeaAchievement<</if>>.''
+The third question was decided in favor of ''<<if $nicaea.achievement == "slaves">>owning slaves<<else>>$nicaea.achievement<</if>>.''
<br><br>
//The creed has now taken effect in $arcologies[0].name. It is effectively a policy. Its impacts can be reviewed from the policy menu, and conformity to the creed can be decided from the policy menu if you decided to change it.//
diff --git a/src/uncategorized/seNicaeaPreperation.tw b/src/uncategorized/seNicaeaPreperation.tw
index 6cb571b353c..74d507a6a95 100644
--- a/src/uncategorized/seNicaeaPreperation.tw
+++ b/src/uncategorized/seNicaeaPreperation.tw
@@ -2,11 +2,11 @@
<<if $plot == 1>><<set $nextLink = "Nonrandom Event">><<else>><<set $nextLink = "Random Nonindividual Event">><</if>>
<<set $nextButton = "Continue">>
-<<set $nicaeaPreparation = 0>>
+<<set $nicaea.preparation = 0>>
<<setAssistantPronouns>>
-<<if $nicaeaInvolvement == -1>>
+<<if $nicaea.involvement == -1>>
Your vigorous opposition to a religious council to establish an agreed upon creed for Chattel Religionism has been successful, but not without cost. The furious controversy @@.red;cost you friends and damaged your reputation@@ among those of your religious peers who wanted to see Chattel Religionists draw closer together, and as happens in controversies as heated as this, the influence and reputation you gain from those who agree with you doesn't match what you lose among those who think you're standing in the way of progress. Furthermore, not all of your citizens agreed with you, either. A few citizens of consequence have actually left $arcologies[0].name over it, @@.red;damaging its economic prosperity.@@ Also, Chattel Religionists have had a serious disagreement here for the first time. @@.red;Full acceptance of slaveowning theocracy in your arcology has been set back.@@ A majority of your citizens still approve and participate, but it will take time to rebuild.
<<set $arcologies[0].prosperity -= 5, $arcologies[0].FSChattelReligionist *= 0.6>>
@@ -16,7 +16,7 @@ But you did win. Chattel Religionism will remain a free and open faith that acce
<<else>>
-You have a busy week preparing for the $nicaeaName ahead of you. Planning the event itself is the easy part. Modern arcologies are designed to host big events, and it's not like you don't have a lot of labor available to assist you. Furthermore, one of $assistant.name's standard functions is event planning. _HeA helps manage the thousand details of hosting a group of rich, powerful, opinionated people, letting you focus on the most important matters.
+You have a busy week preparing for the $nicaea.name ahead of you. Planning the event itself is the easy part. Modern arcologies are designed to host big events, and it's not like you don't have a lot of labor available to assist you. Furthermore, one of $assistant.name's standard functions is event planning. _HeA helps manage the thousand details of hosting a group of rich, powerful, opinionated people, letting you focus on the most important matters.
<<if $HeadGirlID != 0>>
<<setLocalPronouns _S.HeadGirl>>
_S.HeadGirl.slaveName is also a great help. $He does $his best to supervise your other slaves even more thoroughly than usual, giving you precious time.
@@ -37,7 +37,7 @@ The first major choice you have to make concerns the seats on the Council. There
<br><<link "Invite Chattel Religionists you agree with">>
<<replace "#result">>
You do your best to invite Chattel Religionists you hope will agree with you, while trying to keep what you're doing from being too obvious.
- <<set $nicaeaPower -= 1, $nicaeaInfluence += 1>>
+ <<set $nicaea.power -= 1, $nicaea.influence += 1>>
<</replace>>
<</link>>
</span>
@@ -55,7 +55,7 @@ Second, you need to decide whether you intend to engage in a canvassing campaign
<br><<link "Leverage reputation into power">>
<<replace "#result2">>
This isn't an opportunity that will come again. @@.red;You call in every favor you have.@@ You'll have to rebuild your reputation later.
- <<set $nicaeaInfluence += 1>>
+ <<set $nicaea.influence += 1>>
<<run repX(($rep * 0.5)-$rep, "event")>>
<</replace>>
<</link>> //This will cost a great deal of reputation//
@@ -74,7 +74,7 @@ Finally, you could use money to influence the Council. Everyone who's likely to
<br><<link "Host a festival to coincide with their arrival">>
<<replace "#result3">>
Good works will spread the joy of a Chattel Religionist revival, and make you even more influential with the Council. You plan a public festival as part of the event.
- <<set $nicaeaInfluence += 1>>
+ <<set $nicaea.influence += 1>>
<<run cashX(-50000, "event")>>
<</replace>>
<</link>> //This will cost <<print cashFormat(50000)>>//
--
GitLab