search

cleka / colossus-titan

Colossus is a Java implementation of the classic board game Titan.
12 stars 10 forks source link

Display marker count during split phase #1

Closed BrentNZ closed 9 years ago

BrentNZ commented 9 years ago

Hi Clemens,

As a proof of concept, I've made a minor change to display the number of split markers available during the split phase so you can more easily see when you are running low on split markers.

Cheers, Brent.

baerrach commented 9 years ago

Please use the Colossus coding conventions as per https://github.com/cleka/colossus-titan/blob/master/Colossus/docs/CodingStandards.html, i.e. dont use tabs.

Unfortunately we do not have Checkstyle configured for automating these warnings.

BrentNZ commented 9 years ago

Hi Barrie,

Thanks for the heads up.

I've added an extra commit which replaces the tabs with spaces, and the one set of braces that I missed. Wasn't sure whether to merge them into a single commit, but thought I'd leave it separate for now so as to not confuse matters. I assume that you can accept the two changes as a single change to the project.

I've also updated my vi settings, so hopefully it won't happen again.

Cheers, Brent.

baerrach commented 9 years ago

You'll also want your comments to line up with the rest of the indention of the code. But I've tried out your changes and they do what you say.

cleka commented 9 years ago

Indentation and code style is another good reason to use e.g. Eclipse...

On 2015-06-20 13:06, Barrie Treloar wrote:

You'll also want your comments to line up with the rest of the indention of the code. But I've tried out your changes and they do what you say.

Reply to this email directly or view it on GitHub [1].

*

Links:

[1] https://github.com/cleka/colossus-titan/pull/1#issuecomment-113740180

cleka commented 9 years ago

Hei,

nice, I have merged it. I took the freedom to indent also the

// After doing....

comments and removed spaces in the if condition

if ( something ) => if (something)

leave it separate for now

yes, good idea; if I do formatting changes, I do them usually as separate commit. In this case it's less important, since your whole work appears merged alltogether as a single commit anyway :-)

Thx, Looking forward for more!

-Clemens

On 2015-06-20 12:24, BrentNZ wrote:

Hi Barrie,

Thanks for the heads up.

I've added an extra commit which replaces the tabs with spaces, and the one set of braces that I missed. Wasn't sure whether to merge them into a single commit, but thought I'd leave it separate for now so as to not confuse matters. I assume that you can accept the two changes as a single change to the project.

I've also updated my vi settings, so hopefully it won't happen again.

Cheers, Brent.

Reply to this email directly or view it on GitHub [1].

*

Links:

[1] https://github.com/cleka/colossus-titan/pull/1#issuecomment-113735887