diff --git a/Content.Shared/Revenant/Components/RevenantComponent.cs b/Content.Shared/Revenant/Components/RevenantComponent.cs
index cbe7ca91cd8..0b1e8229902 100644
--- a/Content.Shared/Revenant/Components/RevenantComponent.cs
+++ b/Content.Shared/Revenant/Components/RevenantComponent.cs
@@ -57,7 +57,7 @@ public sealed partial class RevenantComponent : Component
/// through harvesting player souls.
///
[ViewVariables(VVAccess.ReadWrite), DataField("maxEssence")]
- public FixedPoint2 EssenceRegenCap = 75;
+ public FixedPoint2 EssenceRegenCap = 100; // DeltaV changed from 75 to 100
///
/// The coefficient of damage taken to actual health lost.
@@ -69,7 +69,7 @@ public sealed partial class RevenantComponent : Component
/// The amount of essence passively generated per second.
///
[ViewVariables(VVAccess.ReadWrite), DataField("essencePerSecond")]
- public FixedPoint2 EssencePerSecond = 0.5f;
+ public FixedPoint2 EssencePerSecond = 1.0f; // DeltaV increased from 0.5 to 1
[ViewVariables]
public float Accumulator = 0;
@@ -110,7 +110,7 @@ public sealed partial class RevenantComponent : Component
public Vector2 HauntDebuffs = new(3, 8);
[DataField("hauntStolenEssencePerWitness"), ViewVariables(VVAccess.ReadWrite)]
- public FixedPoint2 HauntStolenEssencePerWitness = 2.5;
+ public FixedPoint2 HauntStolenEssencePerWitness = 5; // DeltaV changed from 2.5 to 5
[DataField("hauntEssenceRegenPerWitness"), ViewVariables(VVAccess.ReadWrite)]
public FixedPoint2 HauntEssenceRegenPerWitness = 0.5;
@@ -134,7 +134,7 @@ public sealed partial class RevenantComponent : Component
/// The amount of essence that is needed to use the ability.
///
[ViewVariables(VVAccess.ReadWrite), DataField("defileCost")]
- public FixedPoint2 DefileCost = 30;
+ public FixedPoint2 DefileCost = 20; // DeltaV - reduced cost from 30 to 20
///
/// The status effects applied after the ability
@@ -148,7 +148,7 @@ public sealed partial class RevenantComponent : Component
/// The radius around the user that this ability affects
///
[ViewVariables(VVAccess.ReadWrite), DataField("defileRadius")]
- public float DefileRadius = 3.5f;
+ public float DefileRadius = 4f; //DeltaV - increased from 3.5 to 4
///
/// The amount of tiles that are uprooted by the ability
@@ -161,7 +161,7 @@ public sealed partial class RevenantComponent : Component
/// happen to it.
///
[ViewVariables(VVAccess.ReadWrite), DataField("defileEffectChance")]
- public float DefileEffectChance = 0.5f;
+ public float DefileEffectChance = 0.6f; //DeltaV - increased from 0.5 to 0.6
#endregion
#region Overload Lights Ability
@@ -261,13 +261,13 @@ public sealed partial class RevenantComponent : Component
#region Animate
[ViewVariables(VVAccess.ReadWrite), DataField]
- public FixedPoint2 AnimateCost = 50;
+ public FixedPoint2 AnimateCost = 40; //DeltaV - reduced from 50 to 40
///
/// How long an item should be animated for
///
[ViewVariables(VVAccess.ReadWrite), DataField]
- public TimeSpan AnimateTime = TimeSpan.FromSeconds(15);
+ public TimeSpan AnimateTime = TimeSpan.FromSeconds(10); // DeltaV - reduced from 15 to 10
[ViewVariables(VVAccess.ReadWrite), DataField]
public Vector2 AnimateDebuffs = new(3, 8);
@@ -282,7 +282,7 @@ public sealed partial class RevenantComponent : Component
public float AnimateSprintSpeed = DefaultAnimateSprintSpeed;
[DataField, ViewVariables(VVAccess.ReadWrite)]
- public bool AnimateCanBoltGuns = false;
+ public bool AnimateCanBoltGuns = true; // DeltavV - made true
#endregion
// End Imp Changes
diff --git a/Resources/Prototypes/Actions/revenant.yml b/Resources/Prototypes/Actions/revenant.yml
index b8cb648e063..5b0dc302d99 100644
--- a/Resources/Prototypes/Actions/revenant.yml
+++ b/Resources/Prototypes/Actions/revenant.yml
@@ -8,7 +8,7 @@
parent: BaseAction
id: ActionRevenantDefile
name: Defile
- description: Costs 30 Essence.
+ description: Costs 20 Essence. # DeltaV cost reduced to 20 from 30
components:
- type: Action
itemIconStyle: NoItem # Imp
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 1c61cc3f652..730c74a8855 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -28,6 +28,22 @@
- type: Damageable
damageContainer: ManifestedSpirit
damageModifierSet: Spirit # DeltaV: Keep revenant extreme weakness to heat and bible
+ - type: MeleeWeapon # Begin DeltaV additions
+ soundHit:
+ path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+ angle: 90
+ animation: WeaponArcClaw
+ wideAnimation: WeaponArcClaw
+ wideAnimationRotation: -90
+ swingLeft: true
+ attackRate: 0.3
+ range: 1.0
+ altDisarm: false
+ damage:
+ types:
+ Slash: 2
+ Shadow: 2
+ - type: CombatMode # end DeltaV additions
- type: NoSlip
- type: Eye
drawFov: false
@@ -55,14 +71,14 @@
malfunctionWhitelist:
components:
# emag lockers open
- - EntityStorage
+ # - EntityStorage # Trolling armory is very stale
# emag doors open
- Airlock
# troll medical to help get kills
- StasisBed
- EmaggableMedibot
# borg become killer
- - EmagSiliconLaw
+ # - EmagSiliconLaw # DeltaV - emag borg doesn't make sense
- type: PointLight
color: MediumPurple
radius: 2
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index cd292989040..6b8287c709b 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -297,6 +297,8 @@
#- type: StunVisuals # DeltaV - No stars
- type: CanDoCPR # DeltaV - Addition of CPR
- type: PotentialPsionic # DeltaV - organic species can all be psionic
+ - type: RevealRevenantOnCollide # DeltaV - passing through people reveal revenant
+ revealTime: 1
- type: entity
save: false
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index 5cfe12d74a6..b402c569903 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -76,6 +76,8 @@
- Packet
- type: ExaminableSolution
exactVolume: true
+ - type: Spillable # DeltaV - spilling salt on the floor, should work for all packets
+ solution: food
- type: entity
parent: BaseFoodCondimentPacket
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index 803d97432ea..a898d6411b6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -30,6 +30,7 @@
- type: Summonable
specialItem: SpawnPointGhostRemilia
- type: RevealRevenantOnCollide # Imp
+ revealTime: 20 # DeltaV - from 5 to 20 seconds reveal
- type: ReactionMixer
mixMessage: "bible-mixing-success"
reactionTypes:
diff --git a/Resources/Prototypes/_DV/Damage/modifier_sets.yml b/Resources/Prototypes/_DV/Damage/modifier_sets.yml
index ed975b28163..8251f6b27ec 100644
--- a/Resources/Prototypes/_DV/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_DV/Damage/modifier_sets.yml
@@ -108,11 +108,12 @@
coefficients:
Cold: 0.0
Shock: 0.5
- Blunt: 0.5
- Slash: 0.5
- Piercing: 0.5
+ Blunt: 0.0
+ Slash: 0.0
+ Piercing: 0.0
Heat: 1.5
Holy: 3.0
+ Shadow: 0.0
- type: damageModifierSet
id: ShockAbsorber
@@ -130,7 +131,10 @@
coefficients:
Cold: 0.0
Shock: 0.2
- Heat: 3.0
+ Blunt: 0.4
+ Slash: 0.4
+ Piercing: 0.4
+ Heat: 2.0
Holy: 5.0
Shadow: 0.0
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/glimmer_creatures.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/glimmer_creatures.yml
index 2b04099286f..f643070d1a0 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/glimmer_creatures.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/glimmer_creatures.yml
@@ -62,9 +62,9 @@
radius: 0.35
density: 13
mask:
- - Opaque
+ - SmallMobMask
layer:
- - MobLayer
+ - Opaque
- type: MovementSpeedModifier
baseSprintSpeed: 8
baseWalkSpeed: 5
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/skia.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/skia.yml
index e07a04f1f81..d762a80e09c 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/skia.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/skia.yml
@@ -10,6 +10,8 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: skia
+ - type: Stealth
+ lastVisibility: 0.8
- type: DamageStateVisuals
states:
Alive:
@@ -28,8 +30,8 @@
0: Alive
120: Dead
- type: Damageable
- damageModifierSet: ManifestedSpirit
damageContainer: BiologicalMetaphysical
+ damageModifierSet: Spirit
- type: Fixtures
fixtures:
fix1:
@@ -111,6 +113,7 @@
range: 5.0
energyConsumption: 20000
disableDuration: 20.0
+ - type: Jaunt
- type: Butcherable
spawned:
- id: Ectoplasm
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/swords.yml
index 6be715ed016..3d095b93c9e 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/swords.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/swords.yml
@@ -24,6 +24,9 @@
- type: Tag
tags:
- SilverSword
+ - type: RevealRevenantOnCollide
+ - type: CollisionWake
+ enabled: False
- type: entity
parent: SilverSword
@@ -38,7 +41,6 @@
graph: RadiantSword
node: embeddedsword
-
- type: entity
parent: SilverSword
id: RadiantSword
@@ -60,6 +62,7 @@
graph: RadiantSword
node: radiantsword
- type: RevealRevenantOnCollide
+ revealTime: 10
- type: CollisionWake
enabled: false
diff --git a/Resources/Prototypes/_DV/NPC/wisp.yml b/Resources/Prototypes/_DV/NPC/wisp.yml
index 3793a47cb2d..3a5683d1e5a 100644
--- a/Resources/Prototypes/_DV/NPC/wisp.yml
+++ b/Resources/Prototypes/_DV/NPC/wisp.yml
@@ -11,6 +11,14 @@
- !type:HTNCompoundTask
task: IdleCompound
+ - preconditions:
+ - !type:PulledPrecondition
+ isPulled: true
+ tasks:
+ - !type:HTNPrimitiveTask
+ operator: !type:UnPullOperator
+ shutdownState: TaskFinished
+
- type: htnCompound
id: DrainPsionicCompound
branches:
diff --git a/Resources/Prototypes/_Impstation/Actions/revenant.yml b/Resources/Prototypes/_Impstation/Actions/revenant.yml
index 21f614aedd2..fe5e1b983b7 100644
--- a/Resources/Prototypes/_Impstation/Actions/revenant.yml
+++ b/Resources/Prototypes/_Impstation/Actions/revenant.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
parent: BaseAction
id: ActionRevenantHaunt
name: Haunt
@@ -30,7 +30,7 @@
parent: BaseAction
id: ActionRevenantAnimate
name: Animate
- description: Costs 50 Essence.
+ description: Costs 40 Essence. # DeltaV - reduced cost 50 to 40
components:
- type: Action
itemIconStyle: NoItem