Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Content.Shared/_Scp/Scp106/Scp106Serializable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ public sealed partial class Scp106LeavePhantomAction : InstantActionEvent;

public sealed partial class Scp106ShopAction : InstantActionEvent;

public sealed partial class Scp106BoughtPhantomAction : InstantActionEvent
{
[DataField] public EntProtoId BoughtAction;
}

public sealed partial class Scp106OnUpgradePhantomAction : InstantActionEvent
{
[DataField] public TimeSpan CooldownReduce;
Expand Down Expand Up @@ -70,6 +65,11 @@ public sealed partial class Scp106BoughtTerrify : InstantActionEvent
[DataField] public EntProtoId BoughtAction;
}

public sealed partial class Scp106BoughtPuddle : InstantActionEvent
{
[DataField] public EntProtoId BoughtAction;
}

#region DoAfters

[Serializable, NetSerializable]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ private void InitializeStore()
// Abilities in that store - I love lambdas >:)

// TODO: Проверка на хендхелд и кенселед
SubscribeLocalEvent((Entity<Scp106Component> ent, ref Scp106BoughtPhantomAction args) =>
_actions.AddAction(ent, args.BoughtAction));
SubscribeLocalEvent((Entity<Scp106Component> ent, ref Scp106BoughtBareBladeAction args) =>
_actions.AddAction(ent, args.BoughtAction));
SubscribeLocalEvent((Entity<Scp106Component> ent, ref Scp106BoughtCreatePortal args) =>
_actions.AddAction(ent, args.BoughtAction));
SubscribeLocalEvent((Entity<Scp106Component> ent, ref Scp106BoughtTerrify args) =>
_actions.AddAction(ent, args.BoughtAction));
SubscribeLocalEvent((Entity<Scp106Component> ent, ref Scp106BoughtPuddle args) =>
_actions.AddAction(ent, args.BoughtAction));

SubscribeLocalEvent<Scp106Component, Scp106OnUpgradePhantomAction>(OnUpgradePhantomAction);

Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_prototypes/_scp/actions/scp106.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
ent-Scp106BackroomsAction = Teleport to the pocket dimension
.desc = Teleports you to the pocket dimension. Requires you to stand still
ent-Scp106PuddleSpawnAction = Dark substance
.desc = Releases a moderate amount of black rot, slowing anyone who steps on it.
ent-Scp106RandomTeleportAction = Teleport to the compound
.desc = Teleports you to the compound. Requires you to stand still
ent-ActionScp106Shop = Embodiment of suffering
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/_strings/_scp/catalog/catalog.ftl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
scp106-store-category-abilities = Nightmare Abilities
store-currency-display-life-essence = Suffering
scp106-shop-phantom-name = { ent-Scp106BecomePhantom }
scp106-shop-phantom-desc = { ent-Scp106BecomePhantom.desc }
scp106-shop-phantom-upgrade-name = Shift of Balance
scp106-shop-phantom-upgrade-desc = Puts pressure on the growing cracks in reality, which reduces the waiting time for creating a new phantom
scp106-shop-blade-name = { ent-Scp106BareBlade }
scp106-shop-blade-desc = { ent-Scp106BareBlade.desc }
scp106-shop-puddle-name = { ent-Scp106PuddleSpawnAction }
scp106-shop-puddle-desc = { ent-Scp106PuddleSpawnAction.desc }
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/_strings/_scp/reagents/reagents.ftl
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
reagent-name-scp096-tears = L-096 substrate
reagent-desc-scp096-tears = A colorless liquid secreted by SCP-096 during stress response. Analysis partially matches human tears, contains unidentified protein component.

reagent-scp-106-name = SCP-106-Q rot
reagent-scp106-desc = A viscous, foul-smelling black fluid constantly secreted by SCP-106. Analysis revealed it contains human blood, feces, rot, and other organic components, including reagents of unknown origin.

reagent-name-scp096-blood = hemosubstrate 096-K
reagent-desc-scp096-blood = Dense dark liquid extracted from SCP-096 biomass. Shows stable composition with anomalous deviations in cellular morphology.

Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_scp/actions/scp106.ftl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ent-Scp106PuddleSpawnAction = Тёмная субстанция
.desc = Высвобождает среднее количество черной гнили, которая замедляет любого кто наступит на нее.
ent-Scp106BackroomsAction = Телепорт в карманное измерение
.desc = Телепортирует вас в карманное измерение. Требуется стоять на месте
ent-Scp106RandomTeleportAction = Телепорт в комплекс
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/ru-RU/_strings/_scp/catalog/catalog.ftl
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
scp106-store-category-abilities = Кошмарные способности
store-currency-display-life-essence = Страдания
scp106-shop-phantom-name = { ent-Scp106BecomePhantom }
scp106-shop-phantom-desc = { ent-Scp106BecomePhantom.desc }
scp106-shop-phantom-upgrade-name = Сдвиг баланса
scp106-shop-phantom-upgrade-desc = Давит на разрастающиеся трещины реальности, что позволяет уменьшить время ожидания создания нового фантома
scp106-shop-blade-name = { ent-Scp106BareBlade }
scp106-shop-blade-desc = { ent-Scp106BareBlade.desc }
scp106-shop-puddle-name = { ent-Scp106PuddleSpawnAction }
scp106-shop-puddle-desc = { ent-Scp106PuddleSpawnAction.desc }

store-currency-display-supplypoint = Очки снабжения

