Skip to content

Commit 9c90f21

Browse files
EgrisEgris
committed
Patch 8296 Initial Commit.
1 parent bf6f122 commit 9c90f21

File tree

77 files changed

+17232
-8426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+17232
-8426
lines changed

‎contrib/protocompiler/definitions/GameMessage.proto

-6
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,6 @@ message TutorialState
9494
required bytes seen_tutorials = 1;
9595
}
9696

97-
message SetAchievementShowcase
98-
{
99-
required uint64 achievement_id = 1;
100-
required uint32 slot = 2;
101-
}
102-
10397
message DeleteHero
10498
{
10599
required .D3.OnlineService.EntityId account_id = 1;

‎contrib/protocompiler/definitions/Items.proto

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ message Generator
1818
repeated sfixed32 base_affixes = 3;
1919
optional .D3.Items.RareItemName rare_item_name = 4;
2020
optional sfixed32 enchant_affix = 5 [default = -1];
21-
optional sfixed32 socket_affix = 6 [default = -1];
2221
required uint32 flags = 7 [default = 0];
2322
required uint32 durability = 8;
2423
required uint64 stack_size = 9;

‎contrib/protocompiler/definitions/OnlineService.proto

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ message GameCreateParams
4242
optional .D3.OnlineService.CoopCreateParams coop = 3;
4343
optional .D3.OnlineService.PvPCreateParams pvp = 4;
4444
optional string name = 5;
45-
required bool is_private = 6 [default = true];
4645
}
4746

4847
message HeroCreateParams

‎contrib/protocompiler/definitions/Profile.proto

+6-3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ message HeroProfile
4040
optional uint32 attack = 8;
4141
optional uint32 precision = 9;
4242
optional uint32 defense = 10;
43+
optional uint32 strength = 31;
44+
optional uint32 dexterity = 32;
45+
optional uint32 intelligence = 33;
4346
optional uint32 vitality = 11;
4447
optional uint32 armor = 12;
4548
optional float dps = 13;
@@ -84,8 +87,8 @@ message AccountProfile
8487
optional .D3.Profile.ClassInfo class_monk = 13;
8588
optional .D3.Profile.ClassInfo class_witchdoctor = 14;
8689
optional .D3.Profile.ClassInfo class_wizard = 15;
87-
optional uint64 achievement_showcase_0 = 16;
88-
optional uint64 achievement_showcase_1 = 17;
89-
optional uint64 achievement_showcase_2 = 18;
90+
optional uint64 deprecated_achievement_showcase_0 = 16;
91+
optional uint64 deprecated_achievement_showcase_1 = 17;
92+
optional uint64 deprecated_achievement_showcase_2 = 18;
9093
}
9194

‎contrib/protocompiler/definitions/Quest.proto

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ message QuestReward
77
optional int32 xp_granted = 1 [default = 0];
88
optional int32 gold_granted = 2 [default = 0];
99
optional .D3.Items.Generator item_granted = 3;
10+
optional sfixed32 sno_quest = 4 [default = -1];
1011
}
1112

1213
message QuestStepComplete

‎contrib/protocompiler/definitions/Settings.proto

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ message ActionBinding
1111
required uint32 key_modifier_flags_1 = 2 [default = 0];
1212
required int32 key_2 = 3 [default = -1];
1313
required uint32 key_modifier_flags_2 = 4 [default = 0];
14+
optional uint32 input_button = 5;
1415
}
1516

1617
message GameAccountSettings
1718
{
1819
optional int32 use_last_hero = 1 [default = 0];
1920
optional int32 show_offline_toast = 2 [default = 0];
2021
optional string rmt_last_used_currency = 3;
21-
optional int32 coop_last_create_game_privacy = 4 [default = 0];
22+
optional int32 coop_last_create_game_privacy = 4 [default = 1];
2223
}
2324

