diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-17 19:11:53 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-17 19:11:53 +0000 |
| commit | a15e97c27cb553d4a87c617da163ef7c1a68f6ec (patch) | |
| tree | a87d3432dedf443d4449969c39cddfd1fae08363 | |
| parent | 309836923b804cab00ad345aef3e04b6a506ca33 (diff) | |
| download | crawl-ref-a15e97c27cb553d4a87c617da163ef7c1a68f6ec.tar.gz crawl-ref-a15e97c27cb553d4a87c617da163ef7c1a68f6ec.zip | |
Add miscellaneous minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9602 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-data.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.cc | 10 | ||||
| -rw-r--r-- | crawl-ref/source/xom.cc | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 5ca75012ff..fa81f0de80 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -1784,8 +1784,8 @@ static void _generate_missile_item(item_def& item, int force_type, return; } - set_equip_race(item, _determine_missile_race(item, item_race)); + if (!no_brand) { set_item_ego_type( item, OBJ_MISSILES, diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 02b9c1d8be..6d71a3fe18 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -3422,7 +3422,7 @@ static monsterentry mondata[] = { M_EVIL, MR_NO_FLAGS, 0, 12, MONS_ORANGE_DEMON, MONS_ORANGE_DEMON, MH_DEMONIC, -6, - { {AT_STING, AF_POISON_STR, 10}, {AT_HIT, AF_PLAIN, 8}, AT_NO_ATK, + { {AT_HIT, AF_PLAIN, 8}, {AT_STING, AF_POISON_STR, 10}, AT_NO_ATK, AT_NO_ATK }, { 8, 4, 5, 0 }, 3, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SCREECH, I_NORMAL, diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 1501a89b04..083bb9ad3a 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -631,7 +631,7 @@ bool cast_summon_horrible_things(int pow, god_type god) mgen_data(MONS_ABOMINATION_LARGE, BEH_FRIENDLY, 6, SPELL_SUMMON_HORRIBLE_THINGS, you.pos(), MHITYOU, - 0, god)); + MG_FORCE_BEH, god)); if (monster != -1) { @@ -1010,7 +1010,9 @@ bool cast_simulacrum(int pow, god_type god) || (weapon->base_type == OBJ_FOOD && weapon->sub_type == FOOD_CHUNK))) { - const monster_type mon = static_cast<monster_type>(weapon->plus); + const monster_type type = static_cast<monster_type>(weapon->plus); + const monster_type sim_type = mons_zombie_size(type) == Z_BIG ? + MONS_SIMULACRUM_LARGE : MONS_SIMULACRUM_SMALL; // Can't create more than the available chunks. int how_many = std::min(8, 4 + random2(pow) / 20); @@ -1020,10 +1022,10 @@ bool cast_simulacrum(int pow, god_type god) { const int monster = create_monster( - mgen_data(MONS_SIMULACRUM_SMALL, BEH_FRIENDLY, + mgen_data(sim_type, BEH_FRIENDLY, 6, SPELL_SIMULACRUM, you.pos(), MHITYOU, - MG_FORCE_BEH, god, mon)); + MG_FORCE_BEH, god, type)); if (monster != -1) { diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 99e57e31c8..652b8fd616 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -576,8 +576,8 @@ static void _xom_acquirement(object_class_type force_class) if (!acquirement(force_class, GOD_XOM, false, &item_index) || item_index == NON_ITEM) { - god_speaks(GOD_XOM, "\"No, never mind.\""); - return; + god_speaks(GOD_XOM, "\"No, never mind.\""); + return; } _try_brand_switch(item_index); |