diff --git a/gamedir/Data-1.13/Item_Settings.ini b/gamedir/Data-1.13/Item_Settings.ini index fa14a461c..b9617953b 100644 --- a/gamedir/Data-1.13/Item_Settings.ini +++ b/gamedir/Data-1.13/Item_Settings.ini @@ -287,3 +287,21 @@ DAMAGE_BREATH_MOVE_EXPLOSIVE_MODIFIER = 0.1 ;****************************************************************************************************************************** ;****************************************************************************************************************************** + +[Energy Settings] +;****************************************************************************************************************************** +; +; Energy consumption settings for non-vanilla batteries. +; +;****************************************************************************************************************************** + +;****************************************************************************************************************************** +; various energy costs for the radio set +ENERGY_COST_RADIOSET_ACTIVATE = 100.00 +ENERGY_COST_RADIOSET_JAM = 30.00 +ENERGY_COST_RADIOSET_SCAN = 15.00 +ENERGY_COST_RADIOSET_SCAN_ASSIGNMENT = 3000.00 + +;****************************************************************************************************************************** + +;****************************************************************************************************************************** diff --git a/gamedir/Data-1.13/Skills_Settings.INI b/gamedir/Data-1.13/Skills_Settings.INI index f1444f86c..eeab957ba 100644 --- a/gamedir/Data-1.13/Skills_Settings.INI +++ b/gamedir/Data-1.13/Skills_Settings.INI @@ -738,3 +738,36 @@ COVERT_CLOSE_DETECTION_RANGE_SOLDIER_CORPSE = 5 ; elite soldiers can uncover even perfectly disguised spies if standing next to them and more expericenced ; this only works on soldier disguises, levels in this trait require the elite to be more experienced to uncover the spy COVERT_ELITES_DETECT_NEXTTILE = TRUE + +;****************************************************************************************************************************** +;****************************************************************************************************************************** +[Radio Operator] + +; artillery can be called every x minutes from a sector. Does not apply if mercs fire the shells +RADIO_OPERATOR_ARTILLERY_SECTOR_FREQUENCY = 120 + +; AI artillery: number of mortars is number of soldiers divided by this +RADIO_OPERATOR_MORTAR_COUNT_DIVISOR = 6 + +; AI artillery: number of shells is mortar points divided by this +RADIO_OPERATOR_MORTAR_SHELL_DIVISOR = 30 + +; AI artillery: the total sum of mortars points is determined by the quality of soldiers +RADIO_OPERATOR_MORTAR_POINTS_ADMIN = 10 +RADIO_OPERATOR_MORTAR_POINTS_TROOP = 15 +RADIO_OPERATOR_MORTAR_POINTS_ELITE = 25 + +; artillery shells land within a x tiles radius of their target +RADIO_OPERATOR_MORTAR_RADIUS = 10 + +; the initial signal shell lands within x tiles radius of their target +RADIO_OPERATOR_MORTAR_SIGNAL_SHELL_RADIUS = 2 + +; scan assignment: detect enemies up to x sectors away +RADIO_OPERATOR_ASSIGNMENT_SCAN_BASE_RANGE = 5 + +; we can use our radio set to listen, this will greatly enhance our hearing, but makes it easier to interrupt us +RADIO_OPERATOR_LISTENING_HEARING_BONUS = 20 + +;****************************************************************************************************************************** +;****************************************************************************************************************************** \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml b/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml index 9923acdc8..b1cdd5fe4 100644 --- a/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml +++ b/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml @@ -1103,7 +1103,7 @@ 20 LBE - 19 + 20 1079 1080 1081 @@ -1123,7 +1123,7 @@ 1097 1098 1099 - 0 + 1697 0 0 0 diff --git a/gamedir/Data-1.13/TableData/Inventory/IMPItemChoices.xml b/gamedir/Data-1.13/TableData/Inventory/IMPItemChoices.xml index 42c95f671..c4c60c879 100644 --- a/gamedir/Data-1.13/TableData/Inventory/IMPItemChoices.xml +++ b/gamedir/Data-1.13/TableData/Inventory/IMPItemChoices.xml @@ -2856,4 +2856,60 @@ 0 0 + + 51 + Vox Operator + 1 + 1 + 1697 + 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 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml index 9923acdc8..b1cdd5fe4 100644 --- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml +++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml @@ -1103,7 +1103,7 @@ 20 LBE - 19 + 20 1079 1080 1081 @@ -1123,7 +1123,7 @@ 1097 1098 1099 - 0 + 1697 0 0 0 diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml index 9923acdc8..b1cdd5fe4 100644 --- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml +++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml @@ -1103,7 +1103,7 @@ 20 LBE - 19 + 20 1079 1080 1081 @@ -1123,7 +1123,7 @@ 1097 1098 1099 - 0 + 1697 0 0 0 diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml index 9923acdc8..b1cdd5fe4 100644 --- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml +++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml @@ -1103,7 +1103,7 @@ 20 LBE - 19 + 20 1079 1080 1081 @@ -1123,7 +1123,7 @@ 1097 1098 1099 - 0 + 1697 0 0 0 diff --git a/gamedir/Data-1.13/TableData/Items/Attachments.xml b/gamedir/Data-1.13/TableData/Items/Attachments.xml index a775510bd..5626971bb 100644 --- a/gamedir/Data-1.13/TableData/Items/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Items/Attachments.xml @@ -27767,4 +27767,9 @@ 605 20 + + 1698 + 1697 + 35 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items/Explosives.xml b/gamedir/Data-1.13/TableData/Items/Explosives.xml index d0e1f6dd0..282bbcd1f 100644 --- a/gamedir/Data-1.13/TableData/Items/Explosives.xml +++ b/gamedir/Data-1.13/TableData/Items/Explosives.xml @@ -1880,4 +1880,44 @@ 0 0 + + 94 + 10 + 0 + 0 + 0 + 0 + 0 + 7 + 2 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 95 + 4 + 0 + 0 + 16 + 0 + 0 + 1 + 3 + 6 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index c1d30be44..5cbfc285c 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -50940,4 +50940,153 @@ + + 1697 + Radio Set + Radio set + A standard issue radio set for short-range communications in the field. + Radio set + The Departmento Munitorum made this the standard radio set for all Cadian Infantry regiments in the 39th millenium. If it's good enough for them, it better be good enough for you. + 131072 + 1 + 97 + 1 + 690 + 85 + 23 + 1500 + 2 + -2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 1 + 1698 + 100.0 + 33554432 + + + + + + 1698 + Radio battery + Radio Set battery + A battery used in standard field equipment. Quite heavy, but can last for weeks if you conserve it. + Radio battery + A standard issue field battery for radio sets. + 268435456 + 1 + 1 + 226 + 12 + 6 + 10 + 200 + 1 + 1 + 1 + 1 + 1 + 100.0 + 134217728 + + + + + + 1699 + Flare Internal + Flare Internal + INTERNAL ITEM, DO NOT USE!!! + Flare Internal + + 256 + 1 + 95 + 6 + 2 + 71 + 2 + 4 + 20 + 50 + 2 + 1 + + + + + + 1700 + Mortar Signal Shell + 60mm Mortar Signal Shell + This mortar shell is used to mark an area for further bombardment. + 60mm Mortar Signal Shell + The red smoke from this signal shell clearly marks an area - visible even at night. + 512 + 1024 + 1024 + 1 + 94 + 1 + 749 + 17 + 2 + 24 + 600 + 8 + -4 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 100.0 + 67108864 + 1699 + + + + + + 1701 + Signal Flare + Signal Flare + Mark a target very visibly with this red smoke. + Signal Flare + Nothing says ATTACK HERE like a giant column of red smoke. + 256 + 1 + 94 + 6 + 1 + 98 + 6 + 4 + 18 + 50 + 3 + -2 + 1 + 1 + 1 + 1 + 1 + 4 + 1 + 100.0 + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items/Launchables.xml b/gamedir/Data-1.13/TableData/Items/Launchables.xml index 2f01df613..730f91576 100644 --- a/gamedir/Data-1.13/TableData/Items/Launchables.xml +++ b/gamedir/Data-1.13/TableData/Items/Launchables.xml @@ -620,4 +620,12 @@ 1376 903 + + 1700 + 41 + + + 1700 + 901 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml b/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml index 49e32d446..cee35f200 100644 --- a/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml +++ b/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml @@ -1940,4 +1940,22 @@ 0 0 + + 97 + 3 + 0 + 30 + 16 + 16 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Map/SectorNames.xml b/gamedir/Data-1.13/TableData/Map/SectorNames.xml index b65c4069d..0770c2fd6 100644 --- a/gamedir/Data-1.13/TableData/Map/SectorNames.xml +++ b/gamedir/Data-1.13/TableData/Map/SectorNames.xml @@ -263,6 +263,7 @@ Drassen Airport 1 100 + 2 B14 @@ -453,6 +454,7 @@ 2 300 2 + 2 D3 @@ -574,6 +576,7 @@ 1 160 2 + 2 D16 @@ -1142,6 +1145,7 @@ 1 100 2 + 1 H14 @@ -1243,6 +1247,7 @@ 1 850 2 + 2 I9 @@ -1411,6 +1416,8 @@ Tixa 0 1000 + 2 + 1 5 6 7 @@ -1956,6 +1963,7 @@ 1 100 1 + 2 N4 @@ -1966,6 +1974,7 @@ 1 100 2 + 2 N5 @@ -1995,6 +2004,7 @@ Coastal, road 1 140 + 1 3 diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml index 48c87e5f7..d1fedb436 100644 --- a/gamedir/Data-1.13/TableData/MercProfiles.xml +++ b/gamedir/Data-1.13/TableData/MercProfiles.xml @@ -54,17 +54,19 @@ + - - - + + + - - + + + @@ -17325,7 +17327,7 @@ 0 0 0 - 0 + 21 0 0 255 @@ -22614,7 +22616,7 @@ 8 1 18 - 0 + 21 240 255 255 @@ -23845,7 +23847,7 @@ 0 0 19 - 0 + 21 0 255 255 diff --git a/gamedir/Data/Sounds/radioerror.wav b/gamedir/Data/Sounds/radioerror.wav new file mode 100644 index 000000000..f6e85ad8e Binary files /dev/null and b/gamedir/Data/Sounds/radioerror.wav differ diff --git a/gamedir/Data/Sounds/radioerror2.wav b/gamedir/Data/Sounds/radioerror2.wav new file mode 100644 index 000000000..87a27f9f4 Binary files /dev/null and b/gamedir/Data/Sounds/radioerror2.wav differ diff --git a/gamedir/Data/Sounds/scan1.wav b/gamedir/Data/Sounds/scan1.wav new file mode 100644 index 000000000..e2982706b Binary files /dev/null and b/gamedir/Data/Sounds/scan1.wav differ diff --git a/gamedir/Data/Tilecache/signal_gas.sti b/gamedir/Data/Tilecache/signal_gas.sti new file mode 100644 index 000000000..da9b65bd7 Binary files /dev/null and b/gamedir/Data/Tilecache/signal_gas.sti differ