wafflecone.fix

GuyBronson · Aug 1, 2020 · 6800c76 · 6800c76
1 parent 9eedea0
commit 6800c76
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 5 deletions.
diff --git a/fu_metagui/panes/fu/example.ui b/fu_metagui/panes/fu/example.ui
@@ -0,0 +1,11 @@
+
+{ //  -*- grammar-ext: json -*-
+  "style" : "window", // window (has titlebar), panel (just a frame) etc.
+  "size" : [100, 100], // *internal* size (not including chrome)
+  "title" : "Container Test",
+  "openWithInventory" : true,
+  //"scripts" : [ "drivebay.lua" ],
+  "children" : [
+    { "id" : "grid", "type" : "itemGrid", "slots" : 9, "columns" : 3, "containerSlot" : 1 }
+  ]
+}
diff --git a/metagui/panes/fu/example.ui b/metagui/panes/fu/example.ui
@@ -0,0 +1,11 @@
+
+{ //  -*- grammar-ext: json -*-
+  "style" : "window", // window (has titlebar), panel (just a frame) etc.
+  "size" : [100, 100], // *internal* size (not including chrome)
+  "title" : "Container Test",
+  "openWithInventory" : true,
+  //"scripts" : [ "drivebay.lua" ],
+  "children" : [
+    { "id" : "grid", "type" : "itemGrid", "slots" : 9, "columns" : 3, "containerSlot" : 1 }
+  ]
+}
diff --git a/metagui/registry.json.patch b/metagui/registry.json.patch
@@ -3,5 +3,6 @@
   { "op" : "add", "path" : "/defaultTheme", "value" : "frackin" },
   { "op" : "add", "path" : "/panes/fu", "value" : {
     // place pane entries here and reference by fu:panename
+    "pane1" : "/panes/fu/example.ui"
   } }
-]
+]
diff --git a/objects/corpsewagon/corpsewagon.object b/objects/corpsewagon/corpsewagon.object
@@ -3,8 +3,12 @@
   "colonyTags" : [ "macabre", "madness", "insanity", "bed" ],
   "printable" : false,
   "rarity" : "rare",
-"interactAction" : "ScriptPane",
-"interactData" : { "gui" : { }, "scripts" : ["/metagui.lua"], "ui" : "example.ui" },
+
+  "interactAction" : "OpenCraftingInterface",
+  "interactData" : {
+    "config" : "/interface/windowconfig/fucorpsewagon.config",
+    "filter" : [ "fucorpsewagon" ]
+  },
 
   "description" : "The stench is quite overwhelming.",
   "shortdescription" : "Midnight Meat Wagon",

diff --git a/objects/minibiome/ancient/artifact/fuancientartifactcorelit.frames b/objects/minibiome/ancient/artifact/fuancientartifactcorelit.frames
@@ -0,0 +1,14 @@
+{
+
+  "frameGrid" : {
+    "size" : [32, 64],
+    "dimensions" : [6, 1],
+    "names" : [
+      [ "default.1", "default.2", "default.3", "default.4", "default.5", "default.empty" ]
+    ]
+  },
+
+  "aliases" : {
+    "default.default" : "default.1"
+  }
+}
diff --git a/objects/minibiome/ancient/artifact/fuancientartifacttutorial4.object b/objects/minibiome/ancient/artifact/fuancientartifacttutorial4.object
@@ -59,8 +59,8 @@
 
   "animation" : "fuancientartifact.animation",
   "animationParts" : {
-    "interactiveObject" : "fuancientartifactore.png",
-    "interactiveObjectlit" : "fuancientartifactorelit.png"
+    "interactiveObject" : "fuancientartifactcore.png",
+    "interactiveObjectlit" : "fuancientartifactcorelit.png"
   },
   "animationPosition" : [0, 0],
   "pickupQuestTemplates" : [ "ancientpowerconduit" ]