5e bugfixes and migration improvements

dnd5e.css

@@ -565,7 +565,7 @@
   margin-bottom: 5px;
 }
 .dnd5e.sheet.actor .counters .counter {
-  padding: 0 6px;
+  padding: 0 3px;
   line-height: 32px;
 }
 .dnd5e.sheet.actor .counters .counter h4 {
@@ -586,17 +586,14 @@
   height: 20px;
   max-width: 20px;
   margin: 0;
+  padding: 0;
   text-align: center;
 }
 .dnd5e.sheet.actor .counters .counter input[type="checkbox"] {
   position: relative;
   margin: 0;
   top: 6px;
 }
-.dnd5e.sheet.actor .counters .counter.lair input[type="text"] {
-  width: 32px;
-  max-width: 32px;
-}
 .dnd5e.sheet.actor .counters .counter span.sep {
   margin: 0 -2px;
   font-size: 12px;

less/actors.less

@@ -258,7 +258,7 @@
     margin-bottom: 5px;
 
     .counter {
-      padding: 0 6px;
+      padding: 0 3px;
       line-height: 32px;
 
       h4 {
@@ -280,6 +280,7 @@
         height: 20px;
         max-width: 20px;
         margin: 0;
+        padding: 0;
         text-align: center;
       }
 
@@ -289,11 +290,6 @@
         top: 6px;
       }
 
-      &.lair input[type="text"] {
-        width: 32px;
-        max-width: 32px;
-      }
-
       span.sep {
         margin: 0 -2px;
         font-size: 12px;

module/apps/actor-flags.js

@@ -61,16 +61,16 @@ export class ActorSheetFlags extends BaseEntitySheet {
    */
   _updateObject(event, formData) {
     const actor = this.object;
-    const flags = duplicate(actor.data.flags.dnd5e || {});
 
     // Iterate over the flags which may be configured
+    const updateData = {};
     for ( let [k, v] of Object.entries(CONFIG.DND5E.characterFlags) ) {
-      if ( [undefined, null, "", false].includes(formData[k]) ) delete flags[k];
-      else if ( (v.type === Number) && (formData[k] === 0) ) delete flags[k];
-      else flags[k] = formData[k];
+      if ( [undefined, null, "", false].includes(formData[k]) ) updateData[`-=${k}`] = null;
+      else if ( (v.type === Number) && (formData[k] === 0) ) updateData[`-=${k}`] = null;
+      else updateData[k] = formData[k];
     }
 
     // Set the new flags in bulk
-    actor.update({'flags.dnd5e': flags});
+    actor.update({'flags.dnd5e': updateData});
   }
 }

module/apps/trait-selector.js

@@ -34,7 +34,6 @@ export class ActorTraitSelector extends FormApplication {
 
     // Get current values
     let attr = getProperty(this.object.data, this.attribute);
-	  if ( typeof attr.value === "string" ) attr.value = this.constructor._backCompat(attr.value, this.options.choices);
 
 	  // Populate choices
     const choices = duplicate(this.options.choices);
@@ -54,23 +53,6 @@ export class ActorTraitSelector extends FormApplication {
 
   /* -------------------------------------------- */
 
-  /**
-   * Support backwards compatibility for old-style string separated traits
-   * @private
-   */
-  static _backCompat(current, choices) {
-    if ( !current || current.length === 0 ) return [];
-	  current = current.split(/[\s,]/).filter(t => !!t);
-    return current.map(val => {
-      for ( let [k, v] of Object.entries(choices) ) {
-        if ( val === v ) return k;
-        }
-      return null;
-    }).filter(val => !!val);
-  }
-
-  /* -------------------------------------------- */
-
   /**
    * Update the Actor object with new trait data processed from the form
    * @private

module/item/entity.js

@@ -104,7 +104,7 @@ export class Item5e extends Item {
         rng.value = null;
         rng.long = null;
       }
-      labels.range = [rng.value, C.distanceUnits[rng.units]].filterJoin(" ");
+      labels.range = [rng.value, rng.long ? `/ ${rng.long}` : null, C.distanceUnits[rng.units]].filterJoin(" ");
 
       // Duration Label
       let dur = item.data.duration || {};

module/migration.js

@@ -439,7 +439,7 @@ const _migrateRemoveDeprecated = function(ent, updateData, toFlatten) {
   const flat = flattenObject(ent.data);
 
   // Deprecate entire objects
-  const toDeprecate = Object.entries.flat().filter(e => e[0].endsWith("_deprecated") && (e[1] === true)).map(e => {
+  const toDeprecate = Object.entries(flat).filter(e => e[0].endsWith("_deprecated") && (e[1] === true)).map(e => {
     let parent = e[0].split(".");
     parent.pop();
     return parent.join(".");