Minor tweaks to Druid role.

Make energy regeneration on par with priests and wizards. Make starting weapon have a 50/50 chance of being either a quarterstaff or a scimitar.
Umbire · Feb 12, 2024 · 8cefe32 · 8cefe32
1 parent 99928d3
commit 8cefe32
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/doc/evilhack-changelog.md b/doc/evilhack-changelog.md
@@ -3347,4 +3347,5 @@ The following changes to date are:
 - Adjust auto-recovery feedback
 - Fix: Amulets could burn your skin but then allow you to regenerate
 - New player role: Druid (initial commit)
+- Minor tweaks to Druid role
 
diff --git a/src/exper.c b/src/exper.c
@@ -28,10 +28,10 @@ enermod(en)
 int en;
 {
     switch (Role_switch) {
+    case PM_DRUID:
     case PM_PRIEST:
     case PM_WIZARD:
         return (2 * en);
-    case PM_DRUID:
     case PM_HEALER:
     case PM_INFIDEL:
     case PM_KNIGHT:

diff --git a/src/makemon.c b/src/makemon.c
@@ -577,6 +577,7 @@ struct trobj Level10Kit2[] = {
 #define B_MAJOR	        0 /* two-handed sword or battle-axe  */
 #define B_MINOR	        1 /* matched with axe or short sword */
 #define C_AMMO          2
+#define D_MAJOR         0 /* quarterstaff or scimitar */
 #define M_BOOK          2
 #define RAN_BOW	        1
 #define RAN_TWO_ARROWS  2
@@ -875,6 +876,8 @@ register struct monst *mtmp;
                 mongets(mtmp, GRAPPLING_HOOK);
             break;
         case PM_DRUID:
+            if (rn2(100) >= 50)
+                Druid[D_MAJOR].trotyp = SCIMITAR;
             if (racial_tortle(mtmp))
                 ini_mon_inv(mtmp, tortleDruid, 1);
             else

diff --git a/src/spell.c b/src/spell.c
@@ -1409,7 +1409,7 @@ boolean wiz_cast;
     case SPE_REFLECTION:
     case SPE_DRUID_TEST:
         cast_reflection(&youmonst);
-	break;
+        break;
     case SPE_FLAME_SPHERE:
     case SPE_FREEZE_SPHERE:
         pline("You conjure elemental energy...");

diff --git a/src/u_init.c b/src/u_init.c
@@ -63,6 +63,7 @@ struct trobj Convict[] = {
     { 0, 0, 0, 0, 0 }
 };
 struct trobj Druid[] = {
+#define D_MAJOR 0 /* quarterstaff or scimitar */
     { QUARTERSTAFF, 1, WEAPON_CLASS, 1, UNDEF_BLESS },
     { BRACERS, 0, ARMOR_CLASS, 1, UNDEF_BLESS },
     { CLOAK, 0, ARMOR_CLASS, 1, UNDEF_BLESS },
@@ -878,6 +879,8 @@ u_init()
             = u.ualign.type = A_CHAOTIC; /* Override racial alignment */
         break;
     case PM_DRUID:
+        if (rn2(100) >= 50)
+            Druid[D_MAJOR].trotyp = SCIMITAR;
         ini_inv(Druid);
         if (!rn2(25))
             ini_inv(Lamp);