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/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 index b254d0ad..acedeb18 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -14,8 +14,8 @@ # Versioning - 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 efd8224e..3ab245b2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg)](https://stand-with-ukraine.pp.ua) - # Fantasy Map Generator Azgaar's _Fantasy Map Generator_ is a free web application that helps fantasy writers, game masters, and cartographers create and edit fantasy maps. @@ -8,19 +6,17 @@ Link: [azgaar.github.io/Fantasy-Map-Generator](https://azgaar.github.io/Fantasy- 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/charges/agnusDei.svg b/charges/agnusDei.svg index 9e9fd1e0..60ea9d87 100644 --- a/charges/agnusDei.svg +++ b/charges/agnusDei.svg @@ -1,135 +1,132 @@ - - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/arbalest.svg b/charges/arbalest.svg index 79cf4950..38adac50 100644 --- a/charges/arbalest.svg +++ b/charges/arbalest.svg @@ -1,39 +1,38 @@ - - - + + - - + + - + - + - + - - + + - + - + - + - - - - - - + + + + + + - - + + - + diff --git a/charges/arbalest2.svg b/charges/arbalest2.svg new file mode 100644 index 00000000..be9b1a6a --- /dev/null +++ b/charges/arbalest2.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/archer.svg b/charges/archer.svg new file mode 100644 index 00000000..00891c1b --- /dev/null +++ b/charges/archer.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armEmbowedHoldingSabre.svg b/charges/armEmbowedHoldingSabre.svg new file mode 100644 index 00000000..2fbae9f6 --- /dev/null +++ b/charges/armEmbowedHoldingSabre.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armEmbowedVambraced.svg b/charges/armEmbowedVambraced.svg new file mode 100644 index 00000000..ac1422b5 --- /dev/null +++ b/charges/armEmbowedVambraced.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armEmbowedVambracedHoldingSword.svg b/charges/armEmbowedVambracedHoldingSword.svg new file mode 100644 index 00000000..d00d8bab --- /dev/null +++ b/charges/armEmbowedVambracedHoldingSword.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/armillarySphere.svg b/charges/armillarySphere.svg index c71938a8..45d09b8d 100644 --- a/charges/armillarySphere.svg +++ b/charges/armillarySphere.svg @@ -1,18 +1 @@ - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/arrow.svg b/charges/arrow.svg index dca5f47e..2135169f 100644 --- a/charges/arrow.svg +++ b/charges/arrow.svg @@ -1,10 +1,10 @@ - - - - - - + + + + + + diff --git a/charges/arrowsSheaf.svg b/charges/arrowsSheaf.svg index 47d8b925..4b879e10 100644 --- a/charges/arrowsSheaf.svg +++ b/charges/arrowsSheaf.svg @@ -1,27 +1,27 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + diff --git a/charges/badgerStatant.svg b/charges/badgerStatant.svg index 02de9b22..29cd5f39 100644 --- a/charges/badgerStatant.svg +++ b/charges/badgerStatant.svg @@ -1,62 +1,62 @@ - + - - + + - - + + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/charges/banner.svg b/charges/banner.svg index 80ca0f4f..8ca47b97 100644 --- a/charges/banner.svg +++ b/charges/banner.svg @@ -1,35 +1,35 @@ - diff --git a/charges/bee.svg b/charges/bee.svg index db5b48b4..7f3a0069 100644 --- a/charges/bee.svg +++ b/charges/bee.svg @@ -1,116 +1,116 @@ - - + + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - - + + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/charges/boarHeadErased.svg b/charges/boarHeadErased.svg index 6c28ab2b..08348586 100644 --- a/charges/boarHeadErased.svg +++ b/charges/boarHeadErased.svg @@ -1,44 +1,44 @@ - - - - - + + + + + - - + + - + - - + + - - + + - + - + - + - + - + - + diff --git a/charges/bone.svg b/charges/bone.svg new file mode 100644 index 00000000..27a9e410 --- /dev/null +++ b/charges/bone.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/bookClosed.svg b/charges/bookClosed.svg index f50006a1..0cd74341 100644 --- a/charges/bookClosed.svg +++ b/charges/bookClosed.svg @@ -1,20 +1,20 @@ - - - - - - + + + + + + - - - - - - - - + + + + + + + + diff --git a/charges/bookClosed2.svg b/charges/bookClosed2.svg new file mode 100644 index 00000000..bf8d2519 --- /dev/null +++ b/charges/bookClosed2.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bookOpen.svg b/charges/bookOpen.svg index 6a760e51..62f1c6fc 100644 --- a/charges/bookOpen.svg +++ b/charges/bookOpen.svg @@ -1,21 +1,21 @@ - - - - + + + + - - - - - - + + + + + + - - + + diff --git a/charges/bowWithArrow.svg b/charges/bowWithArrow.svg index ad2e4502..12d7f9ff 100644 --- a/charges/bowWithArrow.svg +++ b/charges/bowWithArrow.svg @@ -1,15 +1,15 @@ - - + + - - - - - - + + + + + + diff --git a/charges/bowWithThreeArrows.svg b/charges/bowWithThreeArrows.svg new file mode 100644 index 00000000..0efc30f2 --- /dev/null +++ b/charges/bowWithThreeArrows.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bridge.svg b/charges/bridge.svg index 41261f98..f5ce588e 100644 --- a/charges/bridge.svg +++ b/charges/bridge.svg @@ -1,92 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bridge2.svg b/charges/bridge2.svg new file mode 100644 index 00000000..6d3dfab5 --- /dev/null +++ b/charges/bridge2.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/bucket.svg b/charges/bucket.svg index 399aa92c..56c7e83c 100644 --- a/charges/bucket.svg +++ b/charges/bucket.svg @@ -1,20 +1 @@ - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/bullPassant.svg b/charges/bullPassant.svg index 24143bb3..0314b64e 100644 --- a/charges/bullPassant.svg +++ b/charges/bullPassant.svg @@ -1,21 +1,21 @@ - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + diff --git a/charges/butterfly.svg b/charges/butterfly.svg index e956195c..2c301fcf 100644 --- a/charges/butterfly.svg +++ b/charges/butterfly.svg @@ -1,64 +1,64 @@ - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - + - + - + - + - - + + - - - + + + diff --git a/charges/cannon.svg b/charges/cannon.svg index a110c596..05e88b25 100644 --- a/charges/cannon.svg +++ b/charges/cannon.svg @@ -1,67 +1,67 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/caravel.svg b/charges/caravel.svg index 39f8fd86..9eb57671 100644 --- a/charges/caravel.svg +++ b/charges/caravel.svg @@ -1,70 +1,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + diff --git a/charges/castle2.svg b/charges/castle2.svg new file mode 100644 index 00000000..5f12a8aa --- /dev/null +++ b/charges/castle2.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/catPassantGuardant.svg b/charges/catPassantGuardant.svg index 5a556e4e..b49dc820 100644 --- a/charges/catPassantGuardant.svg +++ b/charges/catPassantGuardant.svg @@ -1,66 +1,66 @@ - + - - - - - + + + + + - - + + - - - + + + - + - - + + - - - - + + + + - + - + - - + + - + - - + + - - - + + + - + - + - + - + - + - + - + diff --git a/charges/cavalier.svg b/charges/cavalier.svg index 8e9d9b43..7bfad7ac 100644 --- a/charges/cavalier.svg +++ b/charges/cavalier.svg @@ -1,8 +1,75 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/centaur.svg b/charges/centaur.svg new file mode 100644 index 00000000..f4ddeb22 --- /dev/null +++ b/charges/centaur.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/chain.svg b/charges/chain.svg index 4fea5d56..cfe4a3bb 100644 --- a/charges/chain.svg +++ b/charges/chain.svg @@ -1,10 +1,10 @@ - - - - - - - + + + + + + + - \ No newline at end of file + diff --git a/charges/chalice.svg b/charges/chalice.svg index 2a8f7845..0f4f95f6 100644 --- a/charges/chalice.svg +++ b/charges/chalice.svg @@ -1,13 +1,13 @@ - - - - + + + + - - + + - + diff --git a/charges/cinquefoil.svg b/charges/cinquefoil.svg index 3e957d99..49db293e 100644 --- a/charges/cinquefoil.svg +++ b/charges/cinquefoil.svg @@ -1,14 +1,14 @@ - + - + - - - - - + + + + + diff --git a/charges/column.svg b/charges/column.svg index 80067505..38d8b2a0 100644 --- a/charges/column.svg +++ b/charges/column.svg @@ -1,17 +1,17 @@ - + - - - - - + + + + + - - - - - + + + + + diff --git a/charges/comet.svg b/charges/comet.svg new file mode 100644 index 00000000..096ddb67 --- /dev/null +++ b/charges/comet.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/cossack.svg b/charges/cossack.svg new file mode 100644 index 00000000..f5cf75ed --- /dev/null +++ b/charges/cossack.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/cowStatant.svg b/charges/cowStatant.svg index f28e58e0..66b46823 100644 --- a/charges/cowStatant.svg +++ b/charges/cowStatant.svg @@ -1,43 +1,43 @@ - - - - - - + + + + + + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - + diff --git a/charges/crocodile.svg b/charges/crocodile.svg index b44032f7..442e456d 100644 --- a/charges/crocodile.svg +++ b/charges/crocodile.svg @@ -1,65 +1,65 @@ - + - - + + - + - + - - + + - + - + - - + + - + - + - + - + - - + + - + - + - - + + - + - + - + - + - + - + - + - + diff --git a/charges/crosier.svg b/charges/crosier.svg index 5eb26576..631ef998 100644 --- a/charges/crosier.svg +++ b/charges/crosier.svg @@ -1,16 +1 @@ - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/crossCalvary.svg b/charges/crossCalvary.svg index 493579f9..dd0447b5 100644 --- a/charges/crossCalvary.svg +++ b/charges/crossCalvary.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/charges/crossDouble.svg b/charges/crossDouble.svg index 2176c0e3..1a0e4bc8 100644 --- a/charges/crossDouble.svg +++ b/charges/crossDouble.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/charges/crossSantiago.svg b/charges/crossSantiago.svg index d6b30109..7e510a90 100644 --- a/charges/crossSantiago.svg +++ b/charges/crossSantiago.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/charges/crossedBones.svg b/charges/crossedBones.svg new file mode 100644 index 00000000..3b06442f --- /dev/null +++ b/charges/crossedBones.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/crosslet.svg b/charges/crosslet.svg index 3dc8b517..645b68a3 100644 --- a/charges/crosslet.svg +++ b/charges/crosslet.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/charges/crown2.svg b/charges/crown2.svg index 4be76b88..f06a106e 100644 --- a/charges/crown2.svg +++ b/charges/crown2.svg @@ -1,72 +1,69 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + - - + + - - - - + + + - - - - - - + + + + + + - - + + - - + + - + - - + + - - - - + + + + diff --git a/charges/dolphin.svg b/charges/dolphin.svg index fdc49f07..be5b00bd 100644 --- a/charges/dolphin.svg +++ b/charges/dolphin.svg @@ -21,40 +21,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/donkeyHeadCaboshed.svg b/charges/donkeyHeadCaboshed.svg index c9533d82..da5aee0a 100644 --- a/charges/donkeyHeadCaboshed.svg +++ b/charges/donkeyHeadCaboshed.svg @@ -1,39 +1,37 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + - + + - - - - + + + + + + + + + + + + + + + + + + diff --git a/charges/dove.svg b/charges/dove.svg index 860ff7f5..7406a6ec 100644 --- a/charges/dove.svg +++ b/charges/dove.svg @@ -1,67 +1,67 @@ - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - - - + + + + - + - + - - + + - + - - - + + + - + - + - + - - + + - + diff --git a/charges/doveDisplayed.svg b/charges/doveDisplayed.svg index d3a24ea1..35bd14d6 100644 --- a/charges/doveDisplayed.svg +++ b/charges/doveDisplayed.svg @@ -1,110 +1,110 @@ - + - - + + - + - - + + - + - + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - + - + - - + + - + - + - + - + - + diff --git a/charges/dragonRampant.svg b/charges/dragonRampant.svg index 016d4711..6ff64c2a 100644 --- a/charges/dragonRampant.svg +++ b/charges/dragonRampant.svg @@ -1,61 +1,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/dragonfly.svg b/charges/dragonfly.svg new file mode 100644 index 00000000..c8b501ca --- /dev/null +++ b/charges/dragonfly.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/charges/drakkar.svg b/charges/drakkar.svg new file mode 100644 index 00000000..f36c3c4d --- /dev/null +++ b/charges/drakkar.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/drawingCompass.svg b/charges/drawingCompass.svg new file mode 100644 index 00000000..65a252d3 --- /dev/null +++ b/charges/drawingCompass.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/charges/drum.svg b/charges/drum.svg index d80386d4..bd8fd638 100644 --- a/charges/drum.svg +++ b/charges/drum.svg @@ -1,18 +1,18 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/charges/duck.svg b/charges/duck.svg index 440b93fd..940c3e4d 100644 --- a/charges/duck.svg +++ b/charges/duck.svg @@ -1,85 +1,85 @@ - + - + - + - + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - + - + - + diff --git a/charges/eagleTwoHeads.svg b/charges/eagleTwoHeads.svg index d556d380..cc8ac124 100644 --- a/charges/eagleTwoHeads.svg +++ b/charges/eagleTwoHeads.svg @@ -18,86 +18,86 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/earOfWheat.svg b/charges/earOfWheat.svg new file mode 100644 index 00000000..a1b3072c --- /dev/null +++ b/charges/earOfWheat.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/elephantHeadErased.svg b/charges/elephantHeadErased.svg index cb7acccc..f521413b 100644 --- a/charges/elephantHeadErased.svg +++ b/charges/elephantHeadErased.svg @@ -1,22 +1,22 @@ - - + + - + - - + + - + - - + + - - + + diff --git a/charges/escallop.svg b/charges/escallop.svg index d5803037..4fda9dda 100644 --- a/charges/escallop.svg +++ b/charges/escallop.svg @@ -3,17 +3,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/charges/falchion.svg b/charges/falchion.svg index dc28b164..ccb71d3d 100644 --- a/charges/falchion.svg +++ b/charges/falchion.svg @@ -1,10 +1,10 @@ - - - - - - - + + + + + + + diff --git a/charges/falcon.svg b/charges/falcon.svg index 66d15b9d..5e4cebd5 100644 --- a/charges/falcon.svg +++ b/charges/falcon.svg @@ -1,221 +1,221 @@ - + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - + + - - - + + + - - + + - - - + + + - + - + - + - - - + + + - - - - - + + + + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - + + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - + - + - - - - - + + + + + - - - + + + - + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/charges/fan.svg b/charges/fan.svg new file mode 100644 index 00000000..d7504ac6 --- /dev/null +++ b/charges/fan.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/charges/feather.svg b/charges/feather.svg new file mode 100644 index 00000000..0be55bf5 --- /dev/null +++ b/charges/feather.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/flamberge.svg b/charges/flamberge.svg new file mode 100644 index 00000000..ab9d2277 --- /dev/null +++ b/charges/flamberge.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/charges/flangedMace.svg b/charges/flangedMace.svg new file mode 100644 index 00000000..901d942f --- /dev/null +++ b/charges/flangedMace.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/fly.svg b/charges/fly.svg index 08c07a8c..9c880f72 100644 --- a/charges/fly.svg +++ b/charges/fly.svg @@ -1,61 +1,61 @@ - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/charges/foot.svg b/charges/foot.svg index dc354c02..22963e5b 100644 --- a/charges/foot.svg +++ b/charges/foot.svg @@ -1,14 +1,14 @@ - - - - - - + + + + + + - - - + + + diff --git a/charges/frog.svg b/charges/frog.svg index 6f6f2c1f..392d3d05 100644 --- a/charges/frog.svg +++ b/charges/frog.svg @@ -1,24 +1,24 @@ - + - + - + - + - - + + - + - - + + - + diff --git a/charges/garb.svg b/charges/garb.svg index 3bd53140..fbefacd8 100644 --- a/charges/garb.svg +++ b/charges/garb.svg @@ -1,150 +1,150 @@ - - + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + diff --git a/charges/gauntlet.svg b/charges/gauntlet.svg index 5bbd9e55..f00a03eb 100644 --- a/charges/gauntlet.svg +++ b/charges/gauntlet.svg @@ -1,54 +1,54 @@ - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + diff --git a/charges/gear.svg b/charges/gear.svg new file mode 100644 index 00000000..2d128dfb --- /dev/null +++ b/charges/gear.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/grapeBunch.svg b/charges/grapeBunch.svg index d25c92b8..38d4693f 100644 --- a/charges/grapeBunch.svg +++ b/charges/grapeBunch.svg @@ -1,52 +1,73 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/grapeBunch2.svg b/charges/grapeBunch2.svg new file mode 100644 index 00000000..0af7b6a6 --- /dev/null +++ b/charges/grapeBunch2.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/grenade.svg b/charges/grenade.svg new file mode 100644 index 00000000..07436784 --- /dev/null +++ b/charges/grenade.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/greyhoundCourant.svg b/charges/greyhoundCourant.svg index 75f0476f..916d70cf 100644 --- a/charges/greyhoundCourant.svg +++ b/charges/greyhoundCourant.svg @@ -1,31 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/greyhoundRampant.svg b/charges/greyhoundRampant.svg index 73ae1448..cf607df5 100644 --- a/charges/greyhoundRampant.svg +++ b/charges/greyhoundRampant.svg @@ -1,89 +1,89 @@ - - - - - - + + + + + + - - - + + + - + - + - + - + - + - + - - - + + + - + - + - + - - + + - + - + - + - - + + - - - + + + - + - - - + + + - + - + - + - + - + - + diff --git a/charges/griffinPassant.svg b/charges/griffinPassant.svg index 4ff9c011..871b3591 100644 --- a/charges/griffinPassant.svg +++ b/charges/griffinPassant.svg @@ -19,36 +19,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/griffinRampant.svg b/charges/griffinRampant.svg index c17552c3..da2cfebe 100644 --- a/charges/griffinRampant.svg +++ b/charges/griffinRampant.svg @@ -29,87 +29,87 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/hand.svg b/charges/hand.svg index 4da98b9a..91c279ae 100644 --- a/charges/hand.svg +++ b/charges/hand.svg @@ -2,11 +2,11 @@ - - - - - + + + + + diff --git a/charges/harp.svg b/charges/harp.svg index 6047a0b5..91e5ee08 100644 --- a/charges/harp.svg +++ b/charges/harp.svg @@ -1,30 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/head.svg b/charges/head.svg index a7f6198d..08e36060 100644 --- a/charges/head.svg +++ b/charges/head.svg @@ -1,16 +1 @@ - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/hedgehog.svg b/charges/hedgehog.svg index d591cc02..c7a84caa 100644 --- a/charges/hedgehog.svg +++ b/charges/hedgehog.svg @@ -1,52 +1,52 @@ - + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + diff --git a/charges/helmetCorinthian.svg b/charges/helmetCorinthian.svg new file mode 100644 index 00000000..3ccd9cdd --- /dev/null +++ b/charges/helmetCorinthian.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/helmetGreat.svg b/charges/helmetGreat.svg new file mode 100644 index 00000000..b7a7bf49 --- /dev/null +++ b/charges/helmetGreat.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/helmetZischagge.svg b/charges/helmetZischagge.svg new file mode 100644 index 00000000..8985d197 --- /dev/null +++ b/charges/helmetZischagge.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/heron.svg b/charges/heron.svg index 86d121b0..4893b082 100644 --- a/charges/heron.svg +++ b/charges/heron.svg @@ -15,14 +15,14 @@ - - - - - - - - + + + + + + + + diff --git a/charges/hindStatant.svg b/charges/hindStatant.svg index 0c2aae31..3f9cc429 100644 --- a/charges/hindStatant.svg +++ b/charges/hindStatant.svg @@ -1,35 +1,35 @@ - - - + + + - + - - - - - + + + + + - + - + - - + + - + - - + + - + diff --git a/charges/hook.svg b/charges/hook.svg new file mode 100644 index 00000000..d5679f64 --- /dev/null +++ b/charges/hook.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/horseHeadCouped.svg b/charges/horseHeadCouped.svg index 712a273d..8c455c23 100644 --- a/charges/horseHeadCouped.svg +++ b/charges/horseHeadCouped.svg @@ -1,32 +1,32 @@ - - - + + + - - + + - + - + - + - - - - - + + + + + - + - + - + - - + + diff --git a/charges/horsePassant.svg b/charges/horsePassant.svg index f4d2de5b..b2361b84 100644 --- a/charges/horsePassant.svg +++ b/charges/horsePassant.svg @@ -1,119 +1,120 @@ - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/horseRampant.svg b/charges/horseRampant.svg index d2f2544a..be7fee6c 100644 --- a/charges/horseRampant.svg +++ b/charges/horseRampant.svg @@ -14,13 +14,13 @@ - - - - - - - + + + + + + + diff --git a/charges/horseSalient.svg b/charges/horseSalient.svg index 65bd744f..21b5db48 100644 --- a/charges/horseSalient.svg +++ b/charges/horseSalient.svg @@ -1,24 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/hourglass.svg b/charges/hourglass.svg new file mode 100644 index 00000000..87e7930b --- /dev/null +++ b/charges/hourglass.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/key.svg b/charges/key.svg index fb677cd6..6fb883ea 100644 --- a/charges/key.svg +++ b/charges/key.svg @@ -1,16 +1,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/charges/ladder.svg b/charges/ladder.svg index b15d2f4a..fc72f130 100644 --- a/charges/ladder.svg +++ b/charges/ladder.svg @@ -1,12 +1,12 @@ - + - - - + + + - - + + diff --git a/charges/ladder2.svg b/charges/ladder2.svg new file mode 100644 index 00000000..5596e045 --- /dev/null +++ b/charges/ladder2.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/ladybird.svg b/charges/ladybird.svg new file mode 100644 index 00000000..3cc1587e --- /dev/null +++ b/charges/ladybird.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lamb.svg b/charges/lamb.svg index 8d4e161a..1d574b53 100644 --- a/charges/lamb.svg +++ b/charges/lamb.svg @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/charges/lambPassantReguardant.svg b/charges/lambPassantReguardant.svg index b348c41d..90884eb7 100644 --- a/charges/lambPassantReguardant.svg +++ b/charges/lambPassantReguardant.svg @@ -1,119 +1,118 @@ - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lanceHead.svg b/charges/lanceHead.svg new file mode 100644 index 00000000..255492db --- /dev/null +++ b/charges/lanceHead.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/lanceWithBanner.svg b/charges/lanceWithBanner.svg new file mode 100644 index 00000000..556e5ade --- /dev/null +++ b/charges/lanceWithBanner.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/laurelWreath.svg b/charges/laurelWreath.svg index 74162f57..989e00c4 100644 --- a/charges/laurelWreath.svg +++ b/charges/laurelWreath.svg @@ -1,262 +1,262 @@ - + - - + + - + - - + + - + - + - + - - - + + + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + diff --git a/charges/laurelWreath2.svg b/charges/laurelWreath2.svg new file mode 100644 index 00000000..6dfb373e --- /dev/null +++ b/charges/laurelWreath2.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lighthouse.svg b/charges/lighthouse.svg new file mode 100644 index 00000000..b66938f5 --- /dev/null +++ b/charges/lighthouse.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/charges/lionHeadErased.svg b/charges/lionHeadErased.svg index e8221630..7ed39c67 100644 --- a/charges/lionHeadErased.svg +++ b/charges/lionHeadErased.svg @@ -1,28 +1,28 @@ - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + - + diff --git a/charges/lionPassant.svg b/charges/lionPassant.svg index 10dcb448..7dd6b396 100644 --- a/charges/lionPassant.svg +++ b/charges/lionPassant.svg @@ -5,19 +5,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -34,148 +34,150 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/lionPassantGuardant.svg b/charges/lionPassantGuardant.svg index 9aa594fa..584e8835 100644 --- a/charges/lionPassantGuardant.svg +++ b/charges/lionPassantGuardant.svg @@ -1,243 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/lionRampant.svg b/charges/lionRampant.svg index d5f6bdad..8aab2b09 100644 --- a/charges/lionRampant.svg +++ b/charges/lionRampant.svg @@ -1,23 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/lionSejant.svg b/charges/lionSejant.svg index 6fe1efae..23ca98db 100644 --- a/charges/lionSejant.svg +++ b/charges/lionSejant.svg @@ -1,133 +1,125 @@ - - + + - - - - - - + + + + + + - + - + - - + + - + - + - + - - + + - - + + + - - - - - - - - + + + + + - - - - - - + + + + + + - - + + - - - + + + - + - - + + - + - + - - - - - - - + + + + + + + - + - + - + - + - - + + - - + + - + - + - + - + - - + + - - + + - + - + - - - - - - - - - - - + + + + + diff --git a/charges/lizard.svg b/charges/lizard.svg index 306e99e9..dc8dbf9d 100644 --- a/charges/lizard.svg +++ b/charges/lizard.svg @@ -1,29 +1,29 @@ - + - + - + - + - - + + - + - + - - + + - + - - + + diff --git a/charges/lute.svg b/charges/lute.svg index 195c62cf..c88cc397 100644 --- a/charges/lute.svg +++ b/charges/lute.svg @@ -1,15 +1 @@ - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/charges/lymphad.svg b/charges/lymphad.svg index 7e547eaf..457f10d7 100644 --- a/charges/lymphad.svg +++ b/charges/lymphad.svg @@ -1,75 +1,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + diff --git a/charges/lyre.svg b/charges/lyre.svg new file mode 100644 index 00000000..d89b8550 --- /dev/null +++ b/charges/lyre.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mace.svg b/charges/mace.svg new file mode 100644 index 00000000..a3f0e074 --- /dev/null +++ b/charges/mace.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/maces.svg b/charges/maces.svg new file mode 100644 index 00000000..93988b80 --- /dev/null +++ b/charges/maces.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mallet.svg b/charges/mallet.svg index 381d172d..ecb418f9 100644 --- a/charges/mallet.svg +++ b/charges/mallet.svg @@ -1,8 +1,10 @@ - - + + + + diff --git a/charges/mantle.svg b/charges/mantle.svg new file mode 100644 index 00000000..5493c30b --- /dev/null +++ b/charges/mantle.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/mapleLeaf.svg b/charges/mapleLeaf.svg index 414a9797..93e63767 100644 --- a/charges/mapleLeaf.svg +++ b/charges/mapleLeaf.svg @@ -1,15 +1,15 @@ - - + + - - - - - - - + + + + + + + diff --git a/charges/martenCourant.svg b/charges/martenCourant.svg index 5efac23b..1760d038 100644 --- a/charges/martenCourant.svg +++ b/charges/martenCourant.svg @@ -1,68 +1,68 @@ - + - + - - + + - - + + - + - + - - + + - + - + - + - - + + - - - + + + - - + + - + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - + diff --git a/charges/mastiffStatant.svg b/charges/mastiffStatant.svg index 4f3d3744..14feb266 100644 --- a/charges/mastiffStatant.svg +++ b/charges/mastiffStatant.svg @@ -1,157 +1,156 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/charges/millstone.svg b/charges/millstone.svg new file mode 100644 index 00000000..f8d523ca --- /dev/null +++ b/charges/millstone.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/charges/mitre.svg b/charges/mitre.svg index bba5d163..1a20e002 100644 --- a/charges/mitre.svg +++ b/charges/mitre.svg @@ -1,40 +1,40 @@ - + - - + + - + - - - - + + + + - + - - - - + + + + - - + + - + - - + + - + diff --git a/charges/moonInCrescent.svg b/charges/moonInCrescent.svg index f0da801d..27fdb512 100644 --- a/charges/moonInCrescent.svg +++ b/charges/moonInCrescent.svg @@ -1,27 +1,27 @@ - + - + - + - + - + - - + + - + - - - - - + + + + + diff --git a/charges/oak.svg b/charges/oak.svg index aa877960..b01da9b4 100644 --- a/charges/oak.svg +++ b/charges/oak.svg @@ -1,346 +1,345 @@ - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/orb.svg b/charges/orb.svg index af898083..2d7354f5 100644 --- a/charges/orb.svg +++ b/charges/orb.svg @@ -1,25 +1,25 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + diff --git a/charges/ouroboros.svg b/charges/ouroboros.svg new file mode 100644 index 00000000..f0f39146 --- /dev/null +++ b/charges/ouroboros.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/owlDisplayed.svg b/charges/owlDisplayed.svg index c49d8b27..353fe5e7 100644 --- a/charges/owlDisplayed.svg +++ b/charges/owlDisplayed.svg @@ -1,75 +1,75 @@ - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - - + + + - + - - + + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + diff --git a/charges/palace.svg b/charges/palace.svg new file mode 100644 index 00000000..9e03dd4b --- /dev/null +++ b/charges/palace.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/palmTree.svg b/charges/palmTree.svg index 40264f80..590d14a3 100644 --- a/charges/palmTree.svg +++ b/charges/palmTree.svg @@ -1,154 +1,154 @@ - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - + diff --git a/charges/peacock.svg b/charges/peacock.svg index 0ae12f99..064831f4 100644 --- a/charges/peacock.svg +++ b/charges/peacock.svg @@ -1,166 +1,166 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - - - - - + + + + + + + + + - - - + + + - - + + - + - + - + - - - - + + + + - + - + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - - + + - + - - + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + diff --git a/charges/peacockInPride.svg b/charges/peacockInPride.svg index c235a40a..b8b4f8c7 100644 --- a/charges/peacockInPride.svg +++ b/charges/peacockInPride.svg @@ -1,216 +1,216 @@ - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - + + + + - + - - + + - + - - + + - + - - - + + + - + - - + + - + - - - + + + - + - - - + + + - + - - + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pear.svg b/charges/pear.svg index f1f01c0f..d421e208 100644 --- a/charges/pear.svg +++ b/charges/pear.svg @@ -1,37 +1,37 @@ - + - - + + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - + diff --git a/charges/pegasus.svg b/charges/pegasus.svg index 2583831d..5335022d 100644 --- a/charges/pegasus.svg +++ b/charges/pegasus.svg @@ -16,28 +16,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pillar.svg b/charges/pillar.svg new file mode 100644 index 00000000..d9aa943f --- /dev/null +++ b/charges/pillar.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/pincers.svg b/charges/pincers.svg new file mode 100644 index 00000000..2e91f728 --- /dev/null +++ b/charges/pincers.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/pineCone.svg b/charges/pineCone.svg index 2e5c4e66..c326f2a2 100644 --- a/charges/pineCone.svg +++ b/charges/pineCone.svg @@ -1,24 +1,26 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + diff --git a/charges/pineTree.svg b/charges/pineTree.svg index 7d1aa006..2abebe11 100644 --- a/charges/pineTree.svg +++ b/charges/pineTree.svg @@ -1,16 +1,16 @@ - - - + + + - + - + - + diff --git a/charges/plaice.svg b/charges/plaice.svg index c1e66df1..8325d1ca 100644 --- a/charges/plaice.svg +++ b/charges/plaice.svg @@ -1,48 +1,47 @@ - - - + + - - + + - + - + - + - + - - - - - + + + + + - + - - + + - + - - + + - - + + - + - + - + - + diff --git a/charges/plough.svg b/charges/plough.svg index d31e4287..7c1f42fc 100644 --- a/charges/plough.svg +++ b/charges/plough.svg @@ -1,16 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/charges/ploughshare.svg b/charges/ploughshare.svg new file mode 100644 index 00000000..45928f03 --- /dev/null +++ b/charges/ploughshare.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/portcullis.svg b/charges/portcullis.svg new file mode 100644 index 00000000..de154326 --- /dev/null +++ b/charges/portcullis.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/quatrefoil.svg b/charges/quatrefoil.svg index cc7b9a33..ff33f762 100644 --- a/charges/quatrefoil.svg +++ b/charges/quatrefoil.svg @@ -1,14 +1,12 @@ - - - - - - - - - + + + + + + + diff --git a/charges/rabbitSejant.svg b/charges/rabbitSejant.svg index 7bbc22e8..c61e0a9b 100644 --- a/charges/rabbitSejant.svg +++ b/charges/rabbitSejant.svg @@ -1,39 +1,39 @@ - + - - - - + + + + - - - + + + - + - - + + - + - + - + - - + + - + - - + + - - + + diff --git a/charges/raft.svg b/charges/raft.svg new file mode 100644 index 00000000..d5b728b4 --- /dev/null +++ b/charges/raft.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/charges/rake.svg b/charges/rake.svg index 2b76bc51..6feed725 100644 --- a/charges/rake.svg +++ b/charges/rake.svg @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ramHeadErased.svg b/charges/ramHeadErased.svg index 6ece24a6..c971f7b4 100644 --- a/charges/ramHeadErased.svg +++ b/charges/ramHeadErased.svg @@ -1,72 +1,72 @@ - + - + - + - - + + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - + - + - + - - + + - - + + - + - - + + diff --git a/charges/ramPassant.svg b/charges/ramPassant.svg index 6ce7da7e..421e416c 100644 --- a/charges/ramPassant.svg +++ b/charges/ramPassant.svg @@ -1,80 +1,80 @@ - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - + - - - + + + - + - + - + - + - + diff --git a/charges/rapier.svg b/charges/rapier.svg new file mode 100644 index 00000000..fed83920 --- /dev/null +++ b/charges/rapier.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/ratRampant.svg b/charges/ratRampant.svg index 7e1cb3d6..13c6746a 100644 --- a/charges/ratRampant.svg +++ b/charges/ratRampant.svg @@ -1,44 +1,44 @@ - - - - + + + + - - - - + + + + - - - + + + - - - + + + - + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - + diff --git a/charges/raven.svg b/charges/raven.svg index 83eb8912..6e3c4eca 100644 --- a/charges/raven.svg +++ b/charges/raven.svg @@ -11,14 +11,14 @@ - - - - - - - - + + + + + + + + diff --git a/charges/rhinoceros.svg b/charges/rhinoceros.svg index 4b6304cd..1d43c4f4 100644 --- a/charges/rhinoceros.svg +++ b/charges/rhinoceros.svg @@ -1,61 +1,61 @@ - + - - - + + + - + - - - - - - - + + + + + + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + diff --git a/charges/ribbon1.svg b/charges/ribbon1.svg new file mode 100644 index 00000000..03bf3515 --- /dev/null +++ b/charges/ribbon1.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/ribbon2.svg b/charges/ribbon2.svg new file mode 100644 index 00000000..0f15bb04 --- /dev/null +++ b/charges/ribbon2.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/ribbon3.svg b/charges/ribbon3.svg new file mode 100644 index 00000000..dd168991 --- /dev/null +++ b/charges/ribbon3.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/charges/ribbon4.svg b/charges/ribbon4.svg new file mode 100644 index 00000000..bab35959 --- /dev/null +++ b/charges/ribbon4.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/charges/ribbon5.svg b/charges/ribbon5.svg new file mode 100644 index 00000000..3c718bce --- /dev/null +++ b/charges/ribbon5.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/ribbon6.svg b/charges/ribbon6.svg new file mode 100644 index 00000000..a32eede7 --- /dev/null +++ b/charges/ribbon6.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/charges/ribbon7.svg b/charges/ribbon7.svg new file mode 100644 index 00000000..2d9a1e21 --- /dev/null +++ b/charges/ribbon7.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/ribbon8.svg b/charges/ribbon8.svg new file mode 100644 index 00000000..f7c672a7 --- /dev/null +++ b/charges/ribbon8.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/charges/roundel2.svg b/charges/roundel2.svg index 79e2f6ec..fffa7ad4 100644 --- a/charges/roundel2.svg +++ b/charges/roundel2.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/charges/sabre.svg b/charges/sabre.svg index 765fdb0b..0f1f002d 100644 --- a/charges/sabre.svg +++ b/charges/sabre.svg @@ -1,20 +1,19 @@ - - - - - - + + + + + - - - - - - - - + + + + + + + + diff --git a/charges/sabre2.svg b/charges/sabre2.svg index 44f810c0..2466a761 100644 --- a/charges/sabre2.svg +++ b/charges/sabre2.svg @@ -1,15 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/charges/sabresCrossed.svg b/charges/sabresCrossed.svg index 16136577..e9cec5f4 100644 --- a/charges/sabresCrossed.svg +++ b/charges/sabresCrossed.svg @@ -1,39 +1,36 @@ - - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + - - - - - - - - + + + + + + + + diff --git a/charges/sagittarius.svg b/charges/sagittarius.svg index 074a134a..ac5eaeeb 100644 --- a/charges/sagittarius.svg +++ b/charges/sagittarius.svg @@ -1,136 +1,136 @@ - + - - + + - + - - + + - + - + - + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - - + + - + - + - - + + - + - + - - + + - - + + - + - - - - - - + + + + + + - - + + - + - + - + - + - + - + - + diff --git a/charges/salmon.svg b/charges/salmon.svg index a3dc8e86..bda9bf49 100644 --- a/charges/salmon.svg +++ b/charges/salmon.svg @@ -1,127 +1,127 @@ - - - + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + diff --git a/charges/saw.svg b/charges/saw.svg new file mode 100644 index 00000000..c356263f --- /dev/null +++ b/charges/saw.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/scale.svg b/charges/scale.svg new file mode 100644 index 00000000..b2da96ea --- /dev/null +++ b/charges/scale.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/scaleImbalanced.svg b/charges/scaleImbalanced.svg new file mode 100644 index 00000000..ea151649 --- /dev/null +++ b/charges/scaleImbalanced.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/scalesHanging.svg b/charges/scalesHanging.svg new file mode 100644 index 00000000..1065211b --- /dev/null +++ b/charges/scalesHanging.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/sceptre.svg b/charges/sceptre.svg index 0d060330..57869cbf 100644 --- a/charges/sceptre.svg +++ b/charges/sceptre.svg @@ -1,28 +1,28 @@ - - - + + + - + - + - + - + - - - - - + + + + + - - - - + + + + diff --git a/charges/scissors.svg b/charges/scissors.svg index ebc0df99..a7437f1e 100644 --- a/charges/scissors.svg +++ b/charges/scissors.svg @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/charges/scissors2.svg b/charges/scissors2.svg new file mode 100644 index 00000000..109d8238 --- /dev/null +++ b/charges/scissors2.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/charges/scorpion.svg b/charges/scorpion.svg index 3155f3b9..c132511d 100644 --- a/charges/scorpion.svg +++ b/charges/scorpion.svg @@ -1,60 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + diff --git a/charges/scrollClosed.svg b/charges/scrollClosed.svg new file mode 100644 index 00000000..1f7d8034 --- /dev/null +++ b/charges/scrollClosed.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/scythe.svg b/charges/scythe.svg index 62a52520..b8d0a04d 100644 --- a/charges/scythe.svg +++ b/charges/scythe.svg @@ -1,15 +1,15 @@ - - - + + + - - - - - - + + + + + + diff --git a/charges/scythe2.svg b/charges/scythe2.svg new file mode 100644 index 00000000..7fa9de5d --- /dev/null +++ b/charges/scythe2.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/sextifoil.svg b/charges/sextifoil.svg index cf8b918d..ad6e3303 100644 --- a/charges/sextifoil.svg +++ b/charges/sextifoil.svg @@ -1,14 +1,14 @@ - - + + - - - - - - + + + + + + diff --git a/charges/shears.svg b/charges/shears.svg new file mode 100644 index 00000000..3b3daeb4 --- /dev/null +++ b/charges/shears.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/charges/shield.svg b/charges/shield.svg index 10f6652f..89ad41de 100644 --- a/charges/shield.svg +++ b/charges/shield.svg @@ -1,31 +1,31 @@ - + - - - + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/charges/shipWheel.svg b/charges/shipWheel.svg new file mode 100644 index 00000000..fa23136c --- /dev/null +++ b/charges/shipWheel.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/sickle.svg b/charges/sickle.svg index dcf6dd44..753eeeaa 100644 --- a/charges/sickle.svg +++ b/charges/sickle.svg @@ -1,12 +1,12 @@ - + - - - + + + - - + + diff --git a/charges/skeleton.svg b/charges/skeleton.svg new file mode 100644 index 00000000..cde28dae --- /dev/null +++ b/charges/skeleton.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/skull.svg b/charges/skull.svg index 4ee33d1c..c7dc7044 100644 --- a/charges/skull.svg +++ b/charges/skull.svg @@ -1,37 +1,37 @@ - - + + - - - - + + + + - - - + + + - - - - + + + + - - + + - + - + - + - - - - + + + + diff --git a/charges/skull2.svg b/charges/skull2.svg new file mode 100644 index 00000000..a580afd7 --- /dev/null +++ b/charges/skull2.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/charges/snail.svg b/charges/snail.svg new file mode 100644 index 00000000..387dc48a --- /dev/null +++ b/charges/snail.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/charges/snowflake.svg b/charges/snowflake.svg new file mode 100644 index 00000000..d85d067b --- /dev/null +++ b/charges/snowflake.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/spear.svg b/charges/spear.svg index 036318d7..9944f9d5 100644 --- a/charges/spear.svg +++ b/charges/spear.svg @@ -1,13 +1,13 @@ - - - + + + - - - - + + + + diff --git a/charges/spiral.svg b/charges/spiral.svg new file mode 100644 index 00000000..05736127 --- /dev/null +++ b/charges/spiral.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/charges/squirrel.svg b/charges/squirrel.svg index 0db644c0..bf2cc68b 100644 --- a/charges/squirrel.svg +++ b/charges/squirrel.svg @@ -1,57 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + diff --git a/charges/stagLodgedRegardant.svg b/charges/stagLodgedRegardant.svg new file mode 100644 index 00000000..024f648c --- /dev/null +++ b/charges/stagLodgedRegardant.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/stagPassant.svg b/charges/stagPassant.svg index 51fd94d3..745ed25e 100644 --- a/charges/stagPassant.svg +++ b/charges/stagPassant.svg @@ -1,55 +1,55 @@ - + - - - - + + + + - + - - + + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + diff --git a/charges/stirrup.svg b/charges/stirrup.svg index 7d77eacb..4350ad26 100644 --- a/charges/stirrup.svg +++ b/charges/stirrup.svg @@ -1,47 +1,47 @@ - + - + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - - - - - - - + + + + + + + diff --git a/charges/sunInSplendour2.svg b/charges/sunInSplendour2.svg index 5fee6fcf..d56c221d 100644 --- a/charges/sunInSplendour2.svg +++ b/charges/sunInSplendour2.svg @@ -1,33 +1,33 @@ - - + + - - - + + + - + - + - - + + - - + + - + - - + + - - + + diff --git a/charges/swallow.svg b/charges/swallow.svg index da94f53a..bf363a15 100644 --- a/charges/swallow.svg +++ b/charges/swallow.svg @@ -1,60 +1,60 @@ - + - - + + - - + + - + - + - + - - + + - - + + - + - + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - + diff --git a/charges/swan.svg b/charges/swan.svg index 01893692..26a345f7 100644 --- a/charges/swan.svg +++ b/charges/swan.svg @@ -13,15 +13,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/charges/talbotPassant.svg b/charges/talbotPassant.svg index de6649b9..121e6ba4 100644 --- a/charges/talbotPassant.svg +++ b/charges/talbotPassant.svg @@ -1,57 +1,57 @@ - - - - + + + + - - - + + + - - + + - - + + - - + + - - + + - + - + - - + + - - - + + + - - - - + + + + - + - + - - + + - + diff --git a/charges/talbotSejant.svg b/charges/talbotSejant.svg index 0cb80127..e89d4b90 100644 --- a/charges/talbotSejant.svg +++ b/charges/talbotSejant.svg @@ -1,75 +1,75 @@ - - - - + + + + - + - + - + - + - + - - - - - + + + + + - - - + + + - + - + - + - - + + - + - - + + - - - + + + - + - + - + - + - + - + - + - + diff --git a/charges/thistle.svg b/charges/thistle.svg new file mode 100644 index 00000000..09cff52a --- /dev/null +++ b/charges/thistle.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/tower.svg b/charges/tower.svg index 9e3f64ac..9754803a 100644 --- a/charges/tower.svg +++ b/charges/tower.svg @@ -1,17 +1,17 @@ - - - - - - + + + + + + - - - - + + + + - + diff --git a/charges/trefoil.svg b/charges/trefoil.svg index 83a4a036..438c993e 100644 --- a/charges/trefoil.svg +++ b/charges/trefoil.svg @@ -1,11 +1,11 @@ - - + + - - - + + + diff --git a/charges/trowel.svg b/charges/trowel.svg new file mode 100644 index 00000000..b9533474 --- /dev/null +++ b/charges/trowel.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/charges/unicornRampant.svg b/charges/unicornRampant.svg index 4eef4dba..a3102dbc 100644 --- a/charges/unicornRampant.svg +++ b/charges/unicornRampant.svg @@ -17,13 +17,13 @@ - - - - - - - + + + + + + + diff --git a/charges/wasp.svg b/charges/wasp.svg new file mode 100644 index 00000000..9d54306c --- /dev/null +++ b/charges/wasp.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wheatStalk.svg b/charges/wheatStalk.svg index 229783fb..c6113ccd 100644 --- a/charges/wheatStalk.svg +++ b/charges/wheatStalk.svg @@ -1,41 +1,41 @@ - + - + - - + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - - + + - + - + diff --git a/charges/wheel.svg b/charges/wheel.svg index 5e012206..6133eee9 100644 --- a/charges/wheel.svg +++ b/charges/wheel.svg @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - diff --git a/charges/windmill.svg b/charges/windmill.svg new file mode 100644 index 00000000..b814ef1e --- /dev/null +++ b/charges/windmill.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charges/wolfStatant.svg b/charges/wolfStatant.svg index 297390ec..d592b9ef 100644 --- a/charges/wolfStatant.svg +++ b/charges/wolfStatant.svg @@ -23,7 +23,7 @@ - + diff --git a/charges/wyvern.svg b/charges/wyvern.svg index 92c5de2b..f09b821e 100644 --- a/charges/wyvern.svg +++ b/charges/wyvern.svg @@ -38,32 +38,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/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/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/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 4bd1a328..373bf63c 100644 --- a/index.css +++ b/index.css @@ -122,10 +122,6 @@ a { fill: none; } -#biomes { - stroke-width: 0.7; -} - #landmass { mask: url(#land); fill-rule: evenodd; @@ -169,6 +165,8 @@ t, #temperature, #texture, #landmass, +#vignette, +#gridOverlay, #fogging { pointer-events: none; } @@ -189,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, @@ -257,13 +247,12 @@ i.icon-lock { cursor: pointer; } -#routeEditor > *, #labelEditor div { display: inline-block; } #labels { - text-anchor: start; + text-anchor: middle; dominant-baseline: central; cursor: pointer; } @@ -356,6 +345,14 @@ 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; @@ -436,6 +433,14 @@ 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; } @@ -517,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; @@ -560,55 +611,7 @@ input[type="color"]::-webkit-color-swatch-wrapper { height: 2px; } -#options input[type="number"] { - font-size: 0.8em; -} - -#options input[type="text"] { - border: 0px; - width: 62%; - 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 { +#options select { width: 100%; } @@ -625,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, @@ -633,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; } @@ -684,6 +674,7 @@ input[type="color"]::-webkit-color-swatch-wrapper { border: none; padding: 0.45em 0.75em; margin: 0.4em 0; + white-space: nowrap; font-family: var(--monospace); animation: glowing 2s infinite; } @@ -716,9 +707,6 @@ input[type="color"]::-webkit-color-swatch-wrapper { padding: 0.45em 0.75em; margin: 0.35em 0; transition: 0.1s; - font-size: 1em; - text-transform: capitalize; - overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -733,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; } @@ -757,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%; } @@ -782,7 +770,7 @@ fieldset { text-overflow: ellipsis; } -.tabcontent .buttonoff { +.tabcontent li.buttonoff { background-color: var(--bg-disabled); color: #444444aa; } @@ -1260,7 +1248,6 @@ i.resetButton:active { padding: 0; height: 2px; background: #d4d4d4; - top: -0.35em; position: relative; appearance: none; -webkit-appearance: none; @@ -1525,20 +1512,6 @@ 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; } @@ -1609,6 +1582,7 @@ div.states > .riverType { #burgBody > div > div, #riverBody > div, +#routeBody > div, #lakeBody > div { padding: 0.1em; } @@ -1616,6 +1590,7 @@ div.states > .riverType { #riverBody div.label, #riverBody input, #riverBody select, +#routeBody div.label, #lakeBody div.label, #lakeBody input, #lakeBody select { @@ -1623,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, @@ -1632,7 +1613,7 @@ div.states > .riverType { padding: 0.3em 0; } -#saveTilesScreen div.label { +#exportToPngTilesScreen div.label { display: inline-block; width: 5em; } @@ -1828,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; @@ -1844,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; @@ -1875,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; @@ -1920,18 +1883,6 @@ div.editorLine { stroke: #737373; } -#scaleBar { - stroke: none; - fill: none; - cursor: pointer; -} - -#scaleBar text { - fill: #353540; - text-anchor: middle; - font-family: var(--serif); -} - #militaryOptionsTable select { border: 1px solid #d4d4d4; } @@ -1990,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; @@ -1998,6 +1949,7 @@ input[type="checkbox"] { border: 1px solid darkgrey; border-radius: 15%; background: white; + font-family: var(--monospace); } .checkbox:checked + .checkbox-label:before { @@ -2077,7 +2029,6 @@ div.textual span, } #notesBody > iframe { - pointer-events: none; user-select: none; } @@ -2198,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, @@ -2257,10 +2208,6 @@ svg.button { fill: blue; } -#globeOutline { - fill: url(#temperatureGradient); -} - #globeArea { fill: white; fill-opacity: 0.3; @@ -2271,6 +2218,11 @@ svg.button { stroke-width: 0.2; } +#globePrimeMeridian { + stroke: blue; + stroke-width: 1.4; +} + #globeEquator { stroke: red; stroke-width: 1.4; @@ -2392,6 +2344,57 @@ svg.button { 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 { diff --git a/index.html b/index.html index 616f731e..5a18e579 100644 --- a/index.html +++ b/index.html @@ -11,8 +11,8 @@ name="description" content="Free web app that helps fantasy writers, game masters, and cartographers create and edit fantasy maps" /> - + - + - + - - - - - - - + + + + + + + + + + + - + + + + + +
@@ -370,12 +384,12 @@ - +
Azgaar's
Fantasy Map Generator
-
+
‎ ‎

