warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Projects/Scripts/Items/Containers/Container.cs
View file

@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using Server.ContextMenus;
using Server.Mobiles;
using Server.Multis;
@ -17,17 +16,40 @@ namespace Server.Items
{
}
public override int DefaultMaxWeight => IsSecure ? 0 : base.DefaultMaxWeight;
public override int DefaultMaxWeight
{
get
{
if (IsSecure)
return 0;
public override bool IsAccessibleTo(Mobile m) =>
BaseHouse.CheckAccessible(m, this) && base.IsAccessibleTo(m);
return base.DefaultMaxWeight;
}
}
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight) =>
(!IsSecure || BaseHouse.CheckHold(m, this, item, message, checkItems, plusItems, plusWeight)) &&
base.CheckHold(m, item, message, checkItems, plusItems, plusWeight);
public override bool IsAccessibleTo(Mobile m)
{
if (!BaseHouse.CheckAccessible(m, this))
return false;
public override bool CheckItemUse(Mobile from, Item item) =>
IsDecoContainer && item is BaseBook || base.CheckItemUse(from, item);
return base.IsAccessibleTo(m);
}
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
{
if (IsSecure && !BaseHouse.CheckHold(m, this, item, message, checkItems, plusItems, plusWeight))
return false;
return base.CheckHold(m, item, message, checkItems, plusItems, plusWeight);
}
public override bool CheckItemUse(Mobile from, Item item)
{
if (IsDecoContainer && item is BaseBook)
return true;
return base.CheckItemUse(from, item);
}
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{
@ -57,8 +79,13 @@ namespace Server.Items
List<Item> list = Items;
if (list.Any(item => !(item is Container) && item.StackWith(from, dropped, false)))
return true;
for (int i = 0; i < list.Count; ++i)
{
Item item = list[i];
if (!(item is Container) && item.StackWith(from, dropped, false))
return true;
}
DropItem(dropped);
@ -909,4 +936,4 @@ namespace Server.Items
Weight = -1;
}
}
}
}

16
Projects/Scripts/Items/Containers/FillableContainers.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Mobiles;
namespace Server.Items
@ -96,7 +95,14 @@ namespace Server.Items
}
}
public int GetItemsCount() => Items.Sum(item => item.Amount);
public int GetItemsCount()
{
int count = 0;
foreach (Item item in Items) count += item.Amount;
return count;
}
public void CheckRespawn()
{
@ -1501,9 +1507,7 @@ namespace Server.Items
Mobile nearest = null;
FillableContent content = null;
IPooledEnumerable eable = map.GetMobilesInRange(loc, 20);
foreach (Mobile mob in eable)
foreach (Mobile mob in map.GetMobilesInRange(loc, 20))
{
if (nearest != null && mob.GetDistanceToSqrt(loc) > nearest.GetDistanceToSqrt(loc) &&
!(nearest is Cobbler && mob is Provisioner))
@ -1516,8 +1520,6 @@ namespace Server.Items
}
}
eable.Free();
return content;
}
}

4
Projects/Scripts/Items/Containers/LockableContainer.cs
View file

@ -264,7 +264,7 @@ namespace Server.Items
inaccessible = true;
}
Packets.SendMessageLocalized(from.NetState, Serial, ItemID, MessageType.Regular, 0x3B2, 3, number);
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, 0x3B2, 3, number, "", ""));
}
return inaccessible;
@ -323,4 +323,4 @@ namespace Server.Items
LabelTo(from, 1041645); //recovered from a shipwreck
}
}
}
}

15
Projects/Scripts/Items/Containers/SalvageBag.cs
View file

