- Future ML craftables added to the special repair list until the craft system is updated.

- Items can now be repaired while wearing them.
- Items can now be fortified while wearing them.
- Fixed repair deed messages not sending.
- Sound effect added to powder of fortifying.
- Map issue for fishing and SOSs fixed, where it would not allow fishing in empty resource banks when not on the target SOS map.
- Added proximity spawner.
- Improved spawner mouseover menu, now also shows types set on the spawner which are not yet spawned.
- Fixed spawners only deleting half of their spawned objects when deleted.
- Added the ability to set TextDefinition objects in the props gump.
- WaitTeleporters now round delays to nearest in the remaining time messages.
- Updated TextDefinition to be more usable; made it parsable from string and added safe serialization/deserialization methods.
- Improved checking whether a mobile can flee.
- Monsters that give ML minor artifacts will no longer flee when low on hits (like paragons).
- Monsters that give ML minor artifacts will no longer spawn as paragon.
- Fixed issue with pets not eating certain foods.
- AI and targeting fixes for Red Death, Pyre and Swoop.
- Fame and karma added to Rend.
- Swoop corrected to have 0 karma.
- Stat and skill tweaks for Putrefier.
- Changelings will no longer show their fame title when morphed.
- Added travel restrictions for ML dungeons.
- Fixed issue of travel restriction message displaying twice.
- Monster teleporting is no longer affected by region travel restrictions.
This commit is contained in:
eos 2012-03-07 18:59:52 +00:00
parent 4bcde77cc2
commit a0e13d5007
25 changed files with 432 additions and 140 deletions

View file

@ -101,7 +101,7 @@ namespace Server.Engines.Craft
private bool IsSpecialClothing( BaseClothing clothing )
{
// Armor repairable but not craftable
// Clothing repairable but not craftable
if( m_CraftSystem is DefTailoring )
{
@ -132,12 +132,41 @@ namespace Server.Engines.Craft
}
else if ( m_CraftSystem is DefBlacksmithy )
{
return ( weapon is Pitchfork );
return ( weapon is Pitchfork )
#region Temporary
// TODO: Make these items craftable
|| ( weapon is RadiantScimitar )
|| ( weapon is WarCleaver )
|| ( weapon is ElvenSpellblade )
|| ( weapon is AssassinSpike )
|| ( weapon is Leafblade )
|| ( weapon is RuneBlade )
|| ( weapon is ElvenMachete )
|| ( weapon is OrnateAxe )
|| ( weapon is DiamondMace );
#endregion
}
return false;
}
private bool IsSpecialArmor( BaseArmor armor )
{
// Armor repairable but not craftable
#region Temporary
// TODO: Make these items craftable
if ( m_CraftSystem is DefBlacksmithy )
{
return ( armor is Circlet )
|| ( armor is RoyalCirclet )
|| ( armor is GemmedCirclet );
}
#endregion
return false;
}
protected override void OnTarget( Mobile from, object targeted )
{
int number;
@ -149,8 +178,8 @@ namespace Server.Engines.Craft
bool usingDeed = (m_Deed != null);
bool toDelete = false;
//TODO: Make a IRepairable
// TODO: Make an IRepairable
if ( m_CraftSystem.CanCraft( from, m_Tool, targeted.GetType() ) == 1044267 )
{
number = 1044282; // You must be near a forge and and anvil to repair items. * Yes, there are two and's *
@ -244,7 +273,7 @@ namespace Server.Engines.Craft
{
number = (usingDeed)? 1061136 : 1044277; // That item cannot be repaired. // You cannot repair that item with this type of repair contract.
}
else if ( !weapon.IsChildOf( from.Backpack ) )
else if ( !weapon.IsChildOf( from.Backpack ) && ( !Core.ML || weapon.Parent != from ) )
{
number = 1044275; // The item must be in your backpack to repair it.
}
@ -301,11 +330,11 @@ namespace Server.Engines.Craft
toWeaken = 3;
}
if ( m_CraftSystem.CraftItems.SearchForSubclass( armor.GetType() ) == null )
if ( m_CraftSystem.CraftItems.SearchForSubclass( armor.GetType() ) == null && !IsSpecialArmor( armor ) )
{
number = (usingDeed)? 1061136 : 1044277; // That item cannot be repaired. // You cannot repair that item with this type of repair contract.
}
else if ( !armor.IsChildOf( from.Backpack ) )
else if ( !armor.IsChildOf( from.Backpack ) && ( !Core.ML || armor.Parent != from ) )
{
number = 1044275; // The item must be in your backpack to repair it.
}
@ -366,7 +395,7 @@ namespace Server.Engines.Craft
{
number = (usingDeed) ? 1061136 : 1044277; // That item cannot be repaired. // You cannot repair that item with this type of repair contract.
}
else if ( !clothing.IsChildOf( from.Backpack ) )
else if ( !clothing.IsChildOf( from.Backpack ) && ( !Core.ML || clothing.Parent != from ) )
{
number = 1044275; // The item must be in your backpack to repair it.
}
@ -430,10 +459,12 @@ namespace Server.Engines.Craft
CraftContext context = m_CraftSystem.GetContext( from );
from.SendGump( new CraftGump( from, m_CraftSystem, m_Tool, number ) );
}
else if( toDelete )
else
{
from.SendLocalizedMessage( number );
m_Deed.Delete();
if( toDelete )
m_Deed.Delete();
}
}
}