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

Update MPN00BS

Browse source
This commit is contained in:
Li 2022-11-18 20:09:43 +13:00
parent 7fcaf412df
commit be228de5ea
13 changed files with 509 additions and 507 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -4,6 +4,8 @@
*.log *.log
*.suo *.suo
*.csproj.user *.csproj.user
*.pubxml.user
*.user
*.DS_Store *.DS_Store

4
HorseIsleServer/HISPd/Properties/AssemblyInfo.cs
View file

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.8.46.0")] [assembly: AssemblyVersion("1.8.47.0")]
[assembly: AssemblyFileVersion("1.8.46.0")] [assembly: AssemblyFileVersion("1.8.47.0")]

2
HorseIsleServer/HISPd/Resources/DEBIAN/control
View file

@ -1,5 +1,5 @@
Package: hisp Package: hisp
Version: 1.8.46 Version: 1.8.47
Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev
Maintainer: Li Maintainer: Li
Homepage: https://islehorse.com Homepage: https://islehorse.com

2
HorseIsleServer/HISPtests/UnitTests/PacketTest.cs
View file

@ -1,4 +1,4 @@
#define GENERATE //#define GENERATE
using HISP.Tests.Properties; using HISP.Tests.Properties;
using HISP.Game.SwfModules; using HISP.Game.SwfModules;

982
HorseIsleServer/LibHISP/Game/Ranch.cs
View file

