Commit: a9c41e6fea4f0c6ab5dde2fb3834790e182ea880 - HotshotOnline (hg)

Commit MetaInfo

• Revision: a9c41e6fea4f0c6ab5dde2fb3834790e182ea880 (tree)
• Time: 2019-04-12 03:46:05
• Author: sebastian_bugiu <sebastian_ <bugiu@head...>
• Commiter: sebastian_bugiu <sebastian_

Log Message

Adding level_patrol beginning cutscene.

Change Summary

• modified: core/src/headwayEnt/blackholedarksun/parser/ast/ObjectEvent.java
• modified: core/src/headwayEnt/blackholedarksun/parser/dispatchers/CutsceneEventDispatcher.java
• modified: desktop/raw/hotshot_gamedata/sl_level_patrol_begin.hsl

Incremental Difference

diff -r af861a9349cf -r a9c41e6fea4f core/src/headwayEnt/blackholedarksun/parser/ast/ObjectEvent.java
--- a/core/src/headwayEnt/blackholedarksun/parser/ast/ObjectEvent.java	Wed Apr 10 22:45:28 2019 +0300
+++ b/core/src/headwayEnt/blackholedarksun/parser/ast/ObjectEvent.java	Thu Apr 11 21:46:05 2019 +0300
@@ -91,7 +91,17 @@
         return levelEvent;
     }
 
