upgraded to SpatialOS 12.0.4

johnprobable · johnprobable · commit f0918f62a511 · 2017-11-09T17:18:25.000Z
diff --git a/default_launch.json b/default_launch.json
@@ -31,9 +31,9 @@
           },
           "loadbalancer_config": {
             "min_range_meters": 500.0,
-            "max_range_meters": 1000.0,
+            "max_range_meters": 4000.0,
             "speed_meters_per_second": 100.0,
-            "expansion_time_millis": 60000
+            "expansion_time_millis": 6000
           }
         }
       },
diff --git a/workers/unity/Assets/Gamelogic/HQ/HQSpawnBarracksBehaviour.cs b/workers/unity/Assets/Gamelogic/HQ/HQSpawnBarracksBehaviour.cs
@@ -117,7 +117,7 @@ private void SpawnUnconstructedBarracksAtRandomLocation()
 
             var teamId = teamAssignment.Data.teamId;
             var template = EntityTemplateFactory.CreateBarracksTemplate(spawnPosition.ToCoordinates(), BarracksState.UNDER_CONSTRUCTION, teamId);
-            SpatialOS.Commands.CreateEntity(hqInfo, template)
+            SpatialOS.Commands.CreateEntity(hqInfo, template, new System.TimeSpan(0, 0, 30))
                 .OnFailure(_ =>
                 {
                     Debug.LogWarning("HQ failed to spawn barracks due to timeout.");
diff --git a/workers/unity/Assets/Gamelogic/NPC/Lumberjack/LumberjackHarvestingState.cs b/workers/unity/Assets/Gamelogic/NPC/Lumberjack/LumberjackHarvestingState.cs
@@ -76,8 +76,11 @@ private void AttemptToHarvestTree()
             if (targetGameObject != null && NPCUtils.IsTargetAHealthyTree(parentBehaviour.gameObject, targetGameObject))
             {
                 SpatialOS.Commands.SendCommand(inventory,
-                    Harvestable.Commands.Harvest.Descriptor,
-                    new HarvestRequest(parentBehaviour.gameObject.EntityId()), Owner.Data.targetEntityId, OnHarvestResponse);
+                                               Harvestable.Commands.Harvest.Descriptor,
+                                               new HarvestRequest(parentBehaviour.gameObject.EntityId()),
+                                               Owner.Data.targetEntityId,
+                                               OnHarvestResponse,
+                                               new System.TimeSpan(0, 0, 30));
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@`
`31`	`31`	`},`
`32`	`32`	`"loadbalancer_config": {`
`33`	`33`	`"min_range_meters": 500.0,`
`34`		`- "max_range_meters": 1000.0,`
	`34`	`+ "max_range_meters": 4000.0,`
`35`	`35`	`"speed_meters_per_second": 100.0,`
`36`		`- "expansion_time_millis": 60000`
	`36`	`+ "expansion_time_millis": 6000`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`},`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ private void SpawnUnconstructedBarracksAtRandomLocation()`
`117`	`117`
`118`	`118`	`var teamId = teamAssignment.Data.teamId;`
`119`	`119`	`var template = EntityTemplateFactory.CreateBarracksTemplate(spawnPosition.ToCoordinates(), BarracksState.UNDER_CONSTRUCTION, teamId);`
`120`		`- SpatialOS.Commands.CreateEntity(hqInfo, template)`
	`120`	`+ SpatialOS.Commands.CreateEntity(hqInfo, template, new System.TimeSpan(0, 0, 30))`
`121`	`121`	`.OnFailure(_ =>`
`122`	`122`	`{`
`123`	`123`	`Debug.LogWarning("HQ failed to spawn barracks due to timeout.");`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,11 @@ private void AttemptToHarvestTree()`
`76`	`76`	`if (targetGameObject != null && NPCUtils.IsTargetAHealthyTree(parentBehaviour.gameObject, targetGameObject))`
`77`	`77`	`{`
`78`	`78`	`SpatialOS.Commands.SendCommand(inventory,`
`79`		`- Harvestable.Commands.Harvest.Descriptor,`
`80`		`- new HarvestRequest(parentBehaviour.gameObject.EntityId()), Owner.Data.targetEntityId, OnHarvestResponse);`
	`79`	`+ Harvestable.Commands.Harvest.Descriptor,`
	`80`	`+ new HarvestRequest(parentBehaviour.gameObject.EntityId()),`
	`81`	`+ Owner.Data.targetEntityId,`
	`82`	`+ OnHarvestResponse,`
	`83`	`+ new System.TimeSpan(0, 0, 30));`
`81`	`84`	`}`
`82`	`85`	`else`
`83`	`86`	`{`