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

Add mods revenge

Browse source
This commit is contained in:
SilicaAndPina 2021-05-11 22:14:35 +12:00
parent 291b6e5292
commit 5fedb7841d
7 changed files with 233 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4042,6 +4042,25 @@ namespace HISP.Server
return instances;
}
}
public static int[] GetModsAndAdmins()
{
List<int> userList = new List<int>();
using (MySqlConnection db = new MySqlConnection(ConnectionString))
{
db.Open();
MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "SELECT id FROM Users WHERE Moderator=\"YES\" AND Admin=\"YES\"";
MySqlDataReader reader = sqlCommand.ExecuteReader();
while (reader.Read())
{
userList.Add(reader.GetInt32(0));
}
sqlCommand.Dispose();
}
return userList.ToArray();
}
public static int[] GetUsers()
{
List<int> userList = new List<int>();

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

@ -964,10 +964,16 @@ namespace HISP.Server
// Message Queue
Messages.MessageQueueHeader = gameData.messages.message_queue;
// Events : Mods Revenge
Messages.EventStartModsRevenge = gameData.messages.events.mods_revenge.event_start;
Messages.EventEndModsRevenge = gameData.messages.events.mods_revenge.event_end;
// Events : Isle Trading Game
Messages.EventStartIsleTradingGame = gameData.messages.events.isle_card_trading_game.event_start;
Messages.EventDisqualifiedIsleTradingGame = gameData.messages.events.isle_card_trading_game.event_disqualified;
Messages.EventOnlyOneTypeIsleTradingGame = gameData.messages.events.isle_card_trading_game.event_one_type;
Messages.EventOnlyTwoTypeIsleTradingGame = gameData.messages.events.isle_card_trading_game.event_two_type;
Messages.EventOnlyThreeTypeIsleTradingGame = gameData.messages.events.isle_card_trading_game.event_three_type;
Messages.EventNoneIsleTradingGame = gameData.messages.events.isle_card_trading_game.event_no_cards;
Messages.EventWonIsleTradingGame = gameData.messages.events.isle_card_trading_game.event_win;

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

@ -44,6 +44,7 @@ namespace HISP.Server
public static RealTimeQuiz QuizEvent = null;
public static WaterBalloonGame WaterBalloonEvent = new WaterBalloonGame();
public static IsleCardTradingGame IsleCardTrading;
public static ModsRevenge ModsRevengeEvent = new ModsRevenge();
/*
* Private stuff
@ -134,6 +135,11 @@ namespace HISP.Server
}
}
}
// Mods Revenge
if(totalMinutesElapsed % (((60*8)+5)+10) == 0)
{
ModsRevengeEvent.StartEvent();
}
// Isle Card Trading Game
if(totalMinutesElapsed % ((60 + 50)+5) == 0)
{
@ -152,7 +158,7 @@ namespace HISP.Server
TackShopGiveawayEvent.StartEvent();
}
// Real Time Riddle
if(totalMinutesElapsed % (30+5) == 0)
if(totalMinutesElapsed % (30) == 0)
{
RiddleEvent = RealTimeRiddle.GetRandomRiddle();
RiddleEvent.StartEvent();
@ -5957,7 +5963,7 @@ namespace HISP.Server
}
ItemInstance curItem = sender.LoggedinUser.Inventory.GetItemByItemId(itemId).ItemInstances[0];
User[] userAt = GetUsersAt(sender.LoggedinUser.X, sender.LoggedinUser.Y, false, true);
User[] userAt = GetReallyNearbyUsers(sender.LoggedinUser.X, sender.LoggedinUser.Y);
while (true)
{
@ -5983,14 +5989,7 @@ namespace HISP.Server
}
if(itemId == Item.ModSplatterball)
{
byte[] otherEarned = PacketBuilder.CreateChat(Messages.FormatModSplatterBallAwardedOther(sender.LoggedinUser.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
byte[] youEarned = PacketBuilder.CreateChat(Messages.FormatModSplatterBallAwardedYou(userAt[userIndx].Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.LoggedinUser.Money += 50;
userAt[userIndx].Money += 500;
sender.SendPacket(youEarned);
userAt[userIndx].LoggedinClient.SendPacket(otherEarned);
ModsRevengeEvent.Payout(sender.LoggedinUser, userAt[userIndx]);
}
byte[] thrownForYou = PacketBuilder.CreateChat(Messages.FormatThrownItemMessage(throwableItem.ThrowMessage, userAt[userIndx].Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
@ -7052,6 +7051,8 @@ namespace HISP.Server
if (QuizEvent != null)
QuizEvent.LeaveEvent(sender.LoggedinUser);
ModsRevengeEvent.LeaveEvent(sender.LoggedinUser);
// Delete Arena Entries
if (Arena.UserHasEnteredHorseInAnyArena(sender.LoggedinUser))
{
@ -7195,6 +7196,25 @@ namespace HISP.Server
throw new KeyNotFoundException("User not found (not online?)");
}
public static User[] GetReallyNearbyUsers(int x, int y)
{
int startX = x - 3;
int endX = x + 3;
int startY = y - 3;
int endY = y + 3;
List<User> usersNearby = new List<User>();
foreach (GameClient client in ConnectedClients)
if (client.LoggedIn)
{
if (startX <= client.LoggedinUser.X && endX >= client.LoggedinUser.X && startY <= client.LoggedinUser.Y && endY >= client.LoggedinUser.Y)
usersNearby.Add(client.LoggedinUser);
}
return usersNearby.ToArray();
}
public static User[] GetNearbyUsers(int x, int y, bool includeStealth=false, bool includeMuted=false)
{
int startX = x - 15;