From 96ebb7a1a24286cfefc2c32dbd52c61c0c1d0573 Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 11 Jul 2022 09:59:09 +0100 Subject: [PATCH] Cleanup --- src/Dodge/Item/Equipment.hs | 1 - src/Dodge/Item/Equipment/Shape.hs | 7 ------- src/Dodge/Item/Weapon/Radar.hs | 5 ----- src/Dodge/Item/Weapon/UseEffect.hs | 4 ++-- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/Dodge/Item/Equipment.hs b/src/Dodge/Item/Equipment.hs index 5f9e6e597..6e32c48fe 100644 --- a/src/Dodge/Item/Equipment.hs +++ b/src/Dodge/Item/Equipment.hs @@ -16,7 +16,6 @@ module Dodge.Item.Equipment ) where import Dodge.Data import Dodge.Item.Draw -import Dodge.Item.Equipment.Shape import Dodge.Item.Equipment.Booster import Dodge.LightSource import Dodge.Default diff --git a/src/Dodge/Item/Equipment/Shape.hs b/src/Dodge/Item/Equipment/Shape.hs index 9c8dfcff4..80770dba8 100644 --- a/src/Dodge/Item/Equipment/Shape.hs +++ b/src/Dodge/Item/Equipment/Shape.hs @@ -1,18 +1,11 @@ module Dodge.Item.Equipment.Shape where import Dodge.Data import Dodge.Creature.HandPos -import Shape import ShapePicture -import Geometry import LensHelp import Data.Maybe ---shapeForWrist :: Shape -> SPic ---shapeForWrist = noPic . translateSH (V3 0 4 (-4)) --- ---spicForWrist :: SPic -> SPic ---spicForWrist = translateSP (V3 0 4 (-4)) pictureOnEquip :: SPic -> Creature -> Item -> SPic pictureOnEquip sp cr itm = fromMaybe mempty $ do i <- itm ^? itPos . ipInvID diff --git a/src/Dodge/Item/Weapon/Radar.hs b/src/Dodge/Item/Weapon/Radar.hs index 550992245..daa9ef088 100644 --- a/src/Dodge/Item/Weapon/Radar.hs +++ b/src/Dodge/Item/Weapon/Radar.hs @@ -2,9 +2,6 @@ module Dodge.Item.Weapon.Radar where import Dodge.Data --import Dodge.Picture.Layer import Dodge.Default ---import Dodge.Item.Draw ---import Dodge.Item.Equipment -import Dodge.Item.Equipment.Shape import Dodge.Item.Weapon.TriggerType import Dodge.Item.Weapon.ExtraEffect import Dodge.Item.Weapon.UseEffect @@ -34,8 +31,6 @@ clickDetector dt = defaultWeapon autoDetector :: Detector -> Item autoDetector dt = defaultEquipment - { _itID = Nothing - } & itUse . eqEq . eqSite .~ GoesOnWrist & itUse . eqEq . eqUse .~ autoEffect (detectorEffect dt) 100 click1S & itUse . eqEq . eqParams .~ EquipCounter 0 diff --git a/src/Dodge/Item/Weapon/UseEffect.hs b/src/Dodge/Item/Weapon/UseEffect.hs index 128466cd2..71eef7850 100644 --- a/src/Dodge/Item/Weapon/UseEffect.hs +++ b/src/Dodge/Item/Weapon/UseEffect.hs @@ -74,8 +74,8 @@ itemBlips p r = IM.elems . IM.filter f . fmap _flItPos . _floorItems wallBlips :: Point2 -> Float -> World -> [Point2] wallBlips p r w = runIdentity . S.toList_ $ S.mapMaybe (uncurry (intersectCircSegFirst p r) . _wlLine) - $ S.map (over wlLine swp) (wlsInsideCirc p r w) - <> wlsInsideCirc p r w + $ S.map (over wlLine swp) (wlsInsideCirc p r w) + <> wlsInsideCirc p r w where swp (a,b) = (b,a)