[ctp2-commit] Revision 904 committed by Martin G?\195?\188hmann

ctp2-commit at darkdust.net ctp2-commit at darkdust.net
Sat Sep 13 23:19:07 CEST 2008


Finished the upgrade option:

Some cleanings:
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/gs/gameobj/bldque.cpp
modified trunk/ctp2_code/gs/gameobj/CityData.cpp

Free unit upgrades for the AI is now enabled by default:
modified trunk/ctp2_code/gs/database/profileDB.cpp

Added upgrade option to the single player new game rules screen:
modified trunk/ctp2_code/gs/database/profileDB.h
modified trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp
modified trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/italian/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl

If a unit can be upgraded can now be controlled by terrain.txt, tileimp.txt and goods.txt:
modified trunk/ctp2_code/gs/world/Cell.cpp

Added upgrade events:
modified trunk/ctp2_code/gs/events/GameEventDescription.h
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.h
modified trunk/ctp2_code/gs/gameobj/armyevent.cpp
modified trunk/ctp2_code/gs/gameobj/Unit.cpp
modified trunk/ctp2_code/gs/gameobj/Unit.h
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
modified trunk/ctp2_code/gs/gameobj/UnitData.h
modified trunk/ctp2_code/gs/gameobj/unitevent.cpp

The upgrade order appears only on the order button bank when an army is selected that contains units that can be upgraded:
modified trunk/ctp2_code/gs/gameobj/Unit.cpp

When the mouse hovers over the upgrade order button in the status bar, the number of units that can be upgraded with the gold in the treasury, the units that could be upgraded if there were enough gold in the treasury, and the number of units in the selected army are shown. Additionally, the amount of gold is shown that is needed to upgrade the units that can be upgraded with the gold in the treasury, and the gold needed to upgrade all units in the selected army:
modified trunk/ctp2_code/ui/aui_common/aui_control.cpp
modified trunk/ctp2_code/ui/aui_common/aui_control.h
modified trunk/ctp2_code/ui/interface/UnitControlPanel.cpp

Added upgrade order:
modified trunk/ctp2_data/default/gamedata/Orders.txt
modified trunk/ctp2_data/default/gamedata/uniticon.txt
added trunk/ctp2_data/default/graphics/pictures/upgradeunit_buttonactive.tga
added trunk/ctp2_data/default/graphics/pictures/upgradeunit_buttoninactive.tga
added trunk/ctp2_data/default/graphics/pictures/upgradeunit_GLpicture.tga
added trunk/ctp2_data/default/graphics/pictures/upgradeunit_GLpicture_old.tga
modified trunk/ctp2_data/english/gamedata/gl_str.txt
modified trunk/ctp2_data/english/gamedata/Great_Library.txt
modified trunk/ctp2_data/english/gamedata/ldl_str.txt
modified trunk/ctp2_data/french/gamedata/gl_str.txt
modified trunk/ctp2_data/french/gamedata/Great_Library.txt
modified trunk/ctp2_data/french/gamedata/ldl_str.txt
modified trunk/ctp2_data/german/gamedata/gl_str.txt
modified trunk/ctp2_data/german/gamedata/Great_Library.txt
modified trunk/ctp2_data/german/gamedata/info_str.txt
modified trunk/ctp2_data/german/gamedata/ldl_str.txt
modified trunk/ctp2_data/italian/gamedata/gl_str.txt
modified trunk/ctp2_data/italian/gamedata/Great_Library.txt
modified trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified trunk/ctp2_data/spanish/gamedata/gl_str.txt
modified trunk/ctp2_data/spanish/gamedata/Great_Library.txt
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt

U   trunk/ctp2_code/ai/ctpai.cpp
U   trunk/ctp2_code/gs/database/profileDB.cpp
U   trunk/ctp2_code/gs/database/profileDB.h
U   trunk/ctp2_code/gs/events/GameEventDescription.h
U   trunk/ctp2_code/gs/gameobj/ArmyData.cpp
U   trunk/ctp2_code/gs/gameobj/ArmyData.h
U   trunk/ctp2_code/gs/gameobj/CityData.cpp
U   trunk/ctp2_code/gs/gameobj/Unit.cpp
U   trunk/ctp2_code/gs/gameobj/Unit.h
U   trunk/ctp2_code/gs/gameobj/UnitData.cpp
U   trunk/ctp2_code/gs/gameobj/UnitData.h
U   trunk/ctp2_code/gs/gameobj/armyevent.cpp
U   trunk/ctp2_code/gs/gameobj/bldque.cpp
U   trunk/ctp2_code/gs/gameobj/unitevent.cpp
U   trunk/ctp2_code/gs/world/Cell.cpp
U   trunk/ctp2_code/ui/aui_common/aui_control.cpp
U   trunk/ctp2_code/ui/aui_common/aui_control.h
U   trunk/ctp2_code/ui/interface/UnitControlPanel.cpp
U   trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp
U   trunk/ctp2_data/default/gamedata/Orders.txt
U   trunk/ctp2_data/default/gamedata/uniticon.txt
A   trunk/ctp2_data/default/graphics/pictures/upgradeunit_GLpicture.tga
A   trunk/ctp2_data/default/graphics/pictures/upgradeunit_GLpicture_old.tga
A   trunk/ctp2_data/default/graphics/pictures/upgradeunit_buttonactive.tga
A   trunk/ctp2_data/default/graphics/pictures/upgradeunit_buttoninactive.tga
U   trunk/ctp2_data/english/gamedata/Great_Library.txt
U   trunk/ctp2_data/english/gamedata/gl_str.txt
U   trunk/ctp2_data/english/gamedata/ldl_str.txt
U   trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
U   trunk/ctp2_data/french/gamedata/Great_Library.txt
U   trunk/ctp2_data/french/gamedata/gl_str.txt
U   trunk/ctp2_data/french/gamedata/ldl_str.txt
U   trunk/ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
U   trunk/ctp2_data/german/gamedata/Great_Library.txt
U   trunk/ctp2_data/german/gamedata/gl_str.txt
U   trunk/ctp2_data/german/gamedata/info_str.txt
U   trunk/ctp2_data/german/gamedata/ldl_str.txt
U   trunk/ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
U   trunk/ctp2_data/italian/gamedata/Great_Library.txt
U   trunk/ctp2_data/italian/gamedata/gl_str.txt
U   trunk/ctp2_data/italian/gamedata/ldl_str.txt
U   trunk/ctp2_data/italian/uidata/layouts/spnewgamepopups.ldl
U   trunk/ctp2_data/japanese/uidata/layouts/spnewgamepopups.ldl
U   trunk/ctp2_data/spanish/gamedata/Great_Library.txt
U   trunk/ctp2_data/spanish/gamedata/gl_str.txt
U   trunk/ctp2_data/spanish/gamedata/ldl_str.txt
U   trunk/ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl



More information about the ctp2-commit mailing list