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.

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 Arcs Basic Architecture #2997

Merged
merged 378 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
378 commits
Select commit Hold shift + click to select a range
0929d47
Change Young Wolves arc to force travel through Sudeten per canon
AaronGullickson Dec 28, 2021
0233299
Add details to Cutting Teeth scenario in Young Wolves story arc
AaronGullickson Dec 28, 2021
a61880a
Add private to variable
AaronGullickson Dec 28, 2021
5891b96
Add CheckPersonActiveStoryPoint
AaronGullickson Dec 28, 2021
b63818c
Add name variable to StoryPoint and move id XML tracking from attribu…
AaronGullickson Dec 28, 2021
0e2a809
Add name variable to Personality and move id XML tracking from attrib…
AaronGullickson Dec 28, 2021
33c3907
Update all writeToXML methods to use modern methods
AaronGullickson Dec 29, 2021
6c7fb36
Merge remote-tracking branch 'upstream/master' into story-arcs
AaronGullickson Dec 29, 2021
7b99e3e
Create StoryArcStub for selecting and loading story arcs
AaronGullickson Dec 29, 2021
dc93ae1
Forgot actual StoryArcStub class in prior commit
AaronGullickson Dec 29, 2021
edcad6d
Consolidate PersonKiaStoryPoint and PersonMiaStoryPoint into PersonSt…
AaronGullickson Dec 29, 2021
74d1033
Place better restrictions on biographic details in character creation…
AaronGullickson Dec 30, 2021
2798e98
Updates to Young Wolves story arcs
AaronGullickson Dec 31, 2021
1869780
Update initial campaign to give MM settings and give edge to star com…
AaronGullickson Dec 31, 2021
51de607
Update Young Wolves story arc with new OpFor in first mission
AaronGullickson Dec 31, 2021
0e6c1af
Add character images
AaronGullickson Dec 31, 2021
ee12784
Update Young Wolves story arc with Tayyiba convo
AaronGullickson Jan 3, 2022
fe48471
Merge remote-tracking branch 'upstream/master' into story-arcs
AaronGullickson Jan 3, 2022
bfce094
Change startNew variable in StoryArc into a StoryLoadingType enum
AaronGullickson Jan 3, 2022
9049f41
Update test story arc to new format
AaronGullickson Jan 3, 2022
951872a
Fix indenting in Young Wolves storyArc.xml
AaronGullickson Jan 3, 2022
c4cc76b
Add storyLoadingType to test story arc
AaronGullickson Jan 3, 2022
5a8bf61
Fix indenting in Young Wolves storyArc.xml for realsies this time
AaronGullickson Jan 3, 2022
34d1392
Merge remote-tracking branch 'upstream/master' into story-arcs
AaronGullickson Jan 4, 2022
cd604f6
Add Baker 3 scenarios to Young Wolves story arc
AaronGullickson Jan 5, 2022
96823d9
Add post-mission narrative for Baker 3
AaronGullickson Jan 5, 2022
50feb15
Refactor all StoryTrigger classes to include "Story" in their name
AaronGullickson Jan 5, 2022
6037b1a
Add SetDateStoryTrigger class
AaronGullickson Jan 5, 2022
019ca1b
Add hegira/retreat conditions to all scenario descriptions
AaronGullickson Jan 5, 2022
a3112a3
Indent scenario descriptions until I figure out a markdown solution
AaronGullickson Jan 5, 2022
d0d7038
Add pre mission hooks for Denizli mission in Young Wolves story arc
AaronGullickson Jan 7, 2022
9cc153d
Correct first storypoint for Young Wolves story arc
AaronGullickson Jan 8, 2022
210be43
Add scenarios for Denizli
AaronGullickson Jan 8, 2022
43bd0a1
Fix starting story point in Young Wolves arc
AaronGullickson Jan 8, 2022
65dc072
Resolve conflicts
AaronGullickson Jan 9, 2022
6ed6abd
Correct capitalization of map in Hide and Seek scenario
AaronGullickson Jan 9, 2022
20b5173
Use curly brackets rather than @ to designate replacable tokens in st…
AaronGullickson Jan 10, 2022
53214b6
Refactor DateReachedStoryPoint.java as CheckDateReachedStoryPoint.java
AaronGullickson Jan 10, 2022
7703cda
Add CheckMoreScenariosStoryPoint class
AaronGullickson Jan 11, 2022
fdc1626
Add closing story points to Denizli mission
AaronGullickson Jan 11, 2022
46ce57d
Add mission and scenario descriptions to Denizli
AaronGullickson Jan 11, 2022
e9b7376
Add details to twycross scenario for Young Wolves story arc
AaronGullickson Jan 11, 2022
46c77c6
Add shifting wind conditions to Twycross scenario for Young Wolves st…
AaronGullickson Jan 11, 2022
7d1c46f
Merge remote-tracking branch 'upstream/master' into story-arcs
AaronGullickson Jan 18, 2022
3cb9c7a
Finish Blood and Sand scenario and closing hooks for Young Wolves sto…
AaronGullickson Jan 18, 2022
be27a65
Update camo and force icons for Young Wolves story arc
AaronGullickson Jan 18, 2022
49e73ee
Fix save bug in story arcs
AaronGullickson Jan 21, 2022
e7c689f
Fix post mission story transition for Devin in Young Wolves story arc
AaronGullickson Jan 21, 2022
b040fbe
Merge remote-tracking branch 'upstream/master' into story-arcs
AaronGullickson Jan 21, 2022
aa2083d
Add ChangePersonStatusStoryTrigger and related Young Wolves story arc…
AaronGullickson Jan 22, 2022
4a23c01
Add traitor id to trial of refusal scenario in Young Wolves story arc
AaronGullickson Jan 25, 2022
97dc813
Merge remote-tracking branch 'upstream/master' into story-arcs
AaronGullickson Jan 25, 2022
2e11139
Fix some references based on refactoring on master branch
AaronGullickson Jan 25, 2022
b92c8f8
Add scaffolding story points for Trial of Position in Young Wolves st…
AaronGullickson Jan 26, 2022
104a322
Add RollDiceStoryPoint
AaronGullickson Jan 26, 2022
45f0ef8
Merge branch 'master' of https://github.com/MegaMek/mekhq into story-…
AaronGullickson Jan 26, 2022
f578536
Merge branch 'master' of https://github.com/MegaMek/mekhq into story-…
AaronGullickson Jan 26, 2022
0fd8c63
Merge branch 'master' of https://github.com/MegaMek/mekhq into story-…
AaronGullickson Jan 27, 2022
9535513
Add post-Mathius trial narrative to Young Wolves story arc
AaronGullickson Jan 27, 2022
a80c3c1
Change version of young wolves story arc
AaronGullickson Jan 27, 2022
dfc6fdb
Fix bug with personality portraits not loading after save and load in…
AaronGullickson Jan 28, 2022
9b31923
Fix bug with forces assigned to ScenarioStoryPoint not being properly…
AaronGullickson Jan 28, 2022
e6426ae
Move starting story point back to the beginning
AaronGullickson Jan 28, 2022
d02c834
Merge remote-tracking branch 'upstream/master' into story-arcs
AaronGullickson Jan 28, 2022
8bfce78
Replace button group with awt.List for StoryChoiceDialog
AaronGullickson Jan 29, 2022
f047bb1
add back in deployed force to first scenario in Young Wolves story arc
AaronGullickson Jan 29, 2022
95f25f4
Refactor ChangePersonStatusStoryTrigger as ChangePersonStoryTrigger
AaronGullickson Jan 29, 2022
3a3c54b
Add trothkin divided event to Young Wolves story arc
AaronGullickson Jan 29, 2022
7da6318
Return startingStoryPointID to beginning
AaronGullickson Jan 29, 2022
12528e5
Add takeUnit variable to ChangePersonStoryTrigger
AaronGullickson Jan 30, 2022
a4199ac
Add consequences for trothkin trial of grievance
AaronGullickson Jan 30, 2022
d04c216
Add crusader consequents for trothkin trial of grievance
AaronGullickson Jan 30, 2022
6de1011
Pass Version into StoryTrigger and StoryOutcome XML generators
AaronGullickson Jan 30, 2022
d3f3abe
Add AddPersonStoryTrigger and corresponding test case in Young Wolves…
AaronGullickson Jan 30, 2022
9c77162
Fix some errors in Young Wolves XML
AaronGullickson Jan 30, 2022
4a56fe9
Reset starting story point
AaronGullickson Jan 30, 2022
a2c45e2
fix merge conflicts
AaronGullickson Feb 3, 2022
6a78c43
Correct objects for removal of MekHQSerializable
AaronGullickson Feb 4, 2022
26e0d81
Add tab switching story triggers
AaronGullickson Feb 4, 2022
99fa550
Merge branch 'master' of https://github.com/MegaMek/mekhq into story-…
AaronGullickson Feb 4, 2022
0203c3e
Update initial campaign file with some fixes and changed options
AaronGullickson Feb 4, 2022
a1b0f31
Correct issue with created character not being updated in TO&E
AaronGullickson Feb 4, 2022
11d2fcd
Resolve conflicts with last upstream pull
AaronGullickson Apr 25, 2022
19cfc88
Add minor edits to story arc dialogs
AaronGullickson Apr 25, 2022
1f513f5
Use new StartupScreenPanel approach to load Story Arcs
AaronGullickson Apr 25, 2022
980847a
merge conflicts
AaronGullickson Jun 18, 2022
d9b9a4a
Correct errors due to recent changes to MegaMek and MekHQ
AaronGullickson Jun 18, 2022
6e58ced
Avoid NPE when a storyarc.xml fails to parse when loading StoryArcStubs
AaronGullickson Jun 18, 2022
e4a2f95
Remove extra whitespace at the beginning of file preventing parsing
AaronGullickson Jun 18, 2022
bfae03c
Resize images
AaronGullickson Jun 18, 2022
72d88cd
Add correct images for some personalities in Young Wolves story arc
AaronGullickson Jun 18, 2022
a547293
Add setup story points for main Morges scenario
AaronGullickson Jul 27, 2022
906a1d9
Resolve conflicts
AaronGullickson Mar 16, 2024
7df76f1
Fix errors from long hibernation
AaronGullickson Mar 16, 2024
dbc8589
Change starting id to real beginning
AaronGullickson Mar 16, 2024
7acd89c
Change starting point for testing
AaronGullickson Mar 18, 2024
64cabfb
Add parseFromString method to MHQTabType and re-enable tab switching …
AaronGullickson Mar 18, 2024
76aa69d
Add rough draft of save khan scenario
AaronGullickson Mar 19, 2024
c2f12e5
Add Phelan's custom mech
AaronGullickson Mar 20, 2024
8456521
Finalize saving khan scenario
AaronGullickson Mar 20, 2024
9434230
Add choice_phelan_rescue storypoint
AaronGullickson Mar 20, 2024
ad907b7
Add restart method to MekHQ to return to splash screen
AaronGullickson Mar 20, 2024
fccded9
Add GameOverStoryTrigger story trigger
AaronGullickson Mar 20, 2024
a085c56
Add game over check to young wolves arc
AaronGullickson Mar 20, 2024
6f0b857
Merge pull request #14 from AaronGullickson/game-over
AaronGullickson Mar 20, 2024
0c113de
Shrink splash image sizes
AaronGullickson Mar 20, 2024
8e22a48
Merge branch 'story-arcs' into warden-ending
AaronGullickson Mar 20, 2024
b18cd1a
Merge branch 'story-arcs' of https://github.com/AaronGullickson/mekhq…
AaronGullickson Mar 20, 2024
4904528
Merge branch 'story-arcs' into warden-ending
AaronGullickson Mar 20, 2024
738654a
Add next storypoint for save phelan scenario; add to scenario descrip…
AaronGullickson Mar 20, 2024
9c2e293
Update young wolves campagin to uncheck exclusive deployment zones
AaronGullickson Mar 20, 2024
8573d66
Add destroy convoy scenario
AaronGullickson Mar 20, 2024
3d5b622
Add game over trigger to narr_trail_game_over Narrative Story Point
AaronGullickson Mar 21, 2024
cdb68a3
Add bloodname variable to young wolves arc
AaronGullickson Mar 21, 2024
cd0b412
Change string variable keys to camel case for easier token lookup
AaronGullickson Mar 21, 2024
b09e78b
Add tokens for string variable keys
AaronGullickson Mar 21, 2024
f46ed72
Merge branch 'story-arcs' into warden-ending
AaronGullickson Mar 21, 2024
c72517a
Add natasha bloodname dialogue
AaronGullickson Mar 21, 2024
e861382
Fix bug when initializing non-existent directories in a story arc
AaronGullickson Mar 21, 2024
a96a140
Merge branch 'story-arcs' into warden-ending
AaronGullickson Mar 21, 2024
cafd60a
Add post destroy convoy narrative up to bloodname decision
AaronGullickson Mar 21, 2024
c1a38e7
Add Tayyiba final conversation
AaronGullickson Mar 21, 2024
1152d86
Add first scenario and skeleton for trial of bloodright
AaronGullickson Mar 21, 2024
76936d9
Add all trial of bloodright scenarios
AaronGullickson Mar 21, 2024
97e4d7c
Add ability to change bloodname to ChangePersonStoryTrigger
AaronGullickson Mar 21, 2024
99e9d57
Add ability to change rank to ChangePersonStoryTrigger
AaronGullickson Mar 21, 2024
eeec0f7
Add phelan bloodname success-failure talk
AaronGullickson Mar 21, 2024
f8b80c1
Correct errors in bloodname trial
AaronGullickson Mar 21, 2024
c0b0b69
Add additional congrats narratives for bloodname
AaronGullickson Mar 21, 2024
b094c9b
Add final warden wolf ceremony
AaronGullickson Mar 22, 2024
7f0bfce
Merge pull request #5 from AaronGullickson/warden-ending
AaronGullickson Mar 22, 2024
2b1620e
Change starting point back to real one
AaronGullickson Mar 22, 2024
309d25f
Add new portraits to campaign file
AaronGullickson Mar 22, 2024
b8f0c4a
Add story arc files to stageFiles gradle task
AaronGullickson Mar 22, 2024
91dec7c
Fix bug: conversation response pointing to wrong narrativeStoryPoint …
AaronGullickson Mar 22, 2024
77c3199
Add narrative lead up to Wotan mission for young wolves story arc
AaronGullickson Mar 22, 2024
681056d
Add first Vlad interaction at Butler to young wolves story arc
AaronGullickson Mar 22, 2024
5aa70bd
Add first wotan scenario for young wolves story arc
AaronGullickson Mar 22, 2024
273a680
Allow botForce to deploy on a given round
AaronGullickson Mar 23, 2024
3cc4240
Add final wotan scenario for young wolves story arc
AaronGullickson Mar 23, 2024
45378eb
Add post-wotan mission narrative up to medbay for young wolves story arc
AaronGullickson Mar 23, 2024
a0beab6
Add RemoveUnitStoryTrigger class
AaronGullickson Mar 23, 2024
aa3fdae
Add temporary Vandervahn Chistu image for young wolves story arc
AaronGullickson Mar 23, 2024
b7b88d9
Add remove units story trigger to young wolves story arc
AaronGullickson Mar 23, 2024
e43e911
Add AvanceTimeStoryTrigger class
AaronGullickson Mar 23, 2024
4bca263
Add post Wotan dialog up to trial for young wolves arc
AaronGullickson Mar 24, 2024
94c8be5
Add AddUnitStoryTrigger class
AaronGullickson Mar 24, 2024
fc8aedf
Add chistu trial of refusal to young wolves arc
AaronGullickson Mar 24, 2024
ee12198
Add post Trial of Refusal narrative up to final ceremony for young wo…
AaronGullickson Mar 24, 2024
4d7f7f5
Add story arc token for command name without rank
AaronGullickson Mar 24, 2024
f36ee58
Finish narrative to end of crusader branch.
AaronGullickson Mar 24, 2024
3f2975f
Refactor CheckPersonActiveStoryPoint to CheckPersonStatusStoryPoint
AaronGullickson Mar 24, 2024
82d0f59
Amend previous
AaronGullickson Mar 24, 2024
999554a
Add mathius dialog on waking up in medbay for young wolves story arc
AaronGullickson Mar 24, 2024
d581f8e
Merge pull request #17 from AaronGullickson/crusader-ending
AaronGullickson Mar 24, 2024
31c7e41
Add WaitStoryPoint class
AaronGullickson Mar 24, 2024
3a0464a
Set starting point back to real one for young wolves arc
AaronGullickson Mar 24, 2024
245abc3
Reduce starting XP for main character in young wolves story arc
AaronGullickson Mar 24, 2024
e364d2c
Update some settings on initial campaign for young wolves story arc
AaronGullickson Mar 24, 2024
59d79af
Add option to limit created character home planet by faction
AaronGullickson Mar 24, 2024
c4f255d
Unregister story arc handler when loading a different campaign
AaronGullickson Mar 24, 2024
f9fe75c
Merge branch 'master' into story-arcs
AaronGullickson Mar 24, 2024
05c01a7
Fix Tobias image not showing up
AaronGullickson Mar 25, 2024
3cdf2d0
Fix bug: deployment round not respected
AaronGullickson Mar 25, 2024
3630510
Edit various bits of text for improvement
AaronGullickson Mar 25, 2024
44962cc
Add Louisa conversation about how travel works to young wolves story arc
AaronGullickson Mar 25, 2024
44abcc7
Fix repair bay tab switch in young wolves story arc
AaronGullickson Mar 25, 2024
ecef844
Update larine speech
AaronGullickson Mar 25, 2024
db915b4
Add doctor personality and doctor speech
AaronGullickson Mar 25, 2024
ff3a83e
Add tech larine tutorial about how to assign units to young wolves st…
AaronGullickson Mar 25, 2024
e433fa8
Correct staring point young wolves arc
AaronGullickson Mar 25, 2024
37529ac
Add natasha comment about bondsmen to young wolves story arc
AaronGullickson Mar 25, 2024
8bb7fe7
Improve mission descriptions for young wolves story arc
AaronGullickson Mar 25, 2024
98ae373
Fix concurrency issue with WaitStoryPoint
AaronGullickson Mar 25, 2024
17becfe
Merge branch 'master' into story-arcs
AaronGullickson Mar 26, 2024
6efefff
Reset starting point for young wolves story arc
AaronGullickson Mar 26, 2024
2fe6c45
Reformat xml of young wolf story arc
AaronGullickson Mar 29, 2024
b06f4d6
add beta testing welcome
AaronGullickson Mar 29, 2024
998045e
Update young wolf story arc overview to provide credits
AaronGullickson Mar 29, 2024
b715491
Make type of xml node show on first line in young wolves arc for read…
AaronGullickson Mar 29, 2024
fd1407f
Fix map size for colmar scenario in young wolves story arc
AaronGullickson Mar 29, 2024
107e5c5
Fix Bug: Bot BV, unit count increased when loading from a saved file
AaronGullickson Mar 29, 2024
ba45d13
Update initial equipment for young wolves story arc
AaronGullickson Mar 29, 2024
49dea3c
Reset caret to top for NarrativeStoryDialog
AaronGullickson Mar 29, 2024
f151886
Change young wolves story arc to v0.2
AaronGullickson Mar 29, 2024
5f58b87
Bug: First Mathius check in young wolves story arc goes to the same p…
AaronGullickson Mar 29, 2024
1782a53
Set date on scenarios from ScenarioStoryPoint to today
AaronGullickson Mar 29, 2024
a337942
Add clanperson to all opfor units in young wolves story arc
AaronGullickson Mar 30, 2024
68047cd
Split trothkin fight into multiple panels in young wolves story arc
AaronGullickson Mar 30, 2024
a2e9efe
Reduce difficulty of Into the Storm scenario in young wolves story arc
AaronGullickson Mar 31, 2024
44c77cd
Change hits to addHits and healHits in ChangePersonStoryTrigger
AaronGullickson Apr 1, 2024
eaffa20
Fix bug with mission resolution in young wolves arc
AaronGullickson Apr 1, 2024
9195bd9
Make spelling and grammatial corrections to young wolves arc
AaronGullickson Apr 1, 2024
390f146
Add EndArcStoryTrigger
AaronGullickson Apr 1, 2024
e96a0ae
Fix bug by capitalizing board directory name in young wolves arc
AaronGullickson Apr 1, 2024
f88910f
Update bot settings
AaronGullickson Apr 1, 2024
4d1c250
Merge branch 'master' into story-arcs
AaronGullickson Apr 1, 2024
f5bf24e
Add narrative to start of young wolves arc explaining rules details
AaronGullickson Apr 2, 2024
6489ac4
Reduce Cutting Teeth scenario to star for young wolves story arc
AaronGullickson Apr 2, 2024
b3aa4c5
Merge branch 'master' into story-arcs
AaronGullickson Apr 3, 2024
cb3b885
Updage campaign and game options for young wolves arc
AaronGullickson Apr 3, 2024
3ea4ba2
Allow scenario date to be set as certain days ahead
AaronGullickson Apr 3, 2024
3b2e42d
Merge branch 'master' into story-arcs
AaronGullickson Apr 3, 2024
b49bae5
Remove Vulture D from young wolves story arc because not introduced yet
AaronGullickson Apr 3, 2024
19f786a
Add omnipod equipment to warehouse, young wolves arc
AaronGullickson Apr 3, 2024
53566ed
Make slight change to young wolves description about single blind play
AaronGullickson Apr 3, 2024
ad35f7f
Merge branch 'master' into story-arcs
AaronGullickson Apr 3, 2024
4293efe
Update young wolves arc versioning
AaronGullickson Apr 3, 2024
afb9f94
Add new crichell and chistu portraits
AaronGullickson Apr 4, 2024
3370fe2
Trigger ScenarioResolvedEvent before stopping game thread to avoid NPE
AaronGullickson Apr 5, 2024
f22b749
Update young wolves campaign; remove NTT quirk, adjust XP for kills, …
AaronGullickson Apr 5, 2024
8409bf3
Make small grammatical correction in young wolves arc
AaronGullickson Apr 5, 2024
f8d06ed
Fix conflicts
AaronGullickson Apr 7, 2024
369b01b
Fix indentation
AaronGullickson Apr 7, 2024
d2819fe
Add empty line
AaronGullickson Apr 7, 2024
6907776
Add extra empty line added to scenario
AaronGullickson Apr 7, 2024
d5081d3
Check starting point of story arc for being null when starting
AaronGullickson Apr 8, 2024
7f48978
Replace Map.Entry with Entry in StoryArc
AaronGullickson Apr 8, 2024
959e3dd
Update javadoc for story arcs
AaronGullickson Apr 8, 2024
73d7ee3
Make a variety of small changes to story arc code as suggested by int…
AaronGullickson Apr 8, 2024
852a354
Make various small changes to new gui elements for story arcs as reco…
AaronGullickson Apr 8, 2024
5546989
Revert gitignore
AaronGullickson Apr 8, 2024
5b2373d
Correct XML recording of personnel status
AaronGullickson Apr 8, 2024
4cdfb01
Add toString method to StoryArcStub for proper sorting
AaronGullickson Apr 8, 2024
628cede
Made spellchecks to young wolves arc
AaronGullickson Apr 9, 2024
0068adb
Change word choice in young wolves arc
AaronGullickson Apr 9, 2024
8d46341
Fix saving wrong variable to xml
AaronGullickson Apr 9, 2024
1b98bd4
Remove accidental save file
AaronGullickson Apr 9, 2024
4997596
Correct spelling of remembrance
AaronGullickson Apr 9, 2024
212bbe1
Fix conflict
AaronGullickson Apr 10, 2024
9d6f1b1
Add missing word to young wolves arc narrative
AaronGullickson Apr 10, 2024
75bd696
Add space
AaronGullickson Apr 10, 2024
5768b6a
Make updates to young wolves starting campaign
AaronGullickson Apr 10, 2024
ff713d5
StoryTriggers in wrong place in young wolves arc
AaronGullickson Apr 10, 2024
99c7d04
Update camo xml for young wolves arc
AaronGullickson Apr 10, 2024
92a5ad0
Remove out of date comment
AaronGullickson Apr 14, 2024
8904aae
Change one line getter/setter methods to three lines
AaronGullickson Apr 14, 2024
83dadf4
Correct scenario objective description with correct percent
AaronGullickson Apr 14, 2024
de296a1
Fix conflict
AaronGullickson Apr 14, 2024
9a93a5c
Remove empty line
AaronGullickson Apr 14, 2024
97c9223
Add StoryChoicePanel (WIP)
AaronGullickson Apr 16, 2024
373dd52
Replace JTextPane with JLael in StoryChoicePanel
AaronGullickson Apr 17, 2024
18f6905
Merge branch 'master' into story-arcs
AaronGullickson Apr 17, 2024
8669d6d
Edit a few parts of young wolves arc for grammar/spelling
AaronGullickson Apr 19, 2024
183d823
Fix bug with wrong variable assigned in XML
AaronGullickson Apr 19, 2024
179e75b
Use ammo by type in young wolves campaign
AaronGullickson Apr 22, 2024
2c05f51
Adjust XP for tactics in young wolves arc
AaronGullickson Apr 22, 2024
8b25116
Add hegira/retreat conditions to trials in young wolves arc
AaronGullickson Apr 22, 2024
d7a0e6b
Merge branch 'master' into story-arcs
AaronGullickson Apr 22, 2024
e0977d5
Change XP on switching comboboxes in CreateCharacterDialog
AaronGullickson Apr 22, 2024
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
2 changes: 2 additions & 0 deletions MekHQ/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,13 @@ task stageFiles(type: Copy) {
include "${data}/images/misc/"
include "${data}/images/stratcon/"
include "${data}/images/universe/"
include "${data}/images/storysplash/"
include "${data}/scenariomodifiers/"
include "${data}/scenariotemplates/"
include "${data}/stratconbiomedefinitions/"
include "${data}/stratconcontractdefinitions/"
include "${data}/stratconfacilities/"
include "${data}/storyarcs/"
include "${data}/terrainconditionsodds/"
include "${docs}/**"
include "${mmconf}/**"
Expand Down
Binary file added MekHQ/data/images/storysplash/splash-convoy.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MekHQ/data/images/storysplash/splash-fight.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MekHQ/data/images/storysplash/splash-guard.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MekHQ/data/images/storysplash/splash-liftoff.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MekHQ/data/images/storysplash/splash-mechbay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MekHQ/data/images/storysplash/splash-repairs.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MekHQ/data/images/storysplash/splash-rescue.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MekHQ/data/storyarcs/test/initCampaign.cpnx.gz
Binary file not shown.
181 changes: 181 additions & 0 deletions MekHQ/data/storyarcs/test/storyArc.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
<?xml version="1.0" encoding="UTF-8"?>
<storyArc version="0.49.6-SNAPSHOT">
<title>A Test Campaign</title>
<details>Just for testing</details>
<description>This campaign is used for testing out features.</description>
<storyLoadingType>START_NEW</storyLoadingType>
<startingPointId>10700728-5c5b-11ec-bf63-0242ac130002</startingPointId>
<storyPoints>
<storyPoint name="creat_char" type="mekhq.campaign.storyarc.storypoint.CreateCharacterStoryPoint">
<id>9b068c99-c2ef-4a35-b59b-b923f4ddbdce</id>
<xpPool>25</xpPool>
<rank>34</rank>
<firstname>Harry</firstname>
<bloodname>Christu</bloodname>
<age>35</age>
<clan>true</clan>
<phenotype>MECHWARRIOR</phenotype>
<primaryRole>MECHWARRIOR</primaryRole>
<nextStoryPointId>10700728-5c5b-11ec-bf63-0242ac130002</nextStoryPointId>
</storyPoint>
<storyPoint name="date_reached" type="mekhq.campaign.storyarc.storypoint.CheckDateReachedStoryPoint">
<id>d01587c6-5473-4d62-ba2e-9a015368db40</id>
<date>3071-05-15</date>
<nextStoryPointId>dedcb5e7-dc7d-40d1-b45e-b97002c60334</nextStoryPointId>
</storyPoint>
<storyPoint name="travel_acamar" type="mekhq.campaign.storyarc.storypoint.TravelStoryPoint">
<id>6116e791-ea40-4435-8f45-e2c696f4da2b</id>
<destinationId>Acamar</destinationId>
<nextStoryPointId>10700728-5c5b-11ec-bf63-0242ac130002</nextStoryPointId>
</storyPoint>
<storyPoint name="narr_welcome" type="mekhq.campaign.storyarc.storypoint.NarrativeStoryPoint">
<id>10700728-5c5b-11ec-bf63-0242ac130002</id>
<title>A Test Story Arc</title>
<narrative>Welcome to the test *story arc*! Check out the **briefing tab** to see what missions and scenarios are available. Have fun!</narrative>
<personalityId>057e8ef4-5c59-11ec-bf63-0242ac130002</personalityId>
<storyTrigger type="mekhq.campaign.storyarc.storytrigger.SetDateStoryTrigger">
<storyPointId>d01587c6-5473-4d62-ba2e-9a015368db40</storyPointId>
<futureDays>5</futureDays>
</storyTrigger>
<nextStoryPointId>35b5b068-5946-11ec-bf63-0242ac130002</nextStoryPointId>
</storyPoint>
<storyPoint name="narr_mission_complete" type="mekhq.campaign.storyarc.storypoint.NarrativeStoryPoint">
<id>500511f2-5b8f-11ec-bf63-0242ac130002</id>
<title>First mission complete!</title>
<narrative>Congratulations on completing your first mission!</narrative>
<nextStoryPointId>3491b950-5bcd-11ec-bf63-0242ac130002</nextStoryPointId>
<StorySplash>
<category></category>
<filename>splash-guardduty.png</filename>
</StorySplash>
</storyPoint>
<storyPoint name="narr_date_reached" type="mekhq.campaign.storyarc.storypoint.NarrativeStoryPoint">
<id>dedcb5e7-dc7d-40d1-b45e-b97002c60334</id>
<title>Date reached</title>
<narrative>Its May 15th, 3071. Just thought you should know. Its probably a holiday somewhere.</narrative>
<StorySplash>
<category></category>
<filename>splash-guardduty.png</filename>
</StorySplash>
</storyPoint>
<storyPoint name="choice_what_next" type="mekhq.campaign.storyarc.storypoint.ChoiceStoryPoint">
<id>3491b950-5bcd-11ec-bf63-0242ac130002</id>
<title>What Next?</title>
<question>Which mission would you like to go on now?</question>
<choice id="mission2">Mission 2</choice>
<choice id="mission3">Mission 3</choice>
<personalityId>9adeb0c8-69d0-4206-b455-bcca43144df3</personalityId>
<storyOutcomes>
<storyOutcome result="mission2">
<nextStoryPointId>bf41db33-2683-459f-855b-0632eedb807e</nextStoryPointId>
</storyOutcome>
<storyOutcome result="mission3">
<nextStoryPointId>d7617c74-5bcd-11ec-bf63-0242ac130002</nextStoryPointId>
</storyOutcome>
</storyOutcomes>
</storyPoint>
<storyPoint name="mission_first" type="mekhq.campaign.storyarc.storypoint.MissionStoryPoint">
<id>35b5b068-5946-11ec-bf63-0242ac130002</id>
<mission type="mekhq.campaign.mission.Mission">
<name>First Mission</name>
<type>Planetary Assault</type>
<systemId>Terra</systemId>
<desc>If everything is working correctly, you should see this mission loaded when you begin the story arc.</desc>
</mission>
<scenarioStoryPointId>5a333f88-597c-11ec-bf63-0242ac130002</scenarioStoryPointId>
<nextStoryPointId>500511f2-5b8f-11ec-bf63-0242ac130002</nextStoryPointId>
</storyPoint>
<storyPoint name="mission_second" type="mekhq.campaign.storyarc.storypoint.MissionStoryPoint">
<id>bf41db33-2683-459f-855b-0632eedb807e</id>
<mission type="mekhq.campaign.mission.Mission">
<name>Second Mission</name>
<type>Objective Raid</type>
<systemId>Terra</systemId>
<desc>If everything is working correctly, you should see this mission once you select it from the choice dialog. There is nothing more at this point.</desc>
</mission>
</storyPoint>
<storyPoint name="mission_third" type="mekhq.campaign.storyarc.storypoint.MissionStoryPoint">
<id>d7617c74-5bcd-11ec-bf63-0242ac130002</id>
<mission type="mekhq.campaign.mission.Mission">
<name>Third Mission</name>
<type>Riot Duty</type>
<systemId>Hall</systemId>
<desc>If everything is working correctly, you should see this mission once once you select it from the choice dialog. There is nothing more at this point.</desc>
</mission>
</storyPoint>
<storyPoint name="scenario_initial" type="mekhq.campaign.storyarc.storypoint.ScenarioStoryPoint">
<id>5a333f88-597c-11ec-bf63-0242ac130002</id>
<missionStoryPointId>35b5b068-5946-11ec-bf63-0242ac130002</missionStoryPointId>
<nextStoryPointId>dbb7357c-59cd-11ec-bf63-0242ac130002</nextStoryPointId>
<storyOutcomes>
<storyOutcome result="PYRRHIC_VICTORY">
<nextStoryPointId>0d96f227-6c97-4cb1-ade5-578b2386c1a5</nextStoryPointId>
</storyOutcome>
</storyOutcomes>
<scenario type="mekhq.campaign.mission.Scenario">
<name>Initial Scenario</name>
<desc>If everything is working correctly, you should see this scenario as part of First mission when you begin the story arc. To see what happens next, try out the scenario and then select Victory or Defeat.</desc>
</scenario>
</storyPoint>
<storyPoint name="scenario_victory" type="mekhq.campaign.storyarc.storypoint.ScenarioStoryPoint">
<id>0d96f227-6c97-4cb1-ade5-578b2386c1a5</id>
<missionStoryPointId>35b5b068-5946-11ec-bf63-0242ac130002</missionStoryPointId>
<nextStoryPointId>f6d7cc16-5afb-11ec-bf63-0242ac130002</nextStoryPointId>
<storyOutcomes>
<storyOutcome result="PYRRHIC_VICTORY">
<storyTrigger type="mekhq.campaign.storyarc.storytrigger.CompleteMissionStoryTrigger">
<missionStoryPointId>35b5b068-5946-11ec-bf63-0242ac130002</missionStoryPointId>
<missionStatus>SUCCESS</missionStatus>
</storyTrigger>
</storyOutcome>
</storyOutcomes>
<scenario type="mekhq.campaign.mission.Scenario">
<name>Victory Scenario</name>
<desc>If everything is working correctly, this scenario should be added to First mission when you are victorious in the initial scenario. Being victorious in this scenario should complete First Mission.</desc>
</scenario>
</storyPoint>
<storyPoint name="scenario_defeat" type="mekhq.campaign.storyarc.storypoint.ScenarioStoryPoint">
<id>dbb7357c-59cd-11ec-bf63-0242ac130002</id>
<missionStoryPointId>35b5b068-5946-11ec-bf63-0242ac130002</missionStoryPointId>
<nextStoryPointId>f6d7cc16-5afb-11ec-bf63-0242ac130002</nextStoryPointId>
<storyOutcomes>
<storyOutcome result="PYRRHIC_VICTORY">
<storyTrigger type="mekhq.campaign.storyarc.storytrigger.CompleteMissionStoryTrigger">
<missionStoryPointId>35b5b068-5946-11ec-bf63-0242ac130002</missionStoryPointId>
<missionStatus>SUCCESS</missionStatus>
</storyTrigger>
</storyOutcome>
</storyOutcomes>
<scenario type="mekhq.campaign.mission.Scenario">
<name>Defeat Scenario</name>
<desc>If everything is working correctly, this scenario should be added to First mission when you are defeated in the initial scenario. Being victorious in this scenario should complete First mission.</desc>
</scenario>
</storyPoint>
<storyPoint name="scenario_last_try" type="mekhq.campaign.storyarc.storypoint.ScenarioStoryPoint">
<id>f6d7cc16-5afb-11ec-bf63-0242ac130002</id>
<missionStoryPointId>35b5b068-5946-11ec-bf63-0242ac130002</missionStoryPointId>
<storyTrigger type="mekhq.campaign.storyarc.storytrigger.CompleteMissionStoryTrigger">
<missionStoryPointId>35b5b068-5946-11ec-bf63-0242ac130002</missionStoryPointId>
<missionStatus>SUCCESS</missionStatus>
</storyTrigger>
<scenario type="mekhq.campaign.mission.Scenario">
<name>Last Try Scenario</name>
<desc>If everything is working correctly, this scenario should be added to First mission if you are defeated in your second scenario. Completing it should finish First Mission.</desc>
</scenario>
</storyPoint>
</storyPoints>
<personalities>
<personality name="personality_helperpants">
<id>057e8ef4-5c59-11ec-bf63-0242ac130002</id>
<title>Captain Helperpants</title>
<portrait>
<category>Female/Admin/Command</category>
<filename>Adm_Com_F_2.png</filename>
</portrait>
</personality>
<personality name="personality_somebody">
<id>9adeb0c8-69d0-4206-b455-bcca43144df3</id>
<personCampaignId>590dcabe-e9d9-43ec-8e24-0c3651f1a28c</personCampaignId>
</personality>
</personalities>
</storyArc>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
170 changes: 170 additions & 0 deletions MekHQ/data/storyarcs/young_wolves/data/mechfiles/Black Hawk Phelan.mtf
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
generator:MegaMek Suite 0.49.18 on 2024-03-19
chassis:Black Hawk
clanname:Nova
model:Phelan

Config:Biped Omnimech
techbase:Clan
era:2870
rules level:2
role:Skirmisher

quirk:combat_computer
quirk:low_profile

mass:50
engine:250 XL (Clan) Engine(IS)
structure:IS Standard
myomer:Standard

heat sinks:18 Clan Double
base chassis heat sinks:10
walk mp:5
jump mp:5

armor:Standard(Inner Sphere)
LA armor:16
RA armor:16
LT armor:16
RT armor:16
CT armor:23
HD armor:9
LL armor:20
RL armor:20
RTL armor:8
RTR armor:8
RTC armor:8

Weapons:6
Medium Pulse Laser, Left Arm
Medium Pulse Laser, Left Arm
Medium Pulse Laser, Left Arm
Medium Pulse Laser, Right Arm
Medium Pulse Laser, Right Arm
Medium Pulse Laser, Right Arm

Left Arm:
Shoulder
Upper Arm Actuator
Lower Arm Actuator
Hand Actuator
CLDoubleHeatSink (OMNIPOD)
CLDoubleHeatSink (OMNIPOD)
CLMediumPulseLaser (OMNIPOD)
CLMediumPulseLaser (OMNIPOD)
CLMediumPulseLaser (OMNIPOD)
-Empty-
-Empty-
-Empty-

Right Arm:
Shoulder
Upper Arm Actuator
Lower Arm Actuator
Hand Actuator
CLDoubleHeatSink (OMNIPOD)
CLDoubleHeatSink (OMNIPOD)
CLMediumPulseLaser (OMNIPOD)
CLMediumPulseLaser (OMNIPOD)
CLMediumPulseLaser (OMNIPOD)
-Empty-
-Empty-
-Empty-

Left Torso:
Fusion Engine
Fusion Engine
CLDoubleHeatSink
CLDoubleHeatSink
CLDoubleHeatSink
CLDoubleHeatSink
CLDoubleHeatSink (OMNIPOD)
CLDoubleHeatSink (OMNIPOD)
-Empty-
-Empty-
-Empty-
-Empty-

Right Torso:
Fusion Engine
Fusion Engine
CLDoubleHeatSink
CLDoubleHeatSink
CLDoubleHeatSink
CLDoubleHeatSink
CLDoubleHeatSink (OMNIPOD)
CLDoubleHeatSink (OMNIPOD)
-Empty-
-Empty-
-Empty-
-Empty-

Center Torso:
Fusion Engine
Fusion Engine
Fusion Engine
Gyro
Gyro
Gyro
Gyro
Fusion Engine
Fusion Engine
Fusion Engine
Jump Jet
-Empty-

Head:
Life Support
Sensors
Cockpit
-Empty-
Sensors
Life Support
-Empty-
-Empty-
-Empty-
-Empty-
-Empty-
-Empty-

Left Leg:
Hip
Upper Leg Actuator
Lower Leg Actuator
Foot Actuator
Jump Jet
Jump Jet
-Empty-
-Empty-
-Empty-
-Empty-
-Empty-
-Empty-

Right Leg:
Hip
Upper Leg Actuator
Lower Leg Actuator
Foot Actuator
Jump Jet
Jump Jet
-Empty-
-Empty-
-Empty-
-Empty-
-Empty-
-Empty-

overview:The Nova is a versatile medium OmniMech that is capable of acting as a workhorse design in most forces. In fact, the design is so well balanced that it inspired the creation of the Black Hawk-KU, an Inner Sphere design based on the Nova and named using the Inner Sphere code name for this 'Mech: Black Hawk.
capabilities:Equipped with a 250 XL Model SF-2 Fusion Engine, the Nova has a ground speed of 86.4 km/h that allows it to keep up with most heavy and assault 'Mechs while being outpaced by most lighter 'Mechs. However, the Nova remains very maneuverable through the use of five jump jets, allowing the Nova to jump up to 150 meters. The fourteen double heat sinks that the Nova mounts are barely sufficient to handle its heavy heat load of its variants. The Nova is also protected by ten tons of armor, providing the 'Mech with ninety-six percent of its maximum armor protection.
deployment:In its primary configuration the Nova is a devastating close combat 'Mech and battle armor killer that is capable of delivering a powerful barrage with its twelve ER Medium Lasers. To help it use these as effectively as possible, the Nova has added four more double heat sinks bringing the total up to eighteen. Even with the added double heat sinks, the Nova prime is capable of producing almost twice as much heat as it can dissipate.
history:The Black Hawk's debut battle was the combined assault on Kindraa Smythe-Jewel on Foster in 2872 launched by the Hell's Horses, Clan Coyote and Kindraa Payne that saw the Smythe-Jewels wiped out as a faction. However, the number of Novas has been diminishing. Only spare parts have been in production since 2921. Designed as an early OmniMech by Clan Hell's Horses, the Nova was produced at the famous Tokasha Mechworks beginning in 2870. At the time of its introduction, the Nova was designed for infantry support, and was the first OmniMech designed with hardpoints allowing Elementals to easily mount and dismount the chassis. However, after Tokasha was taken by Clan Ghost Bear during the Battle of Tokasha, production of the Nova ceased. Since 2921, every Clan has acquired Nova OmniMechs as isorla. Although the last Nova factory was replaced to create Pouncers, the very few remaining in Clan Space have gotten into the hands of Aggressor Mechwarriors.
manufacturer:Tokasha MechWorks, Olivetti Weaponry
primaryfactory:Tokasha, Sudeten
systemmanufacturer:CHASSIS:Star League XTA
systemmanufacturer:ENGINE:250 XL Model SF-2
systemmanufacturer:ARMOR:Forge Type HH30
systemmanufacturer:JUMPJET:Clan Standard Type A2
systemmanufacturer:COMMUNICATIONS:CH3B
systemmanufacturer:TARGETING:Version Omega-V TTS

Binary file not shown.
Loading
Loading