Merge branch 'formatting' into 'master'

Apply Mix Format changes

See merge request maxime/move-your-cedric!2

Author: Maxime Buffa

lib/move_your_cedric/astar.ex

@@ -2,13 +2,11 @@ defmodule MoveYourCedric.Astar do
   require Logger
 
   defmodule Node do
-    defstruct [
-      position: nil,
-      f: nil,
-      g: nil,
-      h: nil,
-      parent: nil
-    ]
+    defstruct position: nil,
+              f: nil,
+              g: nil,
+              h: nil,
+              parent: nil
   end
 
   # G
@@ -54,7 +52,8 @@ defmodule MoveYourCedric.Astar do
   # Core algorithm
 
   # Final handler: We got nothing to do, we got our path.
-  def build_path(_tiles, %{path: %{final_path: final_path}} = state) when is_nil(final_path) == false do
+  def build_path(_tiles, %{path: %{final_path: final_path}} = state)
+      when is_nil(final_path) == false do
     Logger.debug("[ASTAR] Nothing to do, final path is already known.")
     state
   end
@@ -79,16 +78,14 @@ defmodule MoveYourCedric.Astar do
       final_path: nil
     }
 
-    %{state | path: path }
+    %{state | path: path}
   end
 
   # Second handler: We just got the initial node in our open list.
   def build_path(tiles, %{path: %{open_list: [current], closed_list: closed_list}} = state) do
-    path =
-      %{state.path | closed_list: closed_list ++ [current],
-                     open_list: []}
+    path = %{state.path | closed_list: closed_list ++ [current], open_list: []}
 
-    state = %{ state | path: path }
+    state = %{state | path: path}
 
     if state.target == current.position do
       Logger.info("[ASTAR] Reached destination")
@@ -105,7 +102,7 @@ defmodule MoveYourCedric.Astar do
     else
       state = %{state | path: compute_path(current, tiles, state)}
 
-      Logger.info("[ASTAR] Added nodes to the open list: #{ inspect state.path.open_list }")
+      Logger.info("[ASTAR] Added nodes to the open list: #{inspect(state.path.open_list)}")
 
       state
     end
@@ -116,20 +113,17 @@ defmodule MoveYourCedric.Astar do
     current =
       open_list
       |> Enum.sort_by(fn node -> {node.f, node.h} end, &<=/2)
-      |> List.first
+      |> List.first()
 
     new_open_list =
       open_list
       |> Enum.reject(fn node -> node.position == current.position end)
 
     new_closed_list = closed_list ++ [current]
 
-    new_path =
-      %{state.path | open_list: new_open_list,
-                     closed_list: new_closed_list}
+    new_path = %{state.path | open_list: new_open_list, closed_list: new_closed_list}
 
-    state =
-      %{state | path: new_path}
+    state = %{state | path: new_path}
 
     if state.target == current.position do
       final_path =
@@ -149,9 +143,11 @@ defmodule MoveYourCedric.Astar do
     end
   end
 
-
-
-  defp compute_path(current, tiles, %{path: %{closed_list: closed_list, open_list: open_list}} = state) do
+  defp compute_path(
+         current,
+         tiles,
+         %{path: %{closed_list: closed_list, open_list: open_list}} = state
+       ) do
     # We filter our neighbors: we don't want obstacles or nodes in closed_list.
     neighbors =
       neighbors_of(tiles, current.position)
@@ -170,7 +166,7 @@ defmodule MoveYourCedric.Astar do
       neighbors
       |> Enum.map(fn neighbor ->
         cost_to_enter(current.position, neighbor.position) +
-        manhattan_distance(neighbor.position, state.target)
+          manhattan_distance(neighbor.position, state.target)
       end)
 
     Logger.info("[ASTAR] Calculated shortest path available")
@@ -215,12 +211,12 @@ defmodule MoveYourCedric.Astar do
   end
 
   defp build_final_path(closed_list, origin, current, path) do
-    Logger.debug("[PLAYER] Building: #{inspect current}")
+    Logger.debug("[PLAYER] Building: #{inspect(current)}")
 
     parent =
       closed_list
-        |> Enum.filter(fn node -> node.position == current.parent end)
-        |> List.first()
+      |> Enum.filter(fn node -> node.position == current.parent end)
+      |> List.first()
 
     build_final_path(closed_list, origin, parent, [parent, current] ++ path)
   end

