From 38ccd13634d280928e38efb0c173972731022136 Mon Sep 17 00:00:00 2001
From: Tissevert <tissevert+devel@marvid.fr>
Date: Thu, 16 Jan 2020 16:45:23 +0100
Subject: [PATCH] Fix various missing dependencies and renamed variables

---
 js/GUI/Card/HandCard.js         |  2 +-
 js/GUI/Screen/Game.js           | 12 +++++++-----
 js/GUI/Screen/Game/Animation.js | 12 +++++++-----
 js/GUI/Screen/Game/State.js     |  2 ++
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/js/GUI/Card/HandCard.js b/js/GUI/Card/HandCard.js
index 5189be5..baabc67 100644
--- a/js/GUI/Card/HandCard.js
+++ b/js/GUI/Card/HandCard.js
@@ -25,7 +25,7 @@ function HandCard(name) {
 		if(matching.length > 1) {
 			State.select(card);
 		} else {
-			State.play({play: card.name});
+			State.play({play: name});
 		}
 	}
 }
diff --git a/js/GUI/Screen/Game.js b/js/GUI/Screen/Game.js
index 84442a6..6738935 100644
--- a/js/GUI/Screen/Game.js
+++ b/js/GUI/Screen/Game.js
@@ -4,7 +4,9 @@ import * as RiverCard from GUI.Card.RiverCard;
 import * as TurnedCard from GUI.Card.TurnedCard;
 import * as Screen from GUI.Screen;
 import {animate, catchUp, delay, getQueue} from GUI.Screen.Game.Animation;
-import {dom, init as initState, select, sets, state} from GUI.Screen.Game.State;
+import {
+	dom, init as initState, play, select, sets, state
+} from GUI.Screen.Game.State;
 import Hanafuda;
 import I18n;
 import Messaging;
@@ -75,7 +77,7 @@ function initMessageHandlers() {
 }
 
 function handleGameMessage(o) {
-  if(o.state.public.turns == 0) {
+  if(o.state.public.gameState.turns == 0 || state.game == null) {
     if(o.logs.length > 0) { // but still some logs, from the previous round
       return Async.sequence(applyDiff(o), setGame(o)); // so play the diff, then set the new round
     } else {
@@ -121,7 +123,7 @@ function handleTurnedCard(o, f) {
     setTurned(o.state.public.step.contents);
   } else {
     if(state.step == "ToPlay" && o.state.public.playing == o.state.public.oyake) {
-      rest.className = ["card", "turn" + o.state.public.turns].join(' ');
+      rest.className = ["card", "turn" + o.state.public.gameState.turns].join(' ');
     }
     if(deck.lastChild.id != "rest") {
       deck.removeChild(deck.lastChild);
@@ -217,7 +219,7 @@ function setCaptures(game) {
 }
 
 function setCardSet(set, cardNames, constructor) {
-  constructor = constructor || Card;
+  constructor = constructor || Card.make;
   set.card = {};
   Dom.clear(set.dom);
   cardNames.forEach(function(cardName) {
@@ -240,6 +242,6 @@ function setTheirCards(game) {
 function setTurned(cardName) {
   state.turnedCard = TurnedCard.make(cardName);
   if(state.playing) {
-		select(turnedCard);
+		select(state.turnedCard);
   }
 }
diff --git a/js/GUI/Screen/Game/Animation.js b/js/GUI/Screen/Game/Animation.js
index 3611ed3..126b281 100644
--- a/js/GUI/Screen/Game/Animation.js
+++ b/js/GUI/Screen/Game/Animation.js
@@ -1,4 +1,6 @@
 import * as Card from GUI.Card;
+import * as RiverCard from GUI.Card.RiverCard;
+import * as TurnedCard from GUI.Card.TurnedCard;
 import * as State from GUI.Screen.Game.State;
 import * as Async from UnitJS.Async;
 import * as Dom from UnitJS.Dom;
@@ -30,7 +32,7 @@ function animate(movement) {
         movingCards.push([State.sets[side].hand, dest, card]);
       } else {
         var cardSet = {};
-        cardSet[card.name] = State.state.turnedCard || TurnedCard.make(card.name);
+        cardSet[card.value.name] = State.state.turnedCard || TurnedCard.make(card.value.name);
         State.state.turnedCard = null;
         movingCards.push([{card: cardSet, dom: State.dom.deck}, dest, card]);
       }
@@ -66,7 +68,7 @@ function getQueue() {
 
 function insertCard(toSet, card) {
   if(toSet.dom != undefined) {
-    toSet.card[card.name] = card;
+    toSet.card[card.value.name] = card;
     toSet.dom.appendChild(card.dom);
   } else {
     insertCard(toSet[card.value.family.class], card);
@@ -76,9 +78,9 @@ function insertCard(toSet, card) {
 function moveCard(fromSet, toSet, card) {
   var from, originalCard;
   var slot = Dom.make('li', {class: ['card', 'slot']});
-  if (fromSet.card[card.name] != undefined) {
-    originalCard = fromSet.card[card.name].dom;
-    delete fromSet.card[card.name];
+  if (fromSet.card[card.value.name] != undefined) {
+    originalCard = fromSet.card[card.value.name].dom;
+    delete fromSet.card[card.value.name];
   } else {
     originalCard = fromSet.dom.children[fromSet.dom.children.length - 1];
   }
diff --git a/js/GUI/Screen/Game/State.js b/js/GUI/Screen/Game/State.js
index 2b06147..17fe3ba 100644
--- a/js/GUI/Screen/Game/State.js
+++ b/js/GUI/Screen/Game/State.js
@@ -1,4 +1,6 @@
+import Hanafuda;
 import Messaging;
+import * as Fun from UnitJS.Fun;
 
 var dom = {
 	deck: document.getElementById('deck'),