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

6
Scripts/Items/Skill Items/Fishing/Misc/MessageInABottle.cs
View file

@ -58,7 +58,7 @@ namespace Server.Items
{
base.Serialize( writer );
writer.Write( (int) 2 ); // version
writer.Write( (int) 3 ); // version
writer.Write( (int) m_Level );
@ -73,6 +73,7 @@ namespace Server.Items
switch ( version )
{
case 3:
case 2:
{
m_Level = reader.ReadInt();
@ -92,6 +93,9 @@ namespace Server.Items
if ( version < 2 )
m_Level = GetRandomLevel();
if( version < 3 && m_TargetMap == Map.Tokuno )
m_TargetMap = Map.Trammel;
}
public override void OnDoubleClick( Mobile from )

6
Scripts/Items/Skill Items/Fishing/Misc/SOS.cs
View file

@ -100,7 +100,7 @@ namespace Server.Items
{
base.Serialize( writer );
writer.Write( (int) 3 ); // version
writer.Write( (int) 4 ); // version
writer.Write( m_Level );
@ -117,6 +117,7 @@ namespace Server.Items
switch ( version )
{
case 4:
case 3:
case 2:
{
@ -150,6 +151,9 @@ namespace Server.Items
if ( version < 3 )
UpdateHue();
if( version < 4 && m_TargetMap == Map.Tokuno )
m_TargetMap = Map.Trammel;
}
public override void OnDoubleClick( Mobile from )

39
Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs
View file

@ -209,19 +209,30 @@ namespace Server.Items
if ( item is BasePotion )
{
BasePotion pot = (BasePotion)item;
int toHold = Math.Min( 100 - m_Held, pot.Amount );
if ( m_Held == 0 )
if ( toHold <= 0 )
{
if ( GiveBottle( from ) )
from.SendLocalizedMessage( 502233 ); // The keg will not hold any more!
return false;
}
else if ( m_Held == 0 )
{
if ( GiveBottle( from, toHold ) )
{
m_Type = pot.PotionEffect;
Held = 1;
Held = toHold;
from.PlaySound( 0x240 );
from.SendLocalizedMessage( 502237 ); // You place the empty bottle in your backpack.
item.Delete();
item.Consume( toHold );
if( !item.Deleted )
item.Bounce( from );
return true;
}
else
@ -235,23 +246,21 @@ namespace Server.Items
from.SendLocalizedMessage( 502236 ); // You decide that it would be a bad idea to mix different types of potions.
return false;
}
else if ( m_Held >= 100 )
{
from.SendLocalizedMessage( 502233 ); // The keg will not hold any more!
return false;
}
else
{
if ( GiveBottle( from ) )
if ( GiveBottle( from, toHold ) )
{
++Held;
item.Delete();
Held += toHold;
from.PlaySound( 0x240 );
from.SendLocalizedMessage( 502237 ); // You place the empty bottle in your backpack.
item.Delete();
item.Consume( toHold );
if( !item.Deleted )
item.Bounce( from );
return true;
}
else
@ -268,11 +277,11 @@ namespace Server.Items
}
}
public bool GiveBottle( Mobile m )
public bool GiveBottle( Mobile m, int amount )
{
Container pack = m.Backpack;
Bottle bottle = new Bottle();
Bottle bottle = new Bottle( amount );
if ( pack == null || !pack.TryDropItem( m, bottle, false ) )
{

26
Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -1,6 +1,7 @@
using System;
using Server;
using Server.Engines.Craft;
using System.Collections.Generic;
namespace Server.Items
{
@ -51,7 +52,7 @@ namespace Server.Items
{
m_PotionEffect = effect;
Stackable = false;
Stackable = Core.ML;
Weight = 1.0;
}
@ -94,7 +95,7 @@ namespace Server.Items
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
writer.Write( (int) 1 ); // version
writer.Write( (int) m_PotionEffect );
}
@ -107,12 +108,16 @@ namespace Server.Items
switch ( version )
{
case 1:
case 0:
{
m_PotionEffect = (PotionEffect)reader.ReadInt();
break;
}
}
if( version == 0 )
Stackable = Core.ML;
}
public abstract void Drink( Mobile from );
@ -156,6 +161,15 @@ namespace Server.Items
return AOS.Scale( v, 100 + AosAttributes.GetValue( m, AosAttribute.EnhancePotions ) );
}
public override bool StackWith( Mobile from, Item dropped, bool playSound )
{
if( dropped is BasePotion && ((BasePotion)dropped).m_PotionEffect == m_PotionEffect )
return base.StackWith( from, dropped, playSound );
return false;
}
#region ICraftable Members
public int OnCraft( int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool, CraftItem craftItem, int resHue )
@ -166,11 +180,11 @@ namespace Server.Items
if ( pack != null )
{
Item[] kegs = pack.FindItemsByType( typeof( PotionKeg ), true );
List<PotionKeg> kegs = pack.FindItemsByType<PotionKeg>();
for ( int i = 0; i < kegs.Length; ++i )
for ( int i = 0; i < kegs.Count; ++i )
{
PotionKeg keg = kegs[i] as PotionKeg;
PotionKeg keg = kegs[i];
if ( keg == null )
continue;
@ -183,7 +197,7 @@ namespace Server.Items
++keg.Held;
Delete();
Consume();
from.AddToBackpack( new Bottle() );
return -1; // signal placed in keg

3
Scripts/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs
View file

@ -1,5 +1,6 @@
using System;
using Server;
using Server.Spells;
namespace Server.Items
{
@ -83,7 +84,7 @@ namespace Server.Items
public override void Drink( Mobile from )
{
if ( Spells.Necromancy.TransformationSpell.UnderTransformation( from, typeof( Spells.Necromancy.VampiricEmbraceSpell ) ) )
if ( TransformationSpellHelper.UnderTransformation( from, typeof( Spells.Necromancy.VampiricEmbraceSpell ) ) )
{
from.SendLocalizedMessage( 1061652 ); // The garlic in the potion would surely kill you.
}

7
Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -200,6 +200,11 @@ namespace Server.Items
Effects.SendMovingEffect( from, to, m_Potion.ItemID & 0x3FFF, 7, 0, false, false, m_Potion.Hue, 0 );
if( m_Potion.Amount > 1 )
{
Mobile.LiftItemDupe( m_Potion, 1 );
}
m_Potion.Internalize();
Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), new TimerStateCallback( m_Potion.Reposition_OnTick ), new object[]{ from, p, map } );
}
@ -210,7 +215,7 @@ namespace Server.Items
if ( Deleted )
return;
Delete();
Consume();
for ( int i = 0; m_Users != null && i < m_Users.Count; ++i )
{

550
Scripts/Items/Skill Items/Magical/Scrolls/SpellweavingScrolls.cs Normal file
View file

@ -0,0 +1,550 @@
using System;
using Server;
using Server.Items;
namespace Server.Items
{
public class ArcaneCircleScroll : SpellScroll
{
[Constructable]
public ArcaneCircleScroll()
: this( 1 )
{
}
[Constructable]
public ArcaneCircleScroll( int amount )
: base( 600, 0x2D51, amount )
{
}
public ArcaneCircleScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class GiftOfRenewalScroll : SpellScroll
{
[Constructable]
public GiftOfRenewalScroll()
: this( 1 )
{
}
[Constructable]
public GiftOfRenewalScroll( int amount )
: base( 601, 0x2D52, amount )
{
}
public GiftOfRenewalScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class ImmolatingWeaponScroll : SpellScroll
{
[Constructable]
public ImmolatingWeaponScroll()
: this( 1 )
{
}
[Constructable]
public ImmolatingWeaponScroll( int amount )
: base( 602, 0x2D53, amount )
{
}
public ImmolatingWeaponScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class AttuneWeaponScroll : SpellScroll
{
[Constructable]
public AttuneWeaponScroll()
: this( 1 )
{
}
[Constructable]
public AttuneWeaponScroll( int amount )
: base( 603, 0x2D54, amount )
{
}
public AttuneWeaponScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class ThunderstormScroll : SpellScroll
{
[Constructable]
public ThunderstormScroll()
: this( 1 )
{
}
[Constructable]
public ThunderstormScroll( int amount )
: base( 604, 0x2D55, amount )
{
}
public ThunderstormScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class NatureFuryScroll : SpellScroll
{
[Constructable]
public NatureFuryScroll()
: this( 1 )
{
}
[Constructable]
public NatureFuryScroll( int amount )
: base( 605, 0x2D56, amount )
{
}
public NatureFuryScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class SummonFeyScroll : SpellScroll
{
[Constructable]
public SummonFeyScroll()
: this( 1 )
{
}
[Constructable]
public SummonFeyScroll( int amount )
: base( 606, 0x2D57, amount )
{
}
public SummonFeyScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class SummonFiendScroll : SpellScroll
{
[Constructable]
public SummonFiendScroll()
: this( 1 )
{
}
[Constructable]
public SummonFiendScroll( int amount )
: base( 606, 0x2D57, amount )
{
}
public SummonFiendScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class ReaperFormScroll : SpellScroll
{
[Constructable]
public ReaperFormScroll()
: this( 1 )
{
}
[Constructable]
public ReaperFormScroll( int amount )
: base( 608, 0x2D59, amount )
{
}
public ReaperFormScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class WildfireScroll : SpellScroll
{
[Constructable]
public WildfireScroll()
: this( 1 )
{
}
[Constructable]
public WildfireScroll( int amount )
: base( 609, 0x2D5A, amount )
{
}
public WildfireScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class EssenceOfWindScroll : SpellScroll
{
[Constructable]
public EssenceOfWindScroll()
: this( 1 )
{
}
[Constructable]
public EssenceOfWindScroll( int amount )
: base( 610, 0x2D5B, amount )
{
}
public EssenceOfWindScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class DryadAllureScroll : SpellScroll
{
[Constructable]
public DryadAllureScroll()
: this( 1 )
{
}
[Constructable]
public DryadAllureScroll( int amount )
: base( 611, 0x2D5C, amount )
{
}
public DryadAllureScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class EtherealVoyageScroll : SpellScroll
{
[Constructable]
public EtherealVoyageScroll()
: this( 1 )
{
}
[Constructable]
public EtherealVoyageScroll( int amount )
: base( 612, 0x2D5D, amount )
{
}
public EtherealVoyageScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class WordOfDeathScroll : SpellScroll
{
[Constructable]
public WordOfDeathScroll()
: this( 1 )
{
}
[Constructable]
public WordOfDeathScroll( int amount )
: base( 613, 0x2D5E, amount )
{
}
public WordOfDeathScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class GiftOfLifeScroll : SpellScroll
{
[Constructable]
public GiftOfLifeScroll()
: this( 1 )
{
}
[Constructable]
public GiftOfLifeScroll( int amount )
: base( 614, 0x2D5F, amount )
{
}
public GiftOfLifeScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class ArcaneEmpowermentScroll : SpellScroll
{
[Constructable]
public ArcaneEmpowermentScroll()
: this( 1 )
{
}
[Constructable]
public ArcaneEmpowermentScroll( int amount )
: base( 615, 0x2D60, amount )
{
}
public ArcaneEmpowermentScroll( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}

2
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -265,6 +265,8 @@ namespace Server.Items
return ( book.SpellbookType == type && ( spellID == -1 || book.HasSpell( spellID ) ) );
}
public override bool DisplayWeight { get { return false; } }
private AosAttributes m_AosAttributes;
private AosSkillBonuses m_AosSkillBonuses;

4
Scripts/Items/Skill Items/Misc/Bandage.cs
View file

@ -310,7 +310,7 @@ namespace Server.Items
healerNumber = 1060088; // You bind the wound and stop the bleeding
patientNumber = 1060167; // The bleeding wounds have healed, you are no longer bleeding!
BleedAttack.EndBleed( m_Patient, true );
BleedAttack.EndBleed( m_Patient, false );
}
else if ( MortalStrike.IsWounded( m_Patient ) )
{
@ -365,7 +365,7 @@ namespace Server.Items
healerNumber = 500968; // You apply the bandages, but they barely help.
}
m_Patient.Heal( (int) toHeal, false );
m_Patient.Heal( (int) toHeal, m_Healer, false );
}
else
{

2
Scripts/Items/Skill Items/Thief/DisguiseKit.cs
View file

@ -68,7 +68,7 @@ namespace Server.Items
{
from.SendLocalizedMessage( 1010465 ); // You cannot disguise yourself while holding a sigil
}
else if ( TransformationSpell.UnderTransformation( from ) )
else if ( TransformationSpellHelper.UnderTransformation( from ) )
{
// You cannot disguise yourself while in that form.
from.SendLocalizedMessage( 1061634 );