lib/move_your_cedric/models/entity.ex

@@ -1,9 +1,7 @@
 defmodule MoveYourCedric.Models.Entity do
-  defstruct [
-    name: nil,
-    position: [0, 0],
-    type: nil,
-    status: nil,
-    target: nil
-  ]
+  defstruct name: nil,
+            position: [0, 0],
+            type: nil,
+            status: nil,
+            target: nil
 end

lib/move_your_cedric/models/tile.ex

@@ -1,6 +1,4 @@
 defmodule MoveYourCedric.Models.Tile do
-  defstruct [
-    position: [0, 0],
-    type: nil
-  ]
+  defstruct position: [0, 0],
+            type: nil
 end

lib/move_your_cedric/models/tile_map.ex

@@ -1,7 +1,5 @@
 defmodule MoveYourCedric.Models.TileMap do
-  defstruct [
-    size: [0, 0],
-    tiles: [],
-    entities: []
-  ]
+  defstruct size: [0, 0],
+            tiles: [],
+            entities: []
 end

lib/move_your_cedric/workers/complex_map_generator.ex

@@ -21,7 +21,7 @@ defmodule MoveYourCedric.Workers.ComplexMapGenerator do
         [6, 3],
         [6, 4],
         [6, 5],
-        [6, 6],
+        [6, 6]
       ]
 
       def tile_type_from_coords(x, y) do

lib/move_your_cedric/workers/pathfinder.ex

@@ -16,6 +16,7 @@ defmodule MoveYourCedric.Workers.Pathfinder do
       target: nil,
       path: nil
     }
+
     {:ok, state}
   end
 
@@ -51,11 +52,6 @@ defmodule MoveYourCedric.Workers.Pathfinder do
     GenServer.cast(__MODULE__, {:pick_target, position})
   end
 
-
-
-
-
-
   def handle_call(:get_path, _from, state) do
     {:reply, state.path, state}
   end
@@ -73,13 +69,13 @@ defmodule MoveYourCedric.Workers.Pathfinder do
   end
 
   def handle_cast({:set_position, position}, state) do
-    Logger.debug("[PLAYER] Setting position to #{ inspect position }")
+    Logger.debug("[PLAYER] Setting position to #{inspect(position)}")
     {:noreply, %{state | position: position}}
   end
 
   def handle_cast({:pick_target, position}, state) do
     new_state = pick_target(position, state)
-    Logger.debug("[PLAYER] Setting target to #{ inspect new_state.target }")
+    Logger.debug("[PLAYER] Setting target to #{inspect(new_state.target)}")
     {:noreply, new_state}
   end
 
@@ -102,31 +98,21 @@ defmodule MoveYourCedric.Workers.Pathfinder do
   def handle_cast(:walk_path, %{path: %{final_path: []}} = state) do
     Logger.debug("[PLAYER] Reached destination.")
 
-    state =
-      %{state | path: nil,
-                position: state.target,
-                status: :idle,
-                target: nil}
+    state = %{state | path: nil, position: state.target, status: :idle, target: nil}
 
     {:noreply, state}
   end
 
   def handle_cast(:walk_path, %{path: %{final_path: [head | tail]}} = state) do
-    Logger.debug("[PLAYER] Walking the path, received #{inspect head} and #{inspect tail}.")
+    Logger.debug("[PLAYER] Walking the path, received #{inspect(head)} and #{inspect(tail)}.")
 
-    new_path =
-      %{state.path | final_path: tail}
+    new_path = %{state.path | final_path: tail}
 
-    state =
-      %{state | path: new_path,
-                position: head.position,
-                status: :moving}
+    state = %{state | path: new_path, position: head.position, status: :moving}
 
     {:noreply, state}
   end
 
-
-
   defp pick_target([tx, ty] = target, %{position: [tx, ty]} = state) do
     %{state | status: :idle, target: target, path: nil}
   end

lib/move_your_cedric_web/live/complex_map_live.ex

@@ -12,12 +12,14 @@ defmodule MoveYourCedricWeb.ComplexMapLive do
     player = tile_map.entities |> Enum.find(fn entity -> entity.type == "player" end)
     Pathfinder.set_position(player.position)
 
-    socket = assign(socket,
-      tile_map: tile_map,
-      path: Pathfinder.get_path(),
-      player_position: Pathfinder.get_position(),
-      player_target: Pathfinder.get_target()
-    )
+    socket =
+      assign(socket,
+        tile_map: tile_map,
+        path: Pathfinder.get_path(),
+        player_position: Pathfinder.get_position(),
+        player_target: Pathfinder.get_target()
+      )
+
     {:ok, socket}
   end
 
