Double click and right click should discard immediately

Author: EpicOrange

lib/riichi_advanced/game/utils.ex

@@ -303,7 +303,7 @@ defmodule RiichiAdvanced.Utils do
     sideways = i == Map.get(assigns, :riichi_index, nil) or has_attr?(tile, ["sideways"])
     just_played = Map.get(assigns, :just_discarded?, false) and Map.has_key?(assigns, :pond) and i == length(assigns.pond) - 1
     riichi = Map.has_key?(assigns, :riichi_index) and i == assigns.riichi_index
-    selected = Map.has_key?(assigns, :selected_index) and i == assigns.selected_index
+    selected = Map.has_key?(assigns, :selected_index) and i != nil and i == assigns.selected_index
     number_class = case Riichi.to_num(tile) do
       1 -> ["one"]
       2 -> ["two"]

lib/riichi_advanced_web/views/game_live.ex

@@ -484,16 +484,18 @@ defmodule RiichiAdvancedWeb.GameLive do
 
   def handle_event("double_clicked", _assigns, socket) do
     if not Map.has_key?(socket.assigns, :tutorial_sequence) do
+      socket = assign(socket, :selected_index, :any)
       skip_or_discard_draw(socket)
-    end
-    {:noreply, socket}
+      {:noreply, socket}
+    else {:noreply, socket} end
   end
 
   def handle_event("right_clicked", _assigns, socket) do
     if not Map.has_key?(socket.assigns, :tutorial_sequence) do
+      socket = assign(socket, :selected_index, :any)
       skip_or_discard_draw(socket)
-    end
-    {:noreply, socket}
+      {:noreply, socket}
+    else {:noreply, socket} end
   end
 
   def handle_event("button_clicked", %{"name" => name}, socket) do
@@ -609,7 +611,7 @@ defmodule RiichiAdvancedWeb.GameLive do
   end
 
   def handle_info({:play_tile, index}, socket) do
-    if socket.assigns.seat == socket.assigns.state.turn and index == socket.assigns.selected_index do
+    if socket.assigns.seat == socket.assigns.state.turn and socket.assigns.selected_index in [index, :any] do
       socket = assign(socket, :visible_waits, %{})
       socket = assign(socket, :show_waits_index, nil)
       socket = if not Map.has_key?(socket.assigns, :tutorial_sequence) do