From d53e82c67025c1cff03cde24a90dcf65c080957f Mon Sep 17 00:00:00 2001 From: rftr Date: Mon, 21 Mar 2022 17:33:00 +0000 Subject: [PATCH] added options, item tags, and blank inventory image for new feature: upgradeable robot https://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=364403 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2642 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/Ja2_Options.INI | 3 +++ Data-1.13/TableData/Items/Items.xml | 35 ++++++++++++++++++++++++++++ Data/Interface/MAPINV_1024x768.sti | Bin 381637 -> 511349 bytes Data/Interface/MAPINV_800x600.sti | Bin 350515 -> 480227 bytes Data/Ja2_Options.INI | 3 +++ Data/TableData/Items/Items.xml | 17 ++++++++++++++ 6 files changed, 58 insertions(+) diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI index 3bc2fb840..a27fce92b 100644 --- a/Data-1.13/Ja2_Options.INI +++ b/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/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml index f37c2191b..163a5864d 100644 --- a/Data-1.13/TableData/Items/Items.xml +++ b/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/Data/Interface/MAPINV_1024x768.sti b/Data/Interface/MAPINV_1024x768.sti index e1442debbfd190da0a372d5d3294dfeb226555b6..6a125c6e7b012a6f0c2cc5aee5aca8522c78205a 100644 GIT binary patch delta 18104 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 mpWRlMrQW?Mhvu`02Ery9PREh5s+sRPd4j delta 65 zcmaF7Tz2y&QQ6=SXHSMWMux+otPCKa0mMBF4NMG-3=GU0WrLZU8<^W0m>GeX35Y># LmhBD9tcODZ3>gpG diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI index cf844f482..c52812aff 100644 --- a/Data/Ja2_Options.INI +++ b/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/Data/TableData/Items/Items.xml b/Data/TableData/Items/Items.xml index feab38204..d951fb6fb 100644 --- a/Data/TableData/Items/Items.xml +++ b/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