[NeoDays] Randomness (#2187)

* connected: various mattress traps to bed * added: disconnected standing lamp * renamed: m4a1 > rifle_semi connected: 'modular_ar15' to 'rifle_semi' * added: family-sized water heater (furniture and item) * connected: juvenile sourdough starter and freshly fed sourdough starter to mayonnaise; sourdough starter to mustard * added: various air compressors, various bandsaws, various tablesaws * connected: box battery charger and foot locker recharging station to recharge station * added: standing mirror (item) cleaned: mirror * added: disconnected box battery charger
I-am-Erk · Nov 8, 2023 · db14cfb · db14cfb
1 parent 390c915
commit db14cfb
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 4 deletions.
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_bed.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_bed.json
@@ -2,7 +2,9 @@
   "id": [
     "f_bed",
     "f_floor_mattress",
-    "f_down_mattress"
+    "f_down_mattress",
+    "tr_mattress",
+    "tr_down_mattress"
   ],
   "//": "different sprite(s) for mattresses later",
   "fg": "f_makeshift_bed_0",

diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/ap_box_battery_charger.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/ap_box_battery_charger.json
@@ -0,0 +1,8 @@
+{
+  "id": [
+    "vp_ap_box_battery_charger",
+    "vp_ap_foot_locker_recharge_station"
+  ],
+  "fg": "vp_recharge_station",
+  "//": "vehicle part"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "f_air_compressor",
+    "vp_ap_air_compressor"
+  ],
+  "fg": "f_air_compressor"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "f_bandsaw",
+    "vp_ap_bandsaw"
+  ],
+  "fg": "f_bandsaw"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "f_tablesaw",
+    "vp_ap_tablesaw"
+  ],
+  "fg": "f_tablesaw"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_water_heater_family.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_water_heater_family.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/air_compressor.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/air_compressor.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bandsaw.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bandsaw.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bigmirror.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bigmirror.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.json b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "box_battery_charger",
+    "foot_locker_recharge_station"
+  ],
+  "fg": "box_battery_charger"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/household_water_heater_family.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/household_water_heater_family.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/standing_lamp.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/standing_lamp.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/tablesaw.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/tablesaw.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json b/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json
@@ -13,6 +13,8 @@
      "meal_bone",
      "meal_bone_tainted",
      "starch",
+     "sourdough_young_uncovered",
+     "sourdough_split_uncovered",
      "mayonnaise"
   ],
   "fg": ["mayonnaise"]

diff --git a/.../pngs_tiles_10x10/items/2148_mirror_0.png → ...NeoDays/pngs_tiles_10x10/items/mirror.png b/.../pngs_tiles_10x10/items/2148_mirror_0.png → ...NeoDays/pngs_tiles_10x10/items/mirror.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mirror_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/mirror_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mustard.json b/gfx/NeoDays/pngs_tiles_10x10/items/mustard.json
@@ -0,0 +1,9 @@
+{
+  "id": [
+    "mustard",
+    "honey_bottled",
+    "sourdough_starter_uncovered",
+    "marloss_gel"
+  ],
+  "fg": "mustard"
+}
diff --git a/.../pngs_tiles_10x10/items/951_mustard_0.png → ...eoDays/pngs_tiles_10x10/items/mustard.png b/.../pngs_tiles_10x10/items/951_mustard_0.png → ...eoDays/pngs_tiles_10x10/items/mustard.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mustard_honey_bottled_marloss_gel_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/mustard_honey_bottled_marloss_gel_0.json
diff --git a/...s_tiles_10x10/items/recharge_station.json → ...10x10/items/vehicle/recharge_station.json b/...s_tiles_10x10/items/recharge_station.json → ...10x10/items/vehicle/recharge_station.json
diff --git a/...es_10x10/items/weaponry/firearm/m4a1.json → ...10/items/weaponry/firearm/rifle_semi.json b/...es_10x10/items/weaponry/firearm/m4a1.json → ...10/items/weaponry/firearm/rifle_semi.json
@@ -1,17 +1,19 @@
 {
   "id": [
+    "rifle_semi",
     "m4a1",
     "hk_g3",
     "hk_g36",
     "arx160",
     "acr",
     "ar15",
+    "modular_ar15",
     "scar_l",
     "scar_h",
     "m107a1",
     "h&k416a5",
     "m27iar",
     "rm51_assault_rifle"
   ],
-  "fg": "m4a1"
+  "fg": "rifle_semi"
 }
diff --git a/...les_10x10/items/weaponry/firearm/m4a1.png → ...x10/items/weaponry/firearm/rifle_semi.png b/...les_10x10/items/weaponry/firearm/m4a1.png → ...x10/items/weaponry/firearm/rifle_semi.png