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

- Added hues to elven glasses.

Browse source 
- Aegis of Grace now spawns with 255 durability.
- Corrected a TimeoutTeleporter issue causing them to re-teleport mobiles on server restart.
- Fixed SA doors for house customization.
This commit is contained in:
eos 2012-04-01 03:16:00 +00:00
parent a7d0379322
commit c7f8a29f1a
14 changed files with 150 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Scripts/Items/Armor/Glasses/AnthropomorphistGlasses.cs
View file

@ -23,6 +23,8 @@ namespace Server.Items
Attributes.BonusHits = 5;
Attributes.RegenMana = 3;
Attributes.ReflectPhysical = 20;
Hue = 0x80;
}
public AnthropomorphistGlasses( Serial serial ) : base( serial )
{
@ -31,13 +33,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x80;
}
}
}

7
Scripts/Items/Armor/Glasses/ArtsGlasses.cs
View file

@ -22,6 +22,8 @@ namespace Server.Items
Attributes.BonusStr = 5;
Attributes.BonusInt = 5;
Attributes.BonusHits = 15;
Hue = 0x73;
}
public ArtsGlasses( Serial serial ) : base( serial )
{
@ -30,13 +32,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x73;
}
}
}

7
Scripts/Items/Armor/Glasses/FoldedSteelGlasses.cs
View file

@ -22,6 +22,8 @@ namespace Server.Items
Attributes.BonusStr = 8;
Attributes.NightSight = 1;
Attributes.DefendChance = 15;
Hue = 0x47E;
}
public FoldedSteelGlasses( Serial serial ) : base( serial )
{
@ -30,13 +32,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x47E;
}
}
}

7
Scripts/Items/Armor/Glasses/LightOfWayGlasses.cs
View file

@ -22,6 +22,8 @@ namespace Server.Items
Attributes.BonusStr = 7;
Attributes.BonusInt = 5;
Attributes.WeaponDamage = 30;
Hue = 0x256;
}
public LightOfWayGlasses( Serial serial ) : base( serial )
{
@ -30,13 +32,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x256;
}
}
}

7
Scripts/Items/Armor/Glasses/LyricalGlasses.cs
View file

@ -22,6 +22,8 @@ namespace Server.Items
WeaponAttributes.HitLowerDefend = 20;
Attributes.NightSight = 1;
Attributes.ReflectPhysical = 15;
Hue = 0x47F;
}
public LyricalGlasses( Serial serial ) : base( serial )
{
@ -30,13 +32,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x47F;
}
}
}

7
Scripts/Items/Armor/Glasses/MaceShieldGlasses.cs
View file

@ -22,6 +22,8 @@ namespace Server.Items
WeaponAttributes.HitLowerDefend = 30;
Attributes.BonusStr = 10;
Attributes.BonusDex = 5;
Hue = 0x1DD;
}
public MaceShieldGlasses( Serial serial ) : base( serial )
{
@ -30,13 +32,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x1DD;
}
}
}

7
Scripts/Items/Armor/Glasses/MaritimeGlasses.cs
View file

@ -22,6 +22,8 @@ namespace Server.Items
Attributes.Luck = 150;
Attributes.NightSight = 1;
Attributes.ReflectPhysical = 20;
Hue = 0x581;
}
public MaritimeGlasses( Serial serial ) : base( serial )
{
@ -30,13 +32,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x581;
}
}
}

7
Scripts/Items/Armor/Glasses/NecromanticGlasses.cs
View file

@ -21,6 +21,8 @@ namespace Server.Items
{
Attributes.LowerManaCost = 15;
Attributes.LowerRegCost = 30;
Hue = 0x22D;
}
public NecromanticGlasses( Serial serial ) : base( serial )
{
@ -29,13 +31,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x22D;
}
}
}

7
Scripts/Items/Armor/Glasses/PoisonedGlasses.cs
View file

@ -21,6 +21,8 @@ namespace Server.Items
{
Attributes.BonusStam = 3;
Attributes.RegenStam = 4;
Hue = 0x113;
}
public PoisonedGlasses( Serial serial ) : base( serial )
{
@ -29,13 +31,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x113;
}
}
}

7
Scripts/Items/Armor/Glasses/TreasureTrinketGlasses.cs
View file

@ -22,6 +22,8 @@ namespace Server.Items
Attributes.BonusInt = 10;
Attributes.BonusHits = 5;
Attributes.SpellDamage = 10;
Hue = 0x1C2;
}
public TreasureTrinketGlasses( Serial serial ) : base( serial )
{
@ -30,13 +32,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x1C2;
}
}
}

7
Scripts/Items/Armor/Glasses/WizardsGlasses.cs
View file

@ -22,6 +22,8 @@ namespace Server.Items
Attributes.BonusMana = 10;
Attributes.RegenMana = 3;
Attributes.SpellDamage = 15;
Hue = 0x2B0;
}
public WizardsGlasses( Serial serial ) : base( serial )
{
@ -30,13 +32,16 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 0 && Hue == 0 )
Hue = 0x2B0;
}
}
}

3
Scripts/Items/Minor Artifacts/ML/AegisOfGrace.cs
View file

@ -17,6 +17,9 @@ namespace Server.Items
public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Dragon; } }
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
public override int InitMinHits{ get{ return 255; } }
public override int InitMaxHits{ get{ return 255; } }
[Constructable]
public AegisOfGrace()
{

7
Scripts/Items/Misc/Teleporter.cs
View file

@ -759,6 +759,13 @@ namespace Server.Items
}
}
public override void DoTeleport( Mobile m )
{
m_Teleporting.Remove( m );
base.DoTeleport( m );
}
public override bool OnMoveOver( Mobile m )
{
if ( Active && ( m.Player || Creatures ) )

74
Scripts/Multis/HouseFoundation.cs
View file

@ -344,6 +344,52 @@ namespace Server.Multis
case 1: door = new GenericHouseDoor( facing, 0x368B, 0xEC, 0x3E7 ); break; //shadow
}
}
else if( itemID >= 0x409B && itemID < 0x40A3 )
{
door = new GenericHouseDoor( GetSADoorFacing( itemID - 0x409B ), itemID, 0xEA, 0xF1, false );
}
else if( itemID >= 0x410C && itemID < 0x4114 )
{
door = new GenericHouseDoor( GetSADoorFacing( itemID - 0x410C ), itemID, 0xEA, 0xF1, false );
}
else if( itemID >= 0x41C2 && itemID < 0x41CA )
{
door = new GenericHouseDoor( GetSADoorFacing( itemID - 0x41C2 ), itemID, 0xEA, 0xF1, false );
}
else if( itemID >= 0x41CF && itemID < 0x41D7 )
{
door = new GenericHouseDoor( GetSADoorFacing( itemID - 0x41CF ), itemID, 0xEA, 0xF1, false );
}
else if( itemID >= 0x436E && itemID < 0x437E )
{
/* These ones had to be different...
* Offset 0 2 4 6 8 10 12 14
* DoorFacing 2 3 2 3 6 7 6 7
*/
int offset = itemID - 0x436E;
DoorFacing facing = (DoorFacing)( ( offset / 2 + 2 * ( ( 1 + offset / 4 ) % 2 ) ) % 8 );
door = new GenericHouseDoor( facing, itemID, 0xEA, 0xF1, false );
}
else if( itemID >= 0x46DD && itemID < 0x46E5 )
{
door = new GenericHouseDoor( GetSADoorFacing( itemID - 0x46DD ), itemID, 0xEB, 0xF2, false );
}
else if( itemID >= 0x4D22 && itemID < 0x4D2A )
{
door = new GenericHouseDoor( GetSADoorFacing( itemID - 0x4D22 ), itemID, 0xEA, 0xF1, false );
}
else if( itemID >= 0x50C8 && itemID < 0x50D0 )
{
door = new GenericHouseDoor( GetSADoorFacing( itemID - 0x50C8 ), itemID, 0xEA, 0xF1, false );
}
else if( itemID >= 0x50D0 && itemID < 0x50D8 )
{
door = new GenericHouseDoor( GetSADoorFacing( itemID - 0x50D0 ), itemID, 0xEA, 0xF1, false );
}
else if( itemID >= 0x5142 && itemID < 0x514A )
{
door = new GenericHouseDoor( GetSADoorFacing( itemID - 0x5142 ), itemID, 0xF0, 0xEF, false );
}
if( door != null )
{
@ -420,6 +466,14 @@ namespace Server.Multis
}
}
private static DoorFacing GetSADoorFacing( int offset )
{
/* Offset 0 2 4 6
* DoorFacing 2 3 6 7
*/
return (DoorFacing)( ( offset / 2 + 2 * ( 1 + offset / 4 ) ) % 8 );
}
public void AddFixture( Item item, MultiTileEntry mte )
{
m_Fixtures.Add( item );
@ -1894,6 +1948,26 @@ namespace Server.Multis
return true;
else if( itemID >= 0x367B && itemID < 0x369B )
return true;
#region SA doors
else if( itemID >= 0x409B && itemID < 0x40A3 )
return true;
else if( itemID >= 0x410C && itemID < 0x4114 )
return true;
else if( itemID >= 0x41C2 && itemID < 0x41CA )
return true;
else if( itemID >= 0x41CF && itemID < 0x41D7 )
return true;
else if( itemID >= 0x436E && itemID < 0x437E )
return true;
else if( itemID >= 0x46DD && itemID < 0x46E5 )
return true;
else if( itemID >= 0x4D22 && itemID < 0x4D2A )
return true;
else if( itemID >= 0x50C8 && itemID < 0x50D8 )
return true;
else if( itemID >= 0x5142 && itemID < 0x514A )
return true;
#endregion
return false;
}