Skip to content

Fix pushing an Animated Die saying "You push the Unhappy Die." #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zenorogue merged 1 commit into from
Aug 25, 2025
Merged

Fix pushing an Animated Die saying "You push the Unhappy Die." #434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pcmove.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,7 @@ void apply_chaos() {
}

bool pcmove::actual_move() {
eMonster pushedMonster = moNone;

origd = d;
if(d >= 0) {
Expand Down Expand Up @@ -805,6 +806,7 @@ bool pcmove::actual_move() {
if(mip.proper()) {
auto tgt = roll_effect(mip, dice::data[c2]);
if(tgt.happy() > 0) {
pushedMonster = c2->monst;
changes.ccell(c2);
c2->monst = moNone;
c2->wall = waRichDie;
Expand Down Expand Up @@ -840,7 +842,8 @@ bool pcmove::actual_move() {
return false;
}
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;
pushThumper(mip);
changes.push_push(mip.t);
Expand Down
Loading