Add starship, creature and vehicle

2025-03-15 20:31:50 +01:00
parent 9013229c20
commit 7eee4fab7e
23 changed files with 1080 additions and 746 deletions
--- a/module/applications/sheets/creature-sheet.mjs
+++ b/module/applications/sheets/creature-sheet.mjs
@@ -12,10 +12,8 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {
      contentClasses: ["npc-content"],
    },
    actions: {
-      createArmor: FTLNomadCreatureSheet.#onCreateArmor,
-      createWeapon: FTLNomadCreatureSheet.#onCreateWeapon,
-      createSkill: FTLNomadCreatureSheet.#onCreateSkill,
-
+      createTrait: FTLNomadCreatureSheet.#onCreateTrait,
+      createAbility: FTLNomadCreatureSheet.#onCreateAbility
    },
  }

@@ -27,8 +25,8 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {
    tabs: {
      template: "templates/generic/tab-navigation.hbs",
    },
-    skills: {
-      template: "systems/fvtt-ftl-nomad/templates/creature-skills.hbs",
+    traits: {
+      template: "systems/fvtt-ftl-nomad/templates/creature-trait.hbs",
    },
    biography: {
      template: "systems/fvtt-ftl-nomad/templates/creature-biography.hbs",
@@ -37,7 +35,7 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {

  /** @override */
  tabGroups = {
-    sheet: "skills",
+    sheet: "traits",
  }

  /**
@@ -46,7 +44,7 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {
   */
  #getTabs() {
    const tabs = {
-      skills: { id: "skills", group: "sheet", icon: "fa-solid fa-shapes", label: "FTLNOMAD.Label.skills" },
+      traits: { id: "traits", group: "sheet", icon: "fa-solid fa-shapes", label: "FTLNOMAD.Label.traits" },
      biography: { id: "biography", group: "sheet", icon: "fa-solid fa-book", label: "FTLNOMAD.Label.biography" },
    }
    for (const v of Object.values(tabs)) {
@@ -63,7 +61,7 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {

    context.enrichedDescription = await TextEditor.enrichHTML(this.document.system.description, { async: true })
    context.enrichedNotes = await TextEditor.enrichHTML(this.document.system.notes, { async: true })
-    
+
    return context
  }

@@ -73,14 +71,12 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {
    switch (partId) {
      case "main":
        break
-      case "skills":
-        context.tab = context.tabs.skills
-        context.skills = doc.itemTypes.skill
-        context.skills.sort((a, b) => a.name.localeCompare(b.name))
-        context.weapons = doc.itemTypes.weapon
-        context.weapons.sort((a, b) => a.name.localeCompare(b.name))
-        context.armors = doc.itemTypes.armor
-        context.armors.sort((a, b) => a.name.localeCompare(b.name))
+      case "traits":
+        context.tab = context.tabs.traits
+        context.abilities = doc.itemTypes["creature-ability"]
+        context.abilities.sort((a, b) => a.name.localeCompare(b.name))
+        context.traits = doc.itemTypes["creature-trait"]
+        context.traits.sort((a, b) => a.name.localeCompare(b.name))
        break
      case "biography":
        context.tab = context.tabs.biography
@@ -96,16 +92,12 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {
   * @param {Event} event             The initiating click event.
   * @param {HTMLElement} target      The current target of the event listener.
   */
-  static #onCreateWeapon(event, target) {
-    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newWeapon"), type: "weapon" }])
+  static #onCreateTrait(event, target) {
+    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newTrait"), type: "creaturetrait" }])
  }

-  static #onCreateArmor(event, target) {
-    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newArmor"), type: "armor" }])
-  }
-
-  static #onCreateSkill(event, target) {
-    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newSkill"), type: "skill" }])
+  static #onCreateAbility(event, target) {
+    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newAbility"), type: "creatureability" }])
  }

  /**
@@ -125,30 +117,31 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {
  async _onRoll(event, target) {
    const rollType = $(event.currentTarget).data("roll-type")
    let item
-    let li
-    // Debug : console.log(">>>>", event, target, rollType)
-    // Deprecated : if (this.isEditMode) return
+    let formula
+    let roll
    switch (rollType) {
-      case "char":
-        let charId = $(event.currentTarget).data("char-id")
-        item = foundry.utils.duplicate(this.actor.system.characteristics[charId])
-        item.name = game.i18n.localize(`FTLNOMAD.Label.${charId}Long`)
-        item.targetScore = item.value * 5
-        break
      case "skill":
-        li = $(event.currentTarget).parents(".item");
-        item = this.actor.items.get(li.data("item-id"));
+        let skillId = $(event.currentTarget).data("skill-id");
+        item = this.actor.system.skills[skillId];
+        await this.document.system.roll(rollType, item)
        break
-      case "weapon":
-      case "damage":
-        li = $(event.currentTarget).parents(".item");
-        item = this.actor.items.get(li.data("item-id"));
-        item.damageBonus = this.actor.system.damageBonus
+      case "creature-damage":
+        formula = this.actor.system.damage
+        // Rolll the damage
+        roll = new Roll(formula)
+        await roll.evaluate()
+        roll.toMessage( { flavor: `${this.actor.name} : Damage roll` })
+        break
+      case "creature-number":
+        formula = this.actor.system.numberAppearing
+        // Rolll the damage
+        roll = new Roll(formula)
+        await roll.evaluate()
+        roll.toMessage({flavor: `${this.actor.name} : Number Appearing roll`})
        break
      default:
        throw new Error(`Unknown roll type ${rollType}`)
    }
-    await this.document.system.roll(rollType, item)
  }

  async _onDrop(event) {
@@ -162,5 +155,4 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {
        return super._onDropItem(item)
    }
  }
-
 }
--- a/module/applications/sheets/starship-sheet.mjs
+++ b/module/applications/sheets/starship-sheet.mjs
@@ -3,17 +3,15 @@ import FTLNomadActorSheet from "./base-actor-sheet.mjs"
 export default class FTLNomadStarshipSheet extends FTLNomadActorSheet {
  /** @override */
  static DEFAULT_OPTIONS = {
-    classes: ["vehicle"],
+    classes: ["starship"],
    position: {
      width: 680,
-      height: 540,
+      height: 640,
    },
    window: {
-      contentClasses: ["vehicle-content"],
+      contentClasses: ["starship-content"],
    },
    actions: {
-      createGear: FTLNomadStarshipSheet.#onCreateGear,
-      createWeapon: FTLNomadStarshipSheet.#onCreateWeapon,
    },
  }

@@ -25,9 +23,6 @@ export default class FTLNomadStarshipSheet extends FTLNomadActorSheet {
    tabs: {
      template: "templates/generic/tab-navigation.hbs",
    },
-    equipment: {
-      template: "systems/fvtt-ftl-nomad/templates/starship-equipment.hbs",
-    },
    description: {
      template: "systems/fvtt-ftl-nomad/templates/starship-description.hbs",
    },
@@ -35,7 +30,7 @@ export default class FTLNomadStarshipSheet extends FTLNomadActorSheet {

   /** @override */
   tabGroups = {
-    sheet: "equipment",
+    sheet: "description",
  }
  
  /**
@@ -44,7 +39,6 @@ export default class FTLNomadStarshipSheet extends FTLNomadActorSheet {
   */
  #getTabs() {
    const tabs = {
-      equipment: { id: "equipment", group: "sheet", icon: "fa-solid fa-shapes", label: "FTLNOMAD.Label.equipment" },
      description: { id: "description", group: "sheet", icon: "fa-solid fa-book", label: "FTLNOMAD.Label.description" },
    }
    for (const v of Object.values(tabs)) {
@@ -61,6 +55,7 @@ export default class FTLNomadStarshipSheet extends FTLNomadActorSheet {

    context.enrichedDescription = await TextEditor.enrichHTML(this.document.system.description, { async: true })
    context.enrichedNotes = await TextEditor.enrichHTML(this.document.system.notes, { async: true })
+    context.enrichedModifications = await TextEditor.enrichHTML(this.document.system.modifications, { async: true })
    
    return context
  }
@@ -74,11 +69,6 @@ export default class FTLNomadStarshipSheet extends FTLNomadActorSheet {
    switch (partId) {
      case "main":
        break
-      case "equipment":
-        context.tab = context.tabs.equipment
-        context.weapons = doc.itemTypes.weapon
-        context.gears = doc.itemTypes.gear
-        break  
      case "description":
        context.tab = context.tabs.description
        context.enrichedDescription = await TextEditor.enrichHTML(doc.system.description, { async: true })
@@ -88,17 +78,22 @@ export default class FTLNomadStarshipSheet extends FTLNomadActorSheet {
    return context
  }

-  /**
-   * Creates a new attack item directly from the sheet and embeds it into the document.
-   * @param {Event} event             The initiating click event.
-   * @param {HTMLElement} target      The current target of the event listener.
-   */
-  static #onCreateGear(event, target) {
-    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newGear"), type: "gear" }])
-  }
-
-  static #onCreateWeapon(event, target) {
-    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 formula
+    let roll
+    switch (rollType) {
+      case "starship-guns":
+        formula = this.actor.system.guns
+        // Rolll the damage
+        roll = new Roll(formula)
+        await roll.evaluate()
+        roll.toMessage( { flavor: `Starship ${this.actor.name} : Guns Damage` })
+        break
+      default:
+        throw new Error(`Unknown roll type ${rollType}`)
+    }
  }


--- a/module/applications/sheets/vehicle-sheet.mjs
+++ b/module/applications/sheets/vehicle-sheet.mjs
@@ -12,7 +12,7 @@ export default class FTLNomadVehicleSheet extends FTLNomadActorSheet {
      contentClasses: ["vehicle-content"],
    },
    actions: {
-      createGear: FTLNomadVehicleSheet.#onCreateGear,
+      createEquipment: FTLNomadVehicleSheet.#onCreateEquipment,
      createWeapon: FTLNomadVehicleSheet.#onCreateWeapon,
    },
  }
@@ -77,7 +77,9 @@ export default class FTLNomadVehicleSheet extends FTLNomadActorSheet {
      case "equipment":
        context.tab = context.tabs.equipment
        context.weapons = doc.itemTypes.weapon
-        context.gears = doc.itemTypes.gear
+        context.weapons.sort((a, b) => a.name.localeCompare(b.name))
+        context.equipments = doc.itemTypes.equipment
+        context.equipments.sort((a, b) => a.name.localeCompare(b.name))
        break  
      case "description":
        context.tab = context.tabs.description
@@ -93,8 +95,8 @@ export default class FTLNomadVehicleSheet extends FTLNomadActorSheet {
   * @param {Event} event             The initiating click event.
   * @param {HTMLElement} target      The current target of the event listener.
   */
-  static #onCreateGear(event, target) {
-    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newGear"), type: "gear" }])
+  static #onCreateEquipment(event, target) {
+    this.document.createEmbeddedDocuments("Item", [{ name: game.i18n.localize("FTLNOMAD.Label.newEquipment"), type: "equipment" }])
  }

  static #onCreateWeapon(event, target) {