Age selection and bombard added #6
Closed
Conversation
This file contains 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
added 4 commits
July 29, 2015 19:20
- allow use of proper amount of ballistas and turrets - save age information with castle - allow to restore age information from saved castles - code formatting for the changed source files - added gitignore to not submit eclipse project files
- fixed testResetGridData which now must test from the third character - added additional test layout containing age information
|
Oh wow, this looks fantastic. I'll happily merge this if you can revert the formatting changes. e.g. Editor.java is wanting to replace every line so it's very hard to see what changed. Many apologies for not reacting to this sooner. I only just saw the pull request today, the watch on this project was set to Ignore which is really odd. |
|
While I appreciate the work done, I have to decline it mostly due to the large sweeping formatting changes. Also the size of the window has been increased which is still an issue for some users. |
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.
I implemented an age selector, which helps users to identify the maximum of certain buildings they can place at a certain age (e.g. they can place up to 15 ballistas instead of 10 in age 3, and up to 20 in age 4++). This age information is saved along with the castle design and is later also loaded back when importing.
Subsequently, I also added support for the bombard, which is new as of age 4. For that, I created a new sprite and added the bombard everywhere in the code.
Furthermore I raised the export version string by one.
Finally, I added a .gitignore file, to exclude the eclipse project files from being commited.
Saving and loading of castles from old versions still works fine and saving and loading of castles with bombards and the additional age information did also work fine.
Unit tests could be executed successfully.