thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BLADERUNNER: More fixes for the shooting range

Browse source 
Special targets not yet restored. Fixed a target overlap on PS13, and bad orientation of a target in PS11 and one in PS13.

Special ding sound will be removed in the final pass of the maze code, when special targets will be restored too, and also fast targets will be restore to being fast or faster than they are now.
This commit is contained in:
Thanasis Antoniou 2019-03-21 19:19:52 +02:00
parent 0d10297969
commit d15a5d4578
4 changed files with 134 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
engines/bladerunner/script/scene/ps10.cpp
View file

@ -29,7 +29,7 @@ int SceneScriptPS10::getPoliceMazePS10TargetCount() {
return kPoliceMazePS10TargetCount;
}
static const int *getPoliceMazePS10TrackData1() { // Enemy (kItemPS10Target1, kItemPS10Target2) - Rotating reveal
static const int *getPoliceMazePS10TrackData1() { // Enemy linked series (kItemPS10Target1, kItemPS10Target2) - Rotating reveal
static int trackData[] = {
kPMTIActivate, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
kPMTIVariableInc, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
@ -55,6 +55,7 @@ static const int *getPoliceMazePS10TrackData1() { // Enemy (kItemPS10Target1, k
kPMTIMove, 14,
kPMTIWait, 1000,
kPMTIRotate, 740, 80,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS10Target1, // rotate - reveal
#if BLADERUNNER_ORIGINAL_BUGS
#else
@ -80,7 +81,7 @@ static const int *getPoliceMazePS10TrackData1() { // Enemy (kItemPS10Target1, k
return trackData;
}
static const int *getPoliceMazePS10TrackData2() { // Enemy (kItemPS10Target1, kItemPS10Target2)
static const int *getPoliceMazePS10TrackData2() { // Enemy linked series (kItemPS10Target1, kItemPS10Target2)
static int trackData[] = {
kPMTIFacing, 740,
kPMTIPosition, 0,
@ -91,6 +92,7 @@ static const int *getPoliceMazePS10TrackData2() { // Enemy (kItemPS10Target1, k
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTITargetSet, kItemPS10Target2, 0, // remove target-able here - only for Target2 item
kPMTIPausedReset, kItemPS10Target3,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIPausedReset, kItemPS10Target5,
kPMTIPausedSet, kItemPS10Target2,
@ -119,6 +121,7 @@ static const int *getPoliceMazePS10TrackData3() { // Enemy (kItemPS10Target3) -
kPMTIEnemyReset, kItemPS10Target3,
kPMTIMove, 5,
kPMTIWait, 1000,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS10Target3, // rotate - reveal
kPMTIRotate, 233, 80,
kPMTIWait, 0,
@ -230,6 +233,7 @@ static const int *getPoliceMazePS10TrackData6() { // Enemy (kItemPS10Target6) -
kPMTIEnemyReset, kItemPS10Target6,
kPMTIMove, 7,
kPMTIWait, 500,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS10Target6, // rotate - reveal
kPMTIRotate, 750, 80,
kPMTIWait, 0,
@ -304,10 +308,15 @@ static const int *getPoliceMazePS10TrackData8() { // Enemy (kItemPS10Target8) -
kPMTIEnemyReset, kItemPS10Target8,
kPMTIMove, 34,
kPMTIWait, 500,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS10Target8, // rotate - reveal
kPMTIRotate, 491, 80,
kPMTIMove, 20,
kPMTIWait, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWait, 0, // this is too fast
#else
kPMTIWait, 250,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIShoot, 27, 33,
kPMTIMove, 0,
kPMTIObstacleReset, kItemPS10Target8,
@ -326,6 +335,10 @@ static const int *getPoliceMazePS10TrackData9() { // Special (kItemPS10Target9)
static int trackData[] = {
kPMTIActivate, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
kPMTIVariableInc, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTITargetSet, kItemPS10Target9, 0, // remove target-able here
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleReset, kItemPS10Target9,
kPMTIFacing, 738,
kPMTIPosition, 0,
@ -375,6 +388,10 @@ static const int *getPoliceMazePS10TrackData9() { // Special (kItemPS10Target9)
kPMTIPlaySound, 32, 33,
kPMTIMove, 0,
kPMTIObstacleReset, kItemPS10Target9,
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTITargetSet, kItemPS10Target9, 0, // remove target-able here
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIPausedSet, kItemPS10Target9,
kPMTIRestart
};

33
engines/bladerunner/script/scene/ps11.cpp
View file

@ -55,7 +55,11 @@ static const int *getPoliceMazePS11TrackData9() { // Enemy (kItemPS11Target1)
kPMTIObstacleReset, kItemPS11Target1,
kPMTIFacing, 50,
kPMTIPosition, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 5000, 5000,
#else
kPMTIWaitRandom, 5000, 6000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS11Target1,
kPMTIPlaySound, 31, 33,
kPMTITargetSet, kItemPS11Target1, 1,
@ -125,6 +129,7 @@ static const int *getPoliceMazePS11TrackData11() { // Enemy (kItemPS11Target2,
kPMTIEnemyReset, kItemPS11Target3, // [redundant after bug fix] target 2-3 still is not revealed as enemy
kPMTIMove, 25,
kPMTIWait, 500,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS11Target3, // rotate - reveal -- no need to set target 2 as enemy too, since it's gone
kPMTIPlaySound, 32, 33,
kPMTIRotate, 644, 80,
@ -257,10 +262,15 @@ static const int *getPoliceMazePS11TrackData14() { // Enemy (kItemPS11Target6)
kPMTIPlaySound, 33, 33,
kPMTIMove, 5,
kPMTIWait, 500,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS11Target6, // rotate - reveal
kPMTIRotate, 644, 80,
kPMTIWait, 0,
kPMTIRotate, 388, 80, // TODO fix orientation here
#if BLADERUNNER_ORIGINAL_BUGS
1 kPMTIRotate, 388, 80, // TODO fix orientation here
#else
kPMTIRotate, 280, 80, // corrected orientation
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIWait, 1000,
kPMTIShoot, 27, 33,
kPMTIPlaySound, 34, 33,
@ -373,7 +383,11 @@ static const int *getPoliceMazePS11TrackData17() { // Special (kItemPS11Target9
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIPlaySound, 32, 33,
kPMTIMove, 10,
kPMTIWait, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWait, 0, // this is too fast
#else
kPMTIWait, 350,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIShoot, 27, 33,
kPMTIMove, 0,
#if BLADERUNNER_ORIGINAL_BUGS
@ -386,7 +400,11 @@ static const int *getPoliceMazePS11TrackData17() { // Special (kItemPS11Target9
kPMTIEnemySet, kItemPS11Target9,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIMove, 10,
kPMTIWait, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWait, 0, // this is too fast
#else
kPMTIWait, 350,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIShoot, 27, 33,
kPMTIMove, 24,
kPMTIWait, 1000,
@ -435,7 +453,8 @@ static const int *getPoliceMazePS11TrackData18() { // Special (kItemPS11Target1
kPMTILeave, // TODO MAZE A bug? intended? Is this target not revealed yet? Credit for "first" innocent (special)?
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIRotate, 700, 80,
kPMTIEnemySet, kItemPS11Target10, // Now the target is an enemy. (special)
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS11Target10, // Now the target is an enemy. (special) Rotate reveal?
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTIEnemySet, kItemPS11Target11, // both targets should set their enemy flag here
@ -569,7 +588,11 @@ static const int *getPoliceMazePS11TrackData22() { // Enemy (kItemPS11Target14)
kPMTIPosition, 0,
kPMTITargetSet, kItemPS11Target14, 1,
kPMTIEnemySet, kItemPS11Target14,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 5000, 5000,
#else
kPMTIWaitRandom, 5000, 6000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS11Target14,
kPMTIMove, 7,
kPMTIPlaySound, 32, 33,
@ -581,7 +604,7 @@ static const int *getPoliceMazePS11TrackData22() { // Enemy (kItemPS11Target14)
#else
kPMTITargetSet, kItemPS11Target14, 0, // remove target-able here
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIPausedReset1of2, 23, kItemPS11Target9,
kPMTIPausedReset1of2, kItemPS11Target15, kItemPS11Target9,
kPMTIPausedSet, kItemPS11Target14,
kPMTIPosition, 0,
kPMTIRestart

44
engines/bladerunner/script/scene/ps12.cpp
View file

@ -99,9 +99,15 @@ static const int *getPoliceMazePS12TrackData30() { // Enemy (kItemPS12Target2) -
kPMTIPlaySound, 34, 33,
kPMTIMove, 0,
kPMTIObstacleReset, kItemPS12Target2,
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTITargetSet, kItemPS12Target2, 0, // remove target-able after making target invisible
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIPausedReset1of2, kItemPS12Target13, kItemPS12Target11,
kPMTIPausedSet, kItemPS12Target2,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTITargetSet, kItemPS12Target2, 0, // removes target-able here (original code)
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIRestart
};
return trackData;
@ -295,13 +301,18 @@ static const int *getPoliceMazePS12TrackData34() { // Special (kItemPS12Target6
kPMTIMove, 19,
kPMTIPlaySound, 29, 33,
kPMTIWait, 0,
kPMTIObstacleReset, kItemPS12Target6,
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTITargetSet, kItemPS12Target6, 0, // remove target-able here - only for this item
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleReset, kItemPS12Target6,
kPMTIPausedReset, kItemPS12Target7,
kPMTIPausedSet, kItemPS12Target6,
#else
// Prevent blinking at hand-off
kPMTIPausedReset, kItemPS12Target7,
kPMTIObstacleReset, kItemPS12Target6,
kPMTITargetSet, kItemPS12Target6, 0, // remove target-able here - only for this item
kPMTIObstacleSet, kItemPS12Target7,
kPMTIPausedSet, kItemPS12Target6,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIPosition, 0,
kPMTIRestart
};
@ -310,7 +321,7 @@ static const int *getPoliceMazePS12TrackData34() { // Special (kItemPS12Target6
static const int *getPoliceMazePS12TrackData35() { // Enemy (kItemPS12Target6, kItemPS12Target7, kItemPS12Target8)
static int trackData[] = {
kPMTIObstacleSet, kItemPS12Target7,
kPMTIObstacleSet, kItemPS12Target7, // [redundant after bug fix]
kPMTIFacing, 198,
kPMTIPosition, 0,
kPMTIRotate, 469, 80,
@ -357,7 +368,9 @@ static const int *getPoliceMazePS12TrackData36() { // Enemy (kItemPS12Target6,
kPMTIPausedReset, kItemPS12Target9,
kPMTIPausedSet, kItemPS12Target8,
kPMTIFacing, 469,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS12Target8,
#endif
kPMTIPosition, 0,
kPMTIRestart
};
@ -437,18 +450,23 @@ static const int *getPoliceMazePS12TrackData39() { // Enemy (kItemPS12Target11)
kPMTIVariableInc, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTITargetSet, kItemPS12Target11, 0, // remove target-able here
kPMTIEnemyReset, kItemPS12Target11,
kPMTITargetSet, kItemPS12Target11, 0, // remove target-able here
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleReset, kItemPS12Target11,
kPMTIFacing, 513,
kPMTIPosition, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 5000, 5000,
#else
kPMTIWaitRandom, 5000, 6000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS12Target11,
kPMTIPlaySound, 33, 33,
kPMTITargetSet, kItemPS12Target11, 1,
kPMTIMove, 5,
kPMTIWait, 1000,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS12Target11, // rotate - reveal
kPMTIRotate, 1010, 80,
kPMTIPlaySound, 29, 33,
@ -474,8 +492,8 @@ static const int *getPoliceMazePS12TrackData40() { // Enemy (kItemPS12Target12)
kPMTIVariableInc, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTITargetSet, kItemPS12Target12, 0, // remove target-able here
kPMTIEnemyReset, kItemPS12Target12,
kPMTITargetSet, kItemPS12Target12, 0, // remove target-able here
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleReset, kItemPS12Target12,
kPMTIFacing, 480,
@ -487,6 +505,7 @@ static const int *getPoliceMazePS12TrackData40() { // Enemy (kItemPS12Target12)
kPMTIMove, 5,
kPMTIPlaySound, 29, 33,
kPMTIWait, 500,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS12Target12, // rotate - reveal
kPMTIRotate, 968, 80,
kPMTIPlaySound, 29, 33,
@ -621,13 +640,21 @@ static const int *getPoliceMazePS12TrackData44() { // Innocent (kItemPS12Target
kPMTIObstacleReset, kItemPS12Target16,
kPMTIFacing, 109,
kPMTIPosition, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 5000, 5000,
#else
kPMTIWaitRandom, 5000, 6000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS12Target16,
kPMTIPlaySound, 29, 33,
kPMTITargetSet, kItemPS12Target16, 1,
kPMTIEnemyReset, kItemPS12Target16,
kPMTIMove, 5,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 2000, 2000,
#else
kPMTIWaitRandom, 2000, 3000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIPlaySound, 29, 33,
kPMTIMove, 0,
kPMTILeave,
@ -649,8 +676,8 @@ static const int *getPoliceMazePS12TrackData45() { // Enemy (kItemPS12Target17)
kPMTIVariableInc, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTITargetSet, kItemPS12Target17, 0, // remove target-able here
kPMTIEnemyReset, kItemPS12Target17,
kPMTITargetSet, kItemPS12Target17, 0, // remove target-able here
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleReset, kItemPS12Target17,
kPMTIFacing, 540,
@ -661,6 +688,7 @@ static const int *getPoliceMazePS12TrackData45() { // Enemy (kItemPS12Target17)
kPMTITargetSet, kItemPS12Target17, 1,
kPMTIMove, 9,
kPMTIWait, 1000,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS12Target17, // rotate - reveal
kPMTIRotate, 284, 80,
kPMTIWait, 0,

57
engines/bladerunner/script/scene/ps13.cpp
View file

@ -108,7 +108,11 @@ static const int *getPoliceMazePS13TrackData47() { // Enemy (kItemPS13Target2)
kPMTIObstacleReset, kItemPS13Target2,
kPMTIFacing, 823,
kPMTIPosition, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 5000, 5000,
#else
kPMTIWaitRandom, 5000, 6000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS13Target2,
kPMTIPlaySound, 33, 33,
kPMTITargetSet, kItemPS13Target2, 1,
@ -140,7 +144,11 @@ static const int *getPoliceMazePS13TrackData48() { // Innocent (kItemPS13Target
kPMTIObstacleReset, kItemPS13Target3,
kPMTIFacing, 823,
kPMTIPosition, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 2000, 2000,
#else
kPMTIWaitRandom, 2000, 3000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS13Target3,
kPMTIPlaySound, 33, 33,
kPMTITargetSet, kItemPS13Target3, 1,
@ -237,7 +245,11 @@ static const int *getPoliceMazePS13TrackData51() { // Enemy (kItemPS13Target6)
kPMTIObstacleReset, kItemPS13Target6,
kPMTIFacing, 823,
kPMTIPosition, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 2000, 2000,
#else
kPMTIWaitRandom, 2000, 3000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS13Target6,
kPMTIPlaySound, 33, 33,
kPMTITargetSet, kItemPS13Target6, 1,
@ -277,6 +289,7 @@ static const int *getPoliceMazePS13TrackData52() { // Enemy (kItemPS13Target7)
kPMTIEnemyReset, kItemPS13Target7,
kPMTIMove, 9,
kPMTIWait, 500,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS13Target7, // rotate - reveal
kPMTIRotate, 555, 80,
kPMTIWait, 0,
@ -307,12 +320,17 @@ static const int *getPoliceMazePS13TrackData53() { // Enemy (kItemPS13Target8)
kPMTIObstacleReset, kItemPS13Target8,
kPMTIFacing, 356,
kPMTIPosition, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 3000, 3000,
#else
kPMTIWaitRandom, 3000, 4000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS13Target8,
kPMTIPlaySound, 33, 33,
kPMTITargetSet, kItemPS13Target8, 1,
kPMTIEnemyReset, kItemPS13Target8,
kPMTIMove, 5,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS13Target8, // rotate - reveal
kPMTIRotate, 868, 200,
kPMTIWait, 1000,
@ -341,7 +359,11 @@ static const int *getPoliceMazePS13TrackData54() { // Enemy (kItemPS13Target9)
kPMTITargetSet, kItemPS13Target9, 0, // remove target-able here
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleReset, kItemPS13Target9,
kPMTIFacing, 512,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIFacing, 512, // fix starting orientation
#else
kPMTIFacing, 250, // must have concealed weapon since starting as innocent
#endif
kPMTIPosition, 0,
kPMTIWaitRandom, 10000, 20000,
kPMTIObstacleSet, kItemPS13Target9,
@ -350,6 +372,7 @@ static const int *getPoliceMazePS13TrackData54() { // Enemy (kItemPS13Target9)
kPMTIEnemyReset, kItemPS13Target9,
kPMTIMove, 3,
kPMTIWait, 500,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS13Target9, // rotate - reveal
kPMTIRotate, 768, 80,
kPMTIWait, 1000,
@ -367,7 +390,7 @@ static const int *getPoliceMazePS13TrackData54() { // Enemy (kItemPS13Target9)
return trackData;
}
static const int *getPoliceMazePS13TrackData55() { // Enemy (kItemPS13Target10, kItemPS13Target11, kItemPS13Target12) - Rotating reveal
static const int *getPoliceMazePS13TrackData55() { // Enemy linked series (kItemPS13Target10, kItemPS13Target11, kItemPS13Target12) - Rotating reveal
static int trackData[] = {
kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
@ -385,7 +408,11 @@ static const int *getPoliceMazePS13TrackData55() { // Enemy (kItemPS13Target10,
kPMTITargetSet, kItemPS13Target12, 1,
kPMTIFacing, 327,
kPMTIPosition, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 1000, 1000,
#else
kPMTIWaitRandom, 1000, 2000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIPlaySound, 33, 33,
kPMTIEnemyReset, kItemPS13Target10,
#if BLADERUNNER_ORIGINAL_BUGS
@ -410,7 +437,7 @@ static const int *getPoliceMazePS13TrackData55() { // Enemy (kItemPS13Target10,
return trackData;
}
static const int *getPoliceMazePS13TrackData56() { // Enemy (kItemPS13Target10, kItemPS13Target11, kItemPS13Target12) - Rotating reveal
static const int *getPoliceMazePS13TrackData56() { // Enemy linked series (kItemPS13Target10, kItemPS13Target11, kItemPS13Target12) - Rotating reveal
static int trackData[] = {
kPMTIFacing, 327,
kPMTIPosition, 0,
@ -420,21 +447,27 @@ static const int *getPoliceMazePS13TrackData56() { // Enemy (kItemPS13Target10,
kPMTIWait, 1000,
kPMTIPausedReset, kItemPS13Target12,
kPMTIObstacleReset, kItemPS13Target11,
kPMTIObstacleSet, kItemPS13Target12,
kPMTIPausedSet, kItemPS13Target11,
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTITargetSet, kItemPS13Target11, 0, // remove target-able here - only for kItemPS13Target11 item
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS13Target12,
kPMTIPausedSet, kItemPS13Target11,
kPMTIPosition, 0,
kPMTIRestart
};
return trackData;
}
static const int *getPoliceMazePS13TrackData57() { // Enemy (kItemPS13Target10, kItemPS13Target11, kItemPS13Target12) - Rotating reveal
static const int *getPoliceMazePS13TrackData57() { // Enemy linked series (kItemPS13Target10, kItemPS13Target11, kItemPS13Target12) - Rotating reveal
static int trackData[] = {
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS13Target12, // rotate - reveal
#if BLADERUNNER_ORIGINAL_BUGS
#else
kPMTIEnemySet, kItemPS13Target10, // set all other targets in linked series as enemies here too for consistency
kPMTIEnemySet, kItemPS13Target11, // set all other targets in linked series as enemies here too for consistency
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIFacing, 327,
kPMTIPosition, 0,
kPMTIObstacleSet, kItemPS13Target12, // redundant (original)
@ -469,7 +502,11 @@ static const int *getPoliceMazePS13TrackData58() { // Special (kItemPS13Target1
kPMTIObstacleReset, kItemPS13Target13,
kPMTIFacing, 922,
kPMTIPosition, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 3000, 3000,
#else
kPMTIWaitRandom, 3000, 4000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS13Target13,
kPMTIPlaySound, 33, 33,
kPMTITargetSet, kItemPS13Target13, 1,
@ -511,13 +548,18 @@ static const int *getPoliceMazePS13TrackData62() { // Enemy (kItemPS13Target14)
kPMTIObstacleReset, kItemPS13Target14,
kPMTIFacing, 465,
kPMTIPosition, 0,
#if BLADERUNNER_ORIGINAL_BUGS
kPMTIWaitRandom, 3000, 3000,
#else
kPMTIWaitRandom, 3000, 4000,
#endif // BLADERUNNER_ORIGINAL_BUGS
kPMTIObstacleSet, kItemPS13Target14,
kPMTIPlaySound, 33, 33,
kPMTITargetSet, kItemPS13Target14, 1,
kPMTIEnemyReset, kItemPS13Target14,
kPMTIMove, 14,
kPMTIWait, 1000,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS13Target14, // rotate - reveal
kPMTIRotate, 650, 80,
kPMTIWait, 0,
@ -559,7 +601,8 @@ static const int *getPoliceMazePS13TrackData63() { // Enemy (kItemPS13Target15)
kPMTIEnemyReset, kItemPS13Target15,
kPMTIMove, 9,
kPMTIWait, 1000,
kPMTIEnemySet, kItemPS13Target15,
kPMTIPlaySound, 495, 33, // ASDF REVEAL BELL
kPMTIEnemySet, kItemPS13Target15, // rotate - reveal
kPMTIRotate, 710, 80,
kPMTIWait, 0,
kPMTIRotate, 960, 80,