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

Don't reset incomplete missions after skills training #38632

Merged
merged 1 commit into from
Mar 9, 2020

Conversation

jkraybill
Copy link
Contributor

@jkraybill jkraybill commented Mar 8, 2020

Summary

SUMMARY: Bugfixes "Don't reset incomplete missions after skills training"

Purpose of change

Partial fix for #34789. Fixes #23824. There was a bug where getting skills training from an NPC who had given you a mission, even if not in the context of the mission completion reward, would clear the mission. This PR fixes that by only clearing missions given in training if the mission is complete.

Describe the solution

Added a check before the clear_mission call to only do that if the mission is complete.

Describe alternatives you've considered

A bigger re-work of how mission completion happens.

Testing

Generated a bunch of NPCs and had them give me quests. Previously, asking for training would reset the mission. Now, it does not.

Additional context

I don't think know that this a complete fix for #34789 because that bug's original description did not have a reliable repro. But it at least resolves the bug related to receiving training while a quest is in progress.

Even though they seem somewhat related, I don't believe this bug was the cause of #38325. This bug causes the mission-giver to flip over to the next mission after getting training - you can't complete the first mission you got, but the next time you ask, you get the next mission in the chain. That's not consistent with the behavior in #38325 where the same missions get duplicated.

@ghost
Copy link

ghost commented Mar 8, 2020

Thanks for doing this! looks good to me.

@ZhilkinSerg ZhilkinSerg added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Missions Quests and missions labels Mar 9, 2020
@ZhilkinSerg ZhilkinSerg merged commit edfbefc into CleverRaven:master Mar 9, 2020
@jkraybill jkraybill deleted the 34789 branch March 9, 2020 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Missions Quests and missions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't complete NPC Missions
2 participants