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

14
Projects/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs
View file

@ -7,6 +7,16 @@ using Server.Network;
namespace Server.Items
{
public sealed class StopMusic : Packet
{
public static readonly Packet Instance = SetStatic(new StopMusic());
public StopMusic() : base(0x6D, 3)
{
m_Stream.Write((short)0x1FFF);
}
}
[Flippable(0x2AF9, 0x2AFD)]
public class DawnsMusicBox : Item, ISecurable
{
@ -148,7 +158,7 @@ namespace Server.Items
else
m_ItemID = ItemID;
Packets.SendPlayMusic(m.NetState, music);
m.Send(new PlayMusic(music));
m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(0.5), TimeSpan.FromSeconds(0.5), 4, Animate);
}
@ -157,7 +167,7 @@ namespace Server.Items
if (m_Timer?.Running == true)
m_Timer.Stop();
Packets.SendStopMusic(m.NetState);
m.Send(StopMusic.Instance);
if (m_Count > 0)
ItemID = m_ItemID;

2
Projects/Scripts/Items/Special/Evil Home Decor Collection/SacrificialAltar.cs
View file

@ -108,7 +108,7 @@ namespace Server.Items
Point3D location = Location;
location.Z += 10;
Effects.SendLocationEffect(location, Map, 0x3709, 10, 10, 0x356);
Effects.SendLocationEffect(location, Map, 0x3709, 10, 10, 0x356, 0);
Effects.PlaySound(location, Map, 0x32E);
if (Items.Count > 0)

27
Projects/Scripts/Items/Special/House Raffle/HouseRaffleStone.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using Server.Accounting;
@ -291,9 +290,22 @@ namespace Server.Items
}
}
private bool HasEntered(Mobile from) =>
from.Account is Account acc &&
(from entry in Entries select entry.From?.Account as Account).Any(entryAcc => entryAcc == acc);
private bool HasEntered(Mobile from)
{
if (!(from.Account is Account acc))
return false;
foreach (RaffleEntry entry in Entries)
if (entry.From != null)
{
Account entryAcc = entry.From.Account as Account;
if (entryAcc == acc)
return true;
}
return false;
}
private bool IsAtIPLimit(Mobile from)
{
@ -303,7 +315,12 @@ namespace Server.Items
IPAddress address = from.NetState.Address;
int tickets = 0;
return Entries.Where(entry => Utility.IPMatchClassC(entry.Address, address)).Any(entry => ++tickets >= EntryLimitPerIP);
foreach (RaffleEntry entry in Entries)
if (Utility.IPMatchClassC(entry.Address, address))
if (++tickets >= EntryLimitPerIP)
return true;
return false;
}
public static string FormatLocation(Point3D loc, Map map, bool displayMap)

30
Projects/Scripts/Items/Special/Solen Items/BagOfSending.cs
View file

@ -219,34 +219,54 @@ namespace Server.Items
return;
if (from.Region.IsPartOf<Jail>())
{
from.SendMessage("You may not do that in jail.");
}
else if (!m_Bag.IsChildOf(from.Backpack))
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054107,
0x59); // This item must be in your backpack.
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1062334,
0x59); // The bag of sending must be in your backpack. 1054107 is gone from client, using generic response
}
else if (m_Bag.Charges == 0)
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1042544, 0x59); // This item is out of charges.
}
else if (targeted is Item item)
{
int reqCharges = (int)Math.Max(1, Math.Ceiling(item.TotalWeight / 10.0));
if (!item.IsChildOf(from.Backpack))
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054152,
0x59); // You may only send items from your backpack to your bank box.
}
else if (item is BagOfSending || item is Container)
Packets.SendAsciiMessage(from.NetState, m_Bag.Serial, m_Bag.ItemID, MessageType.Regular, 0x3B2, 3, "",
"You cannot send a container through the bag of sending." );
{
from.Send(new AsciiMessage(m_Bag.Serial, m_Bag.ItemID, MessageType.Regular, 0x3B2, 3, "",
"You cannot send a container through the bag of sending."));
}
else if (item.LootType == LootType.Cursed)
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054108,
0x59); // The bag of sending rejects the cursed item.
}
else if (!item.VerifyMove(from) || item is QuestItem || item.Nontransferable)
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054109,
0x59); // The bag of sending rejects that item.
}
else if (SpellHelper.IsDoomGauntlet(from.Map, from.Location))
{
from.SendLocalizedMessage(1062089); // You cannot use that here.
}
else if (!from.BankBox.TryDropItem(from, item, false))
{
MessageHelper.SendLocalizedMessageTo(m_Bag, from, 1054110, 0x59); // Your bank box is full.
}
else if (Core.ML && reqCharges > m_Bag.Charges)
{
from.SendLocalizedMessage(1079932); //You don't have enough charges to send that much weight
}
else
{
m_Bag.Charges -= Core.ML ? reqCharges : 1;
@ -258,4 +278,4 @@ namespace Server.Items
}
}
}
}
}

18
Projects/Scripts/Items/Special/Solen Items/BallOfSummoning.cs
View file

@ -177,27 +177,41 @@ namespace Server.Items
return;
if (Charges == 0)
{
SendLocalizedMessageTo(from,
1054122); // The Crystal Ball darkens. It must be charged before it can be used again.
}
else if (pet is BaseMount mount && mount.Rider == from)
{
MessageHelper.SendLocalizedMessageTo(this, from, 1054124,
0x36); // The Crystal Ball fills with a yellow mist. Why would you summon your pet while riding it?
}
else if (pet.Map == Map.Internal && (!pet.IsStabled || from.Followers + pet.ControlSlots > from.FollowersMax))
{
MessageHelper.SendLocalizedMessageTo(this, from, 1054125,
0x5); // The Crystal Ball fills with a blue mist. Your pet is not responding to the summons.
}
else if ((!pet.Controlled || pet.ControlMaster != from) && !from.Stabled.Contains(pet))
{
MessageHelper.SendLocalizedMessageTo(this, from, 1054126,
0x8FD); // The Crystal Ball fills with a grey mist. You are not the owner of the pet you are attempting to summon.
}
else if (!pet.IsBonded)
{
MessageHelper.SendLocalizedMessageTo(this, from, 1054127,
0x22); // The Crystal Ball fills with a red mist. You appear to have let your bond to your pet deteriorate.
}
else if (from.Map == Map.Ilshenar || from.Region.IsPartOf<DungeonRegion>() ||
from.Region.IsPartOf<Jail>() || from.Region.IsPartOf<SafeZone>())
Packets.SendAsciiMessage(from.NetState, Serial, ItemID, MessageType.Regular, 0x22, 3, "",
"You cannot summon your pet to this location.");
{
from.Send(new AsciiMessage(Serial, ItemID, MessageType.Regular, 0x22, 3, "",
"You cannot summon your pet to this location."));
}
else if (Core.ML && from is PlayerMobile mobile && DateTime.UtcNow < mobile.LastPetBallTime.AddSeconds(15.0))
{
MessageHelper.SendLocalizedMessageTo(this, mobile, 1080072,
0x22); // You must wait a few seconds before you can summon your pet.
}
else
{
if (Core.ML)

1
Projects/Scripts/Items/Special/Solen Items/BraceletOfBinding.cs
View file

@ -5,6 +5,7 @@ using Server.Factions;
using Server.Misc;
using Server.Mobiles;
using Server.Network;
using Server.Prompts;
using Server.Regions;
using Server.Spells;
using Server.Targeting;

22
Projects/Scripts/Items/Special/Solen Items/MessageHelper.cs Normal file
View file

@ -0,0 +1,22 @@
using Server.Network;
namespace Server
{
public class MessageHelper
{
public static void SendLocalizedMessageTo(Item from, Mobile to, int number, int hue)
{
SendLocalizedMessageTo(from, to, number, "", hue);
}
public static void SendLocalizedMessageTo(Item from, Mobile to, int number, string args, int hue)
{
to.Send(new MessageLocalized(from.Serial, from.ItemID, MessageType.Regular, hue, 3, number, "", args));
}
public static void SendMessageTo(Item from, Mobile to, string text, int hue)
{
to.Send(new UnicodeMessage(from.Serial, from.ItemID, MessageType.Regular, hue, 3, "ENU", "", text));
}
}
}

25
Projects/Scripts/Items/Special/SoulStone.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Linq;
using Server.Accounting;
using Server.Engines.VeteranRewards;
using Server.Factions;
@ -580,6 +579,7 @@ namespace Server.Items
return;
}
SkillName skill = m_Stone.Skill;
double skillValue = m_Stone.SkillValue;
Skill fromSkill = from.Skills[m_Stone.Skill];
@ -589,8 +589,27 @@ namespace Server.Items
*/
int requiredAmount = (int)(skillValue * 10) - fromSkill.BaseFixedPoint - (from.SkillsCap - from.SkillsTotal);
bool cannotAbsorb = fromSkill.Lock != SkillLock.Up || requiredAmount > 0 &&
requiredAmount > from.Skills.Where(t => t.Lock == SkillLock.Down).Sum(t => t.BaseFixedPoint);
bool cannotAbsorb = false;
if (fromSkill.Lock != SkillLock.Up)
{
cannotAbsorb = true;
}
else if (requiredAmount > 0)
{
int available = 0;
for (int i = 0; i < from.Skills.Length; ++i)
{
if (from.Skills[i].Lock != SkillLock.Down)
continue;
available += from.Skills[i].BaseFixedPoint;
}
if (requiredAmount > available)
cannotAbsorb = true;
}
if (cannotAbsorb)
{

30
Projects/Scripts/Items/Special/Special Scrolls/PowerScroll.cs
View file

@ -81,12 +81,10 @@ namespace Server.Items
}
public override int Message =>
1049469;
/* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
* When used, the effect is not immediately seen without a gain of points with that skill or statistics.
* You can view your maximum skill values in your skills window.
* You can view your maximum statistic value in your statistics window.
*/
1049469; /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
* When used, the effect is not immediately seen without a gain of points with that skill or statistics.
* You can view your maximum skill values in your skills window.
* You can view your maximum statistic value in your statistics window. */
public override int Title
{
@ -95,12 +93,10 @@ namespace Server.Items
double level = (Value - 105.0) / 5.0;
if (level >= 0.0 && level <= 3.0 && Value % 5.0 == 0.0)
return 1049635 + (int)level;
/* Wonderous Scroll (105 Skill): OR
* Exalted Scroll (110 Skill): OR
* Mythical Scroll (115 Skill): OR
* Legendary Scroll (120 Skill):
*/
return 1049635 + (int)level; /* Wonderous Scroll (105 Skill): OR
* Exalted Scroll (110 Skill): OR
* Mythical Scroll (115 Skill): OR
* Legendary Scroll (120 Skill): */
return 0;
}
@ -158,12 +154,10 @@ namespace Server.Items
double level = (Value - 105.0) / 5.0;
if (level >= 0.0 && level <= 3.0 && Value % 5.0 == 0.0)
list.Add(1049639 + (int)level, GetNameLocalized());
/* a wonderous scroll of ~1_type~ (105 Skill) OR
* an exalted scroll of ~1_type~ (110 Skill) OR
* a mythical scroll of ~1_type~ (115 Skill) OR
* a legendary scroll of ~1_type~ (120 Skill)
*/
list.Add(1049639 + (int)level, GetNameLocalized()); /* a wonderous scroll of ~1_type~ (105 Skill) OR
* an exalted scroll of ~1_type~ (110 Skill) OR
* a mythical scroll of ~1_type~ (115 Skill) OR
* a legendary scroll of ~1_type~ (120 Skill) */
else
list.Add("a power scroll of {0} ({1} Skill)", GetName(), Value);
}

