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

Visual popup types (#9523)

Browse Source 
* Visual popup types

* Pass over `PopupCoordinates` and `PopupCursor`

* `PopupEntity` pass

* Disease and reagent popup pass

* COLOUR
This commit is contained in:
Kara
2022-07-09 02:09:52 -07:00
committed by GitHub
parent 1d3d8efbc9
commit dc28b58468
47 changed files with 272 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Chemistry/ReagentEffects/PopupMessage.cs
View File

@@ -11,7 +11,10 @@ namespace Content.Server.Chemistry.ReagentEffects
public string[] Messages = default!;
[DataField("type")]
public PopupType Type = PopupType.Local;
public PopupRecipients Type = PopupRecipients.Local;
[DataField("visualType")]
public PopupType VisualType = PopupType.Small;
public override void Effect(ReagentEffectArgs args)
{
@@ -19,14 +22,14 @@ namespace Content.Server.Chemistry.ReagentEffects
var random = IoCManager.Resolve<IRobustRandom>();
var msg = random.Pick(Messages);
if (Type == PopupType.Local)
popupSys.PopupEntity(Loc.GetString(msg), args.SolutionEntity, Filter.Entities(args.SolutionEntity));
else if (Type == PopupType.Pvs)
popupSys.PopupEntity(Loc.GetString(msg), args.SolutionEntity, Filter.Pvs(args.SolutionEntity));
if (Type == PopupRecipients.Local)
popupSys.PopupEntity(Loc.GetString(msg), args.SolutionEntity, Filter.Entities(args.SolutionEntity), VisualType);
else if (Type == PopupRecipients.Pvs)
popupSys.PopupEntity(Loc.GetString(msg), args.SolutionEntity, Filter.Pvs(args.SolutionEntity), VisualType);
}
}
public enum PopupType
public enum PopupRecipients
{
Pvs,
Local