From e152dd90dca3d9527bedc7989449edba945ba3ca Mon Sep 17 00:00:00 2001 From: Metal Gear Sloth Date: Mon, 22 Jun 2020 21:24:21 +1000 Subject: [PATCH 1/4] Port TG weapon animations Although the component doesn't seem to use the state delays... --- .../MeleeWeaponAnimations/animations.yml | 55 +++++++++++++ .../MeleeWeaponAnimations/default.yml | 7 -- .../Effects/weapons/arcs.rsi/bite.png | Bin 0 -> 464 bytes .../Effects/weapons/arcs.rsi/claw.png | Bin 0 -> 530 bytes .../Effects/weapons/arcs.rsi/disarm.png | Bin 0 -> 1974 bytes .../Effects/weapons/arcs.rsi/kick.png | Bin 0 -> 2881 bytes .../Effects/weapons/arcs.rsi/meta.json | 73 +++++++++++++++++- .../Effects/weapons/arcs.rsi/punch.png | Bin 0 -> 843 bytes .../Effects/weapons/arcs.rsi/smash.png | Bin 0 -> 6658 bytes 9 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/MeleeWeaponAnimations/animations.yml delete mode 100644 Resources/Prototypes/MeleeWeaponAnimations/default.yml create mode 100644 Resources/Textures/Effects/weapons/arcs.rsi/bite.png create mode 100644 Resources/Textures/Effects/weapons/arcs.rsi/claw.png create mode 100644 Resources/Textures/Effects/weapons/arcs.rsi/disarm.png create mode 100644 Resources/Textures/Effects/weapons/arcs.rsi/kick.png create mode 100644 Resources/Textures/Effects/weapons/arcs.rsi/punch.png create mode 100644 Resources/Textures/Effects/weapons/arcs.rsi/smash.png diff --git a/Resources/Prototypes/MeleeWeaponAnimations/animations.yml b/Resources/Prototypes/MeleeWeaponAnimations/animations.yml new file mode 100644 index 0000000000..ad05697497 --- /dev/null +++ b/Resources/Prototypes/MeleeWeaponAnimations/animations.yml @@ -0,0 +1,55 @@ +- type: MeleeWeaponAnimation + id: default + state: slash + arcType: Slash + length: 0.1 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Bite + state: bite + arcType: Poke + length: 0.4 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Claw + state: claw + arcType: Slash + length: 0.4 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Disarm + state: disarm + arcType: Poke + length: 0.3 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Kick + state: kick + arcType: Poke + length: 0.3 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Punch + state: punch + arcType: Poke + length: 0.5 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Smash + state: smash + arcType: Poke + length: 0.3 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 diff --git a/Resources/Prototypes/MeleeWeaponAnimations/default.yml b/Resources/Prototypes/MeleeWeaponAnimations/default.yml deleted file mode 100644 index c7fe845719..0000000000 --- a/Resources/Prototypes/MeleeWeaponAnimations/default.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: MeleeWeaponAnimation - id: default - state: slash - arcType: Slash - length: 0.1 - color: 255,255,255,1020 - colorDelta: 0,0,0,-5100 diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/bite.png b/Resources/Textures/Effects/weapons/arcs.rsi/bite.png new file mode 100644 index 0000000000000000000000000000000000000000..1826701a474ee17a0e8696a7d75f426e9120807c GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV4Uvh;uumf=k2WMz7_=m*HWY3 zNv}6;dZ#ZG^f2&~)s1UE0|OrvIT{2#FO5Au`{!cT3o{tEFwD9x{b7CW1<>~0gXQ`YUXE)D0MahF-O>QnY-zrTt`RdOr;3TLd`oYA23hwqEZD%Y>hDs#@i zV4U@e<45VXe?l>hk`CMp44E?+P0|>28;o-m=`j zb*~zQwwY^e*n5!k#=Qk^dH2b{%{{{q#n20~{3nxh(p<}rIw7&Zm}2mB^>bP0l+XkK Deb&f( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/claw.png b/Resources/Textures/Effects/weapons/arcs.rsi/claw.png new file mode 100644 index 0000000000000000000000000000000000000000..62e1234404de8e3ced101777767972524decf998 GIT binary patch literal 530 zcmV+t0`2{YP)$>pG`tdHnTN?m#u=6~XIi7|8 zFT+?w^f(UO_brU^Ed7UPz{=r)K>(|V2L=F?%q{i_OueL%|ie;t-~V#drU{Q$Y|=KPB@KtxnkJA{!=c4tAqzS0a%33`LMzRod7Jtr#3cbc!2mg%nqNr z>M+9tBmk?12S@;zPlTzlW`qYw09fHu*X*ACpjM&Y3AX>YsGpz^i752Lc1I2oD4W zU=yJ-f01M$YFM#aRH( z0vI`;XJ|HHAOpbae7@J8rAGkPN7M}eUcCWWG5pAqcmt4XiL<&A^!5kzs`@@4^*J+q z$o>G!^%$-{z%sm-zqI~u@RPy=L7xUg_6Jx#^jI#t<|W{v-5;>~19pGFG<`jQKSdxs Uj(J#XT>t<807*qoM6N<$f{GdH=l}o! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/disarm.png b/Resources/Textures/Effects/weapons/arcs.rsi/disarm.png new file mode 100644 index 0000000000000000000000000000000000000000..f9637828988bd2364b0be206639cb967e64dda6d GIT binary patch literal 1974 zcmV;n2TAyeP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+TB)dlI$i7{Ld+J1SBCOj>DI#a)TT{jmJB?JG(FS z@{%8^*kd!6u@K!YLE3-(9_cq6RNYfi^V(|7I7%yxJN|fn9FLZAx$f6d?^k&KWKaC| zf?*Q0a(}Sz{vCFG|G>&^AD`{X=IzICNAz@j9dbrK|JNPl?MV1xr~5gz`-5ITOy|CM z-fnN_ug}E*#!~nbPP~OAUw3|tB#*1(s<^W-zggt6WU;UKr6+XX0I2#se)%mjd50r? zqN2XwblXW^?D8C*KSe}*cj5OJ7ekTXV)}w##PW#!m|ZV50j_#a>TQbGKXe>`Q?Ab{ zPQ#`6Z`avydhU6GwS}pUlm{LfF%SC>Ar{_jXqhL=WpgoZJOMgMIVS~M zk|s+WtV}Q`F!M7Oy2fp1JPhU-c@cUt!5JMkKc4B;@T=!1M-fNnLO{BS6^0sm{DFpgd#-@)HLZJ zs}wC2`R0&NPbykewW_IW(_W>Ps%&l2>@#5;$&E1>##!XPhG_~5S zd26kA4BAVFua5p5hQUKd89M5);iHW{A)i^M&N^-SY_l(3vQPrjs>_zIw)&@6ksMF8hS%cZ^%>|uuqK7ju#)ZJR z9R?t1KAdHzQur`;ILnPCi6|pVJ>)DpjDf+ji8biS-8*wXhE~(F$jG4tn;omhidCT1B^z4ZhLr&6PBs!ESO>=S0Kv1>pCA{b5arCs6r6X$}z0RZi=~_@2w4ZVk~NQ>TPh! z+^|s3m}{DDM-0A{`e>NA7szl!=7E5C7n4pR{GQ@`T-ajpJs4xA5{JyC8MZ^~!iC_77@&t_An5`L`406=0ETe~^fL~HV zf_0#Q+P%SlBCHY^rT5a-l$hYgdT)>oq5yUq`{@cy0gda-cpVL-f6NYrE_Y%c?z5pf7uU9=!7;wV)t zf`!snXw|{w(l2PzkfgXc3a$kQKNhPFF3!3-xC(;c2Z)oSlcI~1_`jskBF2N`e!RQ) zxO)e9>t&`G9TR|}ntC!86*AdX!T*Xb^do>_jET(9;;F?nT*ucvJbb;2@GSRpe~unG zXE4Ac5YI79H;FfhXEsfZ^FDEi6-Al&oOoQP3lcwaU2^!1bHQdW&kX75P1HqO^3n9>^T7KVeNz_by9EMk zPH)Y9oIU_)>T3B0I5-4G3zWU?^6u{T-u^w)?C%Gw_Hw=g(rhyT000JJOGiWi{{a60 z|De66lK=n!32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rf1{Mk=2iYk91ONa4#7RU! zRA}Dq)ZGokAPh!P6LkPK$q3BO2;PJZ=#!%;s+yk?AoQNMNP*8_Km-5)00000|H7Re zkW$L)Z|}XUQRp^zl>F)J0Pnq1RZ-Qig_T_Rr;JhZUsnc&5S)lej4@jgcbr69oGo^3 zp66vF?7us2!?uRn`Ik;fiFvKbNAgS8U~}%(@Js$wqELI5N^gLwF1Ky(zgkbyUVc+C z#@u29?#e%U1G+L|6CTxo(VFnc2GE2~v}`~R`2YX_003a?4SR6+M)5ET$p8QV07*qo IM6N<$f({w52mk;8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/kick.png b/Resources/Textures/Effects/weapons/arcs.rsi/kick.png new file mode 100644 index 0000000000000000000000000000000000000000..9645f8b1dde493ac3e63e9e94cfc10bf9186ee66 GIT binary patch literal 2881 zcmV-H3%>M;P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3#rmLw?-g#UAjIRZ$CB57D{lNr?DKIjuC(N&C6ZG;uM@mdaIR ziaujat8|%!KWV=2bfgCDy1+tof}AoeAHJk#-G0|&vBt_PF;f!8(na&zcldGOpT55{ zbk3!DN;jBhPpt4uF28W&B6q);1t96XVrox(Q+T_?A72+(1wnhl+}PlV{$|20eR4}5 zoHbftYL0LDlInUHAVjQfIFl3vVo7SLq*xJ*l!#*kpMmG1SsVnC1(SuBl2r@fG`VZ@ zOij;RF?kzCUI4;KnhG>s2VmuFxsY!S3XNcD+02SnYu0TPExA}JrIxExqiW67YN@rh z+UscAaj2rU=0*iz1Nk-M11E*ex#@X{_gD_z7uFz+OG z(g${*$o&$xKy?3C+~h0d!iDbtfn2!IeS_T3xP5`z8jsxS1JKPvVv0g4>34D*()btu z={5YRf!`SFo2}a3+YrQJ1v4LHglgM#ni)xD$+6G+Exi)in)8r}jg-#jb}mO&2uRvMzBw)35cYdltDVMugh| zW>VxnbOrnUvG9Ox&~6oMBloZ}Xzv2+`Z|sCVRZ=r)~WxX^#apg!N~M zsu?Ps18R`&Ne=4n!AGh!^g!1-vLI=yVA%t7x<<1F*mHbUbXJDofAwqc)gvFg+o4o)8@`*?~cDY-&A;o)yh(ZF3aZ9hTjL zACirXRO(nJg*YrYJ4}mHDN$wR)Hiu_>gZQ22SSh6l|}`cj>(Z`&P19{MQ|h_ffv*A z_iO6c*MPD%nl_3?$@c(*BG7^*&rhyAWr-6t8ydIVavq|zAmwZum*|&J3%Z^<0(zyR zQH|Hlr@oEygTis1ZD_!bFI&Izgz7d6*)Rj?C1&?jMr%6nev)O5S&C=SH06-R_Js|EU?c@Xbim5>(U{UInZ2DNSZ=~l@^m6^O#BX=CqsS zv@}vFk3#{YP@`RVI=t5<20ylOIv$A*d(!Xj6DZU)A&#G8)IWm%5Bc*eLmV_$5B~)~ zF>fPn7n&OY00D$)LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#wNfe$77=mC&^lQV z6>*d*7QsSkE41oha_NWAq#;RhaTHt&4t^|F9bBAsb#N5~!4D88M<+!WDe-?vp+$@b z$NhMB?{W7I5E>PxnqA|7s#!)l5f^j$6*2IN9t*5p0lat9cC(j`N3BtK1|SOnhB=$rDu zz%3A5b$e^=3Jb1)mGP<@vb|xB?!Ytrao>eq9Ho&(@BuY2>k!!Vf~E&yTA* zge$C6#55}W06T`Bc0zo9PEPAC;D{^z-8^dLe;PfK@b7et_y{5*-+R?e0q4$du^st$ z;@qo0&3xH%zrMLsmash", + "copyright": "https://github.com/tgstation/tgstation/raw/c545428822f1ee0d402b812221518632dbe198cb/icons/effects/effects.dmi", "states": [ { "name": "spear", @@ -13,6 +14,76 @@ { "name": "slash", "directions": 1 + }, + { + "name": "bite", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "claw", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "disarm", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "kick", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "punch", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "smash", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/punch.png b/Resources/Textures/Effects/weapons/arcs.rsi/punch.png new file mode 100644 index 0000000000000000000000000000000000000000..a7b116ed6adcb93539dc2cfbd68848a4261f4606 GIT binary patch literal 843 zcmV-R1GM~!P)}idoO$Rda~{>6GITe0g*0Gve{-@zj#H_(fj>=Ux^<--WB-oqyWyO0M4WU z&ZGd&{CZa)BBhiM_Po}5OY;ih0iy=*rj+v0u1g3HzICbDdCUmbB;5CS%Jut3bMlq2V#FuLhvmY2`rb~JF)N=X zfV3d*2~m3<;N&x#lSbT}-O!O6Qoq%n1f_XDt%sz|SelkjEei7P)eUYvB;znQ{mdJ- zEW|jC@(^oRWTst)Sb$SJ0iqp#Qe|kOwh*&ycys-k0aoS;DcX6e>;+jFUozRkbWaV% ziGH~4rt)D6fK5o;v>IULX~g-O^;v-}z$mKVK3j!a{aPAdW0A$N18W_?$<(?huEgb* zbs6nXVZi`ZU-2Xid*lvdaQ1>u5T*ZrUA(o3*aJ=hiobKCaAs6V9YVYj!=N_Dc9%VS zP7&4vPDU~`hxLGy`4>abw~zujlL9!C0yq=mSc)aD*UPp1^Z;j40B2GFXHo!XQUGT} z0*p=`oN|0TBBC&qd-A|)YuNJ@q!lV2(7tQ`t&9W@-S&SLRp%LWH47bTaO`&UWdO>o!6(2XId)dl|yB>{ZlX$XK~O_at1j z2x%&Sqybj9BUk5@lMUY(4ndMd6}C{qo@o+2{A>(8;H1;YBW9PVBY+ApI%dsf$8IR+ zUhe7R|8)(9AZ#L=WdwI7HSY=c`BCpAB6uxCbWvNnC17a;s#8eH_1+C-MM2nS3>b&+ z9s;8D`ktu(qpLWh-|diw*9!qg11#l(>a3%$C<`0q4 VxrVi5PPza9002ovPDHLkV1o3&hUEYN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/smash.png b/Resources/Textures/Effects/weapons/arcs.rsi/smash.png new file mode 100644 index 0000000000000000000000000000000000000000..94e259a15417f0f5e976ec50ea442f2004ecf4af GIT binary patch literal 6658 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 M07*qoM6N<$f}4VB761SM literal 0 HcmV?d00001 From 8e56f6d985f8d4794011d2a60bcdb9a42f4d2ad2 Mon Sep 17 00:00:00 2001 From: Metal Gear Sloth Date: Wed, 24 Jun 2020 19:42:16 +1000 Subject: [PATCH 2/4] Address comments Split out TG arcs into its own thing. --- .../EntitySystems/MeleeWeaponSystem.cs | 2 +- .../Melee/MeleeWeaponAnimationPrototype.cs | 5 +- .../Entities/Effects/weapon_arc.yml | 12 +++ .../MeleeWeaponAnimations/animations.yml | 25 ++++-- .../Effects/weapons/arcs.rsi/meta.json | 72 +--------------- .../{arcs.rsi => tg_arcs.rsi}/bite.png | Bin .../{arcs.rsi => tg_arcs.rsi}/claw.png | Bin .../{arcs.rsi => tg_arcs.rsi}/disarm.png | Bin .../{arcs.rsi => tg_arcs.rsi}/kick.png | Bin .../Effects/weapons/tg_arcs.rsi/meta.json | 81 ++++++++++++++++++ .../{arcs.rsi => tg_arcs.rsi}/punch.png | Bin .../{arcs.rsi => tg_arcs.rsi}/smash.png | Bin 12 files changed, 119 insertions(+), 78 deletions(-) rename Resources/Textures/Effects/weapons/{arcs.rsi => tg_arcs.rsi}/bite.png (100%) rename Resources/Textures/Effects/weapons/{arcs.rsi => tg_arcs.rsi}/claw.png (100%) rename Resources/Textures/Effects/weapons/{arcs.rsi => tg_arcs.rsi}/disarm.png (100%) rename Resources/Textures/Effects/weapons/{arcs.rsi => tg_arcs.rsi}/kick.png (100%) create mode 100644 Resources/Textures/Effects/weapons/tg_arcs.rsi/meta.json rename Resources/Textures/Effects/weapons/{arcs.rsi => tg_arcs.rsi}/punch.png (100%) rename Resources/Textures/Effects/weapons/{arcs.rsi => tg_arcs.rsi}/smash.png (100%) diff --git a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs index 17dcde3023..8b95cb6405 100644 --- a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs @@ -50,7 +50,7 @@ namespace Content.Client.GameObjects.EntitySystems var lunge = attacker.EnsureComponent(); lunge.SetData(msg.Angle); - var entity = EntityManager.SpawnEntity("WeaponArc", attacker.Transform.GridPosition); + var entity = EntityManager.SpawnEntity(weaponArc.Prototype, attacker.Transform.GridPosition); entity.Transform.LocalRotation = msg.Angle; var weaponArcAnimation = entity.GetComponent(); diff --git a/Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs b/Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs index 765cb0882b..6150e3c173 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs @@ -10,6 +10,7 @@ namespace Content.Shared.GameObjects.Components.Weapons.Melee [Prototype("MeleeWeaponAnimation")] public sealed class MeleeWeaponAnimationPrototype : IPrototype, IIndexedPrototype { + private string _prototype; private string _state; private string _id; private Vector4 _colorDelta; @@ -18,9 +19,10 @@ namespace Content.Shared.GameObjects.Components.Weapons.Melee private float _speed; private float _width; private WeaponArcType _arcType; - + [ViewVariables] public string ID => _id; [ViewVariables] public string State => _state; + [ViewVariables] public string Prototype => _prototype; [ViewVariables] public TimeSpan Length => _length; [ViewVariables] public float Speed => _speed; [ViewVariables] public Vector4 Color => _color; @@ -32,6 +34,7 @@ namespace Content.Shared.GameObjects.Components.Weapons.Melee { var serializer = YamlObjectSerializer.NewReader(mapping); + serializer.DataField(ref _prototype, "prototype", "WeaponArc"); serializer.DataField(ref _state, "state", null); serializer.DataField(ref _id, "id", null); serializer.DataField(ref _colorDelta, "colorDelta", Vector4.Zero); diff --git a/Resources/Prototypes/Entities/Effects/weapon_arc.yml b/Resources/Prototypes/Entities/Effects/weapon_arc.yml index 28ea77f4b0..7f14f19f50 100644 --- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml +++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml @@ -9,3 +9,15 @@ offset: 0.85, 0 drawdepth: Overlays - type: MeleeWeaponArcAnimation + +- type: entity + id: WeaponTGArc + save: false + abstract: true + components: + - type: Sprite + sprite: Effects/weapons/tg_arcs.rsi + directional: false + offset: 0.85, 0 + drawdepth: Overlays + - type: MeleeWeaponArcAnimation diff --git a/Resources/Prototypes/MeleeWeaponAnimations/animations.yml b/Resources/Prototypes/MeleeWeaponAnimations/animations.yml index ad05697497..168d08c3a2 100644 --- a/Resources/Prototypes/MeleeWeaponAnimations/animations.yml +++ b/Resources/Prototypes/MeleeWeaponAnimations/animations.yml @@ -7,7 +7,8 @@ colorDelta: 0,0,0,-5100 - type: MeleeWeaponAnimation - id: Bite + id: bite + prototype: WeaponTGArc state: bite arcType: Poke length: 0.4 @@ -15,7 +16,8 @@ colorDelta: 0,0,0,-5100 - type: MeleeWeaponAnimation - id: Claw + id: claw + prototype: WeaponTGArc state: claw arcType: Slash length: 0.4 @@ -23,7 +25,8 @@ colorDelta: 0,0,0,-5100 - type: MeleeWeaponAnimation - id: Disarm + id: disarm + prototype: WeaponTGArc state: disarm arcType: Poke length: 0.3 @@ -31,7 +34,15 @@ colorDelta: 0,0,0,-5100 - type: MeleeWeaponAnimation - id: Kick + id: fist + state: fist + arcType: Poke + length: 0.15 + speed: 1 + +- type: MeleeWeaponAnimation + id: kick + prototype: WeaponTGArc state: kick arcType: Poke length: 0.3 @@ -39,7 +50,8 @@ colorDelta: 0,0,0,-5100 - type: MeleeWeaponAnimation - id: Punch + id: punch + prototype: WeaponTGArc state: punch arcType: Poke length: 0.5 @@ -47,7 +59,8 @@ colorDelta: 0,0,0,-5100 - type: MeleeWeaponAnimation - id: Smash + id: smash + prototype: WeaponTGArc state: smash arcType: Poke length: 0.3 diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json b/Resources/Textures/Effects/weapons/arcs.rsi/meta.json index 2b141cfdee..86a1ea6013 100644 --- a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json +++ b/Resources/Textures/Effects/weapons/arcs.rsi/meta.json @@ -4,8 +4,6 @@ "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0 for bite->smash", - "copyright": "https://github.com/tgstation/tgstation/raw/c545428822f1ee0d402b812221518632dbe198cb/icons/effects/effects.dmi", "states": [ { "name": "spear", @@ -16,74 +14,8 @@ "directions": 1 }, { - "name": "bite", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "claw", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "disarm", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "kick", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "punch", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "smash", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] - ] + "name": "fist", + "directions": 1 } ] } diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/bite.png b/Resources/Textures/Effects/weapons/tg_arcs.rsi/bite.png similarity index 100% rename from Resources/Textures/Effects/weapons/arcs.rsi/bite.png rename to Resources/Textures/Effects/weapons/tg_arcs.rsi/bite.png diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/claw.png b/Resources/Textures/Effects/weapons/tg_arcs.rsi/claw.png similarity index 100% rename from Resources/Textures/Effects/weapons/arcs.rsi/claw.png rename to Resources/Textures/Effects/weapons/tg_arcs.rsi/claw.png diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/disarm.png b/Resources/Textures/Effects/weapons/tg_arcs.rsi/disarm.png similarity index 100% rename from Resources/Textures/Effects/weapons/arcs.rsi/disarm.png rename to Resources/Textures/Effects/weapons/tg_arcs.rsi/disarm.png diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/kick.png b/Resources/Textures/Effects/weapons/tg_arcs.rsi/kick.png similarity index 100% rename from Resources/Textures/Effects/weapons/arcs.rsi/kick.png rename to Resources/Textures/Effects/weapons/tg_arcs.rsi/kick.png diff --git a/Resources/Textures/Effects/weapons/tg_arcs.rsi/meta.json b/Resources/Textures/Effects/weapons/tg_arcs.rsi/meta.json new file mode 100644 index 0000000000..116f323760 --- /dev/null +++ b/Resources/Textures/Effects/weapons/tg_arcs.rsi/meta.json @@ -0,0 +1,81 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/raw/c545428822f1ee0d402b812221518632dbe198cb/icons/effects/effects.dmi", + "states": [ + { + "name": "bite", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "claw", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "disarm", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "kick", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "punch", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "smash", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/punch.png b/Resources/Textures/Effects/weapons/tg_arcs.rsi/punch.png similarity index 100% rename from Resources/Textures/Effects/weapons/arcs.rsi/punch.png rename to Resources/Textures/Effects/weapons/tg_arcs.rsi/punch.png diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/smash.png b/Resources/Textures/Effects/weapons/tg_arcs.rsi/smash.png similarity index 100% rename from Resources/Textures/Effects/weapons/arcs.rsi/smash.png rename to Resources/Textures/Effects/weapons/tg_arcs.rsi/smash.png From c097bd9bef30c0296cf2f6e0a289d2db41f6e83c Mon Sep 17 00:00:00 2001 From: Metal Gear Sloth Date: Wed, 24 Jun 2020 19:49:10 +1000 Subject: [PATCH 3/4] Add first back in --- .../Textures/Effects/weapons/arcs.rsi/fist.png | Bin 0 -> 190 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Effects/weapons/arcs.rsi/fist.png diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/fist.png b/Resources/Textures/Effects/weapons/arcs.rsi/fist.png new file mode 100644 index 0000000000000000000000000000000000000000..337d57adc28b31a7e1d84c2eed5d212dedb6996c GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6`n4RArY-_ zCwp@pFyLVIeR Date: Wed, 24 Jun 2020 20:08:56 +1000 Subject: [PATCH 4/4] Update Resources/Prototypes/Entities/Effects/weapon_arc.yml Co-authored-by: Remie Richards --- Resources/Prototypes/Entities/Effects/weapon_arc.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Effects/weapon_arc.yml b/Resources/Prototypes/Entities/Effects/weapon_arc.yml index 7f14f19f50..2653321b72 100644 --- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml +++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml @@ -12,12 +12,7 @@ - type: entity id: WeaponTGArc - save: false - abstract: true + parent: WeaponArc components: - type: Sprite sprite: Effects/weapons/tg_arcs.rsi - directional: false - offset: 0.85, 0 - drawdepth: Overlays - - type: MeleeWeaponArcAnimation