PROJECT: Revision Reports

[Ekmek]

Revision 605

gameobj/ArmyData.cpp
- fixed pillage method

gameobj/CityData.cpp
- IsBonusGood implemented allows goods not on map to be enabled
- Civ Science, Commerce, production, and Food bonus implemented

gameobj/Player.cpp & h
- add civ bonus methods science, commerce, production, food, boatmvmt, increasehp

gameobj/UnitData.cpp
- Add Civ Bonuses for Boatmvmt, increaeHp, offenseland, sea, AiRegisterAllObjects

newdb/Civilisation.cdb
- updated flags removed unnecesaary flags

gamedata/script.slc
- added Show() to some messages

I didn't correct the error in the previous post, not sure whats going on there.

Also I noticed in diplomat.cpp slic calls: DIPLOMACY_POPUP_DECLARE_WAR and DIPLOMACY_POPUP_GREETING but didn't see those lines called anywhere. I think the declare war part might be why we don't get a popup saying so and so declared war on us.

[Fromafar]

Revision 606

DiffDB type correction for e.g. Alexander scenario
Modified: ctp2_code\gs\newdb\Difficulty.cdb

std::max ambiguity repaired
Modified: ctp2_code\ui\aui_common\aui_control.cpp

MSVS 2005 updates
Modified: ctp2_code\ui\aui_ctp2\lots of files

[Ekmek]

another one same problem

F:\SVN-Code\trunk\ctp2_code\ui\aui_ctp2\thermometer.cpp(149) : error C2782: 'const T &__cdecl std::min(const T &,const T &)' : template parameter 'T' is ambiguous
        could be 'long'
        or       'int'

[Fromafar]

Revision 607
std::max ambiguity repaired
Modified: ctp2_code\ui\aui_ctp2\thermometer.cpp

MSVS 2005 updates
Modified: ctp2_code\gfx\tilesys\maputils.cpp
Modified: ctp2_code\gfx\tilesys\maputils.h
Modified: ctp2_code\ui\aui_ctp2\linegraph.cpp
Modified: ctp2_code\ui\aui_ctp2\picture.cpp
Modified: ctp2_code\ui\interface\lots of files

To solve the ambiguity errors: just help the compiler a little by adding the type you expect, as in std::min<sint32>(arg1, arg2).

[Ekmek]

Revision 608

gameobj/ArmyData.cpp
- implemented ConstDB ChanceLostAtSea
- implemented Wonder EnablesPunativeAirstrikes

gameobj/CityData.cpp
- implemented Advances can give bonuses to a city's Food, Science, Commerce, and Production

gameobj/wonderutil.cpp & h
- created GetEnablesPunativeAirstrikes

newdb/advance.cdb
newdb/unit.cdb
- updated flags

[Ekmek]

Revision 609

ai/diplomacy/sstateevent.cpp
gameobj/Happy.cpp
- added AINoCityLimit difficulty setting that removes unhappiness for AI

gameobj/ArmyData.cpp
- fixed PunativeAirstrike in bombard method
- added difficulty to let AI ships move without sinking (AINoSinking)

newdb/Difficulty.cdb
newdb/terrimprove.cdb

[Fromafar]

Revision 610

Removed old event hooks when cleaning up the Slic engine (weird Slic errors with the Alexander scenario).
Modified: ctp2_code\gs\slic\SlicSegment.cpp

Prevented compiler warnings and asserts.
Modified: ctp2_code\gs\events\GameEvent.cpp
Modified: ctp2_code\gs\events\GameEvent.h
Modified: ctp2_code\gs\events\GameEventHook.cpp
Modified: ctp2_code\gs\events\GameEventHook.h
Modified: ctp2_code\gs\events\GameEventManager.cpp
Modified: ctp2_code\gs\events\GameEventManager.h
Modified: ctp2_code\gs\slic\SlicEngine.cpp
Modified: ctp2_code\gs\slic\SlicFrame.cpp
Modified: ctp2_code\gs\slic\SlicNamedSymbol.cpp
Modified: ctp2_code\gs\slic\slicfuncai.cpp
Modified: ctp2_code\gs\slic\slicif.cpp

Cleaned up some mod stuff that accidentally was placed in the main data files.
Modified: ctp2_data\default\aidata\personalities.txt
Modified: ctp2_data\default\gamedata\Const.txt
Modified: ctp2_data\default\gamedata\DiffDB.txt
Modified: ctp2_data\default\gamedata\Units.txt

Updated credits to include zlib.
Modified: ctp2_data\default\uidata\credits.txt

[Ekmek]

Originally posted by Fromafar

Cleaned up some mod stuff that accidentally was placed in the main data files.
Modified: ctp2_data\default\aidata\personalities.txt
Modified: ctp2_data\default\gamedata\Const.txt
Modified: ctp2_data\default\gamedata\DiffDB.txt
Modified: ctp2_data\default\gamedata\Units.txt

Actually, that was some stuff that we changed to make the AI more aggressive, add unit upgrading, and overall improve gameplay.

[Martin Gühmann]

Originally posted by E
Actually, that was some stuff that we changed to make the AI more aggressive, add unit upgrading, and overall improve gameplay.

Actuallz const.txt was some mod file. It contained a modified end year date which I'll never accept in this way. So Fromafar was just consequent by removing them all so that you look next time more carefully in respect of what you change.

-Martin

[Ekmek]

Ok, const.txt was a modified version of apolpack so I go and scrub it. ZBy the way what can be done about the new game crash when you try to play more than 11 players?

