Make attack automation work with npcs, and adjust npc stats accordingly.

Author: mcglincy

css/deathinspace.css

@@ -154,6 +154,45 @@
 .deathinspace.sheet .editor {
   padding: 0 8px;
 }
+.roll-card {
+  border: 1px solid var(--highlight-background-color);
+  font-family: var(--text-font);
+  padding: 5px;
+}
+.roll-card .card-title {
+  font-weight: bold;
+  margin-bottom: 10px;
+  text-transform: uppercase;
+}
+.roll-card .roll-title {
+  text-align: center;
+  text-transform: uppercase;
+}
+.roll-card .roll-result {
+  border: 1px solid gray;
+  margin-bottom: 10px;
+  margin-left: 10px;
+  margin-right: 10px;
+  text-align: center;
+}
+.roll-card .roll-result span {
+  font-size: 20px;
+}
+.roll-card .outcome-text {
+  font-size: 28px;
+  font-weight: bold;
+  margin-bottom: 10px;
+  text-align: center;
+  text-transform: uppercase;
+}
+
+.attack-roll-card {
+  border: 2px solid var(--character-background-color);
+}
+.attack-roll-card .risky-outcome {
+  font-size: 12px;
+  text-transform: none;
+}
 /* ====================== */
 /* Actor sheet */
 /* ====================== */
@@ -1372,45 +1411,6 @@
 .deathinspace.sheet.npc .data-wrapper .form-spacer {
   height: 20px;
 }
-.roll-card {
-  border: 1px solid var(--highlight-background-color);
-  font-family: var(--text-font);
-  padding: 5px;
-}
-.roll-card .card-title {
-  font-weight: bold;
-  margin-bottom: 10px;
-  text-transform: uppercase;
-}
-.roll-card .roll-title {
-  text-align: center;
-  text-transform: uppercase;
-}
-.roll-card .roll-result {
-  border: 1px solid gray;
-  margin-bottom: 10px;
-  margin-left: 10px;
-  margin-right: 10px;
-  text-align: center;
-}
-.roll-card .roll-result span {
-  font-size: 20px;
-}
-.roll-card .outcome-text {
-  font-size: 28px;
-  font-weight: bold;
-  margin-bottom: 10px;
-  text-align: center;
-  text-transform: uppercase;
-}
-
-.attack-roll-card {
-  border: 2px solid var(--character-background-color);
-}
-.attack-roll-card .risky-outcome {
-  font-size: 12px;
-  text-transform: none;
-}
 .deathinspace.sheet.item {
   /* Notes tab */
   /* Data tab */

lang/en.json

@@ -10,6 +10,7 @@
 "DIS.AttackCriticalHit": "Critical Hit",
 "DIS.AttackHit": "Hit",
 "DIS.AttackMiss": "Miss",
+"DIS.AttackWith": "Attack with",
 "DIS.Background": "Background",
 "DIS.Cancel": "Cancel",
 "DIS.CharacterSheetTitle": "Personal Data Sheet",
@@ -25,6 +26,7 @@
 "DIS.DefenseRating": "Defense Rating",
 "DIS.DefenseRatingHelp": "12+DEX Unarmored",
 "DIS.Drive": "Drive",
+"DIS.DR": "DR",
 "DIS.DRBonus": "DR Bonus",
 "DIS.Equipment": "Equipment",
 "DIS.Frame": "Frame",
@@ -85,6 +87,7 @@
 "DIS.TabCargo": "Cargo",
 "DIS.TabSituation": "Situation",
 "DIS.TabWeaponry": "Weaponry",
+"DIS.ToHit": "To hit",
 "DIS.Total": "Total",
 "DIS.Traits": "Traits",
 "DIS.Weapon": "Weapon",
@@ -95,5 +98,6 @@
 "DIS.VoidPointsCanBeUsedTo": "Void points can be used to",
 "DIS.VoidPointsUse1": "Get advantage on an ability check or attack roll",
 "DIS.VoidPointsUse2": "Activate a cosmic mutation",
+"DIS.Vs": "vs.",
 "DIS.XP": "XP"
 }

module/actor/actor.js

@@ -130,42 +130,42 @@ export class DISActor extends Actor {
     });
   }
 
