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

Make "View Tack" work, still some ordering problems though >_>

Browse source
This commit is contained in:
SilicaPi 2021-01-31 03:01:49 +13:00
parent 3c25795188
commit 6ea23e5870
6 changed files with 112 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DataCollection/gamedata.json
View file

@ -292,9 +292,7 @@
"breed_preview_format":"<B>Viewing %NAME%:</B><BR>%DESCRIPTION%^D4|RETURN TO BREED LIST^R2^H", "breed_preview_format":"<B>Viewing %NAME%:</B><BR>%DESCRIPTION%^D4|RETURN TO BREED LIST^R2^H",
"tack":{ "tack":{
"view_tack_set":"^I%ICONID%^T7View %SETNAME% Tack Set:^BM%SWF%^R1^H", "view_tack_set":"^I%ICONID%^T7View %SETNAME% Tack Set:^BM%SWF%^R1^H",
"set_peice_format":"<B>%ITEMNAME%</B>: %ITEMDESC% <br> <B><font color='#880000'>[ BONUS: %BONUS% ]</font></B><BR>", "set_peice_format":"<B>%ITEMNAME%</B>: %ITEMDESC%<BR>",
"bonus_format":"+%BOOST% %STAT%",
"and":" & "
} }
}, },
"multiroom":{ "multiroom":{

73
Horse Isle Server/HorseIsleServer/Game/Items/Tack.cs
View file

@ -16,6 +16,13 @@ namespace HISP.Game.Items
tackItems = new List<Item.ItemInformation>(); tackItems = new List<Item.ItemInformation>();
} }
public int IconId
{
get
{
return GetSaddle().IconId;
}
}
public string SetName; public string SetName;
private List<Item.ItemInformation> tackItems; private List<Item.ItemInformation> tackItems;
public void Add(Item.ItemInformation item) public void Add(Item.ItemInformation item)
@ -23,6 +30,48 @@ namespace HISP.Game.Items
Logger.DebugPrint("Added "+item.Name+" To Tack Set: "+this.SetName); Logger.DebugPrint("Added "+item.Name+" To Tack Set: "+this.SetName);
tackItems.Add(item); tackItems.Add(item);
} }
public Item.ItemInformation GetSaddle()
{
foreach(Item.ItemInformation tackItem in TackItems)
{
if(tackItem.MiscFlags[0] == 1) // Saddle
return tackItem;
}
throw new KeyNotFoundException("Saddle not found.");
}
public Item.ItemInformation GetSaddlePad()
{
foreach(Item.ItemInformation tackItem in TackItems)
{
if(tackItem.MiscFlags[0] == 2) // SaddlePad
return tackItem;
}
throw new KeyNotFoundException("SaddlePad not found.");
}
public Item.ItemInformation GetBridle()
{
foreach(Item.ItemInformation tackItem in TackItems)
{
if(tackItem.MiscFlags[0] == 3) // Bridle
return tackItem;
}
throw new KeyNotFoundException("GetBridle not found.");
}
public string[] GetSwfNames()
{
string[] swfs = new string[3];
swfs[0] = GetSaddle().EmbedSwf;
swfs[1] = GetSaddlePad().EmbedSwf;
swfs[2] = GetBridle().EmbedSwf;
return swfs;
}
public Item.ItemInformation[] TackItems public Item.ItemInformation[] TackItems
{ {
get get
@ -37,7 +86,7 @@ namespace HISP.Game.Items
return firstChar + str.Substring(1); return firstChar + str.Substring(1);
} }
private static List<TackSet> tackSets = new List<TackSet>(); private static List<TackSet> tackSets = new List<TackSet>();
public TackSet[] TackSets public static TackSet[] TackSets
{ {
get get
{ {
@ -69,18 +118,24 @@ namespace HISP.Game.Items
set.Add(itemInfo); set.Add(itemInfo);
} }
catch(KeyNotFoundException) catch(KeyNotFoundException)
{ {
continue; TackSet tackSet = new TackSet();
tackSet.SetName = capitalizeFirstLetter(itemInfo.EmbedSwf);
Logger.DebugPrint("Created Tack Set: "+tackSet.SetName);
tackSet.Add(itemInfo);
tackSets.Add(tackSet);
} }
TackSet tackSet = new TackSet();
tackSet.SetName = capitalizeFirstLetter(itemInfo.EmbedSwf);
tackSet.Add(itemInfo);
tackSets.Add(tackSet);
Logger.DebugPrint("Created Tack Set: "+tackSet.SetName);
} }
} }
foreach(TackSet set in TackSets)
{
if(set.TackItems.Length < 3)
{
Logger.DebugPrint("Removing set: "+set.SetName);
tackSets.Remove(set);
}
}
} }
} }
} }

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

