diff options
author | dploog <dploog@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-16 20:38:06 +0000 |
---|---|---|
committer | dploog <dploog@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-16 20:38:06 +0000 |
commit | 5c668a7bbb507efe5e8663c905235d9644fdacab (patch) | |
tree | 4685930ce8c14e6fba25b77c41f09f859b516315 /crawl-ref/source | |
parent | 661f576c2ca7241737d9eecbeb0d69481928dbc2 (diff) | |
download | crawl-ref-5c668a7bbb507efe5e8663c905235d9644fdacab.tar.gz crawl-ref-5c668a7bbb507efe5e8663c905235d9644fdacab.zip |
Fix BR 1959133 (Shiori): change Ancus to Ankus.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5085 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/dat/descript/items.txt | 7 | ||||
-rw-r--r-- | crawl-ref/source/itemprop.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/itemprop.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/makeitem.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/newgame.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-item.txt | 2 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/item/weapon/ankus.bmp (renamed from crawl-ref/source/rltiles/item/weapon/ancus.bmp) | bin | 2102 -> 2102 bytes | |||
-rw-r--r-- | crawl-ref/source/shopping.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spells4.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/tile1.cc | 8 |
10 files changed, 20 insertions, 17 deletions
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt index d582e69f06..47ada3e779 100644 --- a/crawl-ref/source/dat/descript/items.txt +++ b/crawl-ref/source/dat/descript/items.txt @@ -64,9 +64,12 @@ This amulet repels some of the attacks of creatures which have been magically summoned, and also makes the wearer more resistant to draining attacks. %%%% -ancus +ankus -A large and vicious toothed club. +What mahouts steer their elephants with. It basically resembles a +fireplace poker with a short, stout handle, and a bluntish spike and +hook for communicating one's desires through the pachyderm's thick +skin. Curiously enough, Ogres are famous for driving larger elephants. %%%% animal skin diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index c9d7c335b2..df1db13883 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -193,7 +193,7 @@ static weapon_def Weapon_prop[NUM_WEAPONS] = { WPN_FLAIL, "flail", 9, 2, 15, 130, 8, SK_MACES_FLAILS, HANDS_ONE, SIZE_SMALL, MI_NONE, false, DAMV_CRUSHING, 10 }, - { WPN_ANCUS, "ancus", 9, 2, 14, 120, 8, + { WPN_ANKUS, "ankus", 9, 2, 14, 120, 8, SK_MACES_FLAILS, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, DAMV_CRUSHING, 10 }, { WPN_MORNINGSTAR, "morningstar", 10, -1, 15, 140, 8, @@ -759,7 +759,7 @@ void set_equip_race( item_def &item, unsigned long flags ) && item.sub_type != WPN_FALCHION) || item.sub_type == WPN_QUICK_BLADE || item.sub_type == WPN_CLUB - || item.sub_type == WPN_ANCUS + || item.sub_type == WPN_ANKUS || item.sub_type == WPN_WHIP || item.sub_type == WPN_BLOWGUN || item.sub_type == WPN_BOW @@ -1437,7 +1437,7 @@ int weapon_rarity( int w_type ) case WPN_GREAT_MACE: return (3); - case WPN_ANCUS: + case WPN_ANKUS: case WPN_DIRE_FLAIL: case WPN_SCYTHE: case WPN_LONGBOW: diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index 7fee9e4710..59e89f67ef 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -449,7 +449,7 @@ enum weapon_type WPN_DOUBLE_SWORD, WPN_TRIPLE_SWORD, WPN_HAMMER, - WPN_ANCUS, + WPN_ANKUS, WPN_WHIP, // 30 WPN_SABRE, WPN_DEMON_BLADE, diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 64a96c12e1..2fb3aa20db 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -136,7 +136,7 @@ static int _classic_weapon_colour(const item_def &item) case WPN_CLUB: case WPN_GIANT_CLUB: case WPN_GIANT_SPIKED_CLUB: - case WPN_ANCUS: + case WPN_ANKUS: case WPN_WHIP: case WPN_QUARTERSTAFF: item_colour = BROWN; @@ -1019,7 +1019,7 @@ static item_status_flag_type _determine_weapon_race(const item_def& item, rc = ISFLAG_DWARVEN; break; - case WPN_ANCUS: + case WPN_ANKUS: if (one_chance_in(4)) rc = ISFLAG_ORCISH; break; diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 07880814c4..0a76870f77 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -3630,7 +3630,7 @@ bool _give_items_skills() _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ANIMAL_SKIN); if (you.species == SP_OGRE) - _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_ANCUS); + _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_ANKUS); else if (you.species == SP_TROLL) _newgame_clear_item(0); } @@ -4031,7 +4031,7 @@ bool _give_items_skills() // WEAPONS if (you.species == SP_OGRE) - _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_ANCUS); + _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_ANKUS); else if (you.species == SP_TROLL) you.equip[EQ_WEAPON] = -1; else diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index b296a26574..fd2cb2378a 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -43,7 +43,7 @@ eveningstar WPN_EVENINGSTAR eveningstar2 WPN_EVENINGSTAR2
hammer WPN_HAMMER
hammer2 WPN_HAMMER2
-ancus WPN_ANCUS/* D9H1S14 A large and vicious toothed club.
+ankus WPN_ANKUS/* D9H1S14 A large and vicious toothed club.
bullwhip WPN_WHIP/* D3H1S14 A whip.
demon_whip WPN_DEMON_WHIP/* D10H1S14 A terrible weapon, woven in the depths of the inferno.
giant_club WPN_GIANT_CLUB/* D15H-5S16 A giant lump of wood, shaped for an ogre's hands.
diff --git a/crawl-ref/source/rltiles/item/weapon/ancus.bmp b/crawl-ref/source/rltiles/item/weapon/ankus.bmp Binary files differindex 977deba6d9..977deba6d9 100644 --- a/crawl-ref/source/rltiles/item/weapon/ancus.bmp +++ b/crawl-ref/source/rltiles/item/weapon/ankus.bmp diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index 30cd1885d1..631cace5ca 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -574,7 +574,7 @@ unsigned int item_value( item_def item, bool ident ) valued += 35; break; - case WPN_ANCUS: + case WPN_ANKUS: case WPN_WAR_AXE: case WPN_MORNINGSTAR: case WPN_SABRE: diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 69d1ec0a97..8b914ad0fe 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -526,7 +526,7 @@ void cast_sticks_to_snakes(int pow) || you.inv[ weapon ].sub_type == WPN_GIANT_SPIKED_CLUB || you.inv[ weapon ].sub_type == WPN_BOW || you.inv[ weapon ].sub_type == WPN_LONGBOW - || you.inv[ weapon ].sub_type == WPN_ANCUS + || you.inv[ weapon ].sub_type == WPN_ANKUS || you.inv[ weapon ].sub_type == WPN_HALBERD || you.inv[ weapon ].sub_type == WPN_GLAIVE || you.inv[ weapon ].sub_type == WPN_BLOWGUN)) diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc index bdfaf540ba..ddcce9456d 100644 --- a/crawl-ref/source/tile1.cc +++ b/crawl-ref/source/tile1.cc @@ -1101,8 +1101,8 @@ static int _tileidx_weapon(const item_def &item) case WPN_GIANT_SPIKED_CLUB: return TILE_WPN_GIANT_SPIKED_CLUB; - case WPN_ANCUS: - return TILE_WPN_ANCUS; + case WPN_ANKUS: + return TILE_WPN_ANKUS; case WPN_WHIP: return TILE_WPN_WHIP; @@ -3302,7 +3302,7 @@ int tilep_equ_weapon(const item_def &item) case WPN_EVENINGSTAR: return TILEP_HAND1_EVENINGSTAR; case WPN_GIANT_CLUB: return TILEP_HAND1_GIANT_CLUB_PLAIN; case WPN_GIANT_SPIKED_CLUB: return TILEP_HAND1_GIANT_CLUB_SPIKE_SLANT; - case WPN_ANCUS: return TILEP_HAND1_MACE; + case WPN_ANKUS: return TILEP_HAND1_MACE; case WPN_WHIP: return TILEP_HAND1_WHIP; case WPN_DEMON_WHIP: return TILEP_HAND1_BLACK_WHIP; @@ -4503,7 +4503,7 @@ static int _pack_floor_item(int *idx, int *flag, int *isort, int max) { WPN_WHIP, WPN_CLUB, WPN_HAMMER, WPN_MACE, WPN_FLAIL, WPN_DEMON_WHIP, - WPN_ANCUS, WPN_MORNINGSTAR, WPN_EVENINGSTAR, + WPN_ANKUS, WPN_MORNINGSTAR, WPN_EVENINGSTAR, WPN_SPIKED_FLAIL, WPN_GREAT_MACE, WPN_DIRE_FLAIL, WPN_GIANT_CLUB, WPN_GIANT_SPIKED_CLUB, |