Skip to content

Commit

Permalink
Merge pull request #2803 from builder-247/facets
Browse files Browse the repository at this point in the history
Add selected Facets to matches
  • Loading branch information
howardchung committed Jun 2, 2024
2 parents 047a951 + e441fa5 commit 6b83b23
Show file tree
Hide file tree
Showing 43 changed files with 1,125 additions and 228 deletions.
1 change: 1 addition & 0 deletions global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ type Player = {
hero_healing: number;
tower_damage: number;
leaver_status: number;
hero_variant?: number;
ability_upgrades?: any[];
ability_upgrades_arr: number[];

Expand Down
1 change: 1 addition & 0 deletions proto/base_gcmessages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ message CGCStorePurchaseInit_LineItem {
optional uint32 cost_in_local_currency = 3;
optional uint32 purchase_type = 4;
optional uint64 source_reference_id = 5;
optional int32 price_index = 6;
}

message CMsgGCStorePurchaseInit {
Expand Down
5 changes: 5 additions & 0 deletions proto/clientmessages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ enum EBaseClientMessages {
CM_DevPaletteVisibilityChanged = 283;
CM_WorldUIControllerHasPanelChanged = 284;
CM_RotateAnchor = 285;
CM_ListenForResponseFound = 286;
CM_MAX_BASE = 300;
}

Expand Down Expand Up @@ -46,3 +47,7 @@ message CClientMsg_WorldUIControllerHasPanelChangedEvent {
message CClientMsg_RotateAnchor {
optional float angle = 1;
}

message CClientMsg_ListenForResponseFound {
optional int32 player_slot = 1 [default = -1];
}
2 changes: 0 additions & 2 deletions proto/connectionless_netmessages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ message C2S_CONNECT_Message {
repeated .CCLCMsg_SplitPlayerConnect splitplayers = 7;
optional bytes auth_steam = 8;
optional string challenge_context = 9;
optional sint32 use_snp = 10;
}

message C2S_CONNECTION_Message {
optional string addon_name = 1;
optional bool use_snp = 2;
}
15 changes: 14 additions & 1 deletion proto/demo.proto
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ enum EDemoCommands {
DEM_SaveGame = 14;
DEM_SpawnGroups = 15;
DEM_AnimationData = 16;
DEM_Max = 17;
DEM_AnimationHeader = 17;
DEM_Max = 18;
DEM_IsCompressed = 64;
}

Expand All @@ -36,6 +37,7 @@ message CDemoFileHeader {
optional string demo_version_guid = 12;
optional int32 build_num = 13;
optional string game = 14;
optional int32 server_start_tick = 15;
}

message CGameInfo {
Expand Down Expand Up @@ -67,7 +69,12 @@ message CGameInfo {
optional uint32 end_time = 11;
}

message CCSGameInfo {
repeated int32 round_start_ticks = 1;
}

optional .CGameInfo.CDotaGameInfo dota = 4;
optional .CGameInfo.CCSGameInfo cs = 5;
}

message CDemoFileInfo {
Expand Down Expand Up @@ -123,6 +130,12 @@ message CDemoCustomDataCallbacks {
repeated string save_id = 1;
}

message CDemoAnimationHeader {
optional sint32 entity_id = 1;
optional int32 tick = 2;
optional bytes data = 3;
}

message CDemoAnimationData {
optional sint32 entity_id = 1;
optional int32 start_tick = 2;
Expand Down
39 changes: 39 additions & 0 deletions proto/dota_clientmessages.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import "dota_commonmessages.proto";
import "dota_shared_enums.proto";
import "base_gcmessages.proto";

enum EDotaClientMessages {
DOTA_CM_MapLine = 301;
Expand Down Expand Up @@ -102,6 +103,11 @@ enum EDotaClientMessages {
DOTA_CM_ChatWheelAlert = 804;
DOTA_CM_AbilityAlert = 805;
DOTA_CM_AllyAbilityAlert = 806;
DOTA_CM_GiftPlayer = 807;
DOTA_CM_GiftEveryone = 808;
DOTA_CM_SelectOverworldTokenRewards = 809;
DOTA_CM_FacetAlert = 810;
DOTA_CM_InnateAlert = 811;
}

message CDOTAClientMsg_MapPing {
Expand All @@ -118,6 +124,8 @@ message CDOTAClientMsg_EnemyItemAlert {
optional int32 item_level = 3 [default = -1];
optional int32 primary_charges = 4 [default = -1];
optional int32 secondary_charges = 5 [default = -1];
optional int32 ability_id = 6 [default = -1];
optional int32 owner_entindex = 7 [default = -1];
}

message CDOTAClientMsg_ModifierAlert {
Expand Down Expand Up @@ -301,6 +309,8 @@ message CDOTAClientMsg_DemoHero {
repeated uint64 item_ids = 4;
optional uint32 style_index = 5 [default = 255];
optional bool keep_existing_demohero = 6;
repeated .CSOEconItem item_data = 7;
optional int32 hero_variant = 8;
}

message CDOTAClientMsg_ChallengeSelect {
Expand Down Expand Up @@ -450,6 +460,15 @@ message CDOTAClientMsg_SalutePlayer {
optional int32 event_id = 2;
}

message CDOTAClientMsg_GiftPlayer {
optional int32 target_player_id = 1 [default = -1];
optional uint32 item_def_index = 2;
}

message CDOTAClientMsg_GiftEveryone {
optional uint32 item_def_index = 1;
}

message CDOTAClientMsg_TipAlert {
optional string tip_text = 1;
}
Expand Down Expand Up @@ -570,4 +589,24 @@ message CDOTAClientMsg_PlayerDraftPreferTeam {
message CDOTAClientMsg_AbilityAlert {
optional uint32 ability_entindex = 1 [default = 16777215];
optional bool ctrl_held = 2;
optional int32 owner_entindex = 3 [default = -1];
optional int32 ability_id = 4 [default = -1];
optional uint32 primary_charges = 5;
optional uint32 secondary_charges = 6;
optional float reclaim_time = 7;
}

message CDOTAClientMsg_SelectOverworldTokenRewards {
repeated uint32 token_ids = 1;
}

message CDOTAClientMsg_FacetAlert {
optional uint32 facet_strhash = 1;
optional uint32 hero_entindex = 2 [default = 16777215];
optional bool ctrl_held = 3;
}

message CDOTAClientMsg_InnateAlert {
optional uint32 ability_entindex = 1 [default = 16777215];
optional bool ctrl_held = 2;
}
1 change: 1 addition & 0 deletions proto/dota_commonmessages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ enum dotaunitorder_t {
DOTA_UNIT_ORDER_TAKE_ITEM_FROM_NEUTRAL_ITEM_STASH = 38;
DOTA_UNIT_ORDER_MOVE_RELATIVE = 39;
DOTA_UNIT_ORDER_CAST_TOGGLE_ALT = 40;
DOTA_UNIT_ORDER_CONSUME_ITEM = 41;
}

enum EDOTAVersusScenePlayerBehavior {
Expand Down
89 changes: 40 additions & 49 deletions proto/dota_gcmessages_client.proto
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ enum EDOTADraftTriviaAnswerResult {
k_EDOTADraftTriviaAnswerResult_GCDown = 5;
}

enum CMsgClientToGCUpdateComicBookStat_Type {
CMsgClientToGCUpdateComicBookStat_Type_HighestPageRead = 1;
CMsgClientToGCUpdateComicBookStat_Type_SecondsSpentReading = 2;
CMsgClientToGCUpdateComicBookStat_Type_HighestPercentRead = 3;
}

message CMsgClientSuspended {
optional uint32 time_end = 1;
}
Expand Down Expand Up @@ -568,11 +574,6 @@ message CMsgGCItemEditorReleaseReservationResponse {
optional bool released = 2;
}

message CMsgDOTARewardTutorialPrizes {
optional uint32 location_id = 1;
optional bool tracking_only = 2;
}

message CMsgFlipLobbyTeams {
}

Expand All @@ -599,50 +600,6 @@ message CMsgDOTAClaimEventAction {
optional .CMsgDOTAClaimEventActionData data = 4;
}

message CMsgDOTAClaimEventActionResponse {
message MysteryItemRewardData {
optional uint32 item_def = 1;
optional uint32 item_category = 2;
}

message LootListRewardData {
repeated uint32 item_def = 1;
}

message ActionListRewardData {
optional uint32 action_id = 1;
optional bytes result_reward_data = 2;
}

message GrantedRewardData {
optional uint32 grant_index = 1;
optional uint32 score_index = 2;
optional uint32 reward_index = 3;
optional bytes reward_data = 4;
}

enum ResultCode {
Success = 0;
InvalidEvent = 1;
EventNotActive = 2;
InvalidAction = 3;
ServerError = 4;
InsufficientPoints = 5;
InsufficentLevel = 6;
AlreadyClaimed = 7;
SDOLockFailure = 8;
SDOLoadFailure = 9;
EventNotOwned = 10;
Timeout = 11;
RequiresPlusSubscription = 12;
InvalidItem = 13;
AsyncRewards = 14;
}

optional .CMsgDOTAClaimEventActionResponse.ResultCode result = 1 [default = Success];
repeated .CMsgDOTAClaimEventActionResponse.GrantedRewardData reward_results = 2;
}

message CMsgClientToGCClaimEventActionUsingItem {
optional uint32 event_id = 1;
optional uint32 action_id = 2;
Expand Down Expand Up @@ -758,6 +715,7 @@ message CMsgDOTAGetPlayerMatchHistoryResponse {
optional uint32 team_id = 19;
optional string team_name = 20;
optional uint64 ugc_team_ui_logo = 21;
optional uint32 selected_facet = 22;
}

repeated .CMsgDOTAGetPlayerMatchHistoryResponse.Match matches = 1;
Expand Down Expand Up @@ -1860,6 +1818,7 @@ message CMsgGCToClientCommendNotification {
optional uint32 commender_account_id = 1;
optional string commender_name = 2;
optional uint32 flags = 3;
optional uint32 commender_hero_id = 4;
}

message CMsgDOTAClientToGCQuickStatsRequest {
Expand Down Expand Up @@ -3333,3 +3292,35 @@ message CMsgLobbyRoadToTIMatchQuestData {
optional uint32 quest_period = 2;
optional uint32 quest_number = 3;
}

message CMsgClientToGCNewBloomGift {
optional uint32 defindex = 1;
optional uint64 lobby_id = 2;
repeated uint32 target_account_ids = 3;
}

message CMsgClientToGCNewBloomGiftResponse {
optional .ENewBloomGiftingResponse result = 1 [default = kENewBloomGifting_UnknownFailure];
repeated uint32 received_account_ids = 2;
}

message CMsgClientToGCSetBannedHeroes {
repeated uint32 banned_hero_ids = 1;
}

message CMsgClientToGCUpdateComicBookStats {
message SingleStat {
optional .CMsgClientToGCUpdateComicBookStat_Type stat_type = 1 [default = CMsgClientToGCUpdateComicBookStat_Type_HighestPageRead];
optional uint32 stat_value = 2;
}

message LanguageStats {
optional uint32 comic_id = 1;
optional uint32 client_language = 2;
optional uint32 client_comic_language = 3;
}

optional uint32 comic_id = 1;
repeated .CMsgClientToGCUpdateComicBookStats.SingleStat stats = 2;
optional .CMsgClientToGCUpdateComicBookStats.LanguageStats language_stats = 3;
}
1 change: 1 addition & 0 deletions proto/dota_gcmessages_client_battle_report.proto
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ message CMsgBattleReport_Game {
optional int32 item3 = 48 [default = -1];
optional int32 item4 = 49 [default = -1];
optional int32 item5 = 50 [default = -1];
optional uint32 selected_facet = 51;
}

message CMsgBattleReport_GameList {
Expand Down
Loading

0 comments on commit 6b83b23

Please sign in to comment.