Attempt to make Wizards less reliant on weapons, focus more on spellcasting (round one).

This is my initial attempt to make Wizards want to be more reliant on
their spells instead of being forced to 'tank' and melee most times.

Playing Dungeons & Dragons, Wizards (Magic-Users as they're called in
ad&d) would almost never melee. The combat arms types in the group would
handle that aspect of battle, while they stayed back and cast spells in
support of the rest of the group. As the Wizard increased in experience
and abilities, they got to the point where they didn't need the 'support
staff' nearly as often, if at all. Granted, Wizards in NetHack don't
have a party of warriors and healers to rely on starting out. However,
they wind up fighting melee style quite a bit, even at higher levels.
This commit is an attempt to change that a bit.

The changes:

* Wizards casting the spell 'force bolt' will only cost them one point
of spell power per cast, instead of the usual five points
* Wizards will not start with any weapons at all
* Wizards will start with an extra wand, and that wand will always be a
wand of magic missile

Player monster Wizards are changed in the same way (no weapon, extra
wand of magic missile).

These are very simple changes, but the effect could be profound.
Definitely want to play test thoroughly before the release of this
version.

Author: k21971

doc/evilhack-changelog.md

@@ -3403,4 +3403,6 @@ The following changes to date are:
 - Lolth will be peaceful towards Drow players under the right
   circumstances
 - Penalty for a chaotic Drow killing Lolth
+- Attempt to make Wizards less reliant on weapons, focus more
+  on spellcasting
 

src/makemon.c

@@ -311,8 +311,8 @@ struct trobj giantSamurai[] = {
 };
 
 struct trobj giantWizard[] = {
-    { QUARTERSTAFF, 1, WEAPON_CLASS, 1, 1 },
     { AMULET_OF_MAGIC_RESISTANCE, 0, AMULET_CLASS, 1, UNDEF_BLESS },
+    { WAN_MAGIC_MISSILE, UNDEF_SPE, WAND_CLASS, 1, UNDEF_BLESS },
     { UNDEF_TYP, UNDEF_SPE, WAND_CLASS, 1, UNDEF_BLESS },
     { UNDEF_TYP, UNDEF_SPE, RING_CLASS, 2, UNDEF_BLESS },
     { UNDEF_TYP, UNDEF_SPE, POTION_CLASS, 3, UNDEF_BLESS },
@@ -418,9 +418,9 @@ struct trobj tortleTourist[] = {
 };
 
 struct trobj tortleWizard[] = {
-    { QUARTERSTAFF, 1, WEAPON_CLASS, 1, 1 },
     { GLOVES, 0, ARMOR_CLASS, 1, UNDEF_BLESS },
     { AMULET_OF_MAGIC_RESISTANCE, 0, AMULET_CLASS, 1, UNDEF_BLESS },
+    { WAN_MAGIC_MISSILE, UNDEF_SPE, WAND_CLASS, 1, UNDEF_BLESS },
     { UNDEF_TYP, UNDEF_SPE, WAND_CLASS, 1, UNDEF_BLESS },
     { UNDEF_TYP, UNDEF_SPE, RING_CLASS, 2, UNDEF_BLESS },
     { UNDEF_TYP, UNDEF_SPE, POTION_CLASS, 3, UNDEF_BLESS },
@@ -631,8 +631,12 @@ unsigned short chance;
                            && mtmp->mnum == PM_MONK)
                        || (otyp == SPE_FORCE_BOLT
                            && mtmp->mnum == PM_WIZARD)
+                       || (otyp == WAN_MAGIC_MISSILE
+                           && mtmp->mnum == PM_WIZARD)
                        || (otyp == SPE_DRAIN_LIFE
                            && mtmp->mnum == PM_INFIDEL)
+                       || (otyp == SPE_CLAIRVOYANCE
+                           && mtmp->mnum == PM_INFIDEL)
                        || (obj->oclass == SPBOOK_CLASS
                            && objects[otyp].oc_level > 3)) {
                        dealloc_obj(obj);

src/spell.c

@@ -1006,6 +1006,7 @@ boolean wiz_cast;
     }
 
     if (wiz_cast) {
+        ;
     } else if (u.uhunger <= 10 && spellid(spell) != SPE_DETECT_FOOD) {
         You("are too hungry to cast that spell.");
         return 0;
@@ -1156,7 +1157,13 @@ boolean wiz_cast;
             losehp(energy, killer.name, KILLED_BY);
         }
     } else {
-        u.uen -= energy;
+        if (Role_if(PM_WIZARD) && spellid(spell) == SPE_FORCE_BOLT) {
+            /* wizards power use for force bolt is only
+               one point of power per cast */
+            u.uen -= energy / 5;
+        } else {
+            u.uen -= energy;
+        }
     }
 
     /* successful casting increases the amount of time the cast

src/u_init.c

@@ -222,8 +222,8 @@ struct trobj Valkyrie[] = {
 struct trobj Wizard[] = {
 #define W_MULTSTART 2
 #define W_MULTEND 6
-    { QUARTERSTAFF, 1, WEAPON_CLASS, 1, 1 },
     { CLOAK_OF_MAGIC_RESISTANCE, 0, ARMOR_CLASS, 1, UNDEF_BLESS },
+    { WAN_MAGIC_MISSILE, UNDEF_SPE, WAND_CLASS, 1, UNDEF_BLESS },
     { UNDEF_TYP, UNDEF_SPE, WAND_CLASS, 1, UNDEF_BLESS },
     { UNDEF_TYP, UNDEF_SPE, RING_CLASS, 2, UNDEF_BLESS },
     { UNDEF_TYP, UNDEF_SPE, POTION_CLASS, 3, UNDEF_BLESS },
@@ -1524,6 +1524,7 @@ register struct trobj *origtrop;
                    || (otyp == SCR_ENCHANT_WEAPON && Role_if(PM_MONK))
                    /* wizard patch -- they already have one */
                    || (otyp == SPE_FORCE_BOLT && Role_if(PM_WIZARD))
+                   || (otyp == WAN_MAGIC_MISSILE && Role_if(PM_WIZARD))
                    /* same for infidels */
                    || (otyp == SPE_DRAIN_LIFE && Role_if(PM_INFIDEL))
                    /* infidels already have auto-clairvoyance