From 968182512c0a7871a7c0a4741819fb173463b0a3 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Thu, 28 Jan 2021 14:24:38 +0300
Subject: [PATCH] v1.5.03 - Cultures small rework

---
 index.css                     |   2 +-
 index.html                    |  14 +-
 modules/cultures-generator.js | 275 ++++++++++++++++------------------
 modules/ui/cultures-editor.js |   6 +-
 modules/ui/options.js         |  16 +-
 5 files changed, 148 insertions(+), 165 deletions(-)

diff --git a/index.css b/index.css
index 2dbbcdae..cb989590 100644
--- a/index.css
+++ b/index.css
@@ -1334,7 +1334,7 @@ div.states>.small {
 }
 
 div.states>.cultureName {
-	width: 5em;
+	width: 7em;
 }
 
 div.states>.culturePopulation {
diff --git a/index.html b/index.html
index 38c7e404..db2f0795 100644
--- a/index.html
+++ b/index.html
@@ -1650,7 +1650,7 @@
                 <option value="oriental" data-max="13">Oriental</option>
                 <option value="english" data-max="10">English</option>
                 <option value="antique" data-max="10">Antique</option>
-                <option value="highFantasy" data-max="23">High Fantasy</option>
+                <option value="highFantasy" data-max="17">High Fantasy</option>
                 <option value="darkFantasy" data-max="18">Dark Fantasy</option>
                 <option value="random" data-max="100">Random</option>
               </select>
@@ -3082,12 +3082,12 @@
     <div id="culturesEditor" class="dialog stable" style="display: none">
       <div id="culturesHeader" class="header">
         <div style="left:1.8em" data-tip="Click to sort by culture name" class="sortable alphabetically" data-sortby="name">Culture&nbsp;</div>
-        <div style="left:6.7em" data-tip="Click to sort by culture cells count" class="sortable hide" data-sortby="cells">Cells&nbsp;</div>
-        <div style="left:11.2em" data-tip="Click to sort by expansionism" class="sortable hide" data-sortby="expansionism">Expan.&nbsp;</div>
-        <div style="left:16.6em" data-tip="Click to sort by type" class="sortable alphabetically" data-sortby="type">Type&nbsp;</div>
-        <div style="left:22.9em" data-tip="Click to sort by culture area" class="sortable hide" data-sortby="area">Area&nbsp;</div>
-        <div style="left:26.8em" data-tip="Click to sort by culture population" class="sortable hide icon-sort-number-down" data-sortby="population">Population&nbsp;</div>
-        <div style="left:33.8em" data-tip="Click to sort by culture namesbase" class="sortable" data-sortby="base">Namesbase&nbsp;</div>
+        <div style="left:8.7em" data-tip="Click to sort by culture cells count" class="sortable hide" data-sortby="cells">Cells&nbsp;</div>
+        <div style="left:13.2em" data-tip="Click to sort by expansionism" class="sortable hide" data-sortby="expansionism">Expan.&nbsp;</div>
+        <div style="left:18.6em" data-tip="Click to sort by type" class="sortable alphabetically" data-sortby="type">Type&nbsp;</div>
+        <div style="left:24.9em" data-tip="Click to sort by culture area" class="sortable hide" data-sortby="area">Area&nbsp;</div>
+        <div style="left:28.8em" data-tip="Click to sort by culture population" class="sortable hide icon-sort-number-down" data-sortby="population">Population&nbsp;</div>
+        <div style="left:35.8em" data-tip="Click to sort by culture namesbase" class="sortable" data-sortby="base">Namesbase&nbsp;</div>
       </div>
       <div id="culturesBody" class="table" data-type="absolute"></div>
 
diff --git a/modules/cultures-generator.js b/modules/cultures-generator.js
index c1c0f08c..58f5a47a 100644
--- a/modules/cultures-generator.js
+++ b/modules/cultures-generator.js
@@ -113,6 +113,7 @@
 
   // assign a unique two-letters code (abbreviation)
   function getCode(name) {
+    name = name.replace(/[()]/g, "");
     const words = name.split(" "), letters = words.join("");
     let code = words.length === 2 ? words[0][0]+words[1][0] : letters.slice(0,2);
     for (let i=1; i < letters.length-1 && pack.cultures.some(c => c.code === code); i++) {
@@ -152,160 +153,142 @@
 
     if (culturesSet.value === "european") {
       return [
-        {name:"Shwazen", base:0, odd: 1, sort: i => n(i) / td(i, 10) / bd(i, [6, 8]), shield:ra(["hessen", "swiss"])},
-        {name:"Angshire", base:1, odd: 1, sort: i => n(i) / td(i, 10) / sf(i), shield:ra(["heater", "wedged"])},
+        {name:"Shwazen", base:0, odd: 1, sort: i => n(i) / td(i, 10) / bd(i, [6, 8]), shield:"swiss"},
+        {name:"Angshire", base:1, odd: 1, sort: i => n(i) / td(i, 10) / sf(i), shield:"wedged"},
         {name:"Luari", base:2, odd: 1, sort: i => n(i) / td(i, 12) / bd(i, [6, 8]), shield:"french"},
-        {name:"Tallian", base:3, odd: 1, sort: i => n(i) / td(i, 15), shield:ra(["horsehead", "horsehead2", "oval"])},
+        {name:"Tallian", base:3, odd: 1, sort: i => n(i) / td(i, 15), shield:"horsehead"},
         {name:"Astellian", base:4, odd: 1, sort: i => n(i) / td(i, 16), shield:"spanish"},
         {name:"Slovan", base:5, odd: 1, sort: i => n(i) / td(i, 6) * t[i], shield:"polish"},
-        {name:"Norse", base:6, odd: 1, sort: i => n(i) / td(i, 5), shield:"kite"},
+        {name:"Norse", base:6, odd: 1, sort: i => n(i) / td(i, 5), shield:"heater"},
         {name:"Elladan", base:7, odd: 1, sort: i => n(i) / td(i, 18) * h[i], shield:"boeotian"},
         {name:"Romian", base:8, odd: .2, sort: i => n(i) / td(i, 15) / t[i], shield:"roman"},
         {name:"Soumi", base:9, odd: 1, sort: i => n(i) / td(i, 5) / bd(i, [9]) * t[i], shield:"pavise"},
         {name:"Portuzian", base:13, odd: 1, sort: i => n(i) / td(i, 17) / sf(i), shield:"renaissance"},
-        {name:"Vengrian", base: 15, odd: 1, sort: i => n(i) / td(i, 11) / bd(i, [4]) * t[i], shield:"targe"},
+        {name:"Vengrian", base: 15, odd: 1, sort: i => n(i) / td(i, 11) / bd(i, [4]) * t[i], shield:"horsehead2"},
         {name:"Turchian", base: 16, odd: .05, sort: i => n(i) / td(i, 14), shield:"round"},
         {name:"Euskati", base: 20, odd: .05, sort: i => n(i) / td(i, 15) * h[i], shield:"oldFrench"},
-        {name:"Keltan", base: 22, odd: .05, sort: i => n(i) / td(i, 11) / bd(i, [6, 8]) * t[i], shield:"vesicaPiscis"}
+        {name:"Keltan", base: 22, odd: .05, sort: i => n(i) / td(i, 11) / bd(i, [6, 8]) * t[i], shield:"oval"}
       ];
     }
 
     if (culturesSet.value === "oriental") {
       return [
-        {name:"Koryo", base:10, odd: 1, sort: i => n(i) / td(i, 12) / t[i]},
-        {name:"Hantzu", base:11, odd: 1, sort: i => n(i) / td(i, 13)},
-        {name:"Yamoto", base:12, odd: 1, sort: i => n(i) / td(i, 15) / t[i]},
-        {name:"Turchian", base: 16, odd: 1, sort: i => n(i) / td(i, 12)},
-        {name:"Berberan", base: 17, odd: .2, sort: i => n(i) / td(i, 19) / bd(i, [1, 2, 3], 7) * t[i]},
-        {name:"Eurabic", base: 18, odd: 1, sort: i => n(i) / td(i, 26) / bd(i, [1, 2], 7) * t[i]},
-        {name:"Efratic", base: 23, odd: .1, sort: i => n(i) / td(i, 22) * t[i]},
-        {name:"Tehrani", base: 24, odd: 1, sort: i => n(i) / td(i, 18) * h[i]},
-        {name:"Maui", base: 25, odd: .2, sort: i => n(i) / td(i, 24) / sf(i) / t[i]},
-        {name:"Carnatic", base: 26, odd: .5, sort: i => n(i) / td(i, 26)},
-        {name:"Vietic", base: 29, odd: .8, sort: i => n(i) / td(i, 25) / bd(i, [7], 7) / t[i]},
-        {name:"Guantzu", base:30, odd: .5, sort: i => n(i) / td(i, 17)},
-        {name:"Ulus", base:31, odd: 1, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i]}
+        {name:"Koryo", base:10, odd: 1, sort: i => n(i) / td(i, 12) / t[i], shield:"round"},
+        {name:"Hantzu", base:11, odd: 1, sort: i => n(i) / td(i, 13), shield:"banner"},
+        {name:"Yamoto", base:12, odd: 1, sort: i => n(i) / td(i, 15) / t[i], shield:"round"},
+        {name:"Turchian", base: 16, odd: 1, sort: i => n(i) / td(i, 12), shield:"round"},
+        {name:"Berberan", base: 17, odd: .2, sort: i => n(i) / td(i, 19) / bd(i, [1, 2, 3], 7) * t[i], shield:"oval"},
+        {name:"Eurabic", base: 18, odd: 1, sort: i => n(i) / td(i, 26) / bd(i, [1, 2], 7) * t[i], shield:"oval"},
+        {name:"Efratic", base: 23, odd: .1, sort: i => n(i) / td(i, 22) * t[i], shield:"round"},
+        {name:"Tehrani", base: 24, odd: 1, sort: i => n(i) / td(i, 18) * h[i], shield:"round"},
+        {name:"Maui", base: 25, odd: .2, sort: i => n(i) / td(i, 24) / sf(i) / t[i], shield:"vesicaPiscis"},
+        {name:"Carnatic", base: 26, odd: .5, sort: i => n(i) / td(i, 26), shield:"round"},
+        {name:"Vietic", base: 29, odd: .8, sort: i => n(i) / td(i, 25) / bd(i, [7], 7) / t[i], shield:"banner"},
+        {name:"Guantzu", base:30, odd: .5, sort: i => n(i) / td(i, 17), shield:"banner"},
+        {name:"Ulus", base:31, odd: 1, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i], shield:"banner"}
       ];
     }
 
     if (culturesSet.value === "english") {
       const getName = () => Names.getBase(1, 5, 9, "", 0);
       return [
-        {name:getName(), base:1, odd: 1},
-        {name:getName(), base:1, odd: 1},
-        {name:getName(), base:1, odd: 1},
-        {name:getName(), base:1, odd: 1},
-        {name:getName(), base:1, odd: 1},
-        {name:getName(), base:1, odd: 1},
-        {name:getName(), base:1, odd: 1},
-        {name:getName(), base:1, odd: 1},
-        {name:getName(), base:1, odd: 1},
-        {name:getName(), base:1, odd: 1}
+        {name:getName(), base:1, odd: 1, shield:"heater"},
+        {name:getName(), base:1, odd: 1, shield:"wedged"},
+        {name:getName(), base:1, odd: 1, shield:"swiss"},
+        {name:getName(), base:1, odd: 1, shield:"oldFrench"},
+        {name:getName(), base:1, odd: 1, shield:"swiss"},
+        {name:getName(), base:1, odd: 1, shield:"spanish"},
+        {name:getName(), base:1, odd: 1, shield:"hessen"},
+        {name:getName(), base:1, odd: 1, shield:"fantasy5"},
+        {name:getName(), base:1, odd: 1, shield:"fantasy4"},
+        {name:getName(), base:1, odd: 1, shield:"fantasy1"}
       ];
     }
 
     if (culturesSet.value === "antique") {
       return [
-        {name:"Roman", base:8, odd: 1, sort: i => n(i) / td(i, 14) / t[i]}, // Roman
-        {name:"Roman", base:8, odd: 1, sort: i => n(i) / td(i, 15) / sf(i)}, // Roman
-        {name:"Roman", base:8, odd: 1, sort: i => n(i) / td(i, 16) / sf(i)}, // Roman
-        {name:"Roman", base:8, odd: 1, sort: i => n(i) / td(i, 17) / t[i]}, // Roman
-        {name:"Hellenic", base:7, odd: 1, sort: i => n(i) / td(i, 18) / sf(i) * h[i]}, // Greek
-        {name:"Hellenic", base:7, odd: 1, sort: i => n(i) / td(i, 19) / sf(i) * h[i]}, // Greek
-        {name:"Macedonian", base:7, odd: .5, sort: i => n(i) / td(i, 12) * h[i]}, // Greek
-        {name:"Celtic", base:22, odd: 1, sort: i => n(i) / td(i, 11) ** .5 / bd(i, [6, 8])},
-        {name:"Germanic", base:0, odd: 1, sort: i => n(i) / td(i, 10) ** .5 / bd(i, [6, 8])},
-        {name:"Persian", base:24, odd: .8, sort: i => n(i) / td(i, 18) * h[i]}, // Iranian
-        {name:"Scythian", base:24, odd: .5, sort: i => n(i) / td(i, 11) ** .5 / bd(i, [4])}, // Iranian
-        {name:"Cantabrian", base: 20, odd: .5, sort: i => n(i) / td(i, 16) * h[i]}, // Basque
-        {name:"Estian", base: 9, odd: .2, sort: i => n(i) / td(i, 5) * t[i]}, // Finnic
-        {name:"Carthaginian", base: 17, odd: .3, sort: i => n(i) / td(i, 19) / sf(i)}, // Berber
-        {name:"Mesopotamian", base: 23, odd: .2, sort: i => n(i) / td(i, 22) / bd(i, [1, 2, 3])} // Mesopotamian
+        {name:"Roman", base:8, odd: 1, sort: i => n(i) / td(i, 14) / t[i], shield:"roman"}, // Roman
+        {name:"Roman", base:8, odd: 1, sort: i => n(i) / td(i, 15) / sf(i), shield:"roman"}, // Roman
+        {name:"Roman", base:8, odd: 1, sort: i => n(i) / td(i, 16) / sf(i), shield:"roman"}, // Roman
+        {name:"Roman", base:8, odd: 1, sort: i => n(i) / td(i, 17) / t[i], shield:"roman"}, // Roman
+        {name:"Hellenic", base:7, odd: 1, sort: i => n(i) / td(i, 18) / sf(i) * h[i], shield:"boeotian"}, // Greek
+        {name:"Hellenic", base:7, odd: 1, sort: i => n(i) / td(i, 19) / sf(i) * h[i], shield:"boeotian"}, // Greek
+        {name:"Macedonian", base:7, odd: .5, sort: i => n(i) / td(i, 12) * h[i], shield:"round"}, // Greek
+        {name:"Celtic", base:22, odd: 1, sort: i => n(i) / td(i, 11) ** .5 / bd(i, [6, 8]), shield:"round"},
+        {name:"Germanic", base:0, odd: 1, sort: i => n(i) / td(i, 10) ** .5 / bd(i, [6, 8]), shield:"round"},
+        {name:"Persian", base:24, odd: .8, sort: i => n(i) / td(i, 18) * h[i], shield:"oval"}, // Iranian
+        {name:"Scythian", base:24, odd: .5, sort: i => n(i) / td(i, 11) ** .5 / bd(i, [4]), shield:"round"}, // Iranian
+        {name:"Cantabrian", base: 20, odd: .5, sort: i => n(i) / td(i, 16) * h[i], shield:"oval"}, // Basque
+        {name:"Estian", base: 9, odd: .2, sort: i => n(i) / td(i, 5) * t[i], shield:"pavise"}, // Finnic
+        {name:"Carthaginian", base: 17, odd: .3, sort: i => n(i) / td(i, 19) / sf(i), shield:"oval"}, // Berber
+        {name:"Mesopotamian", base: 23, odd: .2, sort: i => n(i) / td(i, 22) / bd(i, [1, 2, 3]), shield:"oval"} // Mesopotamian
       ];
     }
 
     if (culturesSet.value === "highFantasy") {
       return [
         // fantasy races
-        {name:"Quenian", base: 33, odd: 1, sort: i => n(i) / bd(i, [6,7,8,9], 10) * t[i]}, // Elves
-        {name:"Eldar", base: 33, odd: 1, sort: i => n(i) / bd(i, [6,7,8,9], 10) * t[i]}, // Elves
-        {name:"Lorian", base: 33, odd: .5, sort: i => n(i) / bd(i, [6,7,8,9], 10)}, // Elves
-        {name:"Trow", base: 34, odd: .9, sort: i => n(i) / bd(i, [7,8,9,12], 10) * t[i]}, // Dark Elves
-        {name:"Dokalfar", base: 34, odd: .3, sort: i => n(i) / bd(i, [7,8,9,12], 10) * t[i]}, // Dark Elves
-        {name:"Durinn", base: 35, odd: 1, sort: i => n(i) + h[i]}, // Dwarven
-        {name:"Khazadur", base: 35, odd: 1, sort: i => n(i) + h[i]}, // Dwarven
-        {name:"Kobblin", base: 36, odd: 1, sort: i => t[i] - s[i]}, // Goblin
-        {name:"Uruk", base: 37, odd: 1, sort: i => h[i] * t[i]}, // Orc
-        {name:"Ugluk", base: 37, odd: .7, sort: i => h[i] * t[i] / bd(i, [1,2,10,11])}, // Orc
-        {name:"Yotunn", base: 38, odd: .9, sort: i => td(i, -10)}, // Giant
-        {name:"Drake", base: 39, odd: .7, sort: i => -s[i]}, // Draconic
-        {name:"Rakhnid", base: 40, odd: .9, sort: i => t[i] - s[i]}, // Arachnid
-        {name:"Aj'Snaga", base: 41, odd: .9, sort: i => n(i) / bd(i, [12], 10)}, // Serpents
-        // common fantasy human
-        {name:"Gozdor", base:32, odd: 1, sort: i => n(i) / td(i, 18)},
-        {name:"Anor", base:32, odd: 1, sort: i => n(i) / td(i, 10)},
-        {name:"Dail", base:32, odd: 1, sort: i => n(i) / td(i, 13)},
-        {name:"Duland", base:32, odd: 1, sort: i => n(i) / td(i, 14)},
-        {name:"Rohand", base:32, odd: 1, sort: i => n(i) / td(i, 16)},
-        // rare real-world western
-        {name:"Norse", base:6, odd: .5, sort: i => n(i) / td(i, 5) / sf(i)},
-        {name:"Izenlute", base:0, odd: .1, sort: i => n(i) / td(i, 5)},
-        {name:"Lurian", base:2, odd: .1, sort: i => n(i) / td(i, 12) / bd(i, [6, 8])},
-        {name:"Getalian", base:3, odd: .1, sort: i => n(i) / td(i, 15)},
-        {name:"Astelan", base:4, odd: .05, sort: i => n(i) / td(i, 16)},
-        // rare real-world exotic
-        {name:"Yoruba", base:21, odd: .05, sort: i => n(i) / td(i, 15) / bd(i, [5, 7])},
-        {name:"Ryoko", base:10, odd: .05, sort: i => n(i) / td(i, 12) / t[i]},
-        {name:"Toyamo", base:12, odd: .05, sort: i => n(i) / td(i, 15) / t[i]},
-        {name:"Guan-Tsu", base:30, odd: .05, sort: i => n(i) / td(i, 17)},
-        {name:"Ulus-Khan", base:31, odd: .05, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i]},
-        {name:"Turan", base: 16, odd: .05, sort: i => n(i) / td(i, 13)},
-        {name:"Al'Uma", base: 18, odd: .05, sort: i => n(i) / td(i, 26) / bd(i, [1, 2], 7) * t[i]},
-        {name:"Druidas", base: 22, odd: .05, sort: i => n(i) / td(i, 11) / bd(i, [6, 8]) * t[i]},
-        {name:"Gorodian", base:5, odd: .05, sort: i => n(i) / td(i, 6) * t[i]}
+        {name:"Quenian (Elfish)", base: 33, odd: 1, sort: i => n(i) / bd(i, [6,7,8,9], 10) * t[i], shield:"gondor"}, // Elves
+        {name:"Eldar (Elfish)", base: 33, odd: 1, sort: i => n(i) / bd(i, [6,7,8,9], 10) * t[i], shield:"noldor"}, // Elves
+        {name:"Trow (Dark Elfish)", base: 34, odd: .9, sort: i => n(i) / bd(i, [7,8,9,12], 10) * t[i], shield:"hessen"}, // Dark Elves
+        {name:"Lothian (Dark Elfish)", base: 34, odd: .3, sort: i => n(i) / bd(i, [7,8,9,12], 10) * t[i], shield:"wedged"}, // Dark Elves
+        {name:"Dunirr (Dwarven)", base: 35, odd: 1, sort: i => n(i) + h[i], shield:"ironHills"}, // Dwarfs
+        {name:"Khazadur (Dwarven)", base: 35, odd: 1, sort: i => n(i) + h[i], shield:"erebor"}, // Dwarfs
+        {name:"Kobold (Goblin)", base: 36, odd: 1, sort: i => t[i] - s[i], shield:"moriaOrc"}, // Goblin
+        {name:"Uruk (Orkish)", base: 37, odd: 1, sort: i => h[i] * t[i], shield:"urukHai"}, // Orc
+        {name:"Ugluk (Orkish)", base: 37, odd: .5, sort: i => h[i] * t[i] / bd(i, [1,2,10,11]), shield:"moriaOrc"}, // Orc
+        {name:"Yotunn (Giants)", base: 38, odd: .7, sort: i => td(i, -10), shield:"pavise"}, // Giant
+        {name:"Rake (Drakonic)", base: 39, odd: .7, sort: i => -s[i], shield:"fantasy2"}, // Draconic
+        {name:"Arago (Arachnid)", base: 40, odd: .7, sort: i => t[i] - s[i], shield:"horsehead2"}, // Arachnid
+        {name:"Aj'Snaga (Serpents)", base: 41, odd: .7, sort: i => n(i) / bd(i, [12], 10), shield:"fantasy1"}, // Serpents
+        // fantasy human
+        {name:"Anor (Human)", base:32, odd: 1, sort: i => n(i) / td(i, 10), shield:"fantasy5"},
+        {name:"Dail (Human)", base:32, odd: 1, sort: i => n(i) / td(i, 13), shield:"roman"},
+        {name:"Rohand (Human)", base:16, odd: 1, sort: i => n(i) / td(i, 16), shield:"round"},
+        {name:"Dulandir (Human)", base:31, odd: 1, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i], shield:"easterling"},
       ];
     }
 
     if (culturesSet.value === "darkFantasy") {
       return [
         // common real-world English
-        {name:"Angshire", base:1, odd: 1, sort: i => n(i) / td(i, 10) / sf(i)},
-        {name:"Enlandic", base:1, odd: 1, sort: i => n(i) / td(i, 12)},
-        {name:"Westen", base:1, odd: 1, sort: i => n(i) / td(i, 10)},
-        {name:"Nortumbic", base:1, odd: 1, sort: i => n(i) / td(i, 7)},
-        {name:"Mercian", base:1, odd: 1, sort: i => n(i) / td(i, 9)},
-        {name:"Kentian", base:1, odd: 1, sort: i => n(i) / td(i, 12)},
+        {name:"Angshire", base:1, odd: 1, sort: i => n(i) / td(i, 10) / sf(i), shield:"heater"},
+        {name:"Enlandic", base:1, odd: 1, sort: i => n(i) / td(i, 12), shield:"heater"},
+        {name:"Westen", base:1, odd: 1, sort: i => n(i) / td(i, 10), shield:"heater"},
+        {name:"Nortumbic", base:1, odd: 1, sort: i => n(i) / td(i, 7), shield:"heater"},
+        {name:"Mercian", base:1, odd: 1, sort: i => n(i) / td(i, 9), shield:"heater"},
+        {name:"Kentian", base:1, odd: 1, sort: i => n(i) / td(i, 12), shield:"heater"},
         // rare real-world western
-        {name:"Norse", base:6, odd: .7, sort: i => n(i) / td(i, 5) / sf(i)},
-        {name:"Schwarzen", base:0, odd: .3, sort: i => n(i) / td(i, 10) / bd(i, [6, 8])},
-        {name:"Luarian", base:2, odd: .3, sort: i => n(i) / td(i, 12) / bd(i, [6, 8])},
-        {name:"Hetallian", base:3, odd: .3, sort: i => n(i) / td(i, 15)},
-        {name:"Astellian", base:4, odd: .3, sort: i => n(i) / td(i, 16)},
+        {name:"Norse", base:6, odd: .7, sort: i => n(i) / td(i, 5) / sf(i), shield:"oldFrench"},
+        {name:"Schwarzen", base:0, odd: .3, sort: i => n(i) / td(i, 10) / bd(i, [6, 8]), shield:"gonfalon"},
+        {name:"Luarian", base:2, odd: .3, sort: i => n(i) / td(i, 12) / bd(i, [6, 8]), shield:"oldFrench"},
+        {name:"Hetallian", base:3, odd: .3, sort: i => n(i) / td(i, 15), shield:"oval"},
+        {name:"Astellian", base:4, odd: .3, sort: i => n(i) / td(i, 16), shield:"spanish"},
         // rare real-world exotic
-        {name:"Kiswaili", base:28, odd: .05, sort: i => n(i) / td(i, 29) / bd(i, [1, 3, 5, 7])},
-        {name:"Yoruba", base:21, odd: .05, sort: i => n(i) / td(i, 15) / bd(i, [5, 7])},
-        {name:"Koryo", base:10, odd: .05, sort: i => n(i) / td(i, 12) / t[i]},
-        {name:"Hantzu", base:11, odd: .05, sort: i => n(i) / td(i, 13)},
-        {name:"Yamoto", base:12, odd: .05, sort: i => n(i) / td(i, 15) / t[i]},
-        {name:"Guantzu", base:30, odd: .05, sort: i => n(i) / td(i, 17)},
-        {name:"Ulus", base:31, odd: .05, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i]},
-        {name:"Turan", base: 16, odd: .05, sort: i => n(i) / td(i, 12)},
-        {name:"Berberan", base: 17, odd: .05, sort: i => n(i) / td(i, 19) / bd(i, [1, 2, 3], 7) * t[i]},
-        {name:"Eurabic", base: 18, odd: .05, sort: i => n(i) / td(i, 26) / bd(i, [1, 2], 7) * t[i]},
-        {name:"Slovan", base:5, odd: .05, sort: i => n(i) / td(i, 6) * t[i]},
-        {name:"Keltan", base: 22, odd: .1, sort: i => n(i) / td(i, 11) ** .5 / bd(i, [6, 8])},
-        {name:"Elladan", base:7, odd: .2, sort: i => n(i) / td(i, 18) / sf(i) * h[i]},
-        {name:"Romian", base:8, odd: .2, sort: i => n(i) / td(i, 14) / t[i]},
+        {name:"Kiswaili", base:28, odd: .05, sort: i => n(i) / td(i, 29) / bd(i, [1, 3, 5, 7]), shield:"vesicaPiscis"},
+        {name:"Yoruba", base:21, odd: .05, sort: i => n(i) / td(i, 15) / bd(i, [5, 7]), shield:"vesicaPiscis"},
+        {name:"Koryo", base:10, odd: .05, sort: i => n(i) / td(i, 12) / t[i], shield:"round"},
+        {name:"Hantzu", base:11, odd: .05, sort: i => n(i) / td(i, 13), shield:"banner"},
+        {name:"Yamoto", base:12, odd: .05, sort: i => n(i) / td(i, 15) / t[i], shield:"round"},
+        {name:"Guantzu", base:30, odd: .05, sort: i => n(i) / td(i, 17), shield:"banner"},
+        {name:"Ulus", base:31, odd: .05, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i], shield:"banner"},
+        {name:"Turan", base: 16, odd: .05, sort: i => n(i) / td(i, 12), shield:"round"},
+        {name:"Berberan", base: 17, odd: .05, sort: i => n(i) / td(i, 19) / bd(i, [1, 2, 3], 7) * t[i], shield:"round"},
+        {name:"Eurabic", base: 18, odd: .05, sort: i => n(i) / td(i, 26) / bd(i, [1, 2], 7) * t[i], shield:"round"},
+        {name:"Slovan", base:5, odd: .05, sort: i => n(i) / td(i, 6) * t[i], shield:"round"},
+        {name:"Keltan", base: 22, odd: .1, sort: i => n(i) / td(i, 11) ** .5 / bd(i, [6, 8]), shield:"vesicaPiscis"},
+        {name:"Elladan", base:7, odd: .2, sort: i => n(i) / td(i, 18) / sf(i) * h[i], shield:"boeotian"},
+        {name:"Romian", base:8, odd: .2, sort: i => n(i) / td(i, 14) / t[i], shield:"roman"},
         // fantasy races
