diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index b027f814..f01a2390 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ # These are supported funding model platforms - +github: Azgaar patreon: Azgaar diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..d4407a32 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,33 @@ +--- +name: Bug report +about: Report a problem +title: '' +labels: pending review +assignees: Azgaar + +--- + + +**Describe the bug** + + +**Steps to reproduce** + +1. Click on ... +2. Type ... +3. See the ... + +**Expected behavior** + + +**.map file** + + +**Screenshots** + + +**System** + + - Version: ... + - Browser: ... + - OS: ... diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..29ab55e2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,19 @@ +--- +name: Feature request +about: Suggest an idea +title: '' +labels: pending review +assignees: Azgaar + +--- + +<-- BEFORE CREATING PLEASE CHECK THE TO-DO LIST--> +<-- https://trello.com/b/7x832DG4/fantasy-map-generator ->> +**Problem** +<-- Is your feature request related to a problem? Please describe. Ex.: I'm always frustrated when ... --> + +**Solution** +<-- A clear and concise description of what you want to happen and ideas on how it can be implemented. Screenshots are welcomed --> + +**Alternatives** +<-- A clear and concise description of any alternative solutions or features you've considered --> diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 00000000..698d23ae --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1,89 @@ +# Fantasy Map Generator + +Azgaar's Fantasy Map Generator is a client-side JavaScript web application for creating fantasy maps. It generates detailed fantasy worlds with countries, cities, rivers, biomes, and cultural elements. + +Always reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here. + +## Working Effectively + +- **CRITICAL**: This is a static web application - NO build process needed. No npm install, no compilation, no bundling. +- Run the application using HTTP server (required - cannot run with file:// protocol): + - `python3 -m http.server 8000` - takes 2-3 seconds to start +- Access at: `http://localhost:8000` + +## Validation + +- Always manually validate any changes by: + 1. Starting the HTTP server (NEVER CANCEL - wait for full startup) + 2. Navigate to the application in browser + 3. Click the "►" button to open the menu and generate a new map + 4. **CRITICAL VALIDATION**: Verify the map generates with countries, cities, roads, and geographic features + 5. Test UI interaction: click "Layers" button, verify layer controls work + 6. Test regeneration: click "New Map!" button, verify new map generates correctly +- **Known Issues**: Google Analytics and font loading errors are normal (blocked external resources) + +## Repository Structure + +### Core Files + +- `index.html` - Main application entry point +- `main.js` - Core application logic +- `versioning.js` - Version management and update handling + +### Key Directories + +- `modules/` - core functionality modules: + - `modules/ui/` - UI components (editors, tools, style management) + - `modules/dynamic/` - runtime modules (export, installation) + - `modules/renderers/` - drawing and rendering logic +- `utils/` - utility libraries (math, arrays, strings, etc.) +- `styles/` - visual style presets (JSON files) +- `libs/` - Third-party libraries (D3.js, TinyMCE, etc.) +- `images/` - backgrounds, UI elements +- `charges/` - heraldic symbols and coat of arms elements +- `config/` - Heightmap templates and configurations +- `heightmaps/` - Terrain generation data + +## Common Tasks + +### Making Code Changes + +1. Edit JavaScript files directly (no compilation needed) +2. Refresh browser to see changes immediately +3. **ALWAYS test map generation** after making changes +4. Update version in `versioning.js` for all changes +5. Update file hashes in `index.html` for changed files (format: `file.js?v=1.108.1`) + +### Debugging Map Generation + +- Open browser developer tools console +- Look for timing logs, e.g. "TOTAL: ~0.76s" +- Map generation logs show each step (heightmap, rivers, states, etc.) +- Error messages will indicate specific generation failures + +### Testing Different Map Types + +- Use "New Map!" button for quick regeneration +- Access "Layers" menu to change map visualization +- Available presets: Political, Cultural, Religions, Biomes, Heightmap, Physical, Military + +## Troubleshooting + +### Application Won't Load + +- Ensure using HTTP server (not file://) +- Check console for JavaScript errors +- Verify all files are present in repository + +### Map Generation Fails + +- Check browser console for error messages +- Look for specific module failures in generation logs +- Try refreshing page and generating new map + +### Performance Issues + +- Map generation should complete in ~1 second for standard configurations +- If slower, check browser console for errors + +Remember: This is a sophisticated client-side application that generates complete fantasy worlds with political systems, geography, cultures, and detailed cartographic elements. Always validate that your changes preserve the core map generation functionality. diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..acedeb18 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,23 @@ +# Description + + + +# Type of change + + + +- [ ] Bug fix +- [ ] New feature +- [ ] Refactoring / style +- [ ] Documentation update / chore +- [ ] Other (please describe) + +# Versioning + + + +- [ ] Version is updated +- [ ] Changed files hash is updated diff --git a/.gitignore b/.gitignore index 8cd42a0d..b0a273f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -.bat .vscode .idea -.idea/Fantasy-Map-Generator.iml +/node_modules +/dist +/coverage diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..23cfdd81 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,108 @@ +# Contributor Code of Conduct + +We as members, contributors, and leaders agree to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* Vocal support of agressive behaviour, agressive communities or countries +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +azgaar.fmg@yandex.com. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 2. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 3. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is based on [Contributor Covenant](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html), +version 2.0. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder](https://github.com/mozilla/diversity). diff --git a/LICENSE b/LICENSE index 45f950ac..4b0e677e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright 2017-2021 Max Haniyeu (Azgaar), azgaar.fmg@yandex.com +Copyright 2017-2024 Max Haniyeu (Azgaar), azgaar.fmg@yandex.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -14,6 +14,7 @@ copies or substantial portions of the Software. You can produce, without restrictions, any derivative works from the original software and even reap commercial benefits from the sale of the secondary product. +The derivates include created maps, map images, screenshots, videos, and other materials. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, @@ -21,4 +22,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/README.md b/README.md index 8bf86ca6..3ab245b2 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,22 @@ # Fantasy Map Generator -Azgaar's _Fantasy Map Generator_ is a free web application generating interactive and highly customizable svg maps based on voronoi diagram. +Azgaar's _Fantasy Map Generator_ is a free web application that helps fantasy writers, game masters, and cartographers create and edit fantasy maps. -Project is under development, the current version is available on [Github Pages](https://azgaar.github.io/Fantasy-Map-Generator). +Link: [azgaar.github.io/Fantasy-Map-Generator](https://azgaar.github.io/Fantasy-Map-Generator). Refer to the [project wiki](https://github.com/Azgaar/Fantasy-Map-Generator/wiki) for guidance. The current progress is tracked in [Trello](https://trello.com/b/7x832DG4/fantasy-map-generator). Some details are covered in my old blog [_Fantasy Maps for fun and glory_](https://azgaar.wordpress.com). -[![preview](https://cdn.discordapp.com/attachments/587406457725779968/594840629213659136/preview1.png)](https://i.redd.it/8bf81ir2cy631.png) +[![preview](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/9502eae9-92e0-4d0d-9f17-a2ba4a565c01)](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/11a42446-4bd5-4526-9cb1-3ef97c868992) -[![preview](https://cdn.discordapp.com/attachments/587406457725779968/594840633911279636/preview2.png)](https://cdn.discordapp.com/attachments/515359185664344071/593888810782162964/The_Wichin_Island_sepia.png) +[![preview](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/e751a9e5-7986-4638-b8a9-362395ef7583)](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/e751a9e5-7986-4638-b8a9-362395ef7583) -[![preview](https://cdn.discordapp.com/attachments/587406457725779968/594840632296734720/preview3.png)](https://cdn.discordapp.com/attachments/515359096925454350/593891237984206848/The_Wichin_Island_-_diplomacy.png) +[![preview](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/b0d0efde-a0d1-4e80-8818-ea3dd83c2323)](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/b0d0efde-a0d1-4e80-8818-ea3dd83c2323) Join our [Discord server](https://discordapp.com/invite/X7E84HU) and [Reddit community](https://www.reddit.com/r/FantasyMapGenerator) to share your creations, discuss the Generator, suggest ideas and get the most recent updates. -Contact me via [email](mailto:azgaar.fmg@yandex.by) if you have non-public suggestions. For bug reports please use [GitHub issues](https://github.com/Azgaar/Fantasy-Map-Generator/issues) or _#bugs_ channel on Discord. If you are facing performance issues, please read [the tips](https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Tips#performance-tips). +Contact me via [email](mailto:azgaar.fmg@yandex.com) if you have non-public suggestions. For bug reports please use [GitHub issues](https://github.com/Azgaar/Fantasy-Map-Generator/issues) or _#fmg-bugs_ channel on Discord. If you are facing performance issues, please read [the tips](https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Tips#performance-tips). -Electron desktop application is available in [releases](https://github.com/Azgaar/Fantasy-Map-Generator/releases). Download archive for your architecture, unzip and run. - -Pull requests are highly welcomed. The codebase is messy and requires re-design, but I will appreciate if you start with minor changes. Check out the [data model](https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Data-model) before contributing. +Pull requests are highly welcomed. The codebase is messy and requires re-design. I will appreciate if you start with minor changes. Check out the [data model](https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Data-model) before contributing. You can support the project on [Patreon](https://www.patreon.com/azgaar). diff --git a/Readme.txt b/Readme.txt deleted file mode 100644 index 9d270a7c..00000000 --- a/Readme.txt +++ /dev/null @@ -1,9 +0,0 @@ -Azgaar's Fantasy Map Generator - -Developed by Azgaar (azgaar.fmg@yandex.com) and contributors - -Minsk, 2017-2021. MIT License - -https://github.com/Azgaar/Fantasy-Map-Generator - -To run the tool unzip ALL files and open index.html in browser \ No newline at end of file diff --git a/charges/agnusDei.svg b/charges/agnusDei.svg index 52f55f24..60ea9d87 100644 --- a/charges/agnusDei.svg +++ b/charges/agnusDei.svg @@ -1,135 +1,132 @@ - - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ 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..38adac50 --- /dev/null +++ b/charges/arbalest.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/arbalest2.svg b/charges/arbalest2.svg new file mode 100644 index 00000000..be9b1a6a --- /dev/null +++ b/charges/arbalest2.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/archer.svg b/charges/archer.svg new file mode 100644 index 00000000..00891c1b --- /dev/null +++ b/charges/archer.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armEmbowedHoldingSabre.svg b/charges/armEmbowedHoldingSabre.svg new file mode 100644 index 00000000..2fbae9f6 --- /dev/null +++ b/charges/armEmbowedHoldingSabre.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armEmbowedVambraced.svg b/charges/armEmbowedVambraced.svg new file mode 100644 index 00000000..ac1422b5 --- /dev/null +++ b/charges/armEmbowedVambraced.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armEmbowedVambracedHoldingSword.svg b/charges/armEmbowedVambracedHoldingSword.svg new file mode 100644 index 00000000..d00d8bab --- /dev/null +++ b/charges/armEmbowedVambracedHoldingSword.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armillarySphere.svg b/charges/armillarySphere.svg index c71938a8..45d09b8d 100644 --- a/charges/armillarySphere.svg +++ b/charges/armillarySphere.svg @@ -1,18 +1 @@ - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/arrow.svg b/charges/arrow.svg index 2b650a9e..2135169f 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..4b879e10 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..29cd5f39 --- /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..8ca47b97 --- /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..7f3a0069 --- /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..08348586 --- /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/bone.svg b/charges/bone.svg new file mode 100644 index 00000000..27a9e410 --- /dev/null +++ b/charges/bone.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/bookClosed.svg b/charges/bookClosed.svg new file mode 100644 index 00000000..0cd74341 --- /dev/null +++ b/charges/bookClosed.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bookClosed2.svg b/charges/bookClosed2.svg new file mode 100644 index 00000000..bf8d2519 --- /dev/null +++ b/charges/bookClosed2.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bookOpen.svg b/charges/bookOpen.svg new file mode 100644 index 00000000..62f1c6fc --- /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..12d7f9ff 100644 --- a/charges/bowWithArrow.svg +++ b/charges/bowWithArrow.svg @@ -1 +1,15 @@ - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/charges/bowWithThreeArrows.svg b/charges/bowWithThreeArrows.svg new file mode 100644 index 00000000..0efc30f2 --- /dev/null +++ b/charges/bowWithThreeArrows.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bridge.svg b/charges/bridge.svg new file mode 100644 index 00000000..f5ce588e --- /dev/null +++ b/charges/bridge.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bridge2.svg b/charges/bridge2.svg new file mode 100644 index 00000000..6d3dfab5 --- /dev/null +++ b/charges/bridge2.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bucket.svg b/charges/bucket.svg index 6357b0c7..56c7e83c 100644 --- a/charges/bucket.svg +++ b/charges/bucket.svg @@ -1 +1 @@ - \ No newline at end of file + \ 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..0314b64e 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..2c301fcf --- /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..05e88b25 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..9eb57671 --- /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/castle2.svg b/charges/castle2.svg new file mode 100644 index 00000000..5f12a8aa --- /dev/null +++ b/charges/castle2.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/catPassantGuardant.svg b/charges/catPassantGuardant.svg new file mode 100644 index 00000000..b49dc820 --- /dev/null +++ b/charges/catPassantGuardant.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/cavalier.svg b/charges/cavalier.svg index 89d441d0..7bfad7ac 100644 --- a/charges/cavalier.svg +++ b/charges/cavalier.svg @@ -1 +1,75 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/centaur.svg b/charges/centaur.svg new file mode 100644 index 00000000..f4ddeb22 --- /dev/null +++ b/charges/centaur.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/chain.svg b/charges/chain.svg index 4fea5d56..cfe4a3bb 100644 --- a/charges/chain.svg +++ b/charges/chain.svg @@ -1,10 +1,10 @@ - - - - - - - + + + + + + + - \ No newline at end of file + diff --git a/charges/chalice.svg b/charges/chalice.svg index f4d96917..0f4f95f6 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..49db293e 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..38d8b2a0 --- /dev/null +++ b/charges/column.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/comet.svg b/charges/comet.svg new file mode 100644 index 00000000..096ddb67 --- /dev/null +++ b/charges/comet.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/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/cossack.svg b/charges/cossack.svg new file mode 100644 index 00000000..f5cf75ed --- /dev/null +++ b/charges/cossack.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/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..66b46823 --- /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..442e456d --- /dev/null +++ b/charges/crocodile.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/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/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/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/crossedBones.svg b/charges/crossedBones.svg new file mode 100644 index 00000000..3b06442f --- /dev/null +++ b/charges/crossedBones.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/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..f06a106e 100644 --- a/charges/crown2.svg +++ b/charges/crown2.svg @@ -1 +1,70 @@ - \ 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..be5b00bd 100644 --- a/charges/dolphin.svg +++ b/charges/dolphin.svg @@ -1,14 +1,14 @@ - - - - - - + + + + + + - + @@ -21,40 +21,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/donkeyHeadCaboshed.svg b/charges/donkeyHeadCaboshed.svg new file mode 100644 index 00000000..da5aee0a --- /dev/null +++ b/charges/donkeyHeadCaboshed.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/dove.svg b/charges/dove.svg new file mode 100644 index 00000000..7406a6ec --- /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..35bd14d6 --- /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..6ff64c2a 100644 --- a/charges/dragonRampant.svg +++ b/charges/dragonRampant.svg @@ -1,54 +1,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/dragonfly.svg b/charges/dragonfly.svg new file mode 100644 index 00000000..c8b501ca --- /dev/null +++ b/charges/dragonfly.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/charges/drakkar.svg b/charges/drakkar.svg new file mode 100644 index 00000000..f36c3c4d --- /dev/null +++ b/charges/drakkar.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/drawingCompass.svg b/charges/drawingCompass.svg new file mode 100644 index 00000000..65a252d3 --- /dev/null +++ b/charges/drawingCompass.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/charges/drum.svg b/charges/drum.svg new file mode 100644 index 00000000..bd8fd638 --- /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..940c3e4d --- /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..cc8ac124 --- /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/earOfWheat.svg b/charges/earOfWheat.svg new file mode 100644 index 00000000..a1b3072c --- /dev/null +++ b/charges/earOfWheat.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/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..f521413b --- /dev/null +++ b/charges/elephantHeadErased.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/escallop.svg b/charges/escallop.svg index 2b2da7ab..4fda9dda 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..ccb71d3d 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..5e4cebd5 --- /dev/null +++ b/charges/falcon.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/fan.svg b/charges/fan.svg new file mode 100644 index 00000000..d7504ac6 --- /dev/null +++ b/charges/fan.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/charges/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/feather.svg b/charges/feather.svg new file mode 100644 index 00000000..0be55bf5 --- /dev/null +++ b/charges/feather.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/flamberge.svg b/charges/flamberge.svg new file mode 100644 index 00000000..ab9d2277 --- /dev/null +++ b/charges/flamberge.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/charges/flangedMace.svg b/charges/flangedMace.svg new file mode 100644 index 00000000..901d942f --- /dev/null +++ b/charges/flangedMace.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/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..9c880f72 --- /dev/null +++ b/charges/fly.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/foot.svg b/charges/foot.svg index c9988d9b..22963e5b 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..392d3d05 --- /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..fbefacd8 100644 --- a/charges/garb.svg +++ b/charges/garb.svg @@ -1,150 +1,150 @@ - - + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + diff --git a/charges/gauntlet.svg b/charges/gauntlet.svg new file mode 100644 index 00000000..f00a03eb --- /dev/null +++ b/charges/gauntlet.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/gear.svg b/charges/gear.svg new file mode 100644 index 00000000..2d128dfb --- /dev/null +++ b/charges/gear.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/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..38d4693f --- /dev/null +++ b/charges/grapeBunch.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/grapeBunch2.svg b/charges/grapeBunch2.svg new file mode 100644 index 00000000..0af7b6a6 --- /dev/null +++ b/charges/grapeBunch2.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/grenade.svg b/charges/grenade.svg new file mode 100644 index 00000000..07436784 --- /dev/null +++ b/charges/grenade.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/greyhoundCourant.svg b/charges/greyhoundCourant.svg index 7d4cc410..916d70cf 100644 --- a/charges/greyhoundCourant.svg +++ b/charges/greyhoundCourant.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/charges/greyhoundRampant.svg b/charges/greyhoundRampant.svg new file mode 100644 index 00000000..cf607df5 --- /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..871b3591 100644 --- a/charges/griffinPassant.svg +++ b/charges/griffinPassant.svg @@ -1 +1,61 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/griffinRampant.svg b/charges/griffinRampant.svg index bf9eb24a..da2cfebe 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..91c279ae 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..91e5ee08 100644 --- a/charges/harp.svg +++ b/charges/harp.svg @@ -1 +1 @@ - \ No newline at end of file + \ 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..08e36060 100644 --- a/charges/head.svg +++ b/charges/head.svg @@ -1,16 +1 @@ - - - - - - - - - - - - - - - - + \ No newline at end of file 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..c7a84caa --- /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/helmetCorinthian.svg b/charges/helmetCorinthian.svg new file mode 100644 index 00000000..3ccd9cdd --- /dev/null +++ b/charges/helmetCorinthian.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/helmetGreat.svg b/charges/helmetGreat.svg new file mode 100644 index 00000000..b7a7bf49 --- /dev/null +++ b/charges/helmetGreat.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/helmetZischagge.svg b/charges/helmetZischagge.svg new file mode 100644 index 00000000..8985d197 --- /dev/null +++ b/charges/helmetZischagge.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/heron.svg b/charges/heron.svg index 017d962e..4893b082 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..3f9cc429 --- /dev/null +++ b/charges/hindStatant.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/hook.svg b/charges/hook.svg new file mode 100644 index 00000000..d5679f64 --- /dev/null +++ b/charges/hook.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/horseHeadCouped.svg b/charges/horseHeadCouped.svg new file mode 100644 index 00000000..8c455c23 --- /dev/null +++ b/charges/horseHeadCouped.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/horsePassant.svg b/charges/horsePassant.svg index f235ce7e..b2361b84 100644 --- a/charges/horsePassant.svg +++ b/charges/horsePassant.svg @@ -1,119 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/horseRampant.svg b/charges/horseRampant.svg index 54845fe6..be7fee6c 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..21b5db48 100644 --- a/charges/horseSalient.svg +++ b/charges/horseSalient.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/charges/hourglass.svg b/charges/hourglass.svg new file mode 100644 index 00000000..87e7930b --- /dev/null +++ b/charges/hourglass.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/key.svg b/charges/key.svg index fb677cd6..6fb883ea 100644 --- a/charges/key.svg +++ b/charges/key.svg @@ -1,16 +1,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/charges/ladder.svg b/charges/ladder.svg new file mode 100644 index 00000000..fc72f130 --- /dev/null +++ b/charges/ladder.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/ladder2.svg b/charges/ladder2.svg new file mode 100644 index 00000000..5596e045 --- /dev/null +++ b/charges/ladder2.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/ladybird.svg b/charges/ladybird.svg new file mode 100644 index 00000000..3cc1587e --- /dev/null +++ b/charges/ladybird.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lamb.svg b/charges/lamb.svg index e3459362..1d574b53 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..90884eb7 100644 --- a/charges/lambPassantReguardant.svg +++ b/charges/lambPassantReguardant.svg @@ -1,119 +1,118 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/charges/lanceHead.svg b/charges/lanceHead.svg new file mode 100644 index 00000000..255492db --- /dev/null +++ b/charges/lanceHead.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/lanceWithBanner.svg b/charges/lanceWithBanner.svg new file mode 100644 index 00000000..556e5ade --- /dev/null +++ b/charges/lanceWithBanner.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/laurelWreath.svg b/charges/laurelWreath.svg new file mode 100644 index 00000000..989e00c4 --- /dev/null +++ b/charges/laurelWreath.svg @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/laurelWreath2.svg b/charges/laurelWreath2.svg new file mode 100644 index 00000000..6dfb373e --- /dev/null +++ b/charges/laurelWreath2.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lighthouse.svg b/charges/lighthouse.svg new file mode 100644 index 00000000..b66938f5 --- /dev/null +++ b/charges/lighthouse.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/charges/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..7ed39c67 --- /dev/null +++ b/charges/lionHeadErased.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lionPassant.svg b/charges/lionPassant.svg index 721b3bfe..7dd6b396 100644 --- a/charges/lionPassant.svg +++ b/charges/lionPassant.svg @@ -1 +1,185 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lionPassantGuardant.svg b/charges/lionPassantGuardant.svg index 1652a5ac..584e8835 100644 --- a/charges/lionPassantGuardant.svg +++ b/charges/lionPassantGuardant.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/charges/lionRampant.svg b/charges/lionRampant.svg index 1160bf62..8aab2b09 100644 --- a/charges/lionRampant.svg +++ b/charges/lionRampant.svg @@ -1,21 +1 @@ - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/lionSejant.svg b/charges/lionSejant.svg new file mode 100644 index 00000000..23ca98db --- /dev/null +++ b/charges/lionSejant.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lizard.svg b/charges/lizard.svg new file mode 100644 index 00000000..dc8dbf9d --- /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..c88cc397 100644 --- a/charges/lute.svg +++ b/charges/lute.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/charges/lymphad.svg b/charges/lymphad.svg index ca0aab51..457f10d7 100644 --- a/charges/lymphad.svg +++ b/charges/lymphad.svg @@ -1,75 +1,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + diff --git a/charges/lyre.svg b/charges/lyre.svg new file mode 100644 index 00000000..d89b8550 --- /dev/null +++ b/charges/lyre.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mace.svg b/charges/mace.svg new file mode 100644 index 00000000..a3f0e074 --- /dev/null +++ b/charges/mace.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/maces.svg b/charges/maces.svg new file mode 100644 index 00000000..93988b80 --- /dev/null +++ b/charges/maces.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mallet.svg b/charges/mallet.svg index 1a6655f4..ecb418f9 100644 --- a/charges/mallet.svg +++ b/charges/mallet.svg @@ -1 +1,10 @@ - \ No newline at end of file + + + + + + + + + + diff --git a/charges/mantle.svg b/charges/mantle.svg new file mode 100644 index 00000000..5493c30b --- /dev/null +++ b/charges/mantle.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mapleLeaf.svg b/charges/mapleLeaf.svg new file mode 100644 index 00000000..93e63767 --- /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..1760d038 --- /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..14feb266 100644 --- a/charges/mastiffStatant.svg +++ b/charges/mastiffStatant.svg @@ -1,157 +1,156 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/millstone.svg b/charges/millstone.svg new file mode 100644 index 00000000..f8d523ca --- /dev/null +++ b/charges/millstone.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/charges/mitre.svg b/charges/mitre.svg new file mode 100644 index 00000000..1a20e002 --- /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..27fdb512 --- /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..b01da9b4 100644 --- a/charges/oak.svg +++ b/charges/oak.svg @@ -1,346 +1,345 @@ - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/orb.svg b/charges/orb.svg index c228bcff..2d7354f5 100644 --- a/charges/orb.svg +++ b/charges/orb.svg @@ -1 +1,25 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ouroboros.svg b/charges/ouroboros.svg new file mode 100644 index 00000000..f0f39146 --- /dev/null +++ b/charges/ouroboros.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/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..353fe5e7 --- /dev/null +++ b/charges/owlDisplayed.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/palace.svg b/charges/palace.svg new file mode 100644 index 00000000..9e03dd4b --- /dev/null +++ b/charges/palace.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/palmTree.svg b/charges/palmTree.svg new file mode 100644 index 00000000..590d14a3 --- /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..064831f4 --- /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..b8b4f8c7 --- /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..d421e208 --- /dev/null +++ b/charges/pear.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pegasus.svg b/charges/pegasus.svg index e4382800..5335022d 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/pillar.svg b/charges/pillar.svg new file mode 100644 index 00000000..d9aa943f --- /dev/null +++ b/charges/pillar.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pincers.svg b/charges/pincers.svg new file mode 100644 index 00000000..2e91f728 --- /dev/null +++ b/charges/pincers.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/pineCone.svg b/charges/pineCone.svg new file mode 100644 index 00000000..c326f2a2 --- /dev/null +++ b/charges/pineCone.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pineTree.svg b/charges/pineTree.svg new file mode 100644 index 00000000..2abebe11 --- /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..8325d1ca --- /dev/null +++ b/charges/plaice.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/plough.svg b/charges/plough.svg index b1534bc5..7c1f42fc 100644 --- a/charges/plough.svg +++ b/charges/plough.svg @@ -1 +1,16 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/charges/ploughshare.svg b/charges/ploughshare.svg new file mode 100644 index 00000000..45928f03 --- /dev/null +++ b/charges/ploughshare.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/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/portcullis.svg b/charges/portcullis.svg new file mode 100644 index 00000000..de154326 --- /dev/null +++ b/charges/portcullis.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/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..ff33f762 --- /dev/null +++ b/charges/quatrefoil.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/rabbitSejant.svg b/charges/rabbitSejant.svg new file mode 100644 index 00000000..c61e0a9b --- /dev/null +++ b/charges/rabbitSejant.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/raft.svg b/charges/raft.svg new file mode 100644 index 00000000..d5b728b4 --- /dev/null +++ b/charges/raft.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/charges/rake.svg b/charges/rake.svg index d0a2ff2d..6feed725 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..c971f7b4 --- /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..421e416c --- /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/rapier.svg b/charges/rapier.svg new file mode 100644 index 00000000..fed83920 --- /dev/null +++ b/charges/rapier.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ratRampant.svg b/charges/ratRampant.svg new file mode 100644 index 00000000..13c6746a --- /dev/null +++ b/charges/ratRampant.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/raven.svg b/charges/raven.svg index 10ae2b99..6e3c4eca 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..1d43c4f4 --- /dev/null +++ b/charges/rhinoceros.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ribbon1.svg b/charges/ribbon1.svg new file mode 100644 index 00000000..03bf3515 --- /dev/null +++ b/charges/ribbon1.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/ribbon2.svg b/charges/ribbon2.svg new file mode 100644 index 00000000..0f15bb04 --- /dev/null +++ b/charges/ribbon2.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/ribbon3.svg b/charges/ribbon3.svg new file mode 100644 index 00000000..dd168991 --- /dev/null +++ b/charges/ribbon3.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/ribbon4.svg b/charges/ribbon4.svg new file mode 100644 index 00000000..bab35959 --- /dev/null +++ b/charges/ribbon4.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/charges/ribbon5.svg b/charges/ribbon5.svg new file mode 100644 index 00000000..3c718bce --- /dev/null +++ b/charges/ribbon5.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/ribbon6.svg b/charges/ribbon6.svg new file mode 100644 index 00000000..a32eede7 --- /dev/null +++ b/charges/ribbon6.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/ribbon7.svg b/charges/ribbon7.svg new file mode 100644 index 00000000..2d9a1e21 --- /dev/null +++ b/charges/ribbon7.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/ribbon8.svg b/charges/ribbon8.svg new file mode 100644 index 00000000..f7c672a7 --- /dev/null +++ b/charges/ribbon8.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/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/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..0f1f002d 100644 --- a/charges/sabre.svg +++ b/charges/sabre.svg @@ -1,20 +1,19 @@ - - - - - - + + + + + - - - - - - - - + + + + + + + + - \ No newline at end of file + diff --git a/charges/sabre2.svg b/charges/sabre2.svg index e16c45fe..2466a761 100644 --- a/charges/sabre2.svg +++ b/charges/sabre2.svg @@ -1,15 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + - \ No newline at end of file + diff --git a/charges/sabresCrossed.svg b/charges/sabresCrossed.svg index 21ddc0e7..e9cec5f4 100644 --- a/charges/sabresCrossed.svg +++ b/charges/sabresCrossed.svg @@ -1,40 +1,37 @@ - - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + - - - - - - - - + + + + + + + + - \ No newline at end of file + diff --git a/charges/sagittarius.svg b/charges/sagittarius.svg new file mode 100644 index 00000000..ac5eaeeb --- /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..bda9bf49 --- /dev/null +++ b/charges/salmon.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/saw.svg b/charges/saw.svg new file mode 100644 index 00000000..c356263f --- /dev/null +++ b/charges/saw.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/scale.svg b/charges/scale.svg new file mode 100644 index 00000000..b2da96ea --- /dev/null +++ b/charges/scale.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/scaleImbalanced.svg b/charges/scaleImbalanced.svg new file mode 100644 index 00000000..ea151649 --- /dev/null +++ b/charges/scaleImbalanced.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/scalesHanging.svg b/charges/scalesHanging.svg new file mode 100644 index 00000000..1065211b --- /dev/null +++ b/charges/scalesHanging.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/sceptre.svg b/charges/sceptre.svg new file mode 100644 index 00000000..57869cbf --- /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..a7437f1e --- /dev/null +++ b/charges/scissors.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/scissors2.svg b/charges/scissors2.svg new file mode 100644 index 00000000..109d8238 --- /dev/null +++ b/charges/scissors2.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/charges/scorpion.svg b/charges/scorpion.svg new file mode 100644 index 00000000..c132511d --- /dev/null +++ b/charges/scorpion.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/scrollClosed.svg b/charges/scrollClosed.svg new file mode 100644 index 00000000..1f7d8034 --- /dev/null +++ b/charges/scrollClosed.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/scythe.svg b/charges/scythe.svg new file mode 100644 index 00000000..b8d0a04d --- /dev/null +++ b/charges/scythe.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/charges/scythe2.svg b/charges/scythe2.svg new file mode 100644 index 00000000..7fa9de5d --- /dev/null +++ b/charges/scythe2.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/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..ad6e3303 --- /dev/null +++ b/charges/sextifoil.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/shears.svg b/charges/shears.svg new file mode 100644 index 00000000..3b3daeb4 --- /dev/null +++ b/charges/shears.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/shield.svg b/charges/shield.svg new file mode 100644 index 00000000..89ad41de --- /dev/null +++ b/charges/shield.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/shipWheel.svg b/charges/shipWheel.svg new file mode 100644 index 00000000..fa23136c --- /dev/null +++ b/charges/shipWheel.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/sickle.svg b/charges/sickle.svg new file mode 100644 index 00000000..753eeeaa --- /dev/null +++ b/charges/sickle.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/skeleton.svg b/charges/skeleton.svg new file mode 100644 index 00000000..cde28dae --- /dev/null +++ b/charges/skeleton.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/skull.svg b/charges/skull.svg new file mode 100644 index 00000000..c7dc7044 --- /dev/null +++ b/charges/skull.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/skull2.svg b/charges/skull2.svg new file mode 100644 index 00000000..a580afd7 --- /dev/null +++ b/charges/skull2.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/charges/snail.svg b/charges/snail.svg new file mode 100644 index 00000000..387dc48a --- /dev/null +++ b/charges/snail.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/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/snowflake.svg b/charges/snowflake.svg new file mode 100644 index 00000000..d85d067b --- /dev/null +++ b/charges/snowflake.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/spear.svg b/charges/spear.svg new file mode 100644 index 00000000..9944f9d5 --- /dev/null +++ b/charges/spear.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/charges/spiral.svg b/charges/spiral.svg new file mode 100644 index 00000000..05736127 --- /dev/null +++ b/charges/spiral.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/squirrel.svg b/charges/squirrel.svg new file mode 100644 index 00000000..bf2cc68b --- /dev/null +++ b/charges/squirrel.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/stagLodgedRegardant.svg b/charges/stagLodgedRegardant.svg new file mode 100644 index 00000000..024f648c --- /dev/null +++ b/charges/stagLodgedRegardant.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/stagPassant.svg b/charges/stagPassant.svg new file mode 100644 index 00000000..745ed25e --- /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..4350ad26 --- /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..d56c221d --- /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..bf363a15 --- /dev/null +++ b/charges/swallow.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/swan.svg b/charges/swan.svg index 8c1df8c3..26a345f7 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..121e6ba4 --- /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..e89d4b90 --- /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/thistle.svg b/charges/thistle.svg new file mode 100644 index 00000000..09cff52a --- /dev/null +++ b/charges/thistle.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/tower.svg b/charges/tower.svg index 0370f8c9..9754803a 100644 --- a/charges/tower.svg +++ b/charges/tower.svg @@ -1,17 +1,17 @@ - - - - - - + + + + + + - - - - + + + + - + - \ 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..438c993e --- /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/trowel.svg b/charges/trowel.svg new file mode 100644 index 00000000..b9533474 --- /dev/null +++ b/charges/trowel.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/unicornRampant.svg b/charges/unicornRampant.svg index f8c86fb5..a3102dbc 100644 --- a/charges/unicornRampant.svg +++ b/charges/unicornRampant.svg @@ -1 +1,29 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wasp.svg b/charges/wasp.svg new file mode 100644 index 00000000..9d54306c --- /dev/null +++ b/charges/wasp.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wheatStalk.svg b/charges/wheatStalk.svg new file mode 100644 index 00000000..c6113ccd --- /dev/null +++ b/charges/wheatStalk.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wheel.svg b/charges/wheel.svg index 5e012206..6133eee9 100644 --- a/charges/wheel.svg +++ b/charges/wheel.svg @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - diff --git a/charges/windmill.svg b/charges/windmill.svg new file mode 100644 index 00000000..b814ef1e --- /dev/null +++ b/charges/windmill.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/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..d592b9ef 100644 --- a/charges/wolfStatant.svg +++ b/charges/wolfStatant.svg @@ -1,29 +1,29 @@ - - - - - - - - - + + + + + + + + + - - - - + + + + - + - + diff --git a/charges/wyvern.svg b/charges/wyvern.svg index 3c4a05a6..f09b821e 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/components/fill-box.js b/components/fill-box.js index 02912f3b..b4d075c3 100644 --- a/components/fill-box.js +++ b/components/fill-box.js @@ -1,7 +1,5 @@ -// fill-box cannot use Shadow DOM as it needs access to svg hatches -// append stylesheet { - const style = ` + const style = /* css */ ` fill-box:not([disabled]) { cursor: pointer; } @@ -14,7 +12,8 @@ fill-box > svg > rect { stroke: #666666; stroke-width: 2; - }`; + } + `; const styleElement = document.createElement("style"); styleElement.setAttribute("type", "text/css"); @@ -24,7 +23,7 @@ { const template = document.createElement("template"); - template.innerHTML = ` + template.innerHTML = /* html */ ` @@ -70,5 +69,6 @@ } } + // cannot use Shadow DOM here as need an access to svg hatches customElements.define("fill-box", FillBox); } diff --git a/components/slider-input.js b/components/slider-input.js new file mode 100644 index 00000000..f1732027 --- /dev/null +++ b/components/slider-input.js @@ -0,0 +1,78 @@ +{ + const style = /* css */ ` + slider-input { + display: flex; + align-items: center; + gap: .4em; + } + `; + + const styleElement = document.createElement("style"); + styleElement.setAttribute("type", "text/css"); + styleElement.innerHTML = style; + document.head.appendChild(styleElement); +} + +{ + const template = document.createElement("template"); + template.innerHTML = /* html */ ` + + + `; + + class SliderInput extends HTMLElement { + constructor() { + super(); + this.appendChild(template.content.cloneNode(true)); + + const range = this.querySelector("input[type=range]"); + const number = this.querySelector("input[type=number]"); + + range.value = number.value = this.value || this.getAttribute("value") || 50; + range.min = number.min = this.getAttribute("min") || 0; + range.max = number.max = this.getAttribute("max") || 100; + range.step = number.step = this.getAttribute("step") || 1; + + range.addEventListener("input", this.handleEvent.bind(this)); + number.addEventListener("input", this.handleEvent.bind(this)); + range.addEventListener("change", this.handleEvent.bind(this)); + number.addEventListener("change", this.handleEvent.bind(this)); + } + + handleEvent(e) { + const value = e.target.value; + const isNaN = Number.isNaN(Number(value)); + if (isNaN || value === "") return e.stopPropagation(); + + const range = this.querySelector("input[type=range]"); + const number = this.querySelector("input[type=number]"); + this.value = range.value = number.value = value; + + this.dispatchEvent( + new CustomEvent(e.type, { + detail: {value}, + bubbles: true, + composed: true + }) + ); + } + + set value(value) { + const range = this.querySelector("input[type=range]"); + const number = this.querySelector("input[type=number]"); + range.value = number.value = value; + } + + get value() { + const number = this.querySelector("input[type=number]"); + return number.value; + } + + get valueAsNumber() { + const number = this.querySelector("input[type=number]"); + return number.valueAsNumber; + } + } + + customElements.define("slider-input", SliderInput); +} diff --git a/config/heightmap-templates.js b/config/heightmap-templates.js new file mode 100644 index 00000000..29738609 --- /dev/null +++ b/config/heightmap-templates.js @@ -0,0 +1,166 @@ +"use strict"; + +const heightmapTemplates = (function () { + const volcano = `Hill 1 90-100 44-56 40-60 + Multiply 0.8 50-100 0 0 + Range 1.5 30-55 45-55 40-60 + Smooth 3 0 0 0 + Hill 1.5 35-45 25-30 20-75 + Hill 1 35-55 75-80 25-75 + Hill 0.5 20-25 10-15 20-25 + Mask 3 0 0 0`; + + const highIsland = `Hill 1 90-100 65-75 47-53 + Add 7 all 0 0 + Hill 5-6 20-30 25-55 45-55 + Range 1 40-50 45-55 45-55 + Multiply 0.8 land 0 0 + Mask 3 0 0 0 + Smooth 2 0 0 0 + Trough 2-3 20-30 20-30 20-30 + Trough 2-3 20-30 60-80 70-80 + Hill 1 10-15 60-60 50-50 + Hill 1.5 13-16 15-20 20-75 + Range 1.5 30-40 15-85 30-40 + Range 1.5 30-40 15-85 60-70 + Pit 3-5 10-30 15-85 20-80`; + + const lowIsland = `Hill 1 90-99 60-80 45-55 + Hill 1-2 20-30 10-30 10-90 + Smooth 2 0 0 0 + Hill 6-7 25-35 20-70 30-70 + Range 1 40-50 45-55 45-55 + Trough 2-3 20-30 15-85 20-30 + Trough 2-3 20-30 15-85 70-80 + Hill 1.5 10-15 5-15 20-80 + Hill 1 10-15 85-95 70-80 + Pit 5-7 15-25 15-85 20-80 + Multiply 0.4 20-100 0 0 + Mask 4 0 0 0`; + + const continents = `Hill 1 80-85 60-80 40-60 + Hill 1 80-85 20-30 40-60 + Hill 6-7 15-30 25-75 15-85 + Multiply 0.6 land 0 0 + Hill 8-10 5-10 15-85 20-80 + Range 1-2 30-60 5-15 25-75 + Range 1-2 30-60 80-95 25-75 + Range 0-3 30-60 80-90 20-80 + Strait 2 vertical 0 0 + Strait 1 vertical 0 0 + Smooth 3 0 0 0 + Trough 3-4 15-20 15-85 20-80 + Trough 3-4 5-10 45-55 45-55 + Pit 3-4 10-20 15-85 20-80 + Mask 4 0 0 0`; + + const archipelago = `Add 11 all 0 0 + Range 2-3 40-60 20-80 20-80 + Hill 5 15-20 10-90 30-70 + Hill 2 10-15 10-30 20-80 + Hill 2 10-15 60-90 20-80 + Smooth 3 0 0 0 + Trough 10 20-30 5-95 5-95 + Strait 2 vertical 0 0 + Strait 2 horizontal 0 0`; + + const atoll = `Hill 1 75-80 50-60 45-55 + Hill 1.5 30-50 25-75 30-70 + Hill .5 30-50 25-35 30-70 + Smooth 1 0 0 0 + Multiply 0.2 25-100 0 0 + Hill 0.5 10-20 50-55 48-52`; + + const mediterranean = `Range 4-6 30-80 0-100 0-10 + Range 4-6 30-80 0-100 90-100 + Hill 6-8 30-50 10-90 0-5 + Hill 6-8 30-50 10-90 95-100 + Multiply 0.9 land 0 0 + Mask -2 0 0 0 + Smooth 1 0 0 0 + Hill 2-3 30-70 0-5 20-80 + Hill 2-3 30-70 95-100 20-80 + Trough 3-6 40-50 0-100 0-10 + Trough 3-6 40-50 0-100 90-100`; + + const peninsula = `Range 2-3 20-35 40-50 0-15 + Add 5 all 0 0 + Hill 1 90-100 10-90 0-5 + Add 13 all 0 0 + Hill 3-4 3-5 5-95 80-100 + Hill 1-2 3-5 5-95 40-60 + Trough 5-6 10-25 5-95 5-95 + Smooth 3 0 0 0 + Invert 0.4 both 0 0`; + + const pangea = `Hill 1-2 25-40 15-50 0-10 + Hill 1-2 5-40 50-85 0-10 + Hill 1-2 25-40 50-85 90-100 + Hill 1-2 5-40 15-50 90-100 + Hill 8-12 20-40 20-80 48-52 + Smooth 2 0 0 0 + Multiply 0.7 land 0 0 + Trough 3-4 25-35 5-95 10-20 + Trough 3-4 25-35 5-95 80-90 + Range 5-6 30-40 10-90 35-65`; + + const isthmus = `Hill 5-10 15-30 0-30 0-20 + Hill 5-10 15-30 10-50 20-40 + Hill 5-10 15-30 30-70 40-60 + Hill 5-10 15-30 50-90 60-80 + Hill 5-10 15-30 70-100 80-100 + Smooth 2 0 0 0 + Trough 4-8 15-30 0-30 0-20 + Trough 4-8 15-30 10-50 20-40 + Trough 4-8 15-30 30-70 40-60 + Trough 4-8 15-30 50-90 60-80 + Trough 4-8 15-30 70-100 80-100 + Invert 0.25 x 0 0`; + + const shattered = `Hill 8 35-40 15-85 30-70 + Trough 10-20 40-50 5-95 5-95 + Range 5-7 30-40 10-90 20-80 + Pit 12-20 30-40 15-85 20-80`; + + const taklamakan = `Hill 1-3 20-30 30-70 30-70 + Hill 2-4 60-85 0-5 0-100 + Hill 2-4 60-85 95-100 0-100 + Hill 3-4 60-85 20-80 0-5 + Hill 3-4 60-85 20-80 95-100 + Smooth 3 0 0 0`; + + const oldWorld = `Range 3 70 15-85 20-80 + Hill 2-3 50-70 15-45 20-80 + Hill 2-3 50-70 65-85 20-80 + Hill 4-6 20-25 15-85 20-80 + Multiply 0.5 land 0 0 + Smooth 2 0 0 0 + Range 3-4 20-50 15-35 20-45 + Range 2-4 20-50 65-85 45-80 + Strait 3-7 vertical 0 0 + Trough 6-8 20-50 15-85 45-65 + Pit 5-6 20-30 10-90 10-90`; + + const fractious = `Hill 12-15 50-80 5-95 5-95 + Mask -1.5 0 0 0 + Mask 3 0 0 0 + Add -20 30-100 0 0 + Range 6-8 40-50 5-95 10-90`; + + return { + volcano: {id: 0, name: "Volcano", template: volcano, probability: 3}, + highIsland: {id: 1, name: "High Island", template: highIsland, probability: 19}, + lowIsland: {id: 2, name: "Low Island", template: lowIsland, probability: 9}, + continents: {id: 3, name: "Continents", template: continents, probability: 16}, + archipelago: {id: 4, name: "Archipelago", template: archipelago, probability: 18}, + atoll: {id: 5, name: "Atoll", template: atoll, probability: 1}, + mediterranean: {id: 6, name: "Mediterranean", template: mediterranean, probability: 5}, + peninsula: {id: 7, name: "Peninsula", template: peninsula, probability: 3}, + pangea: {id: 8, name: "Pangea", template: pangea, probability: 5}, + isthmus: {id: 9, name: "Isthmus", template: isthmus, probability: 2}, + shattered: {id: 10, name: "Shattered", template: shattered, probability: 7}, + taklamakan: {id: 11, name: "Taklamakan", template: taklamakan, probability: 1}, + oldWorld: {id: 12, name: "Old World", template: oldWorld, probability: 8}, + fractious: {id: 13, name: "Fractious", template: fractious, probability: 3} + }; +})(); diff --git a/config/precreated-heightmaps.js b/config/precreated-heightmaps.js new file mode 100644 index 00000000..22f45abd --- /dev/null +++ b/config/precreated-heightmaps.js @@ -0,0 +1,27 @@ +"use strict"; + +const precreatedHeightmaps = { + "africa-centric": {id: 0, name: "Africa Centric"}, + arabia: {id: 1, name: "Arabia"}, + atlantics: {id: 2, name: "Atlantics"}, + britain: {id: 3, name: "Britain"}, + caribbean: {id: 4, name: "Caribbean"}, + "east-asia": {id: 5, name: "East Asia"}, + eurasia: {id: 6, name: "Eurasia"}, + europe: {id: 7, name: "Europe"}, + "europe-accented": {id: 8, name: "Europe Accented"}, + "europe-and-central-asia": {id: 9, name: "Europe and Central Asia"}, + "europe-central": {id: 10, name: "Europe Central"}, + "europe-north": {id: 11, name: "Europe North"}, + greenland: {id: 12, name: "Greenland"}, + hellenica: {id: 13, name: "Hellenica"}, + iceland: {id: 14, name: "Iceland"}, + "indian-ocean": {id: 15, name: "Indian Ocean"}, + "mediterranean-sea": {id: 16, name: "Mediterranean Sea"}, + "middle-east": {id: 17, name: "Middle East"}, + "north-america": {id: 18, name: "North America"}, + "us-centric": {id: 19, name: "US-centric"}, + "us-mainland": {id: 20, name: "US Mainland"}, + world: {id: 21, name: "World"}, + "world-from-pacific": {id: 22, name: "World from Pacific"} +}; diff --git a/heightmaps/import-rules.txt b/heightmaps/import-rules.txt index 9478b35c..69499114 100644 --- a/heightmaps/import-rules.txt +++ b/heightmaps/import-rules.txt @@ -1,8 +1,8 @@ To get heightmap with correct height scale: -1. Open tangrams.github.io +1. Open https://tangrams.github.io/heightmapper 2. Toggle off auto-exposure 3. Set max elevation to 2000 4. Set min elevation to -500 5. Find region you like 6. Render image -7. Optionally rescale image to a smaller size (e.g. 500x300px) as high resolution is not used \ No newline at end of file +7. Optionally rescale image to a smaller size (e.g. 500x300px) as high resolution is not used diff --git a/icons.css b/icons.css index ae40ee00..4740f091 100644 --- a/icons.css +++ b/icons.css @@ -253,7 +253,7 @@ .icon-coa:before {content:'\f3ed'; font-size: .9em; color: #999;} /* '' */ .icon-half:before {font-weight: bold;content:'½';} .icon-voice:before {content:'🔊';} - +.icon-robot:before {content:'🤖';} .icon-die:before {content:'🎲';} .icon-button-die:before {content:'🎲'; padding-right: .4em;} .icon-button-power:before {content:'💪'; padding-right: .6em;} diff --git a/images/Tumblr.png b/images/Tumblr.png deleted file mode 100644 index 2b65ddad..00000000 Binary files a/images/Tumblr.png and /dev/null differ diff --git a/images/favicon-16x16.png b/images/icons/favicon-16x16.png similarity index 100% rename from images/favicon-16x16.png rename to images/icons/favicon-16x16.png diff --git a/images/favicon-32x32.png b/images/icons/favicon-32x32.png similarity index 100% rename from images/favicon-32x32.png rename to images/icons/favicon-32x32.png diff --git a/images/icons/icon_x512.png b/images/icons/icon_x512.png new file mode 100644 index 00000000..f1f8c9aa Binary files /dev/null and b/images/icons/icon_x512.png differ diff --git a/images/icons/maskable_icon_x128.png b/images/icons/maskable_icon_x128.png new file mode 100644 index 00000000..fa877d1b Binary files /dev/null and b/images/icons/maskable_icon_x128.png differ diff --git a/images/icons/maskable_icon_x192.png b/images/icons/maskable_icon_x192.png new file mode 100644 index 00000000..3322eab3 Binary files /dev/null and b/images/icons/maskable_icon_x192.png differ diff --git a/images/icons/maskable_icon_x384.png b/images/icons/maskable_icon_x384.png new file mode 100644 index 00000000..c7e7e705 Binary files /dev/null and b/images/icons/maskable_icon_x384.png differ diff --git a/images/icons/maskable_icon_x512.png b/images/icons/maskable_icon_x512.png new file mode 100644 index 00000000..5b2361fd Binary files /dev/null and b/images/icons/maskable_icon_x512.png differ diff --git a/images/textures/antique-big.jpg b/images/textures/antique-big.jpg new file mode 100644 index 00000000..711b1681 Binary files /dev/null and b/images/textures/antique-big.jpg differ diff --git a/images/textures/antique-small.jpg b/images/textures/antique-small.jpg new file mode 100644 index 00000000..851b5d07 Binary files /dev/null and b/images/textures/antique-small.jpg differ diff --git a/images/textures/folded-paper-big.jpg b/images/textures/folded-paper-big.jpg new file mode 100644 index 00000000..c2c4d761 Binary files /dev/null and b/images/textures/folded-paper-big.jpg differ diff --git a/images/textures/folded-paper-small.jpg b/images/textures/folded-paper-small.jpg new file mode 100644 index 00000000..88418a13 Binary files /dev/null and b/images/textures/folded-paper-small.jpg differ diff --git a/images/textures/gray-paper.jpg b/images/textures/gray-paper.jpg new file mode 100644 index 00000000..238d6e4c Binary files /dev/null and b/images/textures/gray-paper.jpg differ diff --git a/images/textures/iran-small.jpg b/images/textures/iran-small.jpg new file mode 100644 index 00000000..39f34512 Binary files /dev/null and b/images/textures/iran-small.jpg differ diff --git a/images/textures/marble-big.jpg b/images/textures/marble-big.jpg new file mode 100644 index 00000000..c1d2a6d4 Binary files /dev/null and b/images/textures/marble-big.jpg differ diff --git a/images/textures/marble-blue-big.jpg b/images/textures/marble-blue-big.jpg new file mode 100644 index 00000000..dbfc0975 Binary files /dev/null and b/images/textures/marble-blue-big.jpg differ diff --git a/images/textures/marble-blue-small.jpg b/images/textures/marble-blue-small.jpg new file mode 100644 index 00000000..2e95fdcb Binary files /dev/null and b/images/textures/marble-blue-small.jpg differ diff --git a/images/textures/marble-small.jpg b/images/textures/marble-small.jpg new file mode 100644 index 00000000..10d1a9ab Binary files /dev/null and b/images/textures/marble-small.jpg differ diff --git a/images/textures/mars-big.jpg b/images/textures/mars-big.jpg new file mode 100644 index 00000000..3fd39dae Binary files /dev/null and b/images/textures/mars-big.jpg differ diff --git a/images/textures/mars-small.jpg b/images/textures/mars-small.jpg new file mode 100644 index 00000000..75de8dd3 Binary files /dev/null and b/images/textures/mars-small.jpg differ diff --git a/images/textures/mauritania-small.jpg b/images/textures/mauritania-small.jpg new file mode 100644 index 00000000..22d9cecf Binary files /dev/null and b/images/textures/mauritania-small.jpg differ diff --git a/images/textures/mercury-big.jpg b/images/textures/mercury-big.jpg new file mode 100644 index 00000000..7e06f0ee Binary files /dev/null and b/images/textures/mercury-big.jpg differ diff --git a/images/textures/mercury-small.jpg b/images/textures/mercury-small.jpg new file mode 100644 index 00000000..53f31ee3 Binary files /dev/null and b/images/textures/mercury-small.jpg differ diff --git a/images/textures/ocean.jpg b/images/textures/ocean.jpg new file mode 100644 index 00000000..981366ca Binary files /dev/null and b/images/textures/ocean.jpg differ diff --git a/images/textures/pergamena-small.jpg b/images/textures/pergamena-small.jpg new file mode 100644 index 00000000..951f9eda Binary files /dev/null and b/images/textures/pergamena-small.jpg differ diff --git a/images/textures/plaster.jpg b/images/textures/plaster.jpg new file mode 100644 index 00000000..8ec85c81 Binary files /dev/null and b/images/textures/plaster.jpg differ diff --git a/images/textures/soiled-paper-vertical.png b/images/textures/soiled-paper-vertical.png new file mode 100644 index 00000000..f8bb720e Binary files /dev/null and b/images/textures/soiled-paper-vertical.png differ diff --git a/images/textures/soiled-paper.jpg b/images/textures/soiled-paper.jpg new file mode 100644 index 00000000..00333992 Binary files /dev/null and b/images/textures/soiled-paper.jpg differ diff --git a/images/textures/spain-small.jpg b/images/textures/spain-small.jpg new file mode 100644 index 00000000..a413f508 Binary files /dev/null and b/images/textures/spain-small.jpg differ diff --git a/images/textures/timbercut-big.jpg b/images/textures/timbercut-big.jpg new file mode 100644 index 00000000..7dc9b656 Binary files /dev/null and b/images/textures/timbercut-big.jpg differ diff --git a/images/textures/timbercut-small.jpg b/images/textures/timbercut-small.jpg new file mode 100644 index 00000000..a73e47be Binary files /dev/null and b/images/textures/timbercut-small.jpg differ diff --git a/index.css b/index.css index d129d5a5..373bf63c 100644 --- a/index.css +++ b/index.css @@ -1,3 +1,24 @@ +:root { + --monospace: Consolas, monospace; + --serif: Georgia, serif; + --sans-serif: Helvetica, Arial, sans-serif; +} + +/* hide Google translate header */ +body > .skiptranslate { + display: none; +} + +/* hide Google translate in-progress widget */ +body > .skiptranslate + div { + display: none; +} + +/* make translated text wrapper non-blocking */ +font { + pointer-events: none; +} + input, select, button { @@ -101,10 +122,6 @@ a { fill: none; } -#biomes { - stroke-width: 0.7; -} - #landmass { mask: url(#land); fill-rule: evenodd; @@ -119,7 +136,7 @@ a { } #temperature { - font-family: sans-serif; + font-family: var(--sans-serif); font-weight: 700; text-anchor: middle; dominant-baseline: central; @@ -148,6 +165,8 @@ t, #temperature, #texture, #landmass, +#vignette, +#gridOverlay, #fogging { pointer-events: none; } @@ -160,7 +179,7 @@ t, text-shadow: 0 0 4px #000; dominant-baseline: central; text-anchor: middle; - font-family: Helvetica; + font-family: var(--sans-serif); fill-opacity: 1; } @@ -168,20 +187,12 @@ t, font-size: 0.8em; } -#statesBody { - stroke-width: 3; -} - #statesHalo { fill: none; stroke-linecap: round; stroke-linejoin: round; } -#provincesBody { - stroke-width: 0.2; -} - #statesBody, #provincesBody, #relig, @@ -236,31 +247,23 @@ i.icon-lock { cursor: pointer; } -#routeEditor > *, #labelEditor div { display: inline-block; } #labels { - text-anchor: start; + text-anchor: middle; dominant-baseline: central; cursor: pointer; } .chartInfo { text-align: center; - font-family: sans-serif; + font-family: var(--sans-serif); font-style: italic; font-size: 12px; } -#hierarchy .selected { - stroke: #c13119; - stroke-width: 1; - cursor: move; -} - -#hierarchy text, #statesTree text, #provincesTree text { pointer-events: none; @@ -281,7 +284,7 @@ i.icon-lock { stroke-width: 2; } -.dragLine { +.regimentDragLine { marker-end: url(#end-arrow); stroke: #333333; stroke-dasharray: 5; @@ -342,14 +345,36 @@ text.drag { font-weight: bold; } +button.ui-button:disabled { + filter: brightness(0.95); +} + +button.ui-button:disabled:hover { + cursor: default; +} + .ui-dialog, #optionsContainer { user-select: none; } +#optionsTrigger { + padding: 0.6em 0.45em; +} + +@media (max-width: 600px) { + #optionsTrigger { + font-size: 2em; + padding: 0; + width: 1.3em; + height: 1.6em; + border: solid 1px #5e4fa2; + } +} + #options { position: absolute; - font-family: Consolas, monospace; + font-family: var(--monospace); border: solid 1px #5e4fa2; margin: 10px; padding-bottom: 0.3em; @@ -359,7 +384,7 @@ text.drag { #options input, #options select, #options button { - font-family: Consolas, monospace; + font-family: var(--monospace); } #collapsible { @@ -380,7 +405,7 @@ text.drag { div.tab > button#optionsHide { width: auto; - font-family: Arial; + font-family: var(--sans-serif); padding: 0.6em 0.45em; } @@ -408,12 +433,21 @@ button.options:hover { margin: 0.8em 0 0 0; } +#options .tip { + color: #444; + font-size: 0.9em; + font-family: sans-serif; + font-style: italic; + margin-left: 0.5em; +} + #aboutContent { text-align: justify; } #aboutContent p { font-weight: normal; + font-style: normal; } #aboutContent a { @@ -488,7 +522,53 @@ input[type="color"]::-webkit-color-swatch-wrapper { font-size: smaller; } +#options input[type="text"] { + border: 0px; + width: 62%; + font-size: smaller; +} + +#options output { + text-align: right; + font-size: smaller; +} + +#options input[type="number"] { + font-size: 0.8em; + border: 0; + text-align: right; + background-color: transparent; + width: 3.3em; +} + +#options input[type="number"]::-webkit-inner-spin-button, +#options input[type="number"]::-webkit-outer-spin-button { + -webkit-appearance: none; + margin: 0; +} + +#options input[type="number"] { + appearance: textfield; + -moz-appearance: textfield; +} + +#options input[type="number"]:hover { + outline: 1px solid var(--dark-solid); +} + +#options input.paired { + text-align: center; + background-color: white; +} + +#options input.long { + width: 100%; + background-color: white; + text-align: left; +} + #options input[type="range"] { + width: 100%; height: 8px; background: 0; appearance: none; @@ -531,56 +611,13 @@ input[type="color"]::-webkit-color-swatch-wrapper { height: 2px; } -#options input[type="number"] { - font-size: 0.8em; +#options select { + width: 100%; } -#options input[type="text"] { - border: 0px; - width: 62%; +#loadGoogleTranslateButton { font-size: smaller; -} - -#optionsContent output { - text-align: right; - font-size: smaller; -} - -#optionsContent input[type="number"] { - border: 0; - text-align: right; - background-color: transparent; - width: 3.3em; - -moz-appearance: textfield; -} - -#optionsContent input[type="number"]::-webkit-inner-spin-button, -#optionsContent input[type="number"]::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; -} - -#optionsContent input[type="number"]:hover { - outline: 1px solid var(--dark-solid); -} - -#optionsContent input.paired { - text-align: center; - background-color: white; -} - -#optionsContent input.long { - width: 100%; - background-color: white; - text-align: left; -} - -#optionsContent input[type="range"] { - width: 100%; -} - -#optionsContent select { - width: 100%; + padding: 0.4em 0.5em; } #options input[type="color"] { @@ -591,7 +628,7 @@ input[type="color"]::-webkit-color-swatch-wrapper { .tabcontent button.sideButton { border-radius: 15%; font-size: 0.8em; - margin-bottom: -1em; + margin-block: -1em; } #layersContent button.active, @@ -599,19 +636,6 @@ input[type="color"]::-webkit-color-swatch-wrapper { transform: translate(0px, 1px); } -#styleElements input[type="range"] { - width: 64%; -} - -#styleElements select { - width: 64%; -} - -#styleElements input[type="number"] { - width: 6em; - border: 0; -} - #styleSelectFont > option { font-size: 2em; } @@ -650,7 +674,8 @@ input[type="color"]::-webkit-color-swatch-wrapper { border: none; padding: 0.45em 0.75em; margin: 0.4em 0; - font-family: Consolas, monospace; + white-space: nowrap; + font-family: var(--monospace); animation: glowing 2s infinite; } @@ -682,7 +707,9 @@ input[type="color"]::-webkit-color-swatch-wrapper { padding: 0.45em 0.75em; margin: 0.35em 0; transition: 0.1s; - font-size: 1em; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .tabcontent button.pressed { @@ -694,9 +721,9 @@ input[type="color"]::-webkit-color-swatch-wrapper { background-color: var(--header-active); } -#toolsContent div { +#toolsContent > .grid { display: grid; - grid-template-columns: repeat(4, 1fr); + grid-template-columns: repeat(3, 1fr); margin: 0.2em 0; } @@ -718,7 +745,7 @@ input[type="color"]::-webkit-color-swatch-wrapper { #viewMode > button { padding: 0.35em; - margin: 0.2em 0.3em 0.6em 0.3em; + margin: 0.3em 0.3em 0.6em 0.3em; float: left; width: 30.7%; } @@ -736,9 +763,14 @@ fieldset { float: left; width: 28%; text-align: center; + text-transform: capitalize; + + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } -.tabcontent .buttonoff { +.tabcontent li.buttonoff { background-color: var(--bg-disabled); color: #444444aa; } @@ -922,14 +954,14 @@ fieldset { display: inline-block; } -body button.noicon { +#templateTools > button { width: 1.8em; height: 1.6em; margin: 1px; padding: 0.1em 0.5em; float: left; font-size: 1.2em; - font-family: Copperplate, monospace; + font-family: var(--monospace); } #brushesButtons > button { @@ -973,7 +1005,7 @@ body button.noicon { #templateBody > div > span { float: right; - margin: 0 1px 0 0.5px; + margin-inline: 1px; } #templateBody > div > i { @@ -982,14 +1014,13 @@ body button.noicon { #templateBody input, #templateBody select { - width: 4em; + width: 4.5em; height: 1em; border: 0; - font-size: 0.95em; background-color: #ffffff95; color: #05044d; font-style: italic; - font-family: monospace; + font-family: var(--monospace); } #templateBody select { @@ -1076,12 +1107,16 @@ tr.battleSurvivors { font-size: 0.9em; } -#battleBody div.battlePhases, #battleBottom div.battleTypes { position: fixed; background-color: #ffffff30; } +#battleBody div.battlePhases { + position: absolute; + background-color: #ffffff30; +} + #battleBody div.battlePhases > button, #battleBottom div.battleTypes > button { width: 3.2em; @@ -1136,12 +1171,17 @@ div#regimentSelectorBody > div > div { filter: sepia(1) hue-rotate(200deg); } +.colorsContainer { + display: grid; + grid-template-columns: repeat(5, 1fr); + grid-column-gap: 0.3em; + grid-row-gap: 0.2em; +} + .color-div { width: 3em; - height: 1em; - display: inline-block; - margin: 0 0.16em; - border: 1px #c5c5c5 groove; + height: 1.5em; + border: 1px #999 solid; cursor: pointer; } @@ -1208,7 +1248,6 @@ i.resetButton:active { padding: 0; height: 2px; background: #d4d4d4; - top: -0.35em; position: relative; appearance: none; -webkit-appearance: none; @@ -1291,11 +1330,6 @@ div.slider .ui-slider-handle { color: white; } -#brushPower, -#brushRadius { - width: 12em; -} - #rescaleHigher, #rescaleLower, #rescaleModifier { @@ -1318,6 +1352,13 @@ div.slider .ui-slider-handle { scrollbar-width: thin; } +@media screen and (max-width: 600px) { + .table { + max-width: unset; + } +} + +.dialog::-webkit-scrollbar, #alertMessage::-webkit-scrollbar, .table::-webkit-scrollbar, .matrix-table::-webkit-scrollbar { @@ -1326,6 +1367,7 @@ div.slider .ui-slider-handle { background-color: transparent; } +.dialog::-webkit-scrollbar-thumb, #alertMessage::-webkit-scrollbar-thumb, .table::-webkit-scrollbar-thumb, .matrix-table::-webkit-scrollbar-thumb { @@ -1333,30 +1375,30 @@ div.slider .ui-slider-handle { border-radius: 6px; } +.dialog::-webkit-scrollbar-thumb:hover, #alertMessage::-webkit-scrollbar-thumb:hover, .table::-webkit-scrollbar-thumb:hover, .matrix-table::-webkit-scrollbar-thumb:hover { background: #666; } -.overflow { +.dialog { max-width: 93vw; - overflow: auto; - max-height: 75vh; } -.overflow > div { +.dialog > div { width: max-content; } -div.header > div { +div.header { + display: grid; + width: 0; font-weight: bold; font-size: 0.9em; - display: inline-block; - position: sticky; - white-space: nowrap; - overflow-x: hidden; - vertical-align: bottom; +} + +div.header > div:first-child { + margin-left: 1.8em; } .sortable { @@ -1396,7 +1438,7 @@ div.totalLine > div { } div.states > input { - width: 6em; + width: 7em; background: none; border: 0; } @@ -1405,20 +1447,11 @@ div.states div { width: 3.2em; } -div.states .statePower, div.states .biomeHabitability { width: 4em; -moz-appearance: textfield; } -div.states .stateBurgs { - width: 2.4em; -} - -div.states > .stateArea { - width: 5em; -} - div.states > .statePopulation { width: 3em; } @@ -1432,7 +1465,9 @@ div.states .icon-trash-empty, div.states .icon-eye, div.states .icon-pin, div.states .icon-flag-empty, -div.states .icon-cw { +div.states .icon-cw, +div.states .icon-lock, +div.states .icon-lock-open { cursor: pointer; } @@ -1461,17 +1496,8 @@ div.states > .small { font-size: 0.9em; } -div.states > .cultureName { - width: 7em; -} - -div.states > .culturePopulation { - width: 4em; - cursor: pointer; -} - div.states > select { - width: 4.6em; + width: 7em; cursor: pointer; border: 0; background-color: transparent; @@ -1480,27 +1506,12 @@ div.states > select { appearance: none; } -div.states > .cultureBase, div.states > .burgName, div.states > .burgState, div.states > .burgCulture { width: 6em; } -div.states .burgPopulation { - width: 4.8em; -} - -div.states .burgType { - width: 3em; -} - -div.states .burgType > span { - padding: 0 1px; - color: #6e5e66; - transition: 0.2s; -} - div.states span.inactive { color: #c6c2c2; } @@ -1571,6 +1582,7 @@ div.states > .riverType { #burgBody > div > div, #riverBody > div, +#routeBody > div, #lakeBody > div { padding: 0.1em; } @@ -1578,6 +1590,7 @@ div.states > .riverType { #riverBody div.label, #riverBody input, #riverBody select, +#routeBody div.label, #lakeBody div.label, #lakeBody input, #lakeBody select { @@ -1585,6 +1598,12 @@ div.states > .riverType { width: 7em; } +#routeBody input, +#routeBody select { + display: inline-block; + width: 10em; +} + #stateNameEditor div.label, #provinceNameEditor div.label, #regimentBody div.label, @@ -1594,7 +1613,7 @@ div.states > .riverType { padding: 0.3em 0; } -#saveTilesScreen div.label { +#exportToPngTilesScreen div.label { display: inline-block; width: 5em; } @@ -1616,28 +1635,6 @@ div.states > .riverType { color: #abaaaa; } -div.states > .religionName { - width: 11em; -} - -div.states > .religionType { - width: 5em; - cursor: pointer; - border: 0; - background-color: transparent; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; -} - -div.states > .religionForm { - width: 6em; -} - -div.states > .religionDeity { - width: 15em; -} - .placeholder { opacity: 0; cursor: default; @@ -1674,11 +1671,6 @@ div.states > div.biomeArea { width: 5em; } -#militaryHeader > div, -#regimentsHeader > div { - width: 5.2em; -} - #militaryBody div.states > input { -moz-appearance: textfield; } @@ -1720,7 +1712,7 @@ div.states > div.biomeArea { #emblemUploadControl, #emblemDownloadControl { margin-top: 0.3em; - text-align: center; + width: 100%; } div.editorLine { @@ -1747,7 +1739,7 @@ div.editorLine { fill: #f8ffff; font-size: 12px; font-weight: bold; - font-family: Arial, Helvetica, sans-serif; + font-family: var(--sans-serif); cursor: move !important; } @@ -1760,7 +1752,7 @@ div.editorLine { #pickerCloseText { fill: #f8ffff; font-size: 10px; - font-family: Arial, Helvetica, sans-serif; + font-family: var(--sans-serif); pointer-events: none; } @@ -1817,11 +1809,6 @@ div.editorLine { padding: 0px 3px !important; } -#unitsBody > div > * { - display: inline-block; - margin-bottom: 0.2em; -} - .unitsHeader { margin: 0.8em 0 0 -1.1em; font-weight: bold; @@ -1833,28 +1820,21 @@ div.editorLine { margin: 6px 0 0 6px; } -#unitsBody > div > div { +#unitsBody label { + display: inline-block; width: 9em; } -#unitsBody > div > input[type="range"] { - width: 7em; -} - #unitsBody > div > select, #unitsBody > div > input[type="text"] { - width: 12em; -} - -#unitsBody > div > input[type="number"] { - width: 4.35em; -} - -#unitsBody > div > input, -#unitsBody > div > select { + width: 14.4em; border: 1px solid #e9e9e9; } +#unitsBody input[type="range"] { + width: 9em; +} + #unitsEditor i.icon-lock-open, #unitsEditor i.icon-lock { color: #626573; @@ -1864,12 +1844,6 @@ div.editorLine { margin: 0.4em 0 0 -0.9em; } -#barBackColor { - width: 3.5em; - padding: 0px; - height: 1.2em; -} - #ruler { cursor: move; fill: none; @@ -1895,7 +1869,7 @@ div.editorLine { } #ruler text { - font-family: "Georgia"; + font-family: var(--serif); fill: #3d3d3d; text-anchor: middle; text-shadow: 0 0 4px white; @@ -1909,18 +1883,6 @@ div.editorLine { stroke: #737373; } -#scaleBar { - stroke: none; - fill: none; - cursor: pointer; -} - -#scaleBar text { - fill: #353540; - text-anchor: middle; - font-family: Georgia; -} - #militaryOptionsTable select { border: 1px solid #d4d4d4; } @@ -1944,7 +1906,7 @@ div.editorLine { #coordinateLabels { fill: #333333; - font-family: monospace; + font-family: var(--monospace); text-shadow: 0 0 4px white; stroke-width: 0; dominant-baseline: central; @@ -1979,7 +1941,7 @@ input[type="checkbox"] { .checkbox + .checkbox-label:before { content: ""; display: inline-block; - vertical-align: middle; + vertical-align: bottom; width: 0.6em; height: 0.6em; padding: 0.2em; @@ -1987,6 +1949,7 @@ input[type="checkbox"] { border: 1px solid darkgrey; border-radius: 15%; background: white; + font-family: var(--monospace); } .checkbox:checked + .checkbox-label:before { @@ -1997,12 +1960,9 @@ input[type="checkbox"] { } div.textual select, -div.textual textarea { - font-family: Copperplate, monospace; -} - +div.textual textarea, div.textual input { - font-family: Copperplate, monospace; + font-family: var(--monospace); } div.textual fieldset { @@ -2017,13 +1977,13 @@ div.textual span, } #namesbaseExamples { - font-family: Copperplate, monospace; + font-family: var(--monospace); cursor: pointer; } #markers { cursor: pointer; - font-family: monospace; + font-family: var(--monospace); user-select: none; text-anchor: middle; dominant-baseline: central; @@ -2069,7 +2029,6 @@ div.textual span, } #notesBody > iframe { - pointer-events: none; user-select: none; } @@ -2078,11 +2037,12 @@ div.textual span, } #notesLegend { + width: auto; height: 87%; outline: 0; overflow-y: auto; padding: 0.6em; - font-family: Copperplate, monospace; + font-family: var(--monospace); background-color: #fff; border: 1px solid #dedede; color: #000; @@ -2111,6 +2071,7 @@ svg.button { #reliefIconsDiv { margin-top: 2px; padding: 2px; + width: 100%; } #reliefIconsDiv svg { @@ -2188,7 +2149,7 @@ svg.button { #worldControls input[type="number"] { border: 1px solid #e5e5e5; padding: 0px; - width: 3.2em; + width: 4em; } #worldControls i.icon-lock-open, @@ -2211,14 +2172,14 @@ svg.button { #globaAxisLabels { font-style: italic; font-size: 9px; - font-family: monospace; + font-family: var(--monospace); stroke: none; fill: #001754; } #globeLatLabels { font-size: 12px; - font-family: monospace; + font-family: var(--monospace); stroke: none; fill: #001754; } @@ -2247,10 +2208,6 @@ svg.button { fill: blue; } -#globeOutline { - fill: url(#temperatureGradient); -} - #globeArea { fill: white; fill-opacity: 0.3; @@ -2261,6 +2218,11 @@ svg.button { stroke-width: 0.2; } +#globePrimeMeridian { + stroke: blue; + stroke-width: 1.4; +} + #globeEquator { stroke: red; stroke-width: 1.4; @@ -2271,15 +2233,15 @@ svg.button { user-select: none; } - .dontAsk { - display: inline-block; margin: 0.9em 0 0 0.6em; + display: inline-flex; + align-items: center; } #errorBox { font-size: 0.9em; - font-family: Consolas, monospace; + font-family: var(--monospace); color: #920303; background-color: #dabdbd91; padding: 2px; @@ -2314,16 +2276,13 @@ svg.button { #promptText { padding: 0 0 0.6em 0; font-weight: bold; - font-family: sans-serif; + font-family: var(--sans-serif); } #mapOverlay { position: absolute; + inset: 0; display: flex; - top: 0; - left: 0; - right: 0; - bottom: 0; align-items: center; justify-content: center; z-index: 10; @@ -2350,6 +2309,92 @@ 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; +} + +.separator { + display: flex; + align-items: center; + text-align: center; + + font-style: italic; + font-weight: bold; + color: #222; + margin: 0.8em 0 0 0; +} +.separator::before, +.separator::after { + content: ""; + flex: 1; + border-bottom: 1px solid #333; +} +.separator:not(:empty)::before { + margin-right: 0.25em; +} +.separator:not(:empty)::after { + margin-left: 0.25em; +} + +@keyframes clockwiseBorderPulse { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + +#chat-widget-container { + user-select: none; +} + +#chat-widget-minimized { + animation: fadeIn 1s ease-in; + transform: scale(0.65); + opacity: var(--bg-opacity); +} + +@keyframes fadeIn { + from { + opacity: 0; + } + to { + opacity: var(--bg-opacity); + } +} + @media print { div, canvas { @@ -2358,17 +2403,6 @@ svg.button { } @media only screen and (max-width: 420px) { - #collapsible, - #options { - margin: 0; - border: 0; - } - - #options { - height: 100vh; - width: 100vw; - } - table { width: 100%; } @@ -2381,3 +2415,9 @@ svg.button { display: none; } } + +@media (prefers-color-scheme: dark) { + body { + background: #25252a; + } +} diff --git a/index.html b/index.html index 4071ba58..5a18e579 100644 --- a/index.html +++ b/index.html @@ -3,77 +3,102 @@ + Azgaar's Fantasy Map Generator - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - + + + - + - - - + + + - + - + @@ -246,81 +349,102 @@ - - - - - - - + + + + + + + + + + + - - - - - + + + + +
-
Azgaar's
-
Fantasy Map Generator
-
v. 1.8
-

LOADING...

+ + + + + + + +
+
Azgaar's
+
Fantasy Map Generator
+
‎ ‎
+

LOADING...

+