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

Remove push damage types, push and torque done through dam effects

Browse Source
This commit is contained in:
justin
2023-05-01 10:26:48 +01:00
parent 06608c60bf
commit d0534e6fa3
8 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Bullet.hs
+2 -4
View File
@@ -112,8 +112,7 @@ makeFragBullets p w = w & cWorld . lWorld . instantBullets .++~ bus
& buOldPos .~ p
& buWidth .~ 1
& buDamages .~
[ Damage PIERCING 5 0 0 0 NoDamageEffect
, Damage PUSHDAM 1 0 0 0 . PushBackDamage $ 2
[ Damage PIERCING 5 0 0 0 $ PushBackDamage 2
]
makeFlak :: Bullet -> Point2 -> World -> World
@@ -126,8 +125,7 @@ makeFlak bu _ w = w & cWorld . lWorld . instantBullets .++~ [f x | x <- xs]
& buSpawn .~ BulSpark
& buWidth .~ 0.5
& buDamages .~
[ Damage PIERCING 25 0 0 0 NoDamageEffect
, Damage PUSHDAM 1 0 0 0 . PushBackDamage $ 2
[ Damage PIERCING 25 0 0 0 $ PushBackDamage 2
]
g x v = v +.+ x *.* normalizeV (vNormal v)
src/Dodge/Data/Damage.hs
-6
View File
@@ -44,12 +44,6 @@ isElectrical dm = case _dmType dm of
ELECTRICAL -> True
_ -> False
isMovementDam :: Damage -> Bool
isMovementDam dm = case _dmType dm of
TORQUEDAM -> True
PUSHDAM -> True
_ -> False
makeLenses ''Damage
makeLenses ''DamageEffect
deriveJSON defaultOptions ''DamageEffect
src/Dodge/Data/Damage/Type.hs
-2
View File
@@ -20,8 +20,6 @@ data DamageType
| ELECTRICAL
| EXPLOSIVE
| CONCUSSIVE
| TORQUEDAM
| PUSHDAM
| POISONDAM
| ENTERREMENT
deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat)
src/Dodge/Item/Weapon/Bullet.hs
+2 -4
View File
@@ -34,8 +34,7 @@ defaultBullet =
basicBulDams :: [Damage]
basicBulDams =
[ Damage PIERCING 100 0 0 0 NoDamageEffect
, Damage PUSHDAM 1 0 0 0 . PushBackDamage $ 2
[ Damage PIERCING 100 0 0 0 $ PushBackDamage 2
]
hvBullet :: AmmoType
@@ -51,6 +50,5 @@ hvBullet =
heavyBulDams :: [Damage]
heavyBulDams =
[ Damage PIERCING 300 0 0 0 NoDamageEffect
, Damage PUSHDAM 1 0 0 0 $ PushBackDamage 2
[ Damage PIERCING 300 0 0 0 $ PushBackDamage 2
]
src/Dodge/Material/Damage.hs
-2
View File
@@ -32,8 +32,6 @@ damageStone dm dir = case _dmType dm of
FLAMING -> a 0 id
ELECTRICAL -> a 0 id
CONCUSSIVE -> a d id
TORQUEDAM -> a 0 id
PUSHDAM -> a 0 id
POISONDAM -> a 0 id
ENTERREMENT -> a 0 id
where
src/Dodge/Particle/Damage.hs
+2 -4
View File
@@ -16,8 +16,6 @@ hvBulDams =
, Damage PIERCING 25 0 0 0 NoDamageEffect
, Damage PIERCING 25 0 0 0 NoDamageEffect
, Damage PIERCING 25 0 0 0 NoDamageEffect
, Damage PIERCING 25 0 0 0 NoDamageEffect
, Damage PIERCING 25 0 0 0 NoDamageEffect
, Damage TORQUEDAM 1 0 0 0 $ TorqueDamage 0.7
, Damage PUSHDAM 1 0 0 0 $ PushBackDamage 3
, Damage PIERCING 25 0 0 0 $ TorqueDamage 0.7
, Damage PIERCING 25 0 0 0 $ PushBackDamage 3
]
src/Dodge/Shockwave/Update.hs
+2 -2
View File
@@ -40,7 +40,7 @@ moveShockwave w sw
| otherwise =
cr & crState . csDamage
.:~ Damage
PUSHDAM
CONCUSSIVE
dam
(cpos -.- v)
cpos
@@ -68,7 +68,7 @@ moveInverseShockwave w sw
| dist (_crPos cr) p >= rad + _crRad cr = cr
| otherwise =
cr & crState . csDamage
.:~ Damage PUSHDAM 1 (cpos +.+ v) cpos (cpos -.- v) (PushBackDamage 25)
.:~ Damage CONCUSSIVE 1 (cpos +.+ v) cpos (cpos -.- v) (PushBackDamage 25)
where
cpos = _crPos cr
v = normalizeV (cpos -.- p)
src/Dodge/Wall/DamageEffect.hs
-8
View File
@@ -34,8 +34,6 @@ stoneWallDamage dm wl = case _dmType dm of
FLAMING -> a 0 id
ELECTRICAL -> a 0 id
CONCUSSIVE -> a d id
TORQUEDAM -> a 0 id
PUSHDAM -> a 0 id
POISONDAM -> a 0 id
ENTERREMENT -> a 0 id
where
@@ -61,8 +59,6 @@ glassWallDamage dm wl w =
FLAMING -> a 0 id
ELECTRICAL -> a 0 id
CONCUSSIVE -> a 0 dosplint
TORQUEDAM -> a 0 id
PUSHDAM -> a 0 id
POISONDAM -> a 0 id
ENTERREMENT -> a 0 id
where
@@ -93,8 +89,6 @@ crystalWallDamage dm wl = case _dmType dm of
FLAMING -> a 0 id
ELECTRICAL -> a 0 id
CONCUSSIVE -> a 0 id
TORQUEDAM -> a 0 id
PUSHDAM -> a 0 id
POISONDAM -> a 0 id
ENTERREMENT -> a 0 id
where
@@ -119,8 +113,6 @@ dirtWallDamage dm wl = case _dmType dm of
FLAMING -> a 0 id
ELECTRICAL -> a 0 id
CONCUSSIVE -> a d id
TORQUEDAM -> a 0 id
PUSHDAM -> a 0 id
POISONDAM -> a 0 id
ENTERREMENT -> a 0 id
where