From 6c974b6775569fdc2e365f561e5d06dce3f98f92 Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 11:01:01 +0200 Subject: [PATCH 01/12] Added firefox support for weapons --- ADnD_2E_Revised/2ESheet.html | 1304 ++++++++++++++++- ADnD_2E_Revised/2EStyle.css | 6 +- ADnD_2E_Revised/css/2EStyle-base.css | 6 +- .../html/components/dynamicDatalists.html | 1074 ++++++++++++++ .../tabs/character-tab/followers-tab.html | 30 +- .../followers-tab/follower-weapon-row.html | 5 +- .../tabs/character-tab/proficiencies-tab.html | 5 +- .../players-option-weapons-tab.html | 20 +- .../weapons-tab/standard-weapons-tab.html | 20 +- ADnD_2E_Revised/html/tabs/monster-tab.html | 5 +- ADnD_2E_Revised/pug/weaponsDatalists.pug | 63 +- 11 files changed, 2469 insertions(+), 69 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index 13a016fefe..b849e0fc76 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -1697,7 +1697,10 @@ - + + + + - + + + + @@ -1866,7 +1872,10 @@ - + + + + - + + + + @@ -2034,7 +2046,10 @@ - + + + + - + + + + @@ -2235,7 +2253,10 @@ - + + + + - + + + + @@ -3618,7 +3642,10 @@ CW - + + + + @@ -12040,7 +12067,10 @@ Speed - + + + +    @@ -12053,7 +12083,10 @@ - + + + +    @@ -12066,7 +12099,10 @@ - + + + +    @@ -12236,7 +12272,10 @@ Speed - + + + +    @@ -12249,7 +12288,10 @@ - + + + +    @@ -12262,7 +12304,10 @@ - + + + +    @@ -12431,7 +12476,10 @@ Speed - + + + + @@ -12444,7 +12492,10 @@ - + + + + @@ -12457,7 +12508,10 @@ - + + + + @@ -12780,7 +12834,10 @@ Speed - + + + + @@ -12793,7 +12850,10 @@ - + + + + @@ -12806,7 +12866,10 @@ - + + + + @@ -13134,7 +13197,10 @@ Speed - + + + + @@ -13147,7 +13213,10 @@ - + + + + @@ -13160,7 +13229,10 @@ - + + + + @@ -13483,7 +13555,10 @@ Speed - + + + + @@ -13496,7 +13571,10 @@ - + + + + @@ -13509,7 +13587,10 @@ - + + + + @@ -13837,7 +13918,10 @@ Speed - + + + + @@ -13850,7 +13934,10 @@ - + + + + @@ -13863,7 +13950,10 @@ - + + + + @@ -14279,7 +14369,10 @@ Speed - + + + + @@ -14292,7 +14385,10 @@ - + + + + @@ -14305,7 +14401,10 @@ - + + + + @@ -14726,7 +14825,10 @@ Speed - + + + + @@ -14739,7 +14841,10 @@ - + + + + @@ -14752,7 +14857,10 @@ - + + + + @@ -16024,7 +16132,10 @@ Speed - + + + + @@ -16037,7 +16148,10 @@ - + + + + @@ -16050,7 +16164,10 @@ - + + + + @@ -17344,7 +17461,10 @@ Speed - + + + + @@ -17357,7 +17477,10 @@ - + + + + @@ -17370,7 +17493,10 @@ - + + + + @@ -17911,7 +18037,10 @@ Speed - + + + + @@ -17924,7 +18053,10 @@ - + + + + @@ -17937,7 +18069,10 @@ - + + + + @@ -18642,7 +18777,10 @@ - + + + + @@ -21719,6 +21857,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21865,6 +22260,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22218,6 +22759,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22536,6 +23430,324 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/2EStyle.css b/ADnD_2E_Revised/2EStyle.css index ed97157932..51841859a4 100644 --- a/ADnD_2E_Revised/2EStyle.css +++ b/ADnD_2E_Revised/2EStyle.css @@ -1765,13 +1765,15 @@ img.expandable:hover { } /* Announcement styling end */ -@-moz-document url-prefix() { +/* Firefox styling */ +@supports (-moz-appearance:none) { .charsheet .sheet-chrome { display: none; } } -@supports not(-moz-appearance:none) { +/* Not Firefox styling */ +@supports not (-moz-appearance:none) { .charsheet .sheet-firefox { display: none; } diff --git a/ADnD_2E_Revised/css/2EStyle-base.css b/ADnD_2E_Revised/css/2EStyle-base.css index f34d08a551..e92af1015d 100644 --- a/ADnD_2E_Revised/css/2EStyle-base.css +++ b/ADnD_2E_Revised/css/2EStyle-base.css @@ -1158,13 +1158,15 @@ img.expandable:hover { } /* Announcement styling end */ -@-moz-document url-prefix() { +/* Firefox styling */ +@supports (-moz-appearance:none) { .charsheet .sheet-chrome { display: none; } } -@supports not(-moz-appearance:none) { +/* Not Firefox styling */ +@supports not (-moz-appearance:none) { .charsheet .sheet-firefox { display: none; } diff --git a/ADnD_2E_Revised/html/components/dynamicDatalists.html b/ADnD_2E_Revised/html/components/dynamicDatalists.html index dbf5cb8c21..22c0d3e3f4 100644 --- a/ADnD_2E_Revised/html/components/dynamicDatalists.html +++ b/ADnD_2E_Revised/html/components/dynamicDatalists.html @@ -2258,6 +2258,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2404,6 +2661,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2757,6 +3160,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3075,6 +3831,324 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html index 02b78e13bd..6a3b6fb07f 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html +++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html @@ -58,7 +58,10 @@ Speed - + + + +    @@ -71,7 +74,10 @@ - + + + +    @@ -84,7 +90,10 @@ - + + + +    @@ -147,7 +156,10 @@ Speed - + + + +    @@ -160,7 +172,10 @@ - + + + +    @@ -173,7 +188,10 @@ - + + + +    diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-weapon-row.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-weapon-row.html index 1c073145be..c7b33bff53 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-weapon-row.html +++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-weapon-row.html @@ -1,5 +1,8 @@ - + + + + diff --git a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html index 04fa1af0b4..561e29458b 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html +++ b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html @@ -60,7 +60,10 @@ CW - + + + + diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html index 9ede8af90a..f75bbe51fb 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html +++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html @@ -80,7 +80,10 @@ - + + + + - + + + + @@ -281,7 +287,10 @@ - + + + + - + + + + diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html index 87d3dfc4af..8ee37c49d8 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html +++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html @@ -75,7 +75,10 @@ - + + + + - + + + + @@ -244,7 +250,10 @@ - + + + + - + + + + diff --git a/ADnD_2E_Revised/html/tabs/monster-tab.html b/ADnD_2E_Revised/html/tabs/monster-tab.html index f698e6c9c8..e315f4fa9d 100644 --- a/ADnD_2E_Revised/html/tabs/monster-tab.html +++ b/ADnD_2E_Revised/html/tabs/monster-tab.html @@ -166,7 +166,10 @@ - + + + + diff --git a/ADnD_2E_Revised/pug/weaponsDatalists.pug b/ADnD_2E_Revised/pug/weaponsDatalists.pug index 62083eb5c7..008d724e11 100644 --- a/ADnD_2E_Revised/pug/weaponsDatalists.pug +++ b/ADnD_2E_Revised/pug/weaponsDatalists.pug @@ -15,6 +15,21 @@ datalist(id='melee-weapons') - group += (group ? ', ' : '') + books option(value=weapon.name)= group +- processedWeapons.clear() +datalist(id='melee-weapons-ff') + each book in booksPriority + each weaponList in data + each weapon in weaponList + if (!weapon.book.includes(book)) + - continue; + if (!weapon.category.includes('Melee')) + - continue; + if processedWeapons.has(weapon.name.toLowerCase()) + - continue + - processedWeapons.add(weapon.name.toLowerCase()) + option(value=weapon.name) + + - processedWeapons.clear() datalist(id='ranged-weapons') each book in booksPriority @@ -32,6 +47,20 @@ datalist(id='ranged-weapons') - group += (group ? ', ' : '') + books option(value=weapon.name)= group +- processedWeapons.clear() +datalist(id='ranged-weapons-ff') + each book in booksPriority + each weaponList in data + each weapon in weaponList + if (!weapon.book.includes(book)) + - continue; + if (!weapon.category.includes('Range')) + - continue; + if processedWeapons.has(weapon.name.toLowerCase()) + - continue + - processedWeapons.add(weapon.name.toLowerCase()) + option(value=weapon.name) + - processedWeapons.clear() datalist(id='all-weapons') each book in booksPriority @@ -47,9 +76,20 @@ datalist(id='all-weapons') - group += (group ? ', ' : '') + books option(value=weapon.name)= group +- processedWeapons.clear() +datalist(id='all-weapons-ff') + each book in booksPriority + each weaponList in data + each weapon in weaponList + if (!weapon.book.includes(book)) + - continue; + if processedWeapons.has(weapon.name.toLowerCase()) + - continue + - processedWeapons.add(weapon.name.toLowerCase()) + option(value=weapon.name) + - processedWeapons.clear(); datalist(id='weapon-proficiencies') - - let weaponProfsAdded = false each book in booksPriority each weaponList in data - let group = weaponList.map(w => w.group).filter(Boolean).filter((v, i, a) => a.indexOf(v) === i).join(', ') @@ -72,4 +112,23 @@ datalist(id='weapon-proficiencies') - category = prof.category || '' if (prof.book !== 'PHB') - category += (category ? ', ' : '') + prof.book - option(value=profName)= category \ No newline at end of file + option(value=profName)= category + +- processedWeapons.clear(); +datalist(id='weapon-proficiencies-ff') + each book in booksPriority + each weaponList in data + each weapon in weaponList + if (!weapon.book.includes(book)) + - continue + if (weapon.noProf) + - continue + - let weaponName = weapon.name.split(/\s\(|,/)[0] + if (processedWeapons.has(weaponName.toLowerCase())) + - continue + - processedWeapons.add(weaponName.toLowerCase()); + option(value=weaponName) + each prof, profName in proficiencies + if prof.book !== book + - continue + option(value=profName) \ No newline at end of file From d83f72cefd71e5170e515e859d87473f45eed439 Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 12:40:18 +0200 Subject: [PATCH 02/12] Added firefox support for nonweapon proficiencies --- ADnD_2E_Revised/2ESheet.html | 217 +++++++++++++++++- .../html/components/dynamicDatalists.html | 212 +++++++++++++++++ .../tabs/character-tab/proficiencies-tab.html | 5 +- .../pug/nonweaponProficienciesDatalist.pug | 14 +- 4 files changed, 445 insertions(+), 3 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index b849e0fc76..933d1accdb 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -3821,7 +3821,10 @@ Modifier - + + + + ± @@ -23960,6 +23963,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/components/dynamicDatalists.html b/ADnD_2E_Revised/html/components/dynamicDatalists.html index 22c0d3e3f4..eb3ddd81e0 100644 --- a/ADnD_2E_Revised/html/components/dynamicDatalists.html +++ b/ADnD_2E_Revised/html/components/dynamicDatalists.html @@ -4361,6 +4361,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html index 561e29458b..609277f36d 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html +++ b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html @@ -239,7 +239,10 @@ Modifier - + + + + ± diff --git a/ADnD_2E_Revised/pug/nonweaponProficienciesDatalist.pug b/ADnD_2E_Revised/pug/nonweaponProficienciesDatalist.pug index 2c10e09c0d..b3f6f3c1f2 100644 --- a/ADnD_2E_Revised/pug/nonweaponProficienciesDatalist.pug +++ b/ADnD_2E_Revised/pug/nonweaponProficienciesDatalist.pug @@ -12,4 +12,16 @@ datalist(id='nonweapon-proficiencies') if (!nonweaponProficiency.book.includes('PHB')) - books = 'Books: ' + bookShorthand(nonweaponProficiencyList.flatMap(w => w.book)) - classes += (classes ? ', ' : '') + books - option(value=name)= classes \ No newline at end of file + option(value=name)= classes + +- processedNonweaponProficiencies.clear() +datalist(id='nonweapon-proficiencies-ff') + each book in booksPriority + each nonweaponProficiencyList, name in data + each nonweaponProficiency in nonweaponProficiencyList + if (!nonweaponProficiency.book.includes(book)) + - continue; + if processedNonweaponProficiencies.has(name.toLowerCase()) + - continue + - processedNonweaponProficiencies.add(name.toLowerCase()) + option(value=name) \ No newline at end of file From ca71b8b0b599bc03b37399c8ba856d056ab4d693 Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 12:51:43 +0200 Subject: [PATCH 03/12] Added firefox support for spells --- ADnD_2E_Revised/2ESheet.html | 2127 ++++++++++++++++- .../html/components/dynamicDatalists.html | 2002 ++++++++++++++++ .../html/shared/priest-spell-template.html | 5 +- .../html/shared/wizard-spell-template.html | 5 +- ADnD_2E_Revised/pug/spellsDatalists.pug | 7 +- 5 files changed, 4118 insertions(+), 28 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index 933d1accdb..8bc7757007 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -4009,7 +4009,10 @@ - + @@ -4259,7 +4262,10 @@
Spell name: + + + Casting time:
- + @@ -4509,7 +4515,10 @@
Spell name: + + + Casting time:
- + @@ -4759,7 +4768,10 @@
Spell name: + + + Casting time:
- + @@ -5009,7 +5021,10 @@
Spell name: + + + Casting time:
- + @@ -5260,7 +5275,10 @@
Spell name: + + + Casting time:
- + @@ -5511,7 +5529,10 @@
Spell name: + + + Casting time:
- + @@ -5762,7 +5783,10 @@
Spell name: + + + Casting time:
- + @@ -6013,7 +6037,10 @@
Spell name: + + + Casting time:
- + @@ -6264,7 +6291,10 @@
Spell name: + + + Casting time:
- + @@ -6515,7 +6545,10 @@
Spell name: + + + Casting time:
- + @@ -6766,7 +6799,10 @@
Spell name: + + + Casting time:
- + @@ -7017,7 +7053,10 @@
Spell name: + + + Casting time:
- + @@ -7268,7 +7307,10 @@
Spell name: + + + Casting time:
- + @@ -7519,7 +7561,10 @@
Spell name: + + + Casting time:
- + @@ -7856,7 +7901,10 @@
Spell name: + + + Casting time:
- + @@ -8111,7 +8159,10 @@
Spell name: + + + Casting time:
- + @@ -8366,7 +8417,10 @@
Spell name: + + + Casting time:
- + @@ -8621,7 +8675,10 @@
Spell name: + + + Casting time:
- + @@ -8876,7 +8933,10 @@
Spell name: + + + Casting time:
- + @@ -9131,7 +9191,10 @@
Spell name: + + + Casting time:
- + @@ -9386,7 +9449,10 @@
Spell name: + + + Casting time:
- + @@ -9635,7 +9701,10 @@
Spell name: + + + Casting time:
- + @@ -18816,7 +18885,10 @@
Spell name: + + + Casting time:
- + @@ -18921,7 +18993,10 @@
Spell name: + + + Casting time:
- + @@ -20689,6 +20764,1094 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21603,6 +22766,920 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/components/dynamicDatalists.html b/ADnD_2E_Revised/html/components/dynamicDatalists.html index eb3ddd81e0..7413a691b5 100644 --- a/ADnD_2E_Revised/html/components/dynamicDatalists.html +++ b/ADnD_2E_Revised/html/components/dynamicDatalists.html @@ -1087,6 +1087,1094 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2001,6 +3089,920 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/shared/priest-spell-template.html b/ADnD_2E_Revised/html/shared/priest-spell-template.html index cdabf79f68..67373aa2b6 100644 --- a/ADnD_2E_Revised/html/shared/priest-spell-template.html +++ b/ADnD_2E_Revised/html/shared/priest-spell-template.html @@ -4,7 +4,10 @@
Spell name: + + + Casting time:
- + diff --git a/ADnD_2E_Revised/html/shared/wizard-spell-template.html b/ADnD_2E_Revised/html/shared/wizard-spell-template.html index b42d857f4e..e98968a240 100644 --- a/ADnD_2E_Revised/html/shared/wizard-spell-template.html +++ b/ADnD_2E_Revised/html/shared/wizard-spell-template.html @@ -4,7 +4,10 @@
Spell name: + + + Casting time:
- + diff --git a/ADnD_2E_Revised/pug/spellsDatalists.pug b/ADnD_2E_Revised/pug/spellsDatalists.pug index a16c826bdd..b68de9b0bb 100644 --- a/ADnD_2E_Revised/pug/spellsDatalists.pug +++ b/ADnD_2E_Revised/pug/spellsDatalists.pug @@ -21,4 +21,9 @@ if (category) - category += ', ' - category += `${spell.book}` - option(value!=spellName)= category \ No newline at end of file + option(value!=spellName)= category + +each levelObject, level in data + datalist(id=`${level}-spells-ff`) + each spell, spellName in levelObject + option(value!=spellName) \ No newline at end of file From d563e65af0dea2ce9ecd01c000051181f6350939 Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 13:01:10 +0200 Subject: [PATCH 04/12] Updated change log --- ADnD_2E_Revised/html/changelog.html | 37 ++++------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html index ba4f15c563..1aba3bfb5f 100644 --- a/ADnD_2E_Revised/html/changelog.html +++ b/ADnD_2E_Revised/html/changelog.html @@ -4,39 +4,10 @@

Changes in

    -
  • Added roll template for Proficiency check rolls
    • -
  • Added roll template for Character Surprise check roll
    • -
  • Added roll template for Character Rogue skill check rolls
    • -
  • Added roll template for Follower Rogue skill check rolls
    • -
  • Added roll template for Monster Surprise check roll
    • -
  • Added roll template for Monster Morale check roll
    • -
  • Added missing whisper type to Monster spell Effect
    • -
  • Added missing whisper type to Monster spell Critical effect
    • -
  • Fixed rogue follower skills calculation for the misc modifier. It now improves chances for a positive modifier and decreases chances for a negative modifier
    • -
  • Improved the template of the following spells: -
      -
    • Flaming Sphere
      • -
    • Melf's Acid Arrow
      • -
    • Summon Swarm
      • -
    • Flame Arrow
      • -
    • Melf's Minute Meteors
      • -
    • Evard's Black Tentacles
      • -
    • Ice Storm
      • -
    • Wall of Fire
      • -
    • Wall of Ice
      • -
    • Cloudkill
      • -
    • Chain lightning
      • -
    • Death Fog
      • -
    • Otiluke's Freezing Sphere
      • -
    • Finger of Death
      • -
    • Incendiary Cloud
      • -
    • Bigby's Crushing Hand
      • -
    • Meteor Swarm
      • -
    • Fire Aura
      • -
    • Vitriolic Sphere
      • -
    • Flame Blade
      • -
    -
    • +
  • Added Firefox support for Weapons auto-complete, for Characters, Henchmen, and Monsters
    • +
  • Added Firefox support for Weapon proficiencies auto-complete, for Characters
    • +
  • Added Firefox support for Nonweapon proficiencies auto-complete, for Characters
    • +
  • Added Firefox support for Spells auto-complete, for Characters, and Monsters

From 37c3a0055d8f4781e00a2451f82feff7ba9c17c4 Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 13:04:59 +0200 Subject: [PATCH 05/12] Added firefox support for classes --- ADnD_2E_Revised/2ESheet.html | 44 ++++--------------- ADnD_2E_Revised/html/changelog.html | 1 + .../character-info-details.html | 6 ++- 3 files changed, 14 insertions(+), 37 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index 8bc7757007..049c6152fb 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -9,39 +9,11 @@

Changes in

    -
  • Added roll template for Proficiency check rolls
    • -
  • Added roll template for Character Surprise check roll
    • -
  • Added roll template for Character Rogue skill check rolls
    • -
  • Added roll template for Follower Rogue skill check rolls
    • -
  • Added roll template for Monster Surprise check roll
    • -
  • Added roll template for Monster Morale check roll
    • -
  • Added missing whisper type to Monster spell Effect
    • -
  • Added missing whisper type to Monster spell Critical effect
    • -
  • Fixed rogue follower skills calculation for the misc modifier. It now improves chances for a positive modifier and decreases chances for a negative modifier
    • -
  • Improved the template of the following spells: -
      -
    • Flaming Sphere
      • -
    • Melf's Acid Arrow
      • -
    • Summon Swarm
      • -
    • Flame Arrow
      • -
    • Melf's Minute Meteors
      • -
    • Evard's Black Tentacles
      • -
    • Ice Storm
      • -
    • Wall of Fire
      • -
    • Wall of Ice
      • -
    • Cloudkill
      • -
    • Chain lightning
      • -
    • Death Fog
      • -
    • Otiluke's Freezing Sphere
      • -
    • Finger of Death
      • -
    • Incendiary Cloud
      • -
    • Bigby's Crushing Hand
      • -
    • Meteor Swarm
      • -
    • Fire Aura
      • -
    • Vitriolic Sphere
      • -
    • Flame Blade
      • -
    -
    • +
  • Added Firefox support for Weapons auto-complete, for Characters, Henchmen, and Monsters
    • +
  • Added Firefox support for Weapon proficiencies auto-complete, for Characters
    • +
  • Added Firefox support for Nonweapon proficiencies auto-complete, for Characters
    • +
  • Added Firefox support for Spells auto-complete, for Characters, and Monsters
    • +
  • Added Firefox support for Classes auto-complete, for Characters

@@ -171,7 +143,8 @@

- + @@ -19453,6 +19457,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html index 0a5402bcf2..597ea0e213 100644 --- a/ADnD_2E_Revised/html/changelog.html +++ b/ADnD_2E_Revised/html/changelog.html @@ -9,6 +9,7 @@
  • Added Firefox support for Nonweapon proficiencies auto-complete, for Characters
  • Added Firefox support for Spells auto-complete, for Characters, and Monsters
  • Added Firefox support for Classes auto-complete, for Characters
    • +
  • Added Firefox support for Rogue armor auto-complete, for Characters

    • diff --git a/ADnD_2E_Revised/html/components/datalists.html b/ADnD_2E_Revised/html/components/datalists.html index e641446e29..77719d229c 100644 --- a/ADnD_2E_Revised/html/components/datalists.html +++ b/ADnD_2E_Revised/html/components/datalists.html @@ -127,6 +127,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/tabs/character-tab/rogue-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/rogue-tab.html index 278e9f2ef6..8187c56646 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab/rogue-tab.html +++ b/ADnD_2E_Revised/html/tabs/character-tab/rogue-tab.html @@ -36,7 +36,10 @@

    - + From d585ca8a68e64251c453fce74e828fb2e03231f2 Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 13:16:42 +0200 Subject: [PATCH 07/12] Added firefox support for languages --- ADnD_2E_Revised/2ESheet.html | 31 ++++++++++++++++++- ADnD_2E_Revised/html/changelog.html | 1 + .../html/components/datalists.html | 25 +++++++++++++++ .../tabs/character-tab/proficiencies-tab.html | 5 ++- 4 files changed, 60 insertions(+), 2 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index 996a8bed01..09d1753216 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -15,6 +15,7 @@
  • Added Firefox support for Spells auto-complete, for Characters, and Monsters
  • Added Firefox support for Classes auto-complete, for Characters
  • Added Firefox support for Rogue armor auto-complete, for Characters
    • +
  • Added Firefox support for Languages auto-complete, for Characters

    • @@ -3828,7 +3829,10 @@

    - +
    Spell name: + + + Casting time:
    Class:
    - + +
    To Next:
    @@ -214,7 +187,8 @@
    Class:
    - + +
    To Next:
    diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html index 1aba3bfb5f..0a5402bcf2 100644 --- a/ADnD_2E_Revised/html/changelog.html +++ b/ADnD_2E_Revised/html/changelog.html @@ -8,6 +8,7 @@
  • Added Firefox support for Weapon proficiencies auto-complete, for Characters
  • Added Firefox support for Nonweapon proficiencies auto-complete, for Characters
  • Added Firefox support for Spells auto-complete, for Characters, and Monsters
    • +
  • Added Firefox support for Classes auto-complete, for Characters

    • diff --git a/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-details.html b/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-details.html index 041fc72927..47bd544304 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-details.html +++ b/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-details.html @@ -74,7 +74,8 @@

    Class:
    - + +
    To Next:
    @@ -117,7 +118,8 @@
    Class:
    - + +
    To Next:
    From e7c4902c286442c4ebaed7a182c32fc8728be155 Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 13:09:32 +0200 Subject: [PATCH 06/12] Added firefox support for rogue armor --- ADnD_2E_Revised/2ESheet.html | 28 ++++++++++++++++++- ADnD_2E_Revised/html/changelog.html | 1 + .../html/components/datalists.html | 22 +++++++++++++++ .../html/tabs/character-tab/rogue-tab.html | 5 +++- 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index 049c6152fb..996a8bed01 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -14,6 +14,7 @@
  • Added Firefox support for Nonweapon proficiencies auto-complete, for Characters
  • Added Firefox support for Spells auto-complete, for Characters, and Monsters
  • Added Firefox support for Classes auto-complete, for Characters
    • +
  • Added Firefox support for Rogue armor auto-complete, for Characters

    • @@ -2404,7 +2405,10 @@

    		Total Penalty Total + + +
    Total Penalty Total + + +
    Reading/Writing
    + + +
    @@ -19531,6 +19535,31 @@     + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html index 597ea0e213..213e8ad9f3 100644 --- a/ADnD_2E_Revised/html/changelog.html +++ b/ADnD_2E_Revised/html/changelog.html @@ -10,6 +10,7 @@
  • Added Firefox support for Spells auto-complete, for Characters, and Monsters
  • Added Firefox support for Classes auto-complete, for Characters
  • Added Firefox support for Rogue armor auto-complete, for Characters
    • +
  • Added Firefox support for Languages auto-complete, for Characters

    • diff --git a/ADnD_2E_Revised/html/components/datalists.html b/ADnD_2E_Revised/html/components/datalists.html index 77719d229c..ac51efe1eb 100644 --- a/ADnD_2E_Revised/html/components/datalists.html +++ b/ADnD_2E_Revised/html/components/datalists.html @@ -201,6 +201,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html index 609277f36d..f60323a8e5 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html +++ b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html @@ -268,7 +268,10 @@ Reading/Writing - + + + + From 4cbbeb9c8b36bb841a69c7dba93606a5854258e7 Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 13:23:28 +0200 Subject: [PATCH 08/12] Added firefox support for monster morale, intelligence and frequency --- ADnD_2E_Revised/2ESheet.html | 68 +++++++++---------- ADnD_2E_Revised/html/changelog.html | 1 + .../html/components/datalists.html | 68 +++++++++---------- 3 files changed, 69 insertions(+), 68 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index 09d1753216..e192dfef46 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -19650,24 +19650,24 @@ - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -19680,25 +19680,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html index 213e8ad9f3..77c4b0c388 100644 --- a/ADnD_2E_Revised/html/changelog.html +++ b/ADnD_2E_Revised/html/changelog.html @@ -11,6 +11,7 @@

  • Added Firefox support for Classes auto-complete, for Characters
  • Added Firefox support for Rogue armor auto-complete, for Characters
  • Added Firefox support for Languages auto-complete, for Characters
    • +
  • Added Firefox support for Monster Morale, Intelligence, and Frequency auto-complete

    • diff --git a/ADnD_2E_Revised/html/components/datalists.html b/ADnD_2E_Revised/html/components/datalists.html index ac51efe1eb..8d821313e0 100644 --- a/ADnD_2E_Revised/html/components/datalists.html +++ b/ADnD_2E_Revised/html/components/datalists.html @@ -316,24 +316,24 @@ - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -346,25 +346,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + From cc89bb8bae5055e2cd32a6c1ad4fa52962c2764d Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 13:40:49 +0200 Subject: [PATCH 09/12] Added firefox support for spell spheres --- ADnD_2E_Revised/2ESheet.html | 88 ++++++++++++++++--- ADnD_2E_Revised/html/changelog.html | 15 ++-- .../html/components/datalists.html | 64 +++++++++++++- ADnD_2E_Revised/html/tabs/character-tab.html | 8 +- 4 files changed, 151 insertions(+), 24 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index e192dfef46..baac22f348 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -9,13 +9,15 @@

    Changes in

      -
    • Added Firefox support for Weapons auto-complete, for Characters, Henchmen, and Monsters
      • -
    • Added Firefox support for Weapon proficiencies auto-complete, for Characters
      • -
    • Added Firefox support for Nonweapon proficiencies auto-complete, for Characters
      • -
    • Added Firefox support for Spells auto-complete, for Characters, and Monsters
      • -
    • Added Firefox support for Classes auto-complete, for Characters
      • -
    • Added Firefox support for Rogue armor auto-complete, for Characters
      • -
    • Added Firefox support for Languages auto-complete, for Characters
      • +
    • Added Firefox support for Weapons auto-complete for Characters, Henchmen, and Monsters
      • +
    • Added Firefox support for Weapon proficiencies auto-complete for Characters
      • +
    • Added Firefox support for Nonweapon proficiencies auto-complete for Characters
      • +
    • Added Firefox support for Spells auto-complete for Characters and Monsters
      • +
    • Added Firefox support for Classes auto-complete for Characters
      • +
    • Added Firefox support for Rogue armor auto-complete for Characters
      • +
    • Added Firefox support for Languages auto-complete for Characters
      • +
    • Added Firefox support for Priest spheres auto-complete for Characters
      • +
    • Added Firefox support for Monster Morale, Intelligence, and Frequency auto-complete

    @@ -7822,9 +7824,13 @@
    Show Spheres of Influence:

    - Major: + Major: + +
    - Minor: + Minor: + +
    @@ -19563,7 +19569,6 @@ - @@ -19593,14 +19598,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -19626,6 +19660,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html index 77c4b0c388..0c060db6aa 100644 --- a/ADnD_2E_Revised/html/changelog.html +++ b/ADnD_2E_Revised/html/changelog.html @@ -4,13 +4,14 @@

    Changes in

      -
    • Added Firefox support for Weapons auto-complete, for Characters, Henchmen, and Monsters
      • -
    • Added Firefox support for Weapon proficiencies auto-complete, for Characters
      • -
    • Added Firefox support for Nonweapon proficiencies auto-complete, for Characters
      • -
    • Added Firefox support for Spells auto-complete, for Characters, and Monsters
      • -
    • Added Firefox support for Classes auto-complete, for Characters
      • -
    • Added Firefox support for Rogue armor auto-complete, for Characters
      • -
    • Added Firefox support for Languages auto-complete, for Characters
      • +
    • Added Firefox support for Weapons auto-complete for Characters, Henchmen, and Monsters
      • +
    • Added Firefox support for Weapon proficiencies auto-complete for Characters
      • +
    • Added Firefox support for Nonweapon proficiencies auto-complete for Characters
      • +
    • Added Firefox support for Spells auto-complete for Characters and Monsters
      • +
    • Added Firefox support for Classes auto-complete for Characters
      • +
    • Added Firefox support for Rogue armor auto-complete for Characters
      • +
    • Added Firefox support for Languages auto-complete for Characters
      • +
    • Added Firefox support for Priest spheres auto-complete for Characters
    • Added Firefox support for Monster Morale, Intelligence, and Frequency auto-complete
    diff --git a/ADnD_2E_Revised/html/components/datalists.html b/ADnD_2E_Revised/html/components/datalists.html index 8d821313e0..8b446de266 100644 --- a/ADnD_2E_Revised/html/components/datalists.html +++ b/ADnD_2E_Revised/html/components/datalists.html @@ -229,7 +229,6 @@ - @@ -259,14 +258,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -292,6 +320,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/tabs/character-tab.html b/ADnD_2E_Revised/html/tabs/character-tab.html index 9921c5ebf4..287eb6ec1e 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab.html +++ b/ADnD_2E_Revised/html/tabs/character-tab.html @@ -1595,9 +1595,13 @@
    Show Spheres of Influence:
    - Major: + Major: + +
    - Minor: + Minor: + +
    From eedbf54d0ac9cc633049a45c57c2d99987f78b5f Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 13:55:22 +0200 Subject: [PATCH 10/12] Improved responsiveness of sphere input fields --- ADnD_2E_Revised/2ESheet.html | 8 ++++---- ADnD_2E_Revised/html/tabs/character-tab.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index baac22f348..aeb263e766 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -7825,12 +7825,12 @@ Show Spheres of Influence:
    Major: - - + +
    Minor: - - + +
    diff --git a/ADnD_2E_Revised/html/tabs/character-tab.html b/ADnD_2E_Revised/html/tabs/character-tab.html index 287eb6ec1e..9f18601819 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab.html +++ b/ADnD_2E_Revised/html/tabs/character-tab.html @@ -1596,12 +1596,12 @@ Show Spheres of Influence:
    Major: - - + +
    Minor: - - + +
    From 52452f0d40e8161c836f9a40476c4fd68b758c9e Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 21 Jul 2022 14:05:11 +0200 Subject: [PATCH 11/12] - Added firefox support for talents, traits, and disadvantages - Updated change log - Updated version --- ADnD_2E_Revised/2ESheet.html | 107 +++++++++++++++++- ADnD_2E_Revised/html/changelog.html | 1 + .../html/components/dynamicDatalists.html | 89 +++++++++++++++ .../tabs/character-tab/proficiencies-tab.html | 15 ++- ADnD_2E_Revised/javascript/version.js | 2 +- ADnD_2E_Revised/pug/simpleDatalists.pug | 6 +- 6 files changed, 211 insertions(+), 9 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index aeb263e766..a0be7da934 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -17,6 +17,7 @@
  • Added Firefox support for Rogue armor auto-complete for Characters
  • Added Firefox support for Languages auto-complete for Characters
  • Added Firefox support for Priest spheres auto-complete for Characters
    • +
  • Added Firefox support for Special Talents, Traits, and Disadvantages for Characters
  • Added Firefox support for Monster Morale, Intelligence, and Frequency auto-complete
    • @@ -3670,7 +3671,10 @@
    - + @@ -3708,7 +3712,10 @@
    + + +
    - + @@ -3741,7 +3748,10 @@
    + + + ±
    - + @@ -26365,6 +26375,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -26394,6 +26424,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26434,6 +26493,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    @@ -62462,7 +62561,7 @@ on(BOOK_FIELDS.map(b => `change:${b}`).join(' '), function (eventInfo) { // --- Version change start --- // const SHEET_NAME = 'AD&D 2E Revised'; -const SHEET_VERSION = '4.11.0'; +const SHEET_VERSION = '4.12.0'; on('sheet:opened', function(){ getAttrs(['character_sheet'],function(attrs){ diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html index 0c060db6aa..bfb06ff0ff 100644 --- a/ADnD_2E_Revised/html/changelog.html +++ b/ADnD_2E_Revised/html/changelog.html @@ -12,6 +12,7 @@
  • Added Firefox support for Rogue armor auto-complete for Characters
  • Added Firefox support for Languages auto-complete for Characters
  • Added Firefox support for Priest spheres auto-complete for Characters
    • +
  • Added Firefox support for Special Talents, Traits, and Disadvantages for Characters
  • Added Firefox support for Monster Morale, Intelligence, and Frequency auto-complete
    • diff --git a/ADnD_2E_Revised/html/components/dynamicDatalists.html b/ADnD_2E_Revised/html/components/dynamicDatalists.html index 7413a691b5..9d8229fcc7 100644 --- a/ADnD_2E_Revised/html/components/dynamicDatalists.html +++ b/ADnD_2E_Revised/html/components/dynamicDatalists.html @@ -6595,6 +6595,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -6624,6 +6644,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6663,4 +6712,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html index f60323a8e5..c9929e26e3 100644 --- a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html +++ b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html @@ -107,7 +107,10 @@
    + + + ±
    - + @@ -145,7 +148,10 @@
    + + +
    - + @@ -178,7 +184,10 @@
    + + + ±
    - + diff --git a/ADnD_2E_Revised/javascript/version.js b/ADnD_2E_Revised/javascript/version.js index 715c0bb5e2..d5c3e856f0 100644 --- a/ADnD_2E_Revised/javascript/version.js +++ b/ADnD_2E_Revised/javascript/version.js @@ -1,7 +1,7 @@ // --- Version change start --- // const SHEET_NAME = 'AD&D 2E Revised'; -const SHEET_VERSION = '4.11.0'; +const SHEET_VERSION = '4.12.0'; on('sheet:opened', function(){ getAttrs(['character_sheet'],function(attrs){ diff --git a/ADnD_2E_Revised/pug/simpleDatalists.pug b/ADnD_2E_Revised/pug/simpleDatalists.pug index 69c33eba50..f9d80b7614 100644 --- a/ADnD_2E_Revised/pug/simpleDatalists.pug +++ b/ADnD_2E_Revised/pug/simpleDatalists.pug @@ -3,4 +3,8 @@ datalist(id=id) - let classes = prof.classes || '' if (prof.book !== 'PHB') - classes += (classes ? ', ' : '') + prof.book - option(value=name)= classes \ No newline at end of file + option(value=name)= classes + +datalist(id=`${id}-ff`) + each prof, name in data + option(value=name) \ No newline at end of file From b33b84fd60dafa54b000e7a3cf7284cfa9dfc2d8 Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Thu, 28 Jul 2022 12:29:43 +0200 Subject: [PATCH 12/12] fixed image url for grenade miss button --- ADnD_2E_Revised/2ESheet.html | 22 +++++++++---------- .../html/components/rolltemplates.html | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index a0be7da934..581b2ce77a 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -27460,37 +27460,37 @@ diff --git a/ADnD_2E_Revised/html/components/rolltemplates.html b/ADnD_2E_Revised/html/components/rolltemplates.html index 8b2cdc5dcd..63e1e0cb60 100644 --- a/ADnD_2E_Revised/html/components/rolltemplates.html +++ b/ADnD_2E_Revised/html/components/rolltemplates.html @@ -924,37 +924,37 @@
    + + + ±
    {{#rollTotal() direction 1}} - scatter diagram + scatter diagram {{/rollTotal() direction 1}} {{#rollTotal() direction 2}} - scatter diagram + scatter diagram {{/rollTotal() direction 2}} {{#rollTotal() direction 3}} - scatter diagram + scatter diagram {{/rollTotal() direction 3}} {{#rollTotal() direction 4}} - scatter diagram + scatter diagram {{/rollTotal() direction 4}} {{#rollTotal() direction 5}} - scatter diagram + scatter diagram {{/rollTotal() direction 5}} {{#rollTotal() direction 6}} - scatter diagram + scatter diagram {{/rollTotal() direction 6}} {{#rollTotal() direction 7}} - scatter diagram + scatter diagram {{/rollTotal() direction 7}} {{#rollTotal() direction 8}} - scatter diagram + scatter diagram {{/rollTotal() direction 8}} {{#rollTotal() direction 9}} - scatter diagram + scatter diagram {{/rollTotal() direction 9}} {{#rollTotal() direction 10}} - scatter diagram + scatter diagram {{/rollTotal() direction 10}} {{#^rollBetween() direction 1 10}} - scatter diagram + scatter diagram {{/^rollBetween() direction 1 10}}
    {{#rollTotal() direction 1}} - scatter diagram + scatter diagram {{/rollTotal() direction 1}} {{#rollTotal() direction 2}} - scatter diagram + scatter diagram {{/rollTotal() direction 2}} {{#rollTotal() direction 3}} - scatter diagram + scatter diagram {{/rollTotal() direction 3}} {{#rollTotal() direction 4}} - scatter diagram + scatter diagram {{/rollTotal() direction 4}} {{#rollTotal() direction 5}} - scatter diagram + scatter diagram {{/rollTotal() direction 5}} {{#rollTotal() direction 6}} - scatter diagram + scatter diagram {{/rollTotal() direction 6}} {{#rollTotal() direction 7}} - scatter diagram + scatter diagram {{/rollTotal() direction 7}} {{#rollTotal() direction 8}} - scatter diagram + scatter diagram {{/rollTotal() direction 8}} {{#rollTotal() direction 9}} - scatter diagram + scatter diagram {{/rollTotal() direction 9}} {{#rollTotal() direction 10}} - scatter diagram + scatter diagram {{/rollTotal() direction 10}} {{#^rollBetween() direction 1 10}} - scatter diagram + scatter diagram {{/^rollBetween() direction 1 10}}