slaguru666/roll20-character-sheets-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ADnD_2E_Revised-More_sheet_settings_and_books' into ADnD_2E_Revised-Even_more_books

Browse Source 
# Conflicts:
#	ADnD 2E Revised/javascript/sheetWorkers.js
This commit is contained in:
Peter Bjerg Lidegaard
2022-01-17 15:51:05 +01:00
parent 572677fef7 2d3918fffb
commit db6c84591e
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ADnD 2E Revised/2ESheet.html
+10 -10
View File
@@ -18089,49 +18089,49 @@
<td>The Complete Book of Dwarves</td>
<td>1991 October</td>
<td>Weapons, Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcbod' title="@{book-tcbod}" value="The Complete Book of Dwarves"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-dwarves' title="@{book-dwarves}" value="The Complete Book of Dwarves"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Bard's Handbook</td>
<td>1992 March</td>
<td>Spells, Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcbhb' title="@{book-tcbhb}" value="The Complete Bard's Handbook"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-bards' title="@{book-bards}" value="The Complete Bard's Handbook"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Book of Elves</td>
<td>1992 December</td>
<td>Weapons, Spells, Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcboe' title="@{book-tcboe}" value="The Complete Book of Elves"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-elves' title="@{book-elves}" value="The Complete Book of Elves"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Book of Humanoids</td>
<td>1993 April</td>
<td>Weapons, Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcboh' title="@{book-tcboh}" value="The Complete Book of Humanoids"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-humanoids' title="@{book-humanoids}" value="The Complete Book of Humanoids"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Ranger's Handbook</td>
<td>1993 December</td>
<td>Weapons, Spells, Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcrhb' title="@{book-tcrhb}" value="The Complete Ranger's Handbook"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-rangers' title="@{book-rangers}" value="The Complete Ranger's Handbook"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Paladin's Handbook</td>
<td>1994 May</td>
<td>Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcpahb' title="@{book-tcpahb}" value="The Complete Paladin's Handbook"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-paladins' title="@{book-paladins}" value="The Complete Paladin's Handbook"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Druid's Handbook</td>
<td>1994 August</td>
<td>Spells</td>
<td><label><input type='checkbox' name='attr_book-tcdhb' title="@{book-tcdhb}" value="The Complete Druid's Handbook"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-druids' title="@{book-druids}" value="The Complete Druid's Handbook"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Barbarian's Handbook</td>
<td>1995 January</td>
<td>Weapons and Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcbarbhb' title="@{book-tcbarbhb}" value="The Complete Barbarian's Handbook"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-barbarians' title="@{book-barbarians}" value="The Complete Barbarian's Handbook"/><span></span></label></td>
</tr>
</table>
<br>
@@ -41112,8 +41112,8 @@ const ERROR = 'error';
const BOOK_FIELDS = [
'book-phb', 'book-tcfhb', 'book-tcthb', 'book-tcprhb', 'book-tcwhb',
'book-tom', 'book-aaeg',
'book-tcbod', 'book-tcbhb', 'book-tcboe', 'book-tcboh', 'book-tcrhb',
'book-tcpahb', 'book-tcdhb', 'book-tcbarbhb',
'book-dwarves', 'book-bards', 'book-elves', 'book-humanoids', 'book-rangers',
'book-paladins', 'book-druids', 'book-barbarians'
];
//#region Helper function
ADnD 2E Revised/html/2ESheet-base.html
+8 -8
View File
@@ -12695,49 +12695,49 @@
<td>The Complete Book of Dwarves</td>
<td>1991 October</td>
<td>Weapons, Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcbod' title="@{book-tcbod}" value="The Complete Book of Dwarves"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-dwarves' title="@{book-dwarves}" value="The Complete Book of Dwarves"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Bard's Handbook</td>
<td>1992 March</td>
<td>Spells, Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcbhb' title="@{book-tcbhb}" value="The Complete Bard's Handbook"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-bards' title="@{book-bards}" value="The Complete Bard's Handbook"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Book of Elves</td>
<td>1992 December</td>
<td>Weapons, Spells, Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcboe' title="@{book-tcboe}" value="The Complete Book of Elves"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-elves' title="@{book-elves}" value="The Complete Book of Elves"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Book of Humanoids</td>
<td>1993 April</td>
<td>Weapons, Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcboh' title="@{book-tcboh}" value="The Complete Book of Humanoids"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-humanoids' title="@{book-humanoids}" value="The Complete Book of Humanoids"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Ranger's Handbook</td>
<td>1993 December</td>
<td>Weapons, Spells, Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcrhb' title="@{book-tcrhb}" value="The Complete Ranger's Handbook"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-rangers' title="@{book-rangers}" value="The Complete Ranger's Handbook"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Paladin's Handbook</td>
<td>1994 May</td>
<td>Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcpahb' title="@{book-tcpahb}" value="The Complete Paladin's Handbook"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-paladins' title="@{book-paladins}" value="The Complete Paladin's Handbook"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Druid's Handbook</td>
<td>1994 August</td>
<td>Spells</td>
<td><label><input type='checkbox' name='attr_book-tcdhb' title="@{book-tcdhb}" value="The Complete Druid's Handbook"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-druids' title="@{book-druids}" value="The Complete Druid's Handbook"/><span></span></label></td>
</tr>
<tr>
<td>The Complete Barbarian's Handbook</td>
<td>1995 January</td>
<td>Weapons and Proficiencies</td>
<td><label><input type='checkbox' name='attr_book-tcbarbhb' title="@{book-tcbarbhb}" value="The Complete Barbarian's Handbook"/><span></span></label></td>
<td><label><input type='checkbox' name='attr_book-barbarians' title="@{book-barbarians}" value="The Complete Barbarian's Handbook"/><span></span></label></td>
</tr>
</table>
<br>
ADnD 2E Revised/javascript/sheetWorkers.js
+2 -2
View File
@@ -10,8 +10,8 @@ const ERROR = 'error';
const BOOK_FIELDS = [
'book-phb', 'book-tcfhb', 'book-tcthb', 'book-tcprhb', 'book-tcwhb',
'book-tom', 'book-aaeg',
'book-tcbod', 'book-tcbhb', 'book-tcboe', 'book-tcboh', 'book-tcrhb',
'book-tcpahb', 'book-tcdhb', 'book-tcbarbhb',
'book-dwarves', 'book-bards', 'book-elves', 'book-humanoids', 'book-rangers',
'book-paladins', 'book-druids', 'book-barbarians'
];
//#region Helper function
ADnD 2E Revised/sheet.json
+8 -8
View File
@@ -63,7 +63,7 @@
"description": "Includes Weapons"
},
{
"attribute": "book-tcbod",
"attribute": "book-dwarves",
"displayname": "The Complete Book of Dwarves",
"type": "checkbox",
"value": "The Complete Book of Dwarves",
@@ -71,7 +71,7 @@
"description": "Includes Weapons and Proficiencies"
},
{
"attribute": "book-tcbhb",
"attribute": "book-bards",
"displayname": "The Complete Bard's Handbook",
"type": "checkbox",
"value": "The Complete Bard's Handbook",
@@ -79,7 +79,7 @@
"description": "Includes Spells and Proficiencies"
},
{
"attribute": "book-tcboe",
"attribute": "book-elves",
"displayname": "The Complete Book of Elves",
"type": "checkbox",
"value": "The Complete Book of Elves",
@@ -87,7 +87,7 @@
"description": "Includes Weapons, Spells, and Proficiencies"
},
{
"attribute": "book-tcboh",
"attribute": "book-humanoids",
"displayname": "The Complete Book of Humanoids",
"type": "checkbox",
"value": "The Complete Book of Humanoids",
@@ -95,7 +95,7 @@
"description": "Includes Weapons and Proficiencies"
},
{
"attribute": "book-tcrhb",
"attribute": "book-rangers",
"displayname": "The Complete Ranger's Handbook",
"type": "checkbox",
"value": "The Complete Ranger's Handbook",
@@ -103,7 +103,7 @@
"description": "Includes Weapons, Spells, and Proficiencies"
},
{
"attribute": "book-tcpahb",
"attribute": "book-paladins",
"displayname": "The Complete Paladin's Handbook",
"type": "checkbox",
"value": "The Complete Paladin's Handbook",
@@ -111,7 +111,7 @@
"description": "Includes Proficiencies"
},
{
"attribute": "book-tcdhb",
"attribute": "book-druids",
"displayname": "The Complete Druid's Handbook",
"type": "checkbox",
"value": "The Complete Druid's Handbook",
@@ -119,7 +119,7 @@
"description": "Includes Spells"
},
{
"attribute": "book-tcbarbhb",
"attribute": "book-barbarians",
"displayname": "The Complete Barbarian's Handbook",
"type": "checkbox",
"value": "The Complete Barbarian's Handbook",