humza/sml-projects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add collision detection for whip attack

Browse Source
This commit is contained in:
Humza Shahid
2025-03-01 01:31:18 +00:00
parent 94dc17011e
commit 693630a655
2 changed files with 90 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
fcore/level/player/player-attack.sml
View File

@@ -51,47 +51,83 @@ struct
end
end)
fun helpAttackEnemies
( player
, defeatedList
, enemyMap
, fallingMap
, fallingTree
, enemyTree
, pos
, boxes
) =
if pos = Vector.length boxes then
let
val defeatedList = Vector.fromList defeatedList
val defeatedList = Vector.concat [defeatedList, #enemies player]
val player =
PlayerPatch.withPatch (player, PlayerPatch.W_ENEMIES defeatedList)
in
(player, enemyMap, fallingMap)
end
else
let
val {x = px, y = py, ...} = player
val {x = bx, y = by} = Vector.sub (boxes, pos)
val x = px + bx
val y = py + by
val size = Whip.size
val (defeatedList, enemyMap) = PlayerAttackEnemy.foldRegion
(x, y, size, size, (), (defeatedList, enemyMap), enemyTree)
val (defeatedList, fallingMap) = PlayerAttackFalling.foldRegion
(x, y, size, size, (), (defeatedList, fallingMap), fallingTree)
in
helpAttackEnemies
( player
, defeatedList
, enemyMap
, fallingMap
, fallingTree
, enemyTree
, pos + 1
, boxes
)
end
fun attackEnemies (player: PlayerType.player, enemyMap, enemyTree, fallingMap) =
let
open PlayerType
val {x, y, facing, mainAttack, ...} = player
in
(* todo: bring back attack
case mainAttack of
MAIN_ATTACKING {length, ...} =>
MAIN_ATTACKING amt =>
let
open EntityType
val height = Constants.playerHeight
val x =
(case facing of
FACING_RIGHT => x + Constants.playerWidth
| FACING_LEFT => x - length)
val (defeatedList, enemyMap) = PlayerAttackEnemy.foldRegion
(x, y, length, height, (), ([], enemyMap), enemyTree)
val frame = amt div 2
val fallingTree = FallingEnemies.generateTree fallingMap
val (defeatedList, fallingMap) = PlayerAttackFalling.foldRegion
( x
, y
, length
, height
, ()
, (defeatedList, fallingMap)
, fallingTree
)
val defeatedList = Vector.fromList defeatedList
val defeatedList = Vector.concat [defeatedList, #enemies player]
val player =
PlayerPatch.withPatch (player, PlayerPatch.W_ENEMIES defeatedList)
val boxes =
case facing of
FACING_RIGHT => Vector.sub (Whip.rightFrames, frame)
| FACING_LEFT =>
(* todo: replace rightFrames with leftFrames *)
Vector.sub (Whip.rightFrames, frame)
in
(player, enemyMap, fallingMap)
helpAttackEnemies
( player
, []
, enemyMap
, fallingMap
, fallingTree
, enemyTree
, 0
, boxes
)
end
| _ => (player, enemyMap, fallingMap)
*)
(player, enemyMap, fallingMap)
end
(* - Handle collisions when player's projectile hits enemy - *)

44
fcore/level/player/player.sml
View File

@@ -86,10 +86,8 @@ struct
fun helpGetMainAttackPatches (attackHeld, mainAttackPressed, charge, acc) =
let
val attack =
if attackHeld andalso not mainAttackPressed then
MAIN_ATTACKING 1
else
MAIN_NOT_ATTACKING
if attackHeld andalso not mainAttackPressed then MAIN_ATTACKING 1
else MAIN_NOT_ATTACKING
in
W_MAIN_ATTACK_PRESSED (attackHeld andalso mainAttackPressed)
:: W_MAIN_ATTACK attack :: acc
@@ -165,10 +163,8 @@ struct
if amt = Constants.mainAttackLimit then
W_MAIN_ATTACK MAIN_NOT_ATTACKING :: acc
else
let
val amt = amt + 1
in
W_MAIN_ATTACK (MAIN_ATTACKING amt) :: acc
let val amt = amt + 1
in W_MAIN_ATTACK (MAIN_ATTACKING amt) :: acc
end
in
W_MAIN_ATTACK_PRESSED true :: acc
@@ -423,9 +419,7 @@ struct
in
if oldYAxis = DROP_BELOW_PLATFORM andalso newYAxis = DROP_BELOW_PLATFORM then
PlayerPatch.withPatch (player, W_ANIM_TIMER (oldAnimTimer + 1))
else if
oldYAxis = ON_GROUND andalso newYAxis = ON_GROUND
then
else if oldYAxis = ON_GROUND andalso newYAxis = ON_GROUND then
if oldXAxis = MOVE_RIGHT andalso newXAxis = MOVE_RIGHT then
(* update move-right animation *)
PlayerPatch.withPatch (player, W_ANIM_TIMER (oldAnimTimer + 1))
@@ -458,7 +452,8 @@ struct
end
(*** DRAWING FUNCTIONS ***)
fun helpGetWhipVec (tlx, tly, ratio, xOffset, yOffset, pos, boxes, width, height, acc) =
fun helpGetWhipVec
(tlx, tly, ratio, xOffset, yOffset, pos, boxes, width, height, acc) =
if pos = Vector.length boxes then
Vector.concat acc
else
@@ -473,7 +468,18 @@ struct
val size = Whip.sizeReal
val acc = Box.lerp (x, y, size, size, width, height) :: acc
in
helpGetWhipVec (tlx, tly, ratio, xOffset, yOffset, pos + 1, boxes, width, height, acc)
helpGetWhipVec
( tlx
, tly
, ratio
, xOffset
, yOffset
, pos + 1
, boxes
, width
, height
, acc
)
end
fun getFieldVec (player: player, width, height) =
@@ -495,13 +501,13 @@ struct
val boxes =
case facing of
FACING_RIGHT =>
Vector.sub (Whip.rightFrames, frame)
FACING_RIGHT => Vector.sub (Whip.rightFrames, frame)
| FACING_LEFT =>
(* todo: change to leftFrames once that is implemented *)
Vector.sub (Whip.rightFrames, frame)
in
helpGetWhipVec (x, y, wratio, 0.0, yOffset, 0, boxes, width, height, [])
helpGetWhipVec
(x, y, wratio, 0.0, yOffset, 0, boxes, width, height, [])
end
else
let
@@ -513,13 +519,13 @@ struct
val boxes =
case facing of
FACING_RIGHT =>
Vector.sub (Whip.rightFrames, frame)
FACING_RIGHT => Vector.sub (Whip.rightFrames, frame)
| FACING_LEFT =>
(* todo: change to leftFrames once that is implemented *)
Vector.sub (Whip.rightFrames, frame)
in
helpGetWhipVec (x, y, hratio, xOffset, 0.0, 0, boxes, width, height, [])
helpGetWhipVec
(x, y, hratio, xOffset, 0.0, 0, boxes, width, height, [])
end
end
| _ => Vector.fromList []