Add Heaven or Hell/Hell or Hell modes.

Ignore-this: d788cd3d7764813c95055d74c203675

Breaks save compatibility.
Add options hell_or_hell and heaven_or_hell.

The latter makes the player and the monsters have 1 maxhp
at all times.

The first is the same, but monsters have their normal maxhp.

When either of modes is turned on, most damaging traps don't
do anything and potions throws don't do damage.

darcs-hash:20110428213825-40dd4-f5a966244c06176d2a606d45837d58327fd16497

Author: Noeda

include/display.h

@@ -40,9 +40,11 @@
  * vicinity, and a glyph representing the warning level is displayed.
  */
 
-#define mon_warning(mon) (Warning && !(mon)->mpeaceful && 				\
+#define mon_warning(mon) ((Warning || heaven_or_hell_mode) && \
+			 !(mon)->mpeaceful && 				\
 			 (distu((mon)->mx, (mon)->my) < 100) &&				\
-			 (((int) ((mon)->m_lev / 4)) >= flags.warnlevel))
+			 ((((int) ((mon)->m_lev / 4)) >= flags.warnlevel) || \
+			 heaven_or_hell_mode))
 
 /*
  * mon_visible()

include/flag.h

@@ -45,6 +45,10 @@ struct flag {
 	boolean  forcefight;
 	boolean  friday13;	/* it's Friday the 13th */
 	boolean  help;		/* look in data file for info about stuff */
+	boolean  heaven_or_hell; /* die in one hit/enemies die in one hit */
+	boolean  hell_or_hell; /* die in one hit */
+#define heaven_or_hell_mode (flags.heaven_or_hell || flags.hell_or_hell)
+#define hell_or_hell_mode flags.hell_or_hell
 	boolean  ignintr;	/* ignore interrupts */
 #ifdef INSURANCE
 	boolean  ins_chkpt;	/* checkpoint as appropriate */

include/you.h

@@ -272,6 +272,8 @@ struct you {
 	int	 uhunger;	/* refd only in eat.c and shk.c */
 	unsigned uhs;		/* hunger state - see eat.c */
 
+	int  ulives;    /* heaven or hell mode, number of lives */
+
 	struct prop uprops[LAST_PROP+1];
 
 	unsigned umconf;

src/allmain.c

@@ -134,6 +134,13 @@ moveloop()
                       break;	/* it's now your action or the next turn */
                 } while (monscanmove);
 		flags.mon_moving = FALSE;
+		/* heaven or hell mode: player always has 1 maxhp */
+		if (heaven_or_hell_mode)
+		{
+			u.uhpmax = 1;
+			if (u.uhp > u.uhpmax)
+				u.uhp = u.uhpmax;
+		}
 
 		if (((!monscanmove && youmonst.movement < NORMAL_SPEED) ||
                      turns_behind) && (!iflags.multiplayer || !u.ustuck)) {

src/cmd.c

@@ -1121,6 +1121,16 @@ int final;	/* 0 => still in progress; 1 => over, survived; 2 => dead */
 	    you_are(hofe_titles[u.uevent.uhand_of_elbereth - 1]);
 	}
 #endif
+    /* heaven or hell modes */
+	if (heaven_or_hell_mode) {
+		if (u.ulives > 1)
+			Sprintf(buf, "%d lives", u.ulives);
+		else if (u.ulives == 0)
+			Sprintf(buf, "no lives");
+		else
+			Sprintf(buf, "%d life", u.ulives);
+		you_have(buf);
+	}
 
 	/* note: piousness 20 matches MIN_QUEST_ALIGN (quest.h) */
 	if (u.ualign.record >= 20)	you_are("piously aligned");
@@ -1676,6 +1686,14 @@ int final;
 	putstr_or_dump(en_win, 0, "Voluntary challenges:");
 	putstr_or_dump(en_win, 0, "");
 
