From 996ac1c88db60891c0571d13ac136ae7fb167c0d Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Fri, 1 Jul 2022 16:00:49 +0200
Subject: [PATCH] Foundry v10 version

---
 module/actor/actor.js                         |  2 +-
 module/controllers/bol-rolls.js               |  2 +-
 .../properties/item/alchemy-properties.hbs    | 12 ++--
 .../properties/item/capacity-properties.hbs   | 12 ++--
 .../properties/item/equipment-properties.hbs  | 40 ++++++-------
 .../properties/item/protection-properties.hbs | 41 ++++++-------
 .../properties/item/spell-properties.hbs      | 36 +++++------
 .../properties/item/vehicle-properties.hbs    |  8 +--
 .../properties/item/weapon-properties.hbs     | 60 +++++++++----------
 9 files changed, 100 insertions(+), 113 deletions(-)

diff --git a/module/actor/actor.js b/module/actor/actor.js
index a89b220..53bda5f 100644
--- a/module/actor/actor.js
+++ b/module/actor/actor.js
@@ -624,7 +624,7 @@ export class BoLActor extends Actor {
 
   /* -------------------------------------------- */
   rollWeaponDamage(itemId) {
-    let weapon = duplicate(this.system.items.get(itemId))
+    let weapon = duplicate(this.items.get(itemId))
     if (weapon) {
       let r = new BoLDefaultRoll({ id: randomID(16), isSuccess: true, mode: "weapon", weapon: weapon, actorId: this.id, actor: this })
       r.setSuccess(true)
diff --git a/module/controllers/bol-rolls.js b/module/controllers/bol-rolls.js
index 32fd720..3a24c76 100644
--- a/module/controllers/bol-rolls.js
+++ b/module/controllers/bol-rolls.js
@@ -574,7 +574,7 @@ export class BoLDefaultRoll {
     
     let actor = game.actors.get( (actorId) ? actorId: this.rollData.actorId)
     if (attrDamage.includes("vigor")) {
-      attrDamageValue = actor.data.data.attributes.vigor.value
+      attrDamageValue = actor.system.attributes.vigor.value
       if (attrDamage.includes("half")) {
         attrDamageValue = Math.floor(attrDamageValue / 2)
       }
diff --git a/templates/item/parts/properties/item/alchemy-properties.hbs b/templates/item/parts/properties/item/alchemy-properties.hbs
index 7eb5a43..ca974eb 100644
--- a/templates/item/parts/properties/item/alchemy-properties.hbs
+++ b/templates/item/parts/properties/item/alchemy-properties.hbs
@@ -2,8 +2,8 @@
 
   <div class="property flexrow">
       <label class="property-label">{{localize "BOL.ui.alchemyType"}}</label>
-        <select class="field-value" name="data.properties.alchemytype" data-dtype="String">
-            {{#select data.properties.alchemytype}}
+        <select class="field-value" name="system.properties.alchemytype" data-dtype="String">
+            {{#select item.system.properties.alchemytype}}
                 {{#each config.alchemyType as |value id|}}
                     <option value="{{id}}">{{localize value}}</option>
                 {{/each}}
@@ -13,8 +13,8 @@
 
   <div class="property flexrow">
       <label class="property-label">{{localize "BOL.ui.difficulty"}}</label>
-      <select name="data.properties.difficulty" value="{{data.properties.difficulty}}">
-            {{#select data.properties.difficulty}}
+      <select name="system.properties.difficulty" value="{{item.system.properties.difficulty}}">
+            {{#select item.system.properties.difficulty}}
             <option value="2">{{localize "BOL.dialog.veryeasy"}}</option>
             <option value="1">{{localize "BOL.dialog.easy"}}</option>
             <option value="0">{{localize "BOL.dialog.moderate"}}</option>
@@ -29,11 +29,11 @@
 
   <div class="property flexrow">
         <label class="property-label">{{localize "BOL.ui.pccost"}}</label>
-        <input class="field-value" type="text" name="data.properties.pccost" value="{{data.properties.pccost}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.pccost" value="{{item.system.properties.pccost}}" data-dtype="Number"/>
   </div>
 
   <div class="property flexrow">
         <label class="property-label">{{localize "BOL.ui.pcnow"}}</label>
-        <input class="field-value" type="text" name="data.properties.pccurrent" value="{{data.properties.pccurrent}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.pccurrent" value="{{item.system.properties.pccurrent}}" data-dtype="Number"/>
   </div>
 
diff --git a/templates/item/parts/properties/item/capacity-properties.hbs b/templates/item/parts/properties/item/capacity-properties.hbs
index 5faa3cb..bd343b2 100644
--- a/templates/item/parts/properties/item/capacity-properties.hbs
+++ b/templates/item/parts/properties/item/capacity-properties.hbs
@@ -3,23 +3,23 @@
     <label class="property-label">{{localize "BOL.ui.type"}}</label>
     <div class="form-fields">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.weapon" {{checked data.properties.weapon}}> {{localize "BOL.itemProperty.weapon"}}
+            <input class="field-value" type="checkbox" name="system.properties.weapon" {{checked item.system.properties.weapon}}> {{localize "BOL.itemProperty.weapon"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.protection" {{checked data.properties.protection}}> {{localize "BOL.itemProperty.protection"}}
+            <input class="field-value" type="checkbox" name="system.properties.protection" {{checked item.system.properties.protection}}> {{localize "BOL.itemProperty.protection"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.magical" {{checked data.properties.magical}}> {{localize "BOL.itemProperty.magical"}}
+            <input class="field-value" type="checkbox" name="system.properties.magical" {{checked item.system.properties.magical}}> {{localize "BOL.itemProperty.magical"}}
         </label>
     </div>
 </div>
 
-{{#if data.properties.weapon}}
+{{#if item.system.properties.weapon}}
     {{> "systems/bol/templates/item/parts/properties/item/weapon-properties.hbs"}}
 {{/if}}
-{{#if data.properties.protection}}
+{{#if item.system.properties.protection}}
     {{> "systems/bol/templates/item/parts/properties/item/protection-properties.hbs"}}
 {{/if}}
-{{#if data.properties.magical}}
+{{#if item.system.properties.magical}}
     {{> "systems/bol/templates/item/parts/properties/item/magical-properties.hbs"}}
 {{/if}}
diff --git a/templates/item/parts/properties/item/equipment-properties.hbs b/templates/item/parts/properties/item/equipment-properties.hbs
index 4696b48..41aac28 100644
--- a/templates/item/parts/properties/item/equipment-properties.hbs
+++ b/templates/item/parts/properties/item/equipment-properties.hbs
@@ -3,8 +3,8 @@
 <div class="form-group">
     <label class="property-label">{{localize "BOL.ui.subtype"}}</label>
     <div class="form-fields">
-        <select name="data.subtype" data-dtype="String">
-            {{#select data.subtype}}
+        <select name="system.subtype" data-dtype="String">
+            {{#select item.system.subtype}}
                 {{#each config.itemSubtypes as |item id|}}
                     <option value="{{id}}">{{localize item}}</option>
                 {{/each}}
@@ -17,13 +17,13 @@
     <label class="property-label">{{localize "BOL.ui.capacities"}}</label>
     <div class="form-fields">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.weapon" {{checked data.properties.weapon}}> {{localize "BOL.itemProperty.weapon"}}
+            <input class="field-value" type="checkbox" name="system.properties.weapon" {{checked item.system.properties.weapon}}> {{localize "BOL.itemProperty.weapon"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.protection" {{checked data.properties.protection}}> {{localize "BOL.itemProperty.protection"}}
+            <input class="field-value" type="checkbox" name="system.properties.protection" {{checked item.system.properties.protection}}> {{localize "BOL.itemProperty.protection"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.magical" {{checked data.properties.magical}}> {{localize "BOL.itemProperty.magical"}}
+            <input class="field-value" type="checkbox" name="system.properties.magical" {{checked item.system.properties.magical}}> {{localize "BOL.itemProperty.magical"}}
         </label>
     </div>
 </div>
@@ -32,13 +32,13 @@
     <label class="property-label">{{localize "BOL.ui.properties"}}</label>
     <div class="form-fields">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.equipable" {{checked data.properties.equipable}}> {{localize "BOL.itemProperty.equipable"}}
+            <input class="field-value" type="checkbox" name="system.properties.equipable" {{checked item.system.properties.equipable}}> {{localize "BOL.itemProperty.equipable"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.stackable" {{checked data.properties.stackable}}> {{localize "BOL.itemProperty.stackable"}}
+            <input class="field-value" type="checkbox" name="system.properties.stackable" {{checked item.system.properties.stackable}}> {{localize "BOL.itemProperty.stackable"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.consumable" {{checked data.properties.consumable}}> {{localize "BOL.itemProperty.consumable"}}
+            <input class="field-value" type="checkbox" name="system.properties.consumable" {{checked item.system.properties.consumable}}> {{localize "BOL.itemProperty.consumable"}}
         </label>
     </div>
 </div>
@@ -48,15 +48,15 @@
     <label>{{localize "BOL.itemProperty.worn"}}</label>
     <div class="form-fields">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.worn" {{checked data.worn}}> {{localize "BOL.itemProperty.worn"}}
+            <input class="field-value" type="checkbox" name="system.worn" {{checked item.system.worn}}> {{localize "BOL.itemProperty.worn"}}
         </label>
     </div>
 </div>
 <div class="form-group">
     <label>{{localize "BOL.itemProperty.slot"}}</label>
     <div class="form-fields center">
-        <select class="field-value" name="data.properties.slot" data-dtype="String">
-            {{#select data.properties.slot}}
+        <select class="field-value" name="system.properties.slot" data-dtype="String">
+            {{#select item.system.properties.slot}}
                 {{#each config.equipmentSlots as |value id|}}
                     <option value="{{id}}">{{localize value}}</option>
                 {{/each}}
@@ -70,37 +70,31 @@
     <div class="form-group">
         <label class="property-label">{{localize "BOL.ui.quantity"}}</label>
         <div class="form-fields">
-            <input class="field-value" type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
+            <input class="field-value" type="text" name="system.quantity" value="{{item.system.quantity}}" data-dtype="Number"/>
         </div>
     </div>
     <div class="form-group">
         <label class="property-label">{{localize "BOL.ui.stacksize"}}</label>
         <div class="form-fields">
-            <input class="field-value" type="text" name="data.properties.stacksize" value="{{data.properties.stacksize}}" data-dtype="Number"/>
+            <input class="field-value" type="text" name="system.properties.stacksize" value="{{item.system.properties.stacksize}}" data-dtype="Number"/>
         </div>
     </div>
 {{/if}}
 
-<!--<div class="form-group">-->
-<!--    <label class="property-label">{{!localize "BOL.ui.weight"}}</label>-->
-<!--    <div class="form-fields">-->
-<!--        <input class="field-value" type="text" name="data.weight" value="{{!data.weight}}" data-dtype="Number"/>-->
-<!--    </div>-->
-<!--</div>-->
 <div class="form-group">
     <label class="property-label">{{localize "BOL.ui.price"}}</label>
     <div class="form-fields">
-        <input class="field-value" type="text" name="data.price" value="{{data.price}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.price" value="{{item.system.price}}" data-dtype="Number"/>
     </div>
 </div>
 
 
-{{#if data.properties.weapon}}
+{{#if item.system.properties.weapon}}
     {{> "systems/bol/templates/item/parts/properties/item/weapon-properties.hbs"}}
 {{/if}}
-{{#if data.properties.protection}}
+{{#if item.system.properties.protection}}
     {{> "systems/bol/templates/item/parts/properties/item/protection-properties.hbs"}}
 {{/if}}
-{{#if data.properties.magical}}
+{{#if item.system.properties.magical}}
     {{> "systems/bol/templates/item/parts/properties/item/magical-properties.hbs"}}
 {{/if}}
diff --git a/templates/item/parts/properties/item/protection-properties.hbs b/templates/item/parts/properties/item/protection-properties.hbs
index d82c9e1..d4f5c70 100644
--- a/templates/item/parts/properties/item/protection-properties.hbs
+++ b/templates/item/parts/properties/item/protection-properties.hbs
@@ -3,31 +3,24 @@
     <label>{{localize "BOL.ui.subtype"}}</label>
     <div class="form-fields">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.armor" {{checked data.properties.armor}}> {{localize "BOL.itemProperty.armor"}}
+            <input class="field-value" type="checkbox" name="system.properties.armor" {{checked item.system.properties.armor}}> {{localize "BOL.itemProperty.armor"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.shield" {{checked data.properties.shield}}> {{localize "BOL.itemProperty.shield"}}
+            <input class="field-value" type="checkbox" name="system.properties.shield" {{checked item.system.properties.shield}}> {{localize "BOL.itemProperty.shield"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.helm" {{checked data.properties.helm}}> {{localize "BOL.itemProperty.helm"}}
+            <input class="field-value" type="checkbox" name="system.properties.helm" {{checked item.system.properties.helm}}> {{localize "BOL.itemProperty.helm"}}
         </label>
     </div>
 </div>
 <hr/>
-<!--<div class="form-group">-->
-<!--    <label>{{!localize "BOL.ui.properties"}}</label>-->
-<!--    <div class="form-fields">-->
-<!--        <label class="checkbox">-->
-<!--            <input class="field-value" type="checkbox" name="data.properties.throwable" {{!checked data.properties.throwable}}> {{!localize "BOL.itemProperty.throwable"}}-->
-<!--        </label>-->
-<!--    </div>-->
-<!--</div>-->
-{{#if data.properties.armor}}
+
+{{#if item.system.properties.armor}}
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemProperty.armorQuality"}}</label>
     <div class="form-fields center">
-        <select class="field-value armorQuality" name="data.properties.armorQuality" data-dtype="String">
-            {{#select data.properties.armorQuality}}
+        <select class="field-value armorQuality" name="system.properties.armorQuality" data-dtype="String">
+            {{#select item.system.properties.armorQuality}}
                 {{#each config.armorQualities as |value id|}}
                     <option value="{{id}}">{{localize value}}</option>
                 {{/each}}
@@ -38,13 +31,13 @@
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemProperty.soakFormula"}}</label>
     <div class="form-fields">
-        <input class="field-value soakFormula" type="text" name="data.properties.soak.formula" value="{{data.properties.soak.formula}}" data-dtype="String"/>
+        <input class="field-value soakFormula" type="text" name="system.properties.soak.formula" value="{{item.system.properties.soak.formula}}" data-dtype="String"/>
     </div>
 </div>
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemProperty.soakValue"}}</label>
     <div class="form-fields">
-        <input class="field-value" type="text" name="data.properties.soak.value" value="{{data.properties.soak.value}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.soak.value" value="{{item.system.properties.soak.value}}" data-dtype="Number"/>
     </div>
 </div>
 {{/if}}
@@ -53,7 +46,7 @@
     <div class="form-group">
         <label class="property-label">{{localize "BOL.itemProperty.soakModifiers"}}</label>
         <div class="form-fields">
-            <input class="field-value" type="text" name="data.properties.soak.modifier" value="{{data.properties.soak.modifier}}" data-dtype="Number"/>
+            <input class="field-value" type="text" name="system.properties.soak.modifier" value="{{item.system.properties.soak.modifier}}" data-dtype="Number"/>
         </div>
     </div>
 {{/if}}
@@ -62,17 +55,17 @@
     <div class="form-group">
         <label class="property-label">{{localize "BOL.itemProperty.blockingMalus"}}</label>
         <div class="form-fields">
-            <input class="field-value" type="text" name="data.properties.blocking.malus" value="{{data.properties.blocking.malus}}" data-dtype="Number"/>
+            <input class="field-value" type="text" name="system.properties.blocking.malus" value="{{item.system.properties.blocking.malus}}" data-dtype="Number"/>
         </div>
     </div>
     <div class="form-group">
         <label class="property-label">{{localize "BOL.itemProperty.blockingAttacksBlocked"}}</label>
         <div class="form-fields">
             <label class="checkbox">
-                <input class="field-value" type="checkbox" name="data.properties.blocking.blocking1" {{checked data.properties.blocking.blocking1}}> {{localize "BOL.itemProperty.blocking1Attack"}}
+                <input class="field-value" type="checkbox" name="system.properties.blocking.blocking1" {{checked item.system.properties.blocking.blocking1}}> {{localize "BOL.itemProperty.blocking1Attack"}}
             </label>
             <label class="checkbox">
-                <input class="field-value" type="checkbox" name="data.properties.blocking.blockingAll" {{checked data.properties.blocking.blockingAll}}> {{localize "BOL.itemProperty.blockingAllAttacks"}}
+                <input class="field-value" type="checkbox" name="system.properties.blocking.blockingAll" {{checked item.system.properties.blocking.blockingAll}}> {{localize "BOL.itemProperty.blockingAllAttacks"}}
             </label>
         </div>
     </div>
@@ -83,26 +76,26 @@
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemModifiers.init"}}</label>
     <div class="form-fields">
-        <input class="field-value" type="text" name="data.properties.modifiers.init" value="{{data.properties.modifiers.c}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.modifiers.init" value="{{item.system.properties.modifiers.c}}" data-dtype="Number"/>
     </div>
 </div>
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemModifiers.agility"}}</label>
     <div class="form-fields">
-        <input class="field-value" type="text" name="data.properties.modifiers.agility" value="{{data.properties.modifiers.agility}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.modifiers.agility" value="{{item.system.properties.modifiers.agility}}" data-dtype="Number"/>
     </div>
 </div>
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemModifiers.powercost"}}</label>
     <div class="form-fields">
-        <input class="field-value" type="text" name="data.properties.modifiers.powercost" value="{{data.properties.modifiers.powercost}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.modifiers.powercost" value="{{item.system.properties.modifiers.powercost}}" data-dtype="Number"/>
     </div>
 </div>
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemModifiers.social"}}</label>
     <div class="form-fields">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.modifiers.social" {{checked data.properties.modifiers.social}}>
+            <input class="field-value" type="checkbox" name="system.properties.modifiers.social" {{checked item.system.properties.modifiers.social}}>
         </label>
     </div>
 </div>
diff --git a/templates/item/parts/properties/item/spell-properties.hbs b/templates/item/parts/properties/item/spell-properties.hbs
index 1e3fd06..e04855b 100644
--- a/templates/item/parts/properties/item/spell-properties.hbs
+++ b/templates/item/parts/properties/item/spell-properties.hbs
@@ -2,8 +2,8 @@
 
   <div class="property flexrow">
       <label class="property-label">{{localize "BOL.ui.circle"}}</label>
-        <select class="field-value" name="data.properties.circle" data-dtype="Number">
-            {{#select data.properties.circle}}
+        <select class="field-value" name="system.properties.circle" data-dtype="Number">
+            {{#select item.system.properties.circle}}
                 {{#each config.spellType as |value id|}}
                     <option value="{{id}}">{{localize value}}</option>
                 {{/each}}
@@ -13,8 +13,8 @@
 
   <div class="property flexrow">
       <label class="property-label">{{localize "BOL.ui.difficulty"}}</label>
-      <select name="data.properties.difficulty" value="{{data.properties.difficulty}}">
-            {{#select data.properties.difficulty}}
+      <select name="system.properties.difficulty" value="{{item.system.properties.difficulty}}">
+            {{#select item.system.properties.difficulty}}
               <option value="2">{{localize "BOL.dialog.veryeasy"}}</option>
               <option value="1">{{localize "BOL.dialog.easy"}}</option>
               <option value="0">{{localize "BOL.dialog.moderate"}}</option>
@@ -29,18 +29,18 @@
 
   <div class="property flexrow">
         <label class="property-label">{{localize "BOL.ui.ppcost"}}</label>
-        <input class="field-value" type="text" name="data.properties.ppcost" value="{{data.properties.ppcost}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.ppcost" value="{{item.system.properties.ppcost}}" data-dtype="Number"/>
   </div>
 
   <div class="property flexrow">
         <label class="property-label">{{localize "BOL.ui.duration"}}</label>
-        <input class="field-value" type="text" name="data.properties.duration" value="{{data.properties.duration}}" data-dtype="String"/>
+        <input class="field-value" type="text" name="system.properties.duration" value="{{item.system.properties.duration}}" data-dtype="String"/>
   </div>
 
   <div class="property flexrow">
     <label class="property-label">{{localize "BOL.ui.mandatoryconditions"}}</label>
-      <select class="field-value" name="data.properties.nbmandatoryconditions" data-dtype="Number">
-          {{#select data.properties.nbmandatoryconditions}}
+      <select class="field-value" name="system.properties.nbmandatoryconditions" data-dtype="Number">
+          {{#select item.system.properties.nbmandatoryconditions}}
           <option value="1">1</option>
           <option value="2">2</option>
           <option value="3">3</option>
@@ -49,19 +49,19 @@
       </select>
   </div>
 
-    {{#each data.properties.mandatoryconditions as |cond idx|}}
-      {{#if (lt idx @root.data.properties.nbmandatoryconditions)}}
+    {{#each item.system.properties.mandatoryconditions as |cond idx|}}
+      {{#if (lt idx @root.item.system.properties.nbmandatoryconditions)}}
       <div class="property flexrow">
         <label class="property-label">{{localize "BOL.ui.mandatoryconditions"}} {{add idx 1}}</label>
-        <input class="field-value" type="text" name="data.properties.mandatoryconditions.{{idx}}" value="{{cond}}" data-dtype="String"/>
+        <input class="field-value" type="text" name="system.properties.mandatoryconditions.{{idx}}" value="{{cond}}" data-dtype="String"/>
       </div>
       {{/if}}
     {{/each}}
 
   <div class="property flexrow">
     <label class="property-label">{{localize "BOL.ui.optionnalconditions"}}</label>
-      <select class="field-value" name="data.properties.nboptionnalconditions" data-dtype="Number">
-          {{#select data.properties.nboptionnalconditions}}
+      <select class="field-value" name="system.properties.nboptionnalconditions" data-dtype="Number">
+          {{#select item.system.properties.nboptionnalconditions}}
           <option value="1">1</option>
           <option value="2">2</option>
           <option value="3">3</option>
@@ -74,11 +74,11 @@
       </select>
   </div>
 
-    {{#each data.properties.optionnalconditions as |cond idx|}}
-      {{#if (lt idx @root.data.properties.nboptionnalconditions)}}
+    {{#each item.system.optionnalconditions as |cond idx|}}
+      {{#if (lt idx @root.item.system.properties.nboptionnalconditions)}}
       <div class="property flexrow">
         <label class="property-label">{{localize "BOL.ui.optionnalconditions"}} {{add idx 1}}</label>
-        <input class="field-value" type="text" name="data.properties.optionnalconditions.{{idx}}" value="{{cond}}" data-dtype="String"/>
+        <input class="field-value" type="text" name="system.properties.optionnalconditions.{{idx}}" value="{{cond}}" data-dtype="String"/>
       </div>
       {{/if}}
     {{/each}}
@@ -86,12 +86,12 @@
   <div class="property flexrow">
     <div class="form-fields center">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.spellkeep" {{checked data.properties.spellkeep}}> {{localize "BOL.ui.spellkeep"}}
+            <input class="field-value" type="checkbox" name="system.properties.spellkeep" {{checked item.system.properties.spellkeep}}> {{localize "BOL.ui.spellkeep"}}
         </label>
       </div>
       <div class="form-fields center">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.concentrate" {{checked data.properties.concentrate}}> {{localize "BOL.ui.concentrate"}}
+            <input class="field-value" type="checkbox" name="system.properties.concentrate" {{checked item.system.properties.concentrate}}> {{localize "BOL.ui.concentrate"}}
         </label>
       </div>
   </div>
diff --git a/templates/item/parts/properties/item/vehicle-properties.hbs b/templates/item/parts/properties/item/vehicle-properties.hbs
index 3b00be1..95c12e1 100644
--- a/templates/item/parts/properties/item/vehicle-properties.hbs
+++ b/templates/item/parts/properties/item/vehicle-properties.hbs
@@ -3,8 +3,8 @@
 <div class="form-group">
     <label class="property-label">{{localize "BOL.ui.subtype"}}</label>
     <div class="form-fields">
-        <select name="data.subtype" data-dtype="String">
-            {{#select data.subtype}}
+        <select name="system.subtype" data-dtype="String">
+            {{#select item.system.subtype}}
                 {{#each config.vehicleSubtypes as |item id|}}
                     <option value="{{id}}">{{localize item}}</option>
                 {{/each}}
@@ -16,13 +16,13 @@
 <div class="form-group">
     <label class="property-label">{{localize "BOL.ui.speed"}}</label>
     <div class="form-fields">
-        <input class="field-value" type="text" name="data.properties.speed" value="{{data.properties.speed}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.speed" value="{{item.system.properties.speed}}" data-dtype="Number"/>
     </div>
 </div>
 
 <div class="form-group">
     <label class="property-label">{{localize "BOL.ui.price"}}</label>
     <div class="form-fields">
-        <input class="field-value" type="text" name="data.price" value="{{data.price}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.price" value="{{item.system.price}}" data-dtype="Number"/>
     </div>
 </div>
diff --git a/templates/item/parts/properties/item/weapon-properties.hbs b/templates/item/parts/properties/item/weapon-properties.hbs
index 3a5c337..d867689 100644
--- a/templates/item/parts/properties/item/weapon-properties.hbs
+++ b/templates/item/parts/properties/item/weapon-properties.hbs
@@ -3,16 +3,16 @@
     <label>{{localize "BOL.ui.reach"}}</label>
     <div class="form-fields">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.melee" {{checked data.properties.melee}}> {{localize "BOL.itemProperty.melee"}}
+            <input class="field-value" type="checkbox" name="system.properties.melee" {{checked item.system.properties.melee}}> {{localize "BOL.itemProperty.melee"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.ranged" {{checked data.properties.ranged}}> {{localize "BOL.itemProperty.ranged"}}
+            <input class="field-value" type="checkbox" name="system.properties.ranged" {{checked item.system.properties.ranged}}> {{localize "BOL.itemProperty.ranged"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.throwing" {{checked data.properties.throwing}}> {{localize "BOL.itemProperty.throwing"}}
+            <input class="field-value" type="checkbox" name="system.properties.throwing" {{checked item.system.properties.throwing}}> {{localize "BOL.itemProperty.throwing"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.natural" {{checked data.properties.natural}}> {{localize "BOL.itemProperty.natural"}}
+            <input class="field-value" type="checkbox" name="system.properties.natural" {{checked item.system.properties.natural}}> {{localize "BOL.itemProperty.natural"}}
         </label>
     </div>
 </div>
@@ -21,33 +21,33 @@
     <label>{{localize "BOL.ui.properties"}}</label>
     <div class="form-fields">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.2H" {{checked data.properties.2H}}> {{localize "BOL.itemProperty.2H"}}
+            <input class="field-value" type="checkbox" name="system.properties.2H" {{checked item.system.properties.2H}}> {{localize "BOL.itemProperty.2H"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.concealable" {{checked data.properties.concealable}}> {{localize "BOL.itemProperty.concealable"}}
+            <input class="field-value" type="checkbox" name="system.properties.concealable" {{checked item.system.properties.concealable}}> {{localize "BOL.itemProperty.concealable"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.ignoreshield" {{checked data.properties.ignoreshield}}> {{localize "BOL.itemProperty.ignoreshield"}}
+            <input class="field-value" type="checkbox" name="system.properties.ignoreshield" {{checked item.system.properties.ignoreshield}}> {{localize "BOL.itemProperty.ignoreshield"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.attackBonusDice" {{checked data.properties.attackBonusDice}}> {{localize "BOL.itemProperty.attackBonusDice"}}
+            <input class="field-value" type="checkbox" name="system.properties.attackBonusDice" {{checked item.system.properties.attackBonusDice}}> {{localize "BOL.itemProperty.attackBonusDice"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.onlymodifier" {{checked data.properties.onlymodifier}}> {{localize "BOL.itemProperty.onlymodifier"}}
+            <input class="field-value" type="checkbox" name="system.properties.onlymodifier" {{checked item.system.properties.onlymodifier}}> {{localize "BOL.itemProperty.onlymodifier"}}
         </label>
 
         
     {{#if data.properties.ranged}}
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.reloadable" {{checked data.properties.reloadable}}> {{localize "BOL.itemProperty.reloadable"}}
+            <input class="field-value" type="checkbox" name="system.properties.reloadable" {{checked item.system.properties.reloadable}}> {{localize "BOL.itemProperty.reloadable"}}
         </label>
     {{/if}}
     {{#if data.properties.melee}}
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.bashing" {{checked data.properties.bashing}}> {{localize "BOL.itemProperty.bashing"}}
+            <input class="field-value" type="checkbox" name="system.properties.bashing" {{checked item.system.properties.bashing}}> {{localize "BOL.itemProperty.bashing"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.throwable" {{checked data.properties.throwable}}> {{localize "BOL.itemProperty.throwable"}}
+            <input class="field-value" type="checkbox" name="system.properties.throwable" {{checked item.system.properties.throwable}}> {{localize "BOL.itemProperty.throwable"}}
         </label>
     {{/if}}
     </div>
@@ -57,8 +57,8 @@
   <div class="form-group">
       <label class="property-label">{{localize "BOL.itemProperty.attackAttribute"}}</label>
       <div class="form-fields center">
-          <select class="field-value" name="data.properties.attackAttribute" data-dtype="String">
-              {{#select data.properties.attackAttribute}}
+          <select class="field-value" name="system.properties.attackAttribute" data-dtype="String">
+              {{#select item.system.properties.attackAttribute}}
                   {{#each config.attackAttributes as |value id|}}
                       <option value="{{id}}">{{localize value}}</option>
                   {{/each}}
@@ -69,8 +69,8 @@
   <div class="form-group">
       <label class="property-label">{{localize "BOL.itemProperty.attackAptitude"}}</label>
       <div class="form-fields center">
-          <select class="field-value" name="data.properties.attackAptitude" data-dtype="String">
-              {{#select data.properties.attackAptitude}}
+          <select class="field-value" name="system.properties.attackAptitude" data-dtype="String">
+              {{#select item.system.properties.attackAptitude}}
                   {{#each config.attackAptitudes as |value id|}}
                       <option value="{{id}}">{{localize value}}</option>
                   {{/each}}
@@ -82,15 +82,15 @@
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemProperty.attackModifiers"}}</label>
     <div class="form-fields center">
-        <input class="field-value" type="text" name="data.properties.attackModifiers" value="{{data.properties.attackModifiers}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.attackModifiers" value="{{item.system.properties.attackModifiers}}" data-dtype="Number"/>
     </div>
 </div>
 <hr/>
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemProperty.weaponSize"}}</label>
     <div class="form-fields">
-        <select class="field-value" name="data.properties.weaponSize" data-dtype="String">
-            {{#select data.properties.weaponSize}}
+        <select class="field-value" name="system.properties.weaponSize" data-dtype="String">
+            {{#select item.system.properties.weaponSize}}
                 {{#each config.weaponSizes as |value id|}}
                     <option value="{{id}}">{{localize value}}</option>
                 {{/each}}
@@ -101,8 +101,8 @@
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemProperty.damage"}}</label>
     <div class="form-fields">
-        <select class="field-value" name="data.properties.damage" data-dtype="String">
-            {{#select data.properties.damage}}
+        <select class="field-value" name="system.properties.damage" data-dtype="String">
+            {{#select item.system.properties.damage}}
                 {{#each config.damageValues as |value id|}}
                     <option value="{{id}}">{{value}}</option>
                 {{/each}}
@@ -113,8 +113,8 @@
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemProperty.damageAttribute"}}</label>
     <div class="form-fields center">
-        <select class="field-value" name="data.properties.damageAttribute" data-dtype="String">
-            {{#select data.properties.damageAttribute}}
+        <select class="field-value" name="system.properties.damageAttribute" data-dtype="String">
+            {{#select item.system.properties.damageAttribute}}
                 {{#each config.damageAttributes as |value id|}}
                     <option value="{{id}}">{{localize value}}</option>
                 {{/each}}
@@ -125,14 +125,14 @@
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemProperty.damageModifiers"}}</label>
     <div class="form-fields center">
-        <input class="field-value" type="text" name="data.properties.damageModifiers" value="{{data.properties.damageModifiers}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.damageModifiers" value="{{item.system.properties.damageModifiers}}" data-dtype="Number"/>
     </div>
 </div>
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemProperty.damageMultiplier"}}</label>
     <div class="form-fields center">
-        <select class="field-value" name="data.properties.damageMultiplier" data-dtype="String">
-            {{#select data.properties.damageMultiplier}}
+        <select class="field-value" name="system.properties.damageMultiplier" data-dtype="String">
+            {{#select item.system.properties.damageMultiplier}}
                 {{#each config.damageMultiplier as |value id|}}
                     <option value="{{id}}">{{value}}</option>
                 {{/each}}
@@ -144,17 +144,17 @@
     <label class="property-label">{{localize "BOL.itemProperty.damageSpecial"}}</label>
     <div class="form-fields center">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.damageReroll1" {{checked data.properties.damageReroll1}}> {{localize "BOL.itemProperty.damageReroll1"}}
+            <input class="field-value" type="checkbox" name="system.properties.damageReroll1" {{checked item.system.properties.damageReroll1}}> {{localize "BOL.itemProperty.damageReroll1"}}
         </label>
     </div>
 </div>
 
-{{#if (or data.properties.throwing (or data.properties.ranged data.properties.throwable))}}
+{{#if (or item.system.properties.throwing (or item.system.properties.ranged item.system.properties.throwable))}}
     <hr/>
     <div class="form-group">
         <label class="property-label">{{localize "BOL.itemProperty.range"}}</label>
         <div class="form-fields center">
-            <input class="field-value" type="text" name="data.properties.range" value="{{data.properties.range}}" data-dtype="Number"/>
+            <input class="field-value" type="text" name="system.properties.range" value="{{item.system.properties.range}}" data-dtype="Number"/>
         </div>
     </div>
 {{/if}}
@@ -162,7 +162,7 @@
     <div class="form-group">
         <label class="property-label">{{localize "BOL.itemProperty.reload"}}</label>
         <div class="form-fields center">
-            <input class="field-value" type="text" name="data.properties.reload" value="{{data.properties.reload}}" data-dtype="Number"/>
+            <input class="field-value" type="text" name="system.properties.reload" value="{{item.system.properties.reload}}" data-dtype="Number"/>
         </div>
     </div>
 {{/if}}