1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into loading-screens-multi-res

Browse Source
This commit is contained in:
Andrzej Fałkowski
2023-08-19 22:59:21 +02:00
parent 28dfcff389 f8f3d15fd3
commit fb692db5ca
11 changed files with 3650 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data/Ja2_Options.INI
+14 -4
View File
@@ -340,6 +340,20 @@ MERC_BANKRUPT_WARNING = 5000
EARLY_REBELS_RECRUITMENT = 3
;------------------------------------------------------------------------------------------------------------------------------
; Growth modifiers are a replacement for the old Evolution tag.
; Allow each merc to have individual growth modifiers, meaning that each merc gains stats at his or her own rate.
; By default, the only mercs with unique growth modifiers are those who had globally slower growths under the old Evolution tag.
; To change how fast or slow a merc gains stats, you will need to modify the appropriate <GrowthModifier{StatName}> tag in MercProfiles.xml
; Negative values mean the merc grows faster, and higher values means the merc grows slower.
;
; You can also allow growth modifiers to be randomised based on their original growth rates in MercProfiles.xml
; For example, a range of 5 means that a merc with a GrowthModifierLife of -5 will have that modifier randomised between -10 and 0
;------------------------------------------------------------------------------------------------------------------------------
MERCS_GROWTH_MODIFIERS_ENABLED = TRUE
MERCS_RANDOM_GROWTH_MODIFIERS = FALSE
MERCS_RANDOM_GROWTH_MODIFIERS_RANGE = 5
;------------------------------------------------------------------------------------------------------------------------------
; Should the game use random stats for the mercenaries (AIM, MERC, RPC, EPC and NPC)?
; 0 = do not use random stats (JA2 vanilla setting)
@@ -4399,10 +4413,6 @@ TEACHER_TRAIT_BONUS_TO_TRAINING_EFFICIENCY = 30
; The minimum skill rating a character must have before he can train fellow teammates in that skill.
MIN_SKILL_REQUIRED_TO_TEACH_OTHER = 25
; The <bEvolution>-tag in MercProfiles.xml controls whether mercs are stopped from increasing their stats. If TRUE, that tag is
; disabled and increasing stats works normally.
DISABLE_EVOLUTION = FALSE
;------------------------------------------------------------------------------------------------------------------------------
; Two settings to synchronize the sleep/wake periods of Trainers and Students in the same sector.
;
gamedir/Data/Skills_Settings.INI
+9 -9
View File
@@ -580,6 +580,15 @@ SILENT_CRITICAL_HIT_MULTIPLIER_BONUS = 1
; Bonus aim clicks when throwing knives
POSSIBLE_AIM_CLICK_ADDED_TH_KNIVES = 1
; Bonus CtH when throwing grenades
CTH_WHEN_THROWING_GRENADES = 30
; Percentage APs reduction when throwing grenades
APS_NEEDED_TO_THROW_GRENADES_REDUCTION = 25
; Percentage bonus to max range when throwing grenades
MAX_RANGE_TO_THROW_GRENADES = 20
;******************************************************************************************************************************
;******************************************************************************************************************************
@@ -653,15 +662,6 @@ INCREASE_DAMAGE_NEEDED_TO_FALL_DOWN_IF_HIT_TO_LEGS = 100
;******************************************************************************************************************************
[Demolitions]
; Bonus CtH when throwing grenades
CTH_WHEN_THROWING_GRENADES = 30
; Percentage APs reduction when throwing grenades
APS_NEEDED_TO_THROW_GRENADES_REDUCTION = 25
; Percentage bonus to max range when throwing grenades
MAX_RANGE_TO_THROW_GRENADES = 20
; Percentage bonus to damage inflicted by bombs and mines
DAMAGE_OF_PLACED_BOMBS_AND_MINES = 25