1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-01 07:49:55 +00:00

Merge pull request #178 from jruderman/plague_time

Orb of Time now preserves Orb of Plague properly
This commit is contained in:
Zeno Rogue 2021-07-04 09:47:51 +02:00 committed by GitHub
commit 934054a6c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1497,7 +1497,8 @@ EX void swordAttackStatic() {
EX int plague_kills; EX int plague_kills;
EX void spread_plague(cell *mf, cell *mt, int dir, eMonster who) { EX void spread_plague(cell *mf, cell *mt, int dir, eMonster who) {
if(!(who == moPlayer ? markOrb(itOrbPlague) : markEmpathy(itOrbPlague))) return; if(!items[itOrbPlague]) return;
if(who != moPlayer && !items[itOrbEmpathy]) return;
forCellEx(mx, mt) if(celldistance(mx, mf) > celldistance(mx, mf->modmove(dir)) && celldistance(mx, mf) <= 4) { forCellEx(mx, mt) if(celldistance(mx, mf) > celldistance(mx, mf->modmove(dir)) && celldistance(mx, mf) <= 4) {
sideAttackAt(mf, dir, mx, who, itOrbPlague, mt); sideAttackAt(mf, dir, mx, who, itOrbPlague, mt);
} }