Skip to content
This repository has been archived by the owner on Jun 11, 2022. It is now read-only.

Commit

Permalink
Merge pull request #597 from Arcana/dev
Browse files Browse the repository at this point in the history
v6.1.1
  • Loading branch information
Crazy-Duck authored Jul 7, 2018
2 parents 20562c1 + 89ebf6e commit 43b419b
Show file tree
Hide file tree
Showing 14 changed files with 78 additions and 31 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Changelog 6.1.1
## General
* Updated fantasy cards with this year's player card ID

# Changelog 6.1.0
## General
* Removed some trailing util.log commands
Expand Down
4 changes: 2 additions & 2 deletions handlers/fantasy.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function decodeBonus(bonus) {
*/
Dota2.Dota2Client.prototype.requestPlayerCardsByPlayer = function() {
if(this.Inventory) {
var playercards = this.Inventory.filter(item => item.def_index == 11985);
var playercards = this.Inventory.filter(item => item.def_index == 12184);
var promises = [];
// Sort cards per player
var players = playercards.reduce((players, card)=>{
Expand Down Expand Up @@ -205,4 +205,4 @@ var onSetPlayerCardRosterResponse = function onSetPlayerCardRosterResponse(messa
this.emit("playerCardDrafted", playerCardRoster.result);
if (callback) callback(playerCardRoster.result, playerCardRoster);
};
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgClientToGCSetPlayerCardRosterResponse] = onSetPlayerCardRosterResponse;
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgClientToGCSetPlayerCardRosterResponse] = onSetPlayerCardRosterResponse;
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dota2",
"version": "6.1.0",
"version": "6.1.1",
"dependencies": {
"deferred": "^0.7.9",
"long": "^4.0.0",
Expand Down
21 changes: 0 additions & 21 deletions proto/base_gcmessages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ enum ECustomGameInstallStatus {
k_ECustomGameInstallStatus_FailedCanceled = 107;
}

enum GC_BannedWordType {
GC_BANNED_WORD_DISABLE_WORD = 0;
GC_BANNED_WORD_ENABLE_WORD = 1;
}

message CGCStorePurchaseInit_LineItem {
optional uint32 item_def_id = 1;
optional uint32 quantity = 2;
Expand Down Expand Up @@ -358,22 +353,6 @@ message CMsgGCStorePurchaseFinalizeResponse {
repeated uint64 item_ids = 2;
}

message CMsgGCBannedWordListRequest {
optional uint32 ban_list_group_id = 1;
optional uint32 word_id = 2;
}

message CMsgGCBannedWord {
optional uint32 word_id = 1;
optional .GC_BannedWordType word_type = 2 [default = GC_BANNED_WORD_DISABLE_WORD];
optional string word = 3;
}

message CMsgGCBannedWordListResponse {
optional uint32 ban_list_group_id = 1;
repeated .CMsgGCBannedWord word_list = 2;
}

message CMsgGCToGCBannedWordListUpdated {
optional uint32 group_id = 1;
}
Expand Down
47 changes: 46 additions & 1 deletion proto/dota_gcmessages_client.proto
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ message CMsgDOTAWelcome {
optional uint32 timeplayedconsecutively = 6;
optional bool allow_3rd_party_match_history = 7;
optional .PartnerAccountType partner_account_type = 8 [default = PARTNER_NONE];
optional uint32 banned_word_list_word_id = 9;
optional uint32 partner_account_state = 11;
optional uint32 last_time_played = 12;
optional uint32 last_ip_address = 13;
Expand Down Expand Up @@ -2495,17 +2494,29 @@ message CMsgHeroGlobalDataResponse {
optional float ban_percent = 4;
}

message WeekData {
optional uint32 week = 1;
optional float win_percent = 2;
optional float pick_percent = 3;
optional float ban_percent = 4;
}

message HeroDataPerRankChunk {
optional uint32 rank_chunk = 1;
repeated .CMsgTalentWinRates talent_win_rates = 2;
optional .CMsgGlobalHeroAverages hero_averages = 3;
repeated .CMsgHeroGlobalDataResponse.GraphData graph_data = 4;
repeated .CMsgHeroGlobalDataResponse.WeekData week_data = 5;
}

optional uint32 hero_id = 1;
repeated .CMsgHeroGlobalDataResponse.HeroDataPerRankChunk hero_data_per_chunk = 2;
}

message CMsgHeroGlobalDataAllHeroes {
repeated .CMsgHeroGlobalDataResponse heroes = 1;
}

message CMsgPrivateMetadataKeyRequest {
optional uint64 match_id = 1;
}
Expand Down Expand Up @@ -2617,6 +2628,21 @@ message CMsgClientToGCCavernCrawlRequestMapStateResponse {
optional uint32 ultra_rare_reward_room_number = 11;
}

message CMsgClientToGCCavernCrawlGetClaimedRoomCount {
optional uint32 event_id = 1;
}

message CMsgClientToGCCavernCrawlGetClaimedRoomCountResponse {
enum Result {
SUCCESS = 0;
ERROR_UNKNOWN = 1;
EVENT_NOT_OWNED = 2;
}

optional .CMsgClientToGCCavernCrawlGetClaimedRoomCountResponse.Result result = 1 [default = SUCCESS];
optional uint32 count = 2;
}

message CMsgDOTAMutationList {
message Mutation {
optional uint32 id = 1;
Expand Down Expand Up @@ -2696,3 +2722,22 @@ message CMsgSocialFeedCommentsResponse {
repeated .CMsgSocialFeedCommentsResponse.FeedComment feed_comments = 3;
}

message CMsgClientToGCPlayerCardSpecificPurchaseRequest {
optional uint32 player_account_id = 1;
optional uint32 event_id = 2;
optional uint64 card_dust_item_id = 3;
}

message CMsgClientToGCPlayerCardSpecificPurchaseResponse {
enum Result {
SUCCESS = 1;
ERROR_INTERNAL = 2;
ERROR_INSUFFICIENT_DUST = 3;
ERROR_ITEM_NOT_DUST_ITEM = 4;
ERROR_FAILED_CARD_PACK_CREATE = 5;
}

optional .CMsgClientToGCPlayerCardSpecificPurchaseResponse.Result result = 1 [default = SUCCESS];
optional uint64 item_id = 2;
}

6 changes: 3 additions & 3 deletions proto/dota_gcmessages_client_match_management.proto
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ message CMsgPracticeLobbySetDetails {
optional uint64 custom_game_id = 29;
optional uint32 custom_min_players = 30;
optional uint32 custom_max_players = 31;
optional uint32 lan_host_ping_to_server_region = 32;
optional .DOTALobbyVisibility visibility = 33 [default = DOTALobbyVisibility_Public];
optional fixed64 custom_game_crc = 34;
optional uint32 league_series_id = 35;
Expand All @@ -133,6 +132,7 @@ message CMsgPracticeLobbySetDetails {
optional uint64 bot_dire = 45;
optional .DOTASelectionPriorityRules selection_priority_rules = 46 [default = k_DOTASelectionPriorityRules_Manual];
optional bool custom_game_penalties = 47;
optional string lan_host_ping_location = 48;
}

message CMsgPracticeLobbyCreate {
Expand Down Expand Up @@ -222,8 +222,8 @@ message CMsgPracticeLobbyListResponseEntry {
optional string custom_map_name = 15;
optional uint32 max_player_count = 16;
optional uint32 server_region = 17;
optional uint32 lan_host_ping_to_server_region = 18;
optional uint32 league_id = 19;
optional string lan_host_ping_location = 20;
}

message CMsgPracticeLobbyListResponse {
Expand Down Expand Up @@ -296,8 +296,8 @@ message CMsgJoinableCustomLobbiesResponseEntry {
optional string custom_map_name = 7;
optional uint32 max_player_count = 8;
optional uint32 server_region = 9;
optional uint32 lan_host_ping_to_server_region = 10;
optional bool has_pass_key = 11;
optional string lan_host_ping_location = 12;
}

message CMsgJoinableCustomLobbiesResponse {
Expand Down
3 changes: 3 additions & 0 deletions proto/dota_gcmessages_common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ message CMsgLocalServerFakeLobbyData {
repeated .CMsgLobbyEventPoints event_points = 2;
optional bool is_plus_subscriber = 3;
optional uint32 primary_event_id = 4;
optional uint32 favorite_team = 5;
optional uint32 favorite_team_quality = 6;
}

message CMsgBattleCupVictory {
Expand Down Expand Up @@ -1089,6 +1091,7 @@ message CMsgMatchTips {
message SingleTip {
optional uint32 source_account_id = 1;
optional uint32 target_account_id = 2;
optional uint32 tip_amount = 3;
}

optional .EEvent event_id = 1 [default = EVENT_ID_NONE];
Expand Down
2 changes: 1 addition & 1 deletion proto/dota_gcmessages_common_match_management.proto
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ message CSODOTALobby {
optional uint32 custom_min_players = 71;
optional uint32 custom_max_players = 72;
optional .PartnerAccountType partner_type = 73 [default = PARTNER_NONE];
optional uint32 lan_host_ping_to_server_region = 74;
optional .DOTALobbyVisibility visibility = 75 [default = DOTALobbyVisibility_Public];
optional fixed64 custom_game_crc = 76;
optional bool custom_game_auto_created_lobby = 77;
Expand Down Expand Up @@ -343,6 +342,7 @@ message CSODOTALobby {
optional fixed64 custom_game_private_key = 106;
optional bool custom_game_penalties = 107;
repeated uint32 mutations = 108;
optional string lan_host_ping_location = 109;
}

message CMsgLobbyPlaytestDetails {
Expand Down
7 changes: 7 additions & 0 deletions proto/dota_gcmessages_msgid.proto
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,9 @@ enum EDOTAGCMsg {
k_EMsgGCToClientRequestLaneSelectionResponse = 7624;
k_EMsgServerToGCCavernCrawlIsHeroActive = 7625;
k_EMsgServerToGCCavernCrawlIsHeroActiveResponse = 7626;
k_EMsgClientToGCPlayerCardSpecificPurchaseRequest = 7627;
k_EMsgClientToGCPlayerCardSpecificPurchaseResponse = 7628;
k_EMsgGCtoServerTensorflowInstance = 7629;
k_EMsgGCDev_GrantWarKill = 8001;
k_EMsgServerToGCLockCharmTrading = 8004;
k_EMsgClientToGCPlayerStatsRequest = 8006;
Expand Down Expand Up @@ -760,9 +763,13 @@ enum EDOTAGCMsg {
k_EMsgClientToGCRequestEventPointLogResponseV2 = 8299;
k_EMsgClientToGCRequestEventTipsSummary = 8300;
k_EMsgClientToGCRequestEventTipsSummaryResponse = 8301;
k_EMsgHeroGlobalDataAllHeroes = 8302;
k_EMsgClientToGCRequestSocialFeed = 8303;
k_EMsgClientToGCRequestSocialFeedResponse = 8304;
k_EMsgClientToGCRequestSocialFeedComments = 8305;
k_EMsgClientToGCRequestSocialFeedCommentsResponse = 8306;
k_EMsgGCToGCSignoutAwardCappedUnderhollowEventGamePoints = 8307;
k_EMsgClientToGCCavernCrawlGetClaimedRoomCount = 8308;
k_EMsgClientToGCCavernCrawlGetClaimedRoomCountResponse = 8309;
}

1 change: 0 additions & 1 deletion proto/dota_shared_enums.proto
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ enum DOTALobbyVisibility {
enum EDOTAPlayerMMRType {
k_EDOTAPlayerMMRType_Invalid = 0;
k_EDOTAPlayerMMRType_GeneralHidden = 1;
k_EDOTAPlayerMMRType_SoloHidden = 2;
k_EDOTAPlayerMMRType_GeneralCompetitive = 3;
k_EDOTAPlayerMMRType_SoloCompetitive = 4;
k_EDOTAPlayerMMRType_1v1Competitive_UNUSED = 5;
Expand Down
5 changes: 5 additions & 0 deletions proto/econ_gcmessages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -984,3 +984,8 @@ message CMsgGCToClientCurrencyPricePoints {
repeated .CMsgGCToClientCurrencyPricePoints.Currency currencies = 2;
}

message CMsgBannedWordList {
optional uint32 version = 1;
repeated string banned_words = 2;
}

4 changes: 4 additions & 0 deletions proto/gcsdk_gcmessages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,10 @@ message CMsgGCToGCMasterSubscribeToCache {
message CMsgGCToGCMasterSubscribeToCacheResponse {
}

message CMsgGCToGCMasterSubscribeToCacheAsync {
optional .CMsgGCToGCMasterSubscribeToCache subscribe_msg = 1;
}

message CMsgGCToGCMasterUnsubscribeFromCache {
optional uint32 soid_type = 1;
optional fixed64 soid_id = 2;
Expand Down
1 change: 1 addition & 0 deletions proto/gcsystemmsgs.proto
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ enum EGCToGCMsg {
k_EMsgGCToGCMasterSubscribeToCacheResponse = 168;
k_EMsgGCToGCMasterUnsubscribeFromCache = 169;
k_EMsgGCToGCMasterDestroyCache = 170;
k_EMsgGCToGCMasterSubscribeToCacheAsync = 171;
}

message CCommunity_GamePersonalDataCategoryInfo {
Expand Down

0 comments on commit 43b419b

Please sign in to comment.