Skip to content

Commit f7aa428

Browse files
committed
v1.189.1
1 parent 290498c commit f7aa428

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+11103
-10006
lines changed

.github/workflows/master.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
- name: Upload Release
4040
# Add the files one-by-one in an effort to avoid timeouts
4141
run: |
42-
hub release create -a 5etools-${{ github.ref_name }}.zip -F RELEASE_NOTES.md ${{ github.ref_name }}
43-
for f in $(find . -name 'img-${{ github.ref_name }}.*' -print); do hub release edit ${{ github.ref_name }} -m '' -a $f; done
42+
gh release create "${{github.ref_name}}" --title "${{github.ref_name}}" --notes-file RELEASE_NOTES.md 5etools-${{ github.ref_name }}.zip
43+
for f in $(find . -name 'img-${{ github.ref_name }}.*' -print); do gh release upload ${{ github.ref_name }} $f; done
4444
env:
4545
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4646

.github/workflows/pages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
5757
- name: Cleanup
5858
run: |
59-
rm -rf node_modules node .gitmodules *.md *.zip scss spellcheck homebrew
59+
rm -rf node_modules node .gitmodules *.md *.zip scss spellcheck homebrew prerelease
6060
ls -lah
6161
6262
- name: Setup Pages

actions.html

-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ <h1 class="page__title no-wrap my-0">Actions</h1>
148148
<script type="text/javascript" src="js/scalecreature.js"></script>
149149
<script type="text/javascript" src="js/hist.js"></script>
150150
<script type="text/javascript" src="js/listpage.js"></script>
151-
152151
<script type="text/javascript" src="js/filter-common.js"></script>
153152
<script type="text/javascript" src="js/filter-actions.js"></script>
154153
<script type="text/javascript" src="js/actions.js"></script>

backgrounds.html

-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ <h1 class="page__title no-wrap my-0">Backgrounds</h1>
148148
<script type="text/javascript" src="js/scalecreature.js"></script>
149149
<script type="text/javascript" src="js/hist.js"></script>
150150
<script type="text/javascript" src="js/listpage.js"></script>
151-
152151
<script type="text/javascript" src="js/filter-common.js"></script>
153152
<script type="text/javascript" src="js/filter-backgrounds.js"></script>
154153
<script type="text/javascript" src="js/backgrounds.js"></script>

charcreationoptions.html

+10-9
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
</head>
5858

5959
<body>
60+
6061
<div class="cancer__wrp-sidebar-rhs cancer__anchor"><div class="cancer__disp-cancer"></div><div class="cancer__sidebar-rhs-inner cancer__sidebar-rhs-inner--top"><!--5ETOOLS_AD_RIGHT_1--></div><div class="cancer__sidebar-rhs-inner cancer__sidebar-rhs-inner--bottom"><!--5ETOOLS_AD_RIGHT_2--></div></div>
6162

6263
<div class="viewport-wrapper">
@@ -65,7 +66,7 @@
6566
<header class="hidden-xs hidden-sm page__header">
6667
<div class="container ve-flex-v-baseline">
6768
<h1 class="page__title no-wrap my-0">Other Character Creation Options</h1>
68-
<p class="page__subtitle no-wrap my-0" id="page__subtitle">Search by name on the left, click name to display on the right.</p>
69+
<p class="page__subtitle no-wrap my-0" id="page__subtitle">Search by name on the left, click a name to display on the right.</p>
6970
</div>
7071
</header>
7172
<nav class="container page__nav" id="navigation">
@@ -83,15 +84,14 @@ <h1 class="page__title no-wrap my-0">Other Character Creation Options</h1>
8384
</div>
8485
<button class="btn btn-default" id="reset">Reset</button>
8586
</div>
87+
8688
<div id="filtertools" class="input-group input-group--bottom ve-flex no-shrink">
8789
<button class="col-5 sort btn btn-default btn-xs" data-sort="type">Type</button>
8890
<button class="col-5 sort btn btn-default btn-xs" data-sort="name">Name</button>
8991
<button class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
9092
</div>
9193

92-
<div class="list list--stats charcreationoptions">
93-
94-
</div>
94+
<div id="list" class="list list--stats"></div>
9595
</div>
9696

