From 77e71452cd9b3e8f5a45cbb12250eadba8e49566 Mon Sep 17 00:00:00 2001 From: rhailrake <49613070+rhailrake@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:35:31 +0600 Subject: [PATCH] sus (#226) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * sus * панки --- Content.Server/Antag/AntagSelectionSystem.cs | 7 + .../GameTicking/Rules/TraitorRuleSystem.cs | 10 + .../White/MeatyOre/MeatyOreStoreSystem.cs | 7 +- .../Objects/Weapons/Melee/e_sword.yml | 6 +- .../Melee/double_esword.rsi/e_sword.png | Bin 231 -> 0 bytes .../Melee/double_esword.rsi/e_sword_blade.png | Bin 1895 -> 0 bytes .../double_esword.rsi/e_sword_double.png | Bin 0 -> 149 bytes .../e_sword_double_blade.png | Bin 0 -> 813 bytes .../Weapons/Melee/double_esword.rsi/icon.png | Bin 1895 -> 345 bytes .../double_esword.rsi/inhand-left-blade.png | Bin 4267 -> 694 bytes .../Melee/double_esword.rsi/inhand-left.png | Bin 447 -> 313 bytes .../double_esword.rsi/inhand-right-blade.png | Bin 4267 -> 722 bytes .../Melee/double_esword.rsi/inhand-right.png | Bin 464 -> 330 bytes .../Weapons/Melee/double_esword.rsi/meta.json | 192 +++++------------- .../double_esword.rsi/wielded-inhand-left.png | Bin 0 -> 330 bytes .../wielded-inhand-right.png | Bin 0 -> 318 bytes 16 files changed, 73 insertions(+), 149 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword_blade.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword_double.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword_double_blade.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/wielded-inhand-right.png diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index a5a7cd89d8..b58bddc4dc 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -16,6 +16,7 @@ using Robust.Shared.Audio; using Robust.Server.GameObjects; using Content.Server.Chat.Managers; using Content.Server.GameTicking; +using Content.Server.Roles; using Robust.Shared.Containers; using Content.Shared.Mobs.Components; using Content.Server.Station.Systems; @@ -26,6 +27,7 @@ using Robust.Server.Containers; using Robust.Shared.Player; using Robust.Shared.Prototypes; using Content.Server.Shuttles.Components; +using Content.Shared.Players; namespace Content.Server.Antag; @@ -43,6 +45,8 @@ public sealed class AntagSelectionSystem : GameRuleSystem [Dependency] private readonly StorageSystem _storageSystem = default!; [Dependency] private readonly StationSystem _stationSystem = default!; [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!; + [Dependency] private readonly RoleSystem _roles = default!; // WD + [Dependency] private readonly SharedPlayerSystem _sharedPlayerSystem = default!; // WD /// /// Attempts to start the game rule by checking if there are enough players in lobby and readied. @@ -163,6 +167,9 @@ public sealed class AntagSelectionSystem : GameRuleSystem foreach (var player in candidates.Keys) { + if (_sharedPlayerSystem.ContentData(player) is not {Mind: { } mindId} || _roles.MindIsAntagonist(mindId)) + continue; + // Role prevents antag. if (!_jobs.CanBeAntag(player)) continue; diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index 26125a6da7..d3e38a15ea 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -26,6 +26,7 @@ using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; +using Content.Server.Objectives; namespace Content.Server.GameTicking.Rules; @@ -45,6 +46,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem [Dependency] private readonly SharedRoleSystem _roleSystem = default!; [Dependency] private readonly SharedJobSystem _jobs = default!; [Dependency] private readonly ObjectivesSystem _objectives = default!; + [Dependency] private readonly RoleSystem _roles = default!; // WD private int PlayersPerTraitor => _cfg.GetCVar(CCVars.TraitorPlayersPerTraitor); private int MaxTraitors => _cfg.GetCVar(CCVars.TraitorMaxTraitors); @@ -184,6 +186,14 @@ public sealed class TraitorRuleSystem : GameRuleSystem Log.Error("Mind picked for traitor did not have an attached entity."); return false; } + /*if (HasComp(mind.OwnedEntity)) // Cause no CultistRole this why i supposed to do this....... + { + return false; + }*/ + if (_roles.MindIsAntagonist(mindId)) + { + return false; + } // Calculate the amount of currency on the uplink. var startingBalance = _cfg.GetCVar(CCVars.TraitorStartingBalance); diff --git a/Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs b/Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs index 91d58d559b..e75015cf41 100644 --- a/Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs +++ b/Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs @@ -1,5 +1,5 @@ -using Content.Server.Chat.Managers; -using System.Linq; +using Content.Server.Chat.Managers; +using System.Linq; using System.Net.Http; using System.Net.Http.Json; using System.Threading.Tasks; @@ -8,6 +8,7 @@ using Content.Server.GameTicking.Rules; using Content.Server.Mind; using Content.Server.Popups; using Content.Server.Roles; +using Content.Server.Popups; using Content.Server.Store.Components; using Content.Server.Store.Systems; using Content.Server.White.Sponsors; @@ -18,6 +19,7 @@ using Content.Shared.Humanoid; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Roles.Jobs; +using Content.Shared.Popups; using Content.Shared.Verbs; using Content.Shared.White; using Content.Shared.White.MeatyOre; @@ -50,6 +52,7 @@ public sealed class MeatyOreStoreSystem : EntitySystem [Dependency] private readonly SharedJobSystem _jobSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; + private HttpClient _httpClient = default!; private string _apiUrl = default!; diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 59685f8d1f..96fe04b18e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -221,8 +221,9 @@ - type: Sprite sprite: Objects/Weapons/Melee/double_esword.rsi layers: - - state: e_sword - - state: e_sword_blade + - state: e_sword_double + - state: e_sword_double_blade + color: "#FFFFFF" visible: false shader: unshaded map: [ "blade" ] @@ -230,6 +231,7 @@ size: 10 sprite: Objects/Weapons/Melee/double_esword.rsi - type: Wieldable + wieldTime: 0 - type: IncreaseDamageOnWield damage: types: diff --git a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword.png b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword.png deleted file mode 100644 index dac5aed98e72c5d5ea8c4b312fcbd363338690e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C^*y8 z#WAE}&f6;+c@HS?usA5EawW*MrSY3JOcRya>EOlrL$UX6z(3nbe=nR*W?+^$z;K+w z&~4q;U8@_W2tA*3H^)LoVY3h)tHKY8KmW?{;0n+VHiHA) Y$Gy{SMcdYB10BiW>FVdQ&MBb@0KnZ&(*OVf diff --git a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword_blade.png b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword_blade.png deleted file mode 100644 index f73c0beeaefee8871b585075ddb83618ea0bb25b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1895 zcmY+FX;@Qd7RPT07{G=IMpVQ`YlR7`T6|o&VJ+}fKv{$!TNx0>P(XA*AS73C8o;px zL{VT8phA=s1T1a{S)eQ;4Mmo+CsZ5CdVvTDTy7@xna*@RocH|S=Y0B~-+RuReb&nj zuWzCc007>@-Ni?f!!-fvZqb~I(b$)oq?h1My#fFRt($?lV`;Dl0C2lKTpazbmCXH1 z5cjF;wl-RYAx69P=NUFmh^e!s;*8ysjpCt+>u|?4-0~Lp676Q8SHeg6*`|&cA9q+8 zCSW=bahnT(WSV@>u)r;2hwTSJ<~MrJMvlOM4%%NZJA2Z(8E3%&}5=Qmv$2QW2WMh{LVN zdT6Xgo1#AfH;ib@tiD+&t40SYM%l!e@7}c(K7ZjU z+6jA$)aac^Kn$mFC6bot4-%32k82QT5>_RijDm-dFQhG83P4tFuT;aYWlywAiC`Tr zd|ehm5N=bpnm}Vv*irsTB8a4Dm15M?7O8iZecinbCVFwHh5;y~+kX>>ElWi0w$oc2 zc7k~}2#2Xhe|QPF$a~T?!>9RVkX8$?dsC1rsj7ar06%?F6>4Z_U)1|9^kYU}mlgkIg}BmF8gjP;IZaEiM!)%9z#S2Rf~QO>U~C?|$;&teq_6{TD+mV%5<0{n zw+SpYr!@8K)s!y!Tky$J?(0jF8o&(e3hcJdIV%I|X$yDqm9@eL1(!Q4#^iD$!GU&+ zTHy7a|GDFU^^oUzkWY1;!Nkm&-CTnCs#R>QC2YA#HTU2^+mw0}<8k`b2_Wg#LoL#! zS(9@F@cSx4&&$t04N+P$@yZ_Gbm$ZMCm~92Gzc#Hd^bpLG51umW7374U!|S-F}kJ? z0RkAF_f`!$*p(fqQ|6xBK2B+! z1kTNu{&#AO0*{F@c=KeR=LwT3_KjpX#$~jn z#<_(vAj^4l!_d1xyHEB#yXZ$zPvSJyWOmrB{z^?-lKi1=?t0HZ3~;n z>_Wr^iPrJS8DEP?d6EggEl|?^9I2jE$Q$$-{#MC8T{<@0aUQroFY` zvMB@*(Omk`jR(4$lcee3ASbM6)>+Mnw_aM_Y8vt?HUK@cj4fDSO{3*;!=xQ735DYD zf+=`rtWxQG;{<0nfd9Kjz}a()SKrr|j|ch9l={Mwi8JGgb_?g{QYWjU__AM$hr1j7 z8#&i#L#dmK6H5B!R`i@MJ!@w1s)hk6f=@W4Oi{AmAb_5d%q&~kTBpJsR&G-xz<%X9 zrfhsCiaHZ;sy*=kP3O|atA_;>7rO3OQVggX|Nr$6 zlOn!TOe!7K6mKGkmK!7WI+Fn<{^9wD#8dQT?5r8B;&67u;l$$P5zhf9AGj=PIj*rY z$lVC+i&By`S?Fl@8c{G5P?tCvfSQ+UR|0hVvfrT_o{ diff --git a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword_double.png b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword_double.png new file mode 100644 index 0000000000000000000000000000000000000000..dfd3bb9ace240d3fec0f3f1c84f93381e6e63098 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*8>L*$jHdJxw)B`m`F=Y zCnO{sw`2$g$}*M&`2{mLJiCzwmm;Z28|A;$MTNR$AFp{JYD@<);T3K0RTG0C&vH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword_double_blade.png b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/e_sword_double_blade.png new file mode 100644 index 0000000000000000000000000000000000000000..9c19655cd432ab094929111268992fd01ef3bf77 GIT binary patch literal 813 zcmV+|1JeA7P)-`gByp z-2czh)@G)??x6(G{pz}(<3Mm9s8wC}_tbT3XF%WuxHg;q63uDuoAhc^iyQ;t9pLh& zsVN7*)h;mnY{^`%O95JbO#?nIfc_jXa1ZpZd$Vfnw5|Ix8={n09z;l7)%>e!#F93k5Kn=ca+tY8<9zhGf?>hiI02}}g z6@gK>ioguqd%sp-77i?21Fyh=g}WgB=@cAL*aadIM&T*~Nn!*JC>=!Jdp81CuedPp z`Uj=?EW5iPop2)ZNf#)O*SNnq0^21^g7S zf&+lFgadzz&op;8fF~_@UDtG7N87dr z;1sxbv4HP<3XiEpN8mdjh9L38cJav;>SmG<+^tQmQHm_X5S> r*8&fRPX&s=;rAnyQgDE(Bpl!e1&0s?{ZN&700000NkvXXu0mjfU=WAa literal 1895 zcmY+FX;@Qd7RPT07{G=IMpVQ`YlR7`T6|o&VJ+}fKv{$!TNx0>P(XA*AS73C8o;px zL{VT8phA=s1T1a{S)eQ;4Mmo+CsZ5CdVvTDTy7@xna*@RocH|S=Y0B~-+RuReb&nj zuWzCc007>@-Ni?f!!-fvZqb~I(b$)oq?h1My#fFRt($?lV`;Dl0C2lKTpazbmCXH1 z5cjF;wl-RYAx69P=NUFmh^e!s;*8ysjpCt+>u|?4-0~Lp676Q8SHeg6*`|&cA9q+8 zCSW=bahnT(WSV@>u)r;2hwTSJ<~MrJMvlOM4%%NZJA2Z(8E3%&}5=Qmv$2QW2WMh{LVN zdT6Xgo1#AfH;ib@tiD+&t40SYM%l!e@7}c(K7ZjU z+6jA$)aac^Kn$mFC6bot4-%32k82QT5>_RijDm-dFQhG83P4tFuT;aYWlywAiC`Tr zd|ehm5N=bpnm}Vv*irsTB8a4Dm15M?7O8iZecinbCVFwHh5;y~+kX>>ElWi0w$oc2 zc7k~}2#2Xhe|QPF$a~T?!>9RVkX8$?dsC1rsj7ar06%?F6>4Z_U)1|9^kYU}mlgkIg}BmF8gjP;IZaEiM!)%9z#S2Rf~QO>U~C?|$;&teq_6{TD+mV%5<0{n zw+SpYr!@8K)s!y!Tky$J?(0jF8o&(e3hcJdIV%I|X$yDqm9@eL1(!Q4#^iD$!GU&+ zTHy7a|GDFU^^oUzkWY1;!Nkm&-CTnCs#R>QC2YA#HTU2^+mw0}<8k`b2_Wg#LoL#! zS(9@F@cSx4&&$t04N+P$@yZ_Gbm$ZMCm~92Gzc#Hd^bpLG51umW7374U!|S-F}kJ? z0RkAF_f`!$*p(fqQ|6xBK2B+! z1kTNu{&#AO0*{F@c=KeR=LwT3_KjpX#$~jn z#<_(vAj^4l!_d1xyHEB#yXZ$zPvSJyWOmrB{z^?-lKi1=?t0HZ3~;n z>_Wr^iPrJS8DEP?d6EggEl|?^9I2jE$Q$$-{#MC8T{<@0aUQroFY` zvMB@*(Omk`jR(4$lcee3ASbM6)>+Mnw_aM_Y8vt?HUK@cj4fDSO{3*;!=xQ735DYD zf+=`rtWxQG;{<0nfd9Kjz}a()SKrr|j|ch9l={Mwi8JGgb_?g{QYWjU__AM$hr1j7 z8#&i#L#dmK6H5B!R`i@MJ!@w1s)hk6f=@W4Oi{AmAb_5d%q&~kTBpJsR&G-xz<%X9 zrfhsCiaHZ;sy*=kP3O|atA_;>7rO3OQVggX|Nr$6 zlOn!TOe!7K6mKGkmK!7WI+Fn<{^9wD#8dQT?5r8B;&67u;l$$P5zhf9AGj=PIj*rY z$lVC+i&By`S?Fl@8c{G5P?tCvfSQ+UR|0hVvfrT_o{ diff --git a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/inhand-left-blade.png index 0ce936e47d806e57f1ef3288764dc8484421f69b..96d2136fcee81af9b021fb3144b10847b3de644a 100644 GIT binary patch literal 694 zcmV;n0!jUeP)Px%a7jc#RCt{2-NBB6Fc5&@lK3immWxlrm?zC=p+bP2TB^(wt zQ`^$1ad4dj0000000000N7uD(z#h!=?B(Bm-<$QzDF$F1N3We9hM}A1+28N?m-EZA zIOl8z!ejvA85UU0v~^w8_|r5!2SJ_>1JZTfF$TbUuXez)EUxeSPMe{_FcfQBD*m=@ z?smKVh!Y0HVuD;`K&fQ#a7k-1#&PtI$D>pz)wXTw`DvQe^QJjKTLYc5x%`~_ULLO3 zYt{I<98fAoik#fqz;^MIa!;-ybp>ck!zYrIDgT9T7n+ie}`GE)HrHIOSa>Sxs?~m@Hka)hB9gW(aIO5OJBL ztR$;F7@;3znWU^K4VBcT<91qYW(eG(JTO&BW>KpePe$1WxV?L~Be*sbn5*i>eVb$R+b_+g{$c=@p>uwk+~Yi{(fzz42!YIq5F7 z8)m4|wa5XolXH2{{FA2q`zUw800000000000001>ImMUat*Y~W!~Dm)_g0s4 zSo1vla7Y#v&*M1ybzPr_w63eSu7J)teQjoI)hgp!bh;FGda$R?cW&oN*rGnawQR%o zlsu1mv&fGnDEDjMwdKmXPeI$Ugrj!suycubEaBMG&ZVT}|4(u59QWzAw!1g=DajK6 c008)4U+Y5bGX#XK`Tzg`07*qoM6N<$f>`}Y*Z=?k literal 4267 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 N&PQAiS2_A$`7dzq3ex}p diff --git a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/inhand-left.png index e1f16d118ba5d7e20b8badba0bb3152ad6c6dbff..2f06869cd1aae35826369f58f0b6a0406f2455f0 100644 GIT binary patch delta 286 zcmV+(0pb3?1Gxf_B!2;OQb$4nuFf3k0002 zDrf)z00000063+RC%wBlHO|*!H6~p0-k{pmnAv@TDWyy4aZ^ecNj?n2&tp|dKnTH? zWifZRzVEAj0nPR!#2CFs;E$TE2mc5jcot(^-KbT(LT^cukK<_bJlix)R^t!UyhAir k{Nj+!72hHW02hGwZZCXX>@>VWX#fBK07*qoM6N<$g7Q>>^#A|> delta 421 zcmdnVw4Zr`Ng8ngE|S3LRk=KwoLO~+h?=fY2RFid#NV5!G|#L4H* zn5FjS_rJ#WPumzc?Yt@$@k|xzIJiAm`+0qZkQS3lg=JW1>%RAgO?>+$S+kTK`c7{u zSmuyYpI~S*mo476J;GmQ>9InSsaa|cO&z9*x3{gi__6x!`PyqUI43A9Q9JT^PW9zX z(PJ~#vlL%vf4Q~%ibybHrb7MHf^x;ZZ{r{AKPT|dn58I&;Y1;$!g1CH8F2;}ryj~X zAj^O8jZ}8|g0n0~)=l`voxT0BuY1GQI>xhQdpa3@{<>bO*wV0T-Qhx+RYE4WKdLc3 zIeM+Mwd{c)NWP(R-q|Mqiyr#IjO8rrT?1b?BuX5roOfa+rz_`=b(}AD>1F#n1v16m yoE$Kv!Q-6LN(;uF)k0mu6PzsNn2I27nxlW^*%QtO%N9;#00K`}KbLh*2~7YzO0;7D diff --git a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/inhand-right-blade.png index 0ce936e47d806e57f1ef3288764dc8484421f69b..18b785e11ccdaaa3f47a9828171a503a049baf51 100644 GIT binary patch literal 722 zcmV;@0xkWCP)Px%j7da6RCt{2+d*=|AQZ;&$Bb9ewQM|1j>l=T!F6&Nx^QS;@uk)=K%)QOjGNjT z0=z)S4-o(W00000008jrT<->aiWp-mf9Ab+n;3u)!d>G;M22D5MEhQmJN|q=-@SLe zUT+m(jgH7|gsQeqZk>O*T+H`Qr_=5SAf=Q~5`QW{GOBJwoBTC+TH;!Y?ON)reQiX*OQtd%_^b|S#=a*i!RADj3!T%s2&owG^+qBpSk4|Ft04g&-|_V=9;^K{8=qK zyXRsq@-yi~9xvujupM`roCX|l_iL_nJt?NHp%n#NXt!EE3Y>n=8y_n|%AvLcZ zLP)yP%f2j6}Et1b6gfval_e-0mDfLJ~TdK~2 zJ!Ld|sd_%3N2hCLr)OK~e32b2!mV=py*zBxmKM*w2Zb%>BWUTYRttZf)%pn5jwQcp zUpwzy${kC7ZDr@OCbOhJ@w{#?o4lbtES>-W0KkrY0Z?Y#ECd+mKL7v#07*qoM6N<$ Ef~NCO2mk;8 literal 4267 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 N&PQAiS2_A$`7dzq3ex}p diff --git a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/inhand-right.png index fe248fdc6eaf434cc67c0e549626861be9029ca3..ebaeb95b413585f29f10de4f483bedba356a9736 100644 GIT binary patch delta 303 zcmV+~0nq-?1IhxBB!2;OQb$4nuFf3k00035Nkld6SAaOWg~?&%(X_`L8obwTC0eNmQrqghc%#-lDV&sXDrtHcOGha55Cv@Jb%w`Tkkn%t+mR!u5#$V z6+%!8HUF!X%hGy(IE#hQKe3z*0000000019<3D#^-)0xLXCGmIX3r)~Q+xcG7^6t1 zmU$`V)_W#={N?79k~-%^q|XfS-m9w0wr%6K=g+8B@4e=n$9w^2@!nti1q>mjWNs=p zACihOigQkuWhm)ArZHJPCfCH$p^3vT85#g^5nmo|V)QqI3b+6O002ovPDHLkV1n42 BiOT>0 delta 438 zcmX@bbb)z-NuGxhgkRgs62Mf=riZD4h92vmIg~DhBJbU z34I(4#V!mpl$j39spmei$wzysoq**%relRyLPHPw%sN&7gm<};!ujH2MdQlm?G4K^ zC#Y~P%Vavu@nTnB$ct#dr3_n7N|&)tNnLsNlycCkUDr-;+H>jK-AB1x1`G4dY$ks; zZ2xP(v;OtH-}ziWDjnX>>~3A0{5zNB2D_kP*`;cse;ft*AuVRM?>Pck%758DIWGWm zi;N%x)S30@?tCZn=A6`_;IAF0neO<%DBriiI_(74)l^1B?`Qs3)buzFw1qdN%v-kd zAKU9)Y^#Iggame_*qz@j8!qlD_(*--@&m%sQw1-6ubmLm@l2v*(Zeu5&JC9Lx9QIO zG;=z`_V@$W?yP*E+7Pt=K>i-(2B-b{2gKT$R(#`*;A7Qz^q1+PO!GnkNT}^&Sjc^4 Uopz3#E&~vFy85}Sb4q9e0QEh$q5uE@ diff --git a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/meta.json index 1860940661..d7ae4a0ad3 100644 --- a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/meta.json @@ -8,26 +8,10 @@ }, "states": [ { - "name": "icon", - "delays": [ - [ - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15, - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15 - ] - ] + "name": "icon" }, { - "name": "e_sword" + "name": "e_sword_double" }, { "name": "inhand-left", @@ -36,148 +20,66 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 }, { - "name": "e_sword_blade", + "name": "e_sword_double_blade", "delays": [ - [ - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15, - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15 - ] + [ + 0.1, + 0.1 + ] ] }, { "name": "inhand-left-blade", "directions": 4, "delays": [ - [ - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15, - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15 - ], - [ - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15, - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15 - ], - [ - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15, - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15 - ], - [ - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15, - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15 - ] + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] ] }, { "name": "inhand-right-blade", "directions": 4, "delays": [ - [ - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15, - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15 - ], - [ - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15, - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15 - ], - [ - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15, - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15 - ], - [ - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15, - 0.15, - 0.05, - 0.1, - 0.1, - 0.05, - 0.15 - ] + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] ] } ] diff --git a/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0160cafd5d512663c027b8047be3827af6020248 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zSv*}FLn`LH zy>+&?*+8J};Y~fAY^?`xq?Ykbca!Z9vIu6}bm!=slY%EFi3XMl2i$Xi)FAlS(0=)O zC7?+_aKQa%)i#H7H@!85lBWc9@f72h4eG1C6R`E!q)`Be1aX>DV<`-AA>>Ed6vZPi))anhrG zMwj%G^UqdayX>dcGU4>mPUZRcBvUt^vwZpcpLV@7(2AI&ys>2!wqJv-FM_P~boFyt I=akR{0QaAXmjD0& literal 0 HcmV?d00001