From cf700d0f8ea7a5bf36af41295eaa2affad503b51 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 10 Feb 2019 16:22:27 +0000 Subject: [PATCH] A paramedic can use empty bloodbags (-tag, item #1756) to create blood bags (-tag, item #1757) from other mercs. These can then boost the health returned by surgery by ONTOP_PERCENT_SURGERY_HEAL_BLOODBAG percent. git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2467 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/APBPConstants.ini | 8 ++- Data-1.13/BigItems/p1item907.sti | Bin 0 -> 2130 bytes Data-1.13/BigItems/p1item908.sti | Bin 0 -> 2523 bytes Data-1.13/Interface/MDP1ITEMS.sti | Bin 430226 -> 431072 bytes Data-1.13/Skills_Settings.INI | 3 ++ Data-1.13/TableData/Items/Items.xml | 49 ++++++++++++++++++ .../AdditionalDealer_28_Inventory.xml | 5 ++ .../NPCInventory/HowardInventory.xml | 5 ++ Data-1.13/tilesets/0/SMP1ITEMS.STI | Bin 112707 -> 113034 bytes Data/APBPConstants.ini | 13 ++++- Data/CURSORS/bloodbag.sti | Bin 0 -> 3615 bytes Data/CURSORS/bloodbag_r.sti | Bin 0 -> 1085 bytes Data/Interface/ItemInfoSecondaryIcons.sti | Bin 14502 -> 15008 bytes Data/Skills_Settings.INI | 3 ++ Data/TableData/Items/Items.xml | 6 +++ 15 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 Data-1.13/BigItems/p1item907.sti create mode 100644 Data-1.13/BigItems/p1item908.sti create mode 100644 Data/CURSORS/bloodbag.sti create mode 100644 Data/CURSORS/bloodbag_r.sti diff --git a/Data-1.13/APBPConstants.ini b/Data-1.13/APBPConstants.ini index 506c6f3ca..67188080a 100644 --- a/Data-1.13/APBPConstants.ini +++ b/Data-1.13/APBPConstants.ini @@ -465,6 +465,11 @@ AP_SODAMACHINE = 30 ;*********************************************************************** AP_CAMERA = 30 +;*********************************************************************** +;* The APs to take another merc's blood to fill a blood bag * +;*********************************************************************** +AP_FILLBLOODBAG = 100 + [BPConstants] ;*********************************************************************** ;* Ratio of breath points to 1 energy (default = 100) * @@ -543,4 +548,5 @@ BP_FORTIFICATION = 700 BP_REMOVE_FORTIFICATION = 400 BP_HANDCUFF = 100 BP_APPLYITEM = 5 -BP_INVENTORY_ARM = 0 \ No newline at end of file +BP_INVENTORY_ARM = 0 +BP_FILLBLOODBAG = 20 \ No newline at end of file diff --git a/Data-1.13/BigItems/p1item907.sti b/Data-1.13/BigItems/p1item907.sti new file mode 100644 index 0000000000000000000000000000000000000000..7a147f94017a0d1fb7500b04382ec787fd84ea2d GIT binary patch literal 2130 zcmc&#+iu%N5FM%sV8}opiUMsC=c!Ooj8HCMeM0-v*M>_O%D-^dR%A210{w%a=*xNu zvwuQ^vw$D_C+rz2M)C(8ODmG+%Epk)&{dD?@2sGPwFWMMWHM-32~q*m@`N6kt9-#q>+MB zRLV+|5@)J1wq%4vFgSsZ$ALLAXXc5S*IcccJhNx-Sv*J2>NyBU;Ve7}!=ak>!OcgO z$T6};4$4tED^F_SDyT;wlkCMrc_kmr!)NvrHdy;=Z7E?Vn0Oz(SMP)PC_amyuzm1V zu!NxlutXoD*XV=#s6MNoATIkVTk+UxBVyT$k_3|`nPp<(wNz`U5Vn0pERv{~AQDBg z$RvU!tGT8~6$${vC>kZGM3t;EsgA4g zu=ZJY1q@C{E6Z|qx;RB}fX~%1*vfD~ZYCFP-(OPuLd#{jG}x9U9PJu*+9}uHLrIeao z4Y&qcm$)n3y!W{au#0f<9u&=WtwUXxbt=kU=^E0Ys{b2|e=frNoVC`6hX)<|!s+D^ zPkqL7eC-GJfImfeBz|~_T0;%cX4mZSgZ==0(7OVq0pU!~-8kyK`PNONHGUCb)KnCx z>)|ZB)HF?Mkm9_@qW}a*hNHO`7w=UC-f284NJy}NfEhm@Rl9JJx~}gA8;{w5w`l6y zGu?JFc6ZG<-lvVpm_v+1Dwb(K<0ydQHPYQSX_#>^5^#67r~S*U!w6}^?Y-WMq-+(O zV}O7O-M`cg1b~DrhXes2`~(gXEL#w+P@*kLZmLFv8o*9j$GXuGJ$P$`?RXC#37_>0u|@ibcQo{oXB$JURwmXTHk=Xn~!j5rwdkNTu}=h z)9nl&qrZBD?F6NSdJPZfH*|>}zq07F>xZQ*N>GZjyQZrbP;Z1!aGc=6K7jYnF~D}# zXMu~=hofV6+iQCJOmQ|^cB|FnnVfmWvY$bu(gS9^DHcZn>%!?Z9lo+W@rvqFyWQX) fD>!C)LpNW}Z(U$1^*tC}>Qq~LcQU)c=}-C(a#(Q> literal 0 HcmV?d00001 diff --git a/Data-1.13/BigItems/p1item908.sti b/Data-1.13/BigItems/p1item908.sti new file mode 100644 index 0000000000000000000000000000000000000000..58ad746edb096053b7171c51b978b0567f68fdd1 GIT binary patch literal 2523 zcmc&!O^+Kz5G{K@QBDW~2xSu?afr$nZu|gFoSEjzKXLbXcJ1tLHUWiG07XaTe4tuDkwn)C&00sRI{q9_NqG5W~LHUgNC3nXbx&YQ`8*QqxMnZ&{TbJ3t3~< zoYk@>(`@Rdy^*egdJs`^h!hn}LZU}-4Lt(PLNjAZh=dVC$RSt=DTW+_$Iv5u3Qc0d z&;fJIA?IK@Bn#PsTj(LqL*p!-vNka?`)CpqrA61+Yt&h6W>688abhG>v=CE_IYy7M zj}b{WwWdfF3Sh`NT8_zLw&)gnV+k5moSTD9K>1N-6gVf=AiL%sMVaMh#%(~Z5DhM< zhTcTJ>@oMym2#7~N$`Um77WWd;kN9Sdlb}j<7@}zZd>Gjnu#SA+gz^BqxsCGBwm%#o*U0rCNWkb5HA5CjGW zy+NXj&!`89-y(=Cb|oxH3&hRDy3aRIyWQNw!0eYJ%3nUAYM^XXgV%A~!Cjw?i}!K0 znp*=QSlR<5d-)W|p~$1l{y8jO$_aK3J7cS_9!8=Nn<~ldg|vqTczejwF1}{EaOKBH z&Uc6Ud0ocG3O=Oop4Y_q%F=!ifv>sES?^&P9*bj`QHAcfZkKmwV*o(r>;ckXu91By z3+CIMz>6dodpL>94mX3*qYl8?we+q5FP;qs->m0l&Q_=?R2NQuA>9eF7*}T%>jMn# z?7_-Xl`PTqZm*sWgzNRL?Dp2djWhXxDnRWeZBeeOhslzxUKcoDYk!4+{M@3_?4F-U z@Bv3qS-*ZdJuk8>7PRk=%YT=8MUXKcD?K24Y%y`{dy$HT+8*c&2W@%@2BDWgo?TsXn81|1Jm^ilbn~yfW ze>LXYv!YR3gL6Xa~OQek#rZI`pwI;_rPzF4&> ziAhS*h@9u9_smSy4AsDX2J-$-b?mRNXz0Iqb0Lg0IoK2f zfHeYz5FYw5dx}=TI=6&J?J+54%WH(}oDx;mE>=SxPjL=$&B@jl5uH@V<4`@vj!ME= zjJbX>3RDiQ^d<;wrPXTL5UznbXl4+nD{2Tv(~0RWimM+D($hHJZpU$<50=~%B3IuS z4To9w0*Spj!Oj~F3W)5OWJ*+;1Jj)Wmd>97B^l3L9xs z4IxMaV%;XHL1+-`*=uU9g{FGFGPG+7AsWPBa+b)lhi>FWnQx+lNFh7t!5}ya)oMY9 z(h503bENfjh<^wT0 0 0 + 0 + 0 0 0 @@ -52146,4 +52148,51 @@ + + 1756 + E. Blood bag + Empty blood bag + This blood bag can be filled with the blood of a (hopefully willing) donor. + Blood bag + A simple blood bag, used to store blood for medical purposes. + 268435456 + 1 + 1 + 908 + 1 + 4 + 16 + 4 + 1 + 6 + 100.0 + 1 + + + + + + 1757 + Blood bag + Blood bag + This package of fresh blood can be used up to boost a surgery. + Blood bag + Not for sale through BR. + 268435456 + 1 + 5 + 1 + 907 + 6 + 2 + 18 + 25 + 1 + 1 + 100.0 + 1 + + + + \ No newline at end of file diff --git a/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml b/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml index 358b81de3..a6515ada8 100644 --- a/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml +++ b/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml @@ -85,4 +85,9 @@ 1752 2 + + 17 + 1756 + 6 + \ No newline at end of file diff --git a/Data-1.13/TableData/NPCInventory/HowardInventory.xml b/Data-1.13/TableData/NPCInventory/HowardInventory.xml index 1fe7f6079..270d018bb 100644 --- a/Data-1.13/TableData/NPCInventory/HowardInventory.xml +++ b/Data-1.13/TableData/NPCInventory/HowardInventory.xml @@ -115,4 +115,9 @@ 1752 4 + + 23 + 1756 + 6 + \ No newline at end of file diff --git a/Data-1.13/tilesets/0/SMP1ITEMS.STI b/Data-1.13/tilesets/0/SMP1ITEMS.STI index a3cc28d9c7066ac1060fb70eb93651fef9b18f71..68c1d28d51cdcfc8abca189e3c535cf75ec003c4 100644 GIT binary patch delta 403 zcmXw!Jxc>Y5Qb+Z=HkVGf8YwS(O=+4szV#gd>kwm6ByWLYbz6p_hBQ5AP9Fq!^#7j zgZLjTwXu$1KRCOdFT3zQJG1Z3uD-i>Kiz0DJw4ZZ09V%voc3jZs+$cEynl{fhlhRW zzyLycpDS2M^`9pT1&=Ln%juW!ld#hO`uTeJvL34GVp()plqyak?=c>om3+aFZ86q$ z)7X*sZ+aF}ZM`3xnIUYvFUr_Zq8U=@$75|wA~_CDDy+x~giJQVDvm$?Dz@33*U6}D z)62^pYf&f*+#I3|GR3lPAq`kFC(JpdJvJqx)>0PF35vvr@+=_{Y5$Zl^e`rJc`^i{ nCN$*29grb1er%JVmIUVySU%$d*neM)>&XLu*Nvj4AJdJuq-3fds^74@^B~4{YGpgi$uY8j9=p z(oy#SArL5ess5ay>#t6!GqFNEXi{d|i&;d3$6JsCtE$l>AP#=Ctj=d=6qg{X*$ zxJZaVq^g8UQ|T%?N*QxmP0Yki!UQJOC0v?IchM@P=4K7C5D$qEgj7gC8l*$CNoh=} z49Q^J#Lwxjs-fCcyQ+>_Mio;vHB&bYQR@D+L7T3 z)iY2^HcwFov6?%qsdXk8t&EApOdM_&W-zO6;nv(b(^o4sfvJPb9u{E;tFVAISf{vV zrDgFnYvZ2u4)L1Oys39}9leZH;hK5eGm^u+x`%sn@9u;wo0<}p3b+vA2(R#fH+V;u zps?cE95#XFXPH^xs9A$(8l6QMqm0=GvQji-Q8o3}j2F$LQ&){rvq{{?b*^wAqVhpB zL}x);l$OUqv)l0OCm^Uc; zJ6hYv2iT5Ja)h=W`1l{@XZzDMoh|~u9j4P^I$3z$3=^Hlve7hA79HoqBqsxo=^wz= zw72eG&G-@Tcl_>bli@vQ=b8M&HgMuzBP@mFNVXYvLS9#}B+YyGV7Fvbw&}97vuF2V zXOgR9JUea+?97w@{ye``urt&Wa5>+3*xv!}JnWwU?j-Er0`3g#zW}_^u>TtHrosLM D_D~VK literal 0 HcmV?d00001 diff --git a/Data/CURSORS/bloodbag_r.sti b/Data/CURSORS/bloodbag_r.sti new file mode 100644 index 0000000000000000000000000000000000000000..e8f80249ee18a33dd0aaf00d158af25668f90a8f GIT binary patch literal 1085 zcmc&zL2eX54D`Z*<&1a&5~_IyC(g9rV<&+G1boErDc|z}-q4hH6_E=^gw@mPwcB>N zs`u0S@X=(yW|O_w_jt+|b~3H=`F!zSx98_4_q#`fnVW@Knb9m^1#8%b;jnc~7;f$s zZskU|46CpX+hIssImsyVvM8%EmL;udP1`iItyW8@q>3p?*X2&2fCe^z1M7e};BZGc z%0Wj4D$s!)P{O+4Q<@i|Pz4r}D58nYDYt}Pg$A<6fO4AWWO&238XUfk8A+XF;a=`^ z&+rQG@U8agD`#NgP&mq~oaIR`degVSwXYuXFx*7U^g)XpXwis`z!B>Zioo=Vm`Xv9 zjHrl?*by3XT{zXKLZCoZup$}7XvXGHu*CR?BN0TuXcobh!$CD_iXebb6TP-|aVgT&v&! literal 0 HcmV?d00001 diff --git a/Data/Interface/ItemInfoSecondaryIcons.sti b/Data/Interface/ItemInfoSecondaryIcons.sti index 2f632b774ef59cd82a57220f06a42f3d72a4c167..1e7730b4c604df7259a402786b3af13cb2a9c280 100644 GIT binary patch delta 553 zcmZ2hxS&)vIKG56c+ii_2RWi-Dqz3_wQ}gCS6$ow1mq2`C6gKv@tUB8-a#R0KpFKy_^( zD~daTtagy?-5`TeeOr(43fS*p=fj)>3I-rs4~Svn2sT(bOdQBTQv>%d%rKynfNnwe JZ7fZ_3jk!?qtpNZ delta 43 tcmZ2bx~xz(IK0 0 0 + 0 + 0 0 0.0 0 @@ -191,6 +193,10 @@ 0 0 0 + 0 + 0 + 0 + 0 0 0