Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi

Assets/Scenes/ComputerView.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.18018535, g: 0.22559482, b: 0.30677685, a: 1}
+  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -6759,6 +6759,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   texts:
   - Hideo Kojima is not executive director on this project.
+  - Medium-hot mustard > all
+  - Glaceon best eeveelution
+  - Made with lots of coffee
+  - Sell Lada, very little used, will be used very little
+  - It's not very cold at the moment
+  - 'If laziness were a sport, we would all be champions '
+  - Shinji Mikami has not approved this project (but we remain available)
+  - 'JRPG rules the world '
+  - Bravo les lesbiennes !
+  - 'Mer il est fou ! '
+  - Au revoir...
+  - '*Angry cat noise*'
+  - Nyaaaa ~
+  - Coded without JS (I think)
+  - I developed without counting
 --- !u!1 &1542177989
 GameObject:
   m_ObjectHideFlags: 0

Assets/ScriptableObjects/PromptList.asset

@@ -165,3 +165,33 @@ MonoBehaviour:
   - <id>k__BackingField: 70f8b286-b245-45b9-a850-ac2e14bf9cef
     <fr>k__BackingField: Votre plus belle grimace
     <en>k__BackingField: Your best grimace
+  - <id>k__BackingField: bcd451ef-06f7-4517-8ed7-f8d6f24489bc
+    <fr>k__BackingField: "Un p\xE8re no\xEBl"
+    <en>k__BackingField: A Santa Claus
+  - <id>k__BackingField: d3ba94ba-d025-41ff-811f-a80619c34805
+    <fr>k__BackingField: Parle beaucoup
+    <en>k__BackingField: Talk a lot
+  - <id>k__BackingField: c669f53a-aace-4658-95db-ad3df8eeb591
+    <fr>k__BackingField: Un truc qui colle
+    <en>k__BackingField: Something that sticks
+  - <id>k__BackingField: 1bd84b74-0d40-4f84-bbe9-4d279d1c82bb
+    <fr>k__BackingField: Un objet qui prends des photos
+    <en>k__BackingField: An object that takes photos
+  - <id>k__BackingField: eb7ffe31-bf01-4b10-b923-0a9e82cb148e
+    <fr>k__BackingField: Le retour du fils prodigue
+    <en>k__BackingField: The Return of the Prodigal Son
+  - <id>k__BackingField: 1eea7cba-df04-4e7a-8785-2173da8f5477
+    <fr>k__BackingField: "Nourriture agr\xE9able"
+    <en>k__BackingField: Comfort food
+  - <id>k__BackingField: 2c660b2b-82d7-45ab-b88c-38dbbf4505d1
+    <fr>k__BackingField: Un lien entre deux mondes
+    <en>k__BackingField: A link between two worlds
+  - <id>k__BackingField: 720dbf48-5abc-4507-baaa-698ad7f06a44
+    <fr>k__BackingField: "Un actionner des ann\xE9es 80"
+    <en>k__BackingField: 'An action from the 80s '
+  - <id>k__BackingField: fc3de187-e7c2-4d16-a9d2-b8bbf7c9698c
+    <fr>k__BackingField: Vous dans dix ans
+    <en>k__BackingField: You in ten years
+  - <id>k__BackingField: 9676ca98-d488-4105-b25e-78f63ad44482
+    <fr>k__BackingField: "Une excellente excuse pour un arr\xEAt maladie"
+    <en>k__BackingField: An excellent excuse for sick leave

Assets/Scripts/RoomManager.cs

@@ -428,7 +428,7 @@ private void CheckPlayersPropositions()
             {
                 if (string.IsNullOrEmpty(p.photoUrl))
                 {
-                    Debug.Log($"player {p.owner} has a proposition without an URL");
+                    Debug.Log($"player {p.owner.name} has a proposition without an URL");
                     allPlayersHasProposedTwoPictures = false;
                 }
             }

Assets/Scripts/VotingPage.cs

@@ -133,21 +133,27 @@ private void UpdateVoters()
         if (currentQuestion.propositions[0] != null)
         {
             List<Player> playersThatHasVotedForFirstProposition = new List<Player>();
-            foreach (string playerId in currentQuestion.propositions[0].voters)
+            if (currentQuestion.propositions[0].voters != null)
             {
-                playersThatHasVotedForFirstProposition.Add(currentPlayers[playerId]);
+                foreach (string playerId in currentQuestion.propositions[0].voters)
+                {
+                    playersThatHasVotedForFirstProposition.Add(currentPlayers[playerId]);
+                }
+                proposition1.UpdateVoters(playersThatHasVotedForFirstProposition);
             }
-            proposition1.UpdateVoters(playersThatHasVotedForFirstProposition);
         }
 
         if (currentQuestion.propositions[1] != null)
         {
             List<Player> playersThatHasVotedForSecondProposition = new List<Player>();
-            foreach (string playerId in currentQuestion.propositions[1].voters)
+            if (currentQuestion.propositions[0].voters != null)
             {
-                playersThatHasVotedForSecondProposition.Add(currentPlayers[playerId]);
+                foreach (string playerId in currentQuestion.propositions[1].voters)
+                {
+                    playersThatHasVotedForSecondProposition.Add(currentPlayers[playerId]);
+                }
+                proposition2.UpdateVoters(playersThatHasVotedForSecondProposition);
             }
-            proposition2.UpdateVoters(playersThatHasVotedForSecondProposition);
         }
     }
 }