From: <geo...@us...> - 2011-12-29 08:55:20
|
Revision: 4549 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4549&view=rev Author: geoffthemedio Date: 2011-12-29 08:55:14 +0000 (Thu, 29 Dec 2011) Log Message: ----------- Added optional (default off) autogenerated location condition description for ship hull, ship parts, buildings, and specials in encyclopedia. Modified Paths: -------------- trunk/FreeOrion/UI/EncyclopediaDetailPanel.cpp trunk/FreeOrion/default/eng_stringtable.txt Modified: trunk/FreeOrion/UI/EncyclopediaDetailPanel.cpp =================================================================== --- trunk/FreeOrion/UI/EncyclopediaDetailPanel.cpp 2011-12-29 05:19:10 UTC (rev 4548) +++ trunk/FreeOrion/UI/EncyclopediaDetailPanel.cpp 2011-12-29 08:55:14 UTC (rev 4549) @@ -536,6 +536,8 @@ specific_type = UserString(boost::lexical_cast<std::string>(part->Class())); detailed_description = UserString(part->Description()) + "\n\n" + part->StatDescription(); if (GetOptionsDB().Get<bool>("UI.autogenerated-effects-descriptions") && !part->Effects().empty()) { + if (part->Location()) + detailed_description += str(FlexibleFormat(UserString("ENC_LOCATION_CONDITION_STR")) % part->Location()->Description()); detailed_description += str(FlexibleFormat(UserString("ENC_EFFECTS_STR")) % EffectsDescription(part->Effects())); } @@ -555,6 +557,8 @@ general_type = UserString("ENC_SHIP_HULL"); detailed_description = UserString(hull->Description()) + "\n\n" + hull->StatDescription(); if (GetOptionsDB().Get<bool>("UI.autogenerated-effects-descriptions") && !hull->Effects().empty()) { + if (hull->Location()) + detailed_description += str(FlexibleFormat(UserString("ENC_LOCATION_CONDITION_STR")) % hull->Location()->Description()); detailed_description += str(FlexibleFormat(UserString("ENC_EFFECTS_STR")) % EffectsDescription(hull->Effects())); } @@ -627,6 +631,8 @@ general_type = UserString("ENC_BUILDING_TYPE"); detailed_description = UserString(building_type->Description()); if (GetOptionsDB().Get<bool>("UI.autogenerated-effects-descriptions") && !building_type->Effects().empty()) { + if (building_type->Location()) + detailed_description += str(FlexibleFormat(UserString("ENC_LOCATION_CONDITION_STR")) % building_type->Location()->Description()); detailed_description += str(FlexibleFormat(UserString("ENC_EFFECTS_STR")) % EffectsDescription(building_type->Effects())); } @@ -677,6 +683,8 @@ } if (GetOptionsDB().Get<bool>("UI.autogenerated-effects-descriptions") && !special->Effects().empty()) { + if (special->Location()) + detailed_description += str(FlexibleFormat(UserString("ENC_LOCATION_CONDITION_STR")) % special->Location()->Description()); detailed_description += str(FlexibleFormat(UserString("ENC_EFFECTS_STR")) % EffectsDescription(special->Effects())); } Modified: trunk/FreeOrion/default/eng_stringtable.txt =================================================================== --- trunk/FreeOrion/default/eng_stringtable.txt 2011-12-29 05:19:10 UTC (rev 4548) +++ trunk/FreeOrion/default/eng_stringtable.txt 2011-12-29 08:55:14 UTC (rev 4549) @@ -2236,6 +2236,14 @@ ENC_COST_AND_TURNS_STR %1% %2% and %3% Turns +# autogenerated location condition description +ENC_LOCATION_CONDITION_STR +''' + +<u>Location Requirement</u> + +An object%1%''' + # autogenerated effects description. %1% will be the autogenerated effects text. This string should # provide an appropriate heading to appear before the autogenerated text. ENC_EFFECTS_STR |