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

Orb of the Sword can now kill yourself through mirror or topology

Browse Source
This commit is contained in:
Zeno Rogue
2022-06-17 10:40:26 +02:00
parent 7a7a982b33
commit c6369ac832
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pcmove.cpp
View File

@@ -248,6 +248,7 @@ bool pcmove::movepcto() {
mip.t = NULL;
switchplaces = false;
warning_shown = false;
suicidal = false;
if(d == MD_USE_ORB)
return targetRangedOrb(multi::whereto[multi::cpid].tgt, roMultiGo);
@@ -1495,6 +1496,8 @@ EX bool swordAttack(cell *mt, eMonster who, cell *c, int bb) {
}
if(c->wall == waExplosiveBarrel)
explodeBarrel(c);
if(!peace::on && isPlayerOn(c) && whichPlayerOn(c) != multi::cpid && !markOrb(itOrbEmpathy)) killThePlayer(moPlayer, whichPlayerOn(mt), 0);
if(!peace::on && mt == c && !markOrb(itOrbEmpathy)) killThePlayer(moPlayer, multi::cpid, 0);
if(!peace::on && canAttack(mt, who, c, m, AF_SWORD)) {
changes.ccell(c);
markOrb(bb ? itOrbSword2: itOrbSword);