mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-01 21:10:35 +00:00
Code Issues Releases Wiki Activity

secondary attacks cause the barrels to explode

Browse Source
This commit is contained in:
Zeno Rogue 2019-01-11 02:25:02 +01:00
parent d64ce588d2
commit d982407d5a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
game.cpp
View File

@ -5184,6 +5184,8 @@ bool swordAttack(cell *mt, eMonster who, cell *c, int bb) {
drawParticles(c, winf[c->wall].color, 16); drawParticles(c, winf[c->wall].color, 16);
c->wall = waNone; c->wall = waNone;
} }
if(c->wall == waExplosiveBarrel)
explodeBarrel(c);
if(!peace::on && canAttack(mt, who, c, m, AF_SWORD)) { if(!peace::on && canAttack(mt, who, c, m, AF_SWORD)) {
markOrb(bb ? itOrbSword2: itOrbSword); markOrb(bb ? itOrbSword2: itOrbSword);
int k = tkills(); int k = tkills();
@ -5225,6 +5227,8 @@ void sideAttack(cell *mf, int dir, eMonster who, int bonus, eItem orb) {
mt->wall = waSmallTree; mt->wall = waSmallTree;
else if(mt->wall == waSmallTree) else if(mt->wall == waSmallTree)
mt->wall = waNone; mt->wall = waNone;
else if(mt->wall == waExplosiveBarrel)
explodeBarrel(mt);
} }
} }
@ -5298,6 +5302,9 @@ void stabbingAttack(cell *mf, cell *mt, eMonster who, int bonuskill) {
bool stabthere = false, away = true; bool stabthere = false, away = true;
if(logical_adjacent(mt, who, c)) stabthere = true, away = false; if(logical_adjacent(mt, who, c)) stabthere = true, away = false;
if(stabthere && c->wall == waExplosiveBarrel && markOrb(itOrbThorns))
explodeBarrel(c);
if(stabthere && canAttack(mt,who,c,c->monst,AF_STAB)) { if(stabthere && canAttack(mt,who,c,c->monst,AF_STAB)) {
if(c->monst != moHedge) { if(c->monst != moHedge) {