From 2cb38497fef827de0d49113d499b94db3538a85c Mon Sep 17 00:00:00 2001
From: John Morrow <johnmorrownj@hotmail.com>
Date: Wed, 1 Nov 2023 05:24:08 -0400
Subject: [PATCH] emblem-controls v1.1 Bug fix to deal with charges and line
 styles slipping past filters and getting selected.

---
 modules/coa-generator.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/coa-generator.js b/modules/coa-generator.js
index ae0a1121..b5d3cd03 100644
--- a/modules/coa-generator.js
+++ b/modules/coa-generator.js
@@ -1556,6 +1556,7 @@ window.COA = (function () {
       "orb",
       "fasces",
       "cannon",
+      "angel",
       "centaur",
       "sagittarius"
     ],
@@ -1674,7 +1675,10 @@ window.COA = (function () {
       "stirrup",
       "wheel",
       "wing",
-      "wingSword"
+      "wingSword",
+      "angel",
+      "centaur",
+      "sagittarius"
     ],
     excludeNatureCharges: [
       "agnusDei",
@@ -1793,7 +1797,7 @@ window.COA = (function () {
       "serpent",
       "unicornRampant",
       "wyvern",
-      "wyvernWithWingsDisplayed",
+      "wyvernWithWingsDisplayed"
     ]
   };
 
@@ -2392,6 +2396,7 @@ window.COA = (function () {
       chargesSingleSet = charges.singleLimited;
       chargesSemySet = charges.semyShapes;
       excludeChargesSet = charges.excludeUnusualCharges;
+      excludeCultureChargesSet = charges.excludeUnusualCharges;
     } else if (chargesSetting === "Things") {
       chargesTypesSet = charges.typesThings;
       chargesSingleSet = charges.singleThings;
@@ -2472,7 +2477,7 @@ window.COA = (function () {
 
     if (ordinary) {
       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 (P(0.8)) coa.ordinaries[0].divided = "counter";
         // 40%