Shop prices for Draugr, other price tweaks.

Draugr are permanently banned from entering a shop via normal means, but
this doesn't mean they couldn't wind up inside a shop anyways. Could
teleport in, or fall through a trap door into one, and so on. The
capitalist shopkeeper mentality is 'well, so long as they're here...'
but the markup for zombie types is extremely high. Twenty times that of
normal for most shopkeepers. While here, I also made the pricing for
gnome and nymph shopkeepers a bit more varied.

Author: k21971

doc/evilhack-changelog.md

@@ -3434,4 +3434,5 @@ The following changes to date are:
 - More role-specific bits for Draugr
 - Ensure unique undead monsters are appropriately hostile towards Draugr
 - Tweak feedback between shopkeepers and Draugr
+- Shop prices for Draugr, other price tweaks
 

src/shk.c

@@ -2160,6 +2160,8 @@ long *numerator, *denominator;
         } else if (Race_if(PM_CENTAUR)) {
             *numerator = 3L;
             *denominator = 2L;
+        } else if (Race_if(PM_DRAUGR)) {
+            *numerator = 20L;
         }
     } else if (is_elf(shkdat)) {
         if (Race_if(PM_ORC) || Race_if(PM_ILLITHID)
@@ -2171,6 +2173,8 @@ long *numerator, *denominator;
         } else if (Race_if(PM_ELF)) {
             *numerator = 4L;
             *denominator = 5L;
+        } else if (Race_if(PM_DRAUGR)) {
+            *numerator = 20L;
         }
     } else if (is_drow(shkdat)) {
         if (Race_if(PM_ORC) || Race_if(PM_ILLITHID)
@@ -2182,6 +2186,8 @@ long *numerator, *denominator;
         } else if (Race_if(PM_DROW)) {
             *numerator = 4L;
             *denominator = 5L;
+        } else if (Race_if(PM_DRAUGR)) {
+            *numerator = 20L;
         }
     } else if (is_dwarf(shkdat)) {
         if (Race_if(PM_ORC) || Race_if(PM_ILLITHID)) {
@@ -2195,6 +2201,8 @@ long *numerator, *denominator;
         } else if (Race_if(PM_DWARF)) {
             *numerator = 3L;
             *denominator = 4L;
+        } else if (Race_if(PM_DRAUGR)) {
+            *numerator = 20L;
         }
     } else if (is_orc(shkdat)) {
         if (Race_if(PM_ELF) || Race_if(PM_GNOME)
@@ -2209,9 +2217,15 @@ long *numerator, *denominator;
         } else if (Race_if(PM_ORC)) {
             *numerator = 2L;
             *denominator = 3L;
+        } else if (Race_if(PM_DRAUGR)) {
+            *numerator = 20L;
         }
     } else if (is_gnome(shkdat)) {
-        if (ACURR(A_INT) < 15) {
+        if (ACURR(A_INT) <= 6) {
+            *numerator = 6L;
+        } else if (ACURR(A_INT) < 12) {
+            *numerator = 2L;
+        } else if (ACURR(A_INT) < 15) {
             *numerator = 3L;
             *denominator = 2L;
         } else if (ACURR(A_INT) < 18) {
@@ -2224,7 +2238,8 @@ long *numerator, *denominator;
             return;
         }
         if (!Race_if(PM_ILLITHID))
-            *numerator = ((mnum - PM_ILLITHID + 1) * 10);
+            *numerator =
+                ((mnum - PM_ILLITHID + 1) * (Race_if(PM_DRAUGR) ? 20 : 10));
     } else if (is_centaur(shkdat)) {
         if (Race_if(PM_HUMAN) || Race_if(PM_GNOME)
             || Race_if(PM_DWARF) || Race_if(PM_ORC)
@@ -2234,6 +2249,8 @@ long *numerator, *denominator;
         } else if (Race_if(PM_CENTAUR)) {
             *numerator = 3L;
             *denominator = 4L;
+        } else if (Race_if(PM_DRAUGR)) {
+            *numerator = 20L;
         }
     } else if (is_giant(shkdat)) {
         if (Race_if(PM_HUMAN) || Race_if(PM_GNOME)
@@ -2247,18 +2264,20 @@ long *numerator, *denominator;
         } else if (Race_if(PM_GIANT)) {
             *numerator = 3L;
             *denominator = 4L;
+        } else if (Race_if(PM_DRAUGR)) {
+            *numerator = 20L;
         }
     } else if (shkdat == &mons[PM_NYMPH]) {
-        if (mnum < PM_NYMPH) {
-            impossible("mnum for nymph shopkeeper is too low!");
-            return;
-        }
-        if (ACURR(A_CHA) > 14) {
-            *numerator = 4L;
-            *denominator = 3L;
-        } else {
+        if (ACURR(A_CHA) <= 6) {
+            *numerator = 8L;
+        } else if (ACURR(A_CHA) < 12) {
+            *numerator = 3L;
+        } else if (ACURR(A_CHA) < 15) {
             *numerator = 5L;
             *denominator = 3L;
+        } else if (ACURR(A_CHA) < 18) {
+            *numerator = 4L;
+            *denominator = 3L;
         }
     } else {
         ; /* other monsters are possible (e.g. polyed shopkeeper); don't do any