From 1aba98d5a04b17c0c0353fdc34f4f91960ca95cf Mon Sep 17 00:00:00 2001 From: kitty624 <58940527+kitty624@users.noreply.github.com> Date: Thu, 7 Nov 2024 04:39:26 +0100 Subject: [PATCH 1/3] Comments on Merges.xml --- Data-1.13/TableData/Items/Merges.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Data-1.13/TableData/Items/Merges.xml b/Data-1.13/TableData/Items/Merges.xml index 9f6f888ef..43feaaffe 100644 --- a/Data-1.13/TableData/Items/Merges.xml +++ b/Data-1.13/TableData/Items/Merges.xml @@ -2073,17 +2073,17 @@ 20 - 299 - 1016 - 315 + 299 + 1016 + 315 0 6 60 - 299 - 267 - 318 + 299 + 267 + 318 0 6 60 @@ -2585,17 +2585,17 @@ 32 - 317 - 321 - 324 + 317 + 321 + 324 0 5 32 - 321 - 317 - 324 + 321 + 317 + 324 0 5 32 From 52fbd83c2308c71c83a3b9709c45240d1ad50583 Mon Sep 17 00:00:00 2001 From: kitty624 <58940527+kitty624@users.noreply.github.com> Date: Thu, 7 Nov 2024 07:28:07 +0100 Subject: [PATCH 2/3] New Item PPE Bag - empty PPE Bag will transform into full PPE Bag when Surgical Mask and Gloves get attached - full PPE Bag will have both disease protection qualities (face and hand) - instead of two inventory slots (mask and glove) it takes only one while providing same level of protection - replaced mask and gloves in Fox's Starting Gear with PPE Bag - added PPE Bag to (one) Starting Gear of Stella and Hurl - added PPE Bag to dealer inventory of Rebel-Quartermaster, Pharmacy Cambria and Tina - empty PPE Bag available at BR (can be filled/transformed with surgical mask and gloves also available at BR) --- Data-1.13/Interface/MDP2ITEMS.STI | Bin 118130 -> 119104 bytes .../TableData/Inventory/MercStartingGear.xml | 22 ++++-- .../TableData/Items/AttachmentComboMerges.xml | 67 ++++++++++++------ Data-1.13/TableData/Items/Items.xml | 66 +++++++++++++++++ .../AdditionalDealer_21_Inventory.xml | 20 ++++++ .../AdditionalDealer_28_Inventory.xml | 19 ++++- .../TableData/NPCInventory/Merchants.xml | 60 ++++++++-------- .../TableData/NPCInventory/TinaInventory.xml | 5 ++ Data-1.13/tilesets/0/SMP2ITEMS.STI | Bin 40154 -> 40242 bytes 9 files changed, 201 insertions(+), 58 deletions(-) diff --git a/Data-1.13/Interface/MDP2ITEMS.STI b/Data-1.13/Interface/MDP2ITEMS.STI index 8aa485d12950b7a138f108fe85b0079222030015..120b82b8661a223db7953bf381ec150d269534e6 100644 GIT binary patch delta 389 zcmew~i~YbNcG=(%XV1wl3=9kQF*1OF1`t1BY+zyla=&eqO%{^>w2P79Iz*B|j6sCq zZQ$3 201 214 - 1710 - 1711 + 1764 + 1712 1712 1090 1091 - 1091 + 1205 1098 @@ -2333,8 +2333,8 @@ 2 75 2 - 1710 - 1711 + 1764 + 1712 1712 1090 1092 @@ -25206,7 +25206,13 @@ 71 100 1 + 1764 + 100 + 1 + 1090 + 100 1091 + 100 1204 92 @@ -28632,6 +28638,12 @@ 2 1756 2 + 1764 + 100 + 1 + 1758 + 100 + 1 1090 99 1200 diff --git a/Data-1.13/TableData/Items/AttachmentComboMerges.xml b/Data-1.13/TableData/Items/AttachmentComboMerges.xml index d520a8e70..3eb943744 100644 --- a/Data-1.13/TableData/Items/AttachmentComboMerges.xml +++ b/Data-1.13/TableData/Items/AttachmentComboMerges.xml @@ -2,8 +2,8 @@ 0 - 305 - 306 + 305 + 306 0 0 0 @@ -23,13 +23,13 @@ 0 0 0 - 307 + 307 1 - 308 - 309 - 304 + 308 + 309 + 304 0 0 0 @@ -48,13 +48,13 @@ 0 0 0 - 310 + 310 2 - 318 - 319 - 320 + 318 + 319 + 320 0 0 0 @@ -73,12 +73,12 @@ 0 0 0 - 321 + 321 3 - 315 - 316 + 315 + 316 0 0 0 @@ -98,12 +98,12 @@ 0 0 0 - 317 + 317 4 - 264 - 316 + 264 + 316 0 0 0 @@ -123,13 +123,13 @@ 0 0 0 - 223 + 223 5 - 1360 - 1360 - 1360 + 1360 + 1360 + 1360 0 0 0 @@ -148,6 +148,31 @@ 0 0 0 - 1360 + 1360 + + + 6 + 1763 + 1710 + 1711 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1764 \ No newline at end of file diff --git a/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml index 605c42abb..01ae57044 100644 --- a/Data-1.13/TableData/Items/Items.xml +++ b/Data-1.13/TableData/Items/Items.xml @@ -51302,6 +51302,9 @@ If you are a doctor or live in an Asian mega-city, you will need these. 268435456 1 + 1 + 8 + 15 2 224 1 @@ -51311,7 +51314,10 @@ 3 1 1 + 1 + 1 1 + 1 20 1 1 @@ -51328,6 +51334,10 @@ Useful for doctors. Not for keeping your hands warm. 268435456 1 + 1 + 8 + 15 + 1 2 225 1 @@ -51337,7 +51347,10 @@ 3 1 1 + 1 + 1 1 + 1 20 1 1 @@ -52781,4 +52794,57 @@ + + 1763 + Empty PPE Bag + Empty PPE Bag + Protect your PPE from wear and tear. Safely store masks and gloves and keep your inventory tidy. Perfect for a long tour in unhealthy conditions. + Empty PPE Bag + Perfect storage for masks and gloves, keep your inventory tidy and your PPE in prime condition. Mask and gloves not included. + 268435456 + 1 + 8 + 2 + 244 + 4 + 1 + 11 + 20 + 3 + 1 + 1 + 1 + 20 + 3 + 1 + + + + + + 1764 + PPE Bag + PPE Bag + This small bag holds minimum PPE (mask and gloves), protecting against infection risk born by airborne diseases and contact with infected persons. Perfect for frolicing through a disease riddled country. + PPE Bag + Not for sale through BR. + 268435456 + 1 + 2 + 245 + 5 + 1 + 11 + 25 + 4 + 1 + 1 + 1 + 1 + 1 + 1 + + + + \ No newline at end of file diff --git a/Data-1.13/TableData/NPCInventory/AdditionalDealer_21_Inventory.xml b/Data-1.13/TableData/NPCInventory/AdditionalDealer_21_Inventory.xml index d0b146663..8919e870c 100644 --- a/Data-1.13/TableData/NPCInventory/AdditionalDealer_21_Inventory.xml +++ b/Data-1.13/TableData/NPCInventory/AdditionalDealer_21_Inventory.xml @@ -160,4 +160,24 @@ 1728 1 + + 32 + 1710 + 3 + + + 33 + 1711 + 3 + + + 34 + 1763 + 3 + + + 35 + 1764 + 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 a6515ada8..b57375ae4 100644 --- a/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml +++ b/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml @@ -43,12 +43,12 @@ 8 1710 - 4 + 6 9 1711 - 4 + 6 10 @@ -90,4 +90,19 @@ 1756 6 + + 18 + 1758 + 4 + + + 19 + 1763 + 4 + + + 20 + 1764 + 2 + \ No newline at end of file diff --git a/Data-1.13/TableData/NPCInventory/Merchants.xml b/Data-1.13/TableData/NPCInventory/Merchants.xml index 1e2d4c85c..f68692e58 100644 --- a/Data-1.13/TableData/NPCInventory/Merchants.xml +++ b/Data-1.13/TableData/NPCInventory/Merchants.xml @@ -640,7 +640,7 @@ uiFlags must be of additional dealer 3 1.0 1.0 - 255 + 255 0 800 268435456 @@ -1017,7 +1017,7 @@ uiFlags must be of 40 - A10 bunker rebel quartermaster + A10 bunker rebel quartermaster 0.2 0.5 200 @@ -1040,7 +1040,7 @@ uiFlags must be of 41 - general store Drassen (D13) + general store Drassen (D13) 0.7 1.0 200 @@ -1062,7 +1062,7 @@ uiFlags must be of 42 - general store Alma (I14) + general store Alma (I14) 0.7 1.0 200 @@ -1084,7 +1084,7 @@ uiFlags must be of 43 - general store Cambria (G9) + general store Cambria (G9) 0.7 1.05 200 @@ -1106,7 +1106,7 @@ uiFlags must be of 44 - general store Grumm (H1) + general store Grumm (H1) 0.7 1.0 200 @@ -1128,7 +1128,7 @@ uiFlags must be of 45 - general store San Mona (C5) + general store San Mona (C5) 0.7 1.0 200 @@ -1150,7 +1150,7 @@ uiFlags must be of 46 - posh general store Meduna (O4) + posh general store Meduna (O4) 0.7 1.0 200 @@ -1172,7 +1172,7 @@ uiFlags must be of 47 - pharmacy Cambria (G9) + pharmacy Cambria (G9) 1.0 1.0 200 @@ -1194,7 +1194,7 @@ uiFlags must be of 48 - pharmacy Meduna (O4) + pharmacy Meduna (O4) 1.0 1.0 200 @@ -1216,7 +1216,7 @@ uiFlags must be of 49 - restaurant Cambria (G9) + restaurant Cambria (G9) 1.0 1.0 200 @@ -1238,7 +1238,7 @@ uiFlags must be of 50 - restaurant Grumm (H1) + restaurant Grumm (H1) 1.0 1.0 200 @@ -1260,7 +1260,7 @@ uiFlags must be of 51 - restaurant Balime gas station (L10) + restaurant Balime gas station (L10) 1.0 1.0 200 @@ -1282,7 +1282,7 @@ uiFlags must be of 52 - restaurant San Mona (C5) + restaurant San Mona (C5) 1.0 1.0 200 @@ -1304,7 +1304,7 @@ uiFlags must be of 53 - restaurant Meduna 1 (O4) + restaurant Meduna 1 (O4) 1.0 1.0 200 @@ -1326,7 +1326,7 @@ uiFlags must be of 54 - restaurant Meduna 2 (O4) + restaurant Meduna 2 (O4) 1.0 1.0 200 @@ -1348,7 +1348,7 @@ uiFlags must be of 55 - wine store Drassen (D13) + wine store Drassen (D13) 1.0 1.0 200 @@ -1370,7 +1370,7 @@ uiFlags must be of 56 - wine store Alma (I14) + wine store Alma (I14) 1.0 1.0 200 @@ -1392,7 +1392,7 @@ uiFlags must be of 57 - wine store Cambria (G9) + wine store Cambria (G9) 1.0 1.0 200 @@ -1414,7 +1414,7 @@ uiFlags must be of 58 - wine store Grumm (H1) + wine store Grumm (H1) 1.0 1.0 200 @@ -1436,7 +1436,7 @@ uiFlags must be of 59 - wine store San Mona (C5) + wine store San Mona (C5) 1.0 1.0 200 @@ -1458,7 +1458,7 @@ uiFlags must be of 60 - drug dealer Cambria ruins (F9) + drug dealer Cambria ruins (F9) 1.0 1.3 200 @@ -1480,7 +1480,7 @@ uiFlags must be of 61 - tool shop Grumm (H1) + tool shop Grumm (H1) 1.0 1.3 200 @@ -1502,7 +1502,7 @@ uiFlags must be of 62 - hunting store San Mona (C6) + hunting store San Mona (C6) 1.0 1.0 200 @@ -1524,7 +1524,7 @@ uiFlags must be of 63 - construction materials store San Mona (C6) + construction materials store San Mona (C6) 1.0 1.0 200 @@ -1546,7 +1546,7 @@ uiFlags must be of 64 - luxury store Balime (L12) + luxury store Balime (L12) 1.0 2.0 200 @@ -1568,7 +1568,7 @@ uiFlags must be of 65 - luxury store Meduna (O4) + luxury store Meduna (O4) 1.0 2.0 200 @@ -1590,7 +1590,7 @@ uiFlags must be of 66 - restaurant San Mona (C6) + restaurant San Mona (C6) 1.0 1.0 200 @@ -1612,7 +1612,7 @@ uiFlags must be of 67 - armour store San Mona (C6) + armour store San Mona (C6) 0.66 1.1 200 @@ -1634,7 +1634,7 @@ uiFlags must be of 68 - Black Market dealer San Mona (C6) + Black Market dealer San Mona (C6) 1.0 1.0 200 diff --git a/Data-1.13/TableData/NPCInventory/TinaInventory.xml b/Data-1.13/TableData/NPCInventory/TinaInventory.xml index dd2e6d8a1..cefff236d 100644 --- a/Data-1.13/TableData/NPCInventory/TinaInventory.xml +++ b/Data-1.13/TableData/NPCInventory/TinaInventory.xml @@ -165,4 +165,9 @@ 1709 3 + + 33 + 1763 + 5 + \ No newline at end of file diff --git a/Data-1.13/tilesets/0/SMP2ITEMS.STI b/Data-1.13/tilesets/0/SMP2ITEMS.STI index bd3ebf3bad8f1fd50f752772d0c2d560b450b733..b73020121be7a372a8d265557c4ab4093cf260e6 100644 GIT binary patch delta 81 zcmcb$lWEf~CfVQ+XV2+k3=EUH7{EXSNIqa}U}9ioVEDFCHd#nM3MeB3kz`flyQz02z!6@c;k- From 0981111ab40d47507ab6c2de38a52c0d9cdda9d2 Mon Sep 17 00:00:00 2001 From: kitty624 <58940527+kitty624@users.noreply.github.com> Date: Thu, 7 Nov 2024 07:58:55 +0100 Subject: [PATCH 3/3] BigItem sti for PPE Bag - missed in previous commit --- Data-1.13/BigItems/p2item244.sti | Bin 0 -> 2681 bytes Data-1.13/BigItems/p2item245.sti | Bin 0 -> 2681 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Data-1.13/BigItems/p2item244.sti create mode 100644 Data-1.13/BigItems/p2item245.sti diff --git a/Data-1.13/BigItems/p2item244.sti b/Data-1.13/BigItems/p2item244.sti new file mode 100644 index 0000000000000000000000000000000000000000..6c0babad6fce68406dc750a990223e9543cc3c6d GIT binary patch literal 2681 zcmYk6|5Fp`9mkVHIlvn^3RYEXqvy5${ChgR4&7NLzQ8X8DF=pH*LvxrYNym%FQH z0}l4oCp0YJ+s%O!d*@?~GvT(TgO%G%na-xIO+xSy0Rl9c;Fb4|!?&2%Hx*JkQ ze3(4j-yH6O;jSH5{B^U#bzQxVP@sO6$NReMySA;Hi_|e~#9gWN-gu+?xaIQ`)}57R zzpv(Eca3>V!F;T4Lw-hd_|TN#K3QL$@b5j#H$Rvlar3G>lH14CP4&Uq(YEluIj zxwdUnefZ&{yZl_8&|8XcH^eyWguiz1Z0(yjKeRVxk(Jq}&on+sbbonj!%5FE(ovNh ztt&LCFaId*-jy}a<1^vvySHN>tX<_h)o?G~3ip>hh`T#jxDfj^Hb{ML+syaw|I@Xj zPiDJ%4;M^I$KL)^`Axj7$6M8Vh8de^fBd_tujKx3?+?DZ(HQ9ZM452$y@wuOJCbQw ze`W0S&E(nhY{~Bv?wL`%Xme3RJDK-!nQ)c2f6XS zy6sk5oZDfuecDrBJU!GRe|>u9QqOQpfz(xcFMc%dCq=#Pia%V1N1P|V`=xtdfxf!_ z@bzDGmzA&n>x1B%S5l){|HI0o*MH{Tes|-Vze>3~c#dtpEce7b(08`>*MZ{LVC}=y zt-t?Gn2)qRN;ZFgznvrBe>vYhJr`-;y?XBc`9>cTAGfC_PG266efv$<%9CT?Jm~z# zqn_KB*f(#kIluVm3rkL7=Ic;6*4=Ykor51|2h)}7!X;>RcXfAn+tF2E|8eEp?dU$3 zUs95vv#Bzo<4f&}OG^U-e*eNkWIlLPENx+ILqakDKW^nw&I z2PpzD%8C>~E7XRb^e13bbP*!AKAt8_aYrZw2vG$67$u76lM*Qk6Gawq9LsVpTzJeQ z)IKe;36cUN@P_y>rK*xhRTTUC0S5pgfy5C-yl&WhoQsn%p~((~%M6sNt2zKI1=1fJ z#(>F9Dw|DVq#W0DTStQYMv5XR%+V}zKy)HlM8ZJ8@p6?dlEEAv$4CbNcY^*PVlhmM zqN%c42!Ula_Ot>L5{3aplzD?gfxvEqQ;VWezzI+_JZ-iTRo5w<}SWKi@8pH)PA-_Ku^>PdRVkyv|_GFdN6#pn1g{IF5^?!@~eHr(gqAhm4gy&}O#CpQ)g4Nj9}mI4WB+ATbP& zvbhAor8v|*Rv{?dWM!lr6)eGV&=RF71;+`DprVVwX0ve&P&fsLOG`47q8E2)U^Ewm z04*;?X`CfwEBz=GijfvYrfFJo39!)Vd6BPzc07+s`jf$AGU4Sx0(MxgTPB0&&< z3kF9(9C{9hb&-;6I&U@fFT7UIv&a=b6}4KQS23?2z77TxJkJm9KD+U<#^JeHm76m% zI44LfEMRyNfES{KP62-8{0P6t(C{p%>G|l4EkogF21DtyLW3bEDnhi;tuq<>4$UwO zBQT64+f}`is3csm!8Lm(`PEnA_FnSPY#;hAGDH(MMr;(!6t;Veo7jcMd$AZkP zF~T_(BY?$fWmt9^VNjuEbTUUujB$%=nMQKcB;LXpEdW{NEY@XHA&aAqLd67)DyKKC zSe{#=XpeED*b52e=t6y937bcfX+e?MHLfEX_ZK$haxoqj4GB8gkpKi>63rIc9Z(TD zX8E~3tcw=uzb95)i~wl`4Y@}~01I)7Q$5Rq9NnqcM|9DT^m^k{+QUSbgvi;FI1k@*mLQjMWoT3MkPqo5lttXQjGd;NJza#>QTlnW)h fyu4^J?lc}5)m_ZHbndFYqQY2_UWc#hFY5jadfKj3 literal 0 HcmV?d00001 diff --git a/Data-1.13/BigItems/p2item245.sti b/Data-1.13/BigItems/p2item245.sti new file mode 100644 index 0000000000000000000000000000000000000000..132e17703e5e2bd8d78d6b3884f5f5a345d46f59 GIT binary patch literal 2681 zcmYk6e^3)=8po5O6tE+Qu|dwhHbubLxPVZJy!MP;*kmi{+OW_Fw4=!efryK2I533N zhD}nIxGF1bY|PPOoKg#%zi8YlogUm>JzKHUo13{#JA>!VwbPlK`{Txc_3qu!&fT*= zW+(H>_kG^y`#f(0UGu62#nz|Qw?<<`&janrr!-m(y0fyf(!Z{}{{Q=bKmP}j(W6k} zYItV5*J1p1bEU_=#eb;$AhDU;p&#k2cqimI(q`6YYAy`aNyp)lre~SG#W8>5k)|r~ z_@1r0r`kJedtJ}IJLK>W)V@qZ^c$arlWC7BeA}xWkXfrs+~LXnOF0DuFdDX zbstFW@ged=UsI?PhB~*O^VMA(s_X2r1^x9GdAzsNx?}6Qsc;?BN?em#u8%gj4w>FK zY<{W2==0W`?y4~s=TArLHmuKx4DE{vt|Rqj3E!?0eAC<*i5pj4m0Vt~F4hY#j&5rKw!_EO2|XqFHeHl6kNIi`PSiep_+49L7Fm&f?0CcNMAzF#Hym*v zByE++k-7qX-eGceY`i@=V&6xVczbq@xGS!oqCZb|&{dhAf7r(lIHO$swXu$ym-;t> z+z-!tgZ^4&ta)|T+8c4tl~afBek@4GD~8XsUQhH&1Jxge?6=~~jZ?OdM(ewqbFeaf z&!Jy6+Fu>@mwk0d+PNcZn#U(YRoAXWpIN)gd(?hC-U9a&&Ba~qES!zL5*?u4ux#Rc z_WbF>Yqu|U_Uz9emk$2;y)qwf?e|MF1OlJ+r@g`?h5N>gySQd&OAqmgGRy zx@U6Zy>;8nmN>WFVtJ*ze)Gg&v;6+C$ur$U&G}Mi$@TbadA}^|ah3n^JUrky{LN+8 z?tE=k{r*eub(NN_{_9-e;nz}wQTyHU%?Dp{KYsJU1z)9dZQw1o>8#uxbwlro+TZ#& zM+a&@PJQ(EzX{XfmYd0@Z*R15%fv^msj*{cN26bS(z$&5 z;3sn(|G3$GF;K5JgP~F#rRoCv zT(xaD7ULaiE*!>y@#j=Fo5Dyrp4M#{4)7Z(ilFTF7iMBVpoqm{pH{O#!0|GbEtJ6& z9>+)<09OOP0Aew0Zf^dOivI8!dOqcWz_Mxfm;w?Kh5-z-m3jh$e*aFLquT!PUyq+W zdHlm?2#&>oyVX*p>RM$HIMod~28RP4-s2h6ZN#{_`6rJaJ$n3DMNcN+W@3ebVg#IE5(2!1`=oBTV zdv#@f8&+vHneUk@i699u4xnwIT$j`6p^+cubgPQ#^@AYeDrO_7HNa*A3Ni<`5Y6-o zYLzYYM7mfj`3h@L={T?iQK>`%S5U%?pjIGMl4GP5wN?ONL4dIl6Sgctc1d;%GK*no zYPeKNEkLNa&^S)x1U1n_ia0IX+-6qBS#T5rRuLox%^2pCIzkA{#<4YMUNIYv<05Hu zGXTvg*Z|Rx0akWHi_s*%u7ci0+0abksBBGu#4tR<<`M*#;*fi+LQuHD%t$#ZScK!C zIYLtkjuRL`MHYa?V&NE|a0(6=7iA_zFKkbPkz5c2w7eLhah8zH^vz%}N}3dzrfJD3 zzygQ+{(2R(;(1KcmkcD62@ekvu-$aYY+7R$34#DzATSK#(7iXL2^VG4d8?ss_JMky zh0pP+h}nFvl6mm)gFqm`^Zek>6C2N_IXpM3VpB#2=KzV>Sqx7Ca9@p=}PVv=yW*|5wa9(p3K<2Z<1jcfng-ss_GR*BpK78){l>Zo9#K@bF45`N;W%Y>{b3bKNLOlqw_LO3p-&RfkW3N#py(e!d!?-=ScT%mBB zq9Bu@cO%Y-nKzhHGI9y0k)qV4u3IiH;1EwA3o^4t52sj+04B4UVc7|UL4}sl$s8`y z$4$;98p%zNcr&9n0hB6dGA|hlSR6SD6$8|(oYt^xx@U@@9^*!^`x4rt6Zyar7PlnR zf+DkPoCng}U)Yq>$+%fGBC||2xd+AmVF LmDqn?ds_2fz+2`j literal 0 HcmV?d00001