PROJECT: Revision Reports 2

[Martin Gühmann]

The PROJECT: PROJECT: Revision Reports has hit the 500 post limit, so it is time for a new thread.

Here are the previous threads:

PROJECT: Altered source files thread.
PROJECT: Revision Reports

And there last posts:

PROJECT: Altered source files (last post)
PROJECT: Revision Reports (last post)

To get the source code you need an SVN client like TortoiseSVN, which you can find here.

And you need the repository, which is located on the following website:
See the instructions provided at this website:

http://ctp2.darkdust.net/

- Martin

[Martin Gühmann]

Revision 908:

Corrected rare crash at start-up (race condition with mouse initialization)

modified trunk/ctp2_code/ui/aui_common/aui_ui.cpp
modified trunk/ctp2_code/ui/aui_common/aui_ui.h


Revision 909:

Fixed a crash in E's riot casualties code and kept the random integer number generator from crashing if the input is smaller than one:

modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/utility/RandGen.h

[Martin Gühmann]

Revision 910 Fixed unit garrison assignment

Some cleanings:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/gameobj/Happy.cpp
modified trunk/doc/user/playtest/Apolyton_README.txt

The AI does not consider units for goals that are needed for city garrison:
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/ai/strategy/agents/ctpagent.cpp
modified trunk/ctp2_code/ai/strategy/agents/ctpagent.h
modified trunk/ctp2_code/ai/strategy/goals/ctpgoal.cpp
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler_types.h

[Martin Gühmann]

Revision 911: Cell strength computation corrections and other stuff

Some cleanings:
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/ai/strategy/goals/Goal.h

Some speed improvement:
modified trunk/ctp2_code/ai/strategy/goals/ctpgoal.cpp
modified trunk/ctp2_code/gs/gameobj/terrainutil.cpp

Fixed cell strength computation:
modified trunk/ctp2_code/gs/world/cellunitlist.cpp

[Martin Gühmann]

Revision 912

Merged CTPGoal into Goal to improve design and game speed. Why using the expensive inheritance mechanism if only one files class is derived.
modified trunk/ctp2_code/ai/CityManagement/governor.cpp
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/ai/diplomacy/motivationevent.cpp
deleted trunk/ctp2_code/ai/strategy/agents/ctpagent.cpp
deleted trunk/ctp2_code/ai/strategy/goals/ctpgoal.cpp
modified trunk/ctp2_code/ai/strategy/goals/ctpgoal.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
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h
modified trunk/ctp2_code/ctp/civctp.dsp

[Martin Gühmann]

Revision 913

Merged CTPAgent into Agent to improve design and game speed. Why using the expensive inheritance mechanism if only one files class is derived.
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp
modified trunk/ctp2_code/ai/strategy/agents/agent.cpp
modified trunk/ctp2_code/ai/strategy/agents/agent.h
deleted trunk/ctp2_code/ai/strategy/agents/ctpagent.cpp
deleted trunk/ctp2_code/ai/strategy/agents/ctpagent.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/scheduler.cpp
modified trunk/ctp2_code/ai/strategy/squads/Squad.cpp
modified trunk/ctp2_code/ai/strategy/squads/Squad.h
modified trunk/ctp2_code/ctp/civctp.dsp

[Martin Gühmann]

Revision 914

Merged Squad into Agent, no need for an additional class, just wastes space:
modified trunk/ctp2_code/ai/ctpai.cpp
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
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler_types.h
deleted trunk/ctp2_code/ai/strategy/squads/Squad.cpp
deleted trunk/ctp2_code/ai/strategy/squads/Squad.h
modified trunk/ctp2_code/ctp/civctp.dsp

[Martin Gühmann]

Revision 915

Removed more useless virtual destructors and inlined short functions:
modified trunk/ctp2_code/ai/CityManagement/governor.h
modified trunk/ctp2_code/ai/mapanalysis/mapanalysis.h
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/squads/squad_Strength.cpp
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.h

[Maquiladora]

Revision 916

Changed numbers above rations and wages slider on empire manager to show real numbers used.

modified trunk/ctp2_data/english/gamedata/ldl_str.txt

I'll commit the other languages shortly now I know how to do them all at once.

[Maquiladora]

Revision 917

Changed numbers above rations and wages slider on empire manager to show real numbers used.

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

Revision 918

modified trunk/ctp2_data/german/gamedata/ldl_str.txt

For some reason the German one didn't commit the first time.

[Maquiladora]

Revision 919

map.txt - fixed maps generating too many hills, but perhaps it needs further tweaking to increase hills a little more without generating too many.

units.txt - disabled longbowman. upgrade paths from Apolyton Pack added.

terrain.txt - restored original river, terrain and terraforming options (new freight, goods, ruins and upgrade flag stay the same).

const.txt - disabled elite units and trade bonus through cities.

Great_Library.txt - fixed incorrect information for terraforming jungle, desert mountain and swamp.

