The wumpus is now unique to the ranger quest and much scarier. It als…

…o now appears in a random room in the Ranger's locate level.
elunna · Dec 6, 2024 · f158942 · f158942
1 parent 31ff840
commit f158942
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 28 deletions.
diff --git a/dat/Ran-loca.lua b/dat/Ran-loca.lua
@@ -6,29 +6,40 @@
 des.level_init({ style = "solidfill", fg = " " });
 
 des.level_flags("mazelevel", "hardfloor", "noflip")
---1234567890123456789012345678901234567890123456789012345678901234567890
+--0         1         2         3         4         5         6         7
+--0123456789012345678901234567890123456789012345678901234567890123456789012345
 des.map([[
-              .......  .........  .......              
-     ...................       ...................     
-  ....        .......             .......        ....  
-...    .....     .       .....       .     .....    ...
-.   .......... .....  ...........  ..... ..........   .
-.  ..  ..... ..........  .....  .......... .....  ..  .
-.  .     .     .....       .       .....     .     .  .
-.  .   .....         .............         .....   .  .
-.  .  ................  .......  ................  .  .
-.  .   .....            .......            .....   .  .
-.  .     .    ......               ......    .     .  .
-.  .     ...........   .........   ...........     .  .
-.  .          ..........       ..........          .  .
-.  ..  .....     .       .....       .     .....  ..  .
-.   .......... .....  ...........  ..... ..........   .
-.      ..... ..........  .....  .......... .....      .
-.        .     .....       .       .....     .        .
-...   .......           .......           .......   ...
-  ..............     .............     ..............  
-      .......  .......  .......  .......  .......      
+00              .......  .........  .......
+01     ...................       ...................
+02  ....        .......             .......        ....
+03...    .....     .       .....       .     .....    ...
+04.   .......... .....  ...........  ..... ..........   .
+05.  ..  ..... ..........  .....  .......... .....  ..  .
+06.  .     .     .....       .       .....     .     .  .
+07.  .   .....         .............         .....   .  .
+08.  .  ................  .......  ................  .  .
+09.  .   .....            .......            .....   .  .
+10.  .     .    ......               ......    .     .  .
+11.  .     ...........   .........   ...........     .  .
+12.  .          ..........       ..........          .  .
+13.  ..  .....     .       .....       .     .....  ..  .
+14.   .......... .....  ...........  ..... ..........   .
+15.      ..... ..........  .....  .......... .....      .
+16.        .     .....       .       .....     .        .
+17...   .......           .......           .......   ...
+18  ..............     .............     ..............
+19      .......  .......  .......  .......  .......
 ]]);
+
+-- Places the wumpus can appear
+places = { {17,01},{37,01},
+           {09,04},{17,05},{27,04},{37,05},{45,04},
+           {09,08},{27,08},{45,08},
+           {17,11},{37,11},
+           {09,14},{17,15},{27,14},{37,15},{45,14},
+           {09,18},{27,18},{45,18} }
+shuffle(places)
+
 -- Dungeon Description
 des.region(selection.area(00,00,54,19), "lit")
 -- Stairs
@@ -57,7 +68,7 @@ des.trap("bear")
 des.trap("bear")
 des.trap("bear")
 -- Random monsters.
-des.monster({ id = "wumpus", x=27, y=18, peaceful=0, asleep=1 })
+des.monster({ id = "wumpus", coord = places[1], peaceful=0, asleep=1 })
 des.monster({ id = "giant bat", peaceful=0 })
 des.monster({ id = "giant bat", peaceful=0 })
 des.monster({ id = "giant bat", peaceful=0 })

diff --git a/include/monsters.h b/include/monsters.h
@@ -1428,13 +1428,17 @@
         M2_HOSTILE | M2_STRONG | M3_JUMPER, 0,
         NO_RACE, 9, CLR_BRIGHT_BLUE, LANDSHARK),
     MON(NAM("wumpus"), S_QUADRUPED,
-        LVL(8, 3, 2, 10, 0), (G_GENO | 1),
+        LVL(20, 8, -12, 35, 0), (G_NOGEN | 1),
         A(ATTK(AT_BITE, AD_PHYS, 6, 9),
-          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
-        SIZ(2500, 500, MS_BURBLE, MZ_HUGE), 0, 0,
-        M1_CLING | M1_ANIMAL | M1_NOHANDS | M1_OMNIVORE | M1_THICK_HIDE,
-        M2_HOSTILE | M2_STRONG, M3_INFRAVISIBLE,
-        NO_RACE, 10, CLR_CYAN, WUMPUS),
+          ATTK(AT_KICK, AD_PHYS, 3, 6),
+          ATTK(AT_ENGL, AD_DGST, 2, 10),
+          NO_ATTK, NO_ATTK, NO_ATTK),
+        SIZ(2500, 500, MS_BURBLE, MZ_HUGE), MR_POISON, 0,
+        M1_CLING | M1_ANIMAL | M1_NOHANDS | M1_OMNIVORE
+            | M1_THICK_HIDE | M1_MINDLESS | M1_SEE_INVIS,
+        M2_HOSTILE | M2_STRONG | M3_JUMPER,
+        M3_INFRAVISIBLE | M3_INFRAVISION,
+        NO_RACE, 17, CLR_CYAN, WUMPUS),
     MON(NAM("titanothere"), S_QUADRUPED,
         LVL(12, 12, 6, 0, 0), (G_GENO | 2),
         A(ATTK(AT_KICK, AD_PHYS, 8, 8),