remove unused parameter, and clear checkEnemiesWhileUnused function, because have a different idea for attack
This commit is contained in:
@@ -394,14 +394,12 @@ struct
|
|||||||
end
|
end
|
||||||
| [] => acc
|
| [] => acc
|
||||||
|
|
||||||
fun checkEnemiesWhileAttacking (player, wasAttacked, enemies, lst, acc) =
|
fun checkEnemiesWhileAttacking (player, enemies, lst, acc) =
|
||||||
let
|
let
|
||||||
open QuadTree
|
open QuadTree
|
||||||
in
|
in
|
||||||
case lst of
|
case lst of
|
||||||
enemyID :: tl =>
|
enemyID :: tl => (* placeholder *) acc
|
||||||
(* placeholder *)
|
|
||||||
acc
|
|
||||||
| [] => acc
|
| [] => acc
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -455,39 +453,19 @@ struct
|
|||||||
end
|
end
|
||||||
| (MAIN_ATTACKING amt, NOT_ATTACKED) =>
|
| (MAIN_ATTACKING amt, NOT_ATTACKED) =>
|
||||||
let
|
let
|
||||||
|
(* todo: have x, y, and size values reflect a larger player size *)
|
||||||
val enemyCollisions = QuadTree.getCollisions
|
val enemyCollisions = QuadTree.getCollisions
|
||||||
( x
|
(x, y, size, size, 0, 0, 1920, 1080, 0, enemyTree)
|
||||||
, y
|
|
||||||
, mainAttackSize
|
|
||||||
, mainAttackSize
|
|
||||||
, 0
|
|
||||||
, 0
|
|
||||||
, 1920
|
|
||||||
, 1080
|
|
||||||
, 0
|
|
||||||
, enemyTree
|
|
||||||
)
|
|
||||||
in
|
in
|
||||||
checkEnemiesWhileAttacking
|
checkEnemiesWhileAttacking (player, enemies, enemyCollisions, acc)
|
||||||
(player, false, enemies, enemyCollisions, acc)
|
|
||||||
end
|
end
|
||||||
| (MAIN_ATTACKING attackingAmt, ATTACKED attackedAmt) =>
|
| (MAIN_ATTACKING attackingAmt, ATTACKED attackedAmt) =>
|
||||||
let
|
let
|
||||||
|
(* todo: have x, y, and size values reflect a larger player size *)
|
||||||
val enemyCollisions = QuadTree.getCollisions
|
val enemyCollisions = QuadTree.getCollisions
|
||||||
( x
|
(x, y, size, size, 0, 0, 1920, 1080, 0, enemyTree)
|
||||||
, y
|
|
||||||
, mainAttackSize
|
|
||||||
, mainAttackSize
|
|
||||||
, 0
|
|
||||||
, 0
|
|
||||||
, 1920
|
|
||||||
, 1080
|
|
||||||
, 0
|
|
||||||
, enemyTree
|
|
||||||
)
|
|
||||||
in
|
in
|
||||||
checkEnemiesWhileAttacking
|
checkEnemiesWhileAttacking (player, enemies, enemyCollisions, acc)
|
||||||
(player, true, enemies, enemyCollisions, acc)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user