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

Update properties sent to client #4258

Merged
merged 7 commits into from
Jan 15, 2025
Merged

Update properties sent to client #4258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
91b9406
Cleaned up properties sent on appraisal and login
OptimShi Dec 21, 2024
cee8ba2
Fix missing [Ephemeral] attributes
OptimShi Dec 23, 2024
b159500
Balanced enum balances, reduced multiple attributes to a single line
OptimShi Dec 24, 2024
c17d589
Fixed single spacing issue.
OptimShi Dec 24, 2024
74ef868
Fixed bad speeling
OptimShi Dec 24, 2024
7fa0e3c
Add EncumbranceVal to [AssessmentProperty]
OptimShi Dec 31, 2024
d3eccf9
Add EncumbranceVal to [SendOnLogin]
OptimShi Dec 31, 2024
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
62 changes: 0 additions & 62 deletions Source/ACE.Entity/Enum/Properties/ClientProperties.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Source/ACE.Entity/Enum/Properties/PositionType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ public enum PositionType : ushort
/// </summary>
TeleportedCharacter = 27,

[ServerOnly]
PCAPRecordedLocation = 8040
}
}
65 changes: 23 additions & 42 deletions Source/ACE.Entity/Enum/Properties/PropertyBool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@

namespace ACE.Entity.Enum.Properties
{
// No properties are sent to the client unless they featured an attribute.
// SendOnLogin gets sent to players in the PlayerDescription event
// AssessmentProperty gets sent in successful appraisal
public enum PropertyBool : ushort
{
// properties marked as ServerOnly are properties we never saw in PCAPs, from here:
// http://ac.yotesfan.com/ace_object/not_used_enums.php
// source: @OptimShi
// description attributes are used by the weenie editor for a cleaner display name

Undef = 0,
[Ephemeral][ServerOnly]
Stuck = 1,
[Ephemeral]
Stuck = 1,
[AssessmentProperty][Ephemeral]
Open = 2,
[AssessmentProperty]
Locked = 3,
RotProof = 4,
AllegianceUpdateRequest = 5,
Expand All @@ -22,25 +21,18 @@ public enum PropertyBool : ushort
AllowGive = 8,
CurrentlyAttacking = 9,
AttackerAi = 10,
[ServerOnly]
IgnoreCollisions = 11,
[ServerOnly]
ReportCollisions = 12,
[ServerOnly]
Ethereal = 13,
[ServerOnly]
GravityStatus = 14,
[ServerOnly]
LightsStatus = 15,
[ServerOnly]
ScriptedCollision = 16,
[ServerOnly]
Inelastic = 17,
[ServerOnly][Ephemeral]
[Ephemeral]
Visibility = 18,
[ServerOnly]
Attackable = 19,
SafeSpellComponents = 20,
[SendOnLogin]
AdvocateState = 21,
Inscribable = 22,
DestroyOnSell = 23,
Expand All @@ -66,11 +58,11 @@ public enum PropertyBool : ushort
ReportCollisionsAsEnvironment = 41,
AllowEdgeSlide = 42,
AdvocateQuest = 43,
[Ephemeral][SendOnLogin]
[SendOnLogin][Ephemeral]
IsAdmin = 44,
[Ephemeral][SendOnLogin]
[SendOnLogin][Ephemeral]
IsArch = 45,
[Ephemeral][SendOnLogin]
[SendOnLogin][Ephemeral]
IsSentinel = 46,
[SendOnLogin]
IsAdvocate = 47,
Expand All @@ -91,13 +83,15 @@ public enum PropertyBool : ushort
IsAcceptingTells = 60,
LoggingChannel = 61,
OpensAnyLock = 62,
[AssessmentProperty]
UnlimitedUse = 63,
GeneratedTreasureItem = 64,
IgnoreMagicResist = 65,
IgnoreMagicArmor = 66,
AiAllowTrade = 67,
[SendOnLogin]
SpellComponentsRequired = 68,
[AssessmentProperty]
IsSellable = 69,
IgnoreShieldsBySkill = 70,
NoDraw = 71,
Expand All @@ -113,25 +107,29 @@ public enum PropertyBool : ushort
IgnorePortalRestrictions = 80,
RequiresBackpackSlot = 81,
DontTurnOrMoveWhenGiving = 82,
[ServerOnly]
NpcLooksLikeObject = 83,
IgnoreCloIcons = 84,
[AssessmentProperty]
AppraisalHasAllowedWielder = 85,
ChestRegenOnClose = 86,
LogoffInMinigame = 87,
PortalShowDestination = 88,
PortalIgnoresPkAttackTimer = 89,
NpcInteractsSilently = 90,
[AssessmentProperty]
Retained = 91,
IgnoreAuthor = 92,
Limbo = 93,
[AssessmentProperty]
AppraisalHasAllowedActivator = 94,
ExistedBeforeAllegianceXpChanges = 95,
IsDeaf = 96,
[Ephemeral][SendOnLogin]
[SendOnLogin][Ephemeral]
IsPsr = 97,
Invincible = 98,
[AssessmentProperty]
Ivoryable = 99,
[AssessmentProperty]
Dyable = 100,
CanGenerateRare = 101,
CorpseGeneratedRare = 102,
Expand All @@ -142,6 +140,7 @@ public enum PropertyBool : ushort
[Ephemeral]
FirstEnterWorldDone = 106,
RecallsDisabled = 107,
[AssessmentProperty]
RareUsesTimer = 108,
ActdPreorderReceivedItems = 109,
[Ephemeral]
Expand All @@ -167,39 +166,21 @@ public enum PropertyBool : ushort
[SendOnLogin]
Account15Days = 127,
HadNoVitae = 128,
[SendOnLogin]
NoOlthoiTalk = 129,
[AssessmentProperty]
AutowieldLeft = 130,

/* custom */
[ServerOnly]
/* Custom Properties */
LinkedPortalOneSummon = 9001,
[ServerOnly]
LinkedPortalTwoSummon = 9002,
[ServerOnly]
HouseEvicted = 9003,
[ServerOnly]
UntrainedSkills = 9004,
[Ephemeral][ServerOnly]
[Ephemeral]
IsEnvoy = 9005,
[ServerOnly]
UnspecializedSkills = 9006,
[ServerOnly]
FreeSkillResetRenewed = 9007,
[ServerOnly]
FreeAttributeResetRenewed = 9008,
[ServerOnly]
SkillTemplesTimerReset = 9009,
[ServerOnly]
FreeMasteryResetRenewed = 9010,
}

public static class PropertyBoolExtensions
{
public static string GetDescription(this PropertyBool prop)
{
var description = prop.GetAttributeOfType<DescriptionAttribute>();
return description?.Description ?? prop.ToString();
}
}
}
Loading