From 6a314636087b433c1a5cfc8719b26c9eabe67d55 Mon Sep 17 00:00:00 2001 From: silversurfer Date: Wed, 16 Oct 2013 18:46:04 +0000 Subject: [PATCH] - new NAS Layout Classes for Molle System (Thigh Rigs = 3 and Vests = 4) - fixed attachment slot layout for Molle items - fixed wrong slots for Molle items - fixed wrong BR dropoff grid in GameDir 1828 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1829 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Mod_Settings.ini | 2 +- .../TableData/Items/AttachmentSlots.xml | 173 ++++++++++++------ gamedir/Data-1.13/TableData/Items/Items.xml | 96 +++++----- .../TableData/Items/LoadBearingEquipment.xml | 12 +- gamedir/Data/Mod_Settings.ini | 2 +- 5 files changed, 170 insertions(+), 115 deletions(-) diff --git a/gamedir/Data-1.13/Mod_Settings.ini b/gamedir/Data-1.13/Mod_Settings.ini index b5495ff36..3a7941eb4 100644 --- a/gamedir/Data-1.13/Mod_Settings.ini +++ b/gamedir/Data-1.13/Mod_Settings.ini @@ -56,7 +56,7 @@ BOBBYR_DROPOFF_GRIDNO = 10433 BOBBYR_SHIPPING_DEST_SECTOR_X = 13 BOBBYR_SHIPPING_DEST_SECTOR_Y = 2 BOBBYR_SHIPPING_DEST_SECTOR_Z = 0 -BOBBYR_SHIPPING_DEST_GRIDNO = 10122 +BOBBYR_SHIPPING_DEST_GRIDNO = 10112 PABLOS_STOLEN_DEST_GRIDNO = 1 LOST_SHIPMENT_GRIDNO = 2 diff --git a/gamedir/Data-1.13/TableData/Items/AttachmentSlots.xml b/gamedir/Data-1.13/TableData/Items/AttachmentSlots.xml index 8de6ac007..d859b16a0 100644 --- a/gamedir/Data-1.13/TableData/Items/AttachmentSlots.xml +++ b/gamedir/Data-1.13/TableData/Items/AttachmentSlots.xml @@ -288,65 +288,65 @@ 26 - MOLLE Vest Lower Row 1 + MOLLE Leg Upper Row 1 4096 - 1 - 10 - 34 + 3 + 190 + 10 0 0 - 6 + 1 27 - MOLLE Vest Lower Row 2 + MOLLE Leg Upper Row 2 4096 - 1 - 46 - 34 + 3 + 226 + 10 0 0 - 7 + 2 28 - MOLLE Vest Lower Row 3 - 4096 - 1 - 82 + MOLLE Leg Lower Row 1 + 8192 + 3 + 190 34 0 0 - 8 + 3 29 - MOLLE Vest Lower Row 4 - 4096 - 1 - 118 + MOLLE Leg Lower Row 2 + 8192 + 3 + 226 34 0 0 - 9 + 4 30 - MOLLE Vest Lower Row 5 - 4096 - 1 - 154 - 34 + MOLLE Leg Middle Medium + 8192 + 3 + 193 + 58 0 - 0 - 10 + 1 + 5 31 - MOLLE Leg Upper Left + MOLLE Vest Upper Row 1 Small 4096 - 1 - 187 + 4 + 10 10 0 0 @@ -354,10 +354,10 @@ 32 - MOLLE Leg Upper Right + MOLLE Vest Upper Row 2 Small 4096 - 1 - 223 + 4 + 46 10 0 0 @@ -365,57 +365,112 @@ 33 - MOLLE Leg Lower Left + MOLLE Vest Upper Row 3 Small 4096 - 1 - 187 - 34 + 4 + 82 + 10 0 0 3 34 - MOLLE Leg Lower Right + MOLLE Vest Upper Row 4 Small 4096 - 1 - 223 - 34 + 4 + 118 + 10 0 0 4 35 - MOLLE Leg Bottom Medium - 8192 - 1 - 190 - 58 + MOLLE Vest Upper Row 5 Small + 4096 + 4 + 154 + 10 0 - 1 + 0 5 36 + MOLLE Vest Lower Row 1 Small + 4096 + 4 + 10 + 34 + 0 + 0 + 6 + + + 37 + MOLLE Vest Lower Row 2 Small + 4096 + 4 + 46 + 34 + 0 + 0 + 7 + + + 38 + MOLLE Vest Lower Row 3 Small + 4096 + 4 + 82 + 34 + 0 + 0 + 8 + + + 39 + MOLLE Vest Lower Row 4 Small + 4096 + 4 + 118 + 34 + 0 + 0 + 9 + + + 40 + MOLLE Vest Lower Row 5 Small + 4096 + 4 + 154 + 34 + 0 + 0 + 10 + + + 41 + MOLLE Vest Upper Row 6 Medium + 8192 + 4 + 190 + 10 + 0 + 1 + 11 + + + 42 MOLLE Vest Lower Row 6 Medium 8192 - 1 + 4 190 34 0 1 12 - - 37 - MOLLE Vest upper Row 5 small - 4096 - 1 - 154 - 10 - 0 - 0 - 11 - \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index 7cf770cbf..eda1bcd19 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -49434,7 +49434,7 @@ 3.11 Thigh Rig A highly useful accessory used by sportsmen, patrol officers, and tactical operators across the country, the 3.11 Thigh Rig is a lightweight, reliable, and completely customizable. 131072 - 1 + 3 1 3 49 @@ -49465,7 +49465,7 @@ 131072 16777216 8192 - 1 + 3 2 15 50 @@ -49496,7 +49496,7 @@ VTAC LBE Tactical Vest Our MOLLE Vest is made from a stiffened mesh providing the necessary structure for gear and is fully compatible with our VTAC NAS™ pouches or standard MOLLE gear. 131072 - 1 + 4 1 3 51 @@ -49527,7 +49527,7 @@ 131072 16777216 8192 - 1 + 3 2 15 52 @@ -49560,7 +49560,7 @@ 131072 16777216 4096 - 1 + 3 1 15 53 @@ -49593,7 +49593,7 @@ 131072 16777216 4096 - 1 + 3 1 10 54 @@ -49626,7 +49626,7 @@ 131072 16777216 4096 - 1 + 3 1 10 55 @@ -49659,7 +49659,7 @@ 131072 16777216 4096 - 1 + 3 1 10 56 @@ -49691,7 +49691,7 @@ 131072 16777216 4096 - 1 + 3 1 10 57 @@ -49724,7 +49724,7 @@ 131072 16777216 4096 - 1 + 3 1 10 58 @@ -49756,7 +49756,7 @@ 131072 16777216 4096 - 1 + 3 1 10 59 @@ -49788,7 +49788,7 @@ 131072 16777216 4096 - 1 + 3 1 10 60 @@ -49821,7 +49821,7 @@ 131072 16777216 8192 - 1 + 3 2 15 61 @@ -49854,7 +49854,7 @@ 131072 16777216 4096 - 1 + 3 1 10 62 @@ -49887,7 +49887,7 @@ 131072 16777216 4096 - 1 + 3 1 10 63 @@ -49919,7 +49919,7 @@ 131072 16777216 4096 - 1 + 3 1 10 64 @@ -49950,7 +49950,7 @@ MOLLE Drop Leg Ambi Holster Versatility comes from the number of carry modes and weapon configurations allowed by this holster. 131072 - 1 + 3 1 65 2 @@ -49978,7 +49978,7 @@ Casualty Response Kit - Medic/Leg Rig Bag Here we have a Trauma shear storage for quick access and MOLLE style attachment system compatible. 131072 - 1 + 3 3 66 2 @@ -50007,7 +50007,7 @@ Black M.O.L.L.E. Modular Tactical Vest This military vest has hanging loops for added storage and features two inner mesh pockets with zippers, perfect to carry smaller items that cannot be attached to the molle webbing. 131072 - 1 + 4 3 3 67 @@ -50037,7 +50037,7 @@ Multicam Military Tactical Molle Vest The Multicam MOLLE compatible cross draw military vest is the maximum in practicality and durabilty for a tactical vest. 131072 - 1 + 4 1 3 68 @@ -50069,7 +50069,7 @@ 131072 16777216 4096 - 1 + 3 1 10 69 @@ -50102,7 +50102,7 @@ 131072 16777216 4096 - 1 + 3 1 10 70 @@ -50135,7 +50135,7 @@ 131072 16777216 4096 - 1 + 3 1 10 71 @@ -50168,7 +50168,7 @@ 131072 16777216 4096 - 1 + 3 1 10 72 @@ -50201,7 +50201,7 @@ 131072 16777216 4096 - 1 + 3 1 10 73 @@ -50234,7 +50234,7 @@ 131072 16777216 4096 - 1 + 3 1 10 74 @@ -50266,7 +50266,7 @@ 131072 16777216 8192 - 1 + 3 2 15 75 @@ -50297,7 +50297,7 @@ Specter Modular Thigh Rig This rig features 4 rows of MOLLE compatible modular webbing strips that allow the user to configure a thigh rig with the pouches they want and need for the mission at hand. 131072 - 1 + 3 3 3 76 @@ -50329,7 +50329,7 @@ 131072 16777216 8192 - 1 + 3 2 15 77 @@ -50362,7 +50362,7 @@ 131072 16777216 4096 - 1 + 3 1 10 78 @@ -50389,13 +50389,13 @@ 1679 Pistol Mag 3.11 Single Pistol Magazine Pouch - 3.11Tactical bring you the NAS™ Magazine Pouches. These Magazine Pouches will securely carry your pistol’s magazine and provide quick access when it’s time to reload. + 3.11Tactical bring you the NAS™ Magazine Pouches. These Magazine Pouches will securely carry your pistol magazine and provide quick access when it's time to reload. Single Pistol Magazine Pouch The NAS™ Magazine Pouches accommodate a variety of magazines. Be sure to select the correct magazine pouches for your pistol magazines. 131072 16777216 4096 - 1 + 3 1 10 79 @@ -50428,7 +50428,7 @@ 131072 16777216 4096 - 1 + 3 1 10 80 @@ -50461,7 +50461,7 @@ 131072 16777216 4096 - 1 + 3 1 10 81 @@ -50492,7 +50492,7 @@ TT Modular Tactical Assault Vest The Modular Adjustable Tactical Vest is a modern update to the traditional modular vest. The MAT-V has been designed to combine function and comfort without sacrificing either 131072 - 1 + 4 3 82 2 @@ -50521,7 +50521,7 @@ S.T.R.I.K.E. - ELITE VEST Two large, zippered map pouches inside, Shoulder D-rings for accessory attachment, See 3.11.® section for all pouch options. 131072 - 1 + 4 3 83 2 @@ -50553,7 +50553,7 @@ 131072 16777216 4096 - 1 + 3 1 10 84 @@ -50586,7 +50586,7 @@ 131072 16777216 8192 - 1 + 3 2 15 85 @@ -50619,7 +50619,7 @@ 131072 16777216 8192 - 1 + 3 2 15 86 @@ -50652,7 +50652,7 @@ 131072 16777216 8192 - 1 + 3 2 15 87 @@ -50685,7 +50685,7 @@ 131072 16777216 8192 - 1 + 3 2 15 88 @@ -50718,7 +50718,7 @@ 131072 16777216 8192 - 1 + 3 2 15 89 @@ -50749,7 +50749,7 @@ Large Modular Tactical Thigh Rig This rig features 4 rows of MOLLE compatible modular webbing strips that allow the user to configure a tactical thigh rig with exactly the right pouches they want. 131072 - 1 + 3 3 90 2 @@ -50802,11 +50802,11 @@ 1692 Sporting Clay Vest Sporting Clay Vest - This versatile, value-priced vest has plenty of range-perfect features. Organize loads between two double shelll pockets (four total), and secure empties in the mesh back pouch. + This versatile, value-priced vest has plenty of range-perfect features. Organize loads between two double shell pockets (four total), and secure empties in the mesh back pouch. Sporting Clay Vest - This versatile, value-priced vest has plenty of range-perfect features. Organize loads between two double shelll pockets (four total), and secure empties in the mesh back pouch + This versatile, value-priced vest has plenty of range-perfect features. Organize loads between two double shell pockets (four total), and secure empties in the mesh back pouch 131072 - 1 + 4 1 92 1 @@ -50834,7 +50834,7 @@ Condor Heavy Assault Vest When the job is going to get messy, you need the Heavy Assault Vest. The vest itself is a MOLLE system which means that shooters can configure the vest to their own specifications. 131072 - 1 + 4 1 93 2 @@ -50863,7 +50863,7 @@ FSBE LBV Load Bearing Molle Assault Vest Chinese made Special force load bearing vest with1-inch molle webbing cross straps for attaching molle pouches. 131072 - 1 + 4 3 94 2 diff --git a/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml b/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml index 2825dd121..da58f7298 100644 --- a/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml +++ b/gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml @@ -1326,7 +1326,7 @@ 0 26 22 - 30 + 14 21 0 0 @@ -1346,7 +1346,7 @@ 0 29 80 - 4071 + 4067 0 0 17 @@ -1507,11 +1507,11 @@ 26 0 0 - 32 + 0 0 0 0 - 0 + 32 0 0 0 @@ -1547,11 +1547,11 @@ 26 0 0 - 11 + 0 0 0 0 - 0 + 23 0 0 0 diff --git a/gamedir/Data/Mod_Settings.ini b/gamedir/Data/Mod_Settings.ini index b5495ff36..3a7941eb4 100644 --- a/gamedir/Data/Mod_Settings.ini +++ b/gamedir/Data/Mod_Settings.ini @@ -56,7 +56,7 @@ BOBBYR_DROPOFF_GRIDNO = 10433 BOBBYR_SHIPPING_DEST_SECTOR_X = 13 BOBBYR_SHIPPING_DEST_SECTOR_Y = 2 BOBBYR_SHIPPING_DEST_SECTOR_Z = 0 -BOBBYR_SHIPPING_DEST_GRIDNO = 10122 +BOBBYR_SHIPPING_DEST_GRIDNO = 10112 PABLOS_STOLEN_DEST_GRIDNO = 1 LOST_SHIPMENT_GRIDNO = 2