justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Tweak slime sucking

Browse Source
This commit is contained in:
justin
2026-04-16 09:13:12 +01:00
parent 9e215b474f
commit 9d1ab2cf14
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Update.hs
+14 -3
View File
@@ -1051,8 +1051,9 @@ slimeFood cr = case cr ^. crType of
feedSlime :: Creature -> Creature -> World -> World feedSlime :: Creature -> Creature -> World -> World
feedSlime s c w = fromMaybe w $ do feedSlime s c w = fromMaybe w $ do
ch <- crHeight c ch <- crHeight c
return $ if min 10 r1 + s ^?! crType . slimeFeedProgress < ch + 2 return $ if min 10 r1 + s ^?! crType . slimeFeedProgress < max 15 (ch + 2)
then w & cWorld . lWorld . creatures . ix (s ^. crID) . crType . slimeFeedProgress %~ (min r1 . (+0.7)) then w & cWorld . lWorld . creatures . ix (s ^. crID) . crType . slimeFeedProgress %~ (min r1 . (+0.7))
& cWorld . lWorld . creatures %~ (rolap . rolap')
else else
w w
& cWorld . lWorld . creatures . ix (c ^. crID) . crHP .~ CrDestroyed Swallowed & cWorld . lWorld . creatures . ix (c ^. crID) . crHP .~ CrDestroyed Swallowed
@@ -1063,8 +1064,18 @@ feedSlime s c w = fromMaybe w $ do
& crType . slimeRadWobble +~ r - r1 & crType . slimeRadWobble +~ r - r1
& crType . slimeCompression %~ ((r/r1) *^) & crType . slimeCompression %~ ((r/r1) *^)
r1 = s ^?! crType . slimeRad r1 = s ^?! crType . slimeRad
r2 = 2 * c ^. crType . to crRad r2 = c ^. crType . to crRad
r = sqrt (r1*r1 + r2*r2) r = sqrt (r1*r1 + 4*r2*r2)
id1 = s ^. crID
id2 = c ^. crID
rolap = ix id1 . crPos . _xy +~ f' (suckx * 1.5 * m2 / (m1+m2)) *^ normalize (xy2 - xy1)
rolap' = ix id2 . crPos . _xy +~ f' (suckx * 1.5*m1 / (m1+m2)) *^ normalize (xy1 - xy2)
m1 = crMass $ s ^. crType
m2 = crMass $ c ^. crType
suckx = (min 1 $ 2 * (1 - distance xy1 xy2 / (r1 + r2))) ^ (2:: Int)
xy1 = s ^. crPos . _xy
xy2 = c ^. crPos . _xy
f' = min (distance xy1 xy2/2)
fuseSlimes :: Creature -> Creature -> World -> World fuseSlimes :: Creature -> Creature -> World -> World
fuseSlimes c1 c2 = (cWorld . lWorld . creatures . ix mini .~ c) fuseSlimes c1 c2 = (cWorld . lWorld . creatures . ix mini .~ c)