diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 2c2a510f7..b389e56c2 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -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 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) @@ -4400,10 +4414,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 -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 = TRUE - ;------------------------------------------------------------------------------------------------------------------------------ ; Two settings to synchronize the sleep/wake periods of Trainers and Students in the same sector. ; diff --git a/gamedir/Data-1.13/Skills_Settings.INI b/gamedir/Data-1.13/Skills_Settings.INI index a8fe90780..913d39154 100644 --- a/gamedir/Data-1.13/Skills_Settings.INI +++ b/gamedir/Data-1.13/Skills_Settings.INI @@ -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 diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml index f811828b3..e25283881 100644 --- a/gamedir/Data-1.13/TableData/MercProfiles.xml +++ b/gamedir/Data-1.13/TableData/MercProfiles.xml @@ -238,12 +238,13 @@ 20 44 2 - 0 + 0 3 1 8 17 0 + 0 11 255 255 @@ -294,6 +295,17 @@ 0 255 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 1 @@ -335,12 +347,13 @@ 51 23 3 - 0 + 0 5 12 6 6 12 + 0 29 255 255 @@ -390,6 +403,17 @@ 0 0 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 2 @@ -431,12 +455,13 @@ 34 29 4 - 0 + 0 3 4 3 - 19 + 3 13 + 19 18 255 255 @@ -486,6 +511,17 @@ 0 0 2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 3 @@ -527,12 +563,13 @@ 8 24 2 - 0 + 0 2 7 2 6 16 + 0 21 10 255 @@ -582,6 +619,17 @@ 0 0 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 4 @@ -623,12 +671,13 @@ 18 94 4 - 0 + 0 10 5 5 10 - 17 + 8 + 0 255 255 255 @@ -678,6 +727,17 @@ 0 0 4 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 5 @@ -719,12 +779,13 @@ 7 99 2 - 0 + 0 3 1 8 8 17 + 21 255 255 255 @@ -774,6 +835,17 @@ 0 0 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 6 @@ -815,12 +887,13 @@ 22 44 3 - 0 + 0 4 7 2 13 0 + 0 7 255 255 @@ -870,6 +943,17 @@ 0 0 6 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 7 @@ -911,12 +995,13 @@ 15 14 4 - 0 + 0 8 7 1 - 2 - 16 + 1 + 2 + 16 9 6 255 @@ -966,6 +1051,17 @@ 0 0 7 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 8 @@ -1007,12 +1103,13 @@ 22 76 1 - 0 + 0 3 1 8 8 16 + 0 255 255 255 @@ -1062,6 +1159,17 @@ 0 0 8 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 9 @@ -1103,12 +1211,13 @@ 17 36 2 - 0 + 0 9 0 14 - 23 + 4 0 + 0 7 6 255 @@ -1158,6 +1267,17 @@ 0 0 9 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 10 @@ -1199,12 +1319,13 @@ 30 12 5 - 0 + 0 9 15 - 4 + 3 14 - 23 + 19 + 23 255 255 255 @@ -1254,6 +1375,17 @@ 0 0 10 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 11 @@ -1295,12 +1427,13 @@ 5 33 4 - 0 + 0 6 3 8 17 18 + 0 255 255 255 @@ -1350,6 +1483,17 @@ 0 0 11 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 12 @@ -1391,12 +1535,13 @@ 2 37 6 - 0 + 0 9 14 3 3 14 + 5 10 255 255 @@ -1446,6 +1591,17 @@ 0 0 12 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 13 @@ -1487,12 +1643,13 @@ 3 6 3 - 0 + 0 2 0 6 17 0 + 0 43 189 255 @@ -1542,6 +1699,17 @@ 0 0 13 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 14 @@ -1583,12 +1751,13 @@ 70 15 2 - 0 + 0 6 10 18 9 10 + 0 37 255 255 @@ -1638,6 +1807,17 @@ 0 0 14 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 15 @@ -1679,12 +1859,13 @@ 44 2 5 - 0 + 0 5 5 5 - 12 - 17 + 5 + 12 + 0 36 255 255 @@ -1734,6 +1915,17 @@ 0 0 15 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 16 @@ -1775,12 +1967,13 @@ 68 80 8 - 0 + 0 7 7 2 2 7 + 7 27 255 255 @@ -1830,6 +2023,17 @@ 0 0 16 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 17 @@ -1871,12 +2075,13 @@ 48 8 2 - 0 + 0 6 6 3 18 0 + 0 255 255 255 @@ -1926,6 +2131,17 @@ 0 0 17 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 18 @@ -1967,12 +2183,13 @@ 7 42 3 - 0 + 0 6 8 1 1 18 + 0 29 3 255 @@ -2022,6 +2239,17 @@ 0 0 18 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 19 @@ -2063,12 +2291,13 @@ 94 0 1 - 0 + 0 4 9 9 13 14 + 0 4 26 255 @@ -2118,6 +2347,17 @@ 0 0 19 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 20 @@ -2159,12 +2399,13 @@ 84 4 4 - 0 + 0 0 0 9 9 - 0 + 4 + 0 185 255 255 @@ -2214,6 +2455,17 @@ 0 0 20 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 21 @@ -2255,12 +2507,13 @@ 10 25 2 - 0 + 0 2 2 6 - 16 - 0 + 6 + 16 + 0 255 255 255 @@ -2310,6 +2563,17 @@ 0 0 21 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 22 @@ -2351,12 +2615,13 @@ 3 11 4 - 0 + 0 5 6 12 7 18 + 0 6 255 255 @@ -2406,6 +2671,17 @@ 0 0 22 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 23 @@ -2447,7 +2723,7 @@ 0 5 4 - 0 + 0 7 8 1 @@ -2503,6 +2779,17 @@ 0 0 23 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 24 @@ -2544,12 +2831,13 @@ 11 12 4 - 0 + 0 6 6 7 7 18 + 0 25 255 255 @@ -2599,6 +2887,17 @@ 0 0 24 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 25 @@ -2640,12 +2939,13 @@ 17 5 2 - 0 + 0 4 8 1 3 13 + 0 24 255 255 @@ -2695,6 +2995,17 @@ 0 0 25 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 26 @@ -2736,12 +3047,13 @@ 17 99 4 - 0 + 0 3 4 8 - 13 - 0 + 8 + 13 + 0 47 19 255 @@ -2791,6 +3103,17 @@ 0 0 26 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 27 @@ -2832,12 +3155,13 @@ 35 54 7 - 1 + 0 8 6 7 1 18 + 21 4 233 255 @@ -2887,6 +3211,17 @@ 0 0 27 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 28 @@ -2928,12 +3263,13 @@ 88 12 3 - 0 + 0 10 0 9 9 10 + 15 255 255 255 @@ -2983,6 +3319,17 @@ 0 0 28 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 29 @@ -3024,12 +3371,13 @@ 24 91 5 - 0 + 0 1 9 8 15 14 + 16 1 18 255 @@ -3079,6 +3427,17 @@ 0 0 29 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 30 @@ -3120,12 +3479,13 @@ 15 15 5 - 0 + 0 4 6 7 13 18 + 0 255 255 255 @@ -3175,6 +3535,17 @@ 0 0 30 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 31 @@ -3216,12 +3587,13 @@ 36 61 5 - 0 + 0 13 13 12 11 15 + 14 149 255 255 @@ -3271,6 +3643,17 @@ 0 0 31 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 32 @@ -3312,12 +3695,13 @@ 12 14 3 - 0 + 0 13 2 6 11 16 + 0 14 19 255 @@ -3367,6 +3751,17 @@ 0 0 32 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 33 @@ -3408,7 +3803,7 @@ 87 19 3 - 0 + 0 12 4 6 @@ -3464,6 +3859,17 @@ 0 0 33 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 34 @@ -3505,12 +3911,13 @@ 11 63 4 - 0 + 0 1 0 8 17 - 0 + 5 + 0 14 255 255 @@ -3560,6 +3967,17 @@ 0 0 34 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 35 @@ -3601,12 +4019,13 @@ 70 35 3 - 0 + 0 2 9 9 14 6 + 0 18 26 255 @@ -3656,6 +4075,17 @@ 0 0 35 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 36 @@ -3697,12 +4127,13 @@ 17 4 5 - 0 + 0 4 6 3 - 13 - 18 + 3 + 13 + 18 15 255 255 @@ -3752,6 +4183,17 @@ 0 0 36 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 37 @@ -3793,12 +4235,13 @@ 48 65 3 - 0 + 0 6 4 16 13 18 + 0 14 2 255 @@ -3848,6 +4291,17 @@ 0 0 37 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 38 @@ -3889,12 +4343,13 @@ 80 7 1 - 0 + 0 13 6 9 11 18 + 0 255 255 255 @@ -3944,6 +4399,17 @@ 0 0 38 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 39 @@ -3985,12 +4451,13 @@ 3 22 3 - 0 + 0 7 10 2 5 10 + 0 255 255 255 @@ -4040,6 +4507,17 @@ 0 0 39 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 40 @@ -4081,12 +4559,13 @@ 24 2 2 - 0 + 0 6 0 18 0 0 + 0 46 188 255 @@ -4136,6 +4615,17 @@ 0 0 40 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 41 @@ -4177,12 +4667,13 @@ 2 8 1 - 0 + 0 8 13 11 1 0 + 0 43 255 255 @@ -4232,6 +4723,17 @@ 0 0 41 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 42 @@ -4273,12 +4775,13 @@ 0 82 1 - 0 + 0 1 0 8 0 0 + 0 4 255 255 @@ -4328,6 +4831,17 @@ 0 0 42 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 43 @@ -4369,12 +4883,13 @@ 12 8 2 - 0 + 0 13 13 11 12 15 + 0 41 255 255 @@ -4424,6 +4939,17 @@ 0 0 43 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 44 @@ -4465,12 +4991,13 @@ 19 7 1 - 0 + 0 6 0 18 0 0 + 0 40 255 255 @@ -4520,6 +5047,17 @@ 0 0 44 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 45 @@ -4561,12 +5099,13 @@ 9 5 1 - 0 + 0 3 0 17 - 0 + 21 0 + 0 255 255 255 @@ -4616,6 +5155,17 @@ 0 0 45 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 46 @@ -4657,12 +5207,13 @@ 70 14 3 - 0 + 0 9 1 8 9 - 14 + 17 + 0 40 255 255 @@ -4712,6 +5263,17 @@ 0 0 46 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 47 @@ -4753,12 +5315,13 @@ 49 7 1 - 2 + 1 0 0 0 0 0 + 0 26 255 255 @@ -4849,12 +5412,13 @@ 33 58 5 - 0 + 0 8 9 1 14 19 + 0 37 27 255 @@ -4904,6 +5468,17 @@ 0 0 48 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 49 @@ -4945,12 +5520,13 @@ 30 9 3 - 0 + 0 4 12 6 6 13 + 0 255 255 255 @@ -5000,6 +5576,17 @@ 0 0 49 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 50 @@ -5041,12 +5628,13 @@ 0 59 4 - 0 + 0 2 0 6 16 0 + 0 21 255 255 @@ -5096,6 +5684,17 @@ 0 0 50 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 51 @@ -5137,12 +5736,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -5192,6 +5792,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 52 @@ -5233,12 +5844,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -5288,6 +5900,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 53 @@ -5329,12 +5952,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -5384,6 +6008,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 54 @@ -5425,12 +6060,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -5480,6 +6116,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 55 @@ -5521,12 +6168,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -5576,6 +6224,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 56 @@ -5617,12 +6276,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -5672,6 +6332,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 57 @@ -5713,12 +6384,13 @@ 13 22 6 - 0 + 0 4 13 7 - 13 + 7 11 + 13 58 59 255 @@ -5768,6 +6440,17 @@ 1 90 57 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 58 @@ -5809,12 +6492,13 @@ 11 34 4 - 0 + 0 5 9 14 12 19 + 7 57 60 255 @@ -5864,6 +6548,17 @@ 1 85 58 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 59 @@ -5905,12 +6600,13 @@ 40 8 2 - 0 + 0 6 6 9 18 19 + 0 60 57 255 @@ -5960,6 +6656,17 @@ 1 70 59 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 60 @@ -6001,12 +6708,13 @@ 17 71 1 - 0 + 0 5 5 12 - 17 + 14 0 + 0 57 58 255 @@ -6056,6 +6764,17 @@ 1 79 60 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 61 @@ -6097,12 +6816,13 @@ 2 34 3 - 0 + 0 3 13 17 11 0 + 0 255 255 255 @@ -6152,6 +6872,17 @@ 0 0 61 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 62 @@ -6193,12 +6924,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -6248,6 +6980,17 @@ 0 0 62 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 63 @@ -6289,12 +7032,13 @@ 0 19 2 - 0 + 0 9 0 14 0 0 + 0 246 255 255 @@ -6344,6 +7088,17 @@ 1 0 63 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 64 @@ -6385,12 +7140,13 @@ 10 44 4 - 0 + 0 14 8 3 3 1 + 0 255 255 255 @@ -6440,6 +7196,17 @@ 0 0 64 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 65 @@ -6481,12 +7248,13 @@ 5 15 1 - 0 + 0 5 5 12 17 0 + 0 255 255 255 @@ -6536,6 +7304,17 @@ 0 0 65 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 66 @@ -6577,12 +7356,13 @@ 21 67 1 - 0 + 0 1 1 8 8 0 + 0 67 255 255 @@ -6632,6 +7412,17 @@ 4 18 66 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 67 @@ -6673,12 +7464,13 @@ 17 11 1 - 0 + 0 5 5 12 17 0 + 0 66 255 255 @@ -6728,6 +7520,17 @@ 11 25 67 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 68 @@ -6769,12 +7572,13 @@ 33 42 5 - 0 + 0 7 7 2 2 0 + 0 255 255 255 @@ -6824,6 +7628,17 @@ 10 12 68 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 69 @@ -6865,12 +7680,13 @@ 94 13 2 - 0 + 0 6 10 9 10 18 + 0 255 255 255 @@ -6920,6 +7736,17 @@ 6 30 69 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 70 @@ -6961,12 +7788,13 @@ 49 22 5 - 0 + 0 6 8 1 1 18 + 0 68 255 255 @@ -7016,6 +7844,17 @@ 3 25 70 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 71 @@ -7057,12 +7896,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -7112,6 +7952,17 @@ 0 0 71 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 72 @@ -7153,12 +8004,13 @@ 7 68 1 - 0 + 0 1 1 8 8 0 + 0 255 255 255 @@ -7208,6 +8060,17 @@ 8 60 72 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 73 @@ -7249,12 +8112,13 @@ 0 0 2 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -7304,6 +8168,17 @@ 0 0 73 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 74 @@ -7345,12 +8220,13 @@ 20 80 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -7400,6 +8276,17 @@ 6 0 74 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 75 @@ -7441,12 +8328,13 @@ 10 10 2 - 0 + 0 8 8 1 1 16 + 0 255 255 255 @@ -7496,6 +8384,17 @@ 10 0 75 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 76 @@ -7537,12 +8436,13 @@ 14 4 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -7592,6 +8492,17 @@ 3 60 76 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 77 @@ -7633,12 +8544,13 @@ 11 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -7688,6 +8600,17 @@ 10 70 77 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 78 @@ -7729,12 +8652,13 @@ 25 13 4 - 0 + 0 8 8 1 1 11 + 0 255 255 255 @@ -7784,6 +8708,17 @@ 0 0 78 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 79 @@ -7825,12 +8760,13 @@ 47 22 9 - 0 + 0 8 12 1 6 6 + 0 255 255 255 @@ -7880,6 +8816,17 @@ 10 35 79 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 80 @@ -7921,12 +8868,13 @@ 94 18 1 - 0 + 0 13 13 6 11 16 + 0 255 255 255 @@ -7976,6 +8924,17 @@ 6 53 80 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 81 @@ -8017,12 +8976,13 @@ 14 27 1 - 0 + 0 10 13 11 10 0 + 0 255 255 255 @@ -8072,6 +9032,17 @@ 0 0 81 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 82 @@ -8113,12 +9084,13 @@ 40 13 3 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -8168,6 +9140,17 @@ 0 0 82 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 83 @@ -8209,12 +9192,13 @@ 4 33 4 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -8264,6 +9248,17 @@ 0 0 83 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 84 @@ -8305,12 +9300,13 @@ 5 30 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -8360,6 +9356,17 @@ 3 0 84 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 85 @@ -8401,12 +9408,13 @@ 19 70 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -8456,6 +9464,17 @@ 7 36 85 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 86 @@ -8497,12 +9516,13 @@ 5 19 6 - 0 + 0 2 2 1 6 16 + 0 255 255 255 @@ -8552,6 +9572,17 @@ 7 0 86 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 87 @@ -8593,12 +9624,13 @@ 17 40 4 - 0 + 0 8 7 1 2 15 + 0 255 255 255 @@ -8648,6 +9680,17 @@ 7 0 87 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 88 @@ -8689,12 +9732,13 @@ 2 1 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -8744,6 +9788,17 @@ 10 20 88 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 89 @@ -8785,12 +9840,13 @@ 2 13 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -8840,6 +9896,17 @@ 10 42 89 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 90 @@ -8881,12 +9948,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -8936,6 +10004,17 @@ 6 5 90 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 91 @@ -8977,12 +10056,13 @@ 16 90 5 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -9032,6 +10112,17 @@ 7 0 91 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 92 @@ -9073,12 +10164,13 @@ 10 13 2 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -9128,6 +10220,17 @@ 7 0 92 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 93 @@ -9169,12 +10272,13 @@ 10 16 4 - 1 + 0 2 2 6 11 16 + 0 255 255 255 @@ -9224,6 +10328,17 @@ 7 0 93 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 94 @@ -9265,12 +10380,13 @@ 5 13 4 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -9320,6 +10436,17 @@ 7 0 94 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 95 @@ -9361,12 +10488,13 @@ 19 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -9416,6 +10544,17 @@ 7 0 95 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 96 @@ -9457,12 +10596,13 @@ 13 21 5 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -9512,6 +10652,17 @@ 0 0 96 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 97 @@ -9553,12 +10704,13 @@ 30 73 3 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -9608,6 +10760,17 @@ 2 27 97 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 98 @@ -9649,12 +10812,13 @@ 3 55 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -9704,6 +10868,17 @@ 2 40 98 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 99 @@ -9745,12 +10920,13 @@ 12 44 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -9800,6 +10976,17 @@ 2 34 99 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 100 @@ -9841,12 +11028,13 @@ 31 5 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -9896,6 +11084,17 @@ 2 67 100 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 101 @@ -9937,12 +11136,13 @@ 12 7 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -9992,6 +11192,17 @@ 1 43 101 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 102 @@ -10033,12 +11244,13 @@ 3 9 3 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -10088,6 +11300,17 @@ 10 40 102 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 103 @@ -10129,12 +11352,13 @@ 14 11 3 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -10184,6 +11408,17 @@ 5 50 103 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 104 @@ -10225,12 +11460,13 @@ 26 14 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -10280,6 +11516,17 @@ 0 0 104 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 105 @@ -10321,12 +11568,13 @@ 60 90 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -10376,6 +11624,17 @@ 9 16 105 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 106 @@ -10417,12 +11676,13 @@ 6 16 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -10472,6 +11732,17 @@ 8 37 106 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 107 @@ -10513,12 +11784,13 @@ 44 3 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -10568,6 +11840,17 @@ 7 0 107 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 108 @@ -10609,12 +11892,13 @@ 77 31 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -10664,6 +11948,17 @@ 12 50 108 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 109 @@ -10705,12 +12000,13 @@ 6 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -10760,6 +12056,17 @@ 6 51 109 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 110 @@ -10801,12 +12108,13 @@ 12 33 4 - 0 + 0 8 8 1 1 15 + 0 255 255 255 @@ -10856,6 +12164,17 @@ 0 0 110 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 111 @@ -10897,12 +12216,13 @@ 15 16 6 - 0 + 0 10 2 6 10 16 + 0 255 255 255 @@ -10952,6 +12272,17 @@ 0 0 111 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 112 @@ -10993,12 +12324,13 @@ 64 45 4 - 0 + 0 9 9 1 1 14 + 0 255 255 255 @@ -11048,6 +12380,17 @@ 0 0 112 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 113 @@ -11089,12 +12432,13 @@ 2 90 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -11144,6 +12488,17 @@ 8 38 113 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 114 @@ -11185,12 +12540,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -11240,6 +12596,17 @@ 1 0 114 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 115 @@ -11281,12 +12648,13 @@ 8 98 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -11336,6 +12704,17 @@ 11 28 115 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 116 @@ -11377,12 +12756,13 @@ 3 51 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -11432,6 +12812,17 @@ 8 6 116 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 117 @@ -11473,12 +12864,13 @@ 8 97 2 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -11528,6 +12920,17 @@ 7 0 117 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 118 @@ -11569,12 +12972,13 @@ 8 43 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -11624,6 +13028,17 @@ 0 0 118 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 119 @@ -11665,12 +13080,13 @@ 20 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -11720,6 +13136,17 @@ 0 0 119 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 120 @@ -11761,12 +13188,13 @@ 22 9 7 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -11816,6 +13244,17 @@ 3 9 120 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 121 @@ -11857,12 +13296,13 @@ 7 26 2 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -11912,6 +13352,17 @@ 3 22 121 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 122 @@ -11953,12 +13404,13 @@ 25 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -12008,6 +13460,17 @@ 11 0 122 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 123 @@ -12049,12 +13512,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -12104,6 +13568,17 @@ 11 0 123 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 124 @@ -12145,12 +13620,13 @@ 3 50 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -12200,6 +13676,17 @@ 11 18 124 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 125 @@ -12241,12 +13728,13 @@ 45 4 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -12296,6 +13784,17 @@ 11 40 125 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 126 @@ -12337,12 +13836,13 @@ 2 58 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -12392,6 +13892,17 @@ 11 15 126 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 127 @@ -12433,12 +13944,13 @@ 12 8 2 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -12488,6 +14000,17 @@ 11 18 127 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 128 @@ -12529,12 +14052,13 @@ 6 63 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -12584,6 +14108,17 @@ 4 45 128 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 129 @@ -12625,12 +14160,13 @@ 2 5 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -12680,6 +14216,17 @@ 4 41 129 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 130 @@ -12721,12 +14268,13 @@ 10 94 1 - 0 + 0 3 3 8 8 0 + 0 255 255 255 @@ -12776,6 +14324,17 @@ 4 20 130 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 131 @@ -12817,12 +14376,13 @@ 38 57 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -12872,6 +14432,17 @@ 9 15 131 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 132 @@ -12913,12 +14484,13 @@ 55 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -12968,6 +14540,17 @@ 6 34 132 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 133 @@ -13009,12 +14592,13 @@ 2 2 2 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -13064,6 +14648,17 @@ 6 0 133 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 134 @@ -13105,12 +14700,13 @@ 0 20 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -13160,6 +14756,17 @@ 5 1 134 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 135 @@ -13201,12 +14808,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -13256,6 +14864,17 @@ 3 0 135 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 136 @@ -13297,12 +14916,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -13352,6 +14972,17 @@ 10 0 136 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 137 @@ -13393,12 +15024,13 @@ 30 30 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -13448,6 +15080,17 @@ 10 0 137 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 138 @@ -13489,12 +15132,13 @@ 4 87 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -13544,6 +15188,17 @@ 2 29 138 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 139 @@ -13585,12 +15240,13 @@ 8 39 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -13640,6 +15296,17 @@ 2 30 139 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 140 @@ -13681,12 +15348,13 @@ 14 12 6 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -13736,6 +15404,17 @@ 9 0 140 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 141 @@ -13777,12 +15456,13 @@ 12 11 5 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -13832,6 +15512,17 @@ 8 0 141 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 142 @@ -13873,12 +15564,13 @@ 45 18 7 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -13928,6 +15620,17 @@ 11 0 142 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 143 @@ -13969,12 +15672,13 @@ 30 30 6 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -14024,6 +15728,17 @@ 4 0 143 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 144 @@ -14065,12 +15780,13 @@ 32 32 6 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -14120,6 +15836,17 @@ 4 0 144 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 145 @@ -14161,12 +15888,13 @@ 88 88 8 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -14216,6 +15944,17 @@ 4 0 145 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 146 @@ -14257,12 +15996,13 @@ 35 17 1 - 0 + 0 6 6 8 8 18 + 0 255 255 255 @@ -14312,6 +16052,17 @@ 0 0 146 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 147 @@ -14353,12 +16104,13 @@ 2 67 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -14408,6 +16160,17 @@ 6 39 147 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 148 @@ -14449,12 +16212,13 @@ 17 70 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -14504,6 +16268,17 @@ 3 20 148 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 149 @@ -14545,12 +16320,13 @@ 67 98 8 - 0 + 0 0 0 1 - 3 + 2 16 + 15 31 255 255 @@ -14600,6 +16376,17 @@ 1 0 149 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 150 @@ -14641,12 +16428,13 @@ 9 33 2 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -14696,6 +16484,17 @@ 0 0 150 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 151 @@ -14737,12 +16536,13 @@ 5 14 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -14792,6 +16592,17 @@ 0 0 151 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 152 @@ -14833,12 +16644,13 @@ 5 14 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -14888,6 +16700,17 @@ 0 0 152 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 153 @@ -14929,12 +16752,13 @@ 5 14 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -14984,6 +16808,17 @@ 7 0 153 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 154 @@ -15025,12 +16860,13 @@ 5 14 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -15080,6 +16916,17 @@ 7 0 154 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 155 @@ -15121,12 +16968,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -15176,6 +17024,17 @@ 4 0 155 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 156 @@ -15217,12 +17076,13 @@ 20 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -15272,6 +17132,17 @@ 0 0 156 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 157 @@ -15313,12 +17184,13 @@ 4 43 2 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -15368,6 +17240,17 @@ 10 30 157 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 158 @@ -15409,12 +17292,13 @@ 8 38 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -15464,6 +17348,17 @@ 10 20 158 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 159 @@ -15505,12 +17400,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -15560,6 +17456,17 @@ 0 0 159 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 160 @@ -15601,12 +17508,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -15656,6 +17564,17 @@ 0 0 160 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 161 @@ -15697,12 +17616,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -15752,6 +17672,17 @@ 0 0 161 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 162 @@ -15793,12 +17724,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -15848,6 +17780,17 @@ 0 0 162 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 163 @@ -15889,12 +17832,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -15944,6 +17888,17 @@ 0 0 163 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 164 @@ -15985,12 +17940,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -16040,6 +17996,17 @@ 0 0 164 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 165 @@ -16081,12 +18048,13 @@ 23 22 6 - 0 + 0 4 14 3 3 13 + 0 14 17 255 @@ -16136,6 +18104,17 @@ 0 0 165 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 166 @@ -16177,12 +18156,13 @@ 11 74 7 - 0 + 0 7 7 2 2 16 + 0 21 40 255 @@ -16232,6 +18212,17 @@ 0 0 166 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 167 @@ -16273,12 +18264,13 @@ 4 44 4 - 0 + 0 10 15 5 5 10 + 0 14 46 255 @@ -16328,6 +18320,17 @@ 0 0 167 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 168 @@ -16369,12 +18372,13 @@ 17 71 7 - 0 + 0 4 3 7 17 13 + 0 255 255 255 @@ -16424,6 +18428,17 @@ 0 0 168 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 169 @@ -16465,12 +18480,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -16520,6 +18536,17 @@ 0 0 169 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 170 @@ -16561,12 +18588,13 @@ 38 32 4 - 0 + 0 8 15 1 4 23 + 0 175 255 255 @@ -16616,6 +18644,17 @@ 0 0 170 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 171 @@ -16657,12 +18696,13 @@ 28 76 3 - 0 + 0 1 7 2 8 16 + 0 172 255 255 @@ -16712,6 +18752,17 @@ 0 0 171 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 172 @@ -16753,12 +18804,13 @@ 34 37 4 - 0 + 0 4 8 1 13 7 + 0 171 255 255 @@ -16808,6 +18860,17 @@ 0 0 172 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 173 @@ -16849,12 +18912,13 @@ 28 32 7 - 1 + 0 8 7 1 2 18 + 7 177 255 255 @@ -16904,6 +18968,17 @@ 0 0 173 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 174 @@ -16945,12 +19020,13 @@ 30 35 3 - 0 + 0 8 2 1 6 0 + 0 255 255 255 @@ -17000,6 +19076,17 @@ 0 0 174 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 175 @@ -17041,12 +19128,13 @@ 57 33 5 - 0 + 0 8 9 1 9 14 + 0 177 170 255 @@ -17096,6 +19184,17 @@ 0 0 175 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 176 @@ -17137,12 +19236,13 @@ 26 22 2 - 0 + 0 5 5 12 - 17 - 15 + 15 + 0 + 0 255 255 255 @@ -17192,6 +19292,17 @@ 0 0 176 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 177 @@ -17233,12 +19344,13 @@ 46 32 6 - 0 + 0 4 6 3 13 18 + 0 175 173 255 @@ -17288,6 +19400,17 @@ 0 0 177 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 178 @@ -17329,12 +19452,13 @@ 52 18 4 - 0 + 0 15 13 11 14 23 + 0 255 255 255 @@ -17384,6 +19508,17 @@ 0 0 178 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 179 @@ -17425,12 +19560,13 @@ 0 7 1 - 0 + 0 3 0 17 0 0 + 0 47 255 255 @@ -17480,6 +19616,17 @@ 0 0 179 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 180 @@ -17521,12 +19668,13 @@ 4 6 1 - 0 + 0 0 0 21 22 0 + 0 255 255 255 @@ -17576,6 +19724,17 @@ 0 0 180 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 181 @@ -17617,12 +19776,13 @@ 0 3 1 - 0 + 0 2 12 6 6 16 + 0 149 255 255 @@ -17672,6 +19832,17 @@ 0 0 181 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 182 @@ -17713,12 +19884,13 @@ 94 4 3 - 0 + 0 0 0 9 9 0 + 0 255 255 255 @@ -17768,6 +19940,17 @@ 0 0 182 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 183 @@ -17809,12 +19992,13 @@ 18 9 9 - 1 + 0 0 0 4 7 0 + 0 14 255 255 @@ -17864,6 +20048,17 @@ 0 0 183 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 184 @@ -17905,12 +20100,13 @@ 24 95 2 - 0 + 0 3 0 8 8 0 + 0 187 255 255 @@ -17960,6 +20156,17 @@ 0 0 184 + 0 + 0 + 0 + 0 + 0 + 1000 + 0 + 0 + 0 + 0 + 0 185 @@ -18001,12 +20208,13 @@ 70 65 2 - 0 + 0 0 0 9 11 0 + 0 20 255 255 @@ -18056,6 +20264,17 @@ 0 0 185 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 186 @@ -18097,12 +20316,13 @@ 96 13 3 - 0 + 0 0 0 9 9 0 + 0 255 255 255 @@ -18152,6 +20372,17 @@ 0 0 186 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 187 @@ -18193,12 +20424,13 @@ 2 15 2 - 5 + 0 6 0 18 22 0 + 0 184 255 255 @@ -18248,6 +20480,17 @@ 0 0 187 + 150 + 150 + 150 + 150 + 150 + 150 + 150 + 150 + 150 + 150 + 150 188 @@ -18289,12 +20532,13 @@ 0 0 1 - 0 + 0 6 0 18 22 0 + 0 40 255 255 @@ -18344,6 +20588,17 @@ 0 0 188 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 189 @@ -18385,12 +20640,13 @@ 4 2 1 - 0 + 0 0 0 9 - 20 + 15 0 + 0 247 255 255 @@ -18440,6 +20696,17 @@ 0 0 189 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 190 @@ -18481,12 +20748,13 @@ 2 2 1 - 0 + 0 5 0 - 17 + 12 15 - 12 + 0 + 0 255 255 255 @@ -18536,6 +20804,17 @@ 0 0 190 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 191 @@ -18577,12 +20856,13 @@ 11 99 1 - 0 + 0 3 0 8 8 0 + 0 4 255 255 @@ -18632,6 +20912,17 @@ 0 0 191 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 192 @@ -18673,12 +20964,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -18727,6 +21019,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 193 @@ -18768,12 +21071,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -18822,6 +21126,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 194 @@ -18863,12 +21178,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -18917,6 +21233,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 195 @@ -18958,12 +21285,13 @@ 8 88 3 - 0 + 0 8 8 0 0 0 + 0 -1 -1 -1 @@ -19013,6 +21341,17 @@ 0 0 195 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 196 @@ -19054,12 +21393,13 @@ 0 0 1 - 0 + 0 13 0 19 11 0 + 0 -1 -1 -1 @@ -19109,6 +21449,17 @@ 0 0 196 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 197 @@ -19150,12 +21501,13 @@ 0 70 1 - 0 + 0 3 0 8 0 0 + 0 -1 -1 -1 @@ -19205,6 +21557,17 @@ 0 0 197 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 198 @@ -19246,12 +21609,13 @@ 46 0 1 - 0 + 0 0 0 9 0 0 + 0 -1 -1 -1 @@ -19301,6 +21665,17 @@ 0 0 198 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 199 @@ -19342,12 +21717,13 @@ 0 0 1 - 0 + 0 0 0 0 0 0 + 0 255 255 255 @@ -19396,6 +21772,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 200 @@ -19437,12 +21824,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -19491,6 +21879,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 201 @@ -19532,12 +21931,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -19586,6 +21986,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 202 @@ -19627,12 +22038,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -19681,6 +22093,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 203 @@ -19722,12 +22145,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -19776,6 +22200,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 204 @@ -19817,12 +22252,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -19871,6 +22307,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 205 @@ -19912,12 +22359,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -19966,6 +22414,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 206 @@ -20007,12 +22466,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -20061,6 +22521,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 207 @@ -20102,12 +22573,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -20156,6 +22628,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 208 @@ -20197,12 +22680,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -20251,6 +22735,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 209 @@ -20292,12 +22787,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -20346,6 +22842,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 210 @@ -20387,12 +22894,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -20441,6 +22949,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 211 @@ -20482,12 +23001,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -20536,6 +23056,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 212 @@ -20577,12 +23108,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -20631,6 +23163,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 213 @@ -20672,12 +23215,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -20726,6 +23270,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 214 @@ -20767,12 +23322,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -20821,6 +23377,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 215 @@ -20862,12 +23429,13 @@ 12 13 2 - 0 + 0 8 13 4 11 15 + 0 255 255 255 @@ -20917,6 +23485,17 @@ 0 0 215 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 216 @@ -20958,12 +23537,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -21012,6 +23592,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 217 @@ -21053,12 +23644,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -21107,6 +23699,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 218 @@ -21148,12 +23751,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -21202,6 +23806,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 219 @@ -21243,12 +23858,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -21297,6 +23913,17 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 220 @@ -21338,12 +23965,13 @@ 11 18 2 - 0 + 0 9 0 14 0 0 + 0 255 255 255 @@ -21393,6 +24021,17 @@ 0 0 220 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 221 @@ -21434,12 +24073,13 @@ 4 7 1 - 0 + 0 13 0 11 0 0 + 0 255 255 255 @@ -21489,6 +24129,17 @@ 0 0 221 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 222 @@ -21530,7 +24181,7 @@ 25 48 8 - 1 + 0 6 6 7 @@ -21586,6 +24237,17 @@ 0 0 222 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 223 @@ -21627,7 +24289,7 @@ 14 24 2 - 0 + 0 7 5 2 @@ -21683,6 +24345,17 @@ 0 0 223 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 224 @@ -21724,12 +24397,13 @@ 2 87 2 - 0 + 0 3 0 8 0 0 + 0 46 47 255 @@ -21779,6 +24453,17 @@ 0 0 224 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 225 @@ -21820,12 +24505,13 @@ 59 25 2 - 0 + 0 6 0 9 18 22 + 0 255 255 255 @@ -21875,6 +24561,17 @@ 0 0 225 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 226 @@ -21916,12 +24613,13 @@ 21 72 7 - 1 + 0 13 6 4 11 18 + 0 222 255 255 @@ -21971,6 +24669,17 @@ 0 0 226 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 + 10000 227 @@ -22012,12 +24721,13 @@ 44 1 1 - 0 + 0 0 0 15 9 22 + 0 182 255 255 @@ -22067,6 +24777,17 @@ 0 0 227 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 228 @@ -22108,12 +24829,13 @@ 83 3 2 - 0 + 0 0 0 9 9 0 + 0 242 255 255 @@ -22163,6 +24885,17 @@ 0 0 228 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 229 @@ -22204,12 +24937,13 @@ 40 8 4 - 0 + 0 9 9 23 14 15 + 20 59 60 255 @@ -22259,6 +24993,17 @@ 1 50 229 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 230 @@ -22300,12 +25045,13 @@ 11 99 5 - 0 + 0 2 3 8 8 6 + 0 243 255 255 @@ -22355,6 +25101,17 @@ 0 0 230 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 231 @@ -22396,12 +25153,13 @@ 2 20 3 - 0 + 0 9 9 11 14 15 + 0 18 255 255 @@ -22451,6 +25209,17 @@ 0 0 231 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 232 @@ -22492,12 +25261,13 @@ 57 78 5 - 0 + 0 9 3 9 8 14 + 0 255 255 255 @@ -22547,6 +25317,17 @@ 0 0 232 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 233 @@ -22588,12 +25369,13 @@ 13 78 5 - 0 + 0 14 6 3 7 19 + 0 27 255 255 @@ -22643,6 +25425,17 @@ 0 0 233 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 234 @@ -22684,12 +25477,13 @@ 4 92 4 - 0 + 0 1 10 8 10 0 + 0 29 255 255 @@ -22739,6 +25533,17 @@ 0 0 234 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 235 @@ -22780,12 +25585,13 @@ 9 10 2 - 0 + 0 14 0 3 4 - 0 + 4 + 0 255 255 255 @@ -22835,6 +25641,17 @@ 0 0 235 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 236 @@ -22876,12 +25693,13 @@ 40 28 3 - 0 + 0 6 8 1 18 21 + 0 240 255 255 @@ -22931,6 +25749,17 @@ 0 0 236 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 237 @@ -22972,12 +25801,13 @@ 15 68 5 - 0 + 0 14 7 3 2 16 + 1 255 255 255 @@ -23027,6 +25857,17 @@ 0 0 237 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 238 @@ -23068,12 +25909,13 @@ 8 88 2 - 0 + 0 1 13 8 11 0 + 0 225 255 255 @@ -23123,6 +25965,17 @@ 0 0 238 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 239 @@ -23164,12 +26017,13 @@ 2 37 2 - 0 + 0 2 5 6 17 0 + 0 252 255 255 @@ -23219,6 +26073,17 @@ 0 0 239 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 240 @@ -23260,12 +26125,13 @@ 24 28 3 - 0 + 0 14 4 3 13 22 + 0 236 255 255 @@ -23315,6 +26181,17 @@ 0 0 240 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 241 @@ -23356,12 +26233,13 @@ 8 46 5 - 0 + 0 3 4 8 13 17 + 0 255 255 255 @@ -23411,6 +26289,17 @@ 0 0 241 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 242 @@ -23452,12 +26341,13 @@ 93 37 3 - 0 + 0 13 13 9 9 11 + 0 255 255 255 @@ -23507,6 +26397,17 @@ 0 0 242 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 243 @@ -23548,12 +26449,13 @@ 8 86 4 - 0 + 0 2 0 6 8 - 0 + 21 + 0 230 255 255 @@ -23603,6 +26505,17 @@ 0 0 243 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 244 @@ -23644,12 +26557,13 @@ 12 81 1 - 0 + 0 9 1 20 20 14 + 0 255 255 255 @@ -23699,6 +26613,17 @@ 0 0 244 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 245 @@ -23740,12 +26665,13 @@ 10 4 1 - 0 + 0 9 0 20 14 20 + 0 248 255 255 @@ -23795,6 +26721,17 @@ 0 0 245 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 246 @@ -23836,12 +26773,13 @@ 6 38 1 - 0 + 0 13 13 11 15 0 + 0 63 255 255 @@ -23891,6 +26829,17 @@ 0 0 246 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 247 @@ -23932,12 +26881,13 @@ 15 15 1 - 0 + 0 6 10 18 10 0 + 0 255 255 255 @@ -23987,6 +26937,17 @@ 0 0 247 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 248 @@ -24028,12 +26989,13 @@ 89 21 3 - 0 + 0 0 0 9 9 0 + 0 245 255 255 @@ -24083,6 +27045,17 @@ 0 0 248 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 249 @@ -24124,12 +27097,13 @@ 22 26 1 - 0 + 0 0 0 19 21 22 + 0 255 255 255 @@ -24179,6 +27153,17 @@ 0 0 249 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 250 @@ -24220,12 +27205,13 @@ 29 88 5 - 2 + 1 3 1 8 4 0 + 0 183 255 255 @@ -24275,6 +27261,17 @@ 0 0 250 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 251 @@ -24316,12 +27313,13 @@ 7 20 1 - 0 + 0 3 0 17 0 0 + 0 255 255 255 @@ -24371,6 +27369,17 @@ 0 0 251 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 252 @@ -24412,12 +27421,13 @@ 31 11 1 - 0 + 0 3 0 17 0 0 + 0 255 255 255 @@ -24467,6 +27477,17 @@ 0 0 252 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 253 @@ -24508,12 +27529,13 @@ 2 12 2 - 0 + 0 0 0 5 5 0 + 0 149 255 255 @@ -24563,6 +27585,17 @@ 0 0 253 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 254 @@ -24604,12 +27637,13 @@ 0 0 0 - 0 + 0 0 0 0 0 0 + 0 0 0 0 @@ -24659,5 +27693,16 @@ 0 0 254 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index ee74fe416..8825760e9 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -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 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 -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. ; diff --git a/gamedir/Data/Skills_Settings.INI b/gamedir/Data/Skills_Settings.INI index a8fe90780..913d39154 100644 --- a/gamedir/Data/Skills_Settings.INI +++ b/gamedir/Data/Skills_Settings.INI @@ -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 diff --git a/gamedir/Profiles/UserProfile_JA2113/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_JA2113/Ja2_Settings.INI index f008076b5..45fbc8084 100644 --- a/gamedir/Profiles/UserProfile_JA2113/Ja2_Settings.INI +++ b/gamedir/Profiles/UserProfile_JA2113/Ja2_Settings.INI @@ -44,27 +44,27 @@ TOPTION_ANIMATE_SMOKE = TRUE TOPTION_BLOOD_N_GORE = TRUE TOPTION_DONT_MOVE_MOUSE = FALSE TOPTION_OLD_SELECTION_METHOD = FALSE -TOPTION_ALWAYS_SHOW_MOVEMENT_PATH = FALSE +TOPTION_ALWAYS_SHOW_MOVEMENT_PATH = TRUE TOPTION_SHOW_MISSES = FALSE TOPTION_RTCONFIRM = FALSE -TOPTION_SLEEPWAKE_NOTIFICATION = TRUE +TOPTION_SLEEPWAKE_NOTIFICATION = FALSE TOPTION_USE_METRIC_SYSTEM = TRUE TOPTION_SMART_CURSOR = FALSE TOPTION_SNAP_CURSOR_TO_DOOR = TRUE TOPTION_GLOW_ITEMS = TRUE -TOPTION_TOGGLE_TREE_TOPS = FALSE -TOPTION_SMART_TREE_TOPS = FALSE +TOPTION_TOGGLE_TREE_TOPS = TRUE +TOPTION_SMART_TREE_TOPS = TRUE TOPTION_TOGGLE_WIREFRAME = TRUE TOPTION_3D_CURSOR = FALSE TOPTION_CTH_CURSOR = TRUE TOPTION_GL_BURST_CURSOR = TRUE TOPTION_ALLOW_TAUNTS = TRUE -TOPTION_GL_HIGH_ANGLE = FALSE +TOPTION_GL_HIGH_ANGLE = TRUE TOPTION_ALLOW_REAL_TIME_SNEAK = FALSE TOPTION_SPACE_SELECTS_NEXT_SQUAD = TRUE TOPTION_SHOW_ITEM_SHADOW = TRUE TOPTION_SHOW_WEAPON_RANGE_IN_TILES = TRUE -TOPTION_TRACERS_FOR_SINGLE_FIRE = FALSE +TOPTION_TRACERS_FOR_SINGLE_FIRE = TRUE TOPTION_RAIN_SOUND = TRUE TOPTION_ALLOW_CROWS = TRUE TOPTION_ALLOW_SOLDIER_TOOLTIPS = TRUE @@ -82,22 +82,22 @@ TOPTION_DISABLE_CURSOR_SWAP = TRUE TOPTION_QUIET_TRAINING = FALSE TOPTION_QUIET_REPAIRING = FALSE TOPTION_QUIET_DOCTORING = FALSE -TOPTION_AUTO_FAST_FORWARD_MODE = FALSE +TOPTION_AUTO_FAST_FORWARD_MODE = TRUE TOPTION_SHOW_LAST_ENEMY = FALSE -TOPTION_ALT_START_AIM = FALSE +TOPTION_ALT_START_AIM = TRUE TOPTION_ALT_PATHFINDING = FALSE TOPTION_SHOW_LBE_CONTENT = TRUE TOPTION_INVERT_WHEEL = FALSE TOPTION_ZOMBIES = FALSE TOPTION_ENABLE_INVENTORY_POPUPS = TRUE -TOPTION_MERCENARY_FORMATIONS = TRUE +TOPTION_MERCENARY_FORMATIONS = FALSE TOPTION_SHOW_ENEMY_LOCATION = FALSE TOPTION_CHEAT_MODE_OPTIONS_HEADER = FALSE TOPTION_FORCE_BOBBY_RAY_SHIPMENTS = FALSE TOPTION_CHEAT_MODE_OPTIONS_END = FALSE TOPTION_DEBUG_MODE_OPTIONS_HEADER = FALSE TOPTION_REPORT_MISS_MARGIN = FALSE -TOPTION_USE_LOGICAL_BODYTYPES = FALSE +TOPTION_USE_LOGICAL_BODYTYPES = TRUE TOPTION_SHOW_RESET_ALL_OPTIONS = FALSE TOPTION_RESET_ALL_OPTIONS = FALSE TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE = FALSE diff --git a/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI index 3472b498a..bfe3c1072 100644 --- a/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI +++ b/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI @@ -44,27 +44,27 @@ TOPTION_ANIMATE_SMOKE = TRUE TOPTION_BLOOD_N_GORE = TRUE TOPTION_DONT_MOVE_MOUSE = FALSE TOPTION_OLD_SELECTION_METHOD = FALSE -TOPTION_ALWAYS_SHOW_MOVEMENT_PATH = FALSE +TOPTION_ALWAYS_SHOW_MOVEMENT_PATH = TRUE TOPTION_SHOW_MISSES = FALSE TOPTION_RTCONFIRM = FALSE -TOPTION_SLEEPWAKE_NOTIFICATION = TRUE +TOPTION_SLEEPWAKE_NOTIFICATION = FALSE TOPTION_USE_METRIC_SYSTEM = TRUE TOPTION_SMART_CURSOR = FALSE TOPTION_SNAP_CURSOR_TO_DOOR = TRUE TOPTION_GLOW_ITEMS = TRUE TOPTION_TOGGLE_TREE_TOPS = TRUE -TOPTION_SMART_TREE_TOPS = FALSE +TOPTION_SMART_TREE_TOPS = TRUE TOPTION_TOGGLE_WIREFRAME = TRUE TOPTION_3D_CURSOR = FALSE TOPTION_CTH_CURSOR = FALSE TOPTION_GL_BURST_CURSOR = TRUE TOPTION_ALLOW_TAUNTS = FALSE -TOPTION_GL_HIGH_ANGLE = FALSE +TOPTION_GL_HIGH_ANGLE = TRUE TOPTION_ALLOW_REAL_TIME_SNEAK = FALSE TOPTION_SPACE_SELECTS_NEXT_SQUAD = TRUE TOPTION_SHOW_ITEM_SHADOW = TRUE TOPTION_SHOW_WEAPON_RANGE_IN_TILES = TRUE -TOPTION_TRACERS_FOR_SINGLE_FIRE = FALSE +TOPTION_TRACERS_FOR_SINGLE_FIRE = TRUE TOPTION_RAIN_SOUND = TRUE TOPTION_ALLOW_CROWS = TRUE TOPTION_ALLOW_SOLDIER_TOOLTIPS = FALSE @@ -82,9 +82,9 @@ TOPTION_DISABLE_CURSOR_SWAP = FALSE TOPTION_QUIET_TRAINING = FALSE TOPTION_QUIET_REPAIRING = FALSE TOPTION_QUIET_DOCTORING = FALSE -TOPTION_AUTO_FAST_FORWARD_MODE = FALSE +TOPTION_AUTO_FAST_FORWARD_MODE = TRUE TOPTION_SHOW_LAST_ENEMY = FALSE -TOPTION_ALT_START_AIM = FALSE +TOPTION_ALT_START_AIM = TRUE TOPTION_ALT_PATHFINDING = FALSE TOPTION_SHOW_LBE_CONTENT = FALSE TOPTION_INVERT_WHEEL = FALSE diff --git a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_1.13/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_1.13/Ja2_Settings.INI index f008076b5..45fbc8084 100644 --- a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_1.13/Ja2_Settings.INI +++ b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_1.13/Ja2_Settings.INI @@ -44,27 +44,27 @@ TOPTION_ANIMATE_SMOKE = TRUE TOPTION_BLOOD_N_GORE = TRUE TOPTION_DONT_MOVE_MOUSE = FALSE TOPTION_OLD_SELECTION_METHOD = FALSE -TOPTION_ALWAYS_SHOW_MOVEMENT_PATH = FALSE +TOPTION_ALWAYS_SHOW_MOVEMENT_PATH = TRUE TOPTION_SHOW_MISSES = FALSE TOPTION_RTCONFIRM = FALSE -TOPTION_SLEEPWAKE_NOTIFICATION = TRUE +TOPTION_SLEEPWAKE_NOTIFICATION = FALSE TOPTION_USE_METRIC_SYSTEM = TRUE TOPTION_SMART_CURSOR = FALSE TOPTION_SNAP_CURSOR_TO_DOOR = TRUE TOPTION_GLOW_ITEMS = TRUE -TOPTION_TOGGLE_TREE_TOPS = FALSE -TOPTION_SMART_TREE_TOPS = FALSE +TOPTION_TOGGLE_TREE_TOPS = TRUE +TOPTION_SMART_TREE_TOPS = TRUE TOPTION_TOGGLE_WIREFRAME = TRUE TOPTION_3D_CURSOR = FALSE TOPTION_CTH_CURSOR = TRUE TOPTION_GL_BURST_CURSOR = TRUE TOPTION_ALLOW_TAUNTS = TRUE -TOPTION_GL_HIGH_ANGLE = FALSE +TOPTION_GL_HIGH_ANGLE = TRUE TOPTION_ALLOW_REAL_TIME_SNEAK = FALSE TOPTION_SPACE_SELECTS_NEXT_SQUAD = TRUE TOPTION_SHOW_ITEM_SHADOW = TRUE TOPTION_SHOW_WEAPON_RANGE_IN_TILES = TRUE -TOPTION_TRACERS_FOR_SINGLE_FIRE = FALSE +TOPTION_TRACERS_FOR_SINGLE_FIRE = TRUE TOPTION_RAIN_SOUND = TRUE TOPTION_ALLOW_CROWS = TRUE TOPTION_ALLOW_SOLDIER_TOOLTIPS = TRUE @@ -82,22 +82,22 @@ TOPTION_DISABLE_CURSOR_SWAP = TRUE TOPTION_QUIET_TRAINING = FALSE TOPTION_QUIET_REPAIRING = FALSE TOPTION_QUIET_DOCTORING = FALSE -TOPTION_AUTO_FAST_FORWARD_MODE = FALSE +TOPTION_AUTO_FAST_FORWARD_MODE = TRUE TOPTION_SHOW_LAST_ENEMY = FALSE -TOPTION_ALT_START_AIM = FALSE +TOPTION_ALT_START_AIM = TRUE TOPTION_ALT_PATHFINDING = FALSE TOPTION_SHOW_LBE_CONTENT = TRUE TOPTION_INVERT_WHEEL = FALSE TOPTION_ZOMBIES = FALSE TOPTION_ENABLE_INVENTORY_POPUPS = TRUE -TOPTION_MERCENARY_FORMATIONS = TRUE +TOPTION_MERCENARY_FORMATIONS = FALSE TOPTION_SHOW_ENEMY_LOCATION = FALSE TOPTION_CHEAT_MODE_OPTIONS_HEADER = FALSE TOPTION_FORCE_BOBBY_RAY_SHIPMENTS = FALSE TOPTION_CHEAT_MODE_OPTIONS_END = FALSE TOPTION_DEBUG_MODE_OPTIONS_HEADER = FALSE TOPTION_REPORT_MISS_MARGIN = FALSE -TOPTION_USE_LOGICAL_BODYTYPES = FALSE +TOPTION_USE_LOGICAL_BODYTYPES = TRUE TOPTION_SHOW_RESET_ALL_OPTIONS = FALSE TOPTION_RESET_ALL_OPTIONS = FALSE TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE = FALSE diff --git a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_Vanilla/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_Vanilla/Ja2_Settings.INI index 0286a6ca5..205b869ec 100644 --- a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_Vanilla/Ja2_Settings.INI +++ b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_Vanilla/Ja2_Settings.INI @@ -44,7 +44,7 @@ TOPTION_ANIMATE_SMOKE = TRUE TOPTION_BLOOD_N_GORE = TRUE TOPTION_DONT_MOVE_MOUSE = FALSE TOPTION_OLD_SELECTION_METHOD = FALSE -TOPTION_ALWAYS_SHOW_MOVEMENT_PATH = FALSE +TOPTION_ALWAYS_SHOW_MOVEMENT_PATH = TRUE TOPTION_SHOW_MISSES = FALSE TOPTION_RTCONFIRM = FALSE TOPTION_SLEEPWAKE_NOTIFICATION = TRUE @@ -53,18 +53,18 @@ TOPTION_SMART_CURSOR = FALSE TOPTION_SNAP_CURSOR_TO_DOOR = TRUE TOPTION_GLOW_ITEMS = TRUE TOPTION_TOGGLE_TREE_TOPS = TRUE -TOPTION_SMART_TREE_TOPS = FALSE +TOPTION_SMART_TREE_TOPS = TRUE TOPTION_TOGGLE_WIREFRAME = TRUE TOPTION_3D_CURSOR = FALSE TOPTION_CTH_CURSOR = FALSE TOPTION_GL_BURST_CURSOR = TRUE TOPTION_ALLOW_TAUNTS = FALSE -TOPTION_GL_HIGH_ANGLE = FALSE +TOPTION_GL_HIGH_ANGLE = TRUE TOPTION_ALLOW_REAL_TIME_SNEAK = FALSE TOPTION_SPACE_SELECTS_NEXT_SQUAD = TRUE TOPTION_SHOW_ITEM_SHADOW = TRUE TOPTION_SHOW_WEAPON_RANGE_IN_TILES = TRUE -TOPTION_TRACERS_FOR_SINGLE_FIRE = FALSE +TOPTION_TRACERS_FOR_SINGLE_FIRE = TRUE TOPTION_RAIN_SOUND = TRUE TOPTION_ALLOW_CROWS = TRUE TOPTION_ALLOW_SOLDIER_TOOLTIPS = FALSE @@ -82,9 +82,9 @@ TOPTION_DISABLE_CURSOR_SWAP = FALSE TOPTION_QUIET_TRAINING = FALSE TOPTION_QUIET_REPAIRING = FALSE TOPTION_QUIET_DOCTORING = FALSE -TOPTION_AUTO_FAST_FORWARD_MODE = FALSE +TOPTION_AUTO_FAST_FORWARD_MODE = TRUE TOPTION_SHOW_LAST_ENEMY = FALSE -TOPTION_ALT_START_AIM = FALSE +TOPTION_ALT_START_AIM = TRUE TOPTION_ALT_PATHFINDING = FALSE TOPTION_SHOW_LBE_CONTENT = FALSE TOPTION_INVERT_WHEEL = FALSE diff --git a/gamedir/Shaders/cubic/catmull-rom-bilinear.glsl b/gamedir/Shaders/cubic/catmull-rom-bilinear.glsl index 55fb05d04..cfe00bff0 100644 --- a/gamedir/Shaders/cubic/catmull-rom-bilinear.glsl +++ b/gamedir/Shaders/cubic/catmull-rom-bilinear.glsl @@ -1,150 +1,137 @@ -/* - Bicubic Catmull-Rom 9 taps (Fast) - ported by Hyllian - 2020 - The following code is licensed under the MIT license: https://gist.github.com/TheRealMJP/bc503b0b87b643d3505d41eab8b332ae - Ported from code: https://gist.github.com/TheRealMJP/c83b8c0f46b63f3a88a5986f4fa982b1 - Samples a texture with Catmull-Rom filtering, using 9 texture fetches instead of 16. - See http://vec3.ca/bicubic-filtering-in-fewer-taps/ for more details - ATENTION: This code only work using LINEAR filter sampling set on Retroarch! -*/ - -#if defined(VERTEX) - -#if __VERSION__ >= 130 -#define COMPAT_VARYING out -#define COMPAT_ATTRIBUTE in -#define COMPAT_TEXTURE texture -#else -#define COMPAT_VARYING varying -#define COMPAT_ATTRIBUTE attribute -#define COMPAT_TEXTURE texture2D -#endif - -#ifdef GL_ES -#define COMPAT_PRECISION mediump -precision COMPAT_PRECISION float; -#else -#define COMPAT_PRECISION -#endif - -COMPAT_ATTRIBUTE vec4 VertexCoord; -COMPAT_ATTRIBUTE vec4 COLOR; -COMPAT_ATTRIBUTE vec4 TexCoord; -COMPAT_VARYING vec4 COL0; -COMPAT_VARYING vec4 TEX0; - -uniform mat4 MVPMatrix; -uniform COMPAT_PRECISION int FrameDirection; -uniform COMPAT_PRECISION int FrameCount; -uniform COMPAT_PRECISION vec2 OutputSize; -uniform COMPAT_PRECISION vec2 TextureSize; -uniform COMPAT_PRECISION vec2 InputSize; - -void main() -{ - gl_Position = MVPMatrix * VertexCoord; - COL0 = COLOR; - TEX0.xy = TexCoord.xy; -} - -#elif defined(FRAGMENT) - -#if __VERSION__ >= 130 -#define COMPAT_VARYING in -#define COMPAT_TEXTURE texture -out mediump vec4 FragColor; -#else -#define COMPAT_VARYING varying -#define FragColor gl_FragColor -#define COMPAT_TEXTURE texture2D -#endif - -#ifdef GL_ES -#ifdef GL_FRAGMENT_PRECISION_HIGH -precision highp float; -#else -precision mediump float; -#endif -#define COMPAT_PRECISION mediump -#else -#define COMPAT_PRECISION -#endif - -uniform COMPAT_PRECISION int FrameDirection; -uniform COMPAT_PRECISION int FrameCount; -uniform COMPAT_PRECISION vec2 OutputSize; -uniform COMPAT_PRECISION vec2 TextureSize; -uniform COMPAT_PRECISION vec2 InputSize; -uniform sampler2D Texture; -COMPAT_VARYING vec4 TEX0; - -// compatibility #defines -#define Source Texture -#define vTexCoord TEX0.xy - -#define SourceSize vec4(TextureSize, 1.0 / TextureSize) //either TextureSize or InputSize -#define outsize vec4(OutputSize, 1.0 / OutputSize) - -#define mul(c,d) (d*c) - -void main() -{ - // We're going to sample a a 4x4 grid of texels surrounding the target UV coordinate. We'll do this by rounding - // down the sample location to get the exact center of our "starting" texel. The starting texel will be at - // location [1, 1] in the grid, where [0, 0] is the top left corner. - vec2 samplePos = vTexCoord * SourceSize.xy; - vec2 texPos1 = floor(samplePos - 0.5) + 0.5; - - // Compute the fractional offset from our starting texel to our original sample location, which we'll - // feed into the Catmull-Rom spline function to get our filter weights. - vec2 f = samplePos - texPos1; - - // Compute the Catmull-Rom weights using the fractional offset that we calculated earlier. - // These equations are pre-expanded based on our knowledge of where the texels will be located, - // which lets us avoid having to evaluate a piece-wise function. - vec2 w0 = f * (-0.5 + f * (1.0 - 0.5 * f)); - vec2 w1 = 1.0 + f * f * (-2.5 + 1.5 * f); - vec2 w2 = f * (0.5 + f * (2.0 - 1.5 * f)); - vec2 w3 = f * f * (-0.5 + 0.5 * f); - // vec2 w3 = 1.0 - w0 - w1 - w2; - - // Work out weighting factors and sampling offsets that will let us use bilinear filtering to - // simultaneously evaluate the middle 2 samples from the 4x4 grid. - vec2 w12 = w1 + w2; - vec2 offset12 = w2 / (w1 + w2); - - // Compute the final UV coordinates we'll use for sampling the texture - vec2 texPos0 = texPos1 - 1.; - vec2 texPos3 = texPos1 + 2.; - vec2 texPos12 = texPos1 + offset12; - - texPos0 *= SourceSize.zw; - texPos3 *= SourceSize.zw; - texPos12 *= SourceSize.zw; - - vec4 c00 = COMPAT_TEXTURE(Source, vec2(texPos0.x, texPos0.y)); - vec4 c10 = COMPAT_TEXTURE(Source, vec2(texPos12.x, texPos0.y)); - vec4 c20 = COMPAT_TEXTURE(Source, vec2(texPos3.x, texPos0.y)); - - vec4 c01 = COMPAT_TEXTURE(Source, vec2(texPos0.x, texPos12.y)); - vec4 c11 = COMPAT_TEXTURE(Source, vec2(texPos12.x, texPos12.y)); - vec4 c21 = COMPAT_TEXTURE(Source, vec2(texPos3.x, texPos12.y)); - - vec4 c02 = COMPAT_TEXTURE(Source, vec2(texPos0.x, texPos3.y)); - vec4 c12 = COMPAT_TEXTURE(Source, vec2(texPos12.x, texPos3.y)); - vec4 c22 = COMPAT_TEXTURE(Source, vec2(texPos3.x, texPos3.y)); - - // initialize some variables - vec4 c1, c2, c3, wx, wy = vec4(0.,0.,0.,0.); - // junk vec4 used only to round out the non-square 3x4 matrices - vec4 dummy = vec4(0.,0.,0.,1.); - - wx = vec4(w0.x, w12.x, w3.x, 1.0); - wy = vec4(w0.y, w12.y, w3.y, 1.0); - - c1 = vec4(mul(wx, mat4(c00, c10, c20, dummy))); - c2 = vec4(mul(wx, mat4(c01, c11, c21, dummy))); - c3 = vec4(mul(wx, mat4(c02, c12, c22, dummy))); - - FragColor = mul(wy, mat4(c1, c2, c3, dummy)); -} -#endif +/* + The following code is licensed under the MIT license: https://gist.github.com/TheRealMJP/bc503b0b87b643d3505d41eab8b332ae + Ported from code: https://gist.github.com/TheRealMJP/c83b8c0f46b63f3a88a5986f4fa982b1 + Samples a texture with Catmull-Rom filtering, using 9 texture fetches instead of 16. + See http://vec3.ca/bicubic-filtering-in-fewer-taps/ for more details + ATENTION: This code only work using LINEAR filter sampling set on Retroarch! + Modified to use 5 texture fetches +*/ + +#if defined(VERTEX) + +#if __VERSION__ >= 130 +#define COMPAT_VARYING out +#define COMPAT_ATTRIBUTE in +#define COMPAT_TEXTURE texture +#else +#define COMPAT_VARYING varying +#define COMPAT_ATTRIBUTE attribute +#define COMPAT_TEXTURE texture2D +#endif + +#ifdef GL_ES +#define COMPAT_PRECISION mediump +precision COMPAT_PRECISION float; +#else +#define COMPAT_PRECISION +#endif + +COMPAT_ATTRIBUTE vec4 VertexCoord; +COMPAT_ATTRIBUTE vec4 COLOR; +COMPAT_ATTRIBUTE vec4 TexCoord; +COMPAT_VARYING vec4 COL0; +COMPAT_VARYING vec4 TEX0; + +uniform mat4 MVPMatrix; +uniform COMPAT_PRECISION int FrameDirection; +uniform COMPAT_PRECISION int FrameCount; +uniform COMPAT_PRECISION vec2 OutputSize; +uniform COMPAT_PRECISION vec2 TextureSize; +uniform COMPAT_PRECISION vec2 InputSize; + +void main() +{ + gl_Position = MVPMatrix * VertexCoord; + COL0 = COLOR; + TEX0.xy = TexCoord.xy; +} + +#elif defined(FRAGMENT) + +#if __VERSION__ >= 130 +#define COMPAT_VARYING in +#define COMPAT_TEXTURE texture +out mediump vec4 FragColor; +#else +#define COMPAT_VARYING varying +#define FragColor gl_FragColor +#define COMPAT_TEXTURE texture2D +#endif + +#ifdef GL_ES +#ifdef GL_FRAGMENT_PRECISION_HIGH +precision highp float; +#else +precision mediump float; +#endif +#define COMPAT_PRECISION mediump +#else +#define COMPAT_PRECISION +#endif + +uniform COMPAT_PRECISION int FrameDirection; +uniform COMPAT_PRECISION int FrameCount; +uniform COMPAT_PRECISION vec2 OutputSize; +uniform COMPAT_PRECISION vec2 TextureSize; +uniform COMPAT_PRECISION vec2 InputSize; +uniform sampler2D Texture; +COMPAT_VARYING vec4 TEX0; + +// compatibility #defines +#define Source Texture +#define vTexCoord TEX0.xy + +#define SourceSize vec4(TextureSize, 1.0 / TextureSize) //either TextureSize or InputSize +#define outsize vec4(OutputSize, 1.0 / OutputSize) + +void main() +{ + // We're going to sample a a 4x4 grid of texels surrounding the target UV coordinate. We'll do this by rounding + // down the sample location to get the exact center of our "starting" texel. The starting texel will be at + // location [1, 1] in the grid, where [0, 0] is the top left corner. + vec2 samplePos = vTexCoord * SourceSize.xy; + vec2 texPos1 = floor(samplePos - 0.5) + 0.5; + + // Compute the fractional offset from our starting texel to our original sample location, which we'll + // feed into the Catmull-Rom spline function to get our filter weights. + vec2 f = samplePos - texPos1; + + // Compute the Catmull-Rom weights using the fractional offset that we calculated earlier. + // These equations are pre-expanded based on our knowledge of where the texels will be located, + // which lets us avoid having to evaluate a piece-wise function. + vec2 w0 = f * (-0.5 + f * (1.0 - 0.5 * f)); + vec2 w1 = 1.0 + f * f * (-2.5 + 1.5 * f); + vec2 w2 = f * (0.5 + f * (2.0 - 1.5 * f)); + vec2 w3 = f * f * (-0.5 + 0.5 * f); + + // Work out weighting factors and sampling offsets that will let us use bilinear filtering to + // simultaneously evaluate the middle 2 samples from the 4x4 grid. + vec2 w12 = w1 + w2; + vec2 offset12 = w2 / (w1 + w2); + + // Compute the final UV coordinates we'll use for sampling the texture + vec2 texPos0 = texPos1 - 1.; + vec2 texPos3 = texPos1 + 2.; + vec2 texPos12 = texPos1 + offset12; + + texPos0 *= SourceSize.zw; + texPos3 *= SourceSize.zw; + texPos12 *= SourceSize.zw; + + float wtm = w12.x * w0.y; + float wml = w0.x * w12.y; + float wmm = w12.x * w12.y; + float wmr = w3.x * w12.y; + float wbm = w12.x * w3.y; + + vec3 result = vec3(0.0f); + + result += COMPAT_TEXTURE(Source, vec2(texPos12.x, texPos0.y)).rgb * wtm; + result += COMPAT_TEXTURE(Source, vec2(texPos0.x, texPos12.y)).rgb * wml; + result += COMPAT_TEXTURE(Source, vec2(texPos12.x, texPos12.y)).rgb * wmm; + result += COMPAT_TEXTURE(Source, vec2(texPos3.x, texPos12.y)).rgb * wmr; + result += COMPAT_TEXTURE(Source, vec2(texPos12.x, texPos3.y)).rgb * wbm; + + FragColor = vec4(result * (1./(wtm+wml+wmm+wmr+wbm)), 1.0); +} +#endif diff --git a/gamedir/ddraw.ini b/gamedir/ddraw.ini index d338ff0a2..8678dfa18 100644 --- a/gamedir/ddraw.ini +++ b/gamedir/ddraw.ini @@ -24,9 +24,9 @@ boxing=false ; Real rendering rate, -1 = screen rate, 0 = unlimited, n = cap ; Note: Does not have an impact on the game speed, to limit your game speed use 'maxgameticks=' -maxfps=0 +maxfps=-1 -; Vertical synchronization, enable if you get tearing - (Requires 'renderer=auto/opengl/direct3d9') +; Vertical synchronization, enable if you get tearing - (Requires 'renderer=auto/opengl*/direct3d9*') ; Note: vsync=true can fix tearing but it will cause input lag vsync=false @@ -34,7 +34,7 @@ vsync=false ; Note: Only works if stretching is enabled. Sensitivity will be adjusted according to the size of the window adjmouse=true -; Preliminary libretro shader support - (Requires 'renderer=opengl') https://github.com/libretro/glsl-shaders +; Preliminary libretro shader support - (Requires 'renderer=opengl*') https://github.com/libretro/glsl-shaders ; 2x scaling example: https://imgur.com/a/kxsM1oY - 4x scaling example: https://imgur.com/a/wjrhpFV shader=Shaders\cubic\catmull-rom-bilinear.glsl @@ -42,8 +42,8 @@ shader=Shaders\cubic\catmull-rom-bilinear.glsl posX=-32000 posY=-32000 -; Renderer, possible values: auto, opengl, gdi, direct3d9 (auto = try direct3d9/opengl, fallback = gdi) -renderer=opengl +; Renderer, possible values: auto, opengl, openglcore, gdi, direct3d9, direct3d9on12 (auto = try direct3d9/opengl, fallback = gdi) +renderer=auto ; Developer mode (don't lock the cursor) devmode=false @@ -58,16 +58,19 @@ savesettings=1 ; Should the window be resizable by the user in windowed mode? resizable=true -; Upscaling filter for the direct3d9 renderer +; Upscaling filter for the direct3d9* renderers ; Possible values: 0 = nearest-neighbor, 1 = bilinear, 2 = bicubic (16/32bit color depth games only) d3d9_filter=2 ; Enable upscale hack for high resolution patches (Supports C&C1, Red Alert 1 and KKND Xtreme) vhack=false -; cnc-ddraw config program language, possible values: auto, english, chinese, german, spanish, russian, hungarian, french +; cnc-ddraw config program language, possible values: auto, english, chinese, german, spanish, russian, hungarian, french, italian configlang=auto +; cnc-ddraw config program theme, possible values: Windows10, Cobalt XEMedia +configtheme=Windows10 + ; Where should screenshots be saved screenshotdir=.\Screenshots\ @@ -88,56 +91,45 @@ noactivateapp=true ; Note: Usually one of the following values will work: 60 / 30 / 25 / 20 / 15 (lower value = slower game speed) maxgameticks=-1 -; Windows API Hooking, Possible values: 0 = disabled, 1 = IAT Hooking, 2 = Microsoft Detours, 3 = IAT+Detours Hooking (All Modules), 4 = IAT Hooking (All Modules) -; Note: Change this value if windowed mode or upscaling isn't working properly -; Note: 'hook=2' will usually work for problematic games, but 'hook=2' should be combined with renderer=gdi -hook=4 - ; Force minimum FPS, possible values: 0 = disabled, -1 = use 'maxfps=' value, -2 = same as -1 but force full redraw, 1-1000 = custom FPS ; Note: Set this to a low value such as 5 or 10 if some parts of the game are not being displayed (e.g. menus or loading screens) minfps=0 -; Disable fullscreen-exclusive mode for the direct3d9/opengl renderers +; Disable fullscreen-exclusive mode for the direct3d9*/opengl* renderers ; Note: Can be used in case some GUI elements like buttons/textboxes/videos/etc.. are invisible nonexclusive=false ; Force CPU0 affinity, avoids crashes/freezing, *might* have a performance impact +; Note: Disable this if the game is not running smooth or there are sound issues singlecpu=false ; Available resolutions, possible values: 0 = Small list, 1 = Very small list, 2 = Full list -; Note: Set this to 2 if your chosen resolution is not working, set to 1 if the game is crashing +; Note: Set this to 2 if your chosen resolution is not working or does not show up in the list +; Note: Set this to 1 if the game is crashing on startup resolutions=0 ; Child window handling, possible values: 0 = Disabled, 1 = Display top left, 2 = Display top left + repaint, 3 = Hide -; Note: Disables upscaling if a child window was detected +; Note: Disables upscaling if a child window was detected (to ensure the game is fully playable, may look weird though) fixchilds=2 +; Enable the following setting if your cursor doesn't work properly when upscaling is enabled +hook_peekmessage=false -; Undocumented settings -d3d9_adapter=0 -opengl_core=false -d3d9on12=false + +; Undocumented settings - You may or may not change these (You should rather focus on the settings above) +releasealt=true +game_handles_close=false +fixnotresponding=false +hook=4 guard_lines=200 max_resolutions=0 limit_bltfast=false -game_handles_close=false -accuratetimers=false -fixpitch=true -fixwndprochook=false -novidmem=true -fixnotresponding=false -locktopleft=false lock_surfaces=false -releasealt=true -gdilinear=false allow_wmactivate=false -dinputhook=false flipclear=false fixmousehook=true -bpp=0 rgb555=false -hook_peekmessage=false -fpupreserve=true +no_dinput_hook=false @@ -149,7 +141,7 @@ fpupreserve=true ; Switch between windowed and fullscreen mode = [Alt] + ??? keytogglefullscreen=0x0D -; Maximize window without frame = [Alt] + ??? +; Maximize window = [Alt] + ??? keytogglemaximize=0x22 ; Unlock cursor 1 = [Ctrl] + ??? @@ -180,27 +172,23 @@ maxgameticks=60 ; Age of Empires [empires] -renderer=opengl nonexclusive=true adjmouse=true resolutions=2 ; Age of Empires: The Rise of Rome [empiresx] -renderer=opengl nonexclusive=true adjmouse=true resolutions=2 ; Age of Empires II [EMPIRES2] -renderer=opengl nonexclusive=true adjmouse=true ; Age of Empires II: The Conquerors [age2_x1] -renderer=opengl nonexclusive=true adjmouse=true @@ -210,19 +198,37 @@ resolutions=2 guard_lines=300 minfps=-2 -; Age of Wonders -[AoWSM] -windowed=true -fullscreen=false -renderer=gdi -hook=2 - ; Age of Wonders 2 [AoW2] -windowed=true -fullscreen=false -renderer=gdi -hook=2 +resolutions=2 +renderer=opengl +singlecpu=false + +; Age of Wonders 2 +[AoW2Compat] +resolutions=2 +renderer=opengl +singlecpu=false + +; Age of Wonders 2 Config Tool +[aow2Setup] +resolutions=2 + +; Age of Wonders: Shadow Magic +[AoWSM] +resolutions=2 +renderer=opengl +singlecpu=false + +; Age of Wonders: Shadow Magic +[AoWSMCompat] +resolutions=2 +renderer=opengl +singlecpu=false + +; Age of Wonders: Shadow Magic Config Tool +[AoWSMSetup] +resolutions=2 ; Anstoss 3 [anstoss3] @@ -237,10 +243,6 @@ adjmouse=true [AN] adjmouse=true -; Amerzone -[AMERZONE] -fpupreserve=true - ; Atlantis [ATLANTIS] renderer=opengl @@ -255,9 +257,13 @@ fixchilds=0 [BGMain] resolutions=2 +; BALDR FORCE EXE +[BaldrForce] +noactivateapp=true + ; Blade & Sword [comeon] -maxgameticks=62 +maxgameticks=60 fixchilds=3 ; Blood II - The Chosen / Shogo - Mobile Armor Division @@ -267,26 +273,22 @@ noactivateapp=true ; Carmageddon [CARMA95] -fpupreserve=true noactivateapp=true flipclear=true ; Carmageddon [CARM95] -fpupreserve=true noactivateapp=true flipclear=true ; Carmageddon 2 [Carma2_SW] -fpupreserve=true noactivateapp=true ; Captain Claw [claw] +adjmouse=true noactivateapp=true -fpupreserve=true -renderer=opengl nonexclusive=true ; Command & Conquer: Sole Survivor @@ -413,7 +415,6 @@ boxing=false ; Caesar III [c3] -renderer=opengl nonexclusive=true adjmouse=true @@ -432,25 +433,21 @@ adjmouse=true ; Close Combat 2: A Bridge Too Far [cc2] adjmouse=true -renderer=opengl nonexclusive=true ; Close Combat 3: The Russian Front [cc3] adjmouse=true -renderer=opengl nonexclusive=true ; Close Combat 4: The Battle of the Bulge [cc4] adjmouse=true -renderer=opengl nonexclusive=true ; Close Combat 5: Invasion: Normandy [cc5] adjmouse=true -renderer=opengl nonexclusive=true ; Call To Power 2 @@ -461,22 +458,12 @@ boxing=false ; Corsairs Gold [corsairs] adjmouse=true -renderer=gdi -hook=2 ; Divine Divinity [div] resolutions=2 singlecpu=false -; Dune 2000 -[dune2000] -fpupreserve=true - -; Dune 2000 - CnCNet -[dune2000-spawn] -fpupreserve=true - ; Dragon Throne: Battle of Red Cliffs [AdSanguo] maxgameticks=60 @@ -485,7 +472,6 @@ limit_bltfast=true ; Dark Reign: The Future of War [DKReign] -renderer=opengl maxgameticks=60 ; Dungeon Keeper 2 @@ -500,9 +486,16 @@ adjmouse=false maintas=false boxing=false +; Diablo +[Diablo] +devmode=true + +; Diablo: Hellfire +[hellfire] +devmode=true + ; Escape Velocity Nova [EV Nova] -renderer=opengl devmode=true hook_peekmessage=true rgb555=true @@ -514,21 +507,12 @@ adjmouse=true maxgameticks=60 fixnotresponding=true -; Fallout -[falloutw] -dinputhook=true - -; Fallout 2 -[FALLOUT2] -dinputhook=true - ; Fairy Tale About Father Frost, Ivan and Nastya [mrazik] guard_lines=0 ; Future Cop - L.A.P.D. [FCopLAPD] -renderer=opengl nonexclusive=true adjmouse=true @@ -539,28 +523,32 @@ maxgameticks=60 ; Gangsters: Organized Crime [gangsters] adjmouse=true -renderer=opengl nonexclusive=true ; Grand Theft Auto [Grand Theft Auto] -fixwndprochook=true singlecpu=false ; Grand Theft Auto: London 1969 [gta_uk] -fixwndprochook=true singlecpu=false ; Grand Theft Auto: London 1961 [Gta_61] -fixwndprochook=true singlecpu=false ; Heroes of Might and Magic II: The Succession Wars [HEROES2W] adjmouse=true +; Heroes of Might and Magic III +[Heroes3] +game_handles_close=true + +; Heroes of Might and Magic III HD Mod +[Heroes3 HD] +game_handles_close=true + ; Hard Truck: Road to Victory [htruck] maxgameticks=25 @@ -570,13 +558,11 @@ noactivateapp=true ; Invictus [Invictus] adjmouse=true -fixwndprochook=true renderer=opengl ; Interstate 76 [i76] adjmouse=true -fpupreserve=true ; Infantry Online [infantry] @@ -591,7 +577,13 @@ singlecpu=false fixmousehook=true noactivateapp=true releasealt=true -novidmem=true + +; Jagged Alliance 2: Unfinished Business +[JA2UB] +singlecpu=false +fixmousehook=true +noactivateapp=true +releasealt=true ; Jagged Alliance 2: Wildfire [WF6] @@ -599,7 +591,6 @@ singlecpu=false fixmousehook=true noactivateapp=true releasealt=true -novidmem=true ; Jagged Alliance 2 - UC mod [JA2_UC] @@ -607,7 +598,6 @@ singlecpu=false fixmousehook=true noactivateapp=true releasealt=true -novidmem=true ; Jagged Alliance 2 - Vengeance Reloaded mod [JA2_Vengeance] @@ -615,7 +605,6 @@ singlecpu=false fixmousehook=true noactivateapp=true releasealt=true -novidmem=true ; Kings Quest 8 [Mask] @@ -636,12 +625,10 @@ vhack=true ; KKND2: Krossfire [KKND2] noactivateapp=true -renderer=gdi -hook=2 ; Lionheart [Lionheart] -locktopleft=true +hook_peekmessage=true ; Majesty Gold [Majesty] @@ -657,16 +644,10 @@ adjmouse=true ; Mech Warrior 3 [Mech3] -fpupreserve=true nonexclusive=true -; Moorhuhn -[Moorhuhn] -dinputhook=true - ; Moorhuhn 2 [Moorhuhn2] -dinputhook=true releasealt=true ; New Robinson @@ -687,7 +668,6 @@ adjmouse=true ; Pax Imperia [Pax Imperia] -renderer=opengl nonexclusive=true ; Railroad Tycoon II @@ -699,24 +679,17 @@ adjmouse=true adjmouse=true fixchilds=1 -; Septerra Core -[septerra] -hook=2 - ; Sim Copter [SimCopter] -renderer=opengl nonexclusive=true ; Settlers 3 [s3] -renderer=opengl nonexclusive=true ; Star Trek - Armada [Armada] armadahack=true -renderer=opengl nonexclusive=true adjmouse=true maintas=false @@ -724,13 +697,11 @@ boxing=false ; Star Wars: Galactic Battlegrounds [battlegrounds] -renderer=opengl nonexclusive=true adjmouse=true ; Star Wars: Galactic Battlegrounds: Clone Campaigns [battlegrounds_x1] -renderer=opengl nonexclusive=true adjmouse=true @@ -738,25 +709,30 @@ adjmouse=true [StarCraft] game_handles_close=true -; Stronghold Crusader HD -[Stronghold Crusader] -adjmouse=true - ; Space Rangers [Rangers] -locktopleft=true +hook_peekmessage=true + +; Stronghold Crusader HD +[Stronghold Crusader] +resolutions=2 +stronghold_hack=true +adjmouse=true ; Stronghold Crusader Extreme HD [Stronghold_Crusader_Extreme] +resolutions=2 +stronghold_hack=true adjmouse=true ; Stronghold HD [Stronghold] +resolutions=2 +stronghold_hack=true adjmouse=true ; Sim City 3000 [SC3] -fpupreserve=true minfps=-2 ; Shadow Watch @@ -765,27 +741,22 @@ adjmouse=true ; Shadow Flare [ShadowFlare] -renderer=opengl nonexclusive=true adjmouse=true maintas=false boxing=false -; Theme Park World -[TP] -fixwndprochook=true - ; Total Annihilation (Unofficial Beta Patch v3.9.02) [TotalA] +resolutions=2 lock_surfaces=true singlecpu=false -fixwndprochook=true ; Total Annihilation Replay Viewer (Unofficial Beta Patch v3.9.02) [Viewer] +resolutions=2 lock_surfaces=true singlecpu=false -fixwndprochook=true ; Three Kingdoms: Fate of the Dragon [sanguo] @@ -793,16 +764,21 @@ maxgameticks=60 noactivateapp=true limit_bltfast=true +; RollerCoaster Tycoon +[rct] +no_dinput_hook=true +singlecpu=false +maxfps=0 +adjmouse=true + ; Twisted Metal [TWISTED] -renderer=opengl nonexclusive=true maxgameticks=25 minfps=5 ; Twisted Metal 2 [Tm2] -renderer=opengl nonexclusive=true maxgameticks=60 adjmouse=true @@ -829,7 +805,6 @@ adjmouse=true fixmousehook=true noactivateapp=true releasealt=true -novidmem=true ; Worms Armageddon [WA] @@ -838,14 +813,9 @@ width=0 height=0 resizable=false -; Wizards and Warriors -[deep6] -renderer=gdi -hook=2 - ; War Wind [WW] -renderer=opengl +minfps=-1 ; Zeus and Poseidon [Zeus]