Skip to content

Commit

Permalink
Update protobufs + small rework
Browse files Browse the repository at this point in the history 
Now using SDK's custom protoc, which doesn't include "final" in class definitions. This should fix CS2Fixes (unofficial) VS build.
  • Loading branch information
@Vauff
Vauff committed Oct 17, 2024
1 parent 1ec0f18 commit f28de64
Show file tree
Hide file tree
Showing 70 changed files with 45,980 additions and 58,946 deletions.
3 changes: 3 additions & 0 deletions protobuf/base_gcmessages.proto → protobuf/base_gcmessages.proto.disabled
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ message CMsgLANServerAvailable {

message CSOEconGameAccountClient {
optional uint32 additional_backpack_slots = 1 [default = 0];
optional fixed32 trade_ban_expiration = 6;
optional fixed32 bonus_xp_timestamp_refresh = 12;
optional uint32 bonus_xp_usedflags = 13;
optional uint32 elevated_state = 14;
Expand Down Expand Up @@ -173,6 +174,8 @@ message CMsgApplySticker {
optional float sticker_scale = 7;
optional float sticker_offset_x = 8;
optional float sticker_offset_y = 9;
optional float sticker_offset_z = 10;
optional float sticker_wear_target = 11;
}

message CMsgModifyItemAttribute {
Expand Down
2 changes: 2 additions & 0 deletions protobuf/c_peer2peer_netmessages.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ enum P2P_Messages {
p2p_Ping = 258;
p2p_VRAvatarPosition = 259;
p2p_WatchSynchronization = 260;
p2p_FightingGame_GameData = 261;
p2p_FightingGame_Connection = 262;
}

message CP2P_TextMessage {
Expand Down
19 changes: 12 additions & 7 deletions protobuf/cs_usercmd.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,26 @@ message CSGOInterpolationInfoPB {
optional float frac = 3 [default = 0];
}

message CSGOInterpolationInfoPB_CL {
optional float frac = 3 [default = 0];
}

message CSGOInputHistoryEntryPB {
optional .CMsgQAngle view_angles = 2;
optional int32 render_tick_count = 4;
optional float render_tick_fraction = 5;
optional int32 player_tick_count = 6;
optional float player_tick_fraction = 7;
optional .CSGOInterpolationInfoPB cl_interp = 12;
optional .CSGOInterpolationInfoPB_CL cl_interp = 12;
optional .CSGOInterpolationInfoPB sv_interp0 = 13;
optional .CSGOInterpolationInfoPB sv_interp1 = 14;
optional .CSGOInterpolationInfoPB player_interp = 15;
optional int32 frame_number = 20;
optional int32 target_ent_index = 8 [default = -1];
optional .CMsgVector shoot_position = 3;
optional .CMsgVector target_head_pos_check = 9;
optional .CMsgVector target_abs_pos_check = 10;
optional .CMsgQAngle target_abs_ang_check = 11;
optional int32 frame_number = 64;
optional int32 target_ent_index = 65 [default = -1];
optional .CMsgVector shoot_position = 66;
optional .CMsgVector target_head_pos_check = 67;
optional .CMsgVector target_abs_pos_check = 68;
optional .CMsgQAngle target_abs_ang_check = 69;
}

message CSGOUserCmdPB {
Expand All @@ -32,4 +36,5 @@ message CSGOUserCmdPB {
optional int32 attack2_start_history_index = 7 [default = -1];
optional int32 attack3_start_history_index = 8 [default = -1];
optional bool left_hand_desired = 9 [default = false];
optional bool is_predicting_damage = 10 [default = false];
}
29 changes: 28 additions & 1 deletion protobuf/cstrike15_gcmessages.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ enum ECsgoGCMsg {
k_EMsgGCCStrike15_v2_SetPlayerLeaderboardSafeName = 9218;
k_EMsgGCCStrike15_v2_ClientRedeemFreeReward = 9219;
k_EMsgGCCStrike15_v2_ClientNetworkConfig = 9220;
k_EMsgGCCStrike15_v2_GC2ClientNotifyXPShop = 9221;
k_EMsgGCCStrike15_v2_Client2GcAckXPShopTracks = 9222;
}

enum ECsgoSteamUserStat {
Expand Down Expand Up @@ -404,6 +406,7 @@ message CMsgGC_ServerQuestUpdateData {
optional bytes binary_data = 2;
optional uint32 mm_game_mode = 3;
optional .ScoreLeaderboardData missionlbsdata = 4;
optional uint32 flags = 5;
}

message CMsgGCCStrike15_v2_MatchmakingGC2ServerConfirm {
Expand Down Expand Up @@ -533,6 +536,7 @@ message CMsgGCCStrike15_v2_MatchmakingGC2ServerReserve {
optional uint32 tv_control = 17;
repeated .OperationalVarValue op_var_values = 19;
optional uint32 socache_control = 20;
repeated int32 teammate_colors = 21;
}

message CMsgGCCStrike15_v2_MatchmakingServerReservationResponse {
Expand Down Expand Up @@ -878,6 +882,8 @@ message CEconItemPreviewDataBlock {
optional uint32 tint_id = 6;
optional float offset_x = 7;
optional float offset_y = 8;
optional float offset_z = 9;
optional uint32 pattern = 10;
}

optional uint32 accountid = 1;
Expand All @@ -899,6 +905,7 @@ message CEconItemPreviewDataBlock {
optional uint32 musicindex = 17;
optional int32 entindex = 18;
optional uint32 petindex = 19;
repeated .CEconItemPreviewDataBlock.Sticker keychains = 20;
}

message CMsgGCCStrike15_v2_MatchEndRewardDropsNotification {
Expand Down Expand Up @@ -1117,11 +1124,21 @@ message CSOEconCoupon {
}

message CSOAccountItemPersonalStore {
optional uint32 generation_time = 1 [(key_field) = true];
optional uint32 generation_time = 1;
optional uint32 redeemable_balance = 2;
repeated uint64 items = 3;
}

message CSOAccountXpShop {
optional uint32 generation_time = 1;
optional uint32 redeemable_balance = 2;
repeated uint32 xp_tracks = 3;
}

message CSOAccountKeychainRemoveToolCharges {
optional uint32 charges = 1;
}

message CSOQuestProgress {
optional uint32 questid = 1 [(key_field) = true];
optional uint32 points_remaining = 2;
Expand Down Expand Up @@ -1151,6 +1168,16 @@ message CSOPersonaDataPublic {
optional uint32 xp_trail_level = 5;
}

message CMsgGCCStrike15_v2_GC2ClientNotifyXPShop {
optional .CSOAccountXpShop prematch = 1;
optional .CSOAccountXpShop postmatch = 2;
optional uint32 current_xp = 3;
optional uint32 current_level = 4;
}

message CMsgGCCStrike15_v2_Client2GcAckXPShopTracks {
}

message CMsgGC_GlobalGame_Subscribe {
optional uint64 ticket = 1;
}
Expand Down
18 changes: 18 additions & 0 deletions protobuf/cstrike15_usermessages.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ enum ECstrike15UserMessages {
CS_UM_CurrentRoundOdds = 380;
CS_UM_DeepStats = 381;
CS_UM_ShootInfo = 383;
CS_UM_CounterStrafe = 385;
CS_UM_DamagePrediction = 386;
}

enum ECSUsrMsg_DisconnectToLobby_Action {
Expand Down Expand Up @@ -593,3 +595,19 @@ message CCSUsrMsgPreMatchSayText {
optional string text = 2;
optional bool all_chat = 3;
}

message CCSUsrMsg_CounterStrafe {
optional int32 press_to_release_ns = 1;
optional int32 total_keys_down = 2;
}

message CCSUsrMsg_DamagePrediction {
optional int32 command_num = 1;
optional int32 pellet_idx = 2;
optional int32 victim_slot = 3;
optional int32 victim_starting_health = 4;
optional int32 victim_damage = 5;
optional .CMsgVector shoot_pos = 6;
optional .CMsgQAngle shoot_dir = 7;
optional .CMsgQAngle aim_punch = 8;
}
2 changes: 1 addition & 1 deletion protobuf/demo.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ message CGameInfo {
message CHeroSelectEvent {
optional bool is_pick = 1;
optional uint32 team = 2;
optional uint32 hero_id = 3;
optional int32 hero_id = 3;
}

optional uint64 match_id = 1;
Expand Down
8 changes: 7 additions & 1 deletion protobuf/econ_gcmessages.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,16 @@ enum EGCItemCustomizationNotification {
k_EGCItemCustomizationNotification_StatTrakSwap = 1088;
k_EGCItemCustomizationNotification_RemovePatch = 1089;
k_EGCItemCustomizationNotification_ApplyPatch = 1090;
k_EGCItemCustomizationNotification_ApplyKeychain = 1091;
k_EGCItemCustomizationNotification_RemoveKeychain = 1092;
k_EGCItemCustomizationNotification_ActivateFanToken = 9178;
k_EGCItemCustomizationNotification_ActivateOperationCoin = 9179;
k_EGCItemCustomizationNotification_GraffitiUnseal = 9185;
k_EGCItemCustomizationNotification_GenerateSouvenir = 9204;
k_EGCItemCustomizationNotification_ClientRedeemMissionReward = 9209;
k_EGCItemCustomizationNotification_ClientRedeemFreeReward = 9219;
k_EGCItemCustomizationNotification_XpShopUseTicket = 9221;
k_EGCItemCustomizationNotification_XpShopAckTracks = 9222;
}

message CMsgGCGiftedItems {
Expand All @@ -211,7 +215,8 @@ message CMsgGCGiftedItems {
message CMsgGCDev_SchemaReservationRequest {
optional string schema_typename = 1;
optional string instance_name = 2;
optional uint64 id = 3;
optional uint64 context = 3;
optional uint64 id = 4;
}

message CMsgCasketItem {
Expand All @@ -226,4 +231,5 @@ message CMsgGCUserTrackTimePlayedConsecutively {
message CMsgGCItemCustomizationNotification {
repeated uint64 item_id = 1;
optional uint32 request = 2;
repeated uint64 extra_data = 3;
}
Loading

0 comments on commit f28de64

Please sign in to comment.