diff --git a/module/sheets/item-sheet.mjs b/module/sheets/item-sheet.mjs index eb79120..436b62e 100644 --- a/module/sheets/item-sheet.mjs +++ b/module/sheets/item-sheet.mjs @@ -11,7 +11,7 @@ export class VermineItemSheet extends ItemSheet { return foundry.utils.mergeObject(super.defaultOptions, { classes: ["vermine2047", "sheet", "item"], width: 450, - height: "auto", + height: "max-content", tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }] }); } diff --git a/module/system/fight.mjs b/module/system/fight.mjs index 0ba47ce..f34ae63 100644 --- a/module/system/fight.mjs +++ b/module/system/fight.mjs @@ -466,11 +466,13 @@ export class VermineCombatTracker extends CombatTracker { const combatant = combat.combatants.get(li.dataset.combatantId); let flag = combatant.getFlag("world", "attitude"); if (flag == attitude) { - return await combatant.setFlag("world", "attitude", null); + await combatant.setFlag("world", "attitude", null); } else { - return await combatant.setFlag("world", "attitude", attitude); + await combatant.setFlag("world", "attitude", attitude); } + let actor = await game.actors.get(combatant.actorId) + console.log(actor, combatant) } } diff --git a/templates/item/item-evolution-sheet.html b/templates/item/item-evolution-sheet.html index aaa66dd..3f6338e 100644 --- a/templates/item/item-evolution-sheet.html +++ b/templates/item/item-evolution-sheet.html @@ -1,42 +1,21 @@ -
-
- -
-

-
-
+ +
+ +
+

+
+
+
-
+

+ + +

+

description

-

- - -

-

description

+ {{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}} +
- {{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}} -
- -
\ No newline at end of file + diff --git a/templates/item/item-item-sheet.html b/templates/item/item-item-sheet.html index a32e37d..dcbfaad 100644 --- a/templates/item/item-item-sheet.html +++ b/templates/item/item-item-sheet.html @@ -1,42 +1,37 @@
-
- -
-

- -
-
+ {{log this}} + {{> "systems/vermine2047/templates/item/partials/header.hbs"}} {{!-- Sheet Body --}}
+ {{> "systems/vermine2047/templates/item/partials/traits.html"}} +
+ + {{#if system.needSkill.value}} + -
- {{!-- Description Tab --}} -
- - -
+ {{/if}} -
- - -
- -
- - -
-
- - -
-

Description

- {{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}} - {{> "systems/vermine2047/templates/item/partials/damages.html"}} + + {{> "systems/vermine2047/templates/item/partials/physicalItems.hbs"}} +
diff --git a/templates/item/item-specialty-sheet.html b/templates/item/item-specialty-sheet.html index 376553a..fa2688e 100644 --- a/templates/item/item-specialty-sheet.html +++ b/templates/item/item-specialty-sheet.html @@ -9,10 +9,6 @@ - {{log "_____________________________________________==========="}} - - {{log @root.config}} - {{#each @root.config.model.Actor.character.skills as |skill key|}} diff --git a/templates/item/item-trauma-sheet.html b/templates/item/item-trauma-sheet.html index 410c048..d7e22ba 100644 --- a/templates/item/item-trauma-sheet.html +++ b/templates/item/item-trauma-sheet.html @@ -1,33 +1,24 @@
-
- -
-

-
-
+ {{> "systems/vermine2047/templates/item/partials/header.hbs"}} - {{!-- Sheet Tab Navigation --}} - - {{!-- Sheet Body --}} -
+ {{!-- Sheet Body --}} +
-
- -
- {{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}} -
-
-
+
+ +

+ + +

+

description

+ {{editor system.description target="system.description" rollData=rollData +button=true owner=owner editable=editable}} + +
+
diff --git a/templates/item/item-weapon-sheet.html b/templates/item/item-weapon-sheet.html index e936fb2..6d03ac9 100644 --- a/templates/item/item-weapon-sheet.html +++ b/templates/item/item-weapon-sheet.html @@ -51,6 +51,6 @@ {{> "systems/vermine2047/templates/item/partials/physicalItems.hbs"}} + - - + diff --git a/templates/item/partials/traits.html b/templates/item/partials/traits.html index 4847f4f..94ce5b9 100644 --- a/templates/item/partials/traits.html +++ b/templates/item/partials/traits.html @@ -1,7 +1,7 @@

traits - - + +