* Moved most hard-coded non-standard unrandart behaviour to art-func.h,

  specifically code for equipping, unequpping, an equipped unrandart doing
  something every time world_reacts() is called (special wield effects),
  melee hit effects, and evoking.  Left hardcoded outside of art-func.h:

  * Sword of Cerebov temproarily downgrading the defender's fire
    resistance.

  * Staff of Olgreb boosting poison spells, as if it were a staff
    of poison.

  * Vampire's Tooth always getting maximal vampiric drain.

  * Mace of Variablity's initial pluses being chosen at creation time.

* Since what used to be special wield effects is now handled very
  differently, noisy weapons and the lantern of shadows effects
  are handled with player attributes rather than SPWLD_NOISES and
  SPWLD_SHADOW.

* Unrandarts can now have an elemental colour for their colour
  (currently only used for the Mace of Variability).

* Unrandarts' value modification, being special, and being
  evil are now handled in art-data.txt rather than being hardcoded.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10055 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 8 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index d42da805ce..62fe64bd73 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1241,18 +1241,12 @@ int player_hunger_rate(void)
     if (you.species != SP_VAMPIRE)
     {
         if (player_equip_ego_type( EQ_WEAPON, SPWPN_VAMPIRICISM ))
-        {
               hunger += 6;
-              hunger += 3 * player_equip_unrand( UNRAND_VAMPIRES_TOOTH );
-        }
     }
     else
     {
         if (player_equip_ego_type( EQ_WEAPON, SPWPN_VAMPIRICISM ))
-        {
             hunger += 1;
-            hunger += 1 * player_equip_unrand( UNRAND_VAMPIRES_TOOTH );
-        }
     }
 
     // troll leather armour
@@ -3637,7 +3631,7 @@ int check_stealth(void)
         return (1000);
 #endif
 
-    if (you.unrand_reacts == SPWLD_SHADOW || you.duration[DUR_BERSERKER])
+    if (you.attribute[ATTR_SHADOWS] || you.duration[DUR_BERSERKER])
         return (0);
 
     int stealth = you.dex * 3;
@@ -5912,7 +5906,7 @@ void player::init()
     disease         = 0;
     elapsed_time    = 0;
     rotting         = 0;
-    unrand_reacts   = SPWLD_NONE;
+    unrand_reacts   = 0;
     synch_time      = 0;
 
     magic_contamination = 0;