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

start work on auto sell

Browse source
This commit is contained in:
SilicaAndPina 2021-03-20 16:48:44 +13:00
parent adc52f3b35
commit 770f078992
6 changed files with 94 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
DataCollection/gamedata.json
View file

@ -60,6 +60,7 @@
"player_here":"%USERNAME% here",
"no_telescope":"You do not have a telescope to use! You try making circles with your hands and placing them in front of one eye, but it is of minimal aid...",
"starved_horse":"You have been sent to Prison Isle for starving one of your horses! They have been fed for you.",
"message_queue":"<B>OFFLINE MESSAGE:</B>",
"events":{
"real_time_riddle":{
"event_start":"<B>CHAT RIDDLE:</B> %RIDDLETEXT% <I>(answer first via any chat method)</I>",
@ -218,6 +219,14 @@
"password_input":"<BR>^PLReply:|^PS14|ANSWER^R1",
"last_poet":"^LLast Player Poet:%USERNAME% ^R1",
"hammock":"You and all of your horses have fully rested.",
"auto_sell":{
"not_standing_sameplace":"You must be at the same place as the seller or at their ranch.",
"success":"Horse %HORSENAME% Purchase Completed!",
"insufficent_money":"You cannot afford that horse!",
"toomany_horses":"You do not have any room for another horse. Barns on your ranch allow for more horses.",
"you_sold":"<B>AUTO-SELL:</B> You sold your horse %HORSE% for %PRICE% to %USERNAME%!",
"brought_offline":"You sold your horse %HORSE% for $%PRICE% to %USERNAME%!"
},
"two_player":{
"other_player":"^LThe following other players are in the game room:^R1",
"player_name":"^T3%PLAYERNAME%",
@ -685,10 +694,6 @@
"llama_bucked":"Your inexperienced llama has become tired and <B>lain down</B>! (Llama gained 1exp)",
"camel_bucked":"Your inexperienced camel got frustrated and <B>spat angrily</B>, bumping you off! (Camel gained 1exp)",
"auto_sell_success":"Horse %HORSENAME% Purchase Completed!",
"auto_sell_insufficent_money":"You cannot afford that horse!",
"auto_sell_toomany_horses":"You do not have any room for another horse. Barns on your ranch allow for more horses.",
"uniter_time_over":"The %HOSRENAME%' time with you has ended. You were taken back to the Uniter.",
"allstats":{
"all_stats_header":"<B>All of your horses' complete stats:</B>",

8
Horse Isle Server/HorseIsleServer/Game/Messages.cs
View file

@ -10,6 +10,9 @@ namespace HISP.Game
{
public static int RequiredChatViolations;
// Message Queue
public static string MessageQueueHeader;
// Mod isle
public static string ModIsleMessage;
@ -677,6 +680,7 @@ namespace HISP.Game
public static string HorseProfileButtonFormat;
public static string HorseNoAutoSell;
public static string HorseAutoSellOthersFormat;
public static string HorseAutoSellFormat;
public static string HorseAutoSellPriceFormat;
public static string HorseCantAutoSellTacked;
@ -1994,6 +1998,10 @@ namespace HISP.Game
{
return HorseAutoSellPriceFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture));
}
public static string FormatAutoSellOthers(int price)
{
return HorseAutoSellOthersFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
}
public static string FormatAutoSell(string autoSellStr)
{
return HorseAutoSellFormat.Replace("%AUTOSELL%", autoSellStr);

6
Horse Isle Server/HorseIsleServer/Game/Meta.cs
View file

@ -2325,10 +2325,16 @@ namespace HISP.Game
message += Messages.R1;
}
}
else
{
if (horse.AutoSell > 0)
message += Messages.FormatAutoSellOthers(horse.AutoSell);
}
if (horse.Leaser == 0)
{
if (isMyHorse)
message += Messages.FormatHorseCategory(horse.Category, Messages.HorseMarkAsCategory);
else

59
Horse Isle Server/HorseIsleServer/Server/Database.cs
View file

@ -26,6 +26,7 @@ namespace HISP.Server
string ExtTable = "CREATE TABLE IF NOT EXISTS UserExt(Id INT, X INT, Y INT, LastLogin INT, Money INT, QuestPoints INT, BankBalance DOUBLE, BankInterest DOUBLE, ProfilePage Text(1028),IpAddress TEXT(1028),PrivateNotes Text(1028), CharId INT, ChatViolations INT,Subscriber TEXT(3), SubscribedUntil INT, Experience INT, Tiredness INT, Hunger INT, Thirst INT, FreeMinutes INT)";
string MailTable = "CREATE TABLE IF NOT EXISTS Mailbox(RandomId INT, IdTo INT, IdFrom INT, Subject TEXT(128), Message Text(1028), TimeSent INT, BeenRead TEXT(3))";
string BuddyTable = "CREATE TABLE IF NOT EXISTS BuddyList(Id INT, IdFriend INT)";
string MessageQueue = "CREATE TABLE IF NOT EXISTS MessageQueue(Id INT, Message TEXT(1028))";
string WorldTable = "CREATE TABLE World(Time INT, Day INT, Year INT, StartTime INT)";
string WeatherTable = "CREATE TABLE IF NOT EXISTS Weather(Area TEXT(1028), Weather TEXT(64))";
string InventoryTable = "CREATE TABLE IF NOT EXISTS Inventory(PlayerID INT, RandomID INT, ItemID INT, Data INT)";
@ -56,6 +57,17 @@ namespace HISP.Server
string SolvedRealTimeRiddle = "CREATE TABLE IF NOT EXISTS SolvedRealTimeRiddles(playerId INT, riddleId INT)";
string DeleteOnlineUsers = "DELETE FROM OnlineUsers";
try
{
MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = MessageQueue;
sqlCommand.ExecuteNonQuery();
sqlCommand.Dispose();
}
catch (Exception e)
{
Logger.WarnPrint(e.Message);
};
try
{
@ -543,6 +555,53 @@ namespace HISP.Server
}
}
public static void AddMessageToQueue(int userId, string message)
{
using (MySqlConnection db = new MySqlConnection(ConnectionString))
{
db.Open();
MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "INSERT INTO MessageQueue VALUES(@id,@message)";
sqlCommand.Parameters.AddWithValue("@id", userId);
sqlCommand.Parameters.AddWithValue("@message", message);
sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery();
sqlCommand.Dispose();
}
}
public static void ClearMessageQueue(int userId)
{
using (MySqlConnection db = new MySqlConnection(ConnectionString))
{
db.Open();
MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "DELETE FROM MessageQueue WHERE Id=@id";
sqlCommand.Parameters.AddWithValue("@id", userId);
sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery();
sqlCommand.Dispose();
}
}
public static string[] GetMessageQueue(int userId)
{
List<string> msgQueue = new List<string>();
using (MySqlConnection db = new MySqlConnection(ConnectionString))
{
db.Open();
MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "SELECT message FROM MessageQueue WHERE Id=@id";
sqlCommand.Parameters.AddWithValue("@id", userId);
sqlCommand.Prepare();
MySqlDataReader reader = sqlCommand.ExecuteReader();
while(reader.Read())
{
msgQueue.Add(reader.GetString(0));
}
sqlCommand.Dispose();
}
return msgQueue.ToArray();
}
public static void SetDressupRoomPeiceX(int roomId, int peiceId, int newX)
{
using (MySqlConnection db = new MySqlConnection(ConnectionString))

3
Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs
View file

@ -867,6 +867,8 @@ namespace HISP.Server
Messages.SocialTypeFormat = gameData.messages.meta.player_interaction.socials.socials_menu_type;
Messages.SocialPlayerNoLongerNearby = gameData.messages.meta.player_interaction.socials.no_longer_nearby;
// Message Queue
Messages.MessageQueueHeader = gameData.messages.message_queue;
// Events : Real Time Riddle
@ -1512,6 +1514,7 @@ namespace HISP.Server
Messages.HorseNoAutoSell = gameData.messages.meta.horse.horse_inventory.no_auto_sell;
Messages.HorseAutoSellPriceFormat = gameData.messages.meta.horse.horse_inventory.auto_sell_format;
Messages.HorseAutoSellOthersFormat = gameData.messages.meta.horse.horse_inventory.auto_sell_others;
Messages.HorseAutoSellFormat = gameData.messages.meta.horse.horse_inventory.auto_sell;
Messages.HorseCantAutoSellTacked = gameData.messages.meta.horse.horse_inventory.cannot_auto_sell_tacked;

9
Horse Isle Server/HorseIsleServer/Server/GameServer.cs
View file

@ -3286,6 +3286,15 @@ namespace HISP.Server
byte[] MotdData = PacketBuilder.CreateMotd();
sender.SendPacket(MotdData);
// Send Queued Messages
string[] queuedMessages = Database.GetMessageQueue(sender.LoggedinUser.Id);
foreach(string queuedMessage in queuedMessages)
{
byte[] msg = PacketBuilder.CreateChat(Messages.MessageQueueHeader+queuedMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(msg);
}
Database.ClearMessageQueue(sender.LoggedinUser.Id);
}
public static void OnSwfModuleCommunication(GameClient sender, byte[] packet)