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

Allow adding and removing tilesets to existing maps #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

Brett208
Copy link
Member

@Brett208 Brett208 commented May 4, 2018

  • Operation is aborted if tileset is contained within a TerrainType.
  • Removes references to tileset from TileGroups and the current map by setting indices to 0.

** This functionality will eventually need to be expanded for dealing with TerrainTypes.

 - Operation is aborted if tileset is contained within a TerrainType.
 - Removes references to tileset from TileGroups and the current map by setting indices to 0.
@Brett208
Copy link
Member Author

Brett208 commented May 4, 2018

I resolved the merge conflicts within GitHub and it only added a single commit in the process, which is good. I found GitHub's merge conflict resolution system intuitive. The only downside is that I cannot compile and check on the results before pushing the merge to the public.

I will try to resolve through TortoiseGit for the next Merge Conflict and see how it goes again.

@Brett208
Copy link
Member Author

Brett208 commented May 5, 2018

I'm considering never merging this branch into master. A system that gracefully handles replacing tilesets needs to take into account the contents of TerrainRange, which may look a lot different than this solution.

I would like to leave this branch in place in case it is helpful to someone in the future.

@DanRStevens
Copy link
Member

I can see where you're coming from with this. The code is generally useful as part of a solution to the problem, but it's not complete, and not really usable without being complete. Adding it in now adds a substantial amount of code to the project, without any real new useful functionality, though discarding the code also seems wrong, since a working solution will likely need most of this.

What about separating the removal from the compaction of the tileset indicies? That might segregate some of the ugly parts of this problem. It would also make sense if you were doing a replacement of part of the tileset, where an intermediate compaction step might be undesirable. Perhaps the user might want to do a pure graphical replacement, with 1-1 equivalences between tiles. Though considering that case might be an attempt at over optimizing.

@Brett208 Brett208 added Map Outpost 2 map format and removed enhancement labels Jan 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Map Outpost 2 map format
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants