diff --git a/Strategic/Game Init.cpp b/Strategic/Game Init.cpp index 873681762..edf1b6e72 100644 --- a/Strategic/Game Init.cpp +++ b/Strategic/Game Init.cpp @@ -1191,6 +1191,8 @@ void ReStartingGame() // HEADROCK PROFEX: Create mercopinions xml output WriteMercOpinions(); + + WriteMercStartingGearStats(); } // Reload quote files diff --git a/Tactical/XML_MercStartingGear.cpp b/Tactical/XML_MercStartingGear.cpp index 2d9cba899..35c8b4202 100644 --- a/Tactical/XML_MercStartingGear.cpp +++ b/Tactical/XML_MercStartingGear.cpp @@ -655,7 +655,6 @@ BOOLEAN ReadInMercStartingGearStats(STR fileName, BOOLEAN localizedVersion) return( TRUE ); } -/* BOOLEAN WriteMercStartingGearStats() { //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"writemercstartinggearstats"); @@ -666,143 +665,95 @@ BOOLEAN WriteMercStartingGearStats() hFile = FileOpen( "TABLEDATA\\MercStartingGear out.xml", FILE_ACCESS_WRITE | FILE_CREATE_ALWAYS, FALSE ); if ( !hFile ) return( FALSE ); - + { UINT32 cnt, gearkit; CHAR16 str[100]; + FilePrintf(hFile, "\r\n"); FilePrintf(hFile,"\r\n"); for(cnt = 0;cnt < NUM_PROFILES;cnt++) { - FilePrintf(hFile,"\t\r\n"); - FilePrintf(hFile,"\t\t%d\r\n", cnt ); - //FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt].mName ); - - - int j = -1; - for (int i=0;i<80;i++) - { - j++; - if ( i<(int)strlen(gMercProfileGear[cnt][gearkit].mName)) - { - str[i] = gMercProfileGear[cnt][gearkit].mName [j]; - } - else - { - str[i] ='\0'; - } - } - STR16 szRemainder = str; - FilePrintf(hFile,"\t\t"); - while(szRemainder[HELMETPOS] != '\0') - { - UINT32 uiCharLoc = wcscspn(szRemainder, L"&<>\'\"\0"); - CHAR16 invChar = szRemainder[uiCharLoc]; - - if(uiCharLoc) - { - szRemainder[uiCharLoc] = '\0'; - FilePrintf(hFile,"%S",szRemainder); - szRemainder[uiCharLoc] = invChar; - } - - szRemainder += uiCharLoc; - - switch(invChar) - { - case '&': - FilePrintf(hFile,"&"); - szRemainder++; - break; - - case '<': - FilePrintf(hFile,"<"); - szRemainder++; - break; - - case '>': - FilePrintf(hFile,">"); - szRemainder++; - break; - - case '\'': - FilePrintf(hFile,"'"); - szRemainder++; - break; - - case '\"': - FilePrintf(hFile,"""); - szRemainder++; - break; - } - } - FilePrintf(hFile,"\r\n"); + FilePrintf(hFile,"\t\t%d\r\n", cnt); + FilePrintf(hFile,"\t\t%s\r\n", gMercProfileGear[cnt][0].mName); for(gearkit = 0; gearkit < NUM_MERCSTARTINGGEAR_KITS; gearkit++) { - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[HELMETPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[VESTPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[LEGPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[HANDPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[HELMETPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[VESTPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[LEGPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[HANDPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[HELMETPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[VESTPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[LEGPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[HANDPOS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[BIGPOCK1POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[BIGPOCK2POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[BIGPOCK3POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[BIGPOCK4POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[BIGPOCK1POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[BIGPOCK2POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[BIGPOCK3POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[BIGPOCK4POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[BIGPOCK1POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[BIGPOCK2POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[BIGPOCK3POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[BIGPOCK4POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[BIGPOCK1POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[BIGPOCK2POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[BIGPOCK3POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[BIGPOCK4POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK1POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK2POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK3POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK4POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK5POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK6POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK7POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK8POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK1POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK2POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK3POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK4POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK5POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK6POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK7POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK8POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK1POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK2POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK3POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK4POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK5POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK6POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK7POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK8POS] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lbe[0] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lbe[1] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lbe[2] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lbe[3] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lbe[4] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lStatus[0] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lStatus[1] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lStatus[2] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lStatus[3] ); - FilePrintf(hFile,"\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lStatus[4] ); - } + if (gearkit > 0 && gMercProfileGear[cnt][gearkit].mGearKitName[0] == '\0') + { + FilePrintf(hFile, "\t\t\r\n"); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].AbsolutePrice); + FilePrintf(hFile, "\t\t\r\n"); + continue; + } + FilePrintf(hFile, "\t\t\r\n"); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].PriceModifier); + FilePrintf(hFile, "\t\t\t%s\r\n", gMercProfileGear[cnt][gearkit].mGearKitName); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].AbsolutePrice); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[HELMETPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[HELMETPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[HELMETPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[VESTPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[VESTPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[VESTPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[LEGPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[LEGPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[LEGPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[HANDPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[HANDPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[HANDPOS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[BIGPOCK1POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[BIGPOCK1POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[BIGPOCK1POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[BIGPOCK1POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[BIGPOCK2POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[BIGPOCK2POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[BIGPOCK2POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[BIGPOCK2POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[BIGPOCK3POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[BIGPOCK3POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[BIGPOCK3POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[BIGPOCK3POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[BIGPOCK4POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[BIGPOCK4POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[BIGPOCK4POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iDrop[BIGPOCK4POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK1POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK1POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK1POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK2POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK2POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK2POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK3POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK3POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK3POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK4POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK4POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK4POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK5POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK5POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK5POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK6POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK6POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK6POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK7POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK7POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK7POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].inv[SMALLPOCK8POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iStatus[SMALLPOCK8POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].iNumber[SMALLPOCK8POS]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lbe[0]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lStatus[0]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lbe[1]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lStatus[1]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lbe[2]); + FilePrintf(hFile, "\t\t\t%d\r\n",gMercProfileGear[cnt][gearkit].lStatus[2]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lbe[3]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lStatus[3]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lbe[4]); + FilePrintf(hFile, "\t\t\t%d\r\n", gMercProfileGear[cnt][gearkit].lStatus[4]); + FilePrintf(hFile, "\t\t\r\n"); + } FilePrintf(hFile,"\t\r\n"); } FilePrintf(hFile,"\r\n"); @@ -810,5 +761,4 @@ BOOLEAN WriteMercStartingGearStats() FileClose( hFile ); return( TRUE ); -} -*/ +} \ No newline at end of file