Fix secondary attack bonus and tentacle attacks

websterguy · Jun 24, 2024 · 09f37a5 · 09f37a5
1 parent 77ab252
commit 09f37a5
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 16 deletions.
diff --git a/packs/macros/000585.log → packs/macros/000589.log b/packs/macros/000585.log → packs/macros/000589.log
diff --git a/packs/macros/CURRENT b/packs/macros/CURRENT
@@ -1 +1 @@
-MANIFEST-000584
+MANIFEST-000588
diff --git a/packs/macros/LOG b/packs/macros/LOG
@@ -1,3 +1 @@
-2024/06/22-14:07:49.832 2d60 Recovering log #582
-2024/06/22-14:07:49.842 2d60 Delete type=0 #582
-2024/06/22-14:07:49.842 2d60 Delete type=3 #580
+2024/06/23-16:06:00.553 6e04 Delete type=3 #1
diff --git a/packs/macros/LOG.old b/packs/macros/LOG.old
@@ -1,7 +1,5 @@
-2024/06/15-12:03:40.386 1c3c Recovering log #578
-2024/06/15-12:03:40.395 1c3c Delete type=0 #578
-2024/06/15-12:03:40.395 1c3c Delete type=3 #576
-2024/06/18-16:03:08.888 75f8 Level-0 table #583: started
-2024/06/18-16:03:08.888 75f8 Level-0 table #583: 0 bytes OK
-2024/06/18-16:03:08.892 75f8 Delete type=0 #581
-2024/06/18-16:03:08.929 75f8 Manual compaction at level-0 from '!macros!DYCrMAwEKzOOAFkd' @ 72057594037927935 : 1 .. '!macros!tOeKncsmf6bJRT27' @ 0 : 0; will stop at (end)
+2024/06/23-16:06:00.514 6e04 Log #586: 0 ops saved to Table #587 OK
+2024/06/23-16:06:00.515 6e04 Archiving C:\Users\Kevin\AppData\Local\FoundryVTT\Data\modules\pf1-mighty-morphin\packs\macros/000586.log: OK
+2024/06/23-16:06:00.516 6e04 Table #477: 4 entries OK
+2024/06/23-16:06:00.526 6e04 Archiving C:\Users\Kevin\AppData\Local\FoundryVTT\Data\modules\pf1-mighty-morphin\packs\macros/MANIFEST-000584: OK
+2024/06/23-16:06:00.531 6e04 **** Repaired leveldb C:\Users\Kevin\AppData\Local\FoundryVTT\Data\modules\pf1-mighty-morphin\packs\macros; recovered 1 files; 8000 bytes. Some data may have been lost. ****
diff --git a/packs/macros/MANIFEST-000588 b/packs/macros/MANIFEST-000588
diff --git a/packs/macros/lost/000586.log b/packs/macros/lost/000586.log
diff --git a/packs/macros/MANIFEST-000584 → packs/macros/lost/MANIFEST-000584 b/packs/macros/MANIFEST-000584 → packs/macros/lost/MANIFEST-000584
diff --git a/scripts/mighty-morphin.js b/scripts/mighty-morphin.js
@@ -1441,6 +1441,7 @@ export class MightyMorphinApp {
         let subAction = duplicate(globalThis.pf1.components.ItemAction.defaultData);
 
 
+        subAction['naturalAttack']['primaryAttack'] = ((attack.primaryAttack || (MightyMorphinApp.naturalAttacks[attack.name]?.primaryAttack)) || onlyAttack);
         subAction['actionType'] = attack.attackType || 'mwak'; // melee, ranged, save, combat man., etc
         subAction['activation']['type'] = 'attack';
         subAction['activation']['unchained'] = { 'cost': 1, 'type': 'action' };
@@ -1515,7 +1516,7 @@ export class MightyMorphinApp {
 
 
         // ability damage multiplier is the passed multiplier or 1.5 for an only attack, 1 for a primary attack, .5 secondary
-        subAction['ability']['damageMult'] = attack.mult || (onlyAttack ? 1.5 : (attackData.system.primaryAttack) ? 1 : 0.5);
+        subAction['ability']['damageMult'] = attack.mult || (onlyAttack ? 1.5 : 1);
 
         // Create attack sizeRoll with the passed dice stats, the actor's size, and the attack type's damage type (or '' if attack name not in naturalAttacks)
         if (attack.diceSize !== 0) {

diff --git a/scripts/morphin-changes.js b/scripts/morphin-changes.js
@@ -1765,7 +1765,7 @@ MorphinChanges.changes = {
                     size: 'sm',
                     attacks: [
                         { name: 'Bite', diceCount: 1, diceSize: 3, count: 1 },
-                        { name: 'Tentacles', diceCount: 0, diceSize: 0, count: 1, special: ['Grab'], claw: false }
+                        { name: 'Tentacle', diceCount: 0, diceSize: 0, count: 1, special: ['Grab'], claw: false }
                     ],
                     speed: {
                         swim: 30
@@ -1785,7 +1785,7 @@ MorphinChanges.changes = {
                 15: {
                     attacks: [
                         { name: 'Bite', diceCount: 1, diceSize: 3, count: 1 },
-                        { name: 'Tentacles', diceCount: 0, diceSize: 0, count: 1, special: ['Grab'], claw: true }
+                        { name: 'Tentacle', diceCount: 0, diceSize: 0, count: 1, special: ['Grab'], claw: true }
                     ],
                     specialAttack: [
                         { name: 'InkCloud', diceCount: 0, diceSize: 0, count: 1, special: ['Ink'], attackType: 'none', claw: false }
@@ -3223,7 +3223,7 @@ MorphinChanges.changes = {
         size: 'sm',
         attacks: [
             { name: 'Bite', diceCount: 1, diceSize: 3, count: 1, special: ['Poison'] },
-            { name: 'Tentacles', diceCount: 0, diceSize: 0, count: 1, special: ['Grab'] }
+            { name: 'Tentacle', diceCount: 0, diceSize: 0, count: 1, special: ['Grab'] }
         ],
         speed: {
             land: 20,
@@ -5048,7 +5048,7 @@ MorphinChanges.changes = {
         attacks: [
             { name: 'Bite', diceCount: 2, diceSize: 6, count: 1 },
             { name: 'Arm', diceCount: 1, diceSize: 6, count: 1 },
-            { name: 'Tentacles', diceCount: 4, diceSize: 6, count: 1, special: ['Grab', 'Constrict'] }
+            { name: 'Tentacle', diceCount: 4, diceSize: 6, count: 1, special: ['Grab', 'Constrict'] }
         ],
         speed: {
             swim: 60