Fix conflict

2026-01-14 12:41:07 +01:00 · 2025-06-25 02:50:08 +02:00 · 2025-06-25 02:50:08 +02:00 · 22075e7490
commit 22075e7490
parent b7b4722f7c 3953a6fbe9
32 changed files with 1702 additions and 1011 deletions
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@ -55,12 +55,11 @@ export default class DhpAdversary extends BaseDataActor {
                        type: 'weapon'
                    },
                    damage: {
-                        parts: [{
-                            multiplier: 'flat',
-                            dice: 'd20',
-                            bonus: 2,
-                            flatMultiplier: 3
-                        }]
+                        parts: [
+                            {
+                                multiplier: 'flat'
+                            }
+                        ]
                    }
                }
            }),