swap touchstone and flint

in the objects[] array to allow inclusion of touchstone
when wishing for gray stone.

The patch increments editlevel and invalidates bones
and save files.

diff --git a/include/patchlevel.h b/include/patchlevel.h
index 2b5d5e2b633d39e896698de94dbf2026731b85a0..2bbbcc757ee402e59e44f6993c5bdccd4e1389e2 100644 (file)
--- a/include/patchlevel.h
+++ b/include/patchlevel.h
@@ -13,7 +13,7 @@
  * Incrementing EDITLEVEL can be used to force invalidation of old bones
  * and save files.
  */
-#define EDITLEVEL      0
+#define EDITLEVEL      1
 
 #define COPYRIGHT_BANNER_A \
 "NetHack, Copyright 1985-2002"

diff --git a/src/objects.c b/src/objects.c
index 4d61b98b4c4ac2eeed9f7218d88c95f8ebd46e0e..845e5a20462a8436c1140119f42913d6402f1c75 100644 (file)
--- a/src/objects.c
+++ b/src/objects.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)objects.c  3.4     2000/02/18      */
+/*     SCCS Id: @(#)objects.c  3.4     2002/02/13      */
 /* Copyright (c) Mike Threepoint, 1989.                                  */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -923,8 +923,8 @@ GEM("worthless piece of violet glass", "violet", 77, 1, 0, 6, 5, GLASS, CLR_MAGE
 
 ROCK("luckstone", "gray",      0, 10,  10, 60, 3, 3, 1, 10, 7, MINERAL, CLR_GRAY),
 ROCK("loadstone", "gray",      0, 10, 500,  1, 3, 3, 1, 10, 6, MINERAL, CLR_GRAY),
-ROCK("flint", "gray",          0, 10,  10,  1, 6, 6, 0, 10, 7, MINERAL, CLR_GRAY),
 ROCK("touchstone", "gray",     0,  8,  10, 45, 3, 3, 1, 10, 6, MINERAL, CLR_GRAY),
+ROCK("flint", "gray",          0, 10,  10,  1, 6, 6, 0, 10, 7, MINERAL, CLR_GRAY),
 ROCK("rock", (char *)0,                1,100,  10,  0, 3, 3, 0, 10, 7, MINERAL, CLR_GRAY),
 #undef GEM
 #undef ROCK