Skip to content

Commit

Permalink
Merge branch 'BugFixes' of https://github.com/kevin-10/ServUO into Bu…
Browse files Browse the repository at this point in the history 
…gFixes
  • Loading branch information
@kevin-10
kevin-10 committed Jan 17, 2019
2 parents fd1833e + 1d311a9 commit 48caa73
Show file tree
Hide file tree
Showing 26 changed files with 1,613 additions and 26 deletions.
119 changes: 119 additions & 0 deletions Scripts/Items/Addons/BuffetTable.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
using System;
using Server.Gumps;

namespace Server.Items
{
public class BuffetTableAddon : BaseAddon
{
[Constructable]
public BuffetTableAddon(DirectionType type)
{
switch (type)
{
case DirectionType.South:
AddComponent(new AddonComponent(40269), 0, 0, 0);
AddComponent(new AddonComponent(40270), 0, 1, 0);
AddComponent(new AddonComponent(40271), 1, 0, 0);
AddComponent(new AddonComponent(40272), 1, 1, 0);
AddComponent(new AddonComponent(40273), 2, 0, 0);
AddComponent(new AddonComponent(40274), 2, 1, 0);
AddComponent(new AddonComponent(40265), -2, 0, 0);
AddComponent(new AddonComponent(40266), -2, 1, 0);
AddComponent(new AddonComponent(40267), -1, 0, 0);
AddComponent(new AddonComponent(40268), -1, 1, 0);
break;
case DirectionType.East:
AddComponent(new AddonComponent(40264), 1, 2, 0);
AddComponent(new AddonComponent(40263), 0, 2, 0);
AddComponent(new AddonComponent(40262), 1, 1, 0);
AddComponent(new AddonComponent(40261), 0, 1, 0);
AddComponent(new AddonComponent(40260), 1, 0, 0);
AddComponent(new AddonComponent(40259), 0, 0, 0);
AddComponent(new AddonComponent(40258), 1, -1, 0);
AddComponent(new AddonComponent(40257), 0, -1, 0);
AddComponent(new AddonComponent(40256), 1, -2, 0);
AddComponent(new AddonComponent(40255), 0, -2, 0);
break;
}
}

public BuffetTableAddon(Serial serial)
: base(serial)
{
}

public override BaseAddonDeed Deed { get { return new BuffetTableDeed(); } }

public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write((int)0);
}

public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}

public class BuffetTableDeed : BaseAddonDeed, IRewardOption
{
public override int LabelNumber { get { return 1157068; } } // Buffet Table

public override BaseAddon Addon { get { return new BuffetTableAddon(_Direction); } }

private DirectionType _Direction;

[Constructable]
public BuffetTableDeed()
: base()
{
LootType = LootType.Blessed;
}

public BuffetTableDeed(Serial serial)
: base(serial)
{
}

public void GetOptions(RewardOptionList list)
{
list.Add((int)DirectionType.South, 1075386); // South
list.Add((int)DirectionType.East, 1075387); // East
}

public void OnOptionSelected(Mobile from, int choice)
{
_Direction = (DirectionType)choice;

if (!Deleted)
base.OnDoubleClick(from);
}

public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
{
from.CloseGump(typeof(AddonOptionGump));
from.SendGump(new AddonOptionGump(this, 1154194)); // Choose a Facing:
}
else
{
from.SendLocalizedMessage(1062334); // This item must be in your backpack to be used.
}
}

public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write((int)0);
}

public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}
96 changes: 96 additions & 0 deletions Scripts/Items/Addons/CodexOfVirtue.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
using System;

namespace Server.Items
{
public class CodexOfVirtueAddon : BaseAddon
{
[Constructable]
public CodexOfVirtueAddon()
{
AddComponent(new AddonComponent(16637), 3, 3, 0);
AddComponent(new AddonComponent(16636), 2, 3, 0);
AddComponent(new AddonComponent(16635), 1, 3, 0);
AddComponent(new AddonComponent(16634), 0, 3, 0);
AddComponent(new AddonComponent(16633), -1, 3, 0);
AddComponent(new AddonComponent(16632), -2, 3, 0);
AddComponent(new AddonComponent(16631), 3, 2, 0);
AddComponent(new AddonComponent(16630), 2, 2, 0);
AddComponent(new AddonComponent(16629), 1, 2, 0);
AddComponent(new AddonComponent(16628), 0, 2, 0);
AddComponent(new AddonComponent(16627), -1, 2, 0);
AddComponent(new AddonComponent(16626), -2, 2, 0);
AddComponent(new AddonComponent(16625), 3, 1, 0);
AddComponent(new AddonComponent(16624), 2, 1, 0);
AddComponent(new AddonComponent(16623), 1, 1, 0);
AddComponent(new AddonComponent(16622), 0, 1, 0);
AddComponent(new AddonComponent(16621), -1, 1, 0);
AddComponent(new AddonComponent(16620), -2, 1, 0);
AddComponent(new AddonComponent(16619), 3, 0, 0);
AddComponent(new AddonComponent(16618), 2, 0, 0);
AddComponent(new AddonComponent(16617), 1, 0, 0);
AddComponent(new AddonComponent(16616), 0, 0, 0);
AddComponent(new AddonComponent(16615), -1, 0, 0);
AddComponent(new AddonComponent(16614), -2, 0, 0);
AddComponent(new AddonComponent(16613), 3, -1, 0);
AddComponent(new AddonComponent(16612), 2, -1, 0);
AddComponent(new AddonComponent(16611), 1, -1, 0);
AddComponent(new AddonComponent(16610), 0, -1, 0);
AddComponent(new AddonComponent(16609), -1, -1, 0);
AddComponent(new AddonComponent(16608), -2, -1, 0);
AddComponent(new AddonComponent(16607), 3, -2, 0);
AddComponent(new AddonComponent(16606), 2, -2, 0);
AddComponent(new AddonComponent(16605), 1, -2, 0);
AddComponent(new AddonComponent(16604), 0, -2, 0);
AddComponent(new AddonComponent(16603), -1, -2, 0);
AddComponent(new AddonComponent(16602), -2, -2, 0);
}

public CodexOfVirtueAddon(Serial serial)
: base(serial)
{
}

public override BaseAddonDeed Deed { get { return new CodexOfVirtueDeed(); } }

public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write((int)0); // version
}

public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}

