From 547069f25c88394ff717cb71a487b63e98303813 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Fri, 19 Mar 2021 02:20:13 +0300 Subject: [PATCH] new charges: crosses --- charges/crossAnkh.svg | 6 ++++++ charges/crossBiparted.svg | 6 ++++++ charges/crossBurgundy.svg | 6 ++++++ charges/crossCalvary.svg | 6 ++++++ charges/crossCarolingian.svg | 38 +++++++++++++++++++++++++++++++++++ charges/crossCeltic.svg | 2 +- charges/crossCeltic2.svg | 6 ++++++ charges/crossClechy.svg | 2 +- charges/crossDouble.svg | 6 ++++++ charges/crossFitchy.svg | 2 +- charges/crossFormee.svg | 6 ++++++ charges/crossFormee2.svg | 6 ++++++ charges/crossJerusalem.svg | 6 ++++++ charges/crossLatin.svg | 6 ++++++ charges/crossOrthodox.svg | 6 ++++++ charges/crossPatriarchal.svg | 6 ++++++ charges/crossPattee.svg | 2 +- charges/crossPatteeAlisee.svg | 6 ++++++ charges/crossSaltire.svg | 2 +- charges/crossSantiago.svg | 6 ++++++ charges/crossTemplar.svg | 6 ++++++ charges/crossTriquetra.svg | 9 +++++++++ modules/coa-generator.js | 23 ++++++++++++--------- 23 files changed, 156 insertions(+), 14 deletions(-) create mode 100644 charges/crossAnkh.svg create mode 100644 charges/crossBiparted.svg create mode 100644 charges/crossBurgundy.svg create mode 100644 charges/crossCalvary.svg create mode 100644 charges/crossCarolingian.svg create mode 100644 charges/crossCeltic2.svg create mode 100644 charges/crossDouble.svg create mode 100644 charges/crossFormee.svg create mode 100644 charges/crossFormee2.svg create mode 100644 charges/crossJerusalem.svg create mode 100644 charges/crossLatin.svg create mode 100644 charges/crossOrthodox.svg create mode 100644 charges/crossPatriarchal.svg create mode 100644 charges/crossPatteeAlisee.svg create mode 100644 charges/crossSantiago.svg create mode 100644 charges/crossTemplar.svg create mode 100644 charges/crossTriquetra.svg diff --git a/charges/crossAnkh.svg b/charges/crossAnkh.svg new file mode 100644 index 00000000..6bbac70e --- /dev/null +++ b/charges/crossAnkh.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossBiparted.svg b/charges/crossBiparted.svg new file mode 100644 index 00000000..0e6ac5f8 --- /dev/null +++ b/charges/crossBiparted.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossBurgundy.svg b/charges/crossBurgundy.svg new file mode 100644 index 00000000..cb681714 --- /dev/null +++ b/charges/crossBurgundy.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossCalvary.svg b/charges/crossCalvary.svg new file mode 100644 index 00000000..493579f9 --- /dev/null +++ b/charges/crossCalvary.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossCarolingian.svg b/charges/crossCarolingian.svg new file mode 100644 index 00000000..761464a7 --- /dev/null +++ b/charges/crossCarolingian.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/crossCeltic.svg b/charges/crossCeltic.svg index dd3653c9..6abe10fe 100644 --- a/charges/crossCeltic.svg +++ b/charges/crossCeltic.svg @@ -1,6 +1,6 @@ - + diff --git a/charges/crossCeltic2.svg b/charges/crossCeltic2.svg new file mode 100644 index 00000000..84628911 --- /dev/null +++ b/charges/crossCeltic2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossClechy.svg b/charges/crossClechy.svg index 4534dc8b..c246534e 100644 --- a/charges/crossClechy.svg +++ b/charges/crossClechy.svg @@ -1,6 +1,6 @@ - + diff --git a/charges/crossDouble.svg b/charges/crossDouble.svg new file mode 100644 index 00000000..2176c0e3 --- /dev/null +++ b/charges/crossDouble.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossFitchy.svg b/charges/crossFitchy.svg index 733a0ebd..954b8e70 100644 --- a/charges/crossFitchy.svg +++ b/charges/crossFitchy.svg @@ -1,6 +1,6 @@ - + diff --git a/charges/crossFormee.svg b/charges/crossFormee.svg new file mode 100644 index 00000000..efef99d4 --- /dev/null +++ b/charges/crossFormee.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossFormee2.svg b/charges/crossFormee2.svg new file mode 100644 index 00000000..2309e494 --- /dev/null +++ b/charges/crossFormee2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossJerusalem.svg b/charges/crossJerusalem.svg new file mode 100644 index 00000000..54ba95dc --- /dev/null +++ b/charges/crossJerusalem.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossLatin.svg b/charges/crossLatin.svg new file mode 100644 index 00000000..16f60138 --- /dev/null +++ b/charges/crossLatin.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossOrthodox.svg b/charges/crossOrthodox.svg new file mode 100644 index 00000000..9519f84d --- /dev/null +++ b/charges/crossOrthodox.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossPatriarchal.svg b/charges/crossPatriarchal.svg new file mode 100644 index 00000000..12338bc2 --- /dev/null +++ b/charges/crossPatriarchal.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossPattee.svg b/charges/crossPattee.svg index 7679657b..1c3bf761 100644 --- a/charges/crossPattee.svg +++ b/charges/crossPattee.svg @@ -1,6 +1,6 @@ - + diff --git a/charges/crossPatteeAlisee.svg b/charges/crossPatteeAlisee.svg new file mode 100644 index 00000000..801e7113 --- /dev/null +++ b/charges/crossPatteeAlisee.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossSaltire.svg b/charges/crossSaltire.svg index db4bba09..8798ba45 100644 --- a/charges/crossSaltire.svg +++ b/charges/crossSaltire.svg @@ -1,6 +1,6 @@ - + diff --git a/charges/crossSantiago.svg b/charges/crossSantiago.svg new file mode 100644 index 00000000..d6b30109 --- /dev/null +++ b/charges/crossSantiago.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossTemplar.svg b/charges/crossTemplar.svg new file mode 100644 index 00000000..9c33613c --- /dev/null +++ b/charges/crossTemplar.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/crossTriquetra.svg b/charges/crossTriquetra.svg new file mode 100644 index 00000000..024225c1 --- /dev/null +++ b/charges/crossTriquetra.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/modules/coa-generator.js b/modules/coa-generator.js index a863e432..32ed2947 100644 --- a/modules/coa-generator.js +++ b/modules/coa-generator.js @@ -23,10 +23,10 @@ const charges = { // categories selection - types: { conventional: 30, crosses: 8, animals: 2, animalHeads: 1, birds: 2, fantastic: 3, plants: 1, agriculture: 1, arms: 3, bodyparts: 1, people: 1, architecture: 1, miscellaneous: 3, inescutcheon: 3 }, + types: { conventional: 30, crosses: 10, animals: 2, animalHeads: 1, birds: 2, fantastic: 3, plants: 1, agriculture: 1, arms: 3, bodyparts: 1, people: 1, architecture: 1, miscellaneous: 3, inescutcheon: 3 }, single: { conventional: 12, crosses: 8, plants: 2, animals: 10, animalHeads: 2, birds: 4, fantastic: 7, agriculture: 1, arms: 6, bodyparts: 1, people: 2, architecture: 1, miscellaneous: 10, inescutcheon: 5 }, semy: { conventional: 12, crosses: 3, plants: 1 }, - // generic categories + // generic categories conventional: { lozenge: 2, fusil: 4, mascle: 4, rustre: 2, lozengeFaceted: 3, lozengePloye: 1, roundel: 4, roundel2: 3, annulet: 4, mullet: 5, mulletPierced: 1, mulletFaceted: 1, mullet4: 3, mullet6: 4, mullet6Pierced: 1, mullet6Faceted: 1, mullet7: 1, mullet8: 1, mullet10: 1, @@ -34,9 +34,11 @@ fleurDeLis: 6, sun: 3, sunInSplendour: 1, crescent: 5, fountain: 1 }, crosses: { - crossHummetty: 15, crossVoided: 1, crossPattee: 3, crossPotent: 2, crossClechy: 3, crosslet: 1, crossBottony: 1, crossFleury: 3, - crossPatonce: 1, crossPommy: 1, crossGamma: 1, crossArrowed: 1, crossFitchy: 1, crossCercelee: 1, crossMoline: 2, crossFourchy: 1, - crossAvellane: 1, crossErminee: 1, crossMaltese: 3, crossCeltic: 1, crossOccitan: 1, crossSaltire: 3, crossTau: 1 + crossHummetty: 15, crossVoided: 1, crossPattee: 2, crossPatteeAlisee: 1, crossFormee: 1, crossFormee2: 2, crossPotent: 2, crossJerusalem:1, + crosslet: 1, crossClechy: 3, crossBottony: 1, crossFleury: 3, crossPatonce: 1, crossPommy: 1, crossGamma: 1, crossArrowed: 1, crossFitchy: 1, + crossCercelee: 1, crossMoline: 2, crossFourchy: 1, crossAvellane: 1, crossErminee: 1, crossBiparted: 1, crossMaltese: 3, crossTemplar: 2, + crossCeltic: 1, crossCeltic2: 1, crossTriquetra: 1, crossCarolingian: 1, crossOccitan: 1, crossSaltire: 3, crossBurgundy: 1, + crossLatin: 3, crossPatriarchal: 1, crossOrthodox: 1, crossCalvary: 1, crossDouble: 1, crossTau: 1, crossSantiago: 1, crossAnkh: 1 }, animals: { lionRampant: 5, lionPassant: 2, lionPassantGuardant: 1, wolfRampant: 1, wolfPassant: 1, wolfStatant: 1, greyhoundCourant: 1, boarRampant: 1, @@ -65,16 +67,19 @@ // selection based on type City: { key: 3, bell: 2, lute: 1, tower: 1, castle: 1, mallet: 1 }, Capital: { crown: 4, orb: 1, lute: 1, castle: 3, tower: 1 }, - Сathedra: { chalice: 1, orb: 1, crosier: 2, lamb: 1, monk: 2, angel: 3 }, + Сathedra: { chalice: 1, orb: 1, crosier: 2, lamb: 1, monk: 2, angel: 3, crossLatin: 2, crossPatriarchal: 1, crossOrthodox: 1, crossCalvary: 1 }, // specific cases natural: { fountain: "azure", garb: "or", raven: "sable" }, // charges to mainly use predefined colours - sinister: [ + sinister: [ // charges that can be sinister "crossGamma", "lionRampant", "lionPassant", "wolfRampant", "wolfPassant", "wolfStatant", "wolfHeadErased", "greyhoundСourant", "boarRampant", "horseRampant", "horseSalient", "bullPassant", "bearRampant", "bearPassant", "goat", "lamb", "elephant", "eagle", "raven", "cock", "parrot", "swan", "swanErased", "heron", "pike", "dragonPassant", "dragonRampant", "wyvern", "wyvernWithWingsDisplayed", "griffinPassant", "griffinRampant", "unicornRampant", "pegasus", "serpent", "hatchet", "lochaberAxe", "hand", "wing", "wingSword", "lute", "harp", "bow", "head", "headWreathed", - "knight", "lymphad", "log", "crosier", "dolphin", "sabre", "monk", "owl", "axe", "camel", "fasces", "lionPassantGuardant", "helmet"], // charges that can be sinister - reversed: ["goutte", "mullet", "mullet7", "crescent", "crossTau", "cancer", "sword", "sabresCrossed", "hand", "horseshoe", "bowWithArrow", "arrow", "arrowsSheaf", "rake"], // charges that can be reversed + "knight", "lymphad", "log", "crosier", "dolphin", "sabre", "monk", "owl", "axe", "camel", "fasces", "lionPassantGuardant", "helmet"], + reversed: [ // charges that can be reversed + "goutte", "mullet", "mullet7", "crescent", "crossTau", "cancer", "sword", "sabresCrossed", "hand", + "horseshoe", "bowWithArrow", "arrow", "arrowsSheaf", "rake", "crossTriquetra", "crossLatin", "crossTau" + ] } const positions = {