diff options
| -rw-r--r-- | crawl-ref/source/dat/descript/monsters.txt | 4 | ||||
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 17 | ||||
| -rw-r--r-- | crawl-ref/source/spells2.cc | 3 |
3 files changed, 15 insertions, 9 deletions
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index 32a25afc7c..4e57efdbc8 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -12,6 +12,10 @@ Agnes A lanky warrior, she moves at a great pace and carries an exotic weapon. %%%% +Angel + +A divine agent of Zin, it is a towering winged figure of unnatural beauty with an aura of brilliant white light. +%%%% Antaeus A great titan who lives in the depths of Cocytus. diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index cc3f1a101d..181eaa3d68 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -3434,16 +3434,17 @@ static item_make_species_type _give_weapon(monsters *mon, int level, break; case MONS_ANGEL: - force_item = true; - item_race = MAKE_ITEM_NO_RACE; + force_item = true; + item_race = MAKE_ITEM_NO_RACE; item.base_type = OBJ_WEAPONS; - item.colour = WHITE; // forced by force_item above {dlb} + item.colour = WHITE; // forced by force_item above {dlb} - set_equip_desc( item, ISFLAG_GLOWING ); + set_equip_desc(item, ISFLAG_GLOWING); if (one_chance_in(3)) { - item.sub_type = (one_chance_in(3) ? WPN_GREAT_MACE : WPN_MACE); - set_item_ego_type( item, OBJ_WEAPONS, SPWPN_HOLY_WRATH ); + item.sub_type = (one_chance_in(3) ? WPN_GREAT_MACE + : WPN_MACE); + set_item_ego_type(item, OBJ_WEAPONS, SPWPN_HOLY_WRATH); } else item.sub_type = WPN_LONG_SWORD; @@ -3461,8 +3462,8 @@ static item_make_species_type _give_weapon(monsters *mon, int level, item.sub_type = (one_chance_in(4) ? WPN_BLESSED_EUDEMON_BLADE : WPN_LONG_SWORD); - set_equip_desc( item, ISFLAG_GLOWING ); - set_item_ego_type( item, OBJ_WEAPONS, SPWPN_HOLY_WRATH ); + set_equip_desc(item, ISFLAG_GLOWING); + set_item_ego_type(item, OBJ_WEAPONS, SPWPN_HOLY_WRATH); item.plus = 1 + random2(3); item.plus2 = 1 + random2(3); break; diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 66896fe9df..06127f3041 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1614,7 +1614,8 @@ bool summon_berserker(int pow, god_type god, bool force_hostile) static bool _summon_holy_being_wrapper(int pow, god_type god, monster_type mon, bool quiet) -{ const int dur = std::min(2 + (random2(pow) / 4), 6); +{ + const int dur = std::min(2 + (random2(pow) / 4), 6); const int monster = create_monster( |