diff --git a/src/Dodge/Creature/HandPos.hs b/src/Dodge/Creature/HandPos.hs index d605f65db..1289d69a1 100644 --- a/src/Dodge/Creature/HandPos.hs +++ b/src/Dodge/Creature/HandPos.hs @@ -15,7 +15,6 @@ module Dodge.Creature.HandPos ( ) where import Control.Lens -import Data.Maybe import Dodge.Creature.Test import Dodge.Data.Creature import Geometry diff --git a/src/Dodge/HeldUse.hs b/src/Dodge/HeldUse.hs index 9b6cf3e5e..ad23b6001 100644 --- a/src/Dodge/HeldUse.hs +++ b/src/Dodge/HeldUse.hs @@ -12,7 +12,6 @@ import Control.Monad import Data.Maybe import Dodge.Base.Collide import Dodge.Base.Coordinate -import Dodge.Creature.HandPos import Dodge.Data.ComposedItem import Dodge.Data.DoubleTree import Dodge.Data.MuzzleEffect @@ -365,10 +364,8 @@ getBulletTrajectory mz itm bt tp cr w = case bt of BezierTrajectoryType -> BezierTrajectory bulpos tp (mouseWorldPos (w ^. input) (w ^. wCam)) MagnetTrajectoryType -> MagnetTrajectory tp where - (moff,mrot) = heldItemOrient2D itm cr (_mzPos mz + V2 0 offset) (_mzRot mz) + (moff,_) = heldItemOrient2D itm cr (_mzPos mz + V2 0 offset) (_mzRot mz) bulpos = _crPos cr + rotateV (_crDir cr) moff --- dir = _crDir cr + mrot + a --- bulpos = _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm + V2 0 offset) offset = case itm ^? itUse . heldParams . randomOffset of Just x | x /= 0 -> fst . randomR (- x, x) $ _randGen w _ -> 0 diff --git a/src/Dodge/Item/HeldOffset.hs b/src/Dodge/Item/HeldOffset.hs index 59adcdb5e..b3e59328c 100644 --- a/src/Dodge/Item/HeldOffset.hs +++ b/src/Dodge/Item/HeldOffset.hs @@ -8,7 +8,6 @@ module Dodge.Item.HeldOffset ( import qualified Quaternion as Q import Data.Maybe -import Dodge.Creature.HandPos import Dodge.Data.Creature import Dodge.Data.Machine import Geometry