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

Adding barracks fort priority #1063

Merged
merged 13 commits into from
Apr 17, 2024
Merged

Conversation

dvincent56
Copy link
Collaborator

Barracks_UI_Mockup_copy_copy

@crudelios
Copy link
Collaborator

crudelios commented Mar 31, 2024

Instead of the cart image, you have enough space to add actual text next to the checkbox, which I think would be better. Or align the cart image/ checkbox left and add the text to the right of the checkbox.

Also for now I'd rather comment out the archer fort image, that way we can easily add it when we have the forts.

@dvincent56
Copy link
Collaborator Author

Capture d'écran 2024-03-31 225725
Do you prefer the top right position like Grand Temple of Mars ?

@dvincent56
Copy link
Collaborator Author

Capture d'écran 2024-04-01 000048
Remove archery button and place delivery button on top right like grand temple

@crudelios
Copy link
Collaborator

This looks good but has merge conflicts now because of the campaign additions.

@dvincent56
Copy link
Collaborator Author

done

@dvincent56
Copy link
Collaborator Author

Areldir wants to revamp the toggle button.

@Areldir
Copy link
Collaborator

Areldir commented Apr 4, 2024

I'm a nuisance, I know lol

@dvincent56
Copy link
Collaborator Author

dvincent56 commented Apr 4, 2024

I found an issue, I pass the pull request to draft
@crudelios I put comments on my problem, do you know how can I fix it without copy past the military window code in culture window ?
// the building here is the last barracks open instead of grand temple

@dvincent56 dvincent56 marked this pull request as draft April 4, 2024 22:31
@dvincent56
Copy link
Collaborator Author

@crudelios Do you have an idea to fix the grand temple update instead of last barracks ?

@dvincent56 dvincent56 marked this pull request as ready for review April 11, 2024 19:52
@dvincent56
Copy link
Collaborator Author

Find a way to fix but I don't know if it's a good way.

@dvincent56
Copy link
Collaborator Author

Breaks the save ...

Copy link
Collaborator

@crudelios crudelios left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here are some needed changes.

Do note that there's an unfixed issue yet, on old savegames weapons will not be accepted by default.

I'm not sure how to fix that short of bumping the savegame version.

@crudelios
Copy link
Collaborator

crudelios commented Apr 12, 2024

Good job!

Now either a value of 0 means the good is accepted, which is unintuitive but would work without any change, or we set another control value besides RESOURCE_WEAPONS (RESOURCE_NONE comes to mind) to 1 to signal that the current savegame is already enabling/disabling weapons.

Here's a table:

RESOURCE_NONE RESOURCE_WEAPONS Meaning
0 0 Old save format, both should be changed to 1 on game load.
0 1 Shouldn't happen
1 0 New savegame, weapons disabled
1 1 New savegame, weapons enabled

@crudelios
Copy link
Collaborator

LGTM 👍

@crudelios crudelios merged commit 744e7eb into Keriew:master Apr 17, 2024
14 checks passed
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.

3 participants