IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-10 07:05:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add presents and fix bugs

Browse source
This commit is contained in:
SilicaAndPina 2021-02-15 17:22:53 +13:00
parent d9cdd05acb
commit 0cf1665a11
12 changed files with 273 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
DataCollection/gamedata.json
View file

@ -194,6 +194,14 @@
"venus_flytrap_format":"The Giant Venus Flytrap chomped at you!<BR><B>OUCH!!</B><BR>It chomped your pocket, taking $%MONEY% with it!!", "venus_flytrap_format":"The Giant Venus Flytrap chomped at you!<BR><B>OUCH!!</B><BR>It chomped your pocket, taking $%MONEY% with it!!",
"password_input":"<BR>^PLReply:|^PS14|ANSWER^R1", "password_input":"<BR>^PLReply:|^PS14|ANSWER^R1",
"last_poet":"^R1^LLast Player Poet:%USERNAME% ^R1", "last_poet":"^R1^LLast Player Poet:%USERNAME% ^R1",
"santa":{
"hidden_text":"You can pay to have anything in your inventory wrapped.<BR>It costs $10 per wrapping.",
"wrap_format":"^I%ICONID%^T6 %NAME%^B4P%RANDOMID%^R1",
"wrapped_object":"Wrapped object!",
"wrap_fail_inv_full":"You cannot carry any more presents.",
"open_fail_inv_full":"Your inventory is full, cannot open anything.",
"open_format":"Opened object! There was a %ITEM% inside!"
},
"pawneer":{ "pawneer":{
"pawneer_order":"You have a Pawneer Order! Would you like to use it for a new horse?^T6Place a Pawneer Horse Order ^D47|ORDER^R1", "pawneer_order":"You have a Pawneer Order! Would you like to use it for a new horse?^T6Place a Pawneer Horse Order ^D47|ORDER^R1",
"untacked_i_can_buy":"<BR>^LYour untacked horses that I am willing to buy:^R1", "untacked_i_can_buy":"<BR>^LYour untacked horses that I am willing to buy:^R1",
@ -499,7 +507,7 @@
"breed_details":"^H<B>BREED DETAILS:</B><BR>Name: %BREED%<BR>Description: %DESCRIPTION%", "breed_details":"^H<B>BREED DETAILS:</B><BR>Name: %BREED%<BR>Description: %DESCRIPTION%",
"height_range":"<BR>Average Height Range: %MIN%-%MAX% hands<BR>", "height_range":"<BR>Average Height Range: %MIN%-%MAX% hands<BR>",
"possible_colors":"<BR>Possible Colors: %COLORS%<BR>", "possible_colors":"<BR>Possible Colors: %COLORS%<BR>",
"release_horse":"^D8|RELEASE HORSE^R1", "release_horse":"^D8|RELEASE %TYPE%^R1",
"other_horses":"^LOther Horses Owned:^R1" "other_horses":"^LOther Horses Owned:^R1"
}, },
@ -762,6 +770,7 @@
"item_consume_button":"^B4E%RANDOMID%", "item_consume_button":"^B4E%RANDOMID%",
"item_throw_button":"^B4T%RANDOMID%", "item_throw_button":"^B4T%RANDOMID%",
"item_use_button":"^B4UD%RANDOMID%", "item_use_button":"^B4UD%RANDOMID%",
"item_open_button":"^B4O%RANDOMID%",
"item_read_button":"^B4VL%RANDOMID%", "item_read_button":"^B4VL%RANDOMID%",
"buy_button":"^B4BN%ITEMID%", "buy_button":"^B4BN%ITEMID%",
"buy_5_button":"^B4B5%ITEMID%", "buy_5_button":"^B4B5%ITEMID%",

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

@ -35,8 +35,10 @@ namespace HISP.Game.Horse
{ {
name = loadName; name = loadName;
} }
if(GameServer.RandomNumberGenerator.Next(0, 100) > 50)
Sex = breed.GenderTypes()[GameServer.RandomNumberGenerator.Next(0, 1)]; Sex = breed.GenderTypes()[1];
else
Sex = breed.GenderTypes()[0];
description = loadDescription; description = loadDescription;
Breed = breed; Breed = breed;

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

