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

sync and some misc things

Browse source
This commit is contained in:
mark 2010-10-21 04:25:47 +00:00
parent d1f9a38518
commit ed97d43c9e
15 changed files with 77 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Accounting/Firewall.cs
View file

@ -147,7 +147,7 @@ namespace Server
if( obj is string )
return obj.Equals( m_Entry );
else if( obj is WildcardIPFirewallEntry )
m_Entry.Equals( ((WildcardIPFirewallEntry)obj).m_Entry );
return m_Entry.Equals( ((WildcardIPFirewallEntry)obj).m_Entry );
return false;
}

1
Scripts/Gumps/Guilds/GuildChangeTypeGump.cs
View file

@ -59,7 +59,6 @@ namespace Server.Gumps
}
else
{
GuildType newType;
switch ( info.ButtonID )

2
Scripts/Items/Clothing/BaseClothing.cs
View file

@ -167,7 +167,7 @@ namespace Server.Items
public virtual int BaseStrBonus{ get{ return 0; } }
public virtual int BaseDexBonus{ get{ return 0; } }
public virtual int BaseIntBonus { get { return 0; } }
public virtual int BaseIntBonus{ get{ return 0; } }
public override bool AllowSecureTrade( Mobile from, Mobile to, Mobile newOwner, bool accepted )
{

3
Scripts/Items/Lights/Candelabra.cs
View file

@ -56,7 +56,8 @@ namespace Server.Items
{
base.OnSingleClick( from );
LabelTo( from, 1041645 ); //recovered from a shipwreck
if ( m_IsShipwreckedItem )
LabelTo( from, 1041645 ); //recovered from a shipwreck
}
#region IShipwreckedItem Members

2
Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -172,8 +172,6 @@ namespace Server.Items
}
}
public class TrophyAddon : Item, IAddon
{
public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } }

2
Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs
View file

@ -43,7 +43,7 @@ namespace Server.Items
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
list.Add( 1076220 ); // 4st Year Veteran Reward
list.Add( 1076220 ); // 4th Year Veteran Reward
}
public override void Serialize( GenericWriter writer )

2
Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs
View file

@ -43,7 +43,7 @@ namespace Server.Items
base.GetProperties( list );
if ( Core.ML && m_IsRewardItem )
list.Add( 1076221 ); // 5st Year Veteran Reward
list.Add( 1076221 ); // 5th Year Veteran Reward
}
public override void Serialize( GenericWriter writer )

2
Scripts/Items/Weapons/BaseWeapon.cs
View file

@ -2456,7 +2456,7 @@ namespace Server.Items
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 9 ); // version
SaveFlag flags = SaveFlag.None;

4
Scripts/Items/Weapons/Ranged/BaseRanged.cs
View file

@ -144,9 +144,9 @@ namespace Server.Items
m_RecoveryTimer.Start();
}
}
} else {
Ammo.MoveToWorld( new Point3D( defender.X + Utility.RandomMinMax( -1, 1 ), defender.Y + Utility.RandomMinMax( -1, 1 ), defender.Z ), defender.Map );
}
else
Ammo.MoveToWorld( new Point3D( defender.X + Utility.RandomMinMax( -1, 1 ), defender.Y + Utility.RandomMinMax( -1, 1 ), defender.Z ), defender.Map );
}
base.OnMiss( attacker, defender );

2
Scripts/Misc/CharacterCreation.cs
View file

