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

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

@ -85,9 +85,7 @@ namespace Server.SkillHandlers
if (src.CheckTargetSkill(SkillName.DetectHidden, trap, 80.0, 100.0))
{
src.SendLocalizedMessage(1042712, true,
" " + (trap.Faction == null
? ""
: trap.Faction.Definition.FriendlyName)); // You reveal a trap placed by a faction:
$" {(trap.Faction == null ? "" : trap.Faction.Definition.FriendlyName)}"); // You reveal a trap placed by a faction:
trap.Visible = true;
trap.BeginConceal();

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

@ -57,9 +57,7 @@ namespace Server.SkillHandlers
{
if (!CombatOverride)
if (m.GetMobilesInRange(range).Any(check => check.InLOS(m) && check.Combatant == m))
{
badCombat = true;
}
ok = !badCombat && m.CheckSkill(SkillName.Hiding, 0.0 - bonus, 100.0 - bonus);
}

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

@ -74,7 +74,7 @@ namespace Server.SkillHandlers
Faction faction = Faction.Find(from);
FactionTrapRemovalKit kit = from.Backpack?.FindItemByType<FactionTrapRemovalKit>();
bool isOwner = trap.Placer == from || trap.Faction != null && trap.Faction.IsCommander(from);
bool isOwner = trap.Placer == from || trap.Faction?.IsCommander(from) == true;
if (faction == null)
{

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

@ -282,9 +282,7 @@ namespace Server.SkillHandlers
if (m_Thief.CheckTargetSkill(SkillName.Stealing, toSteal, pileWeight - 22.5,
pileWeight + 27.5))
{
stolen = Mobile.LiftItemDupe(toSteal, toSteal.Amount - amount) ?? toSteal;
}
}
}
else

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

@ -36,8 +36,6 @@ namespace Server.SkillHandlers
public static double GetStalkingBonus(Mobile tracker, Mobile target)
{
;
if (!m_Table.TryGetValue(tracker, out TrackingInfo info) || info.m_Target != target || info.m_Map != target.Map)
return 0.0;