[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.
I-am-Erk · Dec 10, 2024 · 5396da4 · 5396da4
1 parent 6810d70
commit 5396da4
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 4 deletions.
diff --git a/...lded/3371_overlay_male_wielded_m4a1_0.png → ...lay_male_wielded_modular_m4_carbine_0.png b/...lded/3371_overlay_male_wielded_m4a1_0.png → ...lay_male_wielded_modular_m4_carbine_0.png
diff --git a/...ded/3372_overlay_male_wielded_m16a4_0.png → ..._overlay_male_wielded_modular_m16a4_0.png b/...ded/3372_overlay_male_wielded_m16a4_0.png → ..._overlay_male_wielded_modular_m16a4_0.png
diff --git a/...ed/3459_overlay_female_wielded_m4a1_0.png → ...y_female_wielded_modular_m4_carbine_0.png b/...ed/3459_overlay_female_wielded_m4a1_0.png → ...y_female_wielded_modular_m4_carbine_0.png
diff --git a/...d/3460_overlay_female_wielded_m16a4_0.png → ...verlay_female_wielded_modular_m16a4_0.png b/...d/3460_overlay_female_wielded_m16a4_0.png → ...verlay_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
diff --git a/...gs_large_20x20/wielded/overlay_female_wielded_m4a1_overlay_female_wielded_h&k416a5_0.json b/...gs_large_20x20/wielded/overlay_female_wielded_m4a1_overlay_female_wielded_h&k416a5_0.json
diff --git a/...0/wielded/overlay_female_wielded_ar15.png → ...d/overlay_female_wielded_modular_ar15.png b/...0/wielded/overlay_female_wielded_ar15.png → ...d/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
@@ -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/.../wielded/overlay_female_wielded_modular_m4_carbine_overlay_female_wielded_h&k416a5_0.json b/.../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
diff --git a/...s/pngs_large_20x20/wielded/overlay_male_wielded_m4a1_overlay_male_wielded_h&k416a5_0.json b/...s/pngs_large_20x20/wielded/overlay_male_wielded_m4a1_overlay_male_wielded_h&k416a5_0.json
diff --git a/...x20/wielded/overlay_male_wielded_ar15.png → ...ded/overlay_male_wielded_modular_ar15.png b/...x20/wielded/overlay_male_wielded_ar15.png → ...ded/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
@@ -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/...0x20/wielded/overlay_male_wielded_modular_m4_carbine_overlay_male_wielded_h&k416a5_0.json b/...0x20/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": []}
Original file line number	Diff line number	Diff line change
		@@ -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": []}
Original file line number	Diff line number	Diff line change
		@@ -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": []}
Original file line number	Diff line number	Diff line change
		@@ -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": []}