http://www.apolyton.net/forums/showthread.php?s=&threadid=154317

[Fromafar]

Revision 611 Updated tiff (3.8.2) library

Modified: ctp2_code\ctp\libtiff3.dll
Modified: ctp2_code\libs\tiff\libtiff.lib
Modified: ctp2_code\libs\tiff\tiff.h
Modified: ctp2_code\libs\tiff\tiffconf.h
Modified: ctp2_code\libs\tiff\tiffio.h
Modified: ctp2_code\libs\tiff\tiffvers.h
Modified: ctp2_code\os\include\ctp2_inttypes.h

[Fromafar]

Revision 612 MSVS 2005 updates (no functional changes)

Modified: ctp2_code\ui\netshell\some files

[Martin Gühmann]

Originally posted by E
Ok, const.txt was a modified version of apolpack so I go and scrub it.

Actually you also did some modifications of personalities.txt that I don't accept, because they are designed so that the AI stops settling/conquering/inciting revolutions (if it ha the wonder) when it reaches the city limit. If the AI stops expansion clearly before it has reached the city cap, then there is a falure and the underlying defect is located in the CTP2 source code and nowhere else.

Modifying text files in this situation is just doing some bloody workarounds. But the avoiding such bloody workarounds is the purpose of the CTP2 source code. Therefore I don't want to see any of those workarounds.

Originally posted by E
By the way what can be done about the new game crash when you try to play more than 11 players?

You could initialize g_player earlier, or you could do an additional NULL check at the right location, but that is not the clean way, because the government modifers should be applied.

-Martin

[Ekmek]

Originally posted by Martin Gühmann


Actually you also did some modifications of personalities.txt that I don't accept, because they are designed so that the AI stops settling/conquering/inciting revolutions (if it ha the wonder) when it reaches the city limit. If the AI stops expansion clearly before it has reached the city cap, then there is a falure and the underlying defect is located in the CTP2 source code and nowhere else.

Modifying text files in this situation is just doing some bloody workarounds. But the avoiding such bloody workarounds is the purpose of the CTP2 source code. Therefore I don't want to see any of those workarounds.

I thought I restored personalities to the 2000 for settling but adding CityLimit modifiers. I disagree with each personality the same though and I think the chnaged values I had before helped a lot.

the problem with settling is that the AI seems to stop building settlers after city #6, generally the starting limit is 10. I can accept that except when the AI changes govts it doesn't accept the new limit either and produces no settlers. After city 6 which is about turn 50 or 100 the AI stops expanding which really drags on gameplay.

You could initialize g_player earlier, or you could do an additional NULL check at the right location, but that is not the clean way, because the government modifers should be applied.

I'd happily start working on this but where is g_player initialize or what do I look for to find it. you said it wasnt in player.cpp

[Ekmek]

Fromafar I'm getting a bunch of errors

F:\SVN-Code\trunk\ctp2_code\gfx\tilesys\TileSet.cpp(461) : error C2664: 'void *__thiscall ProjectFile::getData(char *,long *,enum C3DIR)' : cannot convert parameter 2 from 'int *' to 'long *'
Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast

F:\SVN-Code\trunk\ctp2_code\gfx\spritesys\Director.cpp(33 56) : error C2665: 'maputils_MapXY2PixelXY' : none of the 3 overloads can convert parameter 3 from type 'long *'
F:\SVN-Code\trunk\ctp2_code\gfx\spritesys\Director.cpp(33 57) : error C2665: 'maputils_MapXY2PixelXY' : none of the 3 overloads can convert parameter 3 from type 'long *'
F:\SVN-Code\trunk\ctp2_code\gfx\spritesys\Director.cpp(34 82) : error C2665: 'maputils_MapXY2PixelXY' : none of the 3 overloads can convert parameter 3 from type 'long *'
F:\SVN-Code\trunk\ctp2_code\gfx\spritesys\Director.cpp(34 83) : error C2665: 'maputils_MapXY2PixelXY' : none of the 3 overloads can convert parameter 3 from type 'long *'
F:\SVN-Code\trunk\ctp2_code\gfx\spritesys\Director.cpp(42 72) : error C2665: 'maputils_MapXY2PixelXY' : none of the 3 overloads can convert parameter 3 from type 'long *'
F:\SVN-Code\trunk\ctp2_code\gfx\spritesys\Director.cpp(42 74) : error C2665: 'maputils_MapXY2PixelXY' : none of the 3 overloads can convert parameter 3 from type 'long *'
F:\SVN-Code\trunk\ctp2_code\gfx\spritesys\Director.cpp(44 74) : error C2665: 'maputils_MapXY2PixelXY' : none of the 3 overloads can convert parameter 3 from type 'long *'
F:\SVN-Code\trunk\ctp2_code\gfx\spritesys\Director.cpp(44 76) : error C2665: 'maputils_MapXY2PixelXY' : none of the 3 overloads can convert parameter 3 from type 'long *'

F:\SVN-Code\trunk\ctp2_code\gfx\spritesys\ActorPath.cpp(9 3) : error C2665: 'maputils_MapXY2PixelXY' : none of the 3 overloads can convert parameter 3 from type 'long *'
F:\SVN-Code\trunk\ctp2_code\gfx\spritesys\ActorPath.cpp(9 5) : error C2665: 'maputils_MapXY2PixelXY' : none of the 3 overloads can convert parameter 3 from type 'long *'