Merge lp:~brandesign/armagetronad/0.4-conquest-output into lp:~armagetronad-dev/armagetronad/0.4-armagetronad-work
Proposed by
David Brandes
Status: | Merged |
---|---|
Merged at revision: | 1450 |
Proposed branch: | lp:~brandesign/armagetronad/0.4-conquest-output |
Merge into: | lp:~armagetronad-dev/armagetronad/0.4-armagetronad-work |
Diff against target: |
121 lines (+65/-2) 3 files modified
NEWS (+2/-0) language/english_base.txt (+3/-0) src/tron/zone/zFortress.cpp (+60/-2) |
To merge this branch: | bzr merge lp:~brandesign/armagetronad/0.4-conquest-output |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dlh | Needs Fixing | ||
Review via email: mp+130341@code.launchpad.net |
This proposal supersedes a proposal from 2012-10-18.
Description of the change
This adds the command CONDENSE_
Team 1, Team 2 and Team 3 where awarded 20 Points for conquering Team 4's base
To post a comment you must log in.
== Make more translatable
I think this can be cleaned up a little. It's also difficult to translate (hardcoded " and ").
I think a better solution is: build up a list of team names, and then join all of the strings except the penultimate together (either using boost:: algorithm: :join or a custom implementation). The last team name would be the \4 parameter to the localized string.
So, we currently have: win_conquest_ specific \1 was awarded \2 points for conquering \3's base.\n
* player_
And the new localized string for the condensed message shares the same parameters with the additional \4 parameter: win_condense_ conquest \1, and \4 were awarded \2 points for conquering \3's base.\n
* players_
I think localized strings should be the full string—it's easier for translators to understand. Simply adding a new localized string for " and " can be confusing and may require looking at the source code to see how it's used.
== Should this be a configurable setting?
Does this need to be a configurable setting? And if it a setting, maybe it should be enabled by default.
== Other minor critiques
* "where awarded" should be "were awarded"
* The RequestSync() you added at the end isn't necessary.
* "score > 0 ? score : -score" is abs(score), but it looks like this was copied from eTeam::AddScore().