diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml index e5d5668ae..c8aae5d14 100644 --- a/gamedir/Data-1.13/TableData/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Attachments.xml @@ -13840,4 +13840,399 @@ 775 5 + + 1030 + 12 + 5 + + + 1030 + 13 + 5 + + + 1030 + 14 + 5 + + + 1030 + 17 + 5 + + + 1030 + 20 + 5 + + + 1030 + 21 + 5 + + + 1030 + 22 + 5 + + + 1030 + 23 + 5 + + + 1030 + 24 + 5 + + + 1030 + 25 + 5 + + + 1030 + 26 + 5 + + + 1030 + 27 + 5 + + + 1030 + 28 + 5 + + + 1030 + 29 + 5 + + + 1030 + 30 + 5 + + + 1030 + 68 + 5 + + + 1030 + 69 + 5 + + + 1030 + 331 + 5 + + + 1030 + 332 + 5 + + + 1030 + 346 + 5 + + + 1030 + 347 + 5 + + + 1030 + 349 + 5 + + + 1030 + 350 + 5 + + + 1030 + 602 + 5 + + + 1030 + 603 + 5 + + + 1030 + 605 + 5 + + + 1030 + 606 + 5 + + + 1030 + 607 + 5 + + + 1030 + 608 + 5 + + + 1030 + 609 + 5 + + + 1030 + 610 + 5 + + + 1030 + 611 + 5 + + + 1030 + 612 + 5 + + + 1030 + 613 + 5 + + + 1030 + 614 + 5 + + + 1030 + 615 + 5 + + + 1030 + 616 + 5 + + + 1030 + 617 + 5 + + + 1030 + 619 + 5 + + + 1030 + 624 + 5 + + + 1030 + 629 + 5 + + + 1030 + 632 + 5 + + + 1030 + 633 + 5 + + + 1030 + 646 + 5 + + + 1030 + 647 + 5 + + + 1030 + 648 + 5 + + + 1030 + 651 + 5 + + + 1030 + 652 + 5 + + + 1030 + 653 + 5 + + + 1030 + 655 + 5 + + + 1030 + 656 + 5 + + + 1030 + 659 + 5 + + + 1030 + 660 + 5 + + + 1030 + 662 + 5 + + + 1030 + 664 + 5 + + + 1030 + 665 + 5 + + + 1030 + 666 + 5 + + + 1030 + 667 + 5 + + + 1030 + 668 + 5 + + + 1030 + 683 + 5 + + + 1030 + 686 + 5 + + + 1030 + 691 + 5 + + + 1030 + 693 + 5 + + + 1030 + 704 + 5 + + + 1030 + 708 + 5 + + + 1030 + 712 + 5 + + + 1030 + 713 + 5 + + + 1030 + 742 + 5 + + + 1030 + 743 + 5 + + + 1030 + 747 + 5 + + + 1030 + 749 + 5 + + + 1030 + 750 + 5 + + + 1030 + 751 + 5 + + + 1030 + 752 + 5 + + + 1030 + 757 + 5 + + + 1030 + 760 + 5 + + + 1030 + 762 + 5 + + + 1030 + 763 + 5 + + + 1030 + 769 + 5 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/German.AmmoStrings.xml b/gamedir/Data-1.13/TableData/German.AmmoStrings.xml index 5be93681c..f015206f0 100644 --- a/gamedir/Data-1.13/TableData/German.AmmoStrings.xml +++ b/gamedir/Data-1.13/TableData/German.AmmoStrings.xml @@ -155,4 +155,16 @@ .50 Beowulf .50 Beowulf + + .300 WinMag + .300 WinMag + + + 7.92x57mm + 7.92x57mm + + + 12.7mm Subsonic + 12.7mm Sub. + diff --git a/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml b/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml index e9049e41a..760e5b699 100644 --- a/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml +++ b/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml @@ -68,6 +68,10 @@ 208 1029 + + 208 + 1030 + 209 50 @@ -524,6 +528,10 @@ 1004 1029 + + 1004 + 1030 + 1005 241 @@ -544,6 +552,10 @@ 1007 1029 + + 1007 + 1030 + 1008 1009 @@ -656,4 +668,24 @@ 1029 1007 + + 1029 + 1030 + + + 1030 + 208 + + + 1030 + 1004 + + + 1030 + 1007 + + + 1030 + 1029 + \ 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 bcafd4fa9..5f48e8b0f 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -2879,7 +2879,7 @@ 0 0 0 - 0 + 1030 0 0 0 @@ -40455,7 +40455,7 @@ 0 0 0 - 0 + 1030 0 0 0 @@ -122492,9 +122492,9 @@ 1004 Reflex Scope Reflex Scope - Reflex advanced combat gun scope with 4x magnification, integral rear ghost ring aperture yellow center illumination for close-combat sighting. + Advanced combat gun scope with 4x magnification, an additional Reflex Sight has been mounted atop the ocular for faster target acquisition. Reflex Scope - Reflex advanced combat gun scope with 4x magnification, integral rear ghost ring aperture yellow center illumination for close-combat sighting. Includes flat top adapter, backup iron sights and dust cover. + Reflex advanced combat gun scope with 4x magnification, adapter-mounted rear holosight for close-combat sighting. Includes flat top adapter, backup iron sights and dust cover. 268435456 0 0 @@ -125660,4 +125660,126 @@ 0 0 + + 1030 + Combat Optics + Combat Optics + Combat gun scope with 4x magnification. + Combat Optics + A combat gun scope with 4x magnification, including two-piece adapter-mount for ocular-mounted accessories. + 268435456 + 0 + 0 + 0 + 1 + 545 + 3 + 4 + 500 + 6 + 0 + -3 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 2 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 10 + 20 + 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 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 20 + 0 + 0 + 0 + 0 + 20 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Merges.xml b/gamedir/Data-1.13/TableData/Merges.xml index fd1bf82cd..d78f602d8 100644 --- a/gamedir/Data-1.13/TableData/Merges.xml +++ b/gamedir/Data-1.13/TableData/Merges.xml @@ -1128,6 +1128,14 @@ 1 8 + + 1006 + 1030 + 1004 + 0 + 4 + 8 + 1022 245 @@ -1152,4 +1160,12 @@ 1 8 + + 1030 + 1006 + 1004 + 0 + 4 + 8 + \ No newline at end of file