mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-08-29 08:52:19 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/zenorogue/hyperrogue

Browse Source
This commit is contained in:
Zeno Rogue
2025-08-25 21:52:15 +02:00
parent 6b30441ea1 50960a0761
commit 507b290a81
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pcmove.cpp
View File

@@ -754,6 +754,7 @@ void apply_chaos() {
} }
bool pcmove::actual_move() { bool pcmove::actual_move() {
eMonster pushedMonster = moNone;
origd = d; origd = d;
if(d >= 0) { if(d >= 0) {
@@ -805,6 +806,7 @@ bool pcmove::actual_move() {
if(mip.proper()) { if(mip.proper()) {
auto tgt = roll_effect(mip, dice::data[c2]); auto tgt = roll_effect(mip, dice::data[c2]);
if(tgt.happy() > 0) { if(tgt.happy() > 0) {
pushedMonster = c2->monst;
changes.ccell(c2); changes.ccell(c2);
c2->monst = moNone; c2->monst = moNone;
c2->wall = waRichDie; c2->wall = waRichDie;
@@ -840,7 +842,8 @@ bool pcmove::actual_move() {
return false; return false;
} }
nextmovetype = lmMove; nextmovetype = lmMove;
addMessage(XLAT("You push %the1.", c2->wall)); if(pushedMonster == moNone) addMessage(XLAT("You push %the1.", c2->wall));
else addMessage(XLAT("You push %the1.", pushedMonster));
lastmovetype = lmPush; lastmove = cwt.at; lastmovetype = lmPush; lastmove = cwt.at;
pushThumper(mip); pushThumper(mip);
changes.push_push(mip.t); changes.push_push(mip.t);