Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update UI-related messages #6

Merged
merged 1 commit into from
May 1, 2024
Merged

Update UI-related messages #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions AeroMessages/GSS/V66/AreaVisualData/View/MapMarkerView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ public partial class MapMarkerView
public struct MapMarkerData
{
[AeroSdb("dbencounterdata::MapMarkerInfo", "id")]
public ushort MarkerType; // Weird
public uint Unk2;
public uint Unk3;
public ushort MarkerType;
[AeroSdb("dblocalization::LocalizedText", "id")]
public uint TitleId;
[AeroSdb("dblocalization::LocalizedText", "id")]
public uint DescriptionId;

public EntityId EncounterId;
public EntityId EncounterMarkerId; // No controller specified.
Expand Down
8 changes: 5 additions & 3 deletions AeroMessages/GSS/V66/Character/Controller/MissionAndMarkerController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,11 @@ public partial class MissionAndMarkerController
public struct PersonalMapMarkerData
{
[AeroSdb("dbencounterdata::MapMarkerInfo", "id")]
public ushort MarkerType; // Weird
public uint Unk2;
public uint Unk3;
public ushort MarkerType;
[AeroSdb("dblocalization::LocalizedText", "id")]
public uint TitleId;
[AeroSdb("dblocalization::LocalizedText", "id")]
public uint DescriptionId;
public EntityId EncounterId;
public EntityId EncounterMarkerId; // No controller specified.

Expand Down
14 changes: 12 additions & 2 deletions AeroMessages/GSS/V66/Generic/Event/DisplayUiNotification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,21 @@ namespace AeroMessages.GSS.V66.Generic
[AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 103)]
public partial class DisplayUiNotification
{
public enum BannerType : byte
{
Normal = 1,
MoneyBomb = 2,
}

[AeroSdb("dblocalization::LocalizedText", "id")]
public uint LocalizedTextId;
public uint Unk1;

public uint Duration; // seconds

[AeroArray(typeof(byte))] public UiNotificationData[] Unk2;
public byte Unk3;

[AeroSdb("dbcharacter::BannerType", "id")]
public BannerType Banner;
}

[AeroBlock]
Expand Down
13 changes: 11 additions & 2 deletions AeroMessages/GSS/V66/Generic/Event/PingMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,17 @@ namespace AeroMessages.GSS.V66.Generic
[Aero]
[AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 110)]
public partial class PingMap
{
{
public enum PingMapType : uint
{
Normal = 1, // orange
Dynamic = 2, // purple
// anything else => white
}

public Vector3 Position;
public uint Unk;

[AeroSdb("dbcharacter::UiPingType", "id")]
public PingMapType Type;
}
}
28 changes: 20 additions & 8 deletions AeroMessages/GSS/V66/Generic/Event/SendTipMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,30 @@
using Aero.Gen.Attributes;
using static Aero.Gen.Attributes.AeroMessageIdAttribute;
using AeroMessages.Common;
using System.Numerics;
using System;
namespace AeroMessages.GSS.V66.Generic
{
[Aero]
[AeroMessageId(MsgType.GSS, MsgSrc.Message, 0, 92)]
public partial class SendTipMessage
{
public byte Unk1;
public uint Unk2;
public uint Unk3;
public HalfFloat Unk4;
public sbyte Unk5;
{
public enum HintType : byte
{
None = 0,
Movement = 1,
TechSlot = 2
}

[AeroSdb("clientmissions::UiHints", "id")]
public HintType Hint;

[AeroSdb("dblocalization::LocalizedText", "id")]
public uint MessageId;

[AeroSdb("dblocalization::LocalizedText", "id")]
public uint HeaderId;

public HalfFloat Duration; // seconds

public sbyte Persistent;
}
}
Loading