PROJECT: Revision Reports 2

[EPW]

Revision 1011

I tested this one!

Added HealRate flag for terrain improvements.

Moved heal rate calculation to terrainutil.cpp: function terrainutil_GetHealRate

Heal rate Priority:
City Heal Rate
Sum of Tile Improvement Heal Rate
Base Heal Rate

U trunk/ctp2_code/gs/gameobj/UnitData.cpp
U trunk/ctp2_code/gs/gameobj/terrainutil.cpp
U trunk/ctp2_code/gs/gameobj/terrainutil.h
U trunk/ctp2_code/gs/newdb/TerrainImprovement.cdb
U trunk/ctp2_data/default/gamedata/tileimp.txt

[Martin Gühmann]

Revision 1012: Prepared savegame format 67 to support more than 256 sprites

Some cleanings:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/newdb/unit.cdb
modified trunk/ctp2_code/gs/newdb/unitpromotion.cdb

Fixed the nano destroyed city and nano infected victim messages, so that the slic player argument is the city owner instaed of the visible player:
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp

Prepared savegame format for upgrading to version 67, prepared savegame format change for support of more than 256 sprites:
modified trunk/ctp2_code/gfx/spritesys/SpriteGroupList.h
modified trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
modified trunk/ctp2_code/gs/fileio/GameFile.cpp

modified trunk/doc/user/playtest/Apolyton_README.txt

[Martin Gühmann]

Revision 1013: Updated readme:
modified trunk/doc/user/playtest/Apolyton_README.txt

[Maquiladora]

Revision 1014

Stopped the AI checking it's city limit if no city limit rule is enabled:
modified trunk/ctp2_code/ai/diplomacy/sstateevent.cpp

Removed the AI specific rules from profile and rules screen, since they already exist in difficultyDB. You can now find those diffDB flags for the AI here:
http://www.ctp2.info/database/text/c...medata/DiffDB/ Also removed sectarian happiness because it doesn't do anything:
modified trunk/ctp2_code/gs/database/profileDB.cpp
modified trunk/ctp2_code/gs/database/profileDB.h
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/gameobj/Happy.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/Readiness.cpp
modified trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp
modified trunk/ctp2_data/english/gamedata/ldl_str.txt
modified trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/french/gamedata/ldl_str.txt
modified trunk/ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/german/gamedata/ldl_str.txt
modified trunk/ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified trunk/ctp2_data/italian/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/japanese/gamedata/ldl_str.txt
modified trunk/ctp2_data/japanese/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt
modified trunk/ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl

Added mouse over descriptions in the rules window and cleaned up the (English) button labels to be in the same style:
modified trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp
modified trunk/ctp2_data/english/gamedata/ldl_str.txt
modified trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/french/gamedata/ldl_str.txt
modified trunk/ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/german/gamedata/ldl_str.txt
modified trunk/ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified trunk/ctp2_data/italian/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/japanese/gamedata/ldl_str.txt
modified trunk/ctp2_data/japanese/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt
modified trunk/ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl

[Martin Gühmann]

Revision 1015: Some cleanings and added some German translations

Some cleanings:
modified trunk/ctp2_code/ai/CityManagement/governor.cpp
modified trunk/ctp2_code/ai/ctpai.h
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.cpp
modified trunk/ctp2_code/gs/gameobj/Happy.cpp

Made the CityAstar::FindCityDist useful:
modified trunk/ctp2_code/robot/pathing/CityAstar.cpp

Translated some strings into German, and removed some duplicated strings:
modified trunk/ctp2_data/english/gamedata/ldl_str.txt
modified trunk/ctp2_data/english/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/french/gamedata/ldl_str.txt
modified trunk/ctp2_data/french/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/german/gamedata/ldl_str.txt
modified trunk/ctp2_data/german/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified trunk/ctp2_data/italian/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/japanese/gamedata/ldl_str.txt
modified trunk/ctp2_data/japanese/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt
modified trunk/ctp2_data/spanish/uidata/layouts/civstatus.ldl

[Maquiladora]

Revision 1016

Removed obsolete comment:
modified trunk/ctp2_code/gfx/tilesys/tiledraw.cpp

