Mirror/EpinelPS
1
0
Fork 0
mirror of https://github.com/EpinelPS/EpinelPS.git synced 2025-12-12 23:14:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Equipment and main quest bug fixes

Browse Source
This commit is contained in:
Mikhail
2024-07-26 14:12:30 -04:00
parent cce8179e8d
commit 78659f9c6e
7 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nksrv/Database/JsonDb.cs
View File

@@ -100,10 +100,7 @@ namespace nksrv.Database
public Dictionary<int, ClearedTutorialData> ClearedTutorialData = [];
public NetWallpaperData[] WallpaperList = [];
public Dictionary<int, NetUserTeamData> UserTeams = new Dictionary<int, NetUserTeamData>();
public Dictionary<int, bool> MainQuestData = new()
{
{1, false }
};
public Dictionary<int, bool> MainQuestData = new();
public int InfraCoreExp = 0;
public int InfraCoreLvl = 1;
public UserPointData userPointData = new();
@@ -118,16 +115,16 @@ namespace nksrv.Database
// Event data
public Dictionary<int, EventData> EventInfo = new();
public void SetQuest(int tid, bool recieved)
public void SetQuest(int tid, bool recievedReward)
{
if (MainQuestData.ContainsKey(tid))
{
MainQuestData[tid] = recieved;
MainQuestData[tid] = recievedReward;
return;
}
else
{
MainQuestData.Add(tid, recieved);
MainQuestData.Add(tid, recievedReward);
}
}

24
nksrv/LobbyServer/Msgs/Inventory/WearEquipment.cs
View File

@@ -13,26 +13,30 @@ namespace nksrv.LobbyServer.Msgs.Inventory
var response = new ResWearEquipment();
var pos = NetUtils.GetItemPos(user, req.Isn);
// unequip old item
foreach (var item in user.Items.ToArray())
{
if (item.Csn == req.Csn && item.Position == pos)
{
item.Csn = 0;
}
}
foreach (var item in user.Items.ToArray())
{
if (item.Isn == req.Isn)
{
// update character id
item.Csn = req.Csn;
item.Position = NetUtils.GetItemPos(user, item.Isn);
break;
}
}
foreach (var item in user.Items.ToArray())
{
if (item.Csn == req.Csn)
{
item.Position = pos;
response.Items.Add(NetUtils.ToNet(item));
break;
}
}
JsonDb.Save();
await WriteDataAsync(response);
}

15
nksrv/LobbyServer/Msgs/Inventory/WearEquipmentList.cs
View File

@@ -13,14 +13,27 @@ namespace nksrv.LobbyServer.Msgs.Inventory
var response = new ResWearEquipmentList();
// TODO optimize
foreach (var item2 in req.IsnList)
{
var pos = NetUtils.GetItemPos(user, item2);
// unequip previous items
foreach (var item in user.Items.ToArray())
{
if (item.Position == pos && item.Csn == req.Csn)
{
item.Csn = 0;
item.Position = 0;
}
}
foreach (var item in user.Items.ToArray())
{
if (item2 == item.Isn)
{
item.Csn = req.Csn;
item.Position = NetUtils.GetItemPos(user, item.Isn);
item.Position = pos;
response.Items.Add(NetUtils.ToNet(item));
}
}

2
nksrv/LobbyServer/Msgs/Stage/ClearStage.cs
View File

@@ -227,7 +227,7 @@ namespace nksrv.LobbyServer.Msgs.Stage
{
var quest = StaticDataParser.Instance.GetMainQuestForStageClearCondition(clearedStageId);
if (quest != null)
user.SetQuest(quest.id, true);
user.SetQuest(quest.id, false);
if (clearedStageId == 6000003)
{

2
nksrv/LobbyServer/Msgs/Trigger/FinishMainQuest.cs
View File

@@ -12,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Trigger
var req = await ReadData<ReqFinMainQuest>();
var user = GetUser();
Console.WriteLine("Complete quest: " + req.Tid);
user.SetQuest(req.Tid, true);
user.SetQuest(req.Tid, false);
var completedQuest = StaticDataParser.Instance.GetMainQuestByTableId(req.Tid);
if (completedQuest == null) throw new Exception("Quest not found");

2
nksrv/StaticInfo/StaticDataParser.cs
View File

@@ -238,8 +238,6 @@ namespace nksrv.StaticInfo
{
using var progress = new ProgressBar();
questDataRecords = await LoadZip("MainQuestTable.json", progress);
stageDataRecords = await LoadZip("CampaignStageTable.json", progress);
rewardDataRecords = await LoadZip("RewardTable.json", progress);

2
nksrv/Utils/ProgressBar.cs
View File

@@ -10,7 +10,7 @@ namespace nksrv.Utils
/// </summary>
public class ProgressBar : IDisposable, IProgress<double>
{
private const int blockCount = 10;
private const int blockCount = 17;
private readonly TimeSpan animationInterval = TimeSpan.FromSeconds(1.0 / 8);
private const string animation = @"|/-\";