eos fix for pet issue. client ver bug fix. cliloc updates.
This commit is contained in:
parent
59a5d8e684
commit
4ff574358a
4 changed files with 28 additions and 12 deletions
|
|
@ -2,6 +2,7 @@ using System;
|
||||||
using Server;
|
using Server;
|
||||||
using Server.Items;
|
using Server.Items;
|
||||||
using Server.Mobiles;
|
using Server.Mobiles;
|
||||||
|
using Server.Network;
|
||||||
using Server.Engines.Quests;
|
using Server.Engines.Quests;
|
||||||
using Server.Engines.Quests.Collector;
|
using Server.Engines.Quests.Collector;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
@ -440,7 +441,7 @@ namespace Server.Engines.Harvest
|
||||||
else if ( item is Fish )
|
else if ( item is Fish )
|
||||||
{
|
{
|
||||||
number = 1008124;
|
number = 1008124;
|
||||||
name = "a fish";
|
name = item.ItemData.Name;
|
||||||
}
|
}
|
||||||
else if ( item is BaseShoes )
|
else if ( item is BaseShoes )
|
||||||
{
|
{
|
||||||
|
|
@ -474,7 +475,12 @@ namespace Server.Engines.Harvest
|
||||||
name = item.ItemData.Name;
|
name = item.ItemData.Name;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( number == 1043297 )
|
NetState ns = from.NetState;
|
||||||
|
|
||||||
|
if ( ns == null )
|
||||||
|
return;
|
||||||
|
|
||||||
|
if ( number == 1043297 || ns.HighSeas )
|
||||||
from.SendLocalizedMessage( number, name );
|
from.SendLocalizedMessage( number, name );
|
||||||
else
|
else
|
||||||
from.SendLocalizedMessage( number, true, name );
|
from.SendLocalizedMessage( number, true, name );
|
||||||
|
|
|
||||||
|
|
@ -293,6 +293,9 @@ namespace Server.Items
|
||||||
|
|
||||||
pet.IsStabled = false;
|
pet.IsStabled = false;
|
||||||
from.Stabled.Remove( pet );
|
from.Stabled.Remove( pet );
|
||||||
|
|
||||||
|
if ( from is PlayerMobile )
|
||||||
|
((PlayerMobile)from).AutoStabled.Remove( pet );
|
||||||
}
|
}
|
||||||
|
|
||||||
pet.MoveToWorld( from.Location, from.Map );
|
pet.MoveToWorld( from.Location, from.Map );
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,7 @@ namespace Server.Misc
|
||||||
case OldClientResponse.Warn:
|
case OldClientResponse.Warn:
|
||||||
{
|
{
|
||||||
state.Mobile.SendMessage( 0x22, "Your client is out of date. Please update your client.", Required );
|
state.Mobile.SendMessage( 0x22, "Your client is out of date. Please update your client.", Required );
|
||||||
state.Mobile.SendMessage( 0x22, "This server reccomends that your client version be at least {0}.", Required );
|
state.Mobile.SendMessage( 0x22, "This server recommends that your client version be at least {0}.", Required );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case OldClientResponse.LenientKick:
|
case OldClientResponse.LenientKick:
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,7 @@ namespace Server.Mobiles
|
||||||
m_Trainer.SayTo( from, 1048053 ); // You can't stable that!
|
m_Trainer.SayTo( from, 1048053 ); // You can't stable that!
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CloseClaimList( Mobile from )
|
private void CloseClaimList( Mobile from )
|
||||||
{
|
{
|
||||||
from.CloseGump( typeof( ClaimListGump ) );
|
from.CloseGump( typeof( ClaimListGump ) );
|
||||||
|
|
@ -220,7 +220,7 @@ namespace Server.Mobiles
|
||||||
{
|
{
|
||||||
if ( pet == null || pet.Deleted || from.Map != this.Map || !from.Stabled.Contains( pet ) || !from.CheckAlive() )
|
if ( pet == null || pet.Deleted || from.Map != this.Map || !from.Stabled.Contains( pet ) || !from.CheckAlive() )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if ( !from.InRange( this, 14 ) )
|
if ( !from.InRange( this, 14 ) )
|
||||||
{
|
{
|
||||||
from.SendLocalizedMessage( 500446 ); // That is too far away.
|
from.SendLocalizedMessage( 500446 ); // That is too far away.
|
||||||
|
|
@ -232,6 +232,9 @@ namespace Server.Mobiles
|
||||||
DoClaim( from, pet );
|
DoClaim( from, pet );
|
||||||
|
|
||||||
from.Stabled.Remove( pet );
|
from.Stabled.Remove( pet );
|
||||||
|
|
||||||
|
if ( from is PlayerMobile )
|
||||||
|
((PlayerMobile)from).AutoStabled.Remove( pet );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -245,7 +248,7 @@ namespace Server.Mobiles
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Container bank = from.FindBankNoCreate();
|
Container bank = from.FindBankNoCreate();
|
||||||
|
|
||||||
if ( ( from.Backpack == null || from.Backpack.GetAmount( typeof( Gold ) ) < 30 ) && ( bank == null || bank.GetAmount( typeof( Gold ) ) < 30 ) )
|
if ( ( from.Backpack == null || from.Backpack.GetAmount( typeof( Gold ) ) < 30 ) && ( bank == null || bank.GetAmount( typeof( Gold ) ) < 30 ) )
|
||||||
{
|
{
|
||||||
SayTo( from, 1042556 ); // Thou dost not have enough gold, not even in thy bank account.
|
SayTo( from, 1042556 ); // Thou dost not have enough gold, not even in thy bank account.
|
||||||
|
|
@ -314,7 +317,7 @@ namespace Server.Mobiles
|
||||||
|
|
||||||
pet.IsStabled = true;
|
pet.IsStabled = true;
|
||||||
|
|
||||||
if ( Core.SE )
|
if ( Core.SE )
|
||||||
pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully happy
|
pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully happy
|
||||||
|
|
||||||
from.Stabled.Add( pet );
|
from.Stabled.Add( pet );
|
||||||
|
|
@ -340,7 +343,7 @@ namespace Server.Mobiles
|
||||||
|
|
||||||
bool claimed = false;
|
bool claimed = false;
|
||||||
int stabled = 0;
|
int stabled = 0;
|
||||||
|
|
||||||
bool claimByName = ( petName != null );
|
bool claimByName = ( petName != null );
|
||||||
|
|
||||||
for ( int i = 0; i < from.Stabled.Count; ++i )
|
for ( int i = 0; i < from.Stabled.Count; ++i )
|
||||||
|
|
@ -365,6 +368,10 @@ namespace Server.Mobiles
|
||||||
DoClaim( from, pet );
|
DoClaim( from, pet );
|
||||||
|
|
||||||
from.Stabled.RemoveAt( i );
|
from.Stabled.RemoveAt( i );
|
||||||
|
|
||||||
|
if ( from is PlayerMobile )
|
||||||
|
((PlayerMobile)from).AutoStabled.Remove( pet );
|
||||||
|
|
||||||
--i;
|
--i;
|
||||||
|
|
||||||
claimed = true;
|
claimed = true;
|
||||||
|
|
@ -416,16 +423,16 @@ namespace Server.Mobiles
|
||||||
if ( !e.Handled && e.HasKeyword( 0x0008 ) ) // *stable*
|
if ( !e.Handled && e.HasKeyword( 0x0008 ) ) // *stable*
|
||||||
{
|
{
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
|
|
||||||
CloseClaimList( e.Mobile );
|
CloseClaimList( e.Mobile );
|
||||||
BeginStable( e.Mobile );
|
BeginStable( e.Mobile );
|
||||||
}
|
}
|
||||||
else if ( !e.Handled && e.HasKeyword( 0x0009 ) ) // *claim*
|
else if ( !e.Handled && e.HasKeyword( 0x0009 ) ) // *claim*
|
||||||
{
|
{
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
|
|
||||||
CloseClaimList( e.Mobile );
|
CloseClaimList( e.Mobile );
|
||||||
|
|
||||||
int index = e.Speech.IndexOf( ' ' );
|
int index = e.Speech.IndexOf( ' ' );
|
||||||
|
|
||||||
if ( index != -1 )
|
if ( index != -1 )
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue