mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-18 05:03:02 +00:00
Code Issues Releases Wiki Activity

dual:: you can now swing at unkillable monsters

Browse Source
This commit is contained in:
Zeno Rogue 2019-05-29 23:10:16 +02:00
parent 5e05a0db61
commit c3586308fa
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
game.cpp
View File

@ -8061,6 +8061,7 @@ bool movepcto(int d, int subdir, bool checkonly) {
addMessage(XLAT("You swing your sword at %the1.", c2->wall)); addMessage(XLAT("You swing your sword at %the1.", c2->wall));
else else
addMessage(XLAT("You swing your sword.")); addMessage(XLAT("You swing your sword."));
swing:
sideAttack(cwt.at, d, moPlayer, 0); sideAttack(cwt.at, d, moPlayer, 0);
animateAttack(cwt.at, c2, LAYER_SMALL, d); animateAttack(cwt.at, c2, LAYER_SMALL, d);
} }
@ -8084,7 +8085,18 @@ bool movepcto(int d, int subdir, bool checkonly) {
if(items[itOrbSpeed]&1) attackflags |= AF_FAST; if(items[itOrbSpeed]&1) attackflags |= AF_FAST;
if(items[itOrbSlaying]) attackflags |= AF_CRUSH; if(items[itOrbSlaying]) attackflags |= AF_CRUSH;
if(!canAttack(cwt.at, moPlayer, c2, c2->monst, attackflags)) { bool ca =canAttack(cwt.at, moPlayer, c2, c2->monst, attackflags);
if(!ca) {
if(forcedmovetype == fmAttack) {
if(monstersnear(cwt.at,c2,moPlayer,NULL,cwt.at)) {
if(!checkonly && errormsgs) wouldkill("%The1 would get you!");
return false;
}
if(checkonly) { nextmovetype = lmSkip; return true; }
addMessage(XLAT("You swing your sword at %the1.", c2->monst));
goto swing;
}
if(checkonly) return false; if(checkonly) return false;
if(c2->monst == moWorm || c2->monst == moWormtail || c2->monst == moWormwait) if(c2->monst == moWorm || c2->monst == moWormtail || c2->monst == moWormwait)
addMessage(XLAT("You cannot attack Sandworms directly!")); addMessage(XLAT("You cannot attack Sandworms directly!"));