mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

side attacks acknowledge slaying

Browse Source
This commit is contained in:
Zeno Rogue 2018-01-03 22:33:03 +01:00
parent 1a841aaa4a
commit 454e1909d1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
game.cpp
View File

@ -4839,7 +4839,11 @@ void sideAttack(cell *mf, int dir, eMonster who, int bonus, eItem orb) {
for(int k: {-1, 1}) { for(int k: {-1, 1}) {
cell *mt = getMovR(mf, dir + k*bonus); cell *mt = getMovR(mf, dir + k*bonus);
eMonster m = mt->monst; eMonster m = mt->monst;
if(canAttack(mf, who, mt, m, AF_SIDE)) { flagtype f = AF_SIDE;
if(items[itOrbSlaying]) f|= AF_CRUSH;
if(canAttack(mf, who, mt, m, f)) {
if((f & AF_CRUSH) && !canAttack(mf, who, mt, m, AF_SIDE | AF_MUSTKILL))
markOrb(itOrbSlaying);
markOrb(orb); markOrb(orb);
if(who != moPlayer) markOrb(itOrbEmpathy); if(who != moPlayer) markOrb(itOrbEmpathy);
if(attackMonster(mt, AF_NORMAL | AF_SIDE | AF_MSG, who)) if(attackMonster(mt, AF_NORMAL | AF_SIDE | AF_MSG, who))