modified trunk/ctp2_data/default/gamedata/Const.txt
modified trunk/ctp2_data/default/gamedata/Units.txt
modified trunk/ctp2_data/default/gamedata/map.txt
modified trunk/ctp2_data/default/gamedata/terrain.txt
modified trunk/ctp2_data/english/gamedata/Great_Library.txt
modified trunk/ctp2_data/french/gamedata/Great_Library.txt
modified trunk/ctp2_data/german/gamedata/Great_Library.txt
modified trunk/ctp2_data/italian/gamedata/Great_Library.txt
modified trunk/ctp2_data/spanish/gamedata/Great_Library.txt

[Martin Gühmann]

Revision 920: More AI optimizations:

Some cleanings:
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
modified trunk/ctp2_code/gs/world/Cell.cpp

Optimized some AI code:
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp

[Maquiladora]

Revision 921

Units.txt

- fixed active defence for destroyer, plasma destroyer, leviathan, morey striker and interceptor to match Great Library.
- reverted changes made to upgrade paths of Warrior and Samurai.

Great_Library.txt

- removed line for Hospital saying it increased max city size and fixed overcrowding line.

upc053.tga, upc054.tga, upc055.tga, upc056.tga

- added new thick borders (enabled via "smooth borders" option)

modified trunk/ctp2_data/default/gamedata/Units.txt
modified trunk/ctp2_data/default/graphics/pictures/upc053.TGA
modified trunk/ctp2_data/default/graphics/pictures/upc054.TGA
modified trunk/ctp2_data/default/graphics/pictures/upc055.TGA
modified trunk/ctp2_data/default/graphics/pictures/upc056.TGA
modified trunk/ctp2_data/english/gamedata/Great_Library.txt
modified trunk/ctp2_data/french/gamedata/Great_Library.txt
modified trunk/ctp2_data/german/gamedata/Great_Library.txt
modified trunk/ctp2_data/italian/gamedata/Great_Library.txt
modified trunk/ctp2_data/spanish/gamedata/Great_Library.txt

[Martin Gühmann]

Revision 922: Added back trench generation and fixed a some surprises of the old ConstDB:

The right amount productions is lost again after a build item change:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp

Remove superpowers of veteran units:
modified trunk/ctp2_code/gs/gameobj/CTP2Combat.h
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp

Added back trench generation, and fixed it. In addition fixed map hill and mountain generation:
modified trunk/ctp2_code/gs/world/wldgen.cpp

Reverted Maq's changes, since the map generation should work again with the coorections in wldgen.cpp:
modified trunk/ctp2_data/default/gamedata/map.txt

[Martin Gühmann]

Revision 923: Fixed an event error, and AI garrison after city conquest:

Some cleanings:
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h

Fixed an event error:
modified trunk/ctp2_code/gs/gameobj/Player.cpp

Simplified code:
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

Fixed AI garrison after city conquest:
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp

[Martin Gühmann]

Revision 924

Removed the goal pointer from the plan class, some less data to copy and to keep in sync:
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
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h

Removed some warnings that appear on a VC8 compiler:
modified trunk/ctp2_code/ctp/c3.h

[Martin Gühmann]

Revision 925

Removed the last remaining functionality of the squad class. This saves memory and a lot of memory allocations and deallocations, so that the AI is sped up. And it reduces the number of references that have to be kept in sync on copy.

Furthermore, another problem in the AI garrison unit assignment was fixed.

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/scheduler.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h

[Martin Gühmann]

Revision 926

Fixed scheduler copying, now the references in the goal and agent classes are not copied anymore, but recreated afterwards, so that the references point to the right objects:
modified trunk/ctp2_code/ai/strategy/agents/agent.cpp
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/Plan.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h

Not supposed to be in:
modified trunk/ctp2_code/ctp/civ3_main.cpp
modified trunk/ctp2_code/ctp/civpaths.txt

Revision 927
Reverted changes from last revision, those files slipped through accidentally:
modified trunk/ctp2_code/ctp/civ3_main.cpp
modified trunk/ctp2_code/ctp/civpaths.txt

[Martin Gühmann]

Revision 928: Fixed the scheduler, and simplified AI code

Some cleanings
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/ai/ctpai.h
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp

When a new civ is added to the end of the schedulers, and is destroyed immediately (i.e. slave uprising) and the slot is used by another civ the game does not crash anymore.
Simplified the AI code:
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h

[Martin Gühmann]

Revision 929: Cleaned up the AI more

All agents are added to the match list of a goal, except those that are dead:
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/ai/strategy/goals/Goal.h

Removed unnecessary code:
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h

[Maquiladora]

Added new combat option to rules screen.
If option is on, front line units of a defending army will use their defence stat (rather than attack) to attack the front line units of the attacking army.
See this post for details: http://apolyton.net/forums/showpost....93&postcount=1

Revision 930:

