mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-22 03:51:23 +01:00
Merge branch 'master' into faith-update
This commit is contained in:
commit
fc1b99762e
9 changed files with 70 additions and 44 deletions
|
|
@ -351,9 +351,8 @@ window.Religions = (function () {
|
|||
const codes = [];
|
||||
|
||||
// add folk religions
|
||||
pack.cultures.forEach(c => {
|
||||
const newId = c.i;
|
||||
if (!newId) return religions.push({i: 0, name: "No religion"});
|
||||
cultures.forEach(c => {
|
||||
if (!c.i) return religions.push({i: 0, name: "No religion"});
|
||||
|
||||
if (c.removed) {
|
||||
religions.push({
|
||||
|
|
@ -365,6 +364,8 @@ window.Religions = (function () {
|
|||
return;
|
||||
}
|
||||
|
||||
const newId = c.i;
|
||||
|
||||
if (pack.religions) {
|
||||
const lockedFolkReligion = pack.religions.find(
|
||||
r => r.culture === c.i && !r.removed && r.lock && r.type === "Folk"
|
||||
|
|
@ -868,7 +869,6 @@ window.Religions = (function () {
|
|||
r.culture = cells.culture[r.center];
|
||||
}
|
||||
});
|
||||
TIME && console.timeEnd("updateCulturesForReligions");
|
||||
}
|
||||
|
||||
// get supreme deity name
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue