Commit before modifying slime compression

src/Dodge/Creature/Picture.hs

@@ -48,7 +48,7 @@ drawCreature w m cr = translateSP (_crPos cr) . fallrot . rotateSP (_crDir cr) $
         HoverCrit{} -> noPic $ drawHoverCrit cr
         SlinkCrit{} -> noPic $ drawSlinkCrit cr
         SlimeCrit{} -> noPic $ drawSlimeCrit cr
-        BeeCrit{_beeSlime=x} -> noPic $ drawBeeCrit x
+        BeeCrit{} -> noPic $ drawBeeCrit cr
         HiveCrit{} -> drawHive
   where
     fallrot = case cr ^? crStance . carriage . carDir of
@@ -57,7 +57,7 @@ drawCreature w m cr = translateSP (_crPos cr) . fallrot . rotateSP (_crDir cr) $
 
 drawSlimeCrit :: Creature -> Shape
 drawSlimeCrit cr = colorSH green 
-    $ upperPrismPolyHalf Medium Typical (cr ^?! crType . slimeFeedProgress + min 10 r) $ polyCirc 6 r
+    $ upperPrismPolyHalf Medium Typical (cr ^?! crType . slimeEngulfProgress + min 15 r) $ polyCirc 6 r
     & each %~ scaleAlong d s
     & each %~ scaleAlong (vNormal d) (1 / s)
     & each %~ rotateV (-cr ^. crDir)
@@ -119,13 +119,13 @@ drawHoverCrit cr = colorSH (_skinHead cskin)
 drawHive :: SPic
 drawHive =  noPic $ upperPrismPolyHalfMI 25 $ polyCirc 6 20
 
-drawBeeCrit :: Float -> Shape
-drawBeeCrit x = colorSH yellow
+drawBeeCrit :: Creature -> Shape
+drawBeeCrit cr = colorSH yellow
     (upperPrismPolyHalfMI 3 $ polyCirc 6 r)
         <>
     colorSH (dark yellow) (overPosSH (Q.apply (beakpos)) $ upperPrismPolyHalfST 1 $ [V2 0 (-2), V2 4 0,V2 0 2])
   where
-    r = sqrt $ 2 ^(2::Int) + x
+    r = cr ^. crType . to crRad
     beakpos = (V3 (r-1) 0 0, Q.qid)
 
 drawCrabCrit :: World -> Creature -> Shape
@@ -278,7 +278,7 @@ makeCorpse g cr = case cr ^. crType of
     HoverCrit{} -> noPic $ drawHoverCrit cr
     ChaseCrit{} -> noPic $ chaseCorpse g cr
     CrabCrit{} -> noPic $ crabCorpse g cr
-    BeeCrit{} -> noPic $ drawBeeCrit 0
+    BeeCrit{} -> noPic $ drawBeeCrit cr
     _ ->
         noPic
             . scaleSH (V3 crsize crsize crsize)