From 456ef58920e1a05d95d1416e12e25cebfae2fcc5 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Thu, 7 Oct 2021 23:12:08 +0300
Subject: [PATCH] religion gen fix

---
 index.html                     |  54 ++++++++
 modules/religions-generator.js | 243 +++++++++++++++++++++++++++++++++
 2 files changed, 297 insertions(+)

diff --git a/index.html b/index.html
index e3a59238..bbc56fcf 100644
--- a/index.html
+++ b/index.html
@@ -7901,6 +7901,7 @@
     <script src="libs/priority-queue.min.js"></script>
     <script src="libs/delaunator.min.js"></script>
 
+<<<<<<< HEAD
     <script src="utils/shorthands.js"></script>
     <script src="utils/commonUtils.js"></script>
     <script src="utils/arrayUtils.js"></script>
@@ -7995,4 +7996,57 @@
     <!-- Web Components -->
     <script defer src="components/fill-box.js"></script>
   </body>
+=======
+  <script defer src="https://unpkg.com/dropbox@10.8.0/dist/Dropbox-sdk.min.js"></script>
+  <script defer src="modules/ui/general.js"></script>
+  <script defer src="modules/ui/options.js"></script>
+  <script defer src="modules/ui/style.js"></script>
+  <script defer src="modules/load.js"></script>
+  <script defer src="modules/cloud.js"></script>
+  <script defer src="main.js"></script>
+  <script defer src="modules/save.js"></script>
+  <script defer src="modules/export.js"></script>
+  <script defer src="modules/relief-icons.js"></script>
+  <script defer src="modules/ui/tools.js"></script>
+  <script defer src="modules/ui/world-configurator.js"></script>
+  <script async defer src="modules/ui/heightmap-editor.js"></script>
+  <script async defer src="modules/ui/states-editor.js"></script>
+  <script async defer src="modules/ui/provinces-editor.js"></script>
+  <script async defer src="modules/ui/biomes-editor.js"></script>
+  <script async defer src="modules/ui/cultures-editor.js"></script>
+  <script async defer src="modules/ui/namesbase-editor.js"></script>
+  <script async defer src="modules/ui/elevation-profile.js"></script>
+  <script async defer src="modules/ui/routes-editor.js"></script>
+  <script async defer src="modules/ui/ice-editor.js"></script>
+  <script async defer src="modules/ui/lakes-editor.js"></script>
+  <script async defer src="modules/ui/coastline-editor.js"></script>
+  <script async defer src="modules/ui/labels-editor.js"></script>
+  <script async defer src="modules/ui/rivers-editor.js"></script>
+  <script async defer src="modules/ui/rivers-creator.js"></script>
+  <script async defer src="modules/ui/relief-editor.js"></script>
+  <script async defer src="modules/ui/religions-editor.js"></script>
+  <script async defer src="modules/ui/markers-editor.js"></script>
+  <script async defer src="modules/ui/burg-editor.js"></script>
+  <script async defer src="modules/ui/units-editor.js"></script>
+  <script async defer src="modules/ui/notes-editor.js"></script>
+  <script async defer src="modules/ui/diplomacy-editor.js"></script>
+  <script async defer src="modules/ui/zones-editor.js"></script>
+  <script async defer src="modules/ui/burgs-overview.js"></script>
+  <script async defer src="modules/ui/rivers-overview.js"></script>
+  <script async defer src="modules/ui/military-overview.js"></script>
+  <script async defer src="modules/ui/regiments-overview.js"></script>
+  <script async defer src="modules/ui/markers-overview.js"></script>
+  <script async defer src="modules/ui/regiment-editor.js"></script>
+  <script async defer src="modules/ui/battle-screen.js"></script>
+  <script async defer src="modules/coa-renderer.js"></script>
+  <script async defer src="modules/ui/emblems-editor.js"></script>
+  <script async defer src="modules/ui/editors.js"></script>
+  <script async defer src="modules/ui/3d.js"></script>
+  <script async defer src="modules/ui/hotkeys.js"></script>
+  <script async defer src="libs/rgbquant.min.js"></script>
+  <script async defer src="libs/jquery.ui.touch-punch.min.js"></script>
+  <script async defer src="libs/pell.min.js"></script>
+  <script async defer src="libs/jszip.min.js"></script>
+</body>
+>>>>>>> c6917a14 (religion gen fix)
 </html>
