[MSX] Some more stuff (#2451)

* Create .gitkeep * Add files via upload * Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/Aftershock/furniture/f_habitat_kitchenette/.gitkeep * Create .gitkeep * Add files via upload * Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/Aftershock/furniture/f_habitat_storage_board/.gitkeep * Create .gitkeep * Add files via upload * Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/Aftershock/furniture/f_screenmirror/.gitkeep * Create .gitkeep * Add files via upload * Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/Aftershock/furniture/f_intermodal_crate/.gitkeep * Delete gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_metal_floor_0.json * Delete gfx/MShockXotto+/pngs_tiles_32x32/terrain/3121_t_metal_floor_0.png * Create .gitkeep * Add files via upload * Delete gfx/MShockXotto+/pngs_tiles_32x32/terrain/metal_floor/.gitkeep * Add files via upload * Add files via upload * Create .gitkeep * Add files via upload * Delete gfx/MShockXotto+/pngs_small_20x20/items/atlatl_spear/.gitkeep * Add files via upload * Add files via upload * Add files via upload * Create f_tatami.json * Add files via upload * Delete gfx/MShockXotto+/pngs_tiles_32x32/furniture/1591_f_tatami_0.png * Delete gfx/MShockXotto+/pngs_tiles_32x32/furniture/1592_f_tatami_2.png * Delete gfx/MShockXotto+/pngs_tiles_32x32/furniture/1593_f_tatami_3.png * Delete gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami_0.json * Update t_gates_mech_control_lab.json * Update t_gates_mech_control.json * Update t_scrap_floor_0.json * Delete gfx/MShockXotto+/pngs_tiles_32x32/terrain/metal_floor directory * Add files via upload * Create t_metal_floor.json * Create t_intermodal_crate.json * Update t_intermodal_crate.json * Create f_intermodal_crate.json
I-am-Erk · Jul 22, 2024 · 97f2108 · 97f2108
1 parent 06eab78
commit 97f2108
Show file tree

Hide file tree

Showing 43 changed files with 84 additions and 5 deletions.
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/atlatl_spear/bronze_atlatl_spear.png b/gfx/MShockXotto+/pngs_small_20x20/items/atlatl_spear/bronze_atlatl_spear.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/atlatl_spear/steel_atlatl_spear.png b/gfx/MShockXotto+/pngs_small_20x20/items/atlatl_spear/steel_atlatl_spear.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/atlatl_spear/wood_atlatl_spear.png b/gfx/MShockXotto+/pngs_small_20x20/items/atlatl_spear/wood_atlatl_spear.png
diff --git a/gfx/MShockXotto+/pngs_tall_32x48/terrain/t_nanofab_body.png b/gfx/MShockXotto+/pngs_tall_32x48/terrain/t_nanofab_body.png
diff --git a/...MShockXotto+/pngs_taller_32x64/terrain/overhead_lights/t_metal_floor_olight.png b/...MShockXotto+/pngs_taller_32x64/terrain/overhead_lights/t_metal_floor_olight.png
diff --git a/...ockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_atlatl.png b/...ockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_atlatl.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/1591_f_tatami_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/1591_f_tatami_0.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/1592_f_tatami_2.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/1592_f_tatami_2.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/1593_f_tatami_3.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/1593_f_tatami_3.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami.json b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami.json
@@ -0,0 +1,52 @@
+{
+  "id": "f_tatami",
+  "fg": "f_tatami_unconnected",
+  "multitile": true,
+  "additional_tiles": [
+    {
+      "id": "center",
+      "fg": "f_tatami_center"
+    },
+    {
+      "id": "corner",
+      "fg": [
+        "f_tatami_corner_nw",
+        "f_tatami_corner_sw",
+        "f_tatami_corner_se",
+        "f_tatami_corner_ne"
+      ]
+    },
+    {
+      "id": "t_connection",
+      "fg": [
+        "f_tatami_t_connection_n",
+        "f_tatami_t_connection_w",
+        "f_tatami_t_connection_s",
+        "f_tatami_t_connection_e"
+      ]
+    },
+    {
+      "id": "edge",
+      "fg": [
+        "f_tatami_edge_ns",
+        "f_tatami_edge_ew"
+      ]
+    },
+    {
+      "id": "end_piece",
+      "fg": [
+        "f_tatami_end_piece_n",
+        "f_tatami_end_piece_w",
+        "f_tatami_end_piece_s",
+        "f_tatami_end_piece_e"
+      ]
+    },
+    {
+      "id": "unconnected",
+      "fg": [
+        "f_tatami_unconnected",
+        "f_tatami_unconnected"
+      ]
+    }
+  ]
+}
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_center.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_center.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_corner_ne.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_corner_nw.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_corner_se.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_corner_sw.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_edge_ew.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_edge_ns.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_end_piece_e.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_end_piece_n.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_end_piece_s.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_end_piece_w.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_t_connection_e.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_t_connection_n.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_t_connection_s.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_t_connection_w.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami/f_tatami_unconnected.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_tatami_0.json
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/atlatl.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/atlatl.png
diff --git a/...32x32/mods/Aftershock/furniture/f_habitat_kitchenette/f_habitat_kitchenette.png b/...32x32/mods/Aftershock/furniture/f_habitat_kitchenette/f_habitat_kitchenette.png
diff --git a/...2/mods/Aftershock/furniture/f_habitat_storage_board/f_habitat_storage_board.png b/...2/mods/Aftershock/furniture/f_habitat_storage_board/f_habitat_storage_board.png
diff --git a/...to+/pngs_tiles_32x32/mods/Aftershock/furniture/f_intermodal_crate/f_intermodal_crate.json b/...to+/pngs_tiles_32x32/mods/Aftershock/furniture/f_intermodal_crate/f_intermodal_crate.json
@@ -0,0 +1,8 @@
+[
+  {
+    "id": "f_sealed_intermodal_crate",
+    "fg": [ "f_sealed_intermodal_crate" ],
+    "rotates": false,
+    "bg": [  ]
+  }
+] 
diff --git a/..._32x32/mods/Aftershock/furniture/f_intermodal_crate/f_intermodal_crate_open.png b/..._32x32/mods/Aftershock/furniture/f_intermodal_crate/f_intermodal_crate_open.png
diff --git a/...2x32/mods/Aftershock/furniture/f_intermodal_crate/f_sealed_intermodal_crate.png b/...2x32/mods/Aftershock/furniture/f_intermodal_crate/f_sealed_intermodal_crate.png
diff --git a/...o+/pngs_tiles_32x32/mods/Aftershock/furniture/f_screenmirror/f_screenmirror.png b/...o+/pngs_tiles_32x32/mods/Aftershock/furniture/f_screenmirror/f_screenmirror.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/mods/Aftershock/terrain/t_intermodal_crate.json b/gfx/MShockXotto+/pngs_tiles_32x32/mods/Aftershock/terrain/t_intermodal_crate.json
@@ -0,0 +1,20 @@
+[
+  {
+    "id": "t_intermodal_crate",
+    "fg": [ "f_sealed_intermodal_crate" ],
+    "rotates": false,
+    "bg": [  ]
+  },
+  {
+    "id": "t_intermodal_crate_scripted_source",
+    "fg": [ "f_sealed_intermodal_crate" ],
+    "rotates": false,
+    "bg": [  ]
+  },
+  {
+    "id": "t_intermodal_crate_scripted_destination",
+    "fg": [ "f_sealed_intermodal_crate" ],
+    "rotates": false,
+    "bg": [  ]
+  }
+]
diff --git a/...2x32/mods/xedra_evolved/character/mutations/overlay_mutation_ethereal_wings.png b/...2x32/mods/xedra_evolved/character/mutations/overlay_mutation_ethereal_wings.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/3121_t_metal_floor_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/3121_t_metal_floor_0.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_gates_mech_control.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_gates_mech_control.json
@@ -3,7 +3,7 @@
   "fg": [
     "t_gates_mech_control"
   ],
-  "bg": ["3121_t_metal_floor_0"
+  "bg": ["t_metal_floor"
 
   ],
   "rotates": false

diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_gates_mech_control_lab.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_gates_mech_control_lab.json
@@ -3,7 +3,7 @@
   "fg": [
     "t_gates_mech_control_lab"
   ],
-  "bg": ["3121_t_metal_floor_0"
+  "bg": ["t_metal_floor"
 
   ],
   "rotates": false

diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_metal_floor.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_metal_floor.json
@@ -0,0 +1 @@
+{"id": "t_metal_floor", "fg": ["t_metal_floor"], "rotates": false, "bg": []}
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_metal_floor.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_metal_floor.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_metal_floor_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_metal_floor_0.json
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_scrap_floor_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_scrap_floor_0.json
@@ -1 +1 @@
-{"id": "t_scrap_floor", "fg": ["3121_t_metal_floor_0"], "rotates": false, "bg": []}
+{"id": "t_scrap_floor", "fg": ["t_metal_floor"], "rotates": false, "bg": []}