diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index 40f9dbb513a549c7258994dc03d092c962136fe0..b16a5cdd35706ac841270285aeba075fd7a73866 100644 --- a/js/003-data/gameVariableData.js +++ b/js/003-data/gameVariableData.js @@ -27,8 +27,10 @@ App.Data.defaultGameStateVariables = { IsPastPrimePC: 5000, playerAging: 2, - // Save + // NGP saveImported: 0, + customVariety: 0, + nationalities: {}, // Other cheater: 0, @@ -421,7 +423,6 @@ App.Data.resetOnNGPlus = { upgradeMultiplierArcology: 0, upgradeMultiplierMedicine: 0, upgradeMultiplierTrade: 0, - nationalities: {}, /** @type {Record<FC.Assignment, Set<number>>} */ JobIDMap: null, averageTrust: 0, diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js index a21ab8e594c58fed86c7af59d58ed97a0feccade..01a9b2a69b2c37d7952afc0ad9de39268f6a276f 100644 --- a/src/events/intro/initNationalities.js +++ b/src/events/intro/initNationalities.js @@ -1,11 +1,6 @@ App.Intro.initNationalities = function() { function initSecExp() { App.SecExp.generalInit(); - V.fort = { - reactor: 0, - waterway: 0, - assistant:0 - }; V.garrison = { penthouse: 0, reactor: 0, @@ -140,11 +135,11 @@ App.Intro.initNationalities = function() { break; case "hoodlum": V.trinkets.push("a hood ornament stolen from a fancy Old World vehicle"); - V.PC.shoulderTat = "You have a tattoo denoting your gang affiliation on your neck."; + V.PC.shouldersTat = "You have a tattoo denoting your gang affiliation on your neck."; break; case "street urchin": V.trinkets.push("your trusty knife, whose kept you safe many a night"); - V.PC.shoulderTat = "You have a tattoo denoting your gang affiliation on your neck."; + V.PC.shouldersTat = "You have a tattoo denoting your gang affiliation on your neck."; break; } @@ -600,6 +595,7 @@ App.Intro.initNationalities = function() { V.nationalities = arr2obj(App.Data.misc.baseNationalities); } } else { + /** @type {Map<string, {supr: FC.Race, subj: FC.Race, preset: string}>} */ const continentalDefaults = new Map([ ["North America", {supr: "white", subj: "black", preset: "Vanilla North America"}], ["South America", {supr: "latina", subj: "black", preset: "Vanilla South America"}], diff --git a/src/events/intro/tradeIntro.tw b/src/events/intro/tradeIntro.tw index 46208861b21d4e6bb026f9ef0bb6954305febeb7..c6b6086bb7cd0678698133946aa5e4579475b228 100644 --- a/src/events/intro/tradeIntro.tw +++ b/src/events/intro/tradeIntro.tw @@ -8,13 +8,13 @@ </p> <p> <div> - [[They've turned a blind eye, or even been complicit.|Extreme Intro][$internationalTrade = 1]] + [[They've turned a blind eye, or even been complicit.|Extreme Intro][$internationalTrade = 1, $customVariety = 0]] <span class="note"> Slaves from all across the world will appear. </span> </div> <div> - [[They've done what little they can to stop it.|Extreme Intro][$internationalTrade = 0]] + [[They've done what little they can to stop it.|Extreme Intro][$internationalTrade = 0, $customVariety = 0]] <span class="note"> Almost all slaves will be from the continent where the arcology is located. </span>