diff --git a/charges/agnusDei.svg b/charges/agnusDei.svg index 9e9fd1e0..60ea9d87 100644 --- a/charges/agnusDei.svg +++ b/charges/agnusDei.svg @@ -1,135 +1,132 @@ - - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/arbalest.svg b/charges/arbalest.svg index 79cf4950..38adac50 100644 --- a/charges/arbalest.svg +++ b/charges/arbalest.svg @@ -1,39 +1,38 @@ - - - + + - - + + - + - + - + - - + + - + - + - + - - - - - - + + + + + + - - + + - + diff --git a/charges/arbalest2.svg b/charges/arbalest2.svg new file mode 100644 index 00000000..be9b1a6a --- /dev/null +++ b/charges/arbalest2.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/archer.svg b/charges/archer.svg new file mode 100644 index 00000000..00891c1b --- /dev/null +++ b/charges/archer.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armEmbowedHoldingSabre.svg b/charges/armEmbowedHoldingSabre.svg new file mode 100644 index 00000000..2fbae9f6 --- /dev/null +++ b/charges/armEmbowedHoldingSabre.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armEmbowedVambraced.svg b/charges/armEmbowedVambraced.svg new file mode 100644 index 00000000..ac1422b5 --- /dev/null +++ b/charges/armEmbowedVambraced.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armEmbowedVambracedHoldingSword.svg b/charges/armEmbowedVambracedHoldingSword.svg new file mode 100644 index 00000000..d00d8bab --- /dev/null +++ b/charges/armEmbowedVambracedHoldingSword.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armillarySphere.svg b/charges/armillarySphere.svg index c71938a8..45d09b8d 100644 --- a/charges/armillarySphere.svg +++ b/charges/armillarySphere.svg @@ -1,18 +1 @@ - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/arrow.svg b/charges/arrow.svg index dca5f47e..2135169f 100644 --- a/charges/arrow.svg +++ b/charges/arrow.svg @@ -1,10 +1,10 @@ - - - - - - + + + + + + diff --git a/charges/arrowsSheaf.svg b/charges/arrowsSheaf.svg index 47d8b925..4b879e10 100644 --- a/charges/arrowsSheaf.svg +++ b/charges/arrowsSheaf.svg @@ -1,27 +1,27 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + diff --git a/charges/badgerStatant.svg b/charges/badgerStatant.svg index 02de9b22..29cd5f39 100644 --- a/charges/badgerStatant.svg +++ b/charges/badgerStatant.svg @@ -1,62 +1,62 @@ - + - - + + - - + + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/charges/banner.svg b/charges/banner.svg index 80ca0f4f..8ca47b97 100644 --- a/charges/banner.svg +++ b/charges/banner.svg @@ -1,35 +1,35 @@ - diff --git a/charges/bee.svg b/charges/bee.svg index db5b48b4..7f3a0069 100644 --- a/charges/bee.svg +++ b/charges/bee.svg @@ -1,116 +1,116 @@ - - + + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - - + + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/charges/boarHeadErased.svg b/charges/boarHeadErased.svg index 6c28ab2b..08348586 100644 --- a/charges/boarHeadErased.svg +++ b/charges/boarHeadErased.svg @@ -1,44 +1,44 @@ - - - - - + + + + + - - + + - + - - + + - - + + - + - + - + - + - + - + diff --git a/charges/bone.svg b/charges/bone.svg new file mode 100644 index 00000000..27a9e410 --- /dev/null +++ b/charges/bone.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/bookClosed.svg b/charges/bookClosed.svg index f50006a1..0cd74341 100644 --- a/charges/bookClosed.svg +++ b/charges/bookClosed.svg @@ -1,20 +1,20 @@ - - - - - - + + + + + + - - - - - - - - + + + + + + + + diff --git a/charges/bookClosed2.svg b/charges/bookClosed2.svg new file mode 100644 index 00000000..bf8d2519 --- /dev/null +++ b/charges/bookClosed2.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bookOpen.svg b/charges/bookOpen.svg index 6a760e51..62f1c6fc 100644 --- a/charges/bookOpen.svg +++ b/charges/bookOpen.svg @@ -1,21 +1,21 @@ - - - - + + + + - - - - - - + + + + + + - - + + diff --git a/charges/bowWithArrow.svg b/charges/bowWithArrow.svg index ad2e4502..12d7f9ff 100644 --- a/charges/bowWithArrow.svg +++ b/charges/bowWithArrow.svg @@ -1,15 +1,15 @@ - - + + - - - - - - + + + + + + diff --git a/charges/bowWithThreeArrows.svg b/charges/bowWithThreeArrows.svg new file mode 100644 index 00000000..0efc30f2 --- /dev/null +++ b/charges/bowWithThreeArrows.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bridge.svg b/charges/bridge.svg index 41261f98..f5ce588e 100644 --- a/charges/bridge.svg +++ b/charges/bridge.svg @@ -1,92 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bridge2.svg b/charges/bridge2.svg new file mode 100644 index 00000000..6d3dfab5 --- /dev/null +++ b/charges/bridge2.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bucket.svg b/charges/bucket.svg index 399aa92c..56c7e83c 100644 --- a/charges/bucket.svg +++ b/charges/bucket.svg @@ -1,20 +1 @@ - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/bullPassant.svg b/charges/bullPassant.svg index 24143bb3..0314b64e 100644 --- a/charges/bullPassant.svg +++ b/charges/bullPassant.svg @@ -1,21 +1,21 @@ - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + diff --git a/charges/butterfly.svg b/charges/butterfly.svg index e956195c..2c301fcf 100644 --- a/charges/butterfly.svg +++ b/charges/butterfly.svg @@ -1,64 +1,64 @@ - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - + - + - + - + - - + + - - - + + + diff --git a/charges/cannon.svg b/charges/cannon.svg index a110c596..05e88b25 100644 --- a/charges/cannon.svg +++ b/charges/cannon.svg @@ -1,67 +1,67 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/caravel.svg b/charges/caravel.svg index 39f8fd86..9eb57671 100644 --- a/charges/caravel.svg +++ b/charges/caravel.svg @@ -1,70 +1,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + diff --git a/charges/castle2.svg b/charges/castle2.svg new file mode 100644 index 00000000..5f12a8aa --- /dev/null +++ b/charges/castle2.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/catPassantGuardant.svg b/charges/catPassantGuardant.svg index 5a556e4e..b49dc820 100644 --- a/charges/catPassantGuardant.svg +++ b/charges/catPassantGuardant.svg @@ -1,66 +1,66 @@ - + - - - - - + + + + + - - + + - - - + + + - + - - + + - - - - + + + + - + - + - - + + - + - - + + - - - + + + - + - + - + - + - + - + - + diff --git a/charges/cavalier.svg b/charges/cavalier.svg index 8e9d9b43..7bfad7ac 100644 --- a/charges/cavalier.svg +++ b/charges/cavalier.svg @@ -1,8 +1,75 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/centaur.svg b/charges/centaur.svg new file mode 100644 index 00000000..f4ddeb22 --- /dev/null +++ b/charges/centaur.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/chain.svg b/charges/chain.svg index 4fea5d56..cfe4a3bb 100644 --- a/charges/chain.svg +++ b/charges/chain.svg @@ -1,10 +1,10 @@ - - - - - - - + + + + + + + - \ No newline at end of file + diff --git a/charges/chalice.svg b/charges/chalice.svg index 2a8f7845..0f4f95f6 100644 --- a/charges/chalice.svg +++ b/charges/chalice.svg @@ -1,13 +1,13 @@ - - - - + + + + - - + + - + diff --git a/charges/cinquefoil.svg b/charges/cinquefoil.svg index 3e957d99..49db293e 100644 --- a/charges/cinquefoil.svg +++ b/charges/cinquefoil.svg @@ -1,14 +1,14 @@ - + - + - - - - - + + + + + diff --git a/charges/column.svg b/charges/column.svg index 80067505..38d8b2a0 100644 --- a/charges/column.svg +++ b/charges/column.svg @@ -1,17 +1,17 @@ - + - - - - - + + + + + - - - - - + + + + + diff --git a/charges/comet.svg b/charges/comet.svg new file mode 100644 index 00000000..096ddb67 --- /dev/null +++ b/charges/comet.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/cossack.svg b/charges/cossack.svg new file mode 100644 index 00000000..f5cf75ed --- /dev/null +++ b/charges/cossack.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/cowStatant.svg b/charges/cowStatant.svg index f28e58e0..66b46823 100644 --- a/charges/cowStatant.svg +++ b/charges/cowStatant.svg @@ -1,43 +1,43 @@ - - - - - - + + + + + + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - + diff --git a/charges/crocodile.svg b/charges/crocodile.svg index b44032f7..442e456d 100644 --- a/charges/crocodile.svg +++ b/charges/crocodile.svg @@ -1,65 +1,65 @@ - + - - + + - + - + - - + + - + - + - - + + - + - + - + - + - - + + - + - + - - + + - + - + - + - + - + - + - + - + diff --git a/charges/crosier.svg b/charges/crosier.svg index 5eb26576..631ef998 100644 --- a/charges/crosier.svg +++ b/charges/crosier.svg @@ -1,16 +1 @@ - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/crossCalvary.svg b/charges/crossCalvary.svg index 493579f9..dd0447b5 100644 --- a/charges/crossCalvary.svg +++ b/charges/crossCalvary.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/charges/crossDouble.svg b/charges/crossDouble.svg index 2176c0e3..1a0e4bc8 100644 --- a/charges/crossDouble.svg +++ b/charges/crossDouble.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/charges/crossSantiago.svg b/charges/crossSantiago.svg index d6b30109..7e510a90 100644 --- a/charges/crossSantiago.svg +++ b/charges/crossSantiago.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/charges/crossedBones.svg b/charges/crossedBones.svg new file mode 100644 index 00000000..3b06442f --- /dev/null +++ b/charges/crossedBones.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/crosslet.svg b/charges/crosslet.svg index 3dc8b517..645b68a3 100644 --- a/charges/crosslet.svg +++ b/charges/crosslet.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/charges/crown2.svg b/charges/crown2.svg index 4be76b88..f06a106e 100644 --- a/charges/crown2.svg +++ b/charges/crown2.svg @@ -1,72 +1,69 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + - - + + - - - - + + + - - - - - - + + + + + + - - + + - - + + - + - - + + - - - - + + + + diff --git a/charges/dolphin.svg b/charges/dolphin.svg index fdc49f07..be5b00bd 100644 --- a/charges/dolphin.svg +++ b/charges/dolphin.svg @@ -21,40 +21,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/donkeyHeadCaboshed.svg b/charges/donkeyHeadCaboshed.svg index c9533d82..da5aee0a 100644 --- a/charges/donkeyHeadCaboshed.svg +++ b/charges/donkeyHeadCaboshed.svg @@ -1,39 +1,37 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + - + + - - - - + + + + + + + + + + + + + + + + + + diff --git a/charges/dove.svg b/charges/dove.svg index 860ff7f5..7406a6ec 100644 --- a/charges/dove.svg +++ b/charges/dove.svg @@ -1,67 +1,67 @@ - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - - - + + + + - + - + - - + + - + - - - + + + - + - + - + - - + + - + diff --git a/charges/doveDisplayed.svg b/charges/doveDisplayed.svg index d3a24ea1..35bd14d6 100644 --- a/charges/doveDisplayed.svg +++ b/charges/doveDisplayed.svg @@ -1,110 +1,110 @@ - + - - + + - + - - + + - + - + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - + - + - - + + - + - + - + - + - + diff --git a/charges/dragonRampant.svg b/charges/dragonRampant.svg index 016d4711..6ff64c2a 100644 --- a/charges/dragonRampant.svg +++ b/charges/dragonRampant.svg @@ -1,61 +1,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/dragonfly.svg b/charges/dragonfly.svg new file mode 100644 index 00000000..c8b501ca --- /dev/null +++ b/charges/dragonfly.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/charges/drakkar.svg b/charges/drakkar.svg new file mode 100644 index 00000000..f36c3c4d --- /dev/null +++ b/charges/drakkar.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/drawingCompass.svg b/charges/drawingCompass.svg new file mode 100644 index 00000000..65a252d3 --- /dev/null +++ b/charges/drawingCompass.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/charges/drum.svg b/charges/drum.svg index d80386d4..bd8fd638 100644 --- a/charges/drum.svg +++ b/charges/drum.svg @@ -1,18 +1,18 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/charges/duck.svg b/charges/duck.svg index 440b93fd..940c3e4d 100644 --- a/charges/duck.svg +++ b/charges/duck.svg @@ -1,85 +1,85 @@ - + - + - + - + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - + - + - + diff --git a/charges/eagleTwoHeads.svg b/charges/eagleTwoHeads.svg index d556d380..cc8ac124 100644 --- a/charges/eagleTwoHeads.svg +++ b/charges/eagleTwoHeads.svg @@ -18,86 +18,86 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/earOfWheat.svg b/charges/earOfWheat.svg new file mode 100644 index 00000000..a1b3072c --- /dev/null +++ b/charges/earOfWheat.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/elephantHeadErased.svg b/charges/elephantHeadErased.svg index cb7acccc..f521413b 100644 --- a/charges/elephantHeadErased.svg +++ b/charges/elephantHeadErased.svg @@ -1,22 +1,22 @@ - - + + - + - - + + - + - - + + - - + + diff --git a/charges/escallop.svg b/charges/escallop.svg index d5803037..4fda9dda 100644 --- a/charges/escallop.svg +++ b/charges/escallop.svg @@ -3,17 +3,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/charges/falchion.svg b/charges/falchion.svg index dc28b164..ccb71d3d 100644 --- a/charges/falchion.svg +++ b/charges/falchion.svg @@ -1,10 +1,10 @@ - - - - - - - + + + + + + + diff --git a/charges/falcon.svg b/charges/falcon.svg index 66d15b9d..5e4cebd5 100644 --- a/charges/falcon.svg +++ b/charges/falcon.svg @@ -1,221 +1,221 @@ - + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - + + - - - + + + - - + + - - - + + + - + - + - + - - - + + + - - - - - + + + + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - + + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - + - + - - - - - + + + + + - - - + + + - + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/charges/fan.svg b/charges/fan.svg new file mode 100644 index 00000000..d7504ac6 --- /dev/null +++ b/charges/fan.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/charges/feather.svg b/charges/feather.svg new file mode 100644 index 00000000..0be55bf5 --- /dev/null +++ b/charges/feather.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/flamberge.svg b/charges/flamberge.svg new file mode 100644 index 00000000..ab9d2277 --- /dev/null +++ b/charges/flamberge.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/charges/flangedMace.svg b/charges/flangedMace.svg new file mode 100644 index 00000000..901d942f --- /dev/null +++ b/charges/flangedMace.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/fly.svg b/charges/fly.svg index 08c07a8c..9c880f72 100644 --- a/charges/fly.svg +++ b/charges/fly.svg @@ -1,61 +1,61 @@ - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/charges/foot.svg b/charges/foot.svg index dc354c02..22963e5b 100644 --- a/charges/foot.svg +++ b/charges/foot.svg @@ -1,14 +1,14 @@ - - - - - - + + + + + + - - - + + + diff --git a/charges/frog.svg b/charges/frog.svg index 6f6f2c1f..392d3d05 100644 --- a/charges/frog.svg +++ b/charges/frog.svg @@ -1,24 +1,24 @@ - + - + - + - + - - + + - + - - + + - + diff --git a/charges/garb.svg b/charges/garb.svg index 3bd53140..fbefacd8 100644 --- a/charges/garb.svg +++ b/charges/garb.svg @@ -1,150 +1,150 @@ - - + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + diff --git a/charges/gauntlet.svg b/charges/gauntlet.svg index 5bbd9e55..f00a03eb 100644 --- a/charges/gauntlet.svg +++ b/charges/gauntlet.svg @@ -1,54 +1,54 @@ - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + diff --git a/charges/gear.svg b/charges/gear.svg new file mode 100644 index 00000000..2d128dfb --- /dev/null +++ b/charges/gear.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/grapeBunch.svg b/charges/grapeBunch.svg index d25c92b8..38d4693f 100644 --- a/charges/grapeBunch.svg +++ b/charges/grapeBunch.svg @@ -1,52 +1,73 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/grapeBunch2.svg b/charges/grapeBunch2.svg new file mode 100644 index 00000000..0af7b6a6 --- /dev/null +++ b/charges/grapeBunch2.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/grenade.svg b/charges/grenade.svg new file mode 100644 index 00000000..07436784 --- /dev/null +++ b/charges/grenade.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/greyhoundCourant.svg b/charges/greyhoundCourant.svg index 75f0476f..916d70cf 100644 --- a/charges/greyhoundCourant.svg +++ b/charges/greyhoundCourant.svg @@ -1,31 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/greyhoundRampant.svg b/charges/greyhoundRampant.svg index 73ae1448..cf607df5 100644 --- a/charges/greyhoundRampant.svg +++ b/charges/greyhoundRampant.svg @@ -1,89 +1,89 @@ - - - - - - + + + + + + - - - + + + - + - + - + - + - + - + - - - + + + - + - + - + - - + + - + - + - + - - + + - - - + + + - + - - - + + + - + - + - + - + - + - + diff --git a/charges/griffinPassant.svg b/charges/griffinPassant.svg index 4ff9c011..871b3591 100644 --- a/charges/griffinPassant.svg +++ b/charges/griffinPassant.svg @@ -19,36 +19,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/griffinRampant.svg b/charges/griffinRampant.svg index c17552c3..da2cfebe 100644 --- a/charges/griffinRampant.svg +++ b/charges/griffinRampant.svg @@ -29,87 +29,87 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/hand.svg b/charges/hand.svg index 4da98b9a..91c279ae 100644 --- a/charges/hand.svg +++ b/charges/hand.svg @@ -2,11 +2,11 @@ - - - - - + + + + + diff --git a/charges/harp.svg b/charges/harp.svg index 6047a0b5..91e5ee08 100644 --- a/charges/harp.svg +++ b/charges/harp.svg @@ -1,30 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/head.svg b/charges/head.svg index a7f6198d..08e36060 100644 --- a/charges/head.svg +++ b/charges/head.svg @@ -1,16 +1 @@ - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/hedgehog.svg b/charges/hedgehog.svg index d591cc02..c7a84caa 100644 --- a/charges/hedgehog.svg +++ b/charges/hedgehog.svg @@ -1,52 +1,52 @@ - + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + diff --git a/charges/helmetCorinthian.svg b/charges/helmetCorinthian.svg new file mode 100644 index 00000000..3ccd9cdd --- /dev/null +++ b/charges/helmetCorinthian.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/helmetGreat.svg b/charges/helmetGreat.svg new file mode 100644 index 00000000..b7a7bf49 --- /dev/null +++ b/charges/helmetGreat.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/helmetZischagge.svg b/charges/helmetZischagge.svg new file mode 100644 index 00000000..8985d197 --- /dev/null +++ b/charges/helmetZischagge.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/heron.svg b/charges/heron.svg index 86d121b0..4893b082 100644 --- a/charges/heron.svg +++ b/charges/heron.svg @@ -15,14 +15,14 @@ - - - - - - - - + + + + + + + + diff --git a/charges/hindStatant.svg b/charges/hindStatant.svg index 0c2aae31..3f9cc429 100644 --- a/charges/hindStatant.svg +++ b/charges/hindStatant.svg @@ -1,35 +1,35 @@ - - - + + + - + - - - - - + + + + + - + - + - - + + - + - - + + - + diff --git a/charges/hook.svg b/charges/hook.svg new file mode 100644 index 00000000..d5679f64 --- /dev/null +++ b/charges/hook.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/horseHeadCouped.svg b/charges/horseHeadCouped.svg index 712a273d..8c455c23 100644 --- a/charges/horseHeadCouped.svg +++ b/charges/horseHeadCouped.svg @@ -1,32 +1,32 @@ - - - + + + - - + + - + - + - + - - - - - + + + + + - + - + - + - - + + diff --git a/charges/horsePassant.svg b/charges/horsePassant.svg index f4d2de5b..b2361b84 100644 --- a/charges/horsePassant.svg +++ b/charges/horsePassant.svg @@ -1,119 +1,120 @@ - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/horseRampant.svg b/charges/horseRampant.svg index d2f2544a..be7fee6c 100644 --- a/charges/horseRampant.svg +++ b/charges/horseRampant.svg @@ -14,13 +14,13 @@ - - - - - - - + + + + + + + diff --git a/charges/horseSalient.svg b/charges/horseSalient.svg index 65bd744f..21b5db48 100644 --- a/charges/horseSalient.svg +++ b/charges/horseSalient.svg @@ -1,24 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/hourglass.svg b/charges/hourglass.svg new file mode 100644 index 00000000..87e7930b --- /dev/null +++ b/charges/hourglass.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/key.svg b/charges/key.svg index fb677cd6..6fb883ea 100644 --- a/charges/key.svg +++ b/charges/key.svg @@ -1,16 +1,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/charges/ladder.svg b/charges/ladder.svg index b15d2f4a..fc72f130 100644 --- a/charges/ladder.svg +++ b/charges/ladder.svg @@ -1,12 +1,12 @@ - + - - - + + + - - + + diff --git a/charges/ladder2.svg b/charges/ladder2.svg new file mode 100644 index 00000000..5596e045 --- /dev/null +++ b/charges/ladder2.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/ladybird.svg b/charges/ladybird.svg new file mode 100644 index 00000000..3cc1587e --- /dev/null +++ b/charges/ladybird.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lamb.svg b/charges/lamb.svg index 8d4e161a..1d574b53 100644 --- a/charges/lamb.svg +++ b/charges/lamb.svg @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/charges/lambPassantReguardant.svg b/charges/lambPassantReguardant.svg index b348c41d..90884eb7 100644 --- a/charges/lambPassantReguardant.svg +++ b/charges/lambPassantReguardant.svg @@ -1,119 +1,118 @@ - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lanceHead.svg b/charges/lanceHead.svg new file mode 100644 index 00000000..255492db --- /dev/null +++ b/charges/lanceHead.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/lanceWithBanner.svg b/charges/lanceWithBanner.svg new file mode 100644 index 00000000..556e5ade --- /dev/null +++ b/charges/lanceWithBanner.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/laurelWreath.svg b/charges/laurelWreath.svg index 74162f57..989e00c4 100644 --- a/charges/laurelWreath.svg +++ b/charges/laurelWreath.svg @@ -1,262 +1,262 @@ - + - - + + - + - - + + - + - + - + - - - + + + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + diff --git a/charges/laurelWreath2.svg b/charges/laurelWreath2.svg new file mode 100644 index 00000000..6dfb373e --- /dev/null +++ b/charges/laurelWreath2.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lighthouse.svg b/charges/lighthouse.svg new file mode 100644 index 00000000..b66938f5 --- /dev/null +++ b/charges/lighthouse.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/charges/lionHeadErased.svg b/charges/lionHeadErased.svg index e8221630..7ed39c67 100644 --- a/charges/lionHeadErased.svg +++ b/charges/lionHeadErased.svg @@ -1,28 +1,28 @@ - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + - + diff --git a/charges/lionPassant.svg b/charges/lionPassant.svg index 10dcb448..7dd6b396 100644 --- a/charges/lionPassant.svg +++ b/charges/lionPassant.svg @@ -5,19 +5,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -34,148 +34,150 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lionPassantGuardant.svg b/charges/lionPassantGuardant.svg index 9aa594fa..584e8835 100644 --- a/charges/lionPassantGuardant.svg +++ b/charges/lionPassantGuardant.svg @@ -1,243 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/lionRampant.svg b/charges/lionRampant.svg index d5f6bdad..8aab2b09 100644 --- a/charges/lionRampant.svg +++ b/charges/lionRampant.svg @@ -1,23 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/lionSejant.svg b/charges/lionSejant.svg index 6fe1efae..23ca98db 100644 --- a/charges/lionSejant.svg +++ b/charges/lionSejant.svg @@ -1,133 +1,125 @@ - - + + - - - - - - + + + + + + - + - + - - + + - + - + - + - - + + - - + + + - - - - - - - - + + + + + - - - - - - + + + + + + - - + + - - - + + + - + - - + + - + - + - - - - - - - + + + + + + + - + - + - + - + - - + + - - + + - + - + - + - + - - + + - - + + - + - + - - - - - - - - - - - + + + + + diff --git a/charges/lizard.svg b/charges/lizard.svg index 306e99e9..dc8dbf9d 100644 --- a/charges/lizard.svg +++ b/charges/lizard.svg @@ -1,29 +1,29 @@ - + - + - + - + - - + + - + - + - - + + - + - - + + diff --git a/charges/lute.svg b/charges/lute.svg index 195c62cf..c88cc397 100644 --- a/charges/lute.svg +++ b/charges/lute.svg @@ -1,15 +1 @@ - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/lymphad.svg b/charges/lymphad.svg index 7e547eaf..457f10d7 100644 --- a/charges/lymphad.svg +++ b/charges/lymphad.svg @@ -1,75 +1,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + diff --git a/charges/lyre.svg b/charges/lyre.svg new file mode 100644 index 00000000..d89b8550 --- /dev/null +++ b/charges/lyre.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mace.svg b/charges/mace.svg new file mode 100644 index 00000000..a3f0e074 --- /dev/null +++ b/charges/mace.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/maces.svg b/charges/maces.svg new file mode 100644 index 00000000..93988b80 --- /dev/null +++ b/charges/maces.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mallet.svg b/charges/mallet.svg index 381d172d..ecb418f9 100644 --- a/charges/mallet.svg +++ b/charges/mallet.svg @@ -1,8 +1,10 @@ - - + + + + diff --git a/charges/mantle.svg b/charges/mantle.svg new file mode 100644 index 00000000..5493c30b --- /dev/null +++ b/charges/mantle.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mapleLeaf.svg b/charges/mapleLeaf.svg index 414a9797..93e63767 100644 --- a/charges/mapleLeaf.svg +++ b/charges/mapleLeaf.svg @@ -1,15 +1,15 @@ - - + + - - - - - - - + + + + + + + diff --git a/charges/martenCourant.svg b/charges/martenCourant.svg index 5efac23b..1760d038 100644 --- a/charges/martenCourant.svg +++ b/charges/martenCourant.svg @@ -1,68 +1,68 @@ - + - + - - + + - - + + - + - + - - + + - + - + - + - - + + - - - + + + - - + + - + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - + diff --git a/charges/mastiffStatant.svg b/charges/mastiffStatant.svg index 4f3d3744..14feb266 100644 --- a/charges/mastiffStatant.svg +++ b/charges/mastiffStatant.svg @@ -1,157 +1,156 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/charges/millstone.svg b/charges/millstone.svg new file mode 100644 index 00000000..f8d523ca --- /dev/null +++ b/charges/millstone.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/charges/mitre.svg b/charges/mitre.svg index bba5d163..1a20e002 100644 --- a/charges/mitre.svg +++ b/charges/mitre.svg @@ -1,40 +1,40 @@ - + - - + + - + - - - - + + + + - + - - - - + + + + - - + + - + - - + + - + diff --git a/charges/moonInCrescent.svg b/charges/moonInCrescent.svg index f0da801d..27fdb512 100644 --- a/charges/moonInCrescent.svg +++ b/charges/moonInCrescent.svg @@ -1,27 +1,27 @@ - + - + - + - + - + - - + + - + - - - - - + + + + + diff --git a/charges/oak.svg b/charges/oak.svg index aa877960..b01da9b4 100644 --- a/charges/oak.svg +++ b/charges/oak.svg @@ -1,346 +1,345 @@ - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/orb.svg b/charges/orb.svg index af898083..2d7354f5 100644 --- a/charges/orb.svg +++ b/charges/orb.svg @@ -1,25 +1,25 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + diff --git a/charges/ouroboros.svg b/charges/ouroboros.svg new file mode 100644 index 00000000..f0f39146 --- /dev/null +++ b/charges/ouroboros.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/owlDisplayed.svg b/charges/owlDisplayed.svg index c49d8b27..353fe5e7 100644 --- a/charges/owlDisplayed.svg +++ b/charges/owlDisplayed.svg @@ -1,75 +1,75 @@ - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - - + + + - + - - + + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + diff --git a/charges/palace.svg b/charges/palace.svg new file mode 100644 index 00000000..9e03dd4b --- /dev/null +++ b/charges/palace.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/palmTree.svg b/charges/palmTree.svg index 40264f80..590d14a3 100644 --- a/charges/palmTree.svg +++ b/charges/palmTree.svg @@ -1,154 +1,154 @@ - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - + diff --git a/charges/peacock.svg b/charges/peacock.svg index 0ae12f99..064831f4 100644 --- a/charges/peacock.svg +++ b/charges/peacock.svg @@ -1,166 +1,166 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - - - - - + + + + + + + + + - - - + + + - - + + - + - + - + - - - - + + + + - + - + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - - + + - + - - + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + diff --git a/charges/peacockInPride.svg b/charges/peacockInPride.svg index c235a40a..b8b4f8c7 100644 --- a/charges/peacockInPride.svg +++ b/charges/peacockInPride.svg @@ -1,216 +1,216 @@ - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - + + + + - + - - + + - + - - + + - + - - - + + + - + - - + + - + - - - + + + - + - - - + + + - + - - + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pear.svg b/charges/pear.svg index f1f01c0f..d421e208 100644 --- a/charges/pear.svg +++ b/charges/pear.svg @@ -1,37 +1,37 @@ - + - - + + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - + diff --git a/charges/pegasus.svg b/charges/pegasus.svg index 2583831d..5335022d 100644 --- a/charges/pegasus.svg +++ b/charges/pegasus.svg @@ -16,28 +16,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pillar.svg b/charges/pillar.svg new file mode 100644 index 00000000..d9aa943f --- /dev/null +++ b/charges/pillar.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pincers.svg b/charges/pincers.svg new file mode 100644 index 00000000..2e91f728 --- /dev/null +++ b/charges/pincers.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/pineCone.svg b/charges/pineCone.svg index 2e5c4e66..c326f2a2 100644 --- a/charges/pineCone.svg +++ b/charges/pineCone.svg @@ -1,24 +1,26 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + diff --git a/charges/pineTree.svg b/charges/pineTree.svg index 7d1aa006..2abebe11 100644 --- a/charges/pineTree.svg +++ b/charges/pineTree.svg @@ -1,16 +1,16 @@ - - - + + + - + - + - + diff --git a/charges/plaice.svg b/charges/plaice.svg index c1e66df1..8325d1ca 100644 --- a/charges/plaice.svg +++ b/charges/plaice.svg @@ -1,48 +1,47 @@ - - - + + - - + + - + - + - + - + - - - - - + + + + + - + - - + + - + - - + + - - + + - + - + - + - + diff --git a/charges/plough.svg b/charges/plough.svg index d31e4287..7c1f42fc 100644 --- a/charges/plough.svg +++ b/charges/plough.svg @@ -1,16 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/charges/ploughshare.svg b/charges/ploughshare.svg new file mode 100644 index 00000000..45928f03 --- /dev/null +++ b/charges/ploughshare.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/portcullis.svg b/charges/portcullis.svg new file mode 100644 index 00000000..de154326 --- /dev/null +++ b/charges/portcullis.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/quatrefoil.svg b/charges/quatrefoil.svg index cc7b9a33..ff33f762 100644 --- a/charges/quatrefoil.svg +++ b/charges/quatrefoil.svg @@ -1,14 +1,12 @@ - - - - - - - - - + + + + + + + diff --git a/charges/rabbitSejant.svg b/charges/rabbitSejant.svg index 7bbc22e8..c61e0a9b 100644 --- a/charges/rabbitSejant.svg +++ b/charges/rabbitSejant.svg @@ -1,39 +1,39 @@ - + - - - - + + + + - - - + + + - + - - + + - + - + - + - - + + - + - - + + - - + + diff --git a/charges/raft.svg b/charges/raft.svg new file mode 100644 index 00000000..d5b728b4 --- /dev/null +++ b/charges/raft.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/charges/rake.svg b/charges/rake.svg index 2b76bc51..6feed725 100644 --- a/charges/rake.svg +++ b/charges/rake.svg @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ramHeadErased.svg b/charges/ramHeadErased.svg index 6ece24a6..c971f7b4 100644 --- a/charges/ramHeadErased.svg +++ b/charges/ramHeadErased.svg @@ -1,72 +1,72 @@ - + - + - + - - + + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - + - + - + - - + + - - + + - + - - + + diff --git a/charges/ramPassant.svg b/charges/ramPassant.svg index 6ce7da7e..421e416c 100644 --- a/charges/ramPassant.svg +++ b/charges/ramPassant.svg @@ -1,80 +1,80 @@ - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - + - - - + + + - + - + - + - + - + diff --git a/charges/rapier.svg b/charges/rapier.svg new file mode 100644 index 00000000..fed83920 --- /dev/null +++ b/charges/rapier.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ratRampant.svg b/charges/ratRampant.svg index 7e1cb3d6..13c6746a 100644 --- a/charges/ratRampant.svg +++ b/charges/ratRampant.svg @@ -1,44 +1,44 @@ - - - - + + + + - - - - + + + + - - - + + + - - - + + + - + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - + diff --git a/charges/raven.svg b/charges/raven.svg index 83eb8912..6e3c4eca 100644 --- a/charges/raven.svg +++ b/charges/raven.svg @@ -11,14 +11,14 @@ - - - - - - - - + + + + + + + + diff --git a/charges/rhinoceros.svg b/charges/rhinoceros.svg index 4b6304cd..1d43c4f4 100644 --- a/charges/rhinoceros.svg +++ b/charges/rhinoceros.svg @@ -1,61 +1,61 @@ - + - - - + + + - + - - - - - - - + + + + + + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + diff --git a/charges/ribbon1.svg b/charges/ribbon1.svg new file mode 100644 index 00000000..03bf3515 --- /dev/null +++ b/charges/ribbon1.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/ribbon2.svg b/charges/ribbon2.svg new file mode 100644 index 00000000..0f15bb04 --- /dev/null +++ b/charges/ribbon2.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/ribbon3.svg b/charges/ribbon3.svg new file mode 100644 index 00000000..dd168991 --- /dev/null +++ b/charges/ribbon3.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/ribbon4.svg b/charges/ribbon4.svg new file mode 100644 index 00000000..bab35959 --- /dev/null +++ b/charges/ribbon4.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/charges/ribbon5.svg b/charges/ribbon5.svg new file mode 100644 index 00000000..3c718bce --- /dev/null +++ b/charges/ribbon5.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/ribbon6.svg b/charges/ribbon6.svg new file mode 100644 index 00000000..a32eede7 --- /dev/null +++ b/charges/ribbon6.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/ribbon7.svg b/charges/ribbon7.svg new file mode 100644 index 00000000..2d9a1e21 --- /dev/null +++ b/charges/ribbon7.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/ribbon8.svg b/charges/ribbon8.svg new file mode 100644 index 00000000..f7c672a7 --- /dev/null +++ b/charges/ribbon8.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/roundel2.svg b/charges/roundel2.svg index 79e2f6ec..fffa7ad4 100644 --- a/charges/roundel2.svg +++ b/charges/roundel2.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/charges/sabre.svg b/charges/sabre.svg index 765fdb0b..0f1f002d 100644 --- a/charges/sabre.svg +++ b/charges/sabre.svg @@ -1,20 +1,19 @@ - - - - - - + + + + + - - - - - - - - + + + + + + + + diff --git a/charges/sabre2.svg b/charges/sabre2.svg index 44f810c0..2466a761 100644 --- a/charges/sabre2.svg +++ b/charges/sabre2.svg @@ -1,15 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/charges/sabresCrossed.svg b/charges/sabresCrossed.svg index 16136577..e9cec5f4 100644 --- a/charges/sabresCrossed.svg +++ b/charges/sabresCrossed.svg @@ -1,39 +1,36 @@ - - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + - - - - - - - - + + + + + + + + diff --git a/charges/sagittarius.svg b/charges/sagittarius.svg index 074a134a..ac5eaeeb 100644 --- a/charges/sagittarius.svg +++ b/charges/sagittarius.svg @@ -1,136 +1,136 @@ - + - - + + - + - - + + - + - + - + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - - + + - + - + - - + + - + - + - - + + - - + + - + - - - - - - + + + + + + - - + + - + - + - + - + - + - + - + diff --git a/charges/salmon.svg b/charges/salmon.svg index a3dc8e86..bda9bf49 100644 --- a/charges/salmon.svg +++ b/charges/salmon.svg @@ -1,127 +1,127 @@ - - - + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + diff --git a/charges/saw.svg b/charges/saw.svg new file mode 100644 index 00000000..c356263f --- /dev/null +++ b/charges/saw.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/scale.svg b/charges/scale.svg new file mode 100644 index 00000000..b2da96ea --- /dev/null +++ b/charges/scale.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/scaleImbalanced.svg b/charges/scaleImbalanced.svg new file mode 100644 index 00000000..ea151649 --- /dev/null +++ b/charges/scaleImbalanced.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/scalesHanging.svg b/charges/scalesHanging.svg new file mode 100644 index 00000000..1065211b --- /dev/null +++ b/charges/scalesHanging.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/sceptre.svg b/charges/sceptre.svg index 0d060330..57869cbf 100644 --- a/charges/sceptre.svg +++ b/charges/sceptre.svg @@ -1,28 +1,28 @@ - - - + + + - + - + - + - + - - - - - + + + + + - - - - + + + + diff --git a/charges/scissors.svg b/charges/scissors.svg index ebc0df99..a7437f1e 100644 --- a/charges/scissors.svg +++ b/charges/scissors.svg @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/charges/scissors2.svg b/charges/scissors2.svg new file mode 100644 index 00000000..109d8238 --- /dev/null +++ b/charges/scissors2.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/charges/scorpion.svg b/charges/scorpion.svg index 3155f3b9..c132511d 100644 --- a/charges/scorpion.svg +++ b/charges/scorpion.svg @@ -1,60 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + diff --git a/charges/scrollClosed.svg b/charges/scrollClosed.svg new file mode 100644 index 00000000..1f7d8034 --- /dev/null +++ b/charges/scrollClosed.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/scythe.svg b/charges/scythe.svg index 62a52520..b8d0a04d 100644 --- a/charges/scythe.svg +++ b/charges/scythe.svg @@ -1,15 +1,15 @@ - - - + + + - - - - - - + + + + + + diff --git a/charges/scythe2.svg b/charges/scythe2.svg new file mode 100644 index 00000000..7fa9de5d --- /dev/null +++ b/charges/scythe2.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/sextifoil.svg b/charges/sextifoil.svg index cf8b918d..ad6e3303 100644 --- a/charges/sextifoil.svg +++ b/charges/sextifoil.svg @@ -1,14 +1,14 @@ - - + + - - - - - - + + + + + + diff --git a/charges/shears.svg b/charges/shears.svg new file mode 100644 index 00000000..3b3daeb4 --- /dev/null +++ b/charges/shears.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/shield.svg b/charges/shield.svg index 10f6652f..89ad41de 100644 --- a/charges/shield.svg +++ b/charges/shield.svg @@ -1,31 +1,31 @@ - + - - - + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/charges/shipWheel.svg b/charges/shipWheel.svg new file mode 100644 index 00000000..fa23136c --- /dev/null +++ b/charges/shipWheel.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/sickle.svg b/charges/sickle.svg index dcf6dd44..753eeeaa 100644 --- a/charges/sickle.svg +++ b/charges/sickle.svg @@ -1,12 +1,12 @@ - + - - - + + + - - + + diff --git a/charges/skeleton.svg b/charges/skeleton.svg new file mode 100644 index 00000000..cde28dae --- /dev/null +++ b/charges/skeleton.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/skull.svg b/charges/skull.svg index 4ee33d1c..c7dc7044 100644 --- a/charges/skull.svg +++ b/charges/skull.svg @@ -1,37 +1,37 @@ - - + + - - - - + + + + - - - + + + - - - - + + + + - - + + - + - + - + - - - - + + + + diff --git a/charges/skull2.svg b/charges/skull2.svg new file mode 100644 index 00000000..a580afd7 --- /dev/null +++ b/charges/skull2.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/charges/snail.svg b/charges/snail.svg new file mode 100644 index 00000000..387dc48a --- /dev/null +++ b/charges/snail.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/snowflake.svg b/charges/snowflake.svg new file mode 100644 index 00000000..d85d067b --- /dev/null +++ b/charges/snowflake.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/spear.svg b/charges/spear.svg index 036318d7..9944f9d5 100644 --- a/charges/spear.svg +++ b/charges/spear.svg @@ -1,13 +1,13 @@ - - - + + + - - - - + + + + diff --git a/charges/spiral.svg b/charges/spiral.svg new file mode 100644 index 00000000..05736127 --- /dev/null +++ b/charges/spiral.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/squirrel.svg b/charges/squirrel.svg index 0db644c0..bf2cc68b 100644 --- a/charges/squirrel.svg +++ b/charges/squirrel.svg @@ -1,57 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + diff --git a/charges/stagLodgedRegardant.svg b/charges/stagLodgedRegardant.svg new file mode 100644 index 00000000..024f648c --- /dev/null +++ b/charges/stagLodgedRegardant.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/stagPassant.svg b/charges/stagPassant.svg index 51fd94d3..745ed25e 100644 --- a/charges/stagPassant.svg +++ b/charges/stagPassant.svg @@ -1,55 +1,55 @@ - + - - - - + + + + - + - - + + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + diff --git a/charges/stirrup.svg b/charges/stirrup.svg index 7d77eacb..4350ad26 100644 --- a/charges/stirrup.svg +++ b/charges/stirrup.svg @@ -1,47 +1,47 @@ - + - + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - - - - - - - + + + + + + + diff --git a/charges/sunInSplendour2.svg b/charges/sunInSplendour2.svg index 5fee6fcf..d56c221d 100644 --- a/charges/sunInSplendour2.svg +++ b/charges/sunInSplendour2.svg @@ -1,33 +1,33 @@ - - + + - - - + + + - + - + - - + + - - + + - + - - + + - - + + diff --git a/charges/swallow.svg b/charges/swallow.svg index da94f53a..bf363a15 100644 --- a/charges/swallow.svg +++ b/charges/swallow.svg @@ -1,60 +1,60 @@ - + - - + + - - + + - + - + - + - - + + - - + + - + - + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - + diff --git a/charges/swan.svg b/charges/swan.svg index 01893692..26a345f7 100644 --- a/charges/swan.svg +++ b/charges/swan.svg @@ -13,15 +13,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/charges/talbotPassant.svg b/charges/talbotPassant.svg index de6649b9..121e6ba4 100644 --- a/charges/talbotPassant.svg +++ b/charges/talbotPassant.svg @@ -1,57 +1,57 @@ - - - - + + + + - - - + + + - - + + - - + + - - + + - - + + - + - + - - + + - - - + + + - - - - + + + + - + - + - - + + - + diff --git a/charges/talbotSejant.svg b/charges/talbotSejant.svg index 0cb80127..e89d4b90 100644 --- a/charges/talbotSejant.svg +++ b/charges/talbotSejant.svg @@ -1,75 +1,75 @@ - - - - + + + + - + - + - + - + - + - - - - - + + + + + - - - + + + - + - + - + - - + + - + - - + + - - - + + + - + - + - + - + - + - + - + - + diff --git a/charges/thistle.svg b/charges/thistle.svg new file mode 100644 index 00000000..09cff52a --- /dev/null +++ b/charges/thistle.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/tower.svg b/charges/tower.svg index 9e3f64ac..9754803a 100644 --- a/charges/tower.svg +++ b/charges/tower.svg @@ -1,17 +1,17 @@ - - - - - - + + + + + + - - - - + + + + - + diff --git a/charges/trefoil.svg b/charges/trefoil.svg index 83a4a036..438c993e 100644 --- a/charges/trefoil.svg +++ b/charges/trefoil.svg @@ -1,11 +1,11 @@ - - + + - - - + + + diff --git a/charges/trowel.svg b/charges/trowel.svg new file mode 100644 index 00000000..b9533474 --- /dev/null +++ b/charges/trowel.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/unicornRampant.svg b/charges/unicornRampant.svg index 4eef4dba..a3102dbc 100644 --- a/charges/unicornRampant.svg +++ b/charges/unicornRampant.svg @@ -17,13 +17,13 @@ - - - - - - - + + + + + + + diff --git a/charges/wasp.svg b/charges/wasp.svg new file mode 100644 index 00000000..9d54306c --- /dev/null +++ b/charges/wasp.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wheatStalk.svg b/charges/wheatStalk.svg index 229783fb..c6113ccd 100644 --- a/charges/wheatStalk.svg +++ b/charges/wheatStalk.svg @@ -1,41 +1,41 @@ - + - + - - + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - - + + - + - + diff --git a/charges/wheel.svg b/charges/wheel.svg index 5e012206..6133eee9 100644 --- a/charges/wheel.svg +++ b/charges/wheel.svg @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - diff --git a/charges/windmill.svg b/charges/windmill.svg new file mode 100644 index 00000000..b814ef1e --- /dev/null +++ b/charges/windmill.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wolfStatant.svg b/charges/wolfStatant.svg index 297390ec..d592b9ef 100644 --- a/charges/wolfStatant.svg +++ b/charges/wolfStatant.svg @@ -23,7 +23,7 @@ - + diff --git a/charges/wyvern.svg b/charges/wyvern.svg index 92c5de2b..f09b821e 100644 --- a/charges/wyvern.svg +++ b/charges/wyvern.svg @@ -38,32 +38,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/index.html b/index.html index 93f1213a..d4a5f320 100644 --- a/index.html +++ b/index.html @@ -7985,7 +7985,7 @@ - + diff --git a/modules/coa-generator.js b/modules/coa-generator.js index 669233eb..188707c3 100644 --- a/modules/coa-generator.js +++ b/modules/coa-generator.js @@ -43,82 +43,1287 @@ window.COA = (function () { } }; + const chargeData = { + agnusDei: { + colors: 2, + sinister: true + }, + angel: { + colors: 2, + positions: {e: 1} + }, + anvil: { + sinister: true + }, + apple: { + colors: 2 + }, + arbalest: { + colors: 3, + reversed: true + }, + archer: { + colors: 3, + sinister: true + }, + armEmbowedHoldingSabre: { + colors: 3, + sinister: true + }, + armEmbowedVambraced: { + sinister: true + }, + armEmbowedVambracedHoldingSword: { + colors: 3, + sinister: true + }, + armillarySphere: { + positions: {e: 1} + }, + arrow: { + colors: 3, + reversed: true + }, + arrowsSheaf: { + colors: 3, + reversed: true + }, + axe: { + colors: 2, + sinister: true + }, + badgerStatant: { + colors: 2, + sinister: true + }, + banner: { + colors: 2 + }, + basilisk: { + colors: 3, + sinister: true + }, + bearPassant: { + colors: 3, + sinister: true + }, + bearRampant: { + colors: 3, + sinister: true + }, + bee: { + colors: 3, + reversed: true + }, + bell: { + colors: 2 + }, + boarHeadErased: { + colors: 3, + sinister: true + }, + boarRampant: { + colors: 3, + sinister: true, + positions: {e: 12, beh: 1, kn: 1, jln: 2} + }, + boat: { + colors: 2 + }, + bookClosed: { + colors: 3, + sinister: true + }, + bookClosed2: { + sinister: true + }, + bookOpen: { + colors: 3 + }, + bow: { + sinister: true + }, + bowWithArrow: { + colors: 3, + reversed: true + }, + bowWithThreeArrows: { + colors: 3 + }, + bucket: { + colors: 2 + }, + bugleHorn: { + colors: 2 + }, + bugleHorn2: { + colors: 2 + }, + bullHeadCaboshed: { + colors: 2 + }, + bullPassant: { + colors: 3, + sinister: true + }, + butterfly: { + colors: 3, + reversed: true + }, + camel: { + colors: 2, + sinister: true + }, + cancer: { + reversed: true + }, + cannon: { + colors: 2, + sinister: true + }, + caravel: { + colors: 3, + sinister: true + }, + castle: { + colors: 2 + }, + castle2: { + colors: 3 + }, + catPassantGuardant: { + colors: 2, + sinister: true + }, + cavalier: { + colors: 3, + sinister: true, + positions: {e: 1} + }, + centaur: { + colors: 3, + sinister: true + }, + chalice: { + colors: 2 + }, + cinquefoil: { + reversed: true + }, + cock: { + colors: 3, + sinister: true + }, + comet: { + reversed: true + }, + cowStatant: { + colors: 3, + sinister: true + }, + cossack: { + colors: 3, + sinister: true + }, + crescent: { + reversed: true + }, + crocodile: { + colors: 2, + sinister: true + }, + crosier: { + sinister: true + }, + crossbow: { + colors: 3, + sinister: true + }, + crossGamma: { + sinister: true + }, + crossLatin: { + reversed: true + }, + crossTau: { + reversed: true + }, + crossTriquetra: { + reversed: true + }, + crown: { + colors: 2, + positions: { + e: 10, + abcdefgzi: 1, + beh: 3, + behdf: 2, + acegi: 1, + kn: 1, + pq: 2, + abc: 1, + jln: 4, + jleh: 1, + def: 2, + abcpqh: 3 + } + }, + crown2: { + colors: 3, + positions: { + e: 10, + abcdefgzi: 1, + beh: 3, + behdf: 2, + acegi: 1, + kn: 1, + pq: 2, + abc: 1, + jln: 4, + jleh: 1, + def: 2, + abcpqh: 3 + } + }, + deerHeadCaboshed: { + colors: 2 + }, + dolphin: { + colors: 2, + sinister: true + }, + donkeyHeadCaboshed: { + colors: 2 + }, + dove: { + colors: 2, + natural: "argent", + sinister: true + }, + doveDisplayed: { + colors: 2, + natural: "argent", + sinister: true + }, + dragonfly: { + colors: 2, + reversed: true + }, + dragonPassant: { + colors: 3, + sinister: true + }, + dragonRampant: { + colors: 3, + sinister: true + }, + drakkar: { + colors: 3, + sinister: true + }, + drawingCompass: { + sinister: true + }, + drum: { + colors: 3 + }, + duck: { + colors: 3, + sinister: true + }, + eagle: { + colors: 3, + sinister: true, + positions: {e: 15, beh: 1, kn: 1, abc: 1, jlh: 2, def: 2, pq: 1} + }, + eagleTwoHeads: { + colors: 3 + }, + elephant: { + colors: 2, + sinister: true + }, + elephantHeadErased: { + colors: 2, + sinister: true + }, + falchion: { + colors: 2, + reversed: true + }, + falcon: { + colors: 3, + sinister: true + }, + fan: { + colors: 2, + reversed: true + }, + fasces: { + colors: 3, + sinister: true + }, + feather: { + sinister: true + }, + flamberge: { + colors: 2, + reversed: true + }, + flangedMace: { + reversed: true + }, + fly: { + colors: 3, + reversed: true + }, + foot: { + sinister: true + }, + fountain: { + natural: "azure" + }, + frog: { + reversed: true + }, + garb: { + colors: 2, + natural: "or", + positions: {e: 1, def: 3, abc: 2, beh: 1, kn: 1, jln: 3, jleh: 1, abcpqh: 1, joe: 1, lme: 1} + }, + gauntlet: { + sinister: true, + reversed: true + }, + goat: { + colors: 3, + sinister: true + }, + goutte: { + reversed: true + }, + grapeBunch: { + colors: 3, + sinister: true + }, + grapeBunch2: { + colors: 3, + sinister: true + }, + grenade: { + colors: 2 + }, + greyhoundCourant: { + colors: 3, + sinister: true, + positions: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1} + }, + greyhoundRampant: { + colors: 2, + sinister: true, + positions: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1} + }, + greyhoundSejant: { + colors: 3, + sinister: true + }, + griffinPassant: { + colors: 3, + sinister: true, + positions: {e: 10, def: 2, abc: 2, bdefh: 1, kn: 1, jlh: 2, abcpqh: 1} + }, + griffinRampant: { + colors: 3, + sinister: true, + positions: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1} + }, + hand: { + sinister: true, + reversed: true, + positions: {e: 10, jln: 2, kn: 1, jeo: 1, abc: 2, pqe: 1} + }, + harp: { + colors: 2, + sinister: true + }, + hatchet: { + colors: 2, + sinister: true + }, + head: { + colors: 2, + sinister: true, + positions: {e: 1} + }, + headWreathed: { + colors: 3, + sinister: true, + positions: {e: 1} + }, + hedgehog: { + colors: 3, + sinister: true + }, + helmet: { + sinister: true + }, + helmetCorinthian: { + colors: 3, + sinister: true + }, + helmetGreat: { + sinister: true + }, + helmetZischagge: { + sinister: true + }, + heron: { + colors: 2, + sinister: true + }, + hindStatant: { + colors: 2, + sinister: true + }, + hook: { + sinister: true + }, + horseHeadCouped: { + sinister: true + }, + horsePassant: { + colors: 2, + sinister: true + }, + horseRampant: { + colors: 3, + sinister: true + }, + horseSalient: { + colors: 2, + sinister: true + }, + horseshoe: { + reversed: true + }, + hourglass: { + colors: 3 + }, + ladybird: { + colors: 3, + reversed: true + }, + lamb: { + colors: 2, + sinister: true + }, + lambPassantReguardant: { + colors: 2, + sinister: true + }, + lanceWithBanner: { + colors: 3, + sinister: true + }, + laurelWreath: { + colors: 2 + }, + lighthouse: { + colors: 3 + }, + lionHeadCaboshed: { + colors: 2 + }, + lionHeadErased: { + colors: 2, + sinister: true + }, + lionPassant: { + colors: 3, + sinister: true, + positions: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1} + }, + lionPassantGuardant: { + colors: 3, + sinister: true + }, + lionRampant: { + colors: 3, + sinister: true, + positions: {e: 10, def: 2, abc: 2, bdefh: 1, kn: 1, jlh: 2, abcpqh: 1} + }, + lionSejant: { + colors: 3, + sinister: true + }, + lizard: { + reversed: true + }, + lochaberAxe: { + colors: 2, + sinister: true + }, + log: { + sinister: true + }, + lute: { + colors: 2, + sinister: true + }, + lymphad: { + colors: 3, + sinister: true, + positions: {e: 1} + }, + mace: { + colors: 2 + }, + maces: { + colors: 2 + }, + mallet: { + colors: 2 + }, + mantle: { + colors: 3 + }, + martenCourant: { + colors: 3, + sinister: true + }, + mascle: { + positions: { + e: 15, + abcdefgzi: 3, + beh: 3, + bdefh: 4, + acegi: 1, + kn: 3, + joe: 2, + abc: 3, + jlh: 8, + jleh: 1, + df: 3, + abcpqh: 4, + pqe: 3, + eknpq: 3 + } + }, + mastiffStatant: { + colors: 3, + sinister: true + }, + mitre: { + colors: 3 + }, + monk: { + sinister: true + }, + moonInCrescent: { + sinister: true + }, + mullet: { + reversed: true + }, + mullet7: { + reversed: true + }, + oak: { + colors: 3 + }, + orb: { + colors: 3 + }, + ouroboros: { + sinister: true + }, + owl: { + colors: 2, + sinister: true + }, + owlDisplayed: { + colors: 2 + }, + palmTree: { + colors: 3 + }, + parrot: { + colors: 2, + sinister: true + }, + peacock: { + colors: 3, + sinister: true + }, + peacockInPride: { + colors: 3, + sinister: true + }, + pear: { + colors: 2 + }, + pegasus: { + colors: 3, + sinister: true + }, + pike: { + colors: 2, + sinister: true + }, + pineTree: { + colors: 2 + }, + plaice: { + colors: 2, + sinister: true + }, + plough: { + colors: 2, + sinister: true + }, + ploughshare: { + sinister: true + }, + porcupine: { + colors: 2, + sinister: true + }, + portcullis: { + colors: 2 + }, + rabbitSejant: { + colors: 2, + sinister: true + }, + rake: { + reversed: true + }, + rapier: { + colors: 2, + sinister: true, + reversed: true + }, + ramHeadErased: { + colors: 3, + sinister: true + }, + ramPassant: { + colors: 3, + sinister: true + }, + ratRampant: { + colors: 2, + sinister: true + }, + raven: { + colors: 2, + natural: "sable", + sinister: true, + positions: {e: 15, beh: 1, kn: 1, jeo: 1, abc: 3, jln: 3, def: 1} + }, + rhinoceros: { + colors: 2, + sinister: true + }, + rose: { + colors: 3 + }, + sabre: { + colors: 2, + sinister: true + }, + sabre2: { + colors: 2, + sinister: true, + reversed: true + }, + sabresCrossed: { + colors: 2, + reversed: true + }, + sagittarius: { + colors: 3, + sinister: true + }, + salmon: { + colors: 2, + sinister: true + }, + saw: { + colors: 2 + }, + scale: { + colors: 2 + }, + scaleImbalanced: { + colors: 2, + sinister: true + }, + scissors: { + reversed: true + }, + scorpion: { + reversed: true + }, + scrollClosed: { + colors: 2, + sinister: true + }, + scythe: { + colors: 2, + sinister: true, + reversed: true + }, + scythe2: { + sinister: true + }, + serpent: { + colors: 2, + sinister: true + }, + shield: { + colors: 2, + sinister: true + }, + sickle: { + colors: 2, + sinister: true, + reversed: true + }, + snail: { + colors: 2, + sinister: true + }, + snake: { + colors: 2, + sinister: true + }, + spear: { + colors: 2, + reversed: true + }, + spiral: { + sinister: true, + reversed: true + }, + squirrel: { + sinister: true + }, + stagLodgedRegardant: { + colors: 3, + sinister: true + }, + stagPassant: { + colors: 2, + sinister: true + }, + stirrup: { + colors: 2 + }, + swallow: { + colors: 2, + sinister: true + }, + swan: { + colors: 3, + sinister: true + }, + swanErased: { + colors: 3, + sinister: true + }, + sword: { + colors: 2, + reversed: true + }, + talbotPassant: { + colors: 3, + sinister: true + }, + talbotSejant: { + colors: 3, + sinister: true + }, + tower: { + colors: 2 + }, + tree: { + positions: {e: 1} + }, + trefoil: { + reversed: true + }, + trowel: { + colors: 2, + sinister: true, + reversed: true + }, + unicornRampant: { + colors: 3, + sinister: true + }, + wasp: { + colors: 3, + reversed: true + }, + wheatStalk: { + colors: 2 + }, + windmill: { + colors: 3, + sinister: true + }, + wing: { + sinister: true + }, + wingSword: { + colors: 3, + sinister: true + }, + wolfHeadErased: { + colors: 2, + sinister: true + }, + wolfPassant: { + colors: 3, + sinister: true, + positions: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1} + }, + wolfRampant: { + colors: 3, + sinister: true + }, + wolfStatant: { + colors: 3, + sinister: true + }, + wyvern: { + colors: 3, + sinister: true, + positions: {e: 10, jln: 1} + }, + wyvernWithWingsDisplayed: { + colors: 3, + sinister: true + } + }; + const charges = { types: { - conventional: 30, - crosses: 10, - animals: 2, - animalHeads: 1, - birds: 2, - aquatic: 1, - seafaring: 1, - fantastic: 3, - plants: 1, - agriculture: 1, - arms: 3, - bodyparts: 1, - people: 1, - architecture: 1, - miscellaneous: 3, - inescutcheon: 3 + conventional: 33, // 40 charges + crosses: 13, // 30 charges + beasts: 7, // 41 charges + beastHeads: 3, // 10 charges + birds: 3, // 16 charges + reptiles: 2, // 5 charges + bugs: 2, // 8 charges + fishes: 1, // 3 charges + molluscs: 1, // 2 charges + plants: 3, // 18 charges + fantastic: 5, // 14 charges + agriculture: 2, // 8 charges + arms: 5, // 32 charges + bodyparts: 2, // 12 charges + people: 2, // 4 charges + architecture: 3, // 11 charges + seafaring: 3, // 9 charges + tools: 3, // 15 charges + miscellaneous: 5, // 30 charges + inescutcheon: 3, // 43 charges + ornaments: 0, // 9 charges + uploaded: 0 }, single: { - conventional: 12, + conventional: 10, crosses: 8, - plants: 2, - animals: 10, - animalHeads: 2, - birds: 4, - aquatic: 2, - seafaring: 2, - fantastic: 7, - agriculture: 1, - arms: 6, - bodyparts: 1, + beasts: 7, + beastHeads: 3, + birds: 3, + reptiles: 2, + bugs: 2, + fishes: 1, + molluscs: 1, + plants: 3, + fantastic: 5, + agriculture: 2, + arms: 5, + bodyparts: 2, people: 2, - architecture: 1, - miscellaneous: 10, - inescutcheon: 5 + architecture: 3, + seafaring: 3, + tools: 3, + miscellaneous: 5, + inescutcheon: 1 + }, + semy: { + conventional: 4, + crosses: 1 }, - semy: {conventional: 4, crosses: 1}, 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, - estoile: 1, - compassRose: 1, billet: 5, + carreau: 1, + comet: 1, + compassRose: 1, + crescent: 5, delf: 0, - triangle: 3, - trianglePierced: 1, + estoile: 1, + fleurDeLis: 6, + fountain: 1, + fusil: 4, + gear: 1, goutte: 4, heart: 4, + lozenge: 2, + lozengeFaceted: 3, + lozengePloye: 1, + mascle: 4, + moonInCrescent: 1, + mullet: 5, + mullet10: 1, + mullet4: 3, + mullet6: 4, + mullet6Faceted: 1, + mullet6Pierced: 1, + mullet7: 1, + mullet8: 1, + mulletFaceted: 1, + mulletPierced: 1, pique: 2, - carreau: 1, - trefle: 2, - fleurDeLis: 6, + roundel: 4, + roundel2: 3, + rustre: 2, + spiral: 1, sun: 3, sunInSplendour: 1, sunInSplendour2: 1, - moonInCrescent: 1, - crescent: 5, - fountain: 1 + trefle: 2, + triangle: 3, + trianglePierced: 1 + }, + crosses: { + 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 + }, + beasts: { + agnusDei: 1, + badgerStatant: 1, + bearPassant: 1, + bearRampant: 3, + boarRampant: 1, + bullPassant: 1, + camel: 1, + catPassantGuardant: 1, + cowStatant: 1, + dolphin: 1, + elephant: 1, + goat: 1, + greyhoundCourant: 1, + greyhoundRampant: 1, + greyhoundSejant: 1, + hedgehog: 1, + hindStatant: 1, + horsePassant: 1, + horseRampant: 2, + horseSalient: 1, + lamb: 1, + lambPassantReguardant: 1, + lionPassant: 3, + lionPassantGuardant: 2, + lionRampant: 7, + lionSejant: 2, + martenCourant: 1, + mastiffStatant: 1, + porcupine: 1, + rabbitSejant: 1, + ramPassant: 1, + ratRampant: 1, + rhinoceros: 1, + squirrel: 1, + stagLodgedRegardant: 1, + stagPassant: 1, + talbotPassant: 1, + talbotSejant: 1, + wolfPassant: 1, + wolfRampant: 1, + wolfStatant: 1 + }, + beastHeads: { + boarHeadErased: 1, + bullHeadCaboshed: 1, + deerHeadCaboshed: 1, + donkeyHeadCaboshed: 1, + elephantHeadErased: 1, + horseHeadCouped: 1, + lionHeadCaboshed: 2, + lionHeadErased: 2, + ramHeadErased: 1, + wolfHeadErased: 2 + }, + birds: { + cock: 3, + dove: 2, + doveDisplayed: 1, + duck: 1, + eagle: 9, + falcon: 2, + heron: 1, + owl: 1, + owlDisplayed: 1, + parrot: 1, + peacock: 1, + peacockInPride: 1, + raven: 2, + swallow: 1, + swan: 2, + swanErased: 1 + }, + reptiles: { + crocodile: 1, + frog: 1, + lizard: 1, + ouroboros: 1, + snake: 1 + }, + bugs: { + bee: 1, + butterfly: 1, + cancer: 1, + dragonfly: 1, + fly: 1, + ladybird: 1, + scorpion: 1, + wasp: 1 + }, + fishes: { + pike: 1, + plaice: 1, + salmon: 1 + }, + molluscs: { + escallop: 4, + snail: 1 + }, + plants: { + apple: 1, + cinquefoil: 1, + earOfWheat: 1, + grapeBunch: 1, + grapeBunch2: 1, + mapleLeaf: 1, + oak: 1, + palmTree: 1, + pear: 1, + pineCone: 1, + pineTree: 1, + quatrefoil: 1, + rose: 1, + sextifoil: 1, + thistle: 1, + tree: 1, + trefoil: 1, + wheatStalk: 1 + }, + fantastic: { + angel: 3, + basilisk: 1, + centaur: 1, + dragonPassant: 3, + dragonRampant: 2, + eagleTwoHeads: 2, + griffinPassant: 1, + griffinRampant: 2, + pegasus: 1, + sagittarius: 1, + serpent: 1, + unicornRampant: 1, + wyvern: 1, + wyvernWithWingsDisplayed: 1 + }, + agriculture: { + garb: 2, + millstone: 1, + plough: 1, + ploughshare: 1, + rake: 1, + scythe: 1, + scythe2: 1, + sickle: 1 + }, + arms: { + arbalest: 1, + arbalest2: 1, + arrow: 1, + arrowsSheaf: 1, + axe: 3, + bow: 1, + bowWithArrow: 2, + bowWithThreeArrows: 1, + cannon: 1, + falchion: 1, + flamberge: 1, + flangedMace: 1, + gauntlet: 1, + grenade: 1, + hatchet: 3, + helmet: 2, + helmetCorinthian: 1, + helmetGreat: 2, + helmetZischagge: 1, + lanceHead: 1, + lanceWithBanner: 1, + lochaberAxe: 1, + mace: 1, + maces: 1, + mallet: 1, + rapier: 1, + sabre: 1, + sabre2: 1, + sabresCrossed: 1, + shield: 1, + spear: 1, + sword: 4 + }, + bodyparts: { + armEmbowedHoldingSabre: 1, + armEmbowedVambraced: 1, + armEmbowedVambracedHoldingSword: 1, + bone: 1, + crossedBones: 2, + foot: 1, + hand: 4, + head: 1, + headWreathed: 1, + skeleton: 2, + skull: 2, + skull2: 1 + }, + people: { + archer: 1, + cavalier: 3, + cossack: 1, + monk: 1 + }, + architecture: { + bridge: 1, + bridge2: 1, + castle: 2, + castle2: 1, + column: 1, + lighthouse: 1, + palace: 1, + pillar: 1, + portcullis: 1, + tower: 2, + windmill: 1 + }, + seafaring: { + anchor: 6, + armillarySphere: 1, + boat: 2, + boat2: 1, + caravel: 1, + drakkar: 1, + lymphad: 2, + raft: 1, + shipWheel: 1 + }, + tools: { + anvil: 2, + drawingCompass: 2, + fan: 1, + hook: 1, + ladder: 1, + ladder2: 1, + pincers: 1, + saw: 1, + scale: 1, + scaleImbalanced: 1, + scalesHanging: 1, + scissors: 1, + scissors2: 1, + shears: 1, + trowel: 1 + }, + miscellaneous: { + attire: 2, + banner: 2, + bell: 3, + bookClosed: 1, + bookClosed2: 1, + bookOpen: 1, + bucket: 1, + buckle: 1, + bugleHorn: 2, + bugleHorn2: 1, + chain: 2, + chalice: 2, + cowHorns: 3, + crosier: 1, + crown: 3, + crown2: 2, + drum: 1, + fasces: 1, + feather: 3, + harp: 2, + horseshoe: 3, + hourglass: 2, + key: 3, + laurelWreath: 2, + laurelWreath2: 1, + log: 1, + lute: 2, + lyre: 1, + mitre: 1, + orb: 1, + pot: 2, + ramsHorn: 1, + sceptre: 1, + scrollClosed: 1, + snowflake: 1, + stagsAttires: 1, + stirrup: 2, + wheel: 3, + wing: 2, + wingSword: 1 }, inescutcheon: { inescutcheonHeater: 1, @@ -165,589 +1370,60 @@ window.COA = (function () { inescutcheonUrukHai: 1, inescutcheonMoriaOrc: 1 }, - crosses: { - 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 + ornaments: { + mantle: 0, + ribbon1: 3, + ribbon2: 2, + ribbon3: 1, + ribbon4: 1, + ribbon5: 1, + ribbon6: 1, + ribbon7: 1, + ribbon8: 1 }, - animals: { - lionRampant: 6, - lionPassant: 2, - lionPassantGuardant: 1, - lionSejant: 1, - wolfRampant: 1, - wolfPassant: 1, - wolfStatant: 1, - greyhoundCourant: 1, - greyhoundRampant: 1, - greyhoundSejant: 1, - mastiffStatant: 1, - talbotPassant: 1, - talbotSejant: 1, - martenCourant: 1, - boarRampant: 1, - stagPassant: 1, - hindStatant: 1, - horseRampant: 2, - horseSalient: 1, - horsePassant: 1, - bearRampant: 2, - bearPassant: 1, - bullPassant: 1, - cowStatant: 1, - goat: 1, - lamb: 1, - lambPassantReguardant: 1, - agnusDei: 1, - ramPassant: 1, - badgerStatant: 1, - elephant: 1, - rhinoceros: 1, - camel: 1, - porcupine: 1, - hedgehog: 1, - catPassantGuardant: 1, - rabbitSejant: 1, - ratRampant: 1, - squirrel: 1, - frog: 1, - snake: 1, - crocodile: 1, - lizard: 1, - scorpion: 1, - butterfly: 1, - bee: 1, - fly: 1 - }, - animalHeads: { - wolfHeadErased: 2, - bullHeadCaboshed: 1, - deerHeadCaboshed: 1, - donkeyHeadCaboshed: 1, - lionHeadCaboshed: 2, - lionHeadErased: 2, - boarHeadErased: 1, - horseHeadCouped: 1, - ramHeadErased: 1, - elephantHeadErased: 1 - }, - fantastic: { - dragonPassant: 2, - dragonRampant: 2, - wyvern: 1, - wyvernWithWingsDisplayed: 1, - griffinPassant: 1, - griffinRampant: 1, - eagleTwoHeads: 2, - unicornRampant: 1, - pegasus: 1, - serpent: 1, - basilisk: 1, - sagittarius: 1 - }, - birds: { - eagle: 9, - falcon: 2, - raven: 2, - cock: 3, - parrot: 1, - swan: 2, - swanErased: 1, - heron: 1, - owl: 1, - owlDisplayed: 1, - dove: 2, - doveDisplayed: 1, - duck: 1, - peacock: 1, - peacockInPride: 1, - swallow: 1 - }, - plants: { - tree: 1, - oak: 1, - pineTree: 1, - palmTree: 1, - trefoil: 1, - quatrefoil: 1, - cinquefoil: 1, - sextifoil: 1, - mapleLeaf: 1, - rose: 1, - apple: 1, - pear: 1, - grapeBunch: 1, - wheatStalk: 1, - pineCone: 1 - }, - aquatic: {escallop: 5, pike: 1, plaice: 1, salmon: 1, cancer: 1, dolphin: 1}, - seafaring: {anchor: 6, boat: 2, boat2: 1, lymphad: 2, caravel: 1, armillarySphere: 1}, - agriculture: {garb: 2, sickle: 1, scythe: 1, rake: 1, plough: 2}, - arms: { - sword: 4, - falchion: 1, - sabre: 1, - sabresCrossed: 1, - sabre2: 1, - hatchet: 3, - axe: 3, - lochaberAxe: 1, - spear: 1, - mallet: 1, - bowWithArrow: 3, - bow: 1, - arrow: 1, - arrowsSheaf: 1, - arbalest: 1, - helmet: 2, - gauntlet: 1, - shield: 1, - cannon: 1 - }, - bodyparts: {hand: 4, head: 1, headWreathed: 1, foot: 1, skull: 1}, - people: {cavalier: 3, monk: 1, angel: 2}, - architecture: {tower: 1, castle: 1, bridge: 1, column: 1}, - miscellaneous: { - crown: 2, - crown2: 1, - laurelWreath: 1, - mitre: 1, - orb: 1, - chalice: 1, - key: 1, - buckle: 1, - bugleHorn: 1, - bugleHorn2: 1, - bell: 2, - pot: 1, - bucket: 1, - horseshoe: 3, - stirrup: 1, - attire: 1, - stagsAttires: 1, - ramsHorn: 1, - cowHorns: 2, - wing: 1, - wingSword: 1, - lute: 1, - harp: 1, - drum: 1, - wheel: 2, - crosier: 1, - sceptre: 1, - fasces: 1, - log: 1, - chain: 1, - anvil: 1, - ladder: 1, - banner: 1, - bookClosed: 1, - bookOpen: 1, - scissors: 1 - }, - natural: { - fountain: "azure", - garb: "or", - raven: "sable", - dove: "argent", - doveDisplayed: "argent", - fly: "sable" - }, // charges to mainly use predefined colours - multicolor: { - // charges that can have several tinctures - agnusDei: 2, - angel: 2, - apple: 2, - arbalest: 3, - arrow: 3, - arrowsSheaf: 3, - axe: 2, - badgerStatant: 2, - banner: 2, - basilisk: 3, - bearPassant: 3, - bearRampant: 3, - bee: 3, - bell: 2, - boarHeadErased: 3, - boarRampant: 3, - boat: 2, - bookClosed: 3, - bookOpen: 3, - bowWithArrow: 3, - bucket: 2, - bugleHorn: 2, - bugleHorn2: 2, - bullHeadCaboshed: 2, - bullPassant: 3, - butterfly: 3, - camel: 2, - cannon: 2, - caravel: 3, - castle: 2, - catPassantGuardant: 2, - chalice: 2, - cock: 3, - cowStatant: 3, - crocodile: 2, - crown: 2, - crown2: 3, - deerHeadCaboshed: 2, - dolphin: 2, - donkeyHeadCaboshed: 2, - dove: 2, - doveDisplayed: 2, - dragonPassant: 3, - dragonRampant: 3, - drum: 3, - duck: 3, - eagle: 3, - eagleTwoHeads: 3, - elephant: 2, - elephantHeadErased: 2, - falchion: 2, - falcon: 3, - fasces: 3, - fly: 3, - garb: 2, - goat: 3, - grapeBunch: 3, - greyhoundCourant: 3, - greyhoundRampant: 2, - greyhoundSejant: 3, - griffinPassant: 3, - griffinRampant: 3, - harp: 2, - hatchet: 2, - head: 2, - headWreathed: 3, - hedgehog: 3, - heron: 2, - hindStatant: 2, - horsePassant: 2, - horseRampant: 3, - horseSalient: 2, - lamb: 2, - lambPassantReguardant: 2, - laurelWreath: 2, - lionHeadCaboshed: 2, - lionHeadErased: 2, - lionPassant: 3, - lionPassantGuardant: 3, - lionRampant: 3, - lionSejant: 3, - lochaberAxe: 2, - lute: 2, - lymphad: 3, - mallet: 2, - martenCourant: 3, - mastiffStatant: 3, - mitre: 3, - oak: 3, - orb: 3, - owl: 2, - owlDisplayed: 2, - palmTree: 3, - parrot: 2, - peacock: 3, - peacockInPride: 3, - pear: 2, - pegasus: 3, - pike: 2, - pineTree: 2, - plaice: 2, - plough: 2, - porcupine: 2, - rabbitSejant: 2, - ramHeadErased: 3, - ramPassant: 3, - ratRampant: 2, - raven: 2, - rhinoceros: 2, - rose: 3, - sabre: 2, - sabre2: 2, - sabresCrossed: 2, - sagittarius: 3, - salmon: 2, - scythe: 2, - serpent: 2, - shield: 2, - sickle: 2, - snake: 2, - spear: 2, - squirrel: 2, - stagPassant: 2, - stirrup: 2, - swallow: 2, - swan: 3, - swanErased: 3, - sword: 2, - talbotPassant: 3, - talbotSejant: 3, - tower: 2, - unicornRampant: 3, - wheatStalk: 2, - wingSword: 3, - wolfHeadErased: 2, - wolfPassant: 3, - wolfRampant: 3, - wolfStatant: 3, - wyvern: 3, - wyvernWithWingsDisplayed: 3 - }, - sinister: [ - // charges that can be sinister - "moonInCrescent", - "crossGamma", - "lionRampant", - "lionPassant", - "lionSejant", - "wolfRampant", - "wolfPassant", - "wolfStatant", - "wolfHeadErased", - "greyhoundСourant", - "greyhoundRampant", - "greyhoundSejant", - "mastiffStatant", - "talbotPassant", - "talbotSejant", - "martenCourant", - "boarRampant", - "badgerStatant", - "stagPassant", - "hindStatant", - "horseRampant", - "horseSalient", - "horsePassant", - "bullPassant", - "bearRampant", - "bearPassant", - "cowStatant", - "boarHeadErased", - "horseHeadCouped", - "lionHeadErased", - "ramHeadErased", - "elephantHeadErased", - "ramPassant", - "goat", - "lamb", - "lambPassantReguardant", - "agnusDei", - "dove", - "doveDisplayed", - "duck", - "peacock", - "peacockInPride", - "swallow", - "elephant", - "rhinoceros", - "eagle", - "falcon", - "raven", - "cock", - "parrot", - "swan", - "swanErased", - "heron", - "pike", - "plaice", - "salmon", - "dragonPassant", - "dragonRampant", - "wyvern", - "wyvernWithWingsDisplayed", - "griffinPassant", - "griffinRampant", - "unicornRampant", - "pegasus", - "serpent", - "sagittarius", - "hatchet", - "lochaberAxe", - "hand", - "wing", - "wingSword", - "lute", - "harp", - "bow", - "head", - "headWreathed", - "knight", - "lymphad", - "caravel", - "log", - "crosier", - "dolphin", - "sabre", - "monk", - "owl", - "axe", - "camel", - "fasces", - "lionPassantGuardant", - "helmet", - "gauntlet", - "shield", - "foot", - "sickle", - "scythe", - "plough", - "sabre2", - "cannon", - "porcupine", - "hedgehog", - "catPassantGuardant", - "rabbitSejant", - "ratRampant", - "squirrel", - "basilisk", - "snake", - "crocodile", - "anvil" - ], - reversed: [ - // charges that can be reversed - "goutte", - "mullet", - "mullet7", - "crescent", - "cancer", - "frog", - "lizard", - "scorpion", - "butterfly", - "bee", - "fly", - "trefoil", - "cinquefoil", - "sword", - "falchion", - "sabresCrossed", - "spear", - "gauntlet", - "hand", - "horseshoe", - "bowWithArrow", - "arrow", - "arrowsSheaf", - "arbalest", - "rake", - "sickle", - "scythe", - "scissors", - "crossTriquetra", - "crossLatin", - "crossTau", - "sabre2" - ], - patternable: [ - // charges that can have pattern tincture when counterchanged - "lozengePloye", - "roundel", - "annulet", - "mullet4", - "mullet8", - "delf", - "triangle", - "trianglePierced", - "sun", - "fountain", - "inescutcheonRound", - "inescutcheonSquare", - "inescutcheonNo", - "crossHummetty", - "crossVoided", - "crossPattee", - "crossPatteeAlisee", - "crossFormee", - "crossFormee2", - "crossPotent", - "crossJerusalem", - "crosslet", - "crossClechy", - "crossBottony", - "crossFleury", - "crossPatonce", - "crossPommy", - "crossGamma", - "crossArrowed", - "crossFitchy", - "crossCercelee", - "crossMoline", - "crossAvellane", - "crossErminee", - "crossBiparted", - "crossMaltese", - "crossTemplar", - "crossCeltic", - "crossCeltic2", - "crossTau" - ] + data: chargeData }; // charges specific to culture or burg type (FMG-only config, not coming from Armoria) const typeMapping = { - Naval: {anchor: 3, boat: 1, lymphad: 2, armillarySphere: 1, escallop: 1, dolphin: 1, plaice: 1, caravel: 1}, + Naval: { + anchor: 3, + drakkar: 1, + lymphad: 2, + caravel: 1, + shipWheel: 1, + armillarySphere: 1, + escallop: 1, + dolphin: 1, + plaice: 1 + }, Highland: {tower: 1, raven: 1, wolfHeadErased: 1, wolfPassant: 1, goat: 1, axe: 1}, River: { - tower: 1, garb: 1, rake: 1, - boat: 1, + raft: 1, + boat: 2, + drakkar: 2, + hook: 2, pike: 2, bullHeadCaboshed: 1, apple: 1, pear: 1, plough: 1, + earOfWheat: 1, salmon: 1, cancer: 1, - bridge: 2, + bridge: 1, + bridge2: 2, sickle: 1, scythe: 1, grapeBunch: 1, wheatStalk: 1, + windmill: 1, crocodile: 1 }, Lake: { + hook: 3, cancer: 2, escallop: 1, pike: 2, @@ -757,9 +1433,11 @@ window.COA = (function () { salmon: 1, cancer: 1, sickle: 1, + windmill: 1, swanErased: 1, swan: 1, - frog: 1 + frog: 1, + wasp: 1 }, Nomadic: { pot: 1, @@ -773,6 +1451,7 @@ window.COA = (function () { horseSalient: 1, crescent: 1, camel: 3, + scorpion: 1, falcon: 1 }, Hunting: { @@ -781,8 +1460,10 @@ window.COA = (function () { stagsAttires: 2, attire: 2, hatchet: 1, - bowWithArrow: 1, + bowWithArrow: 2, arrowsSheaf: 1, + lanceHead: 1, + saw: 1, deerHeadCaboshed: 1, wolfStatant: 1, oak: 1, @@ -804,7 +1485,7 @@ window.COA = (function () { mastiffStatant: 1, talbotPassant: 1, talbotSejant: 1, - stagPassant: 1 + stagPassant: 21 }, // selection based on type City: { @@ -812,40 +1493,61 @@ window.COA = (function () { bell: 3, lute: 1, tower: 1, + pillar: 1, castle: 1, + castle2: 1, + portcullis: 1, mallet: 1, cannon: 1, anvil: 1, buckle: 1, horseshoe: 1, stirrup: 1, - banner: 1, + lanceWithBanner: 1, bookClosed: 1, scissors: 1, + scissors2: 1, + shears: 1, + pincers: 1, bridge: 2, + archer: 1, cannon: 1, shield: 1, arbalest: 1, - bowWithArrow: 1, + arbalest2: 1, + bowWithThreeArrows: 1, spear: 1, lochaberAxe: 1, + armEmbowedHoldingSabre: 1, + grenade: 1, + maces: 1, grapeBunch: 1, cock: 1, ramHeadErased: 1, - ratRampant: 1 + ratRampant: 1, + hourglass: 1, + scale: 1, + scrollClosed: 1 }, Capital: { crown: 2, - crown2: 1, + crown2: 2, laurelWreath: 1, orb: 1, lute: 1, - castle: 3, - tower: 1, + lyre: 1, + banner: 1, + castle: 1, + castle2: 1, + palace: 1, crown2: 2, column: 1, lionRampant: 1, - stagPassant: 1 + stagLodgedRegardant: 1, + drawingCompass: 1, + rapier: 1, + scaleImbalanced: 1, + scalesHanging: 1 }, Сathedra: { crossHummetty: 3, @@ -862,7 +1564,9 @@ window.COA = (function () { crossCalvary: 1, agnusDei: 3, bookOpen: 1, - sceptre: 1 + sceptre: 1, + bone: 1, + skull: 1 } }; @@ -897,97 +1601,7 @@ window.COA = (function () { perSaltire: {bhdf: 8, e: 3, abcdefgzi: 1, bh: 1, df: 1, ABCDEFGHIJKL: 1}, perPile: {ee: 3, be: 2, abceh: 1, abcabc: 1, jleh: 1} }, - ordinariesOn: { - pale: {ee: 12, beh: 10, kn: 3, bb: 1}, - fess: {ee: 1, def: 3}, - bar: {defdefdef: 1}, - fessCotissed: {ee: 1, def: 3}, - fessDoubleCotissed: {ee: 1, defdef: 3}, - bend: {ee: 2, jo: 1, joe: 1}, - bendSinister: {ee: 1, lm: 1, lem: 4}, - bendlet: {joejoejoe: 1}, - bendletSinister: {lemlemlem: 1}, - bordure: {ABCDEFGHIJKL: 1}, - chief: {abc: 5, bbb: 1}, - quarter: {jjj: 1}, - canton: {yyyy: 1}, - cross: {eeee: 1, behdfbehdf: 3, behbehbeh: 2}, - crossParted: {e: 5, ee: 1}, - saltire: {ee: 5, jlemo: 1}, - saltireParted: {e: 5, ee: 1}, - pall: {ee: 1, jleh: 5, jlhh: 3}, - pallReversed: {ee: 1, bemo: 5}, - pile: {bbb: 1}, - pileInBend: {eeee: 1, eeoo: 1}, - pileInBendSinister: {eeee: 1, eemm: 1} - }, - ordinariesOff: { - pale: {yyy: 1}, - fess: {abc: 3, abcz: 1}, - bar: {abc: 2, abcgzi: 1, jlh: 5, bgi: 2, ach: 1}, - gemelle: {abc: 1}, - bend: {ccg: 2, ccc: 1}, - bendSinister: {aai: 2, aaa: 1}, - bendlet: {ccg: 2, ccc: 1}, - bendletSinister: {aai: 2, aaa: 1}, - bordure: {e: 4, jleh: 2, kenken: 1, peqpeq: 1}, - orle: {e: 4, jleh: 1, kenken: 1, peqpeq: 1}, - chief: {emo: 2, emoz: 1, ez: 2}, - terrace: {e: 5, def: 1, bdf: 3}, - mount: {e: 5, def: 1, bdf: 3}, - point: {e: 2, def: 1, bdf: 3, acbdef: 1}, - flaunches: {e: 3, kn: 1, beh: 3}, - gyron: {bh: 1}, - quarter: {e: 1}, - canton: {e: 5, beh: 1, def: 1, bdefh: 1, kn: 1}, - cross: {acgi: 1}, - pall: {BCKFEILGJbdmfo: 1}, - pallReversed: {aczac: 1}, - chevron: {ach: 3, hhh: 1}, - chevronReversed: {bbb: 1}, - pile: {acdfgi: 1, acac: 1}, - pileInBend: {cg: 1}, - pileInBendSinister: {ai: 1}, - label: {defgzi: 2, eh: 3, defdefhmo: 1, egiegi: 1, pqn: 5} - }, - // charges - inescutcheon: {e: 4, jln: 1}, - mascle: { - e: 15, - abcdefgzi: 3, - beh: 3, - bdefh: 4, - acegi: 1, - kn: 3, - joe: 2, - abc: 3, - jlh: 8, - jleh: 1, - df: 3, - abcpqh: 4, - pqe: 3, - eknpq: 3 - }, - lionRampant: {e: 10, def: 2, abc: 2, bdefh: 1, kn: 1, jlh: 2, abcpqh: 1}, - lionPassant: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1}, - wolfPassant: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1}, - greyhoundСourant: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1}, - griffinRampant: {e: 10, def: 2, abc: 2, bdefh: 1, kn: 1, jlh: 2, abcpqh: 1}, - griffinPassant: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1}, - boarRampant: {e: 12, beh: 1, kn: 1, jln: 2}, - eagle: {e: 15, beh: 1, kn: 1, abc: 1, jlh: 2, def: 2, pq: 1}, - raven: {e: 15, beh: 1, kn: 1, jeo: 1, abc: 3, jln: 3, def: 1}, - wyvern: {e: 10, jln: 1}, - garb: {e: 1, def: 3, abc: 2, beh: 1, kn: 1, jln: 3, jleh: 1, abcpqh: 1, joe: 1, lme: 1}, - crown: {e: 10, abcdefgzi: 1, beh: 3, behdf: 2, acegi: 1, kn: 1, pq: 2, abc: 1, jln: 4, jleh: 1, def: 2, abcpqh: 3}, - hand: {e: 10, jln: 2, kn: 1, jeo: 1, abc: 2, pqe: 1}, - armillarySphere: {e: 1}, - tree: {e: 1}, - lymphad: {e: 1}, - head: {e: 1}, - headWreathed: {e: 1}, - cavalier: {e: 1}, - angel: {e: 1} + inescutcheon: {e: 4, jln: 1} }; const lines = { @@ -1110,6 +1724,121 @@ window.COA = (function () { piles: 1, pilesInPoint: 2, label: 1 + }, + data: { + bar: { + positionsOn: {defdefdef: 1}, + positionsOff: {abc: 2, abcgzi: 1, jlh: 5, bgi: 2, ach: 1} + }, + bend: { + positionsOn: {ee: 2, jo: 1, joe: 1}, + positionsOff: {ccg: 2, ccc: 1} + }, + bendSinister: { + positionsOn: {ee: 1, lm: 1, lem: 4}, + positionsOff: {aai: 2, aaa: 1} + }, + bendlet: { + positionsOn: {joejoejoe: 1}, + positionsOff: {ccg: 2, ccc: 1} + }, + bendletSinister: { + positionsOn: {lemlemlem: 1}, + positionsOff: {aai: 2, aaa: 1} + }, + bordure: { + positionsOn: {ABCDEFGHIJKL: 1}, + positionsOff: {e: 4, jleh: 2, kenken: 1, peqpeq: 1} + }, + canton: { + positionsOn: {yyyy: 1}, + positionsOff: {e: 5, beh: 1, def: 1, bdefh: 1, kn: 1} + }, + chevron: { + positionsOn: {ach: 3, hhh: 1} + }, + chevronReversed: { + positionsOff: {bbb: 1} + }, + chief: { + positionsOn: {abc: 5, bbb: 1}, + positionsOff: {emo: 2, emoz: 1, ez: 2} + }, + cross: { + positionsOn: {eeee: 1, behdfbehdf: 3, behbehbeh: 2}, + positionsOff: {acgi: 1} + }, + crossParted: { + positionsOn: {e: 5, ee: 1} + }, + fess: { + positionsOn: {ee: 1, def: 3}, + positionsOff: {abc: 3, abcz: 1} + }, + fessCotissed: { + positionsOn: {ee: 1, def: 3} + }, + fessDoubleCotissed: { + positionsOn: {ee: 1, defdef: 3} + }, + flaunches: { + positionsOff: {e: 3, kn: 1, beh: 3} + }, + gemelle: { + positionsOff: {abc: 1} + }, + gyron: { + positionsOff: {bh: 1} + }, + label: { + positionsOff: {defgzi: 2, eh: 3, defdefhmo: 1, egiegi: 1, pqn: 5} + }, + mount: { + positionsOff: {e: 5, def: 1, bdf: 3} + }, + orle: { + positionsOff: {e: 4, jleh: 1, kenken: 1, peqpeq: 1} + }, + pale: { + positionsOn: {ee: 12, beh: 10, kn: 3, bb: 1}, + positionsOff: {yyy: 1} + }, + pall: { + positionsOn: {ee: 1, jleh: 5, jlhh: 3}, + positionsOff: {BCKFEILGJbdmfo: 1} + }, + pallReversed: { + positionsOn: {ee: 1, bemo: 5}, + positionsOff: {aczac: 1} + }, + pile: { + positionsOn: {bbb: 1}, + positionsOff: {acdfgi: 1, acac: 1} + }, + pileInBend: { + positionsOn: {eeee: 1, eeoo: 1}, + positionsOff: {cg: 1} + }, + pileInBendSinister: { + positionsOn: {eeee: 1, eemm: 1}, + positionsOff: {ai: 1} + }, + point: { + positionsOff: {e: 2, def: 1, bdf: 3, acbdef: 1} + }, + quarter: { + positionsOn: {jjj: 1}, + positionsOff: {e: 1} + }, + saltire: { + positionsOn: {ee: 5, jlemo: 1} + }, + saltireParted: { + positionsOn: {e: 5, ee: 1} + }, + terrace: { + positionsOff: {e: 5, def: 1, bdf: 3} + } } }; @@ -1139,40 +1868,34 @@ window.COA = (function () { if (t1.includes("-")) usedPattern = t1; const coa = {t1}; - let charge = P(usedPattern ? 0.5 : 0.93) ? true : false; // 80% for charge + const addCharge = P(usedPattern ? 0.5 : 0.93); // 80% for charge const linedOrdinary = - (charge && P(0.3)) || P(0.5) + (addCharge && P(0.3)) || P(0.5) ? parent?.ordinaries && P(kinship) ? parent.ordinaries[0].ordinary : rw(ordinaries.lined) : null; - const ordinary = (!charge && P(0.65)) || P(0.3) ? (linedOrdinary ? linedOrdinary : rw(ordinaries.straight)) : null; // 36% for ordinary + const ordinary = + (!addCharge && P(0.65)) || P(0.3) ? (linedOrdinary ? linedOrdinary : rw(ordinaries.straight)) : null; // 36% for ordinary + const rareDivided = ["chief", "terrace", "chevron", "quarter", "flaunches"].includes(ordinary); - const divisioned = rareDivided - ? P(0.03) - : charge && ordinary - ? P(0.03) - : charge - ? P(0.3) - : ordinary - ? P(0.7) - : P(0.995); // 33% for division + const divisioned = (() => { + if (rareDivided) return P(0.03); + if (addCharge && ordinary) return P(0.03); + if (addCharge) return P(0.3); + if (ordinary) return P(0.7); + return P(0.995); + })(); - const division = divisioned - ? parent?.division && P(kinship - 0.1) - ? parent.division.division - : rw(divisions.variants) - : null; - - if (charge) - charge = - parent?.charges && P(kinship - 0.1) - ? parent.charges[0].charge - : type && type !== "Generic" && P(0.2) - ? rw(typeMapping[type]) - : selectCharge(); + const division = (() => { + if (divisioned) { + if (parent?.division && P(kinship - 0.1)) return parent.division.division; + return rw(divisions.variants); + } + return null; + })(); if (division) { const t = getTincture("division", usedTinctures, P(0.98) ? coa.t1 : null); @@ -1184,7 +1907,7 @@ window.COA = (function () { if (ordinary) { coa.ordinaries = [{ordinary, t: getTincture("charge", usedTinctures, coa.t1)}]; if (linedOrdinary) coa.ordinaries[0].line = usedPattern || (division && P(0.7)) ? "straight" : rw(lines); - if (division && !charge && !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"; // 40% else if (P(0.6)) coa.ordinaries[0].divided = "field"; @@ -1193,44 +1916,48 @@ window.COA = (function () { } } - if (charge) { + if (addCharge) { + const charge = (() => { + if (parent?.charges && P(kinship - 0.1)) return parent.charges[0].charge; + if (type && type !== "Generic" && P(0.3)) return rw(typeMapping[type]); + return selectCharge(ordinary || divisioned ? charges.types : charges.single); + })(); + const chargeData = charges.data[charge] || {}; + let p = "e"; let t = "gules"; - const ordinaryT = coa.ordinaries ? coa.ordinaries[0].t : null; - if (positions.ordinariesOn[ordinary] && P(0.8)) { + const ordinaryData = ordinaries.data[ordinary]; + const tOrdinary = coa.ordinaries ? coa.ordinaries[0].t : null; + + if (ordinaryData?.positionsOn && P(0.8)) { // place charge over ordinary (use tincture of field type) - p = rw(positions.ordinariesOn[ordinary]); - while (charges.natural[charge] === ordinaryT) charge = selectCharge(); - t = !usedPattern && P(0.3) ? coa.t1 : getTincture("charge", [], ordinaryT); - } else if (positions.ordinariesOff[ordinary] && P(0.95)) { + p = rw(ordinaryData.positionsOn); + t = !usedPattern && P(0.3) ? coa.t1 : getTincture("charge", [], tOrdinary); + } else if (ordinaryData?.positionsOff && P(0.95)) { // place charge out of ordinary (use tincture of ordinary type) - p = rw(positions.ordinariesOff[ordinary]); - while (charges.natural[charge] === coa.t1) charge = selectCharge(); - t = !usedPattern && P(0.3) ? ordinaryT : getTincture("charge", usedTinctures, coa.t1); + p = rw(ordinaryData.positionsOff); + t = !usedPattern && P(0.3) ? tOrdinary : getTincture("charge", usedTinctures, coa.t1); } else if (positions.divisions[division]) { // place charge in fields made by division p = rw(positions.divisions[division]); - while (charges.natural[charge] === coa.t1) charge = selectCharge(); - t = getTincture("charge", ordinaryT ? usedTinctures.concat(ordinaryT) : usedTinctures, coa.t1); - } else if (positions[charge]) { + t = getTincture("charge", tOrdinary ? usedTinctures.concat(tOrdinary) : usedTinctures, coa.t1); + } else if (chargeData.positions) { // place charge-suitable position - p = rw(positions[charge]); - while (charges.natural[charge] === coa.t1) charge = selectCharge(); + p = rw(chargeData.positions); t = getTincture("charge", usedTinctures, coa.t1); } else { // place in standard position (use new tincture) p = usedPattern ? "e" : charges.conventional[charge] ? rw(positions.conventional) : rw(positions.complex); - while (charges.natural[charge] === coa.t1) charge = selectCharge(); - t = getTincture("charge", usedTinctures.concat(ordinaryT), coa.t1); + t = getTincture("charge", usedTinctures.concat(tOrdinary), coa.t1); } - if (charges.natural[charge]) t = charges.natural[charge]; // natural tincture - const item = {charge, t, p}; + if (chargeData.natural && chargeData.natural !== t && chargeData.natural !== tOrdinary) t = chargeData.natural; - const multicolor = charges.multicolor[charge]; - if (multicolor > 1) item.t2 = P(0.25) ? getTincture("charge", usedTinctures, coa.t1) : t; - if (multicolor > 2) item.t3 = P(0.5) ? getTincture("charge", usedTinctures, coa.t1) : t; + const item = {charge: charge, t, p}; + const colors = chargeData.colors || 1; + if (colors > 1) item.t2 = P(0.25) ? getTincture("charge", usedTinctures, coa.t1) : t; + if (colors > 2 && item.t2) item.t3 = P(0.5) ? getTincture("charge", usedTinctures, coa.t1) : t; coa.charges = [item]; if (p === "ABCDEFGHIKL" && P(0.95)) { @@ -1290,18 +2017,7 @@ window.COA = (function () { } else if (allowCounter && p.length > 1) coa.charges[0].divided = "counter"; // counterchanged, 40% } - coa.charges.forEach(c => defineChargeAttributes(c)); - function defineChargeAttributes(c) { - // define size - c.size = (c.size || 1) * getSize(c.p, ordinary, division); - - // clean-up position - c.p = [...new Set(c.p)].join(""); - - // define orientation - if (P(0.02) && charges.sinister.includes(c.charge)) c.sinister = 1; - if (P(0.02) && charges.reversed.includes(c.charge)) c.reversed = 1; - } + coa.charges.forEach(c => defineChargeAttributes(ordinary, division, c)); } // dominions have canton with parent coa @@ -1309,15 +2025,12 @@ window.COA = (function () { const invert = isSameType(parent.t1, coa.t1); const t = invert ? getTincture("division", usedTinctures, coa.t1) : parent.t1; const canton = {ordinary: "canton", t}; - if (coa.charges) { - coa.charges.forEach((charge, i) => { - if (charge.size === 1.5) charge.size = 1.4; - if (charge.p.includes("a")) charge.p = charge.p.replaceAll("a", ""); - if (charge.p.includes("j")) charge.p = charge.p.replaceAll("j", ""); - if (charge.p.includes("y")) charge.p = charge.p.replaceAll("y", ""); - if (!charge.p) coa.charges.splice(i, 1); - }); - } + + coa.charges?.forEach((charge, i) => { + if (charge.size === 1.5) charge.size = 1.4; + charge.p = charge.p.replaceAll(/[ajy]/g, ""); + if (!charge.p) coa.charges.splice(i, 1); + }); let charge = parent.charges[0].charge; if (charge === "inescutcheon" && parent.charges[1]) charge = parent.charges[1].charge; @@ -1359,6 +2072,18 @@ window.COA = (function () { return tincture; } + function defineChargeAttributes(ordinary, division, c) { + // define size + c.size = (c.size || 1) * getSize(c.p, ordinary, division); + + // clean-up position + c.p = [...new Set(c.p)].join(""); + + // define orientation + if (P(0.02) && charges.data[c.charge]?.sinister) c.sinister = 1; + if (P(0.02) && charges.data[c.charge]?.reversed) c.reversed = 1; + } + function getType(t) { const tincture = t.includes("-") ? t.split("-")[1] : t; if (Object.keys(tinctures.metals).includes(tincture)) return "metals"; diff --git a/versioning.js b/versioning.js index 564a69b2..92fdf0e1 100644 --- a/versioning.js +++ b/versioning.js @@ -1,7 +1,7 @@ "use strict"; // version and caching control -const version = "1.93.04"; // generator version, update each time +const version = "1.93.05"; // generator version, update each time { document.title += " v" + version;