From 52488b251b0b0c52a64f0c95957d27f55214f645 Mon Sep 17 00:00:00 2001
From: justin <justin.g.kruger@gmail.com>
Date: Tue, 7 Jun 2022 16:39:47 +0100
Subject: [PATCH] Commit before changing wall drawing

---
 src/Dodge/Data.hs                    | 3 +++
 src/Dodge/Item/Weapon/Utility.hs     | 1 +
 src/Dodge/Placement/Instance/Wall.hs | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Dodge/Data.hs b/src/Dodge/Data.hs
index d7e4636d4..e26a402ec 100644
--- a/src/Dodge/Data.hs
+++ b/src/Dodge/Data.hs
@@ -721,6 +721,9 @@ data AmmoType
         { _amString    :: String
         , _amCreateGas :: Float -> Point2 -> Float -> Creature -> World -> World
         }
+    | ForceFieldAmmo
+        { _amForceFieldType :: Wall
+        }
     | GenericAmmo
 data ItemTweaks
     = NoTweaks
diff --git a/src/Dodge/Item/Weapon/Utility.hs b/src/Dodge/Item/Weapon/Utility.hs
index 5704786b1..0e4a30785 100644
--- a/src/Dodge/Item/Weapon/Utility.hs
+++ b/src/Dodge/Item/Weapon/Utility.hs
@@ -144,6 +144,7 @@ forceFieldGun = defaultGun
         , _ammoLoaded = 100
         , _reloadTime = 40
         , _reloadState = Nothing'
+        , _aoType = ForceFieldAmmo forceField
         }
     , _itUse = ruseInstant useForceFieldGun (HasHammer HammerUp)
         [ hammerCheckI , ammoCheckI , useAmmoAmount 1]
diff --git a/src/Dodge/Placement/Instance/Wall.hs b/src/Dodge/Placement/Instance/Wall.hs
index b7470a6f1..73ccb84ae 100644
--- a/src/Dodge/Placement/Instance/Wall.hs
+++ b/src/Dodge/Placement/Instance/Wall.hs
@@ -121,7 +121,7 @@ baseWindowPane :: Wall
 baseWindowPane = defaultWall
     { _wlLine = (V2 0 0,V2 50 0)
     , _wlID = 0
-    , _wlColor = withAlpha 0.2 cyan
+    , _wlColor = cyan
     , _wlSeen = False
     , _wlOpacity = SeeThrough
     , _wlDraw = True