diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index e1a291e68..9f440a681 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -254,7 +254,7 @@ startCr = defaultCreature , _crUpdate = stateUpdate yourControl , _crRad = 10 , _crMass = 10 - , _crHP = 10000 + , _crHP = 1000 , _crMaxHP = 1500 , _crInv = startInventory , _crCorpse = onLayer CorpseLayer $ color (greyN 0.5) $ pictures [color (greyN 0.8) $ circleSolid 10, circLine 10] @@ -264,7 +264,7 @@ Items you start with. -} startInventory = IM.fromList (zip [0..20] ( - [pistol + [--pistol --,blinkGun --,spawnGun lamp --,poisonSprayer diff --git a/src/Dodge/Floor.hs b/src/Dodge/Floor.hs index bcf8b296a..713cbb5a9 100644 --- a/src/Dodge/Floor.hs +++ b/src/Dodge/Floor.hs @@ -41,13 +41,6 @@ roomTreex = do let t' = padCorridors struct t = treeFromTrunk [[StartRoom] - ,[Corridor] - ,[SpecificRoom $ fmap (pure . Right) armouredCorridor] - ,[Corridor] - ,[TreasureAno [addArmour autoCrit,addArmour autoCrit] [launcher]] --- ,[BossAno $ addArmour launcherCrit & crHP +~ 800 --- & crState . crDropsOnDeath .~ DropSpecific [0] --- ] ,[Corridor] ,[OrAno [[DoorAno] ,[Corridor] @@ -55,7 +48,17 @@ roomTreex = do ] ,[FirstWeapon] ,[Corridor] - ,[SpecificRoom $ branchRectWith $ fmap (pure . Left) armouredChasers] + ,[SpecificRoom $ fmap (pure . Right) testRoom] + ,[Corridor] + ,[OrAno [[SpecificRoom $ branchRectWith $ fmap (pure . Left) armouredChasers] + ,[BossAno $ addArmour launcherCrit & crHP +~ 800 + & crState . crDropsOnDeath .~ DropSpecific [0] ] + ] + ] + ,[Corridor] + ,[SpecificRoom $ fmap (pure . Right) armouredCorridor] + ,[Corridor] + ,[TreasureAno [addArmour autoCrit,addArmour autoCrit] [launcher]] ] t' fmap (shiftExpandTree . expandTreeBy id) $ mapM annoToRoomTree t diff --git a/src/Dodge/Item/Weapon.hs b/src/Dodge/Item/Weapon.hs index 8de0d7cee..d2dbbf6ff 100644 --- a/src/Dodge/Item/Weapon.hs +++ b/src/Dodge/Item/Weapon.hs @@ -1104,7 +1104,7 @@ moveLaser phaseV pos dir mcid w pt hitEffect = case thHit of Just (p,E3x1 cr) - -> over (creatures . ix (_crID cr) . crState . crDamage) ((:) $ Lasering 3 pos p xp) + -> over (creatures . ix (_crID cr) . crState . crDamage) ((:) $ Lasering 19 pos p xp) -- . over worldEvents ((.) $ flareAt yellow (flarePos p)) Just (p,E3x2 wl) -> createSpark 8 colID (p +.+ safeNormalizeV (pos -.- p)) (reflectDir wl) Nothing diff --git a/src/Dodge/Room/Boss.hs b/src/Dodge/Room/Boss.hs index 9ed8e68a0..f3e249a9e 100644 --- a/src/Dodge/Room/Boss.hs +++ b/src/Dodge/Room/Boss.hs @@ -47,8 +47,8 @@ armouredChasers :: RandomGen g => State g Room armouredChasers = do ps <- takeN 5 [(x,y) | x <- [-200,-120 .. 200] ,y <- [-200,-120 .. 200] ] as <- replicateM 5 . state $ randomR (0,2*pi) - let theCrits = zipWith3 (\p a c -> PS p a (PutCrit armourChaseCrit)) ps as cs + let theCrits = zipWith3 (\p a c -> PS p a (PutCrit c)) ps as cs pure $ roomOctogon 300 & rmPS %~ (++ theCrits) where cs = (armourChaseCrit & crState . crDropsOnDeath .~ DropSpecific [0]) - : replicate 4 (armourChaseCrit & crState . crDropsOnDeath .~ DropSpecific [1]) + : replicate 4 chaseCrit