Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)
This commit is contained in:
Kamron Batman
GitHub
parent
e748af4430
commit
513e54f70e
1094 changed files with 15913 additions and 21892 deletions
|
|
@ -82,7 +82,7 @@ namespace Server.Items
|
|||
|
||||
AddBackground(0, 0, 400, 350, 0xA28);
|
||||
|
||||
AddHtmlLocalized(100, 20, 200, 35, 1011015, false, false); // <center>Logging out via camping</center>
|
||||
AddHtmlLocalized(100, 20, 200, 35, 1011015); // <center>Logging out via camping</center>
|
||||
|
||||
/* Using a bedroll in the safety of a camp will log you out of the game safely.
|
||||
* If this is what you wish to do choose CONTINUE and you will be logged out.
|
||||
|
|
@ -92,11 +92,11 @@ namespace Server.Items
|
|||
*/
|
||||
AddHtmlLocalized(50, 55, 300, 140, 1011016, true, true);
|
||||
|
||||
AddButton(45, 298, 0xFA5, 0xFA7, 1, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(80, 300, 110, 35, 1011011, false, false); // CONTINUE
|
||||
AddButton(45, 298, 0xFA5, 0xFA7, 1);
|
||||
AddHtmlLocalized(80, 300, 110, 35, 1011011); // CONTINUE
|
||||
|
||||
AddButton(200, 298, 0xFA5, 0xFA7, 0, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(235, 300, 110, 35, 1011012, false, false); // CANCEL
|
||||
AddButton(200, 298, 0xFA5, 0xFA7, 0);
|
||||
AddHtmlLocalized(235, 300, 110, 35, 1011012); // CANCEL
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
|
|
|
|||
|
|
@ -7,12 +7,7 @@ namespace Server.Items
|
|||
public class Kindling : Item
|
||||
{
|
||||
[Constructible]
|
||||
public Kindling() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Kindling(int amount) : base(0xDE1)
|
||||
public Kindling(int amount = 1) : base(0xDE1)
|
||||
{
|
||||
Stackable = true;
|
||||
Weight = 5.0;
|
||||
|
|
@ -114,4 +109,4 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,7 @@ namespace Server.Items
|
|||
private CraftResource m_Resource;
|
||||
|
||||
[Constructible]
|
||||
public Board()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Board(int amount)
|
||||
public Board(int amount = 1)
|
||||
: this(CraftResource.RegularWood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -23,12 +17,7 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
[Constructible]
|
||||
public Board(CraftResource resource) : this(resource, 1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Board(CraftResource resource, int amount)
|
||||
public Board(CraftResource resource, int amount = 1)
|
||||
: base(0x1BD7)
|
||||
{
|
||||
Stackable = true;
|
||||
|
|
@ -122,13 +111,7 @@ namespace Server.Items
|
|||
public class HeartwoodBoard : Board
|
||||
{
|
||||
[Constructible]
|
||||
public HeartwoodBoard()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public HeartwoodBoard(int amount)
|
||||
public HeartwoodBoard(int amount = 1)
|
||||
: base(CraftResource.Heartwood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -156,13 +139,7 @@ namespace Server.Items
|
|||
public class BloodwoodBoard : Board
|
||||
{
|
||||
[Constructible]
|
||||
public BloodwoodBoard()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public BloodwoodBoard(int amount)
|
||||
public BloodwoodBoard(int amount = 1)
|
||||
: base(CraftResource.Bloodwood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -190,13 +167,7 @@ namespace Server.Items
|
|||
public class FrostwoodBoard : Board
|
||||
{
|
||||
[Constructible]
|
||||
public FrostwoodBoard()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public FrostwoodBoard(int amount)
|
||||
public FrostwoodBoard(int amount = 1)
|
||||
: base(CraftResource.Frostwood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -224,13 +195,7 @@ namespace Server.Items
|
|||
public class OakBoard : Board
|
||||
{
|
||||
[Constructible]
|
||||
public OakBoard()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public OakBoard(int amount)
|
||||
public OakBoard(int amount = 1)
|
||||
: base(CraftResource.OakWood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -258,13 +223,7 @@ namespace Server.Items
|
|||
public class AshBoard : Board
|
||||
{
|
||||
[Constructible]
|
||||
public AshBoard()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public AshBoard(int amount)
|
||||
public AshBoard(int amount = 1)
|
||||
: base(CraftResource.AshWood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -292,13 +251,7 @@ namespace Server.Items
|
|||
public class YewBoard : Board
|
||||
{
|
||||
[Constructible]
|
||||
public YewBoard()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public YewBoard(int amount)
|
||||
public YewBoard(int amount = 1)
|
||||
: base(CraftResource.YewWood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -322,4 +275,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,14 +169,8 @@ namespace Server.Items
|
|||
|
||||
private Mobile m_Hunter;
|
||||
|
||||
[Constructible]
|
||||
public TrophyAddon(Mobile from, int itemID, int westID, int northID, int deedNumber, int addonNumber) : this(from,
|
||||
itemID, westID, northID, deedNumber, addonNumber, null, 0)
|
||||
{
|
||||
}
|
||||
|
||||
public TrophyAddon(Mobile from, int itemID, int westID, int northID, int deedNumber, int addonNumber, Mobile hunter,
|
||||
int animalWeight) : base(itemID)
|
||||
public TrophyAddon(Mobile from, int itemID, int westID, int northID, int deedNumber,
|
||||
int addonNumber, Mobile hunter = null, int animalWeight = 0) : base(itemID)
|
||||
{
|
||||
WestID = westID;
|
||||
NorthID = northID;
|
||||
|
|
@ -335,7 +329,7 @@ namespace Server.Items
|
|||
{
|
||||
BaseHouse house = BaseHouse.FindHouseAt(this);
|
||||
|
||||
if (house != null && house.IsCoOwner(from))
|
||||
if (house?.IsCoOwner(from) == true)
|
||||
{
|
||||
if (from.InRange(GetWorldLocation(), 1))
|
||||
{
|
||||
|
|
@ -358,14 +352,8 @@ namespace Server.Items
|
|||
|
||||
private Mobile m_Hunter;
|
||||
|
||||
[Constructible]
|
||||
public TrophyDeed(int westID, int northID, int deedNumber, int addonNumber) : this(westID, northID, deedNumber,
|
||||
addonNumber, null, 0)
|
||||
{
|
||||
}
|
||||
|
||||
public TrophyDeed(int westID, int northID, int deedNumber, int addonNumber, Mobile hunter, int animalWeight) :
|
||||
base(0x14F0)
|
||||
public TrophyDeed(int westID, int northID, int deedNumber, int addonNumber,
|
||||
Mobile hunter = null, int animalWeight = 0) : base(0x14F0)
|
||||
{
|
||||
WestID = westID;
|
||||
NorthID = northID;
|
||||
|
|
@ -487,7 +475,7 @@ namespace Server.Items
|
|||
{
|
||||
BaseHouse house = BaseHouse.FindHouseAt(from);
|
||||
|
||||
if (house != null && house.IsCoOwner(from))
|
||||
if (house?.IsCoOwner(from) == true)
|
||||
{
|
||||
bool northWall = BaseAddon.IsWall(from.X, from.Y - 1, from.Z, from.Map);
|
||||
bool westWall = BaseAddon.IsWall(from.X - 1, from.Y, from.Z, from.Map);
|
||||
|
|
@ -497,14 +485,12 @@ namespace Server.Items
|
|||
{
|
||||
case Direction.North:
|
||||
case Direction.South:
|
||||
northWall = true;
|
||||
westWall = false;
|
||||
break;
|
||||
|
||||
case Direction.East:
|
||||
case Direction.West:
|
||||
northWall = false;
|
||||
westWall = true;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -7,12 +7,7 @@ namespace Server.Items
|
|||
{
|
||||
private int m_Level;
|
||||
|
||||
[Constructible]
|
||||
public MessageInABottle() : this(Map.Trammel)
|
||||
{
|
||||
}
|
||||
|
||||
public MessageInABottle(Map map) : this(map, GetRandomLevel())
|
||||
public MessageInABottle(Map map = null) : this(map, GetRandomLevel())
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -20,7 +15,7 @@ namespace Server.Items
|
|||
public MessageInABottle(Map map, int level) : base(0x099F)
|
||||
{
|
||||
Weight = 1.0;
|
||||
TargetMap = map;
|
||||
TargetMap = map ?? Map.Trammel;
|
||||
m_Level = level;
|
||||
}
|
||||
|
||||
|
|
@ -105,4 +100,4 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,12 +52,7 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
[Constructible]
|
||||
public SOS() : this(Map.Trammel)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SOS(Map map) : this(map, MessageInABottle.GetRandomLevel())
|
||||
public SOS(Map map = null) : this(map, MessageInABottle.GetRandomLevel())
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -68,7 +63,7 @@ namespace Server.Items
|
|||
|
||||
m_Level = level;
|
||||
MessageIndex = Utility.Random(MessageEntry.Entries.Length);
|
||||
TargetMap = map;
|
||||
TargetMap = map ?? Map.Trammel;
|
||||
TargetLocation = FindLocation(TargetMap);
|
||||
|
||||
UpdateHue();
|
||||
|
|
@ -276,10 +271,10 @@ namespace Server.Items
|
|||
* The message gives the ship's last known sextant co-ordinates.
|
||||
*/
|
||||
|
||||
AddHtml(35, 240, 230, 20, fmt, false, false);
|
||||
AddHtml(35, 240, 230, 20, fmt);
|
||||
|
||||
AddButton(35, 265, 4005, 4007, 0, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(70, 265, 100, 20, 1011036, false, false); // OKAY
|
||||
AddButton(35, 265, 4005, 4007, 0);
|
||||
AddHtmlLocalized(70, 265, 100, 20, 1011036); // OKAY
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -328,4 +323,4 @@ namespace Server.Items
|
|||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,11 +20,7 @@ namespace Server.Items
|
|||
private ToolQuality m_Quality;
|
||||
private int m_UsesRemaining;
|
||||
|
||||
public BaseHarvestTool(int itemID) : this(50, itemID)
|
||||
{
|
||||
}
|
||||
|
||||
public BaseHarvestTool(int usesRemaining, int itemID) : base(itemID)
|
||||
public BaseHarvestTool(int itemID, int usesRemaining = 50) : base(itemID)
|
||||
{
|
||||
m_UsesRemaining = usesRemaining;
|
||||
m_Quality = ToolQuality.Regular;
|
||||
|
|
@ -257,4 +253,4 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,12 +5,7 @@ namespace Server.Items
|
|||
public class Shovel : BaseHarvestTool
|
||||
{
|
||||
[Constructible]
|
||||
public Shovel() : this(50)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Shovel(int uses) : base(uses, 0xF39)
|
||||
public Shovel(int uses = 50) : base(0xF39, uses)
|
||||
{
|
||||
Weight = 5.0;
|
||||
}
|
||||
|
|
@ -35,4 +30,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,12 +5,7 @@ namespace Server.Items
|
|||
public class SturdyPickaxe : BaseAxe, IUsesRemaining
|
||||
{
|
||||
[Constructible]
|
||||
public SturdyPickaxe() : this(180)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SturdyPickaxe(int uses) : base(0xE86)
|
||||
public SturdyPickaxe(int uses = 180) : base(0xE86)
|
||||
{
|
||||
Weight = 11.0;
|
||||
Hue = 0x973;
|
||||
|
|
@ -55,4 +50,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,12 +5,7 @@ namespace Server.Items
|
|||
public class SturdyShovel : BaseHarvestTool
|
||||
{
|
||||
[Constructible]
|
||||
public SturdyShovel() : this(180)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SturdyShovel(int uses) : base(uses, 0xF39)
|
||||
public SturdyShovel(int uses = 180) : base(0xF39, uses)
|
||||
{
|
||||
Weight = 5.0;
|
||||
Hue = 0x973;
|
||||
|
|
@ -37,4 +32,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,7 @@ namespace Server.Items
|
|||
private CraftResource m_Resource;
|
||||
|
||||
[Constructible]
|
||||
public Log() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Log(int amount) : this(CraftResource.RegularWood, amount)
|
||||
public Log(int amount = 1) : this(CraftResource.RegularWood, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -125,12 +120,7 @@ namespace Server.Items
|
|||
public class HeartwoodLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public HeartwoodLog() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public HeartwoodLog(int amount)
|
||||
public HeartwoodLog(int amount = 1)
|
||||
: base(CraftResource.Heartwood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -165,13 +155,7 @@ namespace Server.Items
|
|||
public class BloodwoodLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public BloodwoodLog()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public BloodwoodLog(int amount)
|
||||
public BloodwoodLog(int amount = 1)
|
||||
: base(CraftResource.Bloodwood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -207,13 +191,7 @@ namespace Server.Items
|
|||
public class FrostwoodLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public FrostwoodLog()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public FrostwoodLog(int amount)
|
||||
public FrostwoodLog(int amount = 1)
|
||||
: base(CraftResource.Frostwood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -249,13 +227,7 @@ namespace Server.Items
|
|||
public class OakLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public OakLog()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public OakLog(int amount)
|
||||
public OakLog(int amount = 1)
|
||||
: base(CraftResource.OakWood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -291,13 +263,7 @@ namespace Server.Items
|
|||
public class AshLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public AshLog()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public AshLog(int amount)
|
||||
public AshLog(int amount = 1)
|
||||
: base(CraftResource.AshWood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -333,13 +299,7 @@ namespace Server.Items
|
|||
public class YewLog : Log
|
||||
{
|
||||
[Constructible]
|
||||
public YewLog()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public YewLog(int amount)
|
||||
public YewLog(int amount = 1)
|
||||
: base(CraftResource.YewWood, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -371,4 +331,4 @@ namespace Server.Items
|
|||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class BookOfBushido : Spellbook
|
||||
{
|
||||
[Constructible]
|
||||
public BookOfBushido() : this((ulong)0x3F)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public BookOfBushido(ulong content) : base(content, 0x238C)
|
||||
public BookOfBushido(ulong content = 0x3F) : base(content, 0x238C)
|
||||
{
|
||||
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
|
||||
}
|
||||
|
|
@ -38,4 +33,4 @@ namespace Server.Items
|
|||
Layer = Layer.OneHanded;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class BookOfChivalry : Spellbook
|
||||
{
|
||||
[Constructible]
|
||||
public BookOfChivalry() : this((ulong)0x3FF)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public BookOfChivalry(ulong content) : base(content, 0x2252)
|
||||
public BookOfChivalry(ulong content = 0x3FF) : base(content, 0x2252)
|
||||
{
|
||||
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
|
||||
}
|
||||
|
|
@ -38,4 +33,4 @@ namespace Server.Items
|
|||
Layer = Layer.OneHanded;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class BookOfNinjitsu : Spellbook
|
||||
{
|
||||
[Constructible]
|
||||
public BookOfNinjitsu() : this((ulong)0xFF)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public BookOfNinjitsu(ulong content) : base(content, 0x23A0)
|
||||
public BookOfNinjitsu(ulong content = 0xFF) : base(content, 0x23A0)
|
||||
{
|
||||
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
|
||||
}
|
||||
|
|
@ -38,4 +33,4 @@ namespace Server.Items
|
|||
Layer = Layer.OneHanded;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class BlankScroll : Item, ICommodity
|
||||
{
|
||||
[Constructible]
|
||||
public BlankScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public BlankScroll(int amount) : base(0xEF3)
|
||||
public BlankScroll(int amount = 1) : base(0xEF3)
|
||||
{
|
||||
Stackable = true;
|
||||
Weight = 1.0;
|
||||
|
|
@ -36,4 +31,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class Bottle : Item, ICommodity
|
||||
{
|
||||
[Constructible]
|
||||
public Bottle() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Bottle(int amount) : base(0xF0E)
|
||||
public Bottle(int amount = 1) : base(0xF0E)
|
||||
{
|
||||
Stackable = true;
|
||||
Weight = 1.0;
|
||||
|
|
@ -37,4 +32,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,26 +11,22 @@ namespace Server.Items
|
|||
[DispellableField]
|
||||
public class Moongate : Item
|
||||
{
|
||||
|
||||
[Constructible]
|
||||
public Moongate() : this(Point3D.Zero, null)
|
||||
public Moongate(bool dispellable = true) :
|
||||
this(Point3D.Zero, null, dispellable)
|
||||
{
|
||||
Dispellable = true;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Moongate(bool bDispellable) : this(Point3D.Zero, null)
|
||||
{
|
||||
Dispellable = bDispellable;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Moongate(Point3D target, Map targetMap) : base(0xF6C)
|
||||
public Moongate(Point3D target, Map targetMap = null, bool dispellable = true) : base(0xF6C)
|
||||
{
|
||||
Movable = false;
|
||||
Light = LightType.Circle300;
|
||||
|
||||
Target = target;
|
||||
TargetMap = targetMap;
|
||||
Dispellable = dispellable;
|
||||
}
|
||||
|
||||
public Moongate(Serial serial) : base(serial)
|
||||
|
|
@ -202,12 +198,7 @@ namespace Server.Items
|
|||
|
||||
public static bool IsInTown(Point3D p, Map map)
|
||||
{
|
||||
if (map == null)
|
||||
return false;
|
||||
|
||||
GuardedRegion reg = Region.Find(p, map).GetRegion<GuardedRegion>();
|
||||
|
||||
return reg != null && !reg.IsDisabled();
|
||||
return map != null && Region.Find(p, map).GetRegion<GuardedRegion>()?.IsDisabled() == false;
|
||||
}
|
||||
|
||||
private class DelayTimer : Timer
|
||||
|
|
@ -233,12 +224,12 @@ namespace Server.Items
|
|||
public class ConfirmationMoongate : Moongate
|
||||
{
|
||||
[Constructible]
|
||||
public ConfirmationMoongate() : this(Point3D.Zero, null)
|
||||
public ConfirmationMoongate() : this(Point3D.Zero)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public ConfirmationMoongate(Point3D target, Map targetMap) : base(target, targetMap)
|
||||
public ConfirmationMoongate(Point3D target, Map targetMap = null) : base(target, targetMap)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -354,7 +345,7 @@ namespace Server.Items
|
|||
AddImageTiled(10, 10, 400, 20, 2624);
|
||||
AddAlphaRegion(10, 10, 400, 20);
|
||||
|
||||
AddHtmlLocalized(10, 10, 400, 20, 1062051, 30720, false, false); // Gate Warning
|
||||
AddHtmlLocalized(10, 10, 400, 20, 1062051, 30720); // Gate Warning
|
||||
|
||||
AddImageTiled(10, 40, 400, 200, 2624);
|
||||
AddAlphaRegion(10, 40, 400, 200);
|
||||
|
|
@ -369,11 +360,11 @@ namespace Server.Items
|
|||
AddImageTiled(10, 250, 400, 20, 2624);
|
||||
AddAlphaRegion(10, 250, 400, 20);
|
||||
|
||||
AddButton(10, 250, 4005, 4007, 1, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(40, 250, 170, 20, 1011036, 32767, false, false); // OKAY
|
||||
AddButton(10, 250, 4005, 4007, 1);
|
||||
AddHtmlLocalized(40, 250, 170, 20, 1011036, 32767); // OKAY
|
||||
|
||||
AddButton(210, 250, 4005, 4007, 0, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(240, 250, 170, 20, 1011012, 32767, false, false); // CANCEL
|
||||
AddButton(210, 250, 4005, 4007, 0);
|
||||
AddHtmlLocalized(240, 250, 170, 20, 1011012, 32767); // CANCEL
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -383,14 +374,13 @@ namespace Server.Items
|
|||
AddBackground(10, 10, 400, 380, 3000);
|
||||
|
||||
AddHtml(20, 40, 380, 60,
|
||||
@"Dost thou wish to step into the moongate? Continue to enter the gate, Cancel to stay here", false,
|
||||
false);
|
||||
@"Dost thou wish to step into the moongate? Continue to enter the gate, Cancel to stay here");
|
||||
|
||||
AddHtmlLocalized(55, 110, 290, 20, 1011012, false, false); // CANCEL
|
||||
AddButton(20, 110, 4005, 4007, 0, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(55, 110, 290, 20, 1011012); // CANCEL
|
||||
AddButton(20, 110, 4005, 4007, 0);
|
||||
|
||||
AddHtmlLocalized(55, 140, 290, 40, 1011011, false, false); // CONTINUE
|
||||
AddButton(20, 140, 4005, 4007, 1, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(55, 140, 290, 40, 1011011); // CONTINUE
|
||||
AddButton(20, 140, 4005, 4007, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -400,4 +390,4 @@ namespace Server.Items
|
|||
m_Gate.EndConfirmation(m_From);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ namespace Server.Items
|
|||
{
|
||||
Container pack = from.Backpack;
|
||||
|
||||
if (pack != null && pack.ConsumeTotal(typeof(Bottle), 1))
|
||||
if (pack?.ConsumeTotal(typeof(Bottle)) == true)
|
||||
{
|
||||
from.SendLocalizedMessage(502242); // You pour some of the keg's contents into an empty bottle...
|
||||
|
||||
|
|
@ -284,7 +284,7 @@ namespace Server.Items
|
|||
|
||||
Bottle bottle = new Bottle(amount);
|
||||
|
||||
if (pack == null || !pack.TryDropItem(m, bottle, false))
|
||||
if (pack?.TryDropItem(m, bottle, false) != true)
|
||||
{
|
||||
bottle.Delete();
|
||||
return false;
|
||||
|
|
@ -339,4 +339,4 @@ namespace Server.Items
|
|||
TileData.ItemTable[0x1940].Height = 4;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace Server.Items
|
|||
{
|
||||
get
|
||||
{
|
||||
if (m_House != null && m_House.Deleted)
|
||||
if (m_House?.Deleted == true)
|
||||
House = null;
|
||||
|
||||
return m_House;
|
||||
|
|
@ -90,7 +90,7 @@ namespace Server.Items
|
|||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
if (m_House != null && !m_House.Deleted)
|
||||
if (m_House?.Deleted == false)
|
||||
{
|
||||
writer.Write(1); // version
|
||||
|
||||
|
|
@ -184,7 +184,7 @@ namespace Server.Items
|
|||
|
||||
Map map = m_House.Map;
|
||||
|
||||
if (map != null && !map.CanFit(x, y, z, 16, false, false))
|
||||
if (map?.CanFit(x, y, z, 16, false, false) == false)
|
||||
z = map.GetAverageZ(x, y);
|
||||
|
||||
Target = new Point3D(x, y, z);
|
||||
|
|
@ -305,4 +305,4 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@
|
|||
public class MysticSpellbook : Spellbook
|
||||
{
|
||||
[Constructible]
|
||||
public MysticSpellbook()
|
||||
: this((ulong)0)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public MysticSpellbook(ulong content)
|
||||
public MysticSpellbook(ulong content = 0)
|
||||
: base(content, 0x2D9D)
|
||||
{
|
||||
Layer = Layer.OneHanded;
|
||||
|
|
@ -40,4 +34,4 @@
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class NecromancerSpellbook : Spellbook
|
||||
{
|
||||
[Constructible]
|
||||
public NecromancerSpellbook() : this((ulong)0)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public NecromancerSpellbook(ulong content) : base(content, 0x2253)
|
||||
public NecromancerSpellbook(ulong content = 0) : base(content, 0x2253)
|
||||
{
|
||||
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
|
||||
}
|
||||
|
|
@ -38,4 +33,4 @@ namespace Server.Items
|
|||
Layer = Layer.OneHanded;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ namespace Server.Items
|
|||
|
||||
Amount--;
|
||||
|
||||
if (from.Backpack != null && !from.Backpack.Deleted)
|
||||
if (from.Backpack?.Deleted != false)
|
||||
from.Backpack.DropItem(pot);
|
||||
else
|
||||
pot.MoveToWorld(from.Location, from.Map);
|
||||
|
|
@ -260,4 +260,4 @@ namespace Server.Items
|
|||
base.StackWith(from, potion, playSound);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Server.Spells;
|
||||
using Server.Targeting;
|
||||
|
||||
|
|
@ -260,19 +260,12 @@ namespace Server.Items
|
|||
if (m_Item.Map == null || from == null)
|
||||
return;
|
||||
|
||||
List<Mobile> mobiles = new List<Mobile>();
|
||||
|
||||
foreach (Mobile mobile in m_Item.GetMobilesInRange(0))
|
||||
mobiles.Add(mobile);
|
||||
|
||||
for (int i = 0; i < mobiles.Count; i++)
|
||||
foreach (Mobile m in m_Item.GetMobilesInRange(0))
|
||||
{
|
||||
Mobile m = mobiles[i];
|
||||
|
||||
if (m.Z + 16 > m_Item.Z && m_Item.Z + 12 > m.Z && (!Core.AOS || m != from) &&
|
||||
SpellHelper.ValidIndirectTarget(from, m) && from.CanBeHarmful(m, false))
|
||||
{
|
||||
from?.DoHarmful(m);
|
||||
from.DoHarmful(m);
|
||||
|
||||
AOS.Damage(m, from, m_Item.GetDamage(), 0, 100, 0, 0, 0);
|
||||
m.PlaySound(0x208);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Server.Misc;
|
||||
using Server.Mobiles;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Server.Network;
|
||||
using Server.Spells;
|
||||
using Server.Targeting;
|
||||
|
|
@ -175,22 +176,17 @@ namespace Server.Items
|
|||
alchemyBonus = (int)(from.Skills.Alchemy.Value / (Core.AOS ? 5 : 10));
|
||||
|
||||
IPooledEnumerable<IEntity> eable = map.GetObjectsInRange(loc, ExplosionRange, LeveledExplosion);
|
||||
List<IEntity> toExplode = new List<IEntity>();
|
||||
|
||||
int toDamage = 0;
|
||||
|
||||
foreach (IEntity o in eable)
|
||||
if (o is Mobile mobile && (from == null ||
|
||||
SpellHelper.ValidIndirectTarget(from, mobile) &&
|
||||
from.CanBeHarmful(mobile, false)))
|
||||
{
|
||||
toExplode.Add(mobile);
|
||||
++toDamage;
|
||||
}
|
||||
else if (o is BaseExplosionPotion && o != this)
|
||||
{
|
||||
toExplode.Add(o);
|
||||
}
|
||||
List<IEntity> toExplode = eable.Where(o =>
|
||||
{
|
||||
if (!(o is Mobile mobile) || from != null &&
|
||||
(!SpellHelper.ValidIndirectTarget(from, mobile) || !from.CanBeHarmful(mobile, false)))
|
||||
return o is BaseExplosionPotion && o != this;
|
||||
|
||||
++toDamage;
|
||||
return true;
|
||||
}).ToList();
|
||||
|
||||
eable.Free();
|
||||
|
||||
|
|
@ -199,7 +195,7 @@ namespace Server.Items
|
|||
|
||||
for (int i = 0; i < toExplode.Count; ++i)
|
||||
{
|
||||
object o = toExplode[i];
|
||||
IEntity o = toExplode[i];
|
||||
|
||||
if (o is Mobile m)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Server.Items
|
||||
|
|
|
|||
|
|
@ -19,6 +19,11 @@ namespace Server.Items
|
|||
|
||||
private BookQuality m_Quality;
|
||||
|
||||
[Constructible]
|
||||
public Runebook() : this(Core.SE ? 12 : 6)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Runebook(int maxCharges) : base(Core.AOS ? 0x22C5 : 0xEFA)
|
||||
{
|
||||
|
|
@ -37,11 +42,6 @@ namespace Server.Items
|
|||
Level = SecureLevel.CoOwners;
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Runebook() : this(Core.SE ? 12 : 6)
|
||||
{
|
||||
}
|
||||
|
||||
public Runebook(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
|
@ -289,7 +289,7 @@ namespace Server.Items
|
|||
|
||||
public override void OnSingleClick(Mobile from)
|
||||
{
|
||||
if (m_Description != null && m_Description.Length > 0)
|
||||
if (m_Description?.Length > 0)
|
||||
LabelTo(from, m_Description);
|
||||
|
||||
base.OnSingleClick(from);
|
||||
|
|
@ -349,10 +349,8 @@ namespace Server.Items
|
|||
|
||||
BaseHouse house = BaseHouse.FindHouseAt(this);
|
||||
|
||||
if (house != null && house.IsAosRules && (house.Public ? house.IsBanned(m) : !house.HasAccess(m)))
|
||||
return false;
|
||||
|
||||
return house != null && house.HasSecureAccess(m, Level);
|
||||
return (house?.IsAosRules != true || house.Public && !house.IsBanned(m) || house.HasAccess(m)) &&
|
||||
house?.HasSecureAccess(m, Level) == true;
|
||||
}
|
||||
|
||||
public override bool OnDragDrop(Mobile from, Item dropped)
|
||||
|
|
@ -427,7 +425,7 @@ namespace Server.Items
|
|||
|
||||
public class RunebookEntry
|
||||
{
|
||||
public RunebookEntry(Point3D loc, Map map, string desc, BaseHouse house)
|
||||
public RunebookEntry(Point3D loc, Map map, string desc, BaseHouse house = null)
|
||||
{
|
||||
Location = loc;
|
||||
Map = map;
|
||||
|
|
@ -467,7 +465,7 @@ namespace Server.Items
|
|||
|
||||
public void Serialize(GenericWriter writer)
|
||||
{
|
||||
if (House != null && !House.Deleted)
|
||||
if (House?.Deleted == false)
|
||||
{
|
||||
writer.Write((byte)1); // version
|
||||
|
||||
|
|
@ -483,4 +481,4 @@ namespace Server.Items
|
|||
writer.Write(Description);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class EarthquakeScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public EarthquakeScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public EarthquakeScroll(int amount) : base(56, 0x1F65, amount)
|
||||
public EarthquakeScroll(int amount = 1) : base(56, 0x1F65, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class EnergyVortexScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public EnergyVortexScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public EnergyVortexScroll(int amount) : base(57, 0x1F66, amount)
|
||||
public EnergyVortexScroll(int amount = 1) : base(57, 0x1F66, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class ResurrectionScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public ResurrectionScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public ResurrectionScroll(int amount) : base(58, 0x1F67, amount)
|
||||
public ResurrectionScroll(int amount = 1) : base(58, 0x1F67, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class SummonAirElementalScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public SummonAirElementalScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SummonAirElementalScroll(int amount) : base(59, 0x1F68, amount)
|
||||
public SummonAirElementalScroll(int amount = 1) : base(59, 0x1F68, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class SummonDaemonScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public SummonDaemonScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SummonDaemonScroll(int amount) : base(60, 0x1F69, amount)
|
||||
public SummonDaemonScroll(int amount = 1) : base(60, 0x1F69, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class SummonEarthElementalScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public SummonEarthElementalScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SummonEarthElementalScroll(int amount) : base(61, 0x1F6A, amount)
|
||||
public SummonEarthElementalScroll(int amount = 1) : base(61, 0x1F6A, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class SummonFireElementalScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public SummonFireElementalScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SummonFireElementalScroll(int amount) : base(62, 0x1F6B, amount)
|
||||
public SummonFireElementalScroll(int amount = 1) : base(62, 0x1F6B, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class SummonWaterElementalScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public SummonWaterElementalScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SummonWaterElementalScroll(int amount) : base(63, 0x1F6C, amount)
|
||||
public SummonWaterElementalScroll(int amount = 1) : base(63, 0x1F6C, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class BladeSpiritsScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public BladeSpiritsScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public BladeSpiritsScroll(int amount) : base(32, 0x1F4D, amount)
|
||||
public BladeSpiritsScroll(int amount = 1) : base(32, 0x1F4D, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class DispelFieldScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public DispelFieldScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public DispelFieldScroll(int amount) : base(33, 0x1F4E, amount)
|
||||
public DispelFieldScroll(int amount = 1) : base(33, 0x1F4E, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class IncognitoScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public IncognitoScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public IncognitoScroll(int amount) : base(34, 0x1F4F, amount)
|
||||
public IncognitoScroll(int amount = 1) : base(34, 0x1F4F, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class MagicReflectScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public MagicReflectScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public MagicReflectScroll(int amount) : base(35, 0x1F50, amount)
|
||||
public MagicReflectScroll(int amount = 1) : base(35, 0x1F50, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class MindBlastScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public MindBlastScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public MindBlastScroll(int amount) : base(36, 0x1F51, amount)
|
||||
public MindBlastScroll(int amount = 1) : base(36, 0x1F51, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class ParalyzeScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public ParalyzeScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public ParalyzeScroll(int amount) : base(37, 0x1F52, amount)
|
||||
public ParalyzeScroll(int amount = 1) : base(37, 0x1F52, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class PoisonFieldScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public PoisonFieldScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public PoisonFieldScroll(int amount) : base(38, 0x1F53, amount)
|
||||
public PoisonFieldScroll(int amount = 1) : base(38, 0x1F53, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class SummonCreatureScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public SummonCreatureScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SummonCreatureScroll(int amount) : base(39, 0x1F54, amount)
|
||||
public SummonCreatureScroll(int amount = 1) : base(39, 0x1F54, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class ClumsyScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public ClumsyScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public ClumsyScroll(int amount) : base(0, 0x1F2E, amount)
|
||||
public ClumsyScroll(int amount = 1) : base(0, 0x1F2E, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class CreateFoodScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public CreateFoodScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public CreateFoodScroll(int amount) : base(1, 0x1F2F, amount)
|
||||
public CreateFoodScroll(int amount = 1) : base(1, 0x1F2F, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class FeeblemindScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public FeeblemindScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public FeeblemindScroll(int amount) : base(2, 0x1F30, amount)
|
||||
public FeeblemindScroll(int amount = 1) : base(2, 0x1F30, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class HealScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public HealScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public HealScroll(int amount) : base(3, 0x1F31, amount)
|
||||
public HealScroll(int amount = 1) : base(3, 0x1F31, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class MagicArrowScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public MagicArrowScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public MagicArrowScroll(int amount) : base(4, 0x1F32, amount)
|
||||
public MagicArrowScroll(int amount = 1) : base(4, 0x1F32, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class NightSightScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public NightSightScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public NightSightScroll(int amount) : base(5, 0x1F33, amount)
|
||||
public NightSightScroll(int amount = 1) : base(5, 0x1F33, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class ReactiveArmorScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public ReactiveArmorScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public ReactiveArmorScroll(int amount) : base(6, 0x1F2D, amount)
|
||||
public ReactiveArmorScroll(int amount = 1) : base(6, 0x1F2D, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class WeakenScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public WeakenScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public WeakenScroll(int amount) : base(7, 0x1F34, amount)
|
||||
public WeakenScroll(int amount = 1) : base(7, 0x1F34, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class ArchProtectionScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public ArchProtectionScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public ArchProtectionScroll(int amount) : base(25, 0x1F46, amount)
|
||||
public ArchProtectionScroll(int amount = 1) : base(25, 0x1F46, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class ArchCureScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public ArchCureScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public ArchCureScroll(int amount) : base(24, 0x1F45, amount)
|
||||
public ArchCureScroll(int amount = 1) : base(24, 0x1F45, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class CurseScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public CurseScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public CurseScroll(int amount) : base(26, 0x1F47, amount)
|
||||
public CurseScroll(int amount = 1) : base(26, 0x1F47, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class FireFieldScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public FireFieldScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public FireFieldScroll(int amount) : base(27, 0x1F48, amount)
|
||||
public FireFieldScroll(int amount = 1) : base(27, 0x1F48, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class GreaterHealScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public GreaterHealScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public GreaterHealScroll(int amount) : base(28, 0x1F49, amount)
|
||||
public GreaterHealScroll(int amount = 1) : base(28, 0x1F49, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class LightningScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public LightningScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public LightningScroll(int amount) : base(29, 0x1F4A, amount)
|
||||
public LightningScroll(int amount = 1) : base(29, 0x1F4A, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class ManaDrainScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public ManaDrainScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public ManaDrainScroll(int amount) : base(30, 0x1F4B, amount)
|
||||
public ManaDrainScroll(int amount = 1) : base(30, 0x1F4B, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class RecallScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public RecallScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public RecallScroll(int amount) : base(31, 0x1F4C, amount)
|
||||
public RecallScroll(int amount = 1) : base(31, 0x1F4C, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class AnimatedWeaponScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public AnimatedWeaponScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public AnimatedWeaponScroll(int amount)
|
||||
public AnimatedWeaponScroll(int amount = 1)
|
||||
: base(683, 0x2DA4, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class BombardScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public BombardScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public BombardScroll(int amount)
|
||||
public BombardScroll(int amount = 1)
|
||||
: base(688, 0x2DA9, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class CleansingWindsScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public CleansingWindsScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public CleansingWindsScroll(int amount)
|
||||
public CleansingWindsScroll(int amount = 1)
|
||||
: base(687, 0x2DA8, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class EagleStrikeScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public EagleStrikeScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public EagleStrikeScroll(int amount)
|
||||
public EagleStrikeScroll(int amount = 1)
|
||||
: base(682, 0x2DA3, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class EnchantScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public EnchantScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public EnchantScroll(int amount)
|
||||
public EnchantScroll(int amount = 1)
|
||||
: base(680, 0x2DA1, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class HailStormScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public HailStormScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public HailStormScroll(int amount)
|
||||
public HailStormScroll(int amount = 1)
|
||||
: base(690, 0x2DAB, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class HealingStoneScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public HealingStoneScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public HealingStoneScroll(int amount)
|
||||
public HealingStoneScroll(int amount = 1)
|
||||
: base(678, 0x2D9F, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class MassSleepScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public MassSleepScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public MassSleepScroll(int amount)
|
||||
public MassSleepScroll(int amount = 1)
|
||||
: base(686, 0x2DA7, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class NetherBoltScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public NetherBoltScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public NetherBoltScroll(int amount)
|
||||
public NetherBoltScroll(int amount = 1)
|
||||
: base(677, 0x2D9E, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class NetherCycloneScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public NetherCycloneScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public NetherCycloneScroll(int amount)
|
||||
public NetherCycloneScroll(int amount = 1)
|
||||
: base(691, 0x2DAC, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class PurgeMagicScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public PurgeMagicScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public PurgeMagicScroll(int amount)
|
||||
public PurgeMagicScroll(int amount = 1)
|
||||
: base(679, 0x2DA0, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class RisingColossusScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public RisingColossusScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public RisingColossusScroll(int amount)
|
||||
public RisingColossusScroll(int amount = 1)
|
||||
: base(692, 0x2DAD, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class SleepScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public SleepScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SleepScroll(int amount)
|
||||
public SleepScroll(int amount = 1)
|
||||
: base(681, 0x2DA2, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class SpellPlagueScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public SpellPlagueScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SpellPlagueScroll(int amount)
|
||||
public SpellPlagueScroll(int amount = 1)
|
||||
: base(689, 0x2DAA, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class SpellTriggerScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public SpellTriggerScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SpellTriggerScroll(int amount)
|
||||
public SpellTriggerScroll(int amount = 1)
|
||||
: base(685, 0x2DA6, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ namespace Server.Items
|
|||
public class StoneFormScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public StoneFormScroll()
|
||||
: this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public StoneFormScroll(int amount)
|
||||
public StoneFormScroll(int amount = 1)
|
||||
: base(684, 0x2DA5, amount)
|
||||
{
|
||||
}
|
||||
|
|
@ -34,4 +28,4 @@ namespace Server.Items
|
|||
reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class AnimateDeadScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public AnimateDeadScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public AnimateDeadScroll(int amount) : base(100, 0x2260, amount)
|
||||
public AnimateDeadScroll(int amount = 1) : base(100, 0x2260, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class BloodOathScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public BloodOathScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public BloodOathScroll(int amount) : base(101, 0x2261, amount)
|
||||
public BloodOathScroll(int amount = 1) : base(101, 0x2261, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class CorpseSkinScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public CorpseSkinScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public CorpseSkinScroll(int amount) : base(102, 0x2262, amount)
|
||||
public CorpseSkinScroll(int amount = 1) : base(102, 0x2262, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class CurseWeaponScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public CurseWeaponScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public CurseWeaponScroll(int amount) : base(103, 0x2263, amount)
|
||||
public CurseWeaponScroll(int amount = 1) : base(103, 0x2263, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class EvilOmenScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public EvilOmenScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public EvilOmenScroll(int amount) : base(104, 0x2264, amount)
|
||||
public EvilOmenScroll(int amount = 1) : base(104, 0x2264, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class ExorcismScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public ExorcismScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public ExorcismScroll(int amount) : base(116, 0x2270, amount)
|
||||
public ExorcismScroll(int amount = 1) : base(116, 0x2270, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class HorrificBeastScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public HorrificBeastScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public HorrificBeastScroll(int amount) : base(105, 0x2265, amount)
|
||||
public HorrificBeastScroll(int amount = 1) : base(105, 0x2265, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class LichFormScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public LichFormScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public LichFormScroll(int amount) : base(106, 0x2266, amount)
|
||||
public LichFormScroll(int amount = 1) : base(106, 0x2266, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class MindRotScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public MindRotScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public MindRotScroll(int amount) : base(107, 0x2267, amount)
|
||||
public MindRotScroll(int amount = 1) : base(107, 0x2267, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class PainSpikeScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public PainSpikeScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public PainSpikeScroll(int amount) : base(108, 0x2268, amount)
|
||||
public PainSpikeScroll(int amount = 1) : base(108, 0x2268, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class PoisonStrikeScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public PoisonStrikeScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public PoisonStrikeScroll(int amount) : base(109, 0x2269, amount)
|
||||
public PoisonStrikeScroll(int amount = 1) : base(109, 0x2269, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class StrangleScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public StrangleScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public StrangleScroll(int amount) : base(110, 0x226A, amount)
|
||||
public StrangleScroll(int amount = 1) : base(110, 0x226A, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class SummonFamiliarScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public SummonFamiliarScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public SummonFamiliarScroll(int amount) : base(111, 0x226B, amount)
|
||||
public SummonFamiliarScroll(int amount = 1) : base(111, 0x226B, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class VampiricEmbraceScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public VampiricEmbraceScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public VampiricEmbraceScroll(int amount) : base(112, 0x226C, amount)
|
||||
public VampiricEmbraceScroll(int amount = 1) : base(112, 0x226C, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class VengefulSpiritScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public VengefulSpiritScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public VengefulSpiritScroll(int amount) : base(113, 0x226D, amount)
|
||||
public VengefulSpiritScroll(int amount = 1) : base(113, 0x226D, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class WitherScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public WitherScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public WitherScroll(int amount) : base(114, 0x226E, amount)
|
||||
public WitherScroll(int amount = 1) : base(114, 0x226E, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class WraithFormScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public WraithFormScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public WraithFormScroll(int amount) : base(115, 0x226F, amount)
|
||||
public WraithFormScroll(int amount = 1) : base(115, 0x226F, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class AgilityScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public AgilityScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public AgilityScroll(int amount) : base(8, 0x1F35, amount)
|
||||
public AgilityScroll(int amount = 1) : base(8, 0x1F35, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class CunningScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public CunningScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public CunningScroll(int amount) : base(9, 0x1F36, amount)
|
||||
public CunningScroll(int amount = 1) : base(9, 0x1F36, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class CureScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public CureScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public CureScroll(int amount) : base(10, 0x1F37, amount)
|
||||
public CureScroll(int amount = 1) : base(10, 0x1F37, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class HarmScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public HarmScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public HarmScroll(int amount) : base(11, 0x1F38, amount)
|
||||
public HarmScroll(int amount = 1) : base(11, 0x1F38, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class MagicTrapScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public MagicTrapScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public MagicTrapScroll(int amount) : base(12, 0x1F39, amount)
|
||||
public MagicTrapScroll(int amount = 1) : base(12, 0x1F39, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class MagicUnTrapScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public MagicUnTrapScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public MagicUnTrapScroll(int amount) : base(13, 0x1F3A, amount)
|
||||
public MagicUnTrapScroll(int amount = 1) : base(13, 0x1F3A, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class ProtectionScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public ProtectionScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public ProtectionScroll(int amount) : base(14, 0x1F3B, amount)
|
||||
public ProtectionScroll(int amount = 1) : base(14, 0x1F3B, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ namespace Server.Items
|
|||
public class StrengthScroll : SpellScroll
|
||||
{
|
||||
[Constructible]
|
||||
public StrengthScroll() : this(1)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public StrengthScroll(int amount) : base(15, 0x1F3C, amount)
|
||||
public StrengthScroll(int amount = 1) : base(15, 0x1F3C, amount)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -30,4 +25,4 @@ namespace Server.Items
|
|||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue