From 78ef9199873183cb670925e550453a2fad5e735c Mon Sep 17 00:00:00 2001
From: henriquejsza <henriquejsza@gmail.com>
Date: Sat, 22 Aug 2026 06:30:31 -0300
Subject: [PATCH] Avoid contradictory shield material names

---
 dat/Val-strt.lua      | 2 +-
 include/objects.h     | 6 +++---
 win/share/objects.txt | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dat/Val-strt.lua b/dat/Val-strt.lua
index 13dfccdcb5..2b861a722b 100644
--- a/dat/Val-strt.lua
+++ b/dat/Val-strt.lua
@@ -95,7 +95,7 @@ end})
 des.object({ id="spear", coord={39,04}, spe=d(3) })
 des.object(")", 39, 05)
 des.object(")", 39, 06)
-des.object({ id="small shield", coord={41,04}, spe=3 })
+des.object({ id="buckler", coord={41,04}, spe=3 })
 des.object("[", 41, 05)
 des.object("[", 41, 06)
 -- Valkyrie guards posted outside
diff --git a/include/objects.h b/include/objects.h
index 482abbfead..eb6865dd61 100644
--- a/include/objects.h
+++ b/include/objects.h
@@ -568,13 +568,13 @@ CLOAK("cloak of displacement", "dusty cloak",
                                                         CLOAK_OF_DISPLACEMENT),
 
 /* shields */
-SHIELD("small shield", "wooden shield",
+SHIELD("buckler", "small shield",
        0, 0, 0,          0,  6, 0,  30,  3, 9, 0,  WOOD, HI_WOOD,
                                                         SMALL_SHIELD),
-SHIELD("shield of drain resistance", "wooden shield",
+SHIELD("shield of drain resistance", "small shield",
        0, 1, 0,  DRAIN_RES, 12, 0,  30, 50, 9, 0,  WOOD, HI_WOOD,
                                                   SHIELD_OF_DRAIN_RESISTANCE),
-SHIELD("shield of shock resistance", "wooden shield",
+SHIELD("shield of shock resistance", "small shield",
        0, 1, 0,  SHOCK_RES, 12, 0,  30, 50, 9, 0,  WOOD, HI_WOOD,
                                                   SHIELD_OF_SHOCK_RESISTANCE),
 SHIELD("elven shield", "blue and green shield",
diff --git a/win/share/objects.txt b/win/share/objects.txt
index f2cf420a95..0b0f3b314a 100644
--- a/win/share/objects.txt
+++ b/win/share/objects.txt
@@ -2463,7 +2463,7 @@ Z = (195, 195, 195)
   .....PPPPPAA....
   .......PPAA.....
 }
-# tile 127 (wooden shield / small shield)
+# tile 127 (small shield / buckler)
 {
   ................
   ................
@@ -2482,7 +2482,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 128 (wooden shield / shield of drain resistance)
+# tile 128 (small shield / shield of drain resistance)
 {
   ................
   ................
@@ -2501,7 +2501,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 129 (wooden shield / shield of shock resistance)
+# tile 129 (small shield / shield of shock resistance)
 {
   ................
   ................