A variety of fixes for upstream issues

- MovingBlocks/Terasology#3535 - new serialization - Terasology/Tasks#12 - goes with the new serialization - MovingBlocks/Terasology#3716 - updated world gen
Terasology · Aug 10, 2019 · dc1a2e8 · dc1a2e8
1 parent c238f46
commit dc1a2e8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 149 deletions.
diff --git a/assets/prefabs/quests/card.prefab b/assets/prefabs/quests/card.prefab
@@ -13,18 +13,18 @@
         "tasks" : [
             {
                 "id" : "collectMeat",
-                "type" : "CollectBlocksTask",
+                "class" : "CollectBlocksTask",
                 "data" : {
                     "itemId" : "WildAnimals:Meat",
-                    "amount" : 2
+                    "targetAmount" : 2
                 }
             },
             {
                 "id" : "returnHome",
-                "type" : "GoToBeaconTask",
+                "class" : "GoToBeaconTask",
                 "dependsOn" : "collectMeat",
                 "data" : {
-                    "beaconId" : "homeBeacon"
+                    "targetBeaconId" : "homeBeacon"
                 }
             }
         ]

diff --git a/src/main/java/org/terasology/metalrenegades/economy/actions/ShowDialogActionTypeHandler.java b/src/main/java/org/terasology/metalrenegades/economy/actions/ShowDialogActionTypeHandler.java
diff --git a/...java/org/terasology/metalrenegades/economy/actions/ShowMarketScreenActionTypeHandler.java b/...java/org/terasology/metalrenegades/economy/actions/ShowMarketScreenActionTypeHandler.java
diff --git a/...ava/org/terasology/metalrenegades/economy/actions/ShowTradingScreenActionTypeHandler.java b/...ava/org/terasology/metalrenegades/economy/actions/ShowTradingScreenActionTypeHandler.java
diff --git a/src/main/java/org/terasology/metalrenegades/quests/FetchQuestSystem.java b/src/main/java/org/terasology/metalrenegades/quests/FetchQuestSystem.java
@@ -39,6 +39,7 @@
 import org.terasology.rendering.nui.Color;
 import org.terasology.tasks.CollectBlocksTask;
 import org.terasology.tasks.Task;
+import org.terasology.tasks.TaskGraph;
 import org.terasology.tasks.components.QuestComponent;
 import org.terasology.tasks.components.QuestListComponent;
 import org.terasology.tasks.components.QuestSourceComponent;
@@ -50,7 +51,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -132,7 +132,7 @@ public void onQuestActivated(BeforeQuestEvent event, EntityRef questItem) {
         activeQuestEntity = questItem.getComponent(QuestSourceComponent.class).source;
 
         QuestComponent questComponent = questItem.getComponent(QuestComponent.class);
-        List<Task> tasks = questComponent.tasks;
+        TaskGraph tasks = questComponent.tasks;
         for (Task t : tasks) {
             if (t instanceof CollectBlocksTask) {
                 amounts.put(((CollectBlocksTask) t).getItemId(), ((CollectBlocksTask) t).getTargetAmount());

diff --git a/src/main/java/org/terasology/metalrenegades/world/dynamic/DynamicWorldGenerator.java b/src/main/java/org/terasology/metalrenegades/world/dynamic/DynamicWorldGenerator.java
@@ -17,7 +17,7 @@
 
 import org.terasology.core.world.generator.facetProviders.BiomeProvider;
 import org.terasology.core.world.generator.facetProviders.DefaultFloraProvider;
-import org.terasology.core.world.generator.facetProviders.PerlinHillsAndMountainsProvider;
+import org.terasology.core.world.generator.facetProviders.SimplexHillsAndMountainsProvider;
 import org.terasology.core.world.generator.facetProviders.SeaLevelProvider;
 import org.terasology.core.world.generator.facetProviders.SurfaceToDensityProvider;
 import org.terasology.core.world.generator.rasterizers.FloraRasterizer;
@@ -56,7 +56,7 @@ protected WorldBuilder createWorld() {
                 .addProvider(new HumidityProvider())
                 .addProvider(new TemperatureProvider())
                 .addProvider(new SurfaceToDensityProvider())
-                .addProvider(new PerlinHillsAndMountainsProvider())
+                .addProvider(new SimplexHillsAndMountainsProvider())
                 .addProvider(new BiomeProvider())
                 .addProvider(new DefaultFloraProvider())
                 .addProvider(new DefaultTreeProvider())