Skip to content

Commit c985c67

Browse files
ZheneqZheneq
committed
dev tweaks
1 parent 060a103 commit c985c67

File tree

11 files changed

+54
-17
lines changed

11 files changed

+54
-17
lines changed

‎EvoS.DirectoryServer/DirectoryServer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ public void Configure(IApplicationBuilder app)
6262
PlayerData.Player p;
6363
try
6464
{
65-
p = PlayerData.GetPlayer(request.AuthInfo.Handle);
65+
p = PlayerData.GetPlayer(request.AuthInfo.Handle, request.AuthInfo.AccountId);
6666
if (p == null)
6767
{
6868
Log.Print(LogType.Warning, $"Player {request.AuthInfo.Handle} doesnt exists");
6969
PlayerData.CreatePlayer(request.AuthInfo.Handle);
70-
p = PlayerData.GetPlayer(request.AuthInfo.Handle);
70+
p = PlayerData.GetPlayer(request.AuthInfo.Handle, request.AuthInfo.AccountId);
7171
if (p != null)
7272
{
7373
Log.Print(LogType.Debug, $"Succesfully Registered {p.UserName}");

‎EvoS.Framework/DataAccess/PlayerData.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ public class Player
1919
public int SelectedRibbonID;
2020
}
2121

22-
public static Player GetPlayer(string UserName)
22+
public static Player GetPlayer(string UserName, long defaultAccountId)
2323
{
2424
if (!EvoSGameConfig.UseDatabase) {
2525
return new Player()
2626
{
27-
AccountId = DateTime.Now.Ticks,
27+
AccountId = defaultAccountId,
2828
UserName = UserName,
2929
LastSelectedCharacter = CharacterType.BazookaGirl,
3030
SelectedTitleID = -1,

‎EvoS.Framework/Game/EvoSGameConfig.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class EvoSGameConfig
1010
public static bool DebugNetworkBehaviour = true;
1111
public static bool DebugSyncVars = false;
1212
public static bool DebugNetSerialize = false;
13-
public static bool UseDatabase = true;
13+
public static bool UseDatabase = false;
1414

1515
public static bool GameTypeAvailability_Practice = true;
1616
public static bool GameTypeAvailability_Coop = false;

‎EvoS.LobbyServer/LobbyQueue/LobbyQueueManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,13 @@ private void CreatePracticeQueue()
249249
TeamBBots = 2,
250250
ResolveTimeoutLimit = 160,
251251
RoomName = "default",
252-
Map = Maps.VR_Practice,
252+
Map = Maps.Skyway_Deathmatch,
253253
SubTypes = new List<GameSubType>
254254
{
255255
new GameSubType
256256
{
257257
DuplicationRule = FreelancerDuplicationRuleTypes.noneInTeam,
258-
GameMapConfigs = new List<GameMapConfig> { new GameMapConfig(Maps.VR_Practice) },
258+
GameMapConfigs = new List<GameMapConfig> { new GameMapConfig(Maps.Skyway_Deathmatch) },
259259
InstructionsToDisplay = GameSubType.GameLoadScreenInstructions.Default,
260260
LocalizedName = "GenericPractice@SubTypes",
261261
PersistedStatBucket = PersistedStatBucket.Deathmatch_Unranked,

‎EvoS.LobbyServer/NetworkMessageHandlers/RegisterGameClientRequestHandler.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class RegisterGameClientRequestHandler : IEvosNetworkMessageHandler
2121
public async Task OnMessage(LobbyServerConnection connection, object requestData)
2222
{
2323
RegisterGameClientRequest request = (RegisterGameClientRequest) requestData;
24-
PlayerData.Player p = PlayerData.GetPlayer(request.SessionInfo.Handle);
24+
PlayerData.Player p = PlayerData.GetPlayer(request.SessionInfo.Handle, request.SessionInfo.AccountId);
2525

2626
connection.SessionToken = request.SessionInfo.SessionToken;
2727

@@ -113,7 +113,8 @@ private static RegisterGameClientResponse RegisterGameClient(RegisterGameClientR
113113
response.SessionInfo.ConnectionAddress = "127.0.0.1";
114114
response.SessionInfo.LanguageCode = "EN";
115115
response.AuthInfo = request.AuthInfo;
116-
response.AuthInfo.AccountId = request.SessionInfo.AccountId; // Override AuthInfo.AccountId with SessionInfo.AccountID, The account id from SessionInfo is set in the DirectoryServer and has the accountid value from database for the client username
116+
//response.AuthInfo.AccountId = request.SessionInfo.AccountId; // Override AuthInfo.AccountId with SessionInfo.AccountID, The account id from SessionInfo is set in the DirectoryServer and has the accountid value from database for the client username
117+
Log.Print(LogType.Lobby, $"AccountId {request.AuthInfo.AccountId} (-> {request.SessionInfo.AccountId})");
117118
response.DevServerConnectionUrl = "127.0.0.1"; // What is this?
118119
response.AuthInfo.AccountStatus = null;
119120
response.Status = new LobbyStatusNotification

‎EvoS.LobbyServer/Utils/GameTypesUtils.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static GameTypeAvailability GetPracticeGameTypeAvailability() {
3939
{
4040
new GameSubType {
4141
LocalizedName = "GenericPractice@SubTypes",
42-
GameMapConfigs = new List<GameMapConfig>{ new GameMapConfig(Maps.VR_Practice, true) },
42+
GameMapConfigs = new List<GameMapConfig>{ new GameMapConfig(Maps.Skyway_Deathmatch, true) },
4343
RewardBucket = GameBalanceVars.GameRewardBucketType.NoRewards,
4444
PersistedStatBucket = PersistedStatBucket.DoNotPersist,
4545
TeamBBots = 2,
@@ -109,7 +109,7 @@ public static GameTypeAvailability GetPvPGameTypeAvailability() {
109109
new GameSubType
110110
{
111111
LocalizedName = "GenericPvP@SubTypes",
112-
GameMapConfigs = new List<GameMapConfig>{ new GameMapConfig(Maps.VR_Practice, true) },
112+
GameMapConfigs = new List<GameMapConfig>{ new GameMapConfig(Maps.Skyway_Deathmatch, true) },
113113
RewardBucket = GameBalanceVars.GameRewardBucketType.NoRewards,
114114
PersistedStatBucket = PersistedStatBucket.DoNotPersist,
115115
TeamBBots = 2,

‎LobbyServer2/BridgeServer/BridgeServerProtocol.cs‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public enum BridgeMessageType
2828
SetTeamInfo,
2929
Start,
3030
Stop,
31-
GameStatusChange
31+
GameStatusChange,
32+
PlayerLeaving
3233
}
3334

3435
protected override void OnMessage(MessageEventArgs e)
@@ -111,5 +112,28 @@ public void SendStartNotification()
111112
Send(stream.ToArray());
112113
Log.Print(LogType.Game, "Starting Game Server");
113114
}
115+
116+
public void SendPlayerLeavingNotification(long accountId, bool isPermanent, GameResult gameResult)
117+
{
118+
MemoryStream stream = new MemoryStream();
119+
stream.WriteByte((byte)BridgeMessageType.PlayerLeaving);
120+
string jsonData = JsonConvert.SerializeObject(new PlayerLeavingNotification()
121+
{
122+
AccountId = accountId,
123+
IsPermanent = isPermanent,
124+
GameResult = gameResult
125+
});
126+
stream.Write(GetBytesSpan(jsonData));
127+
Send(stream.ToArray());
128+
Log.Print(LogType.Game, $"Player {accountId} leaves game");
129+
}
130+
131+
[Serializable]
132+
class PlayerLeavingNotification
133+
{
134+
public long AccountId;
135+
public bool IsPermanent;
136+
public GameResult GameResult;
137+
}
114138
}
115139
}

‎LobbyServer2/LobbyServer/Config/ConfigManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace CentralServer.LobbyServer.Config
66
{
77
static class ConfigManager
88
{
9-
public static string MOTDPopUpText = "Welcome back";
9+
public static string MOTDPopUpText = "";
1010
public static string MOTDText = "Lobby server version 2";
1111

1212
public static string PatchNotesHeader = "Evos Emulator v0.1";

‎LobbyServer2/LobbyServer/GameMode/GameModeManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private static GameTypeAvailability GetPracticeGameTypeAvailability()
3636
{
3737
new GameSubType {
3838
LocalizedName = "GenericPractice@SubTypes",
39-
GameMapConfigs = new List<GameMapConfig>{ new GameMapConfig(Maps.VR_Practice, true) },
39+
GameMapConfigs = new List<GameMapConfig>{ new GameMapConfig(Maps.Skyway_Deathmatch, true) },
4040
RewardBucket = GameBalanceVars.GameRewardBucketType.NoRewards,
4141
PersistedStatBucket = PersistedStatBucket.DoNotPersist,
4242
TeamAPlayers = 1,
@@ -106,7 +106,7 @@ private static GameTypeAvailability GetPvPGameTypeAvailability()
106106
new GameSubType
107107
{
108108
LocalizedName = "GenericPvP@SubTypes",
109-
GameMapConfigs = new List<GameMapConfig>{ new GameMapConfig(Maps.VR_Practice, true) },
109+
GameMapConfigs = new List<GameMapConfig>{ new GameMapConfig(Maps.Skyway_Deathmatch, true) },
110110
RewardBucket = GameBalanceVars.GameRewardBucketType.NoRewards,
111111
PersistedStatBucket = PersistedStatBucket.DoNotPersist,
112112
TeamAPlayers = 1,

‎LobbyServer2/LobbyServer/LobbyServerProtocol.cs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ protected override void OnOpen()
3131
RegisterHandler(new EvosMessageDelegate<ClientErrorSummary>(HandleClientErrorSummary));
3232
RegisterHandler(new EvosMessageDelegate<PreviousGameInfoRequest>(HandlePreviousGameInfoRequest));
3333
RegisterHandler(new EvosMessageDelegate<PurchaseTintRequest>(HandlePurchaseTintRequest));
34+
RegisterHandler(new EvosMessageDelegate<LeaveGameRequest>(HandleLeaveGameRequest));
3435

3536
/*
3637
RegisterHandler(new EvosMessageDelegate<PurchaseModResponse>(HandlePurchaseModRequest));
@@ -235,7 +236,17 @@ public void HandlePurchaseTintRequest(PurchaseTintRequest request)
235236
sk.Save();
236237
}
237238

238-
239+
public void HandleLeaveGameRequest(LeaveGameRequest request)
240+
{
241+
Console.WriteLine("LeaveGameRequest " + JsonConvert.SerializeObject(request));
242+
243+
LeaveGameResponse response = new LeaveGameResponse()
244+
{
245+
Success = true,
246+
ResponseId = request.RequestId
247+
};
248+
Send(response);
249+
}
239250

240251

241252
}

0 commit comments

Comments
 (0)