fix: Codegens salvage bags (#947)
This commit is contained in:
Kamron Batman
GitHub
parent
003ad1164f
commit
9bc6d5bdb8
2 changed files with 312 additions and 331 deletions
|
|
@ -6,393 +6,370 @@ using Server.Engines.Craft;
|
|||
using Server.Network;
|
||||
using Server.Utilities;
|
||||
|
||||
namespace Server.Items
|
||||
namespace Server.Items;
|
||||
|
||||
[Serializable(0)]
|
||||
public partial class SalvageBag : Bag
|
||||
{
|
||||
public class SalvageBag : Bag
|
||||
private bool m_Failure;
|
||||
|
||||
[Constructible]
|
||||
public SalvageBag() : this(Utility.RandomBlueHue())
|
||||
{
|
||||
private bool m_Failure;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SalvageBag()
|
||||
: this(Utility.RandomBlueHue())
|
||||
[Constructible]
|
||||
public SalvageBag(int hue)
|
||||
{
|
||||
Weight = 2.0;
|
||||
Hue = hue;
|
||||
m_Failure = false;
|
||||
}
|
||||
|
||||
public override int LabelNumber => 1079931; // Salvage Bag
|
||||
|
||||
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
|
||||
{
|
||||
base.GetContextMenuEntries(from, list);
|
||||
|
||||
if (from.Alive)
|
||||
{
|
||||
var inBackpack = IsChildOf(from.Backpack);
|
||||
var resmeltables = inBackpack && Resmeltables();
|
||||
var scissorables = inBackpack && Scissorables();
|
||||
list.Add(new SalvageIngotsEntry(this, resmeltables));
|
||||
list.Add(new SalvageClothEntry(this, scissorables));
|
||||
list.Add(new SalvageAllEntry(this, resmeltables && scissorables));
|
||||
}
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SalvageBag(int hue)
|
||||
private bool Resmelt(Mobile from, Item item, CraftResource resource)
|
||||
{
|
||||
try
|
||||
{
|
||||
Weight = 2.0;
|
||||
Hue = hue;
|
||||
m_Failure = false;
|
||||
}
|
||||
|
||||
public SalvageBag(Serial serial)
|
||||
: base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override int LabelNumber => 1079931; // Salvage Bag
|
||||
|
||||
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
|
||||
{
|
||||
base.GetContextMenuEntries(from, list);
|
||||
|
||||
if (from.Alive)
|
||||
if (CraftResources.GetType(resource) != CraftResourceType.Metal)
|
||||
{
|
||||
list.Add(new SalvageIngotsEntry(this, IsChildOf(from.Backpack) && Resmeltables()));
|
||||
list.Add(new SalvageClothEntry(this, IsChildOf(from.Backpack) && Scissorables()));
|
||||
list.Add(new SalvageAllEntry(this, IsChildOf(from.Backpack) && Resmeltables() && Scissorables()));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private bool Resmelt(Mobile from, Item item, CraftResource resource)
|
||||
{
|
||||
try
|
||||
var info = CraftResources.GetInfo(resource);
|
||||
|
||||
if (info == null || info.ResourceTypes.Length == 0)
|
||||
{
|
||||
if (CraftResources.GetType(resource) != CraftResourceType.Metal)
|
||||
return false;
|
||||
}
|
||||
|
||||
var craftItem = DefBlacksmithy.CraftSystem.CraftItems.SearchFor(item.GetType());
|
||||
|
||||
if (craftItem == null || craftItem.Resources.Count == 0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var craftResource = craftItem.Resources[0];
|
||||
|
||||
if (craftResource.Amount < 2)
|
||||
{
|
||||
return false; // Not enough metal to resmelt
|
||||
}
|
||||
|
||||
var difficulty = resource switch
|
||||
{
|
||||
CraftResource.DullCopper => 65.0,
|
||||
CraftResource.ShadowIron => 70.0,
|
||||
CraftResource.Copper => 75.0,
|
||||
CraftResource.Bronze => 80.0,
|
||||
CraftResource.Gold => 85.0,
|
||||
CraftResource.Agapite => 90.0,
|
||||
CraftResource.Verite => 95.0,
|
||||
CraftResource.Valorite => 99.0,
|
||||
_ => 0.0
|
||||
};
|
||||
|
||||
var ingot = info.ResourceTypes[0].CreateInstance<Item>();
|
||||
|
||||
if (item is DragonBardingDeed || item is BaseArmor armor && armor.PlayerConstructed ||
|
||||
item is BaseWeapon weapon && weapon.PlayerConstructed ||
|
||||
item is BaseClothing clothing && clothing.PlayerConstructed)
|
||||
{
|
||||
var mining = from.Skills.Mining.Value;
|
||||
if (mining > 100.0)
|
||||
{
|
||||
return false;
|
||||
mining = 100.0;
|
||||
}
|
||||
|
||||
var info = CraftResources.GetInfo(resource);
|
||||
|
||||
if (info == null || info.ResourceTypes.Length == 0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var craftItem = DefBlacksmithy.CraftSystem.CraftItems.SearchFor(item.GetType());
|
||||
|
||||
if (craftItem == null || craftItem.Resources.Count == 0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var craftResource = craftItem.Resources[0];
|
||||
|
||||
if (craftResource.Amount < 2)
|
||||
{
|
||||
return false; // Not enough metal to resmelt
|
||||
}
|
||||
|
||||
var difficulty = resource switch
|
||||
{
|
||||
CraftResource.DullCopper => 65.0,
|
||||
CraftResource.ShadowIron => 70.0,
|
||||
CraftResource.Copper => 75.0,
|
||||
CraftResource.Bronze => 80.0,
|
||||
CraftResource.Gold => 85.0,
|
||||
CraftResource.Agapite => 90.0,
|
||||
CraftResource.Verite => 95.0,
|
||||
CraftResource.Valorite => 99.0,
|
||||
_ => 0.0
|
||||
};
|
||||
|
||||
var ingot = info.ResourceTypes[0].CreateInstance<Item>();
|
||||
|
||||
if (item is DragonBardingDeed || item is BaseArmor armor && armor.PlayerConstructed ||
|
||||
item is BaseWeapon weapon && weapon.PlayerConstructed ||
|
||||
item is BaseClothing clothing && clothing.PlayerConstructed)
|
||||
{
|
||||
var mining = from.Skills.Mining.Value;
|
||||
if (mining > 100.0)
|
||||
{
|
||||
mining = 100.0;
|
||||
}
|
||||
|
||||
var amount = ((4 + mining) * craftResource.Amount - 4) * 0.0068;
|
||||
if (amount < 2)
|
||||
{
|
||||
ingot.Amount = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
ingot.Amount = (int)amount;
|
||||
}
|
||||
}
|
||||
else
|
||||
var amount = ((4 + mining) * craftResource.Amount - 4) * 0.0068;
|
||||
if (amount < 2)
|
||||
{
|
||||
ingot.Amount = 2;
|
||||
}
|
||||
|
||||
if (difficulty > from.Skills.Mining.Value)
|
||||
{
|
||||
m_Failure = true;
|
||||
ingot.Delete();
|
||||
}
|
||||
else
|
||||
{
|
||||
item.Delete();
|
||||
ingot.Amount = (int)amount;
|
||||
}
|
||||
|
||||
from.AddToBackpack(ingot);
|
||||
|
||||
from.PlaySound(0x2A);
|
||||
from.PlaySound(0x240);
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine(ex.ToString());
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool Resmeltables() // Where context menu checks for metal items and dragon barding deeds
|
||||
{
|
||||
foreach (var i in Items)
|
||||
{
|
||||
return i?.Deleted == false && (
|
||||
i is BaseWeapon weapon && CraftResources.GetType(weapon.Resource) == CraftResourceType.Metal ||
|
||||
i is BaseArmor armor && CraftResources.GetType(armor.Resource) == CraftResourceType.Metal ||
|
||||
i is DragonBardingDeed);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool Scissorables() // Where context menu checks for Leather items and cloth items
|
||||
{
|
||||
foreach (var i in Items)
|
||||
{
|
||||
if (i is not IScissorable || i.Deleted)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (i is BaseClothing or Cloth or BoltOfCloth or Hides or BonePile || i is BaseArmor armor && CraftResources.GetType(armor.Resource) == CraftResourceType.Leather)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private void SalvageIngots(Mobile from)
|
||||
{
|
||||
if (from.Backpack.FindItemsByType<BaseTool>().All(tool => tool.CraftSystem != DefBlacksmithy.CraftSystem))
|
||||
{
|
||||
from.SendLocalizedMessage(1079822); // You need a blacksmithing tool in order to salvage ingots.
|
||||
return;
|
||||
}
|
||||
|
||||
DefBlacksmithy.CheckAnvilAndForge(from, 2, out _, out var forge);
|
||||
|
||||
if (!forge)
|
||||
{
|
||||
from.SendLocalizedMessage(1044265); // You must be near a forge.
|
||||
return;
|
||||
}
|
||||
|
||||
var salvaged = 0;
|
||||
var notSalvaged = 0;
|
||||
|
||||
Container sBag = this;
|
||||
|
||||
var smeltables = sBag.FindItemsByType<Item>();
|
||||
|
||||
foreach (var item in smeltables)
|
||||
{
|
||||
if (item?.Deleted != false)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (item is BaseArmor armor && Resmelt(from, armor, armor.Resource) ||
|
||||
item is BaseWeapon weapon && Resmelt(from, weapon, weapon.Resource) ||
|
||||
item is DragonBardingDeed)
|
||||
{
|
||||
salvaged++;
|
||||
}
|
||||
else
|
||||
{
|
||||
notSalvaged++;
|
||||
}
|
||||
}
|
||||
|
||||
if (m_Failure)
|
||||
{
|
||||
from.SendLocalizedMessage(1079975); // You failed to smelt some metal for lack of skill.
|
||||
m_Failure = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1079973,
|
||||
$"{salvaged}\t{salvaged + notSalvaged}"
|
||||
); // Salvaged: ~1_COUNT~/~2_NUM~ blacksmithed items
|
||||
ingot.Amount = 2;
|
||||
}
|
||||
|
||||
if (difficulty > from.Skills.Mining.Value)
|
||||
{
|
||||
m_Failure = true;
|
||||
ingot.Delete();
|
||||
}
|
||||
else
|
||||
{
|
||||
item.Delete();
|
||||
}
|
||||
|
||||
from.AddToBackpack(ingot);
|
||||
|
||||
from.PlaySound(0x2A);
|
||||
from.PlaySound(0x240);
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine(ex.ToString());
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool Resmeltables() // Where context menu checks for metal items and dragon barding deeds
|
||||
{
|
||||
foreach (var i in Items)
|
||||
{
|
||||
return i?.Deleted == false && (
|
||||
i is BaseWeapon weapon && CraftResources.GetType(weapon.Resource) == CraftResourceType.Metal ||
|
||||
i is BaseArmor armor && CraftResources.GetType(armor.Resource) == CraftResourceType.Metal ||
|
||||
i is DragonBardingDeed
|
||||
);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool Scissorables() // Where context menu checks for Leather items and cloth items
|
||||
{
|
||||
foreach (var i in Items)
|
||||
{
|
||||
if (i is not IScissorable || i.Deleted)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (i is BaseClothing or Cloth or BoltOfCloth or Hides or BonePile || i is BaseArmor armor && CraftResources.GetType(armor.Resource) == CraftResourceType.Leather)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
private void SalvageCloth(Mobile from)
|
||||
{
|
||||
var scissors = from.Backpack.FindItemByType<Scissors>();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (scissors == null)
|
||||
private void SalvageIngots(Mobile from)
|
||||
{
|
||||
if (from.Backpack.FindItemsByType<BaseTool>().All(tool => tool.CraftSystem != DefBlacksmithy.CraftSystem))
|
||||
{
|
||||
from.SendLocalizedMessage(1079822); // You need a blacksmithing tool in order to salvage ingots.
|
||||
return;
|
||||
}
|
||||
|
||||
DefBlacksmithy.CheckAnvilAndForge(from, 2, out _, out var forge);
|
||||
|
||||
if (!forge)
|
||||
{
|
||||
from.SendLocalizedMessage(1044265); // You must be near a forge.
|
||||
return;
|
||||
}
|
||||
|
||||
var salvaged = 0;
|
||||
var notSalvaged = 0;
|
||||
|
||||
Container sBag = this;
|
||||
|
||||
var smeltables = sBag.FindItemsByType<Item>();
|
||||
|
||||
foreach (var item in smeltables)
|
||||
{
|
||||
if (item?.Deleted != false)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (item is BaseArmor armor && Resmelt(from, armor, armor.Resource) ||
|
||||
item is BaseWeapon weapon && Resmelt(from, weapon, weapon.Resource) ||
|
||||
item is DragonBardingDeed)
|
||||
{
|
||||
salvaged++;
|
||||
}
|
||||
else
|
||||
{
|
||||
notSalvaged++;
|
||||
}
|
||||
}
|
||||
|
||||
if (m_Failure)
|
||||
{
|
||||
from.SendLocalizedMessage(1079975); // You failed to smelt some metal for lack of skill.
|
||||
m_Failure = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1079973,
|
||||
$"{salvaged}\t{salvaged + notSalvaged}"
|
||||
); // Salvaged: ~1_COUNT~/~2_NUM~ blacksmithed items
|
||||
}
|
||||
}
|
||||
|
||||
private static readonly Type[] _clothTypes = {
|
||||
typeof(Leather), typeof(Cloth), typeof(SpinedLeather), typeof(HornedLeather), typeof(BarbedLeather),
|
||||
typeof(Bandage), typeof(Bone)
|
||||
};
|
||||
|
||||
private void SalvageCloth(Mobile from)
|
||||
{
|
||||
var scissors = from.Backpack.FindItemByType<Scissors>();
|
||||
|
||||
if (scissors == null)
|
||||
{
|
||||
from.SendLocalizedMessage(1079823); // You need scissors in order to salvage cloth.
|
||||
return;
|
||||
}
|
||||
|
||||
var salvaged = 0;
|
||||
var notSalvaged = 0;
|
||||
|
||||
Container sBag = this;
|
||||
|
||||
var scissorables = sBag.FindItemsByType<Item>();
|
||||
|
||||
for (var i = scissorables.Count - 1; i >= 0; --i)
|
||||
{
|
||||
var item = scissorables[i];
|
||||
|
||||
if (item is not IScissorable scissorable)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (Scissors.CanScissor(from, scissorable) && scissorable.Scissor(from, scissors))
|
||||
{
|
||||
++salvaged;
|
||||
}
|
||||
else
|
||||
{
|
||||
++notSalvaged;
|
||||
}
|
||||
}
|
||||
|
||||
// Salvaged: ~1_COUNT~/~2_NUM~ tailored items
|
||||
from.SendLocalizedMessage(1079974, $"{salvaged}\t{salvaged + notSalvaged}");
|
||||
|
||||
var items = FindItemsByType(_clothTypes);
|
||||
|
||||
for (var i = 0; i < items.Length; i++)
|
||||
{
|
||||
from.AddToBackpack(items[i]);
|
||||
}
|
||||
}
|
||||
|
||||
private void SalvageAll(Mobile from)
|
||||
{
|
||||
SalvageIngots(from);
|
||||
SalvageCloth(from);
|
||||
}
|
||||
|
||||
private class SalvageAllEntry : ContextMenuEntry
|
||||
{
|
||||
private readonly SalvageBag m_Bag;
|
||||
|
||||
public SalvageAllEntry(SalvageBag bag, bool enabled) : base(6276)
|
||||
{
|
||||
m_Bag = bag;
|
||||
|
||||
if (!enabled)
|
||||
{
|
||||
Flags |= CMEFlags.Disabled;
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnClick()
|
||||
{
|
||||
if (m_Bag.Deleted)
|
||||
{
|
||||
from.SendLocalizedMessage(1079823); // You need scissors in order to salvage cloth.
|
||||
return;
|
||||
}
|
||||
|
||||
var salvaged = 0;
|
||||
var notSalvaged = 0;
|
||||
var from = Owner.From;
|
||||
|
||||
Container sBag = this;
|
||||
|
||||
var scissorables = sBag.FindItemsByType<Item>();
|
||||
|
||||
for (var i = scissorables.Count - 1; i >= 0; --i)
|
||||
if (from.CheckAlive())
|
||||
{
|
||||
var item = scissorables[i];
|
||||
|
||||
if (item is not IScissorable scissorable)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (Scissors.CanScissor(from, scissorable) && scissorable.Scissor(from, scissors))
|
||||
{
|
||||
++salvaged;
|
||||
}
|
||||
else
|
||||
{
|
||||
++notSalvaged;
|
||||
}
|
||||
m_Bag.SalvageAll(from);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
from.SendLocalizedMessage(
|
||||
1079974,
|
||||
$"{salvaged}\t{salvaged + notSalvaged}"
|
||||
); // Salvaged: ~1_COUNT~/~2_NUM~ tailored items
|
||||
private class SalvageIngotsEntry : ContextMenuEntry
|
||||
{
|
||||
private readonly SalvageBag m_Bag;
|
||||
|
||||
var items = FindItemsByType(
|
||||
new[]
|
||||
{
|
||||
typeof(Leather), typeof(Cloth), typeof(SpinedLeather), typeof(HornedLeather), typeof(BarbedLeather),
|
||||
typeof(Bandage), typeof(Bone)
|
||||
}
|
||||
);
|
||||
public SalvageIngotsEntry(SalvageBag bag, bool enabled) : base(6277)
|
||||
{
|
||||
m_Bag = bag;
|
||||
|
||||
for (var i = 0; i < items.Length; i++)
|
||||
if (!enabled)
|
||||
{
|
||||
from.AddToBackpack(items[i]);
|
||||
Flags |= CMEFlags.Disabled;
|
||||
}
|
||||
}
|
||||
|
||||
private void SalvageAll(Mobile from)
|
||||
public override void OnClick()
|
||||
{
|
||||
SalvageIngots(from);
|
||||
|
||||
SalvageCloth(from);
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.WriteEncodedInt(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadEncodedInt();
|
||||
}
|
||||
|
||||
private class SalvageAllEntry : ContextMenuEntry
|
||||
{
|
||||
private readonly SalvageBag m_Bag;
|
||||
|
||||
public SalvageAllEntry(SalvageBag bag, bool enabled)
|
||||
: base(6276)
|
||||
if (m_Bag.Deleted)
|
||||
{
|
||||
m_Bag = bag;
|
||||
|
||||
if (!enabled)
|
||||
{
|
||||
Flags |= CMEFlags.Disabled;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
public override void OnClick()
|
||||
var from = Owner.From;
|
||||
|
||||
if (from.CheckAlive())
|
||||
{
|
||||
if (m_Bag.Deleted)
|
||||
{
|
||||
return;
|
||||
}
|
||||
m_Bag.SalvageIngots(from);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var from = Owner.From;
|
||||
private class SalvageClothEntry : ContextMenuEntry
|
||||
{
|
||||
private readonly SalvageBag m_Bag;
|
||||
|
||||
if (from.CheckAlive())
|
||||
{
|
||||
m_Bag.SalvageAll(from);
|
||||
}
|
||||
public SalvageClothEntry(SalvageBag bag, bool enabled) : base(6278)
|
||||
{
|
||||
m_Bag = bag;
|
||||
|
||||
if (!enabled)
|
||||
{
|
||||
Flags |= CMEFlags.Disabled;
|
||||
}
|
||||
}
|
||||
|
||||
private class SalvageIngotsEntry : ContextMenuEntry
|
||||
public override void OnClick()
|
||||
{
|
||||
private readonly SalvageBag m_Bag;
|
||||
|
||||
public SalvageIngotsEntry(SalvageBag bag, bool enabled)
|
||||
: base(6277)
|
||||
if (m_Bag.Deleted)
|
||||
{
|
||||
m_Bag = bag;
|
||||
|
||||
if (!enabled)
|
||||
{
|
||||
Flags |= CMEFlags.Disabled;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
public override void OnClick()
|
||||
var from = Owner.From;
|
||||
|
||||
if (from.CheckAlive())
|
||||
{
|
||||
if (m_Bag.Deleted)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var from = Owner.From;
|
||||
|
||||
if (from.CheckAlive())
|
||||
{
|
||||
m_Bag.SalvageIngots(from);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class SalvageClothEntry : ContextMenuEntry
|
||||
{
|
||||
private readonly SalvageBag m_Bag;
|
||||
|
||||
public SalvageClothEntry(SalvageBag bag, bool enabled)
|
||||
: base(6278)
|
||||
{
|
||||
m_Bag = bag;
|
||||
|
||||
if (!enabled)
|
||||
{
|
||||
Flags |= CMEFlags.Disabled;
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnClick()
|
||||
{
|
||||
if (m_Bag.Deleted)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var from = Owner.From;
|
||||
|
||||
if (from.CheckAlive())
|
||||
{
|
||||
m_Bag.SalvageCloth(from);
|
||||
}
|
||||
m_Bag.SalvageCloth(from);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
{
|
||||
"version": 0,
|
||||
"type": "Server.Items.SalvageBag"
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue