From ef6412d9a8541f6fcc35f54d9a8036ec93b19ccf Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 16 Feb 2021 01:50:19 -0500
Subject: [PATCH] move race data to map
---
devTools/types/SugarCubeExtensions.d.ts | 3 +--
js/003-data/miscData.js | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/devTools/types/SugarCubeExtensions.d.ts b/devTools/types/SugarCubeExtensions.d.ts
index c26ed89e066..7ba3bb2d452 100644
--- a/devTools/types/SugarCubeExtensions.d.ts
+++ b/devTools/types/SugarCubeExtensions.d.ts
@@ -21,8 +21,7 @@ declare module "twine-sugarcube" {
whiteAmericanSlaveSurnames: string[];
fakeBellies: string[];
- filterRaces: string[];
- filterRacesLowercase: FC.Race[];
+ filterRaces: Map<FC.Race, string>;
filterRegions: string[];
pregData: Record<string, FC.PregnancyData>;
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index e47f9f1b2aa..f0a3c59732c 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -142,8 +142,20 @@ App.Data.misc = {
/* equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLiveBirth: 44, fetusWeek: [0, 4, 7, 9, 10, 12, 17, 21, 25, 34, 38, 48, 192, 99999], fetusSize: [0, 2.5, 3, 4, 6.3, 14, 17.7, 30, 61, 76.2, 92, 121, 235, 235], fetusRate: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] sizeType: 0} */
- filterRaces: ["Amerindian", "Asian", "Black", "Indo-Aryan", "Latina", "Malay", "Middle Eastern", "Mixed Race", "Pacific Islander", "Semitic", "Southern European", "White"],
- filterRacesLowercase: ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"],
+ filterRaces: new Map([
+ ["amerindian", "Amerindian"],
+ ["asian", "Asian"],
+ ["black", "Black"],
+ ["indo-aryan", "Indo-Aryan"],
+ ["latina", "Latina"],
+ ["malay", "Malay"],
+ ["middle eastern", "Middle Eastern"],
+ ["mixed race", "Mixed Race"],
+ ["pacific islander", "Pacific Islander"],
+ ["semitic", "Semitic"],
+ ["southern european", "Southern European"],
+ ["white", "White"],
+ ]),
filterRegions: ["Africa", "Asia", "Australia", "Europe", "Middle East", "North America", "South America"],
/* START Custom Nationalities region filter */
--
GitLab