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

- Opening a corpse while hidden is not anymore considered a revealing action. Also other tweaks about corpses and revealing

Browse source 
(http://www.uodemise.com/forum/showthread.php?t=142122)

- Herding now works on creatures from champion spawns and on all of tameable creatures
(http://www.uodemise.com/forum/showthread.php?t=121415)

- I hate leading spaces too! (especially on Corpse.cs)
This commit is contained in:
daedalus 2010-05-29 17:08:50 +00:00
parent f2a557ac05
commit 3956b8c804
6 changed files with 224 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Scripts/Mobiles/AI/AI/BaseAI.cs
View file

@ -904,19 +904,30 @@ namespace Server.Mobiles
public virtual bool DoActionCombat()
{
Mobile c = m_Mobile.Combatant;
if( c == null || c.Deleted || c.Map != m_Mobile.Map || !c.Alive || c.IsDeadBondedPet )
Action = ActionType.Wander;
if ( CheckHerding() )
{
m_Mobile.DebugSay( "Praise the shepherd!" );
}
else
m_Mobile.Direction = m_Mobile.GetDirectionTo( c );
{
Mobile c = m_Mobile.Combatant;
if ( c == null || c.Deleted || c.Map != m_Mobile.Map || !c.Alive || c.IsDeadBondedPet )
Action = ActionType.Wander;
else
m_Mobile.Direction = m_Mobile.GetDirectionTo( c );
}
return true;
}
public virtual bool DoActionGuard()
{
if( DateTime.Now < m_NextStopGuard )
if ( CheckHerding() )
{
m_Mobile.DebugSay( "Praise the shepherd!" );
}
else if( DateTime.Now < m_NextStopGuard )
{
m_Mobile.DebugSay( "I am on guard" );
//m_Mobile.Turn( Utility.Random(0, 2) - 1 );
@ -1207,14 +1218,14 @@ namespace Server.Mobiles
public virtual bool CheckHerding()
{
Point2D target = m_Mobile.TargetLocation;
IPoint2D target = m_Mobile.TargetLocation;
if( target == Point2D.Zero )
if ( target == null )
return false; // Creature is not being herded
double distance = m_Mobile.GetDistanceToSqrt( target );
if( distance < 1 || distance > 20 )
if( distance < 1 || distance > 15 )
{
if( distance < 1 && target.X == 1076 && target.Y == 450 && (m_Mobile is HordeMinionFamiliar) )
{
@ -1237,7 +1248,7 @@ namespace Server.Mobiles
}
}
m_Mobile.TargetLocation = Point2D.Zero;
m_Mobile.TargetLocation = null;
return false; // At the target or too far away
}

41
Scripts/Mobiles/AI/Creature/BaseCreature.cs
View file

@ -217,7 +217,7 @@ namespace Server.Mobiles
private Mobile m_bBardTarget = null;
private DateTime m_timeBardEnd;
private WayPoint m_CurrentWayPoint = null;
private Point2D m_TargetLocation = Point2D.Zero;
private IPoint2D m_TargetLocation = null;
private Mobile m_SummonMaster;
@ -1084,7 +1084,7 @@ namespace Server.Mobiles
}
[CommandProperty( AccessLevel.GameMaster )]
public Point2D TargetLocation
public IPoint2D TargetLocation
{
get
{
@ -1365,18 +1365,18 @@ namespace Server.Mobiles
if ( wool != 0 )
{
corpse.AddCarvedItem( new Wool( wool ), from );
corpse.AddCarvedItem( new Wool( wool ), from );
from.SendLocalizedMessage( 500483 ); // You shear it, and the wool is now on the corpse.
}
if ( meat != 0 )
{
if ( MeatType == MeatType.Ribs )
corpse.AddCarvedItem( new RawRibs( meat ), from );
corpse.AddCarvedItem( new RawRibs( meat ), from );
else if ( MeatType == MeatType.Bird )
corpse.AddCarvedItem( new RawBird( meat ), from );
corpse.AddCarvedItem( new RawBird( meat ), from );
else if ( MeatType == MeatType.LambLeg )
corpse.AddCarvedItem( new RawLambLeg( meat ), from );
corpse.AddCarvedItem( new RawLambLeg( meat ), from );
from.SendLocalizedMessage( 500467 ); // You carve some meat, which remains on the corpse.
}
@ -1428,20 +1428,20 @@ namespace Server.Mobiles
switch ( sc )
{
case ScaleType.Red: corpse.AddCarvedItem( new RedScales( scales ), from ); break;
case ScaleType.Yellow: corpse.AddCarvedItem( new YellowScales( scales ), from ); break;
case ScaleType.Black: corpse.AddCarvedItem( new BlackScales( scales ), from ); break;
case ScaleType.Green: corpse.AddCarvedItem( new GreenScales( scales ), from ); break;
case ScaleType.White: corpse.AddCarvedItem( new WhiteScales( scales ), from ); break;
case ScaleType.Blue: corpse.AddCarvedItem( new BlueScales( scales ), from ); break;
case ScaleType.Red: corpse.AddCarvedItem( new RedScales( scales ), from ); break;
case ScaleType.Yellow: corpse.AddCarvedItem( new YellowScales( scales ), from ); break;
case ScaleType.Black: corpse.AddCarvedItem( new BlackScales( scales ), from ); break;
case ScaleType.Green: corpse.AddCarvedItem( new GreenScales( scales ), from ); break;
case ScaleType.White: corpse.AddCarvedItem( new WhiteScales( scales ), from ); break;
case ScaleType.Blue: corpse.AddCarvedItem( new BlueScales( scales ), from ); break;
case ScaleType.All:
{
corpse.AddCarvedItem( new RedScales( scales ), from );
corpse.AddCarvedItem( new YellowScales( scales ), from );
corpse.AddCarvedItem( new BlackScales( scales ), from );
corpse.AddCarvedItem( new GreenScales( scales ), from );
corpse.AddCarvedItem( new WhiteScales( scales ), from );
corpse.AddCarvedItem( new BlueScales( scales ), from );
corpse.AddCarvedItem( new RedScales( scales ), from );
corpse.AddCarvedItem( new YellowScales( scales ), from );
corpse.AddCarvedItem( new BlackScales( scales ), from );
corpse.AddCarvedItem( new GreenScales( scales ), from );
corpse.AddCarvedItem( new WhiteScales( scales ), from );
corpse.AddCarvedItem( new BlueScales( scales ), from );
break;
}
}
@ -2346,6 +2346,9 @@ namespace Server.Mobiles
{
get
{
if ( m_TargetLocation != null )
return 0.3;
return m_dCurrentSpeed;
}
set
@ -4957,7 +4960,7 @@ namespace Server.Mobiles
{
// *rummages through a corpse and takes an item*
PublicOverheadMessage( MessageType.Emote, 0x3B2, 1008086 );
//TODO: Instancing of Rummaged stuff.
//TODO: Instancing of Rummaged stuff.
return true;
}
}