From ca6b0b2160e0ba6ba7e72d20f5d77238bdbaf7c6 Mon Sep 17 00:00:00 2001 From: Humza Shahid Date: Sun, 12 Jan 2025 22:14:36 +0000 Subject: [PATCH] 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) --- fcore/player-enemy.sml | 12 ++---------- fcore/player.sml | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/fcore/player-enemy.sml b/fcore/player-enemy.sml index 40fc2c1..3d8b6b4 100644 --- a/fcore/player-enemy.sml +++ b/fcore/player-enemy.sml @@ -12,17 +12,9 @@ struct case mainAttack of MAIN_ATTACKING => 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 *) - val enemyCollisions = Vector.fromList enemyCollisions + val enemyCollisions = + Player.getEnemyCollisionsWhenAttacking (x, y, enemyTree) val enemies = Enemy.filterWhenAttacked ( Vector.length enemies - 1 , enemyCollisions diff --git a/fcore/player.sml b/fcore/player.sml index 5b97f29..9a997eb 100644 --- a/fcore/player.sml +++ b/fcore/player.sml @@ -511,8 +511,8 @@ struct val ww = Constants.worldWidth val wh = Constants.worldHeight - val enemyCollisions = QuadTree.getCollisions - (x, y, size, size, 0, 0, ww, wh, 0, enemyTree) + val enemyCollisions = QuadTree.getCollisions + (x, y, size, size, 0, 0, ww, wh, 0, enemyTree) in Vector.fromList enemyCollisions end