@ -1,500 +1,500 @@
using HISP.Game.Inventory; using HISP.Game.Inventory;
using HISP.Game.Items; using HISP.Game.Items;
using HISP.Player; using HISP.Player;
using HISP.Server; using HISP.Server;
using HISP.Util; using HISP.Util;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace HISP.Game namespace HISP.Game
{ {
public class Ranch public class Ranch
{ {
public class RanchUpgrade public class RanchUpgrade
{ {
public static List<RanchUpgrade> RanchUpgrades = new List<RanchUpgrade>(); public static List<RanchUpgrade> RanchUpgrades = new List<RanchUpgrade>();
public int Id; public int Id;
public int Cost; public int Cost;
public string Title; public string Title;
public string Description; public string Description;
public int Limit; public int Limit;
public static bool RanchUpgradeExists(int id) public static bool RanchUpgradeExists(int id)
{ {
foreach (RanchUpgrade rachUpgrade in RanchUpgrades) foreach (RanchUpgrade rachUpgrade in RanchUpgrades)
{ {
if (rachUpgrade.Id == id) if (rachUpgrade.Id == id)
return true; return true;
} }
return false; return false;
} }
public static RanchUpgrade GetRanchUpgradeById(int id) public static RanchUpgrade GetRanchUpgradeById(int id)
{ {
foreach (RanchUpgrade ranchUpgrade in RanchUpgrades) foreach (RanchUpgrade ranchUpgrade in RanchUpgrades)
{ {
if (ranchUpgrade.Id == id) if (ranchUpgrade.Id == id)
return ranchUpgrade; return ranchUpgrade;
} }
throw new KeyNotFoundException("No ranch found."); throw new KeyNotFoundException("No ranch found.");
} }
} }
public class RanchBuilding public class RanchBuilding
{ {
public static List<RanchBuilding> RanchBuildings = new List<RanchBuilding>(); public static List<RanchBuilding> RanchBuildings = new List<RanchBuilding>();
public int Id; public int Id;
public int Cost; public int Cost;
public string Title; public string Title;
public string Description; public string Description;
public static bool RanchBuildingExists(int id) public static bool RanchBuildingExists(int id)
{ {
foreach (RanchBuilding ranchBuilding in RanchBuildings) foreach (RanchBuilding ranchBuilding in RanchBuildings)
{ {
if (ranchBuilding.Id == id) if (ranchBuilding.Id == id)
return true; return true;
} }
return false; return false;
} }
public static RanchBuilding GetRanchBuildingById(int id) public static RanchBuilding GetRanchBuildingById(int id)
{ {
foreach(RanchBuilding ranchBuilding in RanchBuildings) foreach(RanchBuilding ranchBuilding in RanchBuildings)
{ {
if (ranchBuilding.Id == id) if (ranchBuilding.Id == id)
return ranchBuilding; return ranchBuilding;
} }
throw new KeyNotFoundException("No ranch found."); throw new KeyNotFoundException("No ranch found.");
} }
public int GetTeardownPrice() public int GetTeardownPrice()
{ {
return Convert.ToInt32(Math.Round((float)this.Cost / (100 / 35.0))); return Convert.ToInt32(Math.Round((float)this.Cost / (100 / 35.0)));
} }
} }
public static List<Ranch> Ranches = new List<Ranch>(); public static List<Ranch> Ranches = new List<Ranch>();
public int X; public int X;
public int Y; public int Y;
public int Id; public int Id;
public int Value; public int Value;
private int ownerId; private int ownerId;
private int upgradedLevel; private int upgradedLevel;
private int investedMoney; private int investedMoney;
private string title; private string title;
private string description; private string description;
public int GetSellPrice() public int GetSellPrice()
{ {
return Convert.ToInt32(Math.Round((double)this.InvestedMoney / (100 / 75.0))); return Convert.ToInt32(Math.Round((double)this.InvestedMoney / (100 / 75.0)));
} }
private void removeDorothyShoes(int Id) private void removeDorothyShoes(int Id)
{ {
if (Id == -1) if (Id == -1)
return; return;
if(GameServer.IsUserOnline(Id)) if(GameServer.IsUserOnline(Id))
{ {
User user = GameServer.GetUserById(Id); User user = GameServer.GetUserById(Id);
user.OwnedRanch = null; user.OwnedRanch = null;
InventoryItem items = user.Inventory.GetItemByItemId(Item.DorothyShoes); InventoryItem items = user.Inventory.GetItemByItemId(Item.DorothyShoes);
foreach (ItemInstance itm in items.ItemInstances) foreach (ItemInstance itm in items.ItemInstances)
{ {
user.Inventory.Remove(itm); user.Inventory.Remove(itm);
} }
} }
else else
{ {
Database.RemoveAllItemTypesFromPlayerInventory(this.Id, Item.DorothyShoes); Database.RemoveAllItemTypesFromPlayerInventory(this.Id, Item.DorothyShoes);
} }
} }
private void deleteRanch() private void deleteRanch()
{ {
Database.DeleteRanchOwner(this.Id); Database.DeleteRanchOwner(this.Id);
removeDorothyShoes(this.ownerId); removeDorothyShoes(this.ownerId);
resetRanch(); resetRanch();
} }
private void resetRanch() private void resetRanch()
{ {
title = ""; title = "";
description = ""; description = "";
investedMoney = 0; investedMoney = 0;
upgradedLevel = 0; upgradedLevel = 0;
ownerId = -1; ownerId = -1;
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
buildings[i] = null; buildings[i] = null;
} }
public int OwnerId public int OwnerId
{ {
get get
{ {
if(ownerId != -1) if(ownerId != -1)
{ {
if (ConfigReader.AllUsersSubbed || Database.IsUserAdmin(ownerId)) if (ConfigReader.AllUsersSubbed || Database.IsUserAdmin(ownerId))
return ownerId; return ownerId;
int subExp = Database.GetUserSubscriptionExpireDate(ownerId); int subExp = Database.GetUserSubscriptionExpireDate(ownerId);
DateTime expTime = Helper.UnixTimeStampToDateTime(subExp); DateTime expTime = Helper.UnixTimeStampToDateTime(subExp);
if ((DateTime.UtcNow.Date - expTime.Date).Days >= 30) if ((DateTime.UtcNow.Date - expTime.Date).Days >= 30)
{ {
int price = GetSellPrice(); int price = GetSellPrice();
try try
{ {
checked checked
{ {
Database.SetPlayerMoney(Database.GetPlayerMoney(ownerId) + price, ownerId); Database.SetPlayerMoney(Database.GetPlayerMoney(ownerId) + price, ownerId);
} }
} }
catch (OverflowException) catch (OverflowException)
{ {
Database.SetPlayerMoney(2147483647, ownerId);; Database.SetPlayerMoney(2147483647, ownerId);;
} }
Database.AddMessageToQueue(ownerId, Messages.FormatRanchForcefullySoldMessage(price)); Database.AddMessageToQueue(ownerId, Messages.FormatRanchForcefullySoldMessage(price));
deleteRanch(); deleteRanch();
return -1; return -1;
} }
} }
return ownerId; return ownerId;
} }
set set
{ {
if (value == -1) if (value == -1)
{ {
deleteRanch(); deleteRanch();
} }
else else
{ {
if (Database.IsRanchOwned(this.Id)) if (Database.IsRanchOwned(this.Id))
{ {
Database.SetRanchOwner(this.Id, ownerId); Database.SetRanchOwner(this.Id, ownerId);
removeDorothyShoes(ownerId); removeDorothyShoes(ownerId);
} }
else else
{ {
resetRanch(); resetRanch();
Database.AddRanch(this.Id, value, "", "", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); 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)) if (GameServer.IsUserOnline(value))
{ {
User user = GameServer.GetUserById(value); User user = GameServer.GetUserById(value);
user.OwnedRanch = this; user.OwnedRanch = this;
user.Inventory.AddIgnoringFull(new ItemInstance(Item.DorothyShoes)); user.Inventory.AddIgnoringFull(new ItemInstance(Item.DorothyShoes));
} }
else else
{ {
Database.AddItemToInventory(value, new ItemInstance(Item.DorothyShoes)); Database.AddItemToInventory(value, new ItemInstance(Item.DorothyShoes));
} }
ownerId = value; ownerId = value;
} }
} }
public int UpgradedLevel public int UpgradedLevel
{ {
get get
{ {
return upgradedLevel; return upgradedLevel;
} }
set set
{ {
upgradedLevel = value; upgradedLevel = value;
Database.SetRanchUpgradeLevel(Id, value); Database.SetRanchUpgradeLevel(Id, value);
} }
} }
public int InvestedMoney public int InvestedMoney
{ {
get get
{ {
return investedMoney; return investedMoney;
} }
set set
{ {
investedMoney = value; investedMoney = value;
Database.SetRanchInvestment(Id, value); Database.SetRanchInvestment(Id, value);
} }
} }
public string Title public string Title
{ {
get get
{ {
return title; return title;
} }
set set
{ {
title = value.Trim(); title = value.Trim();
Database.SetRanchTitle(Id, title); Database.SetRanchTitle(Id, title);
} }
} }
public string Description public string Description
{ {
get get
{ {
return description; return description;
} }
set set
{ {
description = value.Trim(); description = value.Trim();
Database.SetRanchDescription(Id, value); Database.SetRanchDescription(Id, value);
} }
} }
private RanchBuilding[] buildings = new RanchBuilding[16]; private RanchBuilding[] buildings = new RanchBuilding[16];
public int GetBuildingCount(int buildingId) public int GetBuildingCount(int buildingId)
{ {
int count = 0; int count = 0;
foreach(RanchBuilding building in buildings) foreach(RanchBuilding building in buildings)
{ {
if(building != null) if(building != null)
if (building.Id == buildingId) if (building.Id == buildingId)
count++; count++;
} }
return count; return count;
} }
private void updateBuildings() private void updateBuildings()
{ {
if (buildings[0] != null) if (buildings[0] != null)
Database.SetRanchBuilding1(this.Id, buildings[0].Id); Database.SetRanchBuilding1(this.Id, buildings[0].Id);
else else
Database.SetRanchBuilding1(this.Id, 0); Database.SetRanchBuilding1(this.Id, 0);
if (buildings[1] != null) if (buildings[1] != null)
Database.SetRanchBuilding2(this.Id, buildings[1].Id); Database.SetRanchBuilding2(this.Id, buildings[1].Id);
else else
Database.SetRanchBuilding2(this.Id, 0); Database.SetRanchBuilding2(this.Id, 0);
if (buildings[2] != null) if (buildings[2] != null)
Database.SetRanchBuilding3(this.Id, buildings[2].Id); Database.SetRanchBuilding3(this.Id, buildings[2].Id);
else else
Database.SetRanchBuilding3(this.Id, 0); Database.SetRanchBuilding3(this.Id, 0);
if (buildings[3] != null) if (buildings[3] != null)
Database.SetRanchBuilding4(this.Id, buildings[3].Id); Database.SetRanchBuilding4(this.Id, buildings[3].Id);
else else
Database.SetRanchBuilding4(this.Id, 0); Database.SetRanchBuilding4(this.Id, 0);
if (buildings[4] != null) if (buildings[4] != null)
Database.SetRanchBuilding5(this.Id, buildings[4].Id); Database.SetRanchBuilding5(this.Id, buildings[4].Id);
else else
Database.SetRanchBuilding5(this.Id, 0); Database.SetRanchBuilding5(this.Id, 0);
if (buildings[5] != null) if (buildings[5] != null)
Database.SetRanchBuilding6(this.Id, buildings[5].Id); Database.SetRanchBuilding6(this.Id, buildings[5].Id);
else else
Database.SetRanchBuilding6(this.Id, 0); Database.SetRanchBuilding6(this.Id, 0);
if (buildings[6] != null) if (buildings[6] != null)
Database.SetRanchBuilding7(this.Id, buildings[6].Id); Database.SetRanchBuilding7(this.Id, buildings[6].Id);
else else
Database.SetRanchBuilding7(this.Id, 0); Database.SetRanchBuilding7(this.Id, 0);
if (buildings[7] != null) if (buildings[7] != null)
Database.SetRanchBuilding8(this.Id, buildings[7].Id); Database.SetRanchBuilding8(this.Id, buildings[7].Id);
else else
Database.SetRanchBuilding8(this.Id, 0); Database.SetRanchBuilding8(this.Id, 0);
if (buildings[8] != null) if (buildings[8] != null)
Database.SetRanchBuilding9(this.Id, buildings[8].Id); Database.SetRanchBuilding9(this.Id, buildings[8].Id);
else else
Database.SetRanchBuilding9(this.Id, 0); Database.SetRanchBuilding9(this.Id, 0);
if (buildings[9] != null) if (buildings[9] != null)
Database.SetRanchBuilding10(this.Id, buildings[9].Id); Database.SetRanchBuilding10(this.Id, buildings[9].Id);
else else
Database.SetRanchBuilding10(this.Id, 0); Database.SetRanchBuilding10(this.Id, 0);
if (buildings[10] != null) if (buildings[10] != null)
Database.SetRanchBuilding11(this.Id, buildings[10].Id); Database.SetRanchBuilding11(this.Id, buildings[10].Id);
else else
Database.SetRanchBuilding11(this.Id, 0); Database.SetRanchBuilding11(this.Id, 0);
if (buildings[11] != null) if (buildings[11] != null)
Database.SetRanchBuilding12(this.Id, buildings[11].Id); Database.SetRanchBuilding12(this.Id, buildings[11].Id);
else else
Database.SetRanchBuilding12(this.Id, 0); Database.SetRanchBuilding12(this.Id, 0);
if (buildings[12] != null) if (buildings[12] != null)
Database.SetRanchBuilding13(this.Id, buildings[12].Id); Database.SetRanchBuilding13(this.Id, buildings[12].Id);
else else
Database.SetRanchBuilding13(this.Id, 0); Database.SetRanchBuilding13(this.Id, 0);
if (buildings[13] != null) if (buildings[13] != null)
Database.SetRanchBuilding14(this.Id, buildings[13].Id); Database.SetRanchBuilding14(this.Id, buildings[13].Id);
else else
Database.SetRanchBuilding14(this.Id, 0); Database.SetRanchBuilding14(this.Id, 0);
if (buildings[14] != null) if (buildings[14] != null)
Database.SetRanchBuilding15(this.Id, buildings[14].Id); Database.SetRanchBuilding15(this.Id, buildings[14].Id);
else else
Database.SetRanchBuilding15(this.Id, 0); Database.SetRanchBuilding15(this.Id, 0);
if (buildings[15] != null) if (buildings[15] != null)
Database.SetRanchBuilding16(this.Id, buildings[15].Id); Database.SetRanchBuilding16(this.Id, buildings[15].Id);
else else
Database.SetRanchBuilding16(this.Id, 0); Database.SetRanchBuilding16(this.Id, 0);
} }
public RanchBuilding GetBuilding(int buildingId) public RanchBuilding GetBuilding(int buildingId)
{ {
if (buildingId < 0) if (buildingId < 0)
return null; return null;
if (buildingId >= buildings.Length) if (buildingId >= buildings.Length)
return null; return null;
return buildings[buildingId]; return buildings[buildingId];
} }
public void SetBuilding(int buildingId, RanchBuilding value) public void SetBuilding(int buildingId, RanchBuilding value)
{ {
buildings[buildingId] = value; buildings[buildingId] = value;
updateBuildings(); updateBuildings();
} }
public string GetSwf(bool mine) public string GetSwf(bool mine)
{ {
string swf = "ranchviewer.swf?H=" + (upgradedLevel+1).ToString(); string swf = "ranchviewer.swf?H=" + (upgradedLevel+1).ToString();
for(int i = 0; i < buildings.Length; i++) for(int i = 0; i < buildings.Length; i++)
{ {
swf += "&B" + (i+1).ToString() + "="; swf += "&B" + (i+1).ToString() + "=";
if (buildings[i] != null) if (buildings[i] != null)
{ {
swf += buildings[i].Id.ToString(); swf += buildings[i].Id.ToString();
} }
} }
if (mine) if (mine)
swf += "&MINE=1"; swf += "&MINE=1";
return swf; return swf;
} }
public Ranch(int x, int y, int id, int value) public Ranch(int x, int y, int id, int value)
{ {
X = x; X = x;
Y = y; Y = y;
Id = id; Id = id;
Value = value; Value = value;
title = ""; title = "";
description = ""; description = "";
upgradedLevel = 0; upgradedLevel = 0;
ownerId = -1; ownerId = -1;
investedMoney = 0; investedMoney = 0;
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
buildings[i] = null; buildings[i] = null;
bool owned = Database.IsRanchOwned(id); bool owned = Database.IsRanchOwned(id);
if (owned) if (owned)
{ {
upgradedLevel = Database.GetRanchUpgradeLevel(id); upgradedLevel = Database.GetRanchUpgradeLevel(id);
title = Database.GetRanchTitle(id); title = Database.GetRanchTitle(id);
description = Database.GetRanchDescription(id); description = Database.GetRanchDescription(id);
ownerId = Database.GetRanchOwner(id); ownerId = Database.GetRanchOwner(id);
int b1 = Database.GetRanchBuilding1(id); int b1 = Database.GetRanchBuilding1(id);
int b2 = Database.GetRanchBuilding2(id); int b2 = Database.GetRanchBuilding2(id);
int b3 = Database.GetRanchBuilding3(id); int b3 = Database.GetRanchBuilding3(id);
int b4 = Database.GetRanchBuilding4(id); int b4 = Database.GetRanchBuilding4(id);
int b5 = Database.GetRanchBuilding5(id); int b5 = Database.GetRanchBuilding5(id);
int b6 = Database.GetRanchBuilding6(id); int b6 = Database.GetRanchBuilding6(id);
int b7 = Database.GetRanchBuilding7(id); int b7 = Database.GetRanchBuilding7(id);
int b8 = Database.GetRanchBuilding8(id); int b8 = Database.GetRanchBuilding8(id);
int b9 = Database.GetRanchBuilding9(id); int b9 = Database.GetRanchBuilding9(id);
int b10 = Database.GetRanchBuilding10(id); int b10 = Database.GetRanchBuilding10(id);
int b11 = Database.GetRanchBuilding11(id); int b11 = Database.GetRanchBuilding11(id);
int b12 = Database.GetRanchBuilding12(id); int b12 = Database.GetRanchBuilding12(id);
int b13 = Database.GetRanchBuilding13(id); int b13 = Database.GetRanchBuilding13(id);
int b14 = Database.GetRanchBuilding14(id); int b14 = Database.GetRanchBuilding14(id);
int b15 = Database.GetRanchBuilding15(id); int b15 = Database.GetRanchBuilding15(id);
int b16 = Database.GetRanchBuilding16(id); int b16 = Database.GetRanchBuilding16(id);
if (RanchBuilding.RanchBuildingExists(b1)) if (RanchBuilding.RanchBuildingExists(b1))
buildings[0] = RanchBuilding.GetRanchBuildingById(b1); buildings[0] = RanchBuilding.GetRanchBuildingById(b1);
if (RanchBuilding.RanchBuildingExists(b2)) if (RanchBuilding.RanchBuildingExists(b2))
buildings[1] = RanchBuilding.GetRanchBuildingById(b2); buildings[1] = RanchBuilding.GetRanchBuildingById(b2);
if (RanchBuilding.RanchBuildingExists(b3)) if (RanchBuilding.RanchBuildingExists(b3))
buildings[2] = RanchBuilding.GetRanchBuildingById(b3); buildings[2] = RanchBuilding.GetRanchBuildingById(b3);
if (RanchBuilding.RanchBuildingExists(b4)) if (RanchBuilding.RanchBuildingExists(b4))
buildings[3] = RanchBuilding.GetRanchBuildingById(b4); buildings[3] = RanchBuilding.GetRanchBuildingById(b4);
if (RanchBuilding.RanchBuildingExists(b5)) if (RanchBuilding.RanchBuildingExists(b5))
buildings[4] = RanchBuilding.GetRanchBuildingById(b5); buildings[4] = RanchBuilding.GetRanchBuildingById(b5);
if (RanchBuilding.RanchBuildingExists(b6)) if (RanchBuilding.RanchBuildingExists(b6))
buildings[5] = RanchBuilding.GetRanchBuildingById(b6); buildings[5] = RanchBuilding.GetRanchBuildingById(b6);
if (RanchBuilding.RanchBuildingExists(b7)) if (RanchBuilding.RanchBuildingExists(b7))
buildings[6] = RanchBuilding.GetRanchBuildingById(b7); buildings[6] = RanchBuilding.GetRanchBuildingById(b7);
if (RanchBuilding.RanchBuildingExists(b8)) if (RanchBuilding.RanchBuildingExists(b8))
buildings[7] = RanchBuilding.GetRanchBuildingById(b8); buildings[7] = RanchBuilding.GetRanchBuildingById(b8);
if (RanchBuilding.RanchBuildingExists(b9)) if (RanchBuilding.RanchBuildingExists(b9))
buildings[8] = RanchBuilding.GetRanchBuildingById(b9); buildings[8] = RanchBuilding.GetRanchBuildingById(b9);
if (RanchBuilding.RanchBuildingExists(b10)) if (RanchBuilding.RanchBuildingExists(b10))
buildings[9] = RanchBuilding.GetRanchBuildingById(b10); buildings[9] = RanchBuilding.GetRanchBuildingById(b10);
if (RanchBuilding.RanchBuildingExists(b11)) if (RanchBuilding.RanchBuildingExists(b11))
buildings[10] = RanchBuilding.GetRanchBuildingById(b11); buildings[10] = RanchBuilding.GetRanchBuildingById(b11);
if (RanchBuilding.RanchBuildingExists(b12)) if (RanchBuilding.RanchBuildingExists(b12))
buildings[11] = RanchBuilding.GetRanchBuildingById(b12); buildings[11] = RanchBuilding.GetRanchBuildingById(b12);
if (RanchBuilding.RanchBuildingExists(b13)) if (RanchBuilding.RanchBuildingExists(b13))
buildings[12] = RanchBuilding.GetRanchBuildingById(b13); buildings[12] = RanchBuilding.GetRanchBuildingById(b13);
if (RanchBuilding.RanchBuildingExists(b14)) if (RanchBuilding.RanchBuildingExists(b14))
buildings[13] = RanchBuilding.GetRanchBuildingById(b14); buildings[13] = RanchBuilding.GetRanchBuildingById(b14);
if (RanchBuilding.RanchBuildingExists(b15)) if (RanchBuilding.RanchBuildingExists(b15))
buildings[14] = RanchBuilding.GetRanchBuildingById(b15); buildings[14] = RanchBuilding.GetRanchBuildingById(b15);
if (RanchBuilding.RanchBuildingExists(b16)) if (RanchBuilding.RanchBuildingExists(b16))
buildings[15] = RanchBuilding.GetRanchBuildingById(b16); buildings[15] = RanchBuilding.GetRanchBuildingById(b16);
InvestedMoney = Database.GetRanchInvestment(id); InvestedMoney = Database.GetRanchInvestment(id);
} }
} }
public RanchUpgrade GetRanchUpgrade() public RanchUpgrade GetRanchUpgrade()
{ {
return RanchUpgrade.GetRanchUpgradeById(this.upgradedLevel + 1); return RanchUpgrade.GetRanchUpgradeById(this.upgradedLevel + 1);
} }
public static bool IsRanchHere(int x, int y) public static bool IsRanchHere(int x, int y)
{ {
foreach (Ranch ranch in Ranches) foreach (Ranch ranch in Ranches)
{ {
if (ranch.X == x && ranch.Y == y) if (ranch.X == x && ranch.Y == y)
return true; return true;
} }
return false; return false;
} }
public static bool RanchExists(int ranchId) public static bool RanchExists(int ranchId)
{ {
foreach (Ranch ranch in Ranches) foreach (Ranch ranch in Ranches)
{ {
if (ranch.Id == ranchId) if (ranch.Id == ranchId)
return true; return true;
} }
return false; return false;
} }
public static Ranch GetRanchById(int ranchId) public static Ranch GetRanchById(int ranchId)
{ {
foreach (Ranch ranch in Ranches) foreach (Ranch ranch in Ranches)
{ {
if (ranch.Id == ranchId) if (ranch.Id == ranchId)
return ranch; return ranch;
} }
throw new KeyNotFoundException("No Ranch with id " + ranchId); throw new KeyNotFoundException("No Ranch with id " + ranchId);
} }
public static Ranch GetRanchAt(int x, int y) public static Ranch GetRanchAt(int x, int y)
{ {
foreach(Ranch ranch in Ranches) foreach(Ranch ranch in Ranches)
{ {
if (ranch.X == x && ranch.Y == y) if (ranch.X == x && ranch.Y == y)
return ranch; return ranch;
} }
throw new KeyNotFoundException("No Ranch found at x" + x + " y" + y); throw new KeyNotFoundException("No Ranch found at x" + x + " y" + y);
} }
public static bool IsRanchOwned(int playerId) public static bool IsRanchOwned(int playerId)
{ {
foreach (Ranch ranch in Ranches) foreach (Ranch ranch in Ranches)
{ {
if (ranch.OwnerId == playerId) if (ranch.OwnerId == playerId)
{ {
return true; return true;
} }
} }
return false; return false;
} }
public static Ranch GetRanchOwnedBy(int playerId) public static Ranch GetRanchOwnedBy(int playerId)
{ {
foreach(Ranch ranch in Ranches) foreach(Ranch ranch in Ranches)
{ {
if(ranch.OwnerId == playerId) if(ranch.OwnerId == playerId)
{ {
return ranch; return ranch;
} }
} }
throw new KeyNotFoundException("Player " + playerId + " does not own a ranch."); throw new KeyNotFoundException("Player " + playerId + " does not own a ranch.");
} }
} }
} }

2
HorseIsleServer/LibHISP/Game/SwfModules/Brickpoet.cs
View file

@ -156,7 +156,7 @@ namespace HISP.Game.SwfModules
foreach(int room in rooms) foreach(int room in rooms)
{ {
Logger.InfoPrint("Loading poetry room: " + room.ToString()); Logger.InfoPrint("Loading Poetry room: " + room.ToString());
poetryRooms.Add(getPoetryRoom(room)); poetryRooms.Add(getPoetryRoom(room));
if (!Database.LastPlayerExist("P" + room)) if (!Database.LastPlayerExist("P" + room))
Database.AddLastPlayer("P" + room, -1); Database.AddLastPlayer("P" + room, -1);

4
HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs
View file

@ -30,8 +30,8 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.46.0")] [assembly: AssemblyVersion("1.8.47.0")]
[assembly: AssemblyFileVersion("1.8.46.0")] [assembly: AssemblyFileVersion("1.8.47.0")]

6
HorseIsleServer/MPN00BS/MPN00BS.csproj
View file

@ -227,9 +227,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.17" /> <PackageReference Include="Avalonia" Version="0.10.18" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.17" /> <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" /> <PackageReference Include="XamlNameReferenceGenerator" Version="1.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs
View file

@ -30,8 +30,8 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.46.0")] [assembly: AssemblyVersion("1.8.47.0")]
[assembly: AssemblyFileVersion("1.8.46.0")] [assembly: AssemblyFileVersion("1.8.47.0")]

2
HorseIsleServer/MPN00BS/Properties/PublishProfiles/Linux64.pubxml
View file

@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<SelfContained>True</SelfContained> <SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile> <PublishSingleFile>True</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun> <PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed> <PublishTrimmed>False</PublishTrimmed>
<DefineConstants>OS_LINUX;ARCH_X86_64</DefineConstants> <DefineConstants>OS_LINUX;ARCH_X86_64</DefineConstants>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
HorseIsleServer/MPN00BS/Properties/PublishProfiles/Osx64.pubxml
View file

@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<SelfContained>True</SelfContained> <SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile> <PublishSingleFile>True</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun> <PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed> <PublishTrimmed>False</PublishTrimmed>
<DefineConstants>OS_MACOS;ARCH_X86_64</DefineConstants> <DefineConstants>OS_MACOS;ARCH_X86_64</DefineConstants>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win32.pubxml
View file

@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<SelfContained>True</SelfContained> <SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile> <PublishSingleFile>True</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun> <PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed> <PublishTrimmed>False</PublishTrimmed>
<DefineConstants>OS_WINDOWS;ARCH_X86</DefineConstants> <DefineConstants>OS_WINDOWS;ARCH_X86</DefineConstants>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win64.pubxml
View file

@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<SelfContained>True</SelfContained> <SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile> <PublishSingleFile>True</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun> <PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed> <PublishTrimmed>False</PublishTrimmed>
<DefineConstants>OS_WINDOWS;ARCH_X86_64</DefineConstants> <DefineConstants>OS_WINDOWS;ARCH_X86_64</DefineConstants>
</PropertyGroup> </PropertyGroup>
</Project> </Project>