From 936aaab42dba3b6aedc904e35d6f40b1345fe7e2 Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 31 Mar 2015 20:45:14 +0000 Subject: [PATCH] Added 12 gauge rubber slugs to demonstrate the use of and git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2231 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/BigItems/p1item896.sti | Bin 0 -> 2342 bytes gamedir/Data-1.13/BigItems/p1item897.sti | Bin 0 -> 3650 bytes gamedir/Data-1.13/BigItems/p1item898.sti | Bin 0 -> 4026 bytes gamedir/Data-1.13/BigItems/p1item899.sti | Bin 0 -> 4643 bytes gamedir/Data-1.13/BigItems/p1item900.sti | Bin 0 -> 2342 bytes .../Data-1.13/TableData/Items/AmmoTypes.xml | 39 ++++ gamedir/Data-1.13/TableData/Items/Items.xml | 203 ++++++++++++++++++ .../Data-1.13/TableData/Items/Magazines.xml | 49 +++++ 8 files changed, 291 insertions(+) create mode 100644 gamedir/Data-1.13/BigItems/p1item896.sti create mode 100644 gamedir/Data-1.13/BigItems/p1item897.sti create mode 100644 gamedir/Data-1.13/BigItems/p1item898.sti create mode 100644 gamedir/Data-1.13/BigItems/p1item899.sti create mode 100644 gamedir/Data-1.13/BigItems/p1item900.sti diff --git a/gamedir/Data-1.13/BigItems/p1item896.sti b/gamedir/Data-1.13/BigItems/p1item896.sti new file mode 100644 index 0000000000000000000000000000000000000000..aa57fd9bf3faa8b4651674f63b1c56a9ee5e4c62 GIT binary patch literal 2342 zcmeH{ZBJZ96vr{#Nof^GZDYB@&6^vitq_`|agI7=+0%nQBPQP0c0ilBvd2OLI$5 z8U~4E=Fl4ppZqkFUs+sOot^sOyKnwDcI3lz^S{iW`ElT_^P?k|rt&NK_m;o<^3R1& zfBo#@&)2^AeRg_zY4OJSb2s1YJ$v-Xbnmg*{=T`(m(~|QU%R@rzI5fr^4IHOA_#(H zZ|{76|3}Am2cO2j?N66$Ypvi4xES+K{D9Vl59w24)-O>gP<}@cc_7( zxNj(K?^2nbOgtXvCUbE%?mn#AO*-ASN4=U(H3!`X+t*jWFWk%(RtLIGI&-M|`n60@ z?uCJOCEJoYs6Orq!^)sgD1>2HOc360=i~pk|5^tAK0DjJR`0TRmTO}Mxz=XVJ5v@J zV=yMMPm?s={C;(s*bkn)LF4&{AjtYesA4sQd;Yr6jA^ z5{f=O<>fcJ1;((Bi^Yx zBYa;NtTAD+#+Zc^D0O&|Ng@mgqXY{`)r7#%EeN2Az1%j#p+*bI;Yz`wg(gn9L9wj; zheFH{4TS=nMy-KG&`pukglyGA6o)1TTSzT8%5743co9Y;-NS^zqi=+Q38vwbbMpMDLV&qgaNl_97@1kgp7o&t?r%QptL%AV?C@ipH+2Y19ImgFZQhbg# zkbr5i2~30(5dK_geMQg?oI7_8XUw&uB^08yLLZ}b3D=J`g?H~G>qL@QD6M#Gqy=HN^S}$8cI+Nx2n}wjqDUz^1B1#c#)?oI zAY5d00$_zH`p0l};lRjoLb}M^$<1_8VW2I@8zyx3Ob}ppBlL+)ZbfrYCDyso*#4lL ZykQ8VtQ{()J8{CBPLK+!>if9U{{j=!w>|&> literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/BigItems/p1item897.sti b/gamedir/Data-1.13/BigItems/p1item897.sti new file mode 100644 index 0000000000000000000000000000000000000000..d748a60ef094b6ff6d38778369bec5bbe606f26c GIT binary patch literal 3650 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 QGT(wvD~DTS`6CAZ1BP1CV*mgE literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/BigItems/p1item899.sti b/gamedir/Data-1.13/BigItems/p1item899.sti new file mode 100644 index 0000000000000000000000000000000000000000..6ada83f68625bc17c3a6e1d61c09c60992e8b49e GIT binary patch literal 4643 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 ZykQ8VtQ{()J8{CBPLK+!>if9U{{j=!w>|&> literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml index f81ed687a..f36ef6122 100644 --- a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml +++ b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml @@ -1248,4 +1248,43 @@ 1.0 1.0 + + 32 + Rubber + 155 + 4 + 1 + 3 + 5 + 1 + 5 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 0 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + -0.2 + 0 + 0.15 + 0 + 0.3 + 1.3 + \ 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 89846a669..c706c3b60 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -51404,4 +51404,207 @@ + + 1728 + 12g Shells 2 RS + 12 Gauge Shells, 2 Rubber Slug + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 12g Shells 2 Rubber + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 1024 + 1 + 604 + 1 + 896 + 2 + 8 + 10 + 30 + 2 + 1 + 1 + 1 + 30 + -40 + -10 + -10 + 100.0 + + + + + + 1729 + 12g Shells 4 RS + 12 Gauge Shells, 4 Rubber Slug + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 12g Shells 4 Rubber + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 1024 + 1 + 605 + 1 + 897 + 3 + 8 + 11 + 60 + 2 + 1 + 1 + 1 + 30 + -40 + -10 + -10 + 100.0 + + + + + + 1730 + 12g Shells 7 RS + 12 Gauge Shells, 7 Rubber Slug + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 12g Shells 7 Rubber + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 1024 + 1 + 606 + 1 + 898 + 6 + 6 + 15 + 105 + 2 + 1 + 1 + 1 + 30 + -40 + -10 + -10 + 100.0 + + + + + + 1731 + 12g Shells 12 RS + 12 Gauge Shells, 12 Rubber Slug + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 12g Shells 12 Rubber + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 1024 + 1 + 607 + 1 + 899 + 10 + 6 + 19 + 180 + 2 + 1 + 1 + 1 + 30 + -40 + -10 + -10 + 100.0 + + + + + + 1732 + 12g Drum 20 RS + 12 Gauge Drum, 20 Rubber Slug + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 12g Shells 20 Rubber + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 1024 + 1 + 608 + 1 + 900 + 16 + 4 + 22 + 300 + 2 + 1 + 1 + 1 + 30 + -40 + -10 + -10 + 100.0 + + + + + + 1733 + 12g Crate RS + 12 Gauge Ammo Crate, Rubber Slug + A really big box of ammunition. I don't think this will fit in your backpack... + 12g Crate Rubber + We are now providing several types of ammunition in bulk. Please note the prices and weights of ammunition crates before purchasing. + 1024 + 1 + 609 + 1 + 730 + 800 + 34 + 15000 + 2 + 1 + 1 + 1 + 1 + 30 + -40 + -10 + -10 + 100 + + + + + + 1734 + 12g Box RS + 12 Gauge Box, Rubber Slug + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 12g Box Rubber + Rubber slugs are often used by riot police. They are labelled non-lethal, but killing someone with this is still possible. + 1024 + 610 + 2 + 93 + 20 + 1 + 24 + 125 + 2 + 1 + 1 + 1 + 6 + 30 + -40 + -10 + -10 + 100 + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items/Magazines.xml b/gamedir/Data-1.13/TableData/Items/Magazines.xml index e31e6e5b1..aee788f0a 100644 --- a/gamedir/Data-1.13/TableData/Items/Magazines.xml +++ b/gamedir/Data-1.13/TableData/Items/Magazines.xml @@ -4228,4 +4228,53 @@ 30 0 + + 604 + 5 + 2 + 32 + 1 + + + 605 + 5 + 4 + 32 + 1 + + + 606 + 5 + 7 + 32 + 1 + + + 607 + 5 + 12 + 32 + 1 + + + 608 + 5 + 20 + 32 + 1 + + + 609 + 5 + 1000 + 32 + 3 + + + 610 + 5 + 25 + 32 + 2 + \ No newline at end of file