From ed97d43c9e500816b449c95abaf5e08773620be6 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 21 Oct 2010 04:25:47 +0000 Subject: [PATCH] sync and some misc things --- Scripts/Accounting/Firewall.cs | 2 +- Scripts/Gumps/Guilds/GuildChangeTypeGump.cs | 1 - Scripts/Items/Clothing/BaseClothing.cs | 2 +- Scripts/Items/Lights/Candelabra.cs | 3 +- .../Carpenter Items/TaxidermyKit.cs | 2 - .../Tailor Items/Dyetubs/RunebookDyeTub.cs | 2 +- .../Tailor Items/Dyetubs/StatuetteDyeTub.cs | 2 +- Scripts/Items/Weapons/BaseWeapon.cs | 2 +- Scripts/Items/Weapons/Ranged/BaseRanged.cs | 4 +- Scripts/Misc/CharacterCreation.cs | 2 +- Scripts/Mobiles/AI/Creature/BaseCreature.cs | 66 +++++++++---------- Scripts/Mobiles/PlayerMobile.cs | 39 +++++------ Scripts/Mobiles/Vendors/PlayerVendor.cs | 24 +++---- Scripts/Multis/BaseHouse.cs | 2 +- Scripts/Regions/HouseRegion.cs | 2 +- 15 files changed, 77 insertions(+), 78 deletions(-) diff --git a/Scripts/Accounting/Firewall.cs b/Scripts/Accounting/Firewall.cs index 89a8014cb..03ff2ff20 100644 --- a/Scripts/Accounting/Firewall.cs +++ b/Scripts/Accounting/Firewall.cs @@ -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; } diff --git a/Scripts/Gumps/Guilds/GuildChangeTypeGump.cs b/Scripts/Gumps/Guilds/GuildChangeTypeGump.cs index 46a3ed525..f6f619139 100644 --- a/Scripts/Gumps/Guilds/GuildChangeTypeGump.cs +++ b/Scripts/Gumps/Guilds/GuildChangeTypeGump.cs @@ -59,7 +59,6 @@ namespace Server.Gumps } else { - GuildType newType; switch ( info.ButtonID ) diff --git a/Scripts/Items/Clothing/BaseClothing.cs b/Scripts/Items/Clothing/BaseClothing.cs index 00c0e68ae..a6a13a16e 100644 --- a/Scripts/Items/Clothing/BaseClothing.cs +++ b/Scripts/Items/Clothing/BaseClothing.cs @@ -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 ) { diff --git a/Scripts/Items/Lights/Candelabra.cs b/Scripts/Items/Lights/Candelabra.cs index ea7a1dc2e..dd2b86516 100644 --- a/Scripts/Items/Lights/Candelabra.cs +++ b/Scripts/Items/Lights/Candelabra.cs @@ -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 diff --git a/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs b/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs index 9ef6e9274..ccb3f9c89 100644 --- a/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs +++ b/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs @@ -172,8 +172,6 @@ namespace Server.Items } } - - public class TrophyAddon : Item, IAddon { public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } } diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs index 97cbe89f2..a1934c43d 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs @@ -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 ) diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs index 7281563dd..8c616ed02 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs @@ -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 ) diff --git a/Scripts/Items/Weapons/BaseWeapon.cs b/Scripts/Items/Weapons/BaseWeapon.cs index 4fda0b7da..733909e1b 100644 --- a/Scripts/Items/Weapons/BaseWeapon.cs +++ b/Scripts/Items/Weapons/BaseWeapon.cs @@ -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; diff --git a/Scripts/Items/Weapons/Ranged/BaseRanged.cs b/Scripts/Items/Weapons/Ranged/BaseRanged.cs index 55d9524ca..47c1befd3 100644 --- a/Scripts/Items/Weapons/Ranged/BaseRanged.cs +++ b/Scripts/Items/Weapons/Ranged/BaseRanged.cs @@ -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 ); diff --git a/Scripts/Misc/CharacterCreation.cs b/Scripts/Misc/CharacterCreation.cs index 2b6ddaa91..63e4a37c3 100644 --- a/Scripts/Misc/CharacterCreation.cs +++ b/Scripts/Misc/CharacterCreation.cs @@ -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; diff --git a/Scripts/Mobiles/AI/Creature/BaseCreature.cs b/Scripts/Mobiles/AI/Creature/BaseCreature.cs index 83b6d8e4a..90a9e0fae 100644 --- a/Scripts/Mobiles/AI/Creature/BaseCreature.cs +++ b/Scripts/Mobiles/AI/Creature/BaseCreature.cs @@ -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 m_arSpellAttack; // List of attack spell/power List 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 m_Owners; - private List m_Friends; + private List m_Owners; + private List 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 ) diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs index d5108dd11..81e19f5e6 100644 --- a/Scripts/Mobiles/PlayerMobile.cs +++ b/Scripts/Mobiles/PlayerMobile.cs @@ -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 ); diff --git a/Scripts/Mobiles/Vendors/PlayerVendor.cs b/Scripts/Mobiles/Vendors/PlayerVendor.cs index 51a1bc433..f2ea71334 100644 --- a/Scripts/Mobiles/Vendors/PlayerVendor.cs +++ b/Scripts/Mobiles/Vendors/PlayerVendor.cs @@ -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 ) ); } diff --git a/Scripts/Multis/BaseHouse.cs b/Scripts/Multis/BaseHouse.cs index 8bd38b218..64e065961 100644 --- a/Scripts/Multis/BaseHouse.cs +++ b/Scripts/Multis/BaseHouse.cs @@ -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 ) diff --git a/Scripts/Regions/HouseRegion.cs b/Scripts/Regions/HouseRegion.cs index db4d392cd..42746547d 100644 --- a/Scripts/Regions/HouseRegion.cs +++ b/Scripts/Regions/HouseRegion.cs @@ -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 ) {