Move main to allow for new executables

src/Dodge/Item/Weapon.hs

@@ -610,7 +610,7 @@ retireRemoteRocket itid t pjid w = setScope w
 retireRemoteBomb :: Int -> Int -> Int -> World -> World
 retireRemoteBomb itid 0 pjid w = w
     & pointToItem (_itemPositions w IM.! itid) %~ 
-        ( (itAttachment . _Just . scopePos .~ (V2 0 0))
+        ( (itAttachment . _Just . scopePos .~ V2 0 0)
         . (itZoom .~ defaultItZoom)
         . (itUse .~ (\_ -> hammerCheck throwRemoteBomb))
         )
@@ -754,7 +754,7 @@ fireRemoteLauncher cr w = setLocation
     i = IM.newKey $ _projectiles w
     cid = _crID cr
     dir = _crDir cr
-    pos = _crPos cr +.+ rotateV dir (V2 (_crRad cr + 1) (0))
+    pos = _crPos cr +.+ rotateV dir (V2 (_crRad cr + 1) 0)
     remRocket = IM.insert i $ Shell 
         { _pjPos = pos
         , _pjStartPos = pos
@@ -762,7 +762,7 @@ fireRemoteLauncher cr w = setLocation
         , _pjDraw = remoteShellPic'
         , _pjID = i
         , _pjUpdate = \pj -> decTimMvVel pj . setRemoteScope itid pj . moveRemoteShell cid itid pj
-        , _pjAcc = (V2 0 0)
+        , _pjAcc = V2 0 0
         , _pjDir = dir
         , _pjSpin = 0
         , _pjPayload = makeExplosionAt
@@ -864,8 +864,8 @@ throwRemoteBomb cr w = setLocation
     removePict = set (creatures . ix cid . crInv . ix j . itEquipPict) $ \ _ _ -> blank
     resetFire = set (creatures . ix cid . crInv . ix j . itUse) 
         $ \_ -> hammerCheck $ explodeRemoteBomb itid i
-    p' = _crPos cr +.+ rotateV (_crDir cr) (V2 (_crRad cr) (0))
-    p | circOnSomeWall p' 4 w = _crPos cr +.+ rotateV (_crDir cr) (V2 (_crRad cr-4) (0))
+    p' = _crPos cr +.+ rotateV (_crDir cr) (V2 (_crRad cr) 0)
+    p | circOnSomeWall p' 4 w = _crPos cr +.+ rotateV (_crDir cr) (V2 (_crRad cr-4) 0)
       | otherwise             = p'
     maybeitid = w ^? creatures . ix cid . crInv . ix j . itID . _Just
     setLocation :: World -> World

src/Dodge/Item/Weapon/Bezier.hs

@@ -59,7 +59,7 @@ shootBezier targetp cr w = w & particles %~ (theBullet :)
     controlp = mouseWorldPos w
     cid = _crID cr
     dir = _crDir cr
-    startp = _crPos cr +.+ rotateV dir (V2 (_crRad cr + 1) (0))
+    startp = _crPos cr +.+ rotateV dir (V2 (_crRad cr + 1) 0)
     (randPos,randPos') = flip evalState (_randGen w) $ do 
         a <- randInCirc 10
         b <- randInCirc 20

src/Dodge/Item/Weapon/Bullet.hs

@@ -10,12 +10,12 @@ basicBullet = BulletAmmo
     { _amString = "BULLET"
     , _amBulEff = destroyOnImpact bulHitCr bulHitWall' bulHitFF'
     , _amBulWth = 2
-    , _amBulVel = (V2 30 0)
+    , _amBulVel = V2 30 0
     }
 hvBullet :: Ammo
 hvBullet = BulletAmmo
     { _amString = "HVBULLET"
     , _amBulEff = penWalls hvBulHitCr hvBulHitWall' bulHitFF'
     , _amBulWth = 6
-    , _amBulVel = (V2 80 0)
+    , _amBulVel = V2 80 0
     }

src/Dodge/Item/Weapon/ExtraEffect.hs

@@ -127,8 +127,8 @@ targetRBMousePos w = (f, \_ _ _ w' -> cursorPic w')
     cursorPic w' = setLayer 1 $ onLayer InvLayer $ uncurryV translate mwp 
         $ rotate (_cameraRot w')
         $ pictures
-            [line [( V2 (x) (x)), (V2 (-x) (-x))]
-            ,line [(V2 (-x) (x)), (V2 ( x) (-x))]
+            [line [V2   x  x, V2 (-x) (-x)]
+            ,line [V2 (-x) x, V2   x  (-x)]
             ]
       where
         x = 5 / _cameraZoom w'

src/Dodge/Item/Weapon/Grenade.hs

@@ -84,8 +84,8 @@ throwGrenade explosion cr w = setWp $ removePict $ over projectiles addG w
     v' = 1 / (fromIntegral fuseTime * _cameraZoom w) *.* rotateV (_cameraRot w) ( _mousePos w)
     v | magV v' > 6 = 6 *.* normalizeV v'
       | otherwise   = v'
-    p' = _crPos cr +.+ rotateV (_crDir cr) (V2 (_crRad cr) (0))
-    p | circOnSomeWall p' 4 w = _crPos cr +.+ rotateV (_crDir cr) (V2 (_crRad cr-4) (0))
+    p' = _crPos cr +.+ rotateV (_crDir cr) (V2 (_crRad cr) 0)
+    p | circOnSomeWall p' 4 w = _crPos cr +.+ rotateV (_crDir cr) (V2 (_crRad cr-4) 0)
       | otherwise             = p'
     dir = argV v 
     setWp :: World -> World

src/Dodge/Item/Weapon/TriggerType.hs

@@ -128,7 +128,7 @@ withRecoil
 withRecoil recoilAmount eff cr = eff cr . over (creatures . ix cid) pushback
   where 
     cid = _crID cr
-    pushback = over crPos (+.+ rotateV (_crDir cr) (V2 ((-recoilAmount) / _crMass cr ) (0)))
+    pushback = over crPos (+.+ rotateV (_crDir cr) (V2 ((-recoilAmount) / _crMass cr ) 0))
 {- | Pushes a creature sideways by a random amount.
 Applied before the underlying effect.  -}
 withSidePush 
@@ -140,7 +140,7 @@ withSidePush
 withSidePush maxSide eff cr w = eff cr . over (creatures . ix cid) push $ w
   where 
     cid = _crID cr
-    push = over crPos (+.+ rotateV (_crDir cr) (V2 (0) (pushAmount / _crMass cr)))
+    push = over crPos (+.+ rotateV (_crDir cr) (V2 0 (pushAmount / _crMass cr)))
     (pushAmount, _) = randomR (-maxSide,maxSide) $ _randGen w
 -- consider unifying the pushes using a direction vector
 {- | Pushes a creature sideways by a random amount.
@@ -154,7 +154,7 @@ withSidePushAfter
 withSidePushAfter maxSide eff cr w = over (creatures . ix cid) push . eff cr $ w
   where 
     cid = _crID cr
-    push = over crPos (+.+ rotateV (_crDir cr) (V2 (0) (pushAmount / _crMass cr)))
+    push = over crPos (+.+ rotateV (_crDir cr) (V2 0 (pushAmount / _crMass cr)))
     (pushAmount, _) = randomR (-maxSide,maxSide) $ _randGen w
 {- | Applies a world effect and sound effect after an ammo check. -}
 shootWithSound 
@@ -462,7 +462,7 @@ numVelWthHitEff num vel wth eff cr = over particles (newbuls ++)
     d = _crDir cr
     poss = map (+.+ pos) $ take num offsets
     maxOffset = fromIntegral num * 2.5 - 2.5
-    offsets = map (\y -> rotateV d (V2 0 y)) [-maxOffset,5-maxOffset..]
+    offsets = map (rotateV d . V2 0) [-maxOffset,5-maxOffset..]
     pos = _crPos cr +.+ _crRad cr *.* unitVectorAtAngle d
 {- | Uses '_wpSpread' as a parameter for the current offset angle. -}
 randWalkAngle