Blackmarket shouldn't generate potential pets

Presented for discussion and possible inclusion in Slash'EM.

This patch has also been submitted to the SourceForge tracker.

I believe it is too easy to get a pet in the black market.  The player
can simply wait for a domestic-type monster to be generated, or just zap
a wand of create horde a few times.  Then tame the animal as usual.

This works around that, making it an actual effort to get a pet.  (I can
think of three or four ways, and there are probably more.)

This patch applies cleanly to Slashem 0.0.8E0F1.

The new code in this patch is contributed by the author, Silas Dunsmore,
to the Slash'EM project, and to the general Nethack community, under the
terms of the Nethack General Public License.

contact: <silasd@...>; put slashem or nethack in the subject line.
===============================================================================
--- slashem-0.0.8E0F1-clean/src/makemon.c 2006-12-30 05:04:53.000000000 -0800
+++ slashem-0.0.8E0F1-regex/src/makemon.c 2007-07-19 13:48:36.142188400 -0700
@@ -1880,10 +1880,13 @@
  if (upper && !isupper((int)def_monsyms[(int)(ptr->mlet)])) continue;
 #endif
  if (elemlevel && wrong_elem_type(ptr)) continue;
  if (uncommon(mndx)) continue;
  if (Inhell && (ptr->geno & G_NOHELL)) continue;
+#ifdef BLACKMARKET /* SWD: pets are not allowed in the black market */
+ if (is_domestic(ptr) && Is_blackmarket(&u.uz)) continue;
+#endif
  ct = (int)(ptr->geno & G_FREQ) + align_shift(ptr);
  if (ct < 0 || ct > 127)
     panic("rndmonst: bad count [#%d: %d]", mndx, ct);
  rndmonst_state.choice_count += ct;
  rndmonst_state.mchoices[mndx] = (char)ct;

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Slashem-devel mailing list
Slashem-devel@...
https://lists.sourceforge.net/lists/listinfo/slashem-devel