Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update research headers. Closes ticket:2952

master
Per Inge Mathisen 2011-12-18 14:17:19 +01:00
parent a6fa286dcf
commit d19681daab
8 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/mp/stats/research/multiplayer/redcomponents.txt
View File

@ -1,3 +1,4 @@
Research ID,Component ID,unused
R-Comp-CommandTurret02,CommandTurret1,WEAPON,10
R-Comp-CommandTurret03,CommandTurret2,WEAPON,10
R-Comp-CommandTurret04,CommandTurret3,WEAPON,10

1
data/mp/stats/research/multiplayer/redstructure.txt
View File

@ -1,3 +1,4 @@
Research ID,Structure ID,unused
R-Defense-AASite-QuadRotMg,AASite-QuadMg1,189
R-Defense-Emplacement-HPVcannon,PillBox4,130
R-Defense-GuardTower-ATMiss,GuardTower5,123

2
data/mp/stats/research/multiplayer/research.txt
View File

@ -1,4 +1,4 @@
Research ID,-,Left icon,Major tech,Right icon,IMD,-,MsgName,StructName,CompName,CompType,ResearchPoints,keyTopic,Prereqs,Function results,Structure prereqs,Redundant structures,Structure results,Redundant components,Component results
Research ID,unused,Subgroup icon,Major tech,Main icon,IMD,IMD2,MsgName,StructName,CompName,CompType,ResearchPoints,keyTopic,unused,unused,unused,unused,unused,unused,unused
R-Cyborg-Wpn-Thermite,Level Two,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_TFL,0,Flame2,WEAPON,900,0,0,0,0,0,0,0,0
R-Cyborg-Wpn-Grenade,Level Two,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_GRN,0,Mortar1Mk1,WEAPON,900,0,0,0,0,0,0,0,0
R-Cyborg-Sys-ComEng,Level One,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYS_CEN,0,Spade1Mk1,CONSTRUCT,600,0,0,0,0,0,0,0,0

1
data/mp/stats/research/multiplayer/researchfunctions.txt
View File

@ -1,3 +1,4 @@
Research ID,Function ID,unused
R-Struc-PowerModuleMk1,Struc-PowerModuleMk1,225
R-Vehicle-Engine01,Vehicle-Engine01,381
R-Vehicle-Engine02,Vehicle-Engine02,382

1
data/mp/stats/research/multiplayer/researchstruct.txt
View File

@ -1,3 +1,4 @@
Research ID,Structure ID,unused
R-Defense-Tower01,A0CommandCentre,0
R-Defense-Tower06,A0CommandCentre,0
R-Defense-Pillbox01,A0CommandCentre,0

1
data/mp/stats/research/multiplayer/resultcomponent.txt
View File

@ -1,3 +1,4 @@
Research ID,Component ID,Type,Replaced Component,Replaced Type,unused
R-Wpn-AAGun02,AAGun2Mk1,WEAPON,0,0,10
R-Wpn-AALaser,AAGunLaser,WEAPON,0,0,10
R-Sys-Autorepair-General,AutoRepair,REPAIR,ZNULLREPAIR,REPAIR,6

1
data/mp/stats/research/multiplayer/resultstructure.txt
View File

@ -1,3 +1,4 @@
Research ID,Structure ID,unused,unused
R-Defense-AA-Laser,P0-AASite-Laser,0,340
R-Defense-AASite-QuadBof,AASite-QuadBof,0,188
R-Defense-AASite-QuadMg1,AASite-QuadMg1,0,189

29
src/research.cpp
View File

@ -303,7 +303,7 @@ bool loadResearch(const char *pResearchData, UDWORD bufferSize)
//Load the pre-requisites for a research list
bool loadResearchPR(const char *pPRData, UDWORD bufferSize)
{
const unsigned int NumToAlloc = numCR(pPRData, bufferSize);
unsigned NumToAlloc = numCR(pPRData, bufferSize);
char ResearchName[MAX_STR_LENGTH], PRName[MAX_STR_LENGTH];
for (int i = 0; i < NumToAlloc; i++)
@ -345,11 +345,18 @@ bool loadResearchPR(const char *pPRData, UDWORD bufferSize)
//Load the artefacts for a research list
bool loadResearchArtefacts(const char *pArteData, UDWORD bufferSize, UDWORD listNumber)
{
const unsigned int NumToAlloc = numCR(pArteData, bufferSize);
unsigned NumToAlloc = numCR(pArteData, bufferSize);
char ResearchName[MAX_STR_LENGTH], ArteName[MAX_STR_LENGTH], TypeName[MAX_STR_LENGTH];
COMPONENT_STATS *pArtefact;
UDWORD newType;
// Skip descriptive header
if (strncmp(pArteData, "Research ", 9) == 0)
{
pArteData = strchr(pArteData, '\n') + 1;
NumToAlloc--;
}
for (int i = 0; i < NumToAlloc; i++)
{
//read the data into the storage - the data is delimited using commas
@ -437,13 +444,20 @@ bool loadResearchArtefacts(const char *pArteData, UDWORD bufferSize, UDWORD list
//Load the Structures for a research list
bool loadResearchStructures(const char *pStructData, UDWORD bufferSize,UDWORD listNumber)
{
const unsigned int NumToAlloc = numCR(pStructData, bufferSize);
unsigned NumToAlloc = numCR(pStructData, bufferSize);
unsigned int i = 0;
char ResearchName[MAX_STR_LENGTH], StructureName[MAX_STR_LENGTH];
UWORD incR, incS;
STRUCTURE_STATS *pStructure = asStructureStats;
bool recFound;
// Skip descriptive header
if (strncmp(pStructData, "Research ", 9) == 0)
{
pStructData = strchr(pStructData, '\n') + 1;
NumToAlloc--;
}
for (i = 0; i < NumToAlloc; i++)
{
recFound = false;
@ -513,13 +527,20 @@ bool loadResearchStructures(const char *pStructData, UDWORD bufferSize,UDWORD li
//Load the pre-requisites for a research list
bool loadResearchFunctions(const char *pFunctionData, UDWORD bufferSize)
{
const unsigned int NumToAlloc = numCR(pFunctionData, bufferSize);
unsigned NumToAlloc = numCR(pFunctionData, bufferSize);
unsigned int i = 0;
char ResearchName[MAX_STR_LENGTH], FunctionName[MAX_STR_LENGTH];
UDWORD incR, incF;
FUNCTION **pFunction = asFunctions;
bool recFound;
// Skip descriptive header
if (strncmp(pFunctionData, "Research ", 9) == 0)
{
pFunctionData = strchr(pFunctionData, '\n') + 1;
NumToAlloc--;
}
for (i=0; i < NumToAlloc; i++)
{
recFound = false;