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

the cost of leaving Land of Power now happens before collecting items

Browse Source
This commit is contained in:
Zeno Rogue
2018-08-01 14:04:47 +02:00
parent f1250a677d
commit 508cecb3b3
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
orbs.cpp
View File

@@ -534,7 +534,7 @@ void teleportTo(cell *dest) {
if(b) {
killFriendlyIvy();
drainOrb(itOrbTeleport);
movecost(cwt.c, dest);
movecost(cwt.c, dest, 3);
playerMoveEffects(cwt.c, dest);
afterplayermoved();
bfs();
@@ -543,7 +543,8 @@ void teleportTo(cell *dest) {
}
killFriendlyIvy();
movecost(cwt.c, dest);
cell *from = cwt.c;
movecost(from, dest, 1);
playerMoveEffects(cwt.c, dest);
cwt.c = dest; cwt.spin = hrand(dest->type); flipplayer = !!(hrand(2));
drainOrb(itOrbTeleport);
@@ -560,11 +561,14 @@ void teleportTo(cell *dest) {
shmup::teleported();
else
checkmoveO();
movecost(from, dest, 2);
}
void jumpTo(cell *dest, eItem byWhat, int bonuskill, eMonster dashmon) {
if(byWhat != itStrongWind) playSound(dest, "orb-frog");
movecost(cwt.c, dest);
cell *from = cwt.c;
movecost(from, dest, 1);
killFriendlyIvy();
@@ -582,7 +586,7 @@ void jumpTo(cell *dest, eItem byWhat, int bonuskill, eMonster dashmon) {
playerMoveEffects(c1, dest);
if(cwt.c->item != itOrbYendor && cwt.c->item != itHolyGrail)
collectItem(cwt.c, true);
if(byWhat == itOrbFrog) {
useupOrb(itOrbFrog, 5);
addMessage(XLAT("You jump!"));
@@ -603,6 +607,8 @@ void jumpTo(cell *dest, eItem byWhat, int bonuskill, eMonster dashmon) {
for(int i=9; i>=0; i--)
setdist(cwt.c, i, NULL);
movecost(from, dest, 2);
createNoise(1);
if(shmup::on)