From: Pasi Kallinen <paxed@alt.org>
Date: Sat, 19 Feb 2022 09:51:06 +0000 (+0200)
Subject: Knight quest home level has some saddled warhorses
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1d5464fa7daf58bc5067a720b21747cae6d0782;p=nethack

Knight quest home level has some saddled warhorses

Also, when creating a saddle in a monster inventory in special
level lua code, automatically saddle the monster, if possible.
---

diff --git a/dat/Kni-strt.lua b/dat/Kni-strt.lua
index d7f9284c5..00783106a 100644
--- a/dat/Kni-strt.lua
+++ b/dat/Kni-strt.lua
@@ -103,3 +103,7 @@ des.monster({ id = "quasit", x=32, y=00, peaceful=0 })
 des.monster({ id = "quasit", x=34, y=00, peaceful=0 })
 des.monster({ id = "quasit", x=36, y=00, peaceful=0 })
 
+-- Some warhorses
+for i = 1, 2 + nh.rn2(3) do
+    des.monster({ id = "warhorse", peaceful = 1, inventory = function() if percent(50) then des.object("saddle"); end end });
+end
\ No newline at end of file
diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index f1643e64e..0cdfcf837 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -787,6 +787,7 @@ martial arts users, sasquatches, and heroes wearing kicking boots can
 knights get no caitiff penalty against undead
 candy bars are bright blue in text mode
 towels weigh more than blindfolds
+knight quest home level contains some saddled warhorses
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/sp_lev.c b/src/sp_lev.c
index f2ee11783..cde164295 100644
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -2198,7 +2198,10 @@ create_object(object* o, struct mkroom* croom)
                 ; /* ['otmp' remains on floor] */
             } else {
                 remove_object(otmp);
-                (void) mpickobj(invent_carrying_monster, otmp);
+                if (otmp->otyp == SADDLE)
+                    put_saddle_on_mon(otmp, invent_carrying_monster);
+                else
+                    (void) mpickobj(invent_carrying_monster, otmp);
             }
         } else {
             struct obj *cobj = container_obj[container_idx - 1];