From f54fa1bf02f291dbdf51fa37fb742d1d82d01c4a Mon Sep 17 00:00:00 2001
From: Humza Shahid <humzasaur@gmail.com>
Date: Tue, 7 Jan 2025 12:57:15 +0000
Subject: [PATCH] move projectile type into player type

---
 fcore/game-type.sml   |  6 +++---
 fcore/game-update.sml |  2 --
 fcore/player.sml      | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/fcore/game-type.sml b/fcore/game-type.sml
index 7651353..98bd00b 100644
--- a/fcore/game-type.sml
+++ b/fcore/game-type.sml
@@ -39,6 +39,7 @@ sig
     , jumpPressed: bool
     , enemies: defeated_enemies vector
     , charge: int
+    , projectiles: player_projectile vector
     }
 
   datatype player_patch =
@@ -59,7 +60,6 @@ sig
 
   type game_type =
     { player: player
-    , playerProjectiles: player_projectile vector
     , walls: wall vector
     , wallTree: QuadTree.t
     , platforms: platform vector
@@ -113,6 +113,7 @@ struct
     , jumpPressed: bool
     , enemies: defeated_enemies vector
     , charge: int
+    , projectiles: player_projectile vector
     }
 
   datatype player_patch =
@@ -133,7 +134,6 @@ struct
 
   type game_type =
     { player: player
-    , playerProjectiles: player_projectile vector
     , walls: wall vector
     , wallTree: QuadTree.t
     , platforms: platform vector
@@ -158,6 +158,7 @@ struct
         , jumpPressed = false
         , enemies = Vector.fromList []
         , charge = 60
+        , projectiles = Vector.fromList []
         }
 
       val wall1 = {id = 1, x = 0, y = 0, width = 100, height = 1080}
@@ -177,7 +178,6 @@ struct
       val enemyTree = Enemy.generateTree enemies
     in
       { player = player
-      , playerProjectiles = Vector.fromList []
       , walls = walls
       , wallTree = wallTree
       , platforms = platforms
diff --git a/fcore/game-update.sml b/fcore/game-update.sml
index ea6cb03..ee60bf5 100644
--- a/fcore/game-update.sml
+++ b/fcore/game-update.sml
@@ -152,7 +152,6 @@ struct
     let
       val
         { player
-        , playerProjectiles
         , walls
         , wallTree
         , platforms
@@ -170,7 +169,6 @@ struct
       val enemyTree = Enemy.generateTree enemies
     in
       { player = player
-      , playerProjectiles = playerProjectiles
       , walls = walls
       , wallTree = wallTree
       , platforms = platforms
diff --git a/fcore/player.sml b/fcore/player.sml
index a43cc7c..834e622 100644
--- a/fcore/player.sml
+++ b/fcore/player.sml
@@ -16,6 +16,7 @@ struct
     , mainAttackPressed
     , enemies
     , charge
+    , projectiles
     ) =
     { yAxis = yAxis
     , xAxis = xAxis
@@ -30,6 +31,7 @@ struct
     , jumpPressed = jumpPressed
     , enemies = enemies
     , charge = charge
+    , projectiles = projectiles
     }
 
   fun withPatch (player: player, patch) =
@@ -48,6 +50,7 @@ struct
         , jumpPressed
         , enemies
         , charge
+        , projectiles
         } = player
     in
       case patch of
@@ -66,6 +69,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_Y_AXIS yAxis =>
           mkPlayer
@@ -82,6 +86,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_RECOIL recoil =>
           mkPlayer
@@ -98,6 +103,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_ATTACKED attacked =>
           mkPlayer
@@ -114,6 +120,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_MAIN_ATTACK mainAttack =>
           mkPlayer
@@ -130,6 +137,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_FACING facing =>
           mkPlayer
@@ -146,6 +154,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_HEALTH health =>
           mkPlayer
@@ -162,6 +171,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_X x =>
           mkPlayer
@@ -178,6 +188,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_Y y =>
           mkPlayer
@@ -194,6 +205,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_JUMP_PRESSED jumpPressed =>
           mkPlayer
@@ -210,6 +222,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_ENEMIES enemies =>
           mkPlayer
@@ -226,6 +239,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
       | W_CHARGE charge =>
           mkPlayer
@@ -242,6 +256,7 @@ struct
             , mainAttackPressed
             , enemies
             , charge
+            , projectiles
             )
     end