From 262c7a177c415d3dbac1eac92f464346736c11e9 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Sat, 29 Jul 2023 00:34:37 +0400 Subject: [PATCH 01/41] fix: religions name generation --- index.html | 2 +- modules/religions-generator.js | 49 +++++++++++++++++----------------- versioning.js | 2 +- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/index.html b/index.html index b507f5eb..08c97a23 100644 --- a/index.html +++ b/index.html @@ -7867,7 +7867,7 @@ - + diff --git a/modules/religions-generator.js b/modules/religions-generator.js index 916259a2..94720982 100644 --- a/modules/religions-generator.js +++ b/modules/religions-generator.js @@ -363,19 +363,16 @@ window.Religions = (function () { Shamanism: 4, Animism: 4, Polytheism: 4, - Totemism: 2, - Druidism: 1, - "Ancestor Worship": 1, - "Nature Worship": 1 + "Ancestor Worship": 2, + "Nature Worship": 1, + Totemism: 1 }, Organized: { Polytheism: 14, Monotheism: 12, Dualism: 6, Pantheism: 6, - "Non-theism": 4, - Henotheism: 1, - Panentheism: 1 + "Non-theism": 4 }, Cult: { Cult: 2, @@ -418,17 +415,20 @@ window.Religions = (function () { }; const types = { - Shamanism: {Beliefs: 3, Shamanism: 2, Spirits: 1}, - Animism: {Spirits: 1, Beliefs: 1}, - "Ancestor worship": {Beliefs: 1, Forefathers: 2, Ancestors: 2}, + Shamanism: {Beliefs: 3, Shamanism: 2, Druidism: 1, Spirits: 1}, + Animism: {Spirits: 3, Beliefs: 1}, Polytheism: {Deities: 3, Faith: 1, Gods: 1, Pantheon: 1}, + "Ancestor worship": {Beliefs: 1, Forefathers: 2, Ancestors: 2}, + "Nature Worship": {Beliefs: 3, Druids: 1}, + Totemism: {Beliefs: 2, Totems: 2, Idols: 1}, + Monotheism: {Religion: 2, Church: 3, Faith: 1}, Dualism: {Religion: 3, Faith: 1, Cult: 1}, - Monotheism: {Religion: 1, Church: 1}, "Non-theism": {Beliefs: 3, Spirits: 1}, - Cult: {Cult: 4, Sect: 4, Arcanum: 1, Coterie: 1, Order: 1, Worship: 1}, - "Dark Cult": {Cult: 2, Sect: 2, Blasphemy: 1, Circle: 1, Coven: 1, Idols: 1, Occultism: 1}, + Cult: {Cult: 4, Sect: 2, Arcanum: 1, Order: 1, Worship: 1}, + "Dark Cult": {Cult: 2, Blasphemy: 1, Circle: 1, Coven: 1, Idols: 1, Occultism: 1}, + Sect: {Sect: 3, Society: 1}, Heresy: { Heresy: 3, @@ -893,9 +893,10 @@ window.Religions = (function () { const {cells, cultures, burgs, states} = pack; const random = () => Names.getCulture(cells.culture[center], null, null, "", 0); - const type = () => rw(types[form]); - const supreme = () => deity.split(/[ ,]+/)[0]; - const culture = () => cultures[cells.culture[center]].name; + const type = rw(types[form]); + const supreme = deity.split(/[ ,]+/)[0]; + const culture = cultures[cells.culture[center]].name; + const place = adj => { const burgId = cells.burg[center]; const stateId = cells.state[center]; @@ -906,18 +907,18 @@ window.Religions = (function () { }; const m = rw(namingMethods[variety]); - if (m === "Random + type") return [random() + " " + type(), "global"]; + if (m === "Random + type") return [random() + " " + type, "global"]; if (m === "Random + ism") return [trimVowels(random()) + "ism", "global"]; - if (m === "Supreme + ism" && deity) return [trimVowels(supreme()) + "ism", "global"]; + if (m === "Supreme + ism" && deity) return [trimVowels(supreme) + "ism", "global"]; if (m === "Faith of + Supreme" && deity) - return [ra(["Faith", "Way", "Path", "Word", "Witnesses"]) + " of " + supreme(), "global"]; + return [ra(["Faith", "Way", "Path", "Word", "Witnesses"]) + " of " + supreme, "global"]; if (m === "Place + ism") return [place() + "ism", "state"]; - if (m === "Culture + ism") return [trimVowels(culture()) + "ism", "culture"]; - if (m === "Place + ian + type") return [place("adj") + " " + type(), "state"]; - if (m === "Culture + type") return [culture() + " " + type(), "culture"]; + if (m === "Culture + ism") return [trimVowels(culture) + "ism", "culture"]; + if (m === "Place + ian + type") return [place("adj") + " " + type, "state"]; + if (m === "Culture + type") return [culture + " " + type, "culture"]; if (m === "Burg + ian + type") return [`${place("adj")} ${type()}`, "global"]; - if (m === "Random + ian + type") return [`${getAdjective(random())} ${type()}`, "global"]; - if (m === "Type + of the + meaning") return [`${type()} of the ${generateMeaning()}`, "global"]; + if (m === "Random + ian + type") return [`${getAdjective(random())} ${type}`, "global"]; + if (m === "Type + of the + meaning") return [`${type} of the ${generateMeaning()}`, "global"]; return [trimVowels(random()) + "ism", "global"]; // else } diff --git a/versioning.js b/versioning.js index 44b0de0a..132d7271 100644 --- a/versioning.js +++ b/versioning.js @@ -1,7 +1,7 @@ "use strict"; // version and caching control -const version = "1.89.34"; // generator version, update each time +const version = "1.89.36"; // generator version, update each time { document.title += " v" + version; From c8fd7586d6bcb9eaa46d581c136cf29d34127f8f Mon Sep 17 00:00:00 2001 From: Azgaar Date: Sat, 29 Jul 2023 00:34:51 +0400 Subject: [PATCH 02/41] fix: religions name generation --- modules/religions-generator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/religions-generator.js b/modules/religions-generator.js index 94720982..ebf453af 100644 --- a/modules/religions-generator.js +++ b/modules/religions-generator.js @@ -375,8 +375,8 @@ window.Religions = (function () { "Non-theism": 4 }, Cult: { - Cult: 2, - "Dark Cult": 2, + Cult: 5, + "Dark Cult": 5, Sect: 1 }, Heresy: { From 65143bdd3ca7ba2255618c6c14359a00a51fbd5b Mon Sep 17 00:00:00 2001 From: Azgaar Date: Sat, 29 Jul 2023 01:17:21 +0400 Subject: [PATCH 03/41] fix: type is not defined --- modules/religions-generator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/religions-generator.js b/modules/religions-generator.js index ebf453af..dcbc141f 100644 --- a/modules/religions-generator.js +++ b/modules/religions-generator.js @@ -916,7 +916,7 @@ window.Religions = (function () { if (m === "Culture + ism") return [trimVowels(culture) + "ism", "culture"]; if (m === "Place + ian + type") return [place("adj") + " " + type, "state"]; if (m === "Culture + type") return [culture + " " + type, "culture"]; - if (m === "Burg + ian + type") return [`${place("adj")} ${type()}`, "global"]; + if (m === "Burg + ian + type") return [`${place("adj")} ${type}`, "global"]; if (m === "Random + ian + type") return [`${getAdjective(random())} ${type}`, "global"]; if (m === "Type + of the + meaning") return [`${type} of the ${generateMeaning()}`, "global"]; return [trimVowels(random()) + "ism", "global"]; // else From a8c7861b2227124e523f6ec11688275bc4fb6054 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Sat, 29 Jul 2023 15:05:30 +0400 Subject: [PATCH 04/41] chore: add googletagmanager back --- index.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/index.html b/index.html index 65150502..9a38fb22 100644 --- a/index.html +++ b/index.html @@ -30,6 +30,16 @@ /> + + + From 82f951f4ecd2dea5cd125a39ffd731cbcbdd0baf Mon Sep 17 00:00:00 2001 From: metehan Date: Tue, 1 Aug 2023 18:41:14 +0200 Subject: [PATCH 05/41] Turkish culture fixes (#968) * Turkish culture fixes * Turkish namebase shortened --- modules/burgs-and-states.js | 2 +- modules/names-generator.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js index e360b45a..6f2bf831 100644 --- a/modules/burgs-and-states.js +++ b/modules/burgs-and-states.js @@ -1076,7 +1076,7 @@ window.BurgsAndStates = (function () { if (P(0.3) && s.diplomacy.includes("Vassal")) return "Protectorate"; // some vassals } - if (base === 16 && (form === "Empire" || form === "Kingdom")) return "Sultanate"; // Turkic + if (base === 16 && (form === "Empire" || form === "Kingdom")) return "Khaganate"; // Turkic if (base === 5 && (form === "Empire" || form === "Kingdom")) return "Tsardom"; // Ruthenian if ([16, 31].includes(base) && (form === "Empire" || form === "Kingdom")) return "Khaganate"; // Turkic, Mongolian if (base === 12 && (form === "Kingdom" || form === "Grand Duchy")) return "Shogunate"; // Japanese diff --git a/modules/names-generator.js b/modules/names-generator.js index da4d9294..0ba44ed7 100644 --- a/modules/names-generator.js +++ b/modules/names-generator.js @@ -211,7 +211,7 @@ window.Names = (function () { // Finnic else if (base === 15 && rnd < 0.4 && l < 6) suffix = "orszag"; // Hungarian - else if (base === 16) suffix = rnd < 0.6 ? "stan" : "ya"; + else if (base === 16) suffix = rnd < 0.6 ? "yurt" : "eli"; // Turkish else if (base === 10) suffix = "guk"; // Korean @@ -279,7 +279,7 @@ window.Names = (function () { {name: "Portuguese", i: 13, min: 5, max: 11, d: "", m: .1, b: "Abrigada,Afonsoeiro,Agueda,Aguilada,Alagoas,Alagoinhas,Albufeira,Alcanhoes,Alcobaca,Alcoutim,Aldoar,Alenquer,Alfeizerao,Algarve,Almada,Almagreira,Almeirim,Alpalhao,Alpedrinha,Alvorada,Amieira,Anapolis,Apelacao,Aranhas,Arganil,Armacao,Assenceira,Aveiro,Avelar,Balsas,Barcarena,Barreiras,Barretos,Batalha,Beira,Benavente,Betim,Braga,Braganca,Brasilia,Brejo,Cabeceiras,Cabedelo,Cachoeiras,Cadafais,Calhandriz,Calheta,Caminha,Campinas,Canidelo,Canoas,Capinha,Carmoes,Cartaxo,Carvalhal,Carvoeiro,Cascavel,Castanhal,Caxias,Chapadinha,Chaves,Cocais,Coentral,Coimbra,Comporta,Conde,Coqueirinho,Coruche,Damaia,Dourados,Enxames,Ericeira,Ervidel,Escalhao,Esmoriz,Espinhal,Estela,Estoril,Eunapolis,Evora,Famalicao,Fanhoes,Faro,Fatima,Felgueiras,Ferreira,Figueira,Flecheiras,Florianopolis,Fornalhas,Fortaleza,Freiria,Freixeira,Fronteira,Fundao,Gracas,Gradil,Grainho,Gralheira,Guimaraes,Horta,Ilhavo,Ilheus,Lages,Lagos,Laranjeiras,Lavacolhos,Leiria,Limoeiro,Linhares,Lisboa,Lomba,Lorvao,Lourical,Lourinha,Luziania,Macedo,Machava,Malveira,Marinhais,Maxial,Mealhada,Milharado,Mira,Mirandela,Mogadouro,Montalegre,Mourao,Nespereira,Nilopolis,Obidos,Odemira,Odivelas,Oeiras,Oleiros,Olhalvo,Olinda,Olival,Oliveira,Oliveirinha,Palheiros,Palmeira,Palmital,Pampilhosa,Pantanal,Paradinha,Parelheiros,Pedrosinho,Pegoes,Penafiel,Peniche,Pinhao,Pinheiro,Pombal,Pontal,Pontinha,Portel,Portimao,Quarteira,Queluz,Ramalhal,Reboleira,Recife,Redinha,Ribadouro,Ribeira,Ribeirao,Rosais,Sabugal,Sacavem,Sagres,Sandim,Sangalhos,Santarem,Santos,Sarilhos,Seixas,Seixezelo,Seixo,Silvares,Silveira,Sinhaem,Sintra,Sobral,Sobralinho,Tabuaco,Tabuleiro,Taveiro,Teixoso,Telhado,Telheiro,Tomar,Torreira,Trancoso,Troviscal,Vagos,Varzea,Velas,Viamao,Viana,Vidigal,Vidigueira,Vidual,Vilamar,Vimeiro,Vinhais,Vitoria"}, {name: "Nahuatl", i: 14, min: 6, max: 13, d: "l", m: 0, b: "Acapulco,Acatepec,Acatlan,Acaxochitlan,Acolman,Actopan,Acuamanala,Ahuacatlan,Almoloya,Amacuzac,Amanalco,Amaxac,Apaxco,Apetatitlan,Apizaco,Atenco,Atizapan,Atlacomulco,Atlapexco,Atotonilco,Axapusco,Axochiapan,Axocomanitla,Axutla,Azcapotzalco,Aztahuacan,Calimaya,Calnali,Calpulalpan,Camotlan,Capulhuac,Chalco,Chapulhuacan,Chapultepec,Chiapan,Chiautempan,Chiconautla,Chihuahua,Chilcuautla,Chimalhuacan,Cholollan,Cihuatlan,Coahuila,Coatepec,Coatetelco,Coatlan,Coatlinchan,Coatzacoalcos,Cocotitlan,Cohetzala,Colima,Colotlan,Coyoacan,Coyohuacan,Cuapiaxtla,Cuauhnahuac,Cuauhtemoc,Cuauhtitlan,Cuautepec,Cuautla,Cuaxomulco,Culhuacan,Ecatepec,Eloxochitlan,Epatlan,Epazoyucan,Huamantla,Huascazaloya,Huatlatlauca,Huautla,Huehuetlan,Huehuetoca,Huexotla,Hueyapan,Hueyotlipan,Hueypoxtla,Huichapan,Huimilpan,Huitzilac,Ixtapallocan,Iztacalco,Iztaccihuatl,Iztapalapa,Lolotla,Malinalco,Mapachtlan,Mazatepec,Mazatlan,Metepec,Metztitlan,Mexico,Miacatlan,Michoacan,Minatitlan,Mixcoac,Mixtla,Molcaxac,Nanacamilpa,Naucalpan,Naupan,Nextlalpan,Nezahualcoyotl,Nopalucan,Oaxaca,Ocotepec,Ocotitlan,Ocotlan,Ocoyoacac,Ocuilan,Ocuituco,Omitlan,Otompan,Otzoloapan,Pacula,Pahuatlan,Panotla,Papalotla,Patlachican,Piaztla,Popocatepetl,Sultepec,Tecamac,Tecolotlan,Tecozautla,Temamatla,Temascalapa,Temixco,Temoac,Temoaya,Tenayuca,Tenochtitlan,Teocuitlatlan,Teotihuacan,Teotlalco,Tepeacac,Tepeapulco,Tepehuacan,Tepetitlan,Tepeyanco,Tepotzotlan,Tepoztlan,Tetecala,Tetlatlahuca,Texcalyacac,Texcoco,Tezontepec,Tezoyuca,Timilpan,Tizapan,Tizayuca,Tlacopan,Tlacotenco,Tlahuac,Tlahuelilpan,Tlahuiltepa,Tlalmanalco,Tlalnepantla,Tlalpan,Tlanchinol,Tlatelolco,Tlaxcala,Tlaxcoapan,Tlayacapan,Tocatlan,Tolcayuca,Toluca,Tonanitla,Tonantzintla,Tonatico,Totolac,Totolapan,Tototlan,Tuchtlan,Tulantepec,Tultepec,Tzompantepec,Xalatlaco,Xaloztoc,Xaltocan,Xiloxoxtla,Xochiatipan,Xochicoatlan,Xochimilco,Xochitepec,Xolotlan,Xonacatlan,Yahualica,Yautepec,Yecapixtla,Yehaultepec,Zacatecas,Zacazonapan,Zacoalco,Zacualpan,Zacualtipan,Zapotlan,Zimapan,Zinacantepec,Zoyaltepec,Zumpahuacan"}, {name: "Hungarian", i: 15, min: 6, max: 13, d: "", m: 0.1, b: "Aba,Abadszalok,Adony,Ajak,Albertirsa,Alsozsolca,Aszod,Babolna,Bacsalmas,Baktaloranthaza,Balassagyarmat,Balatonalmadi,Balatonboglar,Balkany,Balmazujvaros,Barcs,Bataszek,Batonyterenye,Battonya,Bekes,Berettyoujfalu,Berhida,Biatorbagy,Bicske,Biharkeresztes,Bodajk,Boly,Bonyhad,Budakalasz,Budakeszi,Celldomolk,Csakvar,Csenger,Csongrad,Csorna,Csorvas,Csurgo,Dabas,Demecser,Derecske,Devavanya,Devecser,Dombovar,Dombrad,Dunafoldvar,Dunaharaszti,Dunavarsany,Dunavecse,Edeleny,Elek,Emod,Encs,Enying,Ercsi,Fegyvernek,Fehergyarmat,Felsozsolca,Fertoszentmiklos,Fonyod,Fot,Fuzesabony,Fuzesgyarmat,Gardony,God,Gyal,Gyomaendrod,Gyomro,Hajdudorog,Hajduhadhaz,Hajdusamson,Hajduszoboszlo,Halasztelek,Harkany,Hatvan,Heves,Heviz,Ibrany,Isaszeg,Izsak,Janoshalma,Janossomorja,Jaszapati,Jaszarokszallas,Jaszfenyszaru,Jaszkiser,Kaba,Kalocsa,Kapuvar,Karcag,Kecel,Kemecse,Kenderes,Kerekegyhaza,Keszthely,Kisber,Kiskunmajsa,Kistarcsa,Kistelek,Kisujszallas,Kisvarda,Komadi,Komarom,Komlo,Kormend,Korosladany,Koszeg,Kozarmisleny,Kunhegyes,Kunszentmarton,Kunszentmiklos,Labatlan,Lajosmizse,Lenti,Letavertes,Letenye,Lorinci,Maglod,Mako,Mandok,Marcali,Martonvasar,Mateszalka,Melykut,Mezobereny,Mezocsat,Mezohegyes,Mezokeresztes,Mezokovesd,Mezotur,Mindszent,Mohacs,Monor,Mor,Morahalom,Nadudvar,Nagyatad,Nagyecsed,Nagyhalasz,Nagykallo,Nagykoros,Nagymaros,Nyekladhaza,Nyergesujfalu,Nyirbator,Nyirmada,Nyirtelek,Ocsa,Orkeny,Oroszlany,Paks,Pannonhalma,Paszto,Pecel,Pecsvarad,Pilisvorosvar,Polgar,Polgardi,Pomaz,Puspokladany,Pusztaszabolcs,Putnok,Racalmas,Rackeve,Rakamaz,Rakoczifalva,Sajoszent,Sandorfalva,Sarbogard,Sarkad,Sarospatak,Sarvar,Satoraljaujhely,Siklos,Simontornya,Soltvadkert,Sumeg,Szabadszallas,Szarvas,Szazhalombatta,Szecseny,Szeghalom,Szentgotthard,Szentlorinc,Szerencs,Szigethalom,Szigetvar,Szikszo,Tab,Tamasi,Tapioszele,Tapolca,Teglas,Tet,Tiszafoldvar,Tiszafured,Tiszakecske,Tiszalok,Tiszaujvaros,Tiszavasvari,Tokaj,Tokol,Tompa,Torokbalint,Torokszentmiklos,Totkomlos,Tura,Turkeve,Ujkigyos,ujszasz,Vamospercs,Varpalota,Vasarosnameny,Vasvar,Vecses,Veresegyhaz,Verpelet,Veszto,Zahony,Zalaszentgrot,Zirc,Zsambek"}, - {name: "Turkish", i: 16, min: 4, max: 10, d: "", m: 0, b: "Adapazari,Adiyaman,Afshin,Afyon,Akchaabat,Akchakoca,Akdamadeni,Akhisar,Aksaray,Akshehir,Amasya,Anamur,Antakya,Ardeshen,Ari,Artvin,Aydin,Babaeski,Bafra,Balikesir,Bandirma,Bartin,Bashiskele,Belen,Bergama,Besni,Biga,Bilecik,Bingul,Bitlis,Bodrum,Bolu,Bostanichi,Boyabat,Bozuyuk,Bucak,Bulancak,Bulanik,Burdur,Burhaniye,Ceyhan,Chanakkale,Chankiri,Chayeli,Cherkezkuy,Cheshme,Chivril,Chorlu,Cizre,Dalaman,Darica,Denizli,Derik,Develi,Devrek,Didim,Dilovasi,Dinar,Diyadin,Diyarbakir,Doubayazit,Durtyol,Duzce,Duzichi,Edirne,Elbistan,Emirda,Erbaa,Ercish,Erdek,Ereli,Ergani,Erzin,Erzincan,Erzurum,Eskishehir,Fethiye,Gazipasha,Gebze,Gelibolu,Gerede,Geyve,Giresun,Gulbashi,Gulcuk,Gumushhane,Gurnen,Guroymak,Hakkari,Harbiye,Havza,Hayrabolu,Hilvan,Imamolu,Inegul,Iskenderun,Islahiye,Kadirli,Kahta,Kaman,Kapakli,Karabuk,Karacabey,Karakupru,Karaman,Karamursel,Kars,Kartepe,Kastamonu,Kemer,Keshan,Kilimli,Kirklareli,Kirshehir,Kiziltepe,Korkuteli,Kovancilar,Kozan,Kozluk,Kulu,Kumluca,Kurfez,Kurtalan,Kutahya,Luleburgaz,Malatya,Malazgirt,Malkara,Manavgat,Manisa,Marmaris,Mersin,Merzifon,Midyat,Milas,Mula,Muratli,Mush,Nevshehir,Nide,Nizip,Nusaybin,Oltu,Ordu,Orhangazi,Ortaca,Osmancik,Osmaniye,Patnos,Payas,Pazarcik,Reyhanli,Rize,Safranbolu,Salihli,Samanda,Sandikli,Saray,Sarikamish,Sarikaya,Serik,Seydishehir,sharkishla,shirnak,Siirt,Silifke,Silvan,Simav,Sinop,Sivas,Siverek,Sorgun,Sungurlu,Surke,Suruch,Susurluk,Tarsus,Tatvan,Tekirda,Terme,Tire,Tokat,Tosya,Trabzon,Tunceli,Turgutlu,Turhal,udemish,Unye,Ushak,Uzunkurpru,Van,Vezirkurpru,Viranshehir,Yahyali,Yenishehir,Yerkury,Yozgat,Zile,Zonguldak"}, + {name: "Turkish", i: 16, min: 4, max: 10, d: "", m: 0, b: "Yelkaya,Buyrukkaya,Erdemtepe,Alakesen,Baharbeyli,Bozbay,Karaoklu,Altunbey,Yalkale,Yalkut,Akardere,Altayburnu,Esentepe,Okbelen,Derinsu,Alaoba,Yamanbeyli,Aykor,Ekinova,Saztepe,Baharkale,Devrekdibi,Alpseki,Ormanseki,Erkale,Yalbelen,Aytay,Yamanyaka,Altaydelen,Esen,Yedieli,Alpkor,Demirkor,Yediyol,Erdemkaya,Yayburnu,Ganiler,Bayatyurt,Kopuzteke,Aytepe,Deniz,Ayan,Ayazdere,Tepe,Kayra,Ayyaka,Deren,Adatepe,Kalkaneli,Bozkale,Yedidelen,Kocayolu,Sazdere,Bozkesen,Oguzeli,Yayladibi,Uluyol,Altay,Ayvar,Alazyaka,Yaloba,Suyaka,Baltaberi,Poyrazdelen,Eymir,Yediyuva,Kurt,Yeltepe,Oktar,Kara Ok,Ekinberi,Er Yurdu,Eren,Erenler,Ser,Oguz,Asay,Bozokeli,Aykut,Ormanyol,Yazkaya,Kalkanova,Yazbeyli,Dokuz Teke,Bilge,Ertensuyu,Kopuzyuva,Buyrukkut,Akardiken,Aybaray,Aslanbeyli,Altun Kaynak,Atikobasi,Yayla Eli,Kor Tepe,Salureli,Kor Kaya,Aybarberi,Kemerev,Yanaray,Beydileli,Buyrukoba,Yolduman,Tengri Tepe,Dokuzsu,Uzunkor,Erdem Yurdu,Kemer,Korteke,Bozokev,Bozoba,Ormankale,Askale,Oguztoprak,Yolberi,Kumseki,Esenobasi,Turkbelen,Ayazseki,Cereneli,Taykut,Bayramdelen,Beydilyaka,Boztepe,Uluoba,Yelyaka,Ulgardiken,Esensu,Baykale,Cerenkor,Bozyol,Duranoba,Aladuman,Denizli,Bahar,Yarkesen,Dokuzer,Yamankaya,Kocatarla,Alayaka,Toprakeli,Sarptarla,Sarpkoy,Serkaynak,Adayaka,Ayazkaynak,Kopuz,Turk,Kart,Kum,Erten,Buyruk,Yel,Ada,Alazova,Ayvarduman,Buyrukok,Ayvartoprak,Uzuntepe,Binseki,Yedibey,Durankale,Alaztoprak,Sarp Ok,Yaparobasi,Yaytepe,Asberi,Kalkankor,Beydiltepe,Adaberi,Bilgeyolu,Ganiyurt,Alkanteke,Esenerler,Asbey,Erdemkale,Erenkaynak,Oguzkoyu,Ayazoba,Boynuztoprak,Okova,Yaloklu,Sivriberi,Yuladiken,Sazbey,Karakaynak,Kopuzkoyu,Buyrukay,Kocakaya,Tepeduman,Yanarseki,Atikyurt,Esenev,Akarbeyli,Yayteke,Devreksungur,Akseki,Baykut,Kalkandere,Ulgarova,Devrekev,Yulabey,Bayatev,Yazsu,Vuraleli,Sivribeyli,Alaova,Alpobasi,Yalyurt,Elmatoprak,Alazkaynak,Esenay,Ertenev,Salurkor,Ekinok,Yalbey,Yeldere,Ganibay,Altaykut,Baltaboy,Ereli,Ayvarsu,Uzunsaz,Bayeli,Erenyol,Kocabay,Derintay,Ayazyol,Aslanoba,Esenkaynak,Ekinlik,Alpyolu,Alayunt,Bozeski,Erkil,Duransuyu,Yulak,Kut,Dodurga,Kutlubey,Kutluyurt,Boynuz,Alayol,Aybar,Aslaneli,Kemerseki,Baltasuyu,Akarer,Ayvarburnu,Boynuzbeyli,Adasungur,Esenkor,Yamanoba,Toprakkor,Uzunyurt,Sungur,Bozok,Kemerli,Alaz,Demirci,Kartepe"}, {name: "Berber", i: 17, min: 4, max: 10, d: "s", m: .2, b: "Abkhouch,Adrar,Aeraysh,Afrag,Agadir,Agelmam,Aghmat,Agrakal,Agulmam,Ahaggar,Ait Baha,Ajdir,Akka,Almou,Amegdul,Amizmiz,Amknas,Amlil,Amurakush,Anfa,Annaba,Aousja,Arbat,Arfud,Argoub,Arif,Asfi,Asfru,Ashawen,Assamer,Assif,Awlluz,Ayt Melel,Azaghar,Azila,Azilal,Azmour,Azro,Azrou,Beccar,Beja,Bennour,Benslimane,Berkane,Berrechid,Bizerte,Bjaed,Bouayach,Boudenib,Boufrah,Bouskoura,Boutferda,Darallouch,Dar Bouazza,Darchaabane,Dcheira,Demnat,Denden,Djebel,Djedeida,Drargua,Elhusima,Essaouira,Ezzahra,Fas,Fnideq,Ghezeze,Goubellat,Grisaffen,Guelmim,Guercif,Hammamet,Harrouda,Hdifa,Hoceima,Houara,Idhan,Idurar,Ifendassen,Ifoghas,Ifrane,Ighoud,Ikbir,Imilchil,Imzuren,Inezgane,Irherm,Izoughar,Jendouba,Kacem,Kelibia,Kenitra,Kerrando,Khalidia,Khemisset,Khenifra,Khouribga,Khourigba,Kidal,Korba,Korbous,Lahraouyine,Larache,Leyun,Lqliaa,Manouba,Martil,Mazagan,Mcherga,Mdiq,Megrine,Mellal,Melloul,Midelt,Misur,Mohammedia,Mornag,Mrirt,Nabeul,Nadhour,Nador,Nawaksut,Nefza,Ouarzazate,Ouazzane,Oued Zem,Oujda,Ouladteima,Qsentina,Rades,Rafraf,Safi,Sefrou,Sejnane,Settat,Sijilmassa,Skhirat,Slimane,Somaa,Sraghna,Susa,Tabarka,Tadrart,Taferka,Tafilalt,Tafrawt,Tafza,Tagbalut,Tagerdayt,Taghzut,Takelsa,Taliouine,Tanja,Tantan,Taourirt,Targuist,Taroudant,Tarudant,Tasfelalayt,Tassort,Tata,Tattiwin,Tawnat,Taza,Tazagurt,Tazerka,Tazizawt,Taznakht,Tebourba,Teboursouk,Temara,Testour,Tetouan,Tibeskert,Tifelt,Tijdit,Tinariwen,Tinduf,Tinja,Tittawan,Tiznit,Toubkal,Trables,Tubqal,Tunes,Ultasila,Urup,Wagguten,Wararni,Warzazat,Watlas,Wehran,Wejda,Xamida,Yedder,Youssoufia,Zaghouan,Zahret,Zemmour,Zriba"}, {name: "Arabic", i: 18, min: 4, max: 9, d: "ae", m: .2, b: "Abha,Ajman,Alabar,Alarjam,Alashraf,Alawali,Albawadi,Albirk,Aldhabiyah,Alduwaid,Alfareeq,Algayed,Alhazim,Alhrateem,Alhudaydah,Alhuwaya,Aljahra,Aljubail,Alkhafah,Alkhalas,Alkhawaneej,Alkhen,Alkhobar,Alkhuznah,Allisafah,Almshaykh,Almurjan,Almuwayh,Almuzaylif,Alnaheem,Alnashifah,Alqah,Alqouz,Alqurayyat,Alradha,Alraqmiah,Alsadyah,Alsafa,Alshagab,Alshuqaiq,Alsilaa,Althafeer,Alwasqah,Amaq,Amran,Annaseem,Aqbiyah,Arafat,Arar,Ardah,Asfan,Ashayrah,Askar,Ayaar,Aziziyah,Baesh,Bahrah,Balhaf,Banizayd,Bidiyah,Bisha,Biyatah,Buqhayq,Burayda,Dafiyat,Damad,Dammam,Dariyah,Dhafar,Dhahran,Dhalkut,Dhurma,Dibab,Doha,Dukhan,Duwaibah,Enaker,Fadhla,Fahaheel,Fanateer,Farasan,Fardah,Fujairah,Ghalilah,Ghar,Ghizlan,Ghomgyah,Ghran,Hadiyah,Haffah,Hajanbah,Hajrah,Haqqaq,Haradh,Hasar,Hawiyah,Hebaa,Hefar,Hijal,Husnah,Huwailat,Huwaitah,Irqah,Isharah,Ithrah,Jamalah,Jarab,Jareef,Jazan,Jeddah,Jiblah,Jihanah,Jilah,Jizan,Joraibah,Juban,Jumeirah,Kamaran,Keyad,Khab,Khaiybar,Khasab,Khathirah,Khawarah,Khulais,Kumzar,Limah,Linah,Madrak,Mahab,Mahalah,Makhtar,Mashwar,Masirah,Masliyah,Mastabah,Mazhar,Medina,Meeqat,Mirbah,Mokhtara,Muharraq,Muladdah,Musaykah,Mushayrif,Musrah,Mussafah,Nafhan,Najran,Nakhab,Nizwa,Oman,Qadah,Qalhat,Qamrah,Qasam,Qosmah,Qurain,Quriyat,Qurwa,Radaa,Rafha,Rahlah,Rakamah,Rasheedah,Rasmadrakah,Risabah,Rustaq,Ryadh,Sabtaljarah,Sadah,Safinah,Saham,Saihat,Salalah,Salmiya,Shabwah,Shalim,Shaqra,Sharjah,Sharurah,Shatifiyah,Shidah,Shihar,Shoqra,Shuwaq,Sibah,Sihmah,Sinaw,Sirwah,Sohar,Suhailah,Sulaibiya,Sunbah,Tabuk,Taif,Taqah,Tarif,Tharban,Thuqbah,Thuwal,Tubarjal,Turaif,Turbah,Tuwaiq,Ubar,Umaljerem,Urayarah,Urwah,Wabrah,Warbah,Yabreen,Yadamah,Yafur,Yarim,Yemen,Yiyallah,Zabid,Zahwah,Zallaq,Zinjibar,Zulumah"}, {name: "Inuit", i: 19, min: 5, max: 15, d: "alutsn", m: 0, b: "Aaluik,Aappilattoq,Aasiaat,Agissat,Agssaussat,Akuliarutsip,Akunnaaq,Alluitsup,Alluttoq,Amitsorsuaq,Ammassalik,Anarusuk,Anguniartarfik,Annertussoq,Annikitsoq,Apparsuit,Apusiaajik,Arsivik,Arsuk,Atammik,Ateqanaq,Atilissuaq,Attu,Augpalugtoq,Aukarnersuaq,Aumat,Auvilkikavsaup,Avadtlek,Avallersuaq,Bjornesk,Blabaerdalen,Blomsterdalen,Brattalhid,Bredebrae,Brededal,Claushavn,Edderfulegoer,Egger,Eqalugalinnguit,Eqalugarssuit,Eqaluit,Eqqua,Etah,Graah,Hakluyt,Haredalen,Hareoen,Hundeo,Igaliku,Igdlorssuit,Igdluluarssuk,Iginniafik,Ikamiut,Ikarissat,Ikateq,Ikermiut,Ikermoissuaq,Ikorfarssuit,Ilimanaq,Illorsuit,Illunnguit,Iluileq,Ilulissat,Imaarsivik,Imartunarssuk,Immikkoortukajik,Innaarsuit,Inneruulalik,Inussullissuaq,Iperaq,Ippik,Iqek,Isortok,Isungartussoq,Itileq,Itissaalik,Itivdleq,Ittit,Ittoqqortoormiit,Ivingmiut,Ivittuut,Kanajoorartuut,Kangaamiut,Kangeq,Kangerluk,Kangerlussuaq,Kanglinnguit,Kapisillit,Kekertamiut,Kiatak,Kiataussaq,Kigatak,Kinaussak,Kingittorsuaq,Kitak,Kitsissuarsuit,Kitsissut,Klenczner,Kook,Kraulshavn,Kujalleq,Kullorsuaq,Kulusuk,Kuurmiit,Kuusuaq,Laksedalen,Maniitsoq,Marrakajik,Mattaangassut,Mernoq,Mittivakkat,Moriusaq,Myggbukta,Naajaat,Nangissat,Nanuuseq,Nappassoq,Narsarmijt,Narsarsuaq,Narssaq,Nasiffik,Natsiarsiorfik,Naujanguit,Niaqornaarsuk,Niaqornat,Nordfjordspasset,Nugatsiaq,Nunarssit,Nunarsuaq,Nunataaq,Nunatakavsaup,Nutaarmiut,Nuugaatsiaq,Nuuk,Nuukullak,Olonkinbyen,Oodaaq,Oqaatsut,Oqaitsunguit,Oqonermiut,Paagussat,Paamiut,Paatuut,Palungataq,Pamialluk,Perserajoq,Pituffik,Puugutaa,Puulkuip,Qaanaq,Qaasuitsup,Qaersut,Qajartalik,Qallunaat,Qaneq,Qaqortok,Qasigiannguit,Qassimiut,Qeertartivaq,Qeqertaq,Qeqertasussuk,Qeqqata,Qernertoq,Qernertunnguit,Qianarreq,Qingagssat,Qoornuup,Qorlortorsuaq,Qullikorsuit,Qunnerit,Qutdleq,Ravnedalen,Ritenbenk,Rypedalen,Saarloq,Saatorsuaq,Saattut,Salliaruseq,Sammeqqat,Sammisoq,Sanningassoq,Saqqaq,Saqqarlersuaq,Saqqarliit,Sarfannguit,Sattiaatteq,Savissivik,Serfanguaq,Sermersooq,Sermiligaaq,Sermilik,Sermitsiaq,Simitakaja,Simiutaq,Singamaq,Siorapaluk,Sisimiut,Sisuarsuit,Sullorsuaq,Suunikajik,Sverdrup,Taartoq,Takiseeq,Tasirliaq,Tasiusak,Tiilerilaaq,Timilersua,Timmiarmiut,Tukingassoq,Tussaaq,Tuttulissuup,Tuujuk,Uiivaq,Uilortussoq,Ujuaakajiip,Ukkusissat,Upernavik,Uttorsiutit,Uumannaq,Uunartoq,Uvkusigssat,Ymer"}, From bd01090c3c16bb73b554ee20151c5a886369878e Mon Sep 17 00:00:00 2001 From: Azgaar Date: Tue, 1 Aug 2023 20:41:57 +0400 Subject: [PATCH 06/41] chore: version update --- index.html | 2 +- versioning.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 9a38fb22..9d47deed 100644 --- a/index.html +++ b/index.html @@ -7875,7 +7875,7 @@ - + diff --git a/versioning.js b/versioning.js index 132d7271..e5de6714 100644 --- a/versioning.js +++ b/versioning.js @@ -1,7 +1,7 @@ "use strict"; // version and caching control -const version = "1.89.36"; // generator version, update each time +const version = "1.89.37"; // generator version, update each time { document.title += " v" + version; From e542574324b8d87dcd26e46404cc08f17e55e1b5 Mon Sep 17 00:00:00 2001 From: Elad Bernard Haviv Date: Sat, 5 Aug 2023 12:32:28 +0300 Subject: [PATCH 07/41] Added randomly generated marker placement (#966) * Add option to generate and place marker of type * remove unecessary console.log * versioning * Update versioning.js * Update index.html * removed redundant functions and changed addMarker functionality * changed marker type selection behavior * fixed button toggling * changed type selection to button + dropdown menu * versioning --- index.css | 32 ++++++++++++++++++++++++++++++++ index.html | 14 +++++++++++--- modules/ui/markers-overview.js | 30 +++++++++++++++++++++++++++++- modules/ui/tools.js | 10 +++++++++- versioning.js | 3 ++- 5 files changed, 83 insertions(+), 6 deletions(-) diff --git a/index.css b/index.css index 01b41f67..91c6c6ba 100644 --- a/index.css +++ b/index.css @@ -2357,6 +2357,38 @@ svg.button { opacity: 0.8; } +#markerTypeSelector { + font-size: 0.85em; +} + +#markerTypeSelectorWrapper { + position: relative; +} + +#markerTypeSelectMenu { + display: none; +} +#markerTypeSelectMenu.visible { + display: block; + position: absolute; + height: 250px; + width: 170px; + overflow-y: scroll; + background: inherit; + bottom: 100%; + left: 0; + background: white; +} +#markerTypeSelectMenu > button { + display: block; + width: 100%; + border: 1px solid #ddd; + margin-bottom: 1px; +} +#markerTypeSelectMenu > button:hover { + background: #ccc; +} + @media print { div, canvas { diff --git a/index.html b/index.html index 9d47deed..92ca4c38 100644 --- a/index.html +++ b/index.html @@ -138,7 +138,7 @@ } - + @@ -5509,6 +5509,14 @@
+ + + +
+
+
+
Texture resolution:
+ +
+ + +
Sun position:
@@ -5673,6 +5686,8 @@
+ +
@@ -5683,6 +5698,20 @@
+
+ + +
+ +
+ Sun Color: +
+ - -
Sun position:
@@ -5686,8 +5681,6 @@
- -
@@ -5698,9 +5691,12 @@
-
+
- +
diff --git a/modules/ui/3d.js b/modules/ui/3d.js index 0fa647f8..a4d6b079 100644 --- a/modules/ui/3d.js +++ b/modules/ui/3d.js @@ -96,11 +96,11 @@ window.ThreeD = (function () { const setScale = function (scale) { options.scale = scale; - let vertices = geometry.getAttribute('position'); - for(let i = 0; i < vertices.count; i++){ - vertices.setZ(i,getMeshHeight(i)); + let vertices = geometry.getAttribute("position"); + for (let i = 0; i < vertices.count; i++) { + vertices.setZ(i, getMeshHeight(i)); } - geometry.setAttribute('position',vertices); + geometry.setAttribute("position", vertices); geometry.verticesNeedUpdate = true; geometry.computeVertexNormals(); geometry.verticesNeedUpdate = false; @@ -108,11 +108,11 @@ window.ThreeD = (function () { redraw(); }; - const setSunColor = function(color){ + const setSunColor = function (color) { options.sunColor = color; spotLight.color = new THREE.Color(color); render(); - } + }; const setResolutionScale = function (scale) { options.resolutionScale = scale; @@ -167,10 +167,10 @@ window.ThreeD = (function () { } }; - const toggle3dSubdivision = function(){ + const toggle3dSubdivision = function () { options.subdivide = !options.subdivide; redraw(); - } + }; const toggleWireframe = function () { options.wireframe = !options.wireframe; @@ -275,7 +275,11 @@ window.ThreeD = (function () { context2d.fillStyle = color; context2d.fillText(text, 0, size * quality); - return textureToSprite(context2d.canvas.toDataURL(), context2d.canvas.width / quality, context2d.canvas.height / quality); + return textureToSprite( + context2d.canvas.toDataURL(), + context2d.canvas.width / quality, + context2d.canvas.height / quality + ); } function get3dCoords(baseX, baseY) { @@ -332,8 +336,20 @@ window.ThreeD = (function () { city_icon_material.wireframe = options.wireframe; const town_icon_material = new THREE.MeshPhongMaterial({color: townOptions.iconColor}); town_icon_material.wireframe = options.wireframe; - const city_icon_geometry = new THREE.CylinderGeometry(cityOptions.iconSize * 2, cityOptions.iconSize * 2, cityOptions.iconSize, 16, 1); - const town_icon_geometry = new THREE.CylinderGeometry(townOptions.iconSize * 2, townOptions.iconSize * 2, townOptions.iconSize, 16, 1); + const city_icon_geometry = new THREE.CylinderGeometry( + cityOptions.iconSize * 2, + cityOptions.iconSize * 2, + cityOptions.iconSize, + 16, + 1 + ); + const town_icon_geometry = new THREE.CylinderGeometry( + townOptions.iconSize * 2, + townOptions.iconSize * 2, + townOptions.iconSize, + 16, + 1 + ); const line_material = new THREE.LineBasicMaterial({color: cityOptions.iconColor}); // burg labels @@ -422,14 +438,14 @@ window.ThreeD = (function () { lines = []; } - async function createMeshTextureUrl(){ - return new Promise(async (resolve, reject)=>{ + async function createMeshTextureUrl() { + return new Promise(async (resolve, reject) => { const mapOptions = { noLabels: options.labels3d, noWater: options.extendedWater, fullMap: true }; - const url = await getMapURL("mesh",mapOptions); + const url = await getMapURL("mesh", mapOptions); const canvas = document.createElement("canvas"); const ctx = canvas.getContext("2d"); canvas.width = options.resolutionScale; @@ -437,53 +453,50 @@ window.ThreeD = (function () { const img = new Image(); img.src = url; - img.onload = function(){ - ctx.drawImage(img,0,0,canvas.width,canvas.height); - canvas.toBlob((blob)=>{ - const blobObj = window.URL.createObjectURL(blob) - window.setTimeout(()=>{ + img.onload = function () { + ctx.drawImage(img, 0, 0, canvas.width, canvas.height); + canvas.toBlob(blob => { + const blobObj = window.URL.createObjectURL(blob); + window.setTimeout(() => { canvas.remove(); window.URL.revokeObjectURL(blobObj); }, 100); resolve(blobObj); - }) - } - }) + }); + }; + }); } // create a mesh from pixel data async function createMesh(width, height, segmentsX, segmentsY) { - if (texture) texture.dispose(); - if(!options.wireframe){ - //Try loading skin texture. - texture = new THREE.TextureLoader().load(await createMeshTextureUrl(), render); - texture.needsUpdate = true; - texture.anisotropy = Renderer.capabilities.getMaxAnisotropy(); + if (!options.wireframe) { + texture = new THREE.TextureLoader().load(await createMeshTextureUrl(), render); + texture.needsUpdate = true; + texture.anisotropy = Renderer.capabilities.getMaxAnisotropy(); } - - if (material) material.dispose(); - if(options.wireframe){ - material = new THREE.MeshLambertMaterial(); + material = new THREE.MeshLambertMaterial(); + + if (options.wireframe) { material.wireframe = true; - }else{ - material = new THREE.MeshLambertMaterial(); + } else { material.map = texture; material.transparent = true; } - if (geometry) geometry.dispose(); geometry = new THREE.PlaneGeometry(width, height, segmentsX - 1, segmentsY - 1); - let vertices = geometry.getAttribute('position'); - for(let i = 0; i < vertices.count; i++){ - vertices.setZ(i,getMeshHeight(i)); + + let vertices = geometry.getAttribute("position"); + for (let i = 0; i < vertices.count; i++) { + vertices.setZ(i, getMeshHeight(i)); } - geometry.setAttribute('position',vertices); + + geometry.setAttribute("position", vertices); geometry.computeVertexNormals(); if (mesh) scene.remove(mesh); - if(options.subdivide){ + if (options.subdivide) { await loadLoopSubdivision(); const subdivideParams = { split: true, @@ -492,9 +505,9 @@ window.ThreeD = (function () { flatOnly: false, maxTriangles: Infinity }; - const smoothGeometry = loopSubdivision.modify(geometry,1,subdivideParams); + const smoothGeometry = loopSubdivision.modify(geometry, 1, subdivideParams); mesh = new THREE.Mesh(smoothGeometry, material); - }else{ + } else { mesh = new THREE.Mesh(geometry, material); } mesh.rotation.x = -Math.PI / 2; @@ -548,7 +561,10 @@ window.ThreeD = (function () { // scene scene = new THREE.Scene(); - scene.background = new THREE.TextureLoader().load("https://i0.wp.com/azgaar.files.wordpress.com/2019/10/stars-1.png", render); + scene.background = new THREE.TextureLoader().load( + "https://i0.wp.com/azgaar.files.wordpress.com/2019/10/stars-1.png", + render + ); // Renderer Renderer = new THREE.WebGLRenderer({canvas, antialias: true, preserveDrawingBuffer: true}); @@ -663,7 +679,7 @@ window.ThreeD = (function () { }); } - function loadLoopSubdivision(){ + function loadLoopSubdivision() { if (window.loopSubdivision) return Promise.resolve(true); return new Promise(resolve => { diff --git a/versioning.js b/versioning.js index 0f05093f..e60b7636 100644 --- a/versioning.js +++ b/versioning.js @@ -2,11 +2,8 @@ // version and caching control - - const version = "1.89.39"; // generator version, update each time - { document.title += " v" + version; const loadingScreenVersion = document.getElementById("versionText"); @@ -32,7 +29,7 @@ const version = "1.89.39"; // generator version, update each time
    Latest changes: -
  • New 3D Scene options and quality improvements.
    • +
  • New 3D scene options
  • Autosave feature (in Options)
  • Google translation support (in Options)
  • Religions can be edited and redrawn like cultures
    • From 7b3f897bdb9efbd785a0e43d9a5342a37abde175 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Sun, 6 Aug 2023 22:58:11 +0400 Subject: [PATCH 11/41] New heraldic charges, multicolor support (#973) * feat: new heraldic charges, multicolor support * chore: update to right version --- charges/agnusDei.svg | 26 +- charges/anchor.svg | 10 +- charges/angel.svg | 12 +- charges/annulet.svg | 7 +- charges/apple.svg | 9 +- charges/arbalest.svg | 40 ++ charges/arrow.svg | 11 +- charges/arrowsSheaf.svg | 28 +- charges/attire.svg | 19 +- charges/axe.svg | 17 +- charges/badgerStatant.svg | 62 +++ charges/banner.svg | 35 ++ charges/basilisk.svg | 221 +++++++++- charges/bearPassant.svg | 143 ++++++- charges/bearRampant.svg | 130 +++++- charges/bee.svg | 116 ++++++ charges/bell.svg | 19 +- charges/billet.svg | 7 +- charges/boarHeadErased.svg | 44 ++ charges/boarRampant.svg | 27 +- charges/boat.svg | 20 +- charges/boat2.svg | 46 +- charges/bookClosed.svg | 20 + charges/bookOpen.svg | 21 + charges/bow.svg | 9 +- charges/bowWithArrow.svg | 16 +- charges/bridge.svg | 92 ++++ charges/bucket.svg | 21 +- charges/buckle.svg | 9 +- charges/bugleHorn.svg | 19 +- charges/bugleHorn2.svg | 17 +- charges/bullHeadCaboshed.svg | 18 +- charges/bullPassant.svg | 22 +- charges/butterfly.svg | 64 +++ charges/camel.svg | 16 +- charges/cancer.svg | 21 +- charges/cannon.svg | 69 ++- charges/caravel.svg | 70 ++++ charges/carreau.svg | 7 +- charges/castle.svg | 25 +- charges/catPassantGuardant.svg | 67 +++ charges/cavalier.svg | 9 +- charges/chalice.svg | 14 +- charges/cinquefoil.svg | 16 +- charges/cock.svg | 35 +- charges/column.svg | 17 + charges/compassRose.svg | 8 +- charges/cowHorns.svg | 11 +- charges/cowStatant.svg | 43 ++ charges/crescent.svg | 8 +- charges/crocodile.svg | 66 +++ charges/crosier.svg | 17 +- charges/crossAnkh.svg | 7 +- charges/crossArrowed.svg | 7 +- charges/crossAvellane.svg | 7 +- charges/crossBiparted.svg | 7 +- charges/crossBottony.svg | 7 +- charges/crossBurgundy.svg | 7 +- charges/crossCalvary.svg | 7 +- charges/crossCarolingian.svg | 39 +- charges/crossCeltic.svg | 7 +- charges/crossCeltic2.svg | 7 +- charges/crossCercelee.svg | 7 +- charges/crossClechy.svg | 7 +- charges/crossDouble.svg | 7 +- charges/crossErminee.svg | 7 +- charges/crossFitchy.svg | 7 +- charges/crossFleury.svg | 7 +- charges/crossFormee.svg | 7 +- charges/crossFormee2.svg | 7 +- charges/crossGamma.svg | 7 +- charges/crossHummetty.svg | 7 +- charges/crossJerusalem.svg | 7 +- charges/crossLatin.svg | 7 +- charges/crossMaltese.svg | 7 +- charges/crossMoline.svg | 7 +- charges/crossOccitan.svg | 7 +- charges/crossOrthodox.svg | 7 +- charges/crossPattee.svg | 7 +- charges/crossPatteeAlisee.svg | 7 +- charges/crossPommy.svg | 7 +- charges/crossPotent.svg | 7 +- charges/crossSantiago.svg | 7 +- charges/crossTemplar.svg | 7 +- charges/crossTriquetra.svg | 10 +- charges/crossVoided.svg | 7 +- charges/crosslet.svg | 7 +- charges/crown.svg | 15 +- charges/crown2.svg | 74 +++- charges/deerHeadCaboshed.svg | 26 +- charges/delf.svg | 7 +- charges/dolphin.svg | 14 +- charges/donkeyHeadCaboshed.svg | 39 ++ charges/dove.svg | 67 +++ charges/doveDisplayed.svg | 112 +++++ charges/dragonPassant.svg | 30 +- charges/dragonRampant.svg | 43 +- charges/drum.svg | 18 + charges/duck.svg | 85 ++++ charges/eagle.svg | 92 +++- charges/eagleTwoHeads.svg | 103 +++++ charges/eagleTwoHeards.svg | 1 - charges/elephant.svg | 18 +- charges/elephantHeadErased.svg | 22 + charges/escallop.svg | 20 +- charges/estoile.svg | 21 +- charges/falchion.svg | 4 +- charges/falcon.svg | 223 ++++++++++ charges/fasces.svg | 35 +- charges/fleurDeLis.svg | 11 +- charges/fly.svg | 61 +++ charges/foot.svg | 22 +- charges/fountain.svg | 12 +- charges/frog.svg | 24 ++ charges/fusil.svg | 7 +- charges/garb.svg | 4 +- charges/gauntlet.svg | 54 +++ charges/goat.svg | 22 +- charges/goutte.svg | 7 +- charges/grapeBunch.svg | 52 +++ charges/greyhoundCourant.svg | 32 +- charges/greyhoundRampant.svg | 89 ++++ charges/greyhoundSejant.svg | 109 ++++- charges/griffinPassant.svg | 60 ++- charges/griffinRampant.svg | 116 +++++- charges/hand.svg | 15 +- charges/harp.svg | 31 +- charges/hatchet.svg | 9 +- charges/head.svg | 4 +- charges/headWreathed.svg | 29 +- charges/heart.svg | 7 +- charges/hedgehog.svg | 52 +++ charges/helmet.svg | 15 +- charges/heron.svg | 29 +- charges/hindStatant.svg | 35 ++ charges/horseHeadCouped.svg | 32 ++ charges/horsePassant.svg | 232 +++++------ charges/horseRampant.svg | 27 +- charges/horseSalient.svg | 25 +- charges/ladder.svg | 12 + charges/lamb.svg | 19 +- charges/lambPassantReguardant.svg | 12 +- charges/laurelWreath.svg | 263 ++++++++++++ charges/lionHeadCaboshed.svg | 108 ++++- charges/lionHeadErased.svg | 28 ++ charges/lionPassant.svg | 184 +++++++- charges/lionPassantGuardant.svg | 244 ++++++++++- charges/lionRampant.svg | 4 +- charges/lionSejant.svg | 133 ++++++ charges/lizard.svg | 29 ++ charges/lochaberAxe.svg | 10 +- charges/log.svg | 9 +- charges/lozengeFaceted.svg | 12 +- charges/lute.svg | 16 +- charges/lymphad.svg | 12 +- charges/mallet.svg | 9 +- charges/mapleLeaf.svg | 15 + charges/martenCourant.svg | 68 +++ charges/mascle.svg | 7 +- charges/mastiffStatant.svg | 306 +++++++------- charges/mitre.svg | 41 ++ charges/monk.svg | 140 ++++++- charges/moonInCrescent.svg | 27 ++ charges/mullet.svg | 7 +- charges/mullet4.svg | 7 +- charges/mullet6.svg | 7 +- charges/mullet6Faceted.svg | 8 +- charges/mullet6Pierced.svg | 7 +- charges/mullet7.svg | 7 +- charges/mullet8.svg | 7 +- charges/mulletFaceted.svg | 8 +- charges/oak.svg | 38 +- charges/orb.svg | 26 +- charges/owl.svg | 140 ++++++- charges/owlDisplayed.svg | 75 ++++ charges/palmTree.svg | 156 +++++++ charges/parrot.svg | 28 +- charges/peacock.svg | 167 ++++++++ charges/peacockInPride.svg | 216 ++++++++++ charges/pear.svg | 38 ++ charges/pegasus.svg | 44 +- charges/pike.svg | 20 +- charges/pineCone.svg | 24 ++ charges/pineTree.svg | 16 + charges/pique.svg | 7 +- charges/plaice.svg | 48 +++ charges/plough.svg | 17 +- charges/porcupine.svg | 138 +++++- charges/pot.svg | 11 +- charges/quatrefoil.svg | 14 + charges/rabbitSejant.svg | 39 ++ charges/rake.svg | 27 +- charges/ramHeadErased.svg | 75 ++++ charges/ramPassant.svg | 80 ++++ charges/ramsHorn.svg | 29 +- charges/ratRampant.svg | 44 ++ charges/raven.svg | 25 +- charges/rhinoceros.svg | 61 +++ charges/rose.svg | 13 +- charges/roundel.svg | 7 +- charges/roundel2.svg | 8 +- charges/rustre.svg | 7 +- charges/sabre.svg | 4 +- charges/sabre2.svg | 4 +- charges/sabresCrossed.svg | 6 +- charges/sagittarius.svg | 136 ++++++ charges/salmon.svg | 127 ++++++ charges/sceptre.svg | 28 ++ charges/scissors.svg | 8 + charges/scorpion.svg | 60 +++ charges/scythe.svg | 15 + charges/serpent.svg | 25 +- charges/sextifoil.svg | 14 + charges/shield.svg | 31 ++ charges/sickle.svg | 12 + charges/skull.svg | 37 ++ charges/snake.svg | 75 +++- charges/spear.svg | 13 + charges/squirrel.svg | 57 +++ charges/stagPassant.svg | 55 +++ charges/stagsAttires.svg | 15 +- charges/stirrup.svg | 47 +++ charges/sun.svg | 7 +- charges/sunInSplendour.svg | 16 +- charges/sunInSplendour2.svg | 34 ++ charges/swallow.svg | 62 +++ charges/swan.svg | 28 +- charges/swanErased.svg | 4 +- charges/sword.svg | 15 +- charges/talbotPassant.svg | 58 +++ charges/talbotSejant.svg | 75 ++++ charges/template.svg | 23 +- charges/tower.svg | 12 +- charges/trefle.svg | 7 +- charges/trefoil.svg | 11 + charges/triangle.svg | 7 +- charges/trianglePierced.svg | 7 +- charges/unicornRampant.svg | 30 +- charges/wheatStalk.svg | 41 ++ charges/wing.svg | 35 +- charges/wingSword.svg | 24 +- charges/wolfHeadErased.svg | 21 +- charges/wolfPassant.svg | 35 +- charges/wolfRampant.svg | 31 +- charges/wolfStatant.svg | 28 +- charges/wyvern.svg | 70 +++- charges/wyvernWithWingsDisplayed.svg | 47 ++- index.html | 4 +- modules/coa-generator.js | 599 ++++++++++++++++++++++++--- modules/coa-renderer.js | 20 +- versioning.js | 2 + 251 files changed, 9375 insertions(+), 620 deletions(-) create mode 100644 charges/arbalest.svg create mode 100644 charges/badgerStatant.svg create mode 100644 charges/banner.svg create mode 100644 charges/bee.svg create mode 100644 charges/boarHeadErased.svg create mode 100644 charges/bookClosed.svg create mode 100644 charges/bookOpen.svg create mode 100644 charges/bridge.svg create mode 100644 charges/butterfly.svg create mode 100644 charges/caravel.svg create mode 100644 charges/catPassantGuardant.svg create mode 100644 charges/column.svg create mode 100644 charges/cowStatant.svg create mode 100644 charges/crocodile.svg create mode 100644 charges/donkeyHeadCaboshed.svg create mode 100644 charges/dove.svg create mode 100644 charges/doveDisplayed.svg create mode 100644 charges/drum.svg create mode 100644 charges/duck.svg create mode 100644 charges/eagleTwoHeads.svg delete mode 100644 charges/eagleTwoHeards.svg create mode 100644 charges/elephantHeadErased.svg create mode 100644 charges/falcon.svg create mode 100644 charges/fly.svg create mode 100644 charges/frog.svg create mode 100644 charges/gauntlet.svg create mode 100644 charges/grapeBunch.svg create mode 100644 charges/greyhoundRampant.svg create mode 100644 charges/hedgehog.svg create mode 100644 charges/hindStatant.svg create mode 100644 charges/horseHeadCouped.svg create mode 100644 charges/ladder.svg create mode 100644 charges/laurelWreath.svg create mode 100644 charges/lionHeadErased.svg create mode 100644 charges/lionSejant.svg create mode 100644 charges/lizard.svg create mode 100644 charges/mapleLeaf.svg create mode 100644 charges/martenCourant.svg create mode 100644 charges/mitre.svg create mode 100644 charges/moonInCrescent.svg create mode 100644 charges/owlDisplayed.svg create mode 100644 charges/palmTree.svg create mode 100644 charges/peacock.svg create mode 100644 charges/peacockInPride.svg create mode 100644 charges/pear.svg create mode 100644 charges/pineCone.svg create mode 100644 charges/pineTree.svg create mode 100644 charges/plaice.svg create mode 100644 charges/quatrefoil.svg create mode 100644 charges/rabbitSejant.svg create mode 100644 charges/ramHeadErased.svg create mode 100644 charges/ramPassant.svg create mode 100644 charges/ratRampant.svg create mode 100644 charges/rhinoceros.svg create mode 100644 charges/sagittarius.svg create mode 100644 charges/salmon.svg create mode 100644 charges/sceptre.svg create mode 100644 charges/scissors.svg create mode 100644 charges/scorpion.svg create mode 100644 charges/scythe.svg create mode 100644 charges/sextifoil.svg create mode 100644 charges/shield.svg create mode 100644 charges/sickle.svg create mode 100644 charges/skull.svg create mode 100644 charges/spear.svg create mode 100644 charges/squirrel.svg create mode 100644 charges/stagPassant.svg create mode 100644 charges/stirrup.svg create mode 100644 charges/sunInSplendour2.svg create mode 100644 charges/swallow.svg create mode 100644 charges/talbotPassant.svg create mode 100644 charges/talbotSejant.svg create mode 100644 charges/trefoil.svg create mode 100644 charges/wheatStalk.svg diff --git a/charges/agnusDei.svg b/charges/agnusDei.svg index 52f55f24..9e9fd1e0 100644 --- a/charges/agnusDei.svg +++ b/charges/agnusDei.svg @@ -1,27 +1,27 @@ - + - + - + - - - - - - + + + + + + - - - + + + @@ -132,4 +132,4 @@ - \ No newline at end of file + diff --git a/charges/anchor.svg b/charges/anchor.svg index 86ffa85e..59678314 100644 --- a/charges/anchor.svg +++ b/charges/anchor.svg @@ -1 +1,9 @@ - \ No newline at end of file + + + + + + + + + diff --git a/charges/angel.svg b/charges/angel.svg index 5dd03384..e6f3ba3e 100644 --- a/charges/angel.svg +++ b/charges/angel.svg @@ -1,22 +1,22 @@ - - + + - + - - + + - + diff --git a/charges/annulet.svg b/charges/annulet.svg index 2e9b28f2..b3dad13d 100644 --- a/charges/annulet.svg +++ b/charges/annulet.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/apple.svg b/charges/apple.svg index 551cb1ea..6679428d 100644 --- a/charges/apple.svg +++ b/charges/apple.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/charges/arbalest.svg b/charges/arbalest.svg new file mode 100644 index 00000000..79cf4950 --- /dev/null +++ b/charges/arbalest.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/arrow.svg b/charges/arrow.svg index 2b650a9e..dca5f47e 100644 --- a/charges/arrow.svg +++ b/charges/arrow.svg @@ -1 +1,10 @@ - \ No newline at end of file + + + + + + + + + + diff --git a/charges/arrowsSheaf.svg b/charges/arrowsSheaf.svg index 01cb6e8d..47d8b925 100644 --- a/charges/arrowsSheaf.svg +++ b/charges/arrowsSheaf.svg @@ -1 +1,27 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/attire.svg b/charges/attire.svg index 200dce16..99427a60 100644 --- a/charges/attire.svg +++ b/charges/attire.svg @@ -1 +1,18 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/charges/axe.svg b/charges/axe.svg index ff842a97..e1608145 100644 --- a/charges/axe.svg +++ b/charges/axe.svg @@ -1 +1,16 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/charges/badgerStatant.svg b/charges/badgerStatant.svg new file mode 100644 index 00000000..02de9b22 --- /dev/null +++ b/charges/badgerStatant.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/banner.svg b/charges/banner.svg new file mode 100644 index 00000000..80ca0f4f --- /dev/null +++ b/charges/banner.svg @@ -0,0 +1,35 @@ + + + + diff --git a/charges/basilisk.svg b/charges/basilisk.svg index e73d2a4c..b2755dff 100644 --- a/charges/basilisk.svg +++ b/charges/basilisk.svg @@ -1 +1,220 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bearPassant.svg b/charges/bearPassant.svg index 98e2c416..847ea7bd 100644 --- a/charges/bearPassant.svg +++ b/charges/bearPassant.svg @@ -1 +1,142 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bearRampant.svg b/charges/bearRampant.svg index f7c240c1..418d6fb3 100644 --- a/charges/bearRampant.svg +++ b/charges/bearRampant.svg @@ -1 +1,129 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bee.svg b/charges/bee.svg new file mode 100644 index 00000000..db5b48b4 --- /dev/null +++ b/charges/bee.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bell.svg b/charges/bell.svg index 22db9957..307b6493 100644 --- a/charges/bell.svg +++ b/charges/bell.svg @@ -1 +1,18 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/charges/billet.svg b/charges/billet.svg index 197064ff..9482f5a7 100644 --- a/charges/billet.svg +++ b/charges/billet.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/boarHeadErased.svg b/charges/boarHeadErased.svg new file mode 100644 index 00000000..6c28ab2b --- /dev/null +++ b/charges/boarHeadErased.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/boarRampant.svg b/charges/boarRampant.svg index efdb9bd6..436fb439 100644 --- a/charges/boarRampant.svg +++ b/charges/boarRampant.svg @@ -1 +1,26 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/boat.svg b/charges/boat.svg index 72f9c5cf..b50f6194 100644 --- a/charges/boat.svg +++ b/charges/boat.svg @@ -1 +1,19 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/charges/boat2.svg b/charges/boat2.svg index 9eac5afa..f3e37a5b 100644 --- a/charges/boat2.svg +++ b/charges/boat2.svg @@ -1 +1,45 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bookClosed.svg b/charges/bookClosed.svg new file mode 100644 index 00000000..f50006a1 --- /dev/null +++ b/charges/bookClosed.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bookOpen.svg b/charges/bookOpen.svg new file mode 100644 index 00000000..6a760e51 --- /dev/null +++ b/charges/bookOpen.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bow.svg b/charges/bow.svg index 6f047535..b1f2c8ec 100644 --- a/charges/bow.svg +++ b/charges/bow.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/charges/bowWithArrow.svg b/charges/bowWithArrow.svg index 8caf84c4..ad2e4502 100644 --- a/charges/bowWithArrow.svg +++ b/charges/bowWithArrow.svg @@ -1 +1,15 @@ - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/charges/bridge.svg b/charges/bridge.svg new file mode 100644 index 00000000..41261f98 --- /dev/null +++ b/charges/bridge.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bucket.svg b/charges/bucket.svg index 6357b0c7..399aa92c 100644 --- a/charges/bucket.svg +++ b/charges/bucket.svg @@ -1 +1,20 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + diff --git a/charges/buckle.svg b/charges/buckle.svg index 8bb54df3..b83ba97d 100644 --- a/charges/buckle.svg +++ b/charges/buckle.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/charges/bugleHorn.svg b/charges/bugleHorn.svg index d0ee8107..a7985ca6 100644 --- a/charges/bugleHorn.svg +++ b/charges/bugleHorn.svg @@ -1 +1,18 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/charges/bugleHorn2.svg b/charges/bugleHorn2.svg index 4ce25830..cf5bcaa7 100644 --- a/charges/bugleHorn2.svg +++ b/charges/bugleHorn2.svg @@ -1 +1,16 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/charges/bullHeadCaboshed.svg b/charges/bullHeadCaboshed.svg index af7eb064..d3ddeccc 100644 --- a/charges/bullHeadCaboshed.svg +++ b/charges/bullHeadCaboshed.svg @@ -1 +1,17 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + diff --git a/charges/bullPassant.svg b/charges/bullPassant.svg index 8e78550f..24143bb3 100644 --- a/charges/bullPassant.svg +++ b/charges/bullPassant.svg @@ -1 +1,21 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/butterfly.svg b/charges/butterfly.svg new file mode 100644 index 00000000..e956195c --- /dev/null +++ b/charges/butterfly.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/camel.svg b/charges/camel.svg index 12ca27ec..e2dd8bb9 100644 --- a/charges/camel.svg +++ b/charges/camel.svg @@ -1,16 +1,16 @@ - - + + - - + + - - - - + + + + diff --git a/charges/cancer.svg b/charges/cancer.svg index 0287d16c..a8bf102c 100644 --- a/charges/cancer.svg +++ b/charges/cancer.svg @@ -1 +1,20 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + diff --git a/charges/cannon.svg b/charges/cannon.svg index 08b90b6b..a110c596 100644 --- a/charges/cannon.svg +++ b/charges/cannon.svg @@ -1 +1,68 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/caravel.svg b/charges/caravel.svg new file mode 100644 index 00000000..39f8fd86 --- /dev/null +++ b/charges/caravel.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/carreau.svg b/charges/carreau.svg index cbc379bb..bfeeb049 100644 --- a/charges/carreau.svg +++ b/charges/carreau.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/castle.svg b/charges/castle.svg index 91106986..43a2fa38 100644 --- a/charges/castle.svg +++ b/charges/castle.svg @@ -1 +1,24 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/catPassantGuardant.svg b/charges/catPassantGuardant.svg new file mode 100644 index 00000000..5a556e4e --- /dev/null +++ b/charges/catPassantGuardant.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/cavalier.svg b/charges/cavalier.svg index 89d441d0..8e9d9b43 100644 --- a/charges/cavalier.svg +++ b/charges/cavalier.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/charges/chalice.svg b/charges/chalice.svg index f4d96917..2a8f7845 100644 --- a/charges/chalice.svg +++ b/charges/chalice.svg @@ -1 +1,13 @@ - \ No newline at end of file + + + + + + + + + + + + + diff --git a/charges/cinquefoil.svg b/charges/cinquefoil.svg index e3914397..3e957d99 100644 --- a/charges/cinquefoil.svg +++ b/charges/cinquefoil.svg @@ -1 +1,15 @@ - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/charges/cock.svg b/charges/cock.svg index 995d06f5..4b100034 100644 --- a/charges/cock.svg +++ b/charges/cock.svg @@ -1 +1,34 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/column.svg b/charges/column.svg new file mode 100644 index 00000000..80067505 --- /dev/null +++ b/charges/column.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/compassRose.svg b/charges/compassRose.svg index eada7308..dec495cc 100644 --- a/charges/compassRose.svg +++ b/charges/compassRose.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/charges/cowHorns.svg b/charges/cowHorns.svg index e482a9a2..74378210 100644 --- a/charges/cowHorns.svg +++ b/charges/cowHorns.svg @@ -1 +1,10 @@ - \ No newline at end of file + + + + + + + + + + diff --git a/charges/cowStatant.svg b/charges/cowStatant.svg new file mode 100644 index 00000000..f28e58e0 --- /dev/null +++ b/charges/cowStatant.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/crescent.svg b/charges/crescent.svg index c3d85186..9181995b 100644 --- a/charges/crescent.svg +++ b/charges/crescent.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/charges/crocodile.svg b/charges/crocodile.svg new file mode 100644 index 00000000..b44032f7 --- /dev/null +++ b/charges/crocodile.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/crosier.svg b/charges/crosier.svg index 631ef998..5eb26576 100644 --- a/charges/crosier.svg +++ b/charges/crosier.svg @@ -1 +1,16 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/charges/crossAnkh.svg b/charges/crossAnkh.svg index 1f5693c5..6bbac70e 100644 --- a/charges/crossAnkh.svg +++ b/charges/crossAnkh.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossArrowed.svg b/charges/crossArrowed.svg index c78608aa..ff4b6c02 100644 --- a/charges/crossArrowed.svg +++ b/charges/crossArrowed.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/charges/crossAvellane.svg b/charges/crossAvellane.svg index f2625d07..303e7f72 100644 --- a/charges/crossAvellane.svg +++ b/charges/crossAvellane.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/charges/crossBiparted.svg b/charges/crossBiparted.svg index 8cd951a9..0e6ac5f8 100644 --- a/charges/crossBiparted.svg +++ b/charges/crossBiparted.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossBottony.svg b/charges/crossBottony.svg index 1f739c6b..2d246b29 100644 --- a/charges/crossBottony.svg +++ b/charges/crossBottony.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossBurgundy.svg b/charges/crossBurgundy.svg index e253555f..cb681714 100644 --- a/charges/crossBurgundy.svg +++ b/charges/crossBurgundy.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossCalvary.svg b/charges/crossCalvary.svg index dd0447b5..493579f9 100644 --- a/charges/crossCalvary.svg +++ b/charges/crossCalvary.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossCarolingian.svg b/charges/crossCarolingian.svg index 3390b7e4..761464a7 100644 --- a/charges/crossCarolingian.svg +++ b/charges/crossCarolingian.svg @@ -1 +1,38 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/crossCeltic.svg b/charges/crossCeltic.svg index 5de3f305..6abe10fe 100644 --- a/charges/crossCeltic.svg +++ b/charges/crossCeltic.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossCeltic2.svg b/charges/crossCeltic2.svg index 2b6ab9f6..84628911 100644 --- a/charges/crossCeltic2.svg +++ b/charges/crossCeltic2.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossCercelee.svg b/charges/crossCercelee.svg index f037ea98..2b8bff16 100644 --- a/charges/crossCercelee.svg +++ b/charges/crossCercelee.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossClechy.svg b/charges/crossClechy.svg index a0028fad..c246534e 100644 --- a/charges/crossClechy.svg +++ b/charges/crossClechy.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossDouble.svg b/charges/crossDouble.svg index 1a0e4bc8..2176c0e3 100644 --- a/charges/crossDouble.svg +++ b/charges/crossDouble.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossErminee.svg b/charges/crossErminee.svg index 2e03019d..1def3830 100644 --- a/charges/crossErminee.svg +++ b/charges/crossErminee.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossFitchy.svg b/charges/crossFitchy.svg index 4730bc89..954b8e70 100644 --- a/charges/crossFitchy.svg +++ b/charges/crossFitchy.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossFleury.svg b/charges/crossFleury.svg index 80ed83e2..d617a15d 100644 --- a/charges/crossFleury.svg +++ b/charges/crossFleury.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossFormee.svg b/charges/crossFormee.svg index d66de827..efef99d4 100644 --- a/charges/crossFormee.svg +++ b/charges/crossFormee.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossFormee2.svg b/charges/crossFormee2.svg index 66ef6602..2309e494 100644 --- a/charges/crossFormee2.svg +++ b/charges/crossFormee2.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossGamma.svg b/charges/crossGamma.svg index 377976f9..d2da6490 100644 --- a/charges/crossGamma.svg +++ b/charges/crossGamma.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossHummetty.svg b/charges/crossHummetty.svg index e530d384..e2676ab2 100644 --- a/charges/crossHummetty.svg +++ b/charges/crossHummetty.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossJerusalem.svg b/charges/crossJerusalem.svg index b5d5000c..54ba95dc 100644 --- a/charges/crossJerusalem.svg +++ b/charges/crossJerusalem.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossLatin.svg b/charges/crossLatin.svg index 1f3776a3..16f60138 100644 --- a/charges/crossLatin.svg +++ b/charges/crossLatin.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossMaltese.svg b/charges/crossMaltese.svg index e0eb8dd7..5718dacf 100644 --- a/charges/crossMaltese.svg +++ b/charges/crossMaltese.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossMoline.svg b/charges/crossMoline.svg index 4784ef8d..97f3b918 100644 --- a/charges/crossMoline.svg +++ b/charges/crossMoline.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossOccitan.svg b/charges/crossOccitan.svg index 83b5fabb..15fe7587 100644 --- a/charges/crossOccitan.svg +++ b/charges/crossOccitan.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossOrthodox.svg b/charges/crossOrthodox.svg index 122df4ca..9519f84d 100644 --- a/charges/crossOrthodox.svg +++ b/charges/crossOrthodox.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossPattee.svg b/charges/crossPattee.svg index 8c3d3c0c..1c3bf761 100644 --- a/charges/crossPattee.svg +++ b/charges/crossPattee.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossPatteeAlisee.svg b/charges/crossPatteeAlisee.svg index 5625cdb4..801e7113 100644 --- a/charges/crossPatteeAlisee.svg +++ b/charges/crossPatteeAlisee.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossPommy.svg b/charges/crossPommy.svg index 9bc765fe..da002347 100644 --- a/charges/crossPommy.svg +++ b/charges/crossPommy.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossPotent.svg b/charges/crossPotent.svg index 330e830f..cc3bb92f 100644 --- a/charges/crossPotent.svg +++ b/charges/crossPotent.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossSantiago.svg b/charges/crossSantiago.svg index 7e510a90..d6b30109 100644 --- a/charges/crossSantiago.svg +++ b/charges/crossSantiago.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossTemplar.svg b/charges/crossTemplar.svg index 855989b4..9c33613c 100644 --- a/charges/crossTemplar.svg +++ b/charges/crossTemplar.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crossTriquetra.svg b/charges/crossTriquetra.svg index 1f2b4ce9..024225c1 100644 --- a/charges/crossTriquetra.svg +++ b/charges/crossTriquetra.svg @@ -1 +1,9 @@ - \ No newline at end of file + + + + + + + + + diff --git a/charges/crossVoided.svg b/charges/crossVoided.svg index 02f98d27..0fa95bd7 100644 --- a/charges/crossVoided.svg +++ b/charges/crossVoided.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crosslet.svg b/charges/crosslet.svg index 645b68a3..3dc8b517 100644 --- a/charges/crosslet.svg +++ b/charges/crosslet.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/crown.svg b/charges/crown.svg index 5501bf57..00dbbacf 100644 --- a/charges/crown.svg +++ b/charges/crown.svg @@ -1 +1,14 @@ - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/charges/crown2.svg b/charges/crown2.svg index ce3a5a2b..4be76b88 100644 --- a/charges/crown2.svg +++ b/charges/crown2.svg @@ -1 +1,73 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/deerHeadCaboshed.svg b/charges/deerHeadCaboshed.svg index 7a83f136..aca87f99 100644 --- a/charges/deerHeadCaboshed.svg +++ b/charges/deerHeadCaboshed.svg @@ -1 +1,25 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/delf.svg b/charges/delf.svg index b05eab68..227bd04f 100644 --- a/charges/delf.svg +++ b/charges/delf.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/dolphin.svg b/charges/dolphin.svg index 4632a120..fdc49f07 100644 --- a/charges/dolphin.svg +++ b/charges/dolphin.svg @@ -1,14 +1,14 @@ - - - - - - + + + + + + - + diff --git a/charges/donkeyHeadCaboshed.svg b/charges/donkeyHeadCaboshed.svg new file mode 100644 index 00000000..c9533d82 --- /dev/null +++ b/charges/donkeyHeadCaboshed.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/dove.svg b/charges/dove.svg new file mode 100644 index 00000000..860ff7f5 --- /dev/null +++ b/charges/dove.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/doveDisplayed.svg b/charges/doveDisplayed.svg new file mode 100644 index 00000000..d3a24ea1 --- /dev/null +++ b/charges/doveDisplayed.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/dragonPassant.svg b/charges/dragonPassant.svg index 5d177cbe..b8fbc58e 100644 --- a/charges/dragonPassant.svg +++ b/charges/dragonPassant.svg @@ -1,30 +1,38 @@ - + - - + + + + - - - + + + + + - - + + + + + - - + + + - + diff --git a/charges/dragonRampant.svg b/charges/dragonRampant.svg index d1b14d0a..016d4711 100644 --- a/charges/dragonRampant.svg +++ b/charges/dragonRampant.svg @@ -1,35 +1,42 @@ - - - - - + + + + + + + - - - - - - + + + + + + + + - + + + - - - - + + + + + - - + + diff --git a/charges/drum.svg b/charges/drum.svg new file mode 100644 index 00000000..d80386d4 --- /dev/null +++ b/charges/drum.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/charges/duck.svg b/charges/duck.svg new file mode 100644 index 00000000..440b93fd --- /dev/null +++ b/charges/duck.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/eagle.svg b/charges/eagle.svg index d8c478ca..c52fd495 100644 --- a/charges/eagle.svg +++ b/charges/eagle.svg @@ -1 +1,91 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/eagleTwoHeads.svg b/charges/eagleTwoHeads.svg new file mode 100644 index 00000000..d556d380 --- /dev/null +++ b/charges/eagleTwoHeads.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/eagleTwoHeards.svg b/charges/eagleTwoHeards.svg deleted file mode 100644 index 8492a718..00000000 --- a/charges/eagleTwoHeards.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/charges/elephant.svg b/charges/elephant.svg index 6f580587..fed4c13f 100644 --- a/charges/elephant.svg +++ b/charges/elephant.svg @@ -1 +1,17 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + diff --git a/charges/elephantHeadErased.svg b/charges/elephantHeadErased.svg new file mode 100644 index 00000000..cb7acccc --- /dev/null +++ b/charges/elephantHeadErased.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/escallop.svg b/charges/escallop.svg index 2b2da7ab..d5803037 100644 --- a/charges/escallop.svg +++ b/charges/escallop.svg @@ -1 +1,19 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/charges/estoile.svg b/charges/estoile.svg index dbcd4e81..6966ccbc 100644 --- a/charges/estoile.svg +++ b/charges/estoile.svg @@ -1 +1,20 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + diff --git a/charges/falchion.svg b/charges/falchion.svg index 6bb3b0ec..dc28b164 100644 --- a/charges/falchion.svg +++ b/charges/falchion.svg @@ -1,10 +1,10 @@ - + - \ No newline at end of file + diff --git a/charges/falcon.svg b/charges/falcon.svg new file mode 100644 index 00000000..66d15b9d --- /dev/null +++ b/charges/falcon.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/fasces.svg b/charges/fasces.svg index ed22053b..71e27285 100644 --- a/charges/fasces.svg +++ b/charges/fasces.svg @@ -1 +1,34 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/fleurDeLis.svg b/charges/fleurDeLis.svg index b26c1c21..2583e48f 100644 --- a/charges/fleurDeLis.svg +++ b/charges/fleurDeLis.svg @@ -1 +1,10 @@ - \ No newline at end of file + + + + + + + + + + diff --git a/charges/fly.svg b/charges/fly.svg new file mode 100644 index 00000000..08c07a8c --- /dev/null +++ b/charges/fly.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/foot.svg b/charges/foot.svg index c9988d9b..dc354c02 100644 --- a/charges/foot.svg +++ b/charges/foot.svg @@ -1,14 +1,14 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/charges/fountain.svg b/charges/fountain.svg index 38ae6e71..1ed8ac67 100644 --- a/charges/fountain.svg +++ b/charges/fountain.svg @@ -1 +1,11 @@ - \ No newline at end of file + + + + + + + + + + + diff --git a/charges/frog.svg b/charges/frog.svg new file mode 100644 index 00000000..6f6f2c1f --- /dev/null +++ b/charges/frog.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/fusil.svg b/charges/fusil.svg index 797caeef..eac10ed4 100644 --- a/charges/fusil.svg +++ b/charges/fusil.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/garb.svg b/charges/garb.svg index 002fa1d0..3bd53140 100644 --- a/charges/garb.svg +++ b/charges/garb.svg @@ -139,8 +139,8 @@ - - + + diff --git a/charges/gauntlet.svg b/charges/gauntlet.svg new file mode 100644 index 00000000..5bbd9e55 --- /dev/null +++ b/charges/gauntlet.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/goat.svg b/charges/goat.svg index a3249e72..721c3f15 100644 --- a/charges/goat.svg +++ b/charges/goat.svg @@ -1 +1,21 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/goutte.svg b/charges/goutte.svg index a6e15386..40f23183 100644 --- a/charges/goutte.svg +++ b/charges/goutte.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/grapeBunch.svg b/charges/grapeBunch.svg new file mode 100644 index 00000000..d25c92b8 --- /dev/null +++ b/charges/grapeBunch.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/greyhoundCourant.svg b/charges/greyhoundCourant.svg index 7d4cc410..75f0476f 100644 --- a/charges/greyhoundCourant.svg +++ b/charges/greyhoundCourant.svg @@ -1 +1,31 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/greyhoundRampant.svg b/charges/greyhoundRampant.svg new file mode 100644 index 00000000..73ae1448 --- /dev/null +++ b/charges/greyhoundRampant.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/greyhoundSejant.svg b/charges/greyhoundSejant.svg index 4a1c1667..09efa81c 100644 --- a/charges/greyhoundSejant.svg +++ b/charges/greyhoundSejant.svg @@ -1 +1,108 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/griffinPassant.svg b/charges/griffinPassant.svg index c978d591..4ff9c011 100644 --- a/charges/griffinPassant.svg +++ b/charges/griffinPassant.svg @@ -1 +1,59 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/griffinRampant.svg b/charges/griffinRampant.svg index bf9eb24a..c17552c3 100644 --- a/charges/griffinRampant.svg +++ b/charges/griffinRampant.svg @@ -1 +1,115 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/hand.svg b/charges/hand.svg index 42195678..4da98b9a 100644 --- a/charges/hand.svg +++ b/charges/hand.svg @@ -1 +1,14 @@ - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/charges/harp.svg b/charges/harp.svg index b2c19a36..6047a0b5 100644 --- a/charges/harp.svg +++ b/charges/harp.svg @@ -1 +1,30 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/hatchet.svg b/charges/hatchet.svg index bd479e2e..37052556 100644 --- a/charges/hatchet.svg +++ b/charges/hatchet.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/charges/head.svg b/charges/head.svg index fa458631..a7f6198d 100644 --- a/charges/head.svg +++ b/charges/head.svg @@ -2,10 +2,10 @@ - + - + diff --git a/charges/headWreathed.svg b/charges/headWreathed.svg index 85b38ddf..b6dafc64 100644 --- a/charges/headWreathed.svg +++ b/charges/headWreathed.svg @@ -1 +1,28 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/heart.svg b/charges/heart.svg index 57b9cd99..56d0940c 100644 --- a/charges/heart.svg +++ b/charges/heart.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/hedgehog.svg b/charges/hedgehog.svg new file mode 100644 index 00000000..d591cc02 --- /dev/null +++ b/charges/hedgehog.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/helmet.svg b/charges/helmet.svg index 86e9a77b..9099c7c3 100644 --- a/charges/helmet.svg +++ b/charges/helmet.svg @@ -1 +1,14 @@ - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/charges/heron.svg b/charges/heron.svg index 017d962e..86d121b0 100644 --- a/charges/heron.svg +++ b/charges/heron.svg @@ -1 +1,28 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/hindStatant.svg b/charges/hindStatant.svg new file mode 100644 index 00000000..0c2aae31 --- /dev/null +++ b/charges/hindStatant.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/horseHeadCouped.svg b/charges/horseHeadCouped.svg new file mode 100644 index 00000000..712a273d --- /dev/null +++ b/charges/horseHeadCouped.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/horsePassant.svg b/charges/horsePassant.svg index f235ce7e..f4d2de5b 100644 --- a/charges/horsePassant.svg +++ b/charges/horsePassant.svg @@ -1,119 +1,119 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/horseRampant.svg b/charges/horseRampant.svg index 54845fe6..d2f2544a 100644 --- a/charges/horseRampant.svg +++ b/charges/horseRampant.svg @@ -1 +1,26 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/horseSalient.svg b/charges/horseSalient.svg index 16728061..65bd744f 100644 --- a/charges/horseSalient.svg +++ b/charges/horseSalient.svg @@ -1 +1,24 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ladder.svg b/charges/ladder.svg new file mode 100644 index 00000000..b15d2f4a --- /dev/null +++ b/charges/ladder.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/lamb.svg b/charges/lamb.svg index e3459362..8d4e161a 100644 --- a/charges/lamb.svg +++ b/charges/lamb.svg @@ -1 +1,18 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/charges/lambPassantReguardant.svg b/charges/lambPassantReguardant.svg index 4d90b210..b348c41d 100644 --- a/charges/lambPassantReguardant.svg +++ b/charges/lambPassantReguardant.svg @@ -1,11 +1,11 @@ - + - + - - - + + + @@ -116,4 +116,4 @@ - \ No newline at end of file + diff --git a/charges/laurelWreath.svg b/charges/laurelWreath.svg new file mode 100644 index 00000000..74162f57 --- /dev/null +++ b/charges/laurelWreath.svg @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lionHeadCaboshed.svg b/charges/lionHeadCaboshed.svg index b7065322..63022fc0 100644 --- a/charges/lionHeadCaboshed.svg +++ b/charges/lionHeadCaboshed.svg @@ -1 +1,107 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lionHeadErased.svg b/charges/lionHeadErased.svg new file mode 100644 index 00000000..e8221630 --- /dev/null +++ b/charges/lionHeadErased.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lionPassant.svg b/charges/lionPassant.svg index 721b3bfe..10dcb448 100644 --- a/charges/lionPassant.svg +++ b/charges/lionPassant.svg @@ -1 +1,183 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lionPassantGuardant.svg b/charges/lionPassantGuardant.svg index 1652a5ac..9aa594fa 100644 --- a/charges/lionPassantGuardant.svg +++ b/charges/lionPassantGuardant.svg @@ -1 +1,243 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lionRampant.svg b/charges/lionRampant.svg index 1160bf62..d5f6bdad 100644 --- a/charges/lionRampant.svg +++ b/charges/lionRampant.svg @@ -4,7 +4,9 @@ - + + + diff --git a/charges/lionSejant.svg b/charges/lionSejant.svg new file mode 100644 index 00000000..6fe1efae --- /dev/null +++ b/charges/lionSejant.svg @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lizard.svg b/charges/lizard.svg new file mode 100644 index 00000000..306e99e9 --- /dev/null +++ b/charges/lizard.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lochaberAxe.svg b/charges/lochaberAxe.svg index bcf31775..cf09c61e 100644 --- a/charges/lochaberAxe.svg +++ b/charges/lochaberAxe.svg @@ -1 +1,9 @@ - \ No newline at end of file + + + + + + + + + diff --git a/charges/log.svg b/charges/log.svg index 0136afc0..387fad44 100644 --- a/charges/log.svg +++ b/charges/log.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/charges/lozengeFaceted.svg b/charges/lozengeFaceted.svg index 8d9cc76a..63a575e3 100644 --- a/charges/lozengeFaceted.svg +++ b/charges/lozengeFaceted.svg @@ -1 +1,11 @@ - \ No newline at end of file + + + + + + + + + + + diff --git a/charges/lute.svg b/charges/lute.svg index 1ce3d6bc..195c62cf 100644 --- a/charges/lute.svg +++ b/charges/lute.svg @@ -1 +1,15 @@ - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/charges/lymphad.svg b/charges/lymphad.svg index ca0aab51..7e547eaf 100644 --- a/charges/lymphad.svg +++ b/charges/lymphad.svg @@ -9,22 +9,22 @@ - + - - - + + + - + - + diff --git a/charges/mallet.svg b/charges/mallet.svg index 1a6655f4..381d172d 100644 --- a/charges/mallet.svg +++ b/charges/mallet.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/charges/mapleLeaf.svg b/charges/mapleLeaf.svg new file mode 100644 index 00000000..414a9797 --- /dev/null +++ b/charges/mapleLeaf.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/charges/martenCourant.svg b/charges/martenCourant.svg new file mode 100644 index 00000000..5efac23b --- /dev/null +++ b/charges/martenCourant.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mascle.svg b/charges/mascle.svg index bc8c3411..b867e47a 100644 --- a/charges/mascle.svg +++ b/charges/mascle.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/mastiffStatant.svg b/charges/mastiffStatant.svg index 83947142..4f3d3744 100644 --- a/charges/mastiffStatant.svg +++ b/charges/mastiffStatant.svg @@ -1,157 +1,157 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mitre.svg b/charges/mitre.svg new file mode 100644 index 00000000..bba5d163 --- /dev/null +++ b/charges/mitre.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/monk.svg b/charges/monk.svg index af0cb69a..8ede0359 100644 --- a/charges/monk.svg +++ b/charges/monk.svg @@ -1 +1,139 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/moonInCrescent.svg b/charges/moonInCrescent.svg new file mode 100644 index 00000000..f0da801d --- /dev/null +++ b/charges/moonInCrescent.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mullet.svg b/charges/mullet.svg index 556f1ebd..2658e971 100644 --- a/charges/mullet.svg +++ b/charges/mullet.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/mullet4.svg b/charges/mullet4.svg index aea310ce..37242f99 100644 --- a/charges/mullet4.svg +++ b/charges/mullet4.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/mullet6.svg b/charges/mullet6.svg index a712d695..1a1972aa 100644 --- a/charges/mullet6.svg +++ b/charges/mullet6.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/mullet6Faceted.svg b/charges/mullet6Faceted.svg index 13364f15..1ca0c335 100644 --- a/charges/mullet6Faceted.svg +++ b/charges/mullet6Faceted.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/charges/mullet6Pierced.svg b/charges/mullet6Pierced.svg index 955c6501..96d6f279 100644 --- a/charges/mullet6Pierced.svg +++ b/charges/mullet6Pierced.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/mullet7.svg b/charges/mullet7.svg index 6b78d873..53321978 100644 --- a/charges/mullet7.svg +++ b/charges/mullet7.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/mullet8.svg b/charges/mullet8.svg index 66c84ce8..0239a883 100644 --- a/charges/mullet8.svg +++ b/charges/mullet8.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/mulletFaceted.svg b/charges/mulletFaceted.svg index 49836d0f..a43fe26e 100644 --- a/charges/mulletFaceted.svg +++ b/charges/mulletFaceted.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/charges/oak.svg b/charges/oak.svg index aa208e4a..aa877960 100644 --- a/charges/oak.svg +++ b/charges/oak.svg @@ -19,7 +19,7 @@ - + @@ -157,12 +157,12 @@ - - - - - - + + + + + + @@ -200,8 +200,8 @@ - - + + @@ -224,8 +224,8 @@ - - + + @@ -248,8 +248,8 @@ - - + + @@ -272,8 +272,8 @@ - - + + @@ -296,8 +296,8 @@ - - + + @@ -320,8 +320,8 @@ - - + + diff --git a/charges/orb.svg b/charges/orb.svg index c228bcff..af898083 100644 --- a/charges/orb.svg +++ b/charges/orb.svg @@ -1 +1,25 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/owl.svg b/charges/owl.svg index 5ec6f37b..015a7f81 100644 --- a/charges/owl.svg +++ b/charges/owl.svg @@ -1 +1,139 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/owlDisplayed.svg b/charges/owlDisplayed.svg new file mode 100644 index 00000000..c49d8b27 --- /dev/null +++ b/charges/owlDisplayed.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/palmTree.svg b/charges/palmTree.svg new file mode 100644 index 00000000..40264f80 --- /dev/null +++ b/charges/palmTree.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/parrot.svg b/charges/parrot.svg index d854d0fd..92d7dd10 100644 --- a/charges/parrot.svg +++ b/charges/parrot.svg @@ -1 +1,27 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/peacock.svg b/charges/peacock.svg new file mode 100644 index 00000000..0ae12f99 --- /dev/null +++ b/charges/peacock.svg @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/peacockInPride.svg b/charges/peacockInPride.svg new file mode 100644 index 00000000..c235a40a --- /dev/null +++ b/charges/peacockInPride.svg @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pear.svg b/charges/pear.svg new file mode 100644 index 00000000..f1f01c0f --- /dev/null +++ b/charges/pear.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pegasus.svg b/charges/pegasus.svg index e4382800..2583831d 100644 --- a/charges/pegasus.svg +++ b/charges/pegasus.svg @@ -1 +1,43 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pike.svg b/charges/pike.svg index 7edd6aff..812002b7 100644 --- a/charges/pike.svg +++ b/charges/pike.svg @@ -1 +1,19 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/charges/pineCone.svg b/charges/pineCone.svg new file mode 100644 index 00000000..2e5c4e66 --- /dev/null +++ b/charges/pineCone.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pineTree.svg b/charges/pineTree.svg new file mode 100644 index 00000000..7d1aa006 --- /dev/null +++ b/charges/pineTree.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/charges/pique.svg b/charges/pique.svg index 4383d3ea..06c5836e 100644 --- a/charges/pique.svg +++ b/charges/pique.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/plaice.svg b/charges/plaice.svg new file mode 100644 index 00000000..c1e66df1 --- /dev/null +++ b/charges/plaice.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/plough.svg b/charges/plough.svg index b1534bc5..d31e4287 100644 --- a/charges/plough.svg +++ b/charges/plough.svg @@ -1 +1,16 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/charges/porcupine.svg b/charges/porcupine.svg index 92d095bc..bdc53081 100644 --- a/charges/porcupine.svg +++ b/charges/porcupine.svg @@ -1 +1,137 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pot.svg b/charges/pot.svg index db4e0eec..64cc0ff6 100644 --- a/charges/pot.svg +++ b/charges/pot.svg @@ -1 +1,10 @@ - \ No newline at end of file + + + + + + + + + + diff --git a/charges/quatrefoil.svg b/charges/quatrefoil.svg new file mode 100644 index 00000000..cc7b9a33 --- /dev/null +++ b/charges/quatrefoil.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/rabbitSejant.svg b/charges/rabbitSejant.svg new file mode 100644 index 00000000..7bbc22e8 --- /dev/null +++ b/charges/rabbitSejant.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/rake.svg b/charges/rake.svg index d0a2ff2d..2b76bc51 100644 --- a/charges/rake.svg +++ b/charges/rake.svg @@ -1 +1,26 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ramHeadErased.svg b/charges/ramHeadErased.svg new file mode 100644 index 00000000..6ece24a6 --- /dev/null +++ b/charges/ramHeadErased.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ramPassant.svg b/charges/ramPassant.svg new file mode 100644 index 00000000..6ce7da7e --- /dev/null +++ b/charges/ramPassant.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ramsHorn.svg b/charges/ramsHorn.svg index ce66c26d..26585cc9 100644 --- a/charges/ramsHorn.svg +++ b/charges/ramsHorn.svg @@ -1 +1,28 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ratRampant.svg b/charges/ratRampant.svg new file mode 100644 index 00000000..7e1cb3d6 --- /dev/null +++ b/charges/ratRampant.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/raven.svg b/charges/raven.svg index 10ae2b99..83eb8912 100644 --- a/charges/raven.svg +++ b/charges/raven.svg @@ -1 +1,24 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/rhinoceros.svg b/charges/rhinoceros.svg new file mode 100644 index 00000000..4b6304cd --- /dev/null +++ b/charges/rhinoceros.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/rose.svg b/charges/rose.svg index 1b61758c..7ce11665 100644 --- a/charges/rose.svg +++ b/charges/rose.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + + + + + + + + + + diff --git a/charges/roundel.svg b/charges/roundel.svg index b2d22c8d..344991ed 100644 --- a/charges/roundel.svg +++ b/charges/roundel.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/roundel2.svg b/charges/roundel2.svg index fffa7ad4..79e2f6ec 100644 --- a/charges/roundel2.svg +++ b/charges/roundel2.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/charges/rustre.svg b/charges/rustre.svg index da45eb58..60c253a1 100644 --- a/charges/rustre.svg +++ b/charges/rustre.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/sabre.svg b/charges/sabre.svg index 8b339a0f..765fdb0b 100644 --- a/charges/sabre.svg +++ b/charges/sabre.svg @@ -1,7 +1,7 @@ - + @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/charges/sabre2.svg b/charges/sabre2.svg index e16c45fe..44f810c0 100644 --- a/charges/sabre2.svg +++ b/charges/sabre2.svg @@ -1,7 +1,7 @@ - + @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/charges/sabresCrossed.svg b/charges/sabresCrossed.svg index 21ddc0e7..16136577 100644 --- a/charges/sabresCrossed.svg +++ b/charges/sabresCrossed.svg @@ -2,7 +2,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/charges/sagittarius.svg b/charges/sagittarius.svg new file mode 100644 index 00000000..074a134a --- /dev/null +++ b/charges/sagittarius.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/salmon.svg b/charges/salmon.svg new file mode 100644 index 00000000..a3dc8e86 --- /dev/null +++ b/charges/salmon.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/sceptre.svg b/charges/sceptre.svg new file mode 100644 index 00000000..0d060330 --- /dev/null +++ b/charges/sceptre.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/scissors.svg b/charges/scissors.svg new file mode 100644 index 00000000..ebc0df99 --- /dev/null +++ b/charges/scissors.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/scorpion.svg b/charges/scorpion.svg new file mode 100644 index 00000000..3155f3b9 --- /dev/null +++ b/charges/scorpion.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/scythe.svg b/charges/scythe.svg new file mode 100644 index 00000000..62a52520 --- /dev/null +++ b/charges/scythe.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/charges/serpent.svg b/charges/serpent.svg index 67a7bccd..e12c9570 100644 --- a/charges/serpent.svg +++ b/charges/serpent.svg @@ -1 +1,24 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/sextifoil.svg b/charges/sextifoil.svg new file mode 100644 index 00000000..cf8b918d --- /dev/null +++ b/charges/sextifoil.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/shield.svg b/charges/shield.svg new file mode 100644 index 00000000..10f6652f --- /dev/null +++ b/charges/shield.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/sickle.svg b/charges/sickle.svg new file mode 100644 index 00000000..dcf6dd44 --- /dev/null +++ b/charges/sickle.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/skull.svg b/charges/skull.svg new file mode 100644 index 00000000..4ee33d1c --- /dev/null +++ b/charges/skull.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/snake.svg b/charges/snake.svg index bb00fbf8..532f2c0c 100644 --- a/charges/snake.svg +++ b/charges/snake.svg @@ -1 +1,74 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/spear.svg b/charges/spear.svg new file mode 100644 index 00000000..036318d7 --- /dev/null +++ b/charges/spear.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/charges/squirrel.svg b/charges/squirrel.svg new file mode 100644 index 00000000..0db644c0 --- /dev/null +++ b/charges/squirrel.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/stagPassant.svg b/charges/stagPassant.svg new file mode 100644 index 00000000..51fd94d3 --- /dev/null +++ b/charges/stagPassant.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/stagsAttires.svg b/charges/stagsAttires.svg index 85792750..c8b3692b 100644 --- a/charges/stagsAttires.svg +++ b/charges/stagsAttires.svg @@ -1 +1,14 @@ - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/charges/stirrup.svg b/charges/stirrup.svg new file mode 100644 index 00000000..7d77eacb --- /dev/null +++ b/charges/stirrup.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/sun.svg b/charges/sun.svg index ec82b8d4..6d58a55c 100644 --- a/charges/sun.svg +++ b/charges/sun.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/sunInSplendour.svg b/charges/sunInSplendour.svg index b5c64b94..4de9c571 100644 --- a/charges/sunInSplendour.svg +++ b/charges/sunInSplendour.svg @@ -1 +1,15 @@ - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/charges/sunInSplendour2.svg b/charges/sunInSplendour2.svg new file mode 100644 index 00000000..5fee6fcf --- /dev/null +++ b/charges/sunInSplendour2.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/swallow.svg b/charges/swallow.svg new file mode 100644 index 00000000..da94f53a --- /dev/null +++ b/charges/swallow.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/swan.svg b/charges/swan.svg index 8c1df8c3..01893692 100644 --- a/charges/swan.svg +++ b/charges/swan.svg @@ -1 +1,27 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/swanErased.svg b/charges/swanErased.svg index 243565db..510c380a 100644 --- a/charges/swanErased.svg +++ b/charges/swanErased.svg @@ -1,8 +1,8 @@ - - + + diff --git a/charges/sword.svg b/charges/sword.svg index e9b29caa..cdf8853b 100644 --- a/charges/sword.svg +++ b/charges/sword.svg @@ -1 +1,14 @@ - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/charges/talbotPassant.svg b/charges/talbotPassant.svg new file mode 100644 index 00000000..de6649b9 --- /dev/null +++ b/charges/talbotPassant.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/talbotSejant.svg b/charges/talbotSejant.svg new file mode 100644 index 00000000..0cb80127 --- /dev/null +++ b/charges/talbotSejant.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/template.svg b/charges/template.svg index 5594bc12..cad51295 100644 --- a/charges/template.svg +++ b/charges/template.svg @@ -1 +1,22 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/tower.svg b/charges/tower.svg index 0370f8c9..9e3f64ac 100644 --- a/charges/tower.svg +++ b/charges/tower.svg @@ -7,11 +7,11 @@ - - - - + + + + - + - \ No newline at end of file + diff --git a/charges/trefle.svg b/charges/trefle.svg index fce4a3f1..8180526b 100644 --- a/charges/trefle.svg +++ b/charges/trefle.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/trefoil.svg b/charges/trefoil.svg new file mode 100644 index 00000000..83a4a036 --- /dev/null +++ b/charges/trefoil.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/charges/triangle.svg b/charges/triangle.svg index ff02c150..0a06d67c 100644 --- a/charges/triangle.svg +++ b/charges/triangle.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/trianglePierced.svg b/charges/trianglePierced.svg index 55d7783f..6bbe2fc2 100644 --- a/charges/trianglePierced.svg +++ b/charges/trianglePierced.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/charges/unicornRampant.svg b/charges/unicornRampant.svg index f8c86fb5..4eef4dba 100644 --- a/charges/unicornRampant.svg +++ b/charges/unicornRampant.svg @@ -1 +1,29 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wheatStalk.svg b/charges/wheatStalk.svg new file mode 100644 index 00000000..229783fb --- /dev/null +++ b/charges/wheatStalk.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wing.svg b/charges/wing.svg index 4f85c9c6..d38622f2 100644 --- a/charges/wing.svg +++ b/charges/wing.svg @@ -1 +1,34 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wingSword.svg b/charges/wingSword.svg index f37cbde9..75c2f80e 100644 --- a/charges/wingSword.svg +++ b/charges/wingSword.svg @@ -1 +1,23 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wolfHeadErased.svg b/charges/wolfHeadErased.svg index f3c8bb12..518ea83f 100644 --- a/charges/wolfHeadErased.svg +++ b/charges/wolfHeadErased.svg @@ -1 +1,20 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wolfPassant.svg b/charges/wolfPassant.svg index 4ec0eb77..06f8761a 100644 --- a/charges/wolfPassant.svg +++ b/charges/wolfPassant.svg @@ -1 +1,34 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wolfRampant.svg b/charges/wolfRampant.svg index 7375d688..f5c7f57c 100644 --- a/charges/wolfRampant.svg +++ b/charges/wolfRampant.svg @@ -1 +1,30 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wolfStatant.svg b/charges/wolfStatant.svg index 2ff7766b..297390ec 100644 --- a/charges/wolfStatant.svg +++ b/charges/wolfStatant.svg @@ -1,25 +1,25 @@ - - - - - - - - - + + + + + + + + + - - - - + + + + - + diff --git a/charges/wyvern.svg b/charges/wyvern.svg index 3c4a05a6..92c5de2b 100644 --- a/charges/wyvern.svg +++ b/charges/wyvern.svg @@ -1 +1,69 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wyvernWithWingsDisplayed.svg b/charges/wyvernWithWingsDisplayed.svg index a4cf5563..d3aef9b4 100644 --- a/charges/wyvernWithWingsDisplayed.svg +++ b/charges/wyvernWithWingsDisplayed.svg @@ -1 +1,46 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/index.html b/index.html index aa7a5d54..9e1cf078 100644 --- a/index.html +++ b/index.html @@ -7913,7 +7913,7 @@ - + @@ -7963,7 +7963,7 @@ - + diff --git a/modules/coa-generator.js b/modules/coa-generator.js index 9491cc0d..5ecfae60 100644 --- a/modules/coa-generator.js +++ b/modules/coa-generator.js @@ -60,8 +60,7 @@ window.COA = (function () { people: 1, architecture: 1, miscellaneous: 3, - inescutcheon: 3, - uploaded: 0 + inescutcheon: 3 }, single: { conventional: 12, @@ -79,8 +78,7 @@ window.COA = (function () { people: 2, architecture: 1, miscellaneous: 10, - inescutcheon: 5, - uploaded: 0 + inescutcheon: 5 }, semy: {conventional: 4, crosses: 1}, conventional: { @@ -117,6 +115,8 @@ window.COA = (function () { fleurDeLis: 6, sun: 3, sunInSplendour: 1, + sunInSplendour2: 1, + moonInCrescent: 1, crescent: 5, fountain: 1 }, @@ -211,29 +211,63 @@ window.COA = (function () { 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, - snake: 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 }, - animalHeads: {wolfHeadErased: 2, bullHeadCaboshed: 1, deerHeadCaboshed: 1, lionHeadCaboshed: 2}, fantastic: { dragonPassant: 2, dragonRampant: 2, @@ -241,17 +275,51 @@ window.COA = (function () { wyvernWithWingsDisplayed: 1, griffinPassant: 1, griffinRampant: 1, - eagleTwoHeards: 2, + eagleTwoHeads: 2, unicornRampant: 1, pegasus: 1, serpent: 1, - basilisk: 1 + basilisk: 1, + sagittarius: 1 }, - birds: {eagle: 9, raven: 2, cock: 3, parrot: 1, swan: 2, swanErased: 1, heron: 1, owl: 1}, - plants: {tree: 1, oak: 1, cinquefoil: 1, rose: 1, apple: 1}, - aquatic: {escallop: 5, pike: 1, cancer: 1, dolphin: 1}, - seafaring: {anchor: 6, boat: 2, boat2: 1, lymphad: 2, armillarySphere: 1}, - agriculture: {garb: 2, rake: 1, plough: 2}, + 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, @@ -261,20 +329,26 @@ window.COA = (function () { 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}, + bodyparts: {hand: 4, head: 1, headWreathed: 1, foot: 1, skull: 1}, people: {cavalier: 3, monk: 1, angel: 2}, - architecture: {tower: 1, castle: 1}, + architecture: {tower: 1, castle: 1, bridge: 1, column: 1}, miscellaneous: { crown: 2, crown2: 1, + laurelWreath: 1, + mitre: 1, orb: 1, chalice: 1, key: 1, @@ -285,6 +359,7 @@ window.COA = (function () { pot: 1, bucket: 1, horseshoe: 3, + stirrup: 1, attire: 1, stagsAttires: 1, ramsHorn: 1, @@ -293,63 +368,220 @@ window.COA = (function () { wingSword: 1, lute: 1, harp: 1, + drum: 1, wheel: 2, crosier: 1, + sceptre: 1, fasces: 1, log: 1, chain: 1, - anvil: 1 + anvil: 1, + ladder: 1, + banner: 1, + bookClosed: 1, + bookOpen: 1, + scissors: 1 }, - // selection based on culture type: - Naval: {anchor: 3, boat: 1, lymphad: 2, armillarySphere: 1, escallop: 1, dolphin: 1}, - Highland: {tower: 1, raven: 1, wolfHeadErased: 1, wolfPassant: 1, goat: 1, axe: 1}, - River: {tower: 1, garb: 1, rake: 1, boat: 1, pike: 2, bullHeadCaboshed: 1, apple: 1, plough: 1}, - Lake: {cancer: 2, escallop: 1, pike: 2, heron: 1, boat: 1, boat2: 2}, - Nomadic: {pot: 1, buckle: 1, wheel: 2, sabre: 2, sabresCrossed: 1, bow: 2, arrow: 1, horseRampant: 1, horseSalient: 1, crescent: 1, camel: 3}, - Hunting: { + 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: 1, - stagsAttires: 2, - attire: 2, - hatchet: 1, - bowWithArrow: 1, - arrowsSheaf: 1, - deerHeadCaboshed: 1, - wolfStatant: 1, - oak: 1, - greyhoundSejant: 1 + 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 }, - // selection based on type - City: {key: 3, bell: 2, lute: 1, tower: 1, castle: 1, mallet: 1, cannon: 1, anvil: 1}, - Capital: {crown: 2, orb: 1, lute: 1, castle: 3, tower: 1, crown2: 2}, - Сathedra: {chalice: 1, orb: 1, crosier: 2, lamb: 1, monk: 2, angel: 3, crossLatin: 2, crossPatriarchal: 1, crossOrthodox: 1, crossCalvary: 1, agnusDei: 3}, - // specific cases - natural: {fountain: "azure", garb: "or", raven: "sable"}, // charges to mainly use predefined colours 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", @@ -357,6 +589,8 @@ window.COA = (function () { "swanErased", "heron", "pike", + "plaice", + "salmon", "dragonPassant", "dragonRampant", "wyvern", @@ -366,6 +600,7 @@ window.COA = (function () { "unicornRampant", "pegasus", "serpent", + "sagittarius", "hatchet", "lochaberAxe", "hand", @@ -378,6 +613,7 @@ window.COA = (function () { "headWreathed", "knight", "lymphad", + "caravel", "log", "crosier", "dolphin", @@ -389,13 +625,23 @@ window.COA = (function () { "fasces", "lionPassantGuardant", "helmet", + "gauntlet", + "shield", "foot", + "sickle", + "scythe", "plough", "sabre2", "cannon", "porcupine", + "hedgehog", + "catPassantGuardant", + "rabbitSejant", + "ratRampant", + "squirrel", "basilisk", "snake", + "crocodile", "anvil" ], reversed: [ @@ -404,24 +650,222 @@ window.COA = (function () { "mullet", "mullet7", "crescent", - "crossTau", "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" ] }; + // 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, cavavel: 1}, + Highland: {tower: 1, raven: 1, wolfHeadErased: 1, wolfPassant: 1, goat: 1, axe: 1}, + River: { + tower: 1, + garb: 1, + rake: 1, + boat: 1, + pike: 2, + bullHeadCaboshed: 1, + apple: 1, + pear: 1, + plough: 1, + salmon: 1, + cancer: 1, + bridge: 2, + sickle: 1, + scythe: 1, + grapeBunch: 1, + wheatStalk: 1, + crocodile: 1 + }, + Lake: { + cancer: 2, + escallop: 1, + pike: 2, + heron: 1, + boat: 1, + boat2: 2, + salmon: 1, + cancer: 1, + sickle: 1, + swanErased: 1, + swan: 1, + frog: 1 + }, + Nomadic: { + pot: 1, + buckle: 1, + wheel: 2, + sabre: 2, + sabresCrossed: 1, + bow: 2, + arrow: 1, + horseRampant: 1, + horseSalient: 1, + crescent: 1, + camel: 3, + falcon: 1 + }, + Hunting: { + bugleHorn: 2, + bugleHorn2: 1, + stagsAttires: 2, + attire: 2, + hatchet: 1, + bowWithArrow: 1, + arrowsSheaf: 1, + deerHeadCaboshed: 1, + wolfStatant: 1, + oak: 1, + pineCone: 1, + pineTree: 1, + oak: 1, + owl: 1, + falcon: 1, + peacock: 1, + boarHeadErased: 2, + horseHeadCouped: 1, + rabbitSejant: 1, + wolfRampant: 1, + wolfPassant: 1, + wolfStatant: 1, + greyhoundCourant: 1, + greyhoundRampant: 1, + greyhoundSejant: 1, + mastiffStatant: 1, + talbotPassant: 1, + talbotSejant: 1, + stagPassant: 1 + }, + // selection based on type + City: { + key: 4, + bell: 3, + lute: 1, + tower: 1, + castle: 1, + mallet: 1, + cannon: 1, + anvil: 1, + buckle: 1, + horseshoe: 1, + stirrup: 1, + banner: 1, + bookClosed: 1, + scissors: 1, + bridge: 2, + cannon: 1, + shield: 1, + arbalest: 1, + bowWithArrow: 1, + spear: 1, + lochaberAxe: 1, + grapeBunch: 1, + cock: 1, + ramHeadErased: 1, + ratRampant: 1 + }, + Capital: { + crown: 2, + crown2: 1, + laurelWreath: 1, + orb: 1, + lute: 1, + castle: 3, + tower: 1, + crown2: 2, + column: 1, + lionRampant: 1, + stagPassant: 1 + }, + Сathedra: { + crossHummetty: 3, + mitre: 3, + chalice: 1, + orb: 1, + crosier: 2, + lamb: 1, + monk: 2, + angel: 3, + crossLatin: 2, + crossPatriarchal: 1, + crossOrthodox: 1, + crossCalvary: 1, + agnusDei: 3, + bookOpen: 1, + sceptre: 1 + } + }; + const positions = { conventional: { e: 20, @@ -508,7 +952,22 @@ window.COA = (function () { }, // 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}, + 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}, @@ -681,18 +1140,45 @@ window.COA = (function () { const coa = {t1}; let charge = P(usedPattern ? 0.5 : 0.93) ? true : false; // 80% for charge - const linedOrdinary = (charge && P(0.3)) || P(0.5) ? (parent?.ordinaries && P(kinship) ? parent.ordinaries[0].ordinary : rw(ordinaries.lined)) : null; + const linedOrdinary = + (charge && 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 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 division = divisioned ? (parent?.division && P(kinship - 0.1) ? parent.division.division : rw(divisions.variants)) : null; + + 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 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(charges[type]) : selectCharge(); + charge = + parent?.charges && P(kinship - 0.1) + ? parent.charges[0].charge + : type && type !== "Generic" && P(0.2) + ? rw(typeMapping[type]) + : selectCharge(); if (division) { const t = getTincture("division", usedTinctures, P(0.98) ? coa.t1 : null); coa.division = {division, t}; - if (divisions[division]) coa.division.line = usedPattern || (ordinary && P(0.7)) ? "straight" : rw(divisions[division]); + if (divisions[division]) + coa.division.line = usedPattern || (ordinary && P(0.7)) ? "straight" : rw(divisions[division]); } if (ordinary) { @@ -708,8 +1194,9 @@ window.COA = (function () { } if (charge) { - let p = "e", - t = "gules"; + let p = "e"; + let t = "gules"; + const ordinaryT = coa.ordinaries ? coa.ordinaries[0].t : null; if (positions.ordinariesOn[ordinary] && P(0.8)) { // place charge over ordinary (use tincture of field type) @@ -739,7 +1226,12 @@ window.COA = (function () { } if (charges.natural[charge]) t = charges.natural[charge]; // natural tincture - coa.charges = [{charge, t, p}]; + const item = {charge, t, p}; + + 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; + coa.charges = [item]; if (p === "ABCDEFGHIKL" && P(0.95)) { // add central charge if charge is in bordure @@ -768,7 +1260,14 @@ window.COA = (function () { // counterchanged, 40% else if (["perPale", "perFess", "perBend", "perBendSinister"].includes(division) && P(0.8)) { // place 2 charges in division standard positions - const [p1, p2] = division === "perPale" ? ["p", "q"] : division === "perFess" ? ["k", "n"] : division === "perBend" ? ["l", "m"] : ["j", "o"]; // perBendSinister + const [p1, p2] = + division === "perPale" + ? ["p", "q"] + : division === "perFess" + ? ["k", "n"] + : division === "perBend" + ? ["l", "m"] + : ["j", "o"]; // perBendSinister coa.charges[0].p = p1; const charge = selectCharge(charges.single); diff --git a/modules/coa-renderer.js b/modules/coa-renderer.js index 269e3317..732aa92e 100644 --- a/modules/coa-renderer.js +++ b/modules/coa-renderer.js @@ -1814,11 +1814,16 @@ window.COArenderer = (function () { const loadedPatterns = getPatterns(coa, id); const blacklight = ``; const field = ``; + const style = ``; + const divisionGroup = division ? templateDivision() : ""; const overlay = ``; const svg = ` - ${shieldClip}${divisionClip}${loadedCharges}${loadedPatterns}${blacklight} + ${shieldClip}${divisionClip}${loadedCharges}${loadedPatterns}${blacklight}${style} ${field}${divisionGroup}${templateAboveAll()} ${overlay}`; @@ -1903,17 +1908,20 @@ window.COArenderer = (function () { return svg + ``; } - function templateCharge(charge, tincture) { - const fill = clr(tincture); + function templateCharge(charge, tincture, secondaryTincture, tertiaryTincture) { + const primary = clr(tincture); + const secondary = clr(secondaryTincture || tincture); + const tertiary = clr(tertiaryTincture || tincture); + const stroke = charge.stroke || "#000"; + const chargePositions = [...new Set(charge.p)].filter(position => positions[position]); - let svg = ""; - svg += ``; + let svg = ``; for (const p of chargePositions) { const transform = getElTransform(charge, p); svg += ``; } - return svg + ``; + return svg + ""; function getElTransform(c, p) { const s = (c.size || 1) * sizeModifier; diff --git a/versioning.js b/versioning.js index e60b7636..7b4b88e1 100644 --- a/versioning.js +++ b/versioning.js @@ -29,6 +29,8 @@ const version = "1.89.39"; // generator version, update each time
      Latest changes: +
    • More than 70 new heraldic charges
      • +
    • Multi-color heraldic charges support
    • New 3D scene options
    • Autosave feature (in Options)
    • Google translation support (in Options)
      • From b3e2aa00e705b91ce70cd8d2dd540fab0429cb16 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Sun, 6 Aug 2023 22:59:33 +0400 Subject: [PATCH 12/41] Independent North and South Poles temperature (#972) * Poles to have Different Temperature (Ref: Axial Tilt suggestion) (#964) * Initial Idea * Changed Names: Currently still only on NorthTemperature reliant, compadible version * Restored Generation of Temperature * Temperature Function found * Version Bump * Scuffed Saving solution * Current Version(without the save changes) * Globe Temperature Display * Individual Regeneration of Temperatures * Fixed Loading and Saving New Maps save a Dummy 0 at settings[17] * Final Version Bump (currently no description for the Update) --------- Co-authored-by: Azgaar * chore: formatting * refactor: temperature inputs * feat: rework temperature generation alg * style: respore winds button * refactor: update options on load, don't update temperature UI * refactor: no need to keep compatibility here * fix: load temp setting from .map file --------- Co-authored-by: Leo --- index.html | 181 ++++++++++++++++++------------- main.js | 63 +++++++---- modules/dynamic/export-json.js | 2 - modules/io/load.js | 15 +-- modules/io/save.js | 4 +- modules/ui/options.js | 25 ++--- modules/ui/world-configurator.js | 94 +++++++++++----- utils/unitUtils.js | 3 +- versioning.js | 8 +- 9 files changed, 240 insertions(+), 155 deletions(-) diff --git a/index.html b/index.html index 9e1cf078..e719c1bf 100644 --- a/index.html +++ b/index.html @@ -2346,29 +2346,58 @@
      @@ -5884,37 +5896,42 @@ @@ -5919,7 +5919,7 @@

      - Maps are saved in .gz format, that can be loaded back via the Load in menu. There is no way to + Maps are saved in .map format, that can be loaded back via the Load in menu. There is no way to restore the progress if file is lost. Please keep old save files on your machine or cloud storage as backups.

@@ -5927,12 +5927,12 @@