Skip to content

Commit 00445f0

Browse files
Stewmathsev-
authored andcommitted
STARTREK: TRIAL3
1 parent 2771797 commit 00445f0

File tree

5 files changed

+589
-2
lines changed

5 files changed

+589
-2
lines changed

engines/startrek/awaymission.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,25 @@ struct AwayMission {
278278
bool globSplitInTwo; // 0x35
279279
bool globDefeated; // 0x36
280280
byte globEnergyLevels[3]; // 0x37
281+
bool enteredTrial3FirstTime; // 0x3a
282+
byte klingonShootIndex; // 0x3b
283+
byte shotKlingons; // 0x3c
284+
285+
// 0: Hasn't appeared yet
286+
// 21: Is conscious
287+
// 22: Is stunned
288+
// 23: Is dead
289+
int16 shotKlingonState; // 0x3d
290+
281291
bool enteredGlobRoom; // 0x5c
282292
bool forceFieldDown; // 0x5d
283293
bool uhuraAnalyzedCode; // 0x5e
284294
int16 field5f; // 0x5f
285295
bool gotPointsForGettingRod; // 0x61
286296
bool gotPointsForCoatingRodWithIron; // 0x62
287297
bool gotPointsForScanningGlob; // 0x64
298+
299+
bool gotPointsForBeamingOut;
288300
} trial;
289301
};
290302
};

engines/startrek/room.h

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,6 +1893,59 @@ class Room {
18931893

18941894
// TRIAL3
18951895
void trial3Tick1();
1896+
void trial3Tick30();
1897+
void trial3Klingon1BeamedIn();
1898+
void trial3Klingon2BeamedIn();
1899+
void trial3Klingon3BeamedIn();
1900+
void trial3KlingonShootsSomeone1();
1901+
void trial3Klingon1DoneShooting();
1902+
void trial3Klingon2DoneShooting();
1903+
void trial3Klingon3DoneShooting();
1904+
void trial3KlingonShootsSomeone2();
1905+
void trial3RedshirtDoneDying();
1906+
void trial3KirkDoneDying();
1907+
void trial3Klingon1Shot();
1908+
void trial3Klingon2Shot();
1909+
void trial3Klingon3Shot();
1910+
void trial3CheckShowUhuraText();
1911+
void trial3CrewmanBeamedOut();
1912+
void trial3Tick90();
1913+
void trial3TouchedHotspot3();
1914+
void trial3KirkExploded();
1915+
void trial3LookAtKirk();
1916+
void trial3LookAtSpock();
1917+
void trial3LookAtMccoy();
1918+
void trial3LookAtRedshirt();
1919+
void trial3LookAtExit();
1920+
void trial3LookAtWall();
1921+
void trial3TalkToKirk();
1922+
void trial3TalkToSpock();
1923+
void trial3TalkToMccoy();
1924+
void trial3TalkToRedshirt();
1925+
void trial3UsePhaserOnWall();
1926+
void trial3UseStunPhaserOnKlingon1();
1927+
void trial3ReadyToShootKlingon1OnStun();
1928+
void trial3UseKillPhaserOnKlingon1();
1929+
void trial3ReadyToShootKlingon1OnKill();
1930+
void trial3UsePhaserAnywhere();
1931+
void trial3UseMTricorderOnKirk();
1932+
void trial3UseMTricorderOnSpock();
1933+
void trial3UseMTricorderOnMccoy();
1934+
void trial3UseMTricorderOnRedshirt();
1935+
void trial3UseMTricorderOnExit();
1936+
void trial3UseSTricorderOnWall();
1937+
void trial3UseSTricorderOnExit();
1938+
void trial3UseMTricorderOnKlingon();
1939+
void trial3UseCommunicator();
1940+
void trial3BeamToVlict();
1941+
void trial3UseMccoyOnWall();
1942+
void trial3UseMccoyOnExit();
1943+
void trial3UseSpockOnWall();
1944+
void trial3UseSpockOnExit();
1945+
void trial3UseRedshirtOnExit();
1946+
void trial3UseRedshirtOnWall();
1947+
void trial3WalkToExit();
1948+
void trial3UseMedkitAnywhere();
18961949

18971950
// TRIAL4
18981951
void trial4Tick1();

0 commit comments

Comments
 (0)