diff --git a/modules/religions-generator.js b/modules/religions-generator.js
index 391127c1..6b973a3e 100644
--- a/modules/religions-generator.js
+++ b/modules/religions-generator.js
@@ -30,6 +30,7 @@ window.Religions = (function () {
   const base = {
     number: ["One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve"],
     being: [
+<<<<<<< HEAD
       "Ancestor",
       "Ancient",
       "Brother",
@@ -63,19 +64,69 @@ window.Religions = (function () {
       "Ape",
       "Badger",
       "Basilisk",
+=======
+      "God",
+      "Goddess",
+      "Lord",
+      "Lady",
+      "Deity",
+      "Creator",
+      "Maker",
+      "Overlord",
+      "Ruler",
+      "Chief",
+      "Master",
+      "Spirit",
+      "Ancestor",
+      "Father",
+      "Forebear",
+      "Forefather",
+      "Mother",
+      "Brother",
+      "Sister",
+      "Elder",
+      "Numen",
+      "Ancient",
+      "Virgin",
+      "Giver",
+      "Council",
+      "Guardian",
+      "Reaper"
+    ],
+    animal: [
+      "Dragon",
+      "Wyvern",
+      "Phoenix",
+      "Unicorn",
+      "Sphinx",
+      "Centaur",
+      "Pegasus",
+      "Kraken",
+      "Basilisk",
+      "Chimera",
+      "Cyclope",
+      "Antelope",
+      "Ape",
+      "Badger",
+>>>>>>> c6917a14 (religion gen fix)
       "Bear",
       "Beaver",
       "Bison",
       "Boar",
       "Buffalo",
+<<<<<<< HEAD
       "Camel",
       "Cat",
       "Centaur",
       "Chimera",
+=======
+      "Cat",
+>>>>>>> c6917a14 (religion gen fix)
       "Cobra",
       "Crane",
       "Crocodile",
       "Crow",
+<<<<<<< HEAD
       "Cyclope",
       "Deer",
       "Dog",
@@ -83,6 +134,12 @@ window.Religions = (function () {
       "Eagle",
       "Elk",
       "Falcon",
+=======
+      "Deer",
+      "Dog",
+      "Eagle",
+      "Elk",
+>>>>>>> c6917a14 (religion gen fix)
       "Fox",
       "Goat",
       "Goose",
@@ -90,12 +147,18 @@ 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",
@@ -105,30 +168,44 @@ 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: [
@@ -295,6 +372,161 @@ window.Religions = (function () {
       "White",
       "Yellow"
     ]
+=======
+      "Camel",
+      "Falcon",
+      "Hound",
+      "Ox",
+      "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",
+      "Blind",
+      "Friendly",
+      "Unknown",
+      "Sleeping",
+      "Slumbering",
+      "Loud",
+      "Hungry",
+      "Wise",
+      "Worried",
+      "Sacred",
+      "Magical",
+      "Superior",
+      "Patient",
+      "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",
+      "Eternal",
+      "Immutable",
+      "Infallible"
+    ],
+    genitive: [
+      "Day",
+      "Life",
+      "Death",
+      "Night",
+      "Home",
+      "Fog",
+      "Snow",
+      "Winter",
+      "Summer",
+      "Cold",
+      "Springs",
+      "Gates",
+      "Nature",
+      "Thunder",
+      "Lightning",
+      "War",
+      "Ice",
+      "Frost",
+      "Fire",
+      "Doom",
+      "Fate",
+      "Pain",
+      "Heaven",
+      "Justice",
+      "Light",
+      "Love",
+      "Time",
+      "Victory"
+    ],
+    theGenitive: [
+      "World",
+      "Word",
+      "South",
+      "West",
+      "North",
+      "East",
+      "Sun",
+      "Moon",
+      "Peak",
+      "Fall",
+      "Dawn",
+      "Eclipse",
+      "Abyss",
+      "Blood",
+      "Tree",
+      "Earth",
+      "Harvest",
+      "Rainbow",
+      "Sea",
+      "Sky",
+      "Stars",
+      "Storm",
+      "Underworld",
+      "Wild"
+    ],
+    color: ["Dark", "Light", "Bright", "Golden", "White", "Black", "Red", "Pink", "Purple", "Blue", "Green", "Yellow", "Amber", "Orange", "Brown", "Grey"]
+>>>>>>> c6917a14 (religion gen fix)
   };
 
   const forms = {
@@ -506,7 +738,11 @@ window.Religions = (function () {
             expansion: "global",
             expansionism,
             center,
+<<<<<<< HEAD
             origins: [r.i]
+=======
+            origin: r.i
+>>>>>>> c6917a14 (religion gen fix)
           });
           religionsTree.add([x, y]);
         }
@@ -543,8 +779,11 @@ window.Religions = (function () {
       name,
       religions.map((r) => r.code)
     );
+<<<<<<< HEAD
 
     const i = religions.length;
+=======
+>>>>>>> c6917a14 (religion gen fix)
     religions.push({
       i,
       name,
@@ -560,7 +799,11 @@ window.Religions = (function () {
       area: 0,
       rural: 0,
       urban: 0,
+<<<<<<< HEAD
       origins: [religionId],
+=======
+      origin: r,
+>>>>>>> c6917a14 (religion gen fix)
       code
     });
     cells.religion[center] = i;