@ -1235,7 +1235,7 @@ namespace Server.Misc
private static void PackScroll( int circle )
{
switch ( Utility.Random( 8 ) * (circle * 8) )
switch ( Utility.Random( 8 ) * ( circle + 1 ) )
{
case 0: PackItem( new ClumsyScroll() ); break;
case 1: PackItem( new CreateFoodScroll() ); break;

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

@ -60,8 +60,8 @@ namespace Server.Mobiles
{
None = 0x0000,
Meat = 0x0001,
FruitsAndVegies = 0x0002,
GrainsAndHay = 0x0004,
FruitsAndVegies = 0x0002,
GrainsAndHay = 0x0004,
Fish = 0x0008,
Eggs = 0x0010,
Gold = 0x0020
@ -174,36 +174,36 @@ namespace Server.Mobiles
#region Var declarations
private BaseAI m_AI; // THE AI
private AIType m_CurrentAI; // The current AI
private AIType m_DefaultAI; // The default AI
private AIType m_CurrentAI; // The current AI
private AIType m_DefaultAI; // The default AI
private Mobile m_FocusMob; // Use focus mob instead of combatant, maybe we don't whan to fight
private FightMode m_FightMode; // The style the mob uses
private FightMode m_FightMode; // The style the mob uses
private int m_iRangePerception; // The view area
private int m_iRangeFight; // The fight distance
private bool m_bDebugAI; // Show debug AI messages
private bool m_bDebugAI; // Show debug AI messages
private int m_iTeam; // Monster Team
private int m_iTeam; // Monster Team
private double m_dActiveSpeed; // Timer speed when active
private double m_dPassiveSpeed; // Timer speed when not active
private double m_dCurrentSpeed; // The current speed, lets say it could be changed by something;
private double m_dActiveSpeed; // Timer speed when active
private double m_dPassiveSpeed; // Timer speed when not active
private double m_dCurrentSpeed; // The current speed, lets say it could be changed by something;
private Point3D m_pHome; // The home position of the creature, used by some AI
private Point3D m_pHome; // The home position of the creature, used by some AI
private int m_iRangeHome = 10; // The home range of the creature
List<Type> m_arSpellAttack; // List of attack spell/power
List<Type> m_arSpellDefense; // List of defensive spell/power
private bool m_bControlled; // Is controlled
private Mobile m_ControlMaster; // My master
private Mobile m_ControlTarget; // My target mobile
private Point3D m_ControlDest; // My target destination (patrol)
private OrderType m_ControlOrder; // My order
private bool m_bControlled; // Is controlled
private Mobile m_ControlMaster; // My master
private Mobile m_ControlTarget; // My target mobile
private Point3D m_ControlDest; // My target destination (patrol)
private OrderType m_ControlOrder; // My order
private int m_Loyalty;
private int m_Loyalty;
private double m_dMinTameSkill;
private bool m_bTamable;
@ -222,22 +222,22 @@ namespace Server.Mobiles
private Mobile m_SummonMaster;
private int m_HitsMax = -1;
private int m_StamMax = -1;
private int m_ManaMax = -1;
private int m_DamageMin = -1;
private int m_DamageMax = -1;
private int m_HitsMax = -1;
private int m_StamMax = -1;
private int m_ManaMax = -1;
private int m_DamageMin = -1;
private int m_DamageMax = -1;
private int m_PhysicalResistance, m_PhysicalDamage = 100;
private int m_FireResistance, m_FireDamage;
private int m_ColdResistance, m_ColdDamage;
private int m_PoisonResistance, m_PoisonDamage;
private int m_EnergyResistance, m_EnergyDamage;
private int m_ChaosDamage;
private int m_DirectDamage;
private int m_PhysicalResistance, m_PhysicalDamage = 100;
private int m_FireResistance, m_FireDamage;
private int m_ColdResistance, m_ColdDamage;
private int m_PoisonResistance, m_PoisonDamage;
private int m_EnergyResistance, m_EnergyDamage;
private int m_ChaosDamage;
private int m_DirectDamage;
private List<Mobile> m_Owners;
private List<Mobile> m_Friends;
private List<Mobile> m_Owners;
private List<Mobile> m_Friends;
private bool m_IsStabled;
@ -1636,7 +1636,7 @@ namespace Server.Mobiles
// Version 14
writer.Write( (bool)m_RemoveIfUntamed );
writer.Write( (int)m_RemoveStep );
// Version 17
if ( IsStabled || ( Controlled && ControlMaster != null ) )
writer.Write( TimeSpan.Zero );
@ -1848,7 +1848,7 @@ namespace Server.Mobiles
m_RemoveIfUntamed = reader.ReadBool();
m_RemoveStep = reader.ReadInt();
}
TimeSpan deleteTime = TimeSpan.Zero;
if ( version >= 17 )

39
Scripts/Mobiles/PlayerMobile.cs
View file

@ -2478,6 +2478,7 @@ namespace Server.Mobiles
Packet.Release( p );
}
private static void SendToStaffMessage( Mobile from, string format, params object[] args )
{
SendToStaffMessage( from, String.Format( format, args ) );
@ -2637,8 +2638,6 @@ namespace Server.Mobiles
get{ return m_BOBFilter; }
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
@ -2925,20 +2924,7 @@ namespace Server.Mobiles
t.Remove( remove[i] );
}
//decay our kills
if ( m_ShortTermElapse < this.GameTime )
{
m_ShortTermElapse += TimeSpan.FromHours( 8 );
if ( ShortTermMurders > 0 )
--ShortTermMurders;
}
if ( m_LongTermElapse < this.GameTime )
{
m_LongTermElapse += TimeSpan.FromHours( 40 );
if ( Kills > 0 )
--Kills;
}
CheckKillDecay();
CheckAtrophies( this );
@ -3049,8 +3035,6 @@ namespace Server.Mobiles
writer.Write( this.GameTime );
}
public static void CheckAtrophies( Mobile m )
{
SacrificeVirtue.CheckAtrophy( m );
@ -3063,6 +3047,23 @@ namespace Server.Mobiles
ChampionTitleInfo.CheckAtrophy( (PlayerMobile)m );
}
public void CheckKillDecay()
{
if ( m_ShortTermElapse < this.GameTime )
{
m_ShortTermElapse += TimeSpan.FromHours( 8 );
if ( ShortTermMurders > 0 )
--ShortTermMurders;
}
if ( m_LongTermElapse < this.GameTime )
{
m_LongTermElapse += TimeSpan.FromHours( 40 );
if ( Kills > 0 )
--Kills;
}
}
public void ResetKillTime()
{
m_ShortTermElapse = this.GameTime + TimeSpan.FromHours( 8 );
@ -3411,7 +3412,7 @@ namespace Server.Mobiles
public override TimeSpan ComputeMovementSpeed( Direction dir, bool checkTurning )
{
if ( checkTurning && (dir & Direction.Mask) != (this.Direction & Direction.Mask) )
return TimeSpan.FromSeconds( 0.1 ); // We are NOT actually moving (just a direction change)
return Mobile.RunMount; // We are NOT actually moving (just a direction change)
TransformContext context = TransformationSpellHelper.GetContext( this );

24
Scripts/Mobiles/Vendors/PlayerVendor.cs
View file

@ -1468,18 +1468,18 @@ namespace Server.Mobiles
int price;
string description;
if ( int.TryParse( firstWord, out price ) )
{
if ( sep >= 0 )
description = text.Substring( sep + 1 ).Trim();
else
description = "";
}
else
{
price = -1;
description = text.Trim();
}
if ( int.TryParse( firstWord, out price ) )
{
if ( sep >= 0 )
description = text.Substring( sep + 1 ).Trim();
else
description = "";
}
else
{
price = -1;
description = text.Trim();
}
SetInfo( from, price, Utility.FixHtml( description ) );
}

2
Scripts/Multis/BaseHouse.cs
View file

@ -3438,7 +3438,7 @@ namespace Server.Multis
{
if ( !from.Alive || m_House.Deleted || !m_House.IsCoOwner( from ) )
return;
if ( targeted is Item )
{
if ( m_Release )

2
Scripts/Regions/HouseRegion.cs
View file

@ -336,7 +336,7 @@ namespace Server.Regions
from.SendLocalizedMessage( 502094 ); // You must be in your house to do this.
}
}
else if ( e.HasKeyword( 0x28 ) )
else if ( e.HasKeyword( 0x28 ) ) // trash barrel
{
if ( isCoOwner )
{