mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 14:02:59 +00:00
Code Issues Releases Wiki Activity

fixed missing 'too far' messages on Frog-like orbs

Browse Source
This commit is contained in:
Zeno Rogue
2022-09-15 12:04:08 +02:00
parent d7e4c25c92
commit a20063c119
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
orbs.cpp
View File

@@ -1421,7 +1421,7 @@ EX eItem targetRangedOrb(cell *c, orbAction a) {
cell *jumpthru = NULL; cell *jumpthru = NULL;
// orb of vaulting // orb of vaulting
if(!shmup::on && items[itOrbDash] && c->cpdist == 2) { if(!shmup::on && items[itOrbDash] && CHK(c->cpdist == 2, XLAT("Cannot vault that far!"))) {
changes.init(isCheck(a)); changes.init(isCheck(a));
int vaultstate = check_vault(cwt.at, c, P_ISPLAYER, jumpthru); int vaultstate = check_vault(cwt.at, c, P_ISPLAYER, jumpthru);
@@ -1461,7 +1461,7 @@ EX eItem targetRangedOrb(cell *c, orbAction a) {
else changes.rollback(); else changes.rollback();
} }
if(items[itOrbFrog] && c->cpdist == 2) { if(items[itOrbFrog] && CHK(c->cpdist == 2, XLAT("Cannot jump that far!"))) {
changes.init(isCheck(a)); changes.init(isCheck(a));
int frogstate = check_jump(cwt.at, c, P_ISPLAYER, jumpthru); int frogstate = check_jump(cwt.at, c, P_ISPLAYER, jumpthru);
if(frogstate == 1 && jumpthru && jumpthru->monst) { if(frogstate == 1 && jumpthru && jumpthru->monst) {
@@ -1485,7 +1485,7 @@ EX eItem targetRangedOrb(cell *c, orbAction a) {
else changes.rollback(); else changes.rollback();
} }
if(items[itOrbPhasing] && c->cpdist == 2) { if(items[itOrbPhasing] && CHK(c->cpdist == 2, XLAT("Cannot phase that far!"))) {
changes.init(isCheck(a)); changes.init(isCheck(a));
if(shmup::on) shmup::pushmonsters(); if(shmup::on) shmup::pushmonsters();
int phasestate = check_phase(cwt.at, c, P_ISPLAYER, jumpthru); int phasestate = check_phase(cwt.at, c, P_ISPLAYER, jumpthru);