diff --git a/Data-1.13/BigItems/P2ITEM168.sti b/Data-1.13/BigItems/P2ITEM168.sti new file mode 100644 index 000000000..7e54e2c5f Binary files /dev/null and b/Data-1.13/BigItems/P2ITEM168.sti differ diff --git a/Data-1.13/BigItems/p2item163.sti b/Data-1.13/BigItems/p2item163.sti new file mode 100644 index 000000000..ba49fe72e Binary files /dev/null and b/Data-1.13/BigItems/p2item163.sti differ diff --git a/Data-1.13/BigItems/p2item164.sti b/Data-1.13/BigItems/p2item164.sti new file mode 100644 index 000000000..7d937d253 Binary files /dev/null and b/Data-1.13/BigItems/p2item164.sti differ diff --git a/Data-1.13/BigItems/p2item165.sti b/Data-1.13/BigItems/p2item165.sti new file mode 100644 index 000000000..62922bb80 Binary files /dev/null and b/Data-1.13/BigItems/p2item165.sti differ diff --git a/Data-1.13/BigItems/p2item166.sti b/Data-1.13/BigItems/p2item166.sti new file mode 100644 index 000000000..0ab0147ad Binary files /dev/null and b/Data-1.13/BigItems/p2item166.sti differ diff --git a/Data-1.13/BigItems/p2item167.sti b/Data-1.13/BigItems/p2item167.sti new file mode 100644 index 000000000..4d739edbe Binary files /dev/null and b/Data-1.13/BigItems/p2item167.sti differ diff --git a/Data-1.13/BigItems/p2item169.sti b/Data-1.13/BigItems/p2item169.sti new file mode 100644 index 000000000..7181f13e5 Binary files /dev/null and b/Data-1.13/BigItems/p2item169.sti differ diff --git a/Data-1.13/BigItems/p2item170.sti b/Data-1.13/BigItems/p2item170.sti new file mode 100644 index 000000000..15901191d Binary files /dev/null and b/Data-1.13/BigItems/p2item170.sti differ diff --git a/Data-1.13/Interface/MDP2ITEMS.STI b/Data-1.13/Interface/MDP2ITEMS.STI index 6fe9a9447..8c41c5c07 100644 Binary files a/Data-1.13/Interface/MDP2ITEMS.STI and b/Data-1.13/Interface/MDP2ITEMS.STI differ diff --git a/Data-1.13/Interface/Silhouettes.sti b/Data-1.13/Interface/Silhouettes.sti new file mode 100644 index 000000000..0f6f56b88 Binary files /dev/null and b/Data-1.13/Interface/Silhouettes.sti differ diff --git a/Data-1.13/TableData/Inventory/MercStartingGear.xml b/Data-1.13/TableData/Inventory/MercStartingGear.xml index 620d60cdd..a741863a4 100644 --- a/Data-1.13/TableData/Inventory/MercStartingGear.xml +++ b/Data-1.13/TableData/Inventory/MercStartingGear.xml @@ -247,9 +247,9 @@ 0 1090 100 - 1091 + 0 0 - 0 + 1644 100 0 0 @@ -274,7 +274,7 @@ 214 1 1090 - 1091 + 1644 Martial Arts @@ -309,7 +309,7 @@ 214 1 1090 - 1091 + 1644 1098 @@ -331,7 +331,7 @@ 214 201 1090 - 1091 + 1644 1098 @@ -555,7 +555,7 @@ 100 0 0 - 1093 + 1641 100 0 0 @@ -579,7 +579,7 @@ 1 1090 100 - 1093 + 1641 100 @@ -599,7 +599,7 @@ 1 1090 100 - 1093 + 1641 100 100 @@ -622,7 +622,7 @@ 1 1090 100 - 1093 + 1641 100 1098 99 @@ -657,7 +657,7 @@ 214 1090 100 - 1093 + 1641 100 1098 100 @@ -1801,11 +1801,11 @@ 0 1090 91 - 0 - 0 + 1647 + 91 1091 91 - 1098 + 0 0 0 0 @@ -1830,9 +1830,9 @@ 2 1090 91 + 1647 1091 91 - 1098 Breach @@ -2736,7 +2736,7 @@ 97 0 0 - 1091 + 1645 97 0 0 @@ -2761,7 +2761,7 @@ 1 1090 97 - 1091 + 1645 97 @@ -2779,6 +2779,7 @@ 98 1 1090 + 1645 1092 @@ -2887,7 +2888,7 @@ 100 0 0 - 0 + 1643 0 0 0 @@ -2904,6 +2905,7 @@ 72 2 1090 + 1643 Gun Choice 2 @@ -2915,6 +2917,7 @@ 81 2 1090 + 1643 Gun Choice 3 @@ -2926,6 +2929,7 @@ 510 2 1090 + 1643 1098 @@ -2946,6 +2950,7 @@ 212 96 1090 + 1643 1098 @@ -3308,7 +3313,7 @@ 98 0 0 - 0 + 1646 0 0 0 @@ -3332,6 +3337,7 @@ 92 1090 98 + 1648 Ammo @@ -3451,7 +3457,7 @@ 0 1090 100 - 0 + 1644 0 1091 100 @@ -3481,6 +3487,7 @@ 210 87 1090 + 1644 1091 @@ -3498,6 +3505,7 @@ 38 95 1090 + 1645 1091 @@ -3520,6 +3528,7 @@ 131 99 1090 + 1644 1092 1098 @@ -3547,6 +3556,8 @@ 212 99 1090 + 1644 + 1092 1098 @@ -5347,7 +5358,7 @@ 94 0 0 - 0 + 1648 0 0 0 @@ -5370,6 +5381,7 @@ 1 1090 94 + 1642 Breach @@ -5805,7 +5817,7 @@ 98 0 0 - 0 + 1648 0 1098 98 @@ -5830,6 +5842,7 @@ 1 1090 98 + 1648 1098 98 @@ -5852,7 +5865,7 @@ 100 1 1090 - 1098 + 1642 Night Ops @@ -18792,8 +18805,8 @@ 99 - Premium 50 + Premium -1 176 99 diff --git a/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml index 3aa8874fd..eca952f8e 100644 --- a/Data-1.13/TableData/Items/Items.xml +++ b/Data-1.13/TableData/Items/Items.xml @@ -1,4 +1,4 @@ - + 0 @@ -49123,4 +49123,207 @@ + + 1641 + Large Holster + Large Holster + This pistol holster can store a larger pistol and up to two spare magazines. It also has a pocket for additional equipment. + Large Holster + This pistol holster can store a larger pistol and up to two spare magazines. + 131072 + 41 + 2 + 163 + 3 + 30 + 75 + 2 + 3 + 1 + 1 + 1 + 2 + 1 + + + + + + 1642 + SG Holster + Shotgun holster + This is the perfect holster to store a small handheld shotgun in. + Shotgun holster + This is the perfect holster to store a small handheld shotgun in. + 131072 + 42 + 2 + 164 + 4 + 30 + 150 + 3 + 2 + 1 + 1 + 1 + 2 + 1 + + + + + + 1643 + SMG Leg Rig + SMG Leg Rig + A leg pouch to carry SMG ammunition, as used by SAS teams during hostage rescue operations. + A leg pouch to carry SMG ammunition, as used by SAS teams during hostage rescue operations. + 131072 + 43 + 2 + 165 + 5 + 30 + 120 + 3 + 2 + 1 + 1 + 1 + 2 + 1 + 3 + + + + + + 1644 + TK Rig + Leg Rig Throwing Knives + Stealthy assasins like their knives.This rig can hold several knives. + TK Rig + Stealthy assasins like their knives.This rig can hold several knives.. + 131072 + 44 + 2 + 166 + 4 + 30 + 85 + 4 + 2 + 1 + 1 + 1 + 2 + 1 + 3 + + + + + + 1645 + Pistol Magazines + Pistol Magazines + A leg rig with three pouches for pistol magazines. + Pistol Magazines + A leg rig with three pouches for pistol magazines. + 131072 + 45 + 2 + 167 + 2 + 30 + 75 + 1 + 2 + 1 + 1 + 1 + 2 + 1 + 3 + + + + + + 1646 + Equipment Pouch + Equipment Pouch + A versatile leg pouch with pockets to carry various items. + Equipment Pouch + A versatile leg pouch with pockets to carry various items. + 131072 + 46 + 2 + 168 + 5 + 30 + 75 + 1 + 2 + 1 + 1 + 1 + 2 + 1 + 3 + + + + + + 1647 + Bomb Pouch + Bomb Pouch + A leg rig suitable for the safe transport of explosives. + Bomb Pouch + Not for sale. + 131072 + 47 + 2 + 169 + 4 + 30 + 95 + 5 + 2 + 1 + 1 + 1 + 2 + 1 + + + + + + 1648 + 12g S Rig + 12g Shotgun Rig + This leg rig can hold several 12 gauge shotgun shells and allows access to the regular pants pockets. + 12g Shotgun Rig + This leg rig can hold several 12 gauge shotgun shells and allows access to the regular pants pockets. + 131072 + 48 + 2 + 170 + 2 + 30 + 75 + 2 + 2 + 1 + 1 + 1 + 2 + 1 + + + + \ No newline at end of file diff --git a/Data-1.13/TableData/Items/LoadBearingEquipment.xml b/Data-1.13/TableData/Items/LoadBearingEquipment.xml index 6e123ce2e..2717b6623 100644 --- a/Data-1.13/TableData/Items/LoadBearingEquipment.xml +++ b/Data-1.13/TableData/Items/LoadBearingEquipment.xml @@ -1,4 +1,4 @@ - + 0 @@ -738,4 +738,149 @@ 0 0 + + 41 + 1 + 0 + 31 + 16 + 17 + 15 + 15 + 23 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 42 + 1 + 0 + 31 + 16 + 17 + 24 + 24 + 24 + 25 + 0 + 0 + 0 + 0 + 0 + 0 + + + 43 + 1 + 0 + 31 + 16 + 12 + 12 + 12 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + 44 + 1 + 0 + 31 + 17 + 17 + 26 + 26 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 45 + 1 + 0 + 31 + 16 + 15 + 15 + 15 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 46 + 1 + 0 + 31 + 16 + 17 + 27 + 27 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 47 + 1 + 0 + 31 + 16 + 17 + 28 + 28 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 48 + 1 + 0 + 31 + 16 + 17 + 24 + 24 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + \ No newline at end of file diff --git a/Data-1.13/TableData/Items/Pockets.xml b/Data-1.13/TableData/Items/Pockets.xml index 0031c5515..86370d19e 100644 --- a/Data-1.13/TableData/Items/Pockets.xml +++ b/Data-1.13/TableData/Items/Pockets.xml @@ -1,4 +1,4 @@ - + 0 @@ -400,4 +400,508 @@ 2 2 + + 23 + Large Pistol Holster + 26 + 2 + 2 + 1 + 1 + 1 + 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 + + + 24 + Shotgun Shells + 27 + 1 + 1024 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 7 + 3 + 3 + 0 + 0 + 2 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 25 + Shotgun Holster + 9 + 2 + 2 + 1 + 1 + 1 + 1 + 1 + 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 + + + 26 + Throwing Knife + 11 + 1 + 8 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 5 + 3 + 3 + 0 + 2 + 2 + 2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 27 + General Misc + 29 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 5 + 4 + 4 + 2 + 2 + 2 + 0 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 28 + Small Explosive + 31 + 1 + 512 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 0 + 0 + 2 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 29 + Short Rifle Mag x2 + 28 + 1 + 1024 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 6 + 4 + 4 + 3 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 30 + Revolver Holster + 30 + 2 + 2 + 1 + 1 + 1 + 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 + + + 31 + Combat Pack Gun Sling + 32 + 3 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 0 + 0 + 2 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 32 + Combat Pack Small + 8 + 3 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 6 + 5 + 5 + 3 + 4 + 4 + 2 + 1 + 1 + 2 + 1 + 0 + 1 + 1 + 3 + 2 + 2 + 2 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 33 + Explosives + 31 + 2 + 512 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 4 + 0 + 0 + 0 + 3 + 2 + 0 + 0 + 0 + 2 + 0 + 0 + 4 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 34 + Sniper Mag + 35 + 1 + 1024 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 6 + 4 + 4 + 2 + 2 + 0 + 0 + 2 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + \ No newline at end of file diff --git a/Data-1.13/TableData/Lookup/Silhouette.xml b/Data-1.13/TableData/Lookup/Silhouette.xml index 1f516be2c..08afe2705 100644 --- a/Data-1.13/TableData/Lookup/Silhouette.xml +++ b/Data-1.13/TableData/Lookup/Silhouette.xml @@ -1,4 +1,4 @@ - + 0 @@ -104,4 +104,44 @@ 25 Small Medical Cross + + 26 + Large Pistol Holster + + + 27 + Shotgun Shells + + + 28 + Short Rifle Mag x2 + + + 29 + General Misc + + + 30 + Revolver Holster + + + 31 + Small Explosive + + + 32 + Combat Pack Gun Sling + + + 33 + Medic Kit + + + 34 + First Aid Kit Pocket + + + 35 + Sniper Mag + \ No newline at end of file diff --git a/Data-1.13/tilesets/0/SMP2ITEMS.STI b/Data-1.13/tilesets/0/SMP2ITEMS.STI index 852f22047..0484f687d 100644 Binary files a/Data-1.13/tilesets/0/SMP2ITEMS.STI and b/Data-1.13/tilesets/0/SMP2ITEMS.STI differ