religion gen fix

This commit is contained in:
Azgaar 2021-10-07 23:12:08 +03:00 committed by Peter
parent c83dcff6db
commit 456ef58920
2 changed files with 297 additions and 0 deletions

View file

@ -7901,6 +7901,7 @@
<script src="libs/priority-queue.min.js"></script> <script src="libs/priority-queue.min.js"></script>
<script src="libs/delaunator.min.js"></script> <script src="libs/delaunator.min.js"></script>
<<<<<<< HEAD
<script src="utils/shorthands.js"></script> <script src="utils/shorthands.js"></script>
<script src="utils/commonUtils.js"></script> <script src="utils/commonUtils.js"></script>
<script src="utils/arrayUtils.js"></script> <script src="utils/arrayUtils.js"></script>
@ -7995,4 +7996,57 @@
<!-- Web Components --> <!-- Web Components -->
<script defer src="components/fill-box.js"></script> <script defer src="components/fill-box.js"></script>
</body> </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> </html>

View file

@ -30,6 +30,7 @@ window.Religions = (function () {
const base = { const base = {
number: ["One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve"], number: ["One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve"],
being: [ being: [
<<<<<<< HEAD
"Ancestor", "Ancestor",
"Ancient", "Ancient",
"Brother", "Brother",
@ -63,19 +64,69 @@ window.Religions = (function () {
"Ape", "Ape",
"Badger", "Badger",
"Basilisk", "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", "Bear",
"Beaver", "Beaver",
"Bison", "Bison",
"Boar", "Boar",
"Buffalo", "Buffalo",
<<<<<<< HEAD
"Camel", "Camel",
"Cat", "Cat",
"Centaur", "Centaur",
"Chimera", "Chimera",
=======
"Cat",
>>>>>>> c6917a14 (religion gen fix)
"Cobra", "Cobra",
"Crane", "Crane",
"Crocodile", "Crocodile",
"Crow", "Crow",
<<<<<<< HEAD
"Cyclope", "Cyclope",
"Deer", "Deer",
"Dog", "Dog",
@ -83,6 +134,12 @@ window.Religions = (function () {
"Eagle", "Eagle",
"Elk", "Elk",
"Falcon", "Falcon",
=======
"Deer",
"Dog",
"Eagle",
"Elk",
>>>>>>> c6917a14 (religion gen fix)
"Fox", "Fox",
"Goat", "Goat",
"Goose", "Goose",
@ -90,12 +147,18 @@ window.Religions = (function () {
"Hawk", "Hawk",
"Heron", "Heron",
"Horse", "Horse",
<<<<<<< HEAD
"Hound", "Hound",
=======
>>>>>>> c6917a14 (religion gen fix)
"Hyena", "Hyena",
"Ibis", "Ibis",
"Jackal", "Jackal",
"Jaguar", "Jaguar",
<<<<<<< HEAD
"Kraken", "Kraken",
=======
>>>>>>> c6917a14 (religion gen fix)
"Lark", "Lark",
"Leopard", "Leopard",
"Lion", "Lion",
@ -105,30 +168,44 @@ window.Religions = (function () {
"Mule", "Mule",
"Narwhal", "Narwhal",
"Owl", "Owl",
<<<<<<< HEAD
"Ox", "Ox",
"Panther", "Panther",
"Pegasus", "Pegasus",
"Phoenix", "Phoenix",
=======
"Panther",
>>>>>>> c6917a14 (religion gen fix)
"Rat", "Rat",
"Raven", "Raven",
"Rook", "Rook",
"Scorpion", "Scorpion",
<<<<<<< HEAD
"Serpent", "Serpent",
"Shark", "Shark",
"Sheep", "Sheep",
"Snake", "Snake",
"Sphinx", "Sphinx",
=======
"Shark",
"Sheep",
"Snake",
>>>>>>> c6917a14 (religion gen fix)
"Spider", "Spider",
"Swan", "Swan",
"Tiger", "Tiger",
"Turtle", "Turtle",
<<<<<<< HEAD
"Unicorn", "Unicorn",
=======
>>>>>>> c6917a14 (religion gen fix)
"Viper", "Viper",
"Vulture", "Vulture",
"Walrus", "Walrus",
"Wolf", "Wolf",
"Wolverine", "Wolverine",
"Worm", "Worm",
<<<<<<< HEAD
"Wyvern" "Wyvern"
], ],
adjective: [ adjective: [
@ -295,6 +372,161 @@ window.Religions = (function () {
"White", "White",
"Yellow" "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 = { const forms = {
@ -506,7 +738,11 @@ window.Religions = (function () {
expansion: "global", expansion: "global",
expansionism, expansionism,
center, center,
<<<<<<< HEAD
origins: [r.i] origins: [r.i]
=======
origin: r.i
>>>>>>> c6917a14 (religion gen fix)
}); });
religionsTree.add([x, y]); religionsTree.add([x, y]);
} }
@ -543,8 +779,11 @@ window.Religions = (function () {
name, name,
religions.map((r) => r.code) religions.map((r) => r.code)
); );
<<<<<<< HEAD
const i = religions.length; const i = religions.length;
=======
>>>>>>> c6917a14 (religion gen fix)
religions.push({ religions.push({
i, i,
name, name,
@ -560,7 +799,11 @@ window.Religions = (function () {
area: 0, area: 0,
rural: 0, rural: 0,
urban: 0, urban: 0,
<<<<<<< HEAD
origins: [religionId], origins: [religionId],
=======
origin: r,
>>>>>>> c6917a14 (religion gen fix)
code code
}); });
cells.religion[center] = i; cells.religion[center] = i;