Merge branch 'updates' into merges

Notes on resolving this latest merge:
- The new artifact changes are quite substantial. To accomodate them I decided to port the artifact "value" handling as is, but set all the artifacts to 1 (except quest artifacts which are 12) so that they are still gifted as normal. Because we have altars that eventually crack and disappear, this mechanic is not applicable.
- I did some work with artifact enchantments, I standardized the bane enchantments to +2 and armor enchantments to +1, and sprinkled +x as felt needed.
- The luck aspect of #offering was ported as is.

Cross-compiling

@@ -472,18 +472,18 @@ Cross-compiler pre-built binary downloads:
        or pdcursesmod from:
            https://github.com/Bill-Gray/PDCursesMod.git
 
-    - A shell script to download that djgpp cross-compiler and associated
+    - A bash script to download that djgpp cross-compiler and associated
       pieces for either linux or macOS is available:
 
-           sh sys/msdos/fetch-cross-compiler.sh
+           bash sys/msdos/fetch-cross-compiler.sh
 
     That script won't install anything, it just does file fetches and stores
     them in subfolders of lib. The linux.370 and macOS.370 hints files are
     configured to find the cross-compiler there if you add
         CROSS_TO_MSDOS=1
     on your make command line.
 
-    Note: Both the fetch-cross-compiler.sh script and the msdos
+    Note: Both the fetch-cross-compiler.sh bash script and the msdos
     cross-compile and package procedures require unzip and zip to be available
     on your host build system.
 

azure-pipelines.yml

@@ -225,7 +225,7 @@ steps:
     sh setup.sh hints/linux.370
     cd ../..
     make fetch-lua
-    sh sys/msdos/fetch-cross-compiler.sh
+    sys/msdos/fetch-cross-compiler.sh
     retVal=$?
     if [ $retVal -eq 0 ]; then
         make LUA_VERSION=5.4.6 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package

doc/fixes3-7-0.txt

@@ -1486,6 +1486,13 @@ digging in ice was handled inconsistently, particularly if done at the span
 angry god may remove an intrinsic
 gelatinous cubes eat organic objects inside them
 pets with reflection were unwilling to attack floating eyes
+artifact gifts are rebalanced (easier to obtain; higher-value sacrifices are
+	needed for higher-value artifacts; lower-value artifacts are usually
+	gifted enchanted; unaligned artifacts are possible but rare even on
+	the first gift; artifacts you can't use well are less likely)
+luck gains from sacrificing are limited by the value of the sacrifice
+failed #untrap could move hero diagonally into or out of an open doorway
+remember box is trapped after finding the trap
 
 
 Fixes to 3.7.0-x General Problems Exposed Via git Repository
@@ -2066,6 +2073,11 @@ if a pile of objects had plain arrow(s) on top, map location classification
 	got confused and reported 'unexplored area'
 when the 'fireassist' option was on, 'f' would choose uquiver over wielded
 	throw-and-return uwep
+knockback could move hero diagonally into or out of an open doorway
+farlook of /e or /E stopped reporting engraving and headstone text after a fix
+	for the situation where // or ; reported such text when there was an
+	object or monster in the way
+message was garbled when lightning or acid breath hit iron bars
 
 
 Fixes to 3.7.0-x Platform and/or Interface Problems Exposed Via git Repository

doc/lua.adoc

@@ -850,6 +850,7 @@ The table parameter accepts the following:
 | eroded      | int      | Object erosion
 | locked      | boolean  | Is the object locked?
 | trapped     | boolean  | Is the object trapped?
+| trap_known  | boolean  | If container is trapped, is it obvious?
 | recharged   | boolean  | Is the object recharged?
 | greased     | boolean  | Is the object greased?
 | broken      | boolean  | Is the object broken?

include/artifact.h

@@ -53,6 +53,8 @@ struct artifact {
     aligntyp alignment; /* alignment of bequeathing gods */
     short role;         /* character role associated with */
     short race;         /* character race associated with */
+    schar gen_spe;      /* bias to spe when gifted or randomly generated */
+    uchar gift_value;   /* minimum sacrifice value to be gifted this */
     long cost;          /* price when sold to hero (default 100 x base cost) */
     char acolor;        /* color to use if artifact 'glows' */
 };