Minor fixes

2025-03-30 16:23:16 +02:00
parent 8576d25c2c
commit 38e01dad24
10 changed files with 51 additions and 17 deletions
--- a/module/applications/sheets/character-sheet.mjs
+++ b/module/applications/sheets/character-sheet.mjs
@@ -112,7 +112,7 @@ export default class FTLNomadCharacterSheet extends FTLNomadActorSheet {


  static #onCreateEquipment(event, target) {
-    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newGear"), type: "gear" }])
+    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newEquipment"), type: "equipment" }])
  }

  static #onCreateWeapon(event, target) {
--- a/module/applications/sheets/creature-sheet.mjs
+++ b/module/applications/sheets/creature-sheet.mjs
@@ -93,11 +93,11 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {
   * @param {HTMLElement} target      The current target of the event listener.
   */
  static #onCreateTrait(event, target) {
-    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newTrait"), type: "creaturetrait" }])
+    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newTrait"), type: "creature-trait" }])
  }

  static #onCreateAbility(event, target) {
-    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newAbility"), type: "creatureability" }])
+    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newAbility"), type: "creature-ability" }])
  }

  /**
--- a/module/applications/sheets/vehicle-sheet.mjs
+++ b/module/applications/sheets/vehicle-sheet.mjs
@@ -103,6 +103,21 @@ export default class FTLNomadVehicleSheet extends FTLNomadActorSheet {
    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newWeapon"), type: "weapon" }])
  }

+  async _onRoll(event, target) {
+    const rollType = $(event.currentTarget).data("roll-type")
+    let item
+    let li
+    switch (rollType) {
+      case "damage":
+        li = $(event.currentTarget).parents(".item");
+        item = this.actor.items.get(li.data("item-id"));
+        break
+      default:
+        throw new Error(`Unknown roll type ${rollType}`)
+    }
+    await this.document.system.roll(rollType, item)
+  }
+

  async _onDrop(event) {
    if (!this.isEditable || !this.isEditMode) return
--- a/module/models/creature.mjs
+++ b/module/models/creature.mjs
@@ -31,7 +31,7 @@ export default class FTLNomadCreature extends foundry.abstract.TypeDataModel {
    schema.numberAppearing = new fields.StringField({ required: true, initial: "1d6" })
    schema.health = new fields.SchemaField({
      staminaValue: new fields.NumberField({ ...requiredInteger, initial: 1, min: 0 }),
-      staminaMax: new fields.NumberField({ ...requiredInteger, initial: 1, min: 0 }),
+      staminaMax: new fields.NumberField({ ...requiredInteger, initial: 1, min: 1 }),
    })
    schema.damage = new fields.StringField({ required: true, initial: "1d6" })

--- a/module/models/vehicle.mjs
+++ b/module/models/vehicle.mjs
@@ -33,4 +33,23 @@ export default class FTLNomadVehicle extends foundry.abstract.TypeDataModel {
    return false
  }

+    async roll(rollType, rollItem) {
+      let opponentTarget
+      const hasTarget = opponentTarget !== undefined
+  
+      let roll = await FTLNomadRoll.prompt({
+        rollType,
+        rollItem,
+        actorId: this.parent.id,
+        actorName: this.parent.name,
+        actorImage: this.parent.img,
+        isEncumbered: this.isEncumbered(),
+        hasTarget,
+        target: opponentTarget
+      })
+      if (!roll) return null
+  
+      await roll.toMessage({}, { rollMode: roll.options.rollMode })
+    }
+  
 }
--- a/templates/character-equipment.hbs
+++ b/templates/character-equipment.hbs
@@ -12,7 +12,7 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.weapons"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addWeapon"}}" data-tooltip-direction="UP"><i
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addWeapon"}}" data-tooltip-direction="UP"><i
          class="fas fa-plus" data-action="createWeapon"></i></a>{{/if}}
    </legend>
    <div class="weapons">
@@ -43,7 +43,7 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.armors"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addArmor"}}" data-tooltip-direction="UP"><i
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addArmor"}}" data-tooltip-direction="UP"><i
          class="fas fa-plus" data-action="createArmor"></i></a>{{/if}}
    </legend>
    <div class="armors">
@@ -67,7 +67,7 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.implants"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addTalent"}}" data-tooltip-direction="UP"><i
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addTalent"}}" data-tooltip-direction="UP"><i
          class="fas fa-plus" data-action="createImplant"></i></a>{{/if}}
    </legend>
    <div class="implants">
@@ -101,8 +101,8 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.equipments"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addGear"}}" data-tooltip-direction="UP"><i
-          class="fas fa-plus" data-action="createGear"></i></a>{{/if}}
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addEquipment"}}" data-tooltip-direction="UP"><i
+          class="fas fa-plus" data-action="createEquipment"></i></a>{{/if}}
    </legend>
    <div class="equipments">
      {{#each equipments as |item|}}
--- a/templates/character-talents.hbs
+++ b/templates/character-talents.hbs
@@ -2,7 +2,7 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.talents"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addTalent"}}" data-tooltip-direction="UP"><i
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addTalent"}}" data-tooltip-direction="UP"><i
          class="fas fa-plus" data-action="createTalent"></i></a>{{/if}}
    </legend>
    <div class="talents">
@@ -36,7 +36,7 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.psionics"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addImplant"}}" data-tooltip-direction="UP"><i
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addImplant"}}" data-tooltip-direction="UP"><i
          class="fas fa-plus" data-action="createPsionic"></i></a>{{/if}}
    </legend>
    <div class="psionics">
@@ -70,7 +70,7 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.languages"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addLanguage"}}" data-tooltip-direction="UP"><i
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addLanguage"}}" data-tooltip-direction="UP"><i
          class="fas fa-plus" data-action="createLanguage"></i></a>{{/if}}
    </legend>
    <div class="languages">
--- a/templates/creature-main.hbs
+++ b/templates/creature-main.hbs
@@ -11,7 +11,7 @@
        <fieldset class="creature-hp">
          <legend>{{localize "FTLNOMAD.Label.Stamina"}}</legend>
          <div class="flexrow">
-            Curr. {{formField systemFields.health.fields.staminaValue value=health.staminaValue}}
+            Curr. {{formField systemFields.health.fields.staminaValue value=system.health.staminaValue}}
            Max {{formField systemFields.health.fields.staminaMax value=system.health.staminaMax rootId=partId}}
          </div>
        </fieldset>
--- a/templates/creature-trait.hbs
+++ b/templates/creature-trait.hbs
@@ -2,7 +2,7 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.traits"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addTrait"}}" data-tooltip-direction="UP"><i
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addTrait"}}" data-tooltip-direction="UP"><i
          class="fas fa-plus" data-action="createTrait"></i></a>{{/if}}
    </legend>
    <div class="traits">
@@ -25,7 +25,7 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.abilities"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addAbility"}}" data-tooltip-direction="UP"><i
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addAbility"}}" data-tooltip-direction="UP"><i
          class="fas fa-plus" data-action="createAbility"></i></a>{{/if}}
    </legend>
    <div class="abilities">
--- a/templates/vehicle-equipment.hbs
+++ b/templates/vehicle-equipment.hbs
@@ -2,7 +2,7 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.weapons"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addWeapon"}}" data-tooltip-direction="UP"><i
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addWeapon"}}" data-tooltip-direction="UP"><i
          class="fas fa-plus" data-action="createWeapon"></i></a>{{/if}}
    </legend>
    <div class="weapons">
@@ -29,7 +29,7 @@

  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.equipment"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addEquipment"}}" data-tooltip-direction="UP"><i
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addEquipment"}}" data-tooltip-direction="UP"><i
          class="fas fa-plus" data-action="createEquipment"></i></a>{{/if}}
    </legend>
    <div class="equipments">