Merge pull request #3420 from Gazook89/RPG-Awesome-Redux

RPG Awesome Redux
naturalcrit · May 21, 2024 · 933ac41 · 933ac41
2 parents 5bbe401 + 54b4d49
commit 933ac41
Show file tree

Hide file tree

Showing 9 changed files with 1,051 additions and 3 deletions.
diff --git a/shared/naturalcrit/codeEditor/autocompleteEmoji.js b/shared/naturalcrit/codeEditor/autocompleteEmoji.js
@@ -1,11 +1,13 @@
 const diceFont      = require('../../../themes/fonts/iconFonts/diceFont.js');
 const elderberryInn = require('../../../themes/fonts/iconFonts/elderberryInn.js');
 const fontAwesome   = require('../../../themes/fonts/iconFonts/fontAwesome.js');
+const gameIcons     = require('../../../themes/fonts/iconFonts/gameIcons.js');
 
 const emojis = {
 	...diceFont,
 	...elderberryInn,
-	...fontAwesome
+	...fontAwesome,
+	...gameIcons
 };
 
 const showAutocompleteEmoji = function(CodeMirror, editor) {

diff --git a/shared/naturalcrit/codeEditor/codeEditor.less b/shared/naturalcrit/codeEditor/codeEditor.less
@@ -7,6 +7,7 @@
 //Icon fonts included so they can appear in emoji autosuggest dropdown
 @import (less) './themes/fonts/iconFonts/diceFont.less';
 @import (less) './themes/fonts/iconFonts/elderberryInn.less';
+@import (less) './themes/fonts/iconFonts/gameIcons.less';
 
 @keyframes sourceMoveAnimation {
 	50%  {background-color: red;   color: white;}

diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js
@@ -10,6 +10,7 @@ const { markedEmoji: MarkedEmojis } = require('marked-emoji');
 const diceFont      = require('../../themes/fonts/iconFonts/diceFont.js');
 const elderberryInn = require('../../themes/fonts/iconFonts/elderberryInn.js');
 const fontAwesome   = require('../../themes/fonts/iconFonts/fontAwesome.js');
+const gameIcons     = require('../../themes/fonts/iconFonts/gameIcons.js');
 
 const MathParser = require('expr-eval').Parser;
 const renderer = new Marked.Renderer();
@@ -688,7 +689,8 @@ const MarkedEmojiOptions = {
 	emojis : {
 		...diceFont,
 		...elderberryInn,
-		...fontAwesome
+		...fontAwesome,
+		...gameIcons,
 	},
 	renderer : (token)=>`<i class="${token.emoji}"></i>`
 };

diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less
@@ -2,6 +2,7 @@
 @import (less) './themes/assets/assets.less';
 @import (less) './themes/fonts/iconFonts/elderberryInn.less';
 @import (less) './themes/fonts/iconFonts/diceFont.less';
+@import (less) './themes/fonts/iconFonts/gameIcons.less';
 
 :root {
 	//Colors

diff --git a/themes/fonts/iconFonts/elderberryInn.js b/themes/fonts/iconFonts/elderberryInn.js
@@ -29,7 +29,7 @@ const elderberryInn = {
 	'ei_slashing'    : 'ei slashing',
 	'ei_thunder'     : 'ei thunder',
 
-	/* DnD Donditions */
+	/* DnD Conditions */
 	'ei_blinded'       : 'ei blinded',
 	'ei_charmed'       : 'ei charmed',
 	'ei_deafened'      : 'ei deafened',

diff --git a/themes/fonts/iconFonts/game-icons_license.md b/themes/fonts/iconFonts/game-icons_license.md
@@ -0,0 +1,13 @@
+# Game Icons License
+
+The font used in gameIcons.woff / gameIcons.less / gameIcons.js, and usable in the Homebrewery as "gi" icons, are a subset of the Game-Icons.net library of icons.
+
+## The license
+
+Game-Icons has this to say about their license:
+
+> Game-icons.net is an online repository providing heaps of cool game related graphics.
+> 
+> They are provided provided under the terms of the Creative Commons 3.0 BY license.
+> 
+> It means that you can use them freely as long as you credit the original author in your creation(see below). A mention like "Icons made by {author;}. Available on https://game-icons.net" is fine.
diff --git a/themes/fonts/iconFonts/gameIcons.js b/themes/fonts/iconFonts/gameIcons.js