mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-07 20:02:50 +00:00
Code Issues Releases Wiki Activity

fixed the message order for teleport/jump orbs

Browse Source
This commit is contained in:
Zeno Rogue 2018-08-01 14:05:17 +02:00
parent f734df14f6
commit 9220938e79
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
orbs.cpp
View File

@ -542,6 +542,8 @@ void teleportTo(cell *dest) {
return; return;
} }
addMessage(XLAT("You teleport to a new location!"));
killFriendlyIvy(); killFriendlyIvy();
cell *from = cwt.c; cell *from = cwt.c;
movecost(from, dest, 1); movecost(from, dest, 1);
@ -549,7 +551,6 @@ void teleportTo(cell *dest) {
cwt.c = dest; cwt.spin = hrand(dest->type); flipplayer = !!(hrand(2)); cwt.c = dest; cwt.spin = hrand(dest->type); flipplayer = !!(hrand(2));
drainOrb(itOrbTeleport); drainOrb(itOrbTeleport);
addMessage(XLAT("You teleport to a new location!"));
mirror::destroyAll(); mirror::destroyAll();
afterplayermoved(); afterplayermoved();
@ -568,6 +569,22 @@ void teleportTo(cell *dest) {
void jumpTo(cell *dest, eItem byWhat, int bonuskill, eMonster dashmon) { void jumpTo(cell *dest, eItem byWhat, int bonuskill, eMonster dashmon) {
if(byWhat != itStrongWind) playSound(dest, "orb-frog"); if(byWhat != itStrongWind) playSound(dest, "orb-frog");
cell *from = cwt.c; cell *from = cwt.c;
if(byWhat == itOrbFrog) {
useupOrb(itOrbFrog, 5);
addMessage(XLAT("You jump!"));
}
if(byWhat == itOrbDash) {
useupOrb(itOrbDash, 5);
addMessage(XLAT("You vault over %the1!", dashmon));
}
if(byWhat == itOrbPhasing) {
useupOrb(itOrbPhasing, 5);
addMessage(XLAT("You jump!"));
}
movecost(from, dest, 1); movecost(from, dest, 1);
killFriendlyIvy(); killFriendlyIvy();
@ -587,21 +604,6 @@ void jumpTo(cell *dest, eItem byWhat, int bonuskill, eMonster dashmon) {
if(cwt.c->item != itOrbYendor && cwt.c->item != itHolyGrail) if(cwt.c->item != itOrbYendor && cwt.c->item != itHolyGrail)
collectItem(cwt.c, true); collectItem(cwt.c, true);
if(byWhat == itOrbFrog) {
useupOrb(itOrbFrog, 5);
addMessage(XLAT("You jump!"));
}
if(byWhat == itOrbDash) {
useupOrb(itOrbDash, 5);
addMessage(XLAT("You vault over %the1!", dashmon));
}
if(byWhat == itOrbPhasing) {
useupOrb(itOrbPhasing, 5);
addMessage(XLAT("You jump!"));
}
mirror::destroyAll(); mirror::destroyAll();
for(int i=9; i>=0; i--) for(int i=9; i>=0; i--)