From 3bd67f466ab0b91b5d89c483e7e8a3f6e5588f88 Mon Sep 17 00:00:00 2001 From: Jacob Mandelson Date: Mon, 11 Mar 2024 11:28:15 -0700 Subject: [PATCH 1/3] Remove trees and red rock from conductive walls. --- complex.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/complex.cpp b/complex.cpp index 9a92500c9..7b13a9f7d 100644 --- a/complex.cpp +++ b/complex.cpp @@ -215,7 +215,7 @@ EX namespace elec { if(c->wall == waSea || c->wall == waGrounded) return ecGrounded; if(c->wall == waSandstone || c->wall == waDeadTroll || c->wall == waDeadTroll2 || - among(c->wall, waBigTree, waSmallTree, waExplosiveBarrel, waRed1, waRed2, waRed3) || + c->wall == waExplosiveBarrel || c->wall == waVinePlant || c->wall == waMetal || isAlchAny(c)) return isElectricLand(c) ? ecConductor : ecGrounded; From a40e72f1d88049b2b975fd44efbd61ee9fb74675 Mon Sep 17 00:00:00 2001 From: Jacob Mandelson Date: Mon, 11 Mar 2024 11:42:13 -0700 Subject: [PATCH 2/3] Mark trees as grounded walls. --- complex.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/complex.cpp b/complex.cpp index 7b13a9f7d..f66af4f13 100644 --- a/complex.cpp +++ b/complex.cpp @@ -219,6 +219,8 @@ EX namespace elec { c->wall == waVinePlant || c->wall == waMetal || isAlchAny(c)) return isElectricLand(c) ? ecConductor : ecGrounded; + if(c->wall == waBigTree || c->wall == waSmallTree) + return ecGrounded; if(c->wall == waBarrier) return ecIsolator; if(c->wall == waChasm) From ee293310b6d4f6b312035cff01bb168e20e5e467 Mon Sep 17 00:00:00 2001 From: Jacob Mandelson Date: Mon, 11 Mar 2024 12:03:48 -0700 Subject: [PATCH 3/3] Consider red rock & rubble to electrically insulate. --- complex.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/complex.cpp b/complex.cpp index f66af4f13..aa8c236b9 100644 --- a/complex.cpp +++ b/complex.cpp @@ -221,6 +221,8 @@ EX namespace elec { 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) return ecIsolator; if(c->wall == waChasm)