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

UtBS S05 Enforce encounter with the Cloaked Figure #6644

Merged
merged 3 commits into from May 9, 2022

Conversation

Descacharrado
Copy link
Contributor

@Descacharrado Descacharrado commented Apr 27, 2022

The Cloaked Figure will appear when enemies are defeated if it did not already.

I tried other methods, like spawning the cloaked figure some turns after defeating an enemy leader (so the randomness is kept) or some turns after moving to certain sections, but none of those implementations felt the same (as how it is rn) and could be cheesed (so we would not be enforcing the encounter, just changing the spawning method).

So I decided that keeping the spawning mechanism and, in the cases where the figure is not spawned (likely because of players rushing), the figure just appears.

Closes #6364 and has a revert of #6361.

@github-actions github-actions bot added the Campaign (any) Deprecated tag, replaced with separate tags for each mainline campaign label Apr 27, 2022
@knyghtmare
Copy link
Member

Would this PR still allow players to use the "Use Keratur as a meat shield" exploit?

@Wedge009
Copy link
Member

If I understand the change correctly, the assassin is triggered when the last of the enemies - whether dwarf or troll - has been defeated. A bit awkward, but it maintains the story with that character, at least.

Does victory correctly flow on from when the assassin is defeated in that case (where the dwarves/trolls are all defeated first)?

Regarding #6361, I suppose it doesn't have to be reverted but at the very least the comment change there will become obsolete so may as well revert it all. You can include the reversion as part of this PR, or I (or someone else) can revert that commit if/when this PR is merged.

@Wedge009 Wedge009 added the Backport A reminder of a bugfix that was added to master that needs to be duplicated on the stable branch. label Apr 27, 2022
@Descacharrado
Copy link
Contributor Author

Would this PR still allow players to use the "Use Keratur as a meat shield" exploit?

I'm unfamiliar with that. Please expatiate.

@Descacharrado
Copy link
Contributor Author

Does victory correctly flow on from when the assassin is defeated in that case (where the dwarves/trolls are all defeated first)?

I'll make sure it does (perhaps later today), I'm pretty sure I tested all the possibilities, but can't remember doing exactly that.

Regarding #6361, I suppose it doesn't have to be reverted but at the very least the comment change there will become obsolete so may as well revert it all. You can include the reversion as part of this PR, or I (or someone else) can revert that commit if/when this PR is merged.

Sure, I can do that, do I just change it back to what it was or do I do git revert (or whatever) in this branch?

@knyghtmare
Copy link
Member

Would this PR still allow players to use the "Use Keratur as a meat shield" exploit?

I'm unfamiliar with that. Please expatiate.

Well, the encounter was meant to happen at a certain point in the heat of battle and he pops behind/adjacent Kaleh. This allows a nasty exploit where this assassin is forced to spam at a spot which puts in the middle of Kalen and the trolls/dwarves. That is, he is a meat shield in a sense. :P It's rather amusing.

@Descacharrado
Copy link
Contributor Author

Well, the encounter was meant to happen at a certain point in the heat of battle and he pops behind/adjacent Kaleh. This allows a nasty exploit where this assassin is forced to spam at a spot which puts in the middle of Kalen and the trolls/dwarves. That is, he is a meat shield in a sense. :P It's rather amusing.

Ah, didn't know his side was enemied with player's enemies haha. Yeah that may still happen, with the same chance as before.

@Wedge009
Copy link
Member

Sure, I can do that, do I just change it back to what it was or do I do git revert (or whatever) in this branch?

Either works. I think if you use git revert it will make it slightly easier for you as it automates the commit message and makes it quite clear what is being reverted.

I also hadn't heard of the 'meat-shield' tactic nor was aware that he is still flagged as an enemy to Kaleh's enemies - probably because when I did encounter him I dispatched him as quickly as possible.

@Wedge009
Copy link
Member

Wedge009 commented May 1, 2022

Looks fine to me. Thanks.

@Wedge009
Copy link
Member

Wedge009 commented May 1, 2022

@nemaara or anyone else: Any issue or concerns against merging this?

@Descacharrado
Copy link
Contributor Author

Last commit is changelog conflicts

@Wedge009
Copy link
Member

Wedge009 commented May 9, 2022

I think it's better to re-base your PR branch rather than try to merge the destination back into it, but it looks like squash-merge will work.

@Wedge009 Wedge009 merged commit 7e87826 into wesnoth:master May 9, 2022
@Wedge009
Copy link
Member

Wedge009 commented May 9, 2022

Oh, darn, I just realised the string freeze for 1.16 just started. Will have to wait for the back-port, then.

@Wedge009 Wedge009 mentioned this pull request May 9, 2022
Wedge009 pushed a commit that referenced this pull request May 30, 2022
* Enforce encounter with the Cloaked Figure

* Revert "Avoid counting encounters with 'Cloaked Figure'."

This reverts commit ada454b.

(cherry picked from commit 7e87826)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport A reminder of a bugfix that was added to master that needs to be duplicated on the stable branch. Campaign (any) Deprecated tag, replaced with separate tags for each mainline campaign
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UtBS S5: Enforce second encounter with 'Cloaked Figure'
4 participants