-        {name:"Eldar", base: 33, odd: .5, sort: i => n(i) / bd(i, [6,7,8,9], 10) * t[i]}, // Elves
-        {name:"Trow", base: 34, odd: .8, sort: i => n(i) / bd(i, [7,8,9,12], 10) * t[i]}, // Dark Elves
-        {name:"Durinn", base: 35, odd: .8, sort: i => n(i) + h[i]}, // Dwarven
-        {name:"Kobblin", base: 36, odd: .8, sort: i => t[i] - s[i]}, // Goblin
-        {name:"Uruk", base: 37, odd: .8, sort: i => h[i] * t[i] / bd(i, [1,2,10,11])}, // Orc
-        {name:"Yotunn", base: 38, odd: .8, sort: i => td(i, -10)}, // Giant
-        {name:"Drake", base: 39, odd: .9, sort: i => -s[i]}, // Draconic
-        {name:"Rakhnid", base: 40, odd: .9, sort: i => t[i] - s[i]}, // Arachnid
-        {name:"Aj'Snaga", base: 41, odd: .9, sort: i => n(i) / bd(i, [12], 10)}, // Serpents
+        {name:"Eldar", base: 33, odd: .5, sort: i => n(i) / bd(i, [6,7,8,9], 10) * t[i], shield:"fantasy5"}, // Elves
+        {name:"Trow", base: 34, odd: .8, sort: i => n(i) / bd(i, [7,8,9,12], 10) * t[i], shield:"hessen"}, // Dark Elves
+        {name:"Durinn", base: 35, odd: .8, sort: i => n(i) + h[i], shield:"erebor"}, // Dwarven
+        {name:"Kobblin", base: 36, odd: .8, sort: i => t[i] - s[i], shield:"moriaOrc"}, // Goblin
+        {name:"Uruk", base: 37, odd: .8, sort: i => h[i] * t[i] / bd(i, [1,2,10,11]), shield:"urukHai"}, // Orc
+        {name:"Yotunn", base: 38, odd: .8, sort: i => td(i, -10), shield:"pavise"}, // Giant
+        {name:"Drake", base: 39, odd: .9, sort: i => -s[i], shield:"fantasy2"}, // Draconic
+        {name:"Rakhnid", base: 40, odd: .9, sort: i => t[i] - s[i], shield:"horsehead2"}, // Arachnid
+        {name:"Aj'Snaga", base: 41, odd: .9, sort: i => n(i) / bd(i, [12], 10), shield:"fantasy1"}, // Serpents
       ]
     }
 
@@ -318,38 +301,38 @@
 
     // all-world
     return [
-      {name:"Shwazen", base:0, odd: .7, sort: i => n(i) / td(i, 10) / bd(i, [6, 8])},
-      {name:"Angshire", base:1, odd: 1, sort: i => n(i) / td(i, 10) / sf(i)},
-      {name:"Luari", base:2, odd: .6, sort: i => n(i) / td(i, 12) / bd(i, [6, 8])},
-      {name:"Tallian", base:3, odd: .6, sort: i => n(i) / td(i, 15)},
-      {name:"Astellian", base:4, odd: .6, sort: i => n(i) / td(i, 16)},
-      {name:"Slovan", base:5, odd: .7, sort: i => n(i) / td(i, 6) * t[i]},
-      {name:"Norse", base:6, odd: .7, sort: i => n(i) / td(i, 5)},
-      {name:"Elladan", base:7, odd: .7, sort: i => n(i) / td(i, 18) * h[i]},
-      {name:"Romian", base:8, odd: .7, sort: i => n(i) / td(i, 15)},
-      {name:"Soumi", base:9, odd: .3, sort: i => n(i) / td(i, 5) / bd(i, [9]) * t[i]},
-      {name:"Koryo", base:10, odd: .1, sort: i => n(i) / td(i, 12) / t[i]},
-      {name:"Hantzu", base:11, odd: .1, sort: i => n(i) / td(i, 13)},
-      {name:"Yamoto", base:12, odd: .1, sort: i => n(i) / td(i, 15) / t[i]},
-      {name:"Portuzian", base:13, odd: .4, sort: i => n(i) / td(i, 17) / sf(i)},
-      {name:"Nawatli", base:14, odd: .1, sort: i => h[i] / td(i, 18) / bd(i, [7])},
-      {name:"Vengrian", base: 15, odd: .2, sort: i => n(i) / td(i, 11) / bd(i, [4]) * t[i]},
-      {name:"Turchian", base: 16, odd: .2, sort: i => n(i) / td(i, 13)},
-      {name:"Berberan", base: 17, odd: .1, sort: i => n(i) / td(i, 19) / bd(i, [1, 2, 3], 7) * t[i]},
-      {name:"Eurabic", base: 18, odd: .2, sort: i => n(i) / td(i, 26) / bd(i, [1, 2], 7) * t[i]},
-      {name:"Inuk", base: 19, odd: .05, sort: i => td(i, -1) / bd(i, [10, 11]) / sf(i)},
-      {name:"Euskati", base: 20, odd: .05, sort: i => n(i) / td(i, 15) * h[i]},
-      {name:"Yoruba", base: 21, odd: .05, sort: i => n(i) / td(i, 15) / bd(i, [5, 7])},
-      {name:"Keltan", base: 22, odd: .05, sort: i => n(i) / td(i, 11) / bd(i, [6, 8]) * t[i]},
-      {name:"Efratic", base: 23, odd: .05, sort: i => n(i) / td(i, 22) * t[i]},
-      {name:"Tehrani", base: 24, odd: .1, sort: i => n(i) / td(i, 18) * h[i]},
-      {name:"Maui", base: 25, odd: .05, sort: i => n(i) / td(i, 24) / sf(i) / t[i]},
-      {name:"Carnatic", base: 26, odd: .05, sort: i => n(i) / td(i, 26)},
-      {name:"Inqan", base: 27, odd: .05, sort: i => h[i] / td(i, 13)},
-      {name:"Kiswaili", base: 28, odd: .1, sort: i => n(i) / td(i, 29) / bd(i, [1, 3, 5, 7])},
-      {name:"Vietic", base: 29, odd: .1, sort: i => n(i) / td(i, 25) / bd(i, [7], 7) / t[i]},
-      {name:"Guantzu", base:30, odd: .1, sort: i => n(i) / td(i, 17)},
-      {name:"Ulus", base:31, odd: .1, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i]}
+      {name:"Shwazen", base:0, odd: .7, sort: i => n(i) / td(i, 10) / bd(i, [6, 8]), shield:"hessen"},
+      {name:"Angshire", base:1, odd: 1, sort: i => n(i) / td(i, 10) / sf(i), shield:"heater"},
+      {name:"Luari", base:2, odd: .6, sort: i => n(i) / td(i, 12) / bd(i, [6, 8]), shield:"oldFrench"},
+      {name:"Tallian", base:3, odd: .6, sort: i => n(i) / td(i, 15), shield:"horsehead2"},
+      {name:"Astellian", base:4, odd: .6, sort: i => n(i) / td(i, 16), shield:"spanish"},
+      {name:"Slovan", base:5, odd: .7, sort: i => n(i) / td(i, 6) * t[i], shield:"round"},
+      {name:"Norse", base:6, odd: .7, sort: i => n(i) / td(i, 5), shield:"heater"},
+      {name:"Elladan", base:7, odd: .7, sort: i => n(i) / td(i, 18) * h[i], shield:"boeotian"},
+      {name:"Romian", base:8, odd: .7, sort: i => n(i) / td(i, 15), shield:"roman"},
+      {name:"Soumi", base:9, odd: .3, sort: i => n(i) / td(i, 5) / bd(i, [9]) * t[i], shield:"pavise"},
+      {name:"Koryo", base:10, odd: .1, sort: i => n(i) / td(i, 12) / t[i], shield:"round"},
+      {name:"Hantzu", base:11, odd: .1, sort: i => n(i) / td(i, 13), shield:"banner"},
+      {name:"Yamoto", base:12, odd: .1, sort: i => n(i) / td(i, 15) / t[i], shield:"round"},
+      {name:"Portuzian", base:13, odd: .4, sort: i => n(i) / td(i, 17) / sf(i), shield:"spanish"},
+      {name:"Nawatli", base:14, odd: .1, sort: i => h[i] / td(i, 18) / bd(i, [7]), shield:"square"},
+      {name:"Vengrian", base: 15, odd: .2, sort: i => n(i) / td(i, 11) / bd(i, [4]) * t[i], shield:"wedged"},
+      {name:"Turchian", base: 16, odd: .2, sort: i => n(i) / td(i, 13), shield:"round"},
+      {name:"Berberan", base: 17, odd: .1, sort: i => n(i) / td(i, 19) / bd(i, [1, 2, 3], 7) * t[i], shield:"round"},
+      {name:"Eurabic", base: 18, odd: .2, sort: i => n(i) / td(i, 26) / bd(i, [1, 2], 7) * t[i], shield:"round"},
+      {name:"Inuk", base: 19, odd: .05, sort: i => td(i, -1) / bd(i, [10, 11]) / sf(i), shield:"square"},
+      {name:"Euskati", base: 20, odd: .05, sort: i => n(i) / td(i, 15) * h[i], shield:"spanish"},
+      {name:"Yoruba", base: 21, odd: .05, sort: i => n(i) / td(i, 15) / bd(i, [5, 7]), shield:"vesicaPiscis"},
+      {name:"Keltan", base: 22, odd: .05, sort: i => n(i) / td(i, 11) / bd(i, [6, 8]) * t[i], shield:"vesicaPiscis"},
+      {name:"Efratic", base: 23, odd: .05, sort: i => n(i) / td(i, 22) * t[i], shield:"diamond"},
+      {name:"Tehrani", base: 24, odd: .1, sort: i => n(i) / td(i, 18) * h[i], shield:"round"},
+      {name:"Maui", base: 25, odd: .05, sort: i => n(i) / td(i, 24) / sf(i) / t[i], shield:"round"},
+      {name:"Carnatic", base: 26, odd: .05, sort: i => n(i) / td(i, 26), shield:"round"},
+      {name:"Inqan", base: 27, odd: .05, sort: i => h[i] / td(i, 13), shield:"square"},
+      {name:"Kiswaili", base: 28, odd: .1, sort: i => n(i) / td(i, 29) / bd(i, [1, 3, 5, 7]), shield:"vesicaPiscis"},
+      {name:"Vietic", base: 29, odd: .1, sort: i => n(i) / td(i, 25) / bd(i, [7], 7) / t[i], shield:"banner"},
+      {name:"Guantzu", base:30, odd: .1, sort: i => n(i) / td(i, 17), shield:"banner"},
+      {name:"Ulus", base:31, odd: .1, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i], shield:"banner"}
     ];
   }
 
