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

Adds BufferReader and BufferWriter. Updates UOP handling. (#101)

Browse source
This commit is contained in:
Kamron Batman 2020-04-12 21:33:24 -07:00 • committed by GitHub
parent 2c0d97cd36
commit 038c3be258
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
98 changed files with 2458 additions and 2185 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Scripts/Mobiles/AI/MageAI.cs
View file

@ -632,7 +632,7 @@ namespace Server.Mobiles
if (!Core.AOS && SmartAI && !m_Mobile.StunReady && m_Mobile.Skills.Wrestling.Value >= 80.0 &&
m_Mobile.Skills.Anatomy.Value >= 80.0)
EventSink.InvokeStunRequest(new StunRequestEventArgs(m_Mobile));
EventSink.InvokeStunRequest(m_Mobile);
if (!m_Mobile.InRange(c, m_Mobile.RangePerception))
{

2
Projects/Scripts/Mobiles/AI/ThiefAI.cs
View file

@ -56,7 +56,7 @@ namespace Server.Mobiles
if (!Core.AOS && !m_Mobile.DisarmReady && m_Mobile.Skills.Wrestling.Value >= 80.0 &&
m_Mobile.Skills.ArmsLore.Value >= 80.0 && m_toDisarm != null)
EventSink.InvokeDisarmRequest(new DisarmRequestEventArgs(m_Mobile));
EventSink.InvokeDisarmRequest(m_Mobile);
if (m_toDisarm?.IsChildOf(combatant.Backpack) == true &&
Core.TickCount - m_Mobile.NextSkillTime >= 0 && m_toDisarm.LootType != LootType.Blessed &&

14
Projects/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Items;
namespace Server.Mobiles
@ -71,21 +72,16 @@ namespace Server.Mobiles
EventSink.PlayerDeath += EventSink_PlayerDeath;
}
public static void EventSink_PlayerDeath(PlayerDeathEventArgs e)
public static void EventSink_PlayerDeath(Mobile m)
{
Mobile m = e.Mobile;
Mobile lastKiller = m.LastKiller;
if (lastKiller is BaseCreature creature)
lastKiller = creature.GetMaster();
if (IsInsideKhaldun(m) && IsInsideKhaldun(lastKiller) && lastKiller.Player && !m_Set.Contains(lastKiller))
foreach (AggressorInfo ai in m.Aggressors)
if (ai.Attacker == lastKiller && ai.CanReportMurder)
{
SummonRevenant(m, lastKiller);
break;
}
if (IsInsideKhaldun(m) && IsInsideKhaldun(lastKiller) && lastKiller.Player && !m_Set.Contains(lastKiller) &&
m.Aggressors.Any(ai => ai.Attacker == lastKiller && ai.CanReportMurder))
SummonRevenant(m, lastKiller);
}
public static void SummonRevenant(Mobile victim, Mobile killer)

89
Projects/Scripts/Mobiles/PlayerMobile.cs
View file

@ -543,9 +543,76 @@ namespace Server.Mobiles
EventSink.Connected += EventSink_Connected;
EventSink.Disconnected += EventSink_Disconnected;
EventSink.TargetedSkillUse += TargetedSkillUse;
EventSink.EquipMacro += EquipMacro;
EventSink.UnequipMacro += UnequipMacro;
if (Core.SE) Timer.DelayCall(TimeSpan.Zero, CheckPets);
}
private static void TargetedSkillUse(Mobile from, IEntity target, int skillId)
{
if (from == null || target == null)
return;
from.TargetLocked = true;
if (skillId == 35)
AnimalTaming.DisableMessage = true;
// AnimalTaming.DeferredTarget = false;
if (from.UseSkill(skillId))
from.Target?.Invoke(from, target);
if (skillId == 35)
// AnimalTaming.DeferredTarget = true;
AnimalTaming.DisableMessage = false;
from.TargetLocked = false;
}
public static void EquipMacro(Mobile m, List<Serial> list)
{
if (m is PlayerMobile pm && pm.Backpack != null && pm.Alive)
{
Container pack = pm.Backpack;
foreach (var serial in list)
{
Item item = pack.Items.FirstOrDefault(i => i.Serial == serial);
if (item == null) continue;
Item toMove = pm.FindItemOnLayer(item.Layer);
if (toMove != null)
{
//pack.DropItem(toMove);
toMove.Internalize();
if (!pm.EquipItem(item))
pm.EquipItem(toMove);
else
pack.DropItem(toMove);
}
else
pm.EquipItem(item);
}
}
}
public static void UnequipMacro(Mobile m, List<Layer> layers)
{
if (m is PlayerMobile pm && pm.Backpack != null && pm.Alive)
{
Container pack = pm.Backpack;
List<Item> eq = m.Items;
foreach (var item in eq)
if (layers.Contains(item.Layer))
pack.TryDropItem(pm, item, false);
}
}
private static void CheckPets()
{
foreach (Mobile m in World.Mobiles.Values)
@ -666,10 +733,8 @@ namespace Server.Mobiles
SpecialMove.ClearCurrentMove(this);
}
private static void OnLogin(LoginEventArgs e)
private static void OnLogin(Mobile from)
{
Mobile from = e.Mobile;
CheckAtrophies(from);
if (AccountHandler.LockdownLevel > AccessLevel.Player)
@ -925,15 +990,14 @@ namespace Server.Mobiles
ValidateEquipment();
}
private static void OnLogout(LogoutEventArgs e)
private static void OnLogout(Mobile m)
{
if (e.Mobile is PlayerMobile mobile)
mobile.AutoStablePets();
(m as PlayerMobile)?.AutoStablePets();
}
private static void EventSink_Connected(ConnectedEventArgs e)
private static void EventSink_Connected(Mobile m)
{
if (e.Mobile is PlayerMobile pm)
if (m is PlayerMobile pm)
{
pm.SessionStart = DateTime.UtcNow;
@ -943,14 +1007,13 @@ namespace Server.Mobiles
pm.LastOnline = DateTime.UtcNow;
}
DisguiseTimers.StartTimer(e.Mobile);
DisguiseTimers.StartTimer(m);
Timer.DelayCall(TimeSpan.Zero, SpecialMove.ClearAllMoves, e.Mobile);
Timer.DelayCall(TimeSpan.Zero, SpecialMove.ClearAllMoves, m);
}
private static void EventSink_Disconnected(DisconnectedEventArgs e)
private static void EventSink_Disconnected(Mobile from)
{
Mobile from = e.Mobile;
DesignContext context = DesignContext.Find(from);
if (context != null)
@ -977,7 +1040,7 @@ namespace Server.Mobiles
context.Foundation.RestoreRelocatedEntities();
}
if (e.Mobile is PlayerMobile pm)
if (from is PlayerMobile pm)
{
pm.m_GameTime += DateTime.UtcNow - pm.SessionStart;