mon_attack_flavour => attack_flavour

Replaces mon_attack_flavour with attack_flavour with the hopes that
at some point in the future we might be able to use it instead of
brands as a unified method of identifying a particular attacks'
flavour. Alternatively, it might find a niche in player attacks
that have flavour but are not actually brands (confusing touch).

In addition, this adds attk_type, attk_flavour, and attk_damage to
attack class. These variables have their value set (if the attacker
is of atype() ACT_MONSTER) to the apropriate values of the mon_attack
_def within melee_attack::melee_attack(..). This allows us to only
create one instance of mon_attack_def and thereafter are free to
reference the variables directly.

This commit should allow for me to continue to merge monster_attack
into the unified code line. This serves as a milestone, but presently
most of the functionality of monster combat (and part of player
combat as well) is certainly broken / non-existant (those code paths
have been isolated from the line of exection, pending being written
into the unified code).

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/ghost.h b/crawl-ref/source/ghost.h
index 9bc3aaa8bd..92b5994559 100644
--- a/crawl-ref/source/ghost.h
+++ b/crawl-ref/source/ghost.h
@@ -11,8 +11,8 @@
 #include "mon-enum.h"
 #include "mon_resist_def.h"
 
-mon_attack_flavour ugly_thing_colour_to_flavour(uint8_t u_colour);
-mon_resist_def ugly_thing_resists(bool very_ugly, mon_attack_flavour u_att_flav);
+attack_flavour ugly_thing_colour_to_flavour(uint8_t u_colour);
+mon_resist_def ugly_thing_resists(bool very_ugly, attack_flavour u_att_flav);
 
 #ifdef USE_TILE
 int tile_offset_for_labrat_colour(uint8_t l_colour);
@@ -36,7 +36,7 @@ public:
     bool see_invis;
     brand_type brand;
     attack_type att_type;
-    mon_attack_flavour att_flav;
+    attack_flavour att_flav;
     mon_resist_def resists;
 
     bool spellcaster, cycle_colours;
@@ -70,7 +70,7 @@ private:
     void add_spells();
     spell_type translate_spell(spell_type playerspell) const;
     void ugly_thing_add_resistance(bool very_ugly,
-                                   mon_attack_flavour u_att_flav);
+                                   attack_flavour u_att_flav);
 };
 
 bool debug_check_ghosts();