+    public LevelEvent getAsLevelEvent(ArrayList<ObjDefinition> objDefinitionList) {
+        LevelEvent levelEvent = new LevelEvent();
+        getAsLevelEvent(levelEvent, objDefinitionList);
+        return levelEvent;
+    }
+
     public void getAsLevelEvent(LevelEvent levelEvent) {
+        getAsLevelEvent(levelEvent, this.objDefinitionList);
+    }
+
+    public void getAsLevelEvent(LevelEvent levelEvent, ArrayList<ObjDefinition> objDefinitionList) {
         for (ObjDefinition objDefinition : objDefinitionList) {
             for (Spawn spawn : spawnList) {
                 if (isObj(spawn.getSpawnName()) != null) {
@@ -151,4 +161,8 @@
     public ArrayList<Spawn> getSpawnList() {
         return spawnList;
     }
+
+    public ArrayList<Exit> getExitList() {
+        return exitList;
+    }
 }

diff -r af861a9349cf -r a9c41e6fea4f core/src/headwayEnt/blackholedarksun/parser/dispatchers/CutsceneEventDispatcher.java
--- a/core/src/headwayEnt/blackholedarksun/parser/dispatchers/CutsceneEventDispatcher.java	Wed Apr 10 22:45:28 2019 +0300
+++ b/core/src/headwayEnt/blackholedarksun/parser/dispatchers/CutsceneEventDispatcher.java	Thu Apr 11 21:46:05 2019 +0300
@@ -22,6 +22,7 @@
 import headwayent.blackholedarksun.parser.ast.CompletionTime;
 import headwayent.blackholedarksun.parser.ast.DelayedEvent;
 import headwayent.blackholedarksun.parser.ast.Event;
+import headwayent.blackholedarksun.parser.ast.Exit;
 import headwayent.blackholedarksun.parser.ast.ObjDefinition;
 import headwayent.blackholedarksun.parser.ast.ObjectEvent;
 import headwayent.blackholedarksun.parser.ast.ParallelTask;
@@ -29,6 +30,7 @@
 import headwayent.blackholedarksun.parser.ast.Position;
 import headwayent.blackholedarksun.parser.ast.SetSpeed;
 import headwayent.blackholedarksun.parser.ast.ShowText;
+import headwayent.blackholedarksun.parser.ast.Spawn;
 import headwayent.blackholedarksun.world.WorldManager;
 import headwayent.blackholedarksun.world.WorldManagerBase;
 import headwayent.blackholedarksun.world.WorldManagerSP;
@@ -135,14 +137,12 @@
         if (checkDelayStart(event, new DelayStartCallable() {
             @Override
             public boolean call(Event event1) {
-                if (!event.getObjDefinitionList().isEmpty()) {
-
-                    ArrayList<LevelEvent> levelEvents = new ArrayList<>();
-
-                    levelEvents.add(event.getAsLevelEvent());
-                    worldManager.spawnObjects(levelEvents.get(0));
-                    worldManager.exitObjectsFromLevel(levelEvents.get(0));
-                }
+//                if (!event.getObjDefinitionList().isEmpty()) {
+//
+//                    LevelEvent levelEvent = event.getAsLevelEvent();
+//                    worldManager.spawnObjects(levelEvent);
+//                    worldManager.exitObjectsFromLevel(levelEvent);
+//                }
                 return true;
             }
         })) {
@@ -262,13 +262,63 @@
                 position.setExecuted(true);
                 event.setState(Event.EventState.FINISHABLE);
             }
-            if (!event.getObjDefinitionList().isEmpty()) {
-                WorldManager.getSingleton().createEntitiesV2(event.getObjDefinitionList());
-                for (ObjDefinition objDefinition : event.getObjDefinitionList()) {
-                    objDefinition.setExecuted(true);
+            if (!event.getSpawnList().isEmpty() && !event.getSpawnList().get(0).isExecuted()) {
+                ArrayList<ObjDefinition> objDefinitionList = event.getObjDefinitionList();
+                if (objDefinitionList.isEmpty()) {
+                    throw new IllegalStateException("Cannot spawn without the object definition");
                 }
+                ArrayList<ObjDefinition> spawnObjDefinitionLiat = new ArrayList<>();
+                boolean found = false;
+                for (Spawn spawn : event.getSpawnList()) {
+                    found = false;
+                    for (ObjDefinition objDefinition : objDefinitionList) {
+                        if (objDefinition.getObjName().equalsIgnoreCase(spawn.getSpawnName())) {
+                            spawnObjDefinitionLiat.add(objDefinition);
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        throw new IllegalStateException("Could not find object to spawn by name: " + spawn.getSpawnName());
+                    }
+                }
+                LevelEvent levelEvent = event.getAsLevelEvent(spawnObjDefinitionLiat);
+                worldManager.spawnObjects(levelEvent);
+                event.getSpawnList().get(0).setExecuted(true);
                 event.setState(Event.EventState.FINISHABLE);
             }
+            if (!event.getExitList().isEmpty() && !event.getExitList().get(0).isExecuted()) {
+                ArrayList<ObjDefinition> objDefinitionList = event.getObjDefinitionList();
+                if (objDefinitionList.isEmpty()) {
+                    throw new IllegalStateException("Cannot exit a spawned object without the object definition");
+                }
+                ArrayList<ObjDefinition> exitObjDefinitionLiat = new ArrayList<>();
+                boolean found = false;
+                for (Exit exit : event.getExitList()) {
+                    found = false;
+                    for (ObjDefinition objDefinition : objDefinitionList) {
+                        if (objDefinition.getObjName().equalsIgnoreCase(exit.getExitName())) {
+                            exitObjDefinitionLiat.add(objDefinition);
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        throw new IllegalStateException("Could not find object to exit from cutscene by name: " + exit.getExitName());
+                    }
+                }
+                LevelEvent levelEvent = event.getAsLevelEvent(exitObjDefinitionLiat);
+                worldManager.exitObjectsFromLevel(levelEvent);
+                event.getExitList().get(0).setExecuted(true);
+                event.setState(Event.EventState.FINISHABLE);
+            }
+//            if (!event.getObjDefinitionList().isEmpty()) {
+//                WorldManager.getSingleton().createEntitiesV2(event.getObjDefinitionList());
+//                for (ObjDefinition objDefinition : event.getObjDefinitionList()) {
+//                    objDefinition.setExecuted(true);
+//                }
+//                event.setState(Event.EventState.FINISHABLE);
+//            }
 //            if (event.getDelayEnd() != null) {
 
 //            }

diff -r af861a9349cf -r a9c41e6fea4f desktop/raw/hotshot_gamedata/sl_level_patrol_begin.hsl
--- a/desktop/raw/hotshot_gamedata/sl_level_patrol_begin.hsl	Wed Apr 10 22:45:28 2019 +0300
+++ b/desktop/raw/hotshot_gamedata/sl_level_patrol_begin.hsl	Thu Apr 11 21:46:05 2019 +0300
@@ -60,7 +60,7 @@
 }
 camera_event
 {
-	position 0.0 0.0 50.0
+	position 0.0 0.0 150.0
 	look_at "Defender0" 5 secs
 	end_delay 1 secs
 
@@ -73,7 +73,7 @@
 {
 	start_delay 2 secs
 	attach "Defender0"
-	position 50.0 0.0 0.0 // relative to obj
+	position 150.0 0.0 0.0 // relative to obj
 	look_at "Defender0"
 	end_delay 3000 ms
 }
@@ -90,7 +90,7 @@
 {
 	start_delay 2 secs
 	attach "Defender1"
-	position 50.0 0.0 0.0 // relative to obj
+	position 150.0 0.0 0.0 // relative to obj
 	look_at "Defender1"
 	end_delay 3000 ms
 }
@@ -102,30 +102,34 @@
 }
 camera_event
 {
-	show_text_pos "What the ...?" 0.5 0.5 3000 ms
+	show_text_pos "What the ...?" 0.5 0.5 6000 ms
 }
 obj_event
 {
 	obj_def "Attacker0"
 	{
-		mesh ship_alien0
-		type fighter_ship
+		mesh "ship_alien0"
+		type "fighter_ship"
 		position 0.0 -100.0 -1600.0
 		orientation 0.0 1.0 0.0 180.0
 		speed 0.0 0.0 5.0
 		ai 0
 		friendly 0
-		behavior aggresive
+		behavior "aggressive"
 		health 100
 	}
 
 	spawn "Attacker0"
 }
+camera_detach
+{
+	detach
+}
 camera_attach
 {
-	start_delay 2 secs
+	start_delay 5 secs
 	attach "Attacker0"
-	position 50.0 0.0 0.0 // relative to obj
+	position 150.0 0.0 0.0 // relative to obj
 	look_at "Attacker0"
 	end_delay 3000 ms
 }
@@ -133,56 +137,5 @@
 {
 	detach
 }
-obj_event
-{
-	obj "Defender0"
-	change_speed 20.0 // change ship speed with the maximum delta/second
-}
-obj_event
-{
-	obj "Defender0"
-	change_speed 50.0
-	completion_time 5 secs // The speed must be reached within 5 secs if the ship acceleration permits it
-}
-parallel_task
-{
-	// We need a way to execute events in parallel and advance once all have been completed
-	obj_event
-	{
-		obj "Defender0"
-		change_speed 20.0
-	}
-	camera_detach
-	{
-		start_delay 2 secs
-		detach
-	}
-	obj_event
-	{
-		obj_def "Defender2"
-		{
-			mesh "ship_human1"
-			type "fighter_ship"
-			position -500.0 0.0 300.0
-			orientation 0.0 1.0 0.0 180.0
-			speed 0.0 0.0 -0.0
-			ai 0
-			friendly 1
-			behavior "defensive"
-			health 100
-		}
-
-		spawn "Defender2"
-	}
-}
-
-parallel_task
-{
-	obj_event
-	{
-		obj "Defender1"
-		change_speed 20.0
-	}
-}
 
 }