From dabb04f32483f7e5252df5942d3ac416931f06a1 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 20 Apr 2012 10:44:46 +0000 Subject: [PATCH] - Tripwire / Claymore / Makeshift Mines update (by Flugente) o Items.xml: the tag 1 in Items.xml allows an explosive to be directional. Frags caused by its explosion will fly in the direction determined by the merc planting them. o Items.xml: the tags and are not used anymore, as those properties can be set via flags in . For now, they still remain in the xmls though. o Explosives.xml: the tags and in Explosives.xml determine the arc in which the frags will fly o see 1st post: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303556&#Post303556 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1409 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/BigItems/p2item97.sti | Bin 0 -> 3657 bytes gamedir/Data-1.13/TableData/Attachments.xml | 54 +++- gamedir/Data-1.13/TableData/Explosives.xml | 14 +- .../TableData/IncompatibleAttachments.xml | 34 +- .../TableData/Item_Transformations.xml | 119 +++++++ gamedir/Data-1.13/TableData/Items.xml | 297 +++++++++++++++++- gamedir/Data-1.13/TableData/Merges.xml | 56 ++++ .../TableData/NPCInventory/DevinInventory.xml | 12 +- 8 files changed, 563 insertions(+), 23 deletions(-) create mode 100644 gamedir/Data-1.13/BigItems/p2item97.sti diff --git a/gamedir/Data-1.13/BigItems/p2item97.sti b/gamedir/Data-1.13/BigItems/p2item97.sti new file mode 100644 index 0000000000000000000000000000000000000000..146f3ce9e0c111fff137839a22bd6ba6933f1757 GIT binary patch literal 3657 zcmYk8VN4rWw#Qu;7Y70v6YyZ@^_bX>8#)u3NgT%{<0*mh*i$F<#7>+}z>LM zy{f}q-4!(XILyOfD7truG$8Cq|k9^ql%>;kxv*VnwuanvD7aC4_4_uU*&vH#eUmv!#?E9Ai zr?1O$;iCOC)7sKn|M?fkkrg}5v|at0y*VvTOhyjb%~R8tuk`sY_tt+ZHv0q3(Mt$f zYp=we$LPi{|CJp5#_c|d-Q_g;OgcL|n~oeg z5Dr_fUL{9Hj(_`YC(ByR=Gwb=g6VY6Z|;72@L;{?WL-4UbmlY`?`?@)Yz}>5_MS3* z;Hry=?+^Xru;=8#&?l{zV{Ked>rtwqueUvR>4Q77+^@gwQU=dVO`gx*@4fR~Z0Yx3 z|MoY%eNyuY8tap+moK7#pO~Hs-kJGyb~@35zxcx+mc?1!%)YIS zjpfa)jqQ!!*8K6MX6x(g%hzijzFA8MW#^lf91N;mv+*Nh_WAb9jm^7Fo6p!1lI79} znO&HlS4S{v<|`O=yDrTll5_nvlidd39WygqsmN?eMhF!Yfeh*~uD-Z5qq|){xUZ44 zR$=5!CbhM_{@nppQ51#|WPx`gW(1#j&rmf|SQT&UZW|C*Rb`kkTKK`ptv{}B{D*$| z=ZOQi)9JM}h7~G;Q+8KkX@kLN_}h!LA^q%GG@aH>8{&FbRn-k6-e!vYu)V!;>)ki2 z;>{X{m1Ukfuxu2JxP3Y1byO~pk>0B18%BI$`h$Kn8sh9o3<|Zm*YQDO!BZ`s;Y{>^T-X(CLb;B z|MABk7yY^1)QjcK<<0e34K+#RQYjYBBA&`dB9UT(bdVGdrbcqP`}bE?{Qf2X(j))E zLNTojd3>t6xVpNs0xh?a%Rz{2K76?Pr?Q6n;o&scty{N1ZYq`a`@aIax3shhnESch z=FhP5W^PlvKLzYmF150fd$_T^4G!4KZLXwN#tNz$)KKiKI9?d{%)d$Ha&LLL)s#O4 zQ*yU7e`>b1*KcfWYy>Yei6*@-G$_ip6X;n}Al#YJcVJ+I48(xyiUFrw zMgqg^{PfoCF1y_jiv?U@Ak9);ZMPVWm{AYd0bsk5&|I_>&Vvtv`8=Jc!c=}YPx9q5 zSwf|fEVFZSk{0a9t{KOX81C%w!CG+7RLLwVNI36yOI1c$x zE|o{Xsf^54n2N}Ps0n}2Zg<%OAT`O+);t~NT(A|uxmIwTATb#xX$cJHCCG-d8yLA z9O@!pLW(Fupg>7uG}7(_fY`9h&ILFcM1dw6m2m=oavbG~dZY1c4vJb!P*jwP?xy>r z5{Y=3ah6I@u^9F7V$CrBERlD0F4!|H&>Q8={=R1&c~ zNi^aT2>}gzg8GX?Rgf7*^Nw10%Idu<9J3D zJ(z-dJgf)JW1ftMVOj7GUg2MxbJiNmL`TjO^05g~=Yid|`2rxS#H)?}TO@?Sr!W|OnCM1W0 zcQj(SyKKcU38!f;fRp^(++3+7R2ZM44$f$53YoWR+CpwHQ54}3z_N(P5dnJxc|1P? z&qZ4Woa_w2FZc*NyaEVuoghV! z8CVre(DGT41)Gz3^-2(Cw6g{snvFeL%wjt*Ogz}N)e zs81Ok9rcZls=iTXR8@UGaE3ZG^kfJai(fsucW*T%rFD}Zv;A;S8I42Y$K!ErS*Anl zz=xwgm^|tm94rhD!r1}>vT+C)V`F1~T3Wrgy0Q=~-_YG;*u*oq4+d)#24QWVqV)jq z!Q3J3>Yfc23NU?WXl!v2ULIDLz9NH2ys4XZC(;@Kax{~H(L*q*Fs4b>#A2Nr|`%Ik&Mmn9yM2f{Cyv8IlyYRq( hTjBBpv=h3k`~F~SD6}I1522 342 20 - + 1525 11 @@ -26107,7 +26107,7 @@ 342 20 - + 1525 343 20 @@ -26641,5 +26641,55 @@ 1525 1334 20 + + + 1526 + 137 + 20 + + + 1526 + 138 + 20 + + + 1526 + 139 + 20 + + + 1526 + 142 + 20 + + + 1526 + 1523 + 20 + + + 1527 + 137 + 20 + + + 1527 + 138 + 20 + + + 1527 + 139 + 20 + + + 1527 + 142 + 20 + + + 1527 + 1523 + 20 \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Explosives.xml b/gamedir/Data-1.13/TableData/Explosives.xml index 720221783..b9af41b36 100644 --- a/gamedir/Data-1.13/TableData/Explosives.xml +++ b/gamedir/Data-1.13/TableData/Explosives.xml @@ -17,6 +17,8 @@ 0 0 0 + 360 + 180 1 @@ -1543,10 +1545,12 @@ 0 1 0 - 200 - 3 - 30 - 50 + 70 + 0 + 22 + 100 + 60 + 2 86 @@ -1559,7 +1563,7 @@ 0 1 0 - 1 + 0 0 0 0 diff --git a/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml b/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml index a5da2af21..3a66c6f79 100644 --- a/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml +++ b/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml @@ -191,11 +191,23 @@ 223 224 + + + 223 + 1526 + + 223 + 1527 + 224 223 - + + + 224 + 1527 + 241 1005 @@ -1623,5 +1635,25 @@ 1522 50 + + + 1526 + 223 + + 1526 + 1527 + + + 1527 + 223 + + + 1527 + 224 + + + 1527 + 1526 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Item_Transformations.xml b/gamedir/Data-1.13/TableData/Item_Transformations.xml index e6b38a212..15271b197 100644 --- a/gamedir/Data-1.13/TableData/Item_Transformations.xml +++ b/gamedir/Data-1.13/TableData/Item_Transformations.xml @@ -50,5 +50,124 @@ 20 Tear apart Tear this T-Shirt into two pieces of cloth. + + + 1528 + 131 + 1524 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 40 + 20 + Remove tripwire + Remove tripwire from stun grenade. + + + 1529 + 132 + 1524 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 40 + 20 + Remove tripwire + Remove tripwire from tear gas grenade. + + + 1530 + 133 + 1524 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 40 + 20 + Remove tripwire + Remove tripwire from mustard gas grenade. + + + 1531 + 134 + 1524 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 40 + 20 + Remove tripwire + Remove tripwire from mini grenade. + + + 1532 + 135 + 1524 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 40 + 20 + Remove tripwire + Remove tripwire from MK2 grenade. + + + 1533 + 1189 + 1524 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 40 + 20 + Remove tripwire + Remove tripwire from emergency flare. + + + 1534 + 151 + 1524 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 40 + 20 + Remove tripwire + Remove tripwire from smoke grenade. \ 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 fccce8f37..307708952 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -147,6 +147,7 @@ 0 0 0 + 0 0 0 0 @@ -6670,6 +6671,7 @@ 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 47 1 @@ -6699,6 +6701,7 @@ 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 47 1 @@ -45240,19 +45243,19 @@ 1523 M18 Claymore M18 Claymore - The M18 Claymore directional mine can be triggered by a remote detonator, by a tripwire or simply be used as a mine. Pro-Tip: Front towards enemy. + The M18 Claymore directional mine can be triggered by a remote detonator, by a tripwire or simply be used as a mine. 700 steel balls will be fired in a 60 degree arc, maximum height of 2 m. Tip: Front towards enemy. M18 Claymore - Lay ambushes with networks of tripwire and these babies. Be careful in what direction you aim, though. Can also be activated remotely. + Lay ambushes with networks of tripwire and these babies. Can also be activated remotely. We accept no responsibility for casulties due to setting it up in the wrong way. 512 1 85 18 - 1 - 46 - 8 + 2 + 97 + 16 1 17 - 1050 + 1250 5 -4 1 @@ -45263,6 +45266,7 @@ 1 1 1 + 1 100.0 @@ -45307,8 +45311,8 @@ 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 - 1 128 + 1 524288 2 35 @@ -45316,17 +45320,282 @@ 4 16 80 - 3 + 3 1 1 - 1 + 1 5 2 - 100.0 - - + 100.0 + - - + + + + 1526 + Remote Defuse + Remote Defuse + Put this device on your bombs. You can safely disarm a planted bomb via remote control, provided you know the correct frequency. + 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 + 47 + 1 + 4 + 13 + 150 + 6 + -1 + 1 + 1 + 1 + 1 + 1 + 3 + 1 + 100.0 + + + + + + 1527 + Remote Combo + Remote Combo + This sophisticated device allows you to either arm or disarm a bomb. No evil mastermind's plan would work without these... + 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 + 47 + 1 + 4 + 13 + 375 + 6 + -1 + 1 + 1 + 1 + 1 + 1 + 3 + 1 + 100.0 + + + + + + 1528 + Tripwire Stun Grenade + Tripwire Stun Grenade + This standard stun grenade has been rigged with tripwire, resulting in a simple, although quite effective, makeshift mine. + Tripwire Stun Grenade + NO TEXT NEEDED. + 512 + 1 + 18 + 1 + 38 + 6 + 4 + 14 + 100 + 3 + -2 + 1 + 1 + 1 + 1 + 1 + 1 + 100.0 + + + + + + 1529 + Tripwire Tear Gas + Tripwire Tear Gas Grenade + This standard tear gas grenade has been rigged with tripwire, resulting in a simple, although quite effective, makeshift mine. + Tripwire Tear Gas Grenade + NO TEXT NEEDED. + 512 + 1 + 1 + 18 + 1 + 48 + 6 + 4 + 18 + 120 + 3 + -2 + 1 + 1 + 1 + 1 + 1 + 1 + 100.0 + + + + + + 1530 + Tripwire Mustard Gas + Tripwire Mustard Gas Grenade + This standard mustard gas grenade has been rigged with tripwire, resulting in a simple, although quite effective, makeshift mine. + Tripwire Mustard Gas Grenade + NO TEXT NEEDED. + 512 + 1 + 2 + 18 + 1 + 41 + 6 + 4 + 18 + 600 + 5 + -3 + 1 + 1 + 1 + 1 + 1 + 1 + 100.0 + + + + + + 1531 + Tripwire Mini Grenade + Tripwire Mini Grenade + This standard mini grenade has been rigged with tripwire, resulting in a simple, although quite effective, makeshift mine. + Tripwire Mini Grenade + NO TEXT NEEDED. + 512 + 1 + 3 + 18 + 1 + 50 + 3 + 6 + 14 + 150 + 3 + -4 + 1 + 1 + 1 + 1 + 1 + 1 + 100.0 + + + + + + 1532 + Tripwire Grenade + Tripwire Grenade Mine + This standard MK2 grenade has been rigged with tripwire, resulting in a simple, although quite effective, makeshift mine. + Tripwire Grenade + NO TEXT NEEDED. + 512 + 1 + 4 + 18 + 1 + 49 + 6 + 4 + 14 + 200 + 4 + -4 + 1 + 1 + 1 + 1 + 1 + 1 + 100.0 + + + + + + 1533 + Tripwire Flare + Tripwire Emergency Flare + This emergency flare has been rigged with tripwire, resulting in a simple, although quite effective, makeshift mine. + Tripwire Emergency Flare + NO TEXT NEEDED. + 512 + 1 + 77 + 18 + 2 + 71 + 2 + 4 + 20 + 50 + 2 + 1 + 1 + 1 + 1 + 1 + 100.0 + + + + + + 1534 + Tripwire Smoke Grenade + Tripwire Smoke Grenade + This smoke grenade has been rigged with tripwire, resulting in a simple, although quite effective, makeshift mine. + Tripwire Smoke Grenade + NO TEXT NEEDED. + 512 + 1 + 20 + 18 + 1 + 98 + 6 + 4 + 18 + 50 + 3 + -2 + 1 + 1 + 1 + 1 + 1 + 1 + 100.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 4afe207ba..71b7f49d3 100644 --- a/gamedir/Data-1.13/TableData/Merges.xml +++ b/gamedir/Data-1.13/TableData/Merges.xml @@ -3792,4 +3792,60 @@ 8 50 + + 1524 + 131 + 1528 + 0 + 3 + 32 + + + 1524 + 132 + 1529 + 0 + 3 + 32 + + + 1524 + 133 + 1530 + 0 + 3 + 32 + + + 1524 + 134 + 1531 + 0 + 3 + 32 + + + 1524 + 135 + 1532 + 0 + 3 + 32 + + + 1524 + 1189 + 1533 + 0 + 3 + 32 + + + 1524 + 151 + 1534 + 0 + 3 + 32 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/DevinInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/DevinInventory.xml index c09d1d523..0f31dd712 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/DevinInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/DevinInventory.xml @@ -472,6 +472,16 @@ 94 1524 - 14 + 16 + + + 95 + 1526 + 8 + + + 96 + 1527 + 4 \ No newline at end of file