1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Externalized creature feeding sector CREPITUS_FEEDING_SECTOR (by Buggler)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6725 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-01-02 07:42:24 +00:00
parent e3752a00fc
commit ac83a9600d
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+7 -1
View File
@@ -2672,10 +2672,16 @@ void LoadModSettings(){
gModSettings.CreatureMeanwhileCutscene = iniReader.ReadBoolean("Meanwhile", "CREATURE_MEANWHILE_CUTSCENE", TRUE);
//[End Game]
gModSettings.ubEndGameVictorySectorX = iniReader.ReadInteger("End Game", "VICTORY_SECTOR_X", 3);
gModSettings.ubEndGameVictorySectorY = iniReader.ReadInteger("End Game", "VICTORY_SECTOR_Y", 16);
gModSettings.iEndGameVictoryGridNo = iniReader.ReadInteger("End Game", "VICTORY_POSITION", 5687);
//[Creatures]
gModSettings.ubCrepitusFeedingSectorX = iniReader.ReadInteger("Creatures", "CREPITUS_FEEDING_SECTOR_X", 9);
gModSettings.ubCrepitusFeedingSectorY = iniReader.ReadInteger("Creatures", "CREPITUS_FEEDING_SECTOR_Y", 10);
gModSettings.ubCrepitusFeedingSectorZ = iniReader.ReadInteger("Creatures", "CREPITUS_FEEDING_SECTOR_Z", 2);
}
// silversurfer: load item property modifiers
GameSettings.h
+8 -1
View File
@@ -2073,13 +2073,20 @@ typedef struct
UINT8 ubMeanwhileAddMadlabSector4X;
UINT8 ubMeanwhileAddMadlabSector4Y;
//[End Game]
//victory celebration stuff
UINT8 ubEndGameVictorySectorX;
UINT8 ubEndGameVictorySectorY;
INT32 iEndGameVictoryGridNo;
BOOLEAN CreatureMeanwhileCutscene;
//[Creatures]
//Crepitus Feeding Sector
UINT8 ubCrepitusFeedingSectorX;
UINT8 ubCrepitusFeedingSectorY;
UINT8 ubCrepitusFeedingSectorZ;
}MOD_SETTINGS;
// silversurfer: item property modifiers
Strategic/Creature Spreading.cpp
+6 -5
View File
@@ -404,16 +404,16 @@ void InitCreatureQuest()
}
*/
// determine mine infectible status
// determine mine infectible status in initmines.lua script
for (x = 0; x < MAX_NUMBER_OF_MINES; x++)
{
if( gMineStatus[ x ].fInfectible )
{
if( gMineStatus[ x ].fAttackedHeadMiner ||
//gMineStatus[ x ].uiOreRunningOutPoint ||
!gMineStatus[ x ].fInfectible ||
StrategicMap[ gMineStatus[ x ].StrategicIndex() ].fEnemyControlled )
{ //If head miner was attacked, ore will/has run out, or enemy controlled
{
//If head miner was attacked, ore will/has run out, or enemy controlled
fMineInfectible[ iNumMinesInfectibleLUA ] = FALSE;
}
iNumMinesInfectibleLUA++;
@@ -430,7 +430,7 @@ void InitCreatureQuest()
//// externalize to xml data
//iNumMinesInfectible = fMineInfectible[0] + fMineInfectible[1] + fMineInfectible[2] + fMineInfectible[3];
//count min of infectible sites defined in xml and initmines.lua script
//count actual infectible sites, use min of infectible sites defined in xml and initmines.lua script in case they do not tally
for (x = 0; x < min( NUMBER_OF_INFECTIBLE_SITES, iNumMinesInfectibleLUA ); x++)
{
iNumMinesInfectible += fMineInfectible[x];
@@ -1181,7 +1181,8 @@ void EndCreatureQuest()
}
//Remove the creatures that are trapped underneath Tixa
pSector = FindUnderGroundSector( gModSettings.ubTixaPrisonSectorX, gModSettings.ubTixaPrisonSectorY, 2 );
pSector = FindUnderGroundSector( gModSettings.ubCrepitusFeedingSectorX, gModSettings.ubCrepitusFeedingSectorY,
gModSettings.ubCrepitusFeedingSectorZ ); // (9, 10, 2)
if( pSector )
{
pSector->ubNumCreatures = 0;
Strategic/Creature Spreading.h
+2 -2
View File
@@ -63,8 +63,8 @@ extern UINT8 NUMBER_OF_INFECTIBLE_SITES;
extern UINT8 NUMBER_OF_CREATURE_COMPOSITIONS;
#define MAX_NUMBER_OF_INFECTIBLE_SITES 10
#define MAX_NUMBER_OF_CREATURE_SECTORS 50
#define MAX_NUMBER_OF_CREATURE_COMPOSITIONS 30
#define MAX_NUMBER_OF_CREATURE_SECTORS 255
#define MAX_NUMBER_OF_CREATURE_COMPOSITIONS 50
typedef struct CREATUREHABITAT
{
Strategic/strategicmap.cpp
+2 -1
View File
@@ -2174,7 +2174,8 @@ BOOLEAN SetCurrentWorldSector( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
#ifdef JA2UB
/* Ja25 no creatures */
#else
if( gWorldSectorX == 9 && gWorldSectorY == 10 && gbWorldSectorZ == 2 )
if( gWorldSectorX == gModSettings.ubCrepitusFeedingSectorX && gWorldSectorY == gModSettings.ubCrepitusFeedingSectorY
&& gbWorldSectorZ == gModSettings.ubCrepitusFeedingSectorZ ) // (9, 10, 2)
{
InitCreatureQuest(); //Ignored if already active.
}