Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,8 @@ public uint Pattern
public uint HighlightReel
{ get => Accessor.GetUInt32("highlight_reel"); set => Accessor.SetUInt32("highlight_reel", value); }


public uint WrappedSticker
{ get => Accessor.GetUInt32("wrapped_sticker"); set => Accessor.SetUInt32("wrapped_sticker", value); }

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@

using SwiftlyS2.Core.Natives;
using SwiftlyS2.Core.NetMessages;
using SwiftlyS2.Shared.Natives;
using SwiftlyS2.Shared.NetMessages;
using SwiftlyS2.Shared.ProtobufDefinitions;

namespace SwiftlyS2.Core.ProtobufDefinitions;

internal class CMsgPlayerBulletHitImpl : TypedProtobuf<CMsgPlayerBulletHit>, CMsgPlayerBulletHit
{
public CMsgPlayerBulletHitImpl(nint handle, bool isManuallyAllocated): base(handle)
{
}


public int AttackerSlot
{ get => Accessor.GetInt32("attacker_slot"); set => Accessor.SetInt32("attacker_slot", value); }


public int VictimSlot
{ get => Accessor.GetInt32("victim_slot"); set => Accessor.SetInt32("victim_slot", value); }


public Vector VictimPos
{ get => Accessor.GetVector("victim_pos"); set => Accessor.SetVector("victim_pos", value); }


public int HitGroup
{ get => Accessor.GetInt32("hit_group"); set => Accessor.SetInt32("hit_group", value); }


public int Damage
{ get => Accessor.GetInt32("damage"); set => Accessor.SetInt32("damage", value); }


public int PenetrationCount
{ get => Accessor.GetInt32("penetration_count"); set => Accessor.SetInt32("penetration_count", value); }


public bool IsKill
{ get => Accessor.GetBool("is_kill"); set => Accessor.SetBool("is_kill", value); }

}
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,18 @@ public uint AttackType
{ get => Accessor.GetUInt32("attack_type"); set => Accessor.SetUInt32("attack_type", value); }


public bool PlayerInair
{ get => Accessor.GetBool("player_inair"); set => Accessor.SetBool("player_inair", value); }


public bool PlayerScoped
{ get => Accessor.GetBool("player_scoped"); set => Accessor.SetBool("player_scoped", value); }


public int Tick
{ get => Accessor.GetInt32("tick"); set => Accessor.SetInt32("tick", value); }


public CMsgTEFireBullets_Extra Extra
{ get => new CMsgTEFireBullets_ExtraImpl(NativeNetMessages.GetNestedMessage(Address, "extra"), false); }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ public enum ECsgoGameEvents
GE_PlayerAnimEventId = 450,
GE_RadioIconEventId = 451,
GE_FireBulletsId = 452,
GE_PlayerBulletHitId = 453,
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public enum EGCItemCustomizationNotification
k_EGCItemCustomizationNotification_NameBaseItem = 1019,
k_EGCItemCustomizationNotification_RemoveItemName = 1030,
k_EGCItemCustomizationNotification_RemoveSticker = 1053,
k_EGCItemCustomizationNotification_ExtractSticker = 1054,
k_EGCItemCustomizationNotification_EncapsulateSticker = 1055,
k_EGCItemCustomizationNotification_ApplySticker = 1086,
k_EGCItemCustomizationNotification_StatTrakSwap = 1088,
k_EGCItemCustomizationNotification_RemovePatch = 1089,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,7 @@ public interface CEconItemPreviewDataBlock_Sticker : ITypedProtobuf<CEconItemPre

public uint HighlightReel { get; set; }


public uint WrappedSticker { get; set; }

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

using SwiftlyS2.Core.ProtobufDefinitions;
using SwiftlyS2.Shared.Natives;
using SwiftlyS2.Shared.NetMessages;

namespace SwiftlyS2.Shared.ProtobufDefinitions;

public interface CMsgPlayerBulletHit : ITypedProtobuf<CMsgPlayerBulletHit>
{
static CMsgPlayerBulletHit ITypedProtobuf<CMsgPlayerBulletHit>.Wrap(nint handle, bool isManuallyAllocated) => new CMsgPlayerBulletHitImpl(handle, isManuallyAllocated);


public int AttackerSlot { get; set; }


public int VictimSlot { get; set; }


public Vector VictimPos { get; set; }


public int HitGroup { get; set; }


public int Damage { get; set; }


public int PenetrationCount { get; set; }


public bool IsKill { get; set; }

}
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@ public interface CMsgTEFireBullets : ITypedProtobuf<CMsgTEFireBullets>, INetMess
public uint AttackType { get; set; }


public bool PlayerInair { get; set; }


public bool PlayerScoped { get; set; }


public int Tick { get; set; }


public CMsgTEFireBullets_Extra Extra { get; }

}
14 changes: 14 additions & 0 deletions protobufs/cs2/cs_gameevents.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ enum ECsgoGameEvents {
GE_PlayerAnimEventId = 450;
GE_RadioIconEventId = 451;
GE_FireBulletsId = 452;
GE_PlayerBulletHitId = 453;
}

message CMsgTEPlayerAnimEvent {
Expand Down Expand Up @@ -43,5 +44,18 @@ message CMsgTEFireBullets {
optional .CMsgVector ent_origin = 13;
optional uint32 num_bullets_remaining = 14;
optional uint32 attack_type = 15;
optional bool player_inair = 17;
optional bool player_scoped = 18;
optional int32 tick = 19;
optional .CMsgTEFireBullets.Extra extra = 16;
}

message CMsgPlayerBulletHit {
optional int32 attacker_slot = 1 [default = -1];
optional int32 victim_slot = 2 [default = -1];
optional .CMsgVector victim_pos = 3;
optional int32 hit_group = 4;
optional int32 damage = 5;
optional int32 penetration_count = 6;
optional bool is_kill = 7;
}
1 change: 1 addition & 0 deletions protobufs/cs2/cstrike15_gcmessages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,7 @@ message CEconItemPreviewDataBlock {
optional float offset_z = 9;
optional uint32 pattern = 10;
optional uint32 highlight_reel = 11;
optional uint32 wrapped_sticker = 12;
}

optional uint32 accountid = 1;
Expand Down
2 changes: 2 additions & 0 deletions protobufs/cs2/econ_gcmessages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ enum EGCItemCustomizationNotification {
k_EGCItemCustomizationNotification_NameBaseItem = 1019;
k_EGCItemCustomizationNotification_RemoveItemName = 1030;
k_EGCItemCustomizationNotification_RemoveSticker = 1053;
k_EGCItemCustomizationNotification_ExtractSticker = 1054;
k_EGCItemCustomizationNotification_EncapsulateSticker = 1055;
k_EGCItemCustomizationNotification_ApplySticker = 1086;
k_EGCItemCustomizationNotification_StatTrakSwap = 1088;
k_EGCItemCustomizationNotification_RemovePatch = 1089;
Expand Down
Loading