modified trunk/ctp2_code/gs/database/profileDB.cpp
modified trunk/ctp2_code/gs/database/profileDB.h
modified trunk/ctp2_code/gs/gameobj/CTP2Combat.cpp
modified trunk/ctp2_code/gs/gameobj/CTP2Combat.h
modified trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp

Revision 931:

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

[Maquiladora]

Revision 932:

Fixed check on counter-attacking units using new combat option.

modified trunk/ctp2_code/gs/gameobj/CTP2Combat.cpp
modified trunk/ctp2_code/gs/gameobj/CTP2Combat.h

[Maquiladora]

Revision 933:

Removed new combat option from advanced options menu, to prevent cheating.

modified trunk/ctp2_code/gs/database/profileDB.cpp

[Maquiladora]

Revision 934:

Units with defence > 0 but 0 attack no longer die immediately, and will at least defend themselves. If newcombat rule is enabled they will also counter-attack. Only an army containing units all with 0 attack and 0 defence will die immediately.

Note todo: units that die immediately do not show the death animation, this needs to be fixed because it worked in Activision 1.1 patch. Don't know when it was broken, at least a year old I would guess.

modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp

[Maquiladora]

Revision 935:

Added CreateBuilding and CreateWonder slic functions.

The difference with the same events is that the functions don't effect stored production in a city. And in the case of the CreateWonder event, doesn't trigger the wonder movie.

And actually I think the CreateWonder event is buggy when generated from slic, because the game freezes. Possibly related to the movie.

modified trunk/ctp2_code/gs/slic/SlicEngine.cpp
modified trunk/ctp2_code/gs/slic/SlicFunc.h
modified trunk/ctp2_code/gs/slic/slicfunc.cpp

[Maquiladora]

OK hopefully I didn't break too much.

Revision 936:

- Expanded "New Combat" option. Details in this thread: http://apolyton.net/forums/showthread.php?t=104846
modified trunk/ctp2_code/gs/gameobj/CTP2Combat.cpp
modified trunk/ctp2_code/gs/gameobj/CTP2Combat.h

- Fixed some unit bonus calculations for all combat:
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
modified trunk/ctp2_code/gs/gameobj/UnitData.h

- Added "City Land Attack", "City Air Attack" and "City Sea Attack" to show the building bonuses in battleview window:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/gameobj/citydata.h
modified trunk/ctp2_code/gs/gameobj/unitutil.cpp
modified trunk/ctp2_code/gs/gameobj/unitutil.h
modified trunk/ctp2_code/ui/interface/battle.cpp
modified trunk/ctp2_code/ui/interface/battle.h
modified trunk/ctp2_code/ui/interface/battleview.cpp
modified trunk/ctp2_code/ui/interface/battleview.h
modified trunk/ctp2_code/ui/interface/battleviewwindow.cpp
modified trunk/ctp2_code/ui/interface/battleviewwindow.h

Revision 937:

- Rest of the battleview attack building modifications:
modified trunk/ctp2_data/english/gamedata/ldl_str.txt
modified trunk/ctp2_data/english/uidata/layouts/battleview.ldl
modified trunk/ctp2_data/french/gamedata/ldl_str.txt
modified trunk/ctp2_data/french/uidata/layouts/battleview.ldl
modified trunk/ctp2_data/german/gamedata/ldl_str.txt
modified trunk/ctp2_data/german/uidata/layouts/battleview.ldl
modified trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified trunk/ctp2_data/italian/uidata/layouts/battleview.ldl
modified trunk/ctp2_data/japanese/gamedata/ldl_str.txt
modified trunk/ctp2_data/japanese/uidata/layouts/battleview.ldl
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt
modified trunk/ctp2_data/spanish/uidata/layouts/battleview.ldl

[Maquiladora]

Revision 938:

Added new slic function UnitMovementLeft(unit), returns movement same as terrain.txt. 100 = 1 move, 33 = a single road move etc.

modified trunk/ctp2_code/gs/slic/SlicEngine.cpp
modified trunk/ctp2_code/gs/slic/SlicFunc.h
modified trunk/ctp2_code/gs/slic/slicfunc.cpp

[Maquiladora]

Revision 939:

Modified CheckActiveDefenders to only fire when there's a valid target and still alive. This removes the exploit of making a full army of active-defender's waste their active defence on one unit.
Also removed counter-bombarding and counter-active-defense fire after an active defender has fired, to remove the big disadvantage of being the defender, and it was very cheesy to look at.

modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp

Fixed comments made on previous changes.

modified trunk/ctp2_code/gs/gameobj/CTP2Combat.cpp

[Maquiladora]

Revision 940:

Fixed attack=0 units being allowed to initiate an attack if they had "CanAttack" flag (Cyber Ninja for some reason).

modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp

[Maquiladora]

Revision 941:

Modified Bombard so ranged units and defenders use same bonuses as they do in combat.

modified trunk/ctp2_code/gs/gameobj/UnitData.cpp