diff --git a/BackEnd.dll b/BackEnd.dll index e99d40809..189c38877 100644 Binary files a/BackEnd.dll and b/BackEnd.dll differ diff --git a/Data-1.13/TableData/AttachmentPoint.xml b/Data-1.13/TableData/AttachmentPoint.xml new file mode 100644 index 000000000..aa18c214d --- /dev/null +++ b/Data-1.13/TableData/AttachmentPoint.xml @@ -0,0 +1,7 @@ + + + + 0 + None + + \ No newline at end of file diff --git a/Data-1.13/TableData/Drugs.xml b/Data-1.13/TableData/Drugs.xml index 379d207b1..f8a339dec 100644 --- a/Data-1.13/TableData/Drugs.xml +++ b/Data-1.13/TableData/Drugs.xml @@ -58,184 +58,194 @@ More Infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Num --> - - 0 - 0 - 0 - 0 - 0 - 0 - 0 + + 0 + + 0 + 0 + 0 + 0 + 0 + 0 - 1 - 4 - 2 - 15 - 20 - 2 - 1 + 1 + + 4 + 2 + 15 + 20 + 2 + 1 - 2 - 2 - 2 - 8 - 10 - 1 - 1 + 2 + + 2 + 2 + 8 + 10 + 1 + 1 - 3 - 0 - 0 - 0 - 0 - 0 - 0 + 3 + + 0 + 0 + 0 + 0 + 0 + 0 - 4 - 13 - 1 - 25 - 20 - 1 - 0 + 4 + + 13 + 1 + 25 + 20 + 1 + 0 - 5 - 25 - 1 - 50 - 10 - 1 - 1 + 5 + + 25 + 1 + 50 + 10 + 1 + 1 - 6 - 25 - 1 - 50 - 10 - 1 - 1 + 6 + + 25 + 1 + 50 + 10 + 1 + 1 - 7 - 25 - 1 - 50 - 10 - 1 - 1 + 7 + + 25 + 1 + 50 + 10 + 1 + 1 - 8 - 25 - 1 - 50 - 10 - 1 - 1 + 8 + + 25 + 1 + 50 + 10 + 1 + 1 - 9 - 25 - 1 - 100 - 0 - 0 - 0 + 9 + + 25 + 1 + 100 + 0 + 0 + 0 - 10 - 1 - 1 - 120 - 120 - 1 - 0 + 10 + + 1 + 1 + 120 + 120 + 1 + 0 - 11 - 1 - 1 - 120 - 120 - 1 - 0 + 11 + + 1 + 1 + 120 + 120 + 1 + 0 - 12 - 1 - 1 - 120 - 120 - 1 - 0 + 12 + + 1 + 1 + 120 + 120 + 1 + 0 - 13 - 1 - 1 - 120 - 120 - 1 - 0 + 13 + + 1 + 1 + 120 + 120 + 1 + 0 - 14 - 1 - 1 - 120 - 120 - 1 - 0 - - - 15 - 1 - 1 - 120 - 120 - 1 - 0 + 14 + + 1 + 1 + 120 + 120 + 1 + 0 - 16 - 1 - 1 - 5 - 8 - 1 - 0 + 15 + + 1 + 1 + 120 + 120 + 1 + 0 - 17 - 25 - 1 - 50 - 11 - 1 - 0 + 16 + + 1 + 1 + 5 + 8 + 1 + 0 - 18 - 1 - 1 - 5 - 7 - 1 - 0 + 17 + + 25 + 1 + 50 + 11 + 1 + 0 - 18 - 1 - 1 - 5 - 7 - 1 - 0 + 18 + + 1 + 1 + 5 + 7 + 1 + 0 diff --git a/Data-1.13/TableData/Items.xml b/Data-1.13/TableData/Items.xml index 40c6f2803..cf21c4f99 100644 --- a/Data-1.13/TableData/Items.xml +++ b/Data-1.13/TableData/Items.xml @@ -8,9 +8,12 @@ Nothing JA 2 programmers are the best there are... oh.. well maybe not since this message should never come up... 128 + 0 0 0 - 0 + 0 + 0 + 0 0 2 0 @@ -109,8 +112,6 @@ 0 0 0 - 0 - 0 0 0 0 @@ -129,6 +130,7 @@ 0 0 0 + 0 0 0 0 @@ -148,7 +150,6 @@ 0 0 0 - 0 0 0 0 @@ -4184,9 +4185,9 @@ 60mm Mortar Shell A real man's mortar. This HE bomb features waterproof "horseshoe" snap-off propellant increments and the M734 multi-option fuse. This fuse can be set by hand for delayed, impact, near-surface or proximity burst detonations. 512 + 1024 1024 1 - 1024 9 1 40 @@ -4386,9 +4387,9 @@ 40mm HE Grenade This standard fragmentation grenade features a time-delayed firing device to ignite its encased TNT. Fired from the Talon grenade launcher, this round can provide great lethal coverage. 256 + 1024 1024 1 - 1024 16 1 97 @@ -4419,9 +4420,9 @@ 40mm Tear Gas Grenade This projectile's body is made of rubbery plastic to prevent impact injuries and keep it from being picked up and thrown back. The rubber melts quickly from the heat of burning. This time-delayed round for the Talon grenade launcher releases an irritant gas when ignited. 256 + 1024 1024 1 - 1024 17 1 111 @@ -4452,9 +4453,9 @@ 40mm Stun Grenade These grenade launcher projectile rounds create a massive vacuum, depriving the surrounding impact area of oxygen. Anyone standing within the detonated area will be left gasping, as waves of air rush back into its core. 256 + 1024 1024 1 - 1024 18 1 113 @@ -4485,9 +4486,9 @@ 40mm Smoke Grenade When fired from a 40mm grenade launcher, this grenade will quickly release a cloud of smoke that will aid in battlefield entry or withdrawal. 256 + 1024 1024 1 - 1024 19 1 112 @@ -6209,8 +6210,8 @@ Pistol Suppressor This is the ideal silencer for both indoor and outdoor missions that have to be kept quiet. Its light and compact design can be fitted easily to most handguns and sub-machine guns. 268435456 - 2 2 + 2 1 52 3 @@ -6246,8 +6247,8 @@ Sniper Scope, Mag.10x Dramatically improve your targeting accuracy with this extremely versatile sniper scope. You'll quickly appreciate this scope's accurate windage adjustment, range-finder precision scale, and coated optics. 268435456 - 16 16 + 16 1 171 5 @@ -6286,8 +6287,8 @@ Bipod Every sensible mercenary packs one of these universal bipods. It fits most sniper and assault rifles, as well as light machine guns. Made from a die-cast aluminum, it has a coated matte finish. Its legs fold up when not in use, for easy storage. 268435456 - 512 1 + 512 1 69 5 @@ -6658,8 +6659,8 @@ 1 1 1 - 100.0 1 + 100.0 @@ -6672,8 +6673,8 @@ Detonator Attach this baby to an explosive for real power and control. This time-delayed detonator allows you anywhere from five seconds to ten minutes to move to a location of safety before its attached explosive goes off. 268435456 - 1 65536 + 1 1 47 1 @@ -6688,7 +6689,6 @@ 1 4 1 - 1 100.0 @@ -6702,8 +6702,8 @@ Remote Detonator A must have for any serious explosives agent. Place this time-delayed firing device to any explosive to blow up a target when you want, from where you want. The detonator won't ignite until you hit the remote trigger. 268435456 - 1 1048576 + 1 1 47 1 @@ -6719,7 +6719,6 @@ 1 3 1 - 1 100.0 @@ -6952,8 +6951,8 @@ 1 1 1 - 100.0 4 + 100.0 @@ -7071,8 +7070,8 @@ Laser Sight You won't lose sight of your target when using one of these. The Universal Daylight Laser projects a highly visible red spot upt to 100ft during the day and over 1,000ft at night. In a stainless steel housing, it fits onto the trigger guard of most weapons. 268435456 - 4 4 + 4 1 51 1 @@ -7209,7 +7208,7 @@ 1 1 2 - 100.0 + 100.0 @@ -8886,8 +8885,8 @@ Gun Barrel Extender Not for sale through BR. 268435456 - 2 262144 + 2 1 134 5 @@ -16335,8 +16334,8 @@ Sniper Suppressor A very large sound suppressor that can be fitted to some sniper rifles. Suppression of highpowered rounds comes at the price of high weight, though. 268435456 - 2 2 + 2 1 710 8 @@ -28565,9 +28564,9 @@ 60mm Illumination Shell The M721 60mm mortar shell provides illumination on a scale not possible by other means at the achieved range. 512 + 1024 1024 1 - 1024 30 1 749 @@ -28599,9 +28598,9 @@ 60mm Smoke Shell The M722 smoke round for 60mm mortars produces a dense smokescreen wherever you need it on a battlefield. Great for covering your advance! Be careful of the smoke, though, it is based on WP, and thus may be harmful to unprotected personnel. 512 + 1024 1024 1 - 1024 31 1 748 @@ -28700,8 +28699,8 @@ ISM-V-IR If you do not want your gun overcrowded with attachments, here is a combination of a red-dot sight with an IR-laser sight. Precludes mounting of scopes, though. 268435456 - 8 12 + 8 1 694 3 @@ -28748,8 +28747,8 @@ Grippod Your bipod is getting in the way so you can't mount a foregrip? Here's the solution! The Grippod drops two legs out of its bottom at the push of a button. 268435456 - 512 4097 + 512 1 693 2 @@ -28789,8 +28788,8 @@ Aimpoint Projector Hard to find these days, the eye safety warning on this Aim Point Projector is indicative of its useful range. Fits older HK rifles. 268435456 - 8 12 + 8 1 564 10 @@ -28831,8 +28830,8 @@ Rifle LAM This Laser Aiming Module is meant to fit on modern rifle rail interface systems. Though larger and heavier, it has a longer useful range than (Pistol) Trigger Guard mounted types. 268435456 - 4 4 + 4 1 565 3 @@ -28870,8 +28869,8 @@ Rifle LAM-Flashlight This Laser Aiming Module and tactical flashlight combination is meant to fit on modern rifle rail interface systems. 268435456 - 4 4 + 4 341 4 2 @@ -28910,9 +28909,9 @@ 60mm Mustard Gas Shell This Mustard Gas mortar shell features waterproof "horseshoe" snap-off propellant increments and the M734 multi-option fuse. WARNING: this item may release a noxious odour upon detonation. 512 + 1024 1024 1 - 1024 32 1 160 @@ -28943,9 +28942,9 @@ 20mm HE Clip A six-shot magazine of 20mm high explosive fragmentation grenades. Fun for the whole family! 256 + 1024 1024 1 - 1024 33 1 301 @@ -28973,9 +28972,9 @@ 20mm Mustard Gas Clip Take a lesson from the Central Powers in WWI and don't fire these shells into prevailing tradewinds. 256 + 1024 1024 1 - 1024 34 1 302 @@ -29003,9 +29002,9 @@ 20mm Smoke Clip Mask your advance or cover your withdrawal with these smoke grenades. 256 + 1024 1024 1 - 1024 35 1 303 @@ -29033,9 +29032,9 @@ 20mm Stun Clip These grenades siphon the air out of their blast radius, leaving enemies helpless on the ground. 256 + 1024 1024 1 - 1024 36 1 304 @@ -29063,9 +29062,9 @@ 20mm Tear Gas Clip Before deploying these grenades indoors or in a confined space, remember: gas takes the shape of its container. 256 + 1024 1024 1 - 1024 37 1 305 @@ -29093,9 +29092,9 @@ 20mm Thermobaric Clip These shells will destroy enemy personnel and material with super-heated blast wave. 256 + 1024 1024 1 - 1024 38 1 306 @@ -29123,9 +29122,9 @@ 25mm HE Clip These 25mm HE grenades arm in mid-air to prevent harm to the user. 256 + 1024 1024 1 - 1024 39 1 295 @@ -29153,9 +29152,9 @@ 25mm Mustard Gas Clip These grenades are filled with an invariably fatal blistering agent. 256 + 1024 1024 1 - 1024 40 1 296 @@ -29183,9 +29182,9 @@ 25mm Smoke Clip Screen your troop movement or indicate potential LZ's for the medivac with these smoke grenades. 256 + 1024 1024 1 - 1024 41 1 297 @@ -29213,9 +29212,9 @@ 25mm Stun Clip Leave them breathless, literally, with a 25mm stun grenade. 256 + 1024 1024 1 - 1024 42 1 298 @@ -29243,9 +29242,9 @@ 25mm Tear Gas Clip Nothing stops a riot or stifles enemy fire like a chemical irritant. Buy it by the clip-full in 25mm. 256 + 1024 1024 1 - 1024 43 1 299 @@ -29273,9 +29272,9 @@ 25mm Thermobaric Clip Turn the air in the surrounding atmospheric air into a lethal firestorm with themobaric ordinance. 256 + 1024 1024 1 - 1024 44 1 300 @@ -29303,9 +29302,9 @@ 40mm HE Cylinder This is a six-shot grenade cylinder filled with fragmentation grenades. Each grenade features a time-delayed firing device to ignite its encased TNT. Fired from the MGL Mk.1 grenade launcher, this round can provide great lethal coverage. 256 + 1024 1024 1 - 1024 45 1 315 @@ -29334,9 +29333,9 @@ 40mm Mustard Gas Cylinder Disclaimer: This product is classed as a chemical weapon and is banned by the Geneva convention. Sold for pest control purposes only! 256 + 1024 1024 1 - 1024 46 1 316 @@ -29365,9 +29364,9 @@ 40mm Mustard Gas Grenade Disclaimer: This product is classed as a chemical weapon and is banned by the Geneva convention. Sold for pest control purposes only! 256 + 1024 1024 1 - 1024 47 1 313 @@ -29399,9 +29398,9 @@ 40mm Smoke Grenade Cylinder When fired from a MGL Mk.1, the grenades in this six-shot cylinder will quickly release a cloud of smoke that will aid in battlefield entry or withdrawal. 256 + 1024 1024 1 - 1024 48 1 317 @@ -29430,9 +29429,9 @@ 40mm Stun Grenade Cylinder This six-shot MGL Mk.1 grenade cylinder contains projectile rounds that will create a massive vacuum, depriving the surrounding impact area of oxygen. Anyone standing within the detonated area will be left gasping, as waves of air rush back into its core. 256 + 1024 1024 1 - 1024 49 1 318 @@ -29461,9 +29460,9 @@ 40mm Tear Gas Cylinder This Tear Gas cylinder contains nasty substance that certainly is not odorless. In fact, after walking through a cloud of this stuff you will smell like you just chopped a million raw onions. No, forget that, it's worse. 256 + 1024 1024 1 - 1024 50 1 319 @@ -29492,9 +29491,9 @@ 40mm Thermobaric Grenade Thermobaric grenades provide a better kill probability than standard HE grenades. An overpressure blast uses atmospheric oxygen once the volatile liquid inside the grenade spreads and ignites. 256 + 1024 1024 1 - 1024 51 1 314 @@ -29527,9 +29526,9 @@ 43mm HE Grenades, 4 High Explosive grenades for the GM-94. Sold only in packs of four since we here at Bobby Ray's want to make sure that you won't go into battle with a half-empty weapon. 256 + 1024 1024 1 - 1024 52 1 358 @@ -29556,9 +29555,9 @@ 43mm Mustard Gas Grenades, 4 This product is classed as a chemical weapon and is banned by the Geneva convention. Sold for pest control purposes only! 256 + 1024 1024 1 - 1024 53 1 355 @@ -29585,9 +29584,9 @@ 43mm Smoke Grenades, 4 Smoke rounds for the GM-94. Sold only in packs of four since we here at Bobby Ray's want to make sure that you won't go into battle with a half-empty weapon. 256 + 1024 1024 1 - 1024 54 1 359 @@ -29614,9 +29613,9 @@ 43mm Stun Grenades, 4 Crowd of rioters or room full of hyperactive children (we kid, of course), a stun grenade will take the wind and the fight right out of them. 256 + 1024 1024 1 - 1024 55 1 360 @@ -29643,9 +29642,9 @@ 43mm Tear Gas Grenades, 4 Drop 4 CS gas grenades on your target and reduce them to blubbering wrecks. 256 + 1024 1024 1 - 1024 56 1 356 @@ -29672,9 +29671,9 @@ OG-7V Fragmentation Rocket A rocket propelled grenade is perfect for those times when you need to make a big entrance. 256 + 2048 2048 1 - 2048 57 1 150 @@ -29705,9 +29704,9 @@ PG-7VM HEAT Rocket Works exactly like a can opener, but on tanks. Oh, and it's a bit louder. 256 + 2048 2048 1 - 2048 58 1 224 @@ -29738,9 +29737,9 @@ TBG-7V Thermobaric Rocket Guaranteed to blow your enemies away. 256 + 2048 2048 1 - 2048 59 1 225 @@ -29795,9 +29794,9 @@ VOG-25 40mm Grenade 40mm HE shell for Russian grenade launchers. 256 + 1024 1024 1 - 1024 61 1 291 @@ -29829,9 +29828,9 @@ VOG-25P 40mm Jumping Grenade 40mm jumping grenade - a few hundred bucks. Grenade launcher - a few thousand. Seeing your enemies' expression once they see this little bugger merrily hopping towards them - priceless. 256 + 1024 1024 1 - 1024 62 1 292 @@ -29863,9 +29862,9 @@ 40mm Thermobaric Cylinder This cylinder of 40mm fuel-air grenades transforms the user into a walking, talking WMD. 256 + 1024 1024 1 - 1024 63 1 320 @@ -29895,9 +29894,9 @@ 40mm Metal Storm HE Take the load off the team grenadier with Metal Storm's 40mm multi shot grenade system. Three rounds of High Explosive (HE) death configured for the AICW's hi-tech integrated launcher. 256 + 1024 1024 1 - 1024 64 1 307 @@ -29926,9 +29925,9 @@ 40mm Metal Storm Tear Gas Take the load off the team grenadier with Metal Storm's 40mm multi shot grenade system. Three rounds of tear gas should be enough to quickly pacify any threat 256 + 1024 1024 1 - 1024 65 1 311 @@ -29957,9 +29956,9 @@ 40mm Metal Storm Smoke Quickly lay down a long wall of blinding smoke with a three round stack of 40mm Metal Storm enabled 40mm smoke grenades. 256 + 1024 1024 1 - 1024 66 1 309 @@ -29988,9 +29987,9 @@ 40mm Metal Storm Mustard Gas These things shouldn't exist, but here we have a three round stack of 40mm grenades containing what appears to be Mustard Gas. Where in the world did these things come from, we won't tell. 256 + 1024 1024 1 - 1024 67 1 308 @@ -30019,9 +30018,9 @@ 40mm Metal Storm Thermobaric Overpressure and heat, instead of shrapnel, is the prime killing effect of Thermobaric explosives. This new way to clear a large space, is packaged in the new Metal Storm 40mm multi-shot grenade stack for the AICW. 256 + 1024 1024 1 - 1024 68 1 312 @@ -30050,9 +30049,9 @@ 40mm Metal Storm Stun Knock the wind out of any line of infantry with this compact 3 round stack of stun grenades made possible by Metal Storm's patented electronic firing system. Caution: these are only stun weapons, they only buy time. 256 + 1024 1024 1 - 1024 69 1 310 @@ -30081,9 +30080,9 @@ 20mm Napalm Clip These shells will destroy enemy personnel and material with super-heated napalm. 256 + 1024 1024 1 - 1024 70 1 306 @@ -30109,9 +30108,9 @@ 25mm Napalm Clip Turn the surrounding area into a lethal firestorm with napalm ordinance. Six rounds of superheated fun. 256 + 1024 1024 1 - 1024 71 1 300 @@ -30137,9 +30136,9 @@ 40mm Napalm Grenade Nothing's beats super-heated napalm for burning off some calories. 256 + 1024 1024 1 - 1024 72 1 314 @@ -30168,9 +30167,9 @@ 40mm Napalm Cylinder This cylinder of 40mm napalm grenades transforms the user into a walking, talking WMD. 256 + 1024 1024 1 - 1024 73 1 320 @@ -30197,9 +30196,9 @@ 40mm Metal Storm Napalm This super hot way to clear a large space is packaged in the new Metal Storm 40mm multi-shot grenade stack for the AICW. 256 + 1024 1024 1 - 1024 74 1 312 @@ -30258,9 +30257,9 @@ 40mm Illumination Grenade The M583A1 illumination grenade.provides battlefield illumination from most 40mm grenade launchers. Longer range and more candlepower than a breaklight! 256 + 1024 1024 1 - 1024 76 1 747 @@ -30310,8 +30309,8 @@ 7.62x39mm Drum Adapter This piece of metal lets you fit a 75rnd drum onto several AK-rifles. Permanent installing required. 268435456 - 64 64 + 64 300 1 4 @@ -30347,8 +30346,8 @@ Kobra Kobra is the answer to the needs of Russian special forces operatives who need a gunsight for fast target acquisition. Fits most AK rifles instead of a scope. 268435456 - 65536 8 + 65536 1 556 4 @@ -30382,8 +30381,8 @@ PSO-1 Scope The Russian PSO-1 fits only on rifles with an AK-style receiver, due to the unique side-mount. It has a 4x magnification. 268435456 - 16 16 + 16 1 554 6 @@ -30423,8 +30422,8 @@ PSO-3 Scope If you have an older style Russian rifle and need a highpower scope, than this is your best choice. Magnification is 8x. 268435456 - 16 16 + 16 1 555 10 @@ -30465,8 +30464,8 @@ 5.56mm C-Mag Adapter This special adapter can be attached to certain 5.56mm weapons to allow for the use of the 100-rd Beta C-Mags. 268435456 - 64 64 + 64 1 161 1 @@ -30504,8 +30503,8 @@ 9mm C-Mag Adapter This special adapter can be attached to certain 9mm weapons to allow for the use of the 100-rd Beta C-Mags. 268435456 - 64 64 + 64 1 162 1 @@ -30543,8 +30542,8 @@ Flash Suppressor Standard equipment for keeping those pesky muzzle flashes from giving away your position. 268435456 - 2 2 + 2 1 149 2 @@ -30574,8 +30573,8 @@ ACOG-Combo, Mag.4x Trijicon Advanced Combat Gunscope with 4x magnification, adapter-mounted rear holosight for close-combat sighting. Includes flat top adapter, backup iron sights and dust cover. 268435456 - 16 24 + 16 1 155 5 @@ -30618,8 +30617,8 @@ Insight LAM-200 The LAM-200 is a combination of Laser, IR-Laser, visible Combat-Light and IR-Combat-Light. Essential for night operations specialists. 268435456 - 4 4 + 4 1 179 2 @@ -30660,8 +30659,8 @@ Reflex Sight This reflex dual-illuminated advanced combat gun sight is the new standard for instant any-light shooting accuracy. It gives you maximum accuracy and true-to-life targeting, instantly. 268435456 - 8 8 + 8 1 156 4 @@ -30694,8 +30693,8 @@ Battle Scope, Mag.7x Dramatically improve your targeting accuracy with this extremely versatile battle scope. Attachable to most rifles, you'll quickly appreciate this scope's accurate windage adjustment, a range-finder precision scale, and coated optics. 268435456 - 16 16 + 16 1 76 4 @@ -30734,8 +30733,8 @@ Folding Stock Get your weapon up before the other guy when you attach this new stock. Usable with most fixed-stock firearms. 268435456 - 32 32 + 32 1 234 3 @@ -30772,8 +30771,8 @@ Retractable Stock Get your weapon up before the other guy when you attach this new stock. Usable with most fixed-stock firearms. 268435456 - 32 32 + 32 1 235 2 @@ -30810,8 +30809,8 @@ Universal Foregrip Not for sale through BR. 268435456 - 512 4096 + 512 1 229 2 @@ -30839,8 +30838,8 @@ Foregrip A special hand grip that can be attached to most SMGs and rifles to enhance burst and selective fire accuracy. 268435456 - 512 4096 + 512 1 228 1 @@ -30879,8 +30878,8 @@ AR Suppressor A large sound suppressor that can be fitted to most carbines and assault rifles. Caution: This item is not 100 percent effective on its own. Use it in conjunction with cold-loaded or subsonic ammunition to achieve a greatly reduced muzzle volume. 268435456 - 2 2 + 2 1 180 6 @@ -31254,8 +31253,8 @@ Trigger Group For the unhappy trigger-happy folks out there, we are proud to present the ACME Trigger Group! Marksmanship skill too low? Tired of firing too many bullets in autofire? Simply attach the ACME Trigger Group to your favourite assault rifle and enjoy simple and effective 3-round burst fire. 268435456 - 256 256 + 256 160 4 21 @@ -31346,8 +31345,8 @@ Small Scope, Mag.2x A small scope for mounting onto shortranged guns like revolvers or shotguns. Optional mounts for a few autoloaders available. Usable as a replacement for damaged assault rifle optics. 268435456 - 16 16 + 16 1 525 2 @@ -31384,8 +31383,8 @@ ACOG, Mag.4x A combat gun scope with 4x magnification, including two-piece adapter-mount for eyepiece-mounted accessories. 268435456 - 16 16 + 16 1 545 4 @@ -36317,8 +36316,8 @@ ZF-42 Scope This vintage scope will fit the German Mauser WW-II rifles. 268435456 - 16 16 + 16 1 721 3 @@ -36355,8 +36354,8 @@ No.32 Scope A WW-II era scope of British manufacture, this was also used by other allied forces during that war. 268435456 - 16 16 + 16 1 722 11 @@ -36393,8 +36392,8 @@ PEM Scope Simply THE scope to mount onto the Mosin-Nagant rifle. 268435456 - 16 16 + 16 1 723 3 @@ -36431,8 +36430,8 @@ Match Sights Fully adjustable iron sights to go with a Colt 1911, Glock, HK USP, or SIG pistol. 268435456 - 8 8 + 8 1 724 4 @@ -36491,8 +36490,8 @@ G36 Rail-Kit Change your G36/G36K/MG36 to a more versatile gun with this set of Picatinny Rails. 268435456 - 256 256 + 256 335 8 24 @@ -36520,8 +36519,8 @@ G36 Grip/Optics The G36 standard equipment: Handguard and Carry Grip with mounted dual optics. 268435456 - 256 256 + 256 336 8 24 @@ -36892,8 +36891,8 @@ Ghillie Hood The finishing touch for your ghillie suit. Also usefull to keep the sun out of your eyes and as mosquito net. 268435456 - 1 8192 + 1 2 72 5 @@ -36927,8 +36926,8 @@ Ghillie Leggings Unless you plan to wear jeans under your Ghillie suit, these pants are a must have if you are going for a covert approach. 268435456 - 1 32768 + 1 2 74 16 @@ -36958,8 +36957,8 @@ Ghillie Jacket Whether you are spying on that cute looking girl next door, or sneaking up to that perfect spot overlooking an enemy base, this vest will make sure nobody sees you. 268435456 - 1 16384 + 1 2 73 27 @@ -41325,9 +41324,9 @@ 43mm Illumination Grenades, 4 43mm Illumination Grenades for the GM-94 grenade launcher. 256 + 1024 1024 1 - 1024 78 1 357 @@ -41357,9 +41356,9 @@ 43mm HE Grenade High Explosive grenade for the GM-94. 256 + 1024 1024 1 - 1024 79 1 776 @@ -41386,9 +41385,9 @@ 43mm Mustard Gas Grenades This product is classed as a chemical weapon and is banned by the Geneva convention. Sold for pest control purposes only! 256 + 1024 1024 1 - 1024 80 1 773 @@ -41415,9 +41414,9 @@ 43mm Smoke Grenade Smoke round for the GM-94. 256 + 1024 1024 1 - 1024 81 1 777 @@ -41446,9 +41445,9 @@ 43mm Stun Grenade Crowd of rioters or room full of hyperactive children (we kid, of course), a stun grenade will take the wind and the fight right out of them. 256 + 1024 1024 1 - 1024 82 1 778 @@ -41477,9 +41476,9 @@ 43mm Tear Gas Grenade Drop a CS gas grenade on your target and reduce them to blubbering wrecks. 256 + 1024 1024 1 - 1024 83 1 774 @@ -41506,9 +41505,9 @@ 43mm Illumination Grenade 43mm Illumination Grenade for the GM-94 grenade launcher. 256 + 1024 1024 1 - 1024 84 1 775 @@ -45317,9 +45316,9 @@ Rifle Sling Don't waste time putting your rifle back into your inventory. With this you can just drop your rifle and grab your trusted sidearm. 268435456 + 524288 128 1 - 524288 2 35 2 @@ -45345,8 +45344,8 @@ Remote Defuse Put this device on your bombs. You can safely disarm a planted bomb via remote control, provided you know the correct frequency. 268435456 - 1 2097152 + 1 1 47 1 @@ -45359,6 +45358,7 @@ 1 1 1 + 1 1 3 1 @@ -45375,8 +45375,8 @@ Remote Combo Blow up an entire city, or be the hero and turn a off doomsday device? With this equipment, the choice is yours. 268435456 - 1 3145728 + 1 1 47 1 @@ -45389,6 +45389,7 @@ 1 1 1 + 1 1 3 1 @@ -45609,7 +45610,7 @@ 1535 Barrage Barrage Drug - This combat drug increases physical strength to impressive levels for a short time. Sideeffects include greatly increased aggresiveness and the risk of heart attack. + This combat drug increases physical strength to impressive levels for a short time. Side effects include greatly increased aggresiveness and the risk of heart attack. Barrage Drug Not for sale through BR. 268435456 @@ -45620,13 +45621,15 @@ 8 16 160 - 4 + 5 1 1 + 1 + 1 1 1 - 100.0 66064 + 100.0 @@ -45646,13 +45649,15 @@ 8 16 130 - 4 + 5 1 1 + 1 + 1 1 1 - 100.0 1280 + 100.0 @@ -45672,13 +45677,15 @@ 8 16 110 - 4 + 6 1 1 + 1 + 1 1 1 - 100.0 425984 + 100.0 @@ -45698,13 +45705,15 @@ 8 16 220 - 4 + 5 1 1 + 1 + 1 1 1 - 100.0 30824 + 100.0 diff --git a/Data-1.13/TableData/MercStartingGear.xml b/Data-1.13/TableData/MercStartingGear.xml index 084a69945..a37a6cae9 100644 --- a/Data-1.13/TableData/MercStartingGear.xml +++ b/Data-1.13/TableData/MercStartingGear.xml @@ -2666,8 +2666,8 @@ 1092 - Druggist 50 + Pharmacist -1 176 97 diff --git a/Data-1.13/TableData/NPCInventory/HowardInventory.xml b/Data-1.13/TableData/NPCInventory/HowardInventory.xml index 9bb97c8e3..1e4b8903f 100644 --- a/Data-1.13/TableData/NPCInventory/HowardInventory.xml +++ b/Data-1.13/TableData/NPCInventory/HowardInventory.xml @@ -70,7 +70,7 @@ 1537 4 - + 14 1538 4 diff --git a/Data/TableData/AttachmentPoint.xml b/Data/TableData/AttachmentPoint.xml new file mode 100644 index 000000000..aa18c214d --- /dev/null +++ b/Data/TableData/AttachmentPoint.xml @@ -0,0 +1,7 @@ + + + + 0 + None + + \ No newline at end of file diff --git a/Data/TableData/Drugs.xml b/Data/TableData/Drugs.xml index 54f976435..7a6c53159 100644 --- a/Data/TableData/Drugs.xml +++ b/Data/TableData/Drugs.xml @@ -1,61 +1,193 @@ - - - + + + + 0 + + 0 + 0 + 0 + 0 + 0 + 0 + + + 1 + + 4 + 2 + 15 + 20 + 2 + 1 + + + 2 + + 2 + 2 + 8 + 10 + 1 + 1 + + + 3 + + 0 + 0 + 0 + 0 + 0 + 0 + + + 4 + + 13 + 1 + 25 + 20 + 1 + 0 + + + 5 + + 25 + 1 + 50 + 10 + 1 + 1 + + + 6 + + 25 + 1 + 50 + 10 + 1 + 1 + + + 7 + + 25 + 1 + 50 + 10 + 1 + 1 + + + 8 + + 25 + 1 + 50 + 10 + 1 + 1 + + + 9 + + 25 + 1 + 100 + 0 + 0 + 0 + + + 10 + + 1 + 1 + 120 + 120 + 1 + 0 + + + 11 + + 1 + 1 + 120 + 120 + 1 + 0 + + + 12 + + 1 + 1 + 120 + 120 + 1 + 0 + + + 13 + + 1 + 1 + 120 + 120 + 1 + 0 + + + 14 + + 1 + 1 + 120 + 120 + 1 + 0 + + + 15 + + 1 + 1 + 120 + 120 + 1 + 0 + + + 16 + + 1 + 1 + 5 + 8 + 1 + 0 + + + 17 + + 25 + 1 + 50 + 11 + 1 + 0 + + + 18 + + 1 + 1 + 5 + 7 + 1 + 0 + + \ No newline at end of file diff --git a/Data/TableData/Items.xml b/Data/TableData/Items.xml index 502db666c..2481d04a8 100644 --- a/Data/TableData/Items.xml +++ b/Data/TableData/Items.xml @@ -8,9 +8,12 @@ Nothing JA 2 programmers are the best there are... oh.. well maybe not since this message should never come up... 128 + 0 0 0 - 0 + 0 + 0 + 0 0 2 0 @@ -109,8 +112,7 @@ 0 0 0 - 0 - 0 + 0 0 0 0 @@ -128,6 +130,7 @@ 0 0 0 + 0 0 0 0 @@ -6627,6 +6630,7 @@ 1 1 1 + 1 1 100 @@ -6656,7 +6660,6 @@ 1 4 1 - 1 100 @@ -6686,7 +6689,6 @@ 1 3 1 - 1 100 @@ -6919,6 +6921,7 @@ 1 1 1 + 4 1 100 diff --git a/XML Editor.exe b/XML Editor.exe index 947b9ffef..847372a13 100644 Binary files a/XML Editor.exe and b/XML Editor.exe differ