Merge branch 'master' into pr/1572

2026-01-08 14:02:41 +00:00 · 2021-09-21 22:53:49 -04:00
parent 1c88eb80c0 c20fa90c3f
commit 5f11607358
25 changed files with 1569 additions and 924 deletions
--- a/client/homebrew/editor/snippetbar/snippets/classfeature.gen.js
+++ b/client/homebrew/editor/snippetbar/snippets/classfeature.gen.js
@@ -1,4 +1,5 @@
 const _ = require('lodash');
+const dedent = require('dedent-tabs').default;

 module.exports = function(classname){

@@ -10,33 +11,32 @@ module.exports = function(classname){
 	const hitDie = _.sample([4, 6, 8, 10, 12]);

 	const abilityList = ['Strength', 'Dexerity', 'Constitution', 'Wisdom', 'Charisma', 'Intelligence'];
-	const skillList = ['Acrobatics ', 'Animal Handling', 'Arcana', 'Athletics', 'Deception', 'History', 'Insight', 'Intimidation', 'Investigation', 'Medicine', 'Nature', 'Perception', 'Performance', 'Persuasion', 'Religion', 'Sleight of Hand', 'Stealth', 'Survival'];
+	const skillList = ['Acrobatics', 'Animal Handling', 'Arcana', 'Athletics', 'Deception', 'History', 'Insight', 'Intimidation', 'Investigation', 'Medicine', 'Nature', 'Perception', 'Performance', 'Persuasion', 'Religion', 'Sleight of Hand', 'Stealth', 'Survival'];


-	return [
-		'## Class Features',
-		`As a ${classname}, you gain the following class features`,
-		'#### Hit Points',
-		'___',
-		`- **Hit Dice:** 1d${hitDie} per ${classname} level`,
-		`- **Hit Points at 1st Level:** ${hitDie} + your Constitution modifier`,
-		`- **Hit Points at Higher Levels:** 1d${hitDie} (or ${hitDie/2 + 1}) + your Constitution modifier per ${classname} level after 1st`,
-		'',
-		'#### Proficiencies',
-		'___',
-		`- **Armor:** ${_.sampleSize(['Light armor', 'Medium armor', 'Heavy armor', 'Shields'], _.random(0, 3)).join(', ') || 'None'}`,
-		`- **Weapons:** ${_.sampleSize(['Squeegee', 'Rubber Chicken', 'Simple weapons', 'Martial weapons'], _.random(0, 2)).join(', ') || 'None'}`,
-		`- **Tools:** ${_.sampleSize(['Artian\'s tools', 'one musical instrument', 'Thieve\'s tools'], _.random(0, 2)).join(', ') || 'None'}`,
-		'',
-		'___',
-		`- **Saving Throws:** ${_.sampleSize(abilityList, 2).join(', ')}`,
-		`- **Skills:** Choose two from ${_.sampleSize(skillList, _.random(4, 6)).join(', ')}`,
-		'',
-		'#### Equipment',
-		'You start with the following equipment, in addition to the equipment granted by your background:',
-		'- *(a)* a martial weapon and a shield or *(b)* two martial weapons',
-		'- *(a)* five javelins or *(b)* any simple melee weapon',
-		`- ${_.sample(['10 lint fluffs', '1 button', 'a cherished lost sock'])}`,
-		'\n\n\n'
-	].join('\n');
+	return dedent`
+		## Class Features
+		As a ${classname}, you gain the following class features
+		#### Hit Points
+
+		**Hit Dice:**                    :: 1d${hitDie} per ${classname} level
+		**Hit Points at 1st Level:**     :: ${hitDie} + your Constitution modifier
+		**Hit Points at Higher Levels:** :: 1d${hitDie} (or ${hitDie/2 + 1}) + your Constitution modifier per ${classname} level after 1st
+
+		#### Proficiencies
+
+		**Armor:**   :: ${_.sampleSize(['Light armor', 'Medium armor', 'Heavy armor', 'Shields'], _.random(0, 3)).join(', ') || 'None'}
+		**Weapons:** :: ${_.sampleSize(['Squeegee', 'Rubber Chicken', 'Simple weapons', 'Martial weapons'], _.random(0, 2)).join(', ') || 'None'}
+		**Tools:**   :: ${_.sampleSize(['Artian\'s tools', 'one musical instrument', 'Thieve\'s tools'], _.random(0, 2)).join(', ') || 'None'}
+
+		**Saving Throws:** :: ${_.sampleSize(abilityList, 2).join(', ')}
+		**Skills:**        :: Choose two from ${_.sampleSize(skillList, _.random(4, 6)).join(', ')}
+
+		#### Equipment
+		You start with the following equipment, in addition to the equipment granted by your background:
+		- *(a)* a martial weapon and a shield or *(b)* two martial weapons
+		- *(a)* five javelins or *(b)* any simple melee weapon
+		- ${_.sample(['10 lint fluffs', '1 button', 'a cherished lost sock'])}
+
+		`;
 };
--- a/client/homebrew/editor/snippetbar/snippets/magic.gen.js
+++ b/client/homebrew/editor/snippetbar/snippets/magic.gen.js
@@ -60,13 +60,13 @@ module.exports = {
 		const levels = ['Cantrips (0 Level)', '1st Level', '2nd Level', '3rd Level', '4th Level', '5th Level', '6th Level', '7th Level', '8th Level', '9th Level'];

 		const content = _.map(levels, (level)=>{
-			const spells = _.map(_.sampleSize(spellNames, _.random(5, 15)), (spell)=>{
+			const spells = _.map(_.sampleSize(spellNames, _.random(4, 10)), (spell)=>{
 				return `- ${spell}`;
 			}).join('\n');
 			return `##### ${level} \n${spells} \n`;
 		}).join('\n');

-		return `{{spellList\n${content}\n}}`;
+		return `{{spellList,wide\n${content}\n}}`;
 	},

 	spell : function(){
--- a/client/homebrew/editor/snippetbar/snippets/monsterblock.gen.js
+++ b/client/homebrew/editor/snippetbar/snippets/monsterblock.gen.js
@@ -105,6 +105,20 @@ const genAbilities = function(){
 	]);
 };

+const genLongAbilities = function(){
+	return _.sample([
+		dedent`***Pack Tactics.*** These guys work together like peanut butter and jelly. Jelly and peanut butter.
+
+		When one of these guys attacks, the target is covered with, well, peanut butter and jelly.`,
+		dedent`***Hangriness.*** This creature is angry, and hungry. It will refuse to do anything with you until its hunger is satisfied.
+
+		When in visual contact with this creature, you must purchase an extra order of fries, even if they say they aren't hungry.`,
+		dedent`***Full of Detergent.*** This creature has swallowed an entire bottle of dish detergent and is actually having a pretty good time.
+
+		While walking near this creature, you must make a dexterity check or become "a soapy mess" for three hours, after which your skin will get all dry and itchy.`
+	]);
+};
+
 const genAction = function(){
 	const name = _.sample([
 		'Abdominal Drop',
@@ -159,11 +173,11 @@ module.exports = {
 			**Languages**            :: ${genList(['Common', 'Pottymouth', 'Gibberish', 'Latin', 'Jive'], 2)}
 			**Challenge**            :: ${_.random(0, 15)} (${_.random(10, 10000)} XP)
 			___
+			${_.times(_.random(genLines, genLines + 2), function(){return genAbilities();}).join('\n:\n')}
 			:
-			${_.times(_.random(genLines, genLines + 2), function(){return genAbilities();}).join('\n\t\t\t\n\t\t\t')}
-			:
+			${genLongAbilities()}
 			### Actions
-			${_.times(_.random(genLines, genLines + 2), function(){return genAction();}).join('\n\t\t\t\n\t\t\t')}
+			${_.times(_.random(genLines, genLines + 2), function(){return genAction();}).join('\n:\n')}
 			}}
 			\n`;
 	}
--- a/client/homebrew/editor/snippetbar/snippets/snippets.js
+++ b/client/homebrew/editor/snippetbar/snippets/snippets.js
@@ -130,7 +130,7 @@ module.exports = [
 				gen  : dedent`
 					![cat warrior](https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg) {width:325px,mix-blend-mode:multiply}

-					{{artist,position:relative,top:-230px,left:-100px,margin-bottom:-30px
+					{{artist,position:relative,top:-230px,left:10px,margin-bottom:-30px
 					##### Cat Warrior
 					[Kyoung Hwan Kim](https://www.artstation.com/tahra)
 					}}`
@@ -141,7 +141,7 @@ module.exports = [
 				gen  : dedent`
 					![homebrew mug](http://i.imgur.com/hMna6G0.png) {position:absolute,top:50px,right:30px,width:280px}

-					{{artist,top:90px,right:30px
+					{{artist,top:80px,right:30px
 					##### Homebrew Mug
 					[naturalcrit](https://homebrew.naturalcrit.com)
 					}}`
--- a/client/homebrew/editor/snippetbar/snippets/tableOfContents.gen.js
+++ b/client/homebrew/editor/snippetbar/snippets/tableOfContents.gen.js
@@ -53,19 +53,19 @@ module.exports = function(brew){
 	const TOC = getTOC(pages);
 	const markdown = _.reduce(TOC, (r, g1, idx1)=>{
 		if(g1.title !== null) {
-			r.push(`\t\t- ### [{{ ${g1.title}}}{{ ${g1.page}}}](#p${g1.page})`);
+			r.push(`- ### [{{ ${g1.title}}}{{ ${g1.page}}}](#p${g1.page})`);
 		}
 		if(g1.children.length){
 			_.each(g1.children, (g2, idx2)=>{
 				if(g2.title !== null) {
-					r.push(`\t\t  - #### [{{ ${g2.title}}}{{ ${g2.page}}}](#p${g2.page})`);
+					r.push(`  - #### [{{ ${g2.title}}}{{ ${g2.page}}}](#p${g2.page})`);
 				}
 				if(g2.children.length){
 					_.each(g2.children, (g3, idx3)=>{
 						if(g2.title !== null) {
-							r.push(`\t\t    - [{{ ${g3.title}}}{{ ${g3.page}}}](#p${g3.page})`);
+							r.push(`    - [{{ ${g3.title}}}{{ ${g3.page}}}](#p${g3.page})`);
 						} else { // Don't over-indent if no level-2 parent entry
-							r.push(`\t\t  - [{{ ${g3.title}}}{{ ${g3.page}}}](#p${g3.page})`);
+							r.push(`  - [{{ ${g3.title}}}{{ ${g3.page}}}](#p${g3.page})`);
 						}
 					});
 				}
@@ -78,7 +78,7 @@ module.exports = function(brew){
 		{{toc,wide
 		# Table Of Contents

-${markdown}
+		${markdown}
 		}}
 		\n`;
 };
--- a/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js
+++ b/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js
@@ -241,40 +241,25 @@ module.exports = [
 			{
 				name : 'Split Table',
 				icon : 'fas fa-th-large',
-				gen  : function(){
-					return [
-						'<div style=\'column-count:2\'>',
-						'| d10 | Damage Type |',
-						'|:---:|:------------|',
-						'|  1  | Acid        |',
-						'|  2  | Cold        |',
-						'|  3  | Fire        |',
-						'|  4  | Force       |',
-						'|  5  | Lightning   |',
-						'',
-						'```',
-						'```',
-						'',
-						'| d10 | Damage Type |',
-						'|:---:|:------------|',
-						'|  6  | Necrotic    |',
-						'|  7  | Poison      |',
-						'|  8  | Psychic     |',
-						'|  9  | Radiant     |',
-						'|  10 | Thunder     |',
-						'</div>\n\n',
-					].join('\n');
-				},
-			},
-			{
-				name : 'Class Table',
-				icon : 'fas fa-table',
-				gen  : ClassTableGen.full,
-			},
-			{
-				name : 'Half Class Table',
-				icon : 'fas fa-list-alt',
-				gen  : ClassTableGen.half,
+				gen  : dedent`\n
+					<div style='column-count:2'>
+					| d10 | Damage Type |
+					|:---:|:------------|
+					|  1  | Acid        |
+					|  2  | Cold        |
+					|  3  | Fire        |
+					|  4  | Force       |
+					|  5  | Lightning   |
+
+					| d10 | Damage Type |
+					|:---:|:------------|
+					|  6  | Necrotic    |
+					|  7  | Poison      |
+					|  8  | Psychic     |
+					|  9  | Radiant     |
+					|  10 | Thunder     |
+					</div>
+					\n`
 			}
 		]
 	},