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

fix exception with attacking fallingEnemies, by regenerating fallingTree on each collision

Browse Source
This commit is contained in:
Humza Shahid
2025-03-01 01:53:30 +00:00
parent e9e9d80a78
commit 3e9933bdd0
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,6 @@ struct
, defeatedList , defeatedList
, enemyMap , enemyMap
, fallingMap , fallingMap
, fallingTree
, enemyTree , enemyTree
, pos , pos
, boxes , boxes
@@ -83,6 +82,7 @@ struct
val (defeatedList, enemyMap) = PlayerAttackEnemy.foldRegion val (defeatedList, enemyMap) = PlayerAttackEnemy.foldRegion
(x, y, size, size, (), (defeatedList, enemyMap), enemyTree) (x, y, size, size, (), (defeatedList, enemyMap), enemyTree)
val fallingTree = FallingEnemies.generateTree fallingMap
val (defeatedList, fallingMap) = PlayerAttackFalling.foldRegion val (defeatedList, fallingMap) = PlayerAttackFalling.foldRegion
(x, y, size, size, (), (defeatedList, fallingMap), fallingTree) (x, y, size, size, (), (defeatedList, fallingMap), fallingTree)
in in
@@ -91,7 +91,6 @@ struct
, defeatedList , defeatedList
, enemyMap , enemyMap
, fallingMap , fallingMap
, fallingTree
, enemyTree , enemyTree
, pos + 1 , pos + 1
, boxes , boxes
@@ -108,7 +107,7 @@ struct
let let
open EntityType open EntityType
val frame = amt div 2 val frame = amt div 2
val fallingTree = FallingEnemies.generateTree fallingMap
val boxes = val boxes =
case facing of case facing of
FACING_RIGHT => Vector.sub (Whip.rightFrames, frame) FACING_RIGHT => Vector.sub (Whip.rightFrames, frame)
@@ -119,7 +118,6 @@ struct
, [] , []
, enemyMap , enemyMap
, fallingMap , fallingMap
, fallingTree
, enemyTree , enemyTree
, 0 , 0
, boxes , boxes