15
Projects/Scripts/Items/Special/Special Scrolls/ScrollofAlacrity.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Linq;
using Server.Engines.MLQuests;
using Server.Engines.MLQuests.Objectives;
using Server.Mobiles;
@ -22,11 +21,9 @@ namespace Server.Items
public override int LabelNumber => 1078604; // Scroll of Alacrity
public override int Message =>
1078602;
/* Using a Scroll of Transcendence for a given skill will permanently increase your current
* level in that skill by the amount of points displayed on the scroll.
* As you may not gain skills beyond your maximum skill cap, any excess points will be lost.
*/
1078602; /*Using a Scroll of Transcendence for a given skill will permanently increase your current
*level in that skill by the amount of points displayed on the scroll.
*As you may not gain skills beyond your maximum skill cap, any excess points will be lost.*/
public override string DefaultTitle => "<basefont color=#FFFFFF>Scroll of Alacrity:</basefont>";
@ -77,10 +74,8 @@ namespace Server.Items
if (tskill >= tcap || from.Skills[Skill].Lock != SkillLock.Up)
{
from.SendLocalizedMessage(
1094935);
/* You cannot increase this skill at this time. The skill may be locked or set to lower in your skill menu.
* If you are at your total skill cap, you must use a Powerscroll to increase your current skill cap.
*/
1094935); /*You cannot increase this skill at this time. The skill may be locked or set to lower in your skill menu.
*If you are at your total skill cap, you must use a Powerscroll to increase your current skill cap.*/
return;
}

