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

Magic 3 (#340)

Browse Source 
* - add: Some tweaks and localization.

* - add: Teleport spell.

* - tweak: Tweak wizard hardsuit.

* - add: Turn off shield on cast.

* - add: New wizard clothes & update wizard shuttle,

* - remove: Remove old clothes from shuttle.

* - fix: No teleporting to centcomm.
This commit is contained in:
Aviu00
2024-06-09 16:26:27 +00:00
committed by GitHub
parent daa881b51b
commit 0c34a1fd9b
42 changed files with 1042 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Inventory/InventorySystem.Relay.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared._White.Events;
using Content.Shared._White.StaminaProtection;
using Content.Shared.Changeling;
using Content.Shared.Chemistry;
@@ -32,6 +33,7 @@ public partial class InventorySystem
SubscribeLocalEvent<InventoryComponent, StaminaDamageModifyEvent>(RelayInventoryEvent); // WD
SubscribeLocalEvent<InventoryComponent, ChemRegenModifyEvent>(RelayInventoryEvent); // WD
SubscribeLocalEvent<InventoryComponent, ChangelingRefundEvent>(RelayInventoryEvent); // WD
SubscribeLocalEvent<InventoryComponent, EnergyDomeClothesTurnOffEvent>(RelayInventoryEvent); // WD
SubscribeLocalEvent<InventoryComponent, GetDefaultRadioChannelEvent>(RelayInventoryEvent);
// by-ref events

8
Content.Shared/_White/Events/EnergyDomeClothesTurnOffEvent.cs Normal file
View File

@@ -0,0 +1,8 @@
using Content.Shared.Inventory;
namespace Content.Shared._White.Events;
public sealed class EnergyDomeClothesTurnOffEvent : EntityEventArgs, IInventoryRelayEvent
{
public SlotFlags TargetSlots => SlotFlags.OUTERCLOTHING;
}

13
Content.Shared/_White/Wizard/ScrollSystem/SharedScrollSystem.cs
View File

@@ -38,7 +38,8 @@ public abstract class SharedScrollSystem : EntitySystem
if (args.Handled)
return;
var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.LearnTime, new ScrollDoAfterEvent(), uid, target: uid)
var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.LearnTime, new ScrollDoAfterEvent(),
uid, target: uid)
{
BreakOnMove = true,
BreakOnDamage = true,
@@ -50,7 +51,9 @@ public abstract class SharedScrollSystem : EntitySystem
_audioSystem.PlayPvs(component.UseSound, args.User);
}
_popupSystem.PopupClient($"You start learning about {component.LearnPopup}.", args.User, args.User, PopupType.Medium);
_popupSystem.PopupClient(
Loc.GetString("scroll-component-start", ("subject", Loc.GetString(component.LearnPopup))), args.User,
args.User, PopupType.Medium);
_doAfterSystem.TryStartDoAfter(doAfterEventArgs);
@@ -69,7 +72,9 @@ public abstract class SharedScrollSystem : EntitySystem
_audioSystem.PlayEntity(component.AfterUseSound, args.User, args.User);
}
_popupSystem.PopupClient($"You learned much about {component.LearnPopup}. The scroll is slowly burning in your hands.", args.User, args.User, PopupType.Medium);
_popupSystem.PopupClient(
Loc.GetString("scroll-component-end", ("subject", Loc.GetString(component.LearnPopup))), args.User,
args.User, PopupType.Medium);
BurnScroll(uid);
@@ -80,7 +85,7 @@ public abstract class SharedScrollSystem : EntitySystem
#region Helpers
protected virtual void BurnScroll(EntityUid uid) {}
protected virtual void BurnScroll(EntityUid uid) { }
#endregion
}

16
Content.Shared/_White/Wizard/Teleport/TeleportSpellEuiState.cs Normal file
View File

@@ -0,0 +1,16 @@
using Content.Shared.Eui;
using Robust.Shared.Serialization;
namespace Content.Shared._White.Wizard.Teleport;
[Serializable, NetSerializable]
public sealed class TeleportSpellEuiState : EuiStateBase
{
public Dictionary<int, string> Locations = new();
}
[Serializable, NetSerializable]
public sealed class TeleportSpellTargetLocationSelected : EuiMessageBase
{
public int LocationUid;
}

6
Content.Shared/_White/Wizard/WizardEvents.cs
View File

@@ -172,4 +172,10 @@ public sealed partial class InstantRecallSpellEvent : InstantActionEvent, ISpeak
public string? Speech { get; private set; }
}
public sealed partial class TeleportSpellEvent : InstantActionEvent, ISpeakSpell
{
[DataField("speech")]
public string? Speech { get; private set; }
}
#endregion