Reorganise weapons, start work on drones

src/Dodge/Creature/Action.hs

@@ -27,6 +27,7 @@ import Dodge.Base.Collide
 import Dodge.SoundLogic
 --import Dodge.WorldEvent
 import Dodge.Inventory
+import Dodge.FloorItem
 --import Dodge.LightSources
 import Geometry
 import Picture
@@ -37,7 +38,6 @@ import Control.Lens
 --import Control.Applicative
 import Data.Maybe
 import Data.List (findIndex)
-import System.Random
 import Control.Monad.Reader
 --import qualified Data.Map as M
 performActions :: World -> Creature -> Creature
@@ -239,40 +239,7 @@ copyInvItemToFloor :: Creature -> Int -> World -> World
 copyInvItemToFloor cr i w = case _crInv cr IM.! i of
     NoItem  -> w
     it      -> copyItemToFloor (_crPos cr) it w
-{- | Copy an item to the floor. -}
-copyItemToFloor :: Point2 -> Item -> World -> World
-copyItemToFloor pos it w = w'
-    & floorItems %~ IM.insert flid theflit
-    & updateLocation 
-  where
-    (p',w') = findWallFreeDropPoint (_itRad $ _itDimension it) pos w
-    rot = fst . randomR (-pi,pi) $ _randGen w
-    updateLocation = case it ^? itID of
-        Just (Just i')  -> itemPositions . ix i' .~ OnFloor flid
-        _ -> id
-    flid = IM.newKey $ _floorItems w
-    theflit = FlIt 
-        {_flIt = it
-        ,_flItPos = p'
-        ,_flItRot = rot
-        ,_flItID = flid
-        }
-findWallFreeDropPoint :: Float -> Point2 -> World -> (Point2,World)
-findWallFreeDropPoint r p w = (head $ mapMaybe f cardinalVectors ++ [p]
-    , w {_randGen = g})
-  where
-    f q = testOnWall r $ p +.+ rotateV rot (10 *.* q)
-    testOnWall r' q | circOnSomeWall q r' w = Nothing
-        | otherwise = Just q
-    (rot, g) = randomR (0,2*pi) $ _randGen w
 
-cardinalVectors :: [Point2]
-cardinalVectors =
-    [ V2   1    0
-    , V2   0    1
-    , V2 (-1)   0
-    , V2   0  (-1)
-    ]
     
 
 {- | Pick up a specific item. -}