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

Mission log entries and counter for personnel #1077

Merged
merged 12 commits into from
Feb 23, 2019

Conversation

VicenteCartas
Copy link
Collaborator

  • Fixes Mekhq Adds # of missions partipated in counter #112 .
  • Fixes bug when adding a single kill would not refresh the person view.
  • Adds Log/Missions and kills to the Customize person dialog from the GM mode, so everything can be edited from the same screen. Both Dialogs and Customize use the same "control" to do their add/edit/delete operations.
  • Fixes minor text issues in some of the Log/Mission/Kill dialogs.

Done:
- Added new dialogs to add/edit missions.
- Added new dialog to manage the mission log.
- Modified PersonView to show mission information if it's present.
- Save/Load mission logs when saving/loading person.

Still missing:
- Refresh PersonView when adding/removing missions (and kills).
- Allow to edit all logs from the GM view.
- Add missions when resolving scenarios (research how kills work).
Refactors Add/Edit/Delete dialogs for Logs/Missions/Kills into a control that is used from the regular dialog and from the Customize dialog.
Use ServiceLogEntry instead of MissionLogEntry.
@VicenteCartas
Copy link
Collaborator Author

main
multiselect
editor
gmmode

Adding screenshots to show how the UI looks after the change.

Copy link
Collaborator

@sixlettervariables sixlettervariables left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just a few changes and some questions.

MekHQ/src/mekhq/campaign/personnel/Person.java Outdated Show resolved Hide resolved
MekHQ/src/mekhq/campaign/personnel/Person.java Outdated Show resolved Hide resolved
MekHQ/src/mekhq/campaign/personnel/Person.java Outdated Show resolved Hide resolved
MekHQ/src/mekhq/campaign/personnel/Person.java Outdated Show resolved Hide resolved
MekHQ/src/mekhq/gui/dialog/EditMissionsLogDialog.java Outdated Show resolved Hide resolved
MekHQ/src/mekhq/gui/model/KillTableModel.java Outdated Show resolved Hide resolved
MekHQ/src/mekhq/gui/model/KillTableModel.java Outdated Show resolved Hide resolved
MekHQ/src/mekhq/gui/model/LogTableModel.java Outdated Show resolved Hide resolved
MekHQ/src/mekhq/gui/model/LogTableModel.java Outdated Show resolved Hide resolved
Addressing PR feedback.
@sixlettervariables
Copy link
Collaborator

I need to open a few of the test campaigns I have from folks before merging this in.

@VicenteCartas
Copy link
Collaborator Author

Perfect! If you want me to do the testing feel free to send me the campaign files and I'll test them.

Old campaign files (previous to 0.45.4) will be updated to split the missions out of the personnel log into the missions log.
Cleaning version.java
More cleaning in Version.java.
Update Version.java to follow Java standards for comparables.
MekHQ/src/mekhq/Version.java Outdated Show resolved Hide resolved
PR feedback.
@sixlettervariables sixlettervariables merged commit e09a87b into MegaMek:master Feb 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants