diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index 13a016fefe..581b2ce77a 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -9,39 +9,16 @@

Changes in

@@ -171,7 +148,8 @@

Class:
- + +
To Next:
@@ -214,7 +192,8 @@
Class:
- + +
To Next:
@@ -1697,7 +1676,10 @@ - + + + + - + + + + @@ -1866,7 +1851,10 @@ - + + + + - + + + + @@ -2034,7 +2025,10 @@ - + + + + - + + + + @@ -2235,7 +2232,10 @@ - + + + + - + + + + @@ -2406,7 +2409,10 @@ Total Penalty Total - + + + + @@ -3618,7 +3624,10 @@ CW - + + + + @@ -3662,7 +3671,10 @@
- + @@ -3700,7 +3712,10 @@
+ + +
- + @@ -3733,7 +3748,10 @@
+ + + ±
- + @@ -3794,7 +3812,10 @@ - + @@ -3820,7 +3841,10 @@ - +
+ + + ±Modifier
+ + + ±Reading/Writing
+ + +
@@ -3979,7 +4003,10 @@ - + @@ -4229,7 +4256,10 @@
Spell name: + + + Casting time:
- + @@ -4479,7 +4509,10 @@
Spell name: + + + Casting time:
- + @@ -4729,7 +4762,10 @@
Spell name: + + + Casting time:
- + @@ -4979,7 +5015,10 @@
Spell name: + + + Casting time:
- + @@ -5230,7 +5269,10 @@
Spell name: + + + Casting time:
- + @@ -5481,7 +5523,10 @@
Spell name: + + + Casting time:
- + @@ -5732,7 +5777,10 @@
Spell name: + + + Casting time:
- + @@ -5983,7 +6031,10 @@
Spell name: + + + Casting time:
- + @@ -6234,7 +6285,10 @@
Spell name: + + + Casting time:
- + @@ -6485,7 +6539,10 @@
Spell name: + + + Casting time:
- + @@ -6736,7 +6793,10 @@
Spell name: + + + Casting time:
- + @@ -6987,7 +7047,10 @@
Spell name: + + + Casting time:
- + @@ -7238,7 +7301,10 @@
Spell name: + + + Casting time:
- + @@ -7489,7 +7555,10 @@
Spell name: + + + Casting time:
- + @@ -7765,9 +7834,13 @@
Show Spheres of Influence:
- Major: + Major: + +
- Minor: + Minor: + +
@@ -7826,7 +7899,10 @@
Spell name: + + + Casting time:
- + @@ -8081,7 +8157,10 @@
Spell name: + + + Casting time:
- + @@ -8336,7 +8415,10 @@
Spell name: + + + Casting time:
- + @@ -8591,7 +8673,10 @@
Spell name: + + + Casting time:
- + @@ -8846,7 +8931,10 @@
Spell name: + + + Casting time:
- + @@ -9101,7 +9189,10 @@
Spell name: + + + Casting time:
- + @@ -9356,7 +9447,10 @@
Spell name: + + + Casting time:
- + @@ -9605,7 +9699,10 @@
Spell name: + + + Casting time:
- + @@ -12040,7 +12137,10 @@ - + @@ -12053,7 +12153,10 @@ - + @@ -12066,7 +12169,10 @@ - + @@ -12236,7 +12342,10 @@ - + @@ -12249,7 +12358,10 @@ - + @@ -12262,7 +12374,10 @@ - + @@ -12431,7 +12546,10 @@ - + @@ -12444,7 +12562,10 @@ - + @@ -12457,7 +12578,10 @@ - + @@ -12780,7 +12904,10 @@ - + @@ -12793,7 +12920,10 @@ - + @@ -12806,7 +12936,10 @@ - + @@ -13134,7 +13267,10 @@ - + @@ -13147,7 +13283,10 @@ - + @@ -13160,7 +13299,10 @@ - + @@ -13483,7 +13625,10 @@ - + @@ -13496,7 +13641,10 @@ - + @@ -13509,7 +13657,10 @@ - + @@ -13837,7 +13988,10 @@ - + @@ -13850,7 +14004,10 @@ - + @@ -13863,7 +14020,10 @@ - + @@ -14279,7 +14439,10 @@ - + @@ -14292,7 +14455,10 @@ - + @@ -14305,7 +14471,10 @@ - + @@ -14726,7 +14895,10 @@ - + @@ -14739,7 +14911,10 @@ - + @@ -14752,7 +14927,10 @@ - + @@ -16024,7 +16202,10 @@ - + @@ -16037,7 +16218,10 @@ - + @@ -16050,7 +16234,10 @@ - + @@ -17344,7 +17531,10 @@ - + @@ -17357,7 +17547,10 @@ - + @@ -17370,7 +17563,10 @@ - + @@ -17911,7 +18107,10 @@ - + @@ -17924,7 +18123,10 @@ - + @@ -17937,7 +18139,10 @@ - + @@ -18642,7 +18847,10 @@ - + @@ -18675,7 +18883,10 @@
Spell name: + + + Casting time: Speed
+ + +   
+ + +   
+ + +    Speed
+ + +   
+ + +   
+ + +    Speed
+ + +
+ + +
+ + + Speed
+ + +
+ + +
+ + + Speed
+ + +
+ + +
+ + + Speed
+ + +
+ + +
+ + + Speed
+ + +
+ + +
+ + + Speed
+ + +
+ + +
+ + + Speed
+ + +
+ + +
+ + + Speed
+ + +
+ + +
+ + + Speed
+ + +
+ + +
+ + + Speed
+ + +
+ + +
+ + +
+ + +
- + @@ -18780,7 +18991,10 @@
Spell name: + + + Casting time:
- + @@ -19263,6 +19477,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -19315,10 +19551,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -19348,14 +19608,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -19381,6 +19670,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19405,24 +19724,24 @@ - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -19435,25 +19754,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -20548,6 +20867,1094 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21462,6 +22869,920 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21719,6 +24040,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21865,6 +24443,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22218,6 +24942,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22536,6 +25613,324 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22748,6 +26143,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22768,6 +26375,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -22797,6 +26424,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22837,6 +26493,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -23764,37 +27460,37 @@
@@ -58865,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/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/changelog.html b/ADnD_2E_Revised/html/changelog.html index ba4f15c563..bfb06ff0ff 100644 --- a/ADnD_2E_Revised/html/changelog.html +++ b/ADnD_2E_Revised/html/changelog.html @@ -4,39 +4,16 @@

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
    • +
  • 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/datalists.html b/ADnD_2E_Revised/html/components/datalists.html index e641446e29..8b446de266 100644 --- a/ADnD_2E_Revised/html/components/datalists.html +++ b/ADnD_2E_Revised/html/components/datalists.html @@ -127,6 +127,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -179,10 +201,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -212,14 +258,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -245,6 +320,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -269,24 +374,24 @@ - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -299,25 +404,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ADnD_2E_Revised/html/components/dynamicDatalists.html b/ADnD_2E_Revised/html/components/dynamicDatalists.html index dbf5cb8c21..9d8229fcc7 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2258,6 +4260,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2404,6 +4663,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2757,6 +5162,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3075,6 +5833,324 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3287,6 +6363,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3307,6 +6595,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -3336,6 +6644,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3375,4 +6712,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 @@

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:
{{#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}}
- + 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/html/tabs/character-tab.html b/ADnD_2E_Revised/html/tabs/character-tab.html index 9921c5ebf4..9f18601819 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: + +
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 @@ - + @@ -71,7 +74,10 @@ - + @@ -84,7 +90,10 @@ - + @@ -147,7 +156,10 @@ - + @@ -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..c9929e26e3 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 @@ - + @@ -104,7 +107,10 @@
Spell name: + + + Casting time:
Class:
- + +
To Next:
@@ -117,7 +118,8 @@
Class:
- + +
To Next:
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
+ + +   
+ + +   
+ + +    Speed
+ + +   
+ + +   
+ + +   
+ + + CW
+ + +
- + @@ -142,7 +148,10 @@
+ + +
- + @@ -175,7 +184,10 @@
+ + + ±
- + @@ -236,7 +248,10 @@ - + @@ -262,7 +277,10 @@ - +
+ + + ±Modifier
+ + + ±Reading/Writing
+ + +
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 @@ Total Penalty Total - + + + + 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/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/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 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 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 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