From d6dab713fe1ae8f5ca92e3b97eaf519c99442fe8 Mon Sep 17 00:00:00 2001 From: rftr Date: Sat, 28 May 2022 21:08:59 +0000 Subject: [PATCH] added new options to limit merc salary increases on level up: MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2650 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Ja2_Options.INI | 8 ++++++++ gamedir/Data-UB/AddOns/Data-UB-1.13/Ja2_Options.ini | 8 ++++++++ gamedir/Data-UB/AddOns/Data-UB-Vanilla/Ja2_Options.INI | 8 ++++++++ gamedir/Data/Ja2_Options.INI | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 863bd8ba1..06815b464 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -415,6 +415,14 @@ MINE_INCOME_PERCENTAGE = 100 MERC_LEVEL_UP_SALARY_INCREASE_PERCENTAGE = 25 +;------------------------------------------------------------------------------------------------------------------------------ +; Set the raw maximum value that a merc's salary can increase when they level up. +; Default values are high enough that they have no effect (vanilla behaviour). +;------------------------------------------------------------------------------------------------------------------------------ +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY = 100000 +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY = 100000 +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY = 100000 + ;------------------------------------------------------------------------------------------------------------------------------ ; If MINE_REQUIRES_WORKERS is TRUE, mine income also depends on the number or workers employed in a town. ; The maximum number of workers for each sector can be set in SectorNames.xml. diff --git a/gamedir/Data-UB/AddOns/Data-UB-1.13/Ja2_Options.ini b/gamedir/Data-UB/AddOns/Data-UB-1.13/Ja2_Options.ini index 13291d6b3..31442791f 100644 --- a/gamedir/Data-UB/AddOns/Data-UB-1.13/Ja2_Options.ini +++ b/gamedir/Data-UB/AddOns/Data-UB-1.13/Ja2_Options.ini @@ -426,6 +426,14 @@ MINE_INCOME_PERCENTAGE = 100 MERC_LEVEL_UP_SALARY_INCREASE_PERCENTAGE = 25 +;------------------------------------------------------------------------------------------------------------------------------ +; Set the raw maximum value that a merc's salary can increase when they level up. +; Default values are high enough that they have no effect (vanilla behaviour). +;------------------------------------------------------------------------------------------------------------------------------ +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY = 100000 +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY = 100000 +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY = 100000 + ;------------------------------------------------------------------------------------------------------------------------------ ; If MINE_REQUIRES_WORKERS is TRUE, mine income also depends on the number or workers employed in a town. ; The maximum number of workers for each sector can be set in SectorNames.xml. diff --git a/gamedir/Data-UB/AddOns/Data-UB-Vanilla/Ja2_Options.INI b/gamedir/Data-UB/AddOns/Data-UB-Vanilla/Ja2_Options.INI index 747771126..19dd57c41 100644 --- a/gamedir/Data-UB/AddOns/Data-UB-Vanilla/Ja2_Options.INI +++ b/gamedir/Data-UB/AddOns/Data-UB-Vanilla/Ja2_Options.INI @@ -415,6 +415,14 @@ MINE_INCOME_PERCENTAGE = 100 MERC_LEVEL_UP_SALARY_INCREASE_PERCENTAGE = 25 +;------------------------------------------------------------------------------------------------------------------------------ +; Set the raw maximum value that a merc's salary can increase when they level up. +; Default values are high enough that they have no effect (vanilla behaviour). +;------------------------------------------------------------------------------------------------------------------------------ +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY = 100000 +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY = 100000 +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY = 100000 + ;------------------------------------------------------------------------------------------------------------------------------ ; If MINE_REQUIRES_WORKERS is TRUE, mine income also depends on the number or workers employed in a town. ; The maximum number of workers for each sector can be set in SectorNames.xml. diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index 10069c805..9a9e6131a 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -415,6 +415,14 @@ MINE_INCOME_PERCENTAGE = 100 MERC_LEVEL_UP_SALARY_INCREASE_PERCENTAGE = 25 +;------------------------------------------------------------------------------------------------------------------------------ +; Set the raw maximum value that a merc's salary can increase when they level up. +; Default values are high enough that they have no effect (vanilla behaviour). +;------------------------------------------------------------------------------------------------------------------------------ +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY = 100000 +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY = 100000 +MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY = 100000 + ;------------------------------------------------------------------------------------------------------------------------------ ; If MINE_REQUIRES_WORKERS is TRUE, mine income also depends on the number or workers employed in a town. ; The maximum number of workers for each sector can be set in SectorNames.xml.