+	if (heaven_or_hell_mode) {
+		if (flags.hell_or_hell) {
+			you_have_been("following the path of Hell or Hell");
+		}
+		else
+			you_have_been("following the path of Heaven or Hell");
+	}
+
 	if (!u.uconduct.food)
 	    enl_msg(You_, "have gone", "went", " without food");
 	    /* But beverages are okay */

src/display.c

@@ -462,6 +462,9 @@ display_warning(mon)
     int wl = (int) (mon->m_lev / 4);
     int glyph;
 
+	if (heaven_or_hell_mode && wl == 0)
+		wl = 1;
+
     if (mon_warning(mon)) {
         if (wl > WARNCOUNT - 1) wl = WARNCOUNT - 1;
 	/* 3.4.1: this really ought to be rn2(WARNCOUNT), but value "0"

src/end.c

@@ -41,6 +41,7 @@ STATIC_PTR void FDECL(done_intr, (int));
 static void FDECL(done_hangup, (int));
 # endif
 #endif
+STATIC_PTR int NDECL(heaven_or_hell_lifesave_end);
 STATIC_DCL void FDECL(disclose,(int,BOOLEAN_P,long));
 STATIC_DCL void FDECL(get_valuables, (struct obj *));
 STATIC_DCL void FDECL(sort_valuables, (struct valuable_data *,int));
@@ -960,6 +961,24 @@ int how;
 	killer = kilbuf;
 
 	if (how < PANICKED) u.umortality++;
+	/* Save life when under heaven or hell mode, but not when
+	 * self-genociding. */
+	if (u.ulives > 0 && how < GENOCIDED) {
+		pline("But wait...");
+		You("suddenly start to feel better!");
+		savelife(how);
+		u.ulives--;
+		if (!u.ulives)
+			You_feel("death is waiting for you just around the corner...");
+		/* Set invulnerability and wait until player gets another action. */
+		nomul(-5);
+		u.uinvulnerable = TRUE;
+		nomovemsg = You_can_move_again;
+		afternmv = heaven_or_hell_lifesave_end;
+		killer = 0;
+		killer_format = 0;
+		return;
+	}
 	if (Lifesaved && (how <= GENOCIDED)) {
 		pline("But wait...");
 		makeknown(AMULET_OF_LIFE_SAVING);
@@ -1263,6 +1282,12 @@ int how;
 	terminate(EXIT_SUCCESS);
 }
 
+STATIC_PTR int
+heaven_or_hell_lifesave_end()
+{
+	u.uinvulnerable = FALSE;
+	return(1);
+}
 
 void
 container_contents(list, identified, all_containers)

src/exper.c

@@ -142,7 +142,7 @@ const char *drainer;	/* cause of death, if drain should be fatal */
 	}
 	num = newhp();
 	u.uhpmax -= num;
-	if (u.uhpmax < 1) u.uhpmax = 1;
+	if (u.uhpmax < 1 || heaven_or_hell_mode) u.uhpmax = 1;
 	u.uhp -= num;
 	if (u.uhp < 1) u.uhp = 1;
 	else if (u.uhp > u.uhpmax) u.uhp = u.uhpmax;

src/makemon.c

@@ -1136,6 +1136,13 @@ register int	mmflags;
 			mtmp->mstrategy |= STRAT_CLOSE;
 	}
 
+    /* heaven or hell mode */
+	if (heaven_or_hell_mode && !hell_or_hell_mode)
+	{
+		mtmp->mhpmax = 1;
+		mtmp->mhp = 1;
+	}
+
 	if (!in_mklev)
 	    newsym(mtmp->mx,mtmp->my);	/* make sure the mon shows up */
 

src/monmove.c

@@ -168,7 +168,6 @@ mon_regen(mon, digest_meal)
 struct monst *mon;
 boolean digest_meal;
 {
-        if (is_mp_player(mon)) return; /* regeneration handled separately */
 	if (mon->mhp < mon->mhpmax &&
 	    (monstermoves % 20 == 0 || regenerates(mon->data))) mon->mhp++;
 	if (mon->mspec_used) mon->mspec_used--;