From a51d2e6403de9f7431772d5e70b9282231e482db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81ngel=20Montero=20Lamas?= <angel.montero1@gmail.com>
Date: Mon, 10 Jan 2022 14:13:29 +0100
Subject: [PATCH] religions-generator.js (#724)

Sorted the lists, arrays and weighted arrays of items in alphabetical order. Some remain in the order assigned by weighted random.
I think this helps people spot missing items on the list if they check by name.
The number of items is the same, they just got reordered.
---
 main.js                        |   5 -
 modules/religions-generator.js | 277 ++++++++++++++-------------------
 2 files changed, 117 insertions(+), 165 deletions(-)

diff --git a/main.js b/main.js
index 99f4365a..b00c2918 100644
--- a/main.js
+++ b/main.js
@@ -783,12 +783,7 @@ async function generate(options) {
     const parsedError = parseError(error);
     clearMainTip();
 
-<<<<<<< HEAD
     alertMessage.innerHTML = /* html */ `An error has occurred on map generation. Please retry. <br />If error is critical, clear the stored data and try again.
-=======
-    alertMessage.innerHTML = `An error has occurred on map generation. Please retry.
-      <br>If error is critical, clear the stored data and try again.
->>>>>>> ffb073fe (Update main.js (#722))
       <p id="errorBox">${parsedError}</p>`;
     $("#alert").dialog({
       resizable: false,
diff --git a/modules/religions-generator.js b/modules/religions-generator.js
index 6b973a3e..a58396bb 100644
--- a/modules/religions-generator.js
+++ b/modules/religions-generator.js
@@ -30,7 +30,6 @@ window.Religions = (function () {
   const base = {
     number: ["One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve"],
     being: [
-<<<<<<< HEAD
       "Ancestor",
       "Ancient",
       "Brother",
@@ -72,43 +71,20 @@ window.Religions = (function () {
       "Deity",
       "Creator",
       "Maker",
-      "Overlord",
-      "Ruler",
-      "Chief",
       "Master",
-      "Spirit",
-      "Ancestor",
-      "Father",
-      "Forebear",
-      "Forefather",
       "Mother",
-      "Brother",
-      "Sister",
-      "Elder",
       "Numen",
-      "Ancient",
-      "Virgin",
-      "Giver",
-      "Council",
-      "Guardian",
+      "Overlord",
       "Reaper"
+      "Ruler",
+      "Sister",
+      "Spirit",
+      "Virgin",
     ],
     animal: [
-      "Dragon",
-      "Wyvern",
-      "Phoenix",
-      "Unicorn",
-      "Sphinx",
-      "Centaur",
-      "Pegasus",
-      "Kraken",
-      "Basilisk",
-      "Chimera",
-      "Cyclope",
       "Antelope",
       "Ape",
       "Badger",
->>>>>>> c6917a14 (religion gen fix)
       "Bear",
       "Beaver",
       "Bison",
@@ -134,12 +110,10 @@ window.Religions = (function () {
       "Eagle",
       "Elk",
       "Falcon",
-=======
       "Deer",
       "Dog",
       "Eagle",
       "Elk",
->>>>>>> c6917a14 (religion gen fix)
       "Fox",
       "Goat",
       "Goose",
@@ -147,18 +121,12 @@ window.Religions = (function () {
       "Hawk",
       "Heron",
       "Horse",
-<<<<<<< HEAD
       "Hound",
-=======
->>>>>>> c6917a14 (religion gen fix)
       "Hyena",
       "Ibis",
       "Jackal",
       "Jaguar",
-<<<<<<< HEAD
       "Kraken",
-=======
->>>>>>> c6917a14 (religion gen fix)
       "Lark",
       "Leopard",
       "Lion",
@@ -168,44 +136,34 @@ window.Religions = (function () {
       "Mule",
       "Narwhal",
       "Owl",
-<<<<<<< HEAD
       "Ox",
       "Panther",
       "Pegasus",
       "Phoenix",
-=======
       "Panther",
->>>>>>> c6917a14 (religion gen fix)
       "Rat",
       "Raven",
       "Rook",
       "Scorpion",
-<<<<<<< HEAD
       "Serpent",
       "Shark",
       "Sheep",
       "Snake",
       "Sphinx",
-=======
       "Shark",
       "Sheep",
       "Snake",
->>>>>>> c6917a14 (religion gen fix)
       "Spider",
       "Swan",
       "Tiger",
       "Turtle",
-<<<<<<< HEAD
       "Unicorn",
-=======
->>>>>>> c6917a14 (religion gen fix)
       "Viper",
       "Vulture",
       "Walrus",
       "Wolf",
       "Wolverine",
       "Worm",
-<<<<<<< HEAD
       "Wyvern"
     ],
     adjective: [
@@ -380,153 +338,152 @@ window.Religions = (function () {
       "Serpent"
     ],
     adjective: [
-      "New",
-      "Good",
-      "High",
-      "Old",
-      "Great",
-      "Big",
-      "Young",
-      "Major",
-      "Strong",
-      "Happy",
-      "Last",
-      "Main",
-      "Huge",
-      "Far",
-      "Beautiful",
-      "Wild",
-      "Fair",
-      "Prime",
-      "Crazy",
-      "Ancient",
-      "Proud",
-      "Secret",
-      "Lucky",
-      "Sad",
-      "Silent",
-      "Latter",
-      "Severe",
-      "Fat",
-      "Holy",
-      "Pure",
       "Aggressive",
-      "Honest",
-      "Giant",
-      "Mad",
-      "Pregnant",
-      "Distant",
-      "Lost",
-      "Broken",
+      "Almighty",
+      "Ancient",
+      "Beautiful",
+      "Benevolent",
+      "Big",
       "Blind",
-      "Friendly",
-      "Unknown",
-      "Sleeping",
-      "Slumbering",
-      "Loud",
-      "Hungry",
-      "Wise",
-      "Worried",
-      "Sacred",
-      "Magical",
-      "Superior",
-      "Patient",
+      "Blond",
+      "Bloody",
+      "Brave",
+      "Broken",
+      "Brutal",
+      "Burning",
+      "Calm",
+      "Cheerful",
+      "Crazy",
+      "Cruel",
       "Dead",
       "Deadly",
-      "Peaceful",
-      "Grateful",
-      "Frozen",
-      "Evil",
-      "Scary",
-      "Burning",
-      "Divine",
-      "Bloody",
-      "Dying",
-      "Waking",
-      "Brutal",
-      "Unhappy",
-      "Calm",
-      "Cruel",
-      "Favorable",
-      "Blond",
-      "Explicit",
-      "Disturbing",
       "Devastating",
-      "Brave",
-      "Sunny",
-      "Troubled",
-      "Flying",
-      "Sustainable",
-      "Marine",
-      "Fatal",
-      "Inherent",
-      "Selected",
-      "Naval",
-      "Cheerful",
-      "Almighty",
-      "Benevolent",
+      "Distant",
+      "Disturbing",
+      "Divine",
+      "Dying",
       "Eternal",
+      "Evil",
+      "Explicit",
+      "Fair",
+      "Far",
+      "Fat",
+      "Fatal",
+      "Favorable",
+      "Flying",
+      "Friendly",
+      "Frozen",
+      "Giant",
+      "Good",
+      "Grateful",
+      "Great",
+      "Happy",
+      "High",
+      "Holy",
+      "Honest",
+      "Huge",
+      "Hungry",
       "Immutable",
       "Infallible"
+      "Inherent",
+      "Last",
+      "Latter",
+      "Lost",
+      "Loud",
+      "Lucky",
+      "Mad",
+      "Magical",
+      "Main",
+      "Major",
+      "Marine",
+      "Naval",
+      "New",
+      "Old",
+      "Patient",
+      "Peaceful",
+      "Pregnant",
+      "Prime",
+      "Proud",
+      "Pure",
+      "Sacred",
+      "Sad",
+      "Scary",
+      "Secret",
+      "Selected",
+      "Severe",
+      "Silent",
+      "Sleeping",
+      "Slumbering",
+      "Strong",
+      "Sunny",
+      "Superior",
+      "Sustainable",
+      "Troubled",
+      "Unhappy",
+      "Unknown",
+      "Waking",
+      "Wild",
+      "Wise",
+      "Worried",
+      "Young",
     ],
     genitive: [
-      "Day",
-      "Life",
-      "Death",
-      "Night",
-      "Home",
-      "Fog",
-      "Snow",
-      "Winter",
-      "Summer",
       "Cold",
-      "Springs",
-      "Gates",
-      "Nature",
-      "Thunder",
-      "Lightning",
-      "War",
-      "Ice",
-      "Frost",
-      "Fire",
+      "Day",
+      "Death",
       "Doom",
       "Fate",
-      "Pain",
+      "Fire",
+      "Fog",
+      "Frost",
+      "Gates",
       "Heaven",
+      "Home",
+      "Ice",
       "Justice",
+      "Life",
       "Light",
+      "Lightning",
       "Love",
+      "Nature",
+      "Night",
+      "Pain",
+      "Snow",
+      "Springs",
+      "Summer",
+      "Thunder",
       "Time",
       "Victory"
+      "War",
+      "Winter",
     ],
     theGenitive: [
-      "World",
-      "Word",
-      "South",
-      "West",
-      "North",
-      "East",
-      "Sun",
-      "Moon",
-      "Peak",
-      "Fall",
-      "Dawn",
-      "Eclipse",
       "Abyss",
       "Blood",
-      "Tree",
+      "Dawn",
       "Earth",
+      "East",
+      "Eclipse",
+      "Fall",
       "Harvest",
+      "Moon",
+      "North",
+      "Peak",
       "Rainbow",
       "Sea",
       "Sky",
+      "South",
       "Stars",
       "Storm",
+      "Sun",
+      "Tree",
       "Underworld",
+      "West",
       "Wild"
+      "Word",
+      "World",
     ],
     color: ["Dark", "Light", "Bright", "Golden", "White", "Black", "Red", "Pink", "Purple", "Blue", "Green", "Yellow", "Amber", "Orange", "Brown", "Grey"]
->>>>>>> c6917a14 (religion gen fix)
   };
 
   const forms = {