Skip to content

Commit

Permalink
Merge branch 'master' into aura;-Lucero-Nero.json
Browse files Browse the repository at this point in the history
  • Loading branch information
Aura-6931 authored Dec 3, 2023
2 parents 46902d0 + b36b76b commit 09cd659
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 93 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @TheGiddyLimit
2 changes: 1 addition & 1 deletion _generated/index-timestamps.json

Large diffs are not rendered by default.

13 changes: 11 additions & 2 deletions book/Ghostfire Gaming; Grim Hollow Player's Guide.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
],
"dateAdded": 1620477826,
"dateLastModified": 1695071994,
"dateLastModified": 1701618928,
"optionalFeatureTypes": {
"AdvT": "Adventurer's Talents",
"LC:C": "Living Crucible: Compounds",
Expand Down Expand Up @@ -47,7 +47,7 @@
"BGT:P": "Background Talent; Pauper & Pit Fighter",
"BGT:S": "Background Talent; Seafarer"
},
"_dateLastModifiedHash": "68cd7e78ea"
"_dateLastModifiedHash": "049b3031e6"
},
"book": [
{
Expand Down Expand Up @@ -11119,6 +11119,9 @@
"page": 124,
"level": 8,
"school": "C",
"subschools": [
"sangromancy"
],
"time": [
{
"number": 10,
Expand Down Expand Up @@ -11578,6 +11581,9 @@
"page": 126,
"level": 9,
"school": "T",
"subschools": [
"sangromancy"
],
"time": [
{
"number": 1,
Expand Down Expand Up @@ -11785,6 +11791,9 @@
"page": 127,
"level": 2,
"school": "T",
"subschools": [
"sangromancy"
],
"time": [
{
"number": 1,
Expand Down
32 changes: 8 additions & 24 deletions collection/DMsGuild; Thay Land of the Red Wizards.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"convertedBy": [
"Anonymous"
],
"version": "1.0.0",
"version": "1.0.1",
"color": "0392cd",
"url": "https://www.dmsguild.com/product/386190/Thay-Land-Of-The-Red-Wizards",
"targetSchema": "1.0.0"
}
],
"dateAdded": 1652374503,
"dateLastModified": 1690651615,
"_dateLastModifiedHash": "191fe6ccea"
"dateLastModified": 1701619153,
"_dateLastModifiedHash": "b761a871b5"
},
"background": [
{
Expand Down Expand Up @@ -731,9 +731,7 @@
],
"fluff": {
"entries": [
"The wetlands of Thay are rife with terrible monsters, some of which were transported into the area by the Red Wizards themselves to keep \"intrepid heroes\" at bay. One such terrible monster was the legendary Bogmaw, a hydra of near-unimaginable size that laid waste to numerous villages and farms before it was defeated. The Thayans, impressed with the",
"creature's savagery, sought to duplicate its powers and might; their efforts would soon escape their grasp, though, as the goats they were experimenting upon escaped into the wilderness. Reportedly, only one now remains and those that have witnessed the aftermath of its passage believe this to be Bogmaw returned\u2014most people have no idea that the original",
"hydra is long gone and only this tormented monstrosity remains."
"The wetlands of Thay are rife with terrible monsters, some of which were transported into the area by the Red Wizards themselves to keep \"intrepid heroes\" at bay. One such terrible monster was the legendary Bogmaw, a hydra of near-unimaginable size that laid waste to numerous villages and farms before it was defeated. The Thayans, impressed with the creature's savagery, sought to duplicate its powers and might; their efforts would soon escape their grasp, though, as the goats they were experimenting upon escaped into the wilderness. Reportedly, only one now remains and those that have witnessed the aftermath of its passage believe this to be Bogmaw returned\u2014most people have no idea that the original hydra is long gone and only this tormented monstrosity remains."
]
},
"savingThrowForced": [
Expand Down Expand Up @@ -1099,8 +1097,7 @@
"source": "tlotrw",
"subclassFeatures": [
"Weavebound Paladin|Paladin|PHB|Weavebound|tlotrw|3",
"Channel Divinity: Arcane Armor|Paladin|PHB|Weavebound|tlotrw|3",
"Channel Divinity: Woven from Faith|Paladin|PHB|Weavebound|tlotrw|3",
"Channel Divinity|Paladin|PHB|Weavebound|tlotrw|3",
"Weaver's Mantle|Paladin|PHB|Weavebound|tlotrw|7",
"Crafting the Pattern|Paladin|PHB|Weavebound|tlotrw|15",
"Avatar of the Arcane|Paladin|PHB|Weavebound|tlotrw|20"
Expand Down Expand Up @@ -1214,7 +1211,7 @@
]
},
{
"name": "Channel Divinity: Arcane Armor",
"name": "Channel Divinity",
"source": "tlotrw",
"className": "Paladin",
"classSource": "PHB",
Expand All @@ -1223,21 +1220,8 @@
"subclassSource": "tlotrw",
"level": 3,
"entries": [
"When you take this oath at 3rd level, you gain the following Channel Divinity option:",
"{@b Arcane Armor.} You can use your Channel Divinity as a reaction to provide yourself or your patron with a defensive boost. If you do, you may choose to increase your armor class, or that of your patron, by +6 versus a single magical spell, effect, or attack (including one made with a magical weapon)."
]
},
{
"name": "Channel Divinity: Woven from Faith",
"source": "tlotrw",
"className": "Paladin",
"foundryImg": "icons/skills/melee/weapons-crossed-swords-yellow-teal.webp",
"classSource": "PHB",
"subclassShortName": "Weavebound",
"subclassSource": "tlotrw",
"level": 3,
"entries": [
"When you take this oath at 3rd level, you gain the following Channel Divinity option:",
"When you take this oath at 3rd level, you gain the following two Channel Divinity options:",
"{@b Arcane Armor.} You can use your Channel Divinity as a reaction to provide yourself or your patron with a defensive boost. If you do, you may choose to increase your armor class, or that of your patron, by +6 versus a single magical spell, effect, or attack (including one made with a magical weapon).",
"{@b Woven from Faith.} You can use your Channel Divinity to create a spell component worth up to 50 gp times your paladin level. This spell component lasts until consumed or until one minute has elapsed, whichever occurs first. Selling this item or using it in a duplicitous manner rather than consuming it as part of a spell you cast may draw the ire of your god and patron."
]
},
Expand Down
6 changes: 3 additions & 3 deletions feat/HapHazred; Company Feats.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
],
"status": "wip",
"dateAdded": 1700342109,
"dateLastModified": 1700342109,
"_dateLastModifiedHash": "a3063f7952"
"dateLastModified": 1701618914,
"_dateLastModifiedHash": "2b427f282a"
},
"feat": [
{
Expand Down Expand Up @@ -404,7 +404,7 @@
"source": "BITCFeats",
"page": 2,
"entries": [
"The character can, when taking a short rest, spend a number of minutes of said rest tinkering with a number of weapons up to their proficiency modifier (the number of minutes spent is the number of weapons tinkered with times 10). These weapons will have a bonus of +1 to hit on the next 3 attack rolls made with the weapon."
"The character can, when taking a short rest, spend a number of minutes of said rest tinkering with weapons (the number of minutes spent is the number of weapons tinkered with times 10). These weapons will have a bonus of +1 to hit on the next number of attack rolls made with the weapon equal to the character's proficiency modifier."
],
"foundryImg": "icons/skills/trades/smithing-anvil-silver-red.webp"
},
Expand Down
14 changes: 7 additions & 7 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 @@ -27,7 +27,7 @@
},
"homepage": "https://github.com/TheGiddyLimit/homebrew#readme",
"devDependencies": {
"5etools-utils": "^0.9.44",
"5etools-utils": "^0.9.48",
"commander": "^9.4.1",
"he": "^1.2.0",
"sanitize-html": "^2.10.0"
Expand Down
Loading

0 comments on commit 09cd659

Please sign in to comment.