From: cohrs <cohrs>
Date: Thu, 2 Oct 2003 03:39:57 +0000 (+0000)
Subject: nagas eating
X-Git-Tag: MOVE2GIT~1734
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c734c22ebecab4f58eb7e9ad3e1405b95b31134;p=nethack

nagas eating
<Someone> suggested that nagas should eat.  This seems reasonable.
I made all but the black omnivores.  The black are similar to the AD&D
spirit naga, which are listed as carnivores, while AD&D's other nagas are
omnivores, so I took the same approach.
---

diff --git a/doc/fixes34.3 b/doc/fixes34.3
index bbfd719b0..348779389 100644
--- a/doc/fixes34.3
+++ b/doc/fixes34.3
@@ -40,6 +40,7 @@ kicking a closed drawbridge and dieing should not say "kicking a wall"
 cannot get blessed potions from sink, remove unreachable message
 couldn't insert gold into a container using full menu style if no other
 	objects in inventory unless compiling with GOLDOBJ
+nagas eat
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/monst.c b/src/monst.c
index a566d1d09..e23cb59d4 100644
--- a/src/monst.c
+++ b/src/monst.c
@@ -1734,7 +1734,7 @@ struct permonst _mons2[] = {
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(500, 100, 0, MS_MUMBLE, MZ_LARGE),
 	MR_FIRE|MR_POISON, MR_FIRE|MR_POISON,
-	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_NOTAKE, M2_STRONG,
+	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_NOTAKE|M1_OMNIVORE, M2_STRONG,
 	M3_INFRAVISIBLE, CLR_RED),
     MON("black naga hatchling", S_NAGA,
 	LVL(3, 10, 6, 0, 0), G_GENO,
@@ -1742,27 +1742,29 @@ struct permonst _mons2[] = {
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(500, 100, 0, MS_MUMBLE, MZ_LARGE),
 	MR_POISON|MR_ACID|MR_STONE, MR_POISON|MR_STONE,
-	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_ACID|M1_NOTAKE,
+	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_ACID|M1_NOTAKE|M1_CARNIVORE,
 	M2_STRONG, 0, CLR_BLACK),
     MON("golden naga hatchling", S_NAGA,
 	LVL(3, 10, 6, 0, 0), G_GENO,
 	A(ATTK(AT_BITE, AD_PHYS, 1, 4),
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(500, 100, 0, MS_MUMBLE, MZ_LARGE), MR_POISON, MR_POISON,
-	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_NOTAKE, M2_STRONG, 0, HI_GOLD),
+	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_NOTAKE|M1_OMNIVORE,
+	M2_STRONG, 0, HI_GOLD),
     MON("guardian naga hatchling", S_NAGA,
 	LVL(3, 10, 6, 0, 0), G_GENO,
 	A(ATTK(AT_BITE, AD_PHYS, 1, 4),
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(500, 100, 0, MS_MUMBLE, MZ_LARGE), MR_POISON, MR_POISON,
-	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_NOTAKE, M2_STRONG, 0, CLR_GREEN),
+	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_NOTAKE|M1_OMNIVORE,
+	M2_STRONG, 0, CLR_GREEN),
     MON("red naga", S_NAGA,
 	LVL(6, 12, 4, 0, -4), (G_GENO|1),
 	A(ATTK(AT_BITE, AD_PHYS, 2, 4), ATTK(AT_BREA, AD_FIRE, 2, 6),
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(2600, 400, 0, MS_MUMBLE, MZ_HUGE),
 	MR_FIRE|MR_POISON, MR_FIRE|MR_POISON,
-	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_OVIPAROUS|M1_NOTAKE,
+	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_OVIPAROUS|M1_NOTAKE|M1_OMNIVORE,
 	M2_STRONG, M3_INFRAVISIBLE, CLR_RED),
     MON("black naga", S_NAGA,
 	LVL(8, 14, 2, 10, 4), (G_GENO|1),
@@ -1770,21 +1772,23 @@ struct permonst _mons2[] = {
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(2600, 400, 0, MS_MUMBLE, MZ_HUGE),
 	MR_POISON|MR_ACID|MR_STONE, MR_POISON|MR_STONE,
-	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_OVIPAROUS|M1_ACID|M1_NOTAKE,
+	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_OVIPAROUS|M1_ACID|M1_NOTAKE|
+	  M1_CARNIVORE,
 	M2_STRONG, 0, CLR_BLACK),
     MON("golden naga", S_NAGA,
 	LVL(10, 14, 2, 70, 5), (G_GENO|1),
 	A(ATTK(AT_BITE, AD_PHYS, 2, 6), ATTK(AT_MAGC, AD_SPEL, 4, 6),
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(2600, 400, 0, MS_MUMBLE, MZ_HUGE), MR_POISON, MR_POISON,
-	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_OVIPAROUS|M1_NOTAKE,
+	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_OVIPAROUS|M1_NOTAKE|M1_OMNIVORE,
 	M2_STRONG, 0, HI_GOLD),
     MON("guardian naga", S_NAGA,
 	LVL(12, 16, 0, 50, 7), (G_GENO|1),
 	A(ATTK(AT_BITE, AD_PLYS, 1, 6), ATTK(AT_SPIT, AD_DRST, 1, 6),
 	  ATTK(AT_HUGS, AD_PHYS, 2, 4), NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(2600, 400, 0, MS_MUMBLE, MZ_HUGE), MR_POISON, MR_POISON,
-	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_OVIPAROUS|M1_POIS|M1_NOTAKE,
+	M1_NOLIMBS|M1_SLITHY|M1_THICK_HIDE|M1_OVIPAROUS|M1_POIS|M1_NOTAKE|
+	  M1_OMNIVORE,
 	M2_STRONG, 0, CLR_GREEN),
 /*
  * Ogres