9797
<div class="cancer__wrp-mobile-1 cancer__anchor"><div class="cancer__disp-cancer"></div><!--5ETOOLS_AD_MOB_PLAYER_1--></div>
@@ -102,19 +102,18 @@ <h1 class="page__title no-wrap my-0">Other Character Creation Options</h1>
102102
<button class="col-5 sort btn btn-default btn-xs" data-sort="type">Type</button>
103103
<button class="col-7 sort btn btn-default btn-xs" data-sort="name">Name</button>
104104
</div>
105-
<div class="list subcharcreationoptions">
106-
<!-- populate with JS -->
107-
</div>
105+
106+
<div id="sublist" class="list"></div>
108107
</div>
109108

110109
<div class="wrp-stat-tab" id="stat-tabs">
111110
<div id="tabs-right"></div>
112111
</div>
113112

114-
<div class="wrp-stats-table">
113+
<div id="wrp-pagecontent" class="wrp-stats-table">
115114
<table id="pagecontent" class="w-100 stats">
116115
<tr><th class="border" colspan="6"></th></tr>
117-
<tr><td colspan="6" class="initial-message">Select a character creation option from the list to view it here</td></tr>
116+
<tr><td colspan="6" class="initial-message">Select an entry from the list to view it here</td></tr>
118117
<tr><th class="border" colspan="6"></th></tr>
119118
</table>
120119
</div>
@@ -126,6 +125,7 @@ <h1 class="page__title no-wrap my-0">Other Character Creation Options</h1>
126125
</div>
127126
</div>
128127
</div>
128+
129129
<!--5ETOOLS_SCRIPT_ANCHOR-->
130130
<!--5ETOOLS_AD_ADHESION-->
131131

@@ -147,6 +147,7 @@ <h1 class="page__title no-wrap my-0">Other Character Creation Options</h1>
147147
<script type="text/javascript" src="js/scalecreature.js"></script>
148148
<script type="text/javascript" src="js/hist.js"></script>
149149
<script type="text/javascript" src="js/listpage.js"></script>
150+
<script type="text/javascript" src="js/filter-common.js"></script>
150151
<script type="text/javascript" src="js/filter-charcreationoptions.js"></script>
151152
<script type="text/javascript" src="js/charcreationoptions.js"></script>
152153
<script type="text/javascript" src="js/list2.js"></script>

conditionsdiseases.html

+14-9
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,18 @@
5757
</head>
5858

5959
<body>
60+
6061
<div class="cancer__wrp-sidebar-rhs cancer__anchor"><div class="cancer__disp-cancer"></div><div class="cancer__sidebar-rhs-inner cancer__sidebar-rhs-inner--top"><!--5ETOOLS_AD_RIGHT_1--></div><div class="cancer__sidebar-rhs-inner cancer__sidebar-rhs-inner--bottom"><!--5ETOOLS_AD_RIGHT_2--></div></div>
6162

6263
<div class="viewport-wrapper">
6364
<div class="cancer__wrp-leaderboard cancer__anchor"><div class="cancer__disp-cancer"></div><div class="cancer__wrp-leaderboard-inner"><!--5ETOOLS_AD_LEADERBOARD--></div></div>
6465

6566
<header class="hidden-xs hidden-sm page__header">
6667
<div class="container ve-flex-v-baseline">
67-
<h1 class="page__title no-wrap my-0">Conditions & Diseases</h1>
68+
<h1 class="page__title no-wrap my-0">Conditions &amp; Diseases</h1>
6869
<p class="page__subtitle no-wrap my-0" id="page__subtitle">Search by name on the left, click a name to display on the right.</p>
6970
</div>
7071
</header>
71-
7272
<nav class="container page__nav" id="navigation">
7373
<ul class="nav nav-pills page__nav-inner" id="navbar"></ul>
7474
</nav>
@@ -92,25 +92,26 @@ <h1 class="page__title no-wrap my-0">Conditions & Diseases</h1>
9292
<button class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
9393
</div>
9494

95-
<div class="list list--stats conditions"></div>
95+
<div id="list" class="list list--stats"></div>
9696
</div>
9797

98+
<div class="cancer__wrp-mobile-1 cancer__anchor"><div class="cancer__disp-cancer"></div><!--5ETOOLS_AD_MOB_PLAYER_1--></div>
99+
98100
<div id="contentwrapper" class="view-col">
99101
<div id="sublistcontainer" class="sublist sublist--resizable no-print">
100102
<div id="sublistsort" class="btn-group sublist__wrp-cols">
101103
<button class="col-2 sort btn btn-default btn-xs" data-sort="type">Type</button>
102104
<button class="col-10 sort btn btn-default btn-xs" data-sort="name">Name</button>
103105
</div>
104-
<div class="list subconditions">
105-
<!-- populate with JS -->
106-
</div>
106+
107+
<div id="sublist" class="list"></div>
107108
</div>
108109

109110
<div class="wrp-stat-tab" id="stat-tabs">
110111
<div id="tabs-right"></div>
111112
</div>
112113

113-
<div class="wrp-stats-table">
114+
<div id="wrp-pagecontent" class="wrp-stats-table">
114115
<table id="pagecontent" class="w-100 stats">
115116
<tr><th class="border" colspan="6"></th></tr>
116117
<tr><td colspan="6" class="initial-message">Select an entry from the list to view it here</td></tr>
@@ -124,8 +125,11 @@ <h1 class="page__title no-wrap my-0">Conditions & Diseases</h1>
124125
</div>
125126
</div>
126127
</div>
127-
</div> <!--5ETOOLS_SCRIPT_ANCHOR-->
128+
</div>
129+
130+
<!--5ETOOLS_SCRIPT_ANCHOR-->
128131
<!--5ETOOLS_AD_ADHESION-->
132+
129133
<script type="text/javascript" src="lib/jquery.js"></script>
130134
<script type="text/javascript" src="js/parser.js"></script>
131135
<script type="text/javascript" src="js/utils.js"></script>
@@ -144,10 +148,11 @@ <h1 class="page__title no-wrap my-0">Conditions & Diseases</h1>
144148
<script type="text/javascript" src="js/scalecreature.js"></script>
145149
<script type="text/javascript" src="js/hist.js"></script>
146150
<script type="text/javascript" src="js/listpage.js"></script>
151+
<script type="text/javascript" src="js/filter-common.js"></script>
147152
<script type="text/javascript" src="js/filter-conditionsdiseases.js"></script>
148153
<script type="text/javascript" src="js/conditionsdiseases.js"></script>
149154
<script type="text/javascript" src="js/list2.js"></script>
150155
<script type="text/javascript" src="lib/elasticlunr.js"></script>
151-
</body>
152156

157+
</body>
153158
</html>

converter.html

+1
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ <h3 class="conv__head">Output</h3>
141141
<script type="text/javascript" src="js/converterutils-race.js"></script>
142142
<script type="text/javascript" src="js/converterutils-background.js"></script>
143143
<script type="text/javascript" src="js/converter.js"></script>
144+
<script type="text/javascript" src="js/converter-feature.js"></script>
144145
<script type="text/javascript" src="js/converter-creature.js"></script>
145146
<script type="text/javascript" src="js/converter-spell.js"></script>
146147
<script type="text/javascript" src="js/converter-item.js"></script>

css/main.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cultsboons.html

+21-11
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
</head>
5858

5959
<body>
60+
6061
<div class="cancer__wrp-sidebar-rhs cancer__anchor"><div class="cancer__disp-cancer"></div><div class="cancer__sidebar-rhs-inner cancer__sidebar-rhs-inner--top"><!--5ETOOLS_AD_RIGHT_1--></div><div class="cancer__sidebar-rhs-inner cancer__sidebar-rhs-inner--bottom"><!--5ETOOLS_AD_RIGHT_2--></div></div>
6162

6263
<div class="viewport-wrapper">
@@ -65,18 +66,16 @@
6566
<header class="hidden-xs hidden-sm page__header">
6667
<div class="container ve-flex-v-baseline">
6768
<h1 class="page__title no-wrap my-0">Cults &amp; Supernatural Boons</h1>
68-
<p class="page__subtitle no-wrap my-0" id="page__subtitle">Search by name on the left, click to display on the right.</p>
69+
<p class="page__subtitle no-wrap my-0" id="page__subtitle">Search by name on the left, click a name to display on the right.</p>
6970
</div>
7071
</header>
71-
7272
<nav class="container page__nav" id="navigation">
7373
<ul class="nav nav-pills page__nav-inner" id="navbar"></ul>
7474
</nav>
7575

7676
<div class="view-col-group--cancer h-100 mh-0">
7777
<div class="container view-col-wrapper view-col-wrapper--cancer">
7878
<div class="view-col" id="listcontainer">
79-
8079
<div class="lst__form-top" id="filter-search-group">
8180
<div class="w-100 relative">
8281
<input type="search" id="lst__search" autocomplete="off" autocapitalize="off" spellcheck="false" class="search form-control lst__search lst__search--no-border-h">
@@ -93,35 +92,45 @@ <h1 class="page__title no-wrap my-0">Cults &amp; Supernatural Boons</h1>
9392
<button class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
9493
</div>
9594

96-
<div class="list list--stats cultsboons"></div>
95+
<div id="list" class="list list--stats"></div>
9796
</div>
9897

98+
<div class="cancer__wrp-mobile-1 cancer__anchor"><div class="cancer__disp-cancer"></div><!--5ETOOLS_AD_MOB_PLAYER_1--></div>
99+
99100
<div id="contentwrapper" class="view-col">
100101
<div id="sublistcontainer" class="sublist sublist--resizable no-print">
101102
<div id="sublistsort" class="btn-group sublist__wrp-cols">
102103
<button class="col-2 sort btn btn-default btn-xs" data-sort="type">Type</button>
103104
<button class="col-2 sort btn btn-default btn-xs" data-sort="subType">Subtype</button>
104105
<button class="col-8 sort btn btn-default btn-xs" data-sort="name">Name</button>
105106
</div>
106-
<div class="list subcultsboons">
107-
<!-- populate with JS -->
108-
</div>
107+
108+
<div id="sublist" class="list"></div>
109109
</div>
110110

111-
<div class="wrp-stat-tab">
111+
<div class="wrp-stat-tab" id="stat-tabs">
112112
<div id="tabs-right"></div>
113113
</div>
114114

115-
<div class="wrp-stats-table"><table id="pagecontent" class="w-100 stats"></table></div>
115+
<div id="wrp-pagecontent" class="wrp-stats-table">
116+
<table id="pagecontent" class="w-100 stats">
117+
<tr><th class="border" colspan="6"></th></tr>
118+
<tr><td colspan="6" class="initial-message">Select an entry from the list to view it here</td></tr>
119+
<tr><th class="border" colspan="6"></th></tr>
120+
</table>
121+
</div>
116122

117123
<div class="ve-text-center mt-2 no-print">
118124
<button class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
119125
</div>
120126
</div>
121127
</div>
122128
</div>
123-
</div> <!--5ETOOLS_SCRIPT_ANCHOR-->
129+
</div>
130+
131+
<!--5ETOOLS_SCRIPT_ANCHOR-->
124132
<!--5ETOOLS_AD_ADHESION-->
133+
125134
<script type="text/javascript" src="lib/jquery.js"></script>
126135
<script type="text/javascript" src="js/parser.js"></script>
127136
<script type="text/javascript" src="js/utils.js"></script>
@@ -140,10 +149,11 @@ <h1 class="page__title no-wrap my-0">Cults &amp; Supernatural Boons</h1>
140149
<script type="text/javascript" src="js/scalecreature.js"></script>
141150
<script type="text/javascript" src="js/hist.js"></script>
142151
<script type="text/javascript" src="js/listpage.js"></script>
152+
<script type="text/javascript" src="js/filter-common.js"></script>
143153
<script type="text/javascript" src="js/filter-cultsboons.js"></script>
144154
<script type="text/javascript" src="js/cultsboons.js"></script>
145155
<script type="text/javascript" src="js/list2.js"></script>
146156
<script type="text/javascript" src="lib/elasticlunr.js"></script>
147-
</body>
148157

158+
</body>
149159
</html>

data/adventure/adventure-cm.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27798,7 +27798,7 @@
2779827798
"You crest a dune and see a rocky escarpment in the distance with small cave entrances all over its surface. Dozens of tiny humanoid creatures dash back into the caves, sensing your presence."
2779927799
]
2780027800
},
27801-
"The tiny creatures are desert-dwelling {@creature Chwinga|IDRotF|chwingas} (see their stat block at {@area the end of the adventure|524|x}) that live in tiny caves built up on the shell of a giant dragon tortoise. If the characters approach the escarpment, the earth rumbles as the dragon tortoise raises its massive head out of the sand, addresses them, and asks their intentions.",
27801+
"The tiny creatures are desert-dwelling {@creature Chwinga|IDRotF|chwingas} (see their stat block at {@area the end of the adventure|524|x}) that live in tiny caves built up on the shell of a giant {@creature dragon tortoise|CM}. If the characters approach the escarpment, the earth rumbles as the {@creature dragon tortoise|CM} raises its massive head out of the sand, addresses them, and asks their intentions.",
2780227802
"For the {@creature dragon tortoise|CM}, use the {@creature dragon turtle} stat block with the following changes:",
2780327803
{
2780427804
"type": "list",

0 commit comments

Comments
 (0)