From 95c6af8993434c55866bf803b5d8d8464fc8df1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81ngel=20Montero=20Lamas?= <angel.montero1@gmail.com>
Date: Thu, 12 Sep 2024 01:23:50 +0200
Subject: [PATCH] added names to the random names of zones (#1128)

* added names of zones

added names for rebels, invasion and animals.

* deleted suggested names

- deleted siege and subjugation from zones.generator.js const subtype = rw

* fixed invationCells spelling

Fixed invationCells to invasionCells.
Is invasion with s.

* update versioning and index.html
---
 index.html                 |  2 +-
 modules/zones-generator.js | 23 +++++++++++++++--------
 versioning.js              |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index 4bc61652..9f84bab1 100644
--- a/index.html
+++ b/index.html
@@ -8070,7 +8070,7 @@
     <script src="modules/religions-generator.js?v=1.99.05"></script>
     <script src="modules/military-generator.js?v=1.99.00"></script>
     <script src="modules/markers-generator.js?v=1.103.02"></script>
-    <script src="modules/zones-generator.js?v=1.100.00"></script>
+    <script src="modules/zones-generator.js?v=1.103.6"></script>
     <script src="modules/coa-generator.js?v=1.99.00"></script>
     <script src="modules/submap.js?v=1.100.00"></script>
     <script src="libs/polylabel.min.js"></script>
diff --git a/modules/zones-generator.js b/modules/zones-generator.js
index e0923615..ca8e2b30 100644
--- a/modules/zones-generator.js
+++ b/modules/zones-generator.js
@@ -50,14 +50,14 @@ window.Zones = (function () {
     const startCell = ra(borderCells);
     if (startCell === undefined) return;
 
-    const invationCells = [];
+    const invasionCells = [];
     const queue = [startCell];
     const maxCells = rand(5, 30);
 
     while (queue.length) {
       const cellId = P(0.4) ? queue.shift() : queue.pop();
-      invationCells.push(cellId);
-      if (invationCells.length >= maxCells) break;
+      invasionCells.push(cellId);
+      if (invasionCells.length >= maxCells) break;
 
       cells.c[cellId].forEach(neibCellId => {
         if (usedCells[neibCellId]) return;
@@ -73,11 +73,15 @@ window.Zones = (function () {
       Conquest: 3,
       Incursion: 2,
       Intervention: 2,
-      Subjugation: 1,
+      Assault: 1,
       Foray: 1,
-      Skirmishes: 1,
+      Intrusion: 1,
+      Irruption: 1,
+      Offensive: 1,
       Pillaging: 1,
-      Raid: 1
+      Plunder: 1,
+      Raid: 1,
+      Skirmishes: 1
     });
     const name = getAdjective(states[attacker].name) + " " + subtype;
 
@@ -120,10 +124,13 @@ window.Zones = (function () {
       Insurrection: 2,
       Mutineers: 1,
       Insurgents: 1,
+      Rebellion: 1,
+      Renegades: 1,
+      Revolters: 1,
+      Revolutionaries: 1,
       Rioters: 1,
       Separatists: 1,
       Secessionists: 1,
-      Rebellion: 1,
       Conspiracy: 1
     });
 
@@ -226,7 +233,7 @@ window.Zones = (function () {
     const name = `${(() => {
       const model = rw({color: 2, animal: 1, adjective: 1});
       if (model === "color") return ra(["Amber", "Azure", "Black", "Blue", "Brown", "Crimson", "Emerald", "Golden", "Green", "Grey", "Orange", "Pink", "Purple", "Red", "Ruby", "Scarlet", "Silver", "Violet", "White", "Yellow"]);
-      if (model === "animal") return ra(["Ape", "Bear", "Bird", "Boar", "Cat", "Cow", "Dog", "Fox", "Horse", "Lion", "Pig", "Rat", "Raven", "Sheep", "Spider", "Tiger", "Viper", "Wolf", "Worm", "Wyrm"]);
+      if (model === "animal") return ra(["Ape", "Bear", "Bird", "Boar", "Cat", "Cow", "Deer", "Dog", "Fox", "Goat", "Horse", "Lion", "Pig", "Rat", "Raven", "Sheep", "Spider", "Tiger", "Viper", "Wolf", "Worm", "Wyrm"]);
       if (model === "adjective") return ra(["Blind", "Bloody", "Brutal", "Burning", "Deadly", "Fatal", "Furious", "Great", "Grim", "Horrible", "Invisible", "Lethal", "Loud", "Mortal", "Savage", "Severe", "Silent", "Unknown", "Venomous", "Vicious"]);
     })()} ${rw({Fever: 5, Plague: 3, Cough: 3, Flu: 2, Pox: 2, Cholera: 2, Typhoid: 2, Leprosy: 1, Smallpox: 1, Pestilence: 1, Consumption: 1, Malaria: 1, Dropsy: 1})}`;
 
diff --git a/versioning.js b/versioning.js
index 6f8bf5f7..f89a5780 100644
--- a/versioning.js
+++ b/versioning.js
@@ -12,7 +12,7 @@
  *
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
-const VERSION = "1.103.5";
+const VERSION = "1.103.6";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {