Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -5,161 +5,164 @@ using Server.Mobiles;
|
|||
|
||||
namespace Server.Spells.Spellweaving
|
||||
{
|
||||
public class ArcaneCircleSpell : ArcanistSpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Arcane Circle", "Myrshalee",
|
||||
-1
|
||||
);
|
||||
public class ArcaneCircleSpell : ArcanistSpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Arcane Circle", "Myrshalee",
|
||||
-1
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.5 );
|
||||
public ArcaneCircleSpell(Mobile caster, Item scroll)
|
||||
: base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public override double RequiredSkill => 0.0;
|
||||
public override int RequiredMana => 24;
|
||||
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds(0.5);
|
||||
|
||||
public ArcaneCircleSpell( Mobile caster, Item scroll )
|
||||
: base( caster, scroll, m_Info )
|
||||
{
|
||||
}
|
||||
public override double RequiredSkill => 0.0;
|
||||
public override int RequiredMana => 24;
|
||||
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if ( !IsValidLocation( Caster.Location, Caster.Map ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1072705 ); // You must be standing on an arcane circle, pentagram or abbatoir to use this spell.
|
||||
return false;
|
||||
}
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if (!IsValidLocation(Caster.Location, Caster.Map))
|
||||
{
|
||||
Caster.SendLocalizedMessage(
|
||||
1072705); // You must be standing on an arcane circle, pentagram or abbatoir to use this spell.
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( GetArcanists().Count < 2 )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 1080452 ); //There are not enough spellweavers present to create an Arcane Focus.
|
||||
return false;
|
||||
}
|
||||
if (GetArcanists().Count < 2)
|
||||
{
|
||||
Caster.SendLocalizedMessage(1080452); //There are not enough spellweavers present to create an Arcane Focus.
|
||||
return false;
|
||||
}
|
||||
|
||||
return base.CheckCast();
|
||||
}
|
||||
return base.CheckCast();
|
||||
}
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
if ( CheckSequence() )
|
||||
{
|
||||
Caster.FixedParticles( 0x3779, 10, 20, 0x0, EffectLayer.Waist );
|
||||
Caster.PlaySound( 0x5C0 );
|
||||
public override void OnCast()
|
||||
{
|
||||
if (CheckSequence())
|
||||
{
|
||||
Caster.FixedParticles(0x3779, 10, 20, 0x0, EffectLayer.Waist);
|
||||
Caster.PlaySound(0x5C0);
|
||||
|
||||
List<Mobile> Arcanists = GetArcanists();
|
||||
List<Mobile> Arcanists = GetArcanists();
|
||||
|
||||
TimeSpan duration = TimeSpan.FromHours( Math.Max( 1, (int)(Caster.Skills.Spellweaving.Value / 24) ) );
|
||||
TimeSpan duration = TimeSpan.FromHours(Math.Max(1, (int)(Caster.Skills.Spellweaving.Value / 24)));
|
||||
|
||||
int strengthBonus = Math.Min( Arcanists.Count, IsSanctuary( Caster.Location, Caster.Map ) ? 6 : 5 ); //The Sanctuary is a special, single location place
|
||||
int strengthBonus =
|
||||
Math.Min(Arcanists.Count,
|
||||
IsSanctuary(Caster.Location, Caster.Map)
|
||||
? 6
|
||||
: 5); //The Sanctuary is a special, single location place
|
||||
|
||||
for( int i = 0; i < Arcanists.Count; i++ )
|
||||
GiveArcaneFocus( Arcanists[i], duration, strengthBonus );
|
||||
}
|
||||
for (int i = 0; i < Arcanists.Count; i++)
|
||||
GiveArcaneFocus(Arcanists[i], duration, strengthBonus);
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
|
||||
private static bool IsSanctuary( Point3D p, Map m )
|
||||
{
|
||||
return (m == Map.Trammel || m == Map.Felucca) && p.X == 6267 && p.Y == 131;
|
||||
}
|
||||
private static bool IsSanctuary(Point3D p, Map m)
|
||||
{
|
||||
return (m == Map.Trammel || m == Map.Felucca) && p.X == 6267 && p.Y == 131;
|
||||
}
|
||||
|
||||
private static bool IsValidLocation( Point3D location, Map map )
|
||||
{
|
||||
LandTile lt = map.Tiles.GetLandTile( location.X, location.Y ); // Land Tiles
|
||||
private static bool IsValidLocation(Point3D location, Map map)
|
||||
{
|
||||
LandTile lt = map.Tiles.GetLandTile(location.X, location.Y); // Land Tiles
|
||||
|
||||
if ( IsValidTile( lt.ID ) && lt.Z == location.Z )
|
||||
return true;
|
||||
if (IsValidTile(lt.ID) && lt.Z == location.Z)
|
||||
return true;
|
||||
|
||||
StaticTile[] tiles = map.Tiles.GetStaticTiles( location.X, location.Y ); // Static Tiles
|
||||
StaticTile[] tiles = map.Tiles.GetStaticTiles(location.X, location.Y); // Static Tiles
|
||||
|
||||
for( int i = 0; i < tiles.Length; ++i )
|
||||
{
|
||||
StaticTile t = tiles[i];
|
||||
ItemData id = TileData.ItemTable[t.ID & TileData.MaxItemValue];
|
||||
for (int i = 0; i < tiles.Length; ++i)
|
||||
{
|
||||
StaticTile t = tiles[i];
|
||||
ItemData id = TileData.ItemTable[t.ID & TileData.MaxItemValue];
|
||||
|
||||
int tand = t.ID;
|
||||
int tand = t.ID;
|
||||
|
||||
if ( t.Z + id.CalcHeight != location.Z )
|
||||
continue;
|
||||
if ( IsValidTile( tand ) )
|
||||
return true;
|
||||
}
|
||||
if (t.Z + id.CalcHeight != location.Z)
|
||||
continue;
|
||||
if (IsValidTile(tand))
|
||||
return true;
|
||||
}
|
||||
|
||||
IPooledEnumerable<Item> eable = map.GetItemsInRange( location, 0 ); // Added Tiles
|
||||
IPooledEnumerable<Item> eable = map.GetItemsInRange(location, 0); // Added Tiles
|
||||
|
||||
foreach( Item item in eable )
|
||||
{
|
||||
ItemData id = item.ItemData;
|
||||
foreach (Item item in eable)
|
||||
{
|
||||
ItemData id = item.ItemData;
|
||||
|
||||
if ( item == null || item.Z + id.CalcHeight != location.Z )
|
||||
continue;
|
||||
if ( IsValidTile( item.ItemID ) )
|
||||
{
|
||||
eable.Free();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (item == null || item.Z + id.CalcHeight != location.Z)
|
||||
continue;
|
||||
if (IsValidTile(item.ItemID))
|
||||
{
|
||||
eable.Free();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
eable.Free();
|
||||
return false;
|
||||
}
|
||||
eable.Free();
|
||||
return false;
|
||||
}
|
||||
|
||||
public static bool IsValidTile( int itemID )
|
||||
{
|
||||
//Per OSI, Center tile only
|
||||
return (itemID == 0xFEA || itemID == 0x1216 || itemID == 0x307F || itemID == 0x1D10 || itemID == 0x1D0F || itemID == 0x1D1F || itemID == 0x1D12 ); // Pentagram center, Abbatoir center, Arcane Circle Center, Bloody Pentagram has 4 tiles at center
|
||||
}
|
||||
public static bool IsValidTile(int itemID)
|
||||
{
|
||||
//Per OSI, Center tile only
|
||||
return itemID == 0xFEA || itemID == 0x1216 || itemID == 0x307F || itemID == 0x1D10 || itemID == 0x1D0F ||
|
||||
itemID == 0x1D1F ||
|
||||
itemID == 0x1D12; // Pentagram center, Abbatoir center, Arcane Circle Center, Bloody Pentagram has 4 tiles at center
|
||||
}
|
||||
|
||||
private List<Mobile> GetArcanists()
|
||||
{
|
||||
List<Mobile> weavers = new List<Mobile>();
|
||||
private List<Mobile> GetArcanists()
|
||||
{
|
||||
List<Mobile> weavers = new List<Mobile>();
|
||||
|
||||
weavers.Add( Caster );
|
||||
weavers.Add(Caster);
|
||||
|
||||
//OSI Verified: Even enemies/combatants count
|
||||
foreach( Mobile m in Caster.GetMobilesInRange( 1 ) ) //Range verified as 1
|
||||
{
|
||||
if ( m != Caster && m is PlayerMobile && Caster.CanBeBeneficial( m, false ) && Math.Abs( Caster.Skills.Spellweaving.Value - m.Skills.Spellweaving.Value ) <= 20 && !(m is Clone) )
|
||||
{
|
||||
weavers.Add( m );
|
||||
}
|
||||
// Everyone gets the Arcane Focus, power capped elsewhere
|
||||
}
|
||||
//OSI Verified: Even enemies/combatants count
|
||||
foreach (Mobile m in Caster.GetMobilesInRange(1)) //Range verified as 1
|
||||
if (m != Caster && m is PlayerMobile && Caster.CanBeBeneficial(m, false) &&
|
||||
Math.Abs(Caster.Skills.Spellweaving.Value - m.Skills.Spellweaving.Value) <= 20 && !(m is Clone))
|
||||
weavers.Add(m);
|
||||
// Everyone gets the Arcane Focus, power capped elsewhere
|
||||
|
||||
return weavers;
|
||||
}
|
||||
return weavers;
|
||||
}
|
||||
|
||||
private void GiveArcaneFocus( Mobile to, TimeSpan duration, int strengthBonus )
|
||||
{
|
||||
if ( to == null ) //Sanity
|
||||
return;
|
||||
private void GiveArcaneFocus(Mobile to, TimeSpan duration, int strengthBonus)
|
||||
{
|
||||
if (to == null) //Sanity
|
||||
return;
|
||||
|
||||
ArcaneFocus focus = FindArcaneFocus( to );
|
||||
ArcaneFocus focus = FindArcaneFocus(to);
|
||||
|
||||
if ( focus == null )
|
||||
{
|
||||
ArcaneFocus f = new ArcaneFocus( duration, strengthBonus );
|
||||
if ( to.PlaceInBackpack( f ) )
|
||||
{
|
||||
f.SendTimeRemainingMessage( to );
|
||||
to.SendLocalizedMessage( 1072740 ); // An arcane focus appears in your backpack.
|
||||
}
|
||||
else
|
||||
{
|
||||
f.Delete();
|
||||
}
|
||||
|
||||
}
|
||||
else //OSI renewal rules: the new one will override the old one, always.
|
||||
{
|
||||
to.SendLocalizedMessage( 1072828 ); // Your arcane focus is renewed.
|
||||
focus.LifeSpan = duration;
|
||||
focus.CreationTime = DateTime.UtcNow;
|
||||
focus.StrengthBonus = strengthBonus;
|
||||
focus.InvalidateProperties();
|
||||
focus.SendTimeRemainingMessage( to );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (focus == null)
|
||||
{
|
||||
ArcaneFocus f = new ArcaneFocus(duration, strengthBonus);
|
||||
if (to.PlaceInBackpack(f))
|
||||
{
|
||||
f.SendTimeRemainingMessage(to);
|
||||
to.SendLocalizedMessage(1072740); // An arcane focus appears in your backpack.
|
||||
}
|
||||
else
|
||||
{
|
||||
f.Delete();
|
||||
}
|
||||
}
|
||||
else //OSI renewal rules: the new one will override the old one, always.
|
||||
{
|
||||
to.SendLocalizedMessage(1072828); // Your arcane focus is renewed.
|
||||
focus.LifeSpan = duration;
|
||||
focus.CreationTime = DateTime.UtcNow;
|
||||
focus.StrengthBonus = strengthBonus;
|
||||
focus.InvalidateProperties();
|
||||
focus.SendTimeRemainingMessage(to);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue