From 3906268103a5fc07fde13e85af74baa37b59eab8 Mon Sep 17 00:00:00 2001
From: Frankly George <54015-franklygeorge@users.noreply.gitgud.io>
Date: Sat, 30 Mar 2024 23:41:56 +0000
Subject: [PATCH] Misc patchs

---
 cspell.json                                    | 10 +++++-----
 ...ies.txt => countries_and_people_groups.txt} | 18 ++++++------------
 devTools/scripts/watcher.js                    |  3 +++
 src/js/birth/birth.js                          |  4 ++--
 src/npc/generate/generateGenetics.js           |  4 ++--
 5 files changed, 18 insertions(+), 21 deletions(-)
 rename devTools/dictionaries/{countries.txt => countries_and_people_groups.txt} (90%)

diff --git a/cspell.json b/cspell.json
index 1f33ba0d337..2634d48e0ad 100644
--- a/cspell.json
+++ b/cspell.json
@@ -59,15 +59,15 @@
         "css",
         "filetypes",
         "npm",
-        "countries",
+        "countries_and_people_groups",
         "names",
         "japanese_custom",
         "languages"
     ],
     "dictionaryDefinitions": [
         {
-            "name": "countries",
-            "path": "./devTools/dictionaries/countries.txt"
+            "name": "countries_and_people_groups",
+            "path": "./devTools/dictionaries/countries_and_people_groups.txt"
         },
         {
             "name": "names",
@@ -104,6 +104,7 @@
         "breastflesh",
         "coeff",
         "coeffs",
+        "detaste",
         "documentjs",
         "elohiem's",
         "eqnum",
@@ -154,8 +155,7 @@
         "xmax",
         "xmin",
         "ymax",
-        "ymin",
-		"detaste"
+        "ymin"
     ],
     "words": [
         "abaya",
diff --git a/devTools/dictionaries/countries.txt b/devTools/dictionaries/countries_and_people_groups.txt
similarity index 90%
rename from devTools/dictionaries/countries.txt
rename to devTools/dictionaries/countries_and_people_groups.txt
index ba9220f5e48..1d1dbaa7372 100644
--- a/devTools/dictionaries/countries.txt
+++ b/devTools/dictionaries/countries_and_people_groups.txt
@@ -1,4 +1,5 @@
 Afghan
+African
 Albanian
 Algerian
 American
@@ -31,19 +32,18 @@ Bulgarian
 Burkinabé
 Burmese
 Burundian
+Caledonian
 Cambodian
 Cameroonian
 Canadian
 Cape Verdean
 Catalan
-Central African
 Chadian
 Chilean
 Chinese
 Colombian
 Comorian
 Congolese
-a Cook Islander
 Costa Rican
 Croatian
 Cuban
@@ -55,7 +55,6 @@ Djiboutian
 Dominican
 Dominiquais
 Dutch
-East Timorese
 Ecuadorian
 Egyptian
 Emirati
@@ -66,9 +65,6 @@ Ethiopian
 Fijian
 Filipina
 Finnish
-French
-French Guianan
-French Polynesian
 Gabonese
 Gambian
 Georgian
@@ -79,6 +75,7 @@ Greenlandic
 Grenadian
 Guamanian
 Guatemalan
+Guianan
 Guinean
 Guyanese
 Haitian
@@ -110,8 +107,8 @@ Latvian
 Lebanese
 Liberian
 Libyan
-a Liechtensteiner
 Lithuanian
+Lusitanic
 Luxembourgian
 Macedonian
 Malagasy
@@ -136,8 +133,6 @@ Mozambican
 Namibian
 Nauruan
 Nepalese
-New Caledonian
-a New Zealander
 Ni-Vanuatu
 Nicaraguan
 Nigerian
@@ -153,6 +148,7 @@ Papua New Guinean
 Paraguayan
 Peruvian
 Polish
+Polynesian
 Portuguese
 Puerto Rican
 Qatari
@@ -174,10 +170,7 @@ Sierra Leonean
 Singaporean
 Slovak
 Slovene
-a Solomon Islander
 Somali
-South African
-South Sudanese
 Spanish
 Sri Lankan
 Sudanese
@@ -191,6 +184,7 @@ Tajik
 Tanzanian
 Thai
 Tibetan
+Timorese
 Togolese
 Tongan
 Trinidadian
diff --git a/devTools/scripts/watcher.js b/devTools/scripts/watcher.js
index 41d54ad8a9b..784e8b59c68 100644
--- a/devTools/scripts/watcher.js
+++ b/devTools/scripts/watcher.js
@@ -142,6 +142,9 @@ function build() {
 		sanityCheckProcess.kill();
 	}
 
+	// set needsReloaded to false to stop unnecessary reloads
+	needsReloaded = false;
+
 	if (settings.compilerRunSanityChecks === 1) {
 		// sanity checks first then compile
 		runSanity(true);
diff --git a/src/js/birth/birth.js b/src/js/birth/birth.js
index 259d56e27f4..c10e738e56a 100644
--- a/src/js/birth/birth.js
+++ b/src/js/birth/birth.js
@@ -9376,8 +9376,8 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
 /**
  * Sends newborns to incubator or nursery
  * @param {App.Entity.SlaveState} mom
- * @param {object[]} babiesBeingBorn ovum objects (FIXME: need defined type)
- * @returns {object[]} remaining ova
+ * @param {App.Entity.Fetus[]} babiesBeingBorn ovum objects
+ * @returns {App.Entity.Fetus[]} remaining ova
  */
 globalThis.sendNewbornsToFacility = function(mom, babiesBeingBorn, sendAll) {
 	const remainingBabies = [];
diff --git a/src/npc/generate/generateGenetics.js b/src/npc/generate/generateGenetics.js
index f6cd6c5787a..79cf9ffc6cb 100644
--- a/src/npc/generate/generateGenetics.js
+++ b/src/npc/generate/generateGenetics.js
@@ -1141,8 +1141,8 @@ globalThis.generateGenetics = (function() {
 
 /**
  * Creates a new child object based on its mother and father and whether or not it is destined for the Incubator
- * @param {App.Entity.SlaveState|App.Entity.PlayerState} mother The slave object carrying the child source
- * @param {object} ovum The source for the child, comes from the mother's womb array
+ * @param {FC.HumanState} mother The slave object carrying the child source
+ * @param {App.Entity.Fetus} ovum The source for the child, comes from the mother's womb array
  * @param {boolean} [incubator=false] True if the child is destined for the incubator; false if it's destined for the nursery
  * @returns {App.Entity.SlaveState|App.Facilities.Nursery.InfantState}
  */
-- 
GitLab