diff --git a/modules/ui/cultures-editor.js b/modules/ui/cultures-editor.js
index 8c4e7965..c7a6c45e 100644
--- a/modules/ui/cultures-editor.js
+++ b/modules/ui/cultures-editor.js
@@ -492,9 +492,9 @@ function editCultures() {
     debug.select("#cultureCenters").style("display", "none");
 
     culturesEditor.querySelectorAll(".hide").forEach(el => el.classList.add("hidden"));
-    culturesHeader.querySelector("div[data-sortby='type']").style.left = "6.8em";
+    culturesHeader.querySelector("div[data-sortby='type']").style.left = "8.8em";
     culturesFooter.style.display = "none";
-    culturesHeader.querySelector("div[data-sortby='base']").style.marginLeft = "21px";
+    culturesHeader.querySelector("div[data-sortby='base']").style.marginLeft = "20px";
     body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "none");
     $("#culturesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg"}});
 
@@ -588,7 +588,7 @@ function editCultures() {
     document.getElementById("culturesManuallyButtons").style.display = "none";
 
     culturesEditor.querySelectorAll(".hide").forEach(el => el.classList.remove("hidden"));
-    culturesHeader.querySelector("div[data-sortby='type']").style.left = "15.8em";
+    culturesHeader.querySelector("div[data-sortby='type']").style.left = "18.6em";
     culturesFooter.style.display = "block";
     culturesHeader.querySelector("div[data-sortby='base']").style.marginLeft = "2px";
     body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "all");
diff --git a/modules/ui/options.js b/modules/ui/options.js
index 24434e2d..7a6e24c3 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -403,14 +403,14 @@ function randomizeHeightmapTemplate() {
 // select culture set pseudo-randomly
 function randomizeCultureSet() {
   const sets = {
-    "world":       25,
-    "european":    20,
-    "oriental":    10,
-    "english":     10,
-    "antique":     5,
-    "highFantasy": 22,
-    "darkFantasy": 6,
-    "random":      2};
+    "world":       10,
+    "european":    10,
+    "oriental":    2,
+    "english":     5,
+    "antique":     3,
+    "highFantasy": 11,
+    "darkFantasy": 3,
+    "random":      1};
   culturesSet.value = rw(sets);
   changeCultureSet();
 }