mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/zenorogue/hyperrogue

Browse Source
This commit is contained in:
Zeno Rogue 2024-03-19 18:54:04 +01:00
commit 5bdade94b6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
complex.cpp
View File

@ -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)