From 132e0330ee870316d9ca8398df000a836696fa5c Mon Sep 17 00:00:00 2001 From: Wanne Date: Sat, 19 Oct 2013 12:18:37 +0000 Subject: [PATCH] Molle Improvments / Fixes (by Off_Topic) - Mini Grenade Size 14->13 - Mini Grenade Pocket 14x2->13x2 - New Pocket (Small Knife) for Nylon Knife Sheath Can't hold KCB or Rambo. o KCB & Rambo size 24->28 o Regular Knife Pocket Volume 13->15 - Carabiner o New Item Class Armour/Face/LBE/Misc. o Can now hold items 16 (Handcuffs) & 18 (Compact Binoculars) There are still a few items that will go there that shouldn't (Syringes for example) but with the new item class restriction it's a lot less stuff. - New ITEM: Carabiner oCan be attached to MOLLE vests to add more Rings. -5 Stealth penalty to stop you going overboard. - New Silhouette: Sniper Rifle - New Pocket type: Sniper Rifle (Can now only hold one item sized 8 & 9, large sniper rifles and one item sized 5,6, or 7) - Replaced this in Sniper Drag Bag - General Drop Pouch can now hold more than small pouch (no restriction) and can hold bigger items. Volume increased from 2 to 8. - New ITEM: Carabiner o Can be attached to MOLLE vests to add more Rings. -5 Stealth penalty to stop you going overboard. - Ammo Pockets now more flexible, they still only take Ammo. Other pockets tweaked. - Mercstarting Gear: Wolf K2 Removed Leg Rig/Ice K3 Removed Combat Pack. git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1834 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/BigItems/p2item215.sti | Bin 0 -> 1701 bytes Data-1.13/Interface/MDP2ITEMS.STI | Bin 102920 -> 103075 bytes Data-1.13/Interface/Silhouettes.sti | Bin 17312 -> 17676 bytes .../TableData/Inventory/MercStartingGear.xml | 6 +- Data-1.13/TableData/Items/Items.xml | 58 +++++++++++--- .../TableData/Items/LoadBearingEquipment.xml | 36 +++++++-- Data-1.13/TableData/Items/Pockets.xml | 75 +++++++++++++----- Data-1.13/TableData/Lookup/ItemClass.xml | 4 + Data-1.13/TableData/Lookup/Silhouette.xml | 4 + Data-1.13/tilesets/0/SMP2ITEMS.STI | Bin 35392 -> 35434 bytes 10 files changed, 141 insertions(+), 42 deletions(-) create mode 100644 Data-1.13/BigItems/p2item215.sti diff --git a/Data-1.13/BigItems/p2item215.sti b/Data-1.13/BigItems/p2item215.sti new file mode 100644 index 0000000000000000000000000000000000000000..00e170e327a5fffdab2832a9b58a5053051e5ded GIT binary patch literal 1701 zcmc(eF^=m-42HQc2(Z`yK^h++KtLTMRoWR*r%=5HrV!`Fg}2B_2%SL-q}V1!7BHvJ zO_ZPVTUbW6&%lb)j>KA$-d>$VkH+p^S|L-tkH<1z< zkrP!WV`@w*6L-{i5oRF~QXvy^p{is`O=(r)N_~yZY$Qf%WJYdOoy@5@txnviZ#a@s z62-6y>A;oQm>cuT%pLa~lQ0X5unL>73s+@RZpy1NHuRf5Y!hQOHe)xg&gR^lSC4W% z)T2;H77bD2BsF$OV_9)PCw&(!;Up{-F%cK3DyGs@RvcfYuhB4cAgm^4;wII_T$;-Y zaZUOb=5ctV8r`dt){v%+b!FvF`wl9U;~dqfq%K-jO|_}6s%Wy`JVmQefPk60X>~Q% z=DK=V(8KW<4u$~xVKWT28Xj0RD4;p{rV7V@TMCI3ieX zR`GRfZYvCJ*0;D09Mg7lOfRtxY+fE`GTM z=*0D|V`RzY=@p3s&8$NwIGJX~xE~n=WmwP;?t@de; zM<3=8ID6UQ<*#;{L*P9w(cM+xu*)v)%B1f%J2 zYH8PHDJ5-1N=thOhf|s-WDj?E%%1*;F7dm|9+x@)`8mdrKgk|mmcZ|KMULk@m63kR z^B$M{^&x%zG9W*lcY$Mg75Rr$Zn(4y=n#jdoG;thmV$S!Xj5N;I+n9BL~CEhFU?mgL9KUv&vV-iQ47%v;3PNc0kt~!Z5Ddg#W+sI$TGa86ckQ| z@9qvRLp3F=$L4lr&eYD>x?z((1lcJ4OKG?0s}<#P#CqcC#LkKiJx`t%??LX@!abzJbZ&k<}4 zBr_J=dBL#OVojG4SfMGQWl#}DadGlkFf&`MO>`-PksBSUJgN5(ZuCTL7FdS{^banb BbZ!6u delta 45 vcmeC_VqDP9C>tE&?8yKG1-2lPfk6X^A22pBF)%VP=x>x2X4~w*R$vPN&%OwS diff --git a/Data-1.13/TableData/Inventory/MercStartingGear.xml b/Data-1.13/TableData/Inventory/MercStartingGear.xml index 42044d03f..ffe38b352 100644 --- a/Data-1.13/TableData/Inventory/MercStartingGear.xml +++ b/Data-1.13/TableData/Inventory/MercStartingGear.xml @@ -1,4 +1,4 @@ - + 0 @@ -2932,7 +2932,7 @@ 2 1090 1643 - 1098 + 0 50 @@ -5844,7 +5844,7 @@ 1 1090 98 - 1648 + 0 1098 98 diff --git a/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml index 0c6f64079..e440e31bb 100644 --- a/Data-1.13/TableData/Items/Items.xml +++ b/Data-1.13/TableData/Items/Items.xml @@ -1,4 +1,4 @@ - + 0 @@ -4151,7 +4151,7 @@ 50 3 6 - 14 + 13 150 3 -4 @@ -16610,7 +16610,7 @@ 520 4 2 - 24 + 28 130 2 1 @@ -16820,7 +16820,7 @@ 187 11 1 - 24 + 28 150 4 2 @@ -50331,9 +50331,9 @@ 1677 Russian Pistol Holster Russian MOLLE pistol holster - This holster may be using for Glock, PMM, APS, GSh-18, PB pistols with a silencer. + This holster may be used for Glock, PMM, APS, GSh-18, PB pistols with a silencer. Russian MOLLE pistol holster - This holster may be using for Glock, PMM, APS, GSh-18, PB pistols with a silencer. + This holster may be used for Glock, PMM, APS, GSh-18, PB pistols with a silencer. 131072 16777216 8192 @@ -50644,7 +50644,7 @@ 1 2 1 - 5 + 6 100.0 @@ -50677,7 +50677,7 @@ 1 2 1 - 5 + 6 100.0 @@ -50710,7 +50710,7 @@ 1 3 1 - 4 + 6 100.0 @@ -50743,7 +50743,7 @@ 1 2 1 - 6 + 6 100.0 @@ -50784,7 +50784,7 @@ Sniper Drag Bag Carry your sniper rifle with style and protected from bad weather. Sniper Drag Bag - Those heavy sniper rifles can be a real pain to carry over long distances. This sniper bag will ease long range transportation and it has some additional pockets for your valuable equipment. + This bag can hold a two long guns and two pistols plus quite a bit of gear. This sniper bag will ease long range transportation and it has some additional pockets for your valuable equipment. 131072 1 91 @@ -50892,4 +50892,40 @@ + + 1695 + Carabiner + Carabiner + Functional shape is easy to hold; deep basket accepts loads of slings and runners. + Carabiner + Functional shape is easy to hold; deep basket accepts loads of slings and runners + 131072 + 16777216 + 4096 + 4 + 1 + 5 + 95 + 2 + 215 + 1 + 10 + 20 + 3 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 1 + 0 + -5 + 100.0 + + + + \ 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 da58f7298..a781ad9d9 100644 --- a/Data-1.13/TableData/Items/LoadBearingEquipment.xml +++ b/Data-1.13/TableData/Items/LoadBearingEquipment.xml @@ -1,4 +1,4 @@ - + 0 @@ -1207,7 +1207,7 @@ 26 0 0 - 2 + 52 0 0 0 @@ -1824,19 +1824,19 @@ 91 4 2 - 29 + 32 0 0 - 17 + 44 34 - 0 + 11 0 27 34 - 0 + 11 0 - 31 - 5 + 53 + 31 0 0 @@ -1900,4 +1900,24 @@ 49 0 + + 95 + 1 + 0 + 10 + 0 + 0 + 38 + 0 + 0 + 0 + 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 dc5d8dd03..163e3dcea 100644 --- a/Data-1.13/TableData/Items/Pockets.xml +++ b/Data-1.13/TableData/Items/Pockets.xml @@ -1,4 +1,4 @@ - + 0 @@ -59,7 +59,7 @@ 2 Knife 11 - 13 + 15 2 1 1 @@ -291,7 +291,7 @@ SMG Mag 17 1 - 5 + 6 4 2 2 @@ -476,15 +476,21 @@ General Misc 29 1 - 268435456 - 2 - 4 - 3 - 2 + 10 + 1 + 5 + 4 + 4 2 2 2 - 1 + 2 + 1 + 1 + 1 + 1 + 1 + 1 28 @@ -533,15 +539,10 @@ 32 3 2 - 20 - 1 + 25 1 1 1 - 3 - 2 - 1 - 2 32 @@ -613,6 +614,10 @@ Carabiner Ring 37 1 + 268601344 + 13 + 1 + 1 1 1 1 @@ -624,6 +629,7 @@ 2 256 12 + 3 3 @@ -659,7 +665,8 @@ 41 1 1024 - 9 + 12 + 2 2 @@ -677,6 +684,8 @@ 1 1024 16 + 4 + 2 2 @@ -686,6 +695,8 @@ 1 1024 8 + 2 + 1 1 @@ -694,8 +705,9 @@ 36 2 256 - 12 - 1 + 18 + 3 + 3 3 @@ -714,6 +726,8 @@ 2 1024 24 + 6 + 3 3 @@ -723,7 +737,7 @@ 1 256 8 - 2 + 2 51 @@ -731,7 +745,28 @@ 45 2 1024 - 12 + 18 + 6 3 + + 52 + Small Knife + 11 + 13 + 2 + 1 + 1 + 1 + + + 53 + Sniper Rifle Gun Sling + 47 + 3 + 2 + 25 + 1 + 1 + \ No newline at end of file diff --git a/Data-1.13/TableData/Lookup/ItemClass.xml b/Data-1.13/TableData/Lookup/ItemClass.xml index 02c9ed47b..10b7e1898 100644 --- a/Data-1.13/TableData/Lookup/ItemClass.xml +++ b/Data-1.13/TableData/Lookup/ItemClass.xml @@ -84,6 +84,10 @@ 268435712 Grenade / Misc + + 268601344 + Armour/Face Item/LBE/Misc + 536870912 Money diff --git a/Data-1.13/TableData/Lookup/Silhouette.xml b/Data-1.13/TableData/Lookup/Silhouette.xml index 3d073a61b..972e7258b 100644 --- a/Data-1.13/TableData/Lookup/Silhouette.xml +++ b/Data-1.13/TableData/Lookup/Silhouette.xml @@ -188,4 +188,8 @@ 46 Small Shotgun + + 47 + Sniper Rifle + \ 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 ceb533a3de57a399167997d265df80038f1ffd19..05c9b72db87428c4a7aca6f35349c381891f604c 100644 GIT binary patch delta 51 zcmX>wh3VB4CfVQ+XV2+k3=FF(8NfgTNIqa}U}9ioV7ReScCrBDgv|>D=2uQ$&>{r@ DY4i@N delta 45 wcmaDgh3UW)CfVQ+XV2+k3=9)08NfgTNIqa}U}9ioV7R_fcCx_c0|FB&0T>AkJpcdz