-  async showAttackDialog(itemId) {
+  async showAttackDialogWithItem(itemId) {
     const item = this.items.get(itemId);
     if (!item) {
       return;
     }
+    let attackAbility;
+    if (item.data.data.weaponType === "melee") {
+      attackAbility = "body";
+    } else {
+      attackAbility = "tech";
+    }
+    await this.showAttackDialog(
+      item.name, attackAbility, item.data.data.damage);
+  }
+
+  async showAttackDialog(attackName, attackAbility, attackDamage) {
     const attackDialog = new AttackDialog();
     attackDialog.actor = this;
-    attackDialog.itemId = itemId;
+    attackDialog.attackName = attackName;
+    attackDialog.attackAbility = attackAbility;
+    attackDialog.attackDamage = attackDamage;
     attackDialog.render(true);
   }
 
-  async attack(itemId, defenderDR, rollType, risky) {
-    const item = this.items.get(itemId);
-    if (!item) {
-      return;
-    }
-
+  async rollAttack(attackName, attackAbility, attackDamage, defenderDR, rollType, risky) {
     let d20Formula = "1d20";
     if (rollType === "advantage") {
       d20Formula = "2d20kh";
     } else if (rollType === "disadvantage") {
       d20Formula = "2d20kl";
     }
-    let ability;
-    if (item.data.data.weaponType === "melee") {
-      ability = "body";
-    } else {
-      ability = "tech";
-    }
-    const weaponTypeKey = `DIS.WeaponType${item.data.data.weaponType[0].toUpperCase() + item.data.data.weaponType.substring(1)}`;
-    const attackTitle = `${game.i18n.localize(weaponTypeKey)} ${game.i18n.localize("DIS.Attack")}`;
-    // TODO: localize
-    const attackText = `To hit: ${d20Formula}+${ability.toUpperCase()} vs. DR${defenderDR}`; 
+    const attackTitle = `${game.i18n.localize("DIS.AttackWith")} ${attackName}`;
+    const attackText = `${game.i18n.localize("DIS.ToHit")}: ${d20Formula}+${attackAbility.toUpperCase()} ${game.i18n.localize("DIS.Vs")} ${game.i18n.localize("DIS.DR")}${defenderDR}`; 
     const rollData = this.getRollData();
     const attackRoll = new Roll(
-      `${d20Formula} + @abilities.${ability}.value`,
+      `${d20Formula} + @abilities.${attackAbility}.value`,
       rollData
     );
     attackRoll.evaluate({ async: false });
@@ -180,7 +180,7 @@ export class DISActor extends Actor {
     if (isCrit || attackRoll.total >= defenderDR) {
       // hit
       attackOutcome = game.i18n.localize(isCrit ? "DIS.AttackCriticalHit" : "DIS.AttackHit");
-      const baseDamage = item.data.data.damage;
+      const baseDamage = attackDamage;
       let damageFormula = baseDamage;
       if (isCrit) {
         damageFormula += ` + ${baseDamage}`;
@@ -202,6 +202,7 @@ export class DISActor extends Actor {
     }
 
     const chatData = {
+      attackName,
       attackOutcome,
       attackRoll,
       attackText,

module/actor/sheet/attack-dialog.js

@@ -27,7 +27,6 @@ export default class AttackDialog extends Application {
       .val();
     const risky = $(form).find("input[name=risky]").is(":checked");
     this.close();
-    // TODO: await this?
-    this.actor.attack(this.itemId, defenderDR, rollType, risky);
+    this.actor.rollAttack(this.attackName, this.attackAbility, this.attackDamage, defenderDR, rollType, risky);
   }
 }

module/actor/sheet/character-sheet.js

@@ -130,8 +130,7 @@ export class DISCharacterSheet extends DISActorSheet {
     event.preventDefault();
     const row = $(event.currentTarget).parents(".item");
     const itemId = row.data("itemId");
-    //this.actor.rollItemAttack(itemId);
-    this.actor.showAttackDialog(itemId);
+    this.actor.showAttackDialogWithItem(itemId);
   }
 
   _onDamageRoll(event) {

module/actor/sheet/npc-sheet.js

@@ -38,7 +38,7 @@ export class DISNpcSheet extends DISActorSheet {
 
   _onAttackRoll(event) {
     event.preventDefault();
-    this.actor.rollNpcAttack();
+    this.actor.showAttackDialog(this.actor.data.data.attackName, this.actor.data.data.attackAbility, this.actor.data.data.attackDamage);
   }
 
   _onDamageRoll(event) {