nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Restore monsters.h to its previous order

Browse Source 
This causes the difficulties to get out of sequence, but we agreed
that this is a less important rule than keeping monster IDs stable.

Breaks save and bones files, because it changes monster IDs.
This commit is contained in:
Alex Smith
2025-05-29 19:14:10 +01:00
parent 2bf00395f1
commit 0e50adcc1e
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/monsters.h
+12 -10
View File
@@ -47,8 +47,10 @@
* Rule #1: monsters of a given class are contiguous in the * Rule #1: monsters of a given class are contiguous in the
* mons[] array. * mons[] array.
* *
* Rule #2: monsters of a given class are presented in ascending * Rule #2: monsters of a given class are generally kept in
* order of strength. * the same order as in previous versions of NetHack
* (they used to be presented in ascending order of
* strength, but this rule no longer applies).
* *
* Rule #3: monster frequency is included in the geno mask; * Rule #3: monster frequency is included in the geno mask;
* the frequency can be from 0 to 7. 0's will also * the frequency can be from 0 to 7. 0's will also
@@ -98,6 +100,14 @@
SIZ(1, 5, MS_BUZZ, MZ_TINY), MR_POISON, MR_POISON, SIZ(1, 5, MS_BUZZ, MZ_TINY), MR_POISON, MR_POISON,
M1_ANIMAL | M1_FLY | M1_NOHANDS | M1_POIS, M2_HOSTILE | M2_FEMALE, 0, M1_ANIMAL | M1_FLY | M1_NOHANDS | M1_POIS, M2_HOSTILE | M2_FEMALE, 0,
6, CLR_YELLOW, KILLER_BEE), 6, CLR_YELLOW, KILLER_BEE),
MON(NAM("soldier ant"), S_ANT,
LVL(3, 18, 3, 0, 0), (G_GENO | G_SGROUP | 2),
A(ATTK(AT_BITE, AD_PHYS, 2, 4), ATTK(AT_STNG, AD_DRST, 3, 4),
NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
SIZ(20, 5, MS_SILENT, MZ_TINY), MR_POISON, MR_POISON,
M1_ANIMAL | M1_NOHANDS | M1_OVIPAROUS | M1_POIS | M1_CARNIVORE,
M2_HOSTILE, 0,
7, CLR_BLUE, SOLDIER_ANT),
MON(NAM("fire ant"), S_ANT, MON(NAM("fire ant"), S_ANT,
LVL(3, 18, 3, 10, 0), (G_GENO | G_SGROUP | 1), LVL(3, 18, 3, 10, 0), (G_GENO | G_SGROUP | 1),
A(ATTK(AT_BITE, AD_PHYS, 2, 4), ATTK(AT_BITE, AD_FIRE, 2, 4), A(ATTK(AT_BITE, AD_PHYS, 2, 4), ATTK(AT_BITE, AD_FIRE, 2, 4),
@@ -113,14 +123,6 @@
SIZ(200, 50, MS_SILENT, MZ_LARGE), MR_POISON, MR_POISON, SIZ(200, 50, MS_SILENT, MZ_LARGE), MR_POISON, MR_POISON,
M1_ANIMAL | M1_NOHANDS | M1_POIS | M1_CARNIVORE, M2_HOSTILE, 0, M1_ANIMAL | M1_NOHANDS | M1_POIS | M1_CARNIVORE, M2_HOSTILE, 0,
6, CLR_BLACK, GIANT_BEETLE), 6, CLR_BLACK, GIANT_BEETLE),
MON(NAM("soldier ant"), S_ANT,
LVL(3, 18, 3, 0, 0), (G_GENO | G_SGROUP | 2),
A(ATTK(AT_BITE, AD_PHYS, 2, 4), ATTK(AT_STNG, AD_DRST, 3, 4),
NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
SIZ(20, 5, MS_SILENT, MZ_TINY), MR_POISON, MR_POISON,
M1_ANIMAL | M1_NOHANDS | M1_OVIPAROUS | M1_POIS | M1_CARNIVORE,
M2_HOSTILE, 0,
7, CLR_BLUE, SOLDIER_ANT),
MON(NAM("queen bee"), S_ANT, MON(NAM("queen bee"), S_ANT,
LVL(9, 24, -4, 0, 0), (G_GENO | G_NOGEN), LVL(9, 24, -4, 0, 0), (G_GENO | G_NOGEN),
A(ATTK(AT_STNG, AD_DRST, 1, 8), A(ATTK(AT_STNG, AD_DRST, 1, 8),
include/patchlevel.h
+1 -1
View File
@@ -17,7 +17,7 @@
* Incrementing EDITLEVEL can be used to force invalidation of old bones * Incrementing EDITLEVEL can be used to force invalidation of old bones
* and save files. * and save files.
*/ */
#define EDITLEVEL 125 #define EDITLEVEL 126
/* /*
* Development status possibilities. * Development status possibilities.