fix: Stops invisibility timer on successful hide (#1318)
This commit is contained in:
parent
3f400fc965
commit
f47560e56c
1 changed files with 4 additions and 5 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using Server.Multis;
|
using Server.Multis;
|
||||||
using Server.Network;
|
using Server.Network;
|
||||||
|
using Server.Spells.Sixth;
|
||||||
using Server.Targeting;
|
using Server.Targeting;
|
||||||
|
|
||||||
namespace Server.SkillHandlers
|
namespace Server.SkillHandlers
|
||||||
|
|
@ -49,10 +50,8 @@ namespace Server.SkillHandlers
|
||||||
}
|
}
|
||||||
|
|
||||||
// int range = 18 - (int)(m.Skills.Hiding.Value / 10);
|
// int range = 18 - (int)(m.Skills.Hiding.Value / 10);
|
||||||
var range = Math.Min(
|
// Cap of 18 not OSI-exact, intentional difference
|
||||||
(int)((100 - m.Skills.Hiding.Value) / 2) + 8,
|
var range = Math.Min((int)((100 - m.Skills.Hiding.Value) / 2) + 8, 18);
|
||||||
18
|
|
||||||
); // Cap of 18 not OSI-exact, intentional difference
|
|
||||||
|
|
||||||
var badCombat = !CombatOverride && m.Combatant != null && m.InRange(m.Combatant.Location, range) &&
|
var badCombat = !CombatOverride && m.Combatant != null && m.InRange(m.Combatant.Location, range) &&
|
||||||
m.Combatant.InLOS(m);
|
m.Combatant.InLOS(m);
|
||||||
|
|
@ -92,11 +91,11 @@ namespace Server.SkillHandlers
|
||||||
m.Hidden = true;
|
m.Hidden = true;
|
||||||
m.Warmode = false;
|
m.Warmode = false;
|
||||||
m.LocalOverheadMessage(MessageType.Regular, 0x1F4, 501240); // You have hidden yourself well.
|
m.LocalOverheadMessage(MessageType.Regular, 0x1F4, 501240); // You have hidden yourself well.
|
||||||
|
InvisibilitySpell.StopTimer(m);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m.RevealingAction();
|
m.RevealingAction();
|
||||||
|
|
||||||
m.LocalOverheadMessage(MessageType.Regular, 0x22, 501241); // You can't seem to hide here.
|
m.LocalOverheadMessage(MessageType.Regular, 0x22, 501241); // You can't seem to hide here.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue