IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 21:25:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add equip / remove equp options for CompetitionGear

Browse source
This commit is contained in:
SilicaAndPina 2020-12-23 02:33:14 +13:00
parent 1ed1dd50f1
commit 10b768e82e
9 changed files with 160 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
DataCollection/gamedata.json
View file

@ -10,6 +10,10 @@
"drawing_notice":"Drawing not sent to other players when you are not a subscriber.",
"click_nothing_message":"Nothing interesting here...",
"playtime_timeout":"You have run out of playtime for now. In one minute you will be disconnected. You gain one minute of playtime every 8 minutes. Please come back later!",
"competition_gear":{
"removed_competition_gear":"You removed selected competition gear.",
"equip_competition_gear_format":"The %ITEM% are now selected as competition gear."
},
"sec_code":{
"invalid_sec_code":"Data Code Error. You did not get the bonus. You should reconnect if you get this message again.",
"item_earned":"You Earned a %ITEM%!"
@ -138,7 +142,6 @@
"npc_talk_button":"^BA%ID%"
},
"inventory":{
"equip_format":"The %ITEM% are now selected as competition gear.",
"header_format":"^ATYour Inventory^H<B>You are carrying the following %ITEMCOUNT% different items:</B> (%MAXITEMS% max)",
"item_entry":"^I%ICONID%^T4(%COUNT%) %TITLE%",
"shop_entry":"^I%ICONID%^T4(%COUNT%) %TITLE% $%PRICE%",

22
Horse Isle Server/Horse Isle Server/Game/Messages.cs
View file

@ -41,6 +41,7 @@ namespace HISP.Game
public static string NoJewerlyEquipped;
public static string NoCompetitionGear;
public static string CompetitionGearSelected;
// Announcements
public static string NewUserMessage;
@ -105,9 +106,12 @@ namespace HISP.Game
public static string ItemInformationFormat;
// Competition Gear
public static string EquipItemFormat;
public static string UnequipItem;
// Inventory
public static string InventoryItemFormat;
public static string EquipItemFormat;
public static string InventoryHeaderFormat;
public static string ItemDropButton;
@ -188,6 +192,22 @@ namespace HISP.Game
// Click
public static string NothingInterestingHere;
public static string FormatCompetitionGearHead(string itemName, int icon)
{
return CompetitionGearHeadFormat.Replace("%ITEM%", itemName).Replace("%ICON%",icon.ToString());
}
public static string FormatCompetitionGearBody(string itemName, int icon)
{
return CompetitionGearBodyFormat.Replace("%ITEM%", itemName).Replace("%ICON%", icon.ToString());
}
public static string FormatCompetitionGearLegs(string itemName, int icon)
{
return CompetitionGearLegsFormat.Replace("%ITEM%", itemName).Replace("%ICON%", icon.ToString());
}
public static string FormatCompetitionGearFeet(string itemName, int icon)
{
return CompetitionGearFeetFormat.Replace("%ITEM%", itemName).Replace("%ICON%", icon.ToString());
}
public static string FormatStatsBar(string username)
{
return StatsBarFormat.Replace("%USERNAME%", username);

20
Horse Isle Server/Horse Isle Server/Game/Meta.cs
View file

@ -221,9 +221,23 @@ namespace HISP.Game
{
return Messages.NoJewerlyEquipped;
}
public static string BuildWornCompaionEquip(User user)
public static string BuildEquippedCompetitionGear(User user)
{
return Messages.NoCompetitionGear;
string message = Messages.CompetitionGearSelected;
if (user.EquipedCompetitionGear.Head != null)
message += Messages.FormatCompetitionGearHead(user.EquipedCompetitionGear.Head.Name, user.EquipedCompetitionGear.Head.IconId);
if (user.EquipedCompetitionGear.Body != null)
message += Messages.FormatCompetitionGearBody(user.EquipedCompetitionGear.Body.Name, user.EquipedCompetitionGear.Body.IconId);
if (user.EquipedCompetitionGear.Legs != null)
message += Messages.FormatCompetitionGearLegs(user.EquipedCompetitionGear.Legs.Name, user.EquipedCompetitionGear.Legs.IconId);
if (user.EquipedCompetitionGear.Feet != null)
message += Messages.FormatCompetitionGearFeet(user.EquipedCompetitionGear.Feet.Name, user.EquipedCompetitionGear.Feet.IconId);
if (message == Messages.CompetitionGearSelected)
message = Messages.NoCompetitionGear;
return message;
}
public static string BuildStatsMenu(User user)
{
@ -242,7 +256,7 @@ namespace HISP.Game
message += Messages.FormatTiredStat("Not implemented yet :3");
message += Messages.FormatGenderStat(user.Gender);
message += Messages.FormatJewelryStat(BuildWornJewelery(user));
message += Messages.FormatCompetitionGearStat(BuildWornCompaionEquip(user));
message += Messages.FormatCompetitionGearStat(BuildEquippedCompetitionGear(user));
message += Messages.StatsPrivateNotes;
message += Messages.StatsQuests;
message += Messages.StatsMinigameRanking;

29
Horse Isle Server/Horse Isle Server/Player/CompetitionGear.cs
View file

@ -10,6 +10,11 @@ namespace HISP.Player
{
class CompetitionGear
{
public const int MISC_FLAG_HEAD = 1;
public const int MISC_FLAG_BODY = 2;
public const int MISC_FLAG_LEGS = 3;
public const int MISC_FLAG_FEET = 4;
private int playerId;
public CompetitionGear(int PlayerId)
{
@ -41,6 +46,12 @@ namespace HISP.Player
}
set
{
if (value == null)
{
head = null;
Database.SetCompetitionGearHeadPeice(playerId, 0);
return;
}
Database.SetCompetitionGearHeadPeice(playerId, value.Id);
head = value;
}
@ -53,6 +64,12 @@ namespace HISP.Player
}
set
{
if (value == null)
{
body = null;
Database.SetCompetitionGearBodyPeice(playerId, 0);
return;
}
Database.SetCompetitionGearBodyPeice(playerId, value.Id);
body = value;
}
@ -65,6 +82,12 @@ namespace HISP.Player
}
set
{
if (value == null)
{
legs = null;
Database.SetCompetitionGearLegPeice(playerId, 0);
return;
}
Database.SetCompetitionGearLegPeice(playerId, value.Id);
legs = value;
}
@ -77,6 +100,12 @@ namespace HISP.Player
}
set
{
if (value == null)
{
feet = null;
Database.SetCompetitionGearFeetPeice(playerId, 0);
return;
}
Database.SetCompetitionGearFeetPeice(playerId, value.Id);
feet = value;
}

2
Horse Isle Server/Horse Isle Server/Player/User.cs
View file

@ -56,7 +56,7 @@ namespace HISP.Player
return true;
int Timestamp = Convert.ToInt32(new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds());
if(Timestamp > subscribedUntil) // sub expired.
if(Timestamp > subscribedUntil && subscribed) // sub expired.
{
Logger.InfoPrint(Username + "'s Subscription expired. (timestamp now: " + Timestamp + " exp date: " + subscribedUntil+" )");
Database.SetUserSubscriptionStatus(this.Id, false);

4
Horse Isle Server/Horse Isle Server/Server/Database.cs
View file

@ -593,7 +593,7 @@ namespace HISP.Server
sqlCommand.CommandText = "SELECT Gender FROM users WHERE Id=@playerId";
sqlCommand.Parameters.AddWithValue("@playerId", playerId);
sqlCommand.Prepare();
string gender = (string)(sqlCommand.ExecuteScalar());
string gender = sqlCommand.ExecuteScalar().ToString();
sqlCommand.Dispose();
return gender;
@ -687,7 +687,7 @@ namespace HISP.Server
sqlCommand.CommandText = "SELECT Subscriber FROM userExt WHERE Id=@playerId";
sqlCommand.Parameters.AddWithValue("@playerId", playerId);
sqlCommand.Prepare();
bool subscribed = (string)(sqlCommand.ExecuteScalar()) == "YES";
bool subscribed = sqlCommand.ExecuteScalar().ToString() == "YES";
sqlCommand.Dispose();
return subscribed;

7
Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs
View file

@ -421,6 +421,7 @@ namespace HISP.Server
Messages.NoJewerlyEquipped = gameData.messages.meta.stats_page.msg.no_jewelry_equipped;
Messages.NoCompetitionGear = gameData.messages.meta.stats_page.msg.no_competition_gear;
Messages.CompetitionGearSelected = gameData.messages.meta.stats_page.msg.competition_gear_selected;
// Transport
@ -588,7 +589,11 @@ namespace HISP.Server
// Inventory
Messages.DefaultInventoryMax = gameData.item.max_carryable;
Messages.EquipItemFormat = gameData.messages.meta.inventory.equip_format;
// Competition Gear
Messages.EquipItemFormat = gameData.messages.competition_gear.equip_competition_gear_format;
Messages.UnequipItem = gameData.messages.competition_gear.removed_competition_gear;
// Click
Messages.NothingInterestingHere = gameData.messages.click_nothing_message;

90
Horse Isle Server/Horse Isle Server/Server/GameServer.cs
View file

@ -166,9 +166,7 @@ namespace HISP.Server
byte method = packet[1];
if(method == PacketBuilder.PACKET_CLIENT_TERMINATOR)
{
string metaWind = Meta.BuildStatsMenu(sender.LoggedinUser);
byte[] statsPacket = PacketBuilder.CreateMetaPacket(metaWind);
sender.SendPacket(statsPacket);
UpdateStats(sender);
}
if (method == PacketBuilder.VIEW_PROFILE)
{
@ -796,13 +794,69 @@ namespace HISP.Server
return;
}
break;
case PacketBuilder.ITEM_REMOVE:
char toRemove = (char)packet[2];
switch(toRemove)
{
case '1':
if(sender.LoggedinUser.EquipedCompetitionGear.Head != null)
{
ItemInstance itemInstance = new ItemInstance(sender.LoggedinUser.EquipedCompetitionGear.Head.Id);
sender.LoggedinUser.Inventory.AddIgnoringFull(itemInstance);
sender.LoggedinUser.EquipedCompetitionGear.Head = null;
}
else
{
Logger.HackerPrint(sender.LoggedinUser.Username + " Attempted to remove competition gear when none was equipped.");
}
break;
case '2':
if (sender.LoggedinUser.EquipedCompetitionGear.Body != null)
{
ItemInstance itemInstance = new ItemInstance(sender.LoggedinUser.EquipedCompetitionGear.Body.Id);
sender.LoggedinUser.Inventory.AddIgnoringFull(itemInstance);
sender.LoggedinUser.EquipedCompetitionGear.Body = null;
}
else
{
Logger.HackerPrint(sender.LoggedinUser.Username + " Attempted to remove competition gear when none was equipped.");
}
break;
case '3':
if (sender.LoggedinUser.EquipedCompetitionGear.Legs != null)
{
ItemInstance itemInstance = new ItemInstance(sender.LoggedinUser.EquipedCompetitionGear.Legs.Id);
sender.LoggedinUser.Inventory.AddIgnoringFull(itemInstance);
sender.LoggedinUser.EquipedCompetitionGear.Legs = null;
}
else
{
Logger.HackerPrint(sender.LoggedinUser.Username + " Attempted to remove competition gear when none was equipped.");
}
break;
case '4':
if (sender.LoggedinUser.EquipedCompetitionGear.Feet != null)
{
ItemInstance itemInstance = new ItemInstance(sender.LoggedinUser.EquipedCompetitionGear.Feet.Id);
sender.LoggedinUser.Inventory.AddIgnoringFull(itemInstance);
sender.LoggedinUser.EquipedCompetitionGear.Feet = null;
}
else
{
Logger.HackerPrint(sender.LoggedinUser.Username + " Attempted to remove competition gear when none was equipped.");
}
break;
default:
Logger.InfoPrint(sender.LoggedinUser.Username + "Unimplemented \"remove worn item\" ItemInteraction packet: " + BitConverter.ToString(packet).Replace("-", " "));
break;
}
byte[] itemRemovedMessage = PacketBuilder.CreateChat(Messages.UnequipItem, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(itemRemovedMessage);
UpdateStats(sender);
break;
case PacketBuilder.ITEM_WEAR:
const int MISC_FLAG_HEAD = 1;
const int MISC_FLAG_BODY = 2;
const int MISC_FLAG_LEGS = 3;
const int MISC_FLAG_FEET = 4;
packetStr = Encoding.UTF8.GetString(packet);
randomIdStr = packetStr.Substring(2, packet.Length - 2);
randomId = 0;
@ -829,7 +883,7 @@ namespace HISP.Server
}
switch(itemInf.MiscFlags[0])
{
case MISC_FLAG_HEAD:
case CompetitionGear.MISC_FLAG_HEAD:
if(sender.LoggedinUser.EquipedCompetitionGear.Head == null)
sender.LoggedinUser.EquipedCompetitionGear.Head = itemInf;
else
@ -839,7 +893,7 @@ namespace HISP.Server
sender.LoggedinUser.EquipedCompetitionGear.Head = itemInf;
}
break;
case MISC_FLAG_BODY:
case CompetitionGear.MISC_FLAG_BODY:
if (sender.LoggedinUser.EquipedCompetitionGear.Body == null)
sender.LoggedinUser.EquipedCompetitionGear.Body = itemInf;
else
@ -849,7 +903,7 @@ namespace HISP.Server
sender.LoggedinUser.EquipedCompetitionGear.Body = itemInf;
}
break;
case MISC_FLAG_LEGS:
case CompetitionGear.MISC_FLAG_LEGS:
if (sender.LoggedinUser.EquipedCompetitionGear.Legs == null)
sender.LoggedinUser.EquipedCompetitionGear.Legs = itemInf;
else
@ -859,7 +913,7 @@ namespace HISP.Server
sender.LoggedinUser.EquipedCompetitionGear.Legs = itemInf;
}
break;
case MISC_FLAG_FEET:
case CompetitionGear.MISC_FLAG_FEET:
if (sender.LoggedinUser.EquipedCompetitionGear.Feet == null)
sender.LoggedinUser.EquipedCompetitionGear.Feet = itemInf;
else
@ -1428,6 +1482,7 @@ namespace HISP.Server
}
return count;
}
public static int GetNumberOfAdminsOnline()
{
int count = 0;
@ -1539,6 +1594,17 @@ namespace HISP.Server
forClient.SendPacket(AreaMessage);
forClient.LoggedinUser.MetaPriority = false;
}
public static void UpdateStats(GameClient client)
{
if (!client.LoggedIn)
return;
client.LoggedinUser.MetaPriority = true;
string metaWind = Meta.BuildStatsMenu(client.LoggedinUser);
byte[] statsPacket = PacketBuilder.CreateMetaPacket(metaWind);
client.SendPacket(statsPacket);
}
/*

3
Horse Isle Server/Horse Isle Server/Server/PacketBuilder.cs
View file

@ -29,7 +29,6 @@ namespace HISP.Server
public const byte PACKET_KEEP_ALIVE = 0x7C;
public const byte PACKET_PLAYER = 0x18;
public const byte PACKET_INVENTORY = 0x17;
public const byte ITEM_WEAR = 0x46;
public const byte PACKET_TRANSPORT = 0x29;
public const byte PACKET_KICK = 0x80;
public const byte PACKET_LEAVE = 0x7D;
@ -78,6 +77,8 @@ namespace HISP.Server
public const byte ITEM_BUY_25 = 0x37;
public const byte ITEM_SELL = 0x3C;
public const byte ITEM_SELL_ALL = 0x3D;
public const byte ITEM_WEAR = 0x46;
public const byte ITEM_REMOVE = 0x47;
public const byte ITEM_BINOCULARS = 0x5C;
public const byte ITEM_MAGNIFYING = 0x5D;
public const byte ITEM_RAKE = 0x5B;