From 5396da476242b61dbc5398a102654c844bfe3b8d Mon Sep 17 00:00:00 2001 From: Andrew Rosa Date: Thu, 5 Dec 2024 21:24:41 -0300 Subject: [PATCH] [NeoDays] fix some wielded gun ids With the addition of modular AR-15 and M4 rifles, the IDs got changed but not updatd here, resulting in missing sprites when wielding those guns. I'm not too familiar with this repo, but AFAICT this fix the issue - I was able to generate the tileset and load on a local build of CDDA. This fix may not be exhaustive - i.e. there may be further guns with old IDs. --- ...1_overlay_male_wielded_modular_m4_carbine_0.png} | Bin ...> 3372_overlay_male_wielded_modular_m16a4_0.png} | Bin ...overlay_female_wielded_modular_m4_carbine_0.png} | Bin ...3460_overlay_female_wielded_modular_m16a4_0.png} | Bin .../wielded/overlay_female_wielded_m16a4_0.json | 1 - ...lded_m4a1_overlay_female_wielded_h&k416a5_0.json | 1 - ....png => overlay_female_wielded_modular_ar15.png} | Bin .../overlay_female_wielded_modular_m16a4_0.json | 1 + ...4_carbine_overlay_female_wielded_h&k416a5_0.json | 1 + .../wielded/overlay_male_wielded_m16a4_0.json | 1 - ...ielded_m4a1_overlay_male_wielded_h&k416a5_0.json | 1 - ...15.png => overlay_male_wielded_modular_ar15.png} | Bin .../overlay_male_wielded_modular_m16a4_0.json | 1 + ..._m4_carbine_overlay_male_wielded_h&k416a5_0.json | 1 + 14 files changed, 4 insertions(+), 4 deletions(-) rename gfx/NeoDays/pngs_large_20x20/wielded/{3371_overlay_male_wielded_m4a1_0.png => 3371_overlay_male_wielded_modular_m4_carbine_0.png} (100%) rename gfx/NeoDays/pngs_large_20x20/wielded/{3372_overlay_male_wielded_m16a4_0.png => 3372_overlay_male_wielded_modular_m16a4_0.png} (100%) rename gfx/NeoDays/pngs_large_20x20/wielded/{3459_overlay_female_wielded_m4a1_0.png => 3459_overlay_female_wielded_modular_m4_carbine_0.png} (100%) rename gfx/NeoDays/pngs_large_20x20/wielded/{3460_overlay_female_wielded_m16a4_0.png => 3460_overlay_female_wielded_modular_m16a4_0.png} (100%) delete mode 100644 gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m16a4_0.json delete mode 100644 gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m4a1_overlay_female_wielded_h&k416a5_0.json rename gfx/NeoDays/pngs_large_20x20/wielded/{overlay_female_wielded_ar15.png => overlay_female_wielded_modular_ar15.png} (100%) create mode 100644 gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m16a4_0.json create mode 100644 gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m4_carbine_overlay_female_wielded_h&k416a5_0.json delete mode 100644 gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m16a4_0.json delete mode 100644 gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m4a1_overlay_male_wielded_h&k416a5_0.json rename gfx/NeoDays/pngs_large_20x20/wielded/{overlay_male_wielded_ar15.png => overlay_male_wielded_modular_ar15.png} (100%) create mode 100644 gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m16a4_0.json create mode 100644 gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m4_carbine_overlay_male_wielded_h&k416a5_0.json diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/3371_overlay_male_wielded_m4a1_0.png b/gfx/NeoDays/pngs_large_20x20/wielded/3371_overlay_male_wielded_modular_m4_carbine_0.png similarity index 100% rename from gfx/NeoDays/pngs_large_20x20/wielded/3371_overlay_male_wielded_m4a1_0.png rename to gfx/NeoDays/pngs_large_20x20/wielded/3371_overlay_male_wielded_modular_m4_carbine_0.png diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/3372_overlay_male_wielded_m16a4_0.png b/gfx/NeoDays/pngs_large_20x20/wielded/3372_overlay_male_wielded_modular_m16a4_0.png similarity index 100% rename from gfx/NeoDays/pngs_large_20x20/wielded/3372_overlay_male_wielded_m16a4_0.png rename to gfx/NeoDays/pngs_large_20x20/wielded/3372_overlay_male_wielded_modular_m16a4_0.png diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/3459_overlay_female_wielded_m4a1_0.png b/gfx/NeoDays/pngs_large_20x20/wielded/3459_overlay_female_wielded_modular_m4_carbine_0.png similarity index 100% rename from gfx/NeoDays/pngs_large_20x20/wielded/3459_overlay_female_wielded_m4a1_0.png rename to gfx/NeoDays/pngs_large_20x20/wielded/3459_overlay_female_wielded_modular_m4_carbine_0.png diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/3460_overlay_female_wielded_m16a4_0.png b/gfx/NeoDays/pngs_large_20x20/wielded/3460_overlay_female_wielded_modular_m16a4_0.png similarity index 100% rename from gfx/NeoDays/pngs_large_20x20/wielded/3460_overlay_female_wielded_m16a4_0.png rename to gfx/NeoDays/pngs_large_20x20/wielded/3460_overlay_female_wielded_modular_m16a4_0.png diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m16a4_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m16a4_0.json deleted file mode 100644 index 5af4fb958a..0000000000 --- a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m16a4_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["overlay_female_wielded_m16a4", "overlay_female_wielded_colt_ro635"], "fg": ["3460_overlay_female_wielded_m16a4_0"], "rotates": false, "bg": []} diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m4a1_overlay_female_wielded_h&k416a5_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m4a1_overlay_female_wielded_h&k416a5_0.json deleted file mode 100644 index f795061a5c..0000000000 --- a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m4a1_overlay_female_wielded_h&k416a5_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["overlay_female_wielded_m4a1", "overlay_female_wielded_h&k416a5"], "fg": ["3459_overlay_female_wielded_m4a1_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_ar15.png b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_ar15.png similarity index 100% rename from gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_ar15.png rename to gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_ar15.png diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m16a4_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m16a4_0.json new file mode 100644 index 0000000000..5ebdff71f9 --- /dev/null +++ b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m16a4_0.json @@ -0,0 +1 @@ +{"id": ["overlay_female_wielded_modular_m16a4", "overlay_female_wielded_colt_ro635"], "fg": ["3460_overlay_female_wielded_modular_m16a4_0"], "rotates": false, "bg": []} diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m4_carbine_overlay_female_wielded_h&k416a5_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m4_carbine_overlay_female_wielded_h&k416a5_0.json new file mode 100644 index 0000000000..3d19647825 --- /dev/null +++ b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m4_carbine_overlay_female_wielded_h&k416a5_0.json @@ -0,0 +1 @@ +{"id": ["overlay_female_wielded_modular_m4_carbine", "overlay_female_wielded_h&k416a5"], "fg": ["3459_overlay_female_wielded_modular_m4_carbine_0"], "rotates": false, "bg": []} diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m16a4_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m16a4_0.json deleted file mode 100644 index 26e1aa9729..0000000000 --- a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m16a4_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["overlay_male_wielded_m16a4", "overlay_male_wielded_colt_ro635"], "fg": ["3372_overlay_male_wielded_m16a4_0"], "rotates": false, "bg": []} diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m4a1_overlay_male_wielded_h&k416a5_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m4a1_overlay_male_wielded_h&k416a5_0.json deleted file mode 100644 index 56b758790b..0000000000 --- a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m4a1_overlay_male_wielded_h&k416a5_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["overlay_male_wielded_m4a1", "overlay_male_wielded_h&k416a5"], "fg": ["3371_overlay_male_wielded_m4a1_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_ar15.png b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_ar15.png similarity index 100% rename from gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_ar15.png rename to gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_ar15.png diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m16a4_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m16a4_0.json new file mode 100644 index 0000000000..e3fb57d775 --- /dev/null +++ b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m16a4_0.json @@ -0,0 +1 @@ +{"id": ["overlay_male_wielded_modular_m16a4", "overlay_male_wielded_colt_ro635"], "fg": ["3372_overlay_male_wielded_modular_m16a4_0"], "rotates": false, "bg": []} diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m4_carbine_overlay_male_wielded_h&k416a5_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m4_carbine_overlay_male_wielded_h&k416a5_0.json new file mode 100644 index 0000000000..746cfa0c0a --- /dev/null +++ b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m4_carbine_overlay_male_wielded_h&k416a5_0.json @@ -0,0 +1 @@ +{"id": ["overlay_male_wielded_modular_m4_carbine", "overlay_male_wielded_h&k416a5"], "fg": ["3371_overlay_male_wielded_modular_m4_carbine_0"], "rotates": false, "bg": []}