diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index 05fcaea..194f213 100644 Binary files a/!TheEsc/!RunImage,ff8 and b/!TheEsc/!RunImage,ff8 differ diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index 0e7c628..834ae10 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -676,6 +676,8 @@ void game2_triggerevent(int id) } else if(EventActions[i].Action == 5) // Change overlay tile sprite fullmap[EventActions[i].ActionTarget + 10000] = EventActions[i].ActionValue; + else if(EventActions[i].Action == 6) // Dis-arm + Events[EventActions[i].ActionTarget].Triggered = 1; } } } diff --git a/!TheEsc/compile.php b/!TheEsc/compile.php index 234a0a2..d9c2b11 100644 --- a/!TheEsc/compile.php +++ b/!TheEsc/compile.php @@ -142,6 +142,28 @@ $eventactions[] = array("Event"=>$inevent,"Action"=>3,"ActionValue"=>255,"ActionTarget"=>$target); } break; + case "DisArm": + if($inevent < 0) + { + echo " Invalid outside event\n"; + } + else + { + $csv = str_getcsv($split[1]); + + $target = -1; + foreach($events as $eventid=>$event) + { + if($event['Name'] == $csv[0]) + $target = $eventid; + } + + if($target < 0) + echo " Unknown target: " . $csv[0] . "\n"; + else + $eventactions[] = array("Event"=>$inevent,"Action"=>6,"ActionValue"=>255,"ActionTarget"=>$target); + } + break; case "Schedule": if($inevent < 0) { diff --git a/!TheEsc/m2_evact,ffd b/!TheEsc/m2_evact,ffd index 747fd26..82ca35d 100644 Binary files a/!TheEsc/m2_evact,ffd and b/!TheEsc/m2_evact,ffd differ diff --git a/!TheEsc/m2_evt,ffd b/!TheEsc/m2_evt,ffd index 715ed7f..0524cf8 100644 Binary files a/!TheEsc/m2_evt,ffd and b/!TheEsc/m2_evt,ffd differ diff --git a/!TheEsc/m2_map,ffd b/!TheEsc/m2_map,ffd index ceadf5f..9553b7b 100644 Binary files a/!TheEsc/m2_map,ffd and b/!TheEsc/m2_map,ffd differ diff --git a/!TheEsc/m2_smart,ffd b/!TheEsc/m2_smart,ffd index 3a91ee2..b0cb760 100644 Binary files a/!TheEsc/m2_smart,ffd and b/!TheEsc/m2_smart,ffd differ diff --git a/!TheEsc/m2_txt b/!TheEsc/m2_txt index 4b8cc11..bdb04c9 100644 --- a/!TheEsc/m2_txt +++ b/!TheEsc/m2_txt @@ -43,20 +43,21 @@ AddEvent(15,"MESS-AREA",0,-1,-1) ########################################### AddEvent(16,"REDALERTON",0,-1,-1) AddEvent(17,"REDALERTOFF",0,-1,-1) - +AddEvent(18,"REDALERTSTOP",0,-1,-1) +AddEvent(19,"REDALERTSOUND",0,-1,-1) # Console animation ########################################### -AddEvent(18,"CONSOLE1",0,-1,-1) -AddEvent(19,"CONSOLE2",0,-1,-1) +AddEvent(20,"CONSOLE1",0,-1,-1) +AddEvent(21,"CONSOLE2",0,-1,-1) # Tractor beam events ########################################### -AddEvent(20,"TRAC1",0,-1,-1) -AddEvent(21,"TRAC2",0,-1,-1) -AddEvent(22,"TRACOFF",0,-1,-1) -AddEvent(23,"TRACSOUND",0,-1,-1) +AddEvent(22,"TRAC1",0,-1,-1) +AddEvent(23,"TRAC2",0,-1,-1) +AddEvent(24,"TRACOFF",0,-1,-1) +AddEvent(25,"TRACSOUND",0,-1,-1) ############################################################################### @@ -193,7 +194,7 @@ Event("REDALERTON") SetOverlayTile(2413,84) SetOverlayTile(3113,84) # Cargo bay two SetOverlayTile(3413,84) - Sound(PCMSAMPLE_ALERT, PCMCHANNEL_AMBIENT) + Schedule("REDALERTSOUND",0) ReArm("REDALERTON") Event("REDALERTOFF") Schedule("REDALERTON",125) @@ -206,6 +207,11 @@ Event("REDALERTOFF") SetOverlayTile(3113,83) # Cargo bay two SetOverlayTile(3413,83) ReArm("REDALERTOFF") +Event("REDALERTSOUND") + Sound(PCMSAMPLE_ALERT, PCMCHANNEL_AMBIENT) + ReArm("REDALERTSOUND") +Event("REDALERTSTOP") + DisArm("REDALERTSOUND") ########################################### # Console animations