Feature/armies merging #196
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
ArseniyShestakov
force-pushed
the
feature/armiesMerging
branch
from
a00fce9 to
821e4f9
Compare
Merging algorithm is replicate one from original game.
ArseniyShestakov
force-pushed
the
feature/armiesMerging
branch
from
821e4f9 to
d15106b
Compare
|
So I decide to test this one more and then merge without adding extra bloat. Advanced options will be in separate pull request since they require refactoring of current army merging code. |
ArseniyShestakov
added a commit
that referenced
this pull request
Feb 22, 2016
Feature/armies merging
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
At first I'm want to make merging working as in H3 which is ready as well as few fixes for siege / battle handling. There is bigger plan to implement more merging options since H3 algorithm don't merge stacks of same type and you may end up with smaller army if you split stacks too much.