juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sphere of light redesign

Browse Source
This commit is contained in:
Ed
2025-04-25 14:11:36 +03:00
parent 62cdf9e1c5
commit a8b1b0ed37
7 changed files with 75 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/_CP14/Follower/CP14FollowOnUseInHandComponent.cs
View File

@@ -1,7 +0,0 @@
namespace Content.Shared._CP14.Follower;
[RegisterComponent, Access(typeof(CP14FollowOnUseInHandSystem))]
public sealed partial class CP14FollowOnUseInHandComponent : Component
{
}

20
Content.Shared/_CP14/Follower/CP14FollowOnUseInHandSystem.cs
View File

@@ -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<CP14FollowOnUseInHandComponent, UseInHandEvent>(OnUseInHand);
}
private void OnUseInHand(EntityUid uid, CP14FollowOnUseInHandComponent component, UseInHandEvent args)
{
_followerSystem.StartFollowingEntity(uid, args.User);
}
}

41
Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml
View File

@@ -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

BIN
Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/inhand-left-unshaded.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/inhand-right-unshaded.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

68
Resources/Textures/_CP14/Effects/Magic/sphere_of_light.rsi/meta.json
View File

@@ -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
]
]
}
]
}