aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek
diff options
context:
space:
mode:
Diffstat (limited to 'engines/startrek')
-rw-r--r--engines/startrek/awaymission.h5
-rw-r--r--engines/startrek/room.h53
-rw-r--r--engines/startrek/rooms/trial2.cpp433
-rw-r--r--engines/startrek/sound.h33
-rw-r--r--engines/startrek/text.h105
5 files changed, 628 insertions, 1 deletions
diff --git a/engines/startrek/awaymission.h b/engines/startrek/awaymission.h
index d64de68c1b..984ee55cf8 100644
--- a/engines/startrek/awaymission.h
+++ b/engines/startrek/awaymission.h
@@ -275,11 +275,16 @@ struct AwayMission {
// 5: Will activate the unknown program when the keypad is used
byte doorCodeBehaviour; // 0x34
+ bool globSplitInTwo; // 0x35
+ bool globDefeated; // 0x36
+ byte globEnergyLevels[3]; // 0x37
+ bool enteredGlobRoom; // 0x5c
bool forceFieldDown; // 0x5d
bool uhuraAnalyzedCode; // 0x5e
int16 field5f; // 0x5f
bool gotPointsForGettingRod; // 0x61
bool gotPointsForCoatingRodWithIron; // 0x62
+ bool gotPointsForScanningGlob; // 0x64
} trial;
};
};
diff --git a/engines/startrek/room.h b/engines/startrek/room.h
index e3c0a96f89..288c01fd9e 100644
--- a/engines/startrek/room.h
+++ b/engines/startrek/room.h
@@ -1842,6 +1842,54 @@ public:
// TRIAL2
void trial2Tick1();
+ void trial2Tick60();
+ void trial2TouchedHotspot0();
+ void trial2LookAtKirk();
+ void trial2LookAtSpock();
+ void trial2LookAtMccoy();
+ void trial2LookAtRedshirt();
+ void trial2LookAtInsignia();
+ void trial2LookAtGlob();
+ void trial2LookAtWall();
+ void trial2LookAtDoor();
+ void trial2TalkToKirk();
+ void trial2TalkToSpock();
+ void trial2TalkToMccoy();
+ void trial2TalkToRedshirt();
+ void trial2TalkToGlob();
+ void trial2UsePhaserOnWall();
+
+ void trial2UsePhaserOnGlob(int object, bool phaserOnKill);
+ void trial2ReachedPositionToShootGlob();
+ void trial2DrewPhaserToShootGlob();
+ void trial2GlobDoneExploding();
+ void trial2GlobDoneSplitting();
+ void trial2KirkDied();
+
+ void trial2UseStunPhaserOnGlob();
+ void trial2UseKillPhaserOnGlob();
+ void trial2UseStunPhaserOnSplitGlob1();
+ void trial2UseKillPhaserOnSplitGlob1();
+ void trial2UseStunPhaserOnSplitGlob2();
+ void trial2UseKillPhaserOnSplitGlob2();
+
+ void trial2UseMTricorderOnKirk();
+ void trial2UseMTricorderOnSpock();
+ void trial2UseMTricorderOnMccoy();
+ void trial2UseMTricorderOnRedshirt();
+ void trial2UseMTricorderOnGlob();
+ void trial2UseSTricorderOnWall();
+ void trial2UseSTricorderAnywhere();
+ void trial2UseSTricorderOnGlob();
+ void trial2UseCommunicator();
+ void trial2UseMccoyOnGlob();
+ void trial2UseMccoyOnWall();
+ void trial2UseSpockOnGlob();
+ void trial2UseSpockOnWall();
+ void trial2UseRedshirtOnGlob();
+ void trial2UseRedshirtOnWall();
+ void trial2WalkToDoor();
+ void trial2UseMedkitAnywhere();
// TRIAL3
void trial3Tick1();
@@ -1989,6 +2037,11 @@ private:
bool insultedQuetzecoatl;
} feather;
+ struct {
+ // trial2
+ byte globBeingShot;
+ bool phaserOnKill;
+ } trial;
} _roomVar;
};
diff --git a/engines/startrek/rooms/trial2.cpp b/engines/startrek/rooms/trial2.cpp
index 1bcec41f11..e428618abb 100644
--- a/engines/startrek/rooms/trial2.cpp
+++ b/engines/startrek/rooms/trial2.cpp
@@ -22,16 +22,447 @@
#include "startrek/room.h"
+#define OBJECT_GLOB 8
+#define OBJECT_SPLIT_GLOB_1 9
+#define OBJECT_SPLIT_GLOB_2 10
+#define OBJECT_11 11
+
+#define HOTSPOT_INSIGNIA 0x20 // This doesn't seem to be visible anywhere
+#define HOTSPOT_WALL 0x21 // Same here
+#define HOTSPOT_DOOR 0x22
+
+
+#define GLOB_X 0x46
+#define GLOB_Y 0xaf
+
+#define SPLIT_GLOB_1_X 0x20
+#define SPLIT_GLOB_1_Y 0xaf
+
+#define SPLIT_GLOB_2_X 0x69
+#define SPLIT_GLOB_2_Y 0xaf
+
namespace StarTrek {
+// This room has a good deal of unused code, relating to the "split" globs (automatons).
+// Apparently, it would originally have been possible to interact with the split globs,
+// instead of having them kill the crew right away. This doesn't seem to have quite been
+// finished, though.
+
extern const RoomAction trial2ActionList[] = {
- { {ACTION_TICK, 1, 0, 0}, &Room::trial2Tick1 },
+ { {ACTION_TICK, 1, 0, 0}, &Room::trial2Tick1 },
+ { {ACTION_TICK, 60, 0, 0}, &Room::trial2Tick60 },
+ { {ACTION_TOUCHED_HOTSPOT, 0, 0, 0}, &Room::trial2TouchedHotspot0 },
+ { {ACTION_LOOK, OBJECT_KIRK, 0, 0}, &Room::trial2LookAtKirk },
+ { {ACTION_LOOK, OBJECT_SPOCK, 0, 0}, &Room::trial2LookAtSpock },
+ { {ACTION_LOOK, OBJECT_MCCOY, 0, 0}, &Room::trial2LookAtMccoy },
+ { {ACTION_LOOK, OBJECT_REDSHIRT, 0, 0}, &Room::trial2LookAtRedshirt },
+ { {ACTION_LOOK, HOTSPOT_INSIGNIA, 0, 0}, &Room::trial2LookAtInsignia },
+ { {ACTION_LOOK, OBJECT_GLOB, 0, 0}, &Room::trial2LookAtGlob },
+ { {ACTION_LOOK, OBJECT_SPLIT_GLOB_1, 0, 0}, &Room::trial2LookAtGlob },
+ { {ACTION_LOOK, OBJECT_SPLIT_GLOB_2, 0, 0}, &Room::trial2LookAtGlob },
+ { {ACTION_LOOK, HOTSPOT_WALL, 0, 0}, &Room::trial2LookAtWall },
+ { {ACTION_LOOK, HOTSPOT_DOOR, 0, 0}, &Room::trial2LookAtDoor },
+
+ { {ACTION_TALK, OBJECT_KIRK, 0, 0}, &Room::trial2TalkToKirk },
+ { {ACTION_TALK, OBJECT_SPOCK, 0, 0}, &Room::trial2TalkToSpock },
+ { {ACTION_TALK, OBJECT_MCCOY, 0, 0}, &Room::trial2TalkToMccoy },
+ { {ACTION_TALK, OBJECT_REDSHIRT, 0, 0}, &Room::trial2TalkToRedshirt },
+ { {ACTION_TALK, OBJECT_GLOB, 0, 0}, &Room::trial2TalkToGlob },
+ { {ACTION_TALK, OBJECT_SPLIT_GLOB_1, 0, 0}, &Room::trial2TalkToGlob },
+ { {ACTION_TALK, OBJECT_SPLIT_GLOB_2, 0, 0}, &Room::trial2TalkToGlob },
+
+ { {ACTION_USE, OBJECT_IPHASERS, HOTSPOT_WALL, 0}, &Room::trial2UsePhaserOnWall },
+ { {ACTION_USE, OBJECT_IPHASERK, HOTSPOT_WALL, 0}, &Room::trial2UsePhaserOnWall },
+
+ { {ACTION_DONE_WALK, 7, 0, 0}, &Room::trial2ReachedPositionToShootGlob },
+ { {ACTION_DONE_ANIM, 10, 0, 0}, &Room::trial2DrewPhaserToShootGlob },
+ { {ACTION_DONE_ANIM, 4, 0, 0}, &Room::trial2GlobDoneExploding },
+ { {ACTION_DONE_ANIM, 1, 0, 0}, &Room::trial2GlobDoneSplitting },
+ { {ACTION_DONE_ANIM, 19, 0, 0}, &Room::trial2KirkDied },
+
+ { {ACTION_USE, OBJECT_IPHASERS, OBJECT_GLOB, 0}, &Room::trial2UseStunPhaserOnGlob },
+ { {ACTION_USE, OBJECT_IPHASERK, OBJECT_GLOB, 0}, &Room::trial2UseKillPhaserOnGlob },
+ { {ACTION_USE, OBJECT_IPHASERS, OBJECT_SPLIT_GLOB_1, 0}, &Room::trial2UseStunPhaserOnSplitGlob1 },
+ { {ACTION_USE, OBJECT_IPHASERK, OBJECT_SPLIT_GLOB_1, 0}, &Room::trial2UseKillPhaserOnSplitGlob1 },
+ { {ACTION_USE, OBJECT_IPHASERS, OBJECT_SPLIT_GLOB_2, 0}, &Room::trial2UseStunPhaserOnSplitGlob2 },
+ { {ACTION_USE, OBJECT_IPHASERK, OBJECT_SPLIT_GLOB_2, 0}, &Room::trial2UseKillPhaserOnSplitGlob2 },
+
+ { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_KIRK, 0}, &Room::trial2UseMTricorderOnKirk },
+ { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_SPOCK, 0}, &Room::trial2UseMTricorderOnSpock },
+ { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_MCCOY, 0}, &Room::trial2UseMTricorderOnMccoy },
+ { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_REDSHIRT, 0}, &Room::trial2UseMTricorderOnRedshirt },
+ { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_GLOB, 0}, &Room::trial2UseMTricorderOnGlob },
+ { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_SPLIT_GLOB_1, 0}, &Room::trial2UseMTricorderOnGlob },
+ { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_SPLIT_GLOB_2, 0}, &Room::trial2UseMTricorderOnGlob },
+ { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_WALL, 0}, &Room::trial2UseSTricorderOnWall },
+ { {ACTION_USE, OBJECT_ISTRICOR, 0xff, 0}, &Room::trial2UseSTricorderAnywhere },
+ { {ACTION_USE, OBJECT_ISTRICOR, OBJECT_GLOB, 0}, &Room::trial2UseSTricorderOnGlob },
+ { {ACTION_USE, OBJECT_ISTRICOR, OBJECT_SPLIT_GLOB_1, 0}, &Room::trial2UseSTricorderOnGlob },
+ { {ACTION_USE, OBJECT_ISTRICOR, OBJECT_SPLIT_GLOB_2, 0}, &Room::trial2UseSTricorderOnGlob },
+ { {ACTION_USE, OBJECT_ICOMM, 0xff, 0}, &Room::trial2UseCommunicator },
+ { {ACTION_USE, OBJECT_MCCOY, OBJECT_SPLIT_GLOB_1, 0}, &Room::trial2UseMccoyOnGlob },
+ { {ACTION_USE, OBJECT_MCCOY, OBJECT_SPLIT_GLOB_2, 0}, &Room::trial2UseMccoyOnGlob },
+ { {ACTION_USE, OBJECT_MCCOY, HOTSPOT_WALL, 0}, &Room::trial2UseMccoyOnWall },
+ { {ACTION_USE, OBJECT_SPOCK, OBJECT_SPLIT_GLOB_1, 0}, &Room::trial2UseSpockOnGlob },
+ { {ACTION_USE, OBJECT_SPOCK, OBJECT_SPLIT_GLOB_2, 0}, &Room::trial2UseSpockOnGlob },
+ { {ACTION_USE, OBJECT_SPOCK, HOTSPOT_WALL, 0}, &Room::trial2UseSpockOnWall },
+ { {ACTION_USE, OBJECT_REDSHIRT, OBJECT_SPLIT_GLOB_1, 0}, &Room::trial2UseRedshirtOnGlob },
+ { {ACTION_USE, OBJECT_REDSHIRT, OBJECT_SPLIT_GLOB_2, 0}, &Room::trial2UseRedshirtOnGlob },
+ { {ACTION_USE, OBJECT_REDSHIRT, HOTSPOT_WALL, 0}, &Room::trial2UseRedshirtOnWall },
+
+ { {ACTION_WALK, HOTSPOT_DOOR, 0, 0}, &Room::trial2WalkToDoor },
+ { {ACTION_USE, OBJECT_IMEDKIT, 0xff, 0}, &Room::trial2UseMedkitAnywhere },
+
+ // ENHANCEMENT: Define these actions for the main glob, not just the (unused) split
+ // globs
+ { {ACTION_USE, OBJECT_MCCOY, OBJECT_GLOB, 0}, &Room::trial2UseMccoyOnGlob },
+ { {ACTION_USE, OBJECT_SPOCK, OBJECT_GLOB, 0}, &Room::trial2UseSpockOnGlob },
+ { {ACTION_USE, OBJECT_REDSHIRT, OBJECT_GLOB, 0}, &Room::trial2UseRedshirtOnGlob },
};
extern const int trial2NumActions = sizeof(trial2ActionList) / sizeof(RoomAction);
void Room::trial2Tick1() {
+ playVoc("NOOOLOOP");
+
+ if (!_vm->_awayMission.trial.enteredGlobRoom)
+ _vm->_awayMission.disableInput = 2;
+
+ if (!_vm->_awayMission.trial.globDefeated) {
+ playMidiMusicTracks(MIDITRACK_24, -1);
+ loadMapFile("trial22");
+
+ if (!_vm->_awayMission.trial.globSplitInTwo) {
+ playVoc("TRI2LOOP");
+ loadActorAnim2(OBJECT_GLOB, "sglob", 0x46, 0xaf);
+ _vm->_awayMission.trial.globEnergyLevels[0] = 1;
+ } else {
+ playVoc("TRI2LOOP");
+ loadActorAnim2(OBJECT_SPLIT_GLOB_1, "sglob", 0x20, 0xaf);
+ loadActorAnim2(OBJECT_SPLIT_GLOB_2, "sglob", 0x69, 0xaf);
+ _vm->_awayMission.trial.globEnergyLevels[1] = 1;
+ _vm->_awayMission.trial.globEnergyLevels[2] = 1;
+ }
+ }
+}
+
+void Room::trial2Tick60() {
+ if (!_vm->_awayMission.trial.enteredGlobRoom) {
+ _vm->_awayMission.disableInput = false;
+ showText(TX_SPEAKER_BENNIE, TX_TRI2_034);
+ showText(TX_SPEAKER_KIRK, TX_TRI2_005);
+ showText(TX_SPEAKER_SPOCK, TX_TRI2_030);
+ showText(TX_SPEAKER_KIRK, TX_TRI2_008);
+ _vm->_awayMission.trial.enteredGlobRoom = true;
+ }
+}
+
+void Room::trial2TouchedHotspot0() { // This is unused
+ if (_vm->_awayMission.trial.globEnergyLevels[1] != 0 || _vm->_awayMission.trial.globEnergyLevels[2] != 0)
+ showText(TX_SPEAKER_SPOCK, TX_TRI2_024);
+}
+
+void Room::trial2LookAtKirk() {
+ showText(TX_TRI2N003);
+}
+
+void Room::trial2LookAtSpock() {
+ showText(TX_TRI2N001);
+}
+
+void Room::trial2LookAtMccoy() {
+ showText(TX_TRI2N006);
+}
+
+void Room::trial2LookAtRedshirt() {
+ showText(TX_TRI2N002);
+}
+
+void Room::trial2LookAtInsignia() {
+ showText(TX_TRI2N004);
+}
+
+void Room::trial2LookAtGlob() {
+ showText(TX_TRI2N000);
+}
+
+void Room::trial2LookAtWall() {
+ showText(TX_TRI2N007);
+}
+
+void Room::trial2LookAtDoor() {
+ showText(TX_TRI2N005);
+}
+
+void Room::trial2TalkToKirk() {
+ showText(TX_SPEAKER_KIRK, TX_TRI2_001);
+}
+
+void Room::trial2TalkToSpock() {
+ showText(TX_SPEAKER_SPOCK, TX_TRI2_019);
+}
+
+void Room::trial2TalkToMccoy() {
+ showText(TX_SPEAKER_MCCOY, TX_TRI2_013);
+}
+
+void Room::trial2TalkToRedshirt() {
+ showText(TX_SPEAKER_BENNIE, TX_TRI2_033);
+}
+
+void Room::trial2TalkToGlob() {
+ showText(TX_QUIET);
+}
+
+void Room::trial2UsePhaserOnWall() {
+ showText(TX_TRI2N008);
+}
+
+
+void Room::trial2UsePhaserOnGlob(int object, bool phaserOnKill) {
+ _roomVar.trial.globBeingShot = object;
+ _roomVar.trial.phaserOnKill = phaserOnKill;
+
+ _vm->_awayMission.disableInput = true;
+ walkCrewmanC(OBJECT_KIRK, 0xcd, 0xc5, &Room::trial2ReachedPositionToShootGlob);
+}
+
+void Room::trial2ReachedPositionToShootGlob() {
+ loadActorAnimC(OBJECT_KIRK, "kdraww", -1, -1, &Room::trial2DrewPhaserToShootGlob);
+}
+
+void Room::trial2DrewPhaserToShootGlob() {
+ const char *stunPhaserAnims[] = {
+ "t2kp00",
+ "t2kp01",
+ "t2kp02",
+ };
+ const char *killPhaserAnims[] = {
+ "t2kp03",
+ "t2kp04",
+ "t2kp05",
+ };
+
+ int index = _roomVar.trial.globBeingShot - OBJECT_GLOB;
+
+ _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_W;
+ playSoundEffectIndex(SND_PHASSHOT);
+ if (_roomVar.trial.phaserOnKill)
+ showBitmapFor5Ticks(killPhaserAnims[index], 5);
+ else
+ showBitmapFor5Ticks(stunPhaserAnims[index], 5);
+ loadActorStandAnim(OBJECT_KIRK);
+
+ _vm->_awayMission.disableInput = false;
+
+ if (_roomVar.trial.phaserOnKill)
+ _vm->_awayMission.trial.globEnergyLevels[index] += 2;
+ else
+ _vm->_awayMission.trial.globEnergyLevels[index] += 1;
+
+ if (!(_roomVar.trial.globBeingShot == OBJECT_GLOB && _roomVar.trial.phaserOnKill == true)) {
+ if (_roomVar.trial.phaserOnKill)
+ showText(TX_SPEAKER_SPOCK, TX_TRI2_023);
+ else
+ showText(TX_SPEAKER_SPOCK, TX_TRI2_025);
+ }
+
+
+ const Common::Point globPositions[] = {
+ Common::Point(GLOB_X, GLOB_Y),
+ Common::Point(SPLIT_GLOB_1_X, SPLIT_GLOB_1_Y),
+ Common::Point(SPLIT_GLOB_2_X, SPLIT_GLOB_2_Y)
+ };
+
+ if (_vm->_awayMission.trial.globEnergyLevels[index] == 3) {
+ playVoc("GLOBEDIV");
+ loadActorAnimC(_roomVar.trial.globBeingShot, "globsp", globPositions[index].x, globPositions[index].y, &Room::trial2GlobDoneSplitting);
+ } else if (_vm->_awayMission.trial.globEnergyLevels[index] >= 4) {
+ playSoundEffectIndex(SND_BLANK_14);
+ playVoc("REDBALL");
+ loadActorAnimC(_roomVar.trial.globBeingShot, "globex", globPositions[index].x, globPositions[index].y, &Room::trial2GlobDoneExploding);
+ }
+}
+
+void Room::trial2GlobDoneExploding() {
+ stopAllVocSounds();
+ playVoc("Noooloop");
+ showText(TX_SPEAKER_SPOCK, TX_TRI2_020);
+ _vm->_awayMission.trial.globDefeated = true;
+ playMidiMusicTracks(MIDITRACK_28, -1);
+ _vm->_awayMission.trial.missionScore += 1;
+ loadMapFile("trial2");
+}
+
+void Room::trial2GlobDoneSplitting() {
+ if (_roomVar.trial.globBeingShot == OBJECT_GLOB) {
+ if (true)
+ showText(TX_SPEAKER_SPOCK, TX_TRI2_009);
+ else {
+ // Unused code block: instead of killing the crew right away, the crew can
+ // interact with the split globs.
+ _vm->_awayMission.trial.globEnergyLevels[0] = 0;
+ _vm->_awayMission.trial.globEnergyLevels[1] = 1;
+ _vm->_awayMission.trial.globEnergyLevels[2] = 1;
+ _vm->_awayMission.trial.globSplitInTwo = true;
+ loadActorAnim2(OBJECT_SPLIT_GLOB_1, "sglob", SPLIT_GLOB_1_X, SPLIT_GLOB_1_Y);
+ loadActorAnim2(OBJECT_SPLIT_GLOB_2, "sglob", SPLIT_GLOB_2_X, SPLIT_GLOB_2_Y);
+ loadActorStandAnim(OBJECT_GLOB);
+ showText(TX_SPEAKER_SPOCK, TX_TRI2_021);
+ return;
+ }
+ } else if (_roomVar.trial.globBeingShot == OBJECT_SPLIT_GLOB_1) {
+ loadActorAnim2(OBJECT_11, "sglob", 0x43, 0xaf);
+ loadActorAnim2(OBJECT_SPLIT_GLOB_1, "sglob", 0, 0xaf);
+ } else if (_roomVar.trial.globBeingShot == OBJECT_SPLIT_GLOB_2) {
+ loadActorAnim2(OBJECT_11, "sglob", 0x8c, 0xaf);
+ loadActorAnim2(OBJECT_SPLIT_GLOB_2, "sglob", 0x46, 0xaf);
+ }
+
+ // Everyone gets vaporized
+ playVoc("V7ALLGET");
+ _vm->_awayMission.disableInput = true;
+ playMidiMusicTracks(MIDITRACK_26, -1);
+ loadActorAnimC(OBJECT_KIRK, "kkills", -1, -1, &Room::trial2KirkDied);
+ loadActorAnim2(OBJECT_SPOCK, "skills");
+ loadActorAnim2(OBJECT_MCCOY, "mkills");
+ loadActorAnim2(OBJECT_REDSHIRT, "rkills");
+}
+
+void Room::trial2KirkDied() {
+ _vm->_awayMission.disableInput = false;
+ showGameOverMenu();
+}
+
+void Room::trial2UseStunPhaserOnGlob() {
+ trial2UsePhaserOnGlob(OBJECT_GLOB, false);
+}
+
+void Room::trial2UseKillPhaserOnGlob() {
+ trial2UsePhaserOnGlob(OBJECT_GLOB, true);
+}
+
+void Room::trial2UseStunPhaserOnSplitGlob1() {
+ trial2UsePhaserOnGlob(OBJECT_SPLIT_GLOB_1, false);
+}
+
+void Room::trial2UseKillPhaserOnSplitGlob1() {
+ trial2UsePhaserOnGlob(OBJECT_SPLIT_GLOB_1, true);
+}
+
+void Room::trial2UseStunPhaserOnSplitGlob2() {
+ trial2UsePhaserOnGlob(OBJECT_SPLIT_GLOB_2, false);
+}
+
+void Room::trial2UseKillPhaserOnSplitGlob2() {
+ trial2UsePhaserOnGlob(OBJECT_SPLIT_GLOB_2, true);
+}
+
+void Room::trial2UseMTricorderOnKirk() {
+ mccoyScan(DIR_S, TX_TRI2_016, true);
+}
+
+void Room::trial2UseMTricorderOnSpock() {
+ mccoyScan(DIR_S, TX_TRI2_017, true);
+}
+
+void Room::trial2UseMTricorderOnMccoy() {
+ mccoyScan(DIR_S, TX_TRI2_014, true);
+}
+
+void Room::trial2UseMTricorderOnRedshirt() {
+ mccoyScan(DIR_S, TX_TRI2_015, true);
+}
+
+void Room::trial2UseMTricorderOnGlob() {
+ mccoyScan(DIR_S, TX_TRI2_011, true);
+
+ if (!_vm->_awayMission.trial.gotPointsForScanningGlob) {
+ _vm->_awayMission.trial.gotPointsForScanningGlob = true;
+ _vm->_awayMission.trial.missionScore += 1;
+ }
+}
+
+void Room::trial2UseSTricorderOnWall() {
+ spockScan(DIR_S, TX_TRI2_029, true);
+}
+
+void Room::trial2UseSTricorderAnywhere() {
+ spockScan(DIR_S, TX_TRI2_027, true);
+}
+
+void Room::trial2UseSTricorderOnGlob() {
+ spockScan(DIR_S, TX_TRI2_026, true);
+
+ if (!_vm->_awayMission.trial.gotPointsForScanningGlob) {
+ _vm->_awayMission.trial.gotPointsForScanningGlob = true;
+ _vm->_awayMission.trial.missionScore += 1;
+ }
+}
+
+void Room::trial2UseCommunicator() {
+ if (_vm->_awayMission.trial.forceFieldDown) { // TODO: Refactor this between rooms?
+ showText(TX_SPEAKER_UHURA, TX_TRI2U091);
+
+ const TextRef choices[] = {
+ TX_SPEAKER_KIRK,
+ TX_TRI2_003, TX_TRI2_004, TX_TRI2_007,
+ TX_BLANK
+ };
+ int choice = showText(choices);
+
+ if (choice == 0) { // "Beam us back to the enterprise"
+ _vm->_awayMission.trial.field5f = 1;
+ endMission(_vm->_awayMission.trial.missionScore, 1, 1); // FIXME: Inconsistent with TRIAL1
+ } else if (choice == 1) { // "Beam us to Vlict's position"
+ showText(TX_SPEAKER_UHURA, TX_TRI1U080); // NOTE: Original didn't show text here
+ _vm->_awayMission.disableInput = true;
+ loadRoomIndex(4, 4);
+ } // Else don't transport anywhere
+ } else { // Force field still up
+ showText(TX_SPEAKER_UHURA, TX_TRI2U087);
+ showText(TX_SPEAKER_KIRK, TX_TRI2_006);
+ showText(TX_SPEAKER_UHURA, TX_TRI2U104);
+ if (!_vm->_awayMission.trial.globDefeated) {
+ showText(TX_SPEAKER_UHURA, TX_TRI2U081);
+ showText(TX_SPEAKER_KIRK, TX_TRI2_002);
+ }
+ showText(TX_SPEAKER_UHURA, TX_TRI2U074);
+ }
+}
+
+void Room::trial2UseMccoyOnGlob() {
+ showText(TX_SPEAKER_MCCOY, TX_TRI2_012);
+}
+
+void Room::trial2UseMccoyOnWall() {
+ showText(TX_SPEAKER_MCCOY, TX_TRI2_010);
+}
+
+void Room::trial2UseSpockOnGlob() {
+ // NOTE: Two possible audio files to use, TRI2_028 and TRI2_F11
+ showText(TX_SPEAKER_SPOCK, TX_TRI2_028);
+}
+
+void Room::trial2UseSpockOnWall() {
+ showText(TX_SPEAKER_SPOCK, TX_TRI2_022);
+}
+
+void Room::trial2UseRedshirtOnGlob() {
+ showText(TX_SPEAKER_BENNIE, TX_TRI2_031);
+}
+
+void Room::trial2UseRedshirtOnWall() {
+ showText(TX_SPEAKER_BENNIE, TX_TRI2_032);
+}
+
+void Room::trial2WalkToDoor() {
+ walkCrewman(OBJECT_KIRK, 0x117, 0xb5);
+}
+
+void Room::trial2UseMedkitAnywhere() {
+ showText(TX_SPEAKER_MCCOY, TX_TRI2_018);
}
}
diff --git a/engines/startrek/sound.h b/engines/startrek/sound.h
index 9c7f16a101..6e14effb62 100644
--- a/engines/startrek/sound.h
+++ b/engines/startrek/sound.h
@@ -60,6 +60,39 @@ enum SoundEffects {
SND_WARP = 0x29
};
+
+enum MidiTracks {
+ MIDITRACK_0,
+ MIDITRACK_1,
+ MIDITRACK_2,
+ MIDITRACK_3,
+ MIDITRACK_4,
+ MIDITRACK_5,
+ MIDITRACK_6,
+ MIDITRACK_7,
+ MIDITRACK_8,
+ MIDITRACK_9,
+ MIDITRACK_10,
+ MIDITRACK_11,
+ MIDITRACK_12,
+ MIDITRACK_13,
+ MIDITRACK_14,
+ MIDITRACK_15,
+ MIDITRACK_16,
+ MIDITRACK_17,
+ MIDITRACK_18,
+ MIDITRACK_19,
+ MIDITRACK_20,
+ MIDITRACK_21,
+ MIDITRACK_22,
+ MIDITRACK_23,
+ MIDITRACK_24,
+ MIDITRACK_25,
+ MIDITRACK_26,
+ MIDITRACK_27,
+ MIDITRACK_28
+};
+
// Max # of VOC files that can play at once
const int MAX_SFX_PLAYING = 4;
diff --git a/engines/startrek/text.h b/engines/startrek/text.h
index a19bf200ff..1fe7876b1b 100644
--- a/engines/startrek/text.h
+++ b/engines/startrek/text.h
@@ -2164,6 +2164,59 @@ enum GameStringIDs {
TX_TRI1C002,
+ TX_QUIET,
+ TX_TRI2_001,
+ TX_TRI2_002,
+ TX_TRI2_003,
+ TX_TRI2_004,
+ TX_TRI2_005,
+ TX_TRI2_006,
+ TX_TRI2_007,
+ TX_TRI2_008,
+ TX_TRI2_009,
+ TX_TRI2_010,
+ TX_TRI2_011,
+ TX_TRI2_012,
+ TX_TRI2_013,
+ TX_TRI2_014,
+ TX_TRI2_015,
+ TX_TRI2_016,
+ TX_TRI2_017,
+ TX_TRI2_018,
+ TX_TRI2_019,
+ TX_TRI2_020,
+ TX_TRI2_021,
+ TX_TRI2_022,
+ TX_TRI2_023,
+ TX_TRI2_024,
+ TX_TRI2_025,
+ TX_TRI2_026,
+ TX_TRI2_027,
+ TX_TRI2_028,
+ TX_TRI2_029,
+ TX_TRI2_030,
+ TX_TRI2_031,
+ TX_TRI2_032,
+ TX_TRI2_033,
+ TX_TRI2_034,
+ // UNUSED (035 -> 039; voice substitute for Uhura)
+ TX_TRI2_F11, // UNUSED
+ TX_TRI2N000,
+ TX_TRI2N001,
+ TX_TRI2N002,
+ TX_TRI2N003,
+ TX_TRI2N004,
+ TX_TRI2N005,
+ TX_TRI2N006,
+ TX_TRI2N007,
+ TX_TRI2N008,
+ TX_TRI2U074,
+ TX_TRI2U081,
+ TX_TRI2U087,
+ TX_TRI2U091,
+ TX_TRI2U104,
+
+
TX_TRI4_076,
@@ -4253,6 +4306,58 @@ const char * const g_gameStrings[] = {
"Clunk.",
+ "#SFX\\QUIET#Zzzzzzzzzzzmmmm.",
+ "#TRI2\\TRI2_001#This reminds me of an old practical joke that Finnegan played on me back at the Academy.",
+ "#TRI2\\TRI2_002#...some kind of energy source a few meters from our position. We know.",
+ "#TRI2\\TRI2_003#Beam us back to the Enterprise. Kirk out.",
+ "#TRI2\\TRI2_004#Beam us to Vlict's position.",
+ "#TRI2\\TRI2_005#I don't know, Ensign.",
+ "#TRI2\\TRI2_006#Keep working on it, but don't try to beam us up unless I give the signal.",
+ "#TRI2\\TRI2_007#Negative.",
+ "#TRI2\\TRI2_008#Whatever it is, we have to find a way to get by it.",
+ "#TRI2\\TRI2_009#Extreme increase in energy level, Captain. It absorbed the phaser fire. An unexpected reaction is occuring, high levels of lethal radiation are being produced.",
+ "#TRI2\\TRI2_010#Do you want me to hit my head against it?",
+ "#TRI2\\TRI2_011#It does not register as a life form.",
+ "#TRI2\\TRI2_012#I'm not touching some damned ball of energy!",
+ "#TRI2\\TRI2_013#If you hadn't been so damned anxious to give my patient to the Klingons, we wouldn't be in this mess.",
+ "#TRI2\\TRI2_014#One Male Human, average physical condition.",
+ "#TRI2\\TRI2_015#He's a male Human, excellent physical condition.", // TYPO
+ "#TRI2\\TRI2_016#Male Human, good physical condition.",
+ "#TRI2\\TRI2_017#One male Human-Vulcan hybrid. Excellent physical condition.", // TYPO
+ "#TRI2\\TRI2_018#Nobody needs healing, Jim, but you will if they harm my patient.",
+ "#TRI2\\TRI2_019#Fascinating. It would appear that Vlict sent us into this place in the hope that we would be killed.",
+ "#TRI2\\TRI2_020#Fascinating. These automatons are not stable.",
+ "#TRI2\\TRI2_021#Fascinating. These automatons are not stable.",
+ "#TRI2\\TRI2_022#I do not understand the desired course of action.",
+ "#TRI2\\TRI2_023#Marked increase in energy level, Captain. It absorbed the phaser fire. No appreciable increase in mass.",
+ "#TRI2\\TRI2_024#The automaton is emitting a protective force field, Captain. We cannot proceed further without rendering it inoperative.",
+ "#TRI2\\TRI2_025#The automaton's energy level has increased slightly. It absorbed the phaser fire. No appreciable increase in mass.",
+ "#TRI2\\TRI2_026#The ball of energy is an automaton, Captain. It is an artificial construct, programmed to block any movements; I can detect no other function or intelligence.",
+ "#TRI2\\TRI2_027#These walls were carved from the natural rock of the cavern.",
+ "#TRI2\\TRI2_028#This automaton is generating a force field, Captain. I am physically incapable of touching it.",
+ "#TRI2\\TRI2_029#This wall was carved from the natural rock of a cavern.",
+ "#TRI2\\TRI2_030#I believe Ensign, that this energy sphere is some sort of automaton, programmed to block our movements.",
+ "#TRI2\\TRI2_031#I refuse, Captain, on the grounds that it might incinerate me.",
+ "#TRI2\\TRI2_032#Uh, pardon sir?",
+ "#TRI2\\TRI2_033#We're not going to get out of this alive, are we Captain?",
+ "#TRI2\\TRI2_034#Captain, what is that thing?",
+ "#TRI2\\TRI2_F11#This automaton is generating a force field, Captain. I am physically incapable of touching it.",
+ "#TRI2\\TRI2N000#A pulsing globe of energy.",
+ "#TRI2\\TRI2N001#Commander Spock, a patient and thoughtful Federation first officer.",
+ "#TRI2\\TRI2N002#Ensign Bennie, faithful and true security officer.",
+ "#TRI2\\TRI2N003#James T. Kirk, a rather frustated Federation starship captain.",
+ "#TRI2\\TRI2N004#Klingon insignia.",
+ "#TRI2\\TRI2N005#Leads back to the room where the Electrical creature was.",
+ "#TRI2\\TRI2N006#Leonard McCoy, a crusty country doctor, and Starfleet's finest surgeon.",
+ "#TRI2\\TRI2N007#Rock wall. Looks like it was carved from stone by Klingon heavy mining equipment.",
+ "#TRI2\\TRI2N008#The walls are resistant to phaser fire.",
+ "#TRI2\\TRI2U074#Please keep in contact with us. We'll keep you informed if further developments occur. Uhura out.",
+ "#TRI2\\TRI2U081#By the way, sensors indicate...",
+ "#TRI2\\TRI2U087#Captain, there is still a barrier between us and the planet. Mr. Scott thinks there might be a way to break through it, and he's working on it now, but the Klingons won't like it.",
+ "#TRI2\\TRI2U091#Do you wish to be beamed up now Captain?",
+ "#TRI2\\TRI2U104#Understood, Captain.",
+
+
"#TRI4\\TRI4_076#You humans have an excellent imagination, but a poor grasp of reality.",