Fixes for Last Moved (#194)
This commit is contained in:
parent
3a081d5322
commit
b476bcfd24
28 changed files with 155 additions and 398 deletions
|
|
@ -31,10 +31,7 @@ namespace Server.Regions
|
|||
|
||||
BankBox bank = from.FindBankNoCreate();
|
||||
|
||||
if (bank != null && ContainsDeed(bank))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
return bank != null && ContainsDeed(bank);
|
||||
}
|
||||
|
||||
private bool ContainsDeed(Container cont)
|
||||
|
|
@ -53,4 +50,4 @@ namespace Server.Regions
|
|||
return base.OnTarget(m, t, o);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,13 +68,7 @@ namespace Server.Items
|
|||
get => m_Charges;
|
||||
set
|
||||
{
|
||||
if (value > MaxCharges)
|
||||
m_Charges = MaxCharges;
|
||||
else if (value < 0)
|
||||
m_Charges = 0;
|
||||
else
|
||||
m_Charges = value;
|
||||
|
||||
m_Charges = Math.Clamp(value, 0, MaxCharges);
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
|
@ -85,13 +79,7 @@ namespace Server.Items
|
|||
get => m_Recharges;
|
||||
set
|
||||
{
|
||||
if (value > MaxRecharges)
|
||||
m_Recharges = MaxRecharges;
|
||||
else if (value < 0)
|
||||
m_Recharges = 0;
|
||||
else
|
||||
m_Recharges = value;
|
||||
|
||||
m_Recharges = Math.Clamp(value, 0, MaxRecharges);
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
|
@ -278,4 +266,4 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.CompilerServices;
|
||||
using Server.ContextMenus;
|
||||
using Server.Engines.ConPVP;
|
||||
using Server.Mobiles;
|
||||
|
|
@ -61,13 +62,7 @@ namespace Server.Items
|
|||
get => m_Charges;
|
||||
set
|
||||
{
|
||||
if (value > MaxCharges)
|
||||
m_Charges = MaxCharges;
|
||||
else if (value < 0)
|
||||
m_Charges = 0;
|
||||
else
|
||||
m_Charges = value;
|
||||
|
||||
m_Charges = Math.Clamp(value, 0, MaxCharges);
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
|
@ -78,13 +73,7 @@ namespace Server.Items
|
|||
get => m_Recharges;
|
||||
set
|
||||
{
|
||||
if (value > MaxRecharges)
|
||||
m_Recharges = MaxRecharges;
|
||||
else if (value < 0)
|
||||
m_Recharges = 0;
|
||||
else
|
||||
m_Recharges = value;
|
||||
|
||||
m_Recharges = Math.Clamp(value, 0, MaxRecharges);
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
|
@ -100,17 +89,13 @@ namespace Server.Items
|
|||
public override void AddNameProperty(ObjectPropertyList list)
|
||||
{
|
||||
list.Add(1054131,
|
||||
m_Charges + (PetName.Length == 0
|
||||
? "\t "
|
||||
: $"\t{PetName}")); // a crystal ball of pet summoning: [charges: ~1_charges~] : [linked pet: ~2_petName~]
|
||||
$"{m_Charges}\t{PetName.IsNullOrDefault(" ")}"); // a crystal ball of pet summoning: [charges: ~1_charges~] : [linked pet: ~2_petName~]
|
||||
}
|
||||
|
||||
public override void OnSingleClick(Mobile from)
|
||||
{
|
||||
LabelTo(from, 1054131,
|
||||
m_Charges + (PetName.Length == 0
|
||||
? "\t "
|
||||
: $"\t{PetName}")); // a crystal ball of pet summoning: [charges: ~1_charges~] : [linked pet: ~2_petName~]
|
||||
$"{m_Charges}\t{PetName.IsNullOrDefault(" ")}"); // a crystal ball of pet summoning: [charges: ~1_charges~] : [linked pet: ~2_petName~]
|
||||
}
|
||||
|
||||
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
|
||||
|
|
@ -415,13 +400,8 @@ namespace Server.Items
|
|||
Disturb(DisturbType.Hurt, false);
|
||||
}
|
||||
|
||||
public override bool CheckDisturb(DisturbType type, bool checkFirst, bool resistable)
|
||||
{
|
||||
if (type == DisturbType.EquipRequest || type == DisturbType.UseRequest /* || type == DisturbType.Hurt*/)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
public override bool CheckDisturb(DisturbType type, bool checkFirst, bool resistable) =>
|
||||
type != DisturbType.EquipRequest && type != DisturbType.UseRequest;
|
||||
|
||||
public override void DoHurtFizzle()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -63,13 +63,7 @@ namespace Server.Items
|
|||
get => m_Charges;
|
||||
set
|
||||
{
|
||||
if (value > MaxCharges)
|
||||
m_Charges = MaxCharges;
|
||||
else if (value < 0)
|
||||
m_Charges = 0;
|
||||
else
|
||||
m_Charges = value;
|
||||
|
||||
m_Charges = Math.Clamp(value, 0, MaxCharges);
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
|
@ -80,13 +74,7 @@ namespace Server.Items
|
|||
get => m_Recharges;
|
||||
set
|
||||
{
|
||||
if (value > MaxRecharges)
|
||||
m_Recharges = MaxRecharges;
|
||||
else if (value < 0)
|
||||
m_Recharges = 0;
|
||||
else
|
||||
m_Recharges = value;
|
||||
|
||||
m_Recharges = Math.Clamp(value, 0, MaxRecharges);
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
|
@ -102,17 +90,13 @@ namespace Server.Items
|
|||
public override void AddNameProperty(ObjectPropertyList list)
|
||||
{
|
||||
list.Add(1054000,
|
||||
m_Charges + (m_Inscription.Length == 0
|
||||
? "\t "
|
||||
: $" :\t{m_Inscription}")); // a bracelet of binding : ~1_val~ ~2_val~
|
||||
$"{m_Charges}\t{m_Inscription.IsNullOrDefault(" ")}"); // a bracelet of binding : ~1_val~ ~2_val~
|
||||
}
|
||||
|
||||
public override void OnSingleClick(Mobile from)
|
||||
{
|
||||
LabelTo(from, 1054000,
|
||||
m_Charges + (m_Inscription.Length == 0
|
||||
? "\t "
|
||||
: $" :\t{m_Inscription}")); // a bracelet of binding : ~1_val~ ~2_val~
|
||||
$"{m_Charges}\t{m_Inscription.IsNullOrDefault(" ")}"); // a bracelet of binding : ~1_val~ ~2_val~
|
||||
}
|
||||
|
||||
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ namespace Server.Items
|
|||
|
||||
protected virtual bool CheckUse(Mobile from)
|
||||
{
|
||||
DateTime now = DateTime.UtcNow;
|
||||
// DateTime now = DateTime.UtcNow;
|
||||
|
||||
PlayerMobile pm = from as PlayerMobile;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue