Saisie de valeurs négatives

changelog.md

@@ -4,6 +4,7 @@
 
 - les soins d'un joueur à l'autre fonctionne de nouveau
 - la fenêtre de jet de compétence s'ouvre avec la caractéristique et la difficulté par défaut
+- on peut saisir des valeurs négatives au clavier en sélectionnant les conditions/difficultés
 
 ## 13.0.29 - Le tricorne d'Illysis
 

module/roll/roll-part-conditions.mjs

@@ -65,12 +65,7 @@ export class RollPartConditions extends RollPart {
   async _onRender(rollDialog, context, options) {
     const input = rollDialog.element.querySelector(`roll-section[name="${this.code}"] input[name="${this.code}"]`)
 
-    input?.addEventListener("input", e => this.onInputChange(e, rollDialog))
+    input?.addEventListener("input", e => this.onNumericInputChange(e, rollDialog))
-  }
-
-  onInputChange(event, rollDialog) {
-    this.getCurrent(rollDialog.rollData).value = parseInt(event.currentTarget.value)
-    rollDialog.render()
   }
 
 }

module/roll/roll-part-diff.mjs

@@ -73,12 +73,7 @@ export class RollPartDiff extends RollPart {
   async _onRender(rollDialog, context, options) {
     const input = rollDialog.element.querySelector(`roll-section[name="${this.code}"] input[name="${this.code}"]`)
 
-    input?.addEventListener("input", e => this.onInputChange(e, rollDialog))
+    input?.addEventListener("input", e => this.onNumericInputChange(e, rollDialog))
-  }
-
-  onInputChange(event, rollDialog) {
-    this.getCurrent(rollDialog.rollData).value = parseInt(event.currentTarget.value)
-    rollDialog.render()
   }
 
 }

module/roll/roll-part.mjs

@@ -1,5 +1,3 @@
-import { ALL_ROLL_TYPES } from "./roll-dialog.mjs"
-
 export const ROLLDIALOG_SECTION = {
   ACTION: 'action',
   CARAC: 'carac',
@@ -9,7 +7,6 @@ export const ROLLDIALOG_SECTION = {
   AJUSTEMENTS: 'ajustements',
 }
 
-
 export class RollPart {
   static settingKey(rollPart, key) { return `roll-part-${rollPart.code}.${key}` }
 
@@ -75,7 +72,7 @@ export class RollPart {
   isValid(rollData) { return true }
   visible(rollData) { return true }
 
-  onReady() { }
+  onReady(rollParts) { }
   loadRefs(rollData) { }
 
   prepareContext(rollData) { }
@@ -103,4 +100,13 @@ export class RollPart {
   async _onRender(rollDialog, context, options) { }
 
   getHooks() { return [] }
+
+  onNumericInputChange(event, rollDialog, setValue = value => this.getCurrent(rollDialog.rollData).value = value) {
+    if (isNaN(event.currentTarget.value) || event.currentTarget.value == "") {
+      return
+    }
+    setValue(parseInt(event.currentTarget.value))
+    rollDialog.render()
+  }
+
 }

templates/roll/roll-part-conditions.hbs

@@ -1,8 +1,7 @@
 <label for="{{code}}">Conditions</label>
-{{numberInput current.value
+<input type="number"
-    name=name
+    name="{{name}}"
-    step=1
+    value="{{current.value}}"
-    min=current.min
+    pattern="^(-|+)?\d+$"
-    max=current.max
+    min="{{current.min}}" max="{{current.max}}" step="1"
-    disabled=rollData.type.retry
+    {{#if rollData.type.retry}}disabled{{/if}}>
-}}

templates/roll/roll-part-cuisine.hbs

@@ -9,24 +9,23 @@
     {{#if current.recette}}
     <selected-numeric-value>{{plusMoins current.value}}</selected-numeric-value>
     {{else if current.ingredient}}
-      {{numberInput current.value
+      <input type="number"
-          name='diff-var'
+        name='diff-var'
-          step=1
+        value="{{current.value}}"
-          min=-10
+        pattern="^(-|+)?\d+$"
-          max=0
+        min="-10" max="0" step="1"
-          disabled=rollData.type.retry
+        {{#if rollData.type.retry}}disabled{{/if}}>
-      }}
     {{/if}}
   </subline>
   <subline>
     <label for="proportions">Proportions</label>
-    {{numberInput current.proportions
+    <input type="number"
         name='proportions'
-        step=1
+        value="{{current.proportions}}"
-        min=1
+        pattern="^\d+$"
-        max=(either current.proportionsMax 10)
+        min="1" max="{{either current.proportionsMax 10}}" step="1"
-        disabled=rollData.type.retry
+        {{#if rollData.type.retry}}disabled{{/if}}>
-    }}
+    
     {{#if (and current.sust (ne current.sust 1))}}<span>(&times; {{current.sust}})</span>{{/if}}
   </subline>
   <subline>

templates/roll/roll-part-diff.hbs

@@ -1,10 +1,9 @@
 <subline>
     <label for="{{code}}">{{current.label}}&nbsp;</label>
-    {{numberInput current.value
+    <input type="number"
-        name=name
+        name="{{name}}"
-        step=1 
+        value="{{current.value}}"
-        min=current.min
+        pattern="^(-|+)?\d+$"
-        max=current.max
+        min="{{current.min}}" max="{{current.max}}" step="1"
-        disabled=(or rollData.type.retry current.disabled)
+        {{#if (or rollData.type.retry current.disabled)}}disabled{{/if}}>
-    }}
 </subline>

templates/roll/roll-part-enctotal.hbs

@@ -6,10 +6,9 @@
     {{current.label}}
 </label>
 <label for="malusenc"></label>
-{{numberInput current.value
+<input type="number"
     name='malusenc'
-    step=1
+    value="{{current.value}}"
-    min=-30
+    pattern="^(-)?\d+$"
-    max=0
+    min="-30" max="0" step="1"
-    disabled=rollData.type.retry
+    {{#if rollData.type.retry}}disabled{{/if}}>
-}}

templates/roll/roll-part-sort.hbs

@@ -8,13 +8,12 @@
       {{selectOptions refs.sorts selected=current.key valueAttr="key" labelAttr="label"}}
     </select>
     {{#if current.isDiffVariable}}
-    {{numberInput current.value
+    <input type="number"
         name='diff-var'
-        step=1
+        value="{{current.value}}"
-        min=-20
+        pattern="^(-)?\d+$"
-        max=-1
+        min="-20" max="-1" step="1"
-        disabled=rollData.type.retry
+        {{#if rollData.type.retry}}disabled{{/if}}>
-    }}
     {{else}}
     <selected-numeric-value>{{plusMoins current.value}}</selected-numeric-value>
     {{/if}}
@@ -23,13 +22,13 @@
     <label for="ptreve-var">Rêve {{itemSort-coutReve current.sort}}&nbsp;</span>
     </label>
     {{#if current.isReveVariable}}
-      {{numberInput current.ptreve
+      <input type="number"
           name='ptreve-var'
-          step=1
+          value="{{current.ptreve}}"
-          min=1
+          pattern="^\d+$"
-          max=30
+          min="{{1}}" max="{{60}}" step="1"
-          disabled=rollData.type.retry
+          {{#if rollData.type.retry}}disabled{{/if}}>
-      }}
+
     {{/if}}
     <span>&nbsp;(actuel: {{rollData.active.actor.system.reve.reve.value}})</span>
   </subline>

templates/roll/roll-part-tricher.hbs

@@ -1,8 +1,7 @@
 <label for="{{name}}">Forcer </label>
 <img src="systems/foundryvtt-reve-de-dragon/assets/ui/d100.svg" data-tooltip="Forcer le résultat du jet de dé"/>
-{{numberInput current.resultat
+<input type="number"
-    name=name
+    name="{{name}}"
-    step=1
+    value="{{current.resultat}}"
-    min=-1
+    pattern="^(-|+)?\d+$"
-    max=100
+    min="-1" max="100" step="1">
-}}