diff --git a/cspell.json b/cspell.json index 1f33ba0d337602624498ce931224ffd9d04d7adc..2634d48e0ad7fbfa2a6e2f8b5c63ed5cb5bc6775 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 ba9220f5e488ba8bb3c7e3e5b2aba1ff3e0a2fbe..1d1dbaa737295d2c351190389f6010647bc2814c 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 41d54ad8a9b4dd16262a4a0607ac3f8247ffe359..784e8b59c686dd6a6e50b3d722227f264087602d 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 259d56e27f4b5a403fda3df9526d536babc87d7e..c10e738e56a299ce36e7e6e188b02f85bc5f5198 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 f6cd6c5787ae29c78922b151b765b5ab5c2185bd..79cf9ffc6cbdc2acf32c5d10d5c9d3a79835c5b8 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} */