LOADING...

@@ -428,7 +442,7 @@ @@ -806,12 +811,65 @@ + + + + + + + + + + Terracing + + + + + + + Reduce layers + + + + + + + Simplify line + + + + + + + Line style + + + + + + + Color scheme + + + + + + + Opacity - - 0.4 + @@ -820,8 +878,7 @@ Column items - - 8 + @@ -836,8 +893,7 @@ Opacity - - 1 + @@ -864,79 +920,33 @@ Image - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1173,7 +1229,7 @@ - + @@ -1213,16 +1269,14 @@ Fill opacity - - 0.3 + Labels size - - 8 + @@ -1239,8 +1293,7 @@ Body opacity - - + @@ -1249,75 +1302,30 @@ - 10 + Halo opacity - - 1 + Halo blur - - 4 - - - - - - - Color scheme - - - - - - - Terracing - - - 0 - - - - Reduce layers - - - 5 - - - - - Simplify line - - - 0 - - - - - Line style - - + @@ -1326,62 +1334,36 @@ Fill opacity - - 1 + Box Size - - 3 + - State Size + State size - + - Province Size + Province size - + - Burg Size + Burg size - + @@ -1437,6 +1419,83 @@ + + + + Size + + Bar + + Font + + + + + + Position + + x + + y + + + + + + Label + + + + + + + Back opacity + + + + + + + Back fill + + + + + + + + Back stroke + + + + + Width + + + + + + Back padding + + + + + + + + + + Back filter + @@ -1464,16 +1525,12 @@ px - - - + - + - + + + Points number - + 10K @@ -1529,7 +1596,7 @@ - + Year and era @@ -1573,10 +1640,10 @@ Cultures number - + - + @@ -1602,53 +1669,41 @@ - + States number - - - - - + + - + Provinces ratio - - - - - + + - + Size variety - - - - - + + - + Growth rate - - - - - + + @@ -1669,14 +1724,17 @@ data-tip="Define how many organized religions and cults should be generated. Cultures will have their own folk religions in any case" > - + Religions number - - - - - + + @@ -1705,22 +1763,16 @@ > Interface size - - - - - + + Tooltip size - - - - - + + @@ -1740,11 +1792,8 @@ Transparency - - - - - + + @@ -1775,6 +1824,29 @@ + + + Onload behavior + + + + + + + + + Azgaar assistant + + + + + Speaker voice @@ -1907,7 +1979,7 @@ @@ -1938,8 +2010,8 @@ @@ -1947,23 +2019,16 @@
-

