From 07713546499035f870560cdca1582994f739570d Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 5 Aug 2020 03:06:35 -0400
Subject: [PATCH] structure set

---
 js/003-data/gameVariableData.js | 82 ++++++++++++++++++---------------
 src/002-config/fc-version.js    |  2 +-
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 0cb449c0fc3..1c5fad289ae 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -380,43 +380,50 @@ App.Data.resetOnNGPlus = {
 	PClossStreak: 0,
 	foughtThisWeek: 0,
 	/* edicts */
-	alternativeRents: 0,
-	enslavementRights: 0,
-	securityExemption: 0,
-	sellData: 0,
-	propCampaignBoost: 0,
-	slaveWatch: 0,
-	subsidyChurch: 0,
-	limitImmigration: 0,
-	openBorders: 0,
-	slavesOfficers: 0,
-	martialSchool: 0,
-	discountMercenaries: 0,
-	militiaFounded: 0,
-	recruitVolunteers: 0,
-	conscription: 0,
-	militaryService: 0,
-	militarizedSociety: 0,
-	militaryExemption: 0,
-	lowerRequirements: 0,
-	noSubhumansInArmy: 0,
-	pregExemption: 0,
-	eliteOfficers: 0,
-	liveTargets: 0,
-	legionTradition: 0,
-	eagleWarriors: 0,
-	ronin: 0,
-	sunTzu: 0,
-	mamluks: 0,
-	pharaonTradition: 0,
-	weaponsLaw: 3,
-	soldierWages: 1,
-	militiaSoldierPrivilege: 0,
-	slaveSoldierPrivilege: 0,
-	mercSoldierPrivilege: 0,
-	tradeLegalAid: 0,
-	taxTrade: 0,
-
+	edicts: {
+		alternativeRents: 0,
+		enslavementRights: 0,
+		sellData: 0,
+		propCampaignBoost: 0,
+		tradeLegalAid: 0,
+		taxTrade: 0,
+		slaveWatch: 0,
+		subsidyChurch: 0,
+		SFSupportLevel: 0,
+		limitImmigration: 0,
+		openBorders: 0,
+		weaponsLaw: 3,
+		defense: {
+			soldierWages: 1,
+			slavesOfficers: 0,
+			discountMercenaries: 0,
+			militiaFounded: 0,
+			recruitVolunteers: 0,
+			conscription: 0,
+			militaryService: 0,
+			militarizedSociety: 0,
+			militaryExemption: 0,
+			lowerRequirements: 0,
+			noSubhumansInArmy: 0,
+			pregExemption: 0,
+			FS: {
+				legionTradition: 0,
+				eagleWarriors: 0,
+				ronin: 0,
+				sunTzu: 0,
+				mamluks: 0,
+				pharaonTradition: 0,
+			},
+			privilege: {
+				militiaSoldier: 0,
+				slaveSoldier: 0,
+				mercSoldier: 0,
+			},
+			martialSchool: 0,
+			eliteOfficers: 0,
+			liveTargets: 0,
+		}
+	},
 	/* buildings */
 	secHQ: 0,
 	secMenials: 0,
@@ -533,7 +540,6 @@ App.Data.resetOnNGPlus = {
 	mercUnits: [],
 
 	/* SFanon additions */
-	SFSupportLevel: 0,
 	SFGear: 0,
 	SavedLeader: 0,
 	SavedSFI: 0,
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index 95cd3cd2c4a..a9c32e21547 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -2,5 +2,5 @@ App.Version = {
 	base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
 	pmod: "3.6.2",
 	commitHash: null,
-	release: 1083
+	release: 1084
 };
-- 
GitLab