@ -518,14 +518,10 @@ namespace HISP.Game
// Click // Click
public static string NothingInterestingHere; 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) public static string FormatTackSetPeice(string itemName, string itemDescription)
{ {
return TackSetPeiceFormat.Replace("%ITEMNAME%",itemName).Replace("%ITEMDESC%", itemDescription).Replace("%BONUS%",bonus); return TackSetPeiceFormat.Replace("%ITEMNAME%",itemName).Replace("%ITEMDESC%", itemDescription);
} }
public static string FormatTackSetView(int iconId, string tackSetName, string swf) public static string FormatTackSetView(int iconId, string tackSetName, string swf)

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

@ -319,6 +319,48 @@ namespace HISP.Game
throw new Exception("A mathematically impossible error occured. please check wether the laws of physics still apply."); throw new Exception("A mathematically impossible error occured. please check wether the laws of physics still apply.");
} }
public static string buildTackPeiceLibary(Item.ItemInformation item)
{
string message = "";
message += Messages.FormatTackSetPeice(item.Name, item.Description);
return message;
}
public static string BuildTackLibary()
{
string message = "";
foreach(Tack.TackSet set in Tack.TackSets)
{
string[] setSwfs = set.GetSwfNames();
string swf = "breedviewer.swf?terrain=book2&breed=tackonly";
if(setSwfs.Length >= 1)
swf += "&saddle="+setSwfs[0];
if(setSwfs.Length >= 2)
swf += "&saddlepad="+setSwfs[1];
if(setSwfs.Length >= 3)
swf += "&bridle="+setSwfs[2];
swf += "&j=";
message += Messages.FormatTackSetView(set.IconId, set.SetName, swf);
// Write all peices
try
{
message += buildTackPeiceLibary(set.GetSaddle());
message += buildTackPeiceLibary(set.GetSaddlePad());
message += buildTackPeiceLibary(set.GetBridle());
}
catch(Exception e)
{
Logger.ErrorPrint(e.Message);
}
}
message += Messages.BackToMap;
message += Messages.MetaTerminator;
return message;
}
public static string BuildHorseReleased() public static string BuildHorseReleased()
{ {
string message = ""; string message = "";

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

@ -591,8 +591,6 @@ namespace HISP.Server
// Tack (Horse) // Tack (Horse)
Messages.TackViewSetFormat = gameData.messages.meta.libary.tack.view_tack_set; Messages.TackViewSetFormat = gameData.messages.meta.libary.tack.view_tack_set;
Messages.TackSetPeiceFormat = gameData.messages.meta.libary.tack.set_peice_format; Messages.TackSetPeiceFormat = gameData.messages.meta.libary.tack.set_peice_format;
Messages.TackBonusFormat = gameData.messages.meta.libary.tack.bonus_format;
Messages.TackAndSeperator = gameData.messages.meta.libary.tack.and;
// Vet // Vet
Messages.VetServiceHorseFormat = gameData.messages.meta.vet.service_horse; Messages.VetServiceHorseFormat = gameData.messages.meta.vet.service_horse;

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

@ -1338,19 +1338,10 @@ namespace HISP.Server
metaPacket = PacketBuilder.CreateMetaPacket(Meta.BuildAllStats(sender.LoggedinUser)); metaPacket = PacketBuilder.CreateMetaPacket(Meta.BuildAllStats(sender.LoggedinUser));
sender.SendPacket(metaPacket); sender.SendPacket(metaPacket);
break; break;
case "31": // Find Ranch
break;
case "9": // View Tack case "9": // View Tack
break; sender.LoggedinUser.MetaPriority = true;
case "10": // View Competitions metaPacket = PacketBuilder.CreateMetaPacket(Meta.BuildTackLibary());
break; sender.SendPacket(metaPacket);
case "12": // View Miigames
break;
case "22": // View Locations
break;
case "23": // View Awards
break;
case "38": // Read Books
break; break;
case "53": // Misc Stats / Tracked Items case "53": // Misc Stats / Tracked Items
sender.LoggedinUser.MetaPriority = true; sender.LoggedinUser.MetaPriority = true;