From 3c25795188910215ed625d687f68518082c572cb Mon Sep 17 00:00:00 2001 From: SilicaPi Date: Sun, 31 Jan 2021 01:18:52 +1300 Subject: [PATCH] Weirest bug ever happened, it said "Item.ItemInformation" is higher protection level than Item.Tack even though both were public, i eventurally found that it was because Item was "class" where as "Item.Tack" was "public class" so i made everything be "public class" --- .../HorseIsleServer/Game/AbuseReport.cs | 2 +- .../HorseIsleServer/Game/Chat/Chat.cs | 2 +- .../HorseIsleServer/Game/Chat/Command.cs | 3 +- .../HorseIsleServer/Game/GameExceptions.cs | 6 +- .../HorseIsleServer/Game/Horse/HorseInfo.cs | 4 +- .../Game/Horse/HorseInstance.cs | 2 +- .../HorseIsleServer/Game/Horse/WildHorse.cs | 2 +- .../Game/Inventory/HorseInventory.cs | 2 +- .../Game/Inventory/IInventory.cs | 3 +- .../Game/Inventory/InventoryItem.cs | 3 +- .../Game/Inventory/PlayerInventory.cs | 3 +- .../Game/Inventory/ShopInventory.cs | 3 +- .../Game/{ => Items}/DroppedItems.cs | 5 +- .../HorseIsleServer/Game/{ => Items}/Item.cs | 10 ++- .../Game/{ => Items}/ItemInstance.cs | 5 +- .../HorseIsleServer/Game/Items/Tack.cs | 86 +++++++++++++++++++ Horse Isle Server/HorseIsleServer/Game/Map.cs | 2 +- .../HorseIsleServer/Game/Messages.cs | 18 +++- .../HorseIsleServer/Game/Meta.cs | 3 +- Horse Isle Server/HorseIsleServer/Game/Npc.cs | 2 +- .../HorseIsleServer/Game/Quest.cs | 3 +- .../HorseIsleServer/Game/Services/Inn.cs | 4 +- .../HorseIsleServer/Game/Services/Shop.cs | 3 +- .../Game/Services/Transport.cs | 2 +- .../HorseIsleServer/Game/Services/Vet.cs | 2 +- .../Game/SwfModules/Brickpoet.cs | 2 +- .../HorseIsleServer/Game/Tracking.cs | 2 +- .../HorseIsleServer/Game/World.cs | 2 +- .../HorseIsleServer/Player/Award.cs | 2 +- .../Player/Equips/CompetitionGear.cs | 3 +- .../HorseIsleServer/Player/Equips/Jewelry.cs | 3 +- .../HorseIsleServer/Player/Friends.cs | 2 +- .../HorseIsleServer/Player/Highscore.cs | 2 +- .../HorseIsleServer/Player/Mailbox.cs | 2 +- .../HorseIsleServer/Player/PlayerQuests.cs | 2 +- .../HorseIsleServer/Player/TrackedQuest.cs | 2 +- .../HorseIsleServer/Player/User.cs | 2 +- Horse Isle Server/HorseIsleServer/Program.cs | 5 +- .../Properties/Resources.Designer.cs | 10 +-- .../Security/Authentication.cs | 2 +- .../Security/CrossDomainPolicy.cs | 2 +- .../HorseIsleServer/Security/RandomID.cs | 2 +- .../HorseIsleServer/Server/ConfigReader.cs | 2 +- .../HorseIsleServer/Server/Converters.cs | 2 +- .../HorseIsleServer/Server/Database.cs | 3 +- .../HorseIsleServer/Server/GameClient.cs | 2 +- .../HorseIsleServer/Server/GameDataJson.cs | 3 +- .../HorseIsleServer/Server/GameServer.cs | 3 +- .../HorseIsleServer/Server/Logger.cs | 2 +- .../HorseIsleServer/Server/PacketBuilder.cs | 2 +- 50 files changed, 186 insertions(+), 60 deletions(-) rename Horse Isle Server/HorseIsleServer/Game/{ => Items}/DroppedItems.cs (99%) rename Horse Isle Server/HorseIsleServer/Game/{ => Items}/Item.cs (96%) rename Horse Isle Server/HorseIsleServer/Game/{ => Items}/ItemInstance.cs (83%) create mode 100644 Horse Isle Server/HorseIsleServer/Game/Items/Tack.cs diff --git a/Horse Isle Server/HorseIsleServer/Game/AbuseReport.cs b/Horse Isle Server/HorseIsleServer/Game/AbuseReport.cs index b770403..2f4e648 100755 --- a/Horse Isle Server/HorseIsleServer/Game/AbuseReport.cs +++ b/Horse Isle Server/HorseIsleServer/Game/AbuseReport.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; namespace HISP.Game { - class AbuseReport + public class AbuseReport { public struct ReportReason { diff --git a/Horse Isle Server/HorseIsleServer/Game/Chat/Chat.cs b/Horse Isle Server/HorseIsleServer/Game/Chat/Chat.cs index c317c6a..144cd8d 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Chat/Chat.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Chat/Chat.cs @@ -6,7 +6,7 @@ using HISP.Server; namespace HISP.Game.Chat { - class Chat + public class Chat { public struct Correction { diff --git a/Horse Isle Server/HorseIsleServer/Game/Chat/Command.cs b/Horse Isle Server/HorseIsleServer/Game/Chat/Command.cs index 84ca6b6..28a4f03 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Chat/Command.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Chat/Command.cs @@ -1,11 +1,12 @@ using HISP.Player; using HISP.Server; +using HISP.Game.Items; using System; using System.Collections.Generic; namespace HISP.Game.Chat { - class Command + public class Command { public static bool Give(string message, string[] args, User user) diff --git a/Horse Isle Server/HorseIsleServer/Game/GameExceptions.cs b/Horse Isle Server/HorseIsleServer/Game/GameExceptions.cs index fec4c98..4857e58 100755 --- a/Horse Isle Server/HorseIsleServer/Game/GameExceptions.cs +++ b/Horse Isle Server/HorseIsleServer/Game/GameExceptions.cs @@ -4,7 +4,7 @@ namespace HISP.Game { // Inventory - class InventoryException : Exception { }; - class InventoryFullException : InventoryException { }; - class InventoryMaxStackException : InventoryException { }; + public class InventoryException : Exception { }; + public class InventoryFullException : InventoryException { }; + public class InventoryMaxStackException : InventoryException { }; } diff --git a/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInfo.cs b/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInfo.cs index b2a14c3..1e4e9f3 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInfo.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInfo.cs @@ -1,9 +1,11 @@ using HISP.Server; +using HISP.Game.Items; + using System.Collections.Generic; namespace HISP.Game.Horse { - class HorseInfo + public class HorseInfo { public enum StatType { diff --git a/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInstance.cs b/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInstance.cs index ea79022..83291ca 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInstance.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInstance.cs @@ -4,7 +4,7 @@ using HISP.Server; namespace HISP.Game.Horse { - class HorseInstance + public class HorseInstance { public HorseInstance(HorseInfo.Breed breed, int randomId = -1, string loadName=null, string loadDescription = "", int loadSpoiled=0, string loadCategory="KEEPER", int loadMagicUsed=0, int loadAutoSell=0) { diff --git a/Horse Isle Server/HorseIsleServer/Game/Horse/WildHorse.cs b/Horse Isle Server/HorseIsleServer/Game/Horse/WildHorse.cs index 194504a..29e7f0d 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Horse/WildHorse.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Horse/WildHorse.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace HISP.Game.Horse { - class WildHorse + public class WildHorse { public WildHorse(HorseInstance horse, int MapX = -1, int MapY = -1, int despawnTimeout=60, bool addToDatabase = true) diff --git a/Horse Isle Server/HorseIsleServer/Game/Inventory/HorseInventory.cs b/Horse Isle Server/HorseIsleServer/Game/Inventory/HorseInventory.cs index b4865c2..fd07279 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Inventory/HorseInventory.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Inventory/HorseInventory.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace HISP.Game.Inventory { - class HorseInventory + public class HorseInventory { private User baseUser; private List horsesList = new List(); diff --git a/Horse Isle Server/HorseIsleServer/Game/Inventory/IInventory.cs b/Horse Isle Server/HorseIsleServer/Game/Inventory/IInventory.cs index 4e8adfe..e2b014a 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Inventory/IInventory.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Inventory/IInventory.cs @@ -1,4 +1,5 @@ - +using HISP.Game.Items; + namespace HISP.Game.Inventory { diff --git a/Horse Isle Server/HorseIsleServer/Game/Inventory/InventoryItem.cs b/Horse Isle Server/HorseIsleServer/Game/Inventory/InventoryItem.cs index d137f97..438c51f 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Inventory/InventoryItem.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Inventory/InventoryItem.cs @@ -1,9 +1,10 @@ using System; using System.Collections.Generic; +using HISP.Game.Items; namespace HISP.Game.Inventory { - class InventoryItem + public class InventoryItem { public InventoryItem() { diff --git a/Horse Isle Server/HorseIsleServer/Game/Inventory/PlayerInventory.cs b/Horse Isle Server/HorseIsleServer/Game/Inventory/PlayerInventory.cs index 6c46156..aae4b55 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Inventory/PlayerInventory.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Inventory/PlayerInventory.cs @@ -2,11 +2,12 @@ using System.Linq; using HISP.Player; using HISP.Server; +using HISP.Game.Items; namespace HISP.Game.Inventory { - class PlayerInventory : IInventory + public class PlayerInventory : IInventory { diff --git a/Horse Isle Server/HorseIsleServer/Game/Inventory/ShopInventory.cs b/Horse Isle Server/HorseIsleServer/Game/Inventory/ShopInventory.cs index a1cb2a3..529b3fb 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Inventory/ShopInventory.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Inventory/ShopInventory.cs @@ -1,11 +1,12 @@ using HISP.Game.Services; using HISP.Server; +using HISP.Game.Items; using System.Collections.Generic; using System.Linq; namespace HISP.Game.Inventory { - class ShopInventory : IInventory + public class ShopInventory : IInventory { private Shop baseShop; private List inventoryItems; diff --git a/Horse Isle Server/HorseIsleServer/Game/DroppedItems.cs b/Horse Isle Server/HorseIsleServer/Game/Items/DroppedItems.cs similarity index 99% rename from Horse Isle Server/HorseIsleServer/Game/DroppedItems.cs rename to Horse Isle Server/HorseIsleServer/Game/Items/DroppedItems.cs index b0a9b62..07ee9d3 100755 --- a/Horse Isle Server/HorseIsleServer/Game/DroppedItems.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Items/DroppedItems.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; using HISP.Server; +using HISP.Game; -namespace HISP.Game +namespace HISP.Game.Items { - class DroppedItems + public class DroppedItems { public struct DroppedItem { diff --git a/Horse Isle Server/HorseIsleServer/Game/Item.cs b/Horse Isle Server/HorseIsleServer/Game/Items/Item.cs similarity index 96% rename from Horse Isle Server/HorseIsleServer/Game/Item.cs rename to Horse Isle Server/HorseIsleServer/Game/Items/Item.cs index f681c7c..37a0e9d 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Item.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Items/Item.cs @@ -1,10 +1,11 @@ using HISP.Player; using HISP.Server; +using HISP.Game; using System.Collections.Generic; -namespace HISP.Game +namespace HISP.Game.Items { - class Item + public class Item { public struct Effects { @@ -138,7 +139,10 @@ namespace HISP.Game return false; } } - + public static void DoSpecialCases() + { + Tack.GenerateTackSets(); + } public static ItemInformation GetItemById(int id) { foreach(ItemInformation item in Items) diff --git a/Horse Isle Server/HorseIsleServer/Game/ItemInstance.cs b/Horse Isle Server/HorseIsleServer/Game/Items/ItemInstance.cs similarity index 83% rename from Horse Isle Server/HorseIsleServer/Game/ItemInstance.cs rename to Horse Isle Server/HorseIsleServer/Game/Items/ItemInstance.cs index 19fa4f3..9c37405 100755 --- a/Horse Isle Server/HorseIsleServer/Game/ItemInstance.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Items/ItemInstance.cs @@ -1,7 +1,8 @@ using HISP.Security; -namespace HISP.Game +using HISP.Game; +namespace HISP.Game.Items { - class ItemInstance + public class ItemInstance { public int RandomId; public int ItemId; diff --git a/Horse Isle Server/HorseIsleServer/Game/Items/Tack.cs b/Horse Isle Server/HorseIsleServer/Game/Items/Tack.cs new file mode 100644 index 0000000..ba23473 --- /dev/null +++ b/Horse Isle Server/HorseIsleServer/Game/Items/Tack.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +using HISP.Server; + +namespace HISP.Game.Items +{ + public class Tack + { + public class TackSet + { + public TackSet() + { + tackItems = new List(); + } + + public string SetName; + private List tackItems; + public void Add(Item.ItemInformation item) + { + Logger.DebugPrint("Added "+item.Name+" To Tack Set: "+this.SetName); + tackItems.Add(item); + } + public Item.ItemInformation[] TackItems + { + get + { + return tackItems.ToArray(); + } + } + } + private static string capitalizeFirstLetter(string str) + { + char firstChar = char.ToUpper(str[0]); + return firstChar + str.Substring(1); + } + private static List tackSets = new List(); + public TackSet[] TackSets + { + get + { + return tackSets.ToArray(); + } + } + public static TackSet GetSetByName(string name) + { + foreach(TackSet set in tackSets) + { + if(set.SetName == name) + { + return set; + } + } + throw new KeyNotFoundException("No TackSet with name: "+name+" was found."); + } + + public static void GenerateTackSets() + { + foreach(Item.ItemInformation itemInfo in Item.Items) + { + if(itemInfo.Type == "TACK") + { + + try + { + TackSet set = GetSetByName(capitalizeFirstLetter(itemInfo.EmbedSwf)); + set.Add(itemInfo); + } + catch(KeyNotFoundException) + { + continue; + } + + TackSet tackSet = new TackSet(); + tackSet.SetName = capitalizeFirstLetter(itemInfo.EmbedSwf); + tackSet.Add(itemInfo); + tackSets.Add(tackSet); + Logger.DebugPrint("Created Tack Set: "+tackSet.SetName); + + } + } + } + } +} \ No newline at end of file diff --git a/Horse Isle Server/HorseIsleServer/Game/Map.cs b/Horse Isle Server/HorseIsleServer/Game/Map.cs index 0fdf137..40418e8 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Map.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Map.cs @@ -4,7 +4,7 @@ using HISP.Server; namespace HISP.Game { - class Map + public class Map { public struct TerrainTile { diff --git a/Horse Isle Server/HorseIsleServer/Game/Messages.cs b/Horse Isle Server/HorseIsleServer/Game/Messages.cs index e537333..e9b5b7b 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Messages.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Messages.cs @@ -4,7 +4,7 @@ using System.Drawing; namespace HISP.Game { - class Messages + public class Messages { public static int RequiredChatViolations; public static int DefaultInventoryMax; @@ -517,7 +517,21 @@ namespace HISP.Game // Click public static string NothingInterestingHere; - + + public static string FormatTackBoost(string stat, int amount) + { + return TackBonusFormat.Replace("%BOOST%",amount.ToString("N0")).Replace("%STAT%",stat); + } + + public static string FormatTackSetPeice(string itemName, string itemDescription, string bonus) + { + return TackSetPeiceFormat.Replace("%ITEMNAME%",itemName).Replace("%ITEMDESC%", itemDescription).Replace("%BONUS%",bonus); + } + + public static string FormatTackSetView(int iconId, string tackSetName, string swf) + { + return TackViewSetFormat.Replace("%ICONID%",iconId.ToString()).Replace("%SETNAME%", tackSetName).Replace("%SWF%",swf); + } public static string FormatWhispererHorseFoundMeta(string mapXys) { diff --git a/Horse Isle Server/HorseIsleServer/Game/Meta.cs b/Horse Isle Server/HorseIsleServer/Game/Meta.cs index e20ab2d..020ddeb 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Meta.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Meta.cs @@ -3,6 +3,7 @@ using HISP.Game.Inventory; using HISP.Game.Services; using HISP.Player; using HISP.Server; +using HISP.Game.Items; using System; using System.Collections.Generic; using System.Linq; @@ -10,7 +11,7 @@ using System.Drawing; namespace HISP.Game { - class Meta + public class Meta { // Meta diff --git a/Horse Isle Server/HorseIsleServer/Game/Npc.cs b/Horse Isle Server/HorseIsleServer/Game/Npc.cs index ae6f094..ee1a6ab 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Npc.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Npc.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace HISP.Game { - class Npc + public class Npc { public struct NpcReply { diff --git a/Horse Isle Server/HorseIsleServer/Game/Quest.cs b/Horse Isle Server/HorseIsleServer/Game/Quest.cs index c4848ec..4a5b01c 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Quest.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Quest.cs @@ -4,10 +4,11 @@ using System.Linq; using HISP.Game.Inventory; using HISP.Player; using HISP.Server; +using HISP.Game.Items; namespace HISP.Game { - class Quest + public class Quest { public const string Shovel = "SHOVEL"; public const string Binoculars = "BINOCS"; diff --git a/Horse Isle Server/HorseIsleServer/Game/Services/Inn.cs b/Horse Isle Server/HorseIsleServer/Game/Services/Inn.cs index d42805c..72a0ffb 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Services/Inn.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Services/Inn.cs @@ -1,4 +1,6 @@ using HISP.Player; +using HISP.Game.Items; + using System; using System.Collections.Generic; using System.Linq; @@ -7,7 +9,7 @@ using System.Threading.Tasks; namespace HISP.Game.Services { - class Inn + public class Inn { private static List listInns = new List(); public static Inn[] Inns diff --git a/Horse Isle Server/HorseIsleServer/Game/Services/Shop.cs b/Horse Isle Server/HorseIsleServer/Game/Services/Shop.cs index 8ece16c..421948f 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Services/Shop.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Services/Shop.cs @@ -1,11 +1,12 @@ using HISP.Game.Inventory; using HISP.Server; +using HISP.Game.Items; using System; using System.Collections.Generic; namespace HISP.Game.Services { - class Shop + public class Shop { public int Id; diff --git a/Horse Isle Server/HorseIsleServer/Game/Services/Transport.cs b/Horse Isle Server/HorseIsleServer/Game/Services/Transport.cs index 747f22c..cd7f681 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Services/Transport.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Services/Transport.cs @@ -2,7 +2,7 @@ namespace HISP.Game.Services { - class Transport + public class Transport { public struct TransportLocation { diff --git a/Horse Isle Server/HorseIsleServer/Game/Services/Vet.cs b/Horse Isle Server/HorseIsleServer/Game/Services/Vet.cs index 69bec40..0ed5431 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Services/Vet.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Services/Vet.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace HISP.Game.Services { - class Vet + public class Vet { public static List Vets = new List(); diff --git a/Horse Isle Server/HorseIsleServer/Game/SwfModules/Brickpoet.cs b/Horse Isle Server/HorseIsleServer/Game/SwfModules/Brickpoet.cs index 01ff3f8..eb62ca7 100755 --- a/Horse Isle Server/HorseIsleServer/Game/SwfModules/Brickpoet.cs +++ b/Horse Isle Server/HorseIsleServer/Game/SwfModules/Brickpoet.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace HISP.Game.SwfModules { - class Brickpoet + public class Brickpoet { public struct PoetryEntry { public int Id; diff --git a/Horse Isle Server/HorseIsleServer/Game/Tracking.cs b/Horse Isle Server/HorseIsleServer/Game/Tracking.cs index 776433d..18e12ec 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Tracking.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Tracking.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace HISP.Game { - class Tracking + public class Tracking { public enum TrackableItem { diff --git a/Horse Isle Server/HorseIsleServer/Game/World.cs b/Horse Isle Server/HorseIsleServer/Game/World.cs index 5096f09..c843fc8 100755 --- a/Horse Isle Server/HorseIsleServer/Game/World.cs +++ b/Horse Isle Server/HorseIsleServer/Game/World.cs @@ -4,7 +4,7 @@ using HISP.Server; namespace HISP.Game { - class World + public class World { public struct Isle { diff --git a/Horse Isle Server/HorseIsleServer/Player/Award.cs b/Horse Isle Server/HorseIsleServer/Player/Award.cs index 2d724b7..d51f976 100755 --- a/Horse Isle Server/HorseIsleServer/Player/Award.cs +++ b/Horse Isle Server/HorseIsleServer/Player/Award.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace HISP.Player { - class Award + public class Award { public struct AwardEntry { diff --git a/Horse Isle Server/HorseIsleServer/Player/Equips/CompetitionGear.cs b/Horse Isle Server/HorseIsleServer/Player/Equips/CompetitionGear.cs index 26fbc41..f209669 100755 --- a/Horse Isle Server/HorseIsleServer/Player/Equips/CompetitionGear.cs +++ b/Horse Isle Server/HorseIsleServer/Player/Equips/CompetitionGear.cs @@ -1,9 +1,10 @@ using HISP.Game; using HISP.Server; +using HISP.Game.Items; namespace HISP.Player.Equips { - class CompetitionGear + public class CompetitionGear { public const int MISC_FLAG_HEAD = 1; public const int MISC_FLAG_BODY = 2; diff --git a/Horse Isle Server/HorseIsleServer/Player/Equips/Jewelry.cs b/Horse Isle Server/HorseIsleServer/Player/Equips/Jewelry.cs index 4bf1887..dbf0ebe 100755 --- a/Horse Isle Server/HorseIsleServer/Player/Equips/Jewelry.cs +++ b/Horse Isle Server/HorseIsleServer/Player/Equips/Jewelry.cs @@ -1,9 +1,10 @@ using HISP.Game; using HISP.Server; +using HISP.Game.Items; namespace HISP.Player.Equips { - class Jewelry + public class Jewelry { private int playerId; diff --git a/Horse Isle Server/HorseIsleServer/Player/Friends.cs b/Horse Isle Server/HorseIsleServer/Player/Friends.cs index c556ed4..81ae08e 100755 --- a/Horse Isle Server/HorseIsleServer/Player/Friends.cs +++ b/Horse Isle Server/HorseIsleServer/Player/Friends.cs @@ -3,7 +3,7 @@ using HISP.Server; namespace HISP.Player { - class Friends + public class Friends { private User baseUser; public List List; diff --git a/Horse Isle Server/HorseIsleServer/Player/Highscore.cs b/Horse Isle Server/HorseIsleServer/Player/Highscore.cs index eab2998..dce0651 100755 --- a/Horse Isle Server/HorseIsleServer/Player/Highscore.cs +++ b/Horse Isle Server/HorseIsleServer/Player/Highscore.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace HISP.Player { - class Highscore + public class Highscore { public class HighscoreTableEntry { diff --git a/Horse Isle Server/HorseIsleServer/Player/Mailbox.cs b/Horse Isle Server/HorseIsleServer/Player/Mailbox.cs index 5f4df0e..77c113b 100755 --- a/Horse Isle Server/HorseIsleServer/Player/Mailbox.cs +++ b/Horse Isle Server/HorseIsleServer/Player/Mailbox.cs @@ -2,7 +2,7 @@ namespace HISP.Player { - class Mailbox + public class Mailbox { private User baseUser; public int MailCount; diff --git a/Horse Isle Server/HorseIsleServer/Player/PlayerQuests.cs b/Horse Isle Server/HorseIsleServer/Player/PlayerQuests.cs index 65aa6e3..0238249 100755 --- a/Horse Isle Server/HorseIsleServer/Player/PlayerQuests.cs +++ b/Horse Isle Server/HorseIsleServer/Player/PlayerQuests.cs @@ -3,7 +3,7 @@ using HISP.Server; namespace HISP.Player { - class PlayerQuests + public class PlayerQuests { private List trackedQuests = new List(); public User BaseUser; diff --git a/Horse Isle Server/HorseIsleServer/Player/TrackedQuest.cs b/Horse Isle Server/HorseIsleServer/Player/TrackedQuest.cs index f162ee1..a81da8a 100755 --- a/Horse Isle Server/HorseIsleServer/Player/TrackedQuest.cs +++ b/Horse Isle Server/HorseIsleServer/Player/TrackedQuest.cs @@ -2,7 +2,7 @@ using HISP.Server; namespace HISP { - class TrackedQuest + public class TrackedQuest { public TrackedQuest(int playerID, int questID, int timesComplete) { diff --git a/Horse Isle Server/HorseIsleServer/Player/User.cs b/Horse Isle Server/HorseIsleServer/Player/User.cs index 0695933..334ad92 100755 --- a/Horse Isle Server/HorseIsleServer/Player/User.cs +++ b/Horse Isle Server/HorseIsleServer/Player/User.cs @@ -9,7 +9,7 @@ using HISP.Game.Horse; namespace HISP.Player { - class User + public class User { public int Id; diff --git a/Horse Isle Server/HorseIsleServer/Program.cs b/Horse Isle Server/HorseIsleServer/Program.cs index b204c7f..ac1b50d 100755 --- a/Horse Isle Server/HorseIsleServer/Program.cs +++ b/Horse Isle Server/HorseIsleServer/Program.cs @@ -1,12 +1,14 @@ using System; using HISP.Game; +using HISP.Game.Items; using HISP.Game.Horse; using HISP.Game.SwfModules; using HISP.Security; using HISP.Server; + namespace HISP { - class Program + public class Program { static void Main(string[] args) { @@ -20,6 +22,7 @@ namespace HISP DroppedItems.Init(); WildHorse.Init(); Brickpoet.LoadPoetryRooms(); + Item.DoSpecialCases(); GameServer.StartServer(); } diff --git a/Horse Isle Server/HorseIsleServer/Properties/Resources.Designer.cs b/Horse Isle Server/HorseIsleServer/Properties/Resources.Designer.cs index daa4025..722097e 100755 --- a/Horse Isle Server/HorseIsleServer/Properties/Resources.Designer.cs +++ b/Horse Isle Server/HorseIsleServer/Properties/Resources.Designer.cs @@ -13,10 +13,10 @@ namespace HISP.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource public class, for looking up localized strings, etc. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. + // This public class was auto-generated by the StronglyTypedResourceBuilder + // public class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] @@ -33,7 +33,7 @@ namespace HISP.Properties { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this public class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -48,7 +48,7 @@ namespace HISP.Properties { /// /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// resource lookups using this strongly typed resource public class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Horse Isle Server/HorseIsleServer/Security/Authentication.cs b/Horse Isle Server/HorseIsleServer/Security/Authentication.cs index 3f3c148..e9d0e49 100755 --- a/Horse Isle Server/HorseIsleServer/Security/Authentication.cs +++ b/Horse Isle Server/HorseIsleServer/Security/Authentication.cs @@ -5,7 +5,7 @@ using HISP.Server; namespace HISP.Security { - class Authentication + public class Authentication { public static string DecryptLogin(string encpass) { diff --git a/Horse Isle Server/HorseIsleServer/Security/CrossDomainPolicy.cs b/Horse Isle Server/HorseIsleServer/Security/CrossDomainPolicy.cs index 6b567f3..aae8459 100755 --- a/Horse Isle Server/HorseIsleServer/Security/CrossDomainPolicy.cs +++ b/Horse Isle Server/HorseIsleServer/Security/CrossDomainPolicy.cs @@ -4,7 +4,7 @@ using System.IO; using HISP.Server; namespace HISP.Security { - class CrossDomainPolicy + public class CrossDomainPolicy { public static byte[] GetPolicy() { diff --git a/Horse Isle Server/HorseIsleServer/Security/RandomID.cs b/Horse Isle Server/HorseIsleServer/Security/RandomID.cs index 9bfa631..0c38b17 100755 --- a/Horse Isle Server/HorseIsleServer/Security/RandomID.cs +++ b/Horse Isle Server/HorseIsleServer/Security/RandomID.cs @@ -1,7 +1,7 @@ using System; namespace HISP.Security { - class RandomID + public class RandomID { private static int prevId = 0; public static int NextRandomId(int randomId=-1) diff --git a/Horse Isle Server/HorseIsleServer/Server/ConfigReader.cs b/Horse Isle Server/HorseIsleServer/Server/ConfigReader.cs index bd3612f..6df8691 100755 --- a/Horse Isle Server/HorseIsleServer/Server/ConfigReader.cs +++ b/Horse Isle Server/HorseIsleServer/Server/ConfigReader.cs @@ -4,7 +4,7 @@ using System.IO; namespace HISP.Server { - class ConfigReader + public class ConfigReader { public static int Port; public static string BindIP; diff --git a/Horse Isle Server/HorseIsleServer/Server/Converters.cs b/Horse Isle Server/HorseIsleServer/Server/Converters.cs index 2cff15c..e61fdcd 100755 --- a/Horse Isle Server/HorseIsleServer/Server/Converters.cs +++ b/Horse Isle Server/HorseIsleServer/Server/Converters.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace HISP.Server { - class Converters + public class Converters { // Thanks Stackoverflow (https://stackoverflow.com/questions/321370/how-can-i-convert-a-hex-string-to-a-byte-array) private static int getHexVal(char hex) diff --git a/Horse Isle Server/HorseIsleServer/Server/Database.cs b/Horse Isle Server/HorseIsleServer/Server/Database.cs index 304015f..ffb1f6b 100755 --- a/Horse Isle Server/HorseIsleServer/Server/Database.cs +++ b/Horse Isle Server/HorseIsleServer/Server/Database.cs @@ -5,10 +5,11 @@ using HISP.Game; using HISP.Player; using HISP.Game.Horse; using HISP.Game.Inventory; +using HISP.Game.Items; namespace HISP.Server { - class Database + public class Database { public static string ConnectionString = ""; diff --git a/Horse Isle Server/HorseIsleServer/Server/GameClient.cs b/Horse Isle Server/HorseIsleServer/Server/GameClient.cs index c657642..b23d739 100755 --- a/Horse Isle Server/HorseIsleServer/Server/GameClient.cs +++ b/Horse Isle Server/HorseIsleServer/Server/GameClient.cs @@ -9,7 +9,7 @@ using HISP.Game.Horse; namespace HISP.Server { - class GameClient + public class GameClient { public Socket ClientSocket; public string RemoteIp; diff --git a/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs b/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs index 3583e3f..b9f43a4 100755 --- a/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs +++ b/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs @@ -7,10 +7,11 @@ using HISP.Player; using HISP.Game.Services; using HISP.Game.SwfModules; using HISP.Game.Horse; +using HISP.Game.Items; namespace HISP.Server { - class GameDataJson + public class GameDataJson { public static void ReadGamedata() diff --git a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs index eaf0e11..4c83c7d 100755 --- a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs +++ b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs @@ -16,10 +16,11 @@ using HISP.Game.Services; using HISP.Game.Inventory; using HISP.Game.SwfModules; using HISP.Game.Horse; +using HISP.Game.Items; namespace HISP.Server { - class GameServer + public class GameServer { public static Socket ServerSocket; diff --git a/Horse Isle Server/HorseIsleServer/Server/Logger.cs b/Horse Isle Server/HorseIsleServer/Server/Logger.cs index 081d9f5..2438e3d 100755 --- a/Horse Isle Server/HorseIsleServer/Server/Logger.cs +++ b/Horse Isle Server/HorseIsleServer/Server/Logger.cs @@ -2,7 +2,7 @@ namespace HISP.Server { - class Logger + public class Logger { public static void HackerPrint(string text) // When someone is obviously cheating. { diff --git a/Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs b/Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs index 5bf0fcf..7a396b7 100755 --- a/Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs +++ b/Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs @@ -7,7 +7,7 @@ using HISP.Game.SwfModules; namespace HISP.Server { - class PacketBuilder + public class PacketBuilder { public const byte PACKET_TERMINATOR = 0x00;