From db14cfbbcfc2aa8a7ead53b2086a840b3e6da612 Mon Sep 17 00:00:00 2001 From: Golfavel <32048635+Golfavel@users.noreply.github.com> Date: Wed, 8 Nov 2023 03:51:34 -0700 Subject: [PATCH] [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 --- .../pngs_tiles_10x10/furniture/indoors/f_bed.json | 4 +++- .../furniture/utility/ap_box_battery_charger.json | 8 ++++++++ .../furniture/utility/f_air_compressor.json | 7 +++++++ .../furniture/utility/f_air_compressor.png | Bin 0 -> 150 bytes .../furniture/utility/f_bandsaw.json | 7 +++++++ .../furniture/utility/f_bandsaw.png | Bin 0 -> 159 bytes .../furniture/utility/f_tablesaw.json | 7 +++++++ .../furniture/utility/f_tablesaw.png | Bin 0 -> 160 bytes .../furniture/utility/f_water_heater_family.png | Bin 0 -> 127 bytes .../items/deployables/air_compressor.png | Bin 0 -> 150 bytes .../items/deployables/bandsaw.png | Bin 0 -> 157 bytes .../items/deployables/bigmirror.png | Bin 0 -> 123 bytes .../items/deployables/box_battery_charger.json | 7 +++++++ .../items/deployables/box_battery_charger.png | Bin 0 -> 138 bytes .../deployables/household_water_heater_family.png | Bin 0 -> 130 bytes .../items/deployables/standing_lamp.png | Bin 0 -> 150 bytes .../items/deployables/tablesaw.png | Bin 0 -> 166 bytes .../pngs_tiles_10x10/items/mayonnaise.json | 2 ++ .../items/{2148_mirror_0.png => mirror.png} | Bin gfx/NeoDays/pngs_tiles_10x10/items/mirror_0.json | 1 - gfx/NeoDays/pngs_tiles_10x10/items/mustard.json | 9 +++++++++ .../items/{951_mustard_0.png => mustard.png} | Bin .../mustard_honey_bottled_marloss_gel_0.json | 1 - .../items/{ => vehicle}/recharge_station.json | 0 .../firearm/{m4a1.json => rifle_semi.json} | 4 +++- .../weaponry/firearm/{m4a1.png => rifle_semi.png} | Bin 26 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/furniture/utility/ap_box_battery_charger.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_water_heater_family.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/air_compressor.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/bandsaw.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/bigmirror.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/household_water_heater_family.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/standing_lamp.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/tablesaw.png rename gfx/NeoDays/pngs_tiles_10x10/items/{2148_mirror_0.png => mirror.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/mirror_0.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/mustard.json rename gfx/NeoDays/pngs_tiles_10x10/items/{951_mustard_0.png => mustard.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/mustard_honey_bottled_marloss_gel_0.json rename gfx/NeoDays/pngs_tiles_10x10/items/{ => vehicle}/recharge_station.json (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/{m4a1.json => rifle_semi.json} (76%) rename gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/{m4a1.png => rifle_semi.png} (100%) diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_bed.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_bed.json index 9308b7b553..8314a53c76 100644 --- 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 new file mode 100644 index 0000000000..61800418a2 --- /dev/null +++ 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 new file mode 100644 index 0000000000..41b6f95bd9 --- /dev/null +++ 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 new file mode 100644 index 0000000000000000000000000000000000000000..3ea8cd01140ac0f5c517271a239d713986589ce9 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4#d^9phDcmqJ7FX50Rf4rFptIhDcoQo#4pVpuoej{0RHZ z3+9C%9OWv6RsM1CvuQSQ?k(MPJ5PIy)}QGeqCY3Fx%P22tWHqdbf^l8fLa1tKV8+8Q6IV;-J8qEKVJvZy4`?HUr>mdK II;Vst0DCAo?f?J) literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.json new file mode 100644 index 0000000000..4c5015d779 --- /dev/null +++ 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 new file mode 100644 index 0000000000000000000000000000000000000000..bd990f946ce636a69a50945d805b6833d1d4f539 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4rF*(KhDcoQop6!!fCGo~8bg K=d#Wzp$Py@%|DU= literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..1d710456a974d8e6e1927b15d02ec3a4f271df1a GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4xp}%chDcmaPH|}X&$EM3S$Wf< zSFf^oMAxoeD=^id_5c6>$CG80nYr6utSMo!&Q+Up@`!_q!mX@DzA1-Nnfz9F^2#+a a@-dj3hzMBzJ{}1)k-^i|&t;ucLK6TR11OgO literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/air_compressor.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/air_compressor.png new file mode 100644 index 0000000000000000000000000000000000000000..c53b1eaa4e35033c6b7bac2abd86659d4a448945 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4#d^9phDcmaPH|}X?~&uiW^$lq z&5QpgY;zhomz}V9%hPw`;3e^Y~c-ujs;YdP2-Gt(9_5n7CiHUY+lhro=wsJ ylXnQpE~w@?-0KncxLi3|?AwFHBcd`dvKXpf%P>u<+{Oa5h{4m<&t;ucLK6TUgEjX6 literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bandsaw.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bandsaw.png new file mode 100644 index 0000000000000000000000000000000000000000..bb90c55555c1474ca5e4c467d9405b8fade0f4b5 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4rFgnHhDcoQ4RGW-puppu$}hDh z|5hUZtHk`G2mP-OmTne3*wAuhLdO9mjt0FSQy3mt7>7vh5BTi6{N|L_p6wC=nP-mv zc2r&&WcQe+;-1_aZ&*vKc?3!PG@Ww6k^ZyDfs#x#qNNqa)U!MnPAA_f>pUXO@ GgeCwcwLPN% literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bigmirror.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bigmirror.png new file mode 100644 index 0000000000000000000000000000000000000000..49531f7b605f96838af3d1d13711258c58067756 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4IeEG`hDcmaPFP@;&~oX2XW)R UYfX@=BhWMkPgg&ebxsLQ0H~!XQ2+n{ literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000..fd37fa32db --- /dev/null +++ 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 new file mode 100644 index 0000000000000000000000000000000000000000..7e9d09aeb0b2b820e0fde054566418b575d224fa GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f41$w$ThDcoQoe;=%z<|R!`DLta zu;1+3oW65y7aJ6QEShvc_hGys>%=WCY5VqiyfVxQ-Mn+x(z5J}FZxRkG;O_l@bJ#1 n@1+?Ga{2V;U#@s$@_{@2jQsqf4d3w4yhDcmaPEZgsaC-T_<%;1U zk-z`{%eQlNMEdXm!PTo*Eqa?y8YWJiJC*OCM+4_wt{8@O0@I}v8(3Fo-11p-(0R)G cPCj>r)!{;)lCADv0~*TU>FVdQ&MBb@0Ik|9%m4rY literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/standing_lamp.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/standing_lamp.png new file mode 100644 index 0000000000000000000000000000000000000000..26affe7709e36e6b8165335bbb0a01e8b70d045f GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4#d^9phDcmaPEZgsND}f4<$Ag}hDcnlo#4&YV8G)Nf0UW? z?95#s9Q160S@K21|4MilC`@r*c6b7d#QLBE3_1)uGt#>&B-RHXE2^_Uwk}5GZp*)$ z%k}oQM_+jxsP6N{%lgDx`Nght)8cGnmMfe!2xr_7b0un%@1N=iA0F`U5Y_qnYW^Y} Ppv4THu6{1-oD!M<+zCB5 literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json b/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json index cb2c8ab598..5a0574371f 100644 --- 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/gfx/NeoDays/pngs_tiles_10x10/items/2148_mirror_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/mirror.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/2148_mirror_0.png rename to gfx/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 deleted file mode 100644 index d97e3bfe01..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/mirror_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": "mirror", "fg": ["2148_mirror_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mustard.json b/gfx/NeoDays/pngs_tiles_10x10/items/mustard.json new file mode 100644 index 0000000000..8c4bb284ea --- /dev/null +++ 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/gfx/NeoDays/pngs_tiles_10x10/items/951_mustard_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/mustard.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/951_mustard_0.png rename to gfx/NeoDays/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 deleted file mode 100644 index d4a4b7e5b8..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/mustard_honey_bottled_marloss_gel_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["mustard", "honey_bottled", "marloss_gel"], "fg": ["951_mustard_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/recharge_station.json b/gfx/NeoDays/pngs_tiles_10x10/items/vehicle/recharge_station.json similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/recharge_station.json rename to gfx/NeoDays/pngs_tiles_10x10/items/vehicle/recharge_station.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/m4a1.json b/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/rifle_semi.json similarity index 76% rename from gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/m4a1.json rename to gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/rifle_semi.json index 5f1277a9cb..e33ec27401 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/m4a1.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/rifle_semi.json @@ -1,11 +1,13 @@ { "id": [ + "rifle_semi", "m4a1", "hk_g3", "hk_g36", "arx160", "acr", "ar15", + "modular_ar15", "scar_l", "scar_h", "m107a1", @@ -13,5 +15,5 @@ "m27iar", "rm51_assault_rifle" ], - "fg": "m4a1" + "fg": "rifle_semi" } diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/m4a1.png b/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/rifle_semi.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/m4a1.png rename to gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/rifle_semi.png