Merge branch 'testing', resolved conflicts

src/Dodge/Creature.hs

@@ -253,7 +253,7 @@ startCr = defaultCreature
     , _crMaxHP = 1500
     , _crInv = IM.fromList (zip [0..20] 
          (
-          [pistol,autoGun,launcher,lasGun,grenade
+          [pistol,flameGrenade, teslaGrenade, autoGun,launcher,flameLauncher, poisonLauncher, teslaLauncher, lasGun,grenade
           ,ltAutoGun,flamer,multGun,spreadGun,remoteLauncher
           ,longGun
           ,hvAutoGun
@@ -264,10 +264,36 @@ startCr = defaultCreature
           ,bezierGun
           ,poisonSprayer
           ,blinkGun
-          ,frontArmour
-          ] 
+           ] 
+--          [pistol,autoGun,launcher,lasGun,grenade
+--          ,ltAutoGun,flamer,multGun,spreadGun,remoteLauncher
+--          ,longGun
+--          ,hvAutoGun
+--          ,teslaGun
+--          ,latchkey 0
+--          ,miniGun
+--          ,medkit 50
+--          ,bezierGun
+--          ,poisonSprayer
+--          ,blinkGun
+--          ,frontArmour
+--          ] 
           ++ repeat NoItem)) 
          -- startInv
+--                           ([pistol,flameGrenade, teslaGrenade, autoGun,launcher,flameLauncher, poisonLauncher, teslaLauncher, lasGun,grenade
+--                            ,ltAutoGun,flamer,multGun,spreadGun,remoteLauncher
+--                            ,longGun
+--                            ,hvAutoGun
+--                            ,teslaGun
+--                            ,latchkey 0
+--                            ,miniGun
+--                            ,medkit 50
+--                            ,bezierGun
+--                            ,poisonSprayer
+--                            ,blinkGun
+--                            ] 
+--                            ++ repeat NoItem)) 
+--                          -- startInv
     , _crCorpse = onLayer CorpseLayer $ color (greyN 0.5) $ pictures [color (greyN 0.8) $ circleSolid 10, circLine 10]
     }