Skip to content

Commit

Permalink
More refactoring.. Rewards & some rooms.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sledmore
Sledmore committed Dec 18, 2017
1 parent 7f9c1a6 commit b3c4ded
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 78 deletions.
29 changes: 13 additions & 16 deletions Core/FigureData/FigureDataManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ public class FigureDataManager

public FigureDataManager()
{
this._palettes = new Dictionary<int, Palette>();
this._setTypes = new Dictionary<string, FigureSet>();
_palettes = new Dictionary<int, Palette>();
_setTypes = new Dictionary<string, FigureSet>();

this._requirements = new List<string>();

this._requirements.Add("hd");
this._requirements.Add("ch");
this._requirements.Add("lg");
_requirements = new List<string>
{
"hd",
"ch",
"lg"
};
}

public void Init()
Expand Down Expand Up @@ -102,15 +103,13 @@ public string ProcessFigure(string figure, string gender, ICollection<ClothingPa
{
string type = part.Split('-')[0];

FigureSet figureSet = null;
if (this._setTypes.TryGetValue(type, out figureSet))
if (this._setTypes.TryGetValue(type, out FigureSet figureSet))
{
int partId = Convert.ToInt32(part.Split('-')[1]);
int colorId = 0;
int secondColorId = 0;

Set set = null;
if (figureSet.Sets.TryGetValue(partId, out set))
if (figureSet.Sets.TryGetValue(partId, out Set set))
{
#region Gender Check
if (set.Gender != gender && set.Gender != "U")
Expand Down Expand Up @@ -230,15 +229,14 @@ public string ProcessFigure(string figure, string gender, ICollection<ClothingPa
#endregion

#region Check Required Clothing
foreach (string requirement in this._requirements)
foreach (string requirement in _requirements)
{
if (!rebuildFigure.Contains(requirement))
{
if (requirement == "ch" && gender == "M")
continue;

FigureSet figureSet = null;
if (this._setTypes.TryGetValue(requirement, out figureSet))
if (_setTypes.TryGetValue(requirement, out FigureSet figureSet))
{
Set set = figureSet.Sets.FirstOrDefault(x => x.Value.Gender == gender || x.Value.Gender == "U").Value;
if (set != null)
Expand Down Expand Up @@ -268,8 +266,7 @@ public string ProcessFigure(string figure, string gender, ICollection<ClothingPa
{
string type = part.Split('-')[0];

FigureSet figureSet = null;
if (this._setTypes.TryGetValue(type, out figureSet))
if (this._setTypes.TryGetValue(type, out FigureSet figureSet))
{
Set set = figureSet.Sets.FirstOrDefault(x => x.Value.Gender == gender || x.Value.Gender == "U").Value;
if (set != null)
Expand Down
7 changes: 1 addition & 6 deletions HabboHotel/Game.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using log4net;

using Plus.Communication.Packets;
using Plus.Communication.Packets;
using Plus.HabboHotel.GameClients;
using Plus.HabboHotel.Moderation;
using Plus.HabboHotel.Catalog;
Expand All @@ -27,14 +25,11 @@
using System.Threading;
using System.Threading.Tasks;
using Plus.Core;
using Plus.Core.Language;

namespace Plus.HabboHotel
{
public class Game
{
private static readonly ILog log = LogManager.GetLogger("Plus.HabboHotel.Game");

private readonly PacketManager _packetManager;
private readonly GameClientManager _clientManager;
private readonly ModerationManager _moderationManager;
Expand Down
22 changes: 13 additions & 9 deletions HabboHotel/Rewards/Reward.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,23 @@ public class Reward
public RewardType Type { get; set; }
public string RewardData { get; set; }
public string Message { get; set; }
public Reward(double Start, double End, string Type, string RewardData, string Message)

public Reward(double start, double end, string type, string rewardData, string message)
{
this.RewardStart = Start;
this.RewardEnd = End;
this.Type = RewardTypeUtility.GetType(Type);
this.RewardData = RewardData;
this.Message = Message;
RewardStart = start;
RewardEnd = end;
Type = RewardTypeUtility.GetType(type);
RewardData = rewardData;
Message = message;
}

public bool isActive()
public bool Active
{
double Now = UnixTimestamp.GetNow();
return (Now >= RewardStart && Now <= RewardEnd);
get
{
double Now = UnixTimestamp.GetNow();
return (Now >= RewardStart && Now <= RewardEnd);
}
}
}
}
2 changes: 1 addition & 1 deletion HabboHotel/Rewards/RewardManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void CheckRewards(GameClient Session)
if (this.HasReward(Session.GetHabbo().Id, Id))
continue;

if (Reward.isActive())
if (Reward.Active)
{
switch (Reward.Type)
{
Expand Down
12 changes: 3 additions & 9 deletions HabboHotel/Rewards/RewardTypeUtility.cs
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Plus.HabboHotel.Rewards
namespace Plus.HabboHotel.Rewards
{
public class RewardTypeUtility
{
public static RewardType GetType(string Type)
public static RewardType GetType(string type)
{
switch (Type.ToLower())
switch (type.ToLower())
{
case "badge":
return RewardType.Badge;
Expand Down
66 changes: 29 additions & 37 deletions HabboHotel/Rooms/RoomManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,23 +149,17 @@ public bool TryGetModel(string Id, out RoomModel Model)
return this._roomModels.TryGetValue(Id, out Model);
}

public void UnloadRoom(Room Room, bool RemoveData = false)
public void UnloadRoom(Room room)
{
if (Room == null)
if (room == null)
return;

Room room = null;
if (this._rooms.TryRemove(Room.RoomId, out room))
if (this._rooms.TryRemove(room.RoomId, out Room r))
{
Room.Dispose();
room.Dispose();

if (RemoveData)
{
RoomData Data = null;
this._loadedRoomData.TryRemove(Room.Id, out Data);
}
_loadedRoomData.TryRemove(room.Id, out RoomData Data);
}
//Logging.WriteLine("[RoomMgr] Unloaded room: \"" + Room.Name + "\" (ID: " + Room.RoomId + ")");
}

public List<RoomData> SearchGroupRooms(string Query)
Expand Down Expand Up @@ -350,42 +344,42 @@ orderby RoomInstance.Value.RoomData.UsersNow descending
return null;
}

public RoomModel GetModel(string Model)
public RoomModel GetModel(string model)
{
if (_roomModels.ContainsKey(Model))
return (RoomModel)_roomModels[Model];
if (_roomModels.ContainsKey(model))
return (RoomModel)_roomModels[model];

return null;
}

public RoomData GenerateRoomData(int RoomId)
public RoomData GenerateRoomData(int roomId)
{
if (_loadedRoomData.ContainsKey(RoomId))
return (RoomData)_loadedRoomData[RoomId];
if (_loadedRoomData.ContainsKey(roomId))
return (RoomData)_loadedRoomData[roomId];

RoomData Data = new RoomData();
RoomData data = new RoomData();

Room Room;
Room room;

if (TryGetRoom(RoomId, out Room))
return Room.RoomData;
if (TryGetRoom(roomId, out room))
return room.RoomData;

DataRow Row = null;
using (IQueryAdapter dbClient = PlusEnvironment.GetDatabaseManager().GetQueryReactor())
{
dbClient.SetQuery("SELECT * FROM rooms WHERE id = " + RoomId + " LIMIT 1");
dbClient.SetQuery("SELECT * FROM rooms WHERE id = " + roomId + " LIMIT 1");
Row = dbClient.GetRow();
}

if (Row == null)
return null;

Data.Fill(Row);
data.Fill(Row);

if (!_loadedRoomData.ContainsKey(RoomId))
_loadedRoomData.TryAdd(RoomId, Data);
if (!_loadedRoomData.ContainsKey(roomId))
_loadedRoomData.TryAdd(roomId, data);

return Data;
return data;
}

public RoomData FetchRoomData(int RoomId, DataRow dRow)
Expand All @@ -404,23 +398,21 @@ public RoomData FetchRoomData(int RoomId, DataRow dRow)
}
}

public Room LoadRoom(int Id)
public Room LoadRoom(int id)
{
Room Room = null;

if (TryGetRoom(Id, out Room))
return Room;
if (TryGetRoom(id, out Room room))
return room;

RoomData Data = GenerateRoomData(Id);
if (Data == null)
RoomData data = GenerateRoomData(id);
if (data == null)
return null;

Room = new Room(Data);
room = new Room(data);

if (!_rooms.ContainsKey(Room.RoomId))
_rooms.TryAdd(Room.RoomId, Room);
if (!_rooms.ContainsKey(room.RoomId))
_rooms.TryAdd(room.RoomId, room);

return Room;
return room;
}

public bool TryGetRoom(int RoomId, out Room Room)
Expand Down

0 comments on commit b3c4ded

Please sign in to comment.