diff --git a/AD&D 2E Revised/2ESheet.html b/AD&D 2E Revised/2ESheet.html index 4e690fcff2..abb06807d9 100644 --- a/AD&D 2E Revised/2ESheet.html +++ b/AD&D 2E Revised/2ESheet.html @@ -17099,7 +17099,7 @@

Name:

- + @@ -17160,7 +17160,7 @@ ± | - + @@ -17243,6 +17243,192 @@
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
Attack / Weapon# of
Attack		THAC0DamageSpecial AttackSpeed
+
+
+
+
+ Monster wizard spells +
+
+
+ + + + + + + + +
Spell name:Casting time:
+ + + + + +
Cast / Memorized: /
+ + + + + +
Spell Points / Arc Used: /
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Level:School:Compoenets:
Range:Area of Effect:Duration:
Damage:Damage type:Saving throw:
Healing:Materials:Book reference:
+ + + + + +
+ +
+ +
+
+
+
+
+
+
+ Monster priest spells +
+
+
+ + + + + + + + +
Spell name:Casting time:
+ + + + + +
Cast / Memorized: /
+ + + + + +
Spell Points / Wind Used: /
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Sphere: + + + School:Compoenets:
Range:Area of Effect:Duration:
Damage:Damage type:Saving throw:
Healing:Materials:Book reference:
+ + + + + +
+ +
+ +
+
+
+
+
+
+ @@ -17280,190 +17466,6 @@

Ecology

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18455,24 +18457,24 @@ - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -18485,14 +18487,25 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -30673,6 +30686,21 @@ followerWeapons.forEach(fw => { setupFollowerWeaponsAutoFill(fw.repeating, fw.sections) }); +// Monster weapons +on('change:repeating_monsterweapons:weaponname', function(eventInfo){ + let weapon = getWeaponWithBonus(eventInfo.newValue); + if (weapon === undefined) + return; + + let weaponInfo = { + [`repeating_monsterweapons_attacknum`] : weapon['rof'] || '1', + [`repeating_monsterweapons_damsm`] : weapon['small-medium'], + [`repeating_monsterweapons_weapspeed`] : weapon['speed'], + }; + + setAttrs(weaponInfo); +}); + //Weapon proficiency slots on('change:repeating_weaponprofs:weapprofnum remove:repeating_weaponprofs', function(eventInfo) { if (doEarlyReturn(eventInfo, ['weapprofnum'])) diff --git a/AD&D 2E Revised/html/2ESheet-base.html b/AD&D 2E Revised/html/2ESheet-base.html index 36f6e223ad..021c3e9f1c 100644 --- a/AD&D 2E Revised/html/2ESheet-base.html +++ b/AD&D 2E Revised/html/2ESheet-base.html @@ -15355,7 +15355,7 @@ - +

Name:
@@ -15416,7 +15416,7 @@ ± | - + @@ -15498,8 +15498,45 @@
- - + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
Attack / Weapon# of
Attack		THAC0DamageSpecial AttackSpeed
+
+
+
+
+ Monster wizard spells + insert_wizard-spell-template.html_wizmonster +
+
+ Monster priest spells + insert_priest-spell-template.html_primonster +
diff --git a/AD&D 2E Revised/html/datalists.html b/AD&D 2E Revised/html/datalists.html index ff0dc3817b..3c5b4d3d77 100644 --- a/AD&D 2E Revised/html/datalists.html +++ b/AD&D 2E Revised/html/datalists.html @@ -987,24 +987,24 @@ - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -1017,12 +1017,23 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AD&D 2E Revised/javascript/sheetWorkers.js b/AD&D 2E Revised/javascript/sheetWorkers.js index 678f02f758..17454f0244 100644 --- a/AD&D 2E Revised/javascript/sheetWorkers.js +++ b/AD&D 2E Revised/javascript/sheetWorkers.js @@ -1088,6 +1088,21 @@ followerWeapons.forEach(fw => { setupFollowerWeaponsAutoFill(fw.repeating, fw.sections) }); +// Monster weapons +on('change:repeating_monsterweapons:weaponname', function(eventInfo){ + let weapon = getWeaponWithBonus(eventInfo.newValue); + if (weapon === undefined) + return; + + let weaponInfo = { + [`repeating_monsterweapons_attacknum`] : weapon['rof'] || '1', + [`repeating_monsterweapons_damsm`] : weapon['small-medium'], + [`repeating_monsterweapons_weapspeed`] : weapon['speed'], + }; + + setAttrs(weaponInfo); +}); + //Weapon proficiency slots on('change:repeating_weaponprofs:weapprofnum remove:repeating_weaponprofs', function(eventInfo) { if (doEarlyReturn(eventInfo, ['weapprofnum']))