From be228de5ea1ac13dd829bb6be5b2e1a79b38bdd7 Mon Sep 17 00:00:00 2001 From: Li Date: Fri, 18 Nov 2022 20:09:43 +1300 Subject: [PATCH] Update MPN00BS --- .gitignore | 2 + .../HISPd/Properties/AssemblyInfo.cs | 4 +- .../HISPd/Resources/DEBIAN/control | 2 +- .../HISPtests/UnitTests/PacketTest.cs | 2 +- HorseIsleServer/LibHISP/Game/Ranch.cs | 982 +++++++++--------- .../LibHISP/Game/SwfModules/Brickpoet.cs | 2 +- .../LibHISP/Properties/AssemblyInfo.cs | 4 +- HorseIsleServer/MPN00BS/MPN00BS.csproj | 6 +- .../MPN00BS/Properties/AssemblyInfo.cs | 4 +- .../Properties/PublishProfiles/Linux64.pubxml | 2 +- .../Properties/PublishProfiles/Osx64.pubxml | 2 +- .../Properties/PublishProfiles/Win32.pubxml | 2 +- .../Properties/PublishProfiles/Win64.pubxml | 2 +- 13 files changed, 509 insertions(+), 507 deletions(-) diff --git a/.gitignore b/.gitignore index 7499fc4..f3aceb3 100755 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ *.log *.suo *.csproj.user +*.pubxml.user +*.user *.DS_Store diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index 99b2706..6efe644 100755 --- a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.46.0")] -[assembly: AssemblyFileVersion("1.8.46.0")] +[assembly: AssemblyVersion("1.8.47.0")] +[assembly: AssemblyFileVersion("1.8.47.0")] diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 6928f86..51b345a 100755 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.8.46 +Version: 1.8.47 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/HISPtests/UnitTests/PacketTest.cs b/HorseIsleServer/HISPtests/UnitTests/PacketTest.cs index adf967e..c98596b 100644 --- a/HorseIsleServer/HISPtests/UnitTests/PacketTest.cs +++ b/HorseIsleServer/HISPtests/UnitTests/PacketTest.cs @@ -1,4 +1,4 @@ -#define GENERATE +//#define GENERATE using HISP.Tests.Properties; using HISP.Game.SwfModules; diff --git a/HorseIsleServer/LibHISP/Game/Ranch.cs b/HorseIsleServer/LibHISP/Game/Ranch.cs index f0f7a24..90d60be 100755 --- a/HorseIsleServer/LibHISP/Game/Ranch.cs +++ b/HorseIsleServer/LibHISP/Game/Ranch.cs @@ -1,500 +1,500 @@ -using HISP.Game.Inventory; -using HISP.Game.Items; -using HISP.Player; -using HISP.Server; +using HISP.Game.Inventory; +using HISP.Game.Items; +using HISP.Player; +using HISP.Server; using HISP.Util; -using System; -using System.Collections.Generic; - -namespace HISP.Game -{ - public class Ranch - { - public class RanchUpgrade - { - public static List RanchUpgrades = new List(); - public int Id; - public int Cost; - public string Title; - public string Description; - public int Limit; - - public static bool RanchUpgradeExists(int id) - { - foreach (RanchUpgrade rachUpgrade in RanchUpgrades) - { - if (rachUpgrade.Id == id) - return true; - } - return false; - } - public static RanchUpgrade GetRanchUpgradeById(int id) - { - foreach (RanchUpgrade ranchUpgrade in RanchUpgrades) - { - if (ranchUpgrade.Id == id) - return ranchUpgrade; - } - throw new KeyNotFoundException("No ranch found."); - } - } - public class RanchBuilding - { - public static List RanchBuildings = new List(); - public int Id; - public int Cost; - public string Title; - public string Description; - - public static bool RanchBuildingExists(int id) - { - foreach (RanchBuilding ranchBuilding in RanchBuildings) - { - if (ranchBuilding.Id == id) - return true; - } - return false; - } - public static RanchBuilding GetRanchBuildingById(int id) - { - foreach(RanchBuilding ranchBuilding in RanchBuildings) - { - if (ranchBuilding.Id == id) - return ranchBuilding; - } - throw new KeyNotFoundException("No ranch found."); - } - - public int GetTeardownPrice() - { - return Convert.ToInt32(Math.Round((float)this.Cost / (100 / 35.0))); - } - } - public static List Ranches = new List(); - - public int X; - public int Y; - public int Id; - public int Value; - - private int ownerId; - private int upgradedLevel; - private int investedMoney; - private string title; - private string description; - - public int GetSellPrice() - { - return Convert.ToInt32(Math.Round((double)this.InvestedMoney / (100 / 75.0))); - } - private void removeDorothyShoes(int Id) - { - if (Id == -1) - return; - - if(GameServer.IsUserOnline(Id)) - { - User user = GameServer.GetUserById(Id); - user.OwnedRanch = null; - InventoryItem items = user.Inventory.GetItemByItemId(Item.DorothyShoes); - foreach (ItemInstance itm in items.ItemInstances) - { - user.Inventory.Remove(itm); - } - } - else - { - Database.RemoveAllItemTypesFromPlayerInventory(this.Id, Item.DorothyShoes); - } - - } - - private void deleteRanch() - { - Database.DeleteRanchOwner(this.Id); - removeDorothyShoes(this.ownerId); - resetRanch(); - } - private void resetRanch() - { - title = ""; - description = ""; - investedMoney = 0; - upgradedLevel = 0; - ownerId = -1; - for (int i = 0; i < 16; i++) - buildings[i] = null; - } - public int OwnerId - { - get - { - if(ownerId != -1) - { - if (ConfigReader.AllUsersSubbed || Database.IsUserAdmin(ownerId)) - return ownerId; - - int subExp = Database.GetUserSubscriptionExpireDate(ownerId); - DateTime expTime = Helper.UnixTimeStampToDateTime(subExp); - if ((DateTime.UtcNow.Date - expTime.Date).Days >= 30) - { - int price = GetSellPrice(); - try - { - checked - { - Database.SetPlayerMoney(Database.GetPlayerMoney(ownerId) + price, ownerId); - } - } - catch (OverflowException) - { - Database.SetPlayerMoney(2147483647, ownerId);; - } - - Database.AddMessageToQueue(ownerId, Messages.FormatRanchForcefullySoldMessage(price)); - deleteRanch(); - return -1; - } - - } - return ownerId; - - } - set - { - if (value == -1) - { - deleteRanch(); - } - else - { - if (Database.IsRanchOwned(this.Id)) - { - Database.SetRanchOwner(this.Id, ownerId); - removeDorothyShoes(ownerId); - } - else - { - resetRanch(); - Database.AddRanch(this.Id, value, "", "", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - } - } - +using System; +using System.Collections.Generic; + +namespace HISP.Game +{ + public class Ranch + { + public class RanchUpgrade + { + public static List RanchUpgrades = new List(); + public int Id; + public int Cost; + public string Title; + public string Description; + public int Limit; + + public static bool RanchUpgradeExists(int id) + { + foreach (RanchUpgrade rachUpgrade in RanchUpgrades) + { + if (rachUpgrade.Id == id) + return true; + } + return false; + } + public static RanchUpgrade GetRanchUpgradeById(int id) + { + foreach (RanchUpgrade ranchUpgrade in RanchUpgrades) + { + if (ranchUpgrade.Id == id) + return ranchUpgrade; + } + throw new KeyNotFoundException("No ranch found."); + } + } + public class RanchBuilding + { + public static List RanchBuildings = new List(); + public int Id; + public int Cost; + public string Title; + public string Description; + + public static bool RanchBuildingExists(int id) + { + foreach (RanchBuilding ranchBuilding in RanchBuildings) + { + if (ranchBuilding.Id == id) + return true; + } + return false; + } + public static RanchBuilding GetRanchBuildingById(int id) + { + foreach(RanchBuilding ranchBuilding in RanchBuildings) + { + if (ranchBuilding.Id == id) + return ranchBuilding; + } + throw new KeyNotFoundException("No ranch found."); + } + + public int GetTeardownPrice() + { + return Convert.ToInt32(Math.Round((float)this.Cost / (100 / 35.0))); + } + } + public static List Ranches = new List(); + + public int X; + public int Y; + public int Id; + public int Value; + + private int ownerId; + private int upgradedLevel; + private int investedMoney; + private string title; + private string description; + + public int GetSellPrice() + { + return Convert.ToInt32(Math.Round((double)this.InvestedMoney / (100 / 75.0))); + } + private void removeDorothyShoes(int Id) + { + if (Id == -1) + return; + + if(GameServer.IsUserOnline(Id)) + { + User user = GameServer.GetUserById(Id); + user.OwnedRanch = null; + InventoryItem items = user.Inventory.GetItemByItemId(Item.DorothyShoes); + foreach (ItemInstance itm in items.ItemInstances) + { + user.Inventory.Remove(itm); + } + } + else + { + Database.RemoveAllItemTypesFromPlayerInventory(this.Id, Item.DorothyShoes); + } + + } + + private void deleteRanch() + { + Database.DeleteRanchOwner(this.Id); + removeDorothyShoes(this.ownerId); + resetRanch(); + } + private void resetRanch() + { + title = ""; + description = ""; + investedMoney = 0; + upgradedLevel = 0; + ownerId = -1; + for (int i = 0; i < 16; i++) + buildings[i] = null; + } + public int OwnerId + { + get + { + if(ownerId != -1) + { + if (ConfigReader.AllUsersSubbed || Database.IsUserAdmin(ownerId)) + return ownerId; + + int subExp = Database.GetUserSubscriptionExpireDate(ownerId); + DateTime expTime = Helper.UnixTimeStampToDateTime(subExp); + if ((DateTime.UtcNow.Date - expTime.Date).Days >= 30) + { + int price = GetSellPrice(); + try + { + checked + { + Database.SetPlayerMoney(Database.GetPlayerMoney(ownerId) + price, ownerId); + } + } + catch (OverflowException) + { + Database.SetPlayerMoney(2147483647, ownerId);; + } + + Database.AddMessageToQueue(ownerId, Messages.FormatRanchForcefullySoldMessage(price)); + deleteRanch(); + return -1; + } + + } + return ownerId; + + } + set + { + if (value == -1) + { + deleteRanch(); + } + else + { + if (Database.IsRanchOwned(this.Id)) + { + Database.SetRanchOwner(this.Id, ownerId); + removeDorothyShoes(ownerId); + } + else + { + resetRanch(); + Database.AddRanch(this.Id, value, "", "", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + } + } + if (GameServer.IsUserOnline(value)) { User user = GameServer.GetUserById(value); user.OwnedRanch = this; user.Inventory.AddIgnoringFull(new ItemInstance(Item.DorothyShoes)); - } + } else { Database.AddItemToInventory(value, new ItemInstance(Item.DorothyShoes)); - } - - ownerId = value; - } - } - - public int UpgradedLevel - { - get - { - return upgradedLevel; - } - set - { - upgradedLevel = value; - Database.SetRanchUpgradeLevel(Id, value); - } - } - public int InvestedMoney - { - get - { - return investedMoney; - } - set - { - investedMoney = value; - Database.SetRanchInvestment(Id, value); - } - } - public string Title - { - get - { - return title; - } - set - { - title = value.Trim(); - Database.SetRanchTitle(Id, title); - } - } - public string Description - { - get - { - return description; - } - set - { - description = value.Trim(); - Database.SetRanchDescription(Id, value); - } - } - - - private RanchBuilding[] buildings = new RanchBuilding[16]; - public int GetBuildingCount(int buildingId) - { - int count = 0; - foreach(RanchBuilding building in buildings) - { - if(building != null) - if (building.Id == buildingId) - count++; - } - return count; - } - private void updateBuildings() - { - if (buildings[0] != null) - Database.SetRanchBuilding1(this.Id, buildings[0].Id); - else - Database.SetRanchBuilding1(this.Id, 0); - if (buildings[1] != null) - Database.SetRanchBuilding2(this.Id, buildings[1].Id); - else - Database.SetRanchBuilding2(this.Id, 0); - if (buildings[2] != null) - Database.SetRanchBuilding3(this.Id, buildings[2].Id); - else - Database.SetRanchBuilding3(this.Id, 0); - if (buildings[3] != null) - Database.SetRanchBuilding4(this.Id, buildings[3].Id); - else - Database.SetRanchBuilding4(this.Id, 0); - if (buildings[4] != null) - Database.SetRanchBuilding5(this.Id, buildings[4].Id); - else - Database.SetRanchBuilding5(this.Id, 0); - if (buildings[5] != null) - Database.SetRanchBuilding6(this.Id, buildings[5].Id); - else - Database.SetRanchBuilding6(this.Id, 0); - if (buildings[6] != null) - Database.SetRanchBuilding7(this.Id, buildings[6].Id); - else - Database.SetRanchBuilding7(this.Id, 0); - if (buildings[7] != null) - Database.SetRanchBuilding8(this.Id, buildings[7].Id); - else - Database.SetRanchBuilding8(this.Id, 0); - if (buildings[8] != null) - Database.SetRanchBuilding9(this.Id, buildings[8].Id); - else - Database.SetRanchBuilding9(this.Id, 0); - if (buildings[9] != null) - Database.SetRanchBuilding10(this.Id, buildings[9].Id); - else - Database.SetRanchBuilding10(this.Id, 0); - if (buildings[10] != null) - Database.SetRanchBuilding11(this.Id, buildings[10].Id); - else - Database.SetRanchBuilding11(this.Id, 0); - if (buildings[11] != null) - Database.SetRanchBuilding12(this.Id, buildings[11].Id); - else - Database.SetRanchBuilding12(this.Id, 0); - if (buildings[12] != null) - Database.SetRanchBuilding13(this.Id, buildings[12].Id); - else - Database.SetRanchBuilding13(this.Id, 0); - if (buildings[13] != null) - Database.SetRanchBuilding14(this.Id, buildings[13].Id); - else - Database.SetRanchBuilding14(this.Id, 0); - if (buildings[14] != null) - Database.SetRanchBuilding15(this.Id, buildings[14].Id); - else - Database.SetRanchBuilding15(this.Id, 0); - if (buildings[15] != null) - Database.SetRanchBuilding16(this.Id, buildings[15].Id); - else - Database.SetRanchBuilding16(this.Id, 0); - } - public RanchBuilding GetBuilding(int buildingId) - { - if (buildingId < 0) - return null; - - if (buildingId >= buildings.Length) - return null; - - return buildings[buildingId]; - } - public void SetBuilding(int buildingId, RanchBuilding value) - { - buildings[buildingId] = value; - updateBuildings(); - } - - - public string GetSwf(bool mine) - { - string swf = "ranchviewer.swf?H=" + (upgradedLevel+1).ToString(); - for(int i = 0; i < buildings.Length; i++) - { - swf += "&B" + (i+1).ToString() + "="; - if (buildings[i] != null) - { - swf += buildings[i].Id.ToString(); - } - } - if (mine) - swf += "&MINE=1"; - return swf; - } - - - public Ranch(int x, int y, int id, int value) - { - X = x; - Y = y; - Id = id; - Value = value; - title = ""; - description = ""; - upgradedLevel = 0; - ownerId = -1; - investedMoney = 0; - for (int i = 0; i < 16; i++) - buildings[i] = null; - bool owned = Database.IsRanchOwned(id); - if (owned) - { - upgradedLevel = Database.GetRanchUpgradeLevel(id); - title = Database.GetRanchTitle(id); - description = Database.GetRanchDescription(id); - ownerId = Database.GetRanchOwner(id); - int b1 = Database.GetRanchBuilding1(id); - int b2 = Database.GetRanchBuilding2(id); - int b3 = Database.GetRanchBuilding3(id); - int b4 = Database.GetRanchBuilding4(id); - int b5 = Database.GetRanchBuilding5(id); - int b6 = Database.GetRanchBuilding6(id); - int b7 = Database.GetRanchBuilding7(id); - int b8 = Database.GetRanchBuilding8(id); - int b9 = Database.GetRanchBuilding9(id); - int b10 = Database.GetRanchBuilding10(id); - int b11 = Database.GetRanchBuilding11(id); - int b12 = Database.GetRanchBuilding12(id); - int b13 = Database.GetRanchBuilding13(id); - int b14 = Database.GetRanchBuilding14(id); - int b15 = Database.GetRanchBuilding15(id); - int b16 = Database.GetRanchBuilding16(id); - - if (RanchBuilding.RanchBuildingExists(b1)) - buildings[0] = RanchBuilding.GetRanchBuildingById(b1); - if (RanchBuilding.RanchBuildingExists(b2)) - buildings[1] = RanchBuilding.GetRanchBuildingById(b2); - if (RanchBuilding.RanchBuildingExists(b3)) - buildings[2] = RanchBuilding.GetRanchBuildingById(b3); - if (RanchBuilding.RanchBuildingExists(b4)) - buildings[3] = RanchBuilding.GetRanchBuildingById(b4); - if (RanchBuilding.RanchBuildingExists(b5)) - buildings[4] = RanchBuilding.GetRanchBuildingById(b5); - if (RanchBuilding.RanchBuildingExists(b6)) - buildings[5] = RanchBuilding.GetRanchBuildingById(b6); - if (RanchBuilding.RanchBuildingExists(b7)) - buildings[6] = RanchBuilding.GetRanchBuildingById(b7); - if (RanchBuilding.RanchBuildingExists(b8)) - buildings[7] = RanchBuilding.GetRanchBuildingById(b8); - if (RanchBuilding.RanchBuildingExists(b9)) - buildings[8] = RanchBuilding.GetRanchBuildingById(b9); - if (RanchBuilding.RanchBuildingExists(b10)) - buildings[9] = RanchBuilding.GetRanchBuildingById(b10); - if (RanchBuilding.RanchBuildingExists(b11)) - buildings[10] = RanchBuilding.GetRanchBuildingById(b11); - if (RanchBuilding.RanchBuildingExists(b12)) - buildings[11] = RanchBuilding.GetRanchBuildingById(b12); - if (RanchBuilding.RanchBuildingExists(b13)) - buildings[12] = RanchBuilding.GetRanchBuildingById(b13); - if (RanchBuilding.RanchBuildingExists(b14)) - buildings[13] = RanchBuilding.GetRanchBuildingById(b14); - if (RanchBuilding.RanchBuildingExists(b15)) - buildings[14] = RanchBuilding.GetRanchBuildingById(b15); - if (RanchBuilding.RanchBuildingExists(b16)) - buildings[15] = RanchBuilding.GetRanchBuildingById(b16); - - - InvestedMoney = Database.GetRanchInvestment(id); - } - } - - public RanchUpgrade GetRanchUpgrade() - { - return RanchUpgrade.GetRanchUpgradeById(this.upgradedLevel + 1); - } - public static bool IsRanchHere(int x, int y) - { - foreach (Ranch ranch in Ranches) - { - if (ranch.X == x && ranch.Y == y) - return true; - } - return false; - } - public static bool RanchExists(int ranchId) - { - foreach (Ranch ranch in Ranches) - { - if (ranch.Id == ranchId) - return true; - } - return false; - } - public static Ranch GetRanchById(int ranchId) - { - foreach (Ranch ranch in Ranches) - { - if (ranch.Id == ranchId) - return ranch; - } - throw new KeyNotFoundException("No Ranch with id " + ranchId); - } - public static Ranch GetRanchAt(int x, int y) - { - foreach(Ranch ranch in Ranches) - { - if (ranch.X == x && ranch.Y == y) - return ranch; - } - throw new KeyNotFoundException("No Ranch found at x" + x + " y" + y); - } - - public static bool IsRanchOwned(int playerId) - { - foreach (Ranch ranch in Ranches) - { - if (ranch.OwnerId == playerId) - { - return true; - } - } - return false; - } - public static Ranch GetRanchOwnedBy(int playerId) - { - foreach(Ranch ranch in Ranches) - { - if(ranch.OwnerId == playerId) - { - return ranch; - } - } - throw new KeyNotFoundException("Player " + playerId + " does not own a ranch."); - } - } -} + } + + ownerId = value; + } + } + + public int UpgradedLevel + { + get + { + return upgradedLevel; + } + set + { + upgradedLevel = value; + Database.SetRanchUpgradeLevel(Id, value); + } + } + public int InvestedMoney + { + get + { + return investedMoney; + } + set + { + investedMoney = value; + Database.SetRanchInvestment(Id, value); + } + } + public string Title + { + get + { + return title; + } + set + { + title = value.Trim(); + Database.SetRanchTitle(Id, title); + } + } + public string Description + { + get + { + return description; + } + set + { + description = value.Trim(); + Database.SetRanchDescription(Id, value); + } + } + + + private RanchBuilding[] buildings = new RanchBuilding[16]; + public int GetBuildingCount(int buildingId) + { + int count = 0; + foreach(RanchBuilding building in buildings) + { + if(building != null) + if (building.Id == buildingId) + count++; + } + return count; + } + private void updateBuildings() + { + if (buildings[0] != null) + Database.SetRanchBuilding1(this.Id, buildings[0].Id); + else + Database.SetRanchBuilding1(this.Id, 0); + if (buildings[1] != null) + Database.SetRanchBuilding2(this.Id, buildings[1].Id); + else + Database.SetRanchBuilding2(this.Id, 0); + if (buildings[2] != null) + Database.SetRanchBuilding3(this.Id, buildings[2].Id); + else + Database.SetRanchBuilding3(this.Id, 0); + if (buildings[3] != null) + Database.SetRanchBuilding4(this.Id, buildings[3].Id); + else + Database.SetRanchBuilding4(this.Id, 0); + if (buildings[4] != null) + Database.SetRanchBuilding5(this.Id, buildings[4].Id); + else + Database.SetRanchBuilding5(this.Id, 0); + if (buildings[5] != null) + Database.SetRanchBuilding6(this.Id, buildings[5].Id); + else + Database.SetRanchBuilding6(this.Id, 0); + if (buildings[6] != null) + Database.SetRanchBuilding7(this.Id, buildings[6].Id); + else + Database.SetRanchBuilding7(this.Id, 0); + if (buildings[7] != null) + Database.SetRanchBuilding8(this.Id, buildings[7].Id); + else + Database.SetRanchBuilding8(this.Id, 0); + if (buildings[8] != null) + Database.SetRanchBuilding9(this.Id, buildings[8].Id); + else + Database.SetRanchBuilding9(this.Id, 0); + if (buildings[9] != null) + Database.SetRanchBuilding10(this.Id, buildings[9].Id); + else + Database.SetRanchBuilding10(this.Id, 0); + if (buildings[10] != null) + Database.SetRanchBuilding11(this.Id, buildings[10].Id); + else + Database.SetRanchBuilding11(this.Id, 0); + if (buildings[11] != null) + Database.SetRanchBuilding12(this.Id, buildings[11].Id); + else + Database.SetRanchBuilding12(this.Id, 0); + if (buildings[12] != null) + Database.SetRanchBuilding13(this.Id, buildings[12].Id); + else + Database.SetRanchBuilding13(this.Id, 0); + if (buildings[13] != null) + Database.SetRanchBuilding14(this.Id, buildings[13].Id); + else + Database.SetRanchBuilding14(this.Id, 0); + if (buildings[14] != null) + Database.SetRanchBuilding15(this.Id, buildings[14].Id); + else + Database.SetRanchBuilding15(this.Id, 0); + if (buildings[15] != null) + Database.SetRanchBuilding16(this.Id, buildings[15].Id); + else + Database.SetRanchBuilding16(this.Id, 0); + } + public RanchBuilding GetBuilding(int buildingId) + { + if (buildingId < 0) + return null; + + if (buildingId >= buildings.Length) + return null; + + return buildings[buildingId]; + } + public void SetBuilding(int buildingId, RanchBuilding value) + { + buildings[buildingId] = value; + updateBuildings(); + } + + + public string GetSwf(bool mine) + { + string swf = "ranchviewer.swf?H=" + (upgradedLevel+1).ToString(); + for(int i = 0; i < buildings.Length; i++) + { + swf += "&B" + (i+1).ToString() + "="; + if (buildings[i] != null) + { + swf += buildings[i].Id.ToString(); + } + } + if (mine) + swf += "&MINE=1"; + return swf; + } + + + public Ranch(int x, int y, int id, int value) + { + X = x; + Y = y; + Id = id; + Value = value; + title = ""; + description = ""; + upgradedLevel = 0; + ownerId = -1; + investedMoney = 0; + for (int i = 0; i < 16; i++) + buildings[i] = null; + bool owned = Database.IsRanchOwned(id); + if (owned) + { + upgradedLevel = Database.GetRanchUpgradeLevel(id); + title = Database.GetRanchTitle(id); + description = Database.GetRanchDescription(id); + ownerId = Database.GetRanchOwner(id); + int b1 = Database.GetRanchBuilding1(id); + int b2 = Database.GetRanchBuilding2(id); + int b3 = Database.GetRanchBuilding3(id); + int b4 = Database.GetRanchBuilding4(id); + int b5 = Database.GetRanchBuilding5(id); + int b6 = Database.GetRanchBuilding6(id); + int b7 = Database.GetRanchBuilding7(id); + int b8 = Database.GetRanchBuilding8(id); + int b9 = Database.GetRanchBuilding9(id); + int b10 = Database.GetRanchBuilding10(id); + int b11 = Database.GetRanchBuilding11(id); + int b12 = Database.GetRanchBuilding12(id); + int b13 = Database.GetRanchBuilding13(id); + int b14 = Database.GetRanchBuilding14(id); + int b15 = Database.GetRanchBuilding15(id); + int b16 = Database.GetRanchBuilding16(id); + + if (RanchBuilding.RanchBuildingExists(b1)) + buildings[0] = RanchBuilding.GetRanchBuildingById(b1); + if (RanchBuilding.RanchBuildingExists(b2)) + buildings[1] = RanchBuilding.GetRanchBuildingById(b2); + if (RanchBuilding.RanchBuildingExists(b3)) + buildings[2] = RanchBuilding.GetRanchBuildingById(b3); + if (RanchBuilding.RanchBuildingExists(b4)) + buildings[3] = RanchBuilding.GetRanchBuildingById(b4); + if (RanchBuilding.RanchBuildingExists(b5)) + buildings[4] = RanchBuilding.GetRanchBuildingById(b5); + if (RanchBuilding.RanchBuildingExists(b6)) + buildings[5] = RanchBuilding.GetRanchBuildingById(b6); + if (RanchBuilding.RanchBuildingExists(b7)) + buildings[6] = RanchBuilding.GetRanchBuildingById(b7); + if (RanchBuilding.RanchBuildingExists(b8)) + buildings[7] = RanchBuilding.GetRanchBuildingById(b8); + if (RanchBuilding.RanchBuildingExists(b9)) + buildings[8] = RanchBuilding.GetRanchBuildingById(b9); + if (RanchBuilding.RanchBuildingExists(b10)) + buildings[9] = RanchBuilding.GetRanchBuildingById(b10); + if (RanchBuilding.RanchBuildingExists(b11)) + buildings[10] = RanchBuilding.GetRanchBuildingById(b11); + if (RanchBuilding.RanchBuildingExists(b12)) + buildings[11] = RanchBuilding.GetRanchBuildingById(b12); + if (RanchBuilding.RanchBuildingExists(b13)) + buildings[12] = RanchBuilding.GetRanchBuildingById(b13); + if (RanchBuilding.RanchBuildingExists(b14)) + buildings[13] = RanchBuilding.GetRanchBuildingById(b14); + if (RanchBuilding.RanchBuildingExists(b15)) + buildings[14] = RanchBuilding.GetRanchBuildingById(b15); + if (RanchBuilding.RanchBuildingExists(b16)) + buildings[15] = RanchBuilding.GetRanchBuildingById(b16); + + + InvestedMoney = Database.GetRanchInvestment(id); + } + } + + public RanchUpgrade GetRanchUpgrade() + { + return RanchUpgrade.GetRanchUpgradeById(this.upgradedLevel + 1); + } + public static bool IsRanchHere(int x, int y) + { + foreach (Ranch ranch in Ranches) + { + if (ranch.X == x && ranch.Y == y) + return true; + } + return false; + } + public static bool RanchExists(int ranchId) + { + foreach (Ranch ranch in Ranches) + { + if (ranch.Id == ranchId) + return true; + } + return false; + } + public static Ranch GetRanchById(int ranchId) + { + foreach (Ranch ranch in Ranches) + { + if (ranch.Id == ranchId) + return ranch; + } + throw new KeyNotFoundException("No Ranch with id " + ranchId); + } + public static Ranch GetRanchAt(int x, int y) + { + foreach(Ranch ranch in Ranches) + { + if (ranch.X == x && ranch.Y == y) + return ranch; + } + throw new KeyNotFoundException("No Ranch found at x" + x + " y" + y); + } + + public static bool IsRanchOwned(int playerId) + { + foreach (Ranch ranch in Ranches) + { + if (ranch.OwnerId == playerId) + { + return true; + } + } + return false; + } + public static Ranch GetRanchOwnedBy(int playerId) + { + foreach(Ranch ranch in Ranches) + { + if(ranch.OwnerId == playerId) + { + return ranch; + } + } + throw new KeyNotFoundException("Player " + playerId + " does not own a ranch."); + } + } +} diff --git a/HorseIsleServer/LibHISP/Game/SwfModules/Brickpoet.cs b/HorseIsleServer/LibHISP/Game/SwfModules/Brickpoet.cs index d95c123..a207306 100755 --- a/HorseIsleServer/LibHISP/Game/SwfModules/Brickpoet.cs +++ b/HorseIsleServer/LibHISP/Game/SwfModules/Brickpoet.cs @@ -156,7 +156,7 @@ namespace HISP.Game.SwfModules foreach(int room in rooms) { - Logger.InfoPrint("Loading poetry room: " + room.ToString()); + Logger.InfoPrint("Loading Poetry room: " + room.ToString()); poetryRooms.Add(getPoetryRoom(room)); if (!Database.LastPlayerExist("P" + room)) Database.AddLastPlayer("P" + room, -1); diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index 5c116c3..bc12f32 100755 --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.46.0")] -[assembly: AssemblyFileVersion("1.8.46.0")] +[assembly: AssemblyVersion("1.8.47.0")] +[assembly: AssemblyFileVersion("1.8.47.0")] diff --git a/HorseIsleServer/MPN00BS/MPN00BS.csproj b/HorseIsleServer/MPN00BS/MPN00BS.csproj index 1c03bcf..134ef51 100755 --- a/HorseIsleServer/MPN00BS/MPN00BS.csproj +++ b/HorseIsleServer/MPN00BS/MPN00BS.csproj @@ -227,9 +227,9 @@ - - - + + + diff --git a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs index 3aca806..2f1fbf9 100755 --- a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.46.0")] -[assembly: AssemblyFileVersion("1.8.46.0")] +[assembly: AssemblyVersion("1.8.47.0")] +[assembly: AssemblyFileVersion("1.8.47.0")] diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Linux64.pubxml index c5f1582..db00724 100755 --- a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Linux64.pubxml +++ b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Linux64.pubxml @@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. True True True - True + False OS_LINUX;ARCH_X86_64 \ No newline at end of file diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Osx64.pubxml index ced4af4..f749c20 100755 --- a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Osx64.pubxml +++ b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Osx64.pubxml @@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. True True True - True + False OS_MACOS;ARCH_X86_64 \ No newline at end of file diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win32.pubxml index 2763365..7cba2fe 100755 --- a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win32.pubxml +++ b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win32.pubxml @@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. True True True - True + False OS_WINDOWS;ARCH_X86 \ No newline at end of file diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win64.pubxml index f23270c..9694189 100755 --- a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win64.pubxml +++ b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win64.pubxml @@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. True True True - True + False OS_WINDOWS;ARCH_X86_64 \ No newline at end of file