Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Merge pull request #252 from frosty-dev/CRAB17"

Browse Source 
This reverts commit f1f191270d, reversing
changes made to bc2857f546.
This commit is contained in:
BIGZi0348
2025-01-28 20:24:39 +03:00
parent add7181afb
commit 1314ad56d1
14 changed files with 0 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/_Amour/ProtocolCRAB17/ProtocolCRAB17System.cs
View File

@@ -1,12 +0,0 @@
using Content.Shared._Amour.ProtocolCRAB17;
namespace Content.Client._Amour.ProtocolCRAB17;
public sealed class ProtocolCRAB17System : SharedProtocolCRAB17System
{
public override void OnDoAfter(Entity<ProtocolCRAB17Component> ent, ref ProtocolCRAB17DoAfterEvent args)
{
}
}

109
Content.Server/_Amour/ProtocolCRAB17/ProtocolCRAB17Rule.cs
View File

@@ -1,109 +0,0 @@
using Content.Server.Chat.Systems;
using Content.Server.StationEvents.Events;
using Content.Server.GameTicking.Components;
using Content.Shared._Amour.ProtocolCRAB17;
using Robust.Shared.Timing;
using Content.Shared._White.Economy;
using Content.Server._White.Economy;
namespace Content.Server._Amour.ProtocolCRAB17;
public sealed class ProtocolCRAB17Rule : StationEventSystem<ProtocolCRAB17RuleComponent>
{
[Dependency] private readonly ChatSystem _chatSystem = default!;
[Dependency] private readonly IEntityManager _entities = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly BankCardSystem _bankCardSystem = default!;
public TimeSpan? LastTimeExecuted;
public override void Initialize()
{
base.Initialize();
}
protected override void Added(EntityUid uid, ProtocolCRAB17RuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
{
base.Added(uid, component, gameRule, args);
if (TryGetRandomStation(out var stationUid))
{
component.TargetStation = stationUid;
}
var query = AllEntityQuery<ProtocolCRAB17Component>();
while (query.MoveNext(out _, out var comp))
{
if (comp.BankAccountId == null)
continue;
component.Callers.Add((int) comp.BankAccountId);
}
}
protected override void Started(EntityUid uid, ProtocolCRAB17RuleComponent component, GameRuleComponent gameRule,
GameRuleStartedEvent args)
{
base.Started(uid, component, gameRule, args);
if (component.TargetStation == null)
{
ForceEndSelf(uid, gameRule);
return;
}
_chatSystem.DispatchStationAnnouncement((EntityUid) component.TargetStation, Loc.GetString("protocol-CRAB17-stage-1"),
colorOverride: Color.OrangeRed, sender: "Центральное Командование", announcementSound: ProtocolCRAB17RuleComponent.Announcement);
}
protected override void Ended(EntityUid uid, ProtocolCRAB17RuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
{
base.Ended(uid, component, gameRule, args);
var allMoneyStolen = 0;
var query = AllEntityQuery<BankCardComponent>();
while (query.MoveNext(out _, out var bankCardComponent))
{
if (bankCardComponent.AccountId == null)
continue;
if (component.Callers.Contains((int) bankCardComponent.AccountId))
continue;
var money = _bankCardSystem.GetBalance((int) bankCardComponent.AccountId);
allMoneyStolen += money;
_bankCardSystem.TryChangeBalance((int) bankCardComponent.AccountId, -money);
}
var callersCount = component.Callers.Count;
foreach (var caller in component.Callers)
{
_bankCardSystem.TryChangeBalance(caller, (int) Math.Floor((double) (allMoneyStolen / callersCount)));
}
if (component.TargetStation != null)
_chatSystem.DispatchStationAnnouncement((EntityUid) component.TargetStation, Loc.GetString("protocol-CRAB17-stage-2", ("amount", allMoneyStolen)),
colorOverride: Color.OrangeRed, sender: "Центральное Командование");
var ertsys = _entities.System<ProtocolCRAB17Rule>();
ertsys.LastTimeExecuted = _timing.CurTime;
component.Callers.Clear();
}
public bool CanStartEvent()
{
var ertsys = _entities.System<ProtocolCRAB17Rule>();
if (ertsys.LastTimeExecuted == null)
return true;
else if (ertsys.LastTimeExecuted < _timing.CurTime - ProtocolCRAB17RuleComponent.TimeBetweenEvents)
return true;
return false;
}
}

19
Content.Server/_Amour/ProtocolCRAB17/ProtocolCRAB17RuleComponent.cs
View File

@@ -1,19 +0,0 @@
using Robust.Shared.Audio;
namespace Content.Server._Amour.ProtocolCRAB17;
[RegisterComponent]
public sealed partial class ProtocolCRAB17RuleComponent : Component
{
/// <summary>
/// Minimal time between events.
/// </summary>
public static TimeSpan TimeBetweenEvents = TimeSpan.FromMinutes(20);
public static SoundSpecifier Announcement = new SoundPathSpecifier("/Audio/_Amour/ProtocolCRAB17/Bogdanoff_is_calling.ogg");
[ViewVariables]
public EntityUid? TargetStation;
[ViewVariables]
public HashSet<int> Callers = new();
}

38
Content.Server/_Amour/ProtocolCRAB17/ProtocolCRAB17System.cs
View File

@@ -1,38 +0,0 @@
using Content.Shared._Amour.ProtocolCRAB17;
using Content.Server.GameTicking;
using Content.Server.Popups;
namespace Content.Server._Amour.ProtocolCRAB17;
public sealed class ProtocolCRAB17System : SharedProtocolCRAB17System
{
[Dependency] private readonly GameTicker _gameTicker = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly ProtocolCRAB17Rule _protocolCRAB17Rule = default!;
public override void OnDoAfter(Entity<ProtocolCRAB17Component> ent, ref ProtocolCRAB17DoAfterEvent args)
{
if (args.Cancelled || args.Handled)
return;
if (_gameTicker.IsGameRuleActive("ProtocolCRAB17Event"))
{
_popupSystem.PopupEntity(Loc.GetString("protocol-CRAB17-event-running"), ent, args.User);
args.Handled = true;
return;
}
if (!_protocolCRAB17Rule.CanStartEvent())
{
_popupSystem.PopupEntity(Loc.GetString("protocol-CRAB17-timeout"), ent, args.User);
args.Handled = true;
return;
}
_popupSystem.PopupEntity(Loc.GetString("protocol-CRAB17-activated"), ent, args.User);
_gameTicker.AddGameRule("ProtocolCRAB17Event");
args.Handled = true;
return;
}
}

31
Content.Shared/_Amour/ProtocolCRAB17/ProtocolCRAB17Component.cs
View File

@@ -1,31 +0,0 @@
using Content.Shared.DoAfter;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Serialization;
namespace Content.Shared._Amour.ProtocolCRAB17;
/// <summary>
/// WD
/// </summary>
[NetworkedComponent, RegisterComponent]
public sealed partial class ProtocolCRAB17Component : Component
{
[ViewVariables]
public int? BankAccountId;
[ViewVariables]
public bool HasBankAccountId = false;
[DataField]
public SoundSpecifier UseSound = new SoundPathSpecifier("/Audio/_Amour/ProtocolCRAB17/Phone_Dial.ogg");
[DataField]
public SoundSpecifier SoundApply = new SoundPathSpecifier("/Audio/White/Machines/chime.ogg");
}
[Serializable, NetSerializable]
public sealed partial class ProtocolCRAB17DoAfterEvent : SimpleDoAfterEvent
{
}

71
Content.Shared/_Amour/ProtocolCRAB17/SharedProtocolCRAB17System.cs
View File

@@ -1,71 +0,0 @@
using Content.Shared._White.Economy;
using Content.Shared.DoAfter;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Content.Shared.Popups;
using Content.Shared.Timing;
using Robust.Shared.Audio.Systems;
namespace Content.Shared._Amour.ProtocolCRAB17;
public abstract class SharedProtocolCRAB17System : EntitySystem
{
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly UseDelaySystem _useDelay = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<ProtocolCRAB17Component, UseInHandEvent>(OnUseInHand);
SubscribeLocalEvent<ProtocolCRAB17Component, ProtocolCRAB17DoAfterEvent>(OnDoAfter);
SubscribeLocalEvent<ProtocolCRAB17Component, InteractUsingEvent>(OnInteractUsing);
}
private void OnInteractUsing(EntityUid uid, ProtocolCRAB17Component component, InteractUsingEvent args)
{
if (!TryComp(args.Used, out BankCardComponent? bankCard))
return;
if (!TryComp(uid, out UseDelayComponent? useDelay) ||
!_useDelay.TryResetDelay((uid, useDelay), true))
return;
component.BankAccountId = bankCard.AccountId;
component.HasBankAccountId = true;
_popupSystem.PopupPredicted(Loc.GetString("protocol-CRAB17-card-accepted"), uid, args.User);
_audioSystem.PlayPredicted(component.SoundApply, uid, args.User);
}
private void OnUseInHand(EntityUid uid, ProtocolCRAB17Component component, ref UseInHandEvent args)
{
if (args.Handled ||
!TryComp(uid, out UseDelayComponent? useDelay) ||
!_useDelay.TryResetDelay((uid, useDelay), true))
return;
if (component.HasBankAccountId == false)
{
_popupSystem.PopupClient(Loc.GetString("protocol-CRAB17-no-card"), uid, args.User);
return;
}
var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, useDelay.Delay, new ProtocolCRAB17DoAfterEvent(), uid, target: uid)
{
BreakOnMove = true,
BreakOnDamage = true,
NeedHand = true
};
// TODO find a way to stop playsound on doafter cancel
_audioSystem.PlayPredicted(component.UseSound, uid, args.User);
_popupSystem.PopupClient(Loc.GetString("protocol-CRAB17-try-activate"), uid, args.User);
_doAfterSystem.TryStartDoAfter(doAfterEventArgs);
args.Handled = true;
}
public abstract void OnDoAfter(Entity<ProtocolCRAB17Component> ent, ref ProtocolCRAB17DoAfterEvent args);
}

BIN
Resources/Audio/_Amour/ProtocolCRAB17/Bogdanoff_is_calling.ogg
View File

Binary file not shown.

BIN
Resources/Audio/_Amour/ProtocolCRAB17/Phone_Dial.ogg
View File

Binary file not shown.

6
Resources/Changelog/ChangelogAmour.yml
View File

@@ -171,9 +171,3 @@
type: Add type: Add
id: 27 id: 27
time: '2025-01-07T18:00:13.0000000+00:00' time: '2025-01-07T18:00:13.0000000+00:00'
- author: BIG_Zi_348
changes:
- message: "Добавлен новый предмет в аплинк - подозрительный телефон."
type: Add
id: 28
time: '2025-01-26T18:00:13.0000000+00:00'

12
Resources/Locale/ru-RU/_amour/protocolcrab17.ftl
View File

@@ -1,12 +0,0 @@
ent-ProtocolCRAB17 = подозрительный телефон
.desc = Какой следующий шаг твоего мастер плана? Уничтожить этот рынок, не оставив выживших!
protocol-CRAB17-no-card = Протокол не может быть запущен без привязанной банковской карты.
protocol-CRAB17-card-accepted = Карта привязана.
protocol-CRAB17-try-activate = Вы вводите комбинацию и ожидаете ответ...
protocol-CRAB17-activated = Инициация протокола КРАБ-17 завершена. Ожидайте благополучных новостей.
protocol-CRAB17-event-running = Протокол уже запущен, ваши средства в безопасности!
protocol-CRAB17-timeout = Линия занята, повторите попытку позже...
protocol-CRAB17-stage-1 = Внимание! В централизованной системе учёта финансов обнаружена критическая ошибка. Сброс банковских данных станции неизбежен. Персоналу необходимо в кратчайшие сроки обналичить все счета, для избежания потери средств.
protocol-CRAB17-stage-2 = Системы банковского учёта сброшены до последней стабильной версии и готовы к дальнейшей работе. Оценочная суммарная потеря средств составляет: { $amount } кредитов.

