Add support for extra/hard stages

This commit is contained in:
Mikhail
2024-07-05 15:43:04 -04:00
parent d08c293cd4
commit 65dac31a1a
6 changed files with 76 additions and 15 deletions

View File

@@ -17,11 +17,11 @@ namespace nksrv.LobbyServer.Msgs.Campaign
{
var req = await ReadData<ReqGetCampaignFieldData>();
var user = GetUser();
Console.WriteLine("Map ID: " + req.MapId);
var response = new ResGetCampaignFieldData();
response.Field = GetStage.CreateFieldInfo(user, StaticDataParser.Instance.GetNormalChapterNumberFromFieldName(req.MapId));
response.Field = GetStage.CreateFieldInfo(user, StaticDataParser.Instance.GetNormalChapterNumberFromFieldName(req.MapId), req.MapId.Contains("hard") ? "Hard" : "Normal");
// todo save this data
response.Team = new NetUserTeamData() { LastContentsTeamNumber = 1, Type = 1 };
@@ -51,7 +51,6 @@ namespace nksrv.LobbyServer.Msgs.Campaign
response.Json = resultingJson;
WriteData(response);
}
}

View File

@@ -1,4 +1,5 @@
using nksrv.Utils;
using nksrv.StaticInfo;
using nksrv.Utils;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -17,8 +18,16 @@ namespace nksrv.LobbyServer.Msgs.Campaign
var response = new ResObtainCampaignItem();
var chapter = StaticDataParser.Instance.GetNormalChapterNumberFromFieldName(req.MapId);
var mod = req.MapId.Contains("hard") ? "Hard" : "Normal";
var key = chapter + "_" + mod;
var field = user.FieldInfo[key];
// TODO
response.Reward = new();
WriteData(response);
}

View File

@@ -30,7 +30,7 @@ namespace nksrv.LobbyServer.Msgs.Stage
if (user.FieldInfo.Count == 0)
{
user.FieldInfo.Add(0, new FieldInfo() { });
user.FieldInfo.Add("0_" + clearedStage.chapter_mod, new FieldInfo() { });
}
DoQuestSpecificUserOperations(user, req.StageId);
@@ -41,8 +41,32 @@ namespace nksrv.LobbyServer.Msgs.Stage
else
Logger.Warn("rewardId is null for stage " + req.StageId);
user.LastNormalStageCleared = req.StageId;
user.FieldInfo[clearedStage.chapter_id - 1].CompletedStages.Add(new NetFieldStageData() { StageId = req.StageId });
if (clearedStage.stage_category == "Normal" || clearedStage.stage_category == "Boss")
{
if (clearedStage.chapter_mod == "Hard")
{
user.LastHardStageCleared = req.StageId;
}
else if (clearedStage.chapter_mod == "Normal")
{
user.LastNormalStageCleared = req.StageId;
}
else
{
Logger.Warn("Unknown chapter mod " + clearedStage.chapter_mod);
}
}
else if (clearedStage.stage_category == "Extra")
{
}
else
{
Logger.Warn("Unknown stage category " + clearedStage.stage_category);
}
user.FieldInfo[(clearedStage.chapter_id - 1) + "_" + clearedStage.chapter_mod].CompletedStages.Add(new NetFieldStageData() { StageId = req.StageId });
JsonDb.Save();
}
@@ -132,7 +156,7 @@ namespace nksrv.LobbyServer.Msgs.Stage
Count = 1,
Tid = item.reward_id
});
}
}
}
}
else

View File

@@ -19,7 +19,8 @@ namespace nksrv.LobbyServer.Msgs.Stage
var user = GetUser();
var response = new ResGetStageData();
response.Field = CreateFieldInfo(user, req.Chapter - 1);
response.Field = CreateFieldInfo(user, req.Chapter - 1, req.Mod == 0 ? "Normal" : "Hard");
response.HasChapterBossEntered = true;
@@ -28,13 +29,14 @@ namespace nksrv.LobbyServer.Msgs.Stage
WriteData(response);
}
public static NetFieldObjectData CreateFieldInfo(Utils.User user, int chapter)
public static NetFieldObjectData CreateFieldInfo(Utils.User user, int chapter, string mod)
{
var f = new NetFieldObjectData();
bool found = false;
string key = chapter + "_" + mod;
foreach (var item in user.FieldInfo)
{
if (item.Key == chapter)
if (item.Key == key)
{
found = true;
foreach (var stage in item.Value.CompletedStages)
@@ -47,10 +49,10 @@ namespace nksrv.LobbyServer.Msgs.Stage
if (!found)
{
Console.WriteLine("chapter not found: " + chapter);
Console.WriteLine("chapter not found: " + key);
user.FieldInfo.Add(chapter, new FieldInfo());
return CreateFieldInfo(user, chapter);
user.FieldInfo.Add(key, new FieldInfo());
return CreateFieldInfo(user, chapter, mod);
}
return f;