diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-08 16:14:55 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-08 16:14:55 +0000 |
| commit | 3e5eae658a2dd7acbd5584f4a6104ba99e7de275 (patch) | |
| tree | a67d1bbc631d696ffa2892c5aceadf02c9ba846c /crawl-ref | |
| parent | 2e6e327fcefc772e02f8d6db1232fb97aaaab597 (diff) | |
| download | crawl-ref-3e5eae658a2dd7acbd5584f4a6104ba99e7de275.tar.gz crawl-ref-3e5eae658a2dd7acbd5584f4a6104ba99e7de275.zip | |
Monsters were not getting species-appropriate missiles, fixed.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1802 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 4b823cef70..639879dc1e 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1040,8 +1040,10 @@ std::string item_def::name_aux( description_level_type desc, buff << ' '; } - buff << racial_description_string(*this, terse) - << ammo_name(static_cast<missile_type>(item_typ)); + if (!basename) + buff << racial_description_string(*this, terse); + + buff << ammo_name(static_cast<missile_type>(item_typ)); if (know_type && !basename) { diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 5c3644de6c..97403f0f87 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -3305,9 +3305,12 @@ static item_make_species_type give_weapon(monsters *mon, int level, break; } // deliberate fall-through + case MONS_URUG: + item_race = MAKE_ITEM_ORCISH; + // fall through + case MONS_NORBERT: case MONS_JOZEF: - case MONS_URUG: case MONS_VAULT_GUARD: case MONS_VAMPIRE_KNIGHT: case MONS_DRACONIAN_KNIGHT: @@ -3681,8 +3684,6 @@ static void give_ammo(monsters *mon, int level, SPMSL_CURARE : SPMSL_POISONED); - mitm[thing_created].flags = 0; - // Master archers get double ammo - archery is their only attack. if (mon->type == MONS_DEEP_ELF_MASTER_ARCHER) mitm[thing_created].quantity *= 2; @@ -3721,7 +3722,7 @@ static void give_ammo(monsters *mon, int level, case MONS_URUG: weap_type = MI_JAVELIN; weap_class = OBJ_MISSILES; - item_race = MAKE_ITEM_ORCISH; + item_race = MAKE_ITEM_ORCISH; qty = random_range(4, 7); break; } @@ -3734,7 +3735,6 @@ static void give_ammo(monsters *mon, int level, if (thing_created != NON_ITEM) { mitm[thing_created].quantity = qty; - mitm[thing_created].flags = 0; give_monster_item(mon, thing_created, false, &monsters::pickup_throwable_weapon); } |