mirror of
				https://github.com/zenorogue/hyperrogue.git
				synced 2025-10-31 05:52:59 +00:00 
			
		
		
		
	Merge pull request #178 from jruderman/plague_time
Orb of Time now preserves Orb of Plague properly
This commit is contained in:
		| @@ -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); | ||||||
|     } |     } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Zeno Rogue
					Zeno Rogue