Make TOURIST unconditional.

This commit is contained in:
Sean Hunt
2015-02-13 23:31:41 -05:00
parent 5ee71d2757
commit 260f7ea860
43 changed files with 27 additions and 351 deletions

View File

@@ -2282,10 +2282,8 @@ boolean ordinary;
case WAN_LIGHT: /* (broken wand) */
/* assert( !ordinary ); */
damage = d(obj->spe, 25);
#ifdef TOURIST
case EXPENSIVE_CAMERA:
if (!damage) damage = 5;
#endif
damage = lightdamage(obj, ordinary, damage);
damage += rnd(25);
if (flashburn((long)damage)) learn_it = TRUE;
@@ -3371,10 +3369,8 @@ struct obj **ootmp; /* to return worn armor for caller to disintegrate */
tmp = MAGIC_COOKIE;
if ((otmp2 = which_armor(mon, W_ARMC)) != 0)
m_useup(mon, otmp2);
#ifdef TOURIST
if ((otmp2 = which_armor(mon, W_ARMU)) != 0)
m_useup(mon, otmp2);
#endif
}
type = -1; /* no saving throw wanted */
break; /* not ordinary damage */
@@ -3502,9 +3498,7 @@ xchar sx, sy;
/* no shield or suit, you're dead; wipe out cloak
and/or shirt in case of life-saving or bones */
if (uarmc) (void) destroy_arm(uarmc);
#ifdef TOURIST
if (uarmu) (void) destroy_arm(uarmu);
#endif
} else if (nonliving(youmonst.data) || is_demon(youmonst.data)) {
shieldeff(sx, sy);
You("seem unaffected.");