Skip to content

Avoid contradictory shield material names #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
henriquejsza wants to merge 1 commit into from
Closed

Avoid contradictory shield material names #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dat/Val-strt.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions win/share/objects.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2463,7 +2463,7 @@ Z = (195, 195, 195)
.....PPPPPAA....
.......PPAA.....
}
# tile 127 (wooden shield / small shield)
# tile 127 (small shield / buckler)
{
................
................
Expand All @@ -2482,7 +2482,7 @@ Z = (195, 195, 195)
................
................
}
# tile 128 (wooden shield / shield of drain resistance)
# tile 128 (small shield / shield of drain resistance)
{
................
................
Expand All @@ -2501,7 +2501,7 @@ Z = (195, 195, 195)
................
................
}
# tile 129 (wooden shield / shield of shock resistance)
# tile 129 (small shield / shield of shock resistance)
{
................
................
Expand Down