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/Traps/GasTrap.cs
View file

@ -35,7 +35,7 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public GasTrapType Type
{
get => ItemID switch
get
{
return ItemID switch
{
@ -69,7 +69,7 @@ namespace Server.Items
if (Poison == null || !from.Player || !from.Alive || from.AccessLevel > AccessLevel.Player)
return;
Effects.SendLocationEffect(Location, Map, GetBaseID(Type) - 2, 16, 3, GetEffectHue());
Effects.SendLocationEffect(Location, Map, GetBaseID(Type) - 2, 16, 3, GetEffectHue(), 0);
Effects.PlaySound(Location, Map, 0x231);
from.ApplyPoison(from, Poison);

2
Projects/Scripts/Items/Traps/GiantSpikeTrap.cs
View file

@ -24,7 +24,7 @@ namespace Server.Items
if (from.AccessLevel > AccessLevel.Player)
return;
Effects.SendLocationEffect(Location, Map, 0x1D99, 48, 2, GetEffectHue());
Effects.SendLocationEffect(Location, Map, 0x1D99, 48, 2, GetEffectHue(), 0);
if (from.Alive && CheckRange(from.Location, 0))
SpellHelper.Damage(TimeSpan.FromTicks(1), from, from, Utility.Dice(10, 7, 0));

4
Projects/Scripts/Items/Traps/SawTrap.cs
View file

@ -26,7 +26,7 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public SawTrapType Type
{
get => ItemID switch
get
{
return ItemID switch
{
@ -62,7 +62,7 @@ namespace Server.Items
if (!from.Alive || from.AccessLevel > AccessLevel.Player)
return;
Effects.SendLocationEffect(Location, Map, GetBaseID(Type) + 1, 6, 3, GetEffectHue());
Effects.SendLocationEffect(Location, Map, GetBaseID(Type) + 1, 6, 3, GetEffectHue(), 0);
Effects.PlaySound(Location, Map, 0x21C);
SpellHelper.Damage(TimeSpan.FromTicks(1), from, from, Utility.RandomMinMax(5, 15));

14
Projects/Scripts/Items/Traps/SpikeTrap.cs
View file

@ -26,7 +26,7 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public SpikeTrapType Type
{
get => ItemID switch
get
{
return ItemID switch
{
@ -56,7 +56,13 @@ namespace Server.Items
public bool Extended
{
get => ItemID == GetExtendedID(Type);
set => ItemID = value ? GetExtendedID(Type) : GetBaseID(Type);
set
{
if (value)
ItemID = GetExtendedID(Type);
else
ItemID = GetBaseID(Type);
}
}
public override bool PassivelyTriggered => false;
@ -95,7 +101,7 @@ namespace Server.Items
if (!from.Alive || from.AccessLevel > AccessLevel.Player)
return;
Effects.SendLocationEffect(Location, Map, GetBaseID(Type) + 1, 18, 3, GetEffectHue());
Effects.SendLocationEffect(Location, Map, GetBaseID(Type) + 1, 18, 3, GetEffectHue(), 0);
Effects.PlaySound(Location, Map, 0x22C);
foreach (Mobile mob in GetMobilesInRange(0))
@ -116,7 +122,7 @@ namespace Server.Items
public virtual void OnSpikeRetracted()
{
Extended = false;
Effects.SendLocationEffect(Location, Map, GetExtendedID(Type) - 1, 6, 3, GetEffectHue());
Effects.SendLocationEffect(Location, Map, GetExtendedID(Type) - 1, 6, 3, GetEffectHue(), 0);
}
public override void Serialize(GenericWriter writer)

26
Projects/Scripts/Items/Traps/StoneFaceTrap.cs
View file

@ -40,24 +40,22 @@ namespace Server.Items
}
set
{
0x10F5 => StoneFaceTrapType.NorthWestWall,
0x10F6 => StoneFaceTrapType.NorthWestWall,
0x10F7 => StoneFaceTrapType.NorthWestWall,
0x10FC => StoneFaceTrapType.NorthWall,
0x10FD => StoneFaceTrapType.NorthWall,
0x10FE => StoneFaceTrapType.NorthWall,
0x110F => StoneFaceTrapType.WestWall,
0x1110 => StoneFaceTrapType.WestWall,
0x1111 => StoneFaceTrapType.WestWall,
_ => StoneFaceTrapType.NorthWestWall
};
set => ItemID = Breathing ? GetFireID(value) : GetBaseID(value);
bool breathing = Breathing;
ItemID = breathing ? GetFireID(value) : GetBaseID(value);
}
}
public bool Breathing
{
get => ItemID == GetFireID(Type);
set => ItemID = value ? GetFireID(Type) : GetBaseID(Type);
set
{
if (value)
ItemID = GetFireID(Type);
else
ItemID = GetBaseID(Type);
}
}
public override bool PassivelyTriggered => true;
@ -159,4 +157,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}