Click to configure:

-
- +
Edit
+
- - - - - - - - -
- -

Click to overview:

-
- - - - + + + + + + +
-

Click to regenerate:

-
+
Regenerate
+
+ + + + + - - - - - - - - +
-

Click to add:

-
+
Add
+
- - + +
-

Click to create a new map:

-
- - +
Show
+
+ + +
+ +
Create
+
+ +
@@ -2202,13 +2277,12 @@

- Fantasy Map Generator is a - free + Fantasy Map Generator is an open source - tool which procedurally generates fantasy maps. You may use auto-generated maps as they are, edit them or - even create a new map from scratch. Check out the + tool by Azgaar. You may use auto-generated maps as they are, edit them or even create a new map from + scratch. Check out the Quick start, Q&A, @@ -2222,7 +2296,7 @@

Join our Discord server and Reddit community to ask - questions, get help and share maps. + questions, get help and share maps. The created maps can be used for free, even for commercial purposes.

@@ -2285,6 +2359,22 @@

+
+

Check out our other projects:

+
+ • Armoria: a tool for creating heraldic + coats of arms +
+
+ • Deorum: a vast gallery of customizable fantasy + characters +
+
+ +
+ Chinese localization: 8desk.top +
+
@@ -2404,15 +2494,15 @@
-
-
+ +
+
+ +
+ Presets: + + + + +
+ + + @@ -2683,7 +2829,7 @@
Type:
- + -
+
Icon:
- +
👑
@@ -3452,10 +3644,10 @@ >
-
-
Emblem:
- - +
+
Emblem:
+
+
@@ -3463,7 +3655,7 @@
- + -
+
- +