diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 96af1eb58..cef0f34c1 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -2085,6 +2085,10 @@ CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS = 35 ; In this section you can modify global settings for weapon overheating. ;****************************************************************************************************************************** +; Should weapons overheat when firing? With rising temperature, the chance of weapon malfunction rises drastically. +; Weapons cool down over time. +OVERHEATING = FALSE + ; Should a 'thermometer' for guns and replacable barrels be displayed? OVERHEATING_DISPLAY_THERMOMETER = TRUE diff --git a/gamedir/Data-1.13/TableData/Backgrounds.xml b/gamedir/Data-1.13/TableData/Backgrounds.xml new file mode 100644 index 000000000..4c3d33ab4 --- /dev/null +++ b/gamedir/Data-1.13/TableData/Backgrounds.xml @@ -0,0 +1,473 @@ + + + + 0 + Background name (128 letters) + short name (20) + Enter a description here. This will show up in the laptop and can be up to 256 letters long. + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 0 + 0 + 0 + 0 + + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + + + 1 + Arms dealer + Arms dealer + Experience earned in years of arms trade leads to better deals when buying and selling guns. + 10 + + + 2 + Law enforcement + Law enforcement + Former law enforcement personnel often seek work in the mercenary world, and are the logical choice for handling captives. + 150 + 50 + + + 3 + Prison guard + Prison guard + In longer and larger conflicts, former prison guards are natural choices for running prison camps. + 300 + + + 4 + Gang member + Gang member + Becoming a mercenary is a natural step for many gang members - job's the same, tools and pay much better. + 10 + 3 + 2 + + + 5 + Convict + Convict + Anyone surviving in a merciless prison is bound to be more dangerous on release - if he survives that long. + 5 + 2 + 2 + + + 6 + Drug Addict + Drug Addict + Given the nature of today's drugs, addicts can make fearsome, yet unreliable, opponents. + 1 + 1 + + + 7 + Nobility + Nobility + Some people join this business not out of necessity. While easy to label them as sissy aristocrats, some are actually quite capable, as they have received the best training money can buy. + 1 + 1 + + + 8 + Lawyer + Lawyer + A somewhat unorthodox background for a mercenary, former lawyers might be useful when there's a deal to be made on a knife's edge. + 20 + + + 9 + Pilot + Pilot + Used to physical stress over long periods, some pilots find the transition to ground combat surprisingly easy. + 3 + 10 + + + 10 + Priest + Priest + Many devout followers of any religion or cult area surprisingly violent and zealous if pushed in the right (or wrong) direction. + 10 + + + 11 + Nurse + Nurse + While not full-blown doctors, nurses are still in high demand in warzones, due to the grim business. + 20 + 7 + + + 12 + ANC veteran + ANC veteran + Militant veterans of the ANC's struggle were not only versed in jungle warfare, but also in political theory. + 3 + 6 + 5 + + + 13 + Construction work + Construction + Construction workers are used to hard labour, and can construct fortifications better than deskjob heroes. + 6 + -10 + 8 + + + 14 + Skydiver + Skydiver + If you want to put your life to risk, might as well earn cash by it... + 25 + + + 15 + Drill sergeant + Drill sergeant + A drill sergeant's job is to create armies and traumatise young men and women. + 6 + 4 + 10 + -6 + + + 16 + Bouncer + Bouncer + Doormen make good soldiers in close combat, though the killing part is a change (hopefully). + 4 + 2 + + + 17 + Hitman + Hitman + Professional assassins are obviously used to killing, though might come in conflict with more idealistic team members. + 4 + 2 + -10 + + + 18 + Bomber + Bomber + Wether you call them terrorists or freedom fighters often depends on your relation to those killed. + 6 + 30 + 1 + + + 19 + Bodyguard + Bodyguard + Superbly trained, utterly loyal, and willing to pay the ultimate price. What more could a potential employer want?. + -10 + 1 + 3 + 2 + + + 20 + SWAT Member + SWAT + Blurring the line between police and military, SWAT teams are used in urban operations too dangerous for normal law enforcement. + 2 + 2 + 75 + 50 + 70 + + + 21 + Barkeeper + Barkeeper + A friendly face can make violence unnecessary... + 4 + 15 + 5 + + + 22 + Miner + Miner + Working in a mine is hard, punishing work. No wonder some start to look for easier cash. + -20 + 5 + 1 + + + 23 + The Mob + Mobster + Organized crime is found anywhere. No exceptions. + 3 + 4 + 5 + 8 + 1 + + + 24 + UN Peacekeeper + UN + Nations of the entire world provide these troops to solve all conflicts without any violence. Sadly, this statment is false. + 14 + 10 + 4 + + + 25 + SAS Member + SAS + The british Special Air Service is one of the world's most famous special forces units, and is exceptionally well versed in airborne missions. + 20 + 3 + 10 + -1 + 3 + + + 26 + Rebel + Rebel + Outgunned and outnumbered, Miguel's rebels faced extinction before help came from the outside. + 2 + 4 + 5 + 7 + -10 + 10 + + + 27 + Metaviran Native + Metavira + The indigenous people of Metavira have adjusted to the hostile jungle there. After the liberation, some joined the foreigners, and sought their luck elsewhere. + 3 + 3 + -10 + 5 + 17 + 15 + 5 + + + 28 + Metaviran Shaman + Shaman + Leaders of their communities since ages long forgotten, shamans posess medical knowledge unknown to western eyes. + 3 + 3 + 10 + 17 + + + 29 + SOG Member + SOG + The Studies and Observations Group was a classified special forces unit conductong unconventional warfare in Vietnam. + 2 + 4 + 3 + 5 + 1 + + + 30 + Military Advisor + Military Advisor + Pointing the gun in the right direction is a start, but someone needs to teach these people how to teach other people where to point. + 5 + 10 + + + 31 + Paramilitary Instructor + Instructor + Just like boyscouts. But with with violence. So not like boyscouts at all. + 8 + 10 + 1 + + + 32 + Red army + Red army + With russian stoicism, the red army prevailed against Hitler, father frost, and chronic shortages. + 8 + 4 + 10 + 20 + 15 + + + 33 + Undertaker + Undertaker + When you've seen it all, nothing can frighten you anymore. + -5 + 15 + 7 + + + 34 + Ranger + Ranger + The Rangers form the elite of Us army infantry. + 3 + 2 + 5 + 5 + + + 35 + Tuareg + Tuareg + The tuareg are a berber people that lead a nomadic life in the Sahara. + 8 + +20 + 5 + -5 + -20 + + + 36 + Firefighter + Firefighter + Just because it involves no shooting, it doesn't have to be less dangerous. + 2 + 3 + 2 + 5 + 6 + + + 37 + Competitive Shooter + Competitive Shooter + Some people display a knack for shooting, and a disturbing aggression against innocent paper bull's eyes. + 3 + 1 + + + 38 + Nurse/Shooter + Nurse/Shooter + That combination will at least spice up your resume. + 2 + 4 + 10 + + + 39 + Shopkeeper + Shopkeeper + For many people, their trade IS trade. + 5 + 10 + 5 + + + 40 + Car mechanic + Car mechanic + Very useful, as long as you HAVE a car. + 6 + 10 + + + 41 + Smith + Smith + In a warzone without the usual comforts, it is very useful to have people who can maintain your gear. + 8 + 2 + + + 42 + GSG9 + GSG9 + Formed after the disastrous Munich massacre in 1972, GSG9 is a german counter-terrorism unit. + 2 + 50 + 37 + 8 + 80 + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/LoadScreenHints.xml b/gamedir/Data-1.13/TableData/LoadScreenHints.xml index 50ae4ba68..5acbce3db 100644 --- a/gamedir/Data-1.13/TableData/LoadScreenHints.xml +++ b/gamedir/Data-1.13/TableData/LoadScreenHints.xml @@ -295,5 +295,10 @@ The other tags determine in what category this hint falls, and will be displayed 54 If you'll ever get airborne, those SAM sites might come in handy. 1 + + + 55 + In the militia redistribution menu, holding [CTRL] will move 5 militia. [SHIFT] will move all in a sector. + 1 \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml index aa29474c1..a8eab5e32 100644 --- a/gamedir/Data-1.13/TableData/MercProfiles.xml +++ b/gamedir/Data-1.13/TableData/MercProfiles.xml @@ -82,6 +82,7 @@ 0 0 0 + 0 1 @@ -166,6 +167,7 @@ 0 0 0 + 12 2 @@ -418,6 +420,7 @@ 0 0 0 + 40 5 @@ -670,6 +673,7 @@ 0 0 0 + 32 8 @@ -754,6 +758,7 @@ 0 0 0 + 36 9 @@ -838,6 +843,7 @@ 0 0 0 + 32 10 @@ -922,6 +928,7 @@ 0 0 0 + 12 11 @@ -1006,6 +1013,7 @@ 0 0 0 + 18 12 @@ -1090,6 +1098,7 @@ 0 0 0 + 17 13 @@ -1258,6 +1267,7 @@ 0 0 0 + 11 15 @@ -1342,6 +1352,7 @@ 0 0 0 + 7 16 @@ -1510,6 +1521,7 @@ 0 0 0 + 38 18 @@ -1846,6 +1858,7 @@ 0 0 0 + 3 22 @@ -2098,6 +2111,7 @@ 0 0 0 + 20 25 @@ -2182,6 +2196,7 @@ 0 0 0 + 20 26 @@ -2350,6 +2365,7 @@ 0 0 0 + 15 28 @@ -2434,6 +2450,7 @@ 0 0 0 + 14 29 @@ -2602,6 +2619,7 @@ 0 0 0 + 30 31 @@ -2770,6 +2788,7 @@ 0 0 0 + 16 33 @@ -2938,6 +2957,7 @@ 0 0 0 + 4 35 @@ -3106,6 +3126,7 @@ 0 0 0 + 25 37 @@ -3190,6 +3211,7 @@ 0 0 0 + 31 38 @@ -3778,6 +3800,7 @@ 0 0 0 + 1 45 @@ -3946,6 +3969,7 @@ 0 0 0 + 6 47 @@ -4030,6 +4054,7 @@ 0 0 0 + 6 48 @@ -4198,6 +4223,7 @@ 0 0 0 + 4 50 @@ -4282,6 +4308,7 @@ 0 0 0 + 3 51 @@ -4870,6 +4897,7 @@ 1 1 90 + 26 58 @@ -4954,6 +4982,7 @@ 1 1 85 + 26 59 @@ -5038,6 +5067,7 @@ 1 1 70 + 26 60 @@ -5122,6 +5152,7 @@ 1 1 79 + 26 61 @@ -5206,6 +5237,7 @@ 16 0 0 + 1 62 @@ -5374,6 +5406,7 @@ 17 1 0 + 27 64 @@ -5458,6 +5491,7 @@ 18 0 0 + 17 65 @@ -5794,6 +5828,7 @@ 0 10 12 + 32 69 @@ -5962,6 +5997,7 @@ 0 3 25 + 15 71 @@ -6298,6 +6334,7 @@ 0 6 0 + 41 75 @@ -6718,6 +6755,7 @@ 14 10 35 + 19 80 @@ -7138,6 +7176,7 @@ 0 3 0 + 9 85 @@ -7306,6 +7345,7 @@ 2 7 0 + 23 87 @@ -7390,6 +7430,7 @@ 2 7 0 + 23 88 @@ -7558,6 +7599,7 @@ 4 10 42 + 39 90 @@ -7726,6 +7768,7 @@ 3 7 0 + 1 92 @@ -7810,6 +7853,7 @@ 2 7 0 + 21 93 @@ -7894,6 +7938,7 @@ 2 7 0 + 16 94 @@ -7978,6 +8023,7 @@ 2 7 0 + 19 95 @@ -8062,6 +8108,7 @@ 0 7 0 + 39 96 @@ -8146,6 +8193,7 @@ 0 0 0 + 1 97 @@ -8230,6 +8278,7 @@ 0 2 27 + 9 98 @@ -8482,6 +8531,7 @@ 0 2 67 + 10 101 @@ -8650,6 +8700,7 @@ 11 10 40 + 3 103 @@ -8818,6 +8869,7 @@ 0 0 0 + 39 105 @@ -8986,6 +9038,7 @@ 0 8 37 + 22 107 @@ -9070,6 +9123,7 @@ 2 7 0 + 39 108 @@ -9322,6 +9376,7 @@ 0 0 0 + 23 111 @@ -9406,6 +9461,7 @@ 0 0 0 + 31 112 @@ -9574,6 +9630,7 @@ 12 8 38 + 39 114 @@ -9742,6 +9799,7 @@ 0 11 28 + 40 116 @@ -9910,6 +9968,7 @@ 3 7 0 + 39 118 @@ -10498,6 +10557,7 @@ 0 11 18 + 39 125 @@ -10582,6 +10642,7 @@ 0 11 40 + 39 126 @@ -10666,6 +10727,7 @@ 0 11 15 + 39 127 @@ -10834,6 +10896,7 @@ 0 4 45 + 41 129 @@ -10918,6 +10981,7 @@ 0 4 41 + 39 130 @@ -11002,6 +11066,7 @@ 0 4 20 + 39 131 @@ -11170,6 +11235,7 @@ 8 6 34 + 11 133 @@ -11254,6 +11320,7 @@ 2 6 0 + 16 134 @@ -11842,6 +11909,7 @@ 0 9 0 + 17 141 @@ -11926,6 +11994,7 @@ 0 8 0 + 17 142 @@ -12010,6 +12079,7 @@ 0 11 0 + 17 143 @@ -12094,6 +12164,7 @@ 0 4 0 + 17 144 @@ -12178,6 +12249,7 @@ 0 4 0 + 17 145 @@ -12262,6 +12334,7 @@ 0 4 0 + 17 146 @@ -12430,6 +12503,7 @@ 0 6 39 + 39 148 @@ -12514,6 +12588,7 @@ 0 3 20 + 22 149 @@ -12766,6 +12841,7 @@ 0 0 0 + 21 152 @@ -12850,6 +12926,7 @@ 0 0 0 + 21 153 @@ -12934,6 +13011,7 @@ 0 7 0 + 21 154 @@ -13018,6 +13096,7 @@ 0 7 0 + 21 155 @@ -13102,6 +13181,7 @@ 0 4 0 + 21 156 @@ -13186,6 +13266,7 @@ 0 0 0 + 22 157 @@ -13270,6 +13351,7 @@ 0 10 30 + 22 158 @@ -13354,6 +13436,7 @@ 0 10 20 + 22 159 @@ -13942,6 +14025,7 @@ 0 0 0 + 24 166 @@ -14362,6 +14446,7 @@ 0 0 0 + 32 171 @@ -14446,6 +14531,7 @@ 0 0 0 + 32 172 @@ -14530,6 +14616,7 @@ 0 0 0 + 32 173 @@ -14614,6 +14701,7 @@ 0 0 0 + 7 174 @@ -14950,6 +15038,7 @@ 0 0 0 + 42 178 @@ -15034,6 +15123,7 @@ 0 0 0 + 29 179 @@ -15163,14 +15253,14 @@ 0 0 0 - 0 + 0 255 255 255 255 255 255 - 0 + 0 249 6 255 @@ -15182,7 +15272,7 @@ 255 0 255 - 0 + 0 150 0 0 @@ -15247,16 +15337,16 @@ 12 6 6 - 16 + 16 149 255 255 255 255 255 - 0 + 0 250 - 24 + 24 255 0 255 @@ -15266,7 +15356,7 @@ 255 0 255 - 0 + 0 300 0 0 @@ -15331,14 +15421,14 @@ 0 9 9 - 0 + 0 255 255 255 255 255 255 - 0 + 0 221 12 255 @@ -15454,6 +15544,7 @@ 0 0 0 + 33 184 @@ -15499,14 +15590,14 @@ 0 8 8 - 0 + 0 187 255 255 255 255 255 - 0 + 0 14 36 255 @@ -15538,6 +15629,7 @@ 0 0 0 + 13 185 @@ -15590,7 +15682,7 @@ 255 255 255 - 0 + 0 179 18 255 @@ -15667,14 +15759,14 @@ 0 9 9 - 0 + 0 255 255 255 255 255 255 - 0 + 0 189 18 255 @@ -15920,13 +16012,13 @@ 0 0 0 - 247 + 247 255 255 255 255 255 - 0 + 0 228 32 255 @@ -16546,6 +16638,7 @@ 0 0 0 + 27 197 @@ -16630,6 +16723,7 @@ 0 0 0 + 27 198 @@ -16714,6 +16808,7 @@ 0 0 0 + 28 199 @@ -16729,9 +16824,9 @@ 0 3000 2000 - GREENPANTS - BROWNVEST - PINKSKIN + GREENPANTS + BROWNVEST + PINKSKIN BLONDHEAD 0 27 @@ -16739,65 +16834,65 @@ 0 0 0 - 7 - 101 - 0 - 100 - 100 - 1 - 1 - 1 - 1 - 0 - 0 - 1 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 255 - 255 - 255 - 255 - 255 - 255 - 0 - 255 - 0 - 255 - 0 - 255 - 0 - 255 - 0 - 255 - 0 - 255 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - -1 - -1 - 0 - 0 - 0 - 0 - 0 - 10 - 1 - 0 - 0 - 0 - 0 + 7 + 101 + 0 + 100 + 100 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 255 + 255 + 255 + 255 + 255 + 255 + 0 + 255 + 0 + 255 + 0 + 255 + 0 + 255 + 0 + 255 + 0 + 255 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + -1 + -1 + 0 + 0 + 0 + 0 + 0 + 10 + 1 + 0 + 0 + 0 + 0 200 @@ -18646,6 +18741,7 @@ 0 0 0 + 5 222 @@ -18982,6 +19078,7 @@ 0 0 0 + 11 226 @@ -19402,6 +19499,7 @@ 0 0 0 + 40 231 @@ -19486,6 +19584,7 @@ 0 0 0 + 17 232 @@ -19570,6 +19669,7 @@ 0 0 0 + 24 233 @@ -19738,6 +19838,7 @@ 0 0 0 + 5 235 @@ -19822,6 +19923,7 @@ 0 0 0 + 37 236 @@ -19906,6 +20008,7 @@ 0 0 0 + 9 237 @@ -19990,6 +20093,7 @@ 0 0 0 + 19 238 @@ -20074,6 +20178,7 @@ 0 0 0 + 23 239 @@ -20242,6 +20347,7 @@ 0 0 0 + 8 241 @@ -20546,7 +20652,7 @@ 255 255 255 - 0 + 0 181 16 255 @@ -20558,7 +20664,7 @@ 255 0 255 - 0 + 0 250 0 0 @@ -20578,6 +20684,7 @@ 0 0 0 + 5 245 @@ -20630,7 +20737,7 @@ 255 255 255 - 0 + 0 14 16 255 @@ -20642,7 +20749,7 @@ 255 0 255 - 0 + 0 550 3300 6200 @@ -20714,7 +20821,7 @@ 255 255 255 - 0 + 0 251 8 255 @@ -20726,7 +20833,7 @@ 255 0 255 - 0 + 0 500 2300 4500 @@ -20798,7 +20905,7 @@ 255 255 255 - 0 + 0 221 16 255 @@ -20830,6 +20937,7 @@ 0 0 0 + 10 248 @@ -20882,7 +20990,7 @@ 255 255 255 - 0 + 0 227 24 255 @@ -21166,6 +21274,7 @@ 0 0 0 + 18 252 @@ -21334,6 +21443,7 @@ 0 0 0 + 2 254 diff --git a/gamedir/Profiles/UserProfile_JA2113/Ja2_sp.ini b/gamedir/Profiles/UserProfile_JA2113/Ja2_sp.ini index 9bdef3345..92cee54c9 100644 --- a/gamedir/Profiles/UserProfile_JA2113/Ja2_sp.ini +++ b/gamedir/Profiles/UserProfile_JA2113/Ja2_sp.ini @@ -147,9 +147,9 @@ USE_NCTH = 0 IMPROVED_INTERRUPT_SYSTEM = 0 ;------------------------------------------------------------------------------------------------------------------------------ -; Weapon Overheating +; Story Backgrounds ; ; 0 = Off ; 1 = On ;------------------------------------------------------------------------------------------------------------------------------ -WEAPON_OVERHEATING = 0 \ No newline at end of file +BACKGROUNDS = 0 \ No newline at end of file