Skip to content

Add minor docking failures #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2021
Merged

Add minor docking failures #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified data/gamedata/fails.cdr
View file
Open in desktop
Binary file not shown.
42 changes: 42 additions & 0 deletions src/game/mis_m.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,6 +1273,48 @@ int FailEval(char plr, int type, char *text, int val, int xtra)
Mev[STEP].trace = 0x7F;
break;

case 40: // minor docking failure

FNote = 1;
Mev[STEP].StepInfo = 1951;

/* Scrub the mission if docking is required for any subsequent step */

ctr = 0;

for (k = 0; k < 60; k++) {
switch (Mev[k].loc) {
case 9: // trans-lunar injection
case 26: // LEM thrust test
case 28: // joint duration
ctr = 1;
}
}

if (ctr) {
if (Mev[STEP].fgoto == -1) { // End of Mission Flag
InvalidatePrestige();
Mev[STEP].trace = 0x7F; // End of Mission Signal
FNote = 5;
} else if (Mev[STEP].fgoto != -2) { // Alternate Step is other num
InvalidatePrestige();
Mev[STEP].trace = Mev[STEP].fgoto;
} else {
Mev[STEP].trace = STEP + 1;
}
} else {
FNote = 7;
InvalidatePrestige();

if (Mev[STEP].fgoto == -1) {
Mev[STEP].trace = 0x7F;
} else {
Mev[STEP].trace = STEP + 1;
}
}

break;

case 1:
case 8:
case 10:
Expand Down