diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 3bc2fb840..a27fce92b 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -2186,6 +2186,9 @@ ALLOW_INSTANT_INTERRUPTS_ON_SPOTTING = FALSE ;Should the Robot be exempt from paying AP-to-Ready? ROBOT_NO_READYTIME = FALSE +;------------------------------------------------------------------------------------------------------------------------------ +; Is Madlab's Robot upgradeable? Requires new inventory system. +ROBOT_UPGRADEABLE = TRUE ;------------------------------------------------------------------------------------------------------------------------------ ; Disable enemies to automatically ready their weapon, when they see our mercs. However, since it may help us to notify about diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index f37c2191b..163a5864d 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -199,6 +199,16 @@ 0 0 0 + 1.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 @@ -5717,6 +5727,7 @@ -1 -3 100.0 + 0.9 -15 -6 @@ -6611,6 +6622,7 @@ -20 -40 100.0 + 1 @@ -7336,6 +7348,7 @@ -5 1.3 100.0 + 1 @@ -7492,6 +7505,7 @@ 10 -40 100.0 + 1 @@ -8336,6 +8350,7 @@ 10 -10 100.0 + 1 -3 -1 @@ -8381,6 +8396,7 @@ 10 -5 100.0 + 1 -1 -1 @@ -9112,6 +9128,9 @@ 80 50 100.0 + 10 + 10 + 10 @@ -24649,6 +24668,7 @@ -1 50 100.0 + 1 -5 -2 @@ -25943,6 +25963,7 @@ -1 25 100.0 + 1 -5 -2 @@ -25986,6 +26007,7 @@ -3 25 100.0 + 1 -8 -3 @@ -26029,6 +26051,7 @@ -3 25 100.0 + 1 -8 -3 @@ -29449,6 +29472,7 @@ -15 3.0 100.0 + 1 @@ -31249,6 +31273,7 @@ 20 1.6 100.0 + 1 @@ -31806,6 +31831,7 @@ 15 -40 100.0 + 1 @@ -31841,6 +31867,7 @@ 20 -40 100.0 + 1 @@ -34091,6 +34118,7 @@ -2 25 100.0 + 1 -5 -2 @@ -34133,6 +34161,7 @@ -5 25 100.0 + 1 -8 -3 @@ -34176,6 +34205,7 @@ -4 25 100.0 + 1 -8 -3 @@ -35354,6 +35384,7 @@ -1 25 100.0 + 1 -5 -2 @@ -35397,6 +35428,7 @@ -4 25 100.0 + 1 -8 -3 @@ -35440,6 +35472,7 @@ -3 25 100.0 + 1 -8 -3 @@ -37477,6 +37510,7 @@ 40 1 100.0 + 1 -5 -2 @@ -50610,6 +50644,7 @@ 2 1 100.0 + 21 diff --git a/gamedir/Data/Interface/MAPINV_1024x768.sti b/gamedir/Data/Interface/MAPINV_1024x768.sti new file mode 100644 index 000000000..6a125c6e7 Binary files /dev/null and b/gamedir/Data/Interface/MAPINV_1024x768.sti differ diff --git a/gamedir/Data/Interface/MAPINV_800x600.sti b/gamedir/Data/Interface/MAPINV_800x600.sti new file mode 100644 index 000000000..0c783b7fa Binary files /dev/null and b/gamedir/Data/Interface/MAPINV_800x600.sti differ diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index cf844f482..c52812aff 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -2186,6 +2186,9 @@ ALLOW_INSTANT_INTERRUPTS_ON_SPOTTING = FALSE ;Should the Robot be exempt from paying AP-to-Ready? ROBOT_NO_READYTIME = FALSE +;------------------------------------------------------------------------------------------------------------------------------ +; Is Madlab's Robot upgradeable? Requires new inventory system. +ROBOT_UPGRADEABLE = TRUE ;------------------------------------------------------------------------------------------------------------------------------ ; Disable enemies to automatically ready their weapon, when they see our mercs. However, since it may help us to notify about diff --git a/gamedir/Data/TableData/Items/Items.xml b/gamedir/Data/TableData/Items/Items.xml index feab38204..d951fb6fb 100644 --- a/gamedir/Data/TableData/Items/Items.xml +++ b/gamedir/Data/TableData/Items/Items.xml @@ -199,6 +199,16 @@ 0 0 0 + 1.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 @@ -5629,6 +5639,7 @@ 3 -2 100 + 0.9 -8 -3 @@ -6464,6 +6475,7 @@ -20 -40 100.0 + 1 @@ -7184,6 +7196,7 @@ 90 1.2 100.0 + 1 @@ -7340,6 +7353,7 @@ 10 -40 100.0 + 1 @@ -8635,6 +8649,9 @@ 1 1 1 + 10 + 10 + 10 80 50 100.0