warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

2
Projects/Scripts/Skills/Anatomy.cs
View file

@ -83,7 +83,7 @@ namespace Server.SkillHandlers
}
else
{
(targeted as Item)?.SendLocalizedMessageTo(from, 500323); // Only living things have anatomies!
(targeted as Item)?.SendLocalizedMessageTo(from, 500323, ""); // Only living things have anatomies!
}
}
}

6
Projects/Scripts/Skills/AnimalTaming.cs
View file

@ -338,7 +338,8 @@ namespace Server.SkillHandlers
if (!alreadyOwned) // Passively check animal lore for gain
m_Tamer.CheckTargetSkill(SkillName.AnimalLore, m_Creature, 0.0, 120.0);
m_Paralyzed |= m_Creature.Paralyzed;
if (m_Creature.Paralyzed)
m_Paralyzed = true;
}
else
{
@ -346,7 +347,8 @@ namespace Server.SkillHandlers
m_Tamer.NextSkillTime = Core.TickCount;
m_BeingTamed.Remove(m_Creature);
m_Paralyzed |= m_Creature.Paralyzed;
if (m_Creature.Paralyzed)
m_Paralyzed = true;
if (!alreadyOwned) // Passively check animal lore for gain
m_Tamer.CheckTargetSkill(SkillName.AnimalLore, m_Creature, 0.0, 120.0);

5
Projects/Scripts/Skills/Discordance.cs
View file

@ -50,13 +50,16 @@ namespace Server.SkillHandlers
// According to uoherald bard must remain alive, visible, and
// within range of the target or the effect ends in 15 seconds.
if (!targ.Alive || targ.Deleted || !from.Alive || from.Hidden)
{
ends = true;
}
else
{
int range = (int)targ.GetDistanceToSqrt(from);
int maxRange = BaseInstrument.GetBardRange(from, SkillName.Discordance);
ends |= from.Map != targ.Map || range > maxRange;
if (from.Map != targ.Map || range > maxRange)
ends = true;
}
if (ends && info.m_Ending && info.m_EndTime < DateTime.UtcNow)

3
Projects/Scripts/Skills/EvalInt.cs
View file

@ -84,7 +84,8 @@ namespace Server.SkillHandlers
}
else
{
(targeted as Item)?.SendLocalizedMessageTo(from, 500908); // It looks smarter than a rock, but dumber than a piece of wood.
(targeted as Item)?.SendLocalizedMessageTo(from, 500908,
""); // It looks smarter than a rock, but dumber than a piece of wood.
}
}
}

6
Projects/Scripts/Skills/Hiding.cs
View file

@ -30,10 +30,13 @@ namespace Server.SkillHandlers
BaseHouse house = BaseHouse.FindHouseAt(m);
if (house?.IsFriend(m) == true)
{
bonus = 100.0;
}
else if (!Core.AOS)
{
house ??= BaseHouse.FindHouseAt(new Point3D(m.X - 1, m.Y, 127), m.Map, 16) ??
if (house == null)
house = BaseHouse.FindHouseAt(new Point3D(m.X - 1, m.Y, 127), m.Map, 16) ??
BaseHouse.FindHouseAt(new Point3D(m.X + 1, m.Y, 127), m.Map, 16) ??
BaseHouse.FindHouseAt(new Point3D(m.X, m.Y - 1, 127), m.Map, 16) ??
BaseHouse.FindHouseAt(new Point3D(m.X, m.Y + 1, 127), m.Map, 16);
@ -77,6 +80,7 @@ namespace Server.SkillHandlers
else
{
m.RevealingAction();
m.LocalOverheadMessage(MessageType.Regular, 0x22, 501241); // You can't seem to hide here.
}

8
Projects/Scripts/Skills/ItemIdentification.cs
View file

@ -39,13 +39,19 @@ namespace Server.Items
item.OnSingleClick(from);
}
else
{
from.SendLocalizedMessage(500353); // You are not certain...
}
}
else if (o is Mobile mobile)
{
mobile.OnSingleClick(from);
}
else
{
from.SendLocalizedMessage(500353); // You are not certain...
}
}
}
}
}
}

2
Projects/Scripts/Skills/SpiritSpeak.cs
View file

@ -127,7 +127,7 @@ namespace Server.SkillHandlers
public override void OnCast()
{
IPooledEnumerable<Corpse> eable = Caster.GetItemsInRange<Corpse>(3);
Corpse toChannel = eable.FirstOrDefault(corpse => corpse?.Channeled == false);
Corpse toChannel = eable.FirstOrDefault(item => item is Corpse corpse && !corpse.Channeled);
eable.Free();
int min = 1 + (int)(Caster.Skills.SpiritSpeak.Value * 0.25);

4
Projects/Scripts/Skills/Tracking.cs
View file

@ -106,7 +106,7 @@ namespace Server.SkillHandlers
AddHtmlLocalized(320, 90, 100, 20, 1018090); // Players
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState state, RelayInfo info)
{
if (info.ButtonID >= 1 && info.ButtonID <= 4)
TrackWhoGump.DisplayTo(m_Success, m_From, info.ButtonID - 1);
@ -261,7 +261,7 @@ namespace Server.SkillHandlers
private static bool IsPlayer(Mobile m) => m.Player;
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState state, RelayInfo info)
{
int index = info.ButtonID - 1;