mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 21:48:58 +03:00
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml
228 lines
6.9 KiB
C#
228 lines
6.9 KiB
C#
using Content.Server.Chat.Managers;
|
|
using Content.Server.GameTicking;
|
|
using Content.Shared.CCVar;
|
|
using Content.Shared.Chat;
|
|
using Content.Shared.Dataset;
|
|
using Content.Shared.Tips;
|
|
using Robust.Server.GameObjects;
|
|
using Robust.Server.Player;
|
|
using Robust.Shared.Configuration;
|
|
using Robust.Shared.Console;
|
|
using Robust.Shared.Player;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Random;
|
|
using Robust.Shared.Timing;
|
|
|
|
namespace Content.Server.Tips;
|
|
|
|
/// <summary>
|
|
/// Handles periodically displaying gameplay tips to all players ingame.
|
|
/// </summary>
|
|
public sealed class TipsSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly IChatManager _chat = default!;
|
|
[Dependency] private readonly IPrototypeManager _prototype = default!;
|
|
[Dependency] private readonly IConfigurationManager _cfg = default!;
|
|
[Dependency] private readonly IGameTiming _timing = default!;
|
|
[Dependency] private readonly IRobustRandom _random = default!;
|
|
[Dependency] private readonly GameTicker _ticker = default!;
|
|
[Dependency] private readonly IConsoleHost _conHost = default!;
|
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
|
|
|
private bool _tipsEnabled;
|
|
private float _tipTimeOutOfRound;
|
|
private float _tipTimeInRound;
|
|
private string _tipsDataset = "";
|
|
private float _tipTippyChance;
|
|
|
|
[ViewVariables(VVAccess.ReadWrite)]
|
|
private TimeSpan _nextTipTime = TimeSpan.Zero;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<GameRunLevelChangedEvent>(OnGameRunLevelChanged);
|
|
Subs.CVar(_cfg, CCVars.TipFrequencyOutOfRound, SetOutOfRound, true);
|
|
Subs.CVar(_cfg, CCVars.TipFrequencyInRound, SetInRound, true);
|
|
Subs.CVar(_cfg, CCVars.TipsEnabled, SetEnabled, true);
|
|
Subs.CVar(_cfg, CCVars.TipsDataset, SetDataset, true);
|
|
Subs.CVar(_cfg, CCVars.TipsTippyChance, SetTippyChance, true);
|
|
|
|
RecalculateNextTipTime();
|
|
_conHost.RegisterCommand("tippy", Loc.GetString("cmd-tippy-desc"), Loc.GetString("cmd-tippy-help"), SendTippy, SendTippyHelper);
|
|
_conHost.RegisterCommand("tip", Loc.GetString("cmd-tip-desc"), "tip", SendTip);
|
|
}
|
|
|
|
private CompletionResult SendTippyHelper(IConsoleShell shell, string[] args)
|
|
{
|
|
return args.Length switch
|
|
{
|
|
1 => CompletionResult.FromHintOptions(CompletionHelper.SessionNames(), Loc.GetString("cmd-tippy-auto-1")),
|
|
2 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-2")),
|
|
3 => CompletionResult.FromHintOptions(CompletionHelper.PrototypeIDs<EntityPrototype>(), Loc.GetString("cmd-tippy-auto-3")),
|
|
4 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-4")),
|
|
5 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-5")),
|
|
6 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-6")),
|
|
_ => CompletionResult.Empty
|
|
};
|
|
}
|
|
|
|
private void SendTip(IConsoleShell shell, string argstr, string[] args)
|
|
{
|
|
AnnounceRandomTip();
|
|
RecalculateNextTipTime();
|
|
}
|
|
|
|
private void SendTippy(IConsoleShell shell, string argstr, string[] args)
|
|
{
|
|
if (args.Length < 2)
|
|
{
|
|
shell.WriteLine(Loc.GetString("cmd-tippy-help"));
|
|
return;
|
|
}
|
|
|
|
ActorComponent? actor = null;
|
|
if (args[0] != "all")
|
|
{
|
|
ICommonSession? session;
|
|
if (args.Length > 0)
|
|
{
|
|
// Get player entity
|
|
if (!_playerManager.TryGetSessionByUsername(args[0], out session))
|
|
{
|
|
shell.WriteLine(Loc.GetString("cmd-tippy-error-no-user"));
|
|
return;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
session = shell.Player;
|
|
}
|
|
|
|
if (session?.AttachedEntity is not { } user)
|
|
{
|
|
shell.WriteLine(Loc.GetString("cmd-tippy-error-no-user"));
|
|
return;
|
|
}
|
|
|
|
if (!TryComp(user, out actor))
|
|
{
|
|
shell.WriteError(Loc.GetString("cmd-tippy-error-no-user"));
|
|
return;
|
|
}
|
|
}
|
|
|
|
var ev = new TippyEvent(args[1]);
|
|
|
|
if (args.Length > 2)
|
|
{
|
|
ev.Proto = args[2];
|
|
if (!_prototype.HasIndex<EntityPrototype>(args[2]))
|
|
{
|
|
shell.WriteError(Loc.GetString("cmd-tippy-error-no-prototype", ("proto", args[2])));
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (args.Length > 3)
|
|
ev.SpeakTime = float.Parse(args[3]);
|
|
|
|
if (args.Length > 4)
|
|
ev.SlideTime = float.Parse(args[4]);
|
|
|
|
if (args.Length > 5)
|
|
ev.WaddleInterval = float.Parse(args[5]);
|
|
|
|
if (actor != null)
|
|
RaiseNetworkEvent(ev, actor.PlayerSession);
|
|
else
|
|
RaiseNetworkEvent(ev);
|
|
}
|
|
|
|
|
|
public override void Update(float frameTime)
|
|
{
|
|
base.Update(frameTime);
|
|
|
|
if (!_tipsEnabled)
|
|
return;
|
|
|
|
if (_nextTipTime != TimeSpan.Zero && _timing.CurTime > _nextTipTime)
|
|
{
|
|
AnnounceRandomTip();
|
|
RecalculateNextTipTime();
|
|
}
|
|
}
|
|
|
|
private void SetOutOfRound(float value)
|
|
{
|
|
_tipTimeOutOfRound = value;
|
|
}
|
|
|
|
private void SetInRound(float value)
|
|
{
|
|
_tipTimeInRound = value;
|
|
}
|
|
|
|
private void SetEnabled(bool value)
|
|
{
|
|
_tipsEnabled = value;
|
|
|
|
if (_nextTipTime != TimeSpan.Zero)
|
|
RecalculateNextTipTime();
|
|
}
|
|
|
|
private void SetDataset(string value)
|
|
{
|
|
_tipsDataset = value;
|
|
}
|
|
|
|
private void SetTippyChance(float value)
|
|
{
|
|
_tipTippyChance = value;
|
|
}
|
|
|
|
private void AnnounceRandomTip()
|
|
{
|
|
if (!_prototype.TryIndex<DatasetPrototype>(_tipsDataset, out var tips))
|
|
return;
|
|
|
|
var tip = _random.Pick(tips.Values);
|
|
var msg = Loc.GetString("tips-system-chat-message-wrap", ("tip", tip));
|
|
|
|
if (_random.Prob(_tipTippyChance))
|
|
{
|
|
var ev = new TippyEvent(msg);
|
|
ev.SpeakTime = 1 + tip.Length * 0.05f;
|
|
RaiseNetworkEvent(ev);
|
|
} else
|
|
{
|
|
_chat.ChatMessageToManyFiltered(Filter.Broadcast(), ChatChannel.OOC, tip, msg,
|
|
EntityUid.Invalid, false, false, Color.MediumPurple);
|
|
}
|
|
}
|
|
|
|
private void RecalculateNextTipTime()
|
|
{
|
|
if (_ticker.RunLevel == GameRunLevel.InRound)
|
|
{
|
|
_nextTipTime = _timing.CurTime + TimeSpan.FromSeconds(_tipTimeInRound);
|
|
}
|
|
else
|
|
{
|
|
_nextTipTime = _timing.CurTime + TimeSpan.FromSeconds(_tipTimeOutOfRound);
|
|
}
|
|
}
|
|
|
|
private void OnGameRunLevelChanged(GameRunLevelChangedEvent ev)
|
|
{
|
|
// reset for lobby -> inround
|
|
// reset for inround -> post but not post -> lobby
|
|
if (ev.New == GameRunLevel.InRound || ev.Old == GameRunLevel.InRound)
|
|
{
|
|
RecalculateNextTipTime();
|
|
}
|
|
}
|
|
}
|