From: <geo...@us...> - 2010-07-19 03:43:26
|
Revision: 3683 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3683&view=rev Author: geoffthemedio Date: 2010-07-19 03:43:20 +0000 (Mon, 19 Jul 2010) Log Message: ----------- Added battle speed and starlane speed part type enums, parsing, python enum wrapping and stringtable entries. Modified Paths: -------------- trunk/FreeOrion/Empire/Empire.cpp trunk/FreeOrion/default/eng_stringtable.txt trunk/FreeOrion/universe/Enums.h trunk/FreeOrion/universe/ParserUtil.cpp Modified: trunk/FreeOrion/Empire/Empire.cpp =================================================================== --- trunk/FreeOrion/Empire/Empire.cpp 2010-07-19 03:41:18 UTC (rev 3682) +++ trunk/FreeOrion/Empire/Empire.cpp 2010-07-19 03:43:20 UTC (rev 3683) @@ -1173,7 +1173,7 @@ const ShipDesign* ship_design = GetShipDesign(design_id); if (!ship_design) break; - return std::make_pair(ship_design->Cost(), ship_design->BuildTime()); + return std::make_pair(ship_design->TotalCost(), ship_design->BuildTime()); } default: break; Modified: trunk/FreeOrion/default/eng_stringtable.txt =================================================================== --- trunk/FreeOrion/default/eng_stringtable.txt 2010-07-19 03:41:18 UTC (rev 3682) +++ trunk/FreeOrion/default/eng_stringtable.txt 2010-07-19 03:43:20 UTC (rev 3683) @@ -2418,6 +2418,10 @@ Fuel PC_COLONY Colonization +PC_BATTLE_SPEED +Battle Speed +PC_STARLANE_SPEED +Starlane Speed ################################################ Modified: trunk/FreeOrion/universe/Enums.h =================================================================== --- trunk/FreeOrion/universe/Enums.h 2010-07-19 03:41:18 UTC (rev 3682) +++ trunk/FreeOrion/universe/Enums.h 2010-07-19 03:43:20 UTC (rev 3683) @@ -541,8 +541,10 @@ PC_ARMOUR, ///< defensive material on hull of ship PC_DETECTION, ///< range of vision and seeing through stealth PC_STEALTH, ///< hiding from enemies - PC_FUEL, ///< increases range away from resupply + PC_FUEL, ///< distance that can be traveled away from resupply PC_COLONY, ///< transports colonists and allows ships to make new colonies + PC_BATTLE_SPEED, ///< affects ship speed in battle + PC_STARLANE_SPEED, ///< affects ship speed on starlanes NUM_SHIP_PART_CLASSES }; @@ -559,6 +561,8 @@ GG_ENUM_MAP_INSERT(PC_STEALTH) GG_ENUM_MAP_INSERT(PC_FUEL) GG_ENUM_MAP_INSERT(PC_COLONY) + GG_ENUM_MAP_INSERT(PC_BATTLE_SPEED) + GG_ENUM_MAP_INSERT(PC_STARLANE_SPEED) GG_ENUM_MAP_END } GG_ENUM_STREAM_IN(ShipPartClass) Modified: trunk/FreeOrion/universe/ParserUtil.cpp =================================================================== --- trunk/FreeOrion/universe/ParserUtil.cpp 2010-07-19 03:41:18 UTC (rev 3682) +++ trunk/FreeOrion/universe/ParserUtil.cpp 2010-07-19 03:43:20 UTC (rev 3683) @@ -124,16 +124,18 @@ ("bomber", BOMBER); part_class_p.add - ("shortrange", PC_SHORT_RANGE) - ("missiles", PC_MISSILES) - ("fighters", PC_FIGHTERS) - ("pointdefense",PC_POINT_DEFENSE) - ("shield", PC_SHIELD) - ("armour", PC_ARMOUR) - ("detection", PC_DETECTION) - ("stealth", PC_STEALTH) - ("fuel", PC_FUEL) - ("colony", PC_COLONY); + ("shortrange", PC_SHORT_RANGE) + ("missiles", PC_MISSILES) + ("fighters", PC_FIGHTERS) + ("pointdefense", PC_POINT_DEFENSE) + ("shield", PC_SHIELD) + ("armour", PC_ARMOUR) + ("detection", PC_DETECTION) + ("stealth", PC_STEALTH) + ("fuel", PC_FUEL) + ("colony", PC_COLONY) + ("battlespeed", PC_BATTLE_SPEED) + ("starlanespeed", PC_STARLANE_SPEED); slot_type_p.add ("external", SL_EXTERNAL) |