mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-05-01 04:27: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
201 lines
7.8 KiB
C#
201 lines
7.8 KiB
C#
using System.Collections.Frozen;
|
|
using System.Linq;
|
|
using Content.Shared.Chat;
|
|
using Content.Shared.Chat.Prototypes;
|
|
using Content.Shared.Speech;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Random;
|
|
|
|
namespace Content.Server.Chat.Systems;
|
|
|
|
// emotes using emote prototype
|
|
public partial class ChatSystem
|
|
{
|
|
private FrozenDictionary<string, EmotePrototype> _wordEmoteDict = FrozenDictionary<string, EmotePrototype>.Empty;
|
|
private IReadOnlyList<string> Punctuation { get; } = new List<string> { ",", ".", "!", "?", "-", "~", "'", "\"", };
|
|
|
|
protected override void OnPrototypeReload(PrototypesReloadedEventArgs obj)
|
|
{
|
|
base.OnPrototypeReload(obj);
|
|
if (obj.WasModified<EmotePrototype>())
|
|
CacheEmotes();
|
|
}
|
|
|
|
private void CacheEmotes()
|
|
{
|
|
var dict = new Dictionary<string, EmotePrototype>();
|
|
var emotes = _prototypeManager.EnumeratePrototypes<EmotePrototype>();
|
|
foreach (var emote in emotes)
|
|
{
|
|
foreach (var word in emote.ChatTriggers)
|
|
{
|
|
var lowerWord = Loc.GetString(word).ToLower(); // WD EDIT
|
|
if (dict.TryGetValue(lowerWord, out var value))
|
|
{
|
|
var errMsg = $"Duplicate of emote word {lowerWord} in emotes {emote.ID} and {value.ID}";
|
|
Log.Error(errMsg);
|
|
continue;
|
|
}
|
|
|
|
dict.Add(lowerWord, emote);
|
|
}
|
|
}
|
|
|
|
_wordEmoteDict = dict.ToFrozenDictionary();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Makes selected entity to emote using <see cref="EmotePrototype"/> and sends message to chat.
|
|
/// </summary>
|
|
/// <param name="source">The entity that is speaking</param>
|
|
/// <param name="emoteId">The id of emote prototype. Should has valid <see cref="EmotePrototype.ChatMessages"/></param>
|
|
/// <param name="hideLog">Whether or not this message should appear in the adminlog window</param>
|
|
/// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
|
|
/// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
|
|
public void TryEmoteWithChat(
|
|
EntityUid source,
|
|
string emoteId,
|
|
ChatTransmitRange range = ChatTransmitRange.Normal,
|
|
bool hideLog = false,
|
|
string? nameOverride = null,
|
|
bool ignoreActionBlocker = false
|
|
)
|
|
{
|
|
if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto))
|
|
return;
|
|
TryEmoteWithChat(source, proto, range, hideLog: hideLog, nameOverride, ignoreActionBlocker: ignoreActionBlocker);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Makes selected entity to emote using <see cref="EmotePrototype"/> and sends message to chat.
|
|
/// </summary>
|
|
/// <param name="source">The entity that is speaking</param>
|
|
/// <param name="emote">The emote prototype. Should has valid <see cref="EmotePrototype.ChatMessages"/></param>
|
|
/// <param name="hideLog">Whether or not this message should appear in the adminlog window</param>
|
|
/// <param name="hideChat">Whether or not this message should appear in the chat window</param>
|
|
/// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
|
|
/// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
|
|
public void TryEmoteWithChat(
|
|
EntityUid source,
|
|
EmotePrototype emote,
|
|
ChatTransmitRange range = ChatTransmitRange.Normal,
|
|
bool hideLog = false,
|
|
string? nameOverride = null,
|
|
bool ignoreActionBlocker = false
|
|
)
|
|
{
|
|
if (!(emote.Whitelist?.IsValid(source, EntityManager) ?? true))
|
|
return;
|
|
if (emote.Blacklist?.IsValid(source, EntityManager) ?? false)
|
|
return;
|
|
|
|
if (!emote.Available &&
|
|
TryComp<SpeechComponent>(source, out var speech) &&
|
|
!speech.AllowedEmotes.Contains(emote.ID))
|
|
return;
|
|
|
|
// check if proto has valid message for chat
|
|
if (emote.ChatMessages.Count != 0)
|
|
{
|
|
// not all emotes are loc'd, but for the ones that are we pass in entity
|
|
var action = Loc.GetString(_random.Pick(emote.ChatMessages), ("entity", source));
|
|
var language = _language.GetLanguage(source);
|
|
SendEntityEmote(source, action, range, nameOverride, language, hideLog: hideLog, checkEmote: false, ignoreActionBlocker: ignoreActionBlocker);
|
|
}
|
|
|
|
// do the rest of emote event logic here
|
|
TryEmoteWithoutChat(source, emote, ignoreActionBlocker);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Makes selected entity to emote using <see cref="EmotePrototype"/> without sending any messages to chat.
|
|
/// </summary>
|
|
public void TryEmoteWithoutChat(EntityUid uid, string emoteId, bool ignoreActionBlocker = false)
|
|
{
|
|
if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto))
|
|
return;
|
|
|
|
TryEmoteWithoutChat(uid, proto, ignoreActionBlocker);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Makes selected entity to emote using <see cref="EmotePrototype"/> without sending any messages to chat.
|
|
/// </summary>
|
|
public void TryEmoteWithoutChat(EntityUid uid, EmotePrototype proto, bool ignoreActionBlocker = false)
|
|
{
|
|
if (!_actionBlocker.CanEmote(uid) && !ignoreActionBlocker)
|
|
return;
|
|
|
|
InvokeEmoteEvent(uid, proto);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tries to find and play relevant emote sound in emote sounds collection.
|
|
/// </summary>
|
|
/// <returns>True if emote sound was played.</returns>
|
|
public bool TryPlayEmoteSound(EntityUid uid, EmoteSoundsPrototype? proto, EmotePrototype emote)
|
|
{
|
|
return TryPlayEmoteSound(uid, proto, emote.ID);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tries to find and play relevant emote sound in emote sounds collection.
|
|
/// </summary>
|
|
/// <returns>True if emote sound was played.</returns>
|
|
public bool TryPlayEmoteSound(EntityUid uid, EmoteSoundsPrototype? proto, string emoteId)
|
|
{
|
|
if (proto == null)
|
|
return false;
|
|
|
|
// try to get specific sound for this emote
|
|
if (!proto.Sounds.TryGetValue(emoteId, out var sound))
|
|
{
|
|
// no specific sound - check fallback
|
|
sound = proto.FallbackSound;
|
|
if (sound == null)
|
|
return false;
|
|
}
|
|
|
|
// if general params for all sounds set - use them
|
|
var param = proto.GeneralParams ?? sound.Params;
|
|
_audio.PlayPvs(sound, uid, param);
|
|
return true;
|
|
}
|
|
|
|
private void TryEmoteChatInput(EntityUid uid, string textInput)
|
|
{
|
|
var actionLower = textInput.ToLower();
|
|
// Replace ending punctuation with nothing
|
|
if (Punctuation.Any(punctuation => actionLower.EndsWith(punctuation)))
|
|
actionLower = actionLower.Remove(actionLower.Length - 1);
|
|
|
|
if (!_wordEmoteDict.TryGetValue(actionLower, out var emote))
|
|
return;
|
|
|
|
InvokeEmoteEvent(uid, emote);
|
|
}
|
|
|
|
private void InvokeEmoteEvent(EntityUid uid, EmotePrototype proto)
|
|
{
|
|
var ev = new EmoteEvent(proto);
|
|
RaiseLocalEvent(uid, ref ev);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Raised by chat system when entity made some emote.
|
|
/// Use it to play sound, change sprite or something else.
|
|
/// </summary>
|
|
[ByRefEvent]
|
|
public struct EmoteEvent
|
|
{
|
|
public bool Handled;
|
|
public readonly EmotePrototype Emote;
|
|
|
|
public EmoteEvent(EmotePrototype emote)
|
|
{
|
|
Emote = emote;
|
|
Handled = false;
|
|
}
|
|
}
|