mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

improved dice movement on conflicts

This commit is contained in:
Zeno Rogue 2021-05-27 15:55:01 +02:00
parent 0065f160d0
commit f2ebcc93ea
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monstermove.cpp
View File

@ -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