From f46083515dbff3c2ecd780578f56b5d40b3da4be Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 13 Sep 2014 15:08:30 +0000 Subject: [PATCH] Externalised amount of debt to MERC at which Speck complains. Note: this does NOT affect wether MERC goes bankrupt, as this is independent of the amount of debt. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7515 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 3 ++- GameSettings.h | 1 + Laptop/mercs.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 7586122d..9b8e43e2 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -879,6 +879,7 @@ void LoadGameExternalOptions() gGameExternalOptions.ubRecruitableJohnKulbaDelay = iniReader.ReadInteger("Recruitment Settings", "RECRUITABLE_JOHN_KULBA_DELAY", 14, 0, 255); // anv: enable JA1 natives as MERC mercs gGameExternalOptions.fEnableRecruitableJA1Natives = iniReader.ReadBoolean("Recruitment Settings", "RECRUITABLE_JA1_NATIVES", TRUE); + gGameExternalOptions.usMERCBankruptWarning = iniReader.ReadInteger("Recruitment Settings", "MERC_BANKRUPT_WARNING", 5000, 5000, 50000 ); // Buggler: setting to show/hide skills/traits in AIM & MERC hiring page gGameExternalOptions.fShowSkillsInHirePage = iniReader.ReadBoolean("Recruitment Settings", "SHOW_SKILLS_IN_HIRING_PAGE", FALSE); @@ -2483,7 +2484,7 @@ void LoadSkillTraitsExternalSettings() gSkillTraitValues.sCODisguiseAPReduction = iniReader.ReadInteger("Covert Ops","COVERT_DISGUISE_PERCENT_AP_REDUCTION", 20, 0, 50); gSkillTraitValues.sCOCloseDetectionRange = iniReader.ReadInteger("Covert Ops","COVERT_CLOSE_DETECTION_RANGE", 10, 0, 100); gSkillTraitValues.sCOCloseDetectionRangeSoldierCorpse = iniReader.ReadInteger("Covert Ops","COVERT_CLOSE_DETECTION_RANGE_SOLDIER_CORPSE", 5, 0, 100); - gSkillTraitValues.usCOEliteUncoverRadius = iniReader.ReadInteger("Covert Ops","COVERT_ELITES_UNCOVER_RADIUS", 6 ); + gSkillTraitValues.usCOEliteUncoverRadius = iniReader.ReadInteger("Covert Ops","COVERT_ELITES_UNCOVER_RADIUS", 6, 0, 20 ); gSkillTraitValues.fCODetectIfBleeding = iniReader.ReadBoolean("Covert Ops","COVERT_DETECTEDIFBLEEDING", FALSE ); // Flugente: RADIO OPERATOR diff --git a/GameSettings.h b/GameSettings.h index 353aaf47..935133ca 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -772,6 +772,7 @@ typedef struct UINT16 ubRecruitableJohnKulbaDelay; // anv: enable JA1 natives as MERC mercs BOOLEAN fEnableRecruitableJA1Natives; + UINT32 usMERCBankruptWarning; // Flugente: if outstanding debt exceeds this, Speck will complain about player's outstanding debts // CHRISL: Setting to turn off the description and stack popup options from the sector inventory panel BOOLEAN fSectorDesc; diff --git a/Laptop/mercs.cpp b/Laptop/mercs.cpp index c6f9d582..26ab17b4 100644 --- a/Laptop/mercs.cpp +++ b/Laptop/mercs.cpp @@ -2081,7 +2081,7 @@ BOOLEAN GetSpeckConditionalOpening( BOOLEAN fJustEnteredScreen ) #ifdef JA2UB //JA25: not using quote quote #else - else if( CalculateHowMuchPlayerOwesSpeck() > 5000 ) + else if ( CalculateHowMuchPlayerOwesSpeck( ) > gGameExternalOptions.usMERCBankruptWarning ) { StartSpeckTalking( SPECK_QUOTE_ALTERNATE_OPENING_6_PLAYER_OWES_SPECK_ALMOST_BANKRUPT_1 ); StartSpeckTalking( SPECK_QUOTE_ALTERNATE_OPENING_6_PLAYER_OWES_SPECK_ALMOST_BANKRUPT_2 );