C1984 (C4 nerf) (#7612)

This commit is contained in:
Alex Evgrashin
2022-04-24 03:22:14 +03:00
committed by GitHub
parent d6fc3d31c3
commit 8249185325
6 changed files with 42 additions and 6 deletions

View File

@@ -16,6 +16,13 @@ public sealed class StickyComponent : Component
[ViewVariables(VVAccess.ReadWrite)]
public EntityWhitelist? Whitelist;
/// <summary>
/// What target entities can't be used as surface for sticky entity.
/// </summary>
[DataField("blacklist")]
[ViewVariables(VVAccess.ReadWrite)]
public EntityWhitelist? Blacklist;
/// <summary>
/// How much time does it take to stick entity to target.
/// If zero will stick entity immediately.

View File

@@ -55,8 +55,12 @@ public sealed class StickySystem : EntitySystem
{
if (!Resolve(uid, ref component))
return false;
// check whitelist and blacklist
if (component.Whitelist != null && !component.Whitelist.IsValid(target))
return false;
if (component.Blacklist != null && component.Blacklist.IsValid(target))
return false;
// check if delay is not zero to start do after
var delay = (float) component.StickDelay.TotalSeconds;

View File

@@ -14,3 +14,4 @@
supportedTypes:
- Heat
- Shock
- Structural # this probably should be in separate container

View File

@@ -36,3 +36,8 @@
- type: damageType
id: Cellular
# Damage represent structures internal integrity.
# Exclusive for structures such as walls, airlocks and others.
- type: damageType
id: Structural

View File

@@ -25,11 +25,14 @@
stickPopupSuccess: comp-sticky-success-stick-bomb
unstickPopupStart: comp-sticky-start-unstick-bomb
unstickPopupSuccess: comp-sticky-success-unstick-bomb
blacklist: # can't stick it to other items
components:
- Item
- type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating.
explosionType: Default
maxIntensity: 300
intensitySlope: 100
totalIntensity: 300
explosionType: DemolitionCharge
totalIntensity: 60
intensitySlope: 5
maxIntensity: 30
canCreateVacuum: false
- type: ExplodeOnTrigger
- type: Damageable
@@ -38,10 +41,11 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 10
damage: 50
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:ExplodeBehavior
- type: StickyVisualizer
- type: Appearance
visuals:

View File

@@ -14,6 +14,21 @@
texturePath: /Textures/Effects/fire.rsi
fireStates: 3
- type: explosion
id: DemolitionCharge
damagePerIntensity:
types:
Heat: 3
Blunt: 3
Piercing: 3
Structural: 50
tileBreakChance: [ 0, 0.5, 1 ]
tileBreakIntensity: [ 0, 10, 30 ]
tileBreakRerollReduction: 20
lightColor: Orange
texturePath: /Textures/Effects/fire.rsi
fireStates: 3
- type: explosion
id: Radioactive
damagePerIntensity: