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

Formatting #2 (#59)

Browse source
This commit is contained in:
Kamron Batman 2019-10-05 00:37:03 -07:00 • committed by GitHub
parent 096d39609e
commit 8e9221bb5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
400 changed files with 3688 additions and 5969 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Projects/Scripts/Engines/ConPVP/DuelContext.cs
View file

@ -1,7 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Server.Commands;
using Server.Engines.PartySystem;
using Server.Factions;
using Server.Gumps;
@ -191,33 +190,18 @@ namespace Server.Engines.ConPVP
}
else if (spell is MagerySpell magerySpell)
{
switch (magerySpell.Circle)
title = magerySpell.Circle switch
{
case SpellCircle.First:
title = "1st Circle";
break;
case SpellCircle.Second:
title = "2nd Circle";
break;
case SpellCircle.Third:
title = "3rd Circle";
break;
case SpellCircle.Fourth:
title = "4th Circle";
break;
case SpellCircle.Fifth:
title = "5th Circle";
break;
case SpellCircle.Sixth:
title = "6th Circle";
break;
case SpellCircle.Seventh:
title = "7th Circle";
break;
case SpellCircle.Eighth:
title = "8th Circle";
break;
}
SpellCircle.First => "1st Circle",
SpellCircle.Second => "2nd Circle",
SpellCircle.Third => "3rd Circle",
SpellCircle.Fourth => "4th Circle",
SpellCircle.Fifth => "5th Circle",
SpellCircle.Sixth => "6th Circle",
SpellCircle.Seventh => "7th Circle",
SpellCircle.Eighth => "8th Circle",
_ => title
};
option = magerySpell.Name;
}
@ -518,7 +502,7 @@ namespace Server.Engines.ConPVP
DuelPlayer pl = Find(mob);
if (pl?.Eliminated == true || m_EventGame != null && !m_EventGame.OnDeath(mob, corpse))
if (pl?.Eliminated == true || m_EventGame?.OnDeath(mob, corpse) == false)
return;
pl.Eliminated = true;
@ -1783,13 +1767,13 @@ namespace Server.Engines.ConPVP
if (item is BaseWeapon)
mob.SendLocalizedMessage(1062001,
item.Name ?? "#" + item.LabelNumber); // You can no longer wield your ~1_WEAPON~
item.Name ?? $"#{item.LabelNumber}"); // You can no longer wield your ~1_WEAPON~
else if (item is BaseArmor && !(item is BaseShield))
mob.SendLocalizedMessage(1062002,
item.Name ?? "#" + item.LabelNumber); // You can no longer wear your ~1_ARMOR~
item.Name ?? $"#{item.LabelNumber}"); // You can no longer wear your ~1_ARMOR~
else
mob.SendLocalizedMessage(1062003,
item.Name ?? "#" + item.LabelNumber); // You can no longer equip your ~1_SHIELD~
item.Name ?? $"#{item.LabelNumber}"); // You can no longer equip your ~1_SHIELD~
}
}