Expand Down
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/_strings/_scp/reagents/reagents.ftl
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
reagent-name-scp096-tears = cубстрат L-096
reagent-desc-scp096-tears = Бесцветная жидкость, выделяемая SCP-096 при стрессовой реакции. Анализ частично соответствует человеческим слезам, присутствует неидентифицированная белковая компонента.

reagent-scp-106-name = гниль SCP-106-Q
reagent-scp106-desc = Вязкая и противная черная жидкость, постоянно выделяемая SCP-106. Анализ выявил в составе человеческую кровь, фекалии, гниль и прочие органические компоненты, включая реагенты неизвестного происхождения.

reagent-name-scp096-blood = гемосубстрат 096-К
reagent-desc-scp096-blood = Плотная тёмная жидкость, изъятая из биоматериала SCP-096. Демонстрирует устойчивый состав с аномальными отклонениями в клеточной морфологии.

Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/_Scp/Actions/scp106.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,21 @@
event: !type:Scp106TerrifyNearbyActionEvent
cost: 30

- type: entity
id: Scp106PuddleSpawnAction
components:
- type: Action
raiseOnUser: true
itemIconStyle: BigAction
useDelay: 180
icon:
sprite: _Scp/Actions/scp-106.rsi
state: become_phantom # TODO свой спрайт
- type: InstantAction
event: !type:InstantSpawnSpellEvent
prototype: PuddleScp106Reagent200
posData: !type:TargetCasterPos

### PHANTOM ABILITIES END

### 3 TIRES OF PHANTOM ABILITY START
Expand Down
38 changes: 18 additions & 20 deletions Resources/Prototypes/_Scp/Catalog/Scp106Catalog.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
- type: listing
id: Scp106BoughtPhantomAction
name: scp106-shop-phantom-name
description: scp106-shop-phantom-desc
productEvent: !type:Scp106BoughtPhantomAction
boughtAction: Scp106BecomePhantom
categories:
- Scp106Abilities
cost:
LifeEssence: 10
raiseProductEventOnUser: true
icon:
sprite: _Scp/Actions/scp-106.rsi
state: become_phantom
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: Scp106UpgradePhantom
Expand All @@ -33,9 +16,6 @@
conditions:
- !type:ListingLimitedStockCondition
stock: 4
- !type:BuyBeforeCondition
whitelist:
- Scp106BoughtPhantomAction

- type: listing
id: Scp106BareBlade
Expand Down Expand Up @@ -72,3 +52,21 @@
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: Scp106Puddle
name: scp106-shop-puddle-name
description: scp106-shop-puddle-desc
productEvent: !type:Scp106BoughtPuddle
boughtAction: Scp106PuddleSpawnAction
categories:
- Scp106Abilities
cost:
LifeEssence: 15
raiseProductEventOnUser: true
icon:
sprite: _Scp/Actions/scp-106.rsi
state: become_phantom # TODO свой спрайт
conditions:
- !type:ListingLimitedStockCondition
stock: 1
13 changes: 13 additions & 0 deletions Resources/Prototypes/_Scp/Entities/Effects/puddle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,16 @@
reagents:
- ReagentId: Scp173Reagent
Quantity: 50

- type: entity
parent: PuddleTemporary
id: PuddleScp106Reagent200
suffix: Scp106Reagent (200u)
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: Scp106Reagent
Quantity: 200
Comment thread
WardexOfficial marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
- Scp106RandomTeleportAction
- Scp106BackroomsAction
- ActionScp106Shop
- Scp106BecomePhantom
- type: TTS
voice: HearthstoneSotis
- type: Vocal
Expand Down Expand Up @@ -108,7 +109,7 @@
- ScpFear
- type: Store
balance:
LifeEssence: 20
LifeEssence: 10
currencyWhitelist:
- LifeEssence
categories:
Expand All @@ -121,3 +122,4 @@
allowed:
- Stun
- type: ComplexInteraction
- type: SpeedModifierContactCapClothing
60 changes: 60 additions & 0 deletions Resources/Prototypes/_Scp/Reagents/scp106.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
- type: reagent
parent: Blood
id: Scp106Reagent
name: reagent-scp-106-name
group: Biological
desc: reagent-scp106-desc
color: "#1A1C1A"
flavor: horrible
recognizable: false
physicalDesc: reagent-physical-desc-slimy
synthesisable: true
absorbCooldownPerUnit: 0.4
viscosity: 0.6
metabolisms:
Drink:
effects:
- !type:HealthChange
damage:
types:
Poison: 3
- !type:Vomit
probability: 0.3
- !type:GenericStatusEffect
key: TemporaryBlindness
component: TemporaryBlindness
conditions:
- !type:ReagentCondition
reagent: Scp106Reagent
min: 10
- !type:MovementSpeedModifier
conditions:
- !type:ReagentCondition
reagent: Scp106Reagent
min: 20
walkSpeedModifier: 0.8
sprintSpeedModifier: 0.8
- !type:ModifyBleed
amount: 0.3
Poison:
effects:
- !type:HealthChange
damage:
types:
Poison: 8
- !type:MovementSpeedModifier
conditions:
- !type:ReagentCondition
reagent: Scp106Reagent
min: 15
walkSpeedModifier: 0.7
sprintSpeedModifier: 0.7
- !type:ModifyBleed
amount: 0.5
Comment thread
666XxttimurkaxX666 marked this conversation as resolved.
plantMetabolism:
- !type:PlantAdjustToxins
amount: 5
- !type:PlantAdjustWater
amount: 0.3
- !type:PlantAdjustHealth
amount: -2
Loading