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

Jump to bottom

Refactor fleet missions' code | Part 13 | Report data aquisition refactor #119

Merged
merged 23 commits into from
May 15, 2020
Merged

Refactor fleet missions' code | Part 13 | Report data aquisition refactor #119

merged 23 commits into from
May 15, 2020

Conversation

mdziekon
Copy link
Owner

@mdziekon mdziekon commented May 15, 2020 •
edited

Summary:

All three possible combat missions (MissionAttack, MissionDestruction & MissionGroupAttack) share almost the same mechanism of combat report data aquisition. This mechanism should be implemented in just one place and shared among them.

Changelog:

  • Move combat report data creation to a helper function
  • Generalise combat participant details initialisation
    • Reuse when generating joined attackers details (GroupAttack only)
    • Reuse when generating main attackers details
  • Fix missing morale_points field fetching for defending fleets
  • Fix missing morale details for joined attackers when they also participate in the defense
  • In ACS, main attacker (the leader) should attack as soon as possible (but still taking into account ship types)

Notes:

  • While working on this, I've noticed that Abandoned planets have no user entry. This is fine for now (as in, no major bugs caused by this), but eventually the "empty user" entry should be filled with default data to at least prevent PHP notices about access to non-existent object.

Related issues or PRs:

@mdziekon mdziekon added pr:enhancement_request All pull requests related to enhancements proposals pr:bugfix All pull requests related to fixing bugs labels May 15, 2020
@mdziekon mdziekon marked this pull request as ready for review May 15, 2020 01:54
@mdziekon
GH-91 Create createCombatReportData() util
d48e6a3
@mdziekon
GH-91 Simplify combat report data creation in MissionCaseAttack
8d7f19f
@mdziekon
GH-91 Simplify combat report data creation in MissionCaseDestruction
566bfce
@mdziekon
GH-91 Simplify combat report data creation in MissionCaseGroupAttack
8e29322
@mdziekon
GH-91 Fix missing morale_points field fetch for defending fleets fetc…
722c387 
…hing query
@mdziekon
GH-91 Modify createCombatReportData() to accept props necessary to ac…
3d09154 
…tually generate users details
@mdziekon
GH-91 Stop generating users details by hand in MissionCaseAttack
cc3e100 
(delegate to createCombatReportData())
@mdziekon
GH-91 Stop generating users details by hand in MissionCaseDestruction
f4d3268 
    (delegate to createCombatReportData())
@mdziekon
GH-91 Stop generating users details by hand in MissionCaseGroupAttack
f9722e6 
        (delegate to createCombatReportData())
@mdziekon
GH-91 Use attacker user ID's alias var
49aade0
@mdziekon
GH-91 Minor stylistic changes in the code
bc758aa
@mdziekon
GH-91 Get fleet owner's ID directly
ea50fe1
@mdziekon
GH-91 Extend morale cache with all the details
05e269b
@mdziekon
GH-91 Properly store attackers morale details when they are also one …
e053c6d 
…of the defenders
@mdziekon
GH-91 Remove unused "userData" property from the result
54be240
@mdziekon
GH-91 Generalize the concept of combat participant details initializer
8f3869f
@mdziekon
GH-91 Use the loadMoraleDataFromCache helper to load morale cached data
a93679e
@mdziekon
GH-91 Simplify joined attackers' details initialization by reusing in…
c984ad9 
…itCombatUserDetails()
@mdziekon
GH-91 Reuse initCombatUserDetails() to get main attacker's details in…
4c6b19d 
… MissionCaseAttack
@mdziekon
GH-91 Reuse initCombatUserDetails() to get main attacker's details in…
c482263 
… MissionCaseDestruction
@mdziekon
GH-91 Reuse initCombatUserDetails() to get main attacker's details in…
622100c 
… MissionCaseGroupAttack
@mdziekon
GH-91 Pass fleetRow as reference to allow morale data modifications a…
c4cbfb0 
…t fleetRow level
@mdziekon
GH-91 Add main attacker's fleet first to the fleets table
8047ba0 
(should be first to attack)
@mdziekon mdziekon force-pushed the mdziekon/91/fleet-mission-attack-refactor-part13 branch from b817d0f to 8047ba0 Compare May 15, 2020 01:55
@mdziekon mdziekon merged commit bc34a62 into master May 15, 2020
@mdziekon mdziekon added this to Done in Basic modernisation via automation May 15, 2020
@mdziekon mdziekon mentioned this pull request May 15, 2020
Open
@mdziekon mdziekon deleted the mdziekon/91/fleet-mission-attack-refactor-part13 branch May 15, 2020 01:59
@mdziekon mdziekon removed this from Done in Basic modernisation Apr 8, 2022
@mdziekon mdziekon added this to In progress in Flight Control refactor via automation Apr 8, 2022
@mdziekon mdziekon moved this from In progress to Done in Flight Control refactor Apr 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
pr:bugfix All pull requests related to fixing bugs pr:enhancement_request All pull requests related to enhancements proposals
Projects
Flight Control refactor
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@mdziekon