STARTREK: FEATHER6

2 files changed, 353 insertions, 8 deletions

diff --git a/engines/startrek/rooms/feather6.cpp b/engines/startrek/rooms/feather6.cpp
index 227007ac0d..c75781402c 100644
--- a/engines/startrek/rooms/feather6.cpp
+++ b/engines/startrek/rooms/feather6.cpp
@@ -22,14 +22,363 @@
 
 #include "startrek/room.h"
 
-#define OBJECT_8 8
+#define OBJECT_CRYSTALS 8
+#define OBJECT_STALACTITES 9
+#define OBJECT_THROWN_STONE 10
 
-#define HOTSPOT_20 0x20
+#define HOTSPOT_EAST_EXIT 0x20
+#define HOTSPOT_ROCKS 0x21
+#define HOTSPOT_STALACTITES 0x22
+#define HOTSPOT_STALAGMITES 0x23
 
 namespace StarTrek {
 
+extern const RoomAction feather6ActionList[] = {
+	{ {ACTION_TICK, 1, 0, 0},                            &Room::feather6Tick1 },
+	{ {ACTION_TOUCHED_HOTSPOT, 0, 0, 0},                 &Room::feather6TouchedHotspot0 },
+	{ {ACTION_USE, OBJECT_SPOCK, OBJECT_CRYSTALS, 0},    &Room::feather6UseSpockOnCrystals },
+	{ {ACTION_USE, OBJECT_MCCOY, OBJECT_CRYSTALS, 0},    &Room::feather6UseMccoyOnCrystals },
+	{ {ACTION_USE, OBJECT_REDSHIRT, OBJECT_CRYSTALS, 0}, &Room::feather6UseRedshirtOnCrystals },
+
+	{ {ACTION_USE, OBJECT_IROCK, OBJECT_STALACTITES, 0},  &Room::feather6UseRockOnStalactites },
+	{ {ACTION_USE, OBJECT_IROCK, HOTSPOT_STALACTITES, 0}, &Room::feather6UseRockOnStalactites },
+	{ {ACTION_DONE_WALK, 1, 0, 0},                        &Room::feather6ReachedPositionToThrowRock },
+	{ {ACTION_DONE_ANIM, 7, 0, 0},                        &Room::feather6DoneThrowingRock },
+	{ {ACTION_DONE_ANIM, 2, 0, 0},                        &Room::feather6KirkDiedFromStalactites },
+
+	{ {ACTION_USE, OBJECT_IROCK, OBJECT_CRYSTALS, 0},     &Room::feather6UseRockOnCrystals },
+	{ {ACTION_DONE_WALK, 4, 0, 0},                        &Room::feather6ReachedCrystalsWithRock },
+	{ {ACTION_TICK, 0xff, 0xff, 0xff},                    &Room::feather6Tick },
+	{ {ACTION_DONE_ANIM, 10, 0, 0},                       &Room::feather6HitCrystalsWithRockFirstTime },
+	{ {ACTION_DONE_ANIM, 9, 0, 0},                        &Room::feather6HitCrystalsWithRockSecondTime },
+
+	{ {ACTION_USE, OBJECT_IROCK, HOTSPOT_STALAGMITES, 0}, &Room::feather6UseRockOnStalagmites },
+	{ {ACTION_USE, OBJECT_IROCK, HOTSPOT_EAST_EXIT, 0},   &Room::feather6UseRockOnStalagmites },
+	{ {ACTION_USE, OBJECT_IROCK, 0xff, 0},                &Room::feather6UseRockAnywhere },
+	{ {ACTION_USE, OBJECT_IKNIFE, HOTSPOT_STALAGMITES, 0},&Room::feather6UseKnifeOnStalagmites },
+	{ {ACTION_USE, OBJECT_IKNIFE, 0xff, 0},               &Room::feather6UseKnifeAnywhere },
+	{ {ACTION_USE, OBJECT_IKNIFE, OBJECT_MCCOY, 0},       &Room::feather6UseKnifeOnMccoy },
+	{ {ACTION_USE, OBJECT_IKNIFE, OBJECT_SPOCK, 0},       &Room::feather6UseKnifeOnSpock },
+	{ {ACTION_USE, OBJECT_IKNIFE, OBJECT_REDSHIRT, 0},    &Room::feather6UseKnifeOnRedshirt },
+	{ {ACTION_USE, OBJECT_ICRYSTAL, 0xff, 0},             &Room::feather6UseCrystalAnywhere },
+	{ {ACTION_USE, OBJECT_ISNAKE, 0xff, 0},               &Room::feather6UseSnakeAnywhere },
+	{ {ACTION_USE, OBJECT_IMEDKIT, 0xff, 0},              &Room::feather6UseMedkitAnywhere },
+	{ {ACTION_USE, OBJECT_IPHASERS, 0xff, 0},             &Room::feather6UsePhaser },
+	{ {ACTION_USE, OBJECT_IPHASERK, 0xff, 0},             &Room::feather6UsePhaser },
+	{ {ACTION_LOOK, HOTSPOT_EAST_EXIT, 0, 0},             &Room::feather6LookAtEastExit },
+	{ {ACTION_LOOK, 0xff, 0, 0},                          &Room::feather6LookAnywhere },
+	{ {ACTION_LOOK, HOTSPOT_ROCKS, 0, 0},                 &Room::feather6LookAtRocks },
+	{ {ACTION_LOOK, HOTSPOT_STALAGMITES, 0, 0},           &Room::feather6LookAtStalagmites },
+	{ {ACTION_LOOK, OBJECT_CRYSTALS, 0, 0},               &Room::feather6LookAtCrystals },
+	{ {ACTION_LOOK, OBJECT_KIRK, 0, 0},                   &Room::feather6LookAtKirk },
+	{ {ACTION_LOOK, OBJECT_SPOCK, 0, 0},                  &Room::feather6LookAtSpock },
+	{ {ACTION_LOOK, OBJECT_MCCOY, 0, 0},                  &Room::feather6LookAtMccoy },
+	{ {ACTION_LOOK, OBJECT_REDSHIRT, 0, 0},               &Room::feather6LookAtRedshirt },
+	{ {ACTION_LOOK, HOTSPOT_STALACTITES, 0, 0},           &Room::feather6LookAtStalactites },
+	{ {ACTION_TALK, OBJECT_MCCOY, 0, 0},                  &Room::feather6TalkToMccoy },
+	{ {ACTION_TALK, OBJECT_REDSHIRT, 0, 0},               &Room::feather6TalkToRedshirt },
+	{ {ACTION_TALK, OBJECT_SPOCK, 0, 0},                  &Room::feather6TalkToSpock },
+	{ {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_EAST_EXIT, 0},&Room::feather6UseMTricorderOnEastExit },
+	{ {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_ROCKS, 0},    &Room::feather6UseMTricorderOnRocks },
+	{ {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_EAST_EXIT, 0},&Room::feather6UseSTricorderOnEastExit },
+	{ {ACTION_USE, OBJECT_ISTRICOR, 0xff, 0},             &Room::feather6UseSTricorderAnywhere },
+	{ {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_ROCKS, 0},    &Room::feather6UseSTricorderOnRocks },
+	{ {ACTION_USE, OBJECT_ISTRICOR, OBJECT_CRYSTALS, 0},  &Room::feather6UseSTricorderOnCrystals },
+	{ {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_STALACTITES, 0},&Room::feather6UseSTricorderOnStalactites },
+	{ {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_STALAGMITES, 0},&Room::feather6UseSTricorderOnStalagmites },
+	{ {ACTION_GET, OBJECT_CRYSTALS, 0, 0},                &Room::feather6GetCrystals },
+
+	{ {ACTION_USE, OBJECT_IKNIFE, OBJECT_CRYSTALS, 0},    &Room::feather6UseKnifeOnCrystals },
+	{ {ACTION_DONE_WALK, 2, 0, 0},                        &Room::feather6ReachedCrystalsWithKnife },
+	{ {ACTION_DONE_ANIM, 3, 0, 0},                        &Room::feather6DoneCuttingCrystals },
+	{ {ACTION_TIMER_EXPIRED, 4, 0, 0},                    &Room::feather6Timer4Expired },
+
+	// ENHANCEMENTs: Also add entries for OBJECT_STALACTITES, not just HOTSPOT_STALACTITES
+	{ {ACTION_LOOK, OBJECT_STALACTITES, 0, 0},              &Room::feather6LookAtStalactites },
+	{ {ACTION_USE, OBJECT_ISTRICOR, OBJECT_STALACTITES, 0}, &Room::feather6UseSTricorderOnStalactites },
+};
+
+extern const int feather6NumActions = sizeof(feather6ActionList) / sizeof(RoomAction);
+
+
 void Room::feather6Tick1() {
+	playVoc("FEA6LOOP");
+	playMidiMusicTracks(27);
+	loadActorAnim(OBJECT_CRYSTALS, "s5r6cx", 0x8a, 0x91);
+	loadActorAnim(OBJECT_STALACTITES, "s5r6ts", 0x90, 0x25);
+}
+
+void Room::feather6TouchedHotspot0() { // McCoy warns you not to go back to the river
+	showText(TX_SPEAKER_MCCOY, TX_FEA6_014);
+}
+
+void Room::feather6UseSpockOnCrystals() {
+	showText(TX_SPEAKER_SPOCK, TX_FEA6_020);
+}
+
+void Room::feather6UseMccoyOnCrystals() {
+	showText(TX_SPEAKER_MCCOY, TX_FEA6_009);
+}
+
+void Room::feather6UseRedshirtOnCrystals() {
+	showText(TX_SPEAKER_STRAGEY, TX_FEA6_040);
+}
+
+
+void Room::feather6UseRockOnStalactites() {
+	_vm->_awayMission.disableInput = true;
+	walkCrewmanC(OBJECT_KIRK, 0x94, 0x97, &Room::feather6ReachedPositionToThrowRock);
+}
+
+void Room::feather6ReachedPositionToThrowRock() {
+	loadActorAnim2(OBJECT_KIRK, "s5r1kt");
+	loadActorAnimC(OBJECT_THROWN_STONE, "s5r1ru", 0x96, 0x4e, &Room::feather6DoneThrowingRock);
+}
+
+void Room::feather6DoneThrowingRock() {
+	playSoundEffectIndex(SND_BLANK_0b);
+	loadActorAnim2(OBJECT_STALACTITES, "s5r6tf");
+	loadActorAnimC(OBJECT_KIRK, "s5r6kd", -1, -1, &Room::feather6KirkDiedFromStalactites);
+	playMidiMusicTracks(1);
+}
+
+void Room::feather6KirkDiedFromStalactites() {
+	_vm->_awayMission.feather.missionScore -= 3;
+	_vm->_awayMission.feather.diedFromStalactites = true;
+	_vm->_awayMission.disableInput = false;
+	showText(TX_FEA6N000);
+	showText(TX_FEA6N004);
+	loadRoomIndex(7, 5);
+}
+
+void Room::feather6UseRockOnCrystals() {
+	_vm->_awayMission.disableInput = true;
+	walkCrewmanC(OBJECT_KIRK, 0x9a, 0x97, &Room::feather6ReachedCrystalsWithRock);
+}
+
+void Room::feather6ReachedCrystalsWithRock() {
+	_vm->_awayMission.timers[2] = 174;
+	loadActorAnim2(OBJECT_STALACTITES, "s5r6tm");
+	if (!_roomVar.feather.usedRockOnCrystalsOnce) {
+		_roomVar.feather.usedRockOnCrystalsOnce = true;
+		loadActorAnimC(OBJECT_KIRK, "s5r6kr", -1, -1, &Room::feather6HitCrystalsWithRockFirstTime);
+	} else
+		loadActorAnimC(OBJECT_KIRK, "s5r6kr", -1, -1, &Room::feather6HitCrystalsWithRockSecondTime);
+}
+
+void Room::feather6Tick() {
+	if (_vm->_awayMission.timers[2] == 55 || _vm->_awayMission.timers[2] == 89 || _vm->_awayMission.timers[2] == 119)
+		playSoundEffectIndex(SND_BLANK_0b);
+}
+
+void Room::feather6HitCrystalsWithRockFirstTime() {
+	_vm->_awayMission.disableInput = false;
+	loadActorStandAnim(OBJECT_KIRK);
+	showText(TX_SPEAKER_KIRK, TX_FEA6_001);
+}
+
+void Room::feather6HitCrystalsWithRockSecondTime() {
+	loadActorAnimC(OBJECT_KIRK, "s5r6kd", -1, -1, &Room::feather6KirkDiedFromStalactites);
+	loadActorAnim2(OBJECT_STALACTITES, "s5r6tf");
+	playMidiMusicTracks(0);
+}
+
+void Room::feather6UseRockOnStalagmites() {
+	showText(TX_SPEAKER_SPOCK, TX_FEA6_019);
+}
+
+void Room::feather6UseRockAnywhere() {
+	// ENHANCEMENT: There were two implementations of this function. The first (which took
+	// precedence) showed TX_FEA6N009, a generic "nothing happens" text. The second is
+	// Spock advising you not to use rocks, which is more interesting.
+	showText(TX_SPEAKER_SPOCK, TX_FEA6_021);
+}
+
+void Room::feather6UseKnifeOnStalagmites() {
+	showText(TX_SPEAKER_SPOCK, TX_FEA6_028);
+}
+
+void Room::feather6UseKnifeAnywhere() {
+	showText(TX_FEA6N010);
+}
+
+void Room::feather6UseKnifeOnMccoy() {
+	showText(TX_SPEAKER_STRAGEY, TX_FEA6_039); // BUGFIX: Speaker is Stragey (not Spock)
+}
+
+void Room::feather6UseKnifeOnSpock() {
+	showText(TX_SPEAKER_STRAGEY, TX_FEA6_039); // BUGFIX: Speaker is Stragey (not Spock)
+}
+
+void Room::feather6UseKnifeOnRedshirt() {
+	showText(TX_SPEAKER_STRAGEY, TX_FEA6_039); // BUGFIX: Speaker is Stragey (not Spock)
+}
+
+void Room::feather6UseCrystalAnywhere() {
+	showText(TX_FEA6N015);
+}
+
+void Room::feather6UseSnakeAnywhere() {
+	showText(TX_FEA6N001);
+}
+
+void Room::feather6UseMedkitAnywhere() {
+	showText(TX_SPEAKER_MCCOY, TX_FEA6_011);
+}
+
+void Room::feather6UsePhaser() {
+	showText(TX_SPEAKER_SPOCK, TX_FEA6_023);
+}
+
+void Room::feather6LookAtEastExit() {
+	showText(TX_FEA6N016);
+}
+
+void Room::feather6LookAnywhere() {
+	showText(TX_FEA6N003);
+}
+
+void Room::feather6LookAtRocks() {
+	showText(TX_FEA6N014);
+}
+
+void Room::feather6LookAtStalagmites() {
+	showText(TX_FEA6N013);
+}
+
+void Room::feather6LookAtCrystals() {
+	showText(TX_FEA6N005);
+}
+
+void Room::feather6LookAtKirk() {
+	showText(TX_FEA6N007);
+}
+
+void Room::feather6LookAtSpock() {
+	showText(TX_FEA6N011);
+}
+
+void Room::feather6LookAtMccoy() {
+	showText(TX_FEA6N002);
+}
+
+void Room::feather6LookAtRedshirt() {
+	showText(TX_FEA6N008);
+}
+
+void Room::feather6LookAtStalactites() {
+	showText(TX_FEA6N012);
+	showText(TX_SPEAKER_SPOCK, TX_FEA6_034);
+	showText(TX_SPEAKER_MCCOY, TX_FEA6_017);
+	showText(TX_SPEAKER_SPOCK, TX_FEA6_033);
+
+	// BUG: Choice 2 (TX_FEA6_004) doesn't match with audio at all.
+	const TextRef choices[] = {
+		TX_SPEAKER_KIRK,
+		TX_FEA6_008, TX_FEA6_006, TX_FEA6_004,
+		TX_BLANK
+	};
+	int choice = showText(choices);
+
+	if (choice == 0)
+		showText(TX_SPEAKER_SPOCK, TX_FEA6_032);
+	else if (choice == 1)
+		showText(TX_SPEAKER_SPOCK, TX_FEA6_036);
+	else
+		showText(TX_SPEAKER_SPOCK, TX_FEA6_037);
+}
+
+void Room::feather6TalkToMccoy() {
+	showText(TX_SPEAKER_MCCOY, TX_FEA6_013);
+}
+
+void Room::feather6TalkToRedshirt() {
+	showText(TX_SPEAKER_STRAGEY, TX_FEA6_042);
+	showText(TX_SPEAKER_KIRK,    TX_FEA6_002);
+	showText(TX_SPEAKER_STRAGEY, TX_FEA6_041);
+	showText(TX_SPEAKER_MCCOY,   TX_FEA6_016);
+	showText(TX_SPEAKER_STRAGEY, TX_FEA6_043);
+}
+
+void Room::feather6TalkToSpock() {
+	if (!_vm->_awayMission.redshirtDead)
+		showText(TX_SPEAKER_SPOCK, TX_FEA6_035);
+	else {
+		showText(TX_SPEAKER_SPOCK, TX_FEA6_038);
+
+		const TextRef choices[] = {
+			TX_SPEAKER_KIRK,
+			TX_FEA6_003, TX_FEA6_005, TX_FEA6_007,
+			TX_BLANK
+		};
+		int choice = showText(choices);
+
+		if (choice == 0)
+			showText(TX_SPEAKER_SPOCK, TX_FEA6_029);
+		else if (choice == 1)
+			showText(TX_SPEAKER_SPOCK, TX_FEA6_030);
+		else
+			showText(TX_SPEAKER_SPOCK, TX_FEA6_031);
+	}
+}
+
+void Room::feather6UseMTricorderOnEastExit() {
+	mccoyScan(DIR_E, TX_FEA6_012);
+}
+
+void Room::feather6UseMTricorderOnRocks() {
+	// ENHANCEMENT: Original didn't play tricorder noise, etc
+	mccoyScan(DIR_E, TX_FEA6_015);
+}
+
+void Room::feather6UseSTricorderOnEastExit() {
+	spockScan(DIR_E, TX_FEA6_024);
+}
+
+void Room::feather6UseSTricorderAnywhere() {
+	spockScan(DIR_S, TX_FEA6_022);
+}
+
+void Room::feather6UseSTricorderOnRocks() {
+	spockScan(DIR_N, TX_FEA6_018);
+}
+
+void Room::feather6UseSTricorderOnCrystals() {
+	spockScan(DIR_N, TX_FEA6_027);
+}
+
+void Room::feather6UseSTricorderOnStalactites() {
+	spockScan(DIR_N, TX_FEA6_025);
+}
+
+void Room::feather6UseSTricorderOnStalagmites() {
+	spockScan(DIR_N, TX_FEA6_026);
+}
+
+void Room::feather6GetCrystals() {
+	showText(TX_FEA6N020);
+}
+
+void Room::feather6UseKnifeOnCrystals() {
+	_vm->_awayMission.disableInput = true;
+	walkCrewmanC(OBJECT_KIRK, 0x9a, 0x97, &Room::feather6ReachedCrystalsWithKnife);
+}
+
+void Room::feather6ReachedCrystalsWithKnife() {
+	loadActorAnimC(OBJECT_KIRK, "s5r6kp", -1, -1, &Room::feather6DoneCuttingCrystals);
+	_vm->_awayMission.timers[4] = 122;
+}
+
+void Room::feather6DoneCuttingCrystals() {
+	_vm->_awayMission.disableInput = false;
+	loadActorStandAnim(OBJECT_KIRK);
+	_vm->_awayMission.feather.missionScore += 1;
+	giveItem(OBJECT_ICRYSTAL);
+	showText(TX_FEA6N017);
+}
 
+void Room::feather6Timer4Expired() { // Crystal disappears when timer 4 expires
+	loadActorStandAnim(OBJECT_CRYSTALS);
 }
 
 }
diff --git a/engines/startrek/rooms/function_map.h b/engines/startrek/rooms/function_map.h
index ab53a11159..1bc32ff544 100644
--- a/engines/startrek/rooms/function_map.h
+++ b/engines/startrek/rooms/function_map.h
@@ -1782,12 +1782,8 @@ RoomAction feather0ActionList[] = {
 
 extern const RoomAction feather1ActionList[], feather2ActionList[], feather3ActionList[], feather4ActionList[];
 extern const int        feather1NumActions,   feather2NumActions,   feather3NumActions,   feather4NumActions;
-extern const RoomAction feather5ActionList[];
-extern const int        feather5NumActions;
-
-RoomAction feather6ActionList[] = {
-	{ {ACTION_TICK, 1, 0, 0}, &Room::feather6Tick1 },
-};
+extern const RoomAction feather5ActionList[], feather6ActionList[];
+extern const int        feather5NumActions,   feather6NumActions;
 
 RoomAction feather7ActionList[] = {
 	{ {ACTION_TICK, 1, 0, 0}, &Room::feather7Tick1 },