Fix conflicts

This commit is contained in:
Dapoolp 2025-07-15 13:46:55 +02:00
commit fbfc954564
74 changed files with 1906 additions and 489 deletions

View file

@ -9,7 +9,6 @@ export default class DHWeapon extends AttachableItem {
label: 'TYPES.Item.weapon',
type: 'weapon',
hasDescription: true,
isQuantifiable: true,
isInventoryItem: true
// hasInitialAction: true
});
@ -37,7 +36,7 @@ export default class DHWeapon extends AttachableItem {
actionIds: new fields.ArrayField(new fields.StringField({ required: true }))
})
),
attack: new ActionField({
attack: new ActionField({
initial: {
name: 'Attack',
img: 'icons/skills/melee/blood-slash-foam-red.webp',