From 5dbe7be29483b10252e20a82bc458dd4a7adf24b Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Tue, 18 Jan 2022 21:26:21 +1300 Subject: [PATCH] Fix on-collide explosive collisions (#6186) --- .../Weapons/Guns/Projectiles/projectiles.yml | 67 +++++++----------- .../Guns/Projectiles/grenade.rsi/grenade.png | Bin 2392 -> 2016 bytes .../Guns/Projectiles/rocket.rsi/frag.png | Bin 329 -> 1836 bytes .../Guns/Projectiles/rocket.rsi/smallfrag.png | Bin 266 -> 1296 bytes 4 files changed, 25 insertions(+), 42 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 819830ba62..04bc34c0a2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -33,15 +33,33 @@ path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg - type: entity - id: BulletBaseFlash - name: base bullet flash + id: TriggerBulletBase # Trigger-on-collide bullets parent: BulletBase abstract: true components: + - type: TriggerOnCollide - type: Projectile damage: types: - Blunt: 3 + Blunt: 7 # more damage than a punch. + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.45,0.15,0.15" + hard: false + mask: + - Impassable + layer: + - MobImpassable + +- type: entity + id: BulletBaseFlash + name: base bullet flash + parent: TriggerBulletBase + abstract: true + components: + - type: Projectile soundHit: path: /Audio/Weapons/Guns/Hits/snap.ogg - type: FlashOnTrigger @@ -49,8 +67,6 @@ - type: SoundOnTrigger sound: path: "/Audio/Effects/flash_bang.ogg" - - type: TriggerOnCollide - - type: DeleteOnTrigger - type: entity id: BulletBaseHV @@ -162,7 +178,7 @@ - type: entity id: BulletRocket name: rocket - parent: BulletBase + parent: TriggerBulletBase abstract: true components: - type: Sprite @@ -170,13 +186,6 @@ sprite: Objects/Weapons/Guns/Projectiles/rocket.rsi state: frag - type: ExplodeOnTrigger - - type: DeleteOnTrigger - - type: TriggerOnCollide - - type: Projectile - deleteOnCollide: false - damage: - types: - Blunt: 1 - type: Explosive devastationRange: 1 heavyImpactRange: 2 @@ -211,7 +220,7 @@ - type: entity id: BulletGrenadeBlast name: blast grenade - parent: BulletBase + parent: TriggerBulletBase abstract: true components: - type: Sprite @@ -219,13 +228,6 @@ sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi state: grenade - type: ExplodeOnTrigger - - type: DeleteOnTrigger - - type: TriggerOnCollide - - type: Projectile - deleteOnCollide: false - damage: - types: - Blunt: 1 - type: Explosive devastationRange: 1 heavyImpactRange: 2 @@ -235,33 +237,21 @@ - type: entity id: BulletGrenadeFlash name: flash grenade - parent: BulletBase + parent: BulletBaseFlash abstract: true components: - type: Sprite netsync: false sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi state: grenade - - type: Projectile - deleteOnCollide: false - damage: - types: - Blunt: 1 - soundHit: - path: /Audio/Effects/flash_bang.ogg - type: FlashOnTrigger range: 7 - - type: SoundOnTrigger - sound: - path: "/Audio/Effects/flash_bang.ogg" - - type: TriggerOnCollide - - type: DeleteOnTrigger # This is supposed to spawn shrapnel and stuff so uhh... TODO? - type: entity id: BulletGrenadeFrag name: frag grenade - parent: BulletBase + parent: TriggerBulletBase abstract: true components: - type: Sprite @@ -269,13 +259,6 @@ sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi state: grenade - type: ExplodeOnTrigger - - type: DeleteOnTrigger - - type: TriggerOnCollide - - type: Projectile - deleteOnCollide: false - damage: - types: - Blunt: 1 - type: Explosive devastationRange: 0 heavyImpactRange: 1 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/grenade.rsi/grenade.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/grenade.rsi/grenade.png index 649683ff2cd9662eb4b0ea63d50812063230fd24..36551214808a0b09035b67f6a45b720ee938457f 100644 GIT binary patch delta 1976 zcmV;p2S@nW65tPzB!97bR9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3004N}wU=vp_UNo14rtVLnUe4nIn$c zYtM?C7O&%KQ>^EDj(Wes^QZoh-(F;N6}07gE<1(kgDr~5hdd!E)0=G^}_^Lb6lS}{Jcj0mSn%Tar(|^kF6o=cWc#Al97zlUPa;7m(!9U?%&e?G`m^eXff#$$DL+UBR+m>ot zNt300+Lzvm1OtnY_|Eg(q8 z%?$=>9G8ee={>f};ao6|VhwjXCt0@uxCm<#ltC=l6gd@2oTB6`DZ!5od=#4JQu6?T zM3h$w1~vtmAh~5<8*?O`v6=GKjnV=TR2Zq!Ku7_rRzmzpZHOVILNyQ(lTf2h%7rTv zGYfl-QhzB@g@i?Q*MFkFLBF1A{QLpe?cxdx|`frZr@N_dUlj@0C^U=Ph&9@ zHmgx{!(aTJHvF!DZw2K+N(Gv1oo?B>YSZx9c0BFs}1PKD{mJ`hSIof>^UvL}|P zGTdxP&a@Xo9H};$EEo1F(gXo!56R^Eeq9pM%+=wT1Lq zHYwp^Si~S(xsK@E=IRq5sj8tQ1WTh7GvC-C61jF-9%@x|W3yXD4duxg32GwUxPL@s zVJq-Oxr`fQ?jWz{0cK82PcU5yOs71iDHuSD9ti2MQO`Pn*e0aA4bX^_U6q1q4Bf{< z1wggftt#}H@N1n-;Sog7@aPGuowh`XWiIdm9n)rC_yAf$yIJLk5EN8K@E~3a*t?Y{ z^Mc#=vUz1Dy2?jkbg*jM zJA2UXoGlotk-unA6?im38TqO?6tC!S^IG<+`@#?X3T~-dBN&@9BizN5WqU|6i(Sx-?|je zhhFgh2*PEs??Jz``Fw2y{icBbRgidIhQ9%5sML7u3dR}$000JJOGiWi%K*y&s?2{; z;*)O&9)IQm5CjV!2t`ox00057Nkl?U;$VFo5g4}QmeO`7hyj4;C~sPfV^-HKpEgg6rbyI9SAyGAX5hN z+;k}2Os4@l0Q?mLegOcKuCLPoN7FY4v<~NJ)Pdg_!bTnM zz#<3mX0r0r<9U|rLisQP;OZ;^btKY^xYUs$0HhglW5Y9WaWV_jjJN4snbTZ@Wa=$C#1$ToL^omFm6r4j)8-3L-Xx-@RS)9pzBczx*;qX1U# z1ylq10000< KMNUMnLSTXqvb5R& delta 2355 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 Z);DM(mUB}13+?~_002ovPDHLkV1hWbT;Biy diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/rocket.rsi/frag.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/rocket.rsi/frag.png index 93251cdc2fb0608b6c0fb3685cf136572af99191..42dc20259d72ac889c3ac9d8c0471b3b334e4fe3 100644 GIT binary patch delta 1822 zcmV+(2jTe10;~>@BYy?1dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+O=10mLn$& z{Ld+J1P}JRAj^nm1Ow)j>q(XM{pTC#;3onW}xx`X(&DrCX zYO17Y6o0%98+_W|`$gw1{C?3{5RkNr;iIZrt!3jSf~ zXe(R$99PbXA|3tV{O#)boTd-%oFD4vv^Te&ekTDKgE3zuM>B@#@ttjzXdj9S8}J=s zCTq!V)A9WpJ9jmoz`I&c*m*ts<0BN#=W{@Q!szS|{L~+>W$0l?;lA?24a!##e8O(6 zQP!G=cbYPg%75;3>gLLBVPFH4aX*%E2|kRr?5pA`aIu520X7@1?m`U&v{y)B1Pv?9 zZF}h0Vxma`OVlauz7mBh^-V^yD=d;&<8ZNnjSki#y6M_W*z4B4UJnH;kARUBFj?5l zK3(or=bv2HL~B{-hTzME74}6IHQ0tRXWtkFLc%&R<$sOuzTAhn@gIndV30S=1rDlj z#}tjjJ+|WJIbt096NiBOtp^2}3anRV(ytgX1x;+2=Ivg*={wUgCH z*1{8WU$YiY){L>V$H|>Fbc@`k2qq_NoPjY)0e_5(F@S(3`zo6^6n!h;8f>zC&xwIcSQu5*rlm4v5>WVFLfZrN}Q+Wq(oC zh1fDXr9-z#$wBtbmzz&4scD%wJ8-O-b{>t4>X|nr{ukEy{}}Kab}#2{3-2D3-=giX zaiXp^oN<^Kycf*MBcUEVl<1Nq$Mg=NrQ*ICa9{6`S!y^jXHzqMD*oR@oOK88?jWEe zL!mv@KLzygI1PUbEB8~7Zy3AXLx0FT*%;@@3bpi*7^Is4UvR&zflz@cg!)rk$!RF&>Dkqerll7n^Cih6#L=_n5hyy(QjYx9e484~TCJa65ZJ340 zjQ>kpevbX%?<#U#sG&yPCVzhwUhYj;+eFW*vo#$dq4SV;6y!2$WnkDiKYw8@c;k-24YJ`L;%YG%K)m(e^KH9 z000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j&3~1Pl$dy|;Y;0Dl1gNklhL4!LNE6BLf2igM)(u$!4)o;(9eBUIqq+&lH6K z(?CbT&~^Zisv9&KMrsIrxxI_w*0}*pgxTHi7z*dUqR0UhWkYpcxe=ZVMjb#6Kv5!8 z)G!~7f`N6w{TnA4Zhu~WME?d!L7wM-1_lO(o0lIkJb3UPE`I&~Ge){4Li7ZP>=2qe zAkX6q1CJ^*!xx1w47bEs85kHC7aWsQ>@~ delta 303 zcmV+~0nq-e4#@(LBYy!9Nkl061{q0GQseuJixS%@-M_&tC>M$HBpY zWV4vajRBD5iW=q&3JQV@nTb*V$u)lFcJK z1gHf@9WdYyU?E3Sp2rsk9#v+BFA856Zi%si#daMO03|~DIDcT$4ju-@2Y(sv-{4`m zdHEe!?7@Q%j4q7;l~ zLy8=LTo(+81E>K;9Wb;VFkmGi3`{K*Vz_mVl_CdF6aqY|ZVYNhyaVR|Y5)m59WXF3004mrR(%}Ob>08~002ovPDHLkV1hrt BdVl}` diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/rocket.rsi/smallfrag.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/rocket.rsi/smallfrag.png index 504580ce499af44c0ec40a1daf024df5e2ffbdac..7a119c1ec9f803743c20ec19a6d540ffb7b9c5d8 100644 GIT binary patch delta 1277 zcmVaB^>EX>4U6ba`-PAZ2)IW&i+q+U=HGcH}4w zhTmDmECERf!E(gyoY}!Fe|{);B~|J4C7pSh6H_)=g@w>31Y!R3_X>aE;wT)FTFEu% zh%41p+0iKRcHL@<={(QH*I#&lkcayp43VIg+iRXze}`OOK7X)u$=jnmSikg?OA*C~ zp=FP}+gHDGDH6WP>3R?K`p(m<>0CGWOYOI5J-sJ`Gls_FBc4JM@yvS^**A-$COk

Q+fJz{1yk%GHbAqX^gxvu-d>bwkkg`h z>P{UdCZ24lnLEpo6)~>d4~(=6EjFn#f)vo`pe7LW-4;6I)-ztGf{_QICli#>A^TLq z_kr?=%R5K8i6v9Z zW>&147k??KXvxJ&DYbazDo9~kbG1-Qt<@caI#fHpcJy#>+@z(ZEjMeW)#e@H(^J=; zyY9OD=l4l*($3pzf-%YK2oD6azCa< z7qv|+oqqO04PvuzDrlz@-ONCY6M?vG0tjf{%zt8`lz5Zd%wlCM3T03u-EanNVj!3% zu`ar^dm;BjZb8#;apU*Mg^lhr$c2sWBKMZtcc=|NJBl1YdlhbekXi{+Ncv)P0WG zMt@=VJbSdVcDMam#vW_(p0(lQ*8EhF^{%?o99E)QTO;G-VC?DEA@4MDnwN36Iy?(L zTEA6fI2LA8c4KXcTrK+2?AWHgllNJzHMq-VBKK_m&5_u{Cxp>D>x!W@N}YO_4B>kW&+GV}FgYy5U?$1Cd!LviCSn#^In&EAP1}e1e~! z6d4N)KUE!R;=ssDd&B-Br^0D{5X}Xr-z+q$uj~uyllcEw5y4doBlemgDvQf#?Pdmc z)dw))ld{N{qAx}Nxgx=7sD^(5!u_*4=nTZD00006VoOIv0LuW&0IJM?QQ`mq0DlQ^ zNLh0L04^f{04^f|c%?sf00007bV*G`2j&3~1Pm#NzEi9K006j2L_t(o!(%*f-~huw z0w#t52BQubb-<_thQ0$b(@Xykhy$)(dG>$a+|B=mg(Mg<(@X!)o4c7ThcHrF6wjNx z`F~QfFXMnk!RaH*2R02TC3W@@dBYyzVNkl