15
Projects/Scripts/Items/Special/Special Scrolls/ScrollofTranscendence.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Linq;
using Server.Engines.MLQuests;
using Server.Engines.MLQuests.Objectives;
using Server.Mobiles;
@ -22,11 +21,9 @@ namespace Server.Items
public override int LabelNumber => 1094934; // Scroll of Transcendence
public override int Message =>
1094933;
/* Using a Scroll of Transcendence for a given skill will permanently increase your current
* level in that skill by the amount of points displayed on the scroll.
* As you may not gain skills beyond your maximum skill cap, any excess points will be lost.
*/
1094933; /*Using a Scroll of Transcendence for a given skill will permanently increase your current
*level in that skill by the amount of points displayed on the scroll.
*As you may not gain skills beyond your maximum skill cap, any excess points will be lost.*/
public override string DefaultTitle =>
$"<basefont color=#FFFFFF>Scroll of Transcendence ({Value} Skill):</basefont>";
@ -115,10 +112,8 @@ namespace Server.Items
if (!canGain)
{
from.SendLocalizedMessage(
1094935);
/* You cannot increase this skill at this time. The skill may be locked or set to lower in your skill menu.
* If you are at your total skill cap, you must use a Powerscroll to increase your current skill cap.
*/
1094935); /*You cannot increase this skill at this time. The skill may be locked or set to lower in your skill menu.
*If you are at your total skill cap, you must use a Powerscroll to increase your current skill cap.*/
return;
}

2
Projects/Scripts/Items/Special/Special Scrolls/SpecialScroll.cs
View file

@ -158,7 +158,7 @@ namespace Server.Items
AddHtmlLocalized(310, 20, 120, 20, AosSkillBonuses.GetLabel(m_Scroll.Skill), 0xFFFFFF);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState state, RelayInfo info)
{
if (info.ButtonID == 1)
m_Scroll.Use(m_Mobile);

34
Projects/Scripts/Items/Special/Special Scrolls/StatScroll.cs
View file

@ -12,12 +12,10 @@ namespace Server.Items
}
public override int Message =>
1049469;
/* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
* When used, the effect is not immediately seen without a gain of points with that skill or statistics.
* You can view your maximum skill values in your skills window.
* You can view your maximum statistic value in your statistics window.
*/
1049469; /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
* When used, the effect is not immediately seen without a gain of points with that skill or statistics.
* You can view your maximum skill values in your skills window.
* You can view your maximum statistic value in your statistics window. */
public override int Title
{
@ -26,13 +24,11 @@ namespace Server.Items
int level = ((int)Value - 230) / 5;
if (level >= 0 && level <= 4 && Value % 5 == 0)
return 1049458 + level;
/* Wonderous Scroll (+5 Maximum Stats): OR
* Exalted Scroll (+10 Maximum Stats): OR
* Mythical Scroll (+15 Maximum Stats): OR
* Legendary Scroll (+20 Maximum Stats): OR
* Ultimate Scroll (+25 Maximum Stats):
*/
return 1049458 + level; /* Wonderous Scroll (+5 Maximum Stats): OR
* Exalted Scroll (+10 Maximum Stats): OR
* Mythical Scroll (+15 Maximum Stats): OR
* Legendary Scroll (+20 Maximum Stats): OR
* Ultimate Scroll (+25 Maximum Stats): */
return 0;
}
@ -46,13 +42,11 @@ namespace Server.Items
int level = ((int)Value - 230) / 5;
if (level >= 0 && level <= 4 && (int)Value % 5 == 0)
list.Add(1049463 + level, "#1049476");
/* a wonderous scroll of ~1_type~ (+5 Maximum Stats) OR
* an exalted scroll of ~1_type~ (+10 Maximum Stats) OR
* a mythical scroll of ~1_type~ (+15 Maximum Stats) OR
* a legendary scroll of ~1_type~ (+20 Maximum Stats) OR
* an ultimate scroll of ~1_type~ (+25 Maximum Stats)
*/
list.Add(1049463 + level, "#1049476"); /* a wonderous scroll of ~1_type~ (+5 Maximum Stats) OR
* an exalted scroll of ~1_type~ (+10 Maximum Stats) OR
* a mythical scroll of ~1_type~ (+15 Maximum Stats) OR
* a legendary scroll of ~1_type~ (+20 Maximum Stats) OR
* an ultimate scroll of ~1_type~ (+25 Maximum Stats) */
else
list.Add("a scroll of power ({0}{1} Maximum Stats)", Value - 225 >= 0 ? "+" : "", Value - 225);
}

