Skip to content
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

Linked Scenarios/Interception #5946

Merged
merged 15 commits into from
Feb 1, 2025
Merged

Linked Scenarios/Interception #5946

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e39bf5b
merge with master, cleanup, colorize Reinforce Button
DM0000 Jan 31, 2025
5e2c793
Swapped scenario link around to more logical order.
DM0000 Jan 31, 2025
d8121c8
Readded linkedScenarioProcessing to resolution, fixed rebase errors
DM0000 Jan 31, 2025
f2aac31
formatting and rebase fixes
DM0000 Jan 31, 2025
2294e37
last format fix
DM0000 Jan 31, 2025
814b290
fix LinkedScenarioID -> linkedScenarioId and remove old function from…
DM0000 Jan 31, 2025
1fef6d5
add back in mission link check, add check for other linked missions b…
DM0000 Jan 31, 2025
32241f6
fix Campaign formatting and variable names, added back victory -> Ove…
DM0000 Jan 31, 2025
3d1cc68
formatting and checkLinkedScenario fixes
DM0000 Jan 31, 2025
4a31a08
typo and JavaDocs
DM0000 Feb 1, 2025
143397e
typos and cleanup
DM0000 Feb 1, 2025
c8e806c
Merge branch 'master' into LinkedScenario
rjhancock Feb 1, 2025
ad20773
remove cast and whitespace
DM0000 Feb 1, 2025
459ed07
Merge branch 'LinkedScenario' of https://github.com/DM0000/mekhq into…
DM0000 Feb 1, 2025
3fc188d
Merge branch 'master' into LinkedScenario
rjhancock Feb 1, 2025
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
242 changes: 147 additions & 95 deletions MekHQ/src/mekhq/campaign/Campaign.java
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions MekHQ/src/mekhq/campaign/mission/Scenario.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ public class Scenario implements IPlayerSettings {
protected List<BotForce> botForces;
protected List<BotForceStub> botForcesStubs;

// linked Interception Scenario
private int linkedScenarioID;

// stores external id of bot forces
private Map<String, Entity> externalIDLookup;

Expand Down Expand Up @@ -150,6 +153,7 @@ public Scenario(String name) {
botForces = new ArrayList<>();
botForcesStubs = new ArrayList<>();
externalIDLookup = new HashMap<>();
linkedScenarioID = 0;

light = Light.DAY;
weather = Weather.CLEAR;
Expand Down Expand Up @@ -224,6 +228,14 @@ public void setDate(final @Nullable LocalDate date) {
this.date = date;
}

public int getLinkedScenario() {
return linkedScenarioID;
}

public void setlinkedScenarioID(int ScenarioID) {
linkedScenarioID = ScenarioID;
}

public boolean hasObjectives() {
return (scenarioObjectives != null) && !scenarioObjectives.isEmpty();
}
Expand Down Expand Up @@ -858,6 +870,7 @@ public boolean includesRequiredUnits(Campaign c) {
}

public boolean canStartScenario(Campaign c) {

if (!getStatus().isCurrent()) {
return false;
}
Expand Down Expand Up @@ -890,6 +903,7 @@ protected int writeToXMLBegin(final PrintWriter pw, int indent) {
MHQXMLUtility.writeSimpleXMLTag(pw, indent, "startingAnySEy", startingAnySEy);
MHQXMLUtility.writeSimpleXMLTag(pw, indent, "status", getStatus().name());
MHQXMLUtility.writeSimpleXMLTag(pw, indent, "id", id);
MHQXMLUtility.writeSimpleXMLTag(pw, indent, "linkedScenarioID", linkedScenarioID);
if (null != stub) {
stub.writeToXML(pw, indent);
} else {
Expand Down Expand Up @@ -1025,6 +1039,8 @@ public static Scenario generateInstanceFromXML(Node wn, Campaign c, Version vers
retVal.setReport(wn2.getTextContent());
} else if (wn2.getNodeName().equalsIgnoreCase("forceStub")) {
retVal.stub = ForceStub.generateInstanceFromXML(wn2, version);
} else if (wn2.getNodeName().equalsIgnoreCase("linkedScenarioID")) {
retVal.linkedScenarioID = Integer.parseInt(wn2.getTextContent());
} else if (wn2.getNodeName().equalsIgnoreCase("date")) {
retVal.date = MHQXMLUtility.parseDate(wn2.getTextContent().trim());
} else if (wn2.getNodeName().equalsIgnoreCase("cloaked")) {
Expand Down
Loading
Loading