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

EI S07a various fixes #6639

Merged
merged 5 commits into from May 22, 2022
Merged

Conversation

Descacharrado
Copy link
Contributor

@Descacharrado Descacharrado commented Apr 26, 2022

Addresses some points in #4145.

Side 2 was spoiled previously in two ways:

  • With the status table showing it (as commented in the linked issue)
  • With enough resolution and zoomout, you could see the leader being stored.
    Now the status table at turns 1 and 2 will be:
    side 2 hidden
    side 2 unhidden
    And the leader is stored in the prestart event to ensure that it is not leaked.

Also, the player will now be notified that two more ogres are joining Gweddry (both with dialogue and visually) and Grug will have no upkeep (fixed by deleting the [modifications] tag).

Squash before merging.

P.S. If you want to test this, keep in mind you need Owaec from S05 to trigger the victory condition.

@github-actions github-actions bot added the Campaign (any) Deprecated tag, replaced with separate tags for each mainline campaign label Apr 26, 2022
changelog.md Outdated Show resolved Hide resolved
@Descacharrado
Copy link
Contributor Author

Found a small typo, adding to the batch without changelog because it is so minor. (a46c464)

@Wedge009
Copy link
Member

I think it's generally known that trolls are often characterised with incorrect or unusual grammar or word phrasing, but I suppose the po hint can't hurt. I would just say that the speak is a troll instead of saying 'weird speech pattern', but it can be left as it is for now.

Also it's fine to update straight apostrophes to their curly equivalents without making note of it - I would say that's preferred, in fact.

Go ahead and mark the review comments as resolved if you think they have been dealt with.

@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 28, 2022
@Wedge009
Copy link
Member

Sorry for the potentially silly question, but what is hard-coding the co-ordinates for Gork and Drog supposed to do? I'm assuming a setting of recall just allocates their position according to the standard recall behaviour.

@Descacharrado
Copy link
Contributor Author

Sorry for the potentially silly question, but what is hard-coding the co-ordinates for Gork and Drog supposed to do? I'm assuming a setting of recall just allocates their position according to the standard recall behaviour.

It shows them on the map (useful, for example, in case the player skips text or does not pay too much attention). That idea was originally posted in the linked issue.

@Wedge009
Copy link
Member

I looked through the mentions of S7a (I remember this issue being a very big list) but didn't find the connection. Is it the case that recall just puts the units in the recall list instead of placing them in the scenario directly? I trust the effect is what you intended, I'm just trying to understand the change, that's all.

@Descacharrado
Copy link
Contributor Author

Is it the case that recall just puts the units in the recall list instead of placing them in the scenario directly?

Yes, thats it.

@stevecotton
Copy link
Contributor

Looks good to me, but I'm not sure who should approve. I'd guess @nemaara.

@Wedge009
Copy link
Member

Wedge009 commented May 9, 2022

Along with #6644, will have to wait for string freeze to be over before back-porting this.

@Pentarctagon Pentarctagon merged commit 742bb75 into wesnoth:master May 22, 2022
Wedge009 pushed a commit that referenced this pull request May 30, 2022
* Side 2 hidden without spoilers
* Fixed Grug upkeep, added dialogue about Ogres joining
* typographic quote

(cherry picked from commit 742bb75)
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.

None yet

5 participants