From c801bfd9bda3555d6db9f236188adf19da5b14b7 Mon Sep 17 00:00:00 2001
From: Nicolas Sanchez <sanchez.nicolas96@gmail.com>
Date: Thu, 12 Dec 2024 18:38:30 -0300
Subject: [PATCH 1/4] Execute mechanics from player if player is alive only

---
 apps/arena/lib/arena/game/skill.ex | 44 ++++++++++++++++++------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/apps/arena/lib/arena/game/skill.ex b/apps/arena/lib/arena/game/skill.ex
index f3ae124bd..3f7b98017 100644
--- a/apps/arena/lib/arena/game/skill.ex
+++ b/apps/arena/lib/arena/game/skill.ex
@@ -16,7 +16,15 @@ defmodule Arena.Game.Skill do
     end)
   end
 
-  def do_mechanic(
+  def do_mechanic(game_state, entity, mechanic, skill_params) do
+    if entity.category == :player and not Player.alive?(entity) do
+      game_state
+    else
+      execute_mechanic(game_state, entity, mechanic, skill_params)
+    end
+  end
+
+  def execute_mechanic(
         game_state,
         entity,
         %{type: "circle_hit"} = circle_hit,
@@ -37,7 +45,7 @@ defmodule Arena.Game.Skill do
     |> maybe_move_player(entity, circle_hit[:move_by])
   end
 
-  def do_mechanic(
+  def execute_mechanic(
         game_state,
         entity,
         %{type: "cone_hit"} = cone_hit,
@@ -58,7 +66,7 @@ defmodule Arena.Game.Skill do
     |> maybe_move_player(entity, cone_hit[:move_by])
   end
 
-  def do_mechanic(game_state, entity, %{type: "multi_cone_hit"} = multi_cone_hit, skill_params) do
+  def execute_mechanic(game_state, entity, %{type: "multi_cone_hit"} = multi_cone_hit, skill_params) do
     Enum.each(1..(multi_cone_hit.amount - 1), fn i ->
       mechanic = %{multi_cone_hit | type: "cone_hit"}
 
@@ -69,15 +77,15 @@ defmodule Arena.Game.Skill do
       )
     end)
 
-    do_mechanic(game_state, entity, %{multi_cone_hit | type: "cone_hit"}, skill_params)
+    execute_mechanic(game_state, entity, %{multi_cone_hit | type: "cone_hit"}, skill_params)
   end
 
-  def do_mechanic(game_state, entity, %{type: "multi_circle_hit", amount: nil} = multi_circle_hit, skill_params) do
+  def execute_mechanic(game_state, entity, %{type: "multi_circle_hit", amount: nil} = multi_circle_hit, skill_params) do
     amount = div(multi_circle_hit.duration_ms, multi_circle_hit.interval_ms)
-    do_mechanic(game_state, entity, Map.put(multi_circle_hit, :amount, amount), skill_params)
+    execute_mechanic(game_state, entity, Map.put(multi_circle_hit, :amount, amount), skill_params)
   end
 
-  def do_mechanic(game_state, entity, %{type: "multi_circle_hit"} = multi_circle_hit, skill_params) do
+  def execute_mechanic(game_state, entity, %{type: "multi_circle_hit"} = multi_circle_hit, skill_params) do
     Enum.each(1..(multi_circle_hit.amount - 1), fn i ->
       mechanic = %{multi_circle_hit | type: "circle_hit"}
 
@@ -88,10 +96,10 @@ defmodule Arena.Game.Skill do
       )
     end)
 
-    do_mechanic(game_state, entity, %{multi_circle_hit | type: "circle_hit"}, skill_params)
+    execute_mechanic(game_state, entity, %{multi_circle_hit | type: "circle_hit"}, skill_params)
   end
 
-  def do_mechanic(
+  def execute_mechanic(
         game_state,
         entity,
         %{type: "dash", speed: speed, duration_ms: duration_ms},
@@ -113,7 +121,7 @@ defmodule Arena.Game.Skill do
     %{game_state | players: players}
   end
 
-  def do_mechanic(game_state, entity, %{type: "repeated_shot"} = repeated_shot, skill_params) do
+  def execute_mechanic(game_state, entity, %{type: "repeated_shot"} = repeated_shot, skill_params) do
     remaining_amount = repeated_shot.amount - 1
 
     if remaining_amount > 0 do
@@ -152,7 +160,7 @@ defmodule Arena.Game.Skill do
     |> put_in([:projectiles, projectile.id], projectile)
   end
 
-  def do_mechanic(
+  def execute_mechanic(
         game_state,
         entity,
         %{type: "multi_shoot"} = multishot,
@@ -187,7 +195,7 @@ defmodule Arena.Game.Skill do
     end)
   end
 
-  def do_mechanic(
+  def execute_mechanic(
         game_state,
         entity,
         %{type: "simple_shoot"} = simple_shoot,
@@ -233,7 +241,7 @@ defmodule Arena.Game.Skill do
     |> put_in([:projectiles, projectile.id], projectile)
   end
 
-  def do_mechanic(
+  def execute_mechanic(
         game_state,
         entity,
         %{type: "simple_shoot"} = simple_shoot,
@@ -264,7 +272,7 @@ defmodule Arena.Game.Skill do
     |> put_in([:projectiles, projectile.id], projectile)
   end
 
-  def do_mechanic(game_state, entity, %{type: "leap"} = leap, %{execution_duration: execution_duration}) do
+  def execute_mechanic(game_state, entity, %{type: "leap"} = leap, %{execution_duration: execution_duration}) do
     Process.send_after(
       self(),
       {:stop_leap, entity.id, entity.aditional_info.base_speed, leap.on_arrival_mechanic},
@@ -283,7 +291,7 @@ defmodule Arena.Game.Skill do
     put_in(game_state, [:players, player.id], player)
   end
 
-  def do_mechanic(game_state, entity, %{type: "teleport"}, %{skill_destination: skill_destination}) do
+  def execute_mechanic(game_state, entity, %{type: "teleport"}, %{skill_destination: skill_destination}) do
     entity =
       entity
       |> Map.put(:aditional_info, entity.aditional_info)
@@ -292,7 +300,7 @@ defmodule Arena.Game.Skill do
     put_in(game_state, [:players, entity.id], entity)
   end
 
-  def do_mechanic(game_state, %{category: :projectile} = entity, %{type: "spawn_pool"} = pool_params, skill_params) do
+  def execute_mechanic(game_state, %{category: :projectile} = entity, %{type: "spawn_pool"} = pool_params, skill_params) do
     last_id = game_state.last_id + 1
     entity_player_owner = get_entity_player_owner(game_state, entity)
 
@@ -324,7 +332,7 @@ defmodule Arena.Game.Skill do
     |> put_in([:last_id], last_id)
   end
 
-  def do_mechanic(game_state, player, %{type: "spawn_pool"} = pool_params, skill_params) do
+  def execute_mechanic(game_state, player, %{type: "spawn_pool"} = pool_params, skill_params) do
     last_id = game_state.last_id + 1
     entity_player_owner = get_entity_player_owner(game_state, player)
 
@@ -356,7 +364,7 @@ defmodule Arena.Game.Skill do
     |> put_in([:last_id], last_id)
   end
 
-  def do_mechanic(game_state, entity, {:polygon_hit, polygon_hit}, _skill_params) do
+  def execute_mechanic(game_state, entity, {:polygon_hit, polygon_hit}, _skill_params) do
     polygon_damage_area = Entities.make_polygon_area(entity.id, polygon_hit.vertices)
 
     entity_player_owner = get_entity_player_owner(game_state, entity)

From e3ffae0ec81495e6d8b98946cbc06b6aae316b06 Mon Sep 17 00:00:00 2001
From: Nicolas Sanchez <sanchez.nicolas96@gmail.com>
Date: Fri, 13 Dec 2024 14:02:27 -0300
Subject: [PATCH 2/4] Make execute_mechanic/4 private

---
 apps/arena/lib/arena/game/skill.ex | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/arena/lib/arena/game/skill.ex b/apps/arena/lib/arena/game/skill.ex
index 3f7b98017..3ec963dae 100644
--- a/apps/arena/lib/arena/game/skill.ex
+++ b/apps/arena/lib/arena/game/skill.ex
@@ -24,7 +24,7 @@ defmodule Arena.Game.Skill do
     end
   end
 
-  def execute_mechanic(
+  defp execute_mechanic(
         game_state,
         entity,
         %{type: "circle_hit"} = circle_hit,
@@ -45,7 +45,7 @@ defmodule Arena.Game.Skill do
     |> maybe_move_player(entity, circle_hit[:move_by])
   end
 
-  def execute_mechanic(
+  defp execute_mechanic(
         game_state,
         entity,
         %{type: "cone_hit"} = cone_hit,
@@ -66,7 +66,7 @@ defmodule Arena.Game.Skill do
     |> maybe_move_player(entity, cone_hit[:move_by])
   end
 
-  def execute_mechanic(game_state, entity, %{type: "multi_cone_hit"} = multi_cone_hit, skill_params) do
+  defp execute_mechanic(game_state, entity, %{type: "multi_cone_hit"} = multi_cone_hit, skill_params) do
     Enum.each(1..(multi_cone_hit.amount - 1), fn i ->
       mechanic = %{multi_cone_hit | type: "cone_hit"}
 
@@ -80,12 +80,12 @@ defmodule Arena.Game.Skill do
     execute_mechanic(game_state, entity, %{multi_cone_hit | type: "cone_hit"}, skill_params)
   end
 
-  def execute_mechanic(game_state, entity, %{type: "multi_circle_hit", amount: nil} = multi_circle_hit, skill_params) do
+  defp execute_mechanic(game_state, entity, %{type: "multi_circle_hit", amount: nil} = multi_circle_hit, skill_params) do
     amount = div(multi_circle_hit.duration_ms, multi_circle_hit.interval_ms)
     execute_mechanic(game_state, entity, Map.put(multi_circle_hit, :amount, amount), skill_params)
   end
 
-  def execute_mechanic(game_state, entity, %{type: "multi_circle_hit"} = multi_circle_hit, skill_params) do
+  defp execute_mechanic(game_state, entity, %{type: "multi_circle_hit"} = multi_circle_hit, skill_params) do
     Enum.each(1..(multi_circle_hit.amount - 1), fn i ->
       mechanic = %{multi_circle_hit | type: "circle_hit"}
 
@@ -99,7 +99,7 @@ defmodule Arena.Game.Skill do
     execute_mechanic(game_state, entity, %{multi_circle_hit | type: "circle_hit"}, skill_params)
   end
 
-  def execute_mechanic(
+  defp execute_mechanic(
         game_state,
         entity,
         %{type: "dash", speed: speed, duration_ms: duration_ms},
@@ -121,7 +121,7 @@ defmodule Arena.Game.Skill do
     %{game_state | players: players}
   end
 
-  def execute_mechanic(game_state, entity, %{type: "repeated_shot"} = repeated_shot, skill_params) do
+  defp execute_mechanic(game_state, entity, %{type: "repeated_shot"} = repeated_shot, skill_params) do
     remaining_amount = repeated_shot.amount - 1
 
     if remaining_amount > 0 do
@@ -160,7 +160,7 @@ defmodule Arena.Game.Skill do
     |> put_in([:projectiles, projectile.id], projectile)
   end
 
-  def execute_mechanic(
+  defp execute_mechanic(
         game_state,
         entity,
         %{type: "multi_shoot"} = multishot,
@@ -195,7 +195,7 @@ defmodule Arena.Game.Skill do
     end)
   end
 
-  def execute_mechanic(
+  defp execute_mechanic(
         game_state,
         entity,
         %{type: "simple_shoot"} = simple_shoot,
@@ -241,7 +241,7 @@ defmodule Arena.Game.Skill do
     |> put_in([:projectiles, projectile.id], projectile)
   end
 
-  def execute_mechanic(
+  defp execute_mechanic(
         game_state,
         entity,
         %{type: "simple_shoot"} = simple_shoot,
@@ -272,7 +272,7 @@ defmodule Arena.Game.Skill do
     |> put_in([:projectiles, projectile.id], projectile)
   end
 
-  def execute_mechanic(game_state, entity, %{type: "leap"} = leap, %{execution_duration: execution_duration}) do
+  defp execute_mechanic(game_state, entity, %{type: "leap"} = leap, %{execution_duration: execution_duration}) do
     Process.send_after(
       self(),
       {:stop_leap, entity.id, entity.aditional_info.base_speed, leap.on_arrival_mechanic},
@@ -291,7 +291,7 @@ defmodule Arena.Game.Skill do
     put_in(game_state, [:players, player.id], player)
   end
 
-  def execute_mechanic(game_state, entity, %{type: "teleport"}, %{skill_destination: skill_destination}) do
+  defp execute_mechanic(game_state, entity, %{type: "teleport"}, %{skill_destination: skill_destination}) do
     entity =
       entity
       |> Map.put(:aditional_info, entity.aditional_info)
@@ -300,7 +300,7 @@ defmodule Arena.Game.Skill do
     put_in(game_state, [:players, entity.id], entity)
   end
 
-  def execute_mechanic(game_state, %{category: :projectile} = entity, %{type: "spawn_pool"} = pool_params, skill_params) do
+  defp execute_mechanic(game_state, %{category: :projectile} = entity, %{type: "spawn_pool"} = pool_params, skill_params) do
     last_id = game_state.last_id + 1
     entity_player_owner = get_entity_player_owner(game_state, entity)
 
@@ -332,7 +332,7 @@ defmodule Arena.Game.Skill do
     |> put_in([:last_id], last_id)
   end
 
-  def execute_mechanic(game_state, player, %{type: "spawn_pool"} = pool_params, skill_params) do
+  defp execute_mechanic(game_state, player, %{type: "spawn_pool"} = pool_params, skill_params) do
     last_id = game_state.last_id + 1
     entity_player_owner = get_entity_player_owner(game_state, player)
 
@@ -364,7 +364,7 @@ defmodule Arena.Game.Skill do
     |> put_in([:last_id], last_id)
   end
 
-  def execute_mechanic(game_state, entity, {:polygon_hit, polygon_hit}, _skill_params) do
+  defp execute_mechanic(game_state, entity, {:polygon_hit, polygon_hit}, _skill_params) do
     polygon_damage_area = Entities.make_polygon_area(entity.id, polygon_hit.vertices)
 
     entity_player_owner = get_entity_player_owner(game_state, entity)

From 46fc2b1a414ebe2cf2181c23ea092a75687be947 Mon Sep 17 00:00:00 2001
From: Nicolas Sanchez <sanchez.nicolas96@gmail.com>
Date: Tue, 17 Dec 2024 12:58:17 -0300
Subject: [PATCH 3/4] Use ubuntu 22.04 instead of latest

---
 .github/workflows/elixir-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/elixir-ci.yml b/.github/workflows/elixir-ci.yml
index 6a6fb3116..0d660adef 100644
--- a/.github/workflows/elixir-ci.yml
+++ b/.github/workflows/elixir-ci.yml
@@ -15,7 +15,7 @@ permissions:
 jobs:
   build:
     name: Build and test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         elixir: [1.16.0]

From 8ecccf5cdf909e1f68a18346a18e4ed8aa6f9c1f Mon Sep 17 00:00:00 2001
From: Nicolas Sanchez <sanchez.nicolas96@gmail.com>
Date: Tue, 17 Dec 2024 13:01:16 -0300
Subject: [PATCH 4/4] Format elixir code

---
 apps/arena/lib/arena/game/skill.ex | 67 ++++++++++++++++--------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/apps/arena/lib/arena/game/skill.ex b/apps/arena/lib/arena/game/skill.ex
index 3ec963dae..0323202d2 100644
--- a/apps/arena/lib/arena/game/skill.ex
+++ b/apps/arena/lib/arena/game/skill.ex
@@ -25,11 +25,11 @@ defmodule Arena.Game.Skill do
   end
 
   defp execute_mechanic(
-        game_state,
-        entity,
-        %{type: "circle_hit"} = circle_hit,
-        %{skill_direction: skill_direction} = _skill_params
-      ) do
+         game_state,
+         entity,
+         %{type: "circle_hit"} = circle_hit,
+         %{skill_direction: skill_direction} = _skill_params
+       ) do
     circle_center_position = get_position_with_offset(entity.position, skill_direction, circle_hit.offset)
     circular_damage_area = Entities.make_circular_area(entity.id, circle_center_position, circle_hit.range)
 
@@ -46,11 +46,11 @@ defmodule Arena.Game.Skill do
   end
 
   defp execute_mechanic(
-        game_state,
-        entity,
-        %{type: "cone_hit"} = cone_hit,
-        %{skill_direction: skill_direction} = _skill_params
-      ) do
+         game_state,
+         entity,
+         %{type: "cone_hit"} = cone_hit,
+         %{skill_direction: skill_direction} = _skill_params
+       ) do
     triangle_points =
       Physics.calculate_triangle_vertices(
         entity.position,
@@ -100,11 +100,11 @@ defmodule Arena.Game.Skill do
   end
 
   defp execute_mechanic(
-        game_state,
-        entity,
-        %{type: "dash", speed: speed, duration_ms: duration_ms},
-        %{skill_direction: skill_direction} = _skill_params
-      ) do
+         game_state,
+         entity,
+         %{type: "dash", speed: speed, duration_ms: duration_ms},
+         %{skill_direction: skill_direction} = _skill_params
+       ) do
     Process.send_after(self(), {:stop_dash, entity.id, entity.aditional_info.base_speed}, duration_ms)
 
     ## Modifying base_speed rather than speed because effects will reset the speed on game tick
@@ -161,11 +161,11 @@ defmodule Arena.Game.Skill do
   end
 
   defp execute_mechanic(
-        game_state,
-        entity,
-        %{type: "multi_shoot"} = multishot,
-        %{skill_direction: skill_direction} = skill_params
-      ) do
+         game_state,
+         entity,
+         %{type: "multi_shoot"} = multishot,
+         %{skill_direction: skill_direction} = skill_params
+       ) do
     entity_player_owner = get_entity_player_owner(game_state, entity)
 
     calculate_angle_directions(multishot.amount, multishot.angle_between, skill_direction)
@@ -196,11 +196,11 @@ defmodule Arena.Game.Skill do
   end
 
   defp execute_mechanic(
-        game_state,
-        entity,
-        %{type: "simple_shoot"} = simple_shoot,
-        %{skill_direction: skill_direction, can_pick_destination: true} = skill_params
-      ) do
+         game_state,
+         entity,
+         %{type: "simple_shoot"} = simple_shoot,
+         %{skill_direction: skill_direction, can_pick_destination: true} = skill_params
+       ) do
     last_id = game_state.last_id + 1
     entity_player_owner = get_entity_player_owner(game_state, entity)
 
@@ -242,11 +242,11 @@ defmodule Arena.Game.Skill do
   end
 
   defp execute_mechanic(
-        game_state,
-        entity,
-        %{type: "simple_shoot"} = simple_shoot,
-        %{skill_direction: skill_direction} = skill_params
-      ) do
+         game_state,
+         entity,
+         %{type: "simple_shoot"} = simple_shoot,
+         %{skill_direction: skill_direction} = skill_params
+       ) do
     last_id = game_state.last_id + 1
     entity_player_owner = get_entity_player_owner(game_state, entity)
 
@@ -300,7 +300,12 @@ defmodule Arena.Game.Skill do
     put_in(game_state, [:players, entity.id], entity)
   end
 
-  defp execute_mechanic(game_state, %{category: :projectile} = entity, %{type: "spawn_pool"} = pool_params, skill_params) do
+  defp execute_mechanic(
+         game_state,
+         %{category: :projectile} = entity,
+         %{type: "spawn_pool"} = pool_params,
+         skill_params
+       ) do
     last_id = game_state.last_id + 1
     entity_player_owner = get_entity_player_owner(game_state, entity)