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

4
Projects/Scripts/Items/Skill Items/Magical/Misc/Moongate.cs
View file

@ -167,7 +167,7 @@ namespace Server.Items
from.Map != Map.Felucca && TargetMap == Map.Felucca && ShowFeluccaWarning)
{
if (from.AccessLevel == AccessLevel.Player || !from.Hidden)
Packets.SendPlaySound(from.NetState, 0x20E, from.Location);
from.Send(new PlaySound(0x20E, from.Location));
from.CloseGump<MoongateConfirmGump>();
from.SendGump(new MoongateConfirmGump(from, this));
}
@ -381,7 +381,7 @@ namespace Server.Items
}
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState state, RelayInfo info)
{
if (info.ButtonID == 1)
m_Gate.EndConfirmation(m_From);

1
Projects/Scripts/Items/Skill Items/Magical/Misc/RecallRune.cs
View file

@ -1,4 +1,5 @@
using Server.Multis;
using Server.Prompts;
using Server.Regions;
namespace Server.Items

5
Projects/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -76,7 +76,8 @@ namespace Server.Items
from.RevealingAction();
Users ??= new List<Mobile>();
if (Users == null)
Users = new List<Mobile>();
if (!Users.Contains(from))
Users.Add(from);
@ -168,7 +169,7 @@ namespace Server.Items
Effects.PlaySound(loc, map, 0x307);
Effects.SendLocationEffect(loc, map, 0x36B0, 9);
Effects.SendLocationEffect(loc, map, 0x36B0, 9, 10, 0, 0);
int alchemyBonus = 0;
if (direct)

6
Projects/Scripts/Items/Skill Items/Magical/Potions/NightSight.cs
View file

@ -29,7 +29,7 @@ namespace Server.Items
public override void Drink(Mobile from)
{
if (from.BeginAction<LightCycle.NightSightTimer>())
if (from.BeginAction<LightCycle>())
{
new LightCycle.NightSightTimer(from).Start();
from.LightLevel = LightCycle.DungeonLevel / 2;
@ -43,7 +43,9 @@ namespace Server.Items
Consume();
}
else
{
from.SendMessage("You already have nightsight.");
}
}
}
}
}

14
Projects/Scripts/Items/Skill Items/Magical/Runebook.cs
View file

@ -355,9 +355,13 @@ namespace Server.Items
if (dropped is RecallRune rune)
{
if (IsLockedDown && from.AccessLevel < AccessLevel.GameMaster)
{
from.SendLocalizedMessage(502413, null, 0x35); // That cannot be done while the book is locked down.
}
else if (IsOpen(from))
{
from.SendLocalizedMessage(1005571); // You cannot place objects in the book while viewing the contents.
}
else if (Entries.Count < 16)
{
if (rune.Marked && rune.TargetMap != null)
@ -366,12 +370,12 @@ namespace Server.Items
rune.Delete();
Packets.SendPlaySound(from.NetState, 0x42, GetWorldLocation());
from.Send(new PlaySound(0x42, GetWorldLocation()));
string desc = rune.Description;
if (desc == null || (desc = desc.Trim()).Length == 0)
desc = "(nondescript)";
desc = "(indescript)";
from.SendMessage(desc);
@ -381,13 +385,15 @@ namespace Server.Items
from.SendLocalizedMessage(502409); // This rune does not have a marked location.
}
else
{
from.SendLocalizedMessage(502401); // This runebook is full.
}
}
else if (dropped is RecallScroll)
{
if (CurCharges < MaxCharges)
{
Packets.SendPlaySound(from.NetState, 0x259, GetWorldLocation());
from.Send(new PlaySound(0x249, GetWorldLocation()));
int amount = dropped.Amount;
@ -405,7 +411,9 @@ namespace Server.Items
}
}
else
{
from.SendLocalizedMessage(502410); // This book already has the maximum amount of charges.
}
}
return false;

51
Projects/Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -491,7 +491,7 @@ namespace Server.Items
scroll.Delete();
Packets.SendPlaySound(from.NetState, 0x249, GetWorldLocation());
from.Send(new PlaySound(0x249, GetWorldLocation()));
return true;
}
}
@ -569,16 +569,49 @@ namespace Server.Items
return;
if (Parent == null)
SendWorldPacketFor(ns);
{
to.Send(WorldPacket);
}
else if (Parent is Item)
{
// What will happen if the client doesn't know about our parent?
Packets.SendContainerContentUpdate(ns, this);
if (ns.ContainerGridLines)
to.Send(new ContainerContentUpdate6017(this));
else
to.Send(new ContainerContentUpdate(this));
}
else if (Parent is Mobile)
{
// What will happen if the client doesn't know about our parent?
Packets.SendEquipUpdate(ns, this);
to.Send(new EquipUpdate(this));
}
Packets.SendDisplayContainer(ns, Serial);
Packets.SendSpellbookContent(ns, Serial, ItemID, BookOffset + 1, m_Content);
if (ns.HighSeas)
to.Send(new DisplaySpellbookHS(this));
else
to.Send(new DisplaySpellbook(this));
if (ObjectPropertyList.Enabled)
{
if (ns.NewSpellbook)
{
to.Send(new NewSpellbookContent(this, ItemID, BookOffset + 1, m_Content));
}
else
{
if (ns.ContainerGridLines)
to.Send(new SpellbookContent6017(SpellCount, BookOffset + 1, m_Content, this));
else
to.Send(new SpellbookContent(SpellCount, BookOffset + 1, m_Content, this));
}
}
else
{
if (ns.ContainerGridLines)
to.Send(new SpellbookContent6017(SpellCount, BookOffset + 1, m_Content, this));
else
to.Send(new SpellbookContent(SpellCount, BookOffset + 1, m_Content, this));
}
}
public override void GetProperties(ObjectPropertyList list)
@ -777,9 +810,11 @@ namespace Server.Items
}
}
Attributes ??= new AosAttributes(this);
if (Attributes == null)
Attributes = new AosAttributes(this);
SkillBonuses ??= new AosSkillBonuses(this);
if (SkillBonuses == null)
SkillBonuses = new AosSkillBonuses(this);
if (Core.AOS && Parent is Mobile mobile)
SkillBonuses.AddTo(mobile);