@ -126,11 +126,16 @@ namespace Server.Items
#region Checks
private bool Resmeltables() => //Where context menu checks for metal items and dragon barding deeds
Items.Select(i => 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)).FirstOrDefault();
private bool Resmeltables() //Where context menu checks for metal items and dragon barding deeds
{
foreach (Item 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
{

10
Projects/Scripts/Items/Containers/TrappableContainer.cs
View file

@ -46,7 +46,7 @@ namespace Server.Items
if (Deleted || !to.CanSee(this))
return;
Packets.SendMessageLocalized(to.NetState, Serial, ItemID, MessageType.Regular, hue, 3, number);
to.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number, "", ""));
}
private void SendMessageTo(Mobile to, string text, int hue)
@ -54,7 +54,7 @@ namespace Server.Items
if (Deleted || !to.CanSee(this))
return;
Packets.SendUnicodeMessage(to.NetState,Serial, ItemID, MessageType.Regular, hue, 3, "ENU", "", text);
to.Send(new UnicodeMessage(Serial, ItemID, MessageType.Regular, hue, 3, "ENU", "", text));
}
public virtual bool ExecuteTrap(Mobile from)
@ -91,7 +91,7 @@ namespace Server.Items
from.LocalOverheadMessage(MessageType.Regular, 0x2A, 503000);
}
Effects.SendLocationEffect(loc, facet, 0x36BD, 15);
Effects.SendLocationEffect(loc, facet, 0x36BD, 15, 10);
Effects.PlaySound(loc, facet, 0x307);
break;
@ -129,7 +129,7 @@ namespace Server.Items
AOS.Damage(from, damage, 100, 0, 0, 0, 0);
// A dart embeds itself in your flesh!
// A dart imbeds itself in your flesh!
from.LocalOverheadMessage(MessageType.Regular, 0x62, 502998);
}
@ -221,4 +221,4 @@ namespace Server.Items
}
}
}
}
}

69
Projects/Scripts/Items/Containers/TreasureMapChest.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.ContextMenus;
using Server.Engines.PartySystem;
using Server.Gumps;
@ -40,7 +39,7 @@ namespace Server.Items
public override int LabelNumber => 3000541;
public static Type[] Artifacts { get; } =
public static Type[] Artifacts{ get; } =
{
typeof(CandelabraOfSouls), typeof(GoldBricks), typeof(PhillipsWoodenSteed),
typeof(ArcticDeathDealer), typeof(BlazeOfDeath), typeof(BurglarsBandana),
@ -52,18 +51,18 @@ namespace Server.Items
};
[CommandProperty(AccessLevel.GameMaster)]
public int Level { get; set; }
public int Level{ get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Owner { get; set; }
public Mobile Owner{ get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public DateTime DeleteTime { get; private set; }
public DateTime DeleteTime{ get; private set; }
[CommandProperty(AccessLevel.GameMaster)]
public bool Temporary { get; set; }
public bool Temporary{ get; set; }
public List<Mobile> Guardians { get; private set; }
public List<Mobile> Guardians{ get; private set; }
public override bool IsDecoContainer => false;
@ -197,11 +196,18 @@ namespace Server.Items
};
}
else
{
numberItems = level * 6;
}
for (int i = 0; i < numberItems; ++i)
{
Item item = Core.AOS ? Loot.RandomArmorOrShieldOrWeaponOrJewelry() : Loot.RandomArmorOrShieldOrWeapon();
Item item;
if (Core.AOS)
item = Loot.RandomArmorOrShieldOrWeaponOrJewelry();
else
item = Loot.RandomArmorOrShieldOrWeapon();
if (item is BaseWeapon weapon)
{
@ -290,12 +296,13 @@ namespace Server.Items
if (Level == 0 && from.AccessLevel < AccessLevel.GameMaster)
{
if (Guardians.Any(m => m.Alive))
{
from.SendLocalizedMessage(
1046448); // You must first kill the guardians before you may open this chest.
return true;
}
foreach (Mobile m in Guardians)
if (m.Alive)
{
from.SendLocalizedMessage(
1046448); // You must first kill the guardians before you may open this chest.
return true;
}
LockPick(from);
return false;
@ -388,29 +395,29 @@ namespace Server.Items
switch (version)
{
case 2:
{
Guardians = reader.ReadStrongMobileList();
Temporary = reader.ReadBool();
{
Guardians = reader.ReadStrongMobileList();
Temporary = reader.ReadBool();
goto case 1;
}
goto case 1;
}
case 1:
{
Owner = reader.ReadMobile();
{
Owner = reader.ReadMobile();
goto case 0;
}
goto case 0;
}
case 0:
{
Level = reader.ReadInt();
DeleteTime = reader.ReadDeltaTime();
m_Lifted = reader.ReadStrongItemList();
{
Level = reader.ReadInt();
DeleteTime = reader.ReadDeltaTime();
m_Lifted = reader.ReadStrongItemList();
if (version < 2)
Guardians = new List<Mobile>();
if (version < 2)
Guardians = new List<Mobile>();
break;
}
break;
}
}
if (!Temporary)