diff --git a/gamedir/Data-1.13/BigItems/P4ITEM00.STI b/gamedir/Data-1.13/BigItems/P4ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data-1.13/BigItems/P4ITEM00.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P4ITEM01.STI b/gamedir/Data-1.13/BigItems/P4ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data-1.13/BigItems/P4ITEM01.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P5ITEM00.STI b/gamedir/Data-1.13/BigItems/P5ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data-1.13/BigItems/P5ITEM00.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P5ITEM01.STI b/gamedir/Data-1.13/BigItems/P5ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data-1.13/BigItems/P5ITEM01.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P6ITEM00.STI b/gamedir/Data-1.13/BigItems/P6ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data-1.13/BigItems/P6ITEM00.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P6ITEM01.STI b/gamedir/Data-1.13/BigItems/P6ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data-1.13/BigItems/P6ITEM01.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P7ITEM00.STI b/gamedir/Data-1.13/BigItems/P7ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data-1.13/BigItems/P7ITEM00.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P7ITEM01.STI b/gamedir/Data-1.13/BigItems/P7ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data-1.13/BigItems/P7ITEM01.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P8ITEM00.STI b/gamedir/Data-1.13/BigItems/P8ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data-1.13/BigItems/P8ITEM00.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P8ITEM01.STI b/gamedir/Data-1.13/BigItems/P8ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data-1.13/BigItems/P8ITEM01.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P9ITEM00.STI b/gamedir/Data-1.13/BigItems/P9ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data-1.13/BigItems/P9ITEM00.STI and /dev/null differ diff --git a/gamedir/Data-1.13/BigItems/P9ITEM01.STI b/gamedir/Data-1.13/BigItems/P9ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data-1.13/BigItems/P9ITEM01.STI and /dev/null differ diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 793ad258c..73c64ce99 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -170,6 +170,29 @@ WRITE_PROFILE_DATA_TO_XML = FALSE USE_EXTERNALIZED_ENEMY_ITEM_DROPS = 1 +;------------------------------------------------------------------------------------------------------------------------------ +; Tells the game to load ja2set.dat.xml instead of the old binary file +; Must be TRUE if NUM_P_ITEMS (below) is > 3 +; If an xml file doesn't exist, setting the value to true will create one. +; Issues have been reported using big maps with this value set to TRUE +; Valid values = TRUE or FALSE, Default = FALSE +;------------------------------------------------------------------------------------------------------------------------------ + +USE_XML_TILESETS = FALSE + +;------------------------------------------------------------------------------------------------------------------------------ +; Change the number of PItem graphics files used by the game +; Requires using modified xml version of ja2set.dat for values > 3 +; This setting is also dependent on the items.xml file graphics tags, and the actual PItem graphics files +; Do not change this unless you are modding the game, or it will probably break everything! +; Issues have been reported using big maps with values > 3 +; Valid value range = 3-20, default = 3 +;------------------------------------------------------------------------------------------------------------------------------ + +NUM_P_ITEMS = 3 + + + ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/gamedir/Data-1.13/TableData/AttachmentComboMerges.xml b/gamedir/Data-1.13/TableData/AttachmentComboMerges.xml index da4009b53..d520a8e70 100644 --- a/gamedir/Data-1.13/TableData/AttachmentComboMerges.xml +++ b/gamedir/Data-1.13/TableData/AttachmentComboMerges.xml @@ -5,6 +5,24 @@ 305 306 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 307 @@ -12,6 +30,24 @@ 308 309 304 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 310 @@ -19,6 +55,24 @@ 318 319 320 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 321 @@ -26,6 +80,24 @@ 315 316 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 317 @@ -33,6 +105,24 @@ 264 316 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 223 @@ -40,6 +130,24 @@ 1360 1360 1360 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 1360 \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index 27cabb6fa..498649b57 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -12,6 +12,15 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 0 @@ -38,6 +47,7 @@ 1 0 0 + 0 0 0 0 @@ -91,16 +101,6 @@ 0 0 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 0 0 0 @@ -165,7 +165,6 @@ 0.0 0.0 0.0 - 0 0 0 @@ -8884,7 +8883,7 @@ 310 Extender Gun Barrel Extender - attach this nifty chunk of hardware to any gun barrel and watch your range soar. + Attach this nifty chunk of hardware to any gun barrel and watch your range soar. Gun Barrel Extender Not for sale through BR. 268435456 @@ -43135,7 +43134,7 @@ 811 18 1 - 20 + 22 375 4 1 @@ -43159,7 +43158,7 @@ 812 18 1 - 20 + 22 250 4 1 @@ -43183,7 +43182,7 @@ 811 18 1 - 20 + 22 336 5 1 @@ -43209,7 +43208,7 @@ 812 18 1 - 20 + 22 225 5 1 @@ -43235,7 +43234,7 @@ 813 18 1 - 20 + 22 875 6 1 @@ -43260,7 +43259,7 @@ 814 18 1 - 20 + 22 500 6 1 @@ -43288,7 +43287,7 @@ 815 18 1 - 20 + 22 750 6 1 diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml index e8f47d226..b837ef8bf 100644 --- a/gamedir/Data-1.13/TableData/MercProfiles.xml +++ b/gamedir/Data-1.13/TableData/MercProfiles.xml @@ -2911,6 +2911,7 @@ 6 6 9 + 13 255 255 255 diff --git a/gamedir/Data-1.13/TableData/MercStartingGear.xml b/gamedir/Data-1.13/TableData/MercStartingGear.xml index 28957ff05..650b76d58 100644 --- a/gamedir/Data-1.13/TableData/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/MercStartingGear.xml @@ -15179,11 +15179,11 @@ 0 0 202 - 1 + 100 1 1 201 - 1 + 100 2 1 0 diff --git a/gamedir/Data/BigItems/P4ITEM00.STI b/gamedir/Data/BigItems/P4ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data/BigItems/P4ITEM00.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P4ITEM01.STI b/gamedir/Data/BigItems/P4ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data/BigItems/P4ITEM01.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P5ITEM00.STI b/gamedir/Data/BigItems/P5ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data/BigItems/P5ITEM00.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P5ITEM01.STI b/gamedir/Data/BigItems/P5ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data/BigItems/P5ITEM01.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P6ITEM00.STI b/gamedir/Data/BigItems/P6ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data/BigItems/P6ITEM00.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P6ITEM01.STI b/gamedir/Data/BigItems/P6ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data/BigItems/P6ITEM01.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P7ITEM00.STI b/gamedir/Data/BigItems/P7ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data/BigItems/P7ITEM00.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P7ITEM01.STI b/gamedir/Data/BigItems/P7ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data/BigItems/P7ITEM01.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P8ITEM00.STI b/gamedir/Data/BigItems/P8ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data/BigItems/P8ITEM00.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P8ITEM01.STI b/gamedir/Data/BigItems/P8ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data/BigItems/P8ITEM01.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P9ITEM00.STI b/gamedir/Data/BigItems/P9ITEM00.STI deleted file mode 100644 index 0971eee84..000000000 Binary files a/gamedir/Data/BigItems/P9ITEM00.STI and /dev/null differ diff --git a/gamedir/Data/BigItems/P9ITEM01.STI b/gamedir/Data/BigItems/P9ITEM01.STI deleted file mode 100644 index 4cd957cf3..000000000 Binary files a/gamedir/Data/BigItems/P9ITEM01.STI and /dev/null differ diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index 7d4208dfc..836bbb78e 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -170,6 +170,27 @@ WRITE_PROFILE_DATA_TO_XML = FALSE USE_EXTERNALIZED_ENEMY_ITEM_DROPS = 0 +;------------------------------------------------------------------------------------------------------------------------------ +; Tells the game to load ja2set.dat.xml instead of the old binary file +; Must be TRUE if NUM_P_ITEMS (below) is > 3 +; If an xml file doesn't exist, setting the value to true will create one. +; Issues have been reported using big maps with this value set to TRUE +; Valid values = TRUE or FALSE, Default = FALSE +;------------------------------------------------------------------------------------------------------------------------------ + +USE_XML_TILESETS = FALSE + +;------------------------------------------------------------------------------------------------------------------------------ +; Change the number of PItem graphics files used by the game +; Requires using modified xml version of ja2set.dat for values > 3 +; This setting is also dependent on the items.xml file graphics tags, and the actual PItem graphics files +; Do not change this unless you are modding the game, or it will probably break everything! +; Issues have been reported using big maps with values > 3 +; Valid value range = 3-20, default = 3 +;------------------------------------------------------------------------------------------------------------------------------ + +NUM_P_ITEMS = 3 + ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/gamedir/Data/TableData/Items.xml b/gamedir/Data/TableData/Items.xml index 1aa56a74f..2abf56388 100644 --- a/gamedir/Data/TableData/Items.xml +++ b/gamedir/Data/TableData/Items.xml @@ -12,6 +12,15 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 0 @@ -38,6 +47,7 @@ 1 0 0 + 0 0 0 0 @@ -91,16 +101,6 @@ 0 0 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 0 0 0 diff --git a/gamedir/Ja2.ini b/gamedir/Ja2.ini index e3f6b3e42..ab7be9391 100644 --- a/gamedir/Ja2.ini +++ b/gamedir/Ja2.ini @@ -19,14 +19,6 @@ CD = C VFS_NO_UNICODE = FALSE -;****************************************************************************************************************************** -; Should the game use the xml externalized tileset structure (ja2Set.dat.xml) located in the "Data-?" folder of the current MOD, -; or should it use the binary version (ja2set.dat) located in the "BinaryData" folder. -; Default: FALSE -;****************************************************************************************************************************** - -USE_XML_TILESETS = FALSE - ;****************************************************************************************************************************** ; Define here the correct vfs_config.XYZ.ini for the MOD you would like to play ; If you would like to play a different MOD, you only need to change this line with the correct vfs_config.XYZ.ini