32
Resources/Prototypes/_Amour/Entities/Objects/Tools/protocolcrab17.yml
View File

@@ -1,32 +0,0 @@
- type: entity
name: suspicious phone
parent: BaseItem
id: ProtocolCRAB17
description: So what's the next step of your master plan? Crashing this market, with no survivors!
components:
- type: Sprite
sprite: _Amour/Objects/Devices/protocolcrab17.rsi
state: icon
scale: 0.75, 0.75
- type: EmitSoundOnPickup
sound:
path: /Audio/White/Items/handling/component_pickup.ogg
- type: EmitSoundOnDrop
sound:
path: /Audio/White/Items/handling/component_drop.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/White/Items/handling/component_drop.ogg
- type: ProtocolCRAB17
- type: UseDelay
delay: 4
- type: entity
id: ProtocolCRAB17Event
parent: BaseGameRule
noSpawn: true
components:
- type: StationEvent
weight: 0
duration: 120
- type: ProtocolCRAB17Rule

11
Resources/Prototypes/_Honk/Catalog/uplink_catalog.yml
View File

@@ -8,14 +8,3 @@
Telecrystal: 12 Telecrystal: 12
categories: categories:
- UplinkAllies - UplinkAllies
- type: listing
id: UplinkProtocolCRAB17
name: Протокол КРАБ-17
description: Подозрительный телефон с загруженным протоколом "КРАБ-17". Привяжите свою карту и наблюдайте за падением экономики всей станции.
icon: { sprite: _Amour/Objects/Devices/protocolcrab17.rsi, state: icon }
productEntity: ProtocolCRAB17
cost:
Telecrystal: 6
categories:
- UplinkDisruption

BIN
Resources/Textures/_Amour/Objects/Devices/protocolcrab17.rsi/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

14
Resources/Textures/_Amour/Objects/Devices/protocolcrab17.rsi/meta.json
View File

@@ -1,14 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet/commit/016ff56f3b0c0884912c87002c34eedd5e82a8fe",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
}
]
}