Lots of fixes, changes, rewrites of various things, including but not limited to:
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:
parent
f12e9745c6
commit
2ad37d54aa
214 changed files with 4881 additions and 1243 deletions
|
|
@ -10,11 +10,12 @@ namespace Server.Spells.Chivalry
|
|||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Cleanse By Fire", "Expor Flamus",
|
||||
SpellCircle.Fourth, // 0 + 1.0 = 1s base cast delay
|
||||
-1,
|
||||
9002
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } }
|
||||
|
||||
public override double RequiredSkill{ get{ return 5.0; } }
|
||||
public override int RequiredMana{ get{ return 10; } }
|
||||
public override int RequiredTithing{ get{ return 10; } }
|
||||
|
|
|
|||
|
|
@ -11,11 +11,12 @@ namespace Server.Spells.Chivalry
|
|||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Close Wounds", "Obsu Vulni",
|
||||
SpellCircle.Sixth, // 0 + 1.5 = 1.5s base cast delay
|
||||
-1,
|
||||
9002
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
|
||||
|
||||
public override double RequiredSkill{ get{ return 0.0; } }
|
||||
public override int RequiredMana{ get{ return 10; } }
|
||||
public override int RequiredTithing{ get{ return 10; } }
|
||||
|
|
@ -71,7 +72,9 @@ namespace Server.Spells.Chivalry
|
|||
if ( (m.Hits + toHeal) > m.HitsMax )
|
||||
toHeal = m.HitsMax - m.Hits;
|
||||
|
||||
m.Hits += toHeal;
|
||||
//m.Hits += toHeal; //Was previosuly due to the message
|
||||
//m.Heal( toHeal, Caster, false );
|
||||
SpellHelper.Heal( toHeal, m, Caster, false );
|
||||
|
||||
m.SendLocalizedMessage( 1060203, toHeal.ToString() ); // You have had ~1_HEALED_AMOUNT~ hit points of damage healed.
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,12 @@ namespace Server.Spells.Chivalry
|
|||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Consecrate Weapon", "Consecrus Arma",
|
||||
SpellCircle.Second, // 0 + 0.5 = 0.5s base cast delay
|
||||
-1,
|
||||
9002
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.5 ); } }
|
||||
|
||||
public override double RequiredSkill{ get{ return 15.0; } }
|
||||
public override int RequiredMana{ get{ return 10; } }
|
||||
public override int RequiredTithing{ get{ return 10; } }
|
||||
|
|
|
|||
|
|
@ -12,11 +12,12 @@ namespace Server.Spells.Chivalry
|
|||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Dispel Evil", "Dispiro Malas",
|
||||
SpellCircle.First, // 0 + 0.25 = 0.25s base cast delay
|
||||
-1,
|
||||
9002
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.25 ); } }
|
||||
|
||||
public override double RequiredSkill{ get{ return 35.0; } }
|
||||
public override int RequiredMana{ get{ return 10; } }
|
||||
public override int RequiredTithing{ get{ return 10; } }
|
||||
|
|
@ -93,7 +94,8 @@ namespace Server.Spells.Chivalry
|
|||
}
|
||||
}
|
||||
|
||||
if ( TransformationSpell.GetContext( m ) != null )
|
||||
TransformContext context = TransformationSpellHelper.GetContext( m );
|
||||
if( context != null && context.Spell is NecromancerSpell ) //Trees are not evil! TODO: OSI confirm?
|
||||
{
|
||||
// transformed ..
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,12 @@ namespace Server.Spells.Chivalry
|
|||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Divine Fury", "Divinum Furis",
|
||||
SpellCircle.Fourth, // 0 + 1.0 = 1s base cast delay
|
||||
-1,
|
||||
9002
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } }
|
||||
|
||||
public override double RequiredSkill{ get{ return 25.0; } }
|
||||
public override int RequiredMana{ get{ return 15; } }
|
||||
public override int RequiredTithing{ get{ return 10; } }
|
||||
|
|
|
|||
|
|
@ -12,11 +12,12 @@ namespace Server.Spells.Chivalry
|
|||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Enemy of One", "Forul Solum",
|
||||
SpellCircle.Second, // 0 + 0.5 = 0.5s base cast delay
|
||||
-1,
|
||||
9002
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.5 ); } }
|
||||
|
||||
public override double RequiredSkill{ get{ return 45.0; } }
|
||||
public override int RequiredMana{ get{ return 20; } }
|
||||
public override int RequiredTithing{ get{ return 10; } }
|
||||
|
|
|
|||
|
|
@ -10,11 +10,12 @@ namespace Server.Spells.Chivalry
|
|||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Holy Light", "Augus Luminos",
|
||||
SpellCircle.Seventh, // 0 + 1.75 = 1.75s base cast delay
|
||||
-1,
|
||||
9002
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.75 ); } }
|
||||
|
||||
public override double RequiredSkill{ get{ return 55.0; } }
|
||||
public override int RequiredMana{ get{ return 10; } }
|
||||
public override int RequiredTithing{ get{ return 10; } }
|
||||
|
|
|
|||
|
|
@ -16,11 +16,12 @@ namespace Server.Spells.Chivalry
|
|||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Noble Sacrifice", "Dium Prostra",
|
||||
SpellCircle.Sixth, // 0 + 1.5 = 1.5s base cast delay
|
||||
-1,
|
||||
9002
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
|
||||
|
||||
public override double RequiredSkill{ get{ return 65.0; } }
|
||||
public override int RequiredMana{ get{ return 20; } }
|
||||
public override int RequiredTithing{ get{ return 30; } }
|
||||
|
|
@ -109,7 +110,7 @@ namespace Server.Spells.Chivalry
|
|||
toHeal = 24;
|
||||
|
||||
Caster.DoBeneficial( m );
|
||||
m.Heal( toHeal );
|
||||
m.Heal( toHeal, Caster );
|
||||
sendEffect = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ namespace Server.Spells.Chivalry
|
|||
|
||||
public override bool ClearHandsOnCast{ get{ return false; } }
|
||||
|
||||
public override int CastDelayBase{ get{ return 1; } }
|
||||
//public override int CastDelayBase{ get{ return 1; } }
|
||||
|
||||
public override int CastRecoveryBase{ get{ return 7; } }
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,12 @@ namespace Server.Spells.Chivalry
|
|||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Remove Curse", "Extermo Vomica",
|
||||
SpellCircle.Sixth, // 0 + 1.5 = 1.5s base cast delay
|
||||
-1,
|
||||
9002
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
|
||||
|
||||
public override double RequiredSkill{ get{ return 5.0; } }
|
||||
public override int RequiredMana{ get{ return 20; } }
|
||||
public override int RequiredTithing{ get{ return 10; } }
|
||||
|
|
|
|||
|
|
@ -12,11 +12,12 @@ namespace Server.Spells.Chivalry
|
|||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Sacred Journey", "Sanctum Viatas",
|
||||
SpellCircle.Sixth, // 0 + 1.5 = 1.5s base cast delay
|
||||
-1,
|
||||
9002
|
||||
);
|
||||
|
||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
|
||||
|
||||
public override double RequiredSkill{ get{ return 15.0; } }
|
||||
public override int RequiredMana{ get{ return 10; } }
|
||||
public override int RequiredTithing{ get{ return 15; } }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue