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 e776bf22ca..066e621d3e 100644 Binary files a/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/icon.png and b/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/icon.png differ 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 0000000000..e9fe35eb0c Binary files /dev/null and b/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/inhand-left-unshaded.png differ 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 0000000000..a7fc4dc1da Binary files /dev/null and b/Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/inhand-right-unshaded.png differ 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 + ] + ] } ] }