Cleaning up and made project compile again with NEW_RESOURCE_PROCESS preprocessor definition:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/ui/interface/CauseAndEffectTab.cpp

Fixed a crash related to citystyles:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp

Fixed GetNetCityProduction sometimes returning gross production:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp

Made the turns to growth and city production turns figures update when a city changes size and at begin turn:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp

Removed (now) useless methods that I added before to calculate specialists for city window:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/gameobj/citydata.h
modified trunk/ctp2_code/ui/interface/citywindow.cpp

Added TechCostKnownDeduction to diffDB, you can find a description of it here: http://www.ctp2.info/aewiki/index.ph...KnownDeduction
Thanks to the CtP1 tech dissemination mod and civ4 for this one:
modified trunk/ctp2_code/gs/gameobj/Advances.cpp
modified trunk/ctp2_code/gs/newdb/Difficulty.cdb

Fixed an assert regarding the custom ages screen:
modified trunk/ctp2_code/ui/interface/spnewgamewindow.cpp

Expanded description of new combat in rules window:
modified trunk/ctp2_data/english/gamedata/ldl_str.txt
modified trunk/ctp2_data/french/gamedata/ldl_str.txt
modified trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified trunk/ctp2_data/japanese/gamedata/ldl_str.txt
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt

Fixed "Subtotal:" label in empire manager:
modified trunk/ctp2_data/english/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/french/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/german/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/italian/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/civstatus.ldl

[Maquiladora]

Revision 1017

Fixed EitherPrerequisites (optional prerequisites) in advance.txt. A maximum of 4 (prerequisites + eitherprerequisites) can be used per advance. e.g. Writing can lead to 4 other advances, as a prerequisite or eitherprerequisite. And e.g. Trade can only have 4 required advances (prerequities + eitherprerequisites). As far as I know this is just a limitation of the great library tech tree tab height, so could possibly be increased.
modified trunk/ctp2_code/gs/gameobj/Advances.cpp

Changed to a blue line (rather than black) if an advance is an eitherprerequisite in tech tree tab of great library:
modified trunk/ctp2_code/gs/gameobj/advanceutil.cpp
modified trunk/ctp2_code/gs/gameobj/advanceutil.h
modified trunk/ctp2_code/ui/aui_ctp2/chart.cpp
modified trunk/ctp2_code/ui/aui_ctp2/chart.h
modified trunk/ctp2_code/ui/interface/greatlibrary.cpp

Improved the English messages for entering a new age:
modified trunk/ctp2_data/english/gamedata/info_str.txt

Made the new game screen difficulty text bold again like it was originally:
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

[Maquiladora]

Revision 1018

Fixed bugs when combining "prerequisites" with "eitherprerequisites" in the same advance:
modified trunk/ctp2_code/gs/gameobj/Advances.cpp
modified trunk/ctp2_code/ui/aui_ctp2/chart.cpp

[Maquiladora]

Revision 1019

Fixed spacing of "eitherprerequisites" advances in GL tech tree tab:
modified trunk/ctp2_code/ui/aui_ctp2/chart.cpp

[Martin Gühmann]

Revision 1020: Added roll over AI

MOved some includes from the header file to the implementation file to shrink the size of the governor translation unit:
modified trunk/ctp2_code/ai/CityManagement/governor.cpp
modified trunk/ctp2_code/ai/CityManagement/governor.h

Removed an unnecessary include, a leftover from some of my tests:
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp

Added roll over AI. Now the AI will now pick a path that goes over enemy units if there is a war and the roll over army is strong enough. This removes the problem the AI has with ZOCs and clears the room around an enemy city that is to be conquered. Actually the amount of troops needed is calculated with this in mind:
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.cpp
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.h
modified trunk/ctp2_code/robot/pathing/unitastar.cpp
modified trunk/ctp2_code/robot/pathing/UnitAstar.h

[Maquiladora]

Revision 1021:

