From b0687c344a179d49599c7b85c54b61bdbac074fa Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 30 Jun 2013 16:29:17 +0000
Subject: [PATCH] - Externalized 2 breathing values to APBPConstants.ini (by
 silversurfer) o With those values you can define the minutes needed to
 regenerate BP in real-time mode o BP_RT_BREATH_RECOVER_MODIFIER,
 BP_RT_BREATH_DEDUCT_MODIFIER o see:
 http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/322238/Re_Breath_regeneration_is_too_.html#Post322238

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameSettings.cpp           | 4 ++++
 Init.h                     | 2 ++
 Tactical/Points.cpp        | 8 ++++++--
 Tactical/rt time defines.h | 6 +++---
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/GameSettings.cpp b/GameSettings.cpp
index 9c035cc9a..f227b5a42 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -2515,6 +2515,10 @@ void LoadGameAPBPConstants()
 	APBPConstants[DEFAULT_AIMSKILL] = iniReader.ReadInteger("APConstants","DEFAULT_AIMSKILL",80);
 
 	APBPConstants[BP_RATIO_RED_PTS_TO_NORMAL] = iniReader.ReadInteger("BPConstants","BP_RATIO_RED_PTS_TO_NORMAL",100);
+	// modifies breath regeneration during realtime mode, replaces TB_BREATH_RECOVER_MODIFIER in Tactical\rt time defines.h
+	APBPConstants[BP_RT_BREATH_RECOVER_MODIFIER] = iniReader.ReadInteger("BPConstants", "BP_RT_BREATH_RECOVER_MODIFIER",100, 100, 1000);
+	// modifies breath drain for all movement during realtime mode, replaces TB_BREATH_DEDUCT_MODIFIER in Tactical\rt time defines.h
+	APBPConstants[BP_RT_BREATH_DEDUCT_MODIFIER] = iniReader.ReadInteger("BPConstants", "BP_RT_BREATH_DEDUCT_MODIFIER",125, 100, 1000);
 	APBPConstants[BP_RUN_ENERGYCOSTFACTOR] = iniReader.ReadInteger("BPConstants","BP_RUN_ENERGYCOSTFACTOR",3);
 	APBPConstants[BP_WALK_ENERGYCOSTFACTOR] = iniReader.ReadInteger("BPConstants","BP_WALK_ENERGYCOSTFACTOR",1);
 	APBPConstants[BP_SWAT_ENERGYCOSTFACTOR] = iniReader.ReadInteger("BPConstants","BP_SWAT_ENERGYCOSTFACTOR",2);
diff --git a/Init.h b/Init.h
index e9e56f14c..212f1543f 100644
--- a/Init.h
+++ b/Init.h
@@ -158,6 +158,8 @@ AP_INVENTORY_ARM,
 DEFAULT_APS,
 DEFAULT_AIMSKILL,
 BP_RATIO_RED_PTS_TO_NORMAL,
+BP_RT_BREATH_RECOVER_MODIFIER,	// modifies breath regeneration during realtime mode
+BP_RT_BREATH_DEDUCT_MODIFIER,	// modifies breath drain for all movement during realtime mode
 BP_RUN_ENERGYCOSTFACTOR,
 BP_WALK_ENERGYCOSTFACTOR,
 BP_SWAT_ENERGYCOSTFACTOR,
diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp
index 22fa3cb8f..dc8734877 100644
--- a/Tactical/Points.cpp
+++ b/Tactical/Points.cpp
@@ -348,7 +348,9 @@ INT16 TerrainBreathPoints(SOLDIERTYPE * pSoldier, INT32 sGridNo, INT8 bDir, UINT
  if (!(gTacticalStatus.uiFlags & TURNBASED) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
  {
 		// ATE: ADJUST FOR RT - MAKE BREATH GO A LITTLE FASTER!
-		iPoints	= (INT32)( iPoints * TB_BREATH_DEDUCT_MODIFIER );
+	 	// silversurfer: now externalized to APBPConstants.ini
+		//iPoints	= (INT32)( iPoints * TB_BREATH_DEDUCT_MODIFIER );
+		iPoints	= (INT32)( iPoints * APBPConstants[BP_RT_BREATH_DEDUCT_MODIFIER] / 100 );
  }
 
 
@@ -1178,7 +1180,9 @@ void UnusedAPsToBreath( SOLDIERTYPE * pSoldier )
 
 		// Divide by a number to adjust that in realtimer we do not want to recover as
 		// as fast as the TB values do
-		sBreathChange *= TB_BREATH_RECOVER_MODIFIER;
+		// silversurfer: now externalized to APBPConstants.ini
+		//sBreathChange *= TB_BREATH_RECOVER_MODIFIER;
+		sBreathChange = INT16 ( sBreathChange * APBPConstants[BP_RT_BREATH_RECOVER_MODIFIER] / 100 );
 
 		// SANDRO: get BP *cost* for weapon holding (reduce breath gain, or even make it breath loss)
 		if ( gGameExternalOptions.ubEnergyCostForWeaponWeight ) 
diff --git a/Tactical/rt time defines.h b/Tactical/rt time defines.h
index afc6e2c77..d816af419 100644
--- a/Tactical/rt time defines.h	
+++ b/Tactical/rt time defines.h	
@@ -3,9 +3,9 @@
 
 
 
-
-#define		TB_BREATH_RECOVER_MODIFIER		1
-#define		TB_BREATH_DEDUCT_MODIFIER			1.25
+//silversurfer: now externalized to APBPConstants.ini
+//#define		TB_BREATH_RECOVER_MODIFIER		1
+//#define		TB_BREATH_DEDUCT_MODIFIER			1.25
 
 #define		RT_NEXT_BLEED_MODIFIER							0.5
 #define		RT_FIRST_AID_GAIN_MODIFIER					12