From 5c6a03080110f0cf0108df9b7d57d639df6ceaba Mon Sep 17 00:00:00 2001 From: silvernexus Date: Fri, 13 Jun 2014 21:23:45 +0000 Subject: [PATCH] Hyphenate names of several swords with numbers in the name. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@19558 282e977c-c81d-0410-88c4-b93c2d0d6712 --- ChangeLog | 6 ++++++ weapon/sword/nineringsword.arc | 4 ++-- weapon/sword/sword_3.arc | 4 ++-- weapon/sword/vlongsword.arc | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bd72e54d..9b8e68504 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-06-13 SilverNexus + * weapon/sword/sword_3.arc, + * weapon/sword/nineringsword.arc, + * weapon/sword/vlongsword.arc: Hyphenate names for better clarity. + Before, two two-handed swords in your inventory would read "two two handed swords". + 2014-05-27 SilverNexus * jewel/bars/brassbar.*: Create brass bar, which can be smelted from copper and zinc. diff --git a/weapon/sword/nineringsword.arc b/weapon/sword/nineringsword.arc index fb9db3bd2..0e8531ec8 100644 --- a/weapon/sword/nineringsword.arc +++ b/weapon/sword/nineringsword.arc @@ -9,8 +9,8 @@ weight 16000 value 65 attacktype 1 weapontype 1 -name nine ring sword -name_pl nine ring swords +name nine-ring sword +name_pl nine-ring swords client_type 101 body_arm -1 skill one handed weapons diff --git a/weapon/sword/sword_3.arc b/weapon/sword/sword_3.arc index d3dcadb4f..2a0c094fb 100644 --- a/weapon/sword/sword_3.arc +++ b/weapon/sword/sword_3.arc @@ -1,7 +1,7 @@ Object sword_3 nrof 1 -name two handed sword -name_pl two handed swords +name two-handed sword +name_pl two-handed swords anim_suffix double_sword last_sp 8 type 15 diff --git a/weapon/sword/vlongsword.arc b/weapon/sword/vlongsword.arc index d821e4986..f7b260044 100644 --- a/weapon/sword/vlongsword.arc +++ b/weapon/sword/vlongsword.arc @@ -1,7 +1,7 @@ Object vlongsword nrof 1 -name two handed sword -name_pl two handed swords +name two-handed sword +name_pl two-handed swords anim_suffix double_sword last_sp 8 type 15