Changed occurances of UnitRecord::GetMaxHP to UnitData::CalculateTotalHP, some to fix the unit healthbar overflowing when you get a hp bonus, and some for consistency in calculations:
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/gfx/spritesys/director.cpp
modified trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/Unit.cpp
modified trunk/ctp2_code/gs/world/cellunitlist.cpp
modified trunk/ctp2_code/ui/aui_ctp2/battleorderbox.cpp
modified trunk/ctp2_code/ui/aui_ctp2/unittabbutton.cpp
modified trunk/ctp2_code/ui/interface/armymanagerwindow.cpp
modified trunk/ctp2_code/ui/interface/battle.cpp
modified trunk/ctp2_code/ui/interface/UnitControlPanel.cpp
modified trunk/ctp2_code/ui/interface/unitmanager.cpp

Outcommented some debug stuff:
modified trunk/ctp2_code/gs/gameobj/CTP2Combat.cpp

Units over their maxhp after a hp wonder is lost get their hp lowered to the new maximum:
modified trunk/ctp2_code/gs/gameobj/Player.cpp

Added more unit bonuses and clarified the names of others, modifying GetOffense, GetDefense, GetRanged, and GetDefCounterAttack.
You can find a list of them here.
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
modified trunk/ctp2_code/gs/newdb/unit.cdb

Added built-in slic variable "unit.actualmaxhp" to return the maxhp used after wonders, feats and civ hp bonuses have been added:
modified trunk/ctp2_code/gs/slic/SlicBuiltin.cpp

[Martin Gühmann]

Revision 1022: Fixed AI army to transporter selection:

Some cleanings:
modified trunk/ctp2_code/robot/pathing/unitastar.cpp
modified trunk/ctp2_code/ai/CityManagement/governor.cpp

If the AI now executes a goal that needs transport, it will now pick the army with the closest transporter. SO no more trying to use the furthest from the transporter away army, which will on each turn reverse the selection of the army:
modified trunk/ctp2_code/ai/strategy/agents/agent.cpp
modified trunk/ctp2_code/ai/strategy/agents/agent.h
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/ai/strategy/goals/Goal.h
modified trunk/ctp2_code/ai/strategy/scheduler/Plan.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/Plan.h
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp

[Maquiladora]

Revision 1023:

Modified HutMaxAdvancePrerequisites and HutMaxUnitPrerequisites from risks.txt to check for EitherPrerequisites as well as regular Prerequisites:
modified trunk/ctp2_code/gs/gameobj/Advances.cpp

Fixed advances a player can research not recalculating when finding an advance in a ruin, and some cleaning:
modified trunk/ctp2_code/gs/gameobj/Player.cpp

Modified bombard ranged strength to check for all ranged bonuses used in normal combat and not just veteran bonuses:
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp

Modified NoDefenseBonuses flag in unitDB so a unit does not receive entrenched, terrain, or fort(tile imp) bonuses (all other defence bonuses are added),
Removed RangedCityBonus and added RangedDefendCityBonus and RangedAttackCityBonus,
Added IsSurfaceShip, DefendSurfaceShipBonus, AttackSurfaceShipBonus, and RangedSurfaceShipBonus,
Added AlwaysHeal flag to unitDB for a unit to be eligible for healing even after moving:
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
modified trunk/ctp2_code/gs/newdb/unit.cdb

[Martin Gühmann]

Revision 1024: Improved and fixed AI tile improvement:

The AI now builds every turn tile improvements including roads:
modified trunk/ctp2_code/ai/ctpai.cpp

The AI uses road paths that it has laid down this turn for further road paths, the AI will fill the AI with gold tile improvements if it does not need more food or production improvements, and the AI prefers to improve small first ring cities first:
modified trunk/ctp2_code/ai/CityManagement/governor.cpp
modified trunk/ctp2_code/gs/newdb/Const.cdb
modified trunk/ctp2_code/gs/newdb/strategy.cdb
modified trunk/ctp2_code/gs/world/Cell.cpp
modified trunk/ctp2_code/gs/world/Cell.h
modified trunk/ctp2_code/gs/world/wldgen.cpp
modified trunk/ctp2_code/gs/world/World.h

[Martin Gühmann]

Revision 1025:

The AI now rush buys items in cities without garrison first. Than it rush buys those items in small (one ring) cities.
modified trunk/ctp2_code/ai/ctpai.cpp