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

8
Projects/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs
View file

@ -151,7 +151,7 @@ namespace Server.Mobiles
return;
IPooledEnumerable<Mobile> eable = GetMobilesInRange(8);
switch (Utility.Random(3))
{
case 0: /* greater heal */
@ -208,7 +208,7 @@ namespace Server.Mobiles
damage = Utility.Random(12, 9);
}
m.BoltEffect();
m.BoltEffect(0);
SpellHelper.Damage(TimeSpan.FromSeconds(0.25), m, this, damage, 0, 0, 0, 0, 100);
}
@ -260,7 +260,7 @@ namespace Server.Mobiles
break;
}
}
eable.Free();
}
@ -276,4 +276,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

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

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Items;
namespace Server.Mobiles
@ -80,9 +79,13 @@ namespace Server.Mobiles
if (lastKiller is BaseCreature creature)
lastKiller = creature.GetMaster();
if (IsInsideKhaldun(m) && IsInsideKhaldun(lastKiller) && lastKiller.Player &&
!m_Set.Contains(lastKiller) && m.Aggressors.Any(ai => ai.Attacker == lastKiller && ai.CanReportMurder))
SummonRevenant(m, lastKiller);
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;
}
}
public static void SummonRevenant(Mobile victim, Mobile killer)

2
Projects/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs
View file

@ -104,7 +104,7 @@ namespace Server.Mobiles
}
Effects.PlaySound(this, Map, GetDeathSound());
Effects.SendLocationEffect(Location, Map, 0x3709, 30, 10, 0x835);
Effects.SendLocationEffect(Location, Map, 0x3709, 30, 10, 0x835, 0);
rm.MoveToWorld(Location, Map);
Delete();

2
Projects/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs
View file

@ -113,7 +113,7 @@ namespace Server.Mobiles
}
Effects.PlaySound(this, Map, GetDeathSound());
Effects.SendLocationEffect(Location, Map, 0x3709, 30, 10, 0x835);
Effects.SendLocationEffect(Location, Map, 0x3709, 30, 10, 0x835, 0);
rm.MoveToWorld(Location, Map);
Delete();

4
Projects/Scripts/Mobiles/Monsters/ML/Special/Ilhenir.cs
View file

@ -217,7 +217,7 @@ namespace Server.Mobiles
{
if (to.Alive && to.Player && !UnderCacophonicAttack(to))
{
Packets.SendSpeedControlWalk(to.NetState);
to.Send(SpeedControl.WalkSpeed);
to.SendLocalizedMessage(1072069); // A cacophonic sound lambastes you, suppressing your ability to move.
to.PlaySound(0x584);
@ -229,7 +229,7 @@ namespace Server.Mobiles
public virtual void CacophonicEnd(Mobile from)
{
m_Table.Remove(from);
Packets.SendSpeedControlDisabled(from.NetState);
from.Send(SpeedControl.Disable);
}
public static bool UnderCacophonicAttack(Mobile from) => m_Table.Contains(from);

3
Projects/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs
View file

@ -76,7 +76,8 @@ namespace Server.Mobiles
{
OpenedBy = from;
m_Timer ??= new DecayTimer(this);
if (m_Timer == null)
m_Timer = new DecayTimer(this);
if (!m_Timer.Running)
m_Timer.Start();

3
Projects/Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs
View file

@ -35,7 +35,8 @@ namespace Server.Mobiles
Body = 0x15;
BaseSoundID = 0xDB;
break;
default: // slime
default:
case 5: // slime
Body = 51;
BaseSoundID = 456;
break;

2
Projects/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs
View file

@ -98,7 +98,7 @@ namespace Server.Mobiles
{
if (Utility.RandomBool() && Mana > 14 && to != null)
{
damage += damage / 2;
damage = damage + damage / 2;
to.SendLocalizedMessage(1060091); // You take extra damage from the crushing attack!
to.PlaySound(0x1E1);
to.FixedParticles(0x377A, 1, 32, 0x26da, 0, 0, 0);

9
Projects/Scripts/Mobiles/Monsters/SE/FanDancer.cs
View file

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using Server.Engines.Plants;
using Server.Items;
using Server.Network;
namespace Server.Mobiles
{
@ -84,7 +85,9 @@ namespace Server.Mobiles
* Effect: - To: "0x57D4F5B" - ItemId: "0x27A3" - ItemIdName: "Tessen" - FromLocation: "(992 299, 24)" - ToLocation: "(992 308, 22)" - Speed: "10" - Duration: "0" - FixedDirection: "False" - Explode: "False" - Hue: "0x0" - Render: "0x0"
* Damage: 50-65
*/
Effects.SendMovingEffect(Location, attacker.Location, attacker.Map, 0x27A3, 10);
Effects.SendPacket(attacker, attacker.Map,
new HuedEffect(EffectType.Moving, Serial.Zero, Serial.Zero, 0x27A3, Location, attacker.Location, 10, 0,
false, false, 0, 0));
AOS.Damage(attacker, this, Utility.RandomMinMax(50, 65), 100, 0, 0, 0, 0);
}
}
@ -99,7 +102,9 @@ namespace Server.Mobiles
* Effect: - To: "0x57D4F5B" - ItemId: "0x27A3" - ItemIdName: "Tessen" - FromLocation: "(992 299, 24)" - ToLocation: "(992 308, 22)" - Speed: "10" - Duration: "0" - FixedDirection: "False" - Explode: "False" - Hue: "0x0" - Render: "0x0"
* Damage: 50-65
*/
Effects.SendMovingEffect(Location, attacker.Location, attacker.Map, 0x27A3, 10);
Effects.SendPacket(attacker, attacker.Map,
new HuedEffect(EffectType.Moving, Serial.Zero, Serial.Zero, 0x27A3, Location, attacker.Location, 10, 0,
false, false, 0, 0));
AOS.Damage(attacker, this, Utility.RandomMinMax(50, 65), 100, 0, 0, 0, 0);
}
}