diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 7a304c323..db3180990 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -1953,6 +1953,14 @@ INDIVIDUAL_CIVILIAN_NAMES = TRUE SOLDIER_PROFILES_ENEMY = TRUE SOLDIER_PROFILES_MILITIA = FALSE +;------------------------------------------------------------------------------------------------------------------------------ +; Settings related to enemy armed vehicles (tanks and jeeps). +; Tanks have superior armor that can only be breached by explosives or special ammo. They are armed with a powerful cannon and an MG. +; Enemy jeeps are smaller than tanks, easier to damage and only have an MG, otherwsie they perform similar to tanks. +; +; Unless there is a separate setting, tank-settings also govern jeeps. +;------------------------------------------------------------------------------------------------------------------------------ + ; If set to TRUE, vehicles can be driven around tactical maps. ALLOW_DRIVING_VEHICLES_IN_TACTICAL = TRUE @@ -1987,6 +1995,8 @@ CARS_RAMMING_MAX_STRUCTURE_ARMOUR = 30 ; For reference: cactus - 10, wooden furniture - 20, trees - 30, sandbags - 40, stone walls - 55, reinforced concrete - 70, rock - 85, indestructible - 127. TANKS_RAMMING_MAX_STRUCTURE_ARMOUR = 70 +ENEMY_JEEP_RAMMING_MAX_STRUCTURE_ARMOUR = 38 + ; If set to TRUE, tanks can use cannon even against single mercs and in perfect health. ENEMY_TANKS_DONT_SPARE_SHELLS = TRUE ; If set to TRUE, tanks can ignore chance to get through and destroy enemy cover even if it probably won't hit anyone behind it. @@ -3073,7 +3083,14 @@ ARMY_USES_TANKS_IN_ATTACKS = TRUE ; Depending on game difficulty enemy patrols at game start can be randomly reinforced with. ARMY_USES_TANKS_IN_PATROLS = TRUE ; Minimum progress required for tanks to appear. -TANK_MINIMUM_PROGRESS = 30 +TANK_MINIMUM_PROGRESS = 60 + +; Depending on game difficulty enemy groups created during offensives can include jeeps. +ARMY_USES_JEEPS_IN_ATTACKS = TRUE +; Depending on game difficulty enemy patrols at game start can be randomly reinforced with. +ARMY_USES_JEEPS_IN_PATROLS = TRUE +; Minimum progress required for jeep to appear. +JEEP_MINIMUM_PROGRESS = 30 ;------------------------------------------------------------------------------------------------------------------------------ ; Vehicle Inventory @@ -3548,8 +3565,14 @@ ASD_ACTIVE = FALSE ; one unit of fuel, valid from 1 to 100 ASD_COST_FUEL = 10 -; a helicopter, valid from 10000 to 1000000 -ASD_COST_HELI = 100000 +; a helicopter, valid from 1 to 1000000 +ASD_COST_HELI = 30000 + +; a jeep (armed with a MG), valid from 1 to 1000000 +ASD_COST_JEEP = 20000 + +; a tank, valid from 1 to 1000000 +ASD_COST_TANK = 50000 ;------------------------------------------------------------------------------------------------------------------------------ ; Once bought, it takes time for resources to get to the country. @@ -3562,6 +3585,24 @@ ASD_TIME_FUEL = 480 ; a helicopter, valid from 1 to 60 * 48 ASD_TIME_HELI = 1200 +; a jeep (armed with a MG), , valid from 1 to 60 * 48 +ASD_TIME_JEEP = 720 + +; a tank, , valid from 1 to 60 * 48 +ASD_TIME_TANK = 1440 + +;------------------------------------------------------------------------------------------------------------------------------ +; Determine whether ASD assigns tanks and jeeps to enemy patrols and jeeps +;------------------------------------------------------------------------------------------------------------------------------ +ASD_ASSIGNS_TANKS = TRUE +ASD_ASSIGNS_JEEPS = TRUE + +;------------------------------------------------------------------------------------------------------------------------------ +; Tanks and jeeps are not refueled, instead fuel is required upon 'creating' them +;------------------------------------------------------------------------------------------------------------------------------ +ASD_FUEL_REQUIRED_TANK = 100 +ASD_FUEL_REQUIRED_JEEP = 20 + ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -3578,7 +3619,7 @@ ASD_TIME_HELI = 1200 ; Helicopters have to be fuelled and repaired, which consumes AI resources. ; ; The player can shoot down helis via SAM batteries, and infantry-based MANPADS. Due to engine limitations, this cannot be -; done manually. +; done manually and happens automatically once a heli is known and in range. ; If a helicopter was downed, there is a chance that the pilot survived and can be killed or captured by the player ; (downed pilots are counted as officers with regards to Prisoner Interrogation). ; diff --git a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml index b3c48866e..b14097758 100644 --- a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml +++ b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml @@ -23,7 +23,6 @@ 1 0 0 - 0 0 0 0 @@ -37,6 +36,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 1 @@ -61,7 +64,6 @@ 1 0 0 - 0 0 0 0 @@ -75,6 +77,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 2 @@ -99,7 +105,6 @@ 1 0 0 - 0 0 0 0 @@ -113,6 +118,10 @@ 0 1.0 1.0 + 0.0 + 0.4 + 1.0 + 1.0 3 @@ -137,7 +146,6 @@ 1 0 0 - 0 0 0 0 @@ -151,6 +159,10 @@ 0 1.0 1.0 + 0.0 + 0.6 + 1.0 + 1.0 4 @@ -175,7 +187,6 @@ 4 0 0 - 0 0 0 0 @@ -189,6 +200,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 5 @@ -213,7 +228,6 @@ 10 0 0 - 0 0 0 0 @@ -227,6 +241,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 6 @@ -251,7 +269,6 @@ 1 1 2 - 0 0 0 0 @@ -265,6 +282,10 @@ 0 1.0 1.0 + 0.0 + 0.5 + 1.0 + 1.0 7 @@ -289,7 +310,6 @@ 1 0 0 - 0 0 0 1 @@ -303,6 +323,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 0.0 + 1.0 8 @@ -327,7 +351,6 @@ 1 0 0 - 0 0 1 0 @@ -341,6 +364,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 0.0 + 1.0 9 @@ -365,7 +392,6 @@ 1 1 1 - 0 0 0 0 @@ -379,6 +405,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 10 @@ -403,7 +433,6 @@ 1 1 1 - 1 0 0 0 @@ -417,6 +446,10 @@ 0 1.0 1.0 + 1.0 + 0.75 + 1.0 + 1.0 11 @@ -441,7 +474,6 @@ 1 0 0 - 0 1 0 0 @@ -455,6 +487,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 0.0 + 1.0 12 @@ -479,7 +515,6 @@ 1 0 0 - 0 0 0 0 @@ -493,6 +528,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 0.0 + 1.0 13 @@ -517,7 +556,6 @@ 1 0 0 - 0 0 0 0 @@ -531,6 +569,10 @@ 0 1.0 1.0 + 0.0 + 0.5 + 1.0 + 1.0 14 @@ -555,7 +597,6 @@ 1 0 0 - 0 0 0 0 @@ -569,6 +610,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 0.3 + 1.0 15 @@ -593,7 +638,6 @@ 1 0 0 - 0 0 0 0 @@ -607,6 +651,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 16 @@ -631,7 +679,6 @@ 1 0 0 - 0 0 0 0 @@ -645,6 +692,10 @@ 0 1.0 1.0 + 0.0 + 0.4 + 1.0 + 1.0 17 @@ -669,7 +720,6 @@ 1 0 0 - 0 0 0 0 @@ -683,6 +733,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 18 @@ -707,7 +761,6 @@ 1 0 0 - 0 0 0 0 @@ -721,6 +774,10 @@ 0 1.0 1.0 + 0.0 + 0.4 + 1.0 + 1.0 19 @@ -745,7 +802,6 @@ 1 0 0 - 0 0 0 0 @@ -759,6 +815,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 20 @@ -783,7 +843,6 @@ 1 0 0 - 0 0 0 0 @@ -797,6 +856,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 21 @@ -821,7 +884,6 @@ 1 0 0 - 0 0 0 0 @@ -835,6 +897,10 @@ 0 1.0 1.0 + 0.0 + 0.2 + 1.0 + 1.0 22 @@ -859,7 +925,6 @@ 1 0 0 - 0 0 0 0 @@ -873,6 +938,10 @@ 0 1.0 1.0 + 0.0 + 0.3 + 1.0 + 1.0 23 @@ -897,7 +966,6 @@ 1 0 0 - 0 0 0 0 @@ -911,6 +979,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 24 @@ -935,7 +1007,6 @@ 1 0 0 - 0 0 0 0 @@ -949,6 +1020,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 25 @@ -973,7 +1048,6 @@ 1 0 0 - 0 0 0 0 @@ -987,6 +1061,10 @@ 0 1.0 1.0 + 0.0 + 0.3 + 1.0 + 1.0 26 @@ -1011,7 +1089,6 @@ 1 0 0 - 0 0 0 0 @@ -1025,6 +1102,10 @@ 0 1.0 1.0 + 0.0 + 0.8 + 1.0 + 1.0 27 @@ -1049,7 +1130,6 @@ 3 0 0 - 0 0 0 0 @@ -1063,6 +1143,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 28 @@ -1087,7 +1171,6 @@ 1 0 0 - 0 0 0 0 @@ -1101,6 +1184,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 1.0 + 1.0 29 @@ -1125,7 +1212,6 @@ 1 0 0 - 0 1 0 0 @@ -1138,6 +1224,10 @@ 0 1.0 1.0 + 0.0 + 0.0 + 0.0 + 1.0 30 @@ -1162,7 +1252,6 @@ 1 0 0 - 0 0 0 0 @@ -1176,6 +1265,10 @@ 2 1.0 1.0 + 0.0 + 0.0 + 0.0 + 0.0 31 @@ -1200,7 +1293,6 @@ 1 0 0 - 0 0 0 0 @@ -1214,6 +1306,10 @@ 4 1.0 1.0 + 0.3 + 0.75 + 1.0 + 1.0 32 @@ -1238,7 +1334,6 @@ 1 0 0 - 0 0 0 0 @@ -1252,6 +1347,10 @@ 0 0.3 1.3 + 0.0 + 0.0 + 0.0 + 1.0 33 @@ -1276,7 +1375,6 @@ 1 0 0 - 0 0 0 0 @@ -1288,7 +1386,11 @@ 1.0 1.0 1 - 0.00 - 0.00 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 \ No newline at end of file diff --git a/gamedir/Data/Anims/VEHICLES/LATV_DIE.sti b/gamedir/Data/Anims/VEHICLES/LATV_DIE.sti new file mode 100644 index 000000000..6cfbf10bb Binary files /dev/null and b/gamedir/Data/Anims/VEHICLES/LATV_DIE.sti differ diff --git a/gamedir/Data/Anims/VEHICLES/LATV_ROT.sti b/gamedir/Data/Anims/VEHICLES/LATV_ROT.sti new file mode 100644 index 000000000..3ce6eca8c Binary files /dev/null and b/gamedir/Data/Anims/VEHICLES/LATV_ROT.sti differ diff --git a/gamedir/Data/Anims/VEHICLES/LATV_SHT.sti b/gamedir/Data/Anims/VEHICLES/LATV_SHT.sti new file mode 100644 index 000000000..b3a3e54c3 Binary files /dev/null and b/gamedir/Data/Anims/VEHICLES/LATV_SHT.sti differ