From 828b7758d4394dd2d16e70a0a3afa4cb53ff4a4f Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 28 Jul 2013 18:32:55 +0000 Subject: [PATCH] - more reasonable food poisoning values - Settings were never read git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6254 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 6 +++--- Tactical/Food.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 9eb832767..f20807aa6 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -1772,9 +1772,9 @@ void LoadGameExternalOptions() gGameExternalOptions.ubInsaneTimeEvaluateInMinutes = iniReader.ReadInteger("Strategic Enemy AI Settings","BASE_DELAY_IN_MINUTES_BETWEEN_EVALUATIONS_INSANE", 90, 10, NUM_MIN_IN_DAY); gGameExternalOptions.ubEasyTimeEvaluateVariance = iniReader.ReadInteger("Strategic Enemy AI Settings","EVALUATION_DELAY_VARIANCE_NOVICE", 240, 10, NUM_MIN_IN_DAY); - gGameExternalOptions.ubNormalTimeEvaluateVariance = iniReader.ReadInteger("Strategic Enemy AI Settings","EXPERIENCED_TIME_EVALUATE_VARIANCE", 180, 10, NUM_MIN_IN_DAY); - gGameExternalOptions.ubHardTimeEvaluateVariance = iniReader.ReadInteger("Strategic Enemy AI Settings","EXPERT_TIME_EVALUATE_VARIANCE", 120, 10, NUM_MIN_IN_DAY); - gGameExternalOptions.ubInsaneTimeEvaluateVariance = iniReader.ReadInteger("Strategic Enemy AI Settings","INSANE_TIME_EVALUATE_VARIANCE", 60, 10, NUM_MIN_IN_DAY); + gGameExternalOptions.ubNormalTimeEvaluateVariance = iniReader.ReadInteger("Strategic Enemy AI Settings","EVALUATION_DELAY_VARIANCE_EXPERIENCED", 180, 10, NUM_MIN_IN_DAY); + gGameExternalOptions.ubHardTimeEvaluateVariance = iniReader.ReadInteger("Strategic Enemy AI Settings","EVALUATION_DELAY_VARIANCE_EXPERT", 120, 10, NUM_MIN_IN_DAY); + gGameExternalOptions.ubInsaneTimeEvaluateVariance = iniReader.ReadInteger("Strategic Enemy AI Settings","EVALUATION_DELAY_VARIANCE_INSANE", 60, 10, NUM_MIN_IN_DAY); gGameExternalOptions.ubEasyGracePeriodInHours = iniReader.ReadInteger("Strategic Enemy AI Settings","GRACE_PERIOD_IN_HOURS_AFTER_SECTOR_LIBERATION_NOVICE", 144, 1, 288); gGameExternalOptions.ubNormalGracePeriodInHours = iniReader.ReadInteger("Strategic Enemy AI Settings","GRACE_PERIOD_IN_HOURS_AFTER_SECTOR_LIBERATION_EXPERIENCED", 96, 1, 288); diff --git a/Tactical/Food.cpp b/Tactical/Food.cpp index b33e050e1..d86ef5464 100644 --- a/Tactical/Food.cpp +++ b/Tactical/Food.cpp @@ -170,7 +170,7 @@ BOOLEAN ApplyFood( SOLDIERTYPE *pSoldier, OBJECTTYPE *pObject, BOOLEAN fForce, B // divide by 100 (poison sum is in [0, 99] // multiply with 0.25 for more reasonable values - INT8 poisonadd = (INT8)(0.01 * 0.25 * maxpts * (1.0 - foodcondition) ); + INT8 poisonadd = (INT8)(maxpts * (1.0 - foodcondition) * 0.025 ); // added a max threshold to food poisoning poisonadd = min(poisonadd, gGameExternalOptions.usFoodMaxPoisoning),