From c67f9b72afc938df09bc02fee906f274b269c9b1 Mon Sep 17 00:00:00 2001
From: Jesse Ruderman <jruderman@gmail.com>
Date: Sat, 10 Jul 2021 02:32:13 -0700
Subject: [PATCH] Cave transformation is fairer to players

---
 attack.cpp  | 3 ++-
 complex.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/attack.cpp b/attack.cpp
index 26d34134..a51300bd 100644
--- a/attack.cpp
+++ b/attack.cpp
@@ -567,7 +567,8 @@ EX void killMonster(cell *c, eMonster who, flagtype deathflags IS(0)) {
     forCellEx(c1, c) {
       changes.ccell(c1);
       c1->item = itNone;
-      if(c1->wall == waDeadwall || c1->wall == waDeadfloor2) c1->wall = waCavewall;
+      if(c1->wall == waDeadwall) c1->wall = waCavewall;
+      if(c1->wall == waDeadfloor2 && !c1->monst && !isPlayerOn(c1)) c1->wall = waCavewall;
       if(c1->wall == waDeadfloor) c1->wall = waCavefloor;
       }
     }
diff --git a/complex.cpp b/complex.cpp
index 7648bc58..7db92443 100644
--- a/complex.cpp
+++ b/complex.cpp
@@ -2349,7 +2349,7 @@ EX void livecaves() {
       for(cell *c2: adj_minefield_cells(c)) {
         eWall w = c2->wall;
         if(w == waDeadfloor) hv++, bringlife.push_back(c2);
-        else if(w == waDeadwall || (w == waDeadfloor2 && !c2->monst))
+        else if(w == waDeadwall || (w == waDeadfloor2 && !c2->monst && !isPlayerOn(c2)))
           hv--, bringlife.push_back(c2);
         else if(w == waCavefloor) hv++;
         else if(w == waCavewall) hv--;