From 30e13e1e2609de502a339bec49d840e0e17f01f4 Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 21 Aug 2012 20:36:47 +0000 Subject: [PATCH] New feature: The M.E.R.C. website now also has gearkits (by JMich) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5490 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/mercs Account.cpp | 24 ++++++++++++++++++++++-- Laptop/mercs Files.cpp | Bin 69832 -> 119712 bytes Tactical/soldier profile type.h | 2 ++ Utils/Text.h | 2 ++ Utils/_ChineseText.cpp | 2 ++ Utils/_DutchText.cpp | 2 ++ Utils/_EnglishText.cpp | 2 ++ Utils/_FrenchText.cpp | 2 ++ Utils/_GermanText.cpp | 2 ++ Utils/_ItalianText.cpp | 2 ++ Utils/_PolishText.cpp | 2 ++ Utils/_RussianText.cpp | 2 ++ Utils/_TaiwaneseText.cpp | 2 ++ 13 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Laptop/mercs Account.cpp b/Laptop/mercs Account.cpp index 500ec65e..bc62cfe8 100644 --- a/Laptop/mercs Account.cpp +++ b/Laptop/mercs Account.cpp @@ -212,6 +212,11 @@ INT32 GetNumberOfHiredMercs() #else uiContractCharge = gMercProfiles[ usMercID ].sSalary * gMercProfiles[ usMercID ].iMercMercContractLength; #endif + //JMich_MMG: If gearkit unpaid for, add it to cost + if ( gMercProfiles[ usMercID ].ubMiscFlags2 & PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID) + { + uiContractCharge += gMercProfiles[ usMercID ].usOptionalGearCost; + } giMercTotalContractCharge += uiContractCharge; count++; @@ -579,6 +584,11 @@ void DisplayHiredMercs() #else uiContractCharge = gMercProfiles[ usMercID ].sSalary * gMercProfiles[ usMercID ].iMercMercContractLength; #endif + //JMich_MMG: If gearkit unpaid for, add its cost + if ( gMercProfiles[ usMercID ].ubMiscFlags2 & PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID) + { + uiContractCharge += gMercProfiles[ usMercID ].usOptionalGearCost; + } swprintf(sTemp, L"$%6d", uiContractCharge ); DrawTextToScreen(sTemp, MERC_AC_FOURTH_COLUMN_X, usPosY, MERC_AC_FOURTH_COLUMN_WIDTH, MERC_ACCOUNT_DYNAMIC_TEXT_FONT, ubFontColor, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); @@ -621,15 +631,20 @@ void SettleMercAccounts() #else iContractCharge = gMercProfiles[ ubMercID ].sSalary * gMercProfiles[ ubMercID ].iMercMercContractLength; #endif - + //JMich_MMG: If gearkit unpaid for, add its cost + if (gMercProfiles[ ubMercID ].ubMiscFlags2 & PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID) + { + iContractCharge += gMercProfiles[ ubMercID ].usOptionalGearCost; + } //if the player can afford to pay this merc if( LaptopSaveInfo.iCurrentBalance >= iPartialPayment + iContractCharge ) { //Increment the counter that keeps track of the of the number of days the player has paid for merc services LaptopSaveInfo.guiNumberOfMercPaymentsInDays += gMercProfiles[ ubMercID ].iMercMercContractLength; - //Then reset the merc contract counter + //Then reset the merc contract counter (and remove the unpaid gearkit flag) gMercProfiles[ ubMercID ].iMercMercContractLength = 0; + gMercProfiles[ ubMercID ].ubMiscFlags2 &= (~PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID); //Add this mercs contract charge to the total iPartialPayment += iContractCharge; @@ -814,8 +829,13 @@ UINT32 CalculateHowMuchPlayerOwesSpeck() #else uiContractCharge += gMercProfiles[ usMercID ].sSalary * gMercProfiles[ usMercID ].iMercMercContractLength; #endif + //JMich_MMG: If gearkit unpaid for, add its cost + if ( gMercProfiles[ usMercID ].ubMiscFlags2 & PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID) + { + uiContractCharge += gMercProfiles[ usMercID ].usOptionalGearCost; } } + } return( uiContractCharge ); } diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index 9839f9a5f63c0e54d2398725100fa87f6893dced..d263d4653b4c623e0a23ac586ed2a958c60360a1 100644 GIT binary patch literal 119712 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 GoBjdFS;Ald diff --git a/Tactical/soldier profile type.h b/Tactical/soldier profile type.h index b0626dbe..f5ce42d9 100644 --- a/Tactical/soldier profile type.h +++ b/Tactical/soldier profile type.h @@ -38,6 +38,8 @@ #define PROFILE_MISC_FLAG2_NEEDS_TO_SAY_HOSTILE_QUOTE 0x10 #define PROFILE_MISC_FLAG2_MARRIED_TO_HICKS 0x20 #define PROFILE_MISC_FLAG2_ASKED_BY_HICKS 0x40 +//JMich_MMG: Flag to see if gearkit cost is still unpaid for +#define PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID 0x80 #define PROFILE_MISC_FLAG3_PLAYER_LEFT_MSG_FOR_MERC_AT_AIM 0x01 // In the aimscreen, the merc was away and the player left a message #define PROFILE_MISC_FLAG3_PERMANENT_INSERTION_CODE 0x02 diff --git a/Utils/Text.h b/Utils/Text.h index 459a5ea6..2448b60c 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -923,6 +923,8 @@ enum MERC_FILES_HIRE_TO_MANY_PEOPLE_WARNING, MERC_FILES_MERC_UNAVAILABLE, + MERC_FILES_BIO, //JMich_MMG: Adding two new texts for the small button, assuming we manage to add a silhouette with the gear, add it after this. + MERC_FILES_INVENTORY, TEXT_NUM_MERC_FILES, }; extern STR16 MercInfo[]; diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index acacede4..bb09952c 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -4224,6 +4224,8 @@ STR16 MercInfo[] = L"看起来你雇佣了太多的佣兵。最多只能雇18人。", //"Looks like you're trying to hire too many mercs. Your limit is 18.", L"不可雇佣", //"Unavailable", + L"Bio", //TODO.Translate + L"Inv", }; diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index a85f9d87..db9af0c5 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -4224,6 +4224,8 @@ STR16 MercInfo[] = L"Lijkt erop dat je teveel huurlingen wil recruteren. Limiet is 18.", L"Niet beschikbaar", + L"Bio", //TODO.Translate + L"Inv", }; diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 2e113d59..3ff9ec5d 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -4222,6 +4222,8 @@ STR16 MercInfo[] = L"Looks like you're trying to hire too many mercs. Your limit is 18.", L"Unavailable", + L"Bio", + L"Inv", }; diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 2651cfde..bfe884c1 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -4214,6 +4214,8 @@ STR16 MercInfo[] = L"Vous ne pouvez engager plus de 18 mercenaires.", L"Indisponible", + L"Bio", //TODO.Translate + L"Inv", }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index ad6722ca..ee5d65bc 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -4149,6 +4149,8 @@ STR16 MercInfo[] = L"Sie versuchen, zu viele Söldner anzuheuern. Sie haben die Maximalanzahl erreicht.", L"nicht da", + L"Bio", //TODO.Translate + L"Inv", }; // For use at the M.E.R.C. web site. Text relating to opening an account with MERC diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 710324d7..6785f901 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -4212,6 +4212,8 @@ STR16 MercInfo[] = L"Sembra che state arruolando troppi mercenari. Il vostro limite è di 18.", L"Non disponibile", + L"Bio", //TODO.Translate + L"Inv", }; diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 1229166f..693d3dbe 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -4220,6 +4220,8 @@ STR16 MercInfo[] = L"Wygląda na to, że chcesz wynająć zbyt wielu najemników. Limit wynosi 18.", L"Niedostępny", + L"Bio", //TODO.Translate + L"Inv", }; diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 7eb80b7f..4c6b07d2 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -4211,6 +4211,8 @@ STR16 MercInfo[] = L"Похоже, вы пытаетесь нанять более 18 наемников, а это недопустимо.", L"Недоступно", + L"Bio", //TODO.Translate + L"Inv", }; diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 48da1368..294b9de5 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -4225,6 +4225,8 @@ STR16 MercInfo[] = L"Looks like you're trying to hire too many mercs. Your limit is 18.", L"Unavailable", + L"Bio", //TODO.Translate + L"Inv", };