From: Pasi Kallinen Date: Sat, 25 May 2019 16:15:53 +0000 (+0300) Subject: Make sure the correct luckstone is the prize X-Git-Tag: nmake-explicit-path~2^2~101 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2562144503dfbcc53fd00c785cf2d8f2aa08ae93;p=nethack Make sure the correct luckstone is the prize The first generated luckstone is marked as the prize in mines' end. Make sure we generate the intended one first, before any other (possibly randomly generated) luckstones. --- diff --git a/dat/mines.des b/dat/mines.des index 19a829bda..1ef2031f5 100644 --- a/dat/mines.des +++ b/dat/mines.des @@ -1042,6 +1042,7 @@ OBJECT:('!',"booze"),(10,09) OBJECT:('!',"object detection"),(10,09) # Objects # The Treasure chamber... +OBJECT:('*',"luckstone"),(70,05) OBJECT:('*',"diamond"),(69,04) OBJECT:'*',(69,04) OBJECT:('*',"diamond"),(69,04) @@ -1058,7 +1059,6 @@ OBJECT:('*',"ruby"),(70,05) OBJECT:('*',"amethyst"),(70,05) OBJECT:'*',(70,05) OBJECT:('*',"amethyst"),(70,05) -OBJECT:('*',"luckstone"),(70,05) # Scattered gems... OBJECT:'*',random OBJECT:'*',random @@ -1147,6 +1147,8 @@ STAIR:(42,8),up WALLIFY # Objects +OBJECT:('*',"luckstone"),$place[0] +OBJECT:('*',"flint"),$place[1] OBJECT:('*',"diamond"),random OBJECT:'*',random OBJECT:('*',"diamond"),random @@ -1163,8 +1165,6 @@ OBJECT:('*',"ruby"),random OBJECT:('*',"amethyst"),random OBJECT:'*',random OBJECT:('*',"amethyst"),random -OBJECT:('*',"luckstone"),$place[0] -OBJECT:('*',"flint"),$place[1] OBJECT:'?',random OBJECT:'?',random OBJECT:'?',random diff --git a/doc/fixes36.3 b/doc/fixes36.3 index 42fe406b0..edb1062eb 100644 --- a/doc/fixes36.3 +++ b/doc/fixes36.3 @@ -23,6 +23,7 @@ when co-located with a boulder you could sometimes swap places with pets of any size on rare occasions, multiple mines-end luckstones were being marked as the prize and triggering an impossible() on a public server +make sure the correct luckstone is the prize in mine's end Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository