mirror of
				https://github.com/zenorogue/hyperrogue.git
				synced 2025-10-31 14:02:59 +00:00 
			
		
		
		
	Merge branch 'master' of https://github.com/zenorogue/hyperrogue
This commit is contained in:
		| @@ -215,10 +215,14 @@ EX namespace elec { | |||||||
|     if(c->wall == waSea || c->wall == waGrounded) return ecGrounded; |     if(c->wall == waSea || c->wall == waGrounded) return ecGrounded; | ||||||
|     if(c->wall == waSandstone || c->wall == waDeadTroll ||  |     if(c->wall == waSandstone || c->wall == waDeadTroll ||  | ||||||
|       c->wall == waDeadTroll2 ||  |       c->wall == waDeadTroll2 ||  | ||||||
|       among(c->wall, waBigTree, waSmallTree, waExplosiveBarrel, waRed1, waRed2, waRed3) || |       c->wall == waExplosiveBarrel || | ||||||
|       c->wall == waVinePlant || |       c->wall == waVinePlant || | ||||||
|       c->wall == waMetal || isAlchAny(c))  |       c->wall == waMetal || isAlchAny(c))  | ||||||
|         return isElectricLand(c) ? ecConductor : ecGrounded;  |         return isElectricLand(c) ? ecConductor : ecGrounded;  | ||||||
|  |     if(c->wall == waBigTree || c->wall == waSmallTree) | ||||||
|  |         return ecGrounded; | ||||||
|  |     if(among(c->wall, waRed1, waRed2, waRed3, waRubble, waDeadfloor2)) | ||||||
|  |         return ecIsolator; | ||||||
|     if(c->wall == waBarrier) |     if(c->wall == waBarrier) | ||||||
|       return ecIsolator; |       return ecIsolator; | ||||||
|     if(c->wall == waChasm) |     if(c->wall == waChasm) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Zeno Rogue
					Zeno Rogue