Add custom add item dialog.

Author: mcglincy

css/deathinspace.css

@@ -1348,7 +1348,12 @@
   text-align: center;
   text-transform: uppercase;
 }
-
+.ability-check-dialog {
+  border: 2px solid var(--character-background-color);
+}
+.add-item-dialog {
+  border: 2px solid var(--character-background-color);
+}
 .deathinspace.app.window-app .window-content {
   background: url(../assets/images/ui/seamless_paper_texture.png) repeat;
 }
@@ -1396,8 +1401,11 @@
   box-shadow: 0 0 5px var(--highlight-background-color);
   text-shadow: 0 0 10px var(--highlight-background-color);
 }
+.deathinspace.app.window-app.dialog {
+  background: url(../assets/images/ui/seamless_paper_texture.png) repeat;
+}
+
 .custom-dialog {
-  border: 2px solid var(--character-background-color);
   color: var(--foreground-color);
   font-family: var(--text-font);
   margin: 0;

lang/en.json

@@ -1,8 +1,12 @@
 {
-  "DIS.AbilityBody": "Body",
-  "DIS.Add": "Add",
   "DIS.Ability": "Ability",
+  "DIS.AbilityBody": "Body",
+  "DIS.AbilityDexterity": "Dexterity",
+  "DIS.AbilitySavvy": "Savvy",
+  "DIS.AbilityTech": "Tech",
   "DIS.AbilityCheck": "Ability Check",
+  "DIS.Add": "Add",
+  "DIS.AddItem": "Add Item",
   "DIS.Ammo": "Ammo",
   "DIS.Appearance": "Appearance",
   "DIS.ArmorType": "Armor Type",
@@ -56,11 +60,18 @@
   "DIS.HubRegainHelp3": "On a calm night up to maximum",
   "DIS.HubSheetTitle": "Hub Data Sheet",
   "DIS.ItemBroken": "Item broken",
+  "DIS.ItemName": "Item Name",
+  "DIS.ItemType": "Item Type",
+  "DIS.ItemTypeArmor": "Armor",
+  "DIS.ItemTypeEquipment": "Equipment",
+  "DIS.ItemTypeWeapon": "Weapon",
   "DIS.LifeSupport": "Life Support",
   "DIS.Looks": "Looks",
   "DIS.Max": "Max",
   "DIS.Modules": "Modules",
   "DIS.Morale": "Morale",
+  "DIS.MoraleFailure": "Parley or flee",
+  "DIS.MoraleSuccess": "Stands firm",
   "DIS.Name": "Name",
   "DIS.NpcSheetTitle": "NPC Sheet",
   "DIS.Opponent": "Opponent",
@@ -78,17 +89,23 @@
   "DIS.PowerTotalHelp1": "The power cost sum should not",
   "DIS.PowerTotalHelp2": "exceed the output power.",
   "DIS.ProtectsAgainst": "Protects Against",
-  "DIS.RollType": "Roll Type",
-  "DIS.RollTypeAdvantage": "Advantage",
-  "DIS.RollTypeDisadvantage": "Disadvantage",
-  "DIS.RollTypeNormal": "Normal",
   "DIS.Quirks": "Quirks",
+  "DIS.Reaction": "Reaction",
+  "DIS.ReactionHelpful": "Helpful",
+  "DIS.ReactionHostile": "Hostile",
+  "DIS.ReactionTalkative": "Talkative",
+  "DIS.ReactionUnfriendly": "Unfriendly",
+  "DIS.ReactionUncertain": "Uncertain",
   "DIS.Regenerate": "Regenerate",
   "DIS.RegenerateWarning": "This will destroy your existing character and replace it with a newly generated one. This cannot be undone.",
   "DIS.RiskyAttack": "Risky Attack",
   "DIS.RiskyAttackFailure": "Risky attack fails! Opponent gets immediate counterattack and chooses next initiative.",
   "DIS.RiskyAttackSuccess": "Risky attack adds a die of damage.",
   "DIS.Roll": "Roll",
+  "DIS.RollType": "Roll Type",
+  "DIS.RollTypeAdvantage": "Advantage",
+  "DIS.RollTypeDisadvantage": "Disadvantage",
+  "DIS.RollTypeNormal": "Normal",
   "DIS.Section0Name": "Section 0. Name",
   "DIS.SheetClassCharacter": "Death in Space Character Sheet",
   "DIS.SheetClassHub": "Death in Space Hub Sheet",

module/actor/actor.js

@@ -1,4 +1,5 @@
 import AbilityCheckDialog from "../dialog/ability-check-dialog.js";
+import AddItemDialog from "../dialog/add-item-dialog.js";
 import AttackDialog from "../dialog/attack-dialog.js";
 import { diceSound, showDice } from "../dice.js";
 import { regenerateCharacter, regenerateNpc } from "../generator.js";
@@ -132,6 +133,12 @@ export class DISActor extends Actor {
     return this.showAbilityCheckDialog("tech");
   }
 
+  async showAddItemDialog() {
+    const dialog = new AddItemDialog();
+    dialog.actor = this;
+    dialog.render(true);
+  }
+
   async showAbilityCheckDialog(ability) {
     const checkDialog = new AbilityCheckDialog();
     checkDialog.actor = this;
@@ -375,33 +382,73 @@ export class DISActor extends Actor {
     });
   }
 
-  async rollNpcDamage() {
-    if (!this.data.data.damage) {
-      return;
+  async rollNpcMorale() {
+    const cardTitle = `${game.i18n.localize("Morale")} ${game.i18n.localize(
+      "DIS.Check"
+    )}`;
+    const moraleText = `2D6 ${game.i18n.localize("Vs")} ${game.i18n.localize(
+      "Morale"
+    )}`;
+    const moraleRoll = new Roll("2d6");
+    moraleRoll.evaluate({ async: false });
+    await showDice(moraleRoll);
+    let moraleOutcome;
+    if (moraleRoll.total > this.data.data.morale) {
+      moraleOutcome = game.i18n.localize("DIS.MoraleFailure");
+    } else {
+      moraleOutcome = game.i18n.localize("DIS.MoraleSuccess");
     }
-    const roll = new Roll(this.data.data.damage);
-    roll.toMessage({
-      user: game.user.id,
-      speaker: ChatMessage.getSpeaker({ actor: this }),
-      flavor: `${this.data.data.attack} damage`,
-    });
-  }
 
-  async rollNpcMorale() {
-    const roll = new Roll("2d6");
-    roll.toMessage({
-      user: game.user.id,
+    const chatData = {
+      cardTitle,
+      moraleOutcome,
+      moraleText,
+      moraleRoll,
+    };
+    const html = await renderTemplate(
+      "systems/deathinspace/templates/chat/morale.html",
+      chatData
+    );
+    ChatMessage.create({
+      content: html,
+      sound: diceSound(),
       speaker: ChatMessage.getSpeaker({ actor: this }),
-      flavor: `Morale`,
     });
   }
 
   async rollNpcReaction() {
-    const roll = new Roll("2d6");
-    roll.toMessage({
-      user: game.user.id,
+    const cardTitle = `${game.i18n.localize("Reaction")}`;
+    const reactionText = "2D6";
+    const reactionRoll = new Roll("2d6");
+    reactionRoll.evaluate({ async: false });
+    await showDice(reactionRoll);
+    let reactionOutcome;
+    if (reactionRoll.total === 2) {
+      reactionOutcome = game.i18n.localize("DIS.ReactionHostile");
+    } else if (reactionRoll.total <= 5) {
+      reactionOutcome = game.i18n.localize("DIS.ReactionUnfriendly");
+    } else if (reactionRoll.total <= 8) {
+      reactionOutcome = game.i18n.localize("DIS.ReactionUncertain");
+    } else if (reactionRoll.total <= 11) {
+      reactionOutcome = game.i18n.localize("DIS.ReactionTalkative");
+    } else {
+      reactionOutcome = game.i18n.localize("DIS.ReactionHelpful");
+    }
+
+    const chatData = {
+      cardTitle,
+      reactionOutcome,
+      reactionText,
+      reactionRoll,
+    };
+    const html = await renderTemplate(
+      "systems/deathinspace/templates/chat/reaction.html",
+      chatData
+    );
+    ChatMessage.create({
+      content: html,
+      sound: diceSound(),
       speaker: ChatMessage.getSpeaker({ actor: this }),
-      flavor: `Reaction`,
     });
   }
 

module/actor/sheet/actor-sheet.js

@@ -63,35 +63,11 @@ export default class DISActorSheet extends ActorSheet {
   }
 
   /**
-   * +Add for belongings tab
+   * +Add button for belongings tab
    */
   async _onAddBelonging(event) {
-    console.log("_onAddBelonging ****");
     event.preventDefault();
-    const template =
-      "systems/deathinspace/templates/dialog/add-item-dialog.html";
-    const dialogData = {
-      config: CONFIG.DeathInSpace,
-    };
-    const html = await renderTemplate(template, dialogData);
-    return new Promise((resolve) => {
-      new Dialog({
-        title: game.i18n.localize("Create New Item"),
-        content: html,
-        buttons: {
-          create: {
-            icon: '<i class="fas fa-check"></i>',
-            label: game.i18n.localize("Create New Item"),
-            callback: (html) =>
-              resolve(
-                _createBelongingItem(this.actor, html[0].querySelector("form"))
-              ),
-          },
-        },
-        default: "create",
-        close: () => resolve(null),
-      }).render(true);
-    });
+    this.actor.showAddItemDialog();
   }
 
   _onWeaponRoll(event) {
@@ -157,15 +133,3 @@ export default class DISActorSheet extends ActorSheet {
     }
   }
 }
-
-/**
- * Create a new Owned Item for the given actor, based on the name/type from the form.
- */
-const _createBelongingItem = (actor, form) => {
-  const itemData = {
-    name: form.itemname.value,
-    type: form.itemtype.value,
-    data: {},
-  };
-  actor.createEmbeddedDocuments("Item", [itemData]);
-};

module/dialog/add-item-dialog.js

@@ -0,0 +1,32 @@
+export default class AddItemDialog extends Application {
+  /** @override */
+  static get defaultOptions() {
+    const options = super.defaultOptions;
+    options.id = "add-item-dialog";
+    options.classes = ["deathinspace"];
+    options.title = game.i18n.localize("DIS.AddItem");
+    options.template =
+      "systems/deathinspace/templates/dialog/add-item-dialog.html";
+    options.width = 420;
+    options.height = "auto";
+    return options;
+  }
+
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+    html.find(".add-item-button").click(this._onAddItem.bind(this));
+  }
+
+  async _onAddItem(event) {
+    event.preventDefault();
+    const form = $(event.currentTarget).parents(".add-item-dialog")[0];
+    const itemData = {
+      name: form.itemname.value,
+      type: form.itemtype.value,
+      data: {},
+    };
+    await this.actor.createEmbeddedDocuments("Item", [itemData]);
+    this.close();
+  }
+}

source/templates/chat/morale.pug

@@ -0,0 +1,12 @@
+form.roll-card.morale-card
+  .card-title 
+    | {{cardTitle}}
+  .morale-roll 
+    .roll-title
+      | {{moraleText}}
+    .roll-result 
+      span
+        | {{xtotal moraleRoll}}
+  .outcome-text 
+    .morale-outcome 
+      | {{moraleOutcome}}

source/templates/chat/reaction.pug

@@ -0,0 +1,12 @@
+form.roll-card.reaction-card
+  .card-title 
+    | {{cardTitle}}
+  .reaction-roll 
+    .roll-title
+      | {{reactionText}}
+    .roll-result 
+      span
+        | {{xtotal reactionRoll}}
+  .outcome-text 
+    .reaction-outcome 
+      | {{reactionOutcome}}

source/templates/dialog/ability-check-dialog.scss

@@ -0,0 +1,3 @@
+.ability-check-dialog {
+  border: 2px solid var(--character-background-color);
+}

source/templates/dialog/add-item-dialog.pug

@@ -1,10 +1,15 @@
-form.custom-dialog(action="")
+form.custom-dialog.add-item-dialog(action="")
   .form-group
-    label Name 
-    input(type="text" name="itemname" value="" placeholder="Name" data-dtype="String") 
+    label {{ localize "DIS.ItemName" }}
+    input(type="text" name="itemname" value="" placeholder="{{ localize 'DIS.Name' }}" data-dtype="String") 
+
   .form-group
-    label Type
+    label {{ localize "DIS.ItemType" }}
     select.add-type(name="itemtype") 
-      option armor
-      option(selected=true) equipment 
-      option weapon
+      option(value="armor") {{ localize "DIS.ItemTypeArmor" }}
+      option(value="equipment" selected=true) {{ localize "DIS.ItemTypeEquipment" }}
+      option(value="weapon") {{ localize "DIS.ItemTypeWeapon" }}
+
+  .button-row
+    button(type="button" class="add-item-button" name="add-item-button")
+      | {{ localize "DIS.Add" }}

source/templates/dialog/add-item-dialog.scss

@@ -0,0 +1,4 @@
+
+.add-item-dialog {
+  border: 2px solid var(--character-background-color);
+}