fix mismatched key

rsek · Sep 27, 2022 · 88c5c52 · 88c5c52
1 parent 575832a
commit 88c5c52
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 140 deletions.
diff --git a/_master-data/schema/assets.json b/_master-data/schema/assets.json
@@ -133,11 +133,6 @@
           "type": "string",
           "title": "Requirement"
         },
-        "Meter": {
-          "description": "Information on this asset's condition meter, if any.",
-          "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
-        },
         "$id": {
           "description": "The item's unique string ID. Any object that contains a localizable user-facing string *must* have this key.",
           "pattern": "^(starforged|ironsworn)/assets/[a-z_-]+/[a-z_-]+$",
@@ -2083,11 +2078,6 @@
           "type": "string",
           "title": "Asset type"
         },
-        "Meter": {
-          "description": "Information on this asset's condition meter, if any.",
-          "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
-        },
         "_idFragment": { "type": "string", "title": "_idFragment" }
       },
       "defaultProperties": [],
@@ -2309,85 +2299,6 @@
       "additionalProperties": false,
       "required": ["Disables asset", "Enabled", "Impact", "Label", "Permanent"]
     },
-    "ConditionMeter": {
-      "description": "Interface representing a condition meter such as health, spirit, supply.",
-      "title": "ConditionMeter",
-      "type": "object",
-      "properties": {
-        "$id": {
-          "description": "The item's unique string ID. Any object that contains a localizable user-facing string *must* have this key.",
-          "pattern": "^(starforged|ironsworn)/assets/[a-z_-]+/[a-z_-]+/condition_meter$",
-          "type": "string",
-          "title": "$id"
-        },
-        "Min": {
-          "description": "The minimum value of the meter. Usually this is 0. Momentum is currently the only exception to this and goes as low as -6.",
-          "default": 0,
-          "type": "integer",
-          "title": "Min"
-        },
-        "Max": {
-          "description": "The maximum value of the meter.",
-          "default": 5,
-          "type": "integer",
-          "title": "Max"
-        },
-        "Conditions": {
-          "description": "The conditions that can apply to this meter.",
-          "type": "array",
-          "items": {
-            "description": "Conditions (such as impacts) that can apply to asset cards with condition meters. These are typically presented as tick boxes on the asset card.",
-            "enum": ["battered", "cursed", "out of action", "wrecked"],
-            "type": "string"
-          },
-          "title": "Conditions"
-        },
-        "Aliases": {
-          "description": "Certain common types of asset meters, like companion health and vehicle integrity, are collectively referenced by {@link MoveTriggerOptionAction.Using}. The array will include an appropriate alias if that is the case.",
-          "type": "array",
-          "items": {
-            "description": "Names of non-player condition meters (for e.g. companions and vehicles) that are referenced by moves and other assets.\nIf an asset condition meter can be used in this manner, the alias is included in its Aliases array.",
-            "enum": [
-              "attached asset meter",
-              "command vehicle integrity",
-              "companion health",
-              "incidental vehicle integrity",
-              "support vehicle integrity",
-              "vehicle integrity"
-            ],
-            "type": "string"
-          },
-          "title": "Aliases"
-        },
-        "Value": {
-          "description": "The initial value of the meter.",
-          "type": "integer",
-          "title": "Value"
-        },
-        "Rollable": {
-          "description": "Whether the meter value can be used in place of a stat in an action roll.",
-          "type": "boolean",
-          "title": "Rollable"
-        },
-        "Label": {
-          "description": "The user-facing text label of this item.",
-          "pattern": "^[a-z].+$",
-          "type": "string",
-          "title": "Label"
-        }
-      },
-      "defaultProperties": [],
-      "additionalProperties": false,
-      "required": [
-        "$id",
-        "Conditions",
-        "Label",
-        "Max",
-        "Min",
-        "Rollable",
-        "Value"
-      ]
-    },
     "YamlConditionMeter": {
       "title": "YamlConditionMeter",
       "type": "object",

diff --git a/dataforged-tools/src/builders/assets/AssetAbilityBuilder.ts b/dataforged-tools/src/builders/assets/AssetAbilityBuilder.ts
@@ -52,8 +52,8 @@ export class AssetAbilityBuilder implements AssetAbility {
         const fragment = moveDataClone._idFragment ?? moveDataClone.Title.Canonical;
         moveDataClone.$id = formatId(fragment,this.$id).replace("/Assets/", "/Moves/Assets/");
         moveDataClone.Category = `${game}/Moves/Assets`;
-        if (moveDataClone.Trigger.Options && parent["Meter"]?.$id) {
-          moveDataClone.Trigger.Options = replaceInAllStrings(moveDataClone.Trigger.Options, Replacement.AssetMeter, parent["Meter"].$id);
+        if (moveDataClone.Trigger.Options && parent["Condition meter"]?.$id) {
+          moveDataClone.Trigger.Options = replaceInAllStrings(moveDataClone.Trigger.Options, Replacement.AssetMeter, parent["Condition meter"].$id);
           // console.log("asset ability move data", moveDataClone);
         }
         return new MoveBuilder(moveDataClone, this, game, parent.Source);

diff --git a/dataforged-tools/src/builders/assets/AssetBuilder.ts b/dataforged-tools/src/builders/assets/AssetBuilder.ts
@@ -23,7 +23,7 @@ export class AssetBuilder extends SourceInheritorBuilder implements Asset {
   Requirement?: string | undefined;
   Inputs?: Asset["Inputs"];
   Abilities: [AssetAbility, AssetAbility, AssetAbility];
-  "Meter"?: ConditionMeter | undefined;
+  "Condition meter"?: ConditionMeter | undefined;
   constructor(yaml: YamlAsset, game: Game, parent: AssetType, rootSource: Source) {
     super(yaml.Source ?? {}, rootSource);
     this["Asset type"] = parent.$id;
@@ -71,7 +71,7 @@ export class AssetBuilder extends SourceInheritorBuilder implements Asset {
       this.States = yaml.States.map(state => new AssetStateBuilder(state, this)) ?? undefined;
     }
     this.Requirement = yaml.Requirement;
-    this["Meter"] = yaml["Condition meter"] ? new ConditionMeterBuilder(yaml["Condition meter"], formatId("Condition meter",this.$id), this["Asset type"]) : undefined;
+    this["Condition meter"] = yaml["Condition meter"] ? new ConditionMeterBuilder(yaml["Condition meter"], formatId("Condition meter",this.$id), this["Asset type"]) : undefined;
     if (yaml.Abilities.length !== 3) {
       throw badJsonError(this.constructor, yaml.Abilities, `Asset ${this.$id} doesn't have 3 abilities!`);
     } else {
@@ -80,8 +80,8 @@ export class AssetBuilder extends SourceInheritorBuilder implements Asset {
 
     _.merge(this, replaceInAllStrings(this, Replacement.Asset, this.$id));
 
-    if (this["Meter"]) {
-      _.merge(this, replaceInAllStrings(this, Replacement.AssetMeter, this["Meter"].$id));
+    if (this["Condition meter"]) {
+      _.merge(this, replaceInAllStrings(this, Replacement.AssetMeter, this["Condition meter"].$id));
     }
   }
 }

diff --git a/dataforged-tools/src/json/ironsworn/schema.json b/dataforged-tools/src/json/ironsworn/schema.json
@@ -1773,10 +1773,10 @@
           "maxItems": 3,
           "title": "Abilities"
         },
-        "Meter": {
+        "Condition meter": {
           "description": "Information on this asset's condition meter, if any.",
           "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
+          "title": "Condition meter"
         },
         "Tags": {
           "type": "array",
@@ -3149,11 +3149,6 @@
           "description": "An optional markdown string representing the requirement text that appears at the top of some asset cards.",
           "type": "string",
           "title": "Requirement"
-        },
-        "Meter": {
-          "description": "Information on this asset's condition meter, if any.",
-          "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
         }
       },
       "defaultProperties": [],

diff --git a/dataforged-tools/src/json/starforged/schema.json b/dataforged-tools/src/json/starforged/schema.json
@@ -1116,10 +1116,10 @@
           "maxItems": 3,
           "title": "Abilities"
         },
-        "Meter": {
+        "Condition meter": {
           "description": "Information on this asset's condition meter, if any.",
           "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
+          "title": "Condition meter"
         },
         "Tags": {
           "type": "array",
@@ -2520,11 +2520,6 @@
           "description": "An optional markdown string representing the requirement text that appears at the top of some asset cards.",
           "type": "string",
           "title": "Requirement"
-        },
-        "Meter": {
-          "description": "Information on this asset's condition meter, if any.",
-          "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
         }
       },
       "defaultProperties": [],

diff --git a/dataforged-tools/src/schema/json/assets/Asset.ts b/dataforged-tools/src/schema/json/assets/Asset.ts
@@ -48,7 +48,7 @@ export interface Asset extends HasId, HasDisplay, HasSource, Partial<HasAliases>
   /**
    * Information on this asset's condition meter, if any.
    */
-  "Meter"?: ConditionMeter | undefined;
+  "Condition meter"?: ConditionMeter | undefined;
 
   Tags?: string[] | undefined;
 }
diff --git a/dist/ironsworn/schema.json b/dist/ironsworn/schema.json
@@ -1773,10 +1773,10 @@
           "maxItems": 3,
           "title": "Abilities"
         },
-        "Meter": {
+        "Condition meter": {
           "description": "Information on this asset's condition meter, if any.",
           "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
+          "title": "Condition meter"
         },
         "Tags": {
           "type": "array",
@@ -3149,11 +3149,6 @@
           "description": "An optional markdown string representing the requirement text that appears at the top of some asset cards.",
           "type": "string",
           "title": "Requirement"
-        },
-        "Meter": {
-          "description": "Information on this asset's condition meter, if any.",
-          "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
         }
       },
       "defaultProperties": [],

diff --git a/dist/starforged/schema.json b/dist/starforged/schema.json
@@ -1116,10 +1116,10 @@
           "maxItems": 3,
           "title": "Abilities"
         },
-        "Meter": {
+        "Condition meter": {
           "description": "Information on this asset's condition meter, if any.",
           "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
+          "title": "Condition meter"
         },
         "Tags": {
           "type": "array",
@@ -2520,11 +2520,6 @@
           "description": "An optional markdown string representing the requirement text that appears at the top of some asset cards.",
           "type": "string",
           "title": "Requirement"
-        },
-        "Meter": {
-          "description": "Information on this asset's condition meter, if any.",
-          "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
         }
       },
       "defaultProperties": [],

diff --git a/dist/types/index.d.ts b/dist/types/index.d.ts
@@ -156,7 +156,7 @@ export declare interface Asset extends HasId, HasDisplay, HasSource, Partial<Has
     /**
      * Information on this asset's condition meter, if any.
      */
-    "Meter"?: ConditionMeter | undefined;
+    "Condition meter"?: ConditionMeter | undefined;
     Tags?: string[] | undefined;
 }
 

diff --git a/src/ironsworn/schema.json b/src/ironsworn/schema.json
@@ -1773,10 +1773,10 @@
           "maxItems": 3,
           "title": "Abilities"
         },
-        "Meter": {
+        "Condition meter": {
           "description": "Information on this asset's condition meter, if any.",
           "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
+          "title": "Condition meter"
         },
         "Tags": {
           "type": "array",
@@ -3149,11 +3149,6 @@
           "description": "An optional markdown string representing the requirement text that appears at the top of some asset cards.",
           "type": "string",
           "title": "Requirement"
-        },
-        "Meter": {
-          "description": "Information on this asset's condition meter, if any.",
-          "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
         }
       },
       "defaultProperties": [],

diff --git a/src/starforged/schema.json b/src/starforged/schema.json
@@ -1116,10 +1116,10 @@
           "maxItems": 3,
           "title": "Abilities"
         },
-        "Meter": {
+        "Condition meter": {
           "description": "Information on this asset's condition meter, if any.",
           "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
+          "title": "Condition meter"
         },
         "Tags": {
           "type": "array",
@@ -2520,11 +2520,6 @@
           "description": "An optional markdown string representing the requirement text that appears at the top of some asset cards.",
           "type": "string",
           "title": "Requirement"
-        },
-        "Meter": {
-          "description": "Information on this asset's condition meter, if any.",
-          "$ref": "#/definitions/ConditionMeter",
-          "title": "Meter"
         }
       },
       "defaultProperties": [],

diff --git a/src/types/index.d.ts b/src/types/index.d.ts
@@ -156,7 +156,7 @@ export declare interface Asset extends HasId, HasDisplay, HasSource, Partial<Has
     /**
      * Information on this asset's condition meter, if any.
      */
-    "Meter"?: ConditionMeter | undefined;
+    "Condition meter"?: ConditionMeter | undefined;
     Tags?: string[] | undefined;
 }