public class CodexOfVirtueDeed : BaseAddonDeed
{
public override int LabelNumber { get { return 1113919; } }// a Codex of Virtue deed

[Constructable]
public CodexOfVirtueDeed()
{
}

public CodexOfVirtueDeed(Serial serial)
: base(serial)
{
}

public override BaseAddon Addon { get { return new CodexOfVirtueAddon(); } }

public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write((int)0); // version
}

public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}
123 changes: 123 additions & 0 deletions Scripts/Items/Addons/FormalDiningTable.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
using System;
using Server.Gumps;

namespace Server.Items
{
public class FormalDiningTableAddon : BaseAddon
{
[Constructable]
public FormalDiningTableAddon(DirectionType type)
{
switch (type)
{
case DirectionType.South:
AddComponent(new AddonComponent(40318), 3, 1, 0);
AddComponent(new AddonComponent(40317), 3, 0, 0);
AddComponent(new AddonComponent(40316), 2, 1, 0);
AddComponent(new AddonComponent(40315), 2, 0, 0);
AddComponent(new AddonComponent(40314), 1, 1, 0);
AddComponent(new AddonComponent(40313), 1, 0, 0);
AddComponent(new AddonComponent(40312), 0, 1, 0);
AddComponent(new AddonComponent(40311), 0, 0, 0);
AddComponent(new AddonComponent(40310), -1, 1, 0);
AddComponent(new AddonComponent(40309), -1, 0, 0);
AddComponent(new AddonComponent(40308), -2, 1, 0);
AddComponent(new AddonComponent(40307), -2, 0, 0);
break;
case DirectionType.East:
AddComponent(new AddonComponent(40306), 1, 3, 0);
AddComponent(new AddonComponent(40305), 0, 3, 0);
AddComponent(new AddonComponent(40304), 1, 2, 0);
AddComponent(new AddonComponent(40303), 0, 2, 0);
AddComponent(new AddonComponent(40302), 1, 1, 0);
AddComponent(new AddonComponent(40301), 0, 1, 0);
AddComponent(new AddonComponent(40300), 1, 0, 0);
AddComponent(new AddonComponent(40299), 0, 0, 0);
AddComponent(new AddonComponent(40298), 1, -1, 0);
AddComponent(new AddonComponent(40297), 0, -1, 0);
AddComponent(new AddonComponent(40295), 0, -2, 0);
AddComponent(new AddonComponent(40296), 1, -2, 0);
break;
}
}

public FormalDiningTableAddon(Serial serial)
: base(serial)
{
}

public override BaseAddonDeed Deed { get { return new FormalDiningTableDeed(); } }

public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write((int)0);
}

public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}

public class FormalDiningTableDeed : BaseAddonDeed, IRewardOption
{
public override int LabelNumber { get { return 1157069; } } // Formal Dining Table

public override BaseAddon Addon { get { return new FormalDiningTableAddon(_Direction); } }

private DirectionType _Direction;

[Constructable]
public FormalDiningTableDeed()
: base()
{
LootType = LootType.Blessed;
}

public FormalDiningTableDeed(Serial serial)
: base(serial)
{
}

public void GetOptions(RewardOptionList list)
{
list.Add((int)DirectionType.South, 1075386); // South
list.Add((int)DirectionType.East, 1075387); // East
}

public void OnOptionSelected(Mobile from, int choice)
{
_Direction = (DirectionType)choice;

if (!Deleted)
base.OnDoubleClick(from);
}

public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
{
from.CloseGump(typeof(AddonOptionGump));
from.SendGump(new AddonOptionGump(this, 1154194)); // Choose a Facing:
}
else
{
from.SendLocalizedMessage(1062334); // This item must be in your backpack to be used.
}
}

public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write((int)0);
}

public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}
2 changes: 1 addition & 1 deletion Scripts/Items/Books/SpecialScrollBooks/RecipeBook/RecipeBook.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public class RecipeBook : Item, ISecurable
new RecipeScrollDefinition(141, 356, Expansion.SA, RecipeSkillName.Blacksmith),
new RecipeScrollDefinition(142, 585, Expansion.ML, RecipeSkillName.Tailoring),
new RecipeScrollDefinition(143, 456, Expansion.SA, RecipeSkillName.Tinkering),
//new RecipeScrollDefinition(144, 205, Expansion.SA, RecipeSkillName.Tinkering), // Enchanted picnic basket
new RecipeScrollDefinition(144, 464, Expansion.SA, RecipeSkillName.Tinkering),
//new RecipeScrollDefinition(145, 205, Expansion.ML, RecipeSkillName.Tinkering), // telescope
new RecipeScrollDefinition(146, 605, Expansion.ML, RecipeSkillName.Cooking),
new RecipeScrollDefinition(147, 606, Expansion.ML, RecipeSkillName.Cooking),
Expand Down
Loading

0 comments on commit 48caa73

Please sign in to comment.