From 26b5675b26bc7875005486a3f1700a202b2dafe1 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Thu, 4 Mar 2021 19:02:34 +0100
Subject: [PATCH] Fix catgirl race not injected in race map.
---
js/003-data/miscData.js | 17 ++++++++++++++++-
js/utils.js | 8 --------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index e40d3aa54ff..c64c7f7fa72 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -142,7 +142,10 @@ 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: new Map([
+ /**
+ * @type {Map<string, string>}
+ */
+ filterRacesBase: new Map([
["amerindian", "Amerindian"],
["asian", "Asian"],
["black", "Black"],
@@ -156,6 +159,18 @@ App.Data.misc = {
["southern european", "Southern European"],
["white", "White"],
]),
+
+ /**
+ * @returns {Map<string, string>}
+ */
+ get filterRaces() {
+ const map = new Map(App.Data.misc.filterRacesBase);
+ if (V.seeCats) {
+ map.set("catgirl", "Catgirl");
+ }
+ return map;
+ },
+
filterRegions: ["Africa", "Asia", "Australia", "Europe", "Middle East", "North America", "South America"],
/* START Custom Nationalities region filter */
diff --git a/js/utils.js b/js/utils.js
index e2b3220d828..4f12699266a 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -387,14 +387,6 @@ function deepAssign(target, source) {
}
}
-function raceMap() {
- const map = new Map(App.Data.misc.filterRaces);
- if (V.seeCats) {
- map.set("catgirl", "Catgirl");
- }
- return map;
-}
-
/**
* Returns the median value for an array
*
--
GitLab