From 3ee808fcbea38c312989fb404bd915e5f469a98c Mon Sep 17 00:00:00 2001 From: Jackal298 <129199891+Jackal298@users.noreply.github.com> Date: Sat, 29 Jul 2023 09:09:33 +0300 Subject: [PATCH] Syndicate Sniper bundle change and rework of the anti-material ammo box (#18414) --- .../Locale/en-US/store/uplink-catalog.ftl | 2 +- .../Prototypes/Catalog/uplink_catalog.yml | 2 +- .../Guns/Ammunition/Boxes/antimateriel.yml | 57 ++++++++++++++---- .../Boxes/anti_materiel.rsi/base-b.png | Bin 0 -> 289 bytes .../Boxes/anti_materiel.rsi/base.png | Bin 289 -> 355 bytes .../Boxes/anti_materiel.rsi/mag-1.png | Bin 2476 -> 499 bytes .../Boxes/anti_materiel.rsi/magb-1.png | Bin 0 -> 2476 bytes .../Boxes/anti_materiel.rsi/meta.json | 6 ++ 8 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 076966619f..32fbb11bbe 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -141,7 +141,7 @@ uplink-ammo-bundle-name = Ammo Bundle uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW. uplink-sniper-bundle-name = Sniper Bundle -uplink-sniper-bundle-desc = An inconspicuous briefcase that contains a hristov, 30 spare bullets and a convenient disguise +uplink-sniper-bundle-desc = An inconspicuous briefcase that contains a hristov, 10 spare bullets and a convenient disguise uplink-c20r-bundle-name = C-20r Bundle uplink-c20r-bundle-desc = Old faithful: The classic C-20r Submachine Gun, bundled with three magazines. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 40801848b6..d40abaccf5 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -589,7 +589,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } productEntity: BriefcaseSyndieSniperBundleFilled cost: - Telecrystal: 6 + Telecrystal: 12 categories: - UplinkBundles diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml index aa07a756d8..c7980f845f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml @@ -1,25 +1,60 @@ - type: entity + abstract: true parent: BaseItem - id: MagazineBoxAntiMateriel + id: BaseMagazineBoxAntiMateriel name: ammunition box (.60 anti-materiel) components: - type: BallisticAmmoProvider mayTransfer: true - capacity: 30 + whitelist: + tags: + - CartridgeAntiMateriel proto: CartridgeAntiMateriel + capacity: 10 + - type: Item + size: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag steps: 2 zeroVisible: false - type: Appearance - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - ents: [] + +# Boxes +- type: entity + parent: BaseMagazineBoxAntiMateriel + id: MagazineBoxAntiMaterielBig + name: ammunition box (.60 anti-materiel) + components: + - type: BallisticAmmoProvider + capacity: 30 + proto: CartridgeAntiMateriel + - type: Sprite + layers: + - state: base-b + map: ["enum.GunVisualLayers.Base"] + - state: magb-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: magb + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBoxAntiMateriel + id: MagazineBoxAntiMateriel + name: ammunition box (.60 anti-materiel) + components: + - type: BallisticAmmoProvider + proto: CartridgeAntiMateriel + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base-b.png new file mode 100644 index 0000000000000000000000000000000000000000..1bc6823aba964575b1370c90fea97ce09a0a5752 GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7oIMTAr*6yZ3-SR9Clz@#<;ci z3gcoviP8frnAw_{BR+U;yC(W?d7J80-@iR6mJN-Kjf%QQ8Xms5X`K?8le^}SLH1eJ zJy{%9Aeo1+{_3Y#HEfv0=+6u^qkvstDu=q6+N9JUS5H6JEI+WuR9r%WBSqDVA&z}d z-OrYT2c4Q58yP2wZWXQUFcOJ;+bC>)qMU)5d5J+|gSAHvTMv_(?h%I0_5kk_j4A3) zPcA5!rEFkaB&29IVVXeKA$7Hbfma!yM0sptp78kBflgf)Ni8kC!v$aeu{OPu00H-E fH=sj4@-Z-2r&}MITb+3u=w}8`S3j3^P6I_N7>Oo^jf9_IuTx1ww0*5L#DqJMlyJ`LqYs=s&oN{sgVINVzZJ;Rke#AE8$=*W zL*{#~4Yt032oKf^*w_WKfbGh)1U|uS?1EC@SC#WPvQbQd7k_2lU9WaWM^|7fTdbNE zzNdZ&m(0?T>551NR4K|DzUOwkU?L)I0RWt$Jqy+gC0q;_Np24u;f@=$? zM0DZC0-}g%&J&vQP#$ABZ0mM0Au)90=Dv>f5oG~ bC}1-$VVkX9WWj}V00000NkvXXu0mjfqc@P^ delta 262 zcmaFNw2*0nay`QfPZ!6KiaE(P1rHbwJ1{L{+**5uaWS7n>46o@Y|YFOA3V2R6aBZm zP4%kp-<}l9hQ`K5McpF}4`1B0PKnIPU317F`z-68EDkG>%)?iI^;4`GHq2u5X9k*4 zz%DSAL)}bmQtFSZr=M$Pu_ zZ4@>?QO>~3yu_ff!P+B-t%pfX_XtC0dw}-|#uRm@Cl?gVQZ_Iy5>hmqFioKAkhm`4||i)2$E9tPexp&)|(1HnmRPRb3Bq=?Uul_5B)s-rv!q`$ejd<%_zd_C^{G)-wgfT^L5L3Nayv0C5j+MX+5Z zRL9mrvU1%ng8=O|#0wng?nZ4ZoKAk6`mkL`jvWN|vO??tfO>CFA>Qo#fi*Wx!S^2s ziB~Qq2bht7kUhA>g|siP`4O3rBPo{vW`hv!4Xl}xBU2}H7vLoXz|+nIelGduA((Oz zHzDWn;evlc1RTgyIpY}%;6xUJd7jD{C$|6w81*jhfl-Ol@=F1w17mmK55qj-c$8H# Q^Z)<=07*qoM6N<$f(aPa-2eap delta 2467 zcmV;U30(H`1FRE}BYy^kdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmh31F z{AU%j1SBCI%K-%E%no|_6T+^ntnBQ*T{ZoA?J7fJEFeM(L|A|PcZdJrVy!hKEj72C zBd*j^jNvyi`~C44QI}u=zj%5Xy2IX!I#2S#MjG-6|klU z=86UOI4%=I>C?C5@GMaSx~6!=3l+N!03wX7m<$ORh?ztwQ!LDd2sl>o(=l_F!~+bF z24%x6If-PDQ`yJHH-%1LR=%1cFDF2<6j0NogRGP^WyD*B3-zF)Nma8Jt=hC_$ti2j zxn$R=UVo&dq9vD7YH6icsi|tswbWW$?Twp2#x%6tN~^84-Z5xT9kx39cQgzhGSbkI zM;Udr(I?zzrl~W}GV5%!8=Dv;AXv6y)tdE13$C=%(v??Pb+y$ud~M54TX)`N*WGr1 zuy(Whm90uS>r>L_bZ>Qp}CX~6XbHD&VLyg<3wP*I0JBKcFtm@l-QYb&SGN; z0^Pza)yXk(#=u}&#JcIh-6wN@$y)%r-{pqa;H&SAJ}e^2GYd;91maXaC@gBttp9V9@D}a#*E4uQ@UB)U1u-L z_8c4OSwr|+-^!<)h36g$MKA~gkDa{7>Up$~ud={$w9chLQXqA6s26z01$oI%qcw)c%$ z&4c6vQXtY}nUdhD2-8zP-_4+!Woi1?bY*2d0NHFd~!nWhS0D5yCy8Ce~bf%gp32+jo(iU9Ggz6q5)_4pzjLi|wI)4|=b32P+Un8j>xMP{{3&TrV+5IOV8^B_3z5pQ3 zFqCrLV%saS=G-|Qx^5&f??uCWZZ;Ft#3F`9h&Yx!Fs)eHz@%4HEb)UgI70Q7#k#dev#hK3yk7n-m4RJHwkzAw)2+UoR2Tg`1)p0fQV2@s$xuzO4d;0cb zy5^X3LMb3>2s%&L;G7PYkbfVr)Vliu93(<06H>C_isC$>s-Z&^aRzBE`MQ?jF^53_ zAQ81eTEsb%tFo%eLQ?rqxm3Tg)9%*RSgl?aMleMeV*?NlNJFNIwFLt-iZyxx9FPgq z>5#LMHzR~ES27}(XB=P+ht1*w?Tf@FjFcN-ZzR7++L3oR{~k+Pxqs4!X%wJfwnmPS zzXk?xmfS7)n)%I|zq{n{WzD6j%K7!B&t7V>&=!u(ZE2xoOECvFJ;JmCTmfZFT! z5JAp=+}nmHAS5r|{n`CFc3wM&&))71wLm;N;+977ePF?#I(%qh)4-Xf55&k7%ncAB z{V$NKQwc@gHL`rfiGOnZ$8qvphVOpx+t9bljRRK;{{u;UEHgL3J{$l50flKpLr_UW zLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~lPMJgh8P;tmmoh*uqI7$_ZV4<`XT6HkF^h0RU zkfgXc3a$kQKNhPFF3!3-xC(;c2Z)oSlcI~1_`jskBF2N`et*2X_qclp2=y{k&5m(E z)hr_wkBQmbiWq!F00Ri27h@7L^+b9h1JChw4J|`YE=z_$LT$f#b<6LxD;F)0~lbRzA6N|+*mfM(>43&6_IHIT; zpMTLe<$%6hplj9bt+|iW2OvXT zE!_YIhrmdYve!J`-PzvTzh|2L{Q#2!as84N8S0LaQO0003ONklvJkK~R)MnaAhDq#gH~W6 z075Mx2auf$kVAvmkRdw}VojI{p{T)r`8<6cK(2-4IFkHP)T+U$} h?Hn16I$*>*008VkfUmW671RI#002ovPDHLkV1j^6p7{U( diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3ff1180051b7aa4eb6c97222d32b597f487184c0 GIT binary patch literal 2476 zcmV;d2~+loP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmh31F{AU%j1SBCI%K-%E%no|_6T+^ntnBQ* zT{ZoA?J7fJEFeM(L|A|PcZdJrVy!hKEj72CBd*j^cZ$lKn3@tvg*X^F&bk>vXC_*Xnx)H~wtl1_`r8~nlpx;FqmYA^W3kD19Q z9G9VwW#t!~?sn3bc6kiLUuH!77@5D!D8&|^uP6NWwz~JaR@YMwfGgjN`dG@Tq2quh zIiF?R1^cN-7Rm9iJi50M>2j+?e_BbvRL+R7EJofDN`)Wg$OuS@Y6AKmc#=LkOpPLEIEl}kW<;m#y5pdUsk@FAulIDvJ_C$ zq=T%KG-bqFg$wndqDfV=7OmQ}XUQpR&begQsa~X{q9vD7YH6icsi|tswbWW$?Twp2 z#x%6tN~^84-Z5xT9kx39cQgzhGSbkIM;Udr(I?zzrl~W}GV5%!8=Dv;AXv6y)tdE1 z3$C=%(v??Pb+y$ud~M54TX)`N*WGr1uy(Whm90uS>r>L_bZ>Qp}CX~6XbHD z&KVfvL}0u)18`_|&SIsM*qL+AVq*yc-NG!@$uV-qz+hU$y6M5)Cv$(vTL8M><&EDl z7o56(gSp_;Ju&xZ-rlfg{m88xf;47Ndf$J*qOViIiD@3w!Wzbm${JI;S=?P`FU$5E8|hg?_*>t~r<{f79tuS;2m+6tyvOQ!w2-f| zz;d+Cr9o04b#tf}c*g~K$xfp;D9(A^o1T)Fww=e)jh28Xd5_PJCl{O}6)qS+jo(iU9Ggz6q5)_4pzjLi|wIv37!JBwjoBdH&_ zW0~*^!%JG({U;zBz+!K{03gmVlyco-+bgo>+&LY(ZX_}9MZvx ztytQ?q*qid@q;rsLj^+Q_F}r`m~%oYAZiFYPuSp`4wjG~u++Ny0vselC=*h$;fmrs zp{k)n6mbS=E%~~Z;W39n03Z>yL0ZH)ldH0-$wE^3P`OmUvD5C>)>y4x6-F>c7h?ku z4oE|$inRp;G>SEP0UVGC)9H}2k~brSFIO@mmuDPc4TsI*0_}^$CXAFDU~eS9NZOHi zH~$_>TDj7PX%wJfwnmPSzXk?xmfS7)n)%I|zq{n{WzD6j%K7!B&t7V>&=!u(ZE z2xoOECvFJ;JmCTmfZFT!5JAp=+}nmHAS5r|{n`CFc3wM&&))71wLm;N;+977ePF?# zI(%qh)4-Xf55&k7%ncAB{V$NKQwc@gHL`rfiE{kMaq?V-?|$&x(6`Es16K?G14(== zGdICL8~^|Tg=s@WP)S2WAaHVTW@&6?004NLeUUv#!$2IxUsFp(Dk64JamY}eEQ*Ra zN)?M>p|llRbuhW~Luk^Fq_{W=t_24_7OM^}&bm6d3WDGVh?Ap}qKlOHzogJ2#)IR2 zyu0_fdj|;hGE>ctaX{59BNdN{+1!d4d_@2Q2%#5a5;OHgdLaYP@pTU$U+vrIQE;&tNbO-tvzPaI|?Ng+Nb9yREK#E)E;U4G+SbXee-VIz~8BMuXb z#Wt4Pn3W8bc#1fps2b%9S(g>gTb$K$l{N3lUl_`3%W1CD96}t6NFWIjGOE}>85W|n zYNVJ*(SFRsKj`?Am~{NR7^yIZp`IpHRSVnE=s84N8S0LaQO0003O zNkl>jclbE zWGq}6tPDwK5A9q415+kFWw1KDfZ^DA28LtjNnNEI}u_{m