From 2a0db6dc8b27a945206ac5c6a04a311de2104574 Mon Sep 17 00:00:00 2001 From: Steve Date: Sat, 28 Nov 2015 14:35:10 +0000 Subject: [PATCH] Replaced triggers with script. --- data/missions/alba/02 - patrol #2.json | 30 ++++------ .../coyote/03 - coyote assault #3.json | 58 +++++++++---------- data/missions/warro/02 - evacuation #2.json | 29 +++++----- 3 files changed, 53 insertions(+), 64 deletions(-) diff --git a/data/missions/alba/02 - patrol #2.json b/data/missions/alba/02 - patrol #2.json index 813c74c..d908614 100644 --- a/data/missions/alba/02 - patrol #2.json +++ b/data/missions/alba/02 - patrol #2.json @@ -9,7 +9,7 @@ { "description" : "Check all Waypoints", "targetName" : "Waypoint", - "targetValue" : 5, + "targetValue" : 3, "targetType" : "TT_WAYPOINT" }, { @@ -20,22 +20,6 @@ "active" : 0 } ], - "triggers" : [ - { - "type" : "TRIGGER_WAYPOINT", - "targetName" : "Waypoint #5", - "targetValue" : "1", - "action" : "TA_ACTIVE_ENTITY", - "actionValue" : "Pandoran" - }, - { - "type" : "TRIGGER_WAYPOINT", - "targetName" : "Waypoint #5", - "targetValue" : "1", - "action" : "TA_ACTIVE_OBJECTIVE", - "actionValue" : "1" - } - ], "player" : { "type" : "Firefly", "side" : "SIDE_ALLIES", @@ -66,11 +50,21 @@ "entities" : [ { "type" : "ET_WAYPOINT", - "number" : 5, + "number" : 3, "x" : 25, "y" : 25, "scatter" : 7500 } + ], + "script" : [ + { + "function" : "Waypoint #3", + "lines" : [ + "ACTIVATE_ENTITY Pandoran", + "ACTIVATE_OBJECTIVE 1", + "MSG_BOX 6 Alba Control;Patrol A-82, you have hostiles incoming. Identified as 3 Mitikas fighters; Jackals, possibly Pandoran. Engage, but exercise extreme caution." + ] + } ] } diff --git a/data/missions/coyote/03 - coyote assault #3.json b/data/missions/coyote/03 - coyote assault #3.json index f6defe2..a88ba3c 100644 --- a/data/missions/coyote/03 - coyote assault #3.json +++ b/data/missions/coyote/03 - coyote assault #3.json @@ -23,36 +23,6 @@ "active" : 0 } ], - "triggers" : [ - { - "type" : "TRIGGER_LOSSES", - "targetName" : "ALLIES_KILLED", - "targetValue" : 100, - "action" : "TA_ACTIVE_OBJECTIVE", - "actionValue" : "1" - }, - { - "type" : "TRIGGER_LOSSES", - "targetName" : "ALLIES_KILLED", - "targetValue" : 100, - "action" : "TA_RETREAT_ALLIES", - "actionValue" : "1" - }, - { - "type" : "TRIGGER_LOSSES", - "targetName" : "ALLIES_KILLED", - "targetValue" : 100, - "action" : "TA_ACTIVE_ENTITY", - "actionValue" : "Extraction Point" - }, - { - "type" : "TRIGGER_LOSSES", - "targetName" : "ALLIES_KILLED", - "targetValue" : 100, - "action" : "TA_ACTIVE_ENTITY", - "actionValue" : "ATAFs" - } - ], "player" : { "type" : "TAF", "side" : "SIDE_ALLIES", @@ -106,6 +76,34 @@ "y" : 25, "active" : 0 } + ], + "script" : [ + { + "function" : "ALLIES_KILLED 70", + "lines" : [ + "MSG_BOX 4 UNF Pilot #1;We're getting our arses kicked here! Any chance of any backup?!" + ] + }, + { + "function" : "ALLIES_KILLED 80", + "lines" : [ + "MSG_BOX 4 UNF Pilot #2;The White Knights are here! Finally!", + "ACTIVATE_ENTITY ATAFs" + ] + }, + { + "function" : "ALLIES_KILLED 90", + "lines" : [ + "MSG_BOX 6 UNF Talos;All fighters, Captain Bailey has signalled the retreat. Coyote is lost. Fall back to the extraction point.", + "MSG_BOX 4 Cdr de Winter;You all heard the Captain - fall back, we'll cover the retreat.", + "WAIT 8", + "MSG_BOX 4 Lt Cdr Dodds;Estelle, we've got this. We can take them.", + "MSG_BOX 4 Cdr de Winter;We're taking too many losses, Dodds. Fall back now, that's an order.", + "WAIT 8", + "ACTIVATE_ENTITY Extraction Point", + "RETREAT_ALLIES" + ] + } ] } diff --git a/data/missions/warro/02 - evacuation #2.json b/data/missions/warro/02 - evacuation #2.json index 10ae43a..75e6e6a 100644 --- a/data/missions/warro/02 - evacuation #2.json +++ b/data/missions/warro/02 - evacuation #2.json @@ -105,27 +105,24 @@ "y" : 25 } ], - "triggers" : [ + "script" : [ { - "type" : "TRIGGER_TIME", - "targetName" : "TIME", - "targetValue" : 60, - "action" : "TA_ACTIVE_ENTITY_GROUP", - "actionValue" : "Pandoran-1" + "function" : "TIME 60", + "lines" : [ + "ACTIVATE_ENTITY_GROUP Pandoran-1" + ] }, { - "type" : "TRIGGER_TIME", - "targetName" : "TIME", - "targetValue" : 120, - "action" : "TA_ACTIVE_ENTITY_GROUP", - "actionValue" : "Pandoran-2" + "function" : "TIME 120", + "lines" : [ + "ACTIVATE_ENTITY_GROUP Pandoran-2" + ] }, { - "type" : "TRIGGER_TIME", - "targetName" : "TIME", - "targetValue" : 180, - "action" : "TA_ACTIVE_ENTITY_GROUP", - "actionValue" : "Pandoran-3" + "function" : "TIME 180", + "lines" : [ + "ACTIVATE_ENTITY_GROUP Pandoran-3" + ] } ] }