Commit towards merge

src/Dodge/Item/Weapon/BatteryGuns.hs

@@ -145,7 +145,49 @@ tractorGun = lasGun
         & useAim . aimSpeed .~ 0.4
         & useAim . aimRange .~ 1
         & useAim . aimStance .~ TwoHandTwist
+    , _itDimension = ItemDimension
+        { _dimRad = 10
+        , _dimCenter = V3 15 0 0
+        , _dimPortage = HeldItem 5 30
+        , _dimSPic = tractorGunPic
+        }
+    , _itParams = Traction  {_power = 1}
+    , _itTweaks = Tweakable
+        { _tweakParams = IM.fromList [(0,tractorGunTweak)]
+        , _tweakSel = 0
+        }
     }
+tractorGunTweak :: TweakParam
+tractorGunTweak = TweakParam
+    { _doTweak = thetweak
+    , _curTweak = 1
+    , _maxTweak = 4
+    , _showTweak = showPower
+    , _nameTweak = "TRACTION POWER"
+    }
+  where
+    thetweak 0 = itParams . power .~ 1
+    thetweak 1 = itParams . power .~ -1
+    thetweak 2 = itParams . power .~ -10
+    thetweak 3 = itParams . power .~ 0
+    thetweak _ = id
+    showPower 0 = "+"
+    showPower 1 = "-"
+    showPower 2 = "#"
+    showPower 3 = "0" -- object should stay in the center of the beam
+    showPower i = "THIS SHOULD NOT BE POSSIBLE" ++ show i
+
+tractorGunPic :: Item -> SPic
+tractorGunPic it = 
+    ( colorSH red $ 
+           upperPrismPoly 4 (rectNESW 3    30   1  0)
+        <> upperPrismPoly 4 (rectNESW (-1) 30 (-3) 0)
+        <> upperPrismPoly 1 (rectNESW 3    30 (-3) 0)
+    , setLayer 1 . color col . setDepth 1.1 . polygon $ rectNESW 1 30 (-1) 0
+    )
+  where
+    amFrac = fractionLoadedAmmo it
+    col = brightX 2 1.5 $ mixColors amFrac (1-amFrac) green red
 
 aTeslaArc :: Creature -> World -> World
 aTeslaArc cr w = set randGen g w
@@ -191,7 +233,7 @@ mvLaser phasev pos dir w pt
         ]
 
 aTractorBeam :: Item -> Creature -> World -> World
-aTractorBeam _ cr w = w & props . at i ?~ tractorBeamAt i spos outpos dir
+aTractorBeam _ cr w = w & props . at i ?~ tractorBeamAt i spos outpos dir power
   where 
     i = newProjectileKey w
     cpos = _crPos cr
@@ -200,9 +242,10 @@ aTractorBeam _ cr w = w & props . at i ?~ tractorBeamAt i spos outpos dir
     dir = _crDir cr
     outpos = collidePointWalls cpos xpos
         $ wallsAlongLine cpos xpos w
+    power = _power . _itParams $ _crInv cr IM.! _crInvSel cr
 
-tractorBeamAt :: Int -> Point2 -> Point2 -> Float -> Prop
-tractorBeamAt i pos outpos dir = ProjectileTimed
+tractorBeamAt :: Int -> Point2 -> Point2 -> Float -> Point2 -> Prop
+tractorBeamAt i pos outpos dir power = ProjectileTimed
     { _pjPos = pos
     , _pjStartPos = outpos
     , _pjVel = d
@@ -212,7 +255,7 @@ tractorBeamAt i pos outpos dir = ProjectileTimed
     , _pjTime = 10
     }
   where 
-    d  = unitVectorAtAngle dir
+    d  = unitVectorAtAngle dir * power
 {- |
 The interaction of this with objects, walls etc needs more thought.  -}
 updateTractor :: Prop -> World -> World