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

misc changes laying around

Browse source
This commit is contained in:
mark 2007-10-12 18:37:47 +00:00
parent a48e8d7633
commit 36868afd0a
12 changed files with 70 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Items/Misc/Bola.cs
View file

@ -179,8 +179,6 @@ namespace Server.Items
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );

2
Scripts/Items/Misc/BolaBall.cs
View file

@ -22,8 +22,6 @@ namespace Server.Items
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );

14
Scripts/Items/Misc/IDurability.cs
View file

@ -3,19 +3,19 @@ using Server;
namespace Server.Items
{
interface IDurability
interface IDurability
{
int InitMinHits { get; }
int InitMaxHits { get; }
int InitMinHits { get; }
int InitMaxHits { get; }
int HitPoints { get; set; }
int MaxHitPoints { get; set; }
int HitPoints { get; set; }
int MaxHitPoints { get; set; }
//Maybe a scale/unscale durability?
}
interface IWearableDurability : IDurability
interface IWearableDurability : IDurability
{
int OnHit( BaseWeapon weapon, int damageTaken );
int OnHit( BaseWeapon weapon, int damageTaken );
}
}

11
Scripts/Items/Misc/PublicMoongate.cs
View file

@ -1,10 +1,11 @@
using System;
using System.Collections.Generic;
using Server;
using Server.Gumps;
using Server.Network;
using Server.Mobiles;
using Server.Commands;
using Server.Gumps;
using Server.Mobiles;
using Server.Network;
using Server.Spells;
namespace Server.Items
{
@ -61,7 +62,7 @@ namespace Server.Items
m.SendLocalizedMessage( 1005561, "", 0x22 ); // Thou'rt a criminal and cannot escape so easily.
return false;
}
else if ( Server.Spells.SpellHelper.CheckCombat( m ) )
else if ( SpellHelper.CheckCombat( m ) )
{
m.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle??
return false;
@ -438,7 +439,7 @@ namespace Server.Items
{
m_Mobile.SendLocalizedMessage( 1005561, "", 0x22 ); // Thou'rt a criminal and cannot escape so easily.
}
else if ( Server.Spells.SpellHelper.CheckCombat( m_Mobile ) )
else if ( SpellHelper.CheckCombat( m_Mobile ) )
{
m_Mobile.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle??
}

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

@ -1,12 +1,13 @@
using System;
using Server;
using Server.Network;
using Server.Spells;
namespace Server.Items
{
public class Teleporter : Item
{
private bool m_Active, m_Creatures;
private bool m_Active, m_Creatures, m_CombatCheck;
private Point3D m_PointDest;
private Map m_MapDest;
private bool m_SourceEffect;
@ -70,6 +71,14 @@ namespace Server.Items
set { m_Creatures = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool CombatCheck
{
get { return m_CombatCheck; }
set { m_CombatCheck = value; InvalidateProperties(); }
}
public override int LabelNumber{ get{ return 1026095; } } // teleporter
[Constructable]
@ -92,6 +101,8 @@ namespace Server.Items
m_PointDest = pointDest;
m_MapDest = mapDest;
m_Creatures = creatures;
m_CombatCheck = false;
}
public override void GetProperties( ObjectPropertyList list )
@ -178,6 +189,11 @@ namespace Server.Items
{
if ( !m_Creatures && !m.Player )
return true;
else if ( m_CombatCheck && SpellHelper.CheckCombat( m ) )
{
m.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle??
return true;
}
StartTeleport( m );
return false;
@ -194,7 +210,9 @@ namespace Server.Items
{
base.Serialize( writer );
writer.Write( (int) 2 ); // version
writer.Write( (int) 3 ); // version
writer.Write( (bool) m_CombatCheck );
writer.Write( (bool) m_SourceEffect );
writer.Write( (bool) m_DestEffect );
@ -216,6 +234,11 @@ namespace Server.Items
switch ( version )
{
case 3:
{
m_CombatCheck = reader.ReadBool();
goto case 2;
}
case 2:
{
m_SourceEffect = reader.ReadBool();