From ec1c0197094031ef92d572b6908478be67116e41 Mon Sep 17 00:00:00 2001 From: Golfavel Date: Mon, 4 Dec 2023 20:00:16 -0700 Subject: [PATCH 01/10] added: candy coated peanuts, cactus pad, nopalitos, buttercream icing --- .../items/food/nuts/candy_coated_peanuts.png | Bin 0 -> 156 bytes .../items/food/vegetables/cactus_pad.png | Bin 0 -> 124 bytes .../items/food/vegetables/nopalitos.png | Bin 0 -> 127 bytes .../pngs_tiles_10x10/items/piles/crack.json | 1 + 4 files changed, 1 insertion(+) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/candy_coated_peanuts.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/cactus_pad.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/nopalitos.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/candy_coated_peanuts.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/candy_coated_peanuts.png new file mode 100644 index 0000000000000000000000000000000000000000..44d22625896b0f1c4b97339dbb64caf116a4465e GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4C40I!hDcmaPEZgsND}DlZ4w;U2@V0tStdsDlRJkUA@Pgg&ebxsLQ0As8+ Apa1{> literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/cactus_pad.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/cactus_pad.png new file mode 100644 index 0000000000000000000000000000000000000000..0030b0df5a3a5460a2f17365ab1bea29eb427dc9 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4IeWS|hDcmaPEZgsSoHD#f4xp}%chDcoQy>OC~!GMG1z||(* zV{K=ZCnTG;%LlR@WVQ3o=$kybrKjWjGEPg!*#+*Ra^jLVIUhC6dH7V2VbK Date: Mon, 4 Dec 2023 20:08:23 -0700 Subject: [PATCH 02/10] moved: various nuts to ./food/nuts fixed: various shelled nut sprites having wrong id --- .../items/{ => food/nuts}/almond.png | Bin .../items/{ => food/nuts}/almond_roasted.png | Bin .../nuts/almond_shelled.png} | Bin .../items/{ => food/nuts}/beech_nuts.png | Bin .../items/{ => food/nuts}/chestnut.png | Bin .../items/{ => food/nuts}/chestnut_roasted.png | Bin .../nuts/chestnut_shelled.png} | Bin .../items/{ => food/nuts}/hazelnut.png | Bin .../items/{ => food/nuts}/hazelnut_roasted.png | Bin .../nuts/hazelnut_shelled.png} | Bin .../items/{ => food/nuts}/peanut.png | Bin .../nuts/peanut_shelled.png} | Bin .../items/{ => food/nuts}/pecan.png | Bin .../items/{ => food/nuts}/pecan_roasted.png | Bin .../nuts/pecan_shelled.png} | Bin .../items/{ => food/nuts}/walnut.png | Bin .../items/{ => food/nuts}/walnut_roasted.png | Bin .../nuts/walnut_shelled.png} | Bin 18 files changed, 0 insertions(+), 0 deletions(-) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/almond.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/almond_roasted.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{almond_unshelled.png => food/nuts/almond_shelled.png} (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/beech_nuts.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/chestnut.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/chestnut_roasted.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{chestnut_unshelled.png => food/nuts/chestnut_shelled.png} (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/hazelnut.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/hazelnut_roasted.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{hazelnut_unshelled.png => food/nuts/hazelnut_shelled.png} (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/peanut.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{peanut_unshelled.png => food/nuts/peanut_shelled.png} (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/pecan.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/pecan_roasted.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{pecan_unshelled.png => food/nuts/pecan_shelled.png} (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/walnut.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => food/nuts}/walnut_roasted.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{walnut_unshelled.png => food/nuts/walnut_shelled.png} (100%) diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/almond.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/almond.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/almond.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/almond.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/almond_roasted.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/almond_roasted.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/almond_roasted.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/almond_roasted.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/almond_unshelled.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/almond_shelled.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/almond_unshelled.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/almond_shelled.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/beech_nuts.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/beech_nuts.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/beech_nuts.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/beech_nuts.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/chestnut.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/chestnut.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/chestnut.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/chestnut.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/chestnut_roasted.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/chestnut_roasted.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/chestnut_roasted.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/chestnut_roasted.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/chestnut_unshelled.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/chestnut_shelled.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/chestnut_unshelled.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/chestnut_shelled.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/hazelnut.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/hazelnut.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/hazelnut.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/hazelnut.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/hazelnut_roasted.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/hazelnut_roasted.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/hazelnut_roasted.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/hazelnut_roasted.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/hazelnut_unshelled.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/hazelnut_shelled.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/hazelnut_unshelled.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/hazelnut_shelled.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/peanut.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/peanut.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/peanut.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/peanut.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/peanut_unshelled.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/peanut_shelled.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/peanut_unshelled.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/peanut_shelled.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/pecan.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/pecan.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/pecan.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/pecan.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/pecan_roasted.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/pecan_roasted.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/pecan_roasted.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/pecan_roasted.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/pecan_unshelled.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/pecan_shelled.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/pecan_unshelled.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/pecan_shelled.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/walnut.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/walnut.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/walnut.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/walnut.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/walnut_roasted.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/walnut_roasted.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/walnut_roasted.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/walnut_roasted.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/walnut_unshelled.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/walnut_shelled.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/walnut_unshelled.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/nuts/walnut_shelled.png From 0514c8b0d8a596a49628649df6c78aa0cc5c23ea Mon Sep 17 00:00:00 2001 From: Golfavel Date: Mon, 4 Dec 2023 20:24:54 -0700 Subject: [PATCH 03/10] added: caramel apple connected: caviar egg sandwich with egg salad sandwich; chocolate milkshake with sewage --- .../items/food/fruit/caramel_apple.png | Bin 0 -> 163 bytes .../items/food/sandwiches/sandwich_egg_salad.json | 1 + .../pngs_tiles_10x10/items/puddles/sewage.json | 1 + 3 files changed, 2 insertions(+) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/caramel_apple.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/caramel_apple.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/caramel_apple.png new file mode 100644 index 0000000000000000000000000000000000000000..a32619b76e8956a95860c9d0abbc2d637eb7677c GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4WqGsR-t_#QL*n5ph6}ZwmQ9>{pee_G*X=X<1&g&>IOmxB z;7Xr8$M$r=u^TfO5BHvEGH_K(KY!?|p%OdyuB0a$QjQ2-kYMCv$P?G?b9-RO3$&HN M)78&qol`;+0MidTLI3~& literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/sandwiches/sandwich_egg_salad.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/sandwiches/sandwich_egg_salad.json index 8d742a1fff..40f1bb4e3b 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/food/sandwiches/sandwich_egg_salad.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/sandwiches/sandwich_egg_salad.json @@ -4,6 +4,7 @@ "sandwich_egg_salad_wheat_free", "fried_egg_sandwich", "fried_egg_sandwich_wheat_free", + "caviar_egg_sandwich", "deluxe_fried_egg_sandwich", "deluxe_fried_egg_sandwich_wheat_free" ], diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json index 1e7a4c4625..3df7e7e187 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json @@ -51,6 +51,7 @@ "wash_moonshine", "wash_whiskey", "choc_drink", + "milkshake_choc", "paint_brown" ], From fcedb0547e8c8c6e0b71477867be949e3bf461d2 Mon Sep 17 00:00:00 2001 From: Golfavel Date: Thu, 7 Dec 2023 20:03:53 -0700 Subject: [PATCH 04/10] connected: coconut water to water, chunk of lobster meat to fish, cholla bud to raw burdock --- gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json | 1 + .../items/food/vegetables/raw_burdock.json | 7 +++++++ gfx/NeoDays/pngs_tiles_10x10/items/puddles/water.json | 1 + 3 files changed, 9 insertions(+) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/raw_burdock.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json index b9a5a6a87d..f85b508506 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json @@ -5,6 +5,7 @@ "fried_spam", "meat_aspic", "hflesh_aspic", + "lobster", "sashimi" ], "fg": "fish" diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/raw_burdock.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/raw_burdock.json new file mode 100644 index 0000000000..9077c27ade --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/raw_burdock.json @@ -0,0 +1,7 @@ +{ + "id": [ + "raw_burdock", + "cholla_bud" + ], + "fg": "raw_burdock" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/water.json b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/water.json index b04c77c502..b81d2aeef8 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/water.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/water.json @@ -6,6 +6,7 @@ "saline", "salt_water", "sweet_water", + "coconut_water", "chem_DMSO", "chem_chloroform", "chem_phenol", From 5c232d0ef0d4aafac26754cc1835e09c349c8bc6 Mon Sep 17 00:00:00 2001 From: Golfavel Date: Thu, 7 Dec 2023 20:30:39 -0700 Subject: [PATCH 05/10] added: cooking banana, roasted cooking banana, cooked gastropod connected: cottage cheese to mayonnaise, cooked mollusk to cooked gastropod cleaned: cooked oatmeal --- .../items/food/fruit/plantain.png | Bin 0 -> 133 bytes .../items/food/fruit/plantain_cooked.png | Bin 0 -> 132 bytes .../items/food/meats/gastropod_cooked.json | 7 +++++++ .../items/food/meats/gastropod_cooked.png | Bin 0 -> 139 bytes .../items/food/oatmeal_cooked.json | 7 +++++++ .../oatmeal_cooked.png} | Bin .../pngs_tiles_10x10/items/mayonnaise.json | 3 ++- .../items/oatmeal_deluxe_oatmeal_cooked_0.json | 1 - 8 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/plantain.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/plantain_cooked.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/meats/gastropod_cooked.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/meats/gastropod_cooked.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/oatmeal_cooked.json rename gfx/NeoDays/pngs_tiles_10x10/items/{1083_oatmeal_deluxe_0.png => food/oatmeal_cooked.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/oatmeal_deluxe_oatmeal_cooked_0.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/plantain.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/plantain.png new file mode 100644 index 0000000000000000000000000000000000000000..b718954f0c88d7e6eb030973a7bfcd6396e45dac GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4`FOfGhDcnV+wUmEpuoX&@c6G4 zcHZ0BPFo#uJsz2;P<675$>D*U*6H9qcX-~(E@iPir5l&Wcbuf4d3(AzhDcnV+kcRcL4m{R;Qcqh z|M*#LO^j^c@#2m!+ePnf!VFC2Mz4eS+~IjAJC(tG@6pp|AKp;x|7^tP8M$0tC+c0w gM4JQ4gg-9kv{IF^DEm3%E6`X5Pgg&ebxsLQ0FyBf41$nwShDcmaPEZgsP}=zaaq!`e zH5pl(*t)vj>@5o`GrB68xq9TKBs3Z>Q_D6;Ils5@ ma)?{ayn|wW|2bO>nHgFbRQUcEX>J0V&fw|l=d#Wzp$Py}%`Pzj literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/oatmeal_cooked.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/oatmeal_cooked.json new file mode 100644 index 0000000000..0f9870e7de --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/oatmeal_cooked.json @@ -0,0 +1,7 @@ +{ + "id": [ + "oatmeal_cooked", + "oatmeal_deluxe" + ], + "fg": "oatmeal_cooked" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1083_oatmeal_deluxe_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/oatmeal_cooked.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/1083_oatmeal_deluxe_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/oatmeal_cooked.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json b/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json index 5a0574371f..62040d87b0 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json @@ -12,10 +12,11 @@ "salt", "meal_bone", "meal_bone_tainted", + "cottage_cheese", "starch", "sourdough_young_uncovered", "sourdough_split_uncovered", "mayonnaise" ], - "fg": ["mayonnaise"] + "fg": "mayonnaise" } diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/oatmeal_deluxe_oatmeal_cooked_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/oatmeal_deluxe_oatmeal_cooked_0.json deleted file mode 100644 index 834cb71caa..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/oatmeal_deluxe_oatmeal_cooked_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["oatmeal_deluxe", "oatmeal_cooked"], "fg": ["1083_oatmeal_deluxe_0"], "rotates": false, "bg": []} \ No newline at end of file From 58f68bacbcb16dc45af9491b478941855e4c76a8 Mon Sep 17 00:00:00 2001 From: Golfavel Date: Thu, 7 Dec 2023 20:50:41 -0700 Subject: [PATCH 06/10] added: garlic clove, dehydrated garlic clove connected: rehydrated garlic clove to garlic clove, garlic powder to crack, dehydrated corn to canned corn, dehydrated chili pepper to dry meat, rehydrated chili pepper to chilly powder --- .../items/food/vegetables/dry_garlic.png | Bin 0 -> 114 bytes .../items/food/vegetables/garlic_clove.json | 7 +++++++ .../items/food/vegetables/garlic_clove.png | Bin 0 -> 114 bytes .../pngs_tiles_10x10/items/piles/can_corn.json | 1 + .../pngs_tiles_10x10/items/piles/chilly-p.json | 1 + .../pngs_tiles_10x10/items/piles/crack.json | 1 + .../pngs_tiles_10x10/items/piles/dry_meat.json | 1 + 7 files changed, 11 insertions(+) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/dry_garlic.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/garlic_clove.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/garlic_clove.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/dry_garlic.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/dry_garlic.png new file mode 100644 index 0000000000000000000000000000000000000000..f1f4cf5e9aeb09fdb6c04b2d098d51c48cbbee71 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4S$euShDcmaPLMD-(Bb^YewUP5 zOqX8nOGm*Y%LJSS&07B#?wrUuduo-PYK84*`I}xUM|&i=KDKf(Obiv!{U-C{GtdwQ MPgg&ebxsLQ0K5Ssga7~l literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/garlic_clove.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/garlic_clove.json new file mode 100644 index 0000000000..d1bb6887df --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/garlic_clove.json @@ -0,0 +1,7 @@ +{ + "id": [ + "garlic_clove", + "rehydrated_garlic" + ], + "fg": "garlic_clove" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/garlic_clove.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/garlic_clove.png new file mode 100644 index 0000000000000000000000000000000000000000..015c5e28934bfdc26f55af0d55978e4f149393c8 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4S$euShDcmKdcly7!GMFw;o<-K zWvjP7h;lC$-1;h7@rx<1@T3yc%;UUI7F_BpnaFT0`HHgiG3M>-Wdu8fn7_YCT?I6R N!PC{xWt~$(695U?B{l#6 literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json index 08343d497c..74540065a4 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json @@ -14,6 +14,7 @@ "corn_kernels", "hot_corn_casserole", "pan_roasted_corn", + "dry_corn", "grits" ], "fg": "can_corn" diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/chilly-p.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/chilly-p.json index dadc805047..5ea34caef2 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/piles/chilly-p.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/piles/chilly-p.json @@ -6,6 +6,7 @@ "meat_salted", "hflesh_salted", "red_phosphorous", + "rehydrated_chili", "blood_rice_pudding" ], "fg": "chilly-p" diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/crack.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/crack.json index 62332c22aa..ca2be45e0a 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/piles/crack.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/piles/crack.json @@ -16,6 +16,7 @@ "chem_lead_azide", "popcorn_raw", "buttercream", + "garlic_powder", "wild_rice_cooked" ], "fg": "crack" diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/dry_meat.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/dry_meat.json index 0bbb20492e..6e69e078b0 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/piles/dry_meat.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/piles/dry_meat.json @@ -4,6 +4,7 @@ "iskender", "cooked_marrow", "pepperbone", + "dry_chili", "dry_hflesh" ], "fg": "dry_meat" From c6b8fe880d8549155140f08d2df19e63500c8d7a Mon Sep 17 00:00:00 2001 From: Golfavel Date: Thu, 7 Dec 2023 21:15:25 -0700 Subject: [PATCH 07/10] connected: diet pill to panacea; dry wild rice to canned clams; milkshake and deluxe milkshake to milk; deluxe chocolate milkshake to sewage --- gfx/NeoDays/pngs_tiles_10x10/items/panacea.json | 7 +++++++ .../items/{1115_panacea_0.png => panacea.png} | Bin gfx/NeoDays/pngs_tiles_10x10/items/panacea_0.json | 1 - .../pngs_tiles_10x10/items/piles/can_clams.json | 1 + .../pngs_tiles_10x10/items/puddles/milk.json | 2 ++ .../pngs_tiles_10x10/items/puddles/sewage.json | 1 + 6 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/panacea.json rename gfx/NeoDays/pngs_tiles_10x10/items/{1115_panacea_0.png => panacea.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/panacea_0.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/panacea.json b/gfx/NeoDays/pngs_tiles_10x10/items/panacea.json new file mode 100644 index 0000000000..f9b5a8c340 --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/panacea.json @@ -0,0 +1,7 @@ +{ + "id": [ + "panacea", + "testcomest" + ], + "fg": "panacea" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1115_panacea_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/panacea.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/1115_panacea_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/panacea.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/panacea_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/panacea_0.json deleted file mode 100644 index c9c9fea1ff..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/panacea_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": "panacea", "fg": ["1115_panacea_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json index 2a2c4aa258..df1ebe46bd 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json @@ -5,6 +5,7 @@ "rehydrated_fish", "milk_powder", "dry_rice", + "dry_wild_rice", "rice_cooked", "beansnrice", "yeast", diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/milk.json b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/milk.json index 5d10537d3f..0325848adf 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/milk.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/milk.json @@ -8,6 +8,8 @@ "eggnog_spiked", "ayran", "paint_white", + "milkshake", + "milkshake_deluxe", "liq_bandage" ], "fg": "milk" diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json index 3df7e7e187..4d8be8015a 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json @@ -52,6 +52,7 @@ "wash_whiskey", "choc_drink", "milkshake_choc", + "milkshake_deluxe_choc", "paint_brown" ], From 68c4ee14caf01395c366244e676252744b70ea60 Mon Sep 17 00:00:00 2001 From: Golfavel Date: Sun, 10 Dec 2023 19:05:49 -0700 Subject: [PATCH 08/10] added: pineapple chunks, honeydew, empty corn cob, young leaves connected: fortified milk cleaned: fried sugar --- .../items/food/fruit/pineapple_chunks.png | Bin 0 -> 143 bytes .../pngs_tiles_10x10/items/food/honeydew.png | Bin 0 -> 130 bytes .../items/food/vegetables/empty_corn_cob.png | Bin 0 -> 122 bytes .../items/food/vegetables/young_leaves.png | Bin 0 -> 127 bytes .../pngs_tiles_10x10/items/puddles/milk.json | 1 + .../{948_sugar_fried_0.png => sugar_fried.png} | Bin .../pngs_tiles_10x10/items/sugar_fried_0.json | 1 - 7 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/pineapple_chunks.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/honeydew.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/empty_corn_cob.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.png rename gfx/NeoDays/pngs_tiles_10x10/items/{948_sugar_fried_0.png => sugar_fried.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/sugar_fried_0.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/pineapple_chunks.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/pineapple_chunks.png new file mode 100644 index 0000000000000000000000000000000000000000..aad1b9e25228be0b2596b98eeb9bbf21667b5670 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4g?YL-hDcoQ4LHfk;K<>T-Y>8;rb_XAJd`4>_D|1X1{hr)}S0y|#=ZD8bP0l+XkK@2oP= literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/honeydew.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/honeydew.png new file mode 100644 index 0000000000000000000000000000000000000000..3542a1cc2c5413a097a754e7a2181014abf699f6 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4d3w4yhDcoQoe;>ypupjrKK-rF zys}!6#BC}E`%fnOHJ&#zT%6>?_{H_h?FkGX^JPo#DKv6y(_V1hUAE8Z{e&}lKLxb! deX5F&WzKxA=e{WQ-6f!*44$rjF6*2UngE%PEdl@l literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/empty_corn_cob.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/empty_corn_cob.png new file mode 100644 index 0000000000000000000000000000000000000000..7f8902f01975f7dd060645dc0e8fea747e1e1d11 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4IeNM{hDcmaPEZgscqH(@e_bEv z^hN*wryKqGZ!fHOqQzU#D&f%bj){h{hkJjB7#`wi>Ut0+9MtkqGNvnFjhe_dhF^Ws VHkBp9p+LhJJYD@<);T3K0RVgfC{zFd literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.png new file mode 100644 index 0000000000000000000000000000000000000000..7b4060a002fe629011dc4be79f694c494dc2257a GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4xp}%chDcoQ4G0utP+*Z}FOv|z z*54&JRsM`bgTM0kYY$ihZ7x+Qt Date: Sun, 10 Dec 2023 19:42:09 -0700 Subject: [PATCH 09/10] added: passionfruit connected: lulo to orange; mascarpone and mozzarella cheese to mayonnaise; mustard powder to canned corn; hot sauce and marsala to tomato soup --- .../items/food/fruit/maracuya.png | Bin 0 -> 144 bytes .../items/food/fruit/orange.json | 1 + .../pngs_tiles_10x10/items/food/taco.json | 9 +++++ .../{1082_tiotaco_0.png => food/taco.png} | Bin .../items/food/vegetables/zucchini.json | 1 + .../pngs_tiles_10x10/items/mayonnaise.json | 34 +++++++++--------- .../items/piles/can_corn.json | 1 + .../items/puddles/soup_tomato.json | 2 ++ .../tiotaco_quesadilla_cheese_taco_0.json | 1 - 9 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/maracuya.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/taco.json rename gfx/NeoDays/pngs_tiles_10x10/items/{1082_tiotaco_0.png => food/taco.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tiotaco_quesadilla_cheese_taco_0.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/maracuya.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/maracuya.png new file mode 100644 index 0000000000000000000000000000000000000000..b53e9eea135b9d95daac2efe9eacd487baf3d299 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4g?qX=L^m!N|v;+@sEEt6QfIw1UCY)z4*}Q$iB}iI*?+ literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/orange.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/orange.json index c24d77e0fb..0ffc36b1c6 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/orange.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/orange.json @@ -1,6 +1,7 @@ { "id": [ "orange", + "lulo", "irradiated_orange" ], "fg": "orange" diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/taco.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/taco.json new file mode 100644 index 0000000000..6100312136 --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/taco.json @@ -0,0 +1,9 @@ +{ + "id": [ + "taco", + "ndn_taco", + "tiotaco", + "quesadilla_cheese" + ], + "fg": "taco" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1082_tiotaco_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/taco.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/1082_tiotaco_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/food/taco.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/zucchini.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/zucchini.json index 25003c0ccc..6943836f76 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/zucchini.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/zucchini.json @@ -5,6 +5,7 @@ "cucumber", "irradiated_cucumber", "cattail_stalk", + "japanese_knotweed_stem", "stick_fiber", "pickle" ], diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json b/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json index 62040d87b0..4aac0cf97f 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json @@ -1,22 +1,24 @@ { "id": [ + "mayonnaise", "can_coconut", - "yoghurt", - "pudding", - "can_chicken", - "horseradish", - "con_milk", - "flour", - "flour_wheat_free", - "sugar", - "salt", - "meal_bone", - "meal_bone_tainted", - "cottage_cheese", - "starch", - "sourdough_young_uncovered", - "sourdough_split_uncovered", - "mayonnaise" + "yoghurt", + "pudding", + "can_chicken", + "horseradish", + "con_milk", + "flour", + "flour_wheat_free", + "sugar", + "salt", + "meal_bone", + "meal_bone_tainted", + "cottage_cheese", + "mascarpone", + "mozzarella_cheese", + "starch", + "sourdough_young_uncovered", + "sourdough_split_uncovered" ], "fg": "mayonnaise" } diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json index 74540065a4..65e6031052 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json @@ -15,6 +15,7 @@ "hot_corn_casserole", "pan_roasted_corn", "dry_corn", + "mustard_powder", "grits" ], "fg": "can_corn" diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/soup_tomato.json b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/soup_tomato.json index a14d84c3e7..0ea22d7850 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/soup_tomato.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/soup_tomato.json @@ -16,6 +16,8 @@ "oxyacetylene", "tomato_juice", "red_pen_ink", + "hot_sauce", + "wine_marsala", "paint_red" ], "fg": "soup_tomato" diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tiotaco_quesadilla_cheese_taco_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/tiotaco_quesadilla_cheese_taco_0.json deleted file mode 100644 index 7c9b6a744d..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/tiotaco_quesadilla_cheese_taco_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["tiotaco", "quesadilla_cheese", "taco"], "fg": ["1082_tiotaco_0"], "rotates": false, "bg": []} \ No newline at end of file From ec4240105e870461ccd96b75b498b13e3fd489ba Mon Sep 17 00:00:00 2001 From: Golfavel Date: Sun, 10 Dec 2023 19:48:55 -0700 Subject: [PATCH 10/10] connected: pile of wintergreen leaves, black tea leaves, grape leaves, green tea leaves, and italian seasoning to pile of young leaves cleaned: pesto --- .../items/food/vegetables/young_leaves.json | 11 +++++++++++ gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto.json | 7 +++++++ .../{952_sauce_pesto_0.png => sauce_pesto.png} | Bin ...esto_seasoning_italian_tea_raw_fertilizer_0.json | 1 - 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto.json rename gfx/NeoDays/pngs_tiles_10x10/items/{952_sauce_pesto_0.png => sauce_pesto.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto_seasoning_italian_tea_raw_fertilizer_0.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.json new file mode 100644 index 0000000000..8dea9231c7 --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.json @@ -0,0 +1,11 @@ +{ + "id": [ + "young_leaves", + "wintergreen_leaves", + "tea_raw", + "tea_green_raw", + "grape_leaves", + "seasoning_italian" + ], + "fg": "young_leaves" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto.json b/gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto.json new file mode 100644 index 0000000000..1bc90052eb --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto.json @@ -0,0 +1,7 @@ +{ + "id": [ + "sauce_pesto", + "fertilizer" + ], + "fg": "sauce_pesto" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/952_sauce_pesto_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/952_sauce_pesto_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto_seasoning_italian_tea_raw_fertilizer_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto_seasoning_italian_tea_raw_fertilizer_0.json deleted file mode 100644 index 5ecb0c3ad9..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto_seasoning_italian_tea_raw_fertilizer_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["sauce_pesto", "seasoning_italian", "tea_raw", "fertilizer"], "fg": ["952_sauce_pesto_0"], "rotates": false, "bg": []} \ No newline at end of file