SoDOff-Project/sodoff-mmo
1
0
Fork 1
mirror of https://github.com/SoDOff-Project/sodoff-mmo.git synced 2025-10-11 08:18:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Moved ambassador room controlling to seperate class.

Browse Source
This commit is contained in:
Hipposgrumm 2024-12-29 14:10:32 -07:00
parent 0a6b767c62
commit c26153003f
4 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CommandHandlers/CounterHandler.cs
View File

@ -7,7 +7,7 @@ namespace sodoffmmo.CommandHandlers;
[ExtensionCommandHandler("SCE")]
class CounterEventHandler : CommandHandler {
public override Task Handle(Client client, NetworkObject receivedObject) { // {"a":13,"c":1,"p":{"c":"SCE","p":{"NAME":"COUNT"},"r":-1}}
if (client.Room?.HasAmbassador() is bool b && b) {
if (client.Room is AmbassadorRoom room) {
string name = receivedObject.Get<NetworkObject>("p").Get<string>("NAME");
if (name == "COUNT" || name == "COUNT2" || name == "COUNT3") {
int index = name switch {
@ -15,10 +15,12 @@ class CounterEventHandler : CommandHandler {
"COUNT2" => 1,
"COUNT3" => 2
};
client.Room.ambassadorGauges[index] = Math.Min(100, client.Room.ambassadorGauges[index]+(1/Configuration.ServerConfiguration.AmbassadorGaugePlayers));
client.Room.Send(Utils.VlNetworkPacket(client.Room.AddAmbassadorData(new()), client.Room.Id));
room.ambassadorGauges[index] = Math.Min(100, room.ambassadorGauges[index]+(1/Configuration.ServerConfiguration.AmbassadorGaugePlayers));
NetworkArray vars = new();
room.AddRoomData(vars);
room.Send(Utils.VlNetworkPacket(vars, client.Room.Id));
} else {
Console.WriteLine("Invalid attempt to increment room var "+name+".");
Console.WriteLine($"Invalid attempt to increment room var {name} in {room.Name}.");
}
}

33
src/Core/AmbassadorRoom.cs Normal file
View File

@ -0,0 +1,33 @@
using sodoffmmo.Data;
namespace sodoffmmo.Core;
public class AmbassadorRoom : Room {
public double[] ambassadorGauges;
readonly System.Timers.Timer? ambassadorTimer;
public AmbassadorRoom(string name) : base(name) {
Console.WriteLine($"Setup Ambassador for {name}");
ambassadorGauges = new double[3]; // There is always a maximum of 3.
for (int i=0;i<3;i++) ambassadorGauges[i] = Configuration.ServerConfiguration.AmbassadorGaugeStart;
ambassadorTimer = new(Configuration.ServerConfiguration.AmbassadorGaugeDecayRate * 1000) {
AutoReset = true,
Enabled = true
};
ambassadorTimer.Elapsed += (sender, e) => {
if (!Configuration.ServerConfiguration.AmbassadorGaugeDecayOnlyWhenInRoom || clients.Count > 0) {
for (int i=0;i<3;i++) ambassadorGauges[i] = Math.Max(0, ambassadorGauges[i]-1);
NetworkArray vars = new();
AddRoomData(vars);
Send(Utils.VlNetworkPacket(vars, Id));
}
};
}
internal override void AddRoomData(NetworkArray vars) {
base.AddRoomData(vars);
vars.Add(NetworkArray.VlElement("COUNT", (int)Math.Round(ambassadorGauges[0]), isPersistent: true));
vars.Add(NetworkArray.VlElement("COUNT2", (int)Math.Round(ambassadorGauges[1]), isPersistent: true));
vars.Add(NetworkArray.VlElement("COUNT3", (int)Math.Round(ambassadorGauges[2]), isPersistent: true));
}
}

49
src/Core/Room.cs
View File

@ -7,7 +7,7 @@ public class Room {
static object RoomsListLock = new object();
protected static Dictionary<string, Room> rooms = new();
List<Client> clients = new();
protected List<Client> clients = new();
protected object roomLock = new object();
public int Id { get; private set; }
@ -82,8 +82,10 @@ public class Room {
public static Room GetOrAdd(string name, bool autoRemove = false) {
lock(RoomsListLock) {
if (!Room.Exists(name))
if (!Room.Exists(name)) {
if (Configuration.ServerConfiguration.AmbassadorRooms.Contains(name)) return new AmbassadorRoom(name);
return new Room(name, autoRemove: autoRemove);
}
return rooms[name];
}
}
@ -111,7 +113,10 @@ public class Room {
roomInfo.Add(false); // is password protected
roomInfo.Add((short)clients.Count); // player count
roomInfo.Add((short)4096); // max player count
roomInfo.Add(AddAmbassadorData(RoomVariables)); // variables
NetworkArray roomVars = new();
AddRoomData(roomVars);
for (int i=0;i<RoomVariables.Length;i++) roomVars.Add(RoomVariables[i]);
roomInfo.Add(roomVars); // variables (plus added data)
roomInfo.Add((short)0); // spectator count
roomInfo.Add((short)0); // max spectator count
@ -143,7 +148,9 @@ public class Room {
r1.Add(false);
r1.Add((short)clients.Count); // player count
r1.Add((short)4096); // max player count
r1.Add(AddAmbassadorData(new()));
NetworkArray vars = new();
AddRoomData(vars);
r1.Add(vars);
r1.Add((short)0);
r1.Add((short)0);
@ -154,35 +161,11 @@ public class Room {
return NetworkObject.WrapObject(0, 15, obj).Serialize();
}
public double[] ambassadorGauges;
System.Timers.Timer? ambassadorTimer;
public bool HasAmbassador() {
return ambassadorTimer != null;
}
public void InitAmbassador() {
ambassadorGauges = new double[3]; // There is always a maximum of 3.
for (int i=0;i<3;i++) ambassadorGauges[i] = Configuration.ServerConfiguration.AmbassadorGaugeStart;
ambassadorTimer = new System.Timers.Timer(Configuration.ServerConfiguration.AmbassadorGaugeDecayRate*1000);
ambassadorTimer.AutoReset = true;
ambassadorTimer.Enabled = true;
ambassadorTimer.Elapsed += (sender, e) => {
if (!Configuration.ServerConfiguration.AmbassadorGaugeDecayOnlyWhenInRoom || clients.Count > 0) {
for (int i=0;i<3;i++) ambassadorGauges[i] = Math.Max(0, ambassadorGauges[i]-1);
Send(Utils.VlNetworkPacket(AddAmbassadorData(new()), Id));
}
};
}
internal NetworkArray AddAmbassadorData(NetworkArray array) {
if (HasAmbassador()) { // If this isn't null that means ambassadors are initialized.
array.Add(NetworkArray.VlElement("COUNT", (int)Math.Round(ambassadorGauges[0]), isPersistent: true));
array.Add(NetworkArray.VlElement("COUNT2", (int)Math.Round(ambassadorGauges[1]), isPersistent: true));
array.Add(NetworkArray.VlElement("COUNT3", (int)Math.Round(ambassadorGauges[2]), isPersistent: true));
}
return array;
}
/// <summary>
/// Add extra data for the client to recieve upon joining the room.
/// </summary>
/// <param name="vars">Existing room variables.</param>
internal virtual void AddRoomData(NetworkArray vars) {}
private int alertId = -1;
private Random random = new Random();

5
src/Server.cs
View File

@ -42,11 +42,6 @@ public class Server {
}
}
foreach (var room in Configuration.ServerConfiguration.AmbassadorRooms) {
Console.WriteLine($"Setup Ambassador for {room}");
Room.GetOrAdd(room).InitAmbassador();
}
await Listen(listener);
}