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

Loyal icon superimposed and prestart messages fixes #447

Merged
merged 36 commits into from
Jun 24, 2023

Conversation

Toranks
Copy link
Collaborator

@Toranks Toranks commented Mar 17, 2023

These icon overlays are a problem caused either by the loyal code without an empty overlay, or by using IS_HERO and TRAIT_LOYAL together, existing TRAIT_LOYAL_HERO, better and more specific. And also because of the lua code that adds the loyal icon to all loyal units without checking if they are also heroes. The easiest way to spot it is to check if it has the hero ellipse effect.
Once the first two scenarios are resolved for Delenia and Mario , if the changes seem good to you, I will do it with other characters with the same problem as I progress in the campaign, since I like that the icons on characters that will accompany me in many chapters look beautiful.

imagen

@Dugy
Copy link
Owner

Dugy commented Mar 17, 2023

Feel free to continue, I will merge it then. I never paid much attention to these icons and I didn't notice it didn't always work as it should have.

@Toranks
Copy link
Collaborator Author

Toranks commented Mar 19, 2023

Extra check to avoid give loyal icon to a leader, who already has a crown.

@Toranks Toranks changed the title Loyal icon superimposed fixed Loyal icon superimposed and prestart messages fixs Mar 25, 2023
@Toranks
Copy link
Collaborator Author

Toranks commented Mar 25, 2023

I'll continue here the same cases as here #456 that I find myself throughout the campaign because sometimes the same files are changed, to avoid conflicts.

@Toranks Toranks changed the title Loyal icon superimposed and prestart messages fixs Loyal icon superimposed and prestart messages fixes Mar 25, 2023
@Toranks
Copy link
Collaborator Author

Toranks commented Apr 11, 2023

See the last commit "Fixed loyal random gift..."
It happened to me by unlikely coincidence that in chapter 3, my first recruited loyal elf, received loyal as a reward! (1/50 chance) So I had loyal duplicate loyal,dextrous,loyal xD
Also, coincidentally, I discovered a typo in the gift loyal code, the variable "loyal" doesn't exist, is loyality. I'm not sure what that part of the code does, but I've tested it and everything seems to work fine. It might be redundant and skippable, but I won't touch it since it doesn't do anything wrong either.

@Toranks
Copy link
Collaborator Author

Toranks commented May 16, 2023

@Dugy see the last commit. The shop only allows you to buy 1 item and you have to move the unit to one adjacent square to buy again. As the solution was simple, enclosing the message in a while until "Nothing" is clicked, I have done it for all shops. What do you think, do I keep those changes, or is the original intention for the shops to be for 1 use only?

@Dugy
Copy link
Owner

Dugy commented May 16, 2023

Yeah, keep that. I thought about giving it a nicer GUI, but I didn't get myself to do it.

@Toranks
Copy link
Collaborator Author

Toranks commented May 22, 2023

@Dugy on the last commit I have fixed a problem that makes Vlad attack in the opposite direction of the victim and it looks bad. I guess that you are okay with this, it's a little fix.

For example, Stormrider on Invasion and Bloodbath.
They will no longer show the error image in yellow with debug mode and this error on logs:

20230601 16:27:01 error image: could not open image 'misc/ellipse-hero-leader-selected-top.png'
20230601 16:27:01 error image: could not open image 'misc/ellipse-hero-leader-selected-bottom.png'
@Toranks
Copy link
Collaborator Author

Toranks commented Jun 1, 2023

@Dugy read description on the last commit.
Discord conversation:
https://discord.com/channels/231976805987385345/442775044590927873/1113833880479342743

@Dugy
Copy link
Owner

Dugy commented Jun 1, 2023

I don't have the rights to view anything in that Discord channel.

@Toranks
Copy link
Collaborator Author

Toranks commented Jun 1, 2023

@Dugy
Copy link
Owner

Dugy commented Jun 1, 2023

Yeah, I am fine with that addition.

@Toranks
Copy link
Collaborator Author

Toranks commented Jun 23, 2023

Last commit:
imagen
Before the text was so long that it was not visible on the screen

@Toranks Toranks marked this pull request as ready for review June 23, 2023 15:10
@Toranks
Copy link
Collaborator Author

Toranks commented Jun 23, 2023

I have finished the entire part 1, it is ready for review, all the changes have been checked throughout these months.
Remember that I need a rebuild of the pot file to continue with the translation.

@Dugy Dugy merged commit 016615b into Dugy:master Jun 24, 2023
@Dugy
Copy link
Owner

Dugy commented Jun 24, 2023

Looks okay.

You've done two unrelated things in a large number of commits in a single pull request. I am not asking you to split it up because it would be really annoying work, but next time please make two pull requests for things like this.

I've merged it all now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants