Refactor map size to allow for rectangle maps #16259
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
IntelOrca
force-pushed
the
refactor/rectangle-maps
branch
from
98e0cf0 to
7a84322
Compare
frutiemax
reviewed
Dec 20, 2021
ZehMatt
added
the
network version
IntelOrca
force-pushed
the
refactor/rectangle-maps
branch
from
d8c2abe to
1e266aa
Compare
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
Gymnasiast
reviewed
Jan 19, 2022
IntelOrca
force-pushed
the
refactor/rectangle-maps
branch
3 times, most recently
from
5325dee to
c93cc78
Compare
Gymnasiast
reviewed
Feb 6, 2022
Gymnasiast
reviewed
Feb 6, 2022
Gymnasiast
reviewed
Feb 6, 2022
Gymnasiast
reviewed
Feb 6, 2022
| if (customLocation) | ||
| { | ||
| if (centreMapX) | ||
| customX = (mapSize / 2) * 32 + 16; |
Member
There was a problem hiding this comment.
customX/customY should be refactored in another PR (making a note so that I don’t forget).
Gymnasiast
reviewed
Feb 6, 2022
Gymnasiast
reviewed
Feb 6, 2022
Gymnasiast
reviewed
Feb 6, 2022
Gymnasiast
reviewed
Feb 6, 2022
Gymnasiast
reviewed
Feb 6, 2022
Gymnasiast
reviewed
Feb 6, 2022
Gymnasiast
reviewed
Feb 6, 2022
Gymnasiast
reviewed
Feb 6, 2022
|
|
||
| if (!LocationValid(_location) || _location.x <= 16 || _location.y <= 16 || _location.x >= (GetMapSizeUnits() - 16) | ||
| || _location.y >= (GetMapSizeUnits() - 16)) | ||
| auto mapSizeUnits = GetMapSizeUnits() - CoordsXY{ 16, 16 }; |
Member
There was a problem hiding this comment.
We should have a constant for 16 too, I think. Something like HALF_TILE. But this can be done in another PR too.
Member
|
Getting there, found 1 possible mistake and a few code style/quality things. |
IntelOrca
force-pushed
the
refactor/rectangle-maps
branch
from
48b8ced to
c409faf
Compare
Gymnasiast
reviewed
Feb 14, 2022
IntelOrca
force-pushed
the
refactor/rectangle-maps
branch
from
c409faf to
4429411
Compare
Gymnasiast
approved these changes
Feb 15, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The map size game action has changed to allow for both width and height to be specified.
This means, plugin API is increased, and any plugins using the map size change action must be updated.
The network version has changed.
Currently the UI has not been changed, so the only way to access rectangle maps right now is to use scripting and invoke the game action with your own width and height.