upgraded to SpatialOS 10.4.1

Author: johnprobable

spatialos.json

@@ -1,8 +1,8 @@
 {
     "name": "your_project_name_here",
     "project_version": "1.0.0",
-    "sdk_version": "10.4.0",
+    "sdk_version": "10.4.1",
     "dependencies": [
-    	{"name": "WorkerSdkSchema", "version": "10.4.0"}
+    	{"name": "WorkerSdkSchema", "version": "10.4.1"}
     ]
 }

workers/unity/.vs/config/applicationhost.config

@@ -64,18 +64,19 @@ public static void PopulateSnapshotWithLargeFish(ref Dictionary<EntityId, Snapsh
         }
 
         private static void SaveSnapshot(IDictionary<EntityId, SnapshotEntity> snapshotEntities)
-		{
-			File.Delete(SimulationSettings.DefaultSnapshotPath);
-			var maybeError = Snapshot.Save(SimulationSettings.DefaultSnapshotPath, snapshotEntities);
+        {
+            var snapshotPath = Application.dataPath + SimulationSettings.DefaultRelativeSnapshotPath;
+            File.Delete(snapshotPath);
+            var maybeError = Snapshot.Save(snapshotPath, snapshotEntities);
 
-			if (maybeError.HasValue)
-			{
-				Debug.LogErrorFormat("Failed to generate initial world snapshot: {0}", maybeError.Value);
-			}
-			else
-			{
-				Debug.LogFormat("Successfully generated initial world snapshot at {0}", SimulationSettings.DefaultSnapshotPath);
-			}
-		}
-	}
+            if (maybeError.HasValue)
+            {
+	            Debug.LogErrorFormat("Failed to generate initial world snapshot: {0}", maybeError.Value);
+            }
+            else
+            {
+	            Debug.LogFormat("Successfully generated initial world snapshot at {0}", snapshotPath);
+            }
+        }
+    }
 }

workers/unity/Assets/Editor/SnapshotMenu.cs

@@ -357,4 +357,4 @@ CapsuleCollider:
   m_Radius: 0.6
   m_Height: 4
   m_Direction: 2
-  m_Center: {x: 0, y: 0.25, z: -0.35}
+  m_Center: {x: 0, y: 0.5, z: -0.35}

workers/unity/Assets/EntityPrefabs/PirateShip.prefab

@@ -635,4 +635,4 @@ CapsuleCollider:
   m_Radius: 0.6
   m_Height: 4
   m_Direction: 2
-  m_Center: {x: 0, y: 0.25, z: -0.35}
+  m_Center: {x: 0, y: 0.5, z: -0.35}

workers/unity/Assets/EntityPrefabs/PlayerShip.prefab

@@ -47,7 +47,9 @@ private void OnFailedReservation(ICommandErrorDetails response, string clientWor
 
         private void CreatePlayer(string clientWorkerId, EntityId entityId)
         {
-            var playerEntityTemplate = EntityTemplateFactory.CreatePlayerShipTemplate(clientWorkerId, Coordinates.ZERO);
+            // Initial position is slightly randomised to prevent colliders interpenetrating at start
+            var initialPosition = new Coordinates(Random.Range(-1f, 1f), 0, Random.Range(-1f, 1f));
+            var playerEntityTemplate = EntityTemplateFactory.CreatePlayerShipTemplate(clientWorkerId, initialPosition);
             SpatialOS.Commands.CreateEntity(PlayerCreationWriter, entityId, SimulationSettings.PlayerShipPrefabName, playerEntityTemplate)
                 .OnFailure(failure => OnFailedPlayerCreation(failure, clientWorkerId, entityId));
         }

workers/unity/Assets/Gamelogic/Core/PlayerCreatingBehaviour.cs

@@ -32,8 +32,7 @@ public static class SimulationSettings
         public static readonly float PlayerEntityCreationRetrySecs = 4;
 
         // Snapshot
-        public static readonly string DefaultSnapshotPath = Application.dataPath +
-                                                            "/../../../snapshots/default.snapshot";
+        public static readonly string DefaultRelativeSnapshotPath = "/../../../snapshots/default.snapshot";
 
         // Island placements (prefab name and coordinate location)
         public static readonly Dictionary<string, Coordinates> IslandsEntityPlacements =

workers/unity/Assets/Gamelogic/Core/SimulationSettings.cs

@@ -22,7 +22,10 @@ private void OnDisable()
         private void VisualiseSinking()
         {
             SinkingAnimation.Play();
-            ShipWashVfx.SetActive(false);
+            if (ShipWashVfx != null)
+            {
+                ShipWashVfx.SetActive(false);
+            }
         }
     }
 }

workers/unity/Assets/Gamelogic/Pirates/Behaviours/SinkingBehaviour.cs

@@ -12,10 +12,5 @@ private void Start()
             // Cache entity's cannon gameobject
             cannon = gameObject.GetComponent<Cannon>();
         }
-
-        private void FireCannon(Vector3 direction)
-        {
-            cannon.Fire(direction);
-        }
     }
 }