Gaming/blizzless-diiis
Gaming/blizzless-diiis
3
0
Fork 1
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'community' into optimizations

Browse Source 
# Conflicts:
#	src/DiIiS-NA/Core/Helpers/Math/RandomHelper.cs
This commit is contained in:
Stepan Goremykin 2023-01-29 01:45:49 +01:00
commit 4da0b6373d
59 changed files with 7939 additions and 7443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
docs/commands-list.md
View File

@ -28,6 +28,118 @@
| | | `!lookup actor zombie` | |
| | | `!lookup power Punch` | |
# All Commands
Available commands from `!commands`:
### !account
Provides account management commands.
### !mute
Disables chat messages for the account for some defined time span.
### !tag
Switch private Tag for connect
### !powerful
Makes your character with absurd amount of damage. Useful for testing.
### !resourceful
Makes your character with full resource. Useful for testing.
### !info
Get current game information.
### !followers
Manage your followers.
### !difficulty
Changes difficulty of the game
### !heal
Heals yourself
### !invulnerable
Makes you invulnerable
### !spawn
Spawns a mob.
Usage: spawn [actorSNO] [amount]
### !levelup
Levels your character.
Optionally specify the number of levels: !levelup [count]
### !unlockart
Unlock all artisans: !unlockart
### !platinum
Platinum for your character.
Optionally specify the number of levels: !platinum [count]
### !stashup
Upgrade Stash.
### !gold
Gold for your character.
Optionally specify the number of gold: !gold [count]
### !achiplatinum
Platinum for your character.
Optionally specify the number of levels: !platinum [count]
### !eff
Platinum for your character.
Optionally specify the number of levels: !eff [count]
### !item
Spawns an item (with a name or type).
Usage: item [type <type>|<name>] [amount]
### !drop
Drops an epic item for your class.
Optionally specify the number of items: !drop [1-20]
### !tp
Transfers your character to another world.
### !conversation
Starts a conversation.
Usage: conversation snoConversation
### !speed
Modify speed walk of you character.
Usage: !speed <value>
Reset: !speed
### !commands
Lists available commands for your user-level.
### !help
usage: help <command>
Type 'commands' to get a list of available commands.
### !quest
Retrieves information about quest states and manipulates quest progress.
Usage: quest [triggers | trigger eventType eventValue | advance snoQuest]
### !lookup
Searches in sno databases.
Usage: lookup [actor|conv|power|scene|la|sp|weather] <pattern>
# Item List
You can use the official website to search items: https://eu.diablo3.blizzard.com/en-us/item/

2
src/DiIiS-NA/BGS-Server/AccountsSystem/Account.cs
View File

@ -175,7 +175,7 @@ namespace DiIiS_NA.LoginServer.AccountsSystem
{
var bTag = DBAccount.BattleTagName;
//(controller as HandlerController).Client.Account.GameAccount.ProgramField.Value
//((HandlerController) controller).Client.Account.GameAccount.ProgramField.Value
if(GameAccount.ProgramField.Value == "APP")
return bTag;

9
src/DiIiS-NA/BGS-Server/AccountsSystem/AccountManager.cs
View File

@ -9,6 +9,7 @@ using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Spectre.Console;
@ -132,16 +133,16 @@ namespace DiIiS_NA.LoginServer.AccountsSystem
List<DBAccount> dbAcc = DBSessions.SessionQueryWhere<DBAccount>(dba => dba.Email == email);
if (dbAcc.Count == 0)
{
Logger.Warn($"$[olive]$GetAccountByEmail(\"{email}\")$[/]$: DBAccount is null!");
Logger.Warn($"DBAccount is null from email {email}!");
return null;
}
if (dbAcc.First() == null)
{
Logger.Warn($"$[olive]$GetAccountByEmail(\"{email}\")$[/]$: DBAccount id is not null!");
Logger.Warn($"DBAccount is null from email {email}!");
return null;
}
else
Logger.MethodTrace($"$[olive]$GetAccountByEmail(\"{email}\")$[/]$: id - {dbAcc.First().Id}");
Logger.MethodTrace($"id - {dbAcc.First().Id}");
return GetAccountByDBAccount(dbAcc.First());
}
}

2
src/DiIiS-NA/BGS-Server/AccountsSystem/GameAccount.cs
View File

@ -948,7 +948,7 @@ public class GameAccount : PersistentRPCObject
.SetName("D3.NotificationMessage.Payload")
.SetValue(bgs.protocol.Variant.CreateBuilder().SetMessageValue(update.Build().ToByteString())));
LoggedInClient.MakeRPC((lid) =>
LoggedInClient.MakeRpc((lid) =>
bgs.protocol.notification.v1.NotificationListener.CreateStub(LoggedInClient).OnNotificationReceived(
new HandlerController()
{

227
src/DiIiS-NA/BGS-Server/Battle/BattleBackend.cs
View File

@ -16,19 +16,19 @@ namespace DiIiS_NA.LoginServer.Battle
{
public class BattleBackend
{
private static readonly Logger Logger = LogManager.CreateLogger("BattleNetEmu");
private static readonly Logger Logger = LogManager.CreateLogger("BattleBackend");
public WatsonTcpServer GameServerSocket;
public readonly WatsonTcpServer GameServerSocket;
public struct ServerDescriptor
{
public string GameIP;
public string GameIp;
public int GamePort;
};
public Dictionary<string, ServerDescriptor> GameServers = new Dictionary<string, ServerDescriptor>();
public readonly Dictionary<string, ServerDescriptor> GameServers = new();
public Dictionary<string, ServerDescriptor> PvPGameServers = new Dictionary<string, ServerDescriptor>();
private readonly Dictionary<string, ServerDescriptor> _pvPGameServers = new();
public BattleBackend(string battleHost, int port)
{
@ -38,33 +38,36 @@ namespace DiIiS_NA.LoginServer.Battle
private bool ReceiverClientConnected(string ipPort)
{
Logger.Info($"Blizzless server loaded {ipPort} - connecting...");
Logger.Info($"Blizzless client connected {ipPort}...");
return true;
}
private bool ReceiverClientDisconnected(string ipPort)
{
Logger.Warn("Blizzless server at {0} was disconnected!", ipPort);
Logger.Warn("Blizzless client disconnected $[white]${0}$[/]$!", ipPort);
if (GameServers.ContainsKey(ipPort)) GameServers.Remove(ipPort);
if (PvPGameServers.ContainsKey(ipPort)) PvPGameServers.Remove(ipPort);
if (_pvPGameServers.ContainsKey(ipPort)) _pvPGameServers.Remove(ipPort);
if (GameServers.Count == 0)
Logger.Warn("GameServers list is empty! Unable to use PvE game activities atm.");
if (PvPGameServers.Count == 0)
if (_pvPGameServers.Count == 0)
Logger.Warn("PvPGameServers list is empty! Unable to use PvP game activities atm.");
return true;
}
public void CreateGame(string ipPort, int GameId, int level, int act, int difficulty, int questId, int questStepId, bool isHardcore, int gamemode, bool iSseasoned, int perftest_id = 0)
public void CreateGame(string ipPort, int gameId, int level, int act, int difficulty, int questId, int questStepId, bool isHardcore, int gameMode, bool isSeasoned, int perftestId = 0)
{
GameServerSocket.Send(ipPort, Encoding.UTF8.GetBytes(string.Format("diiiscg|{0}/{1}/{2}/{3}/{4}/{5}/{6}/{7}/{8}", GameId, level, act, difficulty, questId, questStepId, isHardcore, gamemode, iSseasoned, perftest_id)));
Send(ipPort, $"diiiscg|{gameId}/{level}/{act}/{difficulty}/{questId}/{questStepId}/{isHardcore}/{gameMode}/{isSeasoned}");
}
private void Send(string ipPort, string data)
=> GameServerSocket.Send(ipPort, Encoding.UTF8.GetBytes(data));
private bool ReceiverMessageReceived(string ipPort, byte[] data)
{
string msg = "";
if (data != null && data.Length > 0) msg = Encoding.UTF8.GetString(data);
Logger.Trace("Message received from {0}: {1}", ipPort, msg);
Logger.Trace("Message received from $[grey69]${0}$[/]$: $[white]${1}$[/]$", ipPort, msg);
var message = msg.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
var args = message[1].Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
@ -72,134 +75,134 @@ namespace DiIiS_NA.LoginServer.Battle
{
case "rngsr":
if (GameServers.ContainsKey(ipPort)) GameServers.Remove(ipPort);
string rgs_ip = args[0];
int rgs_port = int.Parse(args[1].Trim());
GameServers.Add(ipPort, new ServerDescriptor { GameIP = rgs_ip, GamePort = rgs_port });
Logger.Info("Game server was registered for Blizzless {0}:{1}.", rgs_ip, rgs_port);
string rgsIp = args[0];
int rgsPort = int.Parse(args[1].Trim());
GameServers.Add(ipPort, new ServerDescriptor { GameIp = rgsIp, GamePort = rgsPort });
Logger.Info("Game server was registered for Blizzless {0}:{1}.", rgsIp, rgsPort);
break;
case "rnpvpgsr":
if (PvPGameServers.ContainsKey(ipPort)) PvPGameServers.Remove(ipPort);
string rpgs_ip = args[0];
int rpgs_port = int.Parse(args[1].Trim());
PvPGameServers.Add(ipPort, new ServerDescriptor { GameIP = rpgs_ip, GamePort = rpgs_port });
Logger.Info("PvP GameServer at {0}:{1} successfully signed and ready to work.", rpgs_ip, rpgs_port);
if (_pvPGameServers.ContainsKey(ipPort)) _pvPGameServers.Remove(ipPort);
string rpgsIp = args[0];
int rpgsPort = int.Parse(args[1].Trim());
_pvPGameServers.Add(ipPort, new ServerDescriptor { GameIp = rpgsIp, GamePort = rpgsPort });
Logger.Info("PvP GameServer at {0}:{1} successfully signed and ready to work.", rpgsIp, rpgsPort);
break;
case "grachi":
ulong gachi_accId = ulong.Parse(args[0].Trim());
ulong gachi_achId = ulong.Parse(args[1].Trim());
ulong gachiAccId = ulong.Parse(args[0].Trim());
ulong gachiAchId = ulong.Parse(args[1].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
foreach (var gachi_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == gachi_accId))
AchievementManager.GrantAchievement(gachi_invokerClient, gachi_achId);
foreach (var gachiInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == gachiAccId))
AchievementManager.GrantAchievement(gachiInvokerClient, gachiAchId);
});
break;
case "gcrit":
ulong gc_accId = ulong.Parse(args[0].Trim());
ulong gc_criId = ulong.Parse(args[1].Trim());
ulong gcAccId = ulong.Parse(args[0].Trim());
ulong gcCriId = ulong.Parse(args[1].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
foreach (var gc_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == gc_accId))
AchievementManager.GrantCriteria(gc_invokerClient, gc_criId);
foreach (var gcInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == gcAccId))
AchievementManager.GrantCriteria(gcInvokerClient, gcCriId);
});
break;
case "upequt":
ulong uq_accId = ulong.Parse(args[0].Trim());
ulong uq_achId = ulong.Parse(args[1].Trim());
uint uq_addCounter = uint.Parse(args[2].Trim());
ulong uqAccId = ulong.Parse(args[0].Trim());
ulong uqAchId = ulong.Parse(args[1].Trim());
uint uqAddCounter = uint.Parse(args[2].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
foreach (var uq_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == uq_accId))
AchievementManager.UpdateQuantity(uq_invokerClient, uq_achId, uq_addCounter);
foreach (var uqInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == uqAccId))
AchievementManager.UpdateQuantity(uqInvokerClient, uqAchId, uqAddCounter);
});
break;
case "uoacce":
ulong uac_accId = ulong.Parse(args[0].Trim());
int uac_typeId = int.Parse(args[1].Trim());
uint uac_addCounter = uint.Parse(args[2].Trim());
int uac_comparand = int.Parse(args[3].Trim());
ulong uac_achi = ulong.Parse(args[4].Trim());
ulong uacAccId = ulong.Parse(args[0].Trim());
int uacTypeId = int.Parse(args[1].Trim());
uint uacAddCounter = uint.Parse(args[2].Trim());
int uacComparand = int.Parse(args[3].Trim());
ulong uacAchi = ulong.Parse(args[4].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
if (uac_achi == 0)
foreach (var uac_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == uac_accId))
AchievementManager.UpdateAllCounters(uac_invokerClient, uac_typeId, uac_addCounter, uac_comparand);
if (uacAchi == 0)
foreach (var uacInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == uacAccId))
AchievementManager.UpdateAllCounters(uacInvokerClient, uacTypeId, uacAddCounter, uacComparand);
else
foreach (var uac_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == uac_accId))
AchievementManager.UpdateAllCounters(uac_invokerClient, uac_typeId, uac_addCounter, uac_comparand);
foreach (var uacInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == uacAccId))
AchievementManager.UpdateAllCounters(uacInvokerClient, uacTypeId, uacAddCounter, uacComparand);
});
break;
case "upsnaccr": //UpdateSingleAchievementCounter
ulong usac_accId = ulong.Parse(args[0].Trim());
ulong usac_achId = ulong.Parse(args[1].Trim());
uint usac_addCounter = uint.Parse(args[2].Trim());
ulong usacAccId = ulong.Parse(args[0].Trim());
ulong usacAchId = ulong.Parse(args[1].Trim());
uint usacAddCounter = uint.Parse(args[2].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
foreach (var usac_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == usac_accId))
AchievementManager.UpdateQuantity(usac_invokerClient, usac_achId, usac_addCounter);
foreach (var usacInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == usacAccId))
AchievementManager.UpdateQuantity(usacInvokerClient, usacAchId, usacAddCounter);
});
break;
case "cqc": //CheckQuestCriteria
ulong cqc_accId = ulong.Parse(args[0].Trim());
int cqc_qId = int.Parse(args[1].Trim());
bool cqc_isCoop = (args[2].Trim() == "True" ? true : false);
ulong cqcAccId = ulong.Parse(args[0].Trim());
int cqcQId = int.Parse(args[1].Trim());
bool cqcIsCoop = (args[2].Trim() == "True" ? true : false);
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
foreach (var cqc_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == cqc_accId))
AchievementManager.CheckQuestCriteria(cqc_invokerClient, cqc_qId, cqc_isCoop);
foreach (var cqcInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == cqcAccId))
AchievementManager.CheckQuestCriteria(cqcInvokerClient, cqcQId, cqcIsCoop);
});
break;
case "ckmc": //CheckKillMonsterCriteria
ulong ckmc_accId = ulong.Parse(args[0].Trim());
int ckmc_actorId = int.Parse(args[1].Trim());
int ckmc_type = int.Parse(args[2].Trim());
bool ckmc_isHardcore = (args[3].Trim() == "True" ? true : false);
ulong ckmcAccId = ulong.Parse(args[0].Trim());
int ckmcActorId = int.Parse(args[1].Trim());
int ckmcType = int.Parse(args[2].Trim());
bool ckmcIsHardcore = (args[3].Trim() == "True" ? true : false);
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
foreach (var ckmc_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == ckmc_accId))
AchievementManager.CheckKillMonsterCriteria(ckmc_invokerClient, ckmc_actorId, ckmc_type, ckmc_isHardcore);
foreach (var ckmcInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == ckmcAccId))
AchievementManager.CheckKillMonsterCriteria(ckmcInvokerClient, ckmcActorId, ckmcType, ckmcIsHardcore);
});
break;
case "clc": //CheckLevelCap
ulong clc_accId = ulong.Parse(args[0].Trim());
ulong clcAccId = ulong.Parse(args[0].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
foreach (var clc_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == clc_accId))
AchievementManager.CheckLevelCap(clc_invokerClient);
foreach (var clcInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == clcAccId))
AchievementManager.CheckLevelCap(clcInvokerClient);
});
break;
case "csic": //CheckSalvageItemCriteria
ulong csic_accId = ulong.Parse(args[0].Trim());
int csic_itemId = int.Parse(args[1].Trim());
ulong csicAccId = ulong.Parse(args[0].Trim());
int csicItemId = int.Parse(args[1].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
foreach (var csic_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == csic_accId))
AchievementManager.CheckSalvageItemCriteria(csic_invokerClient, csic_itemId);
foreach (var csicInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == csicAccId))
AchievementManager.CheckSalvageItemCriteria(csicInvokerClient, csicItemId);
});
break;
case "clac": //CheckLevelAreaCriteria
ulong clac_accId = ulong.Parse(args[0].Trim());
int clac_laId = int.Parse(args[1].Trim());
ulong clacAccId = ulong.Parse(args[0].Trim());
int clacLaId = int.Parse(args[1].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
foreach (var clac_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == clac_accId))
AchievementManager.CheckLevelAreaCriteria(clac_invokerClient, clac_laId);
foreach (var clacInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == clacAccId))
AchievementManager.CheckLevelAreaCriteria(clacInvokerClient, clacLaId);
});
break;
case "ccc": //CheckConversationCriteria
ulong ccc_accId = ulong.Parse(args[0].Trim());
int ccc_cId = int.Parse(args[1].Trim());
ulong cccAccId = ulong.Parse(args[0].Trim());
int cccCId = int.Parse(args[1].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
foreach (var ccc_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == ccc_accId))
AchievementManager.CheckConversationCriteria(ccc_invokerClient, ccc_cId);
foreach (var cccInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == cccAccId))
AchievementManager.CheckConversationCriteria(cccInvokerClient, cccCId);
});
break;
case "plu": //ParagonLevelUp
ulong plu_accId = ulong.Parse(args[0].Trim());
ulong pluAccId = ulong.Parse(args[0].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
var plr_client = PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == plu_accId).FirstOrDefault();
if (plr_client != null && plr_client.Account.GameAccount. Clan != null)
plr_client.Account.GameAccount.Clan.ParagonRatings[plr_client.Account.GameAccount] = plr_client.Account.GameAccount.DBGameAccount.ParagonLevel;
var plrClient = PlayerManager.OnlinePlayers.FirstOrDefault(c => c.Account.GameAccount.PersistentID == pluAccId);
if (plrClient != null && plrClient.Account.GameAccount. Clan != null)
plrClient.Account.GameAccount.Clan.ParagonRatings[plrClient.Account.GameAccount] = plrClient.Account.GameAccount.DBGameAccount.ParagonLevel;
});
break;
case "uii": //UniqueItemIdentified
ulong uii_accId = ulong.Parse(args[0].Trim());
ulong uii_itemId = ulong.Parse(args[1].Trim());
ulong uiiAccId = ulong.Parse(args[0].Trim());
ulong uiiItemId = ulong.Parse(args[1].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
var plr_client = PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == uii_accId).FirstOrDefault();
if (plr_client != null && plr_client.Account.GameAccount.Clan != null)
var plrClient = PlayerManager.OnlinePlayers.FirstOrDefault(c => c.Account.GameAccount.PersistentID == uiiAccId);
if (plrClient != null && plrClient.Account.GameAccount.Clan != null)
{
var dbItem = DBSessions.SessionGet<DBInventory>(uii_itemId);
var dbItem = DBSessions.SessionGet<DBInventory>(uiiItemId);
if (dbItem != null)
{
var generator = D3.Items.Generator.CreateBuilder()
@ -219,92 +222,92 @@ namespace DiIiS_NA.LoginServer.Battle
generator.AddBaseAffixes(result);
}
plr_client.Account.GameAccount.Clan.AddNews(plr_client.Account.GameAccount, 0, generator.Build().ToByteArray());
plrClient.Account.GameAccount.Clan.AddNews(plrClient.Account.GameAccount, 0, generator.Build().ToByteArray());
}
}
});
break;
case "uc": //UpdateClient
ulong uc_accId = ulong.Parse(args[0].Trim());
int uc_level = int.Parse(args[1].Trim());
int uc_screen = int.Parse(args[2].Trim());
ulong ucAccId = ulong.Parse(args[0].Trim());
int ucLevel = int.Parse(args[1].Trim());
int ucScreen = int.Parse(args[2].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
try
{
foreach (var uc_invokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == uc_accId))
foreach (var ucInvokerClient in PlayerManager.OnlinePlayers.Where(c => c.Account.GameAccount.PersistentID == ucAccId))
{
if (!uc_invokerClient.Account.IsOnline) continue;
uc_invokerClient.Account.GameAccount.ChangedFields.SetPresenceFieldValue(uc_invokerClient.Account.GameAccount.CurrentToon.HeroLevelField);
uc_invokerClient.Account.GameAccount.ChangedFields.SetPresenceFieldValue(uc_invokerClient.Account.GameAccount.CurrentToon.HeroParagonLevelField);
if (uc_screen != -1) uc_invokerClient.Account.GameAccount.ScreenStatus = D3.PartyMessage.ScreenStatus.CreateBuilder().SetScreen(uc_screen).SetStatus(0).Build();
uc_invokerClient.Account.GameAccount.NotifyUpdate();
if (!ucInvokerClient.Account.IsOnline) continue;
ucInvokerClient.Account.GameAccount.ChangedFields.SetPresenceFieldValue(ucInvokerClient.Account.GameAccount.CurrentToon.HeroLevelField);
ucInvokerClient.Account.GameAccount.ChangedFields.SetPresenceFieldValue(ucInvokerClient.Account.GameAccount.CurrentToon.HeroParagonLevelField);
if (ucScreen != -1) ucInvokerClient.Account.GameAccount.ScreenStatus = D3.PartyMessage.ScreenStatus.CreateBuilder().SetScreen(ucScreen).SetStatus(0).Build();
ucInvokerClient.Account.GameAccount.NotifyUpdate();
}
}
catch { }
});
break;
case "gpj": //PlayerJoined
int gpj_gameId = int.Parse(args[0].Trim());
int gpjGameId = int.Parse(args[0].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
try
{
GameFactoryManager.FindGameByDynamicId((ulong)gpj_gameId).PlayersCount++;
GameFactoryManager.FindGameByDynamicId((ulong)gpjGameId).PlayersCount++;
}
catch { }
});
break;
case "gpl": //PlayerLeft
int gpl_gameId = int.Parse(args[0].Trim());
int gplGameId = int.Parse(args[0].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
try
{
if (GameFactoryManager.FindGameByDynamicId((ulong)gpl_gameId) != null)
GameFactoryManager.FindGameByDynamicId((ulong)gpl_gameId).PlayersCount--;
if (GameFactoryManager.FindGameByDynamicId((ulong)gplGameId) != null)
GameFactoryManager.FindGameByDynamicId((ulong)gplGameId).PlayersCount--;
}
catch { }
});
break;
case "gsp": //SetGamePublic
int gsp_gameId = int.Parse(args[0].Trim());
int gspGameId = int.Parse(args[0].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
try
{
GameFactoryManager.FindGameByDynamicId((ulong)gsp_gameId).Public = true;
GameFactoryManager.FindGameByDynamicId((ulong)gspGameId).Public = true;
}
catch { }
});
break;
case "tsc": //ToonStateChanged
int tsc_toonId = int.Parse(args[0].Trim());
int tscToonId = int.Parse(args[0].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
try
{
Toons.ToonManager.GetToonByLowID((ulong)tsc_toonId).StateChanged();
Toons.ToonManager.GetToonByLowID((ulong)tscToonId).StateChanged();
}
catch { }
});
break;
case "pvpsp": //PvPSaveProgress
ulong pvpsp_gAccId = ulong.Parse(args[0].Trim());
int pvpsp_kills = int.Parse(args[1].Trim());
int pvpsp_wins = int.Parse(args[2].Trim());
int pvpsp_gold = int.Parse(args[3].Trim());
ulong pvpspGAccId = ulong.Parse(args[0].Trim());
int pvpspKills = int.Parse(args[1].Trim());
int pvpspWins = int.Parse(args[2].Trim());
int pvpspGold = int.Parse(args[3].Trim());
System.Threading.Tasks.Task.Delay(1).ContinueWith((a) => {
var gAcc = GameAccountManager.GetAccountByPersistentID(pvpsp_gAccId);
var gAcc = GameAccountManager.GetAccountByPersistentID(pvpspGAccId);
lock (gAcc.DBGameAccount)
{
var dbGAcc = gAcc.DBGameAccount;
dbGAcc.PvPTotalKilled += (ulong)pvpsp_kills;
dbGAcc.PvPTotalWins += (ulong)pvpsp_wins;
dbGAcc.PvPTotalGold += (ulong)pvpsp_gold;
dbGAcc.PvPTotalKilled += (ulong)pvpspKills;
dbGAcc.PvPTotalWins += (ulong)pvpspWins;
dbGAcc.PvPTotalGold += (ulong)pvpspGold;
DBSessions.SessionUpdate(dbGAcc);
}
});
break;
default:
Logger.Warn("Unknown message type: {0}|{1}", message[0], message[1]);
Logger.Warn("Unknown message type: $[white]${0}|{1}$[/]$", message[0], message[1]);
break;
}
return true;

94
src/DiIiS-NA/BGS-Server/Battle/BattleClient.cs
View File

@ -30,33 +30,33 @@ namespace DiIiS_NA.LoginServer.Battle
public ISocketChannel SocketConnection { get; private set; }
public IChannelHandlerContext Connect { get; private set; }
public bool AuthenticationStatus = false;
public ClientLocale ClientLanguage = ClientLocale.enUS;
public ClientLocale ClientLanguage = ClientLocale.EN_US;
public IRpcController ListenerController;
private uint _tokenCounter = 0;
public static NO_RESPONSE NO_RESPONSE = NO_RESPONSE.CreateBuilder().Build();
public static NO_RESPONSE NoResponse = NO_RESPONSE.CreateBuilder().Build();
private readonly Dictionary<int, RPCCallBack> _pendingResponses = new(); // TODO: Check usage and remove if not needed
public bgs.protocol.v2.Attribute AttributeOfServer { get; set; }
public Account Account { get; set; }
public const byte ServiceReply = 0xFE;
public const byte SERVICE_REPLY = 0xFE;
public SslStream Ssl = null;
private static int REQUEST_SERVICE_ID = 0;
private static int RESPONSE_SERVICE_ID = 254;
private static int _requestServiceId = 0;
private static int _responseServiceId = 254;
//public object clientLock = new object();
public readonly object _serviceLock = new();
public object messageLock = new();
public readonly object ServiceLock = new();
public object MessageLock = new();
private ulong _listenerId; // last targeted rpc object.
public bool MOTDSent { get; private set; }
public bool MotdSent { get; private set; }
private ConcurrentDictionary<ulong, ulong> MappedObjects { get; set; }
public bool GuildChannelsRevealed = false;
public string GameTeamTag = "";
public ulong CID = 0;
public readonly ulong Cid = 0;
#region current channel
public Dictionary<ulong, Channel> Channels = new();
public readonly Dictionary<ulong, Channel> Channels = new();
public List<Channel> ChatChannels = new();
public readonly List<Channel> ChatChannels = new();
public Channel PartyChannel; //Used for all non game related messages
public Channel GameChannel; //Used for all game related messages
@ -103,7 +103,7 @@ namespace DiIiS_NA.LoginServer.Battle
.AddAttribute(bgs.protocol.Attribute.CreateBuilder().SetName("whisper")
.SetValue(Variant.CreateBuilder().SetStringValue(text).Build()).Build()).Build();
MakeRPC((lid) => bgs.protocol.notification.v1.NotificationListener.CreateStub(this).
MakeRpc((lid) => bgs.protocol.notification.v1.NotificationListener.CreateStub(this).
OnNotificationReceived(new HandlerController()
{
ListenerId = lid
@ -120,8 +120,8 @@ namespace DiIiS_NA.LoginServer.Battle
public void LeaveAllChannels()
{
List<Channel> _channels = Channels.Values.ToList();
foreach (var channel in _channels)
List<Channel> channels = Channels.Values.ToList();
foreach (var channel in channels)
{
try
{
@ -134,12 +134,12 @@ namespace DiIiS_NA.LoginServer.Battle
#endregion
public BattleClient(ISocketChannel socketChannel, DotNetty.Handlers.Tls.TlsHandler TLS)
public BattleClient(ISocketChannel socketChannel, DotNetty.Handlers.Tls.TlsHandler tls)
{
SocketConnection = socketChannel;
Services = new Dictionary<uint, uint>();
MappedObjects = new ConcurrentDictionary<ulong, ulong>();
MOTDSent = false;
MotdSent = false;
if (SocketConnection.Active)
Logger.Trace("Client - {0} - successfully encrypted the connection", socketChannel.RemoteAddress);
}
@ -150,7 +150,7 @@ namespace DiIiS_NA.LoginServer.Battle
Header header = msg.GetHeader();
byte[] payload = (byte[])msg.GetPayload();
if (msg.GetHeader().ServiceId == RESPONSE_SERVICE_ID)
if (msg.GetHeader().ServiceId == _responseServiceId)
{
if (_pendingResponses.Count == 0) return;
RPCCallBack done = _pendingResponses[(int)header.Token];
@ -276,7 +276,7 @@ namespace DiIiS_NA.LoginServer.Battle
#endif
service.CallMethod(method, controller, message,
(IMessage m) => { sendResponse(ctx, (int)header.Token, m, controller.Status); });
(IMessage m) => { SendResponse(ctx, (int)header.Token, m, controller.Status); });
}
}
catch (NotImplementedException)
@ -319,69 +319,69 @@ namespace DiIiS_NA.LoginServer.Battle
/// <summary>
/// Deutsch.
/// </summary>
deDE,
DE_DE,
/// <summary>
/// English (EU)
/// </summary>
enGB,
EN_GB,
/// <summary>
/// English (Singapore)
/// </summary>
enSG,
EN_SG,
/// <summary>
/// English (US)
/// </summary>
enUS,
EN_US,
/// <summary>
/// Espanol
/// </summary>
esES,
ES_ES,
/// <summary>
/// Espanol (Mexico)
/// </summary>
esMX,
ES_MX,
/// <summary>
/// French
/// </summary>
frFR,
FR_FR,
/// <summary>
/// Italian
/// </summary>
itIT,
IT_IT,
/// <summary>
/// Korean
/// </summary>
koKR,
KO_KR,
/// <summary>
/// Polish
/// </summary>
plPL,
PL_PL,
/// <summary>
/// Portuguese
/// </summary>
ptPT,
PT_PT,
/// <summary>
/// Portuguese (Brazil)
/// </summary>
ptBR,
PT_BR,
/// <summary>
/// Russian
/// </summary>
ruRU,
RU_RU,
/// <summary>
/// Turkish
/// </summary>
trTR,
TR_TR,
/// <summary>
/// Chinese
/// </summary>
zhCN,
ZH_CN,
/// <summary>
/// Chinese (Taiwan)
/// </summary>
zhTW
ZH_TW
}
public virtual void MakeTargetedRPC(RPCObject targetObject, Action<ulong> rpc)
public virtual void MakeTargetedRpc(RPCObject targetObject, Action<ulong> rpc)
{
Task.Run(() =>
{
@ -400,7 +400,7 @@ namespace DiIiS_NA.LoginServer.Battle
//}
});
}
public virtual void MakeRPC(Action<ulong> rpc)
public virtual void MakeRpc(Action<ulong> rpc)
{
Task.Run(() =>
{
@ -438,18 +438,18 @@ namespace DiIiS_NA.LoginServer.Battle
if (controller is HandlerController)
{
status = (controller as HandlerController).Status;
_listenerId = (controller as HandlerController).ListenerId;
status = ((HandlerController) controller).Status;
_listenerId = ((HandlerController) controller).ListenerId;
}
var serviceId = Services[serviceHash];
var token = _tokenCounter++;
sendRequest(Connect, serviceHash, GetMethodId(method), token, request, (uint)_listenerId, status);
SendRequest(Connect, serviceHash, GetMethodId(method), token, request, (uint)_listenerId, status);
}
public static void sendRequest(IChannelHandlerContext ctx, uint serviceHash, uint methodId, uint token, IMessage request, uint listenerId, uint status)
public static void SendRequest(IChannelHandlerContext ctx, uint serviceHash, uint methodId, uint token, IMessage request, uint listenerId, uint status)
{
Header.Builder builder = Header.CreateBuilder();
builder.SetServiceId((uint)REQUEST_SERVICE_ID);
builder.SetServiceId((uint)_requestServiceId);
builder.SetServiceHash(serviceHash);
builder.SetMethodId(methodId);
if (listenerId != 0)
@ -462,7 +462,7 @@ namespace DiIiS_NA.LoginServer.Battle
}
/// <param name="localObjectId">The local objectId.</param>
/// <param name="remoteObjectId">The remote objectId over client.</param>
public void MapLocalObjectID(ulong localObjectId, ulong remoteObjectId)
public void MapLocalObjectId(ulong localObjectId, ulong remoteObjectId)
{
try
{
@ -501,10 +501,10 @@ namespace DiIiS_NA.LoginServer.Battle
return (uint)(method.Index) + 1;
}
}
public static void sendResponse(IChannelHandlerContext ctx, int token, IMessage response, uint status)
public static void SendResponse(IChannelHandlerContext ctx, int token, IMessage response, uint status)
{
Header.Builder builder = Header.CreateBuilder();
builder.SetServiceId((uint)RESPONSE_SERVICE_ID);
builder.SetServiceId((uint)_responseServiceId);
builder.SetToken((uint)token);
builder.SetStatus(status);
if (response != null)
@ -512,15 +512,15 @@ namespace DiIiS_NA.LoginServer.Battle
ctx.Channel.WriteAndFlushAsync(new BNetPacket(builder.Build(), response));
}
public void SendMOTD()
public void SendMotd()
{
if (MOTDSent)
if (MotdSent)
return;
var motd = "Welcome to BlizzLess.Net Alpha-Build Server!";
SendServerWhisper(motd);
MOTDSent = true;
MotdSent = true;
}
public override void ChannelInactive(IChannelHandlerContext context)

4
src/DiIiS-NA/BGS-Server/Battle/PlayerManager.cs
View File

@ -26,9 +26,9 @@ namespace DiIiS_NA.LoginServer.Battle
public static BattleClient GetClientByEmail(string email) => OnlinePlayers.FirstOrDefault(cli => cli.Account.Email == email);
public static BattleClient GetClientByBattleTag(string battleTag) => OnlinePlayers.FirstOrDefault(cli => cli.Account.BattleTag == battleTag);
public static BattleClient GetClientByCID(ulong cid)
public static BattleClient GetClientByCid(ulong cid)
{
return OnlinePlayers.FirstOrDefault(bc => bc.CID == cid);
return OnlinePlayers.FirstOrDefault(bc => bc.Cid == cid);
}
public static void SendWhisper(string message)

18
src/DiIiS-NA/BGS-Server/ChannelSystem/Channel.cs
View File

@ -93,7 +93,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
this.IsGuildChatChannel = false;
if ((client != null) && (remoteObjectId != 0))
client.MapLocalObjectID(this.DynamicId, remoteObjectId);
client.MapLocalObjectId(this.DynamicId, remoteObjectId);
if (this.IsChatChannel)
Program.Watchdog.AddTask(10, new Action(() =>
@ -175,7 +175,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
.AddStateChange(channelMember)
.Build();
client.MakeTargetedRPC(this, (lid) =>
client.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(client).OnUpdateMemberState(new HandlerController() { ListenerId = lid } , notification, callback => { }));
}
@ -201,7 +201,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
//Notify all Channel members
foreach (var n_member in this.Members.Keys)
{
n_member.MakeTargetedRPC(this, (lid) =>
n_member.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(n_member).OnUpdateMemberState(new HandlerController() { ListenerId = lid }, notification, callback => { }));
}
}
@ -213,7 +213,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
public void Join(BattleClient client, ulong remoteObjectId)
{
client.MapLocalObjectID(this.DynamicId, remoteObjectId);
client.MapLocalObjectId(this.DynamicId, remoteObjectId);
this.AddMember(client);
}
@ -249,7 +249,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
.AddRangeMember(members)
.Build();
client.MakeTargetedRPC(this, (lid) =>
client.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(client).OnJoin(new HandlerController() { ListenerId = lid }, joinNotification, callback => { }));
@ -276,7 +276,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
foreach (var pair in this.Members.Where(pair => pair.Value != addedMember)) // only send this to previous members of the channel.
{
pair.Key.MakeTargetedRPC(this, (lid) =>
pair.Key.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(pair.Key).OnMemberAdded(new HandlerController() { ListenerId = lid }, addNotification, callback => { }));
}
@ -348,10 +348,10 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
foreach (var pair in this.Members)
{
if (pair.Key != client)
pair.Key.MakeTargetedRPC(this, (lid) =>
pair.Key.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(pair.Key).OnMemberRemoved(new HandlerController() { ListenerId = lid }, removeMessage, callback => { }));
}
client.MakeTargetedRPC(this, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(client).OnLeave(new HandlerController() { ListenerId = lid }, leaveMessage, callback =>
client.MakeTargetedRpc(this, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(client).OnLeave(new HandlerController() { ListenerId = lid }, leaveMessage, callback =>
{
client.UnmapLocalObjectId(this.DynamicId); }));
@ -431,7 +431,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
foreach (var pair in this.Members) // send to all members of channel even to the actual one that sent the message else he'll not see his own message.
{
if (pair.Key.Account.IgnoreIds.Contains(client.Account.PersistentID)) continue;
pair.Key.MakeTargetedRPC(this, (lid) =>
pair.Key.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(pair.Key).OnSendMessage(new HandlerController() { ListenerId = lid }, notification, callback => { }));
}
}

26
src/DiIiS-NA/BGS-Server/ChannelSystem/ChannelInvitationManager.cs
View File

@ -54,7 +54,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
var notification = bgs.protocol.channel.v1.InvitationAddedNotification.CreateBuilder().SetInvitation(invitation);
invitee.MakeTargetedRPC(this, (lid) =>
invitee.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelInvitationListener.CreateStub(invitee).OnReceivedInvitationAdded(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
}
@ -80,7 +80,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
_onGoingInvitations.Remove(invitation.Id);
GoingInvitations.Remove(request.InvitationId);
client.MakeTargetedRPC(this, (lid) =>
client.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelInvitationListener.CreateStub(client).OnReceivedInvitationRemoved(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
channel.Join(client, request.ObjectId);
@ -92,7 +92,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
foreach (var member in channel.Members.Keys)
{
member.MakeTargetedRPC(channel, (lid) =>
member.MakeTargetedRpc(channel, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(member).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, stateNotification, callback => { }));
}
@ -157,7 +157,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
.SetStateChange(channelStatePermission)
.Build();
JoinClient.MakeTargetedRPC(JoinClient.CurrentChannel, (lid) =>
JoinClient.MakeTargetedRpc(JoinClient.CurrentChannel, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(JoinClient).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notificationPermission, callback => { }));
}
gameFound.StartGame(clients, gameFound.DynamicId);
@ -171,7 +171,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
.SetValue(Variant.CreateBuilder().SetUintValue(gameFound.RequestId).Build());
notificationFound.AddAttribute(attrF);
JoinClient.MakeRPC((lid) =>
JoinClient.MakeRpc((lid) =>
bgs.protocol.notification.v1.NotificationListener.CreateStub(JoinClient).OnNotificationReceived(new HandlerController() { ListenerId = lid }, notificationFound.Build(), callback => { }));
@ -186,7 +186,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
notification.SetGameHandle(gh);
System.Threading.Tasks.Task.Delay(2000).ContinueWith(delegate {
JoinClient.MakeRPC((lid) => bgs.protocol.matchmaking.v1.GameRequestListener.CreateStub(JoinClient).OnMatchmakingResult(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
JoinClient.MakeRpc((lid) => bgs.protocol.matchmaking.v1.GameRequestListener.CreateStub(JoinClient).OnMatchmakingResult(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
});
#endregion
@ -236,9 +236,9 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
foreach (var member in channel.Members.Keys)
{
member.MakeTargetedRPC(channel, (lid) =>
member.MakeTargetedRpc(channel, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(member).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, stateNotification, callback => { }));
member.MakeTargetedRPC(channel, (lid) =>
member.MakeTargetedRpc(channel, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(member).OnJoin(new HandlerController() { ListenerId = lid }, joinstateNotification, callback => { }));
}
@ -264,7 +264,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
client.MakeTargetedRPC(this, (lid) => bgs.protocol.channel.v1.ChannelInvitationListener.CreateStub(client).OnReceivedInvitationRemoved(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
client.MakeTargetedRpc(this, (lid) => bgs.protocol.channel.v1.ChannelInvitationListener.CreateStub(client).OnReceivedInvitationRemoved(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
channel.Join(mem, request.ObjectId); // add invitee to channel -- so inviter and other members will also be notified too.
@ -281,7 +281,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
foreach (var member in channel.Members.Keys)
{
member.MakeTargetedRPC(channel, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(member).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, stateNotification, callback => { }));
member.MakeTargetedRpc(channel, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(member).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, stateNotification, callback => { }));
//member.MakeTargetedRPC(channel, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(member).OnJoin(new HandlerController() { ListenerId = lid }, build, callback => { }));
}
@ -305,7 +305,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
_onGoingInvitations.Remove(invitation.Id);
GoingInvitations.Remove(request.InvitationId);
inviter.LoggedInClient.MakeTargetedRPC(inviter.LoggedInClient.CurrentChannel, (lid) =>
inviter.LoggedInClient.MakeTargetedRpc(inviter.LoggedInClient.CurrentChannel, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(inviter.LoggedInClient).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
}
@ -328,7 +328,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
_onGoingInvitations.Remove(request.InvitationId);
GoingInvitations.Remove(request.InvitationId);
inviter.LoggedInClient.MakeTargetedRPC(inviter.LoggedInClient.CurrentChannel, (lid) =>
inviter.LoggedInClient.MakeTargetedRpc(inviter.LoggedInClient.CurrentChannel, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(client).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, updateChannelNotification.Build(), callback => { }));
//notify invitee about revoke
@ -339,7 +339,7 @@ namespace DiIiS_NA.LoginServer.ChannelSystem
if (Subscribers.All(subscriber => subscriber.Key.Account.GameAccount.BnetEntityId.Low != invitation.InviteeIdentity.AccountId.Low)) return;
client.MakeTargetedRPC(this, (lid) =>
client.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelInvitationListener.CreateStub(client).OnReceivedInvitationRemoved(new HandlerController() { ListenerId = lid }, invitationRemoved.Build(), callback => { }));
}

22
src/DiIiS-NA/BGS-Server/FriendsSystem/FriendManager.cs
View File

@ -67,7 +67,7 @@ namespace DiIiS_NA.LoginServer.FriendsSystem
.SetInvitation(invitation)
.SetAccountId(invitee.BnetEntityId);
invitee.GameAccount.LoggedInClient.MakeTargetedRPC(FriendManager.Instance, (lid) =>
invitee.GameAccount.LoggedInClient.MakeTargetedRpc(FriendManager.Instance, (lid) =>
bgs.protocol.friends.v1.FriendsListener.CreateStub(invitee.GameAccount.LoggedInClient).OnReceivedInvitationAdded(new HandlerController() { ListenerId = lid }, notification.Build(), callback =>
{
}));
@ -89,13 +89,13 @@ namespace DiIiS_NA.LoginServer.FriendsSystem
if (inviter.GameAccount.IsOnline)
{
inviter.GameAccount.LoggedInClient.MakeTargetedRPC(FriendManager.Instance, (lid) =>
inviter.GameAccount.LoggedInClient.MakeTargetedRpc(FriendManager.Instance, (lid) =>
bgs.protocol.friends.v1.FriendsListener.CreateStub(inviter.GameAccount.LoggedInClient).OnReceivedInvitationRemoved(new HandlerController() { ListenerId = lid }, declinedNotification, callback => { }));
}
if (invitee.GameAccount.IsOnline)
{
invitee.GameAccount.LoggedInClient.MakeTargetedRPC(FriendManager.Instance, (lid) =>
invitee.GameAccount.LoggedInClient.MakeTargetedRpc(FriendManager.Instance, (lid) =>
bgs.protocol.friends.v1.FriendsListener.CreateStub(invitee.GameAccount.LoggedInClient).OnReceivedInvitationRemoved(new HandlerController() { ListenerId = lid }, declinedNotification, callback => { }));
}
@ -144,19 +144,19 @@ namespace DiIiS_NA.LoginServer.FriendsSystem
if (inviter.GameAccount.IsOnline)
{
inviter.GameAccount.LoggedInClient.MakeTargetedRPC(FriendManager.Instance, (lid) =>
inviter.GameAccount.LoggedInClient.MakeTargetedRpc(FriendManager.Instance, (lid) =>
bgs.protocol.friends.v1.FriendsListener.CreateStub(inviter.GameAccount.LoggedInClient).OnReceivedInvitationRemoved(new HandlerController() { ListenerId = lid }, notificationToInviter, callback => { }));
inviter.GameAccount.LoggedInClient.MakeTargetedRPC(FriendManager.Instance, (lid) =>
inviter.GameAccount.LoggedInClient.MakeTargetedRpc(FriendManager.Instance, (lid) =>
bgs.protocol.friends.v1.FriendsListener.CreateStub(inviter.GameAccount.LoggedInClient).OnFriendAdded(new HandlerController() { ListenerId = lid }, friendAddedNotificationToInviter, callback => { }));
}
if (invitee.GameAccount.IsOnline)
{
invitee.GameAccount.LoggedInClient.MakeTargetedRPC(FriendManager.Instance, (lid) =>
invitee.GameAccount.LoggedInClient.MakeTargetedRpc(FriendManager.Instance, (lid) =>
bgs.protocol.friends.v1.FriendsListener.CreateStub(invitee.GameAccount.LoggedInClient).OnFriendAdded(new HandlerController() { ListenerId = lid }, friendAddedNotificationToInvitee, callback => { }));
invitee.GameAccount.LoggedInClient.MakeTargetedRPC(FriendManager.Instance, (lid) =>
invitee.GameAccount.LoggedInClient.MakeTargetedRpc(FriendManager.Instance, (lid) =>
bgs.protocol.friends.v1.FriendsListener.CreateStub(invitee.GameAccount.LoggedInClient).OnReceivedInvitationRemoved(new HandlerController() { ListenerId = lid }, notificationToInvitee, callback => { }));
}
@ -177,13 +177,13 @@ namespace DiIiS_NA.LoginServer.FriendsSystem
if (inviter.GameAccount.IsOnline)
{
inviter.GameAccount.LoggedInClient.MakeTargetedRPC(FriendManager.Instance, (lid) =>
inviter.GameAccount.LoggedInClient.MakeTargetedRpc(FriendManager.Instance, (lid) =>
bgs.protocol.friends.v1.FriendsListener.CreateStub(inviter.GameAccount.LoggedInClient).OnReceivedInvitationRemoved(new HandlerController() { ListenerId = lid }, declinedNotification, callback => { }));
}
if (invitee.GameAccount.IsOnline)
{
invitee.GameAccount.LoggedInClient.MakeTargetedRPC(FriendManager.Instance, (lid) =>
invitee.GameAccount.LoggedInClient.MakeTargetedRpc(FriendManager.Instance, (lid) =>
bgs.protocol.friends.v1.FriendsListener.CreateStub(invitee.GameAccount.LoggedInClient).OnReceivedInvitationRemoved(new HandlerController() { ListenerId = lid }, declinedNotification, callback => { }));
}
@ -215,13 +215,13 @@ namespace DiIiS_NA.LoginServer.FriendsSystem
.SetAccountId(remover.BnetEntityId)
.Build();
client.MakeTargetedRPC(FriendManager.Instance, (lid) =>
client.MakeTargetedRpc(FriendManager.Instance, (lid) =>
bgs.protocol.friends.v1.FriendsListener.CreateStub(client).OnFriendRemoved(new HandlerController() { ListenerId = lid }, notifyRemover, callback => { }));
if (removee.GameAccount.IsOnline)
{
var notifyRemovee = bgs.protocol.friends.v1.FriendNotification.CreateBuilder().SetTarget(removerAsFriend).SetAccountId(removee.BnetEntityId).Build();
removee.GameAccount.LoggedInClient.MakeTargetedRPC(FriendManager.Instance, (lid) => bgs.protocol.friends.v1.FriendsListener.CreateStub(removee.GameAccount.LoggedInClient).OnFriendRemoved(new HandlerController() { ListenerId = lid }, notifyRemovee, callback => { }));
removee.GameAccount.LoggedInClient.MakeTargetedRpc(FriendManager.Instance, (lid) => bgs.protocol.friends.v1.FriendsListener.CreateStub(removee.GameAccount.LoggedInClient).OnFriendRemoved(new HandlerController() { ListenerId = lid }, notifyRemovee, callback => { }));
}
}

9
src/DiIiS-NA/BGS-Server/FriendsSystem/UserManager.cs
View File

@ -9,6 +9,7 @@ using DiIiS_NA.LoginServer.Objects;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
@ -38,7 +39,7 @@ namespace DiIiS_NA.LoginServer.FriendsSystem
notifyBlock.SetPlayer(blockedPlayer);
notifyBlock.SetGameAccountId(blocked.BnetEntityId);
client.MakeTargetedRPC(UserManager.Instance, (lid) =>
client.MakeTargetedRpc(UserManager.Instance, (lid) =>
bgs.protocol.user_manager.v1.UserManagerListener.CreateStub(client).OnBlockedPlayerAdded(new HandlerController() { ListenerId = lid }, notifyBlock.Build(), callback => { }));
}
@ -60,13 +61,13 @@ namespace DiIiS_NA.LoginServer.FriendsSystem
var notifyUnblock = bgs.protocol.user_manager.v1.BlockedPlayerRemovedNotification.CreateBuilder();
notifyUnblock.SetPlayer(blockedPlayer);
client.MakeTargetedRPC(UserManager.Instance, (lid) =>
client.MakeTargetedRpc(UserManager.Instance, (lid) =>
bgs.protocol.user_manager.v1.UserManagerListener.CreateStub(client).OnBlockedPlayerRemoved(new HandlerController() { ListenerId = lid }, notifyUnblock.Build(), callback => { }));
}
private static void AddIgnoreToDB(Account owner, Account target)
{
Logger.Trace("AddIgnoreToDB(): owner {0}, target {1}", owner.PersistentID, target.PersistentID);
Logger.MethodTrace($": owner {owner.PersistentID}, target {target.PersistentID}");
try
{
if (DBSessions.SessionQueryWhere<DBAccountLists>(dbl => dbl.ListOwner.Id == owner.PersistentID && dbl.ListTarget.Id == target.PersistentID && dbl.Type == "IGNORE").Count() > 0) return;
@ -87,7 +88,7 @@ namespace DiIiS_NA.LoginServer.FriendsSystem
private static void RemoveIgnoreFromDB(Account owner, Account target)
{
Logger.Trace("RemoveIgnoreFromDB(): owner {0}, target {1}", owner.PersistentID, target.PersistentID);
Logger.MethodTrace($": owner {owner.PersistentID}, target {target.PersistentID}");
try
{
var blockRecords = DBSessions.SessionQueryWhere<DBAccountLists>(dbl => dbl.ListOwner.Id == owner.PersistentID && dbl.ListTarget.Id == target.PersistentID && dbl.Type == "IGNORE");

13
src/DiIiS-NA/BGS-Server/GamesSystem/GameDescriptor.cs
View File

@ -8,6 +8,7 @@ using DiIiS_NA.LoginServer.Helpers;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
@ -74,7 +75,7 @@ namespace DiIiS_NA.LoginServer.GamesSystem
public void StartGame(List<BattleClient> clients, ulong objectId)
{
Logger.Trace("StartGame(): objectId: {0}", objectId);
Logger.MethodTrace($"objectId: {objectId}");
var owner = this.Owner.Account.GameAccount.CurrentToon.DBToon;
if (Program.BattleBackend.GameServers.Count == 0) return;
@ -94,7 +95,7 @@ namespace DiIiS_NA.LoginServer.GamesSystem
foreach (var client in clients)
{
client.MapLocalObjectID(this.DynamicId, objectId);
client.MapLocalObjectId(this.DynamicId, objectId);
this.SendConnectionInfo(client);
client.Account.GameAccount.ScreenStatus = D3.PartyMessage.ScreenStatus.CreateBuilder().SetScreen(0).SetStatus(0).Build();
client.Account.GameAccount.NotifyUpdate();
@ -108,7 +109,7 @@ namespace DiIiS_NA.LoginServer.GamesSystem
{
foreach (var client in clients)
{
client.MapLocalObjectID(this.DynamicId, objectId);
client.MapLocalObjectId(this.DynamicId, objectId);
this.SendConnectionInfo(client);
client.Account.GameAccount.ScreenStatus = D3.PartyMessage.ScreenStatus.CreateBuilder().SetScreen(1).SetStatus(1).Build();
client.Account.GameAccount.NotifyUpdate();
@ -118,7 +119,7 @@ namespace DiIiS_NA.LoginServer.GamesSystem
public bgs.protocol.games.v2.ConnectInfo GetConnectionInfoForClient(BattleClient client)
{
return bgs.protocol.games.v2.ConnectInfo.CreateBuilder()
.SetAddress(bgs.protocol.Address.CreateBuilder().SetAddress_(this.GServer.Value.GameIP).SetPort((uint)this.GServer.Value.GamePort))
.SetAddress(bgs.protocol.Address.CreateBuilder().SetAddress_(this.GServer.Value.GameIp).SetPort((uint)this.GServer.Value.GamePort))
.SetToken(Google.ProtocolBuffers.ByteString.CopyFrom(new byte[] { 0x31, 0x33, 0x38, 0x38, 0x35, 0x34, 0x33, 0x33, 0x32, 0x30, 0x38, 0x34, 0x30, 0x30, 0x38, 0x38, 0x35, 0x37, 0x39, 0x36 }))
.AddAttribute(bgs.protocol.Attribute.CreateBuilder().SetName("Token").SetValue(bgs.protocol.Variant.CreateBuilder().SetUintValue(0xee34d06ffe821c43L)))
@ -145,7 +146,7 @@ namespace DiIiS_NA.LoginServer.GamesSystem
.SetChannelState(channelStatePrivacyLevel)
.Build();
client.MakeTargetedRPC(client.CurrentChannel, (lid) =>
client.MakeTargetedRpc(client.CurrentChannel, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(client).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notificationPrivacyLevel, callback => { }));
@ -165,7 +166,7 @@ namespace DiIiS_NA.LoginServer.GamesSystem
.SetChannelState(channelStatePartyLock)
.Build();
client.MakeTargetedRPC(client.CurrentChannel, (lid) =>
client.MakeTargetedRpc(client.CurrentChannel, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(client).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notificationPartyLock, callback => { }));
}
}

8
src/DiIiS-NA/BGS-Server/GuildSystem/Guild.cs
View File

@ -486,7 +486,7 @@ namespace DiIiS_NA.LoginServer.GuildSystem
.SetTargetAccountId(account.Owner.BnetEntityId)
.Build();
account.LoggedInClient.MakeRPC((lid) =>
account.LoggedInClient.MakeRpc((lid) =>
bgs.protocol.notification.v1.NotificationListener.CreateStub(account.LoggedInClient).OnNotificationReceived(new HandlerController() { ListenerId = lid
}, notificationBuilder, callback => { }));
@ -507,7 +507,7 @@ namespace DiIiS_NA.LoginServer.GuildSystem
.SetTargetAccountId(account.Owner.BnetEntityId)
.Build();
account.LoggedInClient.MakeRPC((lid) =>
account.LoggedInClient.MakeRpc((lid) =>
bgs.protocol.notification.v1.NotificationListener.CreateStub(account.LoggedInClient).OnNotificationReceived(new HandlerController() { ListenerId = lid
}, chatNotificationBuilder, callback => { }));
}
@ -540,7 +540,7 @@ namespace DiIiS_NA.LoginServer.GuildSystem
foreach (var member in this.Channel.Members)
//member.Key.MakeTargetedRPC(this.Channel, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(member.Key).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notification, callback => { }));
member.Key.MakeTargetedRPC(this.Channel, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(member.Key).OnJoin(new HandlerController() { ListenerId = lid }, altnotification, callback => { }));
member.Key.MakeTargetedRpc(this.Channel, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(member.Key).OnJoin(new HandlerController() { ListenerId = lid }, altnotification, callback => { }));
}
public void UpdateMemberAttributes(GameAccount member)
@ -565,7 +565,7 @@ namespace DiIiS_NA.LoginServer.GuildSystem
.Build();
foreach (var mbr in this.Channel.Members)
mbr.Key.MakeTargetedRPC(this.Channel, (lid) =>
mbr.Key.MakeTargetedRpc(this.Channel, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(mbr.Key).OnUpdateMemberState(new HandlerController() { ListenerId = lid }, notification, callback => { }));
}

2
src/DiIiS-NA/BGS-Server/Objects/PresenceField.cs
View File

@ -9,7 +9,7 @@ namespace DiIiS_NA.LoginServer.Objects
{
public class EntityIdPresenceFieldList
{
public List<bgs.protocol.EntityId> Value = new List<bgs.protocol.EntityId>();
public List<bgs.protocol.EntityId> Value = new();
protected FieldKeyHelper.Program _program;
protected FieldKeyHelper.OriginatingClass _originatingClass;

12
src/DiIiS-NA/BGS-Server/Objects/RPCObject.cs
View File

@ -33,7 +33,7 @@ namespace DiIiS_NA.LoginServer.Objects
if (this.Subscribers.ContainsKey(client)) return;
this.Subscribers.TryAdd(client, 0);
client.MapLocalObjectID(this.DynamicId, remoteObjectId);
client.MapLocalObjectId(this.DynamicId, remoteObjectId);
if (client.SocketConnection.Active)
{
@ -56,7 +56,7 @@ namespace DiIiS_NA.LoginServer.Objects
return new List<bgs.protocol.presence.v1.FieldOperation>();
}
public Helpers.FieldKeyHelper ChangedFields = new Helpers.FieldKeyHelper();
public readonly Helpers.FieldKeyHelper ChangedFields = new();
protected void NotifySubscriptionAdded(BattleClient client)
{
@ -96,8 +96,8 @@ namespace DiIiS_NA.LoginServer.Objects
var altnotification = bgs.protocol.channel.v1.JoinNotification.CreateBuilder().SetChannelState(channelState);
if (gameAccount.LoggedInClient != null)
{
gameAccount.LoggedInClient.MakeTargetedRPC(this, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(gameAccount.LoggedInClient).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
gameAccount.LoggedInClient.MakeTargetedRPC(this, (lid) =>
gameAccount.LoggedInClient.MakeTargetedRpc(this, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(gameAccount.LoggedInClient).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
gameAccount.LoggedInClient.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(gameAccount.LoggedInClient).OnJoin(new HandlerController() { ListenerId = lid }, altnotification.Build(), callback => { }));
}
}
@ -110,10 +110,10 @@ namespace DiIiS_NA.LoginServer.Objects
var channelState = bgs.protocol.channel.v1.ChannelState.CreateBuilder().SetExtension(bgs.protocol.presence.v1.ChannelState.Presence, state);
var builder = bgs.protocol.channel.v1.JoinNotification.CreateBuilder().SetChannelState(channelState);
var notification = bgs.protocol.channel.v1.UpdateChannelStateNotification.CreateBuilder().SetStateChange(channelState);
client.MakeTargetedRPC(this, (lid) =>
client.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(client).OnJoin(new HandlerController() { ListenerId = lid }, builder.Build(), callback => { }));
client.MakeTargetedRPC(this, (lid) =>
client.MakeTargetedRpc(this, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(client).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
}

2
src/DiIiS-NA/BGS-Server/Objects/RPCObjectManager.cs
View File

@ -10,7 +10,7 @@ namespace DiIiS_NA.LoginServer.Objects
private static readonly Logger Logger = LogManager.CreateLogger();
private static ulong _nextId = 10000;
public static readonly Dictionary<ulong, RPCObject> Objects = new Dictionary<ulong, RPCObject>();
public static readonly Dictionary<ulong, RPCObject> Objects = new();
static RPCObjectManager()
{ }

6
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/AccountService.cs
View File

@ -20,7 +20,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
GetAccountStateResponse.Builder builder = GetAccountStateResponse.CreateBuilder();
var AccState = AccountState.CreateBuilder();
if (request.EntityId.Low == (controller as HandlerController).Client.Account.BnetEntityId.Low)
if (request.EntityId.Low == ((HandlerController) controller).Client.Account.BnetEntityId.Low)
{
if (request.Options.FieldPrivacyInfo)
{
@ -49,9 +49,9 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
level.SetCountry("RUS");
level.SetPreferredRegion(1);
level.SetFullName("Name LastName");
level.SetBattleTag((controller as HandlerController).Client.Account.BattleTag);
level.SetBattleTag(((HandlerController) controller).Client.Account.BattleTag);
level.SetAccountPaidAny(true);
level.SetEmail((controller as HandlerController).Client.Account.Email).SetHeadlessAccount(false);
level.SetEmail(((HandlerController) controller).Client.Account.Email).SetHeadlessAccount(false);
AccState.SetAccountLevelInfo(level);

38
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/AuthenticationService.cs
View File

@ -88,21 +88,21 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
}
switch (request.Locale)
{
case "deDE": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.deDE; break;
case "enGB": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.enGB; break;
case "enSG": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.enSG; break;
case "enUS": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.enUS; break;
case "esES": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.esES; break;
case "esMX": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.esMX; break;
case "frFR": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.frFR; break;
case "itIT": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.itIT; break;
case "koKR": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.koKR; break;
case "plPL": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.plPL; break;
case "ptBR": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.ptBR; break;
case "ptPT": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.ptPT; break;
case "ruRU": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.ruRU; break;
case "trTR": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.trTR; break;
case "zhCN": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.zhCN; break;
case "deDE": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.DE_DE; break;
case "enGB": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.EN_GB; break;
case "enSG": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.EN_SG; break;
case "enUS": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.EN_US; break;
case "esES": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.ES_ES; break;
case "esMX": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.ES_MX; break;
case "frFR": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.FR_FR; break;
case "itIT": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.IT_IT; break;
case "koKR": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.KO_KR; break;
case "plPL": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.PL_PL; break;
case "ptBR": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.PT_BR; break;
case "ptPT": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.PT_PT; break;
case "ruRU": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.RU_RU; break;
case "trTR": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.TR_TR; break;
case "zhCN": ((HandlerController)controller).Client.ClientLanguage = BattleClient.ClientLocale.ZH_CN; break;
}
done(NoData.CreateBuilder().Build());
var builder = ChallengeExternalRequest.CreateBuilder();
@ -124,7 +124,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
builder.SetPayload(ByteString.CopyFromUtf8(
$"http://{Program.RESTSERVERIP}:{REST.Config.Instance.PORT}/battlenet/login"));
((HandlerController)controller).Client.MakeRPC((lid) => ChallengeListener.CreateStub(((HandlerController)controller).Client).OnExternalChallenge(controller, builder.Build(), callback => { }));
((HandlerController)controller).Client.MakeRpc((lid) => ChallengeListener.CreateStub(((HandlerController)controller).Client).OnExternalChallenge(controller, builder.Build(), callback => { }));
#endregion
}
break;
@ -191,7 +191,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
if (((HandlerController)controller).Client.Account == null)
{
var complete = LogonResult.CreateBuilder().SetErrorCode(2);
((HandlerController)controller).Client.MakeRPC((lid) => AuthenticationListener.CreateStub(((HandlerController)controller).Client).OnLogonComplete(controller, complete.Build(), callback => { }));
((HandlerController)controller).Client.MakeRpc((lid) => AuthenticationListener.CreateStub(((HandlerController)controller).Client).OnLogonComplete(controller, complete.Build(), callback => { }));
((HandlerController)controller).Client.SocketConnection.CloseAsync();
((HandlerController)controller).Client.Connect.CloseAsync();
}
@ -210,12 +210,12 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
.SetErrorCode(0)
.AddGameAccountId(((HandlerController)controller).Client.Account.GameAccount.BnetEntityId); //D3
((HandlerController)controller).Client.Account.GameAccount.LoggedInClient = ((HandlerController)controller).Client;
((HandlerController)controller).Client.MakeRPC((lid) => AuthenticationListener.CreateStub(((HandlerController)controller).Client).OnLogonComplete(controller, complete.Build(), callback => { }));
((HandlerController)controller).Client.MakeRpc((lid) => AuthenticationListener.CreateStub(((HandlerController)controller).Client).OnLogonComplete(controller, complete.Build(), callback => { }));
PlayerManager.PlayerConnected(((HandlerController)controller).Client);
var selectedGameAccount = GameAccountSelectedRequest.CreateBuilder().SetResult(0).SetGameAccountId(((HandlerController)controller).Client.Account.GameAccount.BnetEntityId);
((HandlerController)controller).Client.MakeRPC((lid) =>
((HandlerController)controller).Client.MakeRpc((lid) =>
AuthenticationListener.CreateStub(((HandlerController)controller).Client).OnGameAccountSelected(new HandlerController() { ListenerId = lid }, selectedGameAccount.Build(), callback => { }));
}
#endregion

30
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelInvitationService.cs
View File

@ -19,9 +19,9 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void Subscribe(Google.ProtocolBuffers.IRpcController controller, SubscribeRequest request, Action<NoData> done)
{
Logger.Trace("Subscribe() {0}", ((controller as HandlerController).Client));
Logger.Trace("Subscribe() {0}", (((HandlerController) controller).Client));
_invitationManager.AddSubscriber(((controller as HandlerController).Client), request.ObjectId);
_invitationManager.AddSubscriber((((HandlerController) controller).Client), request.ObjectId);
done(NoData.DefaultInstance);
}
@ -32,7 +32,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var response = AcceptInvitationResponse.CreateBuilder().SetObjectId(channel.DynamicId).Build();
done(response);
_invitationManager.HandleAccept(((controller as HandlerController).Client), request);
_invitationManager.HandleAccept((((HandlerController) controller).Client), request);
}
public override void DeclineInvitation(Google.ProtocolBuffers.IRpcController controller, DeclineInvitationRequest request, Action<NoData> done)
@ -40,7 +40,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var respone = NoData.CreateBuilder();
done(respone.Build());
_invitationManager.HandleDecline(((controller as HandlerController).Client), request);
_invitationManager.HandleDecline((((HandlerController) controller).Client), request);
}
public override void RevokeInvitation(Google.ProtocolBuffers.IRpcController controller, RevokeInvitationRequest request, Action<NoData> done)
@ -48,16 +48,16 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var builder = NoData.CreateBuilder();
done(builder.Build());
_invitationManager.Revoke(((controller as HandlerController).Client), request);
_invitationManager.Revoke((((HandlerController) controller).Client), request);
}
public override void SendInvitation(Google.ProtocolBuffers.IRpcController controller, SendInvitationRequest request, Action<NoData> done)
{
var invitee = GameAccountManager.GetAccountByPersistentID(request.TargetId.Low);
if (invitee.Owner.IgnoreIds.Contains((controller as HandlerController).Client.Account.PersistentID))
if (invitee.Owner.IgnoreIds.Contains(((HandlerController) controller).Client.Account.PersistentID))
{
((controller as HandlerController).Status) = 403;
(((HandlerController) controller).Status) = 403;
done(NoData.CreateBuilder().Build());
return;
}
@ -82,8 +82,8 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var invitation = Invitation.CreateBuilder();
invitation.SetId(ChannelInvitationManager.InvitationIdCounter++)
.SetInviterIdentity(Identity.CreateBuilder().SetGameAccountId((controller as HandlerController).Client.Account.GameAccount.BnetEntityId).Build())
.SetInviterName((controller as HandlerController).Client.Account.GameAccount.Owner.BattleTag)
.SetInviterIdentity(Identity.CreateBuilder().SetGameAccountId(((HandlerController) controller).Client.Account.GameAccount.BnetEntityId).Build())
.SetInviterName(((HandlerController) controller).Client.Account.GameAccount.Owner.BattleTag)
.SetInviteeIdentity(Identity.CreateBuilder().SetGameAccountId(request.TargetId).Build())
.SetInviteeName(invitee.Owner.BattleTag)
.SetInvitationMessage(request.Params.InvitationMessage)
@ -101,12 +101,12 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var builder = JoinNotification.CreateBuilder().SetChannelState(ChannelState.CreateBuilder().AddInvitation(invitation.Clone()));
(controller as HandlerController).Client.MakeTargetedRPC(channel, (lid) => ChannelListener.CreateStub((controller as HandlerController).Client)
((HandlerController) controller).Client.MakeTargetedRpc(channel, (lid) => ChannelListener.CreateStub(((HandlerController) controller).Client)
.OnUpdateChannelState(controller, notification.Build(), callback => { }));
(controller as HandlerController).Client.MakeTargetedRPC(channel, (lid) =>
ChannelListener.CreateStub((controller as HandlerController).Client).OnJoin(new HandlerController() { ListenerId = lid }, builder.Build(), callback => { }));
((HandlerController) controller).Client.MakeTargetedRpc(channel, (lid) =>
ChannelListener.CreateStub(((HandlerController) controller).Client).OnJoin(new HandlerController() { ListenerId = lid }, builder.Build(), callback => { }));
_invitationManager.HandleInvitation((controller as HandlerController).Client, invitation.Build());
_invitationManager.HandleInvitation(((HandlerController) controller).Client, invitation.Build());
}
@ -118,7 +118,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
if (suggestee.Owner.IgnoreIds.Contains(suggester.Owner.PersistentID))
{
((controller as HandlerController).Status) = 403;
(((HandlerController) controller).Status) = 403;
done(NoData.CreateBuilder().Build());
return;
}
@ -137,7 +137,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var notification = SuggestionAddedNotification.CreateBuilder().SetSuggestion(suggestion);
suggestee.LoggedInClient.MakeTargetedRPC(_invitationManager, (lid) =>
suggestee.LoggedInClient.MakeTargetedRpc(_invitationManager, (lid) =>
ChannelInvitationListener.CreateStub(suggestee.LoggedInClient).OnReceivedSuggestionAdded(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
}

18
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelOwnerService.cs
View File

@ -16,15 +16,15 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void CreateChannel(IRpcController controller, CreateChannelRequest request, Action<CreateChannelResponse> done)
{
var channel = ChannelManager.CreateNewChannel(((controller as HandlerController).Client), request.ObjectId);
var channel = ChannelManager.CreateNewChannel((((HandlerController) controller).Client), request.ObjectId);
var builder = CreateChannelResponse.CreateBuilder()
.SetObjectId(channel.DynamicId)
.SetChannelId(channel.BnetEntityId)
;
done(builder.Build());
channel.SetOwner(((controller as HandlerController).Client));
channel.AddMember(((controller as HandlerController).Client));
channel.SetOwner((((HandlerController) controller).Client));
channel.AddMember((((HandlerController) controller).Client));
}
public override void ListChannels(IRpcController controller, ListChannelsRequest request, Action<ListChannelsResponse> done)
@ -34,7 +34,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
foreach (Channel channel in chatChannels)
{
if (!channel.HasUser(((controller as HandlerController).Client)) && (request.Options.HasName ? request.Options.Name == channel.Name : true) && channel.MaxMembers > channel.Members.Count)
if (!channel.HasUser((((HandlerController) controller).Client)) && (request.Options.HasName ? request.Options.Name == channel.Name : true) && channel.MaxMembers > channel.Members.Count)
builder.AddChannel(ChannelDescription.CreateBuilder().SetCurrentMembers((uint)channel.Members.Count)
.SetChannelId(bgs.protocol.EntityId.CreateBuilder().SetHigh(channel.BnetEntityId.High).SetLow(channel.BnetEntityId.Low))
.SetState(channel.State));
@ -59,10 +59,10 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
{
var channel = ChannelManager.GetChannelByEntityId(request.ChannelId);
channel.Join(((controller as HandlerController).Client), request.ObjectId);
var builder = JoinChannelResponse.CreateBuilder().SetObjectId(channel.DynamicId).SetMemberId((controller as HandlerController).Client.Account.BnetEntityId);
channel.Join((((HandlerController) controller).Client), request.ObjectId);
var builder = JoinChannelResponse.CreateBuilder().SetObjectId(channel.DynamicId).SetMemberId(((HandlerController) controller).Client.Account.BnetEntityId);
((controller as HandlerController).Client).ChatChannels.Add(channel);
(((HandlerController) controller).Client).ChatChannels.Add(channel);
done(builder.Build());
}
@ -77,8 +77,8 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
builder.SetObjectId(channel.DynamicId);
done(builder.Build());
((controller as HandlerController).Client).ChatChannels.Add(channel);
channel.Join(((controller as HandlerController).Client), request.ObjectId);
(((HandlerController) controller).Client).ChatChannels.Add(channel);
channel.Join((((HandlerController) controller).Client), request.ObjectId);
}
}

57
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelService.cs
View File

@ -10,6 +10,7 @@ using DiIiS_NA.LoginServer.ChannelSystem;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
@ -28,8 +29,8 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void RemoveMember(Google.ProtocolBuffers.IRpcController controller, bgs.protocol.channel.v1.RemoveMemberRequest request, Action<bgs.protocol.NoData> done)
{
Logger.Trace("RemoveMember()");
var channel = ChannelManager.GetChannelByDynamicId(((controller as HandlerController).LastCallHeader).ObjectId);
Logger.MethodTrace("");
var channel = ChannelManager.GetChannelByDynamicId((((HandlerController) controller).LastCallHeader).ObjectId);
var gameAccount = GameAccountManager.GetAccountByPersistentID(request.MemberId.Low);
var builder = bgs.protocol.NoData.CreateBuilder();
@ -38,17 +39,17 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
channel.RemoveMember(gameAccount.LoggedInClient, Channel.GetRemoveReasonForRequest((Channel.RemoveRequestReason)request.Reason));
if (request.Reason == 0)
{
ulong invId = ChannelInvitationManager.FindInvAsForClient((controller as HandlerController).Client);
ulong invId = ChannelInvitationManager.FindInvAsForClient(((HandlerController) controller).Client);
if (invId != UInt64.MaxValue)
ChannelInvitationManager.AltConnectToJoin((controller as HandlerController).Client, bgs.protocol.channel.v1.AcceptInvitationRequest.CreateBuilder().SetInvitationId(invId).SetObjectId(0).Build());
//ServicesSystem.Services.ChannelInvitationService.CreateStub((controller as HandlerController).Client).AcceptInvitation(controller, bgs.protocol.channel.v1.AcceptInvitationRequest.CreateBuilder().SetInvitationId(invId).SetObjectId(0).Build(), callback => { });
ChannelInvitationManager.AltConnectToJoin(((HandlerController) controller).Client, bgs.protocol.channel.v1.AcceptInvitationRequest.CreateBuilder().SetInvitationId(invId).SetObjectId(0).Build());
//ServicesSystem.Services.ChannelInvitationService.CreateStub(((HandlerController) controller).Client).AcceptInvitation(controller, bgs.protocol.channel.v1.AcceptInvitationRequest.CreateBuilder().SetInvitationId(invId).SetObjectId(0).Build(), callback => { });
}
}
public override void SendMessage(Google.ProtocolBuffers.IRpcController controller, bgs.protocol.channel.v1.SendMessageRequest request, Action<bgs.protocol.NoData> done)
{
var channel = ChannelManager.GetChannelByDynamicId(((controller as HandlerController).LastCallHeader).ObjectId);
//Logger.Trace("{0} sent a message to channel {1}.", ((controller as HandlerController).Client).Account.GameAccount.CurrentToon, channel);
var channel = ChannelManager.GetChannelByDynamicId((((HandlerController) controller).LastCallHeader).ObjectId);
//Logger.Trace("{0} sent a message to channel {1}.", (((HandlerController) controller).Client).Account.GameAccount.CurrentToon, channel);
var builder = bgs.protocol.NoData.CreateBuilder();
done(builder.Build());
@ -59,10 +60,10 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
if (request.Message.AttributeCount == 0 || !request.Message.AttributeList.First().HasValue)
return; // check if it has attributes.
var parsedAsCommand = CommandManager.TryParse(request.Message.AttributeList[0].Value.StringValue, ((controller as HandlerController).Client)); // try parsing the message as a command
var parsedAsCommand = CommandManager.TryParse(request.Message.AttributeList[0].Value.StringValue, (((HandlerController) controller).Client)); // try parsing the message as a command
if (!parsedAsCommand)
channel.SendMessage(((controller as HandlerController).Client), request.Message); // if it's not parsed as an command - let channel itself to broadcast message to it's members.
channel.SendMessage((((HandlerController) controller).Client), request.Message); // if it's not parsed as an command - let channel itself to broadcast message to it's members.
}
public override void UpdateChannelState(Google.ProtocolBuffers.IRpcController controller, bgs.protocol.channel.v1.UpdateChannelStateRequest request, Action<bgs.protocol.NoData> done)
@ -75,9 +76,9 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
ServicesSystem.Services.ChannelInvitationService.CreateStub(this.LoggedInClient).AcceptInvitation(null, request.Build(), callback => { });
}
//*/
Channel channel = ChannelManager.GetChannelByDynamicId(((controller as HandlerController).LastCallHeader).ObjectId);
Channel channel = ChannelManager.GetChannelByDynamicId((((HandlerController) controller).LastCallHeader).ObjectId);
Logger.Debug("UpdateChannelState(): {0}", request.ToString());
Logger.MethodTrace(request.ToString());
foreach (bgs.protocol.Attribute attribute in request.StateChange.AttributeList)
{
@ -88,7 +89,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameCreateParams = D3.OnlineService.GameCreateParams.ParseFrom(attribute.Value.MessageValue);
Logger.Debug("D3.Party.GameCreateParams: {0}", gameCreateParams.ToString());
//D3.OnlineService.EntityId hero = gameCreateParams.Coop.ResumeFromSaveHeroId;
bool clear_quests = ((controller as HandlerController).Client.GameChannel != null && gameCreateParams.CampaignOrAdventureMode.QuestStepId == -1 &&
bool clear_quests = (((HandlerController) controller).Client.GameChannel != null && gameCreateParams.CampaignOrAdventureMode.QuestStepId == -1 &&
(gameCreateParams.CampaignOrAdventureMode.SnoQuest == 87700 ||
gameCreateParams.CampaignOrAdventureMode.SnoQuest == 80322 ||
gameCreateParams.CampaignOrAdventureMode.SnoQuest == 93595 ||
@ -97,9 +98,9 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var paramsBuilder = D3.OnlineService.GameCreateParams.CreateBuilder(gameCreateParams);
var Mode = D3.OnlineService.CampaignOrAdventureModeCreateParams.CreateBuilder(gameCreateParams.CampaignOrAdventureMode);
lock ((controller as HandlerController).Client.Account.GameAccount.CurrentToon.DBToon)
lock (((HandlerController) controller).Client.Account.GameAccount.CurrentToon.DBToon)
{
DBToon toonByClient = ((controller as HandlerController).Client).Account.GameAccount.CurrentToon.DBToon;
DBToon toonByClient = (((HandlerController) controller).Client).Account.GameAccount.CurrentToon.DBToon;
if(toonByClient.CurrentAct == 400)
toonByClient.CurrentAct = gameCreateParams.CampaignOrAdventureMode.Act;
if (!clear_quests)
@ -128,7 +129,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
//paramsBuilder.ClearCoop();
//paramsBuilder.SetPvp(D3.OnlineService.PvPCreateParams.CreateBuilder().SetSnoWorld(79100));
/*var toon = ((controller as HandlerController).Client).Account.GameAccount.CurrentToon.DBToon;
/*var toon = (((HandlerController) controller).Client).Account.GameAccount.CurrentToon.DBToon;
paramsBuilder.SetCoop(D3.OnlineService.CoopCreateParams.CreateBuilder()
.SetDifficultyLevel(toon.CurrentDifficulty)
.SetAct(toon.CurrentAct)
@ -151,8 +152,8 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
else
{
var gameCreateParamsBuilder = D3.OnlineService.GameCreateParams.CreateBuilder();
var toon = ((controller as HandlerController).Client).Account.GameAccount.CurrentToon;
var dbToon = ((controller as HandlerController).Client).Account.GameAccount.CurrentToon.DBToon;
var toon = (((HandlerController) controller).Client).Account.GameAccount.CurrentToon;
var dbToon = (((HandlerController) controller).Client).Account.GameAccount.CurrentToon.DBToon;
gameCreateParamsBuilder.SetGameType(1);
gameCreateParamsBuilder.SetCreationFlags(0);
gameCreateParamsBuilder.SetCampaignOrAdventureMode(D3.OnlineService.CampaignOrAdventureModeCreateParams.CreateBuilder()
@ -197,7 +198,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
else
{
var oldScreen = D3.PartyMessage.ScreenStatus.ParseFrom(attribute.Value.MessageValue);
((controller as HandlerController).Client).Account.GameAccount.ScreenStatus = oldScreen;
(((HandlerController) controller).Client).Account.GameAccount.ScreenStatus = oldScreen;
// TODO: save screen status for use with friends -Egris
var attr = bgs.protocol.Attribute.CreateBuilder()
@ -313,7 +314,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
}
else
{
Logger.Debug("UpdateChannelState(): Unknown attribute: {0}", attribute.Name);
Logger.MethodTrace($"Unknown attribute: {attribute.Name}");
}
}
@ -324,13 +325,13 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
done(builder.Build());
var notification = bgs.protocol.channel.v1.UpdateChannelStateNotification.CreateBuilder()
.SetAgentId(((controller as HandlerController).Client).Account.GameAccount.BnetEntityId)
.SetAgentId((((HandlerController) controller).Client).Account.GameAccount.BnetEntityId)
/*
.SetChannelId(bgs.protocol.channel.v1.ChannelId.CreateBuilder().SetId((uint)channel.BnetEntityId.Low))
.SetSubscriber(bgs.protocol.account.v1.Identity.CreateBuilder()
.SetAccount(bgs.protocol.account.v1.AccountId.CreateBuilder().SetId((uint)((controller as HandlerController).Client).Account.BnetEntityId.Low))
.SetAccount(bgs.protocol.account.v1.AccountId.CreateBuilder().SetId((uint)(((HandlerController) controller).Client).Account.BnetEntityId.Low))
.SetGameAccount(bgs.protocol.account.v1.GameAccountHandle.CreateBuilder()
.SetId((uint)((controller as HandlerController).Client).Account.GameAccount.BnetEntityId.Low)
.SetId((uint)(((HandlerController) controller).Client).Account.GameAccount.BnetEntityId.Low)
.SetProgram(17459)
.SetRegion(1))
.SetProcess(bgs.protocol.ProcessId.CreateBuilder().SetLabel(0).SetEpoch(DateTime.Today.ToUnixTime())))
@ -340,18 +341,18 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var altnotif = bgs.protocol.channel.v1.JoinNotification.CreateBuilder().SetChannelState(channel.State).Build();
var client = (controller as HandlerController).Client;
var client = ((HandlerController) controller).Client;
//Notify all Channel members
foreach (var member in channel.Members.Keys)
{
member.MakeTargetedRPC(channel, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(member).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notification, callback => { }));
member.MakeTargetedRpc(channel, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub(member).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notification, callback => { }));
}
}
public override void UpdateMemberState(Google.ProtocolBuffers.IRpcController controller, bgs.protocol.channel.v1.UpdateMemberStateRequest request, Action<bgs.protocol.NoData> done)
{
var channel = ChannelManager.GetChannelByDynamicId(((controller as HandlerController).LastCallHeader).ObjectId);
var channel = ChannelManager.GetChannelByDynamicId((((HandlerController) controller).LastCallHeader).ObjectId);
var builder = bgs.protocol.NoData.CreateBuilder();
done(builder.Build());
@ -372,7 +373,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
else
{
Logger.Trace("D3.PartyMember.GameId = null");
channel.RemoveMember((controller as HandlerController).Client, Channel.GetRemoveReasonForRequest((Channel.RemoveRequestReason)2));
channel.RemoveMember(((HandlerController) controller).Client, Channel.GetRemoveReasonForRequest((Channel.RemoveRequestReason)2));
}
}
@ -384,7 +385,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
channelMember.SetState(state);
var notification = bgs.protocol.channel.v1.UpdateMemberStateNotification.CreateBuilder()
.SetAgentId(((controller as HandlerController).Client).Account.GameAccount.BnetEntityId)
.SetAgentId((((HandlerController) controller).Client).Account.GameAccount.BnetEntityId)
.AddStateChange(channelMember)
.Build();
@ -400,7 +401,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
//Notify all Channel members
foreach (var member in channel.Members.Keys)
{
member.MakeTargetedRPC(channel, (lid) =>
member.MakeTargetedRpc(channel, (lid) =>
bgs.protocol.channel.v1.ChannelListener.CreateStub(member).OnUpdateMemberState(new HandlerController() { ListenerId = lid }, notification, callback => { }));
}
//*/

68
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ConnectionSerivce.cs
View File

@ -28,29 +28,29 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
if (request.HasUseBindlessRpc)
builder.SetUseBindlessRpc(true);
(controller as HandlerController).Client.Services.Add(0x54DFDA17, 0x01);
(controller as HandlerController).Client.Services.Add(0xD4DCD093, 0x02);
(controller as HandlerController).Client.Services.Add(0x71240E35, 0x03);
(controller as HandlerController).Client.Services.Add(0xBBDA171F, 0x04);
(controller as HandlerController).Client.Services.Add(0xF084FC20, 0x05);
(controller as HandlerController).Client.Services.Add(0xBF8C8094, 0x06);
(controller as HandlerController).Client.Services.Add(0x166FE4A1, 0x07);
(controller as HandlerController).Client.Services.Add(0xB96F5297, 0x08);
(controller as HandlerController).Client.Services.Add(0x6F259A13, 0x09);
(controller as HandlerController).Client.Services.Add(0xE1CB2EA8, 0x0A);
(controller as HandlerController).Client.Services.Add(0xBC872C22, 0x0B);
(controller as HandlerController).Client.Services.Add(0x7FE36B32, 0x0C);
(controller as HandlerController).Client.Services.Add(233634817, 0x0D);
(controller as HandlerController).Client.Services.Add(0x62DA0891, 0x0E); //AccountService
(controller as HandlerController).Client.Services.Add(510168069, 0x0F);
(controller as HandlerController).Client.Services.Add(0x45E59C4D, 0x10);
(controller as HandlerController).Client.Services.Add(0x135185EF, 0x11);
(controller as HandlerController).Client.Services.Add(1910276758, 0x51);
//(controller as HandlerController).Client.Services.Add(2495170438, 0x25);
(controller as HandlerController).Client.Services.Add(2119327385, 0x26);
((HandlerController) controller).Client.Services.Add(0x54DFDA17, 0x01);
((HandlerController) controller).Client.Services.Add(0xD4DCD093, 0x02);
((HandlerController) controller).Client.Services.Add(0x71240E35, 0x03);
((HandlerController) controller).Client.Services.Add(0xBBDA171F, 0x04);
((HandlerController) controller).Client.Services.Add(0xF084FC20, 0x05);
((HandlerController) controller).Client.Services.Add(0xBF8C8094, 0x06);
((HandlerController) controller).Client.Services.Add(0x166FE4A1, 0x07);
((HandlerController) controller).Client.Services.Add(0xB96F5297, 0x08);
((HandlerController) controller).Client.Services.Add(0x6F259A13, 0x09);
((HandlerController) controller).Client.Services.Add(0xE1CB2EA8, 0x0A);
((HandlerController) controller).Client.Services.Add(0xBC872C22, 0x0B);
((HandlerController) controller).Client.Services.Add(0x7FE36B32, 0x0C);
((HandlerController) controller).Client.Services.Add(233634817, 0x0D);
((HandlerController) controller).Client.Services.Add(0x62DA0891, 0x0E); //AccountService
((HandlerController) controller).Client.Services.Add(510168069, 0x0F);
((HandlerController) controller).Client.Services.Add(0x45E59C4D, 0x10);
((HandlerController) controller).Client.Services.Add(0x135185EF, 0x11);
((HandlerController) controller).Client.Services.Add(1910276758, 0x51);
//((HandlerController) controller).Client.Services.Add(2495170438, 0x25);
((HandlerController) controller).Client.Services.Add(2119327385, 0x26);
done(builder.Build());
Logger.Info("Connect with Blizzless established. Client - {0}", (controller as HandlerController).Client.SocketConnection.RemoteAddress);
Logger.Info("Connect with Blizzless established. Client - {0}", ((HandlerController) controller).Client.SocketConnection.RemoteAddress);
}
public override void Echo(IRpcController controller, EchoRequest request, Action<EchoResponse> done)
@ -74,22 +74,22 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void RequestDisconnect(IRpcController controller, DisconnectRequest request, Action<NO_RESPONSE> done)
{
Logger.Info("Client - {0} , disconnected", (controller as HandlerController).Client.SocketConnection.RemoteAddress);
DisconnectClient(controller as HandlerController);
if ((controller as HandlerController).Client.Account != null)
(controller as HandlerController).Client.Account.GameAccount.IsLoggedIn = false;
((controller as HandlerController).Client).Connect.CloseAsync();
(controller as HandlerController).Client.SocketConnection.CloseAsync();
Logger.Info("Client - {0} , disconnected", ((HandlerController) controller).Client.SocketConnection.RemoteAddress);
DisconnectClient((HandlerController) controller);
if (((HandlerController) controller).Client.Account != null)
((HandlerController) controller).Client.Account.GameAccount.IsLoggedIn = false;
(((HandlerController) controller).Client).Connect.CloseAsync();
((HandlerController) controller).Client.SocketConnection.CloseAsync();
/*
if ((controller as HandlerController).Client.Account != null)
if (((HandlerController) controller).Client.Account != null)
{
(controller as HandlerController).Client.Account.CurrentGameAccount.Logined = false;
AccountManager.SaveToDB((controller as HandlerController).Client.Account);
if ((controller as HandlerController).Client.Account.CurrentGameAccount != null)
((HandlerController) controller).Client.Account.CurrentGameAccount.Logined = false;
AccountManager.SaveToDB(((HandlerController) controller).Client.Account);
if (((HandlerController) controller).Client.Account.CurrentGameAccount != null)
{
GameAccountManager.SaveToDB((controller as HandlerController).Client.Account.CurrentGameAccount);
(controller as HandlerController).Client.SocketConnection.CloseAsync();
(controller as HandlerController).Client.Connect.CloseAsync();
GameAccountManager.SaveToDB(((HandlerController) controller).Client.Account.CurrentGameAccount);
((HandlerController) controller).Client.SocketConnection.CloseAsync();
((HandlerController) controller).Client.Connect.CloseAsync();
}
}
//*/

71
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/FriendService.cs
View File

@ -9,6 +9,7 @@ using DiIiS_NA.LoginServer.Helpers;
using Google.ProtocolBuffers;
using System;
using System.Collections.Generic;
using System.Reflection;
namespace DiIiS_NA.LoginServer.ServicesSystem.Services
{
@ -19,10 +20,10 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void Subscribe(IRpcController controller, SubscribeRequest request, Action<SubscribeResponse> done)
{
Logger.Trace("Subscribe() {0}", ((controller as HandlerController).Client));
Logger.Trace("Subscribe() {0}", (((HandlerController) controller).Client));
FriendManager.Instance.AddSubscriber(((controller as HandlerController).Client), request.ObjectId);
FriendManager.Instance.AddSubscriber((((HandlerController) controller).Client), request.ObjectId);
var builder = SubscribeResponse.CreateBuilder()
.SetMaxFriends(127)
@ -31,7 +32,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
.AddRole(Role.CreateBuilder().SetId(1).SetName("battle_tag_friend").Build())
.AddRole(Role.CreateBuilder().SetId(2).SetName("real_id_friend").Build());
var friendsIDs = ((controller as HandlerController).Client).Account.FriendsIds;
var friendsIDs = (((HandlerController) controller).Client).Account.FriendsIds;
foreach (var dbidFriend in friendsIDs) // send friends list.
{
var resp = Friend.CreateBuilder()
@ -46,7 +47,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
foreach (var invitation in FriendManager.OnGoingInvitations.Values)
{
if (invitation.InviteeIdentity.AccountId == ((controller as HandlerController).Client).Account.BnetEntityId && !friendsIDs.Contains(invitation.InviterIdentity.AccountId.Low))
if (invitation.InviteeIdentity.AccountId == (((HandlerController) controller).Client).Account.BnetEntityId && !friendsIDs.Contains(invitation.InviterIdentity.AccountId.Low))
{
invitations.Add(invitation);
}
@ -64,16 +65,16 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var response = NoData.CreateBuilder();
if (friendRequest.TargetEmail.ToLower() == ((controller as HandlerController).Client).Account.Email.ToLower())
if (friendRequest.TargetEmail.ToLower() == (((HandlerController) controller).Client).Account.Email.ToLower())
{
((controller as HandlerController).Status) = 317202;
(((HandlerController) controller).Status) = 317202;
done(response.Build());
return;
}
if (friendRequest.TargetBattleTag == ((controller as HandlerController).Client).Account.BattleTag)
if (friendRequest.TargetBattleTag == (((HandlerController) controller).Client).Account.BattleTag)
{
((controller as HandlerController).Status) = 317202;
(((HandlerController) controller).Status) = 317202;
done(response.Build());
return;
}
@ -90,44 +91,44 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
if (invitee == null)
{
if (friendRequest.HasTargetEmail)
((controller as HandlerController).Status) = 4;
(((HandlerController) controller).Status) = 4;
else
((controller as HandlerController).Status) = 317203;
(((HandlerController) controller).Status) = 317203;
done(response.Build());
return;
}
else if (FriendManager.AreFriends(((controller as HandlerController).Client).Account, invitee))
else if (FriendManager.AreFriends((((HandlerController) controller).Client).Account, invitee))
{
if (friendRequest.HasTargetEmail)
((controller as HandlerController).Status) = 317201;
(((HandlerController) controller).Status) = 317201;
else
((controller as HandlerController).Status) = 5003;
(((HandlerController) controller).Status) = 5003;
done(response.Build());
return;
}
else if (FriendManager.InvitationExists(((controller as HandlerController).Client).Account, invitee))
else if (FriendManager.InvitationExists((((HandlerController) controller).Client).Account, invitee))
{
if (friendRequest.HasTargetEmail)
((controller as HandlerController).Status) = 317200;
(((HandlerController) controller).Status) = 317200;
else
((controller as HandlerController).Status) = 5005;
(((HandlerController) controller).Status) = 5005;
done(response.Build());
return;
}
else if (invitee.IgnoreIds.Contains((controller as HandlerController).Client.Account.PersistentID))
else if (invitee.IgnoreIds.Contains(((HandlerController) controller).Client.Account.PersistentID))
{
((controller as HandlerController).Status) = 5006;
(((HandlerController) controller).Status) = 5006;
done(response.Build());
return;
}
Logger.Trace("{0} sent {1} friend invitation.", ((controller as HandlerController).Client).Account, invitee);
Logger.Trace("{0} sent {1} friend invitation.", (((HandlerController) controller).Client).Account, invitee);
var invitation = ReceivedInvitation.CreateBuilder()
.SetId(FriendManager.InvitationIdCounter++) // we may actually need to store invitation ids in database with the actual invitation there. /raist.
.SetInviterIdentity(Identity.CreateBuilder().SetAccountId(((controller as HandlerController).Client).Account.BnetEntityId))
.SetInviterIdentity(Identity.CreateBuilder().SetAccountId((((HandlerController) controller).Client).Account.BnetEntityId))
.SetInviteeIdentity(Identity.CreateBuilder().SetAccountId(invitee.BnetEntityId))
.SetInviterName(((controller as HandlerController).Client).Account.BattleTagName)
.SetInviterName((((HandlerController) controller).Client).Account.BattleTagName)
.SetInviteeName(invitee.BattleTagName)
.SetCreationTime(DateTime.Now.ToUnixTime())
.SetUnknownFields(UnknownFieldSet.CreateBuilder()
@ -138,19 +139,19 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
done(response.Build());
// notify the invitee on invitation.
FriendManager.HandleInvitation(((controller as HandlerController).Client), invitation.Build());
FriendManager.HandleInvitation((((HandlerController) controller).Client), invitation.Build());
FriendManager.Instance.NotifyUpdate();
(controller as HandlerController).Client.Account.NotifyUpdate();
(controller as HandlerController).Client.Account.GameAccount.NotifyUpdate();
((HandlerController) controller).Client.Account.NotifyUpdate();
((HandlerController) controller).Client.Account.GameAccount.NotifyUpdate();
}
public override void AcceptInvitation(IRpcController controller, AcceptInvitationRequest request, Action<NoData> done)
{
Logger.Trace("{0} accepted friend invitation.", ((controller as HandlerController).Client).Account);
Logger.Trace("{0} accepted friend invitation.", (((HandlerController) controller).Client).Account);
var response = NoData.CreateBuilder();
done(response.Build());
FriendManager.HandleAccept(((controller as HandlerController).Client), request);
FriendManager.HandleAccept((((HandlerController) controller).Client), request);
}
public override void RevokeInvitation(IRpcController controller, RevokeInvitationRequest request, Action<NoData> done)
{
@ -158,12 +159,12 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
}
public override void DeclineInvitation(IRpcController controller, DeclineInvitationRequest request, Action<NoData> done)
{
Logger.Trace("{0} declined friend invitation.", ((controller as HandlerController).Client).Account);
Logger.Trace("{0} declined friend invitation.", (((HandlerController) controller).Client).Account);
var response = NoData.CreateBuilder();
done(response.Build());
FriendManager.HandleDecline(((controller as HandlerController).Client), request);
FriendManager.HandleDecline((((HandlerController) controller).Client), request);
}
public override void IgnoreInvitation(IRpcController controller, IgnoreInvitationRequest request, Action<NoData> done)
{
@ -172,25 +173,25 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var response = NoData.CreateBuilder();
done(response.Build());
FriendManager.HandleIgnore(((controller as HandlerController).Client), request);
FriendManager.HandleIgnore((((HandlerController) controller).Client), request);
}
public override void RemoveFriend(IRpcController controller, RemoveFriendRequest request, Action<NoData> done)
{
Logger.Trace("{0} removed friend with id {1}.", ((controller as HandlerController).Client).Account, request.TargetId);
Logger.Trace("{0} removed friend with id {1}.", (((HandlerController) controller).Client).Account, request.TargetId);
done(NoData.DefaultInstance);
FriendManager.HandleRemove(((controller as HandlerController).Client), request);
FriendManager.HandleRemove((((HandlerController) controller).Client), request);
FriendManager.Instance.NotifyUpdate();
(controller as HandlerController).Client.Account.NotifyUpdate();
(controller as HandlerController).Client.Account.GameAccount.NotifyUpdate();
((HandlerController) controller).Client.Account.NotifyUpdate();
((HandlerController) controller).Client.Account.GameAccount.NotifyUpdate();
}
public override void ViewFriends(IRpcController controller, ViewFriendsRequest request, Action<ViewFriendsResponse> done)
{
Logger.Trace("ViewFriends(): {0}.", request.ToString());
Logger.MethodTrace(request.ToString());
var builder = ViewFriendsResponse.CreateBuilder();
var friendsIDs = AccountManager.GetAccountByPersistentID(request.TargetId.Low).FriendsIds;
@ -209,7 +210,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
}
public override void UpdateFriendState(IRpcController controller, UpdateFriendStateRequest request, Action<NoData> done)
{
Logger.Trace("UpdateFriendState(): {0}.", request.ToString());
Logger.MethodTrace(request.ToString());
done(NoData.CreateBuilder().Build());
}

10
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameRequestService.cs
View File

@ -72,7 +72,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
QueueEntryNotification.Builder qen = QueueEntryNotification.CreateBuilder();
qen.SetRequestId(id).SetWaitTimes(timers).AddMember(member).SetRequestInitiator(member);
((HandlerController) controller).Client.MakeRPC((lid) => GameRequestListener.CreateStub(((HandlerController) controller).Client).OnQueueEntry(new HandlerController() { ListenerId = lid }, qen.Build(), callback => { }));
((HandlerController) controller).Client.MakeRpc((lid) => GameRequestListener.CreateStub(((HandlerController) controller).Client).OnQueueEntry(new HandlerController() { ListenerId = lid }, qen.Build(), callback => { }));
#endregion
#region Update Queue
@ -80,7 +80,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
qun.SetRequestId(id)
.SetWaitTimes(timers)
.SetIsMatchmaking(true);
((HandlerController) controller).Client.MakeRPC((lid) => GameRequestListener.CreateStub(((HandlerController) controller).Client).OnQueueUpdate(new HandlerController() { ListenerId = lid }, qun.Build(), callback => { }));
((HandlerController) controller).Client.MakeRpc((lid) => GameRequestListener.CreateStub(((HandlerController) controller).Client).OnQueueUpdate(new HandlerController() { ListenerId = lid }, qun.Build(), callback => { }));
#endregion
@ -124,7 +124,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var joinNotification = bgs.protocol.channel.v1.JoinNotification.CreateBuilder().SetChannelState(channelStatePermission).Build();
(((HandlerController) controller).Client).MakeTargetedRPC((((HandlerController) controller).Client).CurrentChannel, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub((((HandlerController) controller).Client)).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notificationPermission, callback => { }));
(((HandlerController) controller).Client).MakeTargetedRpc((((HandlerController) controller).Client).CurrentChannel, (lid) => bgs.protocol.channel.v1.ChannelListener.CreateStub((((HandlerController) controller).Client)).OnUpdateChannelState(new HandlerController() { ListenerId = lid }, notificationPermission, callback => { }));
}
gameFound.StartGame(clients, gameFound.DynamicId);
@ -137,7 +137,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
.SetValue(Variant.CreateBuilder().SetUintValue(gameFound.RequestId).Build());
notificationFound.AddAttribute(attrF);
(((HandlerController) controller).Client).MakeRPC((lid) =>
(((HandlerController) controller).Client).MakeRpc((lid) =>
bgs.protocol.notification.v1.NotificationListener.CreateStub((((HandlerController) controller).Client)).OnNotificationReceived(new HandlerController() { ListenerId = lid }, notificationFound.Build(), callback => { }));
@ -152,7 +152,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
notification.SetGameHandle(gh);
System.Threading.Tasks.Task.Delay(2000).ContinueWith(delegate {
((HandlerController) controller).Client.MakeRPC((lid) => GameRequestListener.CreateStub(((HandlerController) controller).Client).OnMatchmakingResult(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
((HandlerController) controller).Client.MakeRpc((lid) => GameRequestListener.CreateStub(((HandlerController) controller).Client).OnMatchmakingResult(new HandlerController() { ListenerId = lid }, notification.Build(), callback => { }));
});
}
}

17
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameUtilitiesService.cs
View File

@ -21,6 +21,7 @@ using Google.ProtocolBuffers;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
namespace DiIiS_NA.LoginServer.ServicesSystem.Services
{
@ -196,7 +197,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
builder.AddAttribute(messageId);
builder.AddAttribute(payload);
Client.MakeRPC((lid) =>
Client.MakeRpc((lid) =>
NotificationListener.CreateStub(Client)
.OnNotificationReceived(new HandlerController() { ListenerId = lid }, builder.Build(),
callback => { }));
@ -1184,7 +1185,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private ByteString SearchGuilds(BattleClient client, ByteString data)
{
GuildSearch request = GuildSearch.ParseFrom(data);
Logger.Debug("GuildSearch(): {0}", request.ToString());
Logger.MethodTrace(request.ToString());
var builder = D3.Guild.GuildSearchResultList.CreateBuilder();
List<Guild> allGuilds = request.ClanOrGroup == 1 ? GuildManager.GetCommunities() : GuildManager.GetClans();
@ -1260,7 +1261,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private void GuildKickMemberP(BattleClient client, GuildKickMember request)
{
Logger.Debug("GuildKickMember(): {0}", request.ToString());
Logger.MethodTrace(request.ToString());
var guild = GuildManager.GetGuildById(request.GuildId);
if (guild != null && client.Account.GameAccount.PersistentID == guild.Owner.PersistentID)
@ -1272,7 +1273,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private void GuildDisband(BattleClient client, GuildId request)
{
Logger.Debug("GuildDisband(): {0}", request.ToString());
Logger.MethodTrace(request.ToString());
var guild = GuildManager.GetGuildById(request.GuildId_);
if (guild != null && client.Account.GameAccount.PersistentID == guild.Owner.PersistentID)
@ -1288,7 +1289,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private ByteString GuildFetchNews(BattleClient client, GuildFetchNews request)
{
Logger.Debug("GuildFetchNews(): {0}", request.ToString());
Logger.MethodTrace(request.ToString());
var builder = D3.Guild.NewsList.CreateBuilder();
/* news types:
@ -1325,7 +1326,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private ByteString GuildPromoteMember(BattleClient client, GuildPromoteMember request)
{
Logger.Debug("GuildPromoteMember(): {0}", request.ToString());
Logger.MethodTrace(request.ToString());
var guild = GuildManager.GetGuildById(request.GuildId);
var account = GameAccountManager.GetAccountByPersistentID(request.MemberId);
@ -1346,7 +1347,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private ByteString GuildDemoteMember(BattleClient client, GuildDemoteMember request)
{
Logger.Debug("GuildDemoteMember(): {0}", request.ToString());
Logger.MethodTrace(request.ToString());
var guild = GuildManager.GetGuildById(request.GuildId);
var account = GameAccountManager.GetAccountByPersistentID(request.MemberId);
@ -1510,7 +1511,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private ByteString CreateCommunity(BattleClient client, ByteString data)
{
var request = GroupCreate.ParseFrom(data);
Logger.Debug("CreateCommunity(): {0}", request.ToString());
Logger.MethodTrace(request.ToString());
var guild = GuildManager.CreateNewGuild(client.Account.GameAccount, request.Name, "", false,
request.SearchCategory, false, request.Language);

12
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/NotificationService.cs
View File

@ -29,20 +29,20 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
case NotificationTypeHelper.NotificationType.Whisper:
var targetAccount = GameAccountManager.GetAccountByPersistentID(request.TargetId.Low);
Logger.Trace(string.Format("NotificationRequest.Whisper by {0} to {1}", (controller as HandlerController).Client.Account.GameAccount, targetAccount));
Logger.Trace(string.Format("NotificationRequest.Whisper by {0} to {1}", ((HandlerController) controller).Client.Account.GameAccount, targetAccount));
if (targetAccount.LoggedInClient == null) return;
if (targetAccount == (controller as HandlerController).Client.Account.GameAccount)
CommandManager.TryParse(request.AttributeList[0].Value.StringValue, (controller as HandlerController).Client); // try parsing it as a command and respond it if so.
if (targetAccount == ((HandlerController) controller).Client.Account.GameAccount)
CommandManager.TryParse(request.AttributeList[0].Value.StringValue, ((HandlerController) controller).Client); // try parsing it as a command and respond it if so.
else
{
var notification = Notification.CreateBuilder(request)
.SetSenderId((controller as HandlerController).Client.Account.GameAccount.BnetEntityId)
.SetSenderAccountId((controller as HandlerController).Client.Account.BnetEntityId)
.SetSenderId(((HandlerController) controller).Client.Account.GameAccount.BnetEntityId)
.SetSenderAccountId(((HandlerController) controller).Client.Account.BnetEntityId)
.Build();
targetAccount.LoggedInClient.MakeRPC((lid) =>
targetAccount.LoggedInClient.MakeRpc((lid) =>
NotificationListener.CreateStub(targetAccount.LoggedInClient).OnNotificationReceived(controller, notification, callback => { }));
}
break;

30
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/PresenceService.cs
View File

@ -1,5 +1,6 @@
//Blizzless Project 2022
using System;
using System.Reflection;
using Google.ProtocolBuffers;
using bgs.protocol;
using bgs.protocol.presence.v1;
@ -34,7 +35,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var account = AccountManager.GetAccountByPersistentID(req.Low);
if (account != null)
{
Logger.MethodTrace("Subscribe() {0} {1}", (((HandlerController)controller).Client), account);
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {account}");
account.AddSubscriber((((HandlerController)controller).Client), request.ObjectId);
response.AddSubscribeFailed(SubscribeResult.CreateBuilder().SetEntityId(req)
.SetResult(0));
@ -46,8 +47,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = GameAccountManager.GetAccountByPersistentID(req.Low);
if (gameAccount != null)
{
Logger.MethodTrace("Subscribe() {0} {1}", (((HandlerController)controller).Client),
gameAccount);
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {gameAccount}");
gameAccount.AddSubscriber((((HandlerController)controller).Client), request.ObjectId);
response.AddSubscribeFailed(SubscribeResult.CreateBuilder().SetEntityId(req)
.SetResult(0));
@ -83,9 +83,8 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = AccountManager.GetAccountByPersistentID(request.EntityId.Low);
foreach (var key in request.KeyList)
{
Logger.Debug("Query() {0} {1} - {2}, {3}, {4}", (((HandlerController)controller).Client),
gameAccount, (FieldKeyHelper.Program)key.Program, (FieldKeyHelper.OriginatingClass)key.Group,
key.Field);
Logger.MethodTrace(
$"{(((HandlerController)controller).Client)} {gameAccount} - {(FieldKeyHelper.Program)key.Program}, {(FieldKeyHelper.OriginatingClass)key.Group}, {key.Field}");
var field = gameAccount.QueryField(key);
if (field != null) builder.AddField(field);
}
@ -97,9 +96,8 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = GameAccountManager.GetAccountByPersistentID(request.EntityId.Low);
foreach (var key in request.KeyList)
{
Logger.Debug("Query() {0} {1} - {2}, {3}, {4}", (((HandlerController)controller).Client),
gameAccount, (FieldKeyHelper.Program)key.Program,
(FieldKeyHelper.OriginatingClass)key.Group, key.Field);
Logger.MethodTrace(
$"{(((HandlerController)controller).Client)} {gameAccount} - {(FieldKeyHelper.Program)key.Program}, {(FieldKeyHelper.OriginatingClass)key.Group}, {key.Field}");
var field = gameAccount.QueryField(key);
if (field != null) builder.AddField(field);
}
@ -124,7 +122,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = AccountManager.GetAccountByPersistentID(request.EntityId.Low);
if (gameAccount != null)
{
Logger.MethodTrace("Subscribe() {0} {1}", (((HandlerController)controller).Client), gameAccount);
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {gameAccount}");
gameAccount.AddSubscriber((((HandlerController)controller).Client), request.ObjectId);
}
}
@ -134,7 +132,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameaccount = GameAccountManager.GetAccountByPersistentID(request.EntityId.Low);
if (gameaccount != null)
{
Logger.MethodTrace("Subscribe() {0} {1}", (((HandlerController)controller).Client), gameaccount);
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {gameaccount}");
gameaccount.AddSubscriber((((HandlerController)controller).Client), request.ObjectId);
}
}
@ -161,7 +159,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
if (gameAccount != null)
{
gameAccount.RemoveSubscriber((((HandlerController) controller).Client));
Logger.MethodTrace("Unsubscribe() {0} {1}", (((HandlerController) controller).Client), gameAccount);
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {gameAccount}");
}
}
break;
@ -170,8 +168,8 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = GameAccountManager.GetAccountByPersistentID(request.EntityId.Low);
if (gameAccount != null)
{
gameAccount.RemoveSubscriber((((HandlerController) controller).Client));
Logger.MethodTrace("Unsubscribe() {0} {1}", (((HandlerController) controller).Client), gameAccount);
gameAccount.RemoveSubscriber((((HandlerController)controller).Client));
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {gameAccount}");
}
}
break;
@ -196,7 +194,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
if (request.EntityId.Low <= 0) break;
var gameAccount = AccountManager.GetAccountByPersistentID(request.EntityId.Low);
if (gameAccount == null) break;
var traceData = $"Update() {(((HandlerController)controller).Client)} {gameAccount} - {request.FieldOperationCount} Operations";
var traceData = $"{(((HandlerController)controller).Client)} {gameAccount} - {request.FieldOperationCount} Operations";
foreach (var fieldOp in request.FieldOperationList)
{
traceData += $"\t{(FieldKeyHelper.Program)fieldOp.Field.Key.Program}, {(FieldKeyHelper.OriginatingClass)fieldOp.Field.Key.Group}, {fieldOp.Field.Key.Field}";
@ -212,7 +210,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = GameAccountManager.GetAccountByPersistentID(request.EntityId.Low);
if (gameAccount == null) break;
var traceData =
$"Update() {(((HandlerController) controller).Client)} {gameAccount} - {request.FieldOperationCount} Operations";
$"{(((HandlerController) controller).Client)} {gameAccount} - {request.FieldOperationCount} Operations";
foreach (var fieldOp in request.FieldOperationList)
{
traceData +=

5
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ResourceService.cs
View File

@ -1,5 +1,6 @@
//Blizzless Project 2022
using System;
using System.Reflection;
using bgs.protocol;
using bgs.protocol.resources.v1;
using DiIiS_NA.Core.Extensions;
@ -19,7 +20,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void GetContentHandle(IRpcController controller, ContentHandleRequest request, Action<ContentHandle> done)
{
Logger.Trace("GetContentHandle(): ProgramId: 0x{0:X8} StreamId: 0x{1:X8}", request.Program, request.Stream);
Logger.MethodTrace($"ProgramId: 0x{request.Program:X8} StreamId: 0x{request.Stream:X8}");
if (request.Program == (uint)FieldKeyHelper.Program.BNet)
{
var builder = ContentHandle.CreateBuilder()
@ -54,7 +55,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
default:
Logger.Warn("Unknown StreamId: 0x{0:X8}", request.Stream);
builder.SetHash(ByteString.Empty);
(controller as HandlerController).Status = 4;
((HandlerController) controller).Status = 4;
break;
}
done(builder.Build());

18
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/SessionService.cs
View File

@ -1,5 +1,6 @@
//Blizzless Project 2022
using System;
using System.Reflection;
using bgs.protocol;
using bgs.protocol.session.v1;
using DiIiS_NA.Core.Helpers.Math;
@ -27,7 +28,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
n.SetIdentity(request.Identity)
.SetReason(0)
.SetSessionId(session);
((HandlerController) controller).Client.MakeRPC((lid) => SessionListener.CreateStub(((HandlerController) controller).Client).OnSessionCreated(controller, n.Build(), callback => { }));
((HandlerController) controller).Client.MakeRpc((lid) => SessionListener.CreateStub(((HandlerController) controller).Client).OnSessionCreated(controller, n.Build(), callback => { }));
}
private void DisconnectClient(HandlerController controller)
@ -38,13 +39,16 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void DestroySession(IRpcController controller, DestroySessionRequest request, Action<NoData> done)
{
Logger.MethodTrace(nameof(SessionService));
Logger.MethodTrace("");
Logger.Trace("Destroying game session for client {0}", ((HandlerController) controller).Client);
DisconnectClient((HandlerController) controller);
if (((HandlerController) controller).Client.Account != null)
((HandlerController) controller).Client.Account.GameAccount.IsLoggedIn = false;
(((HandlerController) controller).Client).Connect.CloseAsync();
((HandlerController) controller).Client.SocketConnection.CloseAsync();
if (controller is HandlerController handlerController)
{
DisconnectClient(handlerController);
if (handlerController.Client.Account != null)
handlerController.Client.Account.GameAccount.IsLoggedIn = false;
(handlerController.Client).Connect.CloseAsync();
handlerController.Client.SocketConnection.CloseAsync();
}
done(NoData.CreateBuilder().Build());
}

17
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/UserManagerService.cs
View File

@ -8,6 +8,7 @@ using DiIiS_NA.LoginServer.FriendsSystem;
using DiIiS_NA.LoginServer.Helpers;
using Google.ProtocolBuffers;
using System;
using System.Reflection;
namespace DiIiS_NA.LoginServer.ServicesSystem.Services
{
@ -18,13 +19,13 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void Subscribe(IRpcController controller, SubscribeRequest request, Action<SubscribeResponse> done)
{
Logger.MethodTrace("Subscribe({0})", ((controller as HandlerController).Client));
Logger.MethodTrace((((HandlerController) controller).Client).ToString());
UserManager.Instance.AddSubscriber(((controller as HandlerController).Client), request.ObjectId);
UserManager.Instance.AddSubscriber((((HandlerController) controller).Client), request.ObjectId);
var builder = SubscribeResponse.CreateBuilder();
var blockedIds = (controller as HandlerController).Client.Account.IgnoreIds;
var blockedIds = ((HandlerController) controller).Client.Account.IgnoreIds;
foreach (var blocked in blockedIds)
{
@ -41,7 +42,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void AddRecentPlayers(IRpcController controller, AddRecentPlayersRequest request, Action<NoData> done)
{
Logger.MethodTrace("AddRecentPlayers()");
Logger.MethodTrace("");
done(NoData.DefaultInstance);
}
@ -52,18 +53,18 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void BlockPlayer(IRpcController controller, BlockPlayerRequest request, Action<NoData> done)
{
Logger.MethodTrace("BlockEntity()");
Logger.MethodTrace("");
done(NoData.CreateBuilder().Build());
UserManager.BlockAccount(((controller as HandlerController).Client), request);
UserManager.BlockAccount((((HandlerController) controller).Client), request);
}
public override void UnblockPlayer(IRpcController controller, UnblockPlayerRequest request, Action<NoData> done)
{
Logger.MethodTrace("UnblockPlayer()");
Logger.MethodTrace("");
done(NoData.CreateBuilder().Build());
UserManager.UnblockAccount(((controller as HandlerController).Client), request);
UserManager.UnblockAccount((((HandlerController) controller).Client), request);
}
public override void BlockPlayerForSession(IRpcController controller, BlockPlayerRequest request, Action<NoData> done)

2
src/DiIiS-NA/Core/Helpers/Math/RandomHelper.cs
View File

@ -74,7 +74,6 @@ public static class RandomHelper
public class ItemRandomHelper
{
private static readonly Logger Logger = LogManager.CreateLogger("RH");
uint a;
uint b;
public ItemRandomHelper(int seed)
@ -94,7 +93,6 @@ public class ItemRandomHelper
a = (uint)temp;
b = (uint)(temp >> 32);
//Logger.Debug("Next(): a {0}, b {1}", a, b);
return a;
}

14
src/DiIiS-NA/Core/Logging/AnsiTarget.cs
View File

@ -57,8 +57,14 @@ public class AnsiTarget : LogTarget
CancellationTokenSource.Cancel();
}
public static string Filter(string text)
/// <summary>
/// Logging keywords to beautify the output.
/// It's ugly, I know.
/// Changes are welcome - @iamdroppy
/// </summary>
/// <param name="text">Text to "beautify"</param>
/// <returns>Replaced with color changes</returns>
public static string Beautify(string text)
{
return text
.Replace("Blizzless", "[dodgerblue1]Blizz[/][deepskyblue2]less[/]", StringComparison.CurrentCultureIgnoreCase)
@ -81,7 +87,7 @@ public class AnsiTarget : LogTarget
/// </summary>
/// <param name="x"></param>
/// <returns></returns>
string Cleanup(string x) => Filter(x.Replace("[", "[[").Replace("]", "]]").Replace("$[[/]]$", "[/]").Replace("$[[", "[").Replace("]]$", "]"));
string Cleanup(string x) => Beautify(x.Replace("[", "[[").Replace("]", "]]").Replace("$[[/]]$", "[/]").Replace("$[[", "[").Replace("]]$", "]"));
public override void LogMessage(Logger.Level level, string logger, string message)
{
@ -128,7 +134,7 @@ public class AnsiTarget : LogTarget
Logger.Level.RenameAccountLog => new Style(Color.DarkSlateGray3),//
Logger.Level.ChatMessage => new Style(Color.DarkSlateGray2),//
Logger.Level.Debug => new Style(Color.Olive),//
Logger.Level.MethodTrace => new Style(Color.Purple),//
Logger.Level.MethodTrace => new Style(Color.DarkOliveGreen1_1),//
Logger.Level.Trace => new Style(Color.BlueViolet),//
Logger.Level.Info => new Style(Color.White),
Logger.Level.Success => new Style(Color.Green3_1),

2
src/DiIiS-NA/Core/Logging/ConsoleTarget.cs
View File

@ -52,7 +52,7 @@ namespace DiIiS_NA.Core.Logging
/// </summary>
/// <param name="x"></param>
/// <returns></returns>
string Cleanup(string x) => AnsiTarget.Filter(x.Replace("[", "[[").Replace("]", "]]").Replace("$[[/]]$", "[/]").Replace("$[[", "[").Replace("]]$", "]"));
string Cleanup(string x) => AnsiTarget.Beautify(x.Replace("[", "[[").Replace("]", "]]").Replace("$[[/]]$", "[/]").Replace("$[[", "[").Replace("]]$", "]"));
/// <param name="level"></param>
private static string SetColor(Logger.Level level, bool withBackground = false)

8
src/DiIiS-NA/Core/Logging/Logger.cs
View File

@ -1,6 +1,8 @@
//Blizzless Project 2022
using System;
using System.Globalization;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Text;
using DiIiS_NA.Core.Extensions;
using DiIiS_NA.GameServer.MessageSystem;
@ -100,11 +102,7 @@ namespace DiIiS_NA.Core.Logging
public void Trace(string message, params object[] args) => Log(Level.Trace, message, args);
/// <param name="message">The log message.</param>
public void MethodTrace(string message) => Log(Level.MethodTrace, message, null);
/// <param name="message">The log message.</param>
/// <param name="args">Additional arguments.</param>
public void MethodTrace(string message, params object[] args) => Log(Level.MethodTrace, message, args);
public void MethodTrace(string message, [CallerMemberName] string methodName = "") => Log(Level.MethodTrace, $"$[olive]${methodName}()$[/]$: " + message, null);
/// <param name="message">The log message.</param>
public void Debug(string message) => Log(Level.Debug, message, null);

28
src/DiIiS-NA/D3-GameServer/AchievementSystem/AchievementManager.cs
View File

@ -11,6 +11,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
@ -174,9 +175,9 @@ namespace DiIiS_NA.GameServer.AchievementSystem
{
Task.Run(() =>
{
lock (client._serviceLock)
lock (client.ServiceLock)
{
Logger.Trace("GrantAchievement(): id {0}", achievementId);
Logger.MethodTrace($"id {achievementId}");
if (client.Account.GameAccount.Achievements.Where(a => a.AchievementId == achievementId && a.Completion != -1).Count() > 0) return;
DBAchievements achievement = null;
var achs = DBSessions.SessionQueryWhere<DBAchievements>(dbi =>
@ -239,9 +240,9 @@ namespace DiIiS_NA.GameServer.AchievementSystem
{
Task.Run(() =>
{
lock (client._serviceLock)
lock (client.ServiceLock)
{
Logger.Trace("GrantCriteria(): id {0}", criteriaId);
Logger.MethodTrace($"id {criteriaId}");
D3.AchievementsStaticData.StaticCriteriaDefinition definition = null;
uint UCriteriaId = (uint)criteriaId;
@ -261,7 +262,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
var achievement = new DBAchievements();
if (achs.Count == 0)
{
Logger.Trace("GrantCriteria(): creating new ach data");
Logger.MethodTrace("creating new ach data");
achievement.DBGameAccount = client.Account.GameAccount.DBGameAccount;
achievement.AchievementId = definition.ParentAchievementId;
achievement.IsHardcore = IsHardcore(definition.ParentAchievementId);
@ -270,7 +271,8 @@ namespace DiIiS_NA.GameServer.AchievementSystem
List<uint> crits = new List<uint>();
crits.Add(UCriteriaId);
achievement.Criteria = SerializeBytes(crits);
Logger.Trace("GrantCriteria(): {0} - {1} - {2} - {3}", client.Account.GameAccount.PersistentID, definition.ParentAchievementId, achievement.CompleteTime, UCriteriaId);
Logger.MethodTrace(
$"{client.Account.GameAccount.PersistentID} - {definition.ParentAchievementId} - {achievement.CompleteTime} - {UCriteriaId}");
DBSessions.SessionSave(achievement);
}
else
@ -278,7 +280,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
achievement = achs.First();
if (!UnserializeBytes(achievement.Criteria).Contains(UCriteriaId))
{
Logger.Trace("GrantCriteria(): editing ach data, id: {0}", achievement.Id);
Logger.MethodTrace($"editing ach data, id: {achievement.Id}");
List<uint> crits = UnserializeBytes(achievement.Criteria);
crits.Add(UCriteriaId);
achievement.Criteria = SerializeBytes(crits);
@ -287,7 +289,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
else return;
}
Logger.Trace("GrantCriteria(): ach data updated");
Logger.MethodTrace("achievement data updated");
var record = D3.Achievements.CriteriaUpdateRecord.CreateBuilder()
.SetCriteriaId32AndFlags8(UCriteriaId)
@ -340,7 +342,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
{
achievement = achs.First();
Logger.Trace("GrantCriteria(): editing ach data, id: {0}", achievement.Id);
Logger.MethodTrace($"editing ach data, id: {achievement.Id}");
List<uint> crits = UnserializeBytes(achievement.Criteria);
crits.Add(UCriteriaId);
achievement.Criteria = SerializeBytes(crits);
@ -374,10 +376,10 @@ namespace DiIiS_NA.GameServer.AchievementSystem
{
Task.Run(() =>
{
lock (client._serviceLock)
lock (client.ServiceLock)
{
if (additionalQuantity == 0) return;
Logger.Debug("UpdateQuantity(): id {0}", achievementId);
Logger.MethodTrace($"id {achievementId}");
if (client.Account.GameAccount.Achievements.Where(a => a.AchievementId == achievementId && a.Completion != -1).Count() > 0) return;
ulong mainCriteriaId = GetMainCriteria(achievementId);
@ -410,7 +412,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
var achievement = new DBAchievements();
if (achs.Count == 0)
{
Logger.Debug("UpdateQuantity(): creating new ach data");
Logger.MethodTrace("creating new ach data");
achievement.DBGameAccount = client.Account.GameAccount.DBGameAccount;
achievement.AchievementId = achievementId;
achievement.IsHardcore = IsHardcore(achievementId);
@ -423,7 +425,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
else
{
achievement = achs.First();
Logger.Trace("UpdateQuantity(): editing ach data, id: {0}", achievement.Id);
Logger.MethodTrace($"editing ach data, id: {achievement.Id}");
achievement.Quantity = (int)newQuantity;
DBSessions.SessionUpdate(achievement);
}

24
src/DiIiS-NA/D3-GameServer/CommandManager/CommandGroup.cs
View File

@ -11,7 +11,7 @@ namespace DiIiS_NA.GameServer.CommandManager
{
public class CommandGroup
{
private static readonly Logger Logger = LogManager.CreateLogger("CM");
private static readonly Logger Logger = LogManager.CreateLogger("CmdGrp");
public CommandGroupAttribute Attributes { get; private set; }
@ -37,7 +37,7 @@ namespace DiIiS_NA.GameServer.CommandManager
if (!_commands.ContainsKey(attribute))
_commands.Add(attribute, method);
else
Logger.Error("Command '{0}' already exists.", attribute.Name);
Logger.Fatal("Command '$[underline white]${0}$[/]$' already exists.", attribute.Name);
}
}
@ -62,8 +62,11 @@ namespace DiIiS_NA.GameServer.CommandManager
// check if the user has enough privileges to access command group.
// check if the user has enough privileges to invoke the command.
if (invokerClient != null && Attributes.MinUserLevel > invokerClient.Account.UserLevel)
#if DEBUG
return $"You don't have enough privileges to invoke that command (Min. level: {Attributes.MinUserLevel}).";
#else
return "You don't have enough privileges to invoke that command.";
#endif
string[] @params = null;
CommandAttribute target = null;
@ -80,7 +83,11 @@ namespace DiIiS_NA.GameServer.CommandManager
// check if the user has enough privileges to invoke the command.
if (invokerClient != null && target.MinUserLevel > invokerClient.Account.UserLevel)
#if DEBUG
return $"You don't have enough privileges to invoke that command (Min. level: {Attributes.MinUserLevel}).";
#else
return "You don't have enough privileges to invoke that command.";
#endif
return (string)_commands[target].Invoke(this, new object[] { @params, invokerClient });
}
@ -99,13 +106,10 @@ namespace DiIiS_NA.GameServer.CommandManager
[DefaultCommand]
public virtual string Fallback(string[] @params = null, BattleClient invokerClient = null)
{
var output = "Available subcommands: ";
foreach (var pair in _commands)
{
if (pair.Key.Name.Trim() == string.Empty) continue; // skip fallback command.
if (invokerClient != null && pair.Key.MinUserLevel > invokerClient.Account.UserLevel) continue;
output += pair.Key.Name + ", ";
}
var output = _commands
.Where(pair => pair.Key.Name.Trim() != string.Empty)
.Where(pair => invokerClient == null || pair.Key.MinUserLevel <= invokerClient.Account.UserLevel)
.Aggregate("Available subcommands: ", (current, pair) => current + (pair.Key.Name + ", "));
return output.Substring(0, output.Length - 2) + ".";
}

35
src/DiIiS-NA/D3-GameServer/CommandManager/CommandManager.cs
View File

@ -11,7 +11,7 @@ namespace DiIiS_NA.GameServer.CommandManager
{
public static class CommandManager
{
private static readonly Logger Logger = LogManager.CreateLogger("CM");
private static readonly Logger Logger = LogManager.CreateLogger("CmdMan");
private static readonly Dictionary<CommandGroupAttribute, CommandGroup> CommandGroups = new Dictionary<CommandGroupAttribute, CommandGroup>();
static CommandManager()
@ -150,21 +150,12 @@ namespace DiIiS_NA.GameServer.CommandManager
public override string Fallback(string[] parameters = null, BattleClient invokerClient = null)
{
var output = "Available commands: ";
if (invokerClient != null)
{
foreach (var pair in CommandGroups.Where(pair =>
pair.Key.MinUserLevel > invokerClient?.Account.UserLevel))
{
output += "!" + pair.Key.Name + ": " + pair.Key.Help + "\n\n";
}
}
else
{
foreach (var pair in CommandGroups)
{
output += "!" + pair.Key.Name + ": " + pair.Key.Help + "\n\n";
}
}
output =
invokerClient != null
? CommandGroups.Where(pair => pair.Key.MinUserLevel > invokerClient?.Account.UserLevel)
.Aggregate(output, (current, pair) => current + ($"{Config.Instance.CommandPrefix}{pair.Key.Name}: {pair.Key.Help}\n\n"))
: CommandGroups
.Aggregate(output, (current, pair) => current + (($"$[underline green]${Config.Instance.CommandPrefix}{pair.Key.Name}$[/]$: {pair.Key.Help}\n\n")));
return output + "Type 'help <command>' to get help about a specific command.";
}
@ -173,10 +164,7 @@ namespace DiIiS_NA.GameServer.CommandManager
[CommandGroup("help", "usage: help <command>\nType 'commands' to get a list of available commands.")]
public class HelpCommandGroup : CommandGroup
{
public override string Fallback(string[] parameters = null, BattleClient invokerClient = null)
{
return "usage: help <command>\nType 'commands' to get a list of available commands.";
}
public override string Fallback(string[] parameters = null, BattleClient invokerClient = null) => "usage: help <command>\nType 'commands' to get a list of available commands.";
public override string Handle(string parameters, BattleClient invokerClient = null)
{
@ -189,11 +177,8 @@ namespace DiIiS_NA.GameServer.CommandManager
var group = @params[0];
var command = @params.Count() > 1 ? @params[1] : string.Empty;
foreach (var pair in CommandGroups)
foreach (var pair in CommandGroups.Where(pair => group == pair.Key.Name))
{
if (group != pair.Key.Name)
continue;
if (command == string.Empty)
return pair.Key.Help;
@ -202,7 +187,7 @@ namespace DiIiS_NA.GameServer.CommandManager
}
if (!found)
output = string.Format("Unknown command: {0} {1}", group, command);
output = $"Unknown command: {group} {command}";
return output;
}

2056
src/DiIiS-NA/D3-GameServer/CommandManager/GameCommands.cs
View File

File diff suppressed because it is too large Load Diff

6
src/DiIiS-NA/D3-GameServer/Core/InventoryGrid.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using DiIiS_NA.Core.Logging;
using DiIiS_NA.GameServer.MessageSystem;
using DiIiS_NA.GameServer.GSSystem.ActorSystem;
@ -12,7 +13,7 @@ namespace DiIiS_NA.GameServer.Core
{
public class InventoryGrid : IRevealable
{
static readonly Logger Logger = LogManager.CreateLogger("IG");
static readonly Logger Logger = LogManager.CreateLogger(nameof(InventoryGrid));
public int EquipmentSlot { get; private set; }
public int Rows { get { return _backpack.GetLength(0); } }
@ -74,7 +75,6 @@ namespace DiIiS_NA.GameServer.Core
}
return new InventorySize() { Width = 1, Height = 1 };
}
@ -167,7 +167,7 @@ namespace DiIiS_NA.GameServer.Core
foreach (var itm in baseItems)
have += itm.Attributes[GameAttribute.ItemStackQuantityLo];
Logger.Trace("HaveEnough(): gbid {0}, count {1}", GBid, have);
Logger.MethodTrace($"gbid {GBid}, count {have}");
return (have >= count);
}

2
src/DiIiS-NA/D3-GameServer/GSSystem/AISystem/Brains/MinionBrain.cs
View File

@ -213,7 +213,7 @@ namespace DiIiS_NA.GameServer.GSSystem.AISystem.Brains
{
if (PresetPowers.ContainsKey(powerSNO))
{
// Logger.Debug("AddPresetPower(): power sno {0} already defined for monster \"{1}\"",
// Logger.MethodTrace("power sno {0} already defined for monster \"{1}\"",
//powerSNO, this.Body.ActorSNO.Name);
return;
}

2
src/DiIiS-NA/D3-GameServer/GSSystem/AISystem/Brains/MonsterBrain.cs
View File

@ -455,7 +455,7 @@ namespace DiIiS_NA.GameServer.GSSystem.AISystem.Brains
if (PresetPowers.ContainsKey(powerSNO))
{
Logger.Debug($"Monster $[red]$\"{Body.Name}\"$[/]$ already has power {powerSNO}.");
// Logger.Debug("AddPresetPower(): power sno {0} already defined for monster \"{1}\"",
// Logger.MethodTrace("power sno {0} already defined for monster \"{1}\"",
//powerSNO, this.Body.ActorSNO.Name);
return;
}

2
src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/Actor.cs
View File

@ -118,7 +118,7 @@ namespace DiIiS_NA.GameServer.GSSystem.ActorSystem
/// <summary>
/// Attribute map.
/// </summary>
public GameAttributeMap Attributes { get; set; } //TODO: this needs to be "private set", but without errors on speed modifications
public GameAttributeMap Attributes { get; }
/// <summary>
/// Affix list.

2
src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/Implementations/ScriptObjects/actIIIBridgeLever.cs
View File

@ -41,7 +41,7 @@ namespace DiIiS_NA.GameServer.GSSystem.ActorSystem.Implementations.ScriptObjects
{
try
{
(World.FindAt(ActorSno._a3dun_keep_bridge, Position, 60.0f) as Door).Open();
(World.FindActorAt(ActorSno._a3dun_keep_bridge, Position, 60.0f) as Door).Open();
}
catch { }
}

6
src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/Implementations/ScriptObjects/actIITombLever.cs
View File

@ -43,12 +43,12 @@ namespace DiIiS_NA.GameServer.GSSystem.ActorSystem.Implementations.ScriptObjects
if (Attributes[GameAttribute.Disabled] == true) return;
try
{
Door waterfall = World.FindAt(ActorSno._caout_oasis_door_aqueduct_a_top, Position, 80.0f) as Door;
Door waterfall = World.FindActorAt(ActorSno._caout_oasis_door_aqueduct_a_top, Position, 80.0f) as Door;
if (waterfall == null)
{
Door gate = World.FindAt(ActorSno._caout_oasis_door_aqueduct_a, Position, 80.0f) as Door;
Door gate = World.FindActorAt(ActorSno._caout_oasis_door_aqueduct_a, Position, 80.0f) as Door;
if (gate == null)
(World.FindAt(ActorSno._caout_oasis_cenote_door, Position, 80.0f) as Door).Open();
(World.FindActorAt(ActorSno._caout_oasis_cenote_door, Position, 80.0f) as Door).Open();
else
gate.Open();
}

93
src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/GSBackend.cs
View File

@ -2,6 +2,7 @@
using DiIiS_NA.Core.Logging;
using System;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using WatsonTcp;
@ -42,8 +43,8 @@ namespace DiIiS_NA.GameServer.GSSystem.GameSystem
{
game.SetAct(int.Parse(args[2].Trim()));
game.SetGameMode((Game.Mode)int.Parse(args[7].Trim()));
game.IsHardcore = (args[6].Trim() == "True" ? true : false);
game.IsSeasoned = (args[8].Trim() == "True" ? true : false);
game.IsHardcore = args[6].Trim() == "True" ? true : false;
game.IsSeasoned = args[8].Trim() == "True" ? true : false;
game.SetDifficulty(int.Parse(args[3].Trim()));
if (game.GameMode != Game.Mode.Portals)
game.SetQuestProgress(int.Parse(args[4].Trim()), int.Parse(args[5].Trim()));
@ -95,136 +96,134 @@ namespace DiIiS_NA.GameServer.GSSystem.GameSystem
private bool SenderServerDisconnected()
{
Logger.Warn("MooNetServer was disconnected!");
Logger.Warn("Blizznet was disconnected!");
return true;
}
public void RegisterGameServer(string ip, int port)
{
Logger.Debug("RegisterGameServer(): ip {0}, port {1}", ip, port);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"rngsr|{ip}/{port}"));
Logger.MethodTrace($"ip {ip}, port {port}");
BattleNetSocketSend($"rngsr|{ip}/{port}");
}
public void RegisterPvPGameServer(string ip, int port)
{
Logger.Debug("RegisterPvPGameServer(): ip {0}, port {1}", ip, port);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"rnpvpgsr|{ip}/{port}"));
Logger.MethodTrace($"ip {ip}, port {port}");
BattleNetSocketSend($"rnpvpgsr|{ip}/{port}");
}
public void GrantAchievement(ulong gameAccountId, ulong achievementId)
{
Logger.Debug("GrantAchievement(): gameAccountId {0}, achievementId {1}", gameAccountId, achievementId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"grachi|{gameAccountId}/{achievementId}"));
Logger.MethodTrace($"gameAccountId {gameAccountId}, achievementId {achievementId}");
BattleNetSocketSend($"grachi|{gameAccountId}/{achievementId}");
}
public void GrantCriteria(ulong gameAccountId, ulong criteriaId)
{
Logger.Debug("GrantCriteria(): gameAccountId {0}, criteriaId {1}", gameAccountId, criteriaId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"gcrit|{gameAccountId}/{criteriaId}"));
Logger.MethodTrace($"gameAccountId {gameAccountId}, achievementId {criteriaId}");
BattleNetSocketSend($"gcrit|{gameAccountId}/{criteriaId}");
}
public void UpdateAchievementCounter(ulong gameAccountId, int type, uint addCounter, int comparand, ulong achievement = 0)
{
Logger.Debug("UpdateAchievementCounter(): type {0}, addCounter {1}, comparand {2}", type, addCounter, comparand);
BattleNetSocketSend(Encoding.UTF8.GetBytes(
$"uoacce|{gameAccountId}/{type}/{addCounter}/{comparand}/{achievement}"));
Logger.MethodTrace($"type {type}, addCounter {addCounter}, comparand {comparand}");
BattleNetSocketSend($"uoacce|{gameAccountId}/{type}/{addCounter}/{comparand}/{achievement}");
}
public void UpdateSingleAchievementCounter(ulong gameAccountId, ulong achId, uint addCounter)
{
Logger.Debug("UpdateSingleAchievementCounter(): type {0}, addCounter {1}", achId, addCounter);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"upsnaccr|{gameAccountId}/{achId}/{addCounter}"));
Logger.MethodTrace($"type {achId}, addCounter {addCounter}");
BattleNetSocketSend($"upsnaccr|{gameAccountId}/{achId}/{addCounter}");
}
public void UpdateQuantity(ulong gameAccountId, ulong achievementId, uint addCounter)
{
Logger.Debug("UpdateQuantity(): achievementId {0}, addCounter {1}", achievementId, addCounter);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"upequt|{gameAccountId}/{achievementId}/{addCounter}"));
Logger.MethodTrace($"achievementId {achievementId}, addCounter {addCounter}");
BattleNetSocketSend($"upequt|{gameAccountId}/{achievementId}/{addCounter}");
}
public void CheckQuestCriteria(ulong gameAccountId, int questId, bool isCoop)
{
Logger.Debug("CheckQuestCriteria(): gameAccountId {0}, questId {1}, coop {2}", gameAccountId, questId, isCoop);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"cqc|{gameAccountId}/{questId}/{(isCoop ? "True" : "False")}"));
Logger.MethodTrace($"gameAccountId {gameAccountId}, questId {questId}, coop {isCoop}");
BattleNetSocketSend($"cqc|{gameAccountId}/{questId}/{(isCoop ? "True" : "False")}");
}
public void CheckKillMonsterCriteria(ulong gameAccountId, int actorId, int type, bool isHardcore)
{
Logger.Debug("CheckKillMonsterCriteria(): gameAccountId {0}, actorId {1}, type {2}, hc {3}", gameAccountId, actorId, type, isHardcore);
BattleNetSocketSend(Encoding.UTF8.GetBytes(
$"ckmc|{gameAccountId}/{actorId}/{type}/{(isHardcore ? "True" : "False")}"));
Logger.MethodTrace($"gameAccountId {gameAccountId}, actorId {actorId}, type {type}, hc {isHardcore}");
BattleNetSocketSend($"ckmc|{gameAccountId}/{actorId}/{type}/{ (isHardcore ? "True" : "False")}");
}
public void CheckSalvageItemCriteria(ulong gameAccountId, int itemId)
{
Logger.Debug("CheckSalvageItemCriteria(): gameAccountId {0}, itemId {1}", gameAccountId, itemId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"csic|{gameAccountId}/{itemId}"));
Logger.MethodTrace($"gameAccountId {gameAccountId}, itemId {itemId}");
BattleNetSocketSend($"csic|{gameAccountId}/{itemId}");
}
public void CheckLevelCap(ulong gameAccountId)
{
Logger.Debug("CheckLevelCap(): gameAccountId {0}", gameAccountId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"clc|{gameAccountId}"));
Logger.MethodTrace($"gameAccountId {gameAccountId}");
BattleNetSocketSend($"clc|{gameAccountId}");
}
public void CheckConversationCriteria(ulong gameAccountId, int convId)
{
Logger.Debug("CheckConversationCriteria(): gameAccountId {0}, convId {1}", gameAccountId, convId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"ccc|{gameAccountId}/{convId}"));
Logger.MethodTrace($"gameAccountId {gameAccountId}, convId {convId}");
BattleNetSocketSend($"ccc|{gameAccountId}/{convId}");
}
public void CheckLevelAreaCriteria(ulong gameAccountId, int laId)
{
Logger.Debug("CheckLevelAreaCriteria(): gameAccountId {0}, laId {1}", gameAccountId, laId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"clac|{gameAccountId}/{laId}"));
Logger.MethodTrace($"gameAccountId {gameAccountId}, laId {laId}");
BattleNetSocketSend($"clac|{gameAccountId}/{laId}");
}
public void UpdateClient(ulong gameAccountId, int level, int screen)
{
Logger.Debug("UpdateClient(): gameAccountId {0}", gameAccountId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"uc|{gameAccountId}/{level}/{screen}"));
Logger.MethodTrace($"gameAccountId {gameAccountId}");
BattleNetSocketSend($"uc|{gameAccountId}/{level}/{screen}");
}
public void PlayerJoined(int gameId)
{
Logger.Debug("PlayerJoined(): gameId {0}", gameId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"gpj|{gameId}"));
Logger.MethodTrace($"gameId {gameId}");
BattleNetSocketSend($"gpj|{gameId}");
}
public void PlayerLeft(int gameId)
{
Logger.Debug("PlayerLeft(): gameId {0}", gameId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"gpl|{gameId}"));
Logger.MethodTrace($"gameId {gameId}");
BattleNetSocketSend($"gpl|{gameId}");
}
public void SetGamePublic(int gameId)
{
Logger.Debug("SetGamePublic(): gameId {0}", gameId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"gsp|{gameId}"));
Logger.MethodTrace($"gameId {gameId}");
BattleNetSocketSend($"gsp|{gameId}");
}
public void PvPSaveProgress(ulong gameAccountId, int kills, int wins, int gold)
{
Logger.Debug("PvPSaveProgress(): gameAccountId {0}", gameAccountId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"pvpsp|{gameAccountId}/{kills}/{wins}/{gold}"));
Logger.MethodTrace($"game account id {gameAccountId}");
BattleNetSocketSend($"pvpsp|{gameAccountId}/{kills}/{wins}/{gold}");
}
public void ParagonLevelUp(ulong gameAccountId)
{
Logger.Debug("ParagonLevelUp(): gameAccountId {0}", gameAccountId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"plu|{gameAccountId}"));
Logger.MethodTrace($"game account id {gameAccountId}");
BattleNetSocketSend($"plu|{gameAccountId}");
}
public void ToonStateChanged(ulong toonId)
{
Logger.Debug("ToonStateChanged(): toonID {0}", toonId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"tsc|{toonId}"));
Logger.MethodTrace($"game account id {toonId}");
BattleNetSocketSend($"tsc|{toonId}");
}
public void UniqueItemIdentified(ulong gameAccountId, ulong itemId)
{
Logger.Debug("UniqueItemIdentified(): gameAccountId {0}, itemId {1}", gameAccountId, itemId);
BattleNetSocketSend(Encoding.UTF8.GetBytes($"uii|{gameAccountId}/{itemId}"));
Logger.MethodTrace($"gameAccountId {gameAccountId}, itemId {itemId}");
BattleNetSocketSend($"uii|{gameAccountId}/{itemId}");
}
}
}

21
src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/QuestManager.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using DiIiS_NA.Core.Extensions;
using DiIiS_NA.Core.Helpers.Hash;
using DiIiS_NA.Core.Helpers.Math;
@ -25,18 +26,18 @@ namespace DiIiS_NA.D3_GameServer.GSSystem.GameSystem
{
public class QuestManager
{
private static readonly Logger Logger = new Logger("QuestManager");
private static readonly Logger Logger = new(nameof(QuestManager));
/// <summary>
/// Accessor for quests
/// </summary>
/// <param name="snoQuest">snoId of the quest to retrieve</param>
/// <returns></returns>
public Dictionary<int, QuestRegistry.Quest> Quests = new Dictionary<int, QuestRegistry.Quest>();
public readonly Dictionary<int, QuestRegistry.Quest> Quests = new();
public Dictionary<int, QuestRegistry.Quest> SideQuests = new Dictionary<int, QuestRegistry.Quest>();
public readonly Dictionary<int, QuestRegistry.Quest> SideQuests = new();
public List<Bounty> Bounties = new List<Bounty>();
public readonly List<Bounty> Bounties = new();
public Game Game { get; set; }
@ -190,7 +191,7 @@ namespace DiIiS_NA.D3_GameServer.GSSystem.GameSystem
if (!Game.Empty)
{
SaveQuestProgress(true);
Logger.Trace(" (Advance) quest {0} completed: {1}", Game.CurrentQuest, Quests[Game.CurrentQuest].Completed);
Logger.Trace($"$[white]$(Advance)$[/]$ Game {Game.GameId} Advanced to quest $[underline white]${Game.CurrentQuest}$[/], completed $[underline white]${Quests[Game.CurrentQuest].Completed}$[/]$");
foreach (var player in Game.Players.Values)
{
int xpReward = (int)(Quests[Game.CurrentQuest].RewardXp * Game.XPModifier);
@ -268,7 +269,7 @@ namespace DiIiS_NA.D3_GameServer.GSSystem.GameSystem
}
OnQuestProgress();
AutoSetQuestMarker();
Logger.Trace(" (Advance) Advanced to quest {0}, step {1}", Game.CurrentQuest, Game.CurrentStep);
Logger.Trace($"$[white]$(Advance)$[/]$ Game {Game.GameId} Advanced to quest $[underline white]${Game.CurrentQuest}$[/], step $[underline white]${Game.CurrentStep}$[/]$");
}
public void SideAdvance()
@ -294,7 +295,7 @@ namespace DiIiS_NA.D3_GameServer.GSSystem.GameSystem
SideQuests[Game.CurrentSideQuest].Steps[Game.CurrentSideStep] == SideQuests[Game.CurrentSideQuest].Steps.Last().Value)
{
SideQuests[Game.CurrentSideQuest].Completed = true;
Logger.Trace(" (SideAdvance) quest {0} completed: {1}", Game.CurrentSideQuest, SideQuests[Game.CurrentSideQuest].Completed);
Logger.Trace($"$[white]$(Side-Advance)$[/]$ Game {Game.GameId} Side-Advanced to quest {Game.CurrentSideQuest} completed: {SideQuests[Game.CurrentSideQuest].Completed}");
foreach (var player in Game.Players.Values)
{
@ -338,7 +339,7 @@ namespace DiIiS_NA.D3_GameServer.GSSystem.GameSystem
}
OnQuestProgress();
Logger.Trace(" (SideAdvance) Advanced to side quest {0}, step {1}", Game.CurrentSideQuest, Game.CurrentSideStep);
Logger.Trace($"$[white]$(Side-Advance)$[/]$ Game {Game.GameId} Side-Advanced to side-quest {Game.CurrentSideQuest} completed: {Game.CurrentSideStep}");
}
public void LaunchSideQuest(int questId, bool forceAbandon = false)
@ -539,7 +540,7 @@ namespace DiIiS_NA.D3_GameServer.GSSystem.GameSystem
{
if (Game.QuestProgress.QuestTriggers.Count == 1)
{
Logger.MethodTrace($"AutoSetQuestMarker() - {Game.QuestProgress.QuestTriggers.Count} triggers found");
Logger.MethodTrace($"{Game.QuestProgress.QuestTriggers.Count} triggers found");
var trigger = Game.QuestProgress.QuestTriggers.First();
if (trigger.Value.triggerType == QuestStepObjectiveType.InteractWithActor)
foreach (var world in Game.Worlds)
@ -854,7 +855,7 @@ namespace DiIiS_NA.D3_GameServer.GSSystem.GameSystem
public List<int> LevelAreaChecks { get; set; }
public bool Finished = false;
public static Dictionary<int, int> LevelAreaOverrides = new Dictionary<int, int>() //first is in-game, second is in-data
public static Dictionary<int, int> LevelAreaOverrides = new() //first is in-game, second is in-data
{
{338602, 377700}, //battlefields of eterntity
{271234, 370512}, //x1 fortress lv1

3
src/DiIiS-NA/D3-GameServer/GSSystem/ItemsSystem/Item.cs
View File

@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using DiIiS_NA.Core.Logging;
using DiIiS_NA.Core.Helpers.Math;
using DiIiS_NA.Core.Storage.AccountDataBase.Entities;
@ -1330,7 +1331,7 @@ namespace DiIiS_NA.GameServer.GSSystem.ItemsSystem
return;
}
Logger.Warn("OnRequestUse(): gbid {0} not implemented", GBHandle.GBID);
Logger.MethodTrace($"gbid {GBHandle.GBID} not implemented");
}
private void SwitchWingsBuff(Player player, int powerId)

427
src/DiIiS-NA/D3-GameServer/GSSystem/MapSystem/World.cs
View File

@ -1,5 +1,14 @@
using DiIiS_NA.Core.Helpers.Math;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Reflection;
using DiIiS_NA.Core.Helpers.Hash;
using DiIiS_NA.Core.Helpers.Math;
using DiIiS_NA.Core.Logging;
using DiIiS_NA.Core.MPQ;
using DiIiS_NA.Core.MPQ.FileFormats;
using DiIiS_NA.D3_GameServer.Core.Types.SNO;
using DiIiS_NA.GameServer.Core.Types.Math;
using DiIiS_NA.GameServer.Core.Types.QuadTrees;
@ -7,27 +16,22 @@ using DiIiS_NA.GameServer.Core.Types.SNO;
using DiIiS_NA.GameServer.Core.Types.TagMap;
using DiIiS_NA.GameServer.GSSystem.ActorSystem;
using DiIiS_NA.GameServer.GSSystem.ActorSystem.Implementations;
using DiIiS_NA.GameServer.GSSystem.ActorSystem.Movement;
using DiIiS_NA.GameServer.GSSystem.GameSystem;
using DiIiS_NA.GameServer.GSSystem.ItemsSystem;
using DiIiS_NA.GameServer.GSSystem.ObjectsSystem;
using DiIiS_NA.GameServer.GSSystem.PlayerSystem;
using DiIiS_NA.GameServer.GSSystem.PowerSystem;
using DiIiS_NA.GameServer.MessageSystem;
using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.ACD;
using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Animation;
using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Misc;
using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.World;
using DiIiS_NA.GameServer.MessageSystem.Message.Fields;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DiIiS_NA.Core.MPQ.FileFormats;
using DiIiS_NA.LoginServer.Toons;
using Actor = DiIiS_NA.GameServer.GSSystem.ActorSystem.Actor;
using Circle = DiIiS_NA.GameServer.Core.Types.Misc.Circle;
using Environment = DiIiS_NA.Core.MPQ.FileFormats.Environment;
using Monster = DiIiS_NA.GameServer.GSSystem.ActorSystem.Monster;
using ResolvedPortalDestination = DiIiS_NA.GameServer.MessageSystem.Message.Fields.ResolvedPortalDestination;
@ -36,8 +40,8 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public sealed class World : DynamicObject, IRevealable, IUpdateable
{
static readonly Logger Logger = LogManager.CreateLogger();
public readonly Dictionary<World, List<Item>> DbItems = new Dictionary<World, List<Item>>(); //we need this list to delete item_instances from items which have no owner anymore.
public readonly Dictionary<ulong, Item> CachedItems = new Dictionary<ulong, Item>();
public readonly Dictionary<World, List<Item>> DbItems = new(); //we need this list to delete item_instances from items which have no owner anymore.
public readonly Dictionary<ulong, Item> CachedItems = new();
public int LastCEId = 3000;
@ -52,30 +56,24 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// SNOHandle for the world.
/// </summary>
public SNOHandle WorldSNO { get; private set; }
public WorldSno SNO
{
get { return (WorldSno)WorldSNO.Id; }
}
public WorldSno SNO => (WorldSno)WorldSNO.Id;
/// <summary>
/// <summary>
/// QuadTree that contains scenes & actors.
/// </summary>
private QuadTree _quadTree;
public static QuadTree _PvPQuadTree = new QuadTree(new Size(60, 60), 0);
public static QuadTree _PvPQuadTree = new(new Size(60, 60), 0);
public QuadTree QuadTree
{
get
{
return (IsPvP ? _PvPQuadTree : _quadTree);
}
get => (IsPvP ? _PvPQuadTree : _quadTree);
set { }
}
/// <summary>
/// WorldData loaded from MPQs/DB
/// </summary>
public DiIiS_NA.Core.MPQ.FileFormats.World worldData = new DiIiS_NA.Core.MPQ.FileFormats.World();
public DiIiS_NA.Core.MPQ.FileFormats.World worldData = new();
/// <summary>
/// Destination for portals(on Exit and DungeonStone)
@ -92,14 +90,11 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// </summary>
private readonly ConcurrentDictionary<uint, Scene> _scenes;
private static readonly ConcurrentDictionary<uint, Scene> _PvPscenes = new ConcurrentDictionary<uint, Scene>();
private static readonly ConcurrentDictionary<uint, Scene> _PvPscenes = new();
public ConcurrentDictionary<uint, Scene> Scenes
{
get
{
return (IsPvP ? _PvPscenes : _scenes);
}
get => (IsPvP ? _PvPscenes : _scenes);
set { }
}
@ -108,46 +103,36 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// </summary>
private readonly ConcurrentDictionary<uint, Actor> _actors;
public static readonly ConcurrentDictionary<uint, Actor> _PvPActors = new ConcurrentDictionary<uint, Actor>();
public static readonly ConcurrentDictionary<uint, Actor> _PvPActors = new();
public ConcurrentDictionary<uint, Actor> Actors
{
get
{
return (IsPvP ? _PvPActors : _actors);
}
get => (IsPvP ? _PvPActors : _actors);
set { }
}
public Dictionary<int, WorldSno> PortalOverrides = new Dictionary<int, WorldSno>();
public Dictionary<int, WorldSno> PortalOverrides = new();
/// <summary>
/// List of players contained in the world.
/// </summary>
private readonly ConcurrentDictionary<uint, Player> _players;
public static readonly ConcurrentDictionary<uint, Player> _PvPPlayers = new ConcurrentDictionary<uint, Player>();
public static readonly ConcurrentDictionary<uint, Player> _PvPPlayers = new();
public ConcurrentDictionary<uint, Player> Players
{
get
{
return (IsPvP ? _PvPPlayers : _players);
}
set { }
}
public ConcurrentDictionary<uint, Player> Players => (IsPvP ? _PvPPlayers : _players);
/// <summary>
/// Returns true if the world has players in.
/// </summary>
public bool HasPlayersIn { get { return Players.Count > 0; } }
public bool HasPlayersIn => Players.Count > 0;
/// <summary>
/// Returns a new dynamicId for scenes.
/// </summary>
public uint NewSceneID { get { return IsPvP ? NewPvPSceneID : Game.NewSceneID; } }
public uint NewSceneID => IsPvP ? NewPvPSceneID : Game.NewSceneID;
public bool IsPvP { get { return SNO == WorldSno.pvp_duel_small_multi; } } //PvP_Duel_Small
public bool IsPvP => SNO == WorldSno.pvp_duel_small_multi; //PvP_Duel_Small
public static bool PvPMapLoaded = false;
@ -164,21 +149,15 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
}
// Environment
public DiIiS_NA.Core.MPQ.FileFormats.Environment Environment
{
get
{
return ((DiIiS_NA.Core.MPQ.FileFormats.World)DiIiS_NA.Core.MPQ.MPQStorage.Data.Assets[SNOGroup.Worlds][WorldSNO.Id].Data).Environment;
}
}
public Environment Environment => ((DiIiS_NA.Core.MPQ.FileFormats.World)MPQStorage.Data.Assets[SNOGroup.Worlds][WorldSNO.Id].Data).Environment;
private static uint _lastPvPObjectID = 10001;
private static object obj = new object();
private static readonly object _obj = new();
public static uint NewActorPvPID
{
get
{
lock (obj)
lock (_obj)
{
_lastPvPObjectID++;
return _lastPvPObjectID;
@ -191,7 +170,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
{
get
{
lock (obj)
lock (_obj)
{
_lastPvPSceneID++;
return _lastPvPSceneID;
@ -218,14 +197,14 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
}
private PowerManager _powerManager;
public static PowerManager _PvPPowerManager = new PowerManager();
public static PowerManager _PvPPowerManager = new();
public PowerManager PowerManager { get { return IsPvP ? _PvPPowerManager : _powerManager; } }
public PowerManager PowerManager => IsPvP ? _PvPPowerManager : _powerManager;
private BuffManager _buffManager;
public static BuffManager _PvPBuffManager = new BuffManager();
public static BuffManager _PvPBuffManager = new();
public BuffManager BuffManager { get { return IsPvP ? _PvPBuffManager : _buffManager; } }
public BuffManager BuffManager => IsPvP ? _PvPBuffManager : _buffManager;
/// <summary>
/// Creates a new world for the given game with given snoId.
@ -257,8 +236,8 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
if (SNO == WorldSno.x1_bog_01) //Blood Marsh
{
var worlds = new List<WorldSno>() { WorldSno.x1_catacombs_level01, WorldSno.x1_catacombs_fakeentrance_02, WorldSno.x1_catacombs_fakeentrance_03, WorldSno.x1_catacombs_fakeentrance_04 };
var scenes = new List<int>() { 265624, 265655, 265678, 265693 };
var worlds = new List<WorldSno> { WorldSno.x1_catacombs_level01, WorldSno.x1_catacombs_fakeentrance_02, WorldSno.x1_catacombs_fakeentrance_03, WorldSno.x1_catacombs_fakeentrance_04 };
var scenes = new List<int> { 265624, 265655, 265678, 265693 };
foreach (var scene in scenes)
{
var wld = worlds[FastRandom.Instance.Next(worlds.Count)];
@ -283,17 +262,17 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
{
foreach (var actor in player.GetActorsInRange().OfType<IUpdateable>()) // get IUpdateable actors in range.
{
if (actorsToUpdate.Contains(actor as IUpdateable)) // don't let a single actor in range of more than players to get updated more thance per tick /raist.
if (actorsToUpdate.Contains(actor)) // don't let a single actor in range of more than players to get updated more thance per tick /raist.
continue;
actorsToUpdate.Add(actor as IUpdateable);
actorsToUpdate.Add(actor);
}
}
foreach (var minion in Actors.Values.OfType<Minion>())
{
if (actorsToUpdate.Contains(minion as IUpdateable))
if (actorsToUpdate.Contains(minion))
continue;
actorsToUpdate.Add(minion as IUpdateable);
actorsToUpdate.Add(minion);
}
foreach (var actor in actorsToUpdate) // trigger the updates.
{
@ -313,6 +292,49 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
#region message broadcasting
/// <summary>
/// Broadcasts a message to all players in the world.
/// </summary>
/// <param name="action">The action that will be invoked to all players</param>
/// <exception cref="Exception">If there was an error to broadcast to player.</exception>
public void BroadcastOperation(Action<Player> action)
{
foreach (var player in Players.Values)
{
if (player == null) continue;
try
{
action(player);
}
catch (Exception ex)
{
throw new Exception("Error while broadcasting to player " + player.Name, ex);
}
}
}
/// <summary>
/// Broadcasts a message to all players in the world where the <param name="predicate"></param> is true.
/// </summary>
/// <param name="predicate">Players matching criteria</param>
/// <param name="action">The action that will be invoked to all players</param>
/// <exception cref="Exception">If there was an error to broadcast to player</exception>
public void BroadcastOperation(Func<Player, bool> predicate, Action<Player> action)
{
foreach (var player in Players.Values.Where(predicate))
{
if (player == null) continue;
try
{
action(player);
}
catch (Exception ex)
{
throw new Exception("Error while broadcasting to player " + player.Name, ex);
}
}
}
// NOTE: Scenes are actually laid out in cells with Subscenes filling in certain areas under a Scene.
// We can use this design feature to track Actors' current scene and send updates to it and neighboring
// scenes instead of distance checking for broadcasting messages. / komiga
@ -325,11 +347,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// <param name="actor">The actor.</param>
public void BroadcastIfRevealed(Func<Player, GameMessage> message, Actor actor)
{
foreach (var player in Players.Values)
{
if (player.RevealedObjects.ContainsKey(actor.GlobalID))
player.InGameClient.SendMessage(message(player));
}
BroadcastOperation(player => player.RevealedObjects.ContainsKey(actor.GlobalID), player => player.InGameClient.SendMessage(message(player)));
}
/// <summary>
@ -338,10 +356,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// <param name="message"></param>
public void BroadcastGlobal(Func<Player, GameMessage> message)
{
foreach (var player in Players.Values)
{
player.InGameClient.SendMessage(message(player));
}
BroadcastOperation(player => player.InGameClient.SendMessage(message(player)));
}
/// <summary>
@ -349,9 +364,9 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// </summary>
/// <param name="message">The message to broadcast.</param>
/// <param name="actor">The actor.</param>
public void BroadcastInclusive(Func<Player, GameMessage> message, Actor actor)
public void BroadcastInclusive(Func<Player, GameMessage> message, Actor actor, float? radius = null)
{
var players = actor.GetPlayersInRange();
var players = actor.GetPlayersInRange(radius);
foreach (var player in players)
{
player.InGameClient.SendMessage(message(player));
@ -404,12 +419,12 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
WorldSizeInFeetY = 5040,
snoDungeonFinderSourceWorld = -1
});
player.InGameClient.SendMessage(new WorldStatusMessage() { WorldID = GlobalID, Field1 = false });
player.InGameClient.SendMessage(new WorldStatusMessage { WorldID = GlobalID, Field1 = false });
//*
player.InGameClient.SendMessage(new WorldSyncedDataMessage()
player.InGameClient.SendMessage(new WorldSyncedDataMessage
{
WorldID = GlobalID,
SyncedData = new WorldSyncedData()
SyncedData = new WorldSyncedData
{
SnoWeatherOverride = -1,
WeatherIntensityOverride = 0,
@ -436,7 +451,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
foreach (var scene in Scenes.Values) scene.Unreveal(player);
player.RevealedObjects.Remove(GlobalID);
player.InGameClient.SendMessage(new WorldStatusMessage() { WorldID = GlobalID, Field1 = true });
player.InGameClient.SendMessage(new WorldStatusMessage { WorldID = GlobalID, Field1 = true });
player.InGameClient.SendMessage(new PrefetchDataMessage(Opcodes.PrefetchWorldMessage) { SNO = WorldSNO.Id });
//player.InGameClient.SendMessage(new WorldDeletedMessage() { WorldID = this.GlobalID });
@ -560,7 +575,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
UnitAniimStartTime = 0,
tAnim = new PlayAnimationMessageSpec[]
{
new PlayAnimationMessageSpec()
new()
{
Duration = 150,
AnimationSNO = monster.AnimationSet.TagMapAnimDefault[animationTag],
@ -576,7 +591,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
return monster;
}
private Queue<Queue<Action>> _flippyTimers = new Queue<Queue<Action>>();
private Queue<Queue<Action>> _flippyTimers = new();
private const int FlippyDurationInTicks = 10;
private const int FlippyMaxDistanceManhattan = 10; // length of one side of the square around the player where the item will appear
@ -592,14 +607,14 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public void PlayPieAnimation(Actor actor, Actor User, int PowerSNO, Vector3D TargetPosition)
{
BroadcastIfRevealed(plr => new MessageSystem.Message.Definitions.ACD.ACDTranslateDetPathPieWedgeMessage
BroadcastIfRevealed(plr => new ACDTranslateDetPathPieWedgeMessage
{
ann = (int)actor.DynamicID(plr),
StartPos = User.Position,
FirstTagetPos = User.Position,
MoveFlags = 9,
AnimTag = 1,
PieData = new DPathPieData()
PieData = new DPathPieData
{
Field0 = TargetPosition,
Field1 = 1,
@ -613,7 +628,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public void PlayCircleAnimation(Actor actor, Actor User, int PowerSNO, Vector3D TargetPosition)
{
BroadcastIfRevealed(plr => new MessageSystem.Message.Definitions.ACD.ACDTranslateDetPathSinMessage
BroadcastIfRevealed(plr => new ACDTranslateDetPathSinMessage
{
ActorID = actor.DynamicID(plr),
DPath = 6,
@ -625,14 +640,14 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
Seed = 1,
Carry = 1,
TargetPostition = TargetPosition,
Angle = ActorSystem.Movement.MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
Angle = MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
StartPosition = User.Position,
MoveFlags = 1,
AnimTag = 1,
PowerSNO = PowerSNO,
Var0Int = 1,
Var0Fl = 1f,
SinData = new DPathSinData()
SinData = new DPathSinData
{
annOwner = (int)actor.DynamicID(plr),
SinIncAccel = 0f,
@ -649,28 +664,28 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public void PlayZigAnimation(Actor actor, Actor User, int PowerSNO, Vector3D TargetPosition)
{
BroadcastIfRevealed(plr => new MessageSystem.Message.Definitions.ACD.ACDTranslateFacingMessage
BroadcastIfRevealed(plr => new ACDTranslateFacingMessage
{
ActorId = actor.DynamicID(plr),
Angle = ActorSystem.Movement.MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
Angle = MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
TurnImmediately = true
}, actor);
BroadcastIfRevealed(plr => new MessageSystem.Message.Definitions.ACD.ACDTranslateDetPathSinMessage
BroadcastIfRevealed(plr => new ACDTranslateDetPathSinMessage
{
ActorID = actor.DynamicID(plr),
DPath = 5,
Seed = 1,
Carry = 1,
TargetPostition = TargetPosition,
Angle = ActorSystem.Movement.MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
Angle = MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
StartPosition = User.Position,
MoveFlags = 1,
AnimTag = 1,
PowerSNO = PowerSNO,
Var0Int = 1,
Var0Fl = 1f,
SinData = new DPathSinData()
SinData = new DPathSinData
{
annOwner = (int)actor.DynamicID(plr),
SinIncAccel = 0f,
@ -687,14 +702,14 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public void PlayReverSpiralAnimation(Actor actor, Actor User, int PowerSNO, Vector3D TargetPosition)
{
BroadcastIfRevealed(plr => new MessageSystem.Message.Definitions.ACD.ACDTranslateFacingMessage
BroadcastIfRevealed(plr => new ACDTranslateFacingMessage
{
ActorId = actor.DynamicID(plr),
Angle = ActorSystem.Movement.MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
Angle = MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
TurnImmediately = true
}, actor);
BroadcastIfRevealed(plr => new MessageSystem.Message.Definitions.ACD.ACDTranslateDetPathSinMessage
BroadcastIfRevealed(plr => new ACDTranslateDetPathSinMessage
{
ActorID = actor.DynamicID(plr),
DPath = 4,
@ -706,14 +721,14 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
Seed = 1,
Carry = 1,
TargetPostition = TargetPosition,
Angle = ActorSystem.Movement.MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
Angle = MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
StartPosition = User.Position,
MoveFlags = 1,
AnimTag = 1,
PowerSNO = PowerSNO,
Var0Int = 1,
Var0Fl = 1f,
SinData = new DPathSinData()
SinData = new DPathSinData
{
annOwner = (int)actor.DynamicID(plr),
SinIncAccel = 0.2f,
@ -730,14 +745,14 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public void PlaySpiralAnimation(Actor actor, Actor User, int PowerSNO, Vector3D TargetPosition)
{
BroadcastIfRevealed(plr => new MessageSystem.Message.Definitions.ACD.ACDTranslateFacingMessage
BroadcastIfRevealed(plr => new ACDTranslateFacingMessage
{
ActorId = actor.DynamicID(plr),
Angle = ActorSystem.Movement.MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
Angle = MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
TurnImmediately = true
}, actor);
BroadcastIfRevealed(plr => new MessageSystem.Message.Definitions.ACD.ACDTranslateDetPathSinMessage
BroadcastIfRevealed(plr => new ACDTranslateDetPathSinMessage
{
ActorID = actor.DynamicID(plr),
DPath = 3,
@ -749,14 +764,14 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
Seed = 1,
Carry = 1,
TargetPostition = TargetPosition,
Angle = ActorSystem.Movement.MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
Angle = MovementHelpers.GetFacingAngle(User.Position, TargetPosition),
StartPosition = User.Position,
MoveFlags = 1,
AnimTag = 1,
PowerSNO = PowerSNO,
Var0Int = 1,
Var0Fl = 1f,
SinData = new DPathSinData()
SinData = new DPathSinData
{
annOwner = (int)actor.DynamicID(plr),
SinIncAccel = 0.2f,
@ -773,7 +788,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public Item SpawnRandomEquip(Actor source, Player player, int forceQuality = -1, int forceLevel = -1,
GameBalance.ItemTypeTable type = null, bool canBeUnidentified = true, ToonClass toonClass = ToonClass.Unknown)
{
Logger.Debug("SpawnRandomEquip(): quality {0}", forceQuality);
Logger.MethodTrace($"quality {forceQuality}");
if (player != null)
{
int level = (forceLevel > 0 ? forceLevel : source.Attributes[GameAttribute.Level]);
@ -801,7 +816,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
}
public void SpawnRandomLegOrSetEquip(Actor source, Player player)
{
//Logger.Debug("SpawnRandomEquip(): quality {0}", forceQuality);
//Logger.MethodTrace("quality {0}", forceQuality);
if (player != null)
{
var item = ItemGenerator.GenerateLegOrSetRandom(player);
@ -857,7 +872,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
}
public void SpawnRandomPotion(Actor source, Player player)
{
if (player != null && !player.Inventory.HaveEnough(DiIiS_NA.Core.Helpers.Hash.StringHashHelper.HashItemName("HealthPotionBottomless"), 1))
if (player != null && !player.Inventory.HaveEnough(StringHashHelper.HashItemName("HealthPotionBottomless"), 1))
{
var item = ItemGenerator.GenerateRandomPotion(player);
if (item == null) return;
@ -946,7 +961,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// <returns></returns>
public bool HasActorsInGroup(string group)
{
var groupHash = DiIiS_NA.Core.Helpers.Hash.StringHashHelper.HashItemName(group);
var groupHash = StringHashHelper.HashItemName(group);
foreach (var actor in Actors.Values)
{
if (actor.Tags != null)
@ -963,7 +978,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public List<Actor> GetActorsInGroup(string group)
{
List<Actor> matchingActors = new List<Actor>();
var groupHash = DiIiS_NA.Core.Helpers.Hash.StringHashHelper.HashItemName(group);
var groupHash = StringHashHelper.HashItemName(group);
foreach (var actor in Actors.Values)
{
if (actor.Tags != null)
@ -1087,7 +1102,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public void AddScene(Scene scene)
{
if (scene.GlobalID == 0 || HasScene(scene.GlobalID))
throw new Exception(String.Format("Scene has an invalid ID or was already present (ID = {0})", scene.GlobalID));
throw new Exception($"Scene has an invalid ID or was already present (ID = {scene.GlobalID})");
Scenes.TryAdd(scene.GlobalID, scene); // add to scenes collection.
QuadTree.Insert(scene); // add it to quad-tree too.
@ -1100,10 +1115,9 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public void RemoveScene(Scene scene)
{
if (scene.GlobalID == 0 || !HasScene(scene.GlobalID))
throw new Exception(String.Format("Scene has an invalid ID or was not present (ID = {0})", scene.GlobalID));
throw new Exception($"Scene has an invalid ID or was not present (ID = {scene.GlobalID})");
Scene remotedScene;
Scenes.TryRemove(scene.GlobalID, out remotedScene); // remove it from scenes collection.
Scenes.TryRemove(scene.GlobalID, out _); // remove it from scenes collection.
QuadTree.Remove(scene); // remove from quad-tree too.
}
@ -1114,8 +1128,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// <returns></returns>
public Scene GetScene(uint dynamicID)
{
Scene scene;
Scenes.TryGetValue(dynamicID, out scene);
Scenes.TryGetValue(dynamicID, out var scene);
return scene;
}
@ -1161,10 +1174,9 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
private void RemoveActor(Actor actor)
{
if (actor.GlobalID == 0 || !Actors.ContainsKey(actor.GlobalID))
throw new Exception(String.Format("Actor has an invalid ID or was not present (ID = {0})", actor.GlobalID));
throw new Exception($"Actor has an invalid ID or was not present (ID = {actor.GlobalID})");
Actor removedActor;
Actors.TryRemove(actor.GlobalID, out removedActor); // remove it from actors collection.
Actors.TryRemove(actor.GlobalID, out _); // remove it from actors collection.
QuadTree.Remove(actor); // remove from quad-tree too.
if (actor.ActorType == ActorType.Player) // if actors is a player, remove it from players collection too.
@ -1173,8 +1185,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public Actor GetActorByGlobalId(uint globalID)
{
Actor actor;
Actors.TryGetValue(globalID, out actor);
Actors.TryGetValue(globalID, out var actor);
return actor;
}
@ -1204,9 +1215,8 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
{
if (actor.ActorType == matchType)
return actor;
else
Logger.Warn("Attempted to get actor ID {0} as a {1}, whereas the actor is type {2}",
dynamicID, Enum.GetName(typeof(ActorType), matchType), Enum.GetName(typeof(ActorType), actor.ActorType));
Logger.Warn("Attempted to get actor ID {0} as a {1}, whereas the actor is type {2}",
dynamicID, Enum.GetName(typeof(ActorType), matchType), Enum.GetName(typeof(ActorType), actor.ActorType));
}
return null;
}
@ -1247,37 +1257,42 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// Adds given player to world.
/// </summary>
/// <param name="player">The player to add.</param>
private void AddPlayer(Player player)
private bool AddPlayer(Player player)
{
if (player.GlobalID == 0 || HasPlayer(player.GlobalID))
throw new Exception(String.Format("Player has an invalid ID or was already present (ID = {0})", player.GlobalID));
if (player == null)
throw new Exception($"Player in world {SNO} is null and cannot be removed.");
Players.TryAdd(player.GlobalID, player); // add it to players collection.
if (player.GlobalID == 0 || HasPlayer(player.GlobalID))
throw new Exception($"Player has an invalid ID or was already present (ID = {player.GlobalID})");
return Players.TryAdd(player.GlobalID, player); // add it to players collection.
}
/// <summary>
/// Removes given player from world.
/// </summary>
/// <param name="player"></param>
private void RemovePlayer(Player player)
private bool RemovePlayer(Player player)
{
if (player.GlobalID == 0 || !Players.ContainsKey(player.GlobalID))
throw new Exception(String.Format("Player has an invalid ID or was not present (ID = {0})", player.GlobalID));
if (player == null)
throw new Exception($"Player in world {SNO} is null and cannot be removed.");
Player removedPlayer;
Players.TryRemove(player.GlobalID, out removedPlayer); // remove it from players collection.
if (player.GlobalID == 0 || !Players.ContainsKey(player.GlobalID))
throw new Exception($"Player has an invalid ID or was not present (ID = {player.GlobalID})");
return Players.TryRemove(player.GlobalID, out _); // remove it from players collection.
}
/// <summary>
/// Returns player with given dynamicId.
/// Returns player with a given predicate
/// </summary>
/// <param name="dynamicID">The dynamicId of the player.</param>
/// <returns></returns>
public Player GetPlayer(uint dynamicID)
/// <param name="predicate">Predicate to find player</param>
/// <param name="player">Player result</param>
/// <returns>Whether the player was found.</returns>
public bool TryGetPlayer(Func<Player, bool> predicate, out Player player)
{
Player player;
Players.TryGetValue(dynamicID, out player);
return player;
player = Players.Values.FirstOrDefault(predicate);
return player != null;
}
/// <summary>
@ -1285,40 +1300,28 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// </summary>
/// <param name="dynamicID">The dynamicId of the player.</param>
/// <returns><see cref="bool"/></returns>
public bool HasPlayer(uint dynamicID)
{
return Players.ContainsKey(dynamicID);
}
public bool HasPlayer(uint dynamicID) => Players.ContainsKey(dynamicID);
/// <summary>
/// Returns item with given dynamicId.
/// </summary>
/// <param name="dynamicID">The dynamicId of the item.</param>
/// <returns></returns>
public Item GetItem(uint dynamicID)
{
return (Item)GetActorByGlobalId(dynamicID, ActorType.Item);
}
public Item GetItem(uint dynamicID) => (Item)GetActorByGlobalId(dynamicID, ActorType.Item);
/// <summary>
/// Returns true if world contains a monster with given dynamicId.
/// </summary>
/// <param name="dynamicID">The dynamicId of the monster.</param>
/// <returns><see cref="bool"/></returns>
public bool HasMonster(uint dynamicID)
{
return HasActor(dynamicID, ActorType.Monster);
}
public bool HasMonster(uint dynamicID) => HasActor(dynamicID, ActorType.Monster);
/// <summary>
/// Returns true if world contains an item with given dynamicId.
/// </summary>
/// <param name="dynamicID">The dynamicId of the item.</param>
/// <returns><see cref="bool"/></returns>
public bool HasItem(uint dynamicID)
{
return HasActor(dynamicID, ActorType.Item);
}
public bool HasItem(uint dynamicID) => HasActor(dynamicID, ActorType.Item);
#endregion
@ -1330,17 +1333,14 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// <param name="id">The id of the StartingPoint.</param>
/// <returns><see cref="StartingPoint"/></returns>
public StartingPoint GetStartingPointById(int id)
{
return Actors.Values.OfType<StartingPoint>().Where(sp => sp.TargetId == id).ToList().FirstOrDefault();
}
public StartingPoint GetStartingPointById(int id) => Actors.Values.OfType<StartingPoint>().Where(sp => sp.TargetId == id).ToList().FirstOrDefault();
public Actor FindAt(ActorSno actorSno, Vector3D position, float radius = 3.0f)
public Actor FindActorAt(ActorSno actorSno, Vector3D position, float radius = 3.0f)
{
var proximityCircle = new Circle(position.X, position.Y, radius);
var actors = QuadTree.Query<Actor>(proximityCircle);
foreach (var actr in actors)
if (actr.Attributes[GameAttribute.Disabled] == false && actr.Attributes[GameAttribute.Gizmo_Has_Been_Operated] == false && actr.SNO == actorSno) return actr;
foreach (var actor in actors)
if (actor.Attributes[GameAttribute.Disabled] == false && actor.Attributes[GameAttribute.Gizmo_Has_Been_Operated] == false && actor.SNO == actorSno) return actor;
return null;
}
@ -1349,10 +1349,13 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
/// </summary>
/// <param name="id">The id of the WayPoint</param>
/// <returns><see cref="Waypoint"/></returns>
public Waypoint GetWayPointById(int id)
{
return Actors.Values.OfType<Waypoint>().FirstOrDefault(waypoint => waypoint.WaypointId == id);
}
public Waypoint GetWayPointById(int id) => Actors.Values.OfType<Waypoint>().FirstOrDefault(waypoint => waypoint.WaypointId == id);
public Waypoint[] GetAllWaypoints() => Actors.Values.OfType<Waypoint>().ToArray();
public Waypoint[] GetAllWaypointsInWorld(WorldSno worldSno) => Actors.Values.OfType<Waypoint>().Where(waypoint => waypoint.World.SNO == worldSno).ToArray();
public Waypoint[] GetAllWaypointsInWorld(World world) => Actors.Values.OfType<Waypoint>().Where(waypoint => waypoint.World == world).ToArray();
#endregion
@ -1360,8 +1363,27 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public override void Destroy()
{
// TODO: Destroy all objects /raist
Logger.Trace($"$[red]$Destroying$[/]$ World #{GlobalID} $[underline red]${SNO}$[/]$");
// TODO: Destroy all objects @iamdroppy - solution below added for testing on 21/01/2023
// foreach (var actor in Actors.Values)
// try
// {
// actor.Destroy();
// }
// catch {}
//
// foreach (var player in Players.Values)
// try
// {
// player.Destroy();
// }
// catch{}
// foreach (var portal in Portals)
// try
// {
// portal.Destroy();
// }
// catch{}
// TODO: Destroy pre-generated tile set
worldData = null;
@ -1384,18 +1406,15 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
if (s.Parent != null) { scene = s.Parent; }
if (s.Subscenes.Count > 0)
{
foreach (var subscene in s.Subscenes)
foreach (var subScene in s.Subscenes.Where(subScene => subScene.Bounds.Contains(location.X, location.Y)))
{
if (subscene.Bounds.Contains(location.X, location.Y))
{
scene = subscene;
}
scene = subScene;
}
}
int x = (int)((location.X - scene.Bounds.Left) / 2.5f);
int y = (int)((location.Y - scene.Bounds.Top) / 2.5f);
int total = (int)((y * scene.NavMesh.SquaresCountX) + x);
int total = (y * scene.NavMesh.SquaresCountX) + x;
if (total < 0 || total > scene.NavMesh.NavMeshSquareCount)
{
Logger.Error("Navmesh overflow!");
@ -1413,57 +1432,59 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public float GetZForLocation(Vector3D location, float defaultZ)
{
foreach (Scene s in Scenes.Values)
foreach (Scene s in Scenes.Values.Where(s => s.Bounds.Contains(location.X, location.Y)))
{
if (s.Bounds.Contains(location.X, location.Y))
Scene scene = s;
if (s.Parent != null)
{
Scene scene = s;
if (s.Parent != null) { scene = s.Parent; }
if (s.Subscenes.Count > 0)
scene = s.Parent;
}
if (s.Subscenes.Count > 0)
{
foreach (var subScene in s.Subscenes)
{
foreach (var subscene in s.Subscenes)
if (subScene.Bounds.Contains(location.X, location.Y))
{
if (subscene.Bounds.Contains(location.X, location.Y))
{
scene = subscene;
}
scene = subScene;
}
}
}
int x = (int)((location.X - scene.Bounds.Left) / 2.5f);
int y = (int)((location.Y - scene.Bounds.Top) / 2.5f);
int total = (int)((y * scene.NavMesh.SquaresCountX) + x);
if (total < 0 || total > scene.NavMesh.NavMeshSquareCount)
{
Logger.Error("Navmesh overflow!");
return defaultZ;
}
try
{
return scene.NavMesh.Squares[total].Z;
}
catch
{
return defaultZ;
}
int x = (int)((location.X - scene.Bounds.Left) / 2.5f);
int y = (int)((location.Y - scene.Bounds.Top) / 2.5f);
int total = (y * scene.NavMesh.SquaresCountX) + x;
if (total < 0 || total > scene.NavMesh.NavMeshSquareCount)
{
Logger.Error("Navmesh overflow!");
return defaultZ;
}
try
{
return scene.NavMesh.Squares[total].Z;
}
catch
{
return defaultZ;
}
}
return defaultZ;
}
[Obsolete("Isn't used anymore")] // made obsolete by @iamdroppy on 28/01/2023
public bool CheckRayPath(Vector3D start, Vector3D destination)
{
var proximity = new RectangleF(start.X - 1f, start.Y - 1f, 2f, 2f);
var scenes = QuadTree.Query<Scene>(proximity);
if (scenes.Count == 0) return false;
var scene = scenes[0]; // Parent scene /fasbat
if (scenes.Count == 2) // What if it's a subscene? /fasbat
{
if (scenes[1].ParentChunkID != 0xFFFFFFFF)
scene = scenes[1];
{
}
}
return true;
@ -1471,7 +1492,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public override string ToString()
{
return string.Format("[World] SNOId: {0} GlobalId: {1} Name: {2}", WorldSNO.Id, GlobalID, WorldSNO.Name);
return $"[World] SNOId: {WorldSNO.Id} GlobalId: {GlobalID} Name: {WorldSNO.Name}";
}
}
}

3
src/DiIiS-NA/D3-GameServer/GSSystem/ObjectsSystem/FixedMap.cs
View File

@ -8,7 +8,8 @@ namespace DiIiS_NA.GameServer.GSSystem.ObjectsSystem
{
Invulnerable,
Speed,
Powerful
Powerful,
Resourcefull
}
public class FixedMap

11556
src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs
View File

File diff suppressed because it is too large Load Diff

40
src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/PowerLoader.cs
View File

@ -1,6 +1,7 @@
using DiIiS_NA.Core.Logging;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Text;
@ -12,24 +13,39 @@ namespace DiIiS_NA.GameServer.GSSystem.PowerSystem
{
static readonly Logger Logger = LogManager.CreateLogger();
private static Dictionary<int, Type> _implementations = new Dictionary<int, Type>();
private static readonly Dictionary<int, Type> _implementations = new();
private static PowerScript TryActivate(int powerSno)
{
try
{
return (PowerScript)Activator.CreateInstance(_implementations[powerSno]);
}
catch(Exception ex)
{
Logger.FatalException(ex, $"Failed to activate power {powerSno}");
return null;
}
}
public static PowerScript CreateImplementationForPowerSNO(int powerSNO)
{
if (_implementations.ContainsKey(powerSNO))
{
PowerScript script = (PowerScript)Activator.CreateInstance(_implementations[powerSNO]);
script.PowerSNO = powerSNO;
return script;
}
else
{
#if DEBUG
if (powerSNO != 30021 && powerSNO != 30022 && powerSNO != -1)
Logger.Info("Unimplemented power: {0}", powerSNO); //for hiding annoying messages
#endif
return null;
PowerScript script = TryActivate(powerSNO);
if (script != null)
{
script.PowerSNO = powerSNO;
return script;
}
}
#if DEBUG
if (powerSNO != 30021 && powerSNO != 30022 && powerSNO != -1) //for hiding annoying messages
Logger.Info($"$[underline red]$Unimplemented power:$[/]$ $[underline]${powerSNO}$[/]$");
#else
if (powerSNO != 30021 && powerSNO != 30022 && powerSNO != -1) //for hiding annoying messages
Logger.Info($"$[underline red]$Unimplemented power:$[/]$ $[underline]${powerSNO}$[/]$");
#endif
return null;
}
public static bool HasImplementationForPowerSNO(int powerSNO)

4
src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs
View File

@ -1357,7 +1357,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem
var world = Game.GetWorld(WorldSno.trout_town);
DestroyFollower(ActorSno._leah);
AddFollower(world, ActorSno._leah);
try { (world.FindAt(ActorSno._trout_tristramfield_field_gate, new Vector3D { X = 1523.13f, Y = 857.71f, Z = 39.26f }, 5.0f) as Door).Open(); } catch { }
try { (world.FindActorAt(ActorSno._trout_tristramfield_field_gate, new Vector3D { X = 1523.13f, Y = 857.71f, Z = 39.26f }, 5.0f) as Door).Open(); } catch { }
StartConversation(world, 167677);
ListenConversation(167677, new Advance());
}
@ -1405,7 +1405,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem
var world = Game.GetWorld(WorldSno.trout_town);
DestroyFollower(ActorSno._leah);
AddFollower(world, ActorSno._leah);
try { (world.FindAt(ActorSno._trout_tristramfield_field_gate, new Vector3D { X = 1444.1f, Y = 786.64f, Z = 39.7f }, 4.0f) as Door).Open(); } catch { }
try { (world.FindActorAt(ActorSno._trout_tristramfield_field_gate, new Vector3D { X = 1444.1f, Y = 786.64f, Z = 39.7f }, 4.0f) as Door).Open(); } catch { }
SetActorOperable(world, ActorSno._keybox_trout_tristramfield_02, false);
SetActorOperable(world, ActorSno._keybox_trout_tristramfield, false);
ListenProximity(ActorSno._waypoint, new Advance());

8
src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActII.cs
View File

@ -96,7 +96,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem
OnAdvance = new Action(() => { //go through canyon
try
{
Door TDoor = (Game.GetWorld(WorldSno.caout_town).FindAt(ActorSno._a2dun_cald_exit_gate, new Vector3D { X = 2905.62f, Y = 1568.82f, Z = 250.75f }, 6.0f) as Door);
Door TDoor = (Game.GetWorld(WorldSno.caout_town).FindActorAt(ActorSno._a2dun_cald_exit_gate, new Vector3D { X = 2905.62f, Y = 1568.82f, Z = 250.75f }, 6.0f) as Door);
//ListenProximity(TDoor, )
TDoor.Open();
} catch { }
@ -926,7 +926,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem
var world = Game.GetWorld(WorldSno.a2dun_aqd_special_01);
Game.AddOnLoadWorldAction(WorldSno.a2dun_aqd_special_01, () =>
{
(world.FindAt(ActorSno._a2dun_aqd_act_stone_slab_a_01, new Vector3D { X = 175.1f, Y = 62.275f, Z = 50.17f }, 20.0f) as Door).Open();
(world.FindActorAt(ActorSno._a2dun_aqd_act_stone_slab_a_01, new Vector3D { X = 175.1f, Y = 62.275f, Z = 50.17f }, 20.0f) as Door).Open();
});
ListenInteract(ActorSno._a2dun_aqd_act_waterwheel_lever_a_01, 1, new CompleteObjective(0));
ListenInteract(ActorSno._a2dun_aqd_act_waterwheel_lever_b_01, 1, new Advance());
@ -948,7 +948,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem
Open(world, ActorSno._a2dun_aqd_act_stone_slab_a_01);
Open(world, ActorSno._a2dun_aqd_special_01_waterfall);
Open(world, ActorSno._a2dun_aqd_mainpuzzle_door);
(world.FindAt(ActorSno._a2dun_aqd_act_stone_slab_a_01, new Vector3D { X = 80.5f, Y = 155.631f, Z = 50.33f }, 20.0f) as Door).Open();
(world.FindActorAt(ActorSno._a2dun_aqd_act_stone_slab_a_01, new Vector3D { X = 80.5f, Y = 155.631f, Z = 50.33f }, 20.0f) as Door).Open();
});
//try {(this.Game.GetWorld(59486).FindAt(83629, new Vector3D{X = 80.5f, Y = 155.631f, Z = 50.33f}, 20.0f) as Door).Open();} catch {}
ListenTeleport(192694, new Advance());
@ -1365,7 +1365,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem
Objectives = new List<Objective> { Objective.Default() },
OnAdvance = new Action(() => { //todo: timed event 115494
var world = Game.GetWorld(WorldSno.caout_town);
try { (world.FindAt(ActorSno._a2dun_cald_exit_gate, new Vector3D { X = 3135.3f, Y = 1546.1f, Z = 250.545f }, 15.0f) as Door).Open(); } catch { }
try { (world.FindActorAt(ActorSno._a2dun_cald_exit_gate, new Vector3D { X = 3135.3f, Y = 1546.1f, Z = 250.545f }, 15.0f) as Door).Open(); } catch { }
foreach (var Ashe in world.GetActorsBySNO(ActorSno._asheara))
RemoveConversations(Ashe);
StartConversation(world, 178852);

6
src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActIII.cs
View File

@ -337,7 +337,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem
ListenConversation(134266, new Advance());
try
{
Game.GetWorld(WorldSno.a3dun_hub_keep).FindAt(ActorSno._a3dun_hub_drawbridge_01, new Vector3D { X = 127.121f, Y = 353.211f, Z = 0.22f }, 25f).Hidden = true;
Game.GetWorld(WorldSno.a3dun_hub_keep).FindActorAt(ActorSno._a3dun_hub_drawbridge_01, new Vector3D { X = 127.121f, Y = 353.211f, Z = 0.22f }, 25f).Hidden = true;
var world = Game.GetWorld(WorldSno.a3dun_keep_hub_inn);
var NStone = world.GetActorBySNO(ActorSno._a2dun_zolt_black_soulstone);//156328
foreach (var atr in world.GetActorsBySNO(ActorSno._leah))
@ -653,8 +653,8 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem
try
{
var world = Game.GetWorld(WorldSno.a3dun_crater_st_level04b);
(world.FindAt(ActorSno._a3dun_crater_st_demon_chainpylon_fire_mistressofpain, new Vector3D { X = 457.04f, Y = 359.03f, Z = 0.39f }, 20f) as Door).Open();
(world.FindAt(ActorSno._a3dun_crater_st_demon_chainpylon_fire_mistressofpain, new Vector3D { X = 356.04f, Y = 267.03f, Z = 0.28f }, 20f) as Door).Open();
(world.FindActorAt(ActorSno._a3dun_crater_st_demon_chainpylon_fire_mistressofpain, new Vector3D { X = 457.04f, Y = 359.03f, Z = 0.39f }, 20f) as Door).Open();
(world.FindActorAt(ActorSno._a3dun_crater_st_demon_chainpylon_fire_mistressofpain, new Vector3D { X = 356.04f, Y = 267.03f, Z = 0.28f }, 20f) as Door).Open();
SetActorOperable(world, ActorSno._a3dun_crater_st_giantdemonheart_mob, false);
}
catch { }

2
src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActV.cs
View File

@ -166,7 +166,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem
{
if (Game.CurrentQuest == 251355 && Game.CurrentStep == 14)
{
try { world.FindAt(ActorSno._x1_westm_door_cloister_locked, new Vector3D { X = 555.9f, Y = 403.47f, Z = 10.2f }, 5.0f).Destroy(); } catch { }
try { world.FindActorAt(ActorSno._x1_westm_door_cloister_locked, new Vector3D { X = 555.9f, Y = 403.47f, Z = 10.2f }, 5.0f).Destroy(); } catch { }
}
});
ListenKill(ActorSno._x1_skeleton_westmarch_a, 10, new Advance());

22
src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/OpenWorld.cs
View File

@ -122,31 +122,31 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem
NextStep = -1,
Objectives = new List<Objective> { Objective.Default() },
OnAdvance = new Action(() => { //complete
var NephalemWorld = Game.GetWorld(Game.WorldOfPortalNephalem);
var nephalem = Game.GetWorld(Game.WorldOfPortalNephalem);
ActorSystem.Actor BossOfPortal = null;
switch (Game.WorldOfPortalNephalem)
{
default:
List<MapSystem.Scene> Scenes = new List<MapSystem.Scene>();
foreach (var scene in NephalemWorld.Scenes.Values)
List<MapSystem.Scene> scenes = new List<MapSystem.Scene>();
foreach (var scene in nephalem.Scenes.Values)
{
if (!scene.SceneSNO.Name.ToLower().Contains("filler"))
Scenes.Add(scene);
scenes.Add(scene);
}
int SceneNum = Scenes.Count - DiIiS_NA.Core.Helpers.Math.RandomHelper.Next(0, 3);
Vector3D SSV = Scenes[SceneNum - 1].Position;
Vector3D SP = null;
int sceneNum = scenes.Count - DiIiS_NA.Core.Helpers.Math.RandomHelper.Next(0, 3);
Vector3D SSV = scenes[sceneNum - 1].Position;
Vector3D location = null;
while (true)
{
SP = new Vector3D(SSV.X + DiIiS_NA.Core.Helpers.Math.RandomHelper.Next(0, 240), SSV.Y + DiIiS_NA.Core.Helpers.Math.RandomHelper.Next(0, 240), SSV.Z);
if (NephalemWorld.CheckLocationForFlag(SP, DiIiS_NA.Core.MPQ.FileFormats.Scene.NavCellFlags.AllowWalk))
location = new Vector3D(SSV.X + DiIiS_NA.Core.Helpers.Math.RandomHelper.Next(0, 240), SSV.Y + DiIiS_NA.Core.Helpers.Math.RandomHelper.Next(0, 240), SSV.Z);
if (nephalem.CheckLocationForFlag(location, DiIiS_NA.Core.MPQ.FileFormats.Scene.NavCellFlags.AllowWalk))
break;
}
BossOfPortal = NephalemWorld.SpawnMonster(ActorSno._x1_lr_boss_mistressofpain, SP);
BossOfPortal = nephalem.SpawnMonster(ActorSno._x1_lr_boss_mistressofpain, location);
break;
}
ActiveArrow(NephalemWorld, BossOfPortal.SNO);
ActiveArrow(nephalem, BossOfPortal.SNO);
ListenKill(BossOfPortal.SNO, 1, new QuestEvents.SideAdvance());
})
});

38
src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestEvents/Implementations/Act II/SpawnSnakemans.cs
View File

@ -17,14 +17,14 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem.QuestEvents.Implementations
//if (world.Game.Empty) return;
//Logger.Trace("SpawnSnakemans event started");
var point = new Vector3D { X = 835.331f, Y = 410.121f, Z = 161.842f };
var snakemanHandle = new Core.Types.SNO.SNOHandle((int)ActorSno._khamsin_snakeman_melee);
var snakemanActor = snakemanHandle.Target as DiIiS_NA.Core.MPQ.FileFormats.Actor;
var snakeManHandle = new Core.Types.SNO.SNOHandle((int)ActorSno._khamsin_snakeman_melee);
var snakeManActor = snakeManHandle.Target as DiIiS_NA.Core.MPQ.FileFormats.Actor;
try
{
var guard_a = world.FindAt(ActorSno._caldeumguard_cleaver_a, point, 20.0f);
Vector3D guard_a_position = guard_a.Position;
guard_a.Destroy(); //world.Game.
world.Game.WorldGenerator.LoadActor(snakemanHandle,
var caldeumGuard = world.FindActorAt(ActorSno._caldeumguard_cleaver_a, point, 20.0f);
Vector3D guard_a_position = caldeumGuard.Position;
caldeumGuard.Destroy(); //world.Game.
world.Game.WorldGenerator.LoadActor(snakeManHandle,
new PRTransform()
{
Quaternion = new Quaternion()
@ -35,15 +35,15 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem.QuestEvents.Implementations
Vector3D = guard_a_position
},
world,
snakemanActor.TagMap);
snakeManActor.TagMap);
}
catch { }
try
{
var guard_b = world.FindAt(ActorSno._caldeumguard_cleaver_a, point, 20.0f);
Vector3D guard_b_position = guard_b.Position;
guard_b.Destroy();
world.Game.WorldGenerator.LoadActor(snakemanHandle,
var caldeumGuard = world.FindActorAt(ActorSno._caldeumguard_cleaver_a, point, 20.0f);
Vector3D caldeumGuardPosition = caldeumGuard.Position;
caldeumGuard.Destroy();
world.Game.WorldGenerator.LoadActor(snakeManHandle,
new PRTransform()
{
Quaternion = new Quaternion()
@ -51,18 +51,18 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem.QuestEvents.Implementations
W = 0.590017f,
Vector3D = new Vector3D(0, 0, 0)
},
Vector3D = guard_b_position
Vector3D = caldeumGuardPosition
},
world,
snakemanActor.TagMap);
snakeManActor.TagMap);
}
catch { }
try
{
var guard_c = world.FindAt(ActorSno._davydimpostor, point, 20.0f);
Vector3D guard_c_position = guard_c.Position;
guard_c.Destroy();
world.Game.WorldGenerator.LoadActor(snakemanHandle,
var davydImpostor = world.FindActorAt(ActorSno._davydimpostor, point, 20.0f);
Vector3D davydPosition = davydImpostor.Position;
davydImpostor.Destroy();
world.Game.WorldGenerator.LoadActor(snakeManHandle,
new PRTransform()
{
Quaternion = new Quaternion()
@ -70,10 +70,10 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem.QuestEvents.Implementations
W = 0.590017f,
Vector3D = new Vector3D(0, 0, 0)
},
Vector3D = guard_c_position
Vector3D = davydPosition
},
world,
snakemanActor.TagMap);
snakeManActor.TagMap);
}
catch { }
}

3
src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestEvents/StartSideQuest.cs
View File

@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
@ -23,7 +24,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem.QuestEvents
public override void Execute(MapSystem.World world)
{
Logger.Trace("StartSideQuest(): {0}", QuestId);
Logger.MethodTrace($"{QuestId}");
world.Game.QuestManager.LaunchSideQuest(QuestId, ForceAbandon);
}
}

2
src/DiIiS-NA/D3-GameServer/MessageSystem/Message/Definitions/Game/GameSetupMessageAck.cs
View File

@ -40,7 +40,7 @@ namespace DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Game
public void Handle(GameClient client)
{
Logger.Info("Client {0}, enter in game. Server loaded.", client.BnetClient.Account.BattleTag);
Logger.Info("Client $[underline]${0}$[/]$, joined game.", client.BnetClient.Account.Email);
}
}
}