9
Projects/Scripts/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs
View file

@ -135,9 +135,9 @@ namespace Server.Items
{
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState state, RelayInfo info)
{
Mobile from = sender.Mobile;
Mobile from = state.Mobile;
if (info.ButtonID == 1 || info.ButtonID == 2)
{
@ -147,10 +147,9 @@ namespace Server.Items
return;
}
if (from is PlayerMobile mobile)
mobile.AnkhNextUse = DateTime.UtcNow + TimeSpan.FromHours(1);
if (from is PlayerMobile mobile) mobile.AnkhNextUse = DateTime.UtcNow + TimeSpan.FromHours(1);
base.OnResponse(sender, info);
base.OnResponse(state, info);
}
}
}

3
Projects/Scripts/Items/Special/Veteran Rewards/Brazier.cs
View file

@ -63,7 +63,8 @@ namespace Server.Items
public void TurnOn()
{
m_Fire ??= new Item();
if (m_Fire == null)
m_Fire = new Item();
m_Fire.ItemID = 0x19AB;
m_Fire.Movable = false;

88
Projects/Scripts/Items/Special/Veteran Rewards/Cannon.cs
View file

@ -63,37 +63,37 @@ namespace Server.Items
switch (direction)
{
case CannonDirection.North:
{
AddComponent(new CannonAddonComponent(0xE8D), 0, 0, 0);
AddComponent(new CannonAddonComponent(0xE8C), 0, 1, 0);
AddComponent(new CannonAddonComponent(0xE8B), 0, 2, 0);
{
AddComponent(new CannonAddonComponent(0xE8D), 0, 0, 0);
AddComponent(new CannonAddonComponent(0xE8C), 0, 1, 0);
AddComponent(new CannonAddonComponent(0xE8B), 0, 2, 0);
break;
}
break;
}
case CannonDirection.East:
{
AddComponent(new CannonAddonComponent(0xE96), 0, 0, 0);
AddComponent(new CannonAddonComponent(0xE95), -1, 0, 0);
AddComponent(new CannonAddonComponent(0xE94), -2, 0, 0);
{
AddComponent(new CannonAddonComponent(0xE96), 0, 0, 0);
AddComponent(new CannonAddonComponent(0xE95), -1, 0, 0);
AddComponent(new CannonAddonComponent(0xE94), -2, 0, 0);
break;
}
break;
}
case CannonDirection.South:
{
AddComponent(new CannonAddonComponent(0xE91), 0, 0, 0);
AddComponent(new CannonAddonComponent(0xE92), 0, -1, 0);
AddComponent(new CannonAddonComponent(0xE93), 0, -2, 0);
{
AddComponent(new CannonAddonComponent(0xE91), 0, 0, 0);
AddComponent(new CannonAddonComponent(0xE92), 0, -1, 0);
AddComponent(new CannonAddonComponent(0xE93), 0, -2, 0);
break;
}
break;
}
default:
{
AddComponent(new CannonAddonComponent(0xE8E), 0, 0, 0);
AddComponent(new CannonAddonComponent(0xE8F), 1, 0, 0);
AddComponent(new CannonAddonComponent(0xE90), 2, 0, 0);
{
AddComponent(new CannonAddonComponent(0xE8E), 0, 0, 0);
AddComponent(new CannonAddonComponent(0xE8F), 1, 0, 0);
AddComponent(new CannonAddonComponent(0xE90), 2, 0, 0);
break;
}
break;
}
}
}
@ -114,7 +114,7 @@ namespace Server.Items
}
[CommandProperty(AccessLevel.GameMaster)]
public CannonDirection CannonDirection { get; private set; }
public CannonDirection CannonDirection{ get; private set; }
[CommandProperty(AccessLevel.GameMaster)]
public int Charges
@ -261,19 +261,34 @@ namespace Server.Items
{
if (!Utility.InRange(new Point3D(p), m_Cannon.Location, 2))
{
bool allow = false;
int x = p.X - m_Cannon.X;
int y = p.Y - m_Cannon.Y;
bool allow = m_Cannon.CannonDirection switch
switch (m_Cannon.CannonDirection)
{
case CannonDirection.North:
if (y < 0 && Math.Abs(x) <= -y / 3)
allow = true;
CannonDirection.North => y < 0 && Math.Abs(x) <= -y / 3,
CannonDirection.East => x > 0 && Math.Abs(y) <= x / 3,
CannonDirection.South => y > 0 && Math.Abs(x) <= y / 3,
CannonDirection.West => x < 0 && Math.Abs(y) <= -x / 3,
_ => false,
};
break;
case CannonDirection.East:
if (x > 0 && Math.Abs(y) <= x / 3)
allow = true;
break;
case CannonDirection.South:
if (y > 0 && Math.Abs(x) <= y / 3)
allow = true;
break;
case CannonDirection.West:
if (x < 0 && Math.Abs(y) <= -x / 3)
allow = true;
break;
}
if (allow && Utility.InRange(new Point3D(p), m_Cannon.Location, 14))
m_Cannon.DoFireEffect(p);
@ -286,7 +301,9 @@ namespace Server.Items
}
}
else
{
from.SendLocalizedMessage(1049630); // You cannot see that target!
}
}
protected override void OnTargetOutOfRange(Mobile from, object targeted)
@ -324,10 +341,10 @@ namespace Server.Items
AddHtmlLocalized(195, 109, 120, 20, 1076197, 0x7FFF); // Recharge
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState state, RelayInfo info)
{
if (m_Cannon?.Deleted == false && info.ButtonID == (int)Buttons.Recharge)
m_Cannon.Fill(sender.Mobile, m_Keg);
m_Cannon.Fill(state.Mobile, m_Keg);
}
private enum Buttons
@ -356,8 +373,7 @@ namespace Server.Items
public override BaseAddon Addon => new CannonAddon(m_Direction)
{
Charges = m_Charges,
IsRewardItem = m_IsRewardItem
Charges = m_Charges, IsRewardItem = m_IsRewardItem
};
[CommandProperty(AccessLevel.GameMaster)]

6
Projects/Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs
View file

@ -243,7 +243,7 @@ namespace Server.Items
AddTextEntry(75, 245, 350, 40, 0x0, (int)Buttons.Text, "");
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState state, RelayInfo info)
{
if (m_Tool?.Deleted != false || m_Target?.Deleted != false)
return;
@ -319,12 +319,12 @@ namespace Server.Items
AddHtmlLocalized(40, 109, 100, 20, 1060051, 0x7FFF); // CANCEL
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState state, RelayInfo info)
{
if (m_Engraver?.Deleted != false || info.ButtonID != (int)Buttons.Confirm)
return;
m_Engraver.Recharge(sender.Mobile, m_Guildmaster);
m_Engraver.Recharge(state.Mobile, m_Guildmaster);
}
private enum Buttons