-
Notifications
You must be signed in to change notification settings - Fork 176
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.
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
Story Arc Editor #4020
Draft
AaronGullickson
wants to merge
48
commits into
MegaMek:master
Choose a base branch
from
AaronGullickson:story-arc-editor
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Story Arc Editor #4020
Changes from 15 commits
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
5164532
Add startup button for story arc editor
AaronGullickson ca96ed2
Add frame for StoryArcEditorGUI and ability to get there from splash …
AaronGullickson 4e5e6cd
Add StoryPointTableModel and corresponding table to GUI
AaronGullickson d002bbc
Add StoryPointEditorPanel framework (WIP)
AaronGullickson 2a7f60a
Add information on linking storypoints to StoryPointEditorPanel
AaronGullickson 4936a11
Add beginning of story outcomes table to StoryPointEditorPanel
AaronGullickson c58bf35
Add default outcomes to story outcome table in StoryPointEditorPanel
AaronGullickson 33a7c42
Report next story point name rather than id in outcome table for Stor…
AaronGullickson 6c92c0b
Add class name for each story point
AaronGullickson fb4dd58
Create StoryPointHyperLinkListener
AaronGullickson 19cb0da
Try another approach to displaying StoryOutcomes in StoryPointEditoPa…
AaronGullickson 4efcbb6
Preventing JLabel wrapping with <nobr> tag
AaronGullickson 0f9f924
Add getAllPossibleResults method to StoryPoint
AaronGullickson e0aa366
Make delete outcome button function in StoryPointEditorPanel
AaronGullickson a998aa7
Add StoryTrigger description
AaronGullickson 891acf3
Refactor StoryPointHyperLinkListener to gui
AaronGullickson d803935
Use static token for STORYPOINT in hyperlinklistener
AaronGullickson 54f4686
Add CustomizeStoryOutcomeDialog
AaronGullickson 2eb1fd1
Make add outcome button functional in StoryPointEditorPanel
AaronGullickson 212b0c6
Add actual possible results for CheckStringVariableStoryPoint
AaronGullickson b2cfbe0
Improve layout of Add StoryOutcome button and combobox
AaronGullickson 35c698c
Add missing space
AaronGullickson b44680b
Disallow CURRENT as a possible result for ScenarioStoryPoint
AaronGullickson 87bab0b
Fix graphical artifact when updating story outcomes
AaronGullickson 3a8633d
Add save and cancel button for name in StoryPointEditorPanel
AaronGullickson 8f16056
Change title of story arc editor
AaronGullickson 90ddeaf
Remove StoryOutcomeModel
AaronGullickson 14e16bc
Set up story trigger panel in CustomizeStoryOutcomeDialog
AaronGullickson d894c65
Add storytriggerpanels
AaronGullickson 17ec557
Merge branch 'master' into story-arc-editor
AaronGullickson 63fe8fa
Redesign CustomizeStoryOUtcomeDialog for display of triggerpanels
AaronGullickson 4482900
Make StoryTrigger.getStoryArc public
AaronGullickson 6668390
Add ChangeStringVariableStoryTriggerPanel
AaronGullickson 0f701f9
Add SwitchTabStoryTriggerPanel
AaronGullickson e78a901
Pass in proper subclass to StoryTriggerPanel
AaronGullickson e2e4f31
Make combobox private
AaronGullickson 5b2a867
Add CompleteMissionStoryTriggerPanel
AaronGullickson a51979b
Add SetDateStoryTriggerPanel
AaronGullickson b6e20b4
Add delete button for triggers in StoryTriggerPanel
AaronGullickson 8020621
Merge branch 'master' into story-arc-editor
AaronGullickson 04895c5
Make delete trigger button functional
AaronGullickson ba3e117
Remove unused function
AaronGullickson 44009fc
Set layout of SwitchTabStoryTriggerPanel to GridBagLayout
AaronGullickson dd43f6f
Add AdvanceTimeStoryTriggerPanel
AaronGullickson 46e66cf
Add EndArc and GameOver StoryTriggerPanels
AaronGullickson 4647b66
Add story trigger drop down selector
AaronGullickson 037d14e
Correct layout of CompleteMissionStoryTriggerPanel
AaronGullickson e579c30
Fix conflicts
AaronGullickson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
fileMenu.text=File | ||
miNewArc.text=New Story Arc... | ||
miLoadArc.text=Load Story Arc... | ||
miSaveArc.text=Save Story Arc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package mekhq; | ||
|
||
import mekhq.campaign.storyarc.StoryArc; | ||
import mekhq.gui.StoryArcEditorGUI; | ||
import org.apache.logging.log4j.LogManager; | ||
|
||
import javax.swing.event.HyperlinkEvent; | ||
import javax.swing.event.HyperlinkListener; | ||
import java.util.UUID; | ||
|
||
public class StoryPointHyperLinkListener implements HyperlinkListener { | ||
|
||
private StoryArc storyArc; | ||
private StoryArcEditorGUI editorGUI; | ||
|
||
public static final String STORYPOINT = "STORYPOINT"; | ||
|
||
public StoryPointHyperLinkListener(final StoryArc arc, final StoryArcEditorGUI gui) { | ||
this.storyArc = arc; | ||
this.editorGUI = gui; | ||
} | ||
|
||
@Override | ||
public void hyperlinkUpdate(HyperlinkEvent evt) { | ||
if (evt.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { | ||
if (evt.getDescription().startsWith(STORYPOINT)) { | ||
try { | ||
final UUID id = UUID.fromString(evt.getDescription().split(":")[1]); | ||
editorGUI.focusOnStoryPoint(id); | ||
} catch (Exception e) { | ||
LogManager.getLogger().error("", e); | ||
} | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check notice
Code scanning / CodeQL
Missing Override annotation Note