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

Loyal overlay fixes #103

Merged
merged 13 commits into from Mar 17, 2023
Merged

Loyal overlay fixes #103

merged 13 commits into from Mar 17, 2023

Conversation

Toranks
Copy link
Contributor

@Toranks Toranks commented Feb 26, 2023

Lady Lorin is recovered just as it was left in the previous scenario, getting her id. It is unnecessary to make the same modifications.
I only send the scenarios that I have already verified that Lady Lorin retains her loyal and strong (on easy) traits, so as I progress in the campaign I will send the other fixes. This is part of the fix of #98

@Toranks
Deleted unnecesary modifications
daef649 
Lady Lorin is recovered just as it was left in the previous scenario, getting her id. It is unnecessary to make the same modifications.
@cooljeanius
Copy link
Collaborator

Lady Lorin is recovered just as it was left in the previous scenario, getting her id. It is unnecessary to make the same modifications. I only send the scenarios that I have already verified that Lady Lorin retains her loyal and strong (on easy) traits, so as I progress in the campaign I will send the other fixes.

OK, maybe convert this into draft mode, then?

@Toranks Toranks marked this pull request as draft February 26, 2023 15:42
@Toranks Toranks changed the title Deleted unnecesary modifications Loyal overlay fixes Feb 27, 2023
@Toranks
Rovio loyal overlay fix
d989cb8 
This is the first apparition. Loyal without overlay.
@Toranks
Moerre Crynenoj loyal fix
d26d80b 
First apparition
cooljeanius added a commit to cooljeanius/A_New_Order that referenced this pull request Feb 27, 2023
@cooljeanius
Update 07_Ally_From_the_Past.cfg
3ca50d0 
cherry-pick 2 commits from nemaara/A_New_Order#103
@cooljeanius cooljeanius mentioned this pull request Feb 28, 2023
Merged
@Toranks
Copy link
Contributor Author

Toranks commented Mar 1, 2023

Closed this:
#108
The changes explained there are made here, since they affect the same files and it is more convenient. All changes up to this comment are tested.

@Toranks Toranks mentioned this pull request Mar 1, 2023
Closed
@cooljeanius
Copy link
Collaborator

@Toranks sorry I introduced some merge conflicts with #109, which has now been merged

@Toranks
Copy link
Contributor Author

Toranks commented Mar 2, 2023

Tested here ^

@Toranks Toranks marked this pull request as ready for review March 16, 2023 23:35
@Toranks
Copy link
Contributor Author

Toranks commented Mar 16, 2023

I'm already on the last mission, I've done all possible side missions, and I haven't seen any more icon overlays, so it's ready to merge, if that's okay with you.

@cooljeanius
Copy link
Collaborator

I'm already on the last mission, I've done all possible side missions, and I haven't seen any more icon overlays, so it's ready to merge, if that's okay with you.

ok, let's get a review from @nemaara too first, though

@nemaara
Copy link
Owner

nemaara commented Mar 17, 2023

Wait it looks like you removed egallager's thing where he gave the STRONG trait on easy mode though.

@Toranks
Copy link
Contributor Author

Toranks commented Mar 17, 2023

Oh, sorry. Restored.

@nemaara nemaara merged commit 265dd8e into nemaara:master Mar 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nemaara nemaara nemaara approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Toranks @cooljeanius @nemaara