2425
message Preferences
@@ -37,7 +38,6 @@ message Preferences
3738
AUTO_EQUIP_ITEMS = 12;
3839
SHOW_TUTORIALS = 13;
3940
SHOW_BREAD_CRUMB = 14;
40-
USE_CMD_INSTEAD_OF_CTRL = 16;
4141
DISABLE_OS_SHORTCUTS = 17;
4242
SHOW_HEAL_NUMBERS = 18;
4343
SHOW_PLAYER_NAMES = 19;
@@ -48,7 +48,6 @@ message Preferences
4848
optional uint32 flags = 2 [default = 0];
4949
optional uint32 items_on_ground_setting = 6 [default = 0];
5050
optional .D3.Client.ActionBinding action_binding_inventory = 10;
51-
optional .D3.Client.ActionBinding action_binding_hero = 11;
5251
optional .D3.Client.ActionBinding action_binding_hireling = 12;
5352
optional .D3.Client.ActionBinding action_binding_skills = 13;
5453
optional .D3.Client.ActionBinding action_binding_quests = 14;
@@ -105,5 +104,7 @@ message Preferences
105104
optional .D3.Client.ActionBinding action_binding_systemscreenshot = 67;
106105
optional .D3.Client.ActionBinding action_binding_stoneofrecall = 68;
107106
optional .D3.Client.ActionBinding action_binding_bannerscreen = 69;
107+
optional .D3.Client.ActionBinding action_binding_lmb = 70;
108+
optional .D3.Client.ActionBinding action_binding_rmb = 71;
108109
}
109110

‎contrib/protocompiler/definitions/bnet/achievements_service.proto

+60-7
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,7 @@ message RegisterWithServiceRequest
4747

4848
message RegisterWithServiceResponse
4949
{
50-
optional uint32 max_records_per_update = 1 [default = 0];
51-
optional uint32 max_criteria_per_record = 2 [default = 0];
52-
optional uint32 max_achievements_per_record = 3 [default = 0];
53-
optional uint32 max_registrations = 4 [default = 0];
54-
optional uint64 flush_frequency = 5 [default = 0];
55-
optional .bnet.protocol.achievements.Snapshot snapshot = 6;
50+
optional .bnet.protocol.achievements.Snapshot snapshot = 1;
5651
}
5752

5853
message UnregisterFromServiceRequest
@@ -80,12 +75,28 @@ message RequestSnapshotResponse
8075

8176
message InitializeRequest
8277
{
83-
optional fixed32 program_id = 1;
78+
optional fixed32 program_id = 1 [default = 0];
8479
}
8580

8681
message InitializeResponse
8782
{
8883
required .bnet.protocol.ContentHandle content_handle = 1;
84+
optional uint32 max_records_per_update = 2 [default = 0];
85+
optional uint32 max_criteria_per_record = 3 [default = 0];
86+
optional uint32 max_achievements_per_record = 4 [default = 0];
87+
optional uint32 max_registrations = 5 [default = 0];
88+
optional uint64 flush_frequency = 6 [default = 0];
89+
}
90+
91+
message StaticDataHash
92+
{
93+
required fixed32 program_id = 1;
94+
required string hash = 2;
95+
}
96+
97+
message ValidateStaticDataRequest
98+
{
99+
repeated .bnet.protocol.achievements.StaticDataHash static_data_hash = 1;
89100
}
90101

91102
message SnapshotUpdateNotification
@@ -94,6 +105,32 @@ message SnapshotUpdateNotification
94105
required .bnet.protocol.achievements.Snapshot snapshot = 2;
95106
}
96107

108+
message AchievementStats
109+
{
110+
required uint64 id = 1;
111+
required uint64 count = 2;
112+
}
113+
114+
message GetAchievementStatsRequest
115+
{
116+
required fixed32 program_id = 1;
117+
}
118+
119+
message GetAchievementStatsResponse
120+
{
121+
repeated .bnet.protocol.achievements.AchievementStats stats = 1;
122+
}
123+
124+
message GetCriteriaStatsRequest
125+
{
126+
required fixed32 program_id = 1;
127+
}
128+
129+
message GetCriteriaStatsResponse
130+
{
131+
repeated .bnet.protocol.achievements.AchievementStats stats = 1;
132+
}
133+
97134
service AchievementsService
98135
{
99136
rpc PostUpdate(.bnet.protocol.achievements.PostUpdateRequest) returns(.bnet.protocol.achievements.PostUpdateResponse)
@@ -116,6 +153,10 @@ service AchievementsService
116153
{
117154
option (method_id) = 5;
118155
}
156+
rpc ValidateStaticData(.bnet.protocol.achievements.ValidateStaticDataRequest) returns(.bnet.protocol.NoData)
157+
{
158+
option (method_id) = 6;
159+
}
119160
}
120161

121162
service AchievementsNotify
@@ -126,3 +167,15 @@ service AchievementsNotify
126167
}
127168
}
128169

170+
service AchievementsUtils
171+
{
172+
rpc GetAchievementStats(.bnet.protocol.achievements.GetAchievementStatsRequest) returns(.bnet.protocol.achievements.GetAchievementStatsResponse)
173+
{
174+
option (method_id) = 1;
175+
}
176+
rpc GetCriteriaStats(.bnet.protocol.achievements.GetCriteriaStatsRequest) returns(.bnet.protocol.achievements.GetCriteriaStatsResponse)
177+
{
178+
option (method_id) = 2;
179+
}
180+
}
181+

‎contrib/protocompiler/definitions/bnet/channel_invitation.proto

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import "bnet/invitation_types.proto";
44
import "bnet/rpc.proto";
55
import "bnet/channel_service.proto";
66
import "bnet/channel_invitation_types.proto";
7+
import "bnet/channel_types.proto";
78

89
package bnet.protocol.channel_invitation;
910

@@ -13,8 +14,9 @@ option (google.protobuf.csharp_file_options).umbrella_classname = "ChannelInvita
1314
message AcceptInvitationRequest
1415
{
1516
optional .bnet.protocol.EntityId agent_id = 1;
16-
required fixed64 invitation_id = 2;
17-
required uint64 object_id = 3;
17+
optional .bnet.protocol.channel.MemberState member_state = 2;
18+
required fixed64 invitation_id = 3;
19+
required uint64 object_id = 4;
1820
}
1921

2022
message AcceptInvitationResponse

‎contrib/protocompiler/definitions/bnet/channel_owner.proto

+8-6
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ message GetChannelIdResponse
1919
message CreateChannelRequest
2020
{
2121
optional .bnet.protocol.Identity agent_identity = 1;
22-
optional .bnet.protocol.channel.ChannelState state = 2;
23-
optional .bnet.protocol.EntityId channel_id = 3;
24-
optional uint64 object_id = 4;
22+
optional .bnet.protocol.channel.MemberState member_state = 2;
23+
optional .bnet.protocol.channel.ChannelState channel_state = 3;
24+
optional .bnet.protocol.EntityId channel_id = 4;
25+
optional uint64 object_id = 5;
2526
}
2627

2728
message CreateChannelResponse
@@ -33,9 +34,10 @@ message CreateChannelResponse
3334
message JoinChannelRequest
3435
{
3536
optional .bnet.protocol.Identity agent_identity = 1;
36-
required .bnet.protocol.EntityId channel_id = 2;
37-
required uint64 object_id = 3;
38-
repeated .bnet.protocol.EntityId friend_account_id = 4;
37+
optional .bnet.protocol.channel.MemberState member_state = 2;
38+
required .bnet.protocol.EntityId channel_id = 3;
39+
required uint64 object_id = 4;
40+
repeated .bnet.protocol.EntityId friend_account_id = 5;
3941
}
4042

4143
message JoinChannelResponse

‎contrib/protocompiler/definitions/bnet/channel_service.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ message AddMemberRequest
1111
{
1212
optional .bnet.protocol.EntityId agent_id = 1;
1313
required .bnet.protocol.Identity member_identity = 2;
14-
required .bnet.protocol.channel.MemberState state = 3;
14+
required .bnet.protocol.channel.MemberState member_state = 3;
1515
required uint64 object_id = 4;
1616
}
1717

‎contrib/protocompiler/definitions/bnet/channel_types.proto

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ message MemberState
5555
repeated .bnet.protocol.attribute.Attribute attribute = 1;
5656
repeated uint32 role = 2 [packed=true];
5757
optional uint64 privileges = 3 [default = 0];
58+
optional .bnet.protocol.AccountInfo info = 4;
5859
extensions 100 to 10000;
5960
}
6061

‎contrib/protocompiler/definitions/bnet/entity.proto

+13
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,16 @@ message Identity
1212
optional .bnet.protocol.EntityId game_account_id = 2;
1313
}
1414

15+
message AccountInfo
16+
{
17+
enum AccountStatus
18+
{
19+
TRIAL = 1;
20+
PAID = 2;
21+
GM = 3;
22+
}
23+
24+
optional .bnet.protocol.AccountInfo.AccountStatus account_status = 1 [default = TRIAL];
25+
optional fixed32 country_id = 2 [default = 0];
26+
}
27+

‎contrib/protocompiler/definitions/bnet/exchange.proto

+14
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,17 @@ message BlobFromOfType
2929
required bytes data = 3;
3030
}
3131

32+
message ActionErrorDetail
33+
{
34+
required uint32 error_code = 1;
35+
optional uint32 extra_error_code = 2;
36+
}
37+
38+
message BillingAddress
39+
{
40+
required int32 country_id = 1;
41+
required string city = 2;
42+
optional string state = 3;
43+
optional string postal_code = 4;
44+
}
45+

‎contrib/protocompiler/definitions/bnet/exchange_object_provider_types.proto

+14-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ message ReportAuthorizeRequest
1313
optional .bnet.protocol.exchange.BlobFromOfType auth_handle = 4;
1414
optional bool defer_delivery = 5;
1515
required .bnet.protocol.EntityId bnet_account_id = 6;
16+
optional .bnet.protocol.exchange.ActionErrorDetail error_detail = 7;
1617
}
1718

1819
message ReportSettleRequest
@@ -21,6 +22,7 @@ message ReportSettleRequest
2122
required .bnet.protocol.exchange.PartitionId token = 2;
2223
required uint64 result = 3;
2324
optional .bnet.protocol.exchange.BlobFrom notification_extra_info = 4;
25+
optional .bnet.protocol.exchange.ActionErrorDetail error_detail = 5;
2426
}
2527

2628
message ReportCancelRequest
@@ -29,6 +31,16 @@ message ReportCancelRequest
2931
required .bnet.protocol.exchange.PartitionId token = 2;
3032
required uint64 result = 3;
3133
optional .bnet.protocol.exchange.BlobFrom notification_extra_info = 4;
34+
optional .bnet.protocol.exchange.ActionErrorDetail error_detail = 5;
35+
}
36+
37+
message ReportRefundRequest
38+
{
39+
required .bnet.protocol.exchange.PartitionId partition_id = 1;
40+
required .bnet.protocol.exchange.PartitionId token = 2;
41+
required uint64 result = 3;
42+
optional .bnet.protocol.exchange.BlobFrom notification_extra_info = 4;
43+
optional .bnet.protocol.exchange.ActionErrorDetail error_detail = 5;
3244
}
3345

3446
message GetPaymentMethodsRequest
@@ -47,10 +59,8 @@ message PaymentMethod
4759
optional string description = 2;
4860
optional uint64 amount = 3;
4961
optional uint32 cash_in_out_mask = 4 [default = 3];
50-
optional uint32 country_id = 5;
51-
optional string state = 6;
52-
optional string city = 7;
53-
optional string postal_code = 8;
62+
optional .bnet.protocol.exchange.BillingAddress billing_address = 5;
63+
required uint64 wallet_id = 6;
5464
}
5565

5666
message GetPaymentMethodsResponse

0 commit comments

Comments
 (0)