backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-22 03:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emblem-controls v1.1 Bug fix to deal with charges and line styles slipping past filters and getting selected.

Browse source
This commit is contained in:
John Morrow 2023-11-01 05:24:08 -04:00
parent c278829f11
commit 2cb38497fe
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/coa-generator.js
View file

@ -1556,6 +1556,7 @@ window.COA = (function () {
"orb", "orb",
"fasces", "fasces",
"cannon", "cannon",
"angel",
"centaur", "centaur",
"sagittarius" "sagittarius"
], ],
@ -1674,7 +1675,10 @@ window.COA = (function () {
"stirrup", "stirrup",
"wheel", "wheel",
"wing", "wing",
"wingSword" "wingSword",
"angel",
"centaur",
"sagittarius"
], ],
excludeNatureCharges: [ excludeNatureCharges: [
"agnusDei", "agnusDei",
@ -1793,7 +1797,7 @@ window.COA = (function () {
"serpent", "serpent",
"unicornRampant", "unicornRampant",
"wyvern", "wyvern",
"wyvernWithWingsDisplayed", "wyvernWithWingsDisplayed"
] ]
}; };
@ -2392,6 +2396,7 @@ window.COA = (function () {
chargesSingleSet = charges.singleLimited; chargesSingleSet = charges.singleLimited;
chargesSemySet = charges.semyShapes; chargesSemySet = charges.semyShapes;
excludeChargesSet = charges.excludeUnusualCharges; excludeChargesSet = charges.excludeUnusualCharges;
excludeCultureChargesSet = charges.excludeUnusualCharges;
} else if (chargesSetting === "Things") { } else if (chargesSetting === "Things") {
chargesTypesSet = charges.typesThings; chargesTypesSet = charges.typesThings;
chargesSingleSet = charges.singleThings; chargesSingleSet = charges.singleThings;
@ -2472,7 +2477,7 @@ window.COA = (function () {
if (ordinary) { if (ordinary) {
coa.ordinaries = [{ordinary, t: getTincture("charge", excludeTincturesSet, usedTinctures, coa.t1)}]; coa.ordinaries = [{ordinary, t: getTincture("charge", excludeTincturesSet, usedTinctures, coa.t1)}];
if (linedOrdinary) coa.ordinaries[0].line = usedPattern || (division && P(0.7)) ? "straight" : rw(lines, excludeLinesSet); if (linedOrdinary) coa.ordinaries[0].line = usedPattern || (division && P(0.7)) ? "straight" : rwx(lines, excludeLinesSet);
if (division && !addCharge && !usedPattern && P(0.5) && ordinary !== "bordure" && ordinary !== "orle") { if (division && !addCharge && !usedPattern && P(0.5) && ordinary !== "bordure" && ordinary !== "orle") {
if (P(0.8)) coa.ordinaries[0].divided = "counter"; if (P(0.8)) coa.ordinaries[0].divided = "counter";
// 40% // 40%