I have gathered a list of unit labels, as used by FreeCol and the 
original game, as far as I can determine. The entry for Free Colonist is 
representative for all unit types that represent people with no expert 
role, the entry for Caravel is representative for all unit types that do 
not represent people:


Free Colonist
    Default         Dutch Free Colonist
    Other           Dutch Soldier (Free Colonist)

Seasoned Scout
    Default         Dutch Seasoned Scout (no horses)
    Expert          Dutch Seasoned Scout
    Other           Dutch Soldier (Seasoned Scout)

Veteran Soldier
    Default         Dutch Veteran Soldier (no muskets)
    Expert          Dutch Veteran Soldier
                    Dutch Veteran Dragoon
    Other           Dutch Missionary (Veteran Soldier)

Hardy Pioneer
    Default         Dutch Hardy Pioneer (no tools)
    Expert          Dutch Hardy Pioneer (40 tools)
    Other           Dutch Soldier (Hardy Pioneer)

Jesuit Missionary
    Default         Dutch Jesuit Missionary (not commissioned)
    Expert          Dutch Jesuit Missionary
    Other           Dutch Soldier (Jesuit Missionary)

King's Regular
    Default         ---
    Expert          Dutch Infantry
                    Dutch Cavalry
    Other           ---

Colonial Regular
    Default         ---
    Expert          Dutch Continental Army [shouldn't that be Infantry?]
                    Dutch Continental Cavalry
    Other           ---

Brave
    Default         Inca Brave
    Other           Inca Armed Brave
                    Inca Mounted Brave
                    Inca Native Dragoon

Caravel
    Default         Dutch Caravel

Treasure Train
    Default         Dutch Treasure Train (500 gold)


So, in the case of units with no expert role, we have "%nation% %type%" 
in the case of the default role, and "%nation% %role% (%type%)" 
otherwise. In the case of units with a single expert role, we have 
"%nation% %type% (no equipment)" in the case of the default role, and 
"%nation% %type%" for the expert role, except for roles with a potential 
equipment count greater than one, in which case that is "%nation% %type% 
(equipment count)". Units that can not be equipped are always labeled 
"%nation% %type%", unless they carry treasures, in which case they are 
labeled "%nation% %type% (amount of gold)".

Things get complicated when the unit has more than one expert role, as 
is the case with veterans, continental regulars, king's regulars, and 
possibly braves. I see no way to generalize these labels, so we should 
probably just check for the presence of corresponding keys in the 
messages file.

In the case of a unit with a proper name, I think we should put the name 
first, followed by the label, like this:

    Santa Maria (Spanish Caravel)
    Natty Bumppo (English Seasoned Scout/no horses)
    The Gold of El Dorado (Spanish Treasure Train/5000 gold)

That is, if the label already contains parentheses, replace them with 
slashes.


What do you think?


Regards

Michael


------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Freecol-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freecol-developers

Reply via email to