mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-26 03:17:39 +00:00
Code Issues Releases Wiki Activity

fixed some bugs with frog orbs

Browse Source
This commit is contained in:
Zeno Rogue
2020-02-29 21:05:55 +01:00
parent 20910ec364
commit 0c6b9aa696
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
orbs.cpp
View File

@@ -609,7 +609,7 @@ EX bool jumpTo(orbAction a, cell *dest, eItem byWhat, int bonuskill IS(0), eMons
if(byWhat == itOrbDash) { if(byWhat == itOrbDash) {
useupOrb(itOrbDash, 5); useupOrb(itOrbDash, 5);
addMessage(XLAT("You vault over %the1!", dashmon)); if(dashmon) addMessage(XLAT("You vault over %the1!", dashmon));
} }
if(byWhat == itOrbPhasing) { if(byWhat == itOrbPhasing) {
@@ -650,7 +650,7 @@ EX bool jumpTo(orbAction a, cell *dest, eItem byWhat, int bonuskill IS(0), eMons
mirror::destroyAll(); mirror::destroyAll();
if(monstersnearO(a, dest, moPlayer, NULL, cwt.at)) { if(monstersnearO(a, dest, moPlayer, NULL, c1)) {
changes.rollback(); changes.rollback();
return false; return false;
} }
@@ -1246,7 +1246,7 @@ EX eItem targetRangedOrb(cell *c, orbAction a) {
jumpstate = 10 + check_vault(cwt.at, c, P_ISPLAYER, jumpthru); jumpstate = 10 + check_vault(cwt.at, c, P_ISPLAYER, jumpthru);
items[itOrbAether] = i; items[itOrbAether] = i;
if(jumpstate == 15) { if(jumpstate == 16) {
changes.init(isCheck(a)); changes.init(isCheck(a));
int k = tkills(); int k = tkills();
eMonster m = jumpthru->monst; eMonster m = jumpthru->monst;
@@ -1257,8 +1257,8 @@ EX eItem targetRangedOrb(cell *c, orbAction a) {
if(m) if(m)
attackMonster(jumpthru, AF_NORMAL | AF_MSG, moPlayer); attackMonster(jumpthru, AF_NORMAL | AF_MSG, moPlayer);
k = tkills() - k; k = tkills() - k;
if(jumpTo(a, c, itOrbDash, k, m)) jumpstate = 16; if(jumpTo(a, c, itOrbDash, k, m)) jumpstate = 17;
if(jumpstate == 16) return itOrbDash; if(jumpstate == 17) return itOrbDash;
} }
} }