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

improved dialog companion mission UI #55746

Merged

Conversation

PatrikLundell
Copy link
Contributor

Summary

None

Purpose of change

  • Improve the UI of the (primarily) Tacoma companion missions.
  • Fix the caravan missions to return all members.

Describe the solution

Some UI string changes, keep track of whether companions are ready to be returned and indicate that in the UI.
Move the random time factor for companions joining a caravan to the caravan level rather than the individual level, resulting in the check for the companions having the same timers actually working.

Describe alternatives you've considered

Leave if for someone else, but I said I'd do it...

Testing

Using a bunch of conveniently retained saves to verify that the changes actually worked as intended, with the greying out of an entry if no companions are available for return and priority marking (yellow) if any of them is available. Checked that the caravan change had two companions sent off on a caravan together return together when one of them was returned.

Additional context

@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Feb 28, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 28, 2022
@PatrikLundell
Copy link
Contributor Author

"General build matrix / GCC 11, Ubuntu cross-compile to MinGW-Win64, Tiles, Sound (pull_request) Failing after 13m — GCC 11, Ubuntu cross-compile to MinGW-Win64, Tiles, Sound" test failure has nothing to do with the PR changes:

(~[slow] [.],starting_items)=> cata_test.exe is a Catch v2.13.7 host application.
(
[slow] [.],starting_items)=> Run with -? for options
(
[slow] [.],starting_items)=>
(
[slow] [.],starting_items)=> Randomness seeded to: 1646052801
(
[slow] [.],starting_items)=>
(
[slow] [.],starting_items)=> -------------------------------------------------------------------------------
(
[slow] [.],starting_items)=> monster_throwing_sanity_test
(
[slow] [.],starting_items)=> -------------------------------------------------------------------------------
(
[slow] [.],starting_items)=> ../tests/monster_attack_test.cpp:176
(
[slow] [.],starting_items)=> ...............................................................................
(
[slow] [.],starting_items)=>
(
[slow] [.],starting_items)=> ../tests/monster_attack_test.cpp:230: FAILED:
(
[slow] [.],starting_items)=> CHECK( damage_dealt.test_threshold( epsilon_threshold{ expected_damage, 2.5 } ) )
(
[slow] [.],starting_items)=> with expansion:
Error: (
[slow] ~[.],starting_items)=> false

@Maleclypse Maleclypse added Missions Quests and missions NPC / Factions NPCs, AI, Speech, Factions, Ownership [C++] Changes (can be) made in C++. Previously named `Code` labels Feb 28, 2022
@PatrikLundell
Copy link
Contributor Author

"LGTM analysis: C/C++": "Failed" by tripping over its own feet by timing out.

@NetSysFire
Copy link
Member

"LGTM analysis: C/C++": "Failed" by tripping over its own feet by timing out.

As usual. It always times out for some reason, so it can not really be used to judge PRs at this time except when it reports new or fixed alerts.

@PatrikLundell
Copy link
Contributor Author

Yes, but unfortunately, it seems that those in power ignore PRs that don't make it through the minefield of broken tests, which is something like 80% of the time.

@kevingranade kevingranade merged commit f3453c5 into CleverRaven:master Mar 4, 2022
@kevingranade
Copy link
Member

I'm pretty much completely overwhelmed by the PR review workload right now. I'm keeping up as best as I can (and sidelining the things I want to work on), but my time is limited at the moment.

@PatrikLundell PatrikLundell deleted the tacoma_companion_mission branch March 4, 2022 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions Missions Quests and missions NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants