edited layouts for new fields and broadcasts

lurch9229 · Nov 7, 2021 · 59a075a · 59a075a
1 parent 8f1ab70
commit 59a075a
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 197 deletions.
diff --git a/enderlilies_maptracker_lurch9229/layouts/broadcast_horizontal.json b/enderlilies_maptracker_lurch9229/layouts/broadcast_horizontal.json
@@ -1,75 +1,41 @@
 {
-  "spirit_grid": {
+  "item_grid": 
+  {
     "type": "container",
-    "content": [
+    "content": 
+    [
       {
         "type": "itemgrid",
         "h_alignment": "center",
         "item_margin": "5,5,5,5",
-        "rows": [
-          ["umbral", "gerrod", "silva", "julius", "ulv", "eleine", "hoenir"],
-          ["faden", "siegrid", "cliffyouth", "headless", "merchant", "maiden", "archer"],
-          ["elderkeeper", "fungal", "floral", "sentinel", "testsubject", "executioner", "sinner"],
-          ["", "verboten", "cliffelder", "chief", "royalaegis", "fellwyrm", ""]
+        "rows": 
+        [
+          [ "umbral", "gerrod", "silva", "julius", "ulv", "eleine", "hoenir", "", "", "pray", "jump", "dodge", "paddle", "switch"],
+          [ "faden", "siegrid", "cliffyouth", "headless", "merchant", "maiden", "archer", "", "", "djump", "hammer", "aquatic", "dodge2", "rites"],
+          [ "elderkeeper", "fungal", "floral", "sentinel", "testsubject", "executioner", "sinner", "", "", "hook", "claws", "dash", "lance", "unlock"],
+          [ "", "verboten", "cliffelder", "chief", "royalaegis", "fellwyrm", "", "", "", "jewel", "gem", "fragment", "relicslot", "wish"],
+          [ "prayerbeads", "royalcrest", "music", "familiar", "snowdrop", "appendage", "giant"],
+          [ "dragonclaw", "ornament", "executionergloves", "crown", "weatherneck", "immortal", "manisa", "", "", "", "tabletch", "tabletwt", "tabletcc"],
+          [ "aura", "kilteus", "caliva", "statue", "doll", "earrings", "holywater", "", "", "", "tabletsa", "tabletts", "tabletrc"],
+          [ "nymphilia", "spellbound", "plume", "witchbook", "ribbon", "blightblade", "heretic", "", "", "", "ch1", "tabletvd", "Bend"],
+          [ "eldred", "ricorus", "luminantcurio", "heirloom", "phantom", "fretia", "iris"]
         ]
       }
     ]
   },
-
-  "relic_grid": {
-    "type": "container",
-    "content": [
-      { 
-        "type": "itemgrid",
-        "h_alignment":"center",
-        "item_margin": "5,5,5,5",
-        "rows": [
-          ["prayerbeads", "royalcrest", "music", "familiar", "snowdrop", "appendage", "giant"],
-          ["dragonclaw", "ornament", "executionergloves", "crown", "weatherneck", "immortal", "manisa"],
-          ["aura", "kilteus", "caliva", "statue", "doll", "earrings", "holywater"],
-          ["nymphilia", "spellbound", "plume", "witchbook", "ribbon", "blightblade", "heretic"],
-          ["eldred", "ricorus", "luminantcurio", "heirloom", "phantom", "fretia", "tablet"]
-        ]
-      }
-    ]
-  },
-
-  "ability_grid": {
-    "type": "container",
-    "content": [
+
+  "tracker_broadcast": 
+  {
+    "type": "array",
+    "drop_shadow": true,
+    "orientation": "horizontal",
+    "margin": "0,0",
+    "content":
+    [
       {
-        "type": "itemgrid",
-        "h_alignment": "center",
-        "item_margin":"5,5,5,5",
-        "rows": [
-          ["pray", "jump", "dodge", "paddle", "switch"],
-          ["djump", "hammer", "aquatic", "dodge2", "rites"],
-          ["hook", "claws", "dash", "lance", "unlock"],
-          ["ch1", "Bend", "gem", "fragment", "relicslot", "wish"],
-          [ "iris", "hood", "orb", "heiml", "gift", "miriel", "groa"]
-        ] 
+        "type": "layout",
+        "key": "item_grid"
       }
     ]
-  },
-
-    "tracker_broadcast": {
-      "type": "array",
-      "drop_shadow": true,
-      "orientation": "horizontal",
-      "margin": "0,0",
-      "content": [
-        {
-          "type": "layout",
-          "key": "spirit_grid"
-        },
-        {
-          "type": "layout",
-          "key": "relic_grid" 
-        },
-        {
-          "type": "layout",
-          "key": "ability_grid"
-        }
-      ]
-    }
+  }
 }
diff --git a/enderlilies_maptracker_lurch9229/layouts/items_only.json b/enderlilies_maptracker_lurch9229/layouts/items_only.json
@@ -1,37 +1,36 @@
 {
-  "item_grid": {
+  "item_grid": 
+  {
     "type": "container",
-    "content": [
+    "content": 
+    [
       {
         "type": "itemgrid",
         "h_alignment": "left",
         "item_margin": "5,5",
         "item_size": "40,40",
-        "rows": [
-          ["umbral", "gerrod", "silva", "julius", "ulv", "eleine", "hoenir"],
-          ["faden", "siegrid", "cliffyouth", "headless", "merchant", "maiden", "archer"],
-          ["elderkeeper", "fungal", "floral", "sentinel", "testsubject", "executioner", "sinner"],
-          ["verboten", "cliffelder", "chief", "royalaegis", "fellwyrm"],
-          ["prayerbeads", "royalcrest", "music", "familiar", "snowdrop", "appendage", "giant"],
-          ["dragonclaw", "ornament", "executionergloves", "crown", "weatherneck", "immortal", "manisa"],
-          ["aura", "kilteus", "caliva", "statue", "doll", "earrings", "holywater"],
-          ["nymphilia", "spellbound", "plume", "witchbook", "ribbon", "blightblade", "heretic"],
-          ["eldred", "ricorus", "luminantcurio", "heirloom", "phantom", "fretia"],
-          ["pray", "jump", "dodge", "paddle", "switch"],
-          ["djump", "hammer", "aquatic", "dodge2", "rites"],
-          ["hook", "claws", "dash", "lance", "unlock"],
-          ["ch1", "Bend", "gem", "fragment", "relicslot", "wish"],
-          ["iris", "hood", "orb", "heiml", "gift", "miriel", "groa"],
-          ["tabletch", "tabletwt", "tabletcc", "tabletsa", "tabletts", "tabletrc", "tabletvd"]
+        "rows":
+        [
+          [ "umbral", "gerrod", "silva", "julius", "ulv", "eleine", "hoenir", "", "", "pray", "jump", "dodge", "paddle", "switch"],
+          [ "faden", "siegrid", "cliffyouth", "headless", "merchant", "maiden", "archer", "", "", "djump", "hammer", "aquatic", "dodge2", "rites"],
+          [ "elderkeeper", "fungal", "floral", "sentinel", "testsubject", "executioner", "sinner", "", "", "hook", "claws", "dash", "lance", "unlock"],
+          [ "", "verboten", "cliffelder", "chief", "royalaegis", "fellwyrm", "", "", "", "jewel", "gem", "fragment", "relicslot", "wish"],
+          [ "prayerbeads", "royalcrest", "music", "familiar", "snowdrop", "appendage", "giant"],
+          [ "dragonclaw", "ornament", "executionergloves", "crown", "weatherneck", "immortal", "manisa", "", "", "", "tabletch", "tabletwt", "tabletcc"],
+          [ "aura", "kilteus", "caliva", "statue", "doll", "earrings", "holywater", "", "", "", "tabletsa", "tabletts", "tabletrc"],
+          [ "nymphilia", "spellbound", "plume", "witchbook", "ribbon", "blightblade", "heretic", "", "", "", "ch1", "tabletvd", "Bend"],
+          [ "eldred", "ricorus", "luminantcurio", "heirloom", "phantom", "fretia", "iris"]
         ] 
       }
     ]
   },
-    "tracker_default": {
+    "tracker_default":
+    {
 	  "type": "array",
 	  "margin": "1,1,1,1",
     "item_size": "400,400",
-	  "content": [
+	  "content":
+    [
 		  { 
 			  "type": "layout",
 			  "key": "item_grid"