Implemented ds2: blood message, message stain, ghosts

TLeonardUK · Dec 31, 2023 · 49108a8 · 49108a8
1 parent 50d1fb0
commit 49108a8
Show file tree

Hide file tree

Showing 41 changed files with 5,563 additions and 1,913 deletions.
diff --git a/Protobuf/DarkSouls2/DS2_Frpg2RequestMessage.proto b/Protobuf/DarkSouls2/DS2_Frpg2RequestMessage.proto
@@ -175,9 +175,9 @@ message BloodMessageData {
 	required uint32 player_id = 1;
 	required uint32 character_id = 2;
 	required uint32 message_id = 3;
-	required uint32 evaluations = 4;
+	required uint32 good = 4;
 	required bytes message_data = 5;
-	required string steam_id = 6;
+	required string player_steam_id = 6;
 	required uint32 cell_id = 7;
 	optional string unknown_8 = 8;
 }
@@ -189,11 +189,12 @@ message BloodMessageCellLimitData {
 }
 
 message RequestReentryBloodMessage {
-    // TODO
+	required uint32 online_area_id = 1;
+	required uint32 cell_id = 2;
+	required uint32 message_id = 3;
 }
 
 message RequestReentryBloodMessageResponse {
-    // TODO
 }
 
 message RequestCreateBloodMessage {
@@ -208,8 +209,8 @@ message RequestCreateBloodMessageResponse {
 }
 
 message RequestRemoveBloodMessage {
-	required uint32 area_id = 1;
-	required uint32 player_id = 2;
+	required uint32 online_area_id = 1;
+	required uint32 cell_id = 2;
 	required uint32 message_id = 3;
 }
 
@@ -219,7 +220,7 @@ message RequestRemoveBloodMessageResponse {
 
 message RequestGetBloodMessageList {
 	required uint32 online_area_id = 1;
-	required uint32 count = 2;
+	required uint32 max_messages = 2;
 	repeated BloodMessageCellLimitData search_areas = 3;
 }
 
@@ -235,35 +236,32 @@ message RequestEvaluateBloodMessage {
 }
 
 message RequestEvaluateBloodMessageResponse {
-    // TODO
+    // Seems to just be empty response.
 }
 
 message RequestGetBloodMessageEvaluation {
-    // TODO
+    required uint32 online_area_id = 1;
+	required uint32 cell_id = 2;
+    required uint32 message_id = 3;
 }
 
 message RequestGetBloodMessageEvaluationResponse {
-    // TODO
+	required int64 message_id = 1;
+	required int64 rating = 2;
 }
 
 message PushRequestEvaluateBloodMessage {
-	required uint32 online_area_id = 1;
-	required uint32 player_id = 2;
+    required PushMessageId push_message_id = 1;     
+	required uint32 player_id = 2;          // Might be cell id
 	required uint32 message_id = 3;
+	required string player_steam_id = 4;
 }
 
 message RequestGetAreaBloodMessageList {
 	required uint32 online_area_id = 1;
 	required uint32 count = 2;              
-	required uint32 unknown_3 = 3;          // 5
-	required uint32 unknown_4 = 4;          // 27
-}
-
-message RequestGetAreaBloodstainList {
-	required uint32 online_area_id = 1;
-	required uint32 count = 2;              
-	required uint32 unknown_3 = 3;         // 5
-	required uint32 unknown_4 = 4;          // 27
+	required uint32 max_type_1 = 3;          // 5
+	required uint32 max_type_2 = 4;          // 27
 }
 
 // ------------------------------------------------------------------------------------------------------------
@@ -274,7 +272,7 @@ message BloodstainInfo {
 	required uint32 online_area_id = 1;
 	required uint32 cell_id = 2;
 	required uint32 bloodstain_id = 3;
-	required bytes bloodstain_data = 4;
+	required bytes data = 4;
 }
 
 message RequestCreateBloodstain {
@@ -290,6 +288,13 @@ message RequestGetBloodstainList {
 	repeated CellLimitData search_areas = 3;
 }
 
+message RequestGetAreaBloodstainList {
+	required uint32 online_area_id = 1;
+	required uint32 count = 2;              
+	required uint32 max_type_1 = 3;         // 5
+	required uint32 max_type_2 = 4;          // 27
+}
+
 message RequestGetBloodstainListResponse {
 	repeated BloodstainInfo bloodstains = 1;
 }
@@ -709,9 +714,15 @@ message RequestRejectBreakInTargetResponse {
 // Game Server Messages - Ghost Data
 // ------------------------------------------------------------------------------------------------------------
 
+message GhostData {
+	required uint32 cell_id = 1;        
+	required uint32 ghost_id = 2;       
+	required bytes data = 3;
+}
+
 message RequestGetGhostDataList {
 	required uint32 online_area_id = 1;     
-	required uint32 max_count = 2;
+	required uint32 max_ghosts = 2;
 	repeated CellLimitData search_areas = 3;
 }
 
@@ -720,16 +731,10 @@ message RequestGetGhostDataListResponse {
 	repeated GhostData ghosts = 3;
 }
 
-message GhostData {
-	required uint32 cell_id = 1;        
-	required uint32 ghost_id = 2;       
-	required bytes ghost_data = 3;
-}
-
 message RequestCreateGhostData {
 	required uint32 online_area_id = 1;
 	required uint32 cell_id = 2;      
-	required bytes ghost_data = 3;
+	required bytes data = 3;
 }
 
 message RequestCreateGhostDataResponse {
@@ -1133,7 +1138,7 @@ message RequestGetServerSidePlayerStatus {
 
 message CellLimitData {
 	required uint32 cell_id = 1;
-	required uint32 max_count = 2;
+	required uint32 max_items = 2;
 }
 
 message DateTime {

diff --git a/Source/Server.DarkSouls2/CMakeLists.txt b/Source/Server.DarkSouls2/CMakeLists.txt
@@ -16,6 +16,29 @@ SET(SOURCES
     Server/GameService/GameManagers/Boot/DS2_BootManager.h
     Server/GameService/GameManagers/PlayerData/DS2_PlayerDataManager.cpp
     Server/GameService/GameManagers/PlayerData/DS2_PlayerDataManager.h
+    Server/GameService/GameManagers/Ghosts/DS2_GhostManager.cpp
+    Server/GameService/GameManagers/Ghosts/DS2_GhostManager.h
+    Server/GameService/GameManagers/BloodMessage/DS2_BloodMessageManager.cpp
+    Server/GameService/GameManagers/BloodMessage/DS2_BloodMessageManager.h
+    Server/GameService/GameManagers/Bloodstain/DS2_BloodstainManager.cpp
+    Server/GameService/GameManagers/Bloodstain/DS2_BloodstainManager.h
+
+    Server/GameService/Utils/DS2_GameIds.h
+    Server/GameService/Utils/DS2_CellAndAreaId.h
+
+    Server/GameService/Utils/Ids/BonfireId.inc
+    Server/GameService/Utils/Ids/CharacterTypeId.inc
+    Server/GameService/Utils/Ids/CovenantId.inc
+    Server/GameService/Utils/Ids/GestureId.inc
+    Server/GameService/Utils/Ids/InvasionTypeId.inc
+    Server/GameService/Utils/Ids/ItemId.inc
+    Server/GameService/Utils/Ids/OnlineAreaId.inc
+    Server/GameService/Utils/Ids/TeamTypeId.inc
+    Server/GameService/Utils/Ids/BossId.inc    
+    Server/GameService/Utils/Ids/BloodMessageConjunction.inc
+    Server/GameService/Utils/Ids/BloodMessageGesture.inc
+    Server/GameService/Utils/Ids/BloodMessageTemplate.inc
+    Server/GameService/Utils/Ids/BloodMessageWord.inc    
 
     Server/Streams/DS2_Frpg2ReliableUdpMessageTypes.inc
     Server/Streams/DS2_Frpg2ReliableUdpMessage.h