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

done refactoring player-specific logic, and also enemy-specific logic, from player-enemy.sml (which now just calls different functions from the player.sml and enemy.sml modules, to help player-enemy.sml maintain a high level overview)

Browse Source
This commit is contained in:
Humza Shahid
2025-01-12 22:14:36 +00:00
parent 3dddd096f7
commit ca6b0b2160
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fcore/player-enemy.sml
View File

@@ -12,17 +12,9 @@ struct
case mainAttack of case mainAttack of
MAIN_ATTACKING => MAIN_ATTACKING =>
let let
(* when attacking, player collision should be larger than player themselves *)
val x = x - Constants.halfPlayerSize
val y = y - Constants.halfPlayerSize
val size = size * 2
(* get list of enemies player has collided with *)
val enemyCollisions = QuadTree.getCollisions
(x, y, size, size, 0, 0, 1920, 1080, 0, enemyTree)
(* filter enemies based on collisions *) (* filter enemies based on collisions *)
val enemyCollisions = Vector.fromList enemyCollisions val enemyCollisions =
Player.getEnemyCollisionsWhenAttacking (x, y, enemyTree)
val enemies = Enemy.filterWhenAttacked val enemies = Enemy.filterWhenAttacked
( Vector.length enemies - 1 ( Vector.length enemies - 1
, enemyCollisions , enemyCollisions

4
fcore/player.sml
View File

@@ -511,8 +511,8 @@ struct
val ww = Constants.worldWidth val ww = Constants.worldWidth
val wh = Constants.worldHeight val wh = Constants.worldHeight
val enemyCollisions = QuadTree.getCollisions val enemyCollisions = QuadTree.getCollisions
(x, y, size, size, 0, 0, ww, wh, 0, enemyTree) (x, y, size, size, 0, 0, ww, wh, 0, enemyTree)
in in
Vector.fromList enemyCollisions Vector.fromList enemyCollisions
end end