Move aiming to attacker

templates/chat-message.hbs

@@ -23,6 +23,16 @@
       <span>{{rollTarget.weapon.name}}</span>
       {{/if}}
 
+      {{#if rollData.letItFly}}
+      <span>Let It Fly attack ! </span>
+      {{/if}}
+      {{#if rollData.pointBlank}}
+      <span>Point Blank Range Attack !</span>
+      {{/if}}
+      {{#if rollData.beyondSkill}}
+      <span>Beyond Skill Range Attack !</span>
+      {{/if}}
+
       <span>Formula : {{titleFormula}}</span>
 
       {{#each diceResults as |result|}}

templates/range-defense-dialog.hbs

@@ -32,14 +32,6 @@
       </select>
     </div>
 
-    <div class="field-section">
-      <span class="field-name">Aim :</span>
-
-      <select name="attackerAim" data-tooltip-direction="UP">
-        {{selectOptions attackerAimChoices selected=attackerAim}}
-      </select>
-    </div>
-
   </fieldSet>
 
   <fieldSet>

templates/roll-dialog.hbs

@@ -33,15 +33,25 @@
     <div class="dialog-save">Add Granted Attack Dice
       <input type="checkbox" data-action="selectGranted" name="granted">
     </div>
+
+    {{#if (eq rollTarget.weapon.system.weaponType "melee")}}
+    {{else}}
     <div class="dialog-save">Point Blank Range Attack
-      <input type="checkbox" data-action="selectPointBlank" name="pointBlank">
+      <input type="checkbox" data-action="selectPointBlank" name="pointBlankV">
     </div>
     <div class="dialog-save">Beyond Skill Range Attack
-      <input type="checkbox" data-action="selectBeyondSkill" name="beyondSkill">
+      <input type="checkbox" data-action="selectBeyondSkill" name="beyondSkillV">
     </div>
     <div class="dialog-save">Let it Fly (Pure D20E)
-      <input type="checkbox" data-action="selectLetItFly" name="letItFly">
+      <input type="checkbox" data-action="selectLetItFly" name="letItFlyV">
     </div>
+    <div class="dialog-save">Aiming
+      <select name="attackerAim" data-tooltip-direction="UP">
+        {{selectOptions attackerAimChoices selected=attackerAim}}
+      </select>
+    </div>
+    {{/if}}
+
     {{/if}}
     {{#if (match rollType "defense")}}
     <div class="dialog-save">Add Granted Defense Dice