From a8b1b0ed376619971f8f5c16d52d6927a4b15eea Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Fri, 25 Apr 2025 14:11:36 +0300 Subject: [PATCH] sphere of light redesign --- .../CP14FollowOnUseInHandComponent.cs | 7 -- .../Follower/CP14FollowOnUseInHandSystem.cs | 20 ------ .../Spells/Light/T0_sphere_of_light.yml | 41 +++-------- .../Magic/sphere_of_light.rsi/icon.png | Bin 371 -> 1413 bytes .../inhand-left-unshaded.png | Bin 0 -> 1439 bytes .../inhand-right-unshaded.png | Bin 0 -> 1440 bytes .../Magic/sphere_of_light.rsi/meta.json | 68 +++++++++++++++++- 7 files changed, 75 insertions(+), 61 deletions(-) delete mode 100644 Content.Shared/_CP14/Follower/CP14FollowOnUseInHandComponent.cs delete mode 100644 Content.Shared/_CP14/Follower/CP14FollowOnUseInHandSystem.cs create mode 100644 Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/inhand-left-unshaded.png create mode 100644 Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/inhand-right-unshaded.png diff --git a/Content.Shared/_CP14/Follower/CP14FollowOnUseInHandComponent.cs b/Content.Shared/_CP14/Follower/CP14FollowOnUseInHandComponent.cs deleted file mode 100644 index 1cf144abc6..0000000000 --- a/Content.Shared/_CP14/Follower/CP14FollowOnUseInHandComponent.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Content.Shared._CP14.Follower; - -[RegisterComponent, Access(typeof(CP14FollowOnUseInHandSystem))] -public sealed partial class CP14FollowOnUseInHandComponent : Component -{ - -} diff --git a/Content.Shared/_CP14/Follower/CP14FollowOnUseInHandSystem.cs b/Content.Shared/_CP14/Follower/CP14FollowOnUseInHandSystem.cs deleted file mode 100644 index 43210c052f..0000000000 --- a/Content.Shared/_CP14/Follower/CP14FollowOnUseInHandSystem.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Content.Shared.Follower; -using Content.Shared.Interaction.Events; - -namespace Content.Shared._CP14.Follower; - -public partial class CP14FollowOnUseInHandSystem : EntitySystem -{ - - [Dependency] private readonly FollowerSystem _followerSystem = default!; - - public override void Initialize() - { - SubscribeLocalEvent(OnUseInHand); - } - - private void OnUseInHand(EntityUid uid, CP14FollowOnUseInHandComponent component, UseInHandEvent args) - { - _followerSystem.StartFollowingEntity(uid, args.User); - } -} diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml index 6ed466d1bc..fbb004dd1c 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml @@ -30,7 +30,7 @@ sprite: _CP14/Actions/Spells/light.rsi state: sphere_of_light event: !type:CP14DelayedInstantActionEvent - cooldown: 100 + cooldown: 30 castDelay: 0.5 breakOnMove: false @@ -68,7 +68,7 @@ categories: [ ForkFiltered ] components: - type: TimedDespawn - lifetime: 180 # 3 min + lifetime: 120 # 2 min - type: Sprite sprite: _CP14/Effects/Magic/sphere_of_light.rsi noRot: true @@ -77,24 +77,15 @@ shader: unshaded - type: Item size: Ginormous - - type: Tag - tags: - - ForceableFollow - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" - density: 30 - hard: true - mask: - - ItemMask - layer: - - Opaque + inhandVisuals: + left: + - state: inhand-left-unshaded + shader: unshaded + right: + - state: inhand-right-unshaded + shader: unshaded - type: LandAtCursor - type: MovementIgnoreGravity - - type: CP14FollowOnUseInHand - type: PointLight radius: 5.0 energy: 1 @@ -105,20 +96,6 @@ path: /Audio/Effects/drop.ogg params: volume: -100 #Yes, it's stupid, but it's easier - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg - params: - variation: 0.250 - volume: -12 - type: entity parent: CP14BaseSpellScrollLight diff --git a/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/icon.png b/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/icon.png index e776bf22ca6bc1e4b05cfd82b8b48e7d8bf81477..066e621d3e69c226ce2e22a162ac58ebcd31ca51 100644 GIT binary patch literal 1413 zcmV;01$z34P)Px)KS@MERCt{2oX<`iM-Ydx?TRqjaJ=48g1%_dKx-|OT zf$K<;W(_X-E^9X%*>&uL1wc*Y_yM4W^IryZfb(7jLC8L|!gnt|ef|VCfgxZNHwfpz zF>s>S*QyWAZmcJ1)=1KAH@y& zjGAU}w}JB{%~ERI3Tn*&a=8ifIv1ZIKXbesf6V%nGUTRc&g*9^syb#!hP~*fCp-NAbBjN zecUt0AnrQv0FR`9BzauzG41>7zYTl|Y^ZHR@@?{&F>C;kJK!ep1+XLij^vxfcYq&& zY2dN+k0r+*0C4^q1hz{0E%IApOneYL0X9o*o6=Vve5l`H|Ma<2((gzg+X3GGc1ge8 zBl{_E1}vBK%hJbw2J*|j?|{`(+p6>(omYvv4oiVkV6miMls>ity#1w;eyIocGu$8_ z0)GH&(yvKARC}!Ds2}_zU?2DuSXbM+F9PvV8!Y^P}$rBx%;-l6`=>7vH7*0o+pfAG>hvW}_!Nfg$@)dm~7n zf-^2|y7Y1@)=z^SO8ekFvhSZm(vtmNY=Q;v!?pY}sNdhl_1pec>4RYyhG7_nVHk#C z7=~dOhG7_nVHk#C7=~dOSB09=J42}T&YEfCSS6m3txXP|!C4{5vd z3?QRT^8EA(TsG_jmP4*UZbIMehqhg51}IhK@RccMaVg0F-{5l7 z_HY?0e*&jTngzQhlmc)Bmyho=f_=(ZqRgEr0a(h>ACvtd+;8*`fg^7}M(`KvGmPW1 zvAyjB;4n$Ele$4rH8;?wC65AAt?b?jEX1^8v&G4A4gYO*g0qB>zuYsS*3so#h{yR-Qux)QYczuR$H-dVeqFr?rfC?ngr&Rzo3pCWU|It+d zUEFrAPx$ElET{RCt{2+CgfAKop1ZZ%i=+x)Gt*$hrr~DRYpndyRl(Q%DfRE;6*MhB}#1 zY`-745i|eC3!30OkR(Zx?mBnluEe!Vu34mrl7*JY4~d0rfI1!kJASKs+uE?M)F8V~|4a0~&e4FE@O-^MHr z$eEwgfUg^8yG?wEJSt;;N&|XEx=?YrUSSv@1PVQB002ovPDHLkV1hCNo%{d* diff --git a/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/inhand-left-unshaded.png b/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/inhand-left-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..e9fe35eb0c4dda15ad614b59995e8dd75630ccf3 GIT binary patch literal 1439 zcmZWpdpOg37~juqV=-IfI7y-9ay;%`c%3tMhrD_xpLjpXdF&@B7!A6F~FUg&V;^Ads#P zg-lm7dp)$E>h~$(*Df^yC+XfKQ0+_O2@nVp;zRb>msl}f;TNaxt?wn|>6-2I^2shn zT6%2XP}1(Sw7E2*6KXaVjw^mZYh@Yglwt~`w>3`#l`+j*Xt8_|SFki*+h_LSSpBkV$*)B~d z(pqqmsGZDv_O8-8aGX43$<|{#7bRyMT8uoM z4K*p|@sVRJ9VJw$=>}ZRt4Xq*q+ggso;|9XLLf8wFdN`c%I?p{B(4rd`xP~G8q(_` z><5lN=VZ}o!~sh@G(5j12_GfBpQV(>z>=b@B|$x&N;sq zu&lsya`eOi$E0Iw-qr{#9yV8%_0I^cWEqwme|8;*fti8E=k$G&GjFq-+l(tOaq4K* zb;WKCC4iB24>kPIBXk&Vo_?~hd_IP#mrR@de7s7fBZjW!%Y9F=1=^{jW_8Rg`=hQ5 z?SuQOqh3BIFZ))PRcQ8a#}u&7wO*j`H_ECygl`sKzz^ys`X=>{LhZcQ#&9g;(y@{d zU94iUs82c)#+^T26&DMO)|oY4%(b;VkTWMMaRh-J8-`5rN49DtVC1nC1)Mx_)662@ zr8*@GHT&ZOn3(4mD_D|t*f*HG60dBKpyFWO9PS>$hTf)=)G?ix_}LzrNa(0Q8o!tQb&_1t=2r9VRls3!a6HFWsf! zF;Hrk%UMJ@fz4cX9=C-#)bdT3s}BdqK?22sWi8S0cSO9tbU7X0u8^f}pITR*21D{A z!-!M%wZu^T*UbZ0a*t@LZBc3)JWdGkGc3;~B{Kl2X zWvMQ;DGF+uw+ygs8o2@mj2gyj>I<{9T{V5CAOe?*c#KE`hfM=Sf3A#=YG)0atuL`# z-D{OA7e2cewVvguv(WQ!>GBFnJszxZ(rR{LXMYb0%QgN=#@G}8uIti(U2Kywn$QEC z-H}N`@1=JG`sE+biO48eK=d^t2|ct$Vg;w(%~ImEsfA~-g9RdTf8h+q2K!395T0q# z*uc1&BgU{vXgs>y%5mM~O+uUVnEII(%s;*i3s5vi;{NQ*2R+({&M6&i)4n5kbs8emOB?yTNr?-mW4)nn)=eAZ7*vp_v@He`l2fCqG zNl<@p=&9BJv~PmGEh7cg2MaI(Db&7?+}i*3?=et;L;Qm3eJ4hj)E5`z<4Ggek|NUn E1@d8)y#N3J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/inhand-right-unshaded.png b/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/inhand-right-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..a7fc4dc1dae20de0af33eb4e7179c2e8dc9847ae GIT binary patch literal 1440 zcmZuxdoizVbCg6io62om594T}?b*L}`{R3_=e+0p-uL_7@AHLBo=?=^XV#|bOLpk1M`d~m=;p?c3ZbIXY&>zbBU;Y7OG@KFBs z0Al-?Tz2X`w`Koi`uGjfd|y!uRrky_NMK`~!BpTozYL1)a69P_L*otO{+=~INCdUH z-ZbDoeBr?;Q!QR(!MjZ8GUjPMULGVLHizWiiL!u{oi&G??0{b2uk*9`Fp>E^pUSEg ze=uRF4F?P2=XX*lZ)X+WP-T_WVcbHL1=GjJZ_i}oRUd9GAt3e;^pW7=!efz+pmni`QvxTdzvb%r((E! z|GpCdl(0gGqa9L$FTosZGvwOxezNEMn!Zim_(gyS2qwI+qTbD|j1C<^J2qk(H@EaBu4^nuVDFj$+t^rV)&GJ`Uzfd>u7-VJq8;T7 zbZ)q7vh^nh7|=_kc@+{sJJ_fMWl9E8kdG#D*<3(4hpW?EHIt&SDL5V6Z7M#&Hn z+aV*{!`_q*60xapPGn^Sm#G`ATw^nZ^U%sW^998=daj(%a=0ZDe;)c$igLWjg)C?w zU-KiHJwM?joqBdK7m`3%cB zJ}XwaJ06XMbXtde=l0mx>ejiONw&QEKb?yeB(~EJO_XjrsDXbUs58+7wo}^U0 z7^RZJ{)u(R`ZE9*2EZ}lkCd1ItB@%bM~0IAtX>5EXAxy{6Mt1ew&n)Q$*RO@<(CVP L-6*b2&Q#XlxhRQs literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/meta.json b/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/meta.json index 2e2a52b055..aa3ebb30dc 100644 --- a/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/meta.json +++ b/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/meta.json @@ -4,19 +4,83 @@ "x": 32, "y": 32 }, - "license": "All right reserved", - "copyright": "Created by Nimfar11", + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd", "states": [ { "name": "icon", "delays": [ [ + 0.2, + 0.2, + 0.2, + 0.2, 0.2, 0.2, 0.2, 0.2 ] ] + }, + { + "name": "inhand-left-unshaded", + "directions": 4, + "delays": [ + [ + 0.4, + 0.4, + 0.4, + 0.4 + ], + [ + 0.4, + 0.4, + 0.4, + 0.4 + ], + [ + 0.4, + 0.4, + 0.4, + 0.4 + ], + [ + 0.4, + 0.4, + 0.4, + 0.4 + ] + ] + }, + { + "name": "inhand-right-unshaded", + "directions": 4, + "delays": [ + [ + 0.4, + 0.4, + 0.4, + 0.4 + ], + [ + 0.4, + 0.4, + 0.4, + 0.4 + ], + [ + 0.4, + 0.4, + 0.4, + 0.4 + ], + [ + 0.4, + 0.4, + 0.4, + 0.4 + ] + ] } ] }