From 2598e055b4ad13a6d1f8b3d2538513afa89faf2e Mon Sep 17 00:00:00 2001 From: lalien Date: Wed, 10 May 2006 22:31:33 +0000 Subject: [PATCH] Little Alien - Moved new game settings from ja2.ini to Ja2_Options.ini - Moved all settings from NewGameSettings.cpp to GameSettings.cpp - New feature: Militia movement on strategic map v1.3 - New feature: Automatic reload Press Shift+R in tactical to reload all weapons of your team with magazines from sector inventory git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@60 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- .../Data-1.13/Ja2_Options.INI | 173 +++++++++++++++++- .../Data/Ja2_Options.INI | 169 ++++++++++++++++- .../Jagged Alliance 2 v1.13/Ja2.ini | 51 ------ 3 files changed, 329 insertions(+), 64 deletions(-) diff --git a/gamedir-languages/Jagged Alliance 2 v1.13/Data-1.13/Ja2_Options.INI b/gamedir-languages/Jagged Alliance 2 v1.13/Data-1.13/Ja2_Options.INI index f997b865b..017ce153b 100644 --- a/gamedir-languages/Jagged Alliance 2 v1.13/Data-1.13/Ja2_Options.INI +++ b/gamedir-languages/Jagged Alliance 2 v1.13/Data-1.13/Ja2_Options.INI @@ -1,4 +1,3 @@ -[Options] ;****************************************************************************************************************************** ;****************************************************************************************************************************** ; Jagged Alliance 2: 1.13 MOD Release Version 10.22.05 @@ -38,6 +37,10 @@ ; before you make the changes. ; ;****************************************************************************************************************************** + +[Options] + + ;****************************************************************************************************************************** ; These are the Starting cash values for the various difficulties. ; The only restriction with these, is the INT32 they are stored in. @@ -48,6 +51,10 @@ EXPERIENCED_CASH = 35000 EXPERT_CASH = 30000 INSANE_CASH = 15000 + + + + ;****************************************************************************************************************************** ; TRUE Enables the ability to sell items from the sector Inventory screen with ALT-LMB option. ; FALSE Turns off the option. PRICE_MODIFIER is a divisor, 4 = 25% of the item's value. @@ -58,6 +65,10 @@ INSANE_CASH = 15000 CAN_SELL_ALT_LMB = TRUE PRICE_MODIFIER = 4 + + + + ;****************************************************************************************************************************** ; The following values deal with the IMP merc generation, MIN_ATTRIBUTE_POINT is the lowest ; you can lower an attribute, and the lowest you can lower a skill before it hits zero. @@ -72,10 +83,15 @@ PRICE_MODIFIER = 4 MIN_ATTRIBUTE_POINT = 35 MAX_ATTRIBUTE_POINT = 90 -IMPATTRIBUTEPOINTS = 40 -MAX_ZERO_BONUS = 15 +IMPATTRIBUTEPOINTS = 50 +MAX_ZERO_BONUS = 35 START_ATTRIBUTE = 55 + + + + + ;****************************************************************************************************************************** ; MAX_MILITIA_PER_SECTOR defines the max number of Militia that can be trained in each sector. ; Keep in Mind That there is not enough room on the strategic map to display more than 20 @@ -91,6 +107,10 @@ MAX_TRAINING_SQUAD_SIZE = 10 MILITIA_TRAINING_COST = 750 MIN_LOYALTY_TO_TRAIN = 20 + + + + ;****************************************************************************************************************************** ; DO NOT LOWER ***MAX_STRATEGIC_TEAM_SIZE*** BELOW 20 ; @@ -127,6 +147,11 @@ EXPERIENCED_MIN_ENEMY_GROUP_SIZE = 4 EXPERT_MIN_ENEMY_GROUP_SIZE = 6 INSANE_MIN_ENEMY_GROUP_SIZE = 8 + + + + + ;****************************************************************************************************************************** ; MERC_AVAILABLE_DAY_ONE set to TRUE sends the initial MERC e-mail at the beginning of the game and thus ; opens the website up on day one. @@ -138,6 +163,11 @@ INSANE_MIN_ENEMY_GROUP_SIZE = 8 MERC_AVAILABLE_DAY_ONE = FALSE ALL_MERCS_AT_MERC = FALSE + + + + + ;****************************************************************************************************************************** ; USE_RANDOM_PERSONALITY set to TRUE will randomly generate an Attitude and a Personality for each of ; your IMP Mercs. @@ -178,9 +208,136 @@ ALL_MERCS_AT_MERC = FALSE USE_RANDOM_PERSONALITY = FALSE CUSTOM_PERSONALITY = 0 -CUSTOM_ATTITUDE = 0 +CUSTOM_ATTITUDE = 3 + + + + + +;****************************************************************************************** +; In this section you can enable/disable vertical synchronisation +; If disabled the game will run faster +;****************************************************************************************** + +[JA2 Screen Resolution Settings] +VerticalSync = FALSE + + + + + +;****************************************************************************************** +; In this section you can enable the weather effects (rain & storms). +; Enabled rain also includes new features to the game (e.g: visibility radius decrease when +; rainig, weapons reliability decreased when raining, possibility to spot the enemy at night +; with lightning) +; For slow CPUs decrease the MAX_RAIN_DROPS, or disable rain (ALLOW_RAIN=0) +;****************************************************************************************** + +[JA2 Rain Settings] +ALLOW_RAIN= TRUE +RAIN_CHANCE_PER_DAY= 100 +RAIN_MIN_LENGTH_IN_MINUTES= 60 +RAIN_MAX_LENGTH_IN_MINUTES= 180 +MAX_RAIN_DROPS= 79 + +[JA2 Thunder Settings] +MIN_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS= 2 +MAX_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS= 15 +MIN_INTERVAL_BETWEEN_LIGHTNING_AND_THUNDERCLAPS_IN_SECONDS= 1 +MAX_INTERVAL_BETWEEN_LIGHTNING_AND_THUNDERCLAPS_IN_SECONDS= 5 +PROLOGNE_DELAY_IF_SEEN_SOMEONE_DURING_LIGHTNING_IN_TURNBASED_IN_SECONDS= 5 +CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS= 35 + + + + + +;****************************************************************************************** +; Controls animation speed for faster movements in battle +; 1 = normal +; 0 = max speed +;****************************************************************************************** + +[JA2 Turnbased Animation Speed Settings] +PlayerTurnSpeedUpFactor = 1 +EnemyTurnSpeedUpFactor = 1 +CreatureTurnSpeedUpFactor= 1 +MilitiaTurnSpeedUpFactor = 1 +CivTurnSpeedUpFactor = 1 + + + + + +;****************************************************************************************** +; Allows militia to move on strategic map +; Allows militia reinforcements from near sectors +; Reinforcements only in cities +; Amount of troops that will be added to queens army when the troops pool is empty +;****************************************************************************************** + +[JA2 Gameplay Settings] +AllowMilitiaMobileGroups = TRUE +AllowReinforcments = TRUE +AllowReinforcmentsOnlyInCities= FALSE +QueenPoolIncrementPerDifficultyLevel=60 + + + + + +;****************************************************************************************** +; 1. Base sight range for every person in game (default 13 tiles) +; 2. Enable/disable militia command on tactical map +;****************************************************************************************** + +[JA2 Tactical Settings] +BaseSightRange = 13 +AllowTacticalMilitiaCommand = TRUE + + + + + +;****************************************************************************************** +; not implemented +; +;****************************************************************************************** + +;[JA2 Tactical AI Settings] +;MaxTossSearchDist=3 + + + + + +;****************************************************************************************** +; Change to increase volume for weapon sounds +; Range 0-100 +; 0 = no change +; 100 = max volume +; +;****************************************************************************************** + +[JA2 Sound Settings] +WeaponSoundEffectsVolume = 0 + + + + + +;****************************************************************************************** +; 1. Time in seconds for DeadLock delay, default 15 +; 2. Skip global strategic events (use to prevent game crashes) +;****************************************************************************************** + +[JA2 System Settings] +DeadLockDelay = 10 +;EnableEmergencyButton_NumLock_ToSkipStrategicEvents=0 + + + + + -;****************************************************************************************************************************** -;****************************************************************************************************************************** -;****************************************************************************************************************************** -;****************************************************************************************************************************** \ No newline at end of file diff --git a/gamedir-languages/Jagged Alliance 2 v1.13/Data/Ja2_Options.INI b/gamedir-languages/Jagged Alliance 2 v1.13/Data/Ja2_Options.INI index 1ef259177..4580f5397 100644 --- a/gamedir-languages/Jagged Alliance 2 v1.13/Data/Ja2_Options.INI +++ b/gamedir-languages/Jagged Alliance 2 v1.13/Data/Ja2_Options.INI @@ -1,4 +1,3 @@ -[Options] ;****************************************************************************************************************************** ;****************************************************************************************************************************** ; Jagged Alliance 2: 1.13 MOD Release Version 10.22.05 @@ -38,6 +37,11 @@ ; before you make the changes. ; ;****************************************************************************************************************************** + +[Options] + + + ;****************************************************************************************************************************** ; These are the Starting cash values for the various difficulties. ; The only restriction with these, is the INT32 they are stored in. @@ -48,6 +52,10 @@ EXPERIENCED_CASH = 35000 EXPERT_CASH = 30000 INSANE_CASH = 15000 + + + + ;****************************************************************************************************************************** ; TRUE Enables the ability to sell items from the sector Inventory screen with ALT-LMB option. ; FALSE Turns off the option. PRICE_MODIFIER is a divisor, 4 = 25% of the item's value. @@ -58,6 +66,10 @@ INSANE_CASH = 15000 CAN_SELL_ALT_LMB = FALSE PRICE_MODIFIER = 4 + + + + ;****************************************************************************************************************************** ; The following values deal with the IMP merc generation, MIN_ATTRIBUTE_POINT is the lowest ; you can lower an attribute, and the lowest you can lower a skill before it hits zero. @@ -76,6 +88,11 @@ IMPATTRIBUTEPOINTS = 30 MAX_ZERO_BONUS = 15 START_ATTRIBUTE = 55 + + + + + ;****************************************************************************************************************************** ; MAX_MILITIA_PER_SECTOR defines the max number of Militia that can be trained in each sector. ; Keep in Mind That there is not enough room on the strategic map to display more than 20 @@ -91,6 +108,11 @@ MAX_TRAINING_SQUAD_SIZE = 10 MILITIA_TRAINING_COST = 750 MIN_LOYALTY_TO_TRAIN = 20 + + + + + ;****************************************************************************************************************************** ; DO NOT LOWER ***MAX_STRATEGIC_TEAM_SIZE*** BELOW 20 ; @@ -127,6 +149,11 @@ EXPERIENCED_MIN_ENEMY_GROUP_SIZE = 4 EXPERT_MIN_ENEMY_GROUP_SIZE = 6 INSANE_MIN_ENEMY_GROUP_SIZE = 8 + + + + + ;****************************************************************************************************************************** ; MERC_AVAILABLE_DAY_ONE set to TRUE sends the initial MERC e-mail at the beginning of the game and thus ; opens the website up on day one. @@ -138,6 +165,11 @@ INSANE_MIN_ENEMY_GROUP_SIZE = 8 MERC_AVAILABLE_DAY_ONE = FALSE ALL_MERCS_AT_MERC = FALSE + + + + + ;****************************************************************************************************************************** ; USE_RANDOM_PERSONALITY set to TRUE will randomly generate an Attitude and a Personality for each of ; your IMP Mercs. @@ -180,7 +212,134 @@ USE_RANDOM_PERSONALITY = TRUE CUSTOM_PERSONALITY = 0 CUSTOM_ATTITUDE = 0 -;****************************************************************************************************************************** -;****************************************************************************************************************************** -;****************************************************************************************************************************** -;****************************************************************************************************************************** \ No newline at end of file + + + + +;****************************************************************************************** +; In this section you can enable/disable vertical synchronisation +; If disabled the game will run faster +;****************************************************************************************** + +[JA2 Screen Resolution Settings] +VerticalSync = FALSE + + + + + +;****************************************************************************************** +; In this section you can enable the weather effects (rain & storms). +; Enabled rain also includes new features to the game (e.g: visibility radius decrease when +; rainig, weapons reliability decreased when raining, possibility to spot the enemy at night +; with lightning) +; For slow CPUs decrease the MAX_RAIN_DROPS, or disable rain (ALLOW_RAIN=0) +;****************************************************************************************** + +[JA2 Rain Settings] +ALLOW_RAIN= TRUE +RAIN_CHANCE_PER_DAY= 100 +RAIN_MIN_LENGTH_IN_MINUTES= 60 +RAIN_MAX_LENGTH_IN_MINUTES= 180 +MAX_RAIN_DROPS= 79 + +[JA2 Thunder Settings] +MIN_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS= 2 +MAX_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS= 15 +MIN_INTERVAL_BETWEEN_LIGHTNING_AND_THUNDERCLAPS_IN_SECONDS= 1 +MAX_INTERVAL_BETWEEN_LIGHTNING_AND_THUNDERCLAPS_IN_SECONDS= 5 +PROLOGNE_DELAY_IF_SEEN_SOMEONE_DURING_LIGHTNING_IN_TURNBASED_IN_SECONDS= 5 +CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS= 35 + + + + + +;****************************************************************************************** +; Controls animation speed for faster movements in battle +; 1 = normal +; 0 = max speed +;****************************************************************************************** + +[JA2 Turnbased Animation Speed Settings] +PlayerTurnSpeedUpFactor = 1 +EnemyTurnSpeedUpFactor = 1 +CreatureTurnSpeedUpFactor= 1 +MilitiaTurnSpeedUpFactor = 1 +CivTurnSpeedUpFactor = 1 + + + + + +;****************************************************************************************** +; Allows militia to move on strategic map +; Allows militia reinforcements from near sectors +; Reinforcements only in cities +; Amount of troops that will be added to queens army when the troops pool is empty +;****************************************************************************************** + +[JA2 Gameplay Settings] +AllowMilitiaMobileGroups = TRUE +AllowReinforcments = TRUE +AllowReinforcmentsOnlyInCities= FALSE +QueenPoolIncrementPerDifficultyLevel=60 + + + + + +;****************************************************************************************** +; 1. Base sight range for every person in game (default 13 tiles) +; 2. Enable/disable militia command on tactical map +;****************************************************************************************** + +[JA2 Tactical Settings] +BaseSightRange = 13 +AllowTacticalMilitiaCommand = TRUE + + + + + +;****************************************************************************************** +; not implemented +; +;****************************************************************************************** + +;[JA2 Tactical AI Settings] +;MaxTossSearchDist=3 + + + + + +;****************************************************************************************** +; Change to increase volume for weapon sounds +; Range 0-100 +; 0 = no change +; 100 = max volume +; +;****************************************************************************************** + +[JA2 Sound Settings] +WeaponSoundEffectsVolume = 0 + + + + + +;****************************************************************************************** +; 1. Time in seconds for DeadLock delay, default 15 +; 2. Skip global strategic events (use to prevent game crashes) +;****************************************************************************************** + +[JA2 System Settings] +DeadLockDelay = 10 +;EnableEmergencyButton_NumLock_ToSkipStrategicEvents=0 + + + + + + diff --git a/gamedir-languages/Jagged Alliance 2 v1.13/Ja2.ini b/gamedir-languages/Jagged Alliance 2 v1.13/Ja2.ini index 88156d1b5..036a96b9a 100644 --- a/gamedir-languages/Jagged Alliance 2 v1.13/Ja2.ini +++ b/gamedir-languages/Jagged Alliance 2 v1.13/Ja2.ini @@ -19,54 +19,3 @@ CUSTOM_DATA_LOCATION=Data-1.13 SCREEN_RESOLUTION=2 -;****************************************************************************************** -; In this section you can enable the weather effects (rain & storms). -; Enabled rain also includes new features to the game (e.g: visibility radius decrease when -; rainig, weapons reliability decreased when raining, possibility to spot the enemy at night -; with lightning) -; For slow CPUs decrease the MAX_RAIN_DROPS, or disable rain (ALLOW_RAIN=0) -;****************************************************************************************** - -[JA2 Rain Settings] -ALLOW_RAIN= 1 -RAIN_CHANCE_PER_DAY= 100 -RAIN_MIN_LENGTH_IN_MINUTES= 60 -RAIN_MAX_LENGTH_IN_MINUTES= 180 -MAX_RAIN_DROPS= 79 - -[JA2 Thunder Settings] -MIN_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS= 2 -MAX_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS= 15 -MIN_INTERVAL_BETWEEN_LIGHTNING_AND_THUNDERCLAPS_IN_SECONDS= 1 -MAX_INTERVAL_BETWEEN_LIGHTNING_AND_THUNDERCLAPS_IN_SECONDS= 5 -PROLOGNE_DELAY_IF_SEEN_SOMEONE_DURING_LIGHTNING_IN_TURNBASED_IN_SECONDS= 5 -CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS= 80 - -[JA2 Screen Resolution Settings] -VSync = 0 - -[JA2 Turnbased Animation Speed Settings] -PlayerTurnSpeedUpFactor = 1 -EnemyTurnSpeedUpFactor = 1 -CreatureTurnSpeedUpFactor= 1 -MilitiaTurnSpeedUpFactor = 1 -CivTurnSpeedUpFactor = 1 - -[JA2 Gameplay Settings] -AllowMilitiaMobileGroups = 1 -AllowReinforcments = 1 -AllowReinforcmentsOnlyInCities= 0 -QueenPoolIncrementPerDifficultyLevel=60 - -[JA2 Tactical Settings] -BaseSightRange = 13 -AllowTacticalMilitiaCommand = 1 - -;[JA2 Tactical AI Settings] -;MaxTossSearchDist = 2 - -;[JA2 Special Settings] -;EnableEmergencyButton_NumLock_ToSkipStrategicEvents = 0 - - -