amulet tiles

Replace the octagonal amulet placeholder for the two new tiles.
Give the "cubical amulet" a hint of being cube shaped and rename
"pentagonal amulet" to "perforated amulet" because it's easier to
draw that way.

Bump EDITLEVEL now for the extra objects and monsters because I
forgot to do so earlier.

diff --git a/include/patchlevel.h b/include/patchlevel.h
index 77039bc794463a7a77fa926f2dd8bffba6be2aab..b02d2d613632043012135e740c23d9969ca95675 100644 (file)
--- a/include/patchlevel.h
+++ b/include/patchlevel.h
@@ -14,7 +14,7 @@
  * Incrementing EDITLEVEL can be used to force invalidation of old bones
  * and save files.
  */
-#define EDITLEVEL 18
+#define EDITLEVEL 19
 
 #define COPYRIGHT_BANNER_A "NetHack, Copyright 1985-2020"
 #define COPYRIGHT_BANNER_B \

diff --git a/src/objects.c b/src/objects.c
index 095f6e42efa76b2d3fc49bcd2a30305d661aad08..8c4d2a9ab0f0b2ed7d6a84ee665c349bf7518555 100644 (file)
--- a/src/objects.c
+++ b/src/objects.c
@@ -617,7 +617,7 @@ AMULET("amulet of unchanging",          "concave", UNCHANGING, 60),
 AMULET("amulet of reflection",        "hexagonal", REFLECTING, 75),
 AMULET("amulet of magical breathing", "octagonal", MAGICAL_BREATHING, 75),
         /* +2 AC and +2 MC; +2 takes naked hero past 'warded' to 'guarded' */
-AMULET("amulet of guarding",         "pentagonal", PROTECTION, 75),
+AMULET("amulet of guarding",         "perforated", PROTECTION, 75),
         /* cubical: some descriptions are already three dimensional and
            parallelogrammatical (real word!) would be way over the top */
 AMULET("amulet of flying",              "cubical", FLYING, 60),

diff --git a/win/share/objects.txt b/win/share/objects.txt
index e7a7ef0b55523b4a3db534eb7ed36620fdd9bb9c..e999b2ab03fcb5ab4b3889c4e9086f4dff4e7130 100644 (file)
--- a/win/share/objects.txt
+++ b/win/share/objects.txt
@@ -3618,7 +3618,7 @@ Z = (195, 195, 195)
   .......KKKAA....
   ........AAA.....
 }
-# tile 189 (pentagonal / amulet of guarding)
+# tile 189 (perforated / amulet of guarding)
 {
   ................
   ......LLLLLAA...
@@ -3631,12 +3631,13 @@ Z = (195, 195, 195)
   ......LAA.LAA...
   ......ACCCAA....
   ......CKKKKAA...
-  .....CKKKKKKA...
-  .....CKKKKKKA...
-  ......KKKKKAA...
+  .....CKAKAKKA...
+  .....CKKAKAKA...
+  ......KAKAKAA...
   .......KKKAA....
   ........AAA.....
 }
+
 # tile 190 (cubical / amulet of flying)
 {
   ................
@@ -3648,13 +3649,13 @@ Z = (195, 195, 195)
   ....LAA.....LAA.
   .....LAA...LAA..
   ......LAA.LAA...
-  ......ACCCAA....
-  ......CKKKKAA...
-  .....CKKKKKKA...
-  .....CKKKKKKA...
-  ......KKKKKAA...
-  .......KKKAA....
-  ........AAA.....
+  .......LAL......
+  .....KKLKL......
+  .....KCCCCCA....
+  .....KCKKKKA....
+  .....KCKKKKA....
+  ......CKKKKA....
+  .......AAAAA....
 }
 # tile 191 (Amulet of Yendor / cheap plastic imitation of the Amulet of Yendor)
 {