Skip to content

Commit

Permalink
Merge branch 'master' into pr/3420
Browse files Browse the repository at this point in the history
  • Loading branch information
calculuschild committed May 21, 2024
2 parents b748a59 + 5bbe401 commit 193af61
Show file tree
Hide file tree
Showing 6 changed files with 197 additions and 187 deletions.
64 changes: 33 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"marked-smartypants-lite": "^1.0.2",
"markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.30.1",
"mongoose": "^8.3.3",
"mongoose": "^8.4.0",
"nanoid": "3.3.4",
"nconf": "^0.12.1",
"react": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion themes/V3/5ePHB/snippets/monsterblock.gen.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ module.exports = {
**Condition Immunities** :: ${genList(['groggy', 'swagged', 'weak-kneed', 'buzzed', 'groovy', 'melancholy', 'drunk'], 3)}
**Senses** :: darkvision 60 ft., passive Perception ${_.random(3, 20)}
**Languages** :: ${genList(['Common', 'Pottymouth', 'Gibberish', 'Latin', 'Jive'], 2)}
**Challenge** :: ${_.random(0, 15)} (${_.random(10, 10000)} XP)
**Challenge** :: ${_.random(0, 15)} (${_.random(10, 10000)} XP) {{bonus **Proficiency Bonus** +${_.random(2, 6)}}}
___
${_.times(_.random(genLines, genLines + 2), function(){return genAbilities();}).join('\n:\n')}
:
Expand Down
5 changes: 5 additions & 0 deletions themes/V3/5ePHB/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,11 @@
}
}

.bonus {
float: right;
padding-right: 0.5em;
}

// Monster Ability table
hr + table:first-of-type {
margin : 0;
Expand Down
1 change: 1 addition & 0 deletions themes/fonts/iconFonts/elderberryInn.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ const elderberryInn = {
'ei_action1' : 'ei action-1',
'ei_alter_self' : 'ei alter-self',
'ei_alter_self2' : 'ei alter-self-2',
'ei_magic_beans' : 'ei magic-beans',
'ei_animal_friendship' : 'ei animal-friendship',
'ei_animate_dead' : 'ei animate-dead',
'ei_animate_objects' : 'ei animate-objects',
Expand Down
Loading

0 comments on commit 193af61

Please sign in to comment.