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 S08 Kromph and Dust Devil able to trigger Eloh's event #6428

Merged
merged 4 commits into from Jan 16, 2022

Conversation

Descacharrado
Copy link
Contributor

@Descacharrado Descacharrado commented Jan 9, 2022

The variable talking_unit is used instead of unit to set the speaker in many messages.

The talking unit that talks on behalf of the monsters can be, in this order: An elf in the map, a recalled elf, a forcedly spawned elf (Lines 3007-3067)

That unit will move to the dunes to fit the dialogue (Lines 3124-3137)

EDIT: fixed on 061a42b:

I found that code at line 3024 was not searching for units on the recall list
Also if a unit was on 19 20 previously, it would get the talker role, even if it was not intended.
Also the unit which gets created in case everything else fails could get stuck in a wall

Another thing I found testing is that skeletons in one of the events can get stuck on the wall if you walk to their spawning positions maybe fixable on another PR.

Closes #6211

@github-actions github-actions bot added the Campaign (any) Deprecated tag, replaced with separate tags for each mainline campaign label Jan 9, 2022
@nemaara
Copy link
Contributor

nemaara commented Jan 9, 2022

Maybe wants @knyghtmare to look too.

@knyghtmare
Copy link
Member

Maybe wants @knyghtmare to look too.

Seems like it can be merged in. I only commented.

@Wedge009
Copy link
Member

One thing I noticed while testing this is that the Dust Devil is excluded from triggering pretty much any event in S8, and probably most other scenarios too. But I suppose that generally isn't a problem except in the unusual circumstance where it travels far beyond the rest of Kaleh's party, and it only seems to be an issue in special cases such as what #6211 reports.

Anyway, the changes seem to work for me. Unfortunately the back-port will have to wait till after the string freeze since it does touch one translated string - even though no words are meaningfully changed here.

@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 Jan 10, 2022
@Descacharrado
Copy link
Contributor Author

Descacharrado commented Jan 10, 2022

One thing I noticed while testing this is that the Dust Devil is excluded from triggering pretty much any event in S8, and probably most other scenarios too.

I will test all S08s events thoroughly and open an issue with all weird things I find, then proceed to fix them if no one else does, as I said:

Skeletons in one of the events can get stuck on the wall if you walk to their spawning positions

Also true, didn't notice, sry:

Unfortunately the back-port will have to wait till after the string freeze since it does touch one translated string - even though no words are meaningfully changed here.

@Wedge009
Copy link
Member

1.16.2 string freeze is over - are we waiting for anything before merging this?

@Wedge009
Copy link
Member

Ah, I just noticed this has already been approved and I did test the change beforehand, so will merge.

@Wedge009 Wedge009 merged commit 3fad3f7 into wesnoth:master Jan 16, 2022
Wedge009 pushed a commit that referenced this pull request Jan 16, 2022
Asheviere pushed a commit to Asheviere/wesnoth that referenced this pull request Feb 18, 2022
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 S8: Kromph fails to trigger events
4 participants