@ -18,6 +18,7 @@ namespace HISP.Game.Items
public int Y; public int Y;
public int DespawnTimer; public int DespawnTimer;
public ItemInstance Instance; public ItemInstance Instance;
public int Data;
} }
private static List<DroppedItem> droppedItemsList = new List<DroppedItem>(); private static List<DroppedItem> droppedItemsList = new List<DroppedItem>();
public static int GetCountOfItem(Item.ItemInformation item) public static int GetCountOfItem(Item.ItemInformation item)
@ -110,13 +111,14 @@ namespace HISP.Game.Items
if (droppedItemsList[i] == null) // Item removed in another thread. if (droppedItemsList[i] == null) // Item removed in another thread.
continue; continue;
droppedItemsList[i].DespawnTimer-=5; droppedItemsList[i].DespawnTimer -= 5;
if(droppedItemsList[i].DespawnTimer <= 0) if(droppedItemsList[i].DespawnTimer <= 0)
{ {
if (GameServer.GetUsersAt(droppedItemsList[i].X, droppedItemsList[i].Y, true, true).Length > 0) // Dont despawn items players are standing on if (GameServer.GetUsersAt(droppedItemsList[i].X, droppedItemsList[i].Y, true, true).Length > 0) // Dont despawn items players are standing on
continue; continue;
Logger.DebugPrint("Despawned Item at " + droppedItemsList[i].X + ", " + droppedItemsList[i].Y); Logger.DebugPrint("Despawned Item at " + droppedItemsList[i].X + ", " + droppedItemsList[i].Y);
RemoveDroppedItem(droppedItemsList[i]); droppedItemsList.Remove(droppedItemsList[i]);
} }
} }
} }
@ -130,7 +132,7 @@ namespace HISP.Game.Items
droppedItemsList.Add(droppedItem); droppedItemsList.Add(droppedItem);
Database.AddDroppedItem(droppedItem); Database.AddDroppedItem(droppedItem);
} }
public static void GenerateItems(bool randomizeDespawnTime) public static void GenerateItems()
{ {
Logger.InfoPrint("Generating items, (this may take awhile on a fresh database!)"); Logger.InfoPrint("Generating items, (this may take awhile on a fresh database!)");
@ -143,9 +145,7 @@ namespace HISP.Game.Items
{ {
count++; count++;
int despawnTimer = 1500; int despawnTimer = 1440;
if(randomizeDespawnTime)
despawnTimer = GameServer.RandomNumberGenerator.Next(900, 1500);
if (item.SpawnParamaters.SpawnInZone != null) if (item.SpawnParamaters.SpawnInZone != null)
{ {
@ -326,7 +326,7 @@ namespace HISP.Game.Items
public static void Init() public static void Init()
{ {
ReadFromDatabase(); ReadFromDatabase();
GenerateItems(true); GenerateItems();
} }
} }

6
Horse Isle Server/HorseIsleServer/Game/Items/ItemInstance.cs
View file

@ -6,7 +6,7 @@ namespace HISP.Game.Items
{ {
public int RandomId; public int RandomId;
public int ItemId; public int ItemId;
public int Data;
public Item.ItemInformation GetItemInfo() public Item.ItemInformation GetItemInfo()
@ -15,10 +15,10 @@ namespace HISP.Game.Items
} }
public ItemInstance(int id,int randomId = -1) public ItemInstance(int id,int randomId = -1, int data=0)
{ {
RandomId = RandomID.NextRandomId(randomId); RandomId = RandomID.NextRandomId(randomId);
Data = data;
ItemId = id; ItemId = id;
} }

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

@ -76,6 +76,15 @@ namespace HISP.Game
public static string RanchHorsesFullyRested; public static string RanchHorsesFullyRested;
public static string RanchWagonDroppedYouOff; public static string RanchWagonDroppedYouOff;
// Santa
public static string SantaHiddenText; // Text that claims that it costs $10 to wrap a present thats sent to the client but never displayed for some reason. also wrapping is free on pinto so IDEK.
public static string SantaWrapItemFormat;
public static string SantaWrappedObjectMessage;
public static string SantaCantWrapInvFull;
public static string SantaItemOpenedFormat;
public static string SantaItemCantOpenInvFull;
// Tools // Tools
public static string BinocularsNothing; public static string BinocularsNothing;
public static string MagnifyNothing; public static string MagnifyNothing;
@ -497,6 +506,7 @@ namespace HISP.Game
public static string ItemInformationByIdButton; public static string ItemInformationByIdButton;
public static string ItemConsumeButton; public static string ItemConsumeButton;
public static string ItemThrowButton; public static string ItemThrowButton;
public static string ItemOpenButton;
public static string ItemUseButton; public static string ItemUseButton;
public static string ItemWearButton; public static string ItemWearButton;
public static string ItemReadButton; public static string ItemReadButton;
@ -722,6 +732,14 @@ namespace HISP.Game
// Click // Click
public static string NothingInterestingHere; public static string NothingInterestingHere;
public static string FormatSantaOpenPresent(string itemName)
{
return SantaItemOpenedFormat.Replace("%ITEM%", itemName);
}
public static string FormatSantaItemEntry(int iconId, string itemName, int randomId)
{
return SantaWrapItemFormat.Replace("%ICONID%", iconId.ToString()).Replace("%NAME%", itemName).Replace("%RANDOMID%", randomId.ToString());
}
public static string FormatPawneerOrderHorseFound(string breedName, string color, string gender, int height, int personality, int inteligence) public static string FormatPawneerOrderHorseFound(string breedName, string color, string gender, int height, int personality, int inteligence)
{ {
return PawneerOrderHorseFoundFormat.Replace("%BREEDNAME%", breedName).Replace("%COLOR%", color).Replace("%GENDER%", gender).Replace("%HEIGHT%", height.ToString()).Replace("%PERSONALITY%", personality.ToString()).Replace("%INTELIGENCE%", inteligence.ToString()); return PawneerOrderHorseFoundFormat.Replace("%BREEDNAME%", breedName).Replace("%COLOR%", color).Replace("%GENDER%", gender).Replace("%HEIGHT%", height.ToString()).Replace("%PERSONALITY%", personality.ToString()).Replace("%INTELIGENCE%", inteligence.ToString());
@ -749,7 +767,7 @@ namespace HISP.Game
} }
public static string FormatPawneerHorseEntry(string horseName, int price, int randomId) public static string FormatPawneerHorseEntry(string horseName, int price, int randomId)
{ {
return PawneerHorseFormat.Replace("%HORSENAME%", horseName).Replace("%PRICE%", price.ToString("N0")).Replace("%RANDOMID%", randomId.ToString()); return PawneerHorseFormat.Replace("%HORSENAME%", horseName).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture)).Replace("%RANDOMID%", randomId.ToString());
} }
public static string FormatPawneerConfirmPawn(string breedName, int randomId) public static string FormatPawneerConfirmPawn(string breedName, int randomId)
{ {
@ -757,7 +775,7 @@ namespace HISP.Game
} }
public static string FormatPawneerSold(string horseName, int price) public static string FormatPawneerSold(string horseName, int price)
{ {
return PawneerHorseSoldMessagesFormat.Replace("%HORSENAME%", horseName).Replace("%PRICE%", price.ToString("N0")); return PawneerHorseSoldMessagesFormat.Replace("%HORSENAME%", horseName).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
@ -769,11 +787,11 @@ namespace HISP.Game
// Barn Formats // Barn Formats
public static string FormatBarnLetAllHorsesReleax(int price) public static string FormatBarnLetAllHorsesReleax(int price)
{ {
return BarnLetAllHorsesReleaxFormat.Replace("%PRICE%", price.ToString("N0")); return BarnLetAllHorsesReleaxFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBarnLetHorseRelax(int price, int randomId) public static string FormatBarnLetHorseRelax(int price, int randomId)
{ {
return BarnLetHorseRelaxFormat.Replace("%PRICE%", price.ToString("N0")).Replace("%RANDOMID%", randomId.ToString()); return BarnLetHorseRelaxFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture)).Replace("%RANDOMID%", randomId.ToString());
} }
public static string FormatBarnHorseStatus(string horseName, int tiredness, int hunger, int thirst) public static string FormatBarnHorseStatus(string horseName, int tiredness, int hunger, int thirst)
{ {
@ -798,15 +816,15 @@ namespace HISP.Game
} }
public static string FormatFarrierApplySteelToAll(int price, int incBy) public static string FormatFarrierApplySteelToAll(int price, int incBy)
{ {
return FarrierShoeAllFormat.Replace("%PRICE%", price.ToString("N0")).Replace("%INCBY%", incBy.ToString()); return FarrierShoeAllFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture)).Replace("%INCBY%", incBy.ToString());
} }
public static string FormatFarrierApplySteel(int price, int incBy, int horseRandomid) public static string FormatFarrierApplySteel(int price, int incBy, int horseRandomid)
{ {
return FarrierApplySteelShoesFormat.Replace("%PRICE%", price.ToString("N0")).Replace("%INCBY%", incBy.ToString()).Replace("%HORSERANDOMID%", horseRandomid.ToString()); return FarrierApplySteelShoesFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture)).Replace("%INCBY%", incBy.ToString()).Replace("%HORSERANDOMID%", horseRandomid.ToString());
} }
public static string FormatFarrierApplyIron(int price, int incBy, int horseRandomid) public static string FormatFarrierApplyIron(int price, int incBy, int horseRandomid)
{ {
return FarrierApplyIronShoesFormat.Replace("%PRICE%", price.ToString("N0")).Replace("%INCBY%", incBy.ToString()).Replace("%HORSERANDOMID%", horseRandomid.ToString()); return FarrierApplyIronShoesFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture)).Replace("%INCBY%", incBy.ToString()).Replace("%HORSERANDOMID%", horseRandomid.ToString());
} }
public static string FormatFarrierCurrentShoes(string horseName, int curShoes, int maxShoes) public static string FormatFarrierCurrentShoes(string horseName, int curShoes, int maxShoes)
{ {
@ -826,7 +844,7 @@ namespace HISP.Game
} }
public static string FormatRanchTrain(string horseName, int speed, int strength, int conformation, int agility, int endurance, int exp) public static string FormatRanchTrain(string horseName, int speed, int strength, int conformation, int agility, int endurance, int exp)
{ {
return RanchTrainSuccessFormat.Replace("%HORSENAME%", horseName).Replace("%SPEED%", speed.ToString("N0")).Replace("%STRENGTH%", strength.ToString("N0")).Replace("%CONFORMATION%", conformation.ToString("N0")).Replace("%AGILITY%", agility.ToString("N0")).Replace("%ENDURANCE%", endurance.ToString("N0")).Replace("%EXP%", exp.ToString("N0")); return RanchTrainSuccessFormat.Replace("%HORSENAME%", horseName).Replace("%SPEED%", speed.ToString("N0", CultureInfo.InvariantCulture)).Replace("%STRENGTH%", strength.ToString("N0", CultureInfo.InvariantCulture)).Replace("%CONFORMATION%", conformation.ToString("N0", CultureInfo.InvariantCulture)).Replace("%AGILITY%", agility.ToString("N0", CultureInfo.InvariantCulture)).Replace("%ENDURANCE%", endurance.ToString("N0", CultureInfo.InvariantCulture)).Replace("%EXP%", exp.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatRanchDescOthers(string description) public static string FormatRanchDescOthers(string description)
{ {
@ -834,11 +852,11 @@ namespace HISP.Game
} }
public static string FormatRanchSoldMessage(int price) public static string FormatRanchSoldMessage(int price)
{ {
return RanchSoldFormat.Replace("%PRICE%", price.ToString("N0")); return RanchSoldFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatRanchUnownedMeta(int price) public static string FormatRanchUnownedMeta(int price)
{ {
return RanchUnownedRanchFormat.Replace("%PRICE%", price.ToString("N0")); return RanchUnownedRanchFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatRanchClickMessage(string owner, string title) public static string FormatRanchClickMessage(string owner, string title)
{ {
@ -846,7 +864,7 @@ namespace HISP.Game
} }
public static string FormatRanchBroughtMessage(int price) public static string FormatRanchBroughtMessage(int price)
{ {
return RanchRanchBroughtMessageFormat.Replace("%PRICE%", price.ToString("N0")); return RanchRanchBroughtMessageFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatRanchEditDescriptonMeta(string curTitle, string curDesc) public static string FormatRanchEditDescriptonMeta(string curTitle, string curDesc)
{ {
@ -862,7 +880,7 @@ namespace HISP.Game
} }
public static string FormatBuildingEntry(string name, int price, int buildingId) public static string FormatBuildingEntry(string name, int price, int buildingId)
{ {
return RanchBuildingEntryFormat.Replace("%BUILDINGNAME%", name).Replace("%PRICE%", price.ToString("N0")).Replace("%BUILDINGID%", buildingId.ToString()); return RanchBuildingEntryFormat.Replace("%BUILDINGNAME%", name).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture)).Replace("%BUILDINGID%", buildingId.ToString());
} }
public static string FormatBuildingInformaton(string name, string description) public static string FormatBuildingInformaton(string name, string description)
{ {
@ -870,11 +888,11 @@ namespace HISP.Game
} }
public static string FormatBuildingAlreadyPlaced(string name, int buildingId, int price) public static string FormatBuildingAlreadyPlaced(string name, int buildingId, int price)
{ {
return RanchBuildingAlreadyHere.Replace("%BUILDINGNAME%", name).Replace("%BUILDINGID%", buildingId.ToString()).Replace("%PRICE%", price.ToString("N0")); return RanchBuildingAlreadyHere.Replace("%BUILDINGNAME%", name).Replace("%BUILDINGID%", buildingId.ToString()).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBuildingTornDown(int price) public static string FormatBuildingTornDown(int price)
{ {
return RanchTornDownRanchBuildingFormat.Replace("%PRICE%", price.ToString("N0")); return RanchTornDownRanchBuildingFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatViewBuilding(string name, string description) public static string FormatViewBuilding(string name, string description)
{ {
@ -886,27 +904,27 @@ namespace HISP.Game
} }
public static string FormatCurrentUpgrade(string curUpgradeName, string curUpgradeDesc, string YouCouldUpgrade, int ranchSellPrice) public static string FormatCurrentUpgrade(string curUpgradeName, string curUpgradeDesc, string YouCouldUpgrade, int ranchSellPrice)
{ {
return UpgradeCurrentUpgradeFormat.Replace("%UPGRADENAME%", curUpgradeName).Replace("%UPGRADEDESC%", curUpgradeDesc).Replace("%YOUCOULDUPGRADE%", YouCouldUpgrade).Replace("%SELLPRICE%", ranchSellPrice.ToString("N0")); return UpgradeCurrentUpgradeFormat.Replace("%UPGRADENAME%", curUpgradeName).Replace("%UPGRADEDESC%", curUpgradeDesc).Replace("%YOUCOULDUPGRADE%", YouCouldUpgrade).Replace("%SELLPRICE%", ranchSellPrice.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatNextUpgrade(string nextUpgrade, int cost) public static string FormatNextUpgrade(string nextUpgrade, int cost)
{ {
return UpgradeNextUpgradeFormat.Replace("%NEXTUPGRADE%", nextUpgrade).Replace("%COST%", cost.ToString("N0")); return UpgradeNextUpgradeFormat.Replace("%NEXTUPGRADE%", nextUpgrade).Replace("%COST%", cost.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBuildingBarn(int numbBarns, int numbHorses) public static string FormatBuildingBarn(int numbBarns, int numbHorses)
{ {
return BuildingBarnFormat.Replace("%COUNT%", numbBarns.ToString("N0")).Replace("%AMOUNT%", numbHorses.ToString("N0")); return BuildingBarnFormat.Replace("%COUNT%", numbBarns.ToString("N0", CultureInfo.InvariantCulture)).Replace("%AMOUNT%", numbHorses.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBuildingBigBarn(int numbBarns, int numbHorses) public static string FormatBuildingBigBarn(int numbBarns, int numbHorses)
{ {
return BuildingBigBarnFormat.Replace("%COUNT%", numbBarns.ToString("N0")).Replace("%AMOUNT%", numbHorses.ToString("N0")); return BuildingBigBarnFormat.Replace("%COUNT%", numbBarns.ToString("N0", CultureInfo.InvariantCulture)).Replace("%AMOUNT%", numbHorses.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBuildingGoldBarn(int numbBarns, int numbHorses) public static string FormatBuildingGoldBarn(int numbBarns, int numbHorses)
{ {
return BuildingGoldBarnFormat.Replace("%COUNT%", numbBarns.ToString("N0")).Replace("%AMOUNT%", numbHorses.ToString("N0")); return BuildingGoldBarnFormat.Replace("%COUNT%", numbBarns.ToString("N0", CultureInfo.InvariantCulture)).Replace("%AMOUNT%", numbHorses.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBuildingWindmill(int numbWindmills, int moneyEarns) public static string FormatBuildingWindmill(int numbWindmills, int moneyEarns)
{ {
return BuildingWindmillFormat.Replace("%COUNT%", numbWindmills.ToString("N0")).Replace("%AMOUNT%", moneyEarns.ToString("N0")); return BuildingWindmillFormat.Replace("%COUNT%", numbWindmills.ToString("N0", CultureInfo.InvariantCulture)).Replace("%AMOUNT%", moneyEarns.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatTrainSuccess(string horseName) public static string FormatTrainSuccess(string horseName)
{ {
@ -926,15 +944,15 @@ namespace HISP.Game
} }
public static string FormatPirateTreasure(int prize) public static string FormatPirateTreasure(int prize)
{ {
return PirateTreasureFormat.Replace("%PRIZE%", prize.ToString("N0")); return PirateTreasureFormat.Replace("%PRIZE%", prize.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatPotOfGold(int prize) public static string FormatPotOfGold(int prize)
{ {
return PotOfGoldFormat.Replace("%PRIZE%", prize.ToString("N0")); return PotOfGoldFormat.Replace("%PRIZE%", prize.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatWorkshopCraftEntry(int iconId, string itemName, int price, int itemId, int craftId) public static string FormatWorkshopCraftEntry(int iconId, string itemName, int price, int itemId, int craftId)
{ {
return WorkshopCraftEntryFormat.Replace("%ICONID%", iconId.ToString()).Replace("%ITEMNAME%", itemName).Replace("%PRICE%", price.ToString("N0")).Replace("%ITEMID%", itemId.ToString()).Replace("%CRAFTID%", craftId.ToString()); return WorkshopCraftEntryFormat.Replace("%ICONID%", iconId.ToString()).Replace("%ITEMNAME%", itemName).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture)).Replace("%ITEMID%", itemId.ToString()).Replace("%CRAFTID%", craftId.ToString());
} }
public static string FormatWorkshopRequirements(string requiresTxt) public static string FormatWorkshopRequirements(string requiresTxt)
{ {
@ -942,16 +960,16 @@ namespace HISP.Game
} }
public static string FormatWorkshopRequireEntry(int requiredCount, string itemNamePlural) public static string FormatWorkshopRequireEntry(int requiredCount, string itemNamePlural)
{ {
return WorkshopRequireEntryFormat.Replace("%REQCOUNT%", requiredCount.ToString("N0")).Replace("%ITEMNAME%", itemNamePlural); return WorkshopRequireEntryFormat.Replace("%REQCOUNT%", requiredCount.ToString("N0", CultureInfo.InvariantCulture)).Replace("%ITEMNAME%", itemNamePlural);
} }
public static string FormatDrawingRoomSaved(int slot) public static string FormatDrawingRoomSaved(int slot)
{ {
return DrawingContentsSavedInSlotFormat.Replace("%SLOT%", slot.ToString("N0")); return DrawingContentsSavedInSlotFormat.Replace("%SLOT%", slot.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatDrawingRoomLoaded(int slot) public static string FormatDrawingRoomLoaded(int slot)
{ {
return DrawingContentsLoadedFromSlotFormat.Replace("%SLOT%", slot.ToString("N0")); return DrawingContentsLoadedFromSlotFormat.Replace("%SLOT%", slot.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatLastToDraw(string username) public static string FormatLastToDraw(string username)
{ {
@ -959,11 +977,11 @@ namespace HISP.Game
} }
public static string FormatGroomerApplyAllService(int count, int price) public static string FormatGroomerApplyAllService(int count, int price)
{ {
return GroomerApplyServiceForAllFormat.Replace("%PRICE%", price.ToString("N0")).Replace("%COUNT%", count.ToString("N0")); return GroomerApplyServiceForAllFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture)).Replace("%COUNT%", count.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatGroomerApplyService(int price, int randomid) public static string FormatGroomerApplyService(int price, int randomid)
{ {
return GroomerApplyServiceFormat.Replace("%PRICE%", price.ToString("N0")).Replace("%RANDOMID%", randomid.ToString()); return GroomerApplyServiceFormat.Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture)).Replace("%RANDOMID%", randomid.ToString());
} }
public static string FormatHorseGroomCurrentlyAt(string horseName, int currentGroom, int maxGroom) public static string FormatHorseGroomCurrentlyAt(string horseName, int currentGroom, int maxGroom)
{ {
@ -988,7 +1006,7 @@ namespace HISP.Game
} }
public static string FormatAwardEntry(int iconId, string awardName, int bonusMoney, string description) public static string FormatAwardEntry(int iconId, string awardName, int bonusMoney, string description)
{ {
return AwardEntryFormat.Replace("%ICONID%", iconId.ToString()).Replace("%AWARDNAME%", awardName).Replace("%BONUSMONEY%",bonusMoney.ToString("N0")).Replace("%DESCRIPTION%",description); return AwardEntryFormat.Replace("%ICONID%", iconId.ToString()).Replace("%AWARDNAME%", awardName).Replace("%BONUSMONEY%",bonusMoney.ToString("N0", CultureInfo.InvariantCulture)).Replace("%DESCRIPTION%",description);
} }
public static string FormatLocationDescription(string description) public static string FormatLocationDescription(string description)
@ -1032,7 +1050,7 @@ namespace HISP.Game
public static string FormatWhispererPrice(int price) public static string FormatWhispererPrice(int price)
{ {
return WhispererServiceCostYouFormat.Replace("%MONEY%",price.ToString("N0")); return WhispererServiceCostYouFormat.Replace("%MONEY%",price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatWhispererHorseBreedButton(string breedName, int breedId) public static string FormatWhispererHorseBreedButton(string breedName, int breedId)
@ -1108,11 +1126,11 @@ namespace HISP.Game
} }
public static string FormatAllStatsEntry(string horseName, string color, string breedName, string sex, int exp) public static string FormatAllStatsEntry(string horseName, string color, string breedName, string sex, int exp)
{ {
return HorseNameEntryFormat.Replace("%HORSENAME%", horseName).Replace("%COLOR%", color).Replace("%BREEDNAME%", breedName).Replace("%SEX%", sex).Replace("%EXP%", exp.ToString("N0")); return HorseNameEntryFormat.Replace("%HORSENAME%", horseName).Replace("%COLOR%", color).Replace("%BREEDNAME%", breedName).Replace("%SEX%", sex).Replace("%EXP%", exp.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormaHorseAllBasicStatsEntry(string horseName, string color, string breedName, string sex, int exp) public static string FormaHorseAllBasicStatsEntry(string horseName, string color, string breedName, string sex, int exp)
{ {
return HorseBasicStatEntryFormat.Replace("%HORSENAME%", horseName).Replace("%COLOR%", color).Replace("%BREEDNAME%", breedName).Replace("%SEX%", sex).Replace("%EXP%", exp.ToString("N0")); return HorseBasicStatEntryFormat.Replace("%HORSENAME%", horseName).Replace("%COLOR%", color).Replace("%BREEDNAME%", breedName).Replace("%SEX%", sex).Replace("%EXP%", exp.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatHorseReleasedBy(string username) public static string FormatHorseReleasedBy(string username)
{ {
@ -1140,7 +1158,7 @@ namespace HISP.Game
} }
public static string FormatHorseCompanionOption(int icon, int count, string name, int id) public static string FormatHorseCompanionOption(int icon, int count, string name, int id)
{ {
return HorseCompanionEntryFormat.Replace("%ICONID%", icon.ToString()).Replace("%COUNT%", count.ToString("N0")).Replace("%NAME%", name).Replace("%ID%", id.ToString()); return HorseCompanionEntryFormat.Replace("%ICONID%", icon.ToString()).Replace("%COUNT%", count.ToString("N0", CultureInfo.InvariantCulture)).Replace("%NAME%", name).Replace("%ID%", id.ToString());
} }
public static string FormatHorseDismountedBecauseTackedMessage(string horsename) public static string FormatHorseDismountedBecauseTackedMessage(string horsename)
{ {
@ -1148,7 +1166,7 @@ namespace HISP.Game
} }
public static string FormatAutoSellConfirmedMessage(int money) public static string FormatAutoSellConfirmedMessage(int money)
{ {
return HorseAutoSellConfirmedFormat.Replace("%MONEY%", money.ToString("N0")); return HorseAutoSellConfirmedFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatAutoSellMenu(int currentAutoSellPrice) public static string FormatAutoSellMenu(int currentAutoSellPrice)
{ {
@ -1177,7 +1195,7 @@ namespace HISP.Game
public static string FormatHorseFeedEntry(int icon, int count, string name, int randomId) public static string FormatHorseFeedEntry(int icon, int count, string name, int randomId)
{ {
return HorsefeedFormat.Replace("%ICONID%", icon.ToString()).Replace("%COUNT%", count.ToString("N0")).Replace("%NAME%", name).Replace("%RANDOMID%", randomId.ToString()); return HorsefeedFormat.Replace("%ICONID%", icon.ToString()).Replace("%COUNT%", count.ToString("N0", CultureInfo.InvariantCulture)).Replace("%NAME%", name).Replace("%RANDOMID%", randomId.ToString());
} }
public static string FormatHorseRidingMessage(string name) public static string FormatHorseRidingMessage(string name)
@ -1234,7 +1252,7 @@ namespace HISP.Game
} }
public static string FormatHorseExperience(int experience) public static string FormatHorseExperience(int experience)
{ {
return HorseExperienceEarnedFormat.Replace("%EXP%", experience.ToString("N0")); return HorseExperienceEarnedFormat.Replace("%EXP%", experience.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatTrainableIn(int minutes) public static string FormatTrainableIn(int minutes)
{ {
@ -1268,7 +1286,7 @@ namespace HISP.Game
public static string FormatAutoSellPrice(int money) public static string FormatAutoSellPrice(int money)
{ {
return HorseAutoSellPriceFormat.Replace("%MONEY%", money.ToString("N0")); return HorseAutoSellPriceFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatAutoSell(string autoSellStr) public static string FormatAutoSell(string autoSellStr)
{ {
@ -1300,6 +1318,10 @@ namespace HISP.Game
{ {
return HorseHeightRangeFormat.Replace("%MIN%", minHeight.ToString()).Replace("%MAX%", maxHeight.ToString()); return HorseHeightRangeFormat.Replace("%MIN%", minHeight.ToString()).Replace("%MAX%", maxHeight.ToString());
} }
public static string FormatHorseReleaseButton(string type)
{
return HorseReleaseButton.Replace("%TYPE%", type);
}
public static string FormatPossibleColors(string[] colors) public static string FormatPossibleColors(string[] colors)
{ {
return HorsePossibleColorsFormat.Replace("%COLORS%", String.Join(",", colors)); return HorsePossibleColorsFormat.Replace("%COLORS%", String.Join(",", colors));
@ -1364,33 +1386,33 @@ namespace HISP.Game
} }
public static string FormatVenusFlyTrapMeta(int money) public static string FormatVenusFlyTrapMeta(int money)
{ {
return VenusFlyTrapFormat.Replace("%MONEY%", money.ToString("N0")); return VenusFlyTrapFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBankIntrestMadeMeta(UInt64 intrestMade) public static string FormatBankIntrestMadeMeta(UInt64 intrestMade)
{ {
return BankMadeInIntrestFormat.Replace("%MONEY%", intrestMade.ToString("N0")); return BankMadeInIntrestFormat.Replace("%MONEY%", intrestMade.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBankCarryingMeta(int money, UInt64 bankMoney) public static string FormatBankCarryingMeta(int money, UInt64 bankMoney)
{ {
return BankCarryingFormat.Replace("%MONEY%", money.ToString("N0")).Replace("%BANKMONEY%", bankMoney.ToString("N0")); return BankCarryingFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture)).Replace("%BANKMONEY%", bankMoney.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBankOptionsMeta(int money, UInt64 bankMoney) public static string FormatBankOptionsMeta(int money, UInt64 bankMoney)
{ {
return BankOptionsFormat.Replace("%MONEY%", money.ToString("N0")).Replace("%BANKMONEY%", bankMoney.ToString("N0")); return BankOptionsFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture)).Replace("%BANKMONEY%", bankMoney.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatDepositedMoneyMessage(int money) public static string FormatDepositedMoneyMessage(int money)
{ {
return BankDepositedMoneyFormat.Replace("%MONEY%", money.ToString("N0")); return BankDepositedMoneyFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatWithdrawMoneyMessage(int money) public static string FormatWithdrawMoneyMessage(int money)
{ {
return BankWithdrewMoneyFormat.Replace("%MONEY%", money.ToString("N0")); return BankWithdrewMoneyFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatNumberOfWishingCoins(int amount) public static string FormatNumberOfWishingCoins(int amount)
{ {
return YouHaveWishingCoinsFormat.Replace("%AMOUNT%", amount.ToString("N0")); return YouHaveWishingCoinsFormat.Replace("%AMOUNT%", amount.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatWishThingsMessage(string item1, string item2) public static string FormatWishThingsMessage(string item1, string item2)
@ -1399,26 +1421,26 @@ namespace HISP.Game
} }
public static string FormatWishMoneyMessage(int money) public static string FormatWishMoneyMessage(int money)
{ {
return WishMoneyFormat.Replace("%MONEY%", money.ToString("N0")); return WishMoneyFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatWishWorldPeaceMessage(int money, string item) public static string FormatWishWorldPeaceMessage(int money, string item)
{ {
return WishWorldPeaceFormat.Replace("%MONEY%", money.ToString("N0")).Replace("%ITEM%", item); return WishWorldPeaceFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture)).Replace("%ITEM%", item);
} }
public static string FormatInnEnjoyedServiceMessage(string item, int price) public static string FormatInnEnjoyedServiceMessage(string item, int price)
{ {
return InnEnjoyedServiceFormat.Replace("%ITEM%", item).Replace("%PRICE%", price.ToString("N0")); return InnEnjoyedServiceFormat.Replace("%ITEM%", item).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatInnItemEntry(int iconId, string itemName, int price, int itemId) public static string FormatInnItemEntry(int iconId, string itemName, int price, int itemId)
{ {
return InnItemEntryFormat.Replace("%ICON%", iconId.ToString()).Replace("%NAME%", itemName).Replace("%PRICE%", price.ToString("N0")).Replace("%ID%", itemId.ToString()); return InnItemEntryFormat.Replace("%ICON%", iconId.ToString()).Replace("%NAME%", itemName).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture)).Replace("%ID%", itemId.ToString());
} }
public static string FormatDroppedMoneyMessage(int amount) public static string FormatDroppedMoneyMessage(int amount)
{ {
return FountainDroppedMoneyFormat.Replace("%MONEY%", amount.ToString("N0")); return FountainDroppedMoneyFormat.Replace("%MONEY%", amount.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatAbuseReportPlayerNotFound(string username) public static string FormatAbuseReportPlayerNotFound(string username)
{ {
@ -1441,16 +1463,16 @@ namespace HISP.Game
public static string FormatPlayerEntry(string iconFormat, string username, int userId, int time, int x, int y, bool idle) public static string FormatPlayerEntry(string iconFormat, string username, int userId, int time, int x, int y, bool idle)
{ {
string xy = FormatMapLocation(x, y); string xy = FormatMapLocation(x, y);
return PlayerListEntryFormat.Replace("%ICONFORMAT%", iconFormat).Replace("%USERNAME%", username).Replace("%PLAYERID%", userId.ToString()).Replace("%TIME%", time.ToString("N0")).Replace("%MAPXY%", xy).Replace("%IDLE%", idle ? PlayerListIdle : ""); return PlayerListEntryFormat.Replace("%ICONFORMAT%", iconFormat).Replace("%USERNAME%", username).Replace("%PLAYERID%", userId.ToString()).Replace("%TIME%", time.ToString("N0", CultureInfo.InvariantCulture)).Replace("%MAPXY%", xy).Replace("%IDLE%", idle ? PlayerListIdle : "");
} }
public static string FormatOnlineBuddyEntry(string iconFormat, string username, int userId, int time, int x, int y) public static string FormatOnlineBuddyEntry(string iconFormat, string username, int userId, int time, int x, int y)
{ {
string xy = FormatMapLocation(x, y); string xy = FormatMapLocation(x, y);
return BuddyListOnlineBuddyEntryFormat.Replace("%ICONFORMAT%", iconFormat).Replace("%USERNAME%", username).Replace("%TIME%", time.ToString("N0")).Replace("%PLAYERID%", userId.ToString()).Replace("%MAPXY%", xy); return BuddyListOnlineBuddyEntryFormat.Replace("%ICONFORMAT%", iconFormat).Replace("%USERNAME%", username).Replace("%TIME%", time.ToString("N0", CultureInfo.InvariantCulture)).Replace("%PLAYERID%", userId.ToString()).Replace("%MAPXY%", xy);
} }
public static string FormatOfflineBuddyEntry(string username, int userId, int time) public static string FormatOfflineBuddyEntry(string username, int userId, int time)
{ {
return BuddyListOfflineBuddyEntryFormat.Replace("%USERNAME%", username).Replace("%TIME%", time.ToString("N0")).Replace("%PLAYERID%", userId.ToString()); return BuddyListOfflineBuddyEntryFormat.Replace("%USERNAME%", username).Replace("%TIME%", time.ToString("N0", CultureInfo.InvariantCulture)).Replace("%PLAYERID%", userId.ToString());
} }
public static string FormatConsumeItemMessaege(string itemName) public static string FormatConsumeItemMessaege(string itemName)
{ {
@ -1458,7 +1480,7 @@ namespace HISP.Game
} }
public static string FormatAwardEntry(int iconId, string title, int moneyBonus) public static string FormatAwardEntry(int iconId, string title, int moneyBonus)
{ {
return AwardFormat.Replace("%ICON%", iconId.ToString()).Replace("%NAME%", title).Replace("%BONUS%", moneyBonus.ToString("N0")); return AwardFormat.Replace("%ICON%", iconId.ToString()).Replace("%NAME%", title).Replace("%BONUS%", moneyBonus.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBestTimeHeader(string gameName) public static string FormatBestTimeHeader(string gameName)
@ -1467,7 +1489,7 @@ namespace HISP.Game
} }
public static string FormatBestTimeListEntry(int ranking, int score, string username, int totalplays) public static string FormatBestTimeListEntry(int ranking, int score, string username, int totalplays)
{ {
return GameBestTimeFormat.Replace("%RANKING%", ranking.ToString("N0")).Replace("%SCORE%", score.ToString().Insert(score.ToString().Length - 2, ".")).Replace("%USERNAME%", username).Replace("%TOTALPLAYS%", totalplays.ToString("N0")); return GameBestTimeFormat.Replace("%RANKING%", ranking.ToString("N0", CultureInfo.InvariantCulture)).Replace("%SCORE%", score.ToString().Insert(score.ToString().Length - 2, ".")).Replace("%USERNAME%", username).Replace("%TOTALPLAYS%", totalplays.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatHighscoreHeader(string gameName) public static string FormatHighscoreHeader(string gameName)
{ {
@ -1475,19 +1497,19 @@ namespace HISP.Game
} }
public static string FormatHighscoreListEntry(int ranking, int score, string username, int totalplays) public static string FormatHighscoreListEntry(int ranking, int score, string username, int totalplays)
{ {
return GameHighScoreFormat.Replace("%RANKING%", ranking.ToString("N0")).Replace("%SCORE%", score.ToString("N0")).Replace("%USERNAME%", username).Replace("%TOTALPLAYS%", totalplays.ToString("N0")); return GameHighScoreFormat.Replace("%RANKING%", ranking.ToString("N0", CultureInfo.InvariantCulture)).Replace("%SCORE%", score.ToString("N0", CultureInfo.InvariantCulture)).Replace("%USERNAME%", username).Replace("%TOTALPLAYS%", totalplays.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatHighscoreStat(string gameTitle, int ranking, int score, int totalplays) public static string FormatHighscoreStat(string gameTitle, int ranking, int score, int totalplays)
{ {
return HighscoreFormat.Replace("%GAMETITLE%", gameTitle).Replace("%RANKING%", ranking.ToString("N0")).Replace("%SCORE%", score.ToString("N0")).Replace("%TOTALPLAYS%", totalplays.ToString("N0")); return HighscoreFormat.Replace("%GAMETITLE%", gameTitle).Replace("%RANKING%", ranking.ToString("N0", CultureInfo.InvariantCulture)).Replace("%SCORE%", score.ToString("N0", CultureInfo.InvariantCulture)).Replace("%TOTALPLAYS%", totalplays.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBestTimeStat(string gameTitle, int ranking, int score, int totalplays) public static string FormatBestTimeStat(string gameTitle, int ranking, int score, int totalplays)
{ {
return BestTimeFormat.Replace("%GAMETITLE%", gameTitle).Replace("%RANKING%", ranking.ToString("N0")).Replace("%SCORE%", score.ToString()).Replace("%TOTALPLAYS%", totalplays.ToString("N0")); return BestTimeFormat.Replace("%GAMETITLE%", gameTitle).Replace("%RANKING%", ranking.ToString("N0", CultureInfo.InvariantCulture)).Replace("%SCORE%", score.ToString()).Replace("%TOTALPLAYS%", totalplays.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatMoneyEarnedMessage(int money) public static string FormatMoneyEarnedMessage(int money)
{ {
return YouEarnedMoneyFormat.Replace("%MONEY%", money.ToString("N0")); return YouEarnedMoneyFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatTimeBeatenMessage(int time) public static string FormatTimeBeatenMessage(int time)
{ {
@ -1501,11 +1523,11 @@ namespace HISP.Game
{ {
int questsComplete = Convert.ToInt32(Math.Floor(((decimal)totalQuestsComplete / (decimal)totalQuests) * (decimal)100.0)); int questsComplete = Convert.ToInt32(Math.Floor(((decimal)totalQuestsComplete / (decimal)totalQuests) * (decimal)100.0));
int questPointsComplete = Convert.ToInt32(Math.Floor(((decimal)questPoints / (decimal)totalQuestPoints) * (decimal)100.0)); int questPointsComplete = Convert.ToInt32(Math.Floor(((decimal)questPoints / (decimal)totalQuestPoints) * (decimal)100.0));
return QuestFooterFormat.Replace("%TOTALCOMPLETED%", totalQuestsComplete.ToString("N0")).Replace("%TOTALQUESTS%", totalQuests.ToString("N0")).Replace("%TOTALPERCENT%", questsComplete.ToString()).Replace("%YOURQP%", questPoints.ToString("N0")).Replace("%YOURQP%", totalQuestPoints.ToString("N0")).Replace("%QPERCENT%", questPointsComplete.ToString()).Replace("%MAXQP%", totalQuestPoints.ToString("N0")); return QuestFooterFormat.Replace("%TOTALCOMPLETED%", totalQuestsComplete.ToString("N0", CultureInfo.InvariantCulture)).Replace("%TOTALQUESTS%", totalQuests.ToString("N0", CultureInfo.InvariantCulture)).Replace("%TOTALPERCENT%", questsComplete.ToString()).Replace("%YOURQP%", questPoints.ToString("N0", CultureInfo.InvariantCulture)).Replace("%YOURQP%", totalQuestPoints.ToString("N0", CultureInfo.InvariantCulture)).Replace("%QPERCENT%", questPointsComplete.ToString()).Replace("%MAXQP%", totalQuestPoints.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatQuestLogQuest(string questTitle, int questPoints, string difficulty, string completionStatus) public static string FormatQuestLogQuest(string questTitle, int questPoints, string difficulty, string completionStatus)
{ {
return QuestFormat.Replace("%TITLE%", questTitle).Replace("%QUESTPOINTS%", questPoints.ToString("N0")).Replace("%DIFFICULTY%", difficulty).Replace("%COMPLETION%", completionStatus); return QuestFormat.Replace("%TITLE%", questTitle).Replace("%QUESTPOINTS%", questPoints.ToString("N0", CultureInfo.InvariantCulture)).Replace("%DIFFICULTY%", difficulty).Replace("%COMPLETION%", completionStatus);
} }
public static string FormatPrivateNotes(string privateNotes) public static string FormatPrivateNotes(string privateNotes)
@ -1573,11 +1595,11 @@ namespace HISP.Game
} }
public static string FormatMoneyStat(int money) public static string FormatMoneyStat(int money)
{ {
return StatsMoneyFormat.Replace("%MONEY%", money.ToString("N0")); return StatsMoneyFormat.Replace("%MONEY%", money.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatFreeTime(int freeMinutes) public static string FormatFreeTime(int freeMinutes)
{ {
return StatsFreeTimeFormat.Replace("%FREEMINUTES%", freeMinutes.ToString("N0")); return StatsFreeTimeFormat.Replace("%FREEMINUTES%", freeMinutes.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatPlayerDescriptionForStatsMenu(string description) public static string FormatPlayerDescriptionForStatsMenu(string description)
{ {
@ -1586,11 +1608,11 @@ namespace HISP.Game
public static string FormatExperience(int expPoints) public static string FormatExperience(int expPoints)
{ {
return StatsExpFormat.Replace("%EXPPOINTS%", expPoints.ToString("N0")); return StatsExpFormat.Replace("%EXPPOINTS%", expPoints.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatQuestPoints(int questPoints) public static string FormatQuestPoints(int questPoints)
{ {
return StatsQuestpointsFormat.Replace("%QUESTPOINTS%", questPoints.ToString("N0")); return StatsQuestpointsFormat.Replace("%QUESTPOINTS%", questPoints.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatHungryStat(string status) public static string FormatHungryStat(string status)
{ {
@ -1640,27 +1662,27 @@ namespace HISP.Game
} }
public static string FormatSellMessage(string itemName, int price) public static string FormatSellMessage(string itemName, int price)
{ {
return Sold1Format.Replace("%ITEM%", itemName).Replace("%PRICE%", price.ToString("N0")); return Sold1Format.Replace("%ITEM%", itemName).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatSellAllMessage(string itemName, int price, int sellAmount) public static string FormatSellAllMessage(string itemName, int price, int sellAmount)
{ {
return SoldAllFormat.Replace("%AMOUNT%",sellAmount.ToString()).Replace("%ITEM%", itemName).Replace("%PRICE%", price.ToString("N0")); return SoldAllFormat.Replace("%AMOUNT%",sellAmount.ToString()).Replace("%ITEM%", itemName).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBuy25Message(string itemName, int price) public static string FormatBuy25Message(string itemName, int price)
{ {
return Brought25Format.Replace("%ITEM%", itemName).Replace("%PRICE%", price.ToString("N0")); return Brought25Format.Replace("%ITEM%", itemName).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBuy5Message(string itemName, int price) public static string FormatBuy5Message(string itemName, int price)
{ {
return Brought5Format.Replace("%ITEM%", itemName).Replace("%PRICE%", price.ToString("N0")); return Brought5Format.Replace("%ITEM%", itemName).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatBuyMessage(string itemName, int price) public static string FormatBuyMessage(string itemName, int price)
{ {
return Brought1Format.Replace("%ITEM%", itemName).Replace("%PRICE%", price.ToString("N0")); return Brought1Format.Replace("%ITEM%", itemName).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatShopEntry(int iconid, string count, string name, int price) public static string FormatShopEntry(int iconid, string count, string name, int price)
{ {
return ShopEntryFormat.Replace("%ICONID%", iconid.ToString()).Replace("%COUNT%", count).Replace("%TITLE%", name).Replace("%PRICE%", price.ToString("N0")); return ShopEntryFormat.Replace("%ICONID%", iconid.ToString()).Replace("%COUNT%", count).Replace("%TITLE%", name).Replace("%PRICE%", price.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatWearButton(int randomId) public static string FormatWearButton(int randomId)
{ {
@ -1755,6 +1777,10 @@ namespace HISP.Game
{ {
return ItemDropButton.Replace("%RANDOMID%", randomid.ToString()); return ItemDropButton.Replace("%RANDOMID%", randomid.ToString());
} }
public static string FormatItemOpenButton(int randomId)
{
return ItemOpenButton.Replace("%RANDOMID%", randomId.ToString());
}
public static string FormatItemUseButton(int randomid) public static string FormatItemUseButton(int randomid)
{ {
return ItemUseButton.Replace("%RANDOMID%", randomid.ToString()); return ItemUseButton.Replace("%RANDOMID%", randomid.ToString());
@ -1776,11 +1802,11 @@ namespace HISP.Game
public static string FormatPlayerBuddyList(int amount) public static string FormatPlayerBuddyList(int amount)
{ {
return PlayerListOfBuddiesFormat.Replace("%AMOUNT%", amount.ToString("N0")); return PlayerListOfBuddiesFormat.Replace("%AMOUNT%", amount.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatPlayerList(int amount) public static string FormatPlayerList(int amount)
{ {
return PlayerListOfPlayersFormat.Replace("%AMOUNT%", amount.ToString("N0")); return PlayerListOfPlayersFormat.Replace("%AMOUNT%", amount.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatMapAllBuddiesList(string buddyxys) public static string FormatMapAllBuddiesList(string buddyxys)
@ -1815,7 +1841,7 @@ namespace HISP.Game
public static string FormatTransportCost(int cost) public static string FormatTransportCost(int cost)
{ {
return TransportCostFormat.Replace("%COST%", cost.ToString("N0")); return TransportCostFormat.Replace("%COST%", cost.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatTransportMessage(string method, string place, string costFormat, int id, int x, int y) public static string FormatTransportMessage(string method, string place, string costFormat, int id, int x, int y)
{ {
@ -1885,34 +1911,34 @@ namespace HISP.Game
// For Sender // For Sender
public static string FormatBuddyChatMessageForSender(int numbBuddies, string username, string message) public static string FormatBuddyChatMessageForSender(int numbBuddies, string username, string message)
{ {
return BuddyChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbBuddies.ToString("N0")); return BuddyChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbBuddies.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatHereChatMessageForSender(int numbHere, string username, string message) public static string FormatHereChatMessageForSender(int numbHere, string username, string message)
{ {
return HereChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbHere.ToString("N0")); return HereChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbHere.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatNearChatMessageForSender(int numbNear, string username, string message) public static string FormatNearChatMessageForSender(int numbNear, string username, string message)
{ {
return NearChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbNear.ToString("N0")); return NearChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbNear.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatIsleChatMessageForSender(int numbIsle, string username, string message) public static string FormatIsleChatMessageForSender(int numbIsle, string username, string message)
{ {
return IsleChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbIsle.ToString("N0")); return IsleChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbIsle.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatAdminChatForSender(int numbAdmins, string username, string message) public static string FormatAdminChatForSender(int numbAdmins, string username, string message)
{ {
return AdminChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbAdmins.ToString("N0")); return AdminChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbAdmins.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatAdsChatForSender(int numbListening, string username, string message) public static string FormatAdsChatForSender(int numbListening, string username, string message)
{ {
return AdsChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbListening.ToString("N0")); return AdsChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbListening.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatModChatForSender(int numbMods, string username, string message) public static string FormatModChatForSender(int numbMods, string username, string message)
{ {
return ModChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbMods.ToString("N0")); return ModChatFormatForSender.Replace("%USERNAME%", username).Replace("%MESSAGE%", message).Replace("%AMOUNT%", numbMods.ToString("N0", CultureInfo.InvariantCulture));
} }
public static string FormatDirectChatMessageForSender(string username,string toUsername, string message) public static string FormatDirectChatMessageForSender(string username,string toUsername, string message)
{ {

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

@ -214,6 +214,7 @@ namespace HISP.Game
private static string buildMultiroom(string id, User user) private static string buildMultiroom(string id, User user)
{ {
string message = Messages.MultiroomPlayersParticipating; string message = Messages.MultiroomPlayersParticipating;
foreach (User userOnTile in GameServer.GetUsersOnSpecialTileCode("MULTIROOM-" + id)) foreach (User userOnTile in GameServer.GetUsersOnSpecialTileCode("MULTIROOM-" + id))
{ {
@ -1523,12 +1524,15 @@ namespace HISP.Game
message += Messages.FormatPlayerInventoryItemMeta(itemInfo.IconId, item.ItemInstances.Count, title); message += Messages.FormatPlayerInventoryItemMeta(itemInfo.IconId, item.ItemInstances.Count, title);
int randomId = item.ItemInstances[0].RandomId; int randomId = item.ItemInstances[0].RandomId;
if (itemInfo.Type != "QUEST" && itemInfo.Type != "TEXT" && !(itemInfo.Id == Item.Present || itemInfo.Id == Item.DorothyShoes || itemInfo.Id == Item.Telescope) && World.CanDropItems(inv.BaseUser.X, inv.BaseUser.Y)) if (itemInfo.Type != "QUEST" && itemInfo.Type != "TEXT" && !(itemInfo.Id == Item.DorothyShoes || itemInfo.Id == Item.Telescope) && World.CanDropItems(inv.BaseUser.X, inv.BaseUser.Y))
message += Messages.FormatItemDropButton(randomId); message += Messages.FormatItemDropButton(randomId);
if (itemInfo.Id == Item.Present || itemInfo.Id == Item.DorothyShoes || itemInfo.Id == Item.Telescope) if (itemInfo.Id == Item.DorothyShoes || itemInfo.Id == Item.Telescope)
message += Messages.FormatItemUseButton(randomId); message += Messages.FormatItemUseButton(randomId);
if (itemInfo.Id == Item.Present)
message += Messages.FormatItemOpenButton(randomId);
if (itemInfo.Type == "CLOTHES" || itemInfo.Type == "JEWELRY") if (itemInfo.Type == "CLOTHES" || itemInfo.Type == "JEWELRY")
message += Messages.FormatWearButton(randomId); message += Messages.FormatWearButton(randomId);
@ -1740,7 +1744,7 @@ namespace HISP.Game
} }
if (canRelease) if (canRelease)
message += Messages.HorseReleaseButton; message += Messages.FormatHorseReleaseButton(horse.Breed.Type.ToUpper());
} }
@ -1935,14 +1939,28 @@ namespace HISP.Game
message += Messages.MetaTerminator; message += Messages.MetaTerminator;
return message; return message;
} }
private static string buildSanta(User user)
{
string message = Messages.SantaHiddenText;
InventoryItem[] items = user.Inventory.GetItemList();
foreach (InventoryItem item in items)
{
Item.ItemInformation itemInfo = Item.GetItemById(item.ItemId);
int randomId = item.ItemInstances[0].RandomId;
if (itemInfo.Type != "QUEST" && itemInfo.Type != "TEXT" && itemInfo.Type != "COMPANION" && itemInfo.Id != Item.Present)
message += Messages.FormatSantaItemEntry(itemInfo.IconId, itemInfo.Name, randomId);
}
message += Messages.ExitThisPlace;
message += Messages.MetaTerminator;
return message;
}
private static string buildPawneer(User user) private static string buildPawneer(User user)
{ {
string message = ""; string message = "";
if (user.Inventory.HasItemId(Item.PawneerOrder)) if (user.Inventory.HasItemId(Item.PawneerOrder))
message += Messages.PawneerOrderMeta; message += Messages.PawneerOrderMeta;
message += Messages.PawneerUntackedHorsesICanBuy; message += Messages.PawneerUntackedHorsesICanBuy;
foreach(HorseInstance horse in user.HorseInventory.HorseList) foreach(HorseInstance horse in user.HorseInventory.HorseList.OrderBy(o => o.Name).ToList())
{ {
if(horse.Category == "TRADING" && horse.Equipment.Bridle == null && horse.Equipment.Saddle == null && horse.Equipment.SaddlePad == null && horse.Equipment.Companion == null) if(horse.Category == "TRADING" && horse.Equipment.Bridle == null && horse.Equipment.Saddle == null && horse.Equipment.SaddlePad == null && horse.Equipment.Companion == null)
{ {
@ -2067,9 +2085,12 @@ namespace HISP.Game
{ {
message += buildRanch(user, int.Parse(TileArg)); message += buildRanch(user, int.Parse(TileArg));
} }
if(TileCode == "SANTA")
{
message += buildSanta(user);
}
if (TileCode == "MULTIROOM") if (TileCode == "MULTIROOM")
{ {
user.MetaPriority = false; // acturally want to track updates here >-<
if (TileArg != "") if (TileArg != "")
message += buildMultiroom(TileArg, user); message += buildMultiroom(TileArg, user);
} }

19
Horse Isle Server/HorseIsleServer/Game/Npc.cs
View file

@ -177,27 +177,32 @@ namespace HISP.Game
if (GameServer.GetUsersAt(this.X, this.Y, true, true).Length > 0) if (GameServer.GetUsersAt(this.X, this.Y, true, true).Length > 0)
return; return;
if (UdlrScriptPos + 1 >= UDLRScript.Length)
UdlrScriptPos = 0;
else
UdlrScriptPos++;
switch (UDLRScript.ToLower()[UdlrScriptPos]) switch (UDLRScript.ToLower()[UdlrScriptPos])
{ {
case 'u': case 'u':
Y++; Logger.DebugPrint(this.Name + " Moved up: was " + X + ", " + Y + " now: " + X + ", " + (Y + 1).ToString());
break;
case 'd':
Y--; Y--;
break; break;
case 'd':
Logger.DebugPrint(this.Name + " Moved down: was " + X + ", " + Y + " now: " + X + ", " + (Y - 1).ToString());
Y++;
break;
case 'l': case 'l':
Logger.DebugPrint(this.Name + " Moved left: was " + X + ", " + Y + " now: " + (X - 1).ToString() + ", " + Y );
X--; X--;
break; break;
case 'r': case 'r':
Logger.DebugPrint(this.Name + " Moved right: was " + X + ", " + Y + " now: " + (X + 1).ToString() + ", " + Y);
X++; X++;
break; break;
} }
if (UdlrScriptPos > UDLRScript.Length)
UdlrScriptPos = 0;
else
UdlrScriptPos++;
} }
} }
} }

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

@ -41,12 +41,12 @@ namespace HISP.Game
if(type == "BURIED") if(type == "BURIED")
{ {
if(moneyValue == -1) if(moneyValue == -1)
value = GameServer.RandomNumberGenerator.Next(100,5000); value = GameServer.RandomNumberGenerator.Next(100,1500);
} }
else if(type == "RAINBOW") else if(type == "RAINBOW")
{ {
if (moneyValue == -1) if (moneyValue == -1)
value = GameServer.RandomNumberGenerator.Next(10000, 50000); value = GameServer.RandomNumberGenerator.Next(10000, 30000);
} }
if (moneyValue != -1) if (moneyValue != -1)

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

@ -25,9 +25,9 @@ namespace HISP.Server
string BuddyTable = "CREATE TABLE BuddyList(Id INT, IdFriend INT, Pending BOOL)"; string BuddyTable = "CREATE TABLE BuddyList(Id INT, IdFriend INT, Pending BOOL)";
string WorldTable = "CREATE TABLE World(Time INT, Day INT, Year INT)"; string WorldTable = "CREATE TABLE World(Time INT, Day INT, Year INT)";
string WeatherTable = "CREATE TABLE Weather(Area TEXT(1028), Weather TEXT(64))"; string WeatherTable = "CREATE TABLE Weather(Area TEXT(1028), Weather TEXT(64))";
string InventoryTable = "CREATE TABLE Inventory(PlayerID INT, RandomID INT, ItemID INT)"; string InventoryTable = "CREATE TABLE Inventory(PlayerID INT, RandomID INT, ItemID INT, Data INT)";
string ShopInventory = "CREATE TABLE ShopInventory(ShopID INT, RandomID INT, ItemID INT)"; string ShopInventory = "CREATE TABLE ShopInventory(ShopID INT, RandomID INT, ItemID INT)";
string DroppedItems = "CREATE TABLE DroppedItems(X INT, Y INT, RandomID INT, ItemID INT, DespawnTimer INT)"; string DroppedItems = "CREATE TABLE DroppedItems(X INT, Y INT, RandomID INT, ItemID INT, DespawnTimer INT, Data INT)";
string TrackedQuest = "CREATE TABLE TrackedQuest(playerId INT, questId INT, timesCompleted INT)"; string TrackedQuest = "CREATE TABLE TrackedQuest(playerId INT, questId INT, timesCompleted INT)";
string OnlineUsers = "CREATE TABLE OnlineUsers(playerId INT, Admin TEXT(3), Moderator TEXT(3), Subscribed TEXT(3))"; string OnlineUsers = "CREATE TABLE OnlineUsers(playerId INT, Admin TEXT(3), Moderator TEXT(3), Subscribed TEXT(3))";
string CompetitionGear = "CREATE TABLE CompetitionGear(playerId INT, headItem INT, bodyItem INT, legItem INT, feetItem INT)"; string CompetitionGear = "CREATE TABLE CompetitionGear(playerId INT, headItem INT, bodyItem INT, legItem INT, feetItem INT)";
@ -3455,7 +3455,7 @@ namespace HISP.Server
db.Open(); db.Open();
MySqlCommand sqlCommand = db.CreateCommand(); MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "SELECT ItemId,RandomId FROM Inventory WHERE PlayerId=@playerId"; sqlCommand.CommandText = "SELECT ItemId,RandomId,Data FROM Inventory WHERE PlayerId=@playerId";
sqlCommand.Parameters.AddWithValue("@playerId", playerId); sqlCommand.Parameters.AddWithValue("@playerId", playerId);
sqlCommand.Prepare(); sqlCommand.Prepare();
MySqlDataReader reader = sqlCommand.ExecuteReader(); MySqlDataReader reader = sqlCommand.ExecuteReader();
@ -3463,7 +3463,7 @@ namespace HISP.Server
while (reader.Read()) while (reader.Read())
{ {
instances.Add(new ItemInstance(reader.GetInt32(0), reader.GetInt32(1))); instances.Add(new ItemInstance(reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2)));
} }
sqlCommand.Dispose(); sqlCommand.Dispose();
return instances; return instances;
@ -3477,10 +3477,11 @@ namespace HISP.Server
db.Open(); db.Open();
MySqlCommand sqlCommand = db.CreateCommand(); MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "INSERT INTO Inventory VALUES(@playerId,@randomId,@itemId)"; sqlCommand.CommandText = "INSERT INTO Inventory VALUES(@playerId,@randomId,@itemId, @data)";
sqlCommand.Parameters.AddWithValue("@playerId", playerId); sqlCommand.Parameters.AddWithValue("@playerId", playerId);
sqlCommand.Parameters.AddWithValue("@randomId", instance.RandomId); sqlCommand.Parameters.AddWithValue("@randomId", instance.RandomId);
sqlCommand.Parameters.AddWithValue("@itemId", instance.ItemId); sqlCommand.Parameters.AddWithValue("@itemId", instance.ItemId);
sqlCommand.Parameters.AddWithValue("@data", instance.Data);
sqlCommand.Prepare(); sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery(); sqlCommand.ExecuteNonQuery();
sqlCommand.Dispose(); sqlCommand.Dispose();
@ -3738,6 +3739,7 @@ namespace HISP.Server
droppedItem.X = reader.GetInt32(0); droppedItem.X = reader.GetInt32(0);
droppedItem.Y = reader.GetInt32(1); droppedItem.Y = reader.GetInt32(1);
droppedItem.DespawnTimer = reader.GetInt32(4); droppedItem.DespawnTimer = reader.GetInt32(4);
droppedItem.Data = reader.GetInt32(5);
itemList.Add(droppedItem); itemList.Add(droppedItem);
} }
sqlCommand.Dispose(); sqlCommand.Dispose();
@ -3768,12 +3770,13 @@ namespace HISP.Server
MySqlCommand sqlCommand = db.CreateCommand(); MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "INSERT INTO DroppedItems VALUES(@x, @y, @randomId, @itemId, @despawnTimer)"; sqlCommand.CommandText = "INSERT INTO DroppedItems VALUES(@x, @y, @randomId, @itemId, @despawnTimer, @data)";
sqlCommand.Parameters.AddWithValue("@x", item.X); sqlCommand.Parameters.AddWithValue("@x", item.X);
sqlCommand.Parameters.AddWithValue("@y", item.Y); sqlCommand.Parameters.AddWithValue("@y", item.Y);
sqlCommand.Parameters.AddWithValue("@randomId", item.Instance.RandomId); sqlCommand.Parameters.AddWithValue("@randomId", item.Instance.RandomId);
sqlCommand.Parameters.AddWithValue("@itemId", item.Instance.ItemId); sqlCommand.Parameters.AddWithValue("@itemId", item.Instance.ItemId);
sqlCommand.Parameters.AddWithValue("@despawnTimer", item.DespawnTimer); sqlCommand.Parameters.AddWithValue("@despawnTimer", item.DespawnTimer);
sqlCommand.Parameters.AddWithValue("@data", item.Data);
sqlCommand.Prepare(); sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery(); sqlCommand.ExecuteNonQuery();
sqlCommand.Dispose(); sqlCommand.Dispose();

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

@ -519,7 +519,7 @@ namespace HISP.Server
int price = gameData.horses.pawneer_base_price[i].price; int price = gameData.horses.pawneer_base_price[i].price;
Pawneer pawneerPricing = new Pawneer(id, price); Pawneer pawneerPricing = new Pawneer(id, price);
Pawneer.PawneerPriceModels.Add(pawneerPricing); Pawneer.PawneerPriceModels.Add(pawneerPricing);
Logger.DebugPrint("Registered Pawneer Base Price " + pawneerPricing.BreedId + " for $" + pawneerPricing.BasePrice.ToString("N0")); Logger.DebugPrint("Registered Pawneer Base Price " + pawneerPricing.BreedId + " for $" + pawneerPricing.BasePrice.ToString("N0", CultureInfo.InvariantCulture));
} }
int totalCategories = gameData.horses.categorys.Count; int totalCategories = gameData.horses.categorys.Count;
@ -924,6 +924,15 @@ namespace HISP.Server
Messages.FarrierPutOnSteelShoesAllMesssageFormat = gameData.messages.meta.farrier.put_on_steel_all; Messages.FarrierPutOnSteelShoesAllMesssageFormat = gameData.messages.meta.farrier.put_on_steel_all;
Messages.FarrierShoesCantAffordMessage = gameData.messages.meta.farrier.cant_afford_farrier; Messages.FarrierShoesCantAffordMessage = gameData.messages.meta.farrier.cant_afford_farrier;
// Santa
Messages.SantaHiddenText = gameData.messages.meta.santa.hidden_text;
Messages.SantaWrapItemFormat = gameData.messages.meta.santa.wrap_format;
Messages.SantaWrappedObjectMessage = gameData.messages.meta.santa.wrapped_object;
Messages.SantaCantWrapInvFull = gameData.messages.meta.santa.wrap_fail_inv_full;
Messages.SantaItemOpenedFormat = gameData.messages.meta.santa.open_format;
Messages.SantaItemCantOpenInvFull = gameData.messages.meta.santa.open_format;
// Pawneer // Pawneer
Messages.PawneerUntackedHorsesICanBuy = gameData.messages.meta.pawneer.untacked_i_can_buy; Messages.PawneerUntackedHorsesICanBuy = gameData.messages.meta.pawneer.untacked_i_can_buy;
Messages.PawneerHorseFormat = gameData.messages.meta.pawneer.pawn_horse; Messages.PawneerHorseFormat = gameData.messages.meta.pawneer.pawn_horse;
@ -1402,6 +1411,7 @@ namespace HISP.Server
Messages.ItemThrowButton = gameData.messages.meta.inventory.item_throw_button; Messages.ItemThrowButton = gameData.messages.meta.inventory.item_throw_button;
Messages.ItemConsumeButton = gameData.messages.meta.inventory.item_consume_button; Messages.ItemConsumeButton = gameData.messages.meta.inventory.item_consume_button;
Messages.ItemUseButton = gameData.messages.meta.inventory.item_use_button; Messages.ItemUseButton = gameData.messages.meta.inventory.item_use_button;
Messages.ItemOpenButton = gameData.messages.meta.inventory.item_open_button;
Messages.ItemWearButton = gameData.messages.meta.inventory.item_wear_button; Messages.ItemWearButton = gameData.messages.meta.inventory.item_wear_button;
Messages.ItemReadButton = gameData.messages.meta.inventory.item_read_button; Messages.ItemReadButton = gameData.messages.meta.inventory.item_read_button;

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

@ -87,14 +87,14 @@ namespace HISP.Server
if (!client.LoggedinUser.MetaPriority) if (!client.LoggedinUser.MetaPriority)
UpdateArea(client); UpdateArea(client);
Treasure.AddValue();
Database.IncPlayerTirednessForOfflineUsers(); Database.IncPlayerTirednessForOfflineUsers();
if (totalMinutesElapsed % 5 == 0) if (totalMinutesElapsed % 5 == 0)
{ {
Treasure.AddValue();
DroppedItems.DespawnItems(); DroppedItems.DespawnItems();
DroppedItems.GenerateItems(false); DroppedItems.GenerateItems();
} }
WildHorse.Update(); WildHorse.Update();
@ -2344,6 +2344,7 @@ namespace HISP.Server
{ {
room.Drawing += drawingToAdd; room.Drawing += drawingToAdd;
Database.SetLastPlayer("D" + room.Id.ToString(), sender.LoggedinUser.Id); Database.SetLastPlayer("D" + room.Id.ToString(), sender.LoggedinUser.Id);
UpdateAreaForAll(sender.LoggedinUser.X, sender.LoggedinUser.Y, true);
} }
else else
{ {
@ -2399,6 +2400,7 @@ namespace HISP.Server
{ {
room.Drawing += drawing; room.Drawing += drawing;
Database.SetLastPlayer("D" + room.Id.ToString(), sender.LoggedinUser.Id); Database.SetLastPlayer("D" + room.Id.ToString(), sender.LoggedinUser.Id);
UpdateAreaForAll(sender.LoggedinUser.X, sender.LoggedinUser.Y, true);
} }
else else
{ {
@ -2501,7 +2503,7 @@ namespace HISP.Server
if (Database.GetLastPlayer("P" + roomId) != sender.LoggedinUser.Id) if (Database.GetLastPlayer("P" + roomId) != sender.LoggedinUser.Id)
{ {
Database.SetLastPlayer("P" + roomId, sender.LoggedinUser.Id); Database.SetLastPlayer("P" + roomId, sender.LoggedinUser.Id);
UpdateAreaForAll(sender.LoggedinUser.X, sender.LoggedinUser.Y); UpdateAreaForAll(sender.LoggedinUser.X, sender.LoggedinUser.Y, true);
} }
break; break;
@ -3226,10 +3228,9 @@ namespace HISP.Server
return; return;
} }
loggedInUser.Facing = direction + (onHorse * 5);
if (loggedInUser.Y != newY || loggedInUser.X != newX) if (loggedInUser.Y != newY || loggedInUser.X != newX)
{ {
loggedInUser.Facing = direction + (onHorse * 5);
if (moveTwo) if (moveTwo)
direction += 20; direction += 20;
loggedInUser.Y = newY; loggedInUser.Y = newY;
@ -4145,6 +4146,76 @@ namespace HISP.Server
sender.SendPacket(itemRemovedMessage); sender.SendPacket(itemRemovedMessage);
} }
break;
case PacketBuilder.ITEM_WRAP:
packetStr = Encoding.UTF8.GetString(packet);
randomIdStr = packetStr.Substring(2, packet.Length - 2);
randomId = 0;
try
{
randomId = Int32.Parse(randomIdStr);
}
catch (FormatException)
{
Logger.ErrorPrint(sender.LoggedinUser.Username + " Sent an invalid object interaction packet.");
return;
}
if (sender.LoggedinUser.Inventory.HasItem(randomId))
{
ItemInstance curItem = sender.LoggedinUser.Inventory.GetItemByRandomid(randomId).ItemInstances[0];
ItemInstance wrappedItem = new ItemInstance(Item.Present, -1, curItem.ItemId);
try
{
sender.LoggedinUser.Inventory.Add(wrappedItem);
sender.LoggedinUser.Inventory.Remove(curItem);
}
catch(InventoryException)
{
byte[] cantWrapPresent = PacketBuilder.CreateChat(Messages.SantaCantWrapInvFull, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(cantWrapPresent);
UpdateArea(sender);
break;
}
}
byte[] wrappedObjectMessage = PacketBuilder.CreateChat(Messages.SantaWrappedObjectMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(wrappedObjectMessage);
UpdateArea(sender);
break;
case PacketBuilder.ITEM_OPEN:
packetStr = Encoding.UTF8.GetString(packet);
randomIdStr = packetStr.Substring(2, packet.Length - 2);
randomId = 0;
try
{
randomId = Int32.Parse(randomIdStr);
}
catch (FormatException)
{
Logger.ErrorPrint(sender.LoggedinUser.Username + " Sent an invalid object interaction packet.");
return;
}
if (sender.LoggedinUser.Inventory.HasItem(randomId))
{
InventoryItem item = sender.LoggedinUser.Inventory.GetItemByRandomid(randomId);
int newItem = item.ItemInstances[0].Data;
try
{
sender.LoggedinUser.Inventory.Add(new ItemInstance(newItem));
sender.LoggedinUser.Inventory.Remove(item.ItemInstances[0]);
}
catch(InventoryException)
{
byte[] cantOpenInvFull = PacketBuilder.CreateChat(Messages.SantaItemCantOpenInvFull, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(cantOpenInvFull);
break;
}
byte[] itemOpened = PacketBuilder.CreateChat(Messages.FormatSantaOpenPresent(Item.GetItemById(newItem).Name), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(itemOpened);
UpdateInventory(sender);
}
break; break;
case PacketBuilder.ITEM_USE: case PacketBuilder.ITEM_USE:
packetStr = Encoding.UTF8.GetString(packet); packetStr = Encoding.UTF8.GetString(packet);

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

@ -1,4 +1,5 @@
using System; using System;
using System.Globalization;
using System.IO; using System.IO;
using System.Text; using System.Text;
using HISP.Game; using HISP.Game;
@ -149,7 +150,9 @@ namespace HISP.Server
public const byte ITEM_BUY_5 = 0x35; public const byte ITEM_BUY_5 = 0x35;
public const byte ITEM_BUY_25 = 0x37; public const byte ITEM_BUY_25 = 0x37;
public const byte ITEM_SELL = 0x3C; public const byte ITEM_SELL = 0x3C;
public const byte ITEM_WRAP = 0x17;
public const byte ITEM_SELL_ALL = 0x3D; public const byte ITEM_SELL_ALL = 0x3D;
public const byte ITEM_OPEN = 0x16;
public const byte ITEM_WEAR = 0x46; public const byte ITEM_WEAR = 0x46;
public const byte ITEM_REMOVE = 0x47; public const byte ITEM_REMOVE = 0x47;
public const byte ITEM_CONSUME = 0x51; public const byte ITEM_CONSUME = 0x51;
@ -813,9 +816,9 @@ namespace HISP.Server
public static byte[] CreatePlayerData(int money, int playerCount, int mail) public static byte[] CreatePlayerData(int money, int playerCount, int mail)
{ {
byte[] moneyStrBytes = Encoding.UTF8.GetBytes(money.ToString("N0")); byte[] moneyStrBytes = Encoding.UTF8.GetBytes(money.ToString("N0", CultureInfo.InvariantCulture));
byte[] playerStrBytes = Encoding.UTF8.GetBytes(playerCount.ToString("N0")); byte[] playerStrBytes = Encoding.UTF8.GetBytes(playerCount.ToString("N0", CultureInfo.InvariantCulture));
byte[] mailStrBytes = Encoding.UTF8.GetBytes(mail.ToString("N0")); byte[] mailStrBytes = Encoding.UTF8.GetBytes(mail.ToString("N0", CultureInfo.InvariantCulture));
MemoryStream ms = new MemoryStream(); MemoryStream ms = new MemoryStream();
ms.WriteByte(PACKET_BASE_STATS); ms.WriteByte(PACKET_BASE_STATS);