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

eos fix for pet issue. client ver bug fix. cliloc updates.

Browse source
This commit is contained in:
xavier 2011-10-02 02:51:09 +00:00
parent 59a5d8e684
commit 4ff574358a
4 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Scripts/Engines/Harvest/Fishing.cs
View file

@ -2,6 +2,7 @@ using System;
using Server;
using Server.Items;
using Server.Mobiles;
using Server.Network;
using Server.Engines.Quests;
using Server.Engines.Quests.Collector;
using System.Collections.Generic;
@ -440,7 +441,7 @@ namespace Server.Engines.Harvest
else if ( item is Fish )
{
number = 1008124;
name = "a fish";
name = item.ItemData.Name;
}
else if ( item is BaseShoes )
{
@ -474,7 +475,12 @@ namespace Server.Engines.Harvest
name = item.ItemData.Name;
}
if ( number == 1043297 )
NetState ns = from.NetState;
if ( ns == null )
return;
if ( number == 1043297 || ns.HighSeas )
from.SendLocalizedMessage( number, name );
else
from.SendLocalizedMessage( number, true, name );

3
Scripts/Items/Special/Solen Items/BallOfSummoning.cs
View file

@ -293,6 +293,9 @@ namespace Server.Items
pet.IsStabled = false;
from.Stabled.Remove( pet );
if ( from is PlayerMobile )
((PlayerMobile)from).AutoStabled.Remove( pet );
}
pet.MoveToWorld( from.Location, from.Map );

2
Scripts/Misc/ClientVerification.cs
View file

@ -182,7 +182,7 @@ namespace Server.Misc
case OldClientResponse.Warn:
{
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;
}
case OldClientResponse.LenientKick:

25
Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs
View file

@ -182,7 +182,7 @@ namespace Server.Mobiles
m_Trainer.SayTo( from, 1048053 ); // You can't stable that!
}
}
private void CloseClaimList( Mobile from )
{
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() )
return;
if ( !from.InRange( this, 14 ) )
{
from.SendLocalizedMessage( 500446 ); // That is too far away.
@ -232,6 +232,9 @@ namespace Server.Mobiles
DoClaim( from, pet );
from.Stabled.Remove( pet );
if ( from is PlayerMobile )
((PlayerMobile)from).AutoStabled.Remove( pet );
}
else
{
@ -245,7 +248,7 @@ namespace Server.Mobiles
return;
Container bank = from.FindBankNoCreate();
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.
@ -314,7 +317,7 @@ namespace Server.Mobiles
pet.IsStabled = true;
if ( Core.SE )
if ( Core.SE )
pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully happy
from.Stabled.Add( pet );
@ -340,7 +343,7 @@ namespace Server.Mobiles
bool claimed = false;
int stabled = 0;
bool claimByName = ( petName != null );
for ( int i = 0; i < from.Stabled.Count; ++i )
@ -365,6 +368,10 @@ namespace Server.Mobiles
DoClaim( from, pet );
from.Stabled.RemoveAt( i );
if ( from is PlayerMobile )
((PlayerMobile)from).AutoStabled.Remove( pet );
--i;
claimed = true;
@ -416,16 +423,16 @@ namespace Server.Mobiles
if ( !e.Handled && e.HasKeyword( 0x0008 ) ) // *stable*
{
e.Handled = true;
CloseClaimList( e.Mobile );
CloseClaimList( e.Mobile );
BeginStable( e.Mobile );
}
else if ( !e.Handled && e.HasKeyword( 0x0009 ) ) // *claim*
{
e.Handled = true;
CloseClaimList( e.Mobile );
int index = e.Speech.IndexOf( ' ' );
if ( index != -1 )