From 0e25cace41da7bcbbfa1ac6744c092b84868faf2 Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 24 Jan 2019 21:53:01 +0000 Subject: [PATCH] - Combining 2 rags (#1022) produces dirty bandages (#1753), that are 25% as effective as first aid kits and have a chance to inflict disease. - Combining alcohol (#245) with dirty bandages produces bandages without the disease chance. - adjusted prices for Mini-14 and SKS git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2459 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/BigItems/p1item905.sti | Bin 0 -> 2656 bytes Data-1.13/BigItems/p1item906.sti | Bin 0 -> 2656 bytes Data-1.13/Interface/MDP1ITEMS.sti | Bin 429516 -> 430226 bytes Data-1.13/TableData/Items/Drugs.xml | 17 ++++++ Data-1.13/TableData/Items/Items.xml | 63 ++++++++++++++++++++++- Data-1.13/TableData/Items/Merges.xml | 16 ++++++ Data-1.13/tilesets/0/SMP1ITEMS.STI | Bin 112427 -> 112707 bytes Data/Interface/ItemInfoAdvancedIcons.sti | Bin 13731 -> 13951 bytes 8 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 Data-1.13/BigItems/p1item905.sti create mode 100644 Data-1.13/BigItems/p1item906.sti diff --git a/Data-1.13/BigItems/p1item905.sti b/Data-1.13/BigItems/p1item905.sti new file mode 100644 index 0000000000000000000000000000000000000000..4c208b33699fc5cea92bd36808867623ec2cde20 GIT binary patch literal 2656 zcmYk84OkQR9mmfO3IZ{Z)Q8oA2?at#9I?EafK3JpQX+S(g;3w_+#B(2cXeBdwsNOl zxL~z+ttm-)@v;^S2-(GUD<~_;rZq6p07^++QKZAtZS+mri7#>g;In7@K6n4S=kE9U z|6cyT|2_Bo3q_?6P;5kKgdin2Cl^tVL5m=8L`Fs~Jbg6$|NZ|SKg1~(ttDX;M+g#Q zc-$rsyg&&a&f{l$y_DNccDPBWK-e9)-9gxR+`=LRp~bLF1EQ)%A?P7yqI4*psnuZ= zi(7coAy6G|w#UnQ0PbPk9?B_@4hPvG;C3G4IFw=GT1sc6R5c_|z zx~UEi*X!jxUe4=fdp(51L3IdRuLrk*00h+H(A9D}oW%$d#xR*OQ>D|P6iaq^hz<|i z(WfJS|F6Y>x-$9R$b`gzE8= zf`{z!5>7YHyHQTS9UiL3kC{jW!&F+GOr?^o(P>ef^Z5yfzxWW5}Nzi*19w9lz#32l*qyU?E!Y(+5haG-DKj7!b{d{1U^AEFLFXsl! zAt0Qfqj+v$7-3k1q7V~{Fd$&iKa>uqaE@mMPiP$R{bbbwfdQ? z>>TheH!o{VUS6(RlV7m54N6@0?6X?kj|+>|t(Qj^$Hb(R$TyUh7C%>}(Qhn=-+_|y zkcywIdj5sVr1e!KGME#30s)@>RT+kOH{$&N*S`m>+^;+Hi=*~VaR=C?1`F5eJklE>uk+b`B^+q3zV zEv2tEuB)qS+`eHub@0$(I-1^SHk<1iOT&@ZEYQI<%acS$kG;-vZ@j6Ln~q1Ni1(}2 zR;%W%#>PE1``dMOO`CVV(%g)~`j(a!1gStOmbJE?XyHZm&_VSEl{~q{@w=DbdAF_o zq|+F^qeBgMS~aH{*L8Jubpv+$PP^;(ono;d2=2IwxQaz5PQNEgc>fP(=um;YI3ZT} z;|D#xXU>ZI{*;v>`Vi^&c>jFrl*VecZf*LD=^T0<{YbwLuoV>*$kC%0L?zKVRf&bZ zl>-N%!v%v$e~rA@BFV@Yx^%hIKO7a?f|y4}%F9Q~uav_Y&DF7w(ec2NPcB|Oed6@R zNZ;f90{B!G!weyQB zbOi|<`q^Ur_HQeS@c_16#lYcS!VY|0!Ura1g-Ps;ZI(=|FQg z>TsV}inVLM072bvPj72$d$X-A9iX|!sH~ir z)F5+bI-Jf&(aw7_AuOZ=KxZ-}Lqjzn_7(HCsN~ z-c0u+Y=Jv4urlKvcGX#_R5~=&e&j*TyG!34YPf&-@?pr5b<-ppOt^4?9v!{a*?I4y zdylw~y8{PaI<|6ehW3o~Oo$AttvM@Q+TMQuG7UAX-V`;s{IJv=t$=5@#Q;i2m6^3nuaw^UE8*ehYgg6m zrOyH~l%74?E0wmlOX{K5Rvq6QAr=RN9)-dRgK|6~#=GtCJplDhWnWAFurNMeVzEeo z80ct*u_Uj|uuqZZ(bF(&otX)F_z1; zg+fp3XTV-sFz-5NvvrNb)vx&b`o8+|tEuauOJ(I9CJhwSN|%R^g35-9n-98VY|Mp@pORM<56UL24D?3YY+h??rLS^6 zJOI8RBlYzoBW7T_u`oP5f8$s_I=(e#P-c{g8R$(#)F(*Vov=#`Q?6DU^m>{eG52o- z7c)(VPmcwfib`ar4ItX%sR==Iq0gse%n@5v5n?s04+et^h9jUm%$lOXtn4UYXiZrh z)9*W0DY-PFz8V=R2mfD*s@oc|T21T4YU^mAEL�%Rp}>&t3>t`XoM!kB%s6+P!{v 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 literal 0 HcmV?d00001 diff --git a/Data-1.13/Interface/MDP1ITEMS.sti b/Data-1.13/Interface/MDP1ITEMS.sti index e17281b07eccd391cc44d03fdbbe784aba903970..e5b2546247ccf90a18ea58035dc436ca918f75c9 100644 GIT binary patch delta 293 zcmX>zTWZomDcRrAR14;w=`Ee1U|C$(@dH+R(&Wy;U16bBLjDhZ7M e3QW(=V=N`s{Pc8G^MO{Nn4g}GWw1`t1BY+zzwWMJsrD7)FZ`Ga-)2Wv(kW&&bn QAZ7t#*6kmx+5Q9q00v7KNB{r; diff --git a/Data-1.13/TableData/Items/Drugs.xml b/Data-1.13/TableData/Items/Drugs.xml index 9a907b79e..999396fb6 100644 --- a/Data-1.13/TableData/Items/Drugs.xml +++ b/Data-1.13/TableData/Items/Drugs.xml @@ -786,4 +786,21 @@ If is set, this is the chance that this effect is applied when consumin 3200 + + + 20 + Dirty Bandages + + + 3 + 100 + 40 + + + + 4 + 100 + 3 + + diff --git a/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml index b0183f0d3..47005def8 100644 --- a/Data-1.13/TableData/Items/Items.xml +++ b/Data-1.13/TableData/Items/Items.xml @@ -833,7 +833,7 @@ 17 39 8 - 870 + 1870 4 2 -1 @@ -1006,7 +1006,7 @@ 22 30 7 - 718 + 1718 4 2 1 @@ -52062,4 +52062,63 @@ + + 1753 + Bandages + Dirty Bandages + These simple bandages were made from rags. They might still bleeding, but are not up to sanitary standards... + Dirty Bandages + Not for sale through BR. + 4096 + 1 + 5 + 1 + 905 + 2 + 4 + 18 + 3 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 100.0 + -300 + 20 + + + + + + 1754 + Bandages + Primitive Bandages + These simple bandages were made from rags. They are clean and might still bleeding, but that's about it. + Primitive Bandages + Not for sale through BR. + 4096 + 1 + 5 + 1 + 906 + 2 + 4 + 18 + 5 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 100.0 + -300 + + + + \ No newline at end of file diff --git a/Data-1.13/TableData/Items/Merges.xml b/Data-1.13/TableData/Items/Merges.xml index 4f792a281..9f6f888ef 100644 --- a/Data-1.13/TableData/Items/Merges.xml +++ b/Data-1.13/TableData/Items/Merges.xml @@ -2016,6 +2016,14 @@ 1 32 + + 245 + 1753 + 1754 + 0 + 15 + 32 + 255 255 @@ -4720,6 +4728,14 @@ 4 32 + + 1022 + 1022 + 1753 + 0 + 4 + 32 + 1027 1027 diff --git a/Data-1.13/tilesets/0/SMP1ITEMS.STI b/Data-1.13/tilesets/0/SMP1ITEMS.STI index 8386f382003781901bae518fb5d693987379e5c9..a3cc28d9c7066ac1060fb70eb93651fef9b18f71 100644 GIT binary patch delta 89 zcmZ4ej_vRVHre11XU_;_28Q4oMg|bj0OALX4NMF`Zudsn&DQeK)r<@^U^xZ`UIs3P Z>!|$Z^VZwXTQkN~Pgbp|ovc<<4FHQ}6ukfd delta 49 zcmX^7fo=6WHre11XU_;_28QTrMg|bj0OALX4NMF`Zs$hX&DPBythax#W{j=|09Qc{ AGXMYp diff --git a/Data/Interface/ItemInfoAdvancedIcons.sti b/Data/Interface/ItemInfoAdvancedIcons.sti index 2a94a38338520cbe9c0c31dc1f3581bc8e947937..07af301bfbe030f473956d188d4cdf6ef9b2baa8 100644 GIT binary patch delta 265 zcmX|*I}XA?3`A#>KqL!k>mWsGsX~!$(?CUmD3V*i9bh*z`P0*E4usSsltb~Qdjr^x+nP6CCt@M&wv k4vFHmLOUp`evgRL2|JI^3~3kCazcZ+qV|YdpD4fK3xQ2CDF6Tf delta 43 tcmeyLvp8EeIK