@@ -148,9 +150,11 @@ defmodule MoveYourCedricWeb.ComplexMapLive do
       tile_map.entities
       |> Enum.map(fn entity ->
         if entity.type == "player" do
-          %{entity | position: Pathfinder.get_position(),
-                     status: Pathfinder.get_status(),
-                     target: Pathfinder.get_target()
+          %{
+            entity
+            | position: Pathfinder.get_position(),
+              status: Pathfinder.get_status(),
+              target: Pathfinder.get_target()
           }
         else
           entity
@@ -173,13 +177,10 @@ defmodule MoveYourCedricWeb.ComplexMapLive do
     "#{x}; #{y}"
   end
 
-
-
   def get_tile_node(list, position) do
     list |> Enum.find(fn node -> position == node.position end)
   end
 
-
   def tile_has_player?([x, y], [x, y]), do: true
   def tile_has_player?(_, _), do: false
 
@@ -190,13 +191,15 @@ defmodule MoveYourCedricWeb.ComplexMapLive do
   def tile_in_open_list?(nil, _), do: false
   def tile_in_open_list?(%{open_list: nil}, _), do: false
   def tile_in_open_list?(%{open_list: []}, _), do: false
+
   def tile_in_open_list?(%{open_list: open_list}, position) do
     open_list |> Enum.any?(fn node -> node.position == position end)
   end
 
   def tile_in_closed_list?(nil, _), do: false
   def tile_in_closed_list?(%{closed_list: nil}, _), do: false
   def tile_in_closed_list?(%{closed_list: []}, _), do: false
+
   def tile_in_closed_list?(%{closed_list: closed_list}, position) do
     closed_list |> Enum.any?(fn node -> node.position == position end)
   end

lib/move_your_cedric_web/live/map_live.ex

@@ -12,12 +12,14 @@ defmodule MoveYourCedricWeb.MapLive do
     player = tile_map.entities |> Enum.find(fn entity -> entity.type == "player" end)
     Pathfinder.set_position(player.position)
 
-    socket = assign(socket,
-      tile_map: tile_map,
-      path: Pathfinder.get_path(),
-      player_position: Pathfinder.get_position(),
-      player_target: Pathfinder.get_target()
-    )
+    socket =
+      assign(socket,
+        tile_map: tile_map,
+        path: Pathfinder.get_path(),
+        player_position: Pathfinder.get_position(),
+        player_target: Pathfinder.get_target()
+      )
+
     {:ok, socket}
   end
 
@@ -148,9 +150,11 @@ defmodule MoveYourCedricWeb.MapLive do
       tile_map.entities
       |> Enum.map(fn entity ->
         if entity.type == "player" do
-          %{entity | position: Pathfinder.get_position(),
-                     status: Pathfinder.get_status(),
-                     target: Pathfinder.get_target()
+          %{
+            entity
+            | position: Pathfinder.get_position(),
+              status: Pathfinder.get_status(),
+              target: Pathfinder.get_target()
           }
         else
           entity
@@ -173,13 +177,10 @@ defmodule MoveYourCedricWeb.MapLive do
     "#{x}; #{y}"
   end
 
-
-
   def get_tile_node(list, position) do
     list |> Enum.find(fn node -> position == node.position end)
   end
 
-
   def tile_has_player?([x, y], [x, y]), do: true
   def tile_has_player?(_, _), do: false
 
@@ -190,13 +191,15 @@ defmodule MoveYourCedricWeb.MapLive do
   def tile_in_open_list?(nil, _), do: false
   def tile_in_open_list?(%{open_list: nil}, _), do: false
   def tile_in_open_list?(%{open_list: []}, _), do: false
+
   def tile_in_open_list?(%{open_list: open_list}, position) do
     open_list |> Enum.any?(fn node -> node.position == position end)
   end
 
   def tile_in_closed_list?(nil, _), do: false
   def tile_in_closed_list?(%{closed_list: nil}, _), do: false
   def tile_in_closed_list?(%{closed_list: []}, _), do: false
+
   def tile_in_closed_list?(%{closed_list: closed_list}, position) do
     closed_list |> Enum.any?(fn node -> node.position == position end)
   end