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

fix money related bugs and crashes.

Browse source
This commit is contained in:
SilicaAndPina 2021-05-14 11:38:04 +12:00
parent 99d9b401a2
commit e600554555
21 changed files with 151 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Horse Isle Server/HorseIsleServer/Game/Arena.cs
View file

@ -271,7 +271,7 @@ namespace HISP.Game
if (place == 0) // WINNER!
{
int prize = EntryCost * Entries.Count;
entry.EnteredUser.Money += prize;
entry.EnteredUser.AddMoney(prize);
byte[] youWinMessage = PacketBuilder.CreateChat(Messages.FormatArenaYouWinMessage(prize, expReward), PacketBuilder.CHAT_BOTTOM_RIGHT);

2
Horse Isle Server/HorseIsleServer/Game/Chat/Command.cs
View file

@ -39,7 +39,7 @@ namespace HISP.Game.Chat
try
{
money = int.Parse(args[1]);
user.Money += money;
user.AddMoney(money);
}
catch (Exception)
{

2
Horse Isle Server/HorseIsleServer/Game/Events/IsleCardTradingGame.cs
View file

@ -98,7 +98,7 @@ namespace HISP.Game.Events
byte[] wonIsleCardGame = PacketBuilder.CreateChat(Messages.EventWonIsleTradingGame, PacketBuilder.CHAT_BOTTOM_RIGHT);
client.SendPacket(wonIsleCardGame);
client.LoggedinUser.Money += 25000;
client.LoggedinUser.AddMoney(25000);
}

4
Horse Isle Server/HorseIsleServer/Game/Events/ModsRevenge.cs
View file

@ -133,8 +133,8 @@ namespace HISP.Game.Events
byte[] otherEarned = PacketBuilder.CreateChat(Messages.FormatModSplatterBallAwardedOther(thrower.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
byte[] youEarned = PacketBuilder.CreateChat(Messages.FormatModSplatterBallAwardedYou(throwAt.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
thrower.Money += 50;
throwAt.Money += 500;
thrower.AddMoney(50);
throwAt.AddMoney(500);
thrower.LoggedinClient.SendPacket(youEarned);
throwAt.LoggedinClient.SendPacket(otherEarned);

2
Horse Isle Server/HorseIsleServer/Game/Events/RandomEvent.cs
View file

@ -35,7 +35,7 @@ namespace HISP.Game.Events
user.Inventory.AddIgnoringFull(new ItemInstance(rngEvent.GiveObject));
if(moneyEarned != 0)
user.Money += moneyEarned;
user.AddMoney(moneyEarned);
HorseInstance effectedHorse = null;

2
Horse Isle Server/HorseIsleServer/Game/Events/RealTimeQuiz.cs
View file

@ -242,7 +242,7 @@ namespace HISP.Game.Events
participent.UserInstance.LoggedinClient.SendPacket(bonusMessage);
}
participent.UserInstance.Money += money;
participent.UserInstance.AddMoney(money);
}

2
Horse Isle Server/HorseIsleServer/Game/Events/RealTimeRiddle.cs
View file

@ -71,7 +71,7 @@ namespace HISP.Game.Events
winner.Awards.AddAward(Award.GetAwardById(34)); // Riddle Genius
winner.Money += Reward;
winner.AddMoney(Reward);
byte[] riddleWonMessage = PacketBuilder.CreateChat(Messages.FormatEventRealTimeRiddleWonForOthers(winner.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
byte[] riddleYouWonMessage = PacketBuilder.CreateChat(Messages.FormatEventRealTimeRiddleWonForYou(Reward), PacketBuilder.CHAT_BOTTOM_RIGHT);
foreach (GameClient client in GameServer.ConnectedClients)

2
Horse Isle Server/HorseIsleServer/Game/Events/WaterBalloonGame.cs
View file

@ -73,7 +73,7 @@ namespace HISP.Game.Events
foreach (ThrownCounter winner in winnerCounter)
{
byte[] youWinMsg = PacketBuilder.CreateChat(Messages.EventWonWaterBallonGame, PacketBuilder.CHAT_BOTTOM_RIGHT);
winner.UserHit.Money += 20000;
winner.UserHit.AddMoney(20000);
winner.UserHit.LoggedinClient.SendPacket(youWinMsg);
winner.UserHit.TrackedItems.GetTrackedItem(Tracking.TrackableItem.WaterbaloonGameWin).Count++;
}

2
Horse Isle Server/HorseIsleServer/Game/Items/DroppedItems.cs
View file

@ -142,7 +142,7 @@ namespace HISP.Game.Items
if (isFirstLoad)
Logger.InfoPrint("Generating items, (this may take awhile on a fresh database!)");
else
Logger.InfoPrint("Generating items.");
Logger.DebugPrint("Generating items.");
int newItems = 0;
foreach (Item.ItemInformation item in Item.Items)

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

@ -212,6 +212,9 @@ namespace HISP.Game
public static string TradeNotAllowedWhileBidding;
public static string TradeNotAllowedWhileOtherBidding;
public static string TradeWillGiveYouTooMuchMoney;
public static string TradeWillGiveOtherTooMuchMoney;
// Player Interaction
public static string PlayerHereMenuFormat;
@ -981,6 +984,7 @@ namespace HISP.Game
public static string Brought25Format;
public static string Sold1Format;
public static string SoldAllFormat;
public static string CannotSellYoudGetTooMuchMoney;
// Bank
public static string BankMadeInIntrestFormat;
@ -991,6 +995,9 @@ namespace HISP.Game
public static string BankWithdrewMoneyFormat;
public static string BankDepositedMoneyFormat;
public static string BankCantHoldThisMuch;
public static string BankYouCantHoldThisMuch;
// Npc
public static string NpcStartChatFormat;
public static string NpcNoChatpoints;

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

@ -471,7 +471,7 @@ namespace HISP.Game
int moneyLost = GameServer.RandomNumberGenerator.Next(0, 100);
if (moneyLost > user.Money)
moneyLost = user.Money;
user.Money -= moneyLost;
user.TakeMoney(moneyLost);
return Messages.FormatVenusFlyTrapMeta(moneyLost);
}
public static string buildInn(Inn inn)

5
Horse Isle Server/HorseIsleServer/Game/Quest.cs
View file

@ -182,9 +182,10 @@ namespace HISP.Game
user.Inventory.Remove(itm.ItemInstances[0]);
}
user.Money -= quest.MoneyCost;
// Take Money
user.TakeMoney(quest.MoneyCost);
// Give money
user.Money += quest.MoneyEarned;
user.AddMoney(quest.MoneyEarned);
// Give items
foreach (QuestItemInfo itemInfo in quest.ItemsEarned)
{

2
Horse Isle Server/HorseIsleServer/Game/Riddler.cs
View file

@ -33,7 +33,7 @@ namespace HISP.Game
byte[] riddleAnswerCorrectPacket = PacketBuilder.CreateChat(Messages.FormatRiddlerAnswerCorrect(this.Reason), PacketBuilder.CHAT_BOTTOM_RIGHT);
user.LoggedinClient.SendPacket(riddleAnswerCorrectPacket);
user.Money += 10000;
user.AddMoney(10000);
if(Database.TotalRiddlesCompletedByPlayer(user.Id) >= riddlerRiddles.Count)
user.Awards.AddAward(Award.GetAwardById(11)); // Riddlers Riddles

4
Horse Isle Server/HorseIsleServer/Game/Services/Auction.cs
View file

@ -146,7 +146,7 @@ namespace HISP.Game.Services
User userWon = GameServer.GetUserById(highestBidder);
byte[] wonAuction = PacketBuilder.CreateChat(Messages.FormatAuctionBroughtHorse(highestBid), PacketBuilder.CHAT_BOTTOM_RIGHT);
userWon.LoggedinClient.SendPacket(wonAuction);
userWon.Money -= highestBid;
userWon.TakeMoney(highestBid);
userWon.HorseInventory.AddHorse(Horse, false);
}
else
@ -159,7 +159,7 @@ namespace HISP.Game.Services
User userSold = GameServer.GetUserById(OwnerId);
byte[] horseSold = PacketBuilder.CreateChat(Messages.FormatAuctionHorseSold(highestBid), PacketBuilder.CHAT_BOTTOM_RIGHT);
userSold.LoggedinClient.SendPacket(horseSold);
userSold.Money += highestBid;
userSold.AddMoney(highestBid);
userSold.HorseInventory.DeleteHorse(Horse, false);
}
else

2
Horse Isle Server/HorseIsleServer/Game/Treasure.cs
View file

@ -142,7 +142,7 @@ namespace HISP.Game
byte[] MovementPacket = PacketBuilder.CreateMovementPacket(user.X, user.Y, user.CharacterId, user.Facing, PacketBuilder.DIRECTION_TELEPORT, true);
user.LoggedinClient.SendPacket(MovementPacket);
user.Money += Value;
user.AddMoney(Value);
if(this.Type == "BURIED")
{