From f2ebcc93ea5b9b784c13f4707b10524f2602e08b Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 27 May 2021 15:55:01 +0200
Subject: [PATCH] improved dice movement on conflicts

---
 monstermove.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/monstermove.cpp b/monstermove.cpp
index 9f39f52e..503bd038 100644
--- a/monstermove.cpp
+++ b/monstermove.cpp
@@ -1090,11 +1090,6 @@ EX void groupmove2(const movei& mi, eMonster movtype, flagtype mf) {
     }
   else return;
   
-  if(c->monst == moAnimatedDie) {
-    forCellEx(c3, from) if(c3 != c && c3->monst == moAnimatedDie)
-      return;
-    }
-
   if(from->monst) {
     if(mf & MF_MOUNT) {
       // don't go through friends
@@ -1158,6 +1153,13 @@ EX void groupmove2(const movei& mi, eMonster movtype, flagtype mf) {
     
     moveMonster(mi);
     onpath(from, 0);
+
+    if(mi.t->monst == moAnimatedDie) {
+      /* other dice will not pathfind through the original cell */
+      /* this makes it easier for the player to roll dice correctly */
+      onpath(c, 0);
+      return;
+      }
     }
   onpath(c, 0);
   // MAXGCELL