From cb583d91546dbf58db8e805e2b025bc1d69b9ab5 Mon Sep 17 00:00:00 2001
From: U~man <ewolfwood@yandex.com>
Date: Tue, 7 Jul 2020 22:07:51 +0200
Subject: [PATCH] ENH: Movement rates order, and speed rolls

---
 src/module/actor/actor-sheet.js                     |  2 +-
 src/module/item/entity.js                           | 13 ++++++-------
 .../actors/partials/character-attributes-tab.html   | 12 ++++++------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/module/actor/actor-sheet.js b/src/module/actor/actor-sheet.js
index da2e953..4b95a1d 100644
--- a/src/module/actor/actor-sheet.js
+++ b/src/module/actor/actor-sheet.js
@@ -114,7 +114,7 @@ export class OseActorSheet extends ActorSheet {
     html.find(".item-image").click(async (ev) => {
       const li = $(ev.currentTarget).parents(".item");
       const item = this.actor.getOwnedItem(li.data("itemId"));
-      item.roll();
+      item.roll({skipDialog: event.ctrlKey});
     });
 
 
diff --git a/src/module/item/entity.js b/src/module/item/entity.js
index 87333c8..b95d904 100644
--- a/src/module/item/entity.js
+++ b/src/module/item/entity.js
@@ -49,15 +49,14 @@ export class OseItem extends Item {
     return data;
   }
 
-  rollWeapon() {
-    console.log(this);
+  rollWeapon(skipDialog) {
     let isNPC = this.actor.data.type != 'character';
     if (this.data.data.missile && !isNPC) {
-      this.actor.rollAttack({type: 'missile', label: this.name, dmg: this.data.data.damage});
+      this.actor.rollAttack({type: 'missile', label: this.name, dmg: this.data.data.damage}, {event: {ctrlKey: skipDialog}});
     } else if (this.data.data.melee && !isNPC) {
-      this.actor.rollAttack({type: 'melee', label: this.name, dmg: this.data.data.damage});
+      this.actor.rollAttack({type: 'melee', label: this.name, dmg: this.data.data.damage}, {event: {ctrlKey: skipDialog}});
     } else {
-      this.actor.rollAttack({type: 'raw', label: this.name, dmg: this.data.data.damage});
+      this.actor.rollAttack({type: 'raw', label: this.name, dmg: this.data.data.damage}, {event: {ctrlKey: skipDialog}});
     }
     return true;
   }
@@ -96,9 +95,9 @@ export class OseItem extends Item {
    * Roll the item to Chat, creating a chat card which contains follow up attack or damage roll options
    * @return {Promise}
    */
-  async roll({ configureDialog = true } = {}) {
+  async roll({ skipDialog = false } = {}) {
     if (this.data.type == 'weapon') {
-      if (this.rollWeapon()) return;
+      if (this.rollWeapon(skipDialog)) return;
     }
     // Basic template rendering data
     const token = this.actor.token;
diff --git a/src/templates/actors/partials/character-attributes-tab.html b/src/templates/actors/partials/character-attributes-tab.html
index 0a6663f..f46bd49 100644
--- a/src/templates/actors/partials/character-attributes-tab.html
+++ b/src/templates/actors/partials/character-attributes-tab.html
@@ -211,11 +211,11 @@
         <div class="flexrow">
             <ul class="attributes flexrow">
                 <li class="attribute attribute-secondaries">
-                    <h4 class="attribute-name box-title" title="{{localize 'OSE.MovementEncounter'}}">
-                        {{localize 'OSE.MovementEncounterShort'}}</h4>
+                    <h4 class="attribute-name box-title" title="{{localize 'OSE.MovementOverland'}}">
+                        {{localize 'OSE.MovementOverlandShort'}}</h4>
                     <div class="flexrow">
                         <div class="attribute-value">
-                            {{divide data.movement.base 3}}
+                            {{divide data.movement.base 5}}
                         </div>
                     </div>
                 </li>
@@ -228,11 +228,11 @@
                     </div>
                 </li>
                 <li class="attribute attribute-secondaries">
-                    <h4 class="attribute-name box-title" title="{{localize 'OSE.MovementOverland'}}">
-                        {{localize 'OSE.MovementOverlandShort'}}</h4>
+                    <h4 class="attribute-name box-title" title="{{localize 'OSE.MovementEncounter'}}">
+                        {{localize 'OSE.MovementEncounterShort'}}</h4>
                     <div class="flexrow">
                         <div class="attribute-value">
-                            {{divide data.movement.base 5}}
+                            {{divide data.movement.base 3}}
                         </div>
                     </div>
                 </li>