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

Lots of fixes, changes, rewrites of various things, including but not limited to:

Browse source 
Logging of staff crafting items,
Fixes for the OSI client changes
The potion stacking stuff
BaseWeapon fix, so that damage increase things don't multiply themselves.
admin gump fixes for Firewall
Various display tweaks for weight
SoS no longer spawn in Tokuno
Hiryu hues happified to OSI standards
staff now see alliance chat correctly
Play barkeeper text increased per OSI
Various other OSI skill requirement changes
Various unimplemented features of the SE moves
EventSink for when the client version is received from client.
Client validation moved out of the core.
Client version validation now has options to ignore/kick/warn/annoy.  Automagically tries to detect current client.
Reverted the delayeddamagecontext back to OSI standards.
Can no longer use bags of sending in jail.

MagerySpell implemented. Now only Magery spells have a circle, and various other properties of 'em.
TransformationSpellHelper now implemented.  Things moved around for this.
Spells now need a Timespan for the cast delay, instead of arbitrarily based on Circle.  Circle doesn't make sense for non-Magery spells!
Alot of the spellweaving spells added to OSI standards.
This commit is contained in:
asayre 2007-05-26 03:12:41 +00:00
parent f12e9745c6
commit 2ad37d54aa
214 changed files with 4881 additions and 1243 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Scripts/Spells/Seventh/ChainLightning.cs
View file

@ -6,11 +6,10 @@ using Server.Targeting;
namespace Server.Spells.Seventh
{
public class ChainLightningSpell : Spell
public class ChainLightningSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Chain Lightning", "Vas Ort Grav",
SpellCircle.Seventh,
209,
9022,
false,
@ -20,6 +19,8 @@ namespace Server.Spells.Seventh
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Seventh; } }
public ChainLightningSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}

5
Scripts/Spells/Seventh/EnergyField.cs
View file

@ -6,11 +6,10 @@ using Server.Items;
namespace Server.Spells.Seventh
{
public class EnergyFieldSpell : Spell
public class EnergyFieldSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Energy Field", "In Sanct Grav",
SpellCircle.Seventh,
221,
9022,
false,
@ -20,6 +19,8 @@ namespace Server.Spells.Seventh
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Seventh; } }
public EnergyFieldSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}

5
Scripts/Spells/Seventh/FlameStrike.cs
View file

@ -4,17 +4,18 @@ using Server.Network;
namespace Server.Spells.Seventh
{
public class FlameStrikeSpell : Spell
public class FlameStrikeSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Flame Strike", "Kal Vas Flam",
SpellCircle.Seventh,
245,
9042,
Reagent.SpidersSilk,
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Seventh; } }
public FlameStrikeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}

5
Scripts/Spells/Seventh/GateTravel.cs
View file

@ -9,11 +9,10 @@ using Server.Mobiles;
namespace Server.Spells.Seventh
{
public class GateTravelSpell : Spell
public class GateTravelSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Gate Travel", "Vas Rel Por",
SpellCircle.Seventh,
263,
9032,
Reagent.BlackPearl,
@ -21,6 +20,8 @@ namespace Server.Spells.Seventh
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Seventh; } }
private RunebookEntry m_Entry;
public GateTravelSpell( Mobile caster, Item scroll ) : this( caster, scroll, null )

5
Scripts/Spells/Seventh/ManaVampire.cs
View file

@ -4,11 +4,10 @@ using Server.Network;
namespace Server.Spells.Seventh
{
public class ManaVampireSpell : Spell
public class ManaVampireSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Mana Vampire", "Ort Sanct",
SpellCircle.Seventh,
221,
9032,
Reagent.BlackPearl,
@ -17,6 +16,8 @@ namespace Server.Spells.Seventh
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Seventh; } }
public ManaVampireSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}

5
Scripts/Spells/Seventh/MassDispel.cs
View file

@ -8,11 +8,10 @@ using Server.Mobiles;
namespace Server.Spells.Seventh
{
public class MassDispelSpell : Spell
public class MassDispelSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Mass Dispel", "Vas An Ort",
SpellCircle.Seventh,
263,
9002,
Reagent.Garlic,
@ -21,6 +20,8 @@ namespace Server.Spells.Seventh
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Seventh; } }
public MassDispelSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}

5
Scripts/Spells/Seventh/MeteorSwarm.cs
View file

@ -6,11 +6,10 @@ using Server.Targeting;
namespace Server.Spells.Seventh
{
public class MeteorSwarmSpell : Spell
public class MeteorSwarmSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Meteor Swarm", "Flam Kal Des Ylem",
SpellCircle.Seventh,
233,
9042,
false,
@ -20,6 +19,8 @@ namespace Server.Spells.Seventh
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Seventh; } }
public MeteorSwarmSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}

9
Scripts/Spells/Seventh/Polymorph.cs
View file

@ -8,11 +8,10 @@ using Server.Spells.Fifth;
namespace Server.Spells.Seventh
{
public class PolymorphSpell : Spell
public class PolymorphSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Polymorph", "Vas Ylem Rel",
SpellCircle.Seventh,
221,
9002,
Reagent.Bloodmoss,
@ -20,6 +19,8 @@ namespace Server.Spells.Seventh
Reagent.MandrakeRoot
);
public override SpellCircle Circle { get { return SpellCircle.Seventh; } }
private int m_NewBody;
public PolymorphSpell( Mobile caster, Item scroll, int body ) : base( caster, scroll, m_Info )
@ -44,7 +45,7 @@ namespace Server.Spells.Seventh
Caster.SendLocalizedMessage( 1010521 ); // You cannot polymorph while you have a Town Sigil
return false;
}
else if ( Necromancy.TransformationSpell.UnderTransformation( Caster ) )
else if( TransformationSpellHelper.UnderTransformation( Caster ) )
{
Caster.SendLocalizedMessage( 1061633 ); // You cannot polymorph while in that form.
return false;
@ -100,7 +101,7 @@ namespace Server.Spells.Seventh
else
Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect.
}
else if ( Necromancy.TransformationSpell.UnderTransformation( Caster ) )
else if( TransformationSpellHelper.UnderTransformation( Caster ) )
{
Caster.SendLocalizedMessage( 1061633 ); // You cannot polymorph while in that form.
}