Skip to content

Commit

Permalink
Added invasion support.
Browse files Browse the repository at this point in the history
  • Loading branch information
TLeonardUK committed Jan 4, 2024
1 parent ead781a commit e13fd12
Show file tree
Hide file tree
Showing 22 changed files with 3,184 additions and 2,341 deletions.
56 changes: 31 additions & 25 deletions Protobuf/DarkSouls2/DS2_Frpg2RequestMessage.proto
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ message RequestNotifyDeathResponse {
}

message RequestNotifyDisconnectSession {
// TODO
required int64 field_1 = 1;
}

message RequestNotifyDisconnectSessionResponse {
Expand Down Expand Up @@ -378,8 +378,8 @@ message RequestNotifyJoinSessionResponse {

message RequestNotifyKillEnemy {
repeated group Enemy_count = 1 {
repeated int64 enemy_id = 1;
repeated int64 enemy_count = 2;
required int64 enemy_id = 1;
required int64 enemy_count = 2;
}
}

Expand Down Expand Up @@ -422,19 +422,19 @@ message RequestNotifyLeaveSessionResponse {
}

message RequestNotifyMirrorKnight {
// TODO
required int64 field_1 = 1;
}

message RequestNotifyMirrorKnightResponse {
// Never recieved.
}

message RequestNotifyOfflineDeathCount {
// TODO
required int64 count = 1;
}

message RequestNotifyOfflineDeathCountResponse {
// TODO
// Never recieved.
}

// ------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -671,6 +671,11 @@ message RequestUpdateMirrorKnightSignResponse {
// Game Server Messages - Break In Messages
// ------------------------------------------------------------------------------------------------------------

enum BreakInType {
BreakInType_RedEyeOrb = 0;
BreakInType_BlueEyeOrb = 2;
};

message BreakInTargetData {
required uint32 player_id = 1;
required string steam_id = 2;
Expand All @@ -687,29 +692,28 @@ message PushRequestBreakInTarget {
required PushMessageId push_message_id = 1;
required uint32 player_id = 2;
required string steam_id = 3;
required uint32 unknown_4 = 4; // 0
required BreakInType type = 4;
required uint32 online_area_id = 5; // 10190000
required uint32 unknown_6 = 6; // 101910
required uint32 cell_id = 6; // 101910
}

message PushRequestRejectBreakInTarget {
required PushMessageId push_message_id = 1;
// required int64 field_1 = 1; // 290333
required int64 field_2 = 2; // 1
required int64 field_3 = 3; // 10190000
required int64 field_4 = 4; // 101910
required int64 field_5 = 5; // 0
required int64 player_id = 2;
required int64 unknown_3 = 3;
required string steam_id = 4;
required int64 unknown_5 = 5;
}

message PushRequestRemoveBreakInTarget {
// TODO
// TODO: I don't think we actually need to implement this.
}

message RequestBreakInTarget {
required uint32 online_area_id = 1;
required uint32 field_2 = 2;
required uint32 cell_id = 2;
required uint32 player_id = 3;
required uint32 unknown_4 = 4;
required BreakInType type = 4;
}

message RequestBreakInTargetResponse {
Expand All @@ -718,24 +722,24 @@ message RequestBreakInTargetResponse {

message RequestGetBreakInTargetList {
required uint32 online_area_id = 1; // 10100000
required uint32 field_2 = 2; // 101030, 101910
required uint32 field_3 = 3; // 5
required uint32 cell_id = 2; // 101030, 101910
required uint32 max_targets = 3; // 5
required MatchingParameter matching_parameter = 4;
required uint32 unknown_5 = 5; // 0
required BreakInType type = 5;
}

message RequestGetBreakInTargetListResponse {
optional uint32 online_area_id = 1;
optional uint32 field_2 = 2; // 101030, 101910
optional uint32 cell_id = 2;
repeated BreakInTargetData target_data = 3;
}

message RequestRejectBreakInTarget {
required int64 field_1 = 1; // 290333
required int64 field_2 = 2; // 1
required int64 field_3 = 3; // 10190000
required int64 field_4 = 4; // 101910
required int64 field_5 = 5; // 0
required int64 player_id = 1; // 290333
required int64 unknown_2 = 2; // 1 // pretty sure this is reason
required int64 online_area_id = 3; // 10190000
required int64 cell_id = 4; // 101910
required int64 unknown_5 = 5; // 4
}

message RequestRejectBreakInTargetResponse {
Expand Down Expand Up @@ -1094,6 +1098,8 @@ message RequestSendMessageToAllPlayersResponse {
}

message RequestSendMessageToPlayers {
repeated uint32 player_ids = 1;
required bytes message = 2; // This is normally a push message, the first field of which is an id to distinguish what type it is.
}

message RequestSendMessageToPlayersResponse {
Expand Down
2 changes: 2 additions & 0 deletions Source/Server.DarkSouls2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ SET(SOURCES
Server/GameService/GameManagers/BreakIn/DS2_BreakInManager.h
Server/GameService/GameManagers/Logging/DS2_LoggingManager.cpp
Server/GameService/GameManagers/Logging/DS2_LoggingManager.h
Server/GameService/GameManagers/Misc/DS2_MiscManager.cpp
Server/GameService/GameManagers/Misc/DS2_MiscManager.h

Server/GameService/Utils/DS2_GameIds.h
Server/GameService/Utils/DS2_CellAndAreaId.h
Expand Down
Loading

0 comments on commit e13fd12

Please sign in to comment.