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

Renames equiped to equipped. (#1)

Browse source
This commit is contained in:
Kamron Batman 2018-02-19 21:51:13 -08:00 • committed by GitHub
parent a21a48d1a2
commit bb8f09752f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs
View file

@ -282,7 +282,7 @@ namespace Server.Engines.MLQuests.Definitions
Description = 1077616; // While Here ar the New Haven Magery Library, use scribe's pen and scribe 3rd and 4th circle Magery scrolls that you have in your spellbook. Remeber, you will need blank scrolls aswell. Do this until you have raised your Inscription skill to 50. Greetings and welcome to the New Haven Magery Library! You wish to learn how to scribe spell scrolls? You have come to the right place! Inscribeed in a steady hand and imbued with te power of reagents, a scroll can mean the difference between life and death in a perilous situation. Those knowledgeable in Inscription man transcribe spells to create useful and valuale magical scrolls. Before you can inscribe a spell, you must first be able to cast the spell without the aid of a scroll. This means that you need the appropriate level of proficiency as a mage, the required mana, and the required reagents. Second, you will need a blank scroll to write on and a scribe's pen. Then, you will need to decide which particular spell you wish to scribe. It may sound easy, but there is a bit more to it. As with the development of all skills, you need to practice Inscription of lower level spells before you can move onto the more difficult ones. The most important aspect of Inscription is mana. Inscribing a scroll with a magic spell drains your mana. When inscribing 3rd or lower spells this is will not be much of a problem for these spells consume a small amount of mana. However, when you are inscribing higher circle spells, you may see your mana drain rapidly. When this happens, pause or meditate before continuing.I suggest you begin scribing any 3rd and 4th circle spells that you know. If you don't possess ant, you can alwayers barter with one of the local mage merchants or a fellow adventurer that is a seasoned Scribe. Come back to me once you feel that you are the worthy rankof Apprentice Scribe and i will reward you with an arcane prize.
RefusalMessage = 1077617; // I understand. When you are ready, feel free to return to me for Inscription training. Thanks for stopping by!
InProgressMessage = 1077631; // You have not achived the rank of Apprentice Scribe. Come back to me once you feel that you are worthy of the rank Apprentice Scribe and i will reward you with a arcane prize.
CompletionMessage = 1077619; // Scribing is a very fulfilling pursuit. I am please to see you embark on this journey. You sling a pen well! On behalf of the New Haven Mage Council I wish to present you with this spellbook. When equipped, the Hallowed Spellbook greatly enhanced the potency of your offensive soells when used against Undead. Be mindful, though. While this book is equiped you invoke powerful spells and abilities vs Humanoids, such as other humans, orcs, ettins, and trolls. Your offensive spells will diminish in effectiveness. I suggest unequipping the Hallowed Spellbook when battling Humanoids. I hope this spellbook serves you well.
CompletionMessage = 1077619; // Scribing is a very fulfilling pursuit. I am please to see you embark on this journey. You sling a pen well! On behalf of the New Haven Mage Council I wish to present you with this spellbook. When equipped, the Hallowed Spellbook greatly enhanced the potency of your offensive soells when used against Undead. Be mindful, though. While this book is equipped you invoke powerful spells and abilities vs Humanoids, such as other humans, orcs, ettins, and trolls. Your offensive spells will diminish in effectiveness. I suggest unequipping the Hallowed Spellbook when battling Humanoids. I hope this spellbook serves you well.
CompletionNotice = 1077618; // You have achieved the rank of Apprentice Scribe. Return to Jillian in New Haven to receive your arcane prize.
Objectives.Add( new GainSkillObjective( SkillName.Inscribe, 500, true, true ) );

4
Scripts/Gumps/AdminGump.cs
View file

@ -2343,7 +2343,7 @@ namespace Server.Gumps
if ( a == null )
break;
from.SendGump( new WarningGump( 1060635, 30720, String.Format( "<center>Account of {0}</center><br>You are about to <em><basefont color=red>permanently delete</basefont></em> the account. Likewise, all characters on the account will be deleted, including equiped, inventory, and banked items. Any houses tied to the account will be demolished.<br><br>Do you wish to continue?", a.Username ), 0xFFC000, 420, 280, new WarningGumpCallback( AccountDelete_Callback ), m_State ) );
from.SendGump( new WarningGump( 1060635, 30720, String.Format( "<center>Account of {0}</center><br>You are about to <em><basefont color=red>permanently delete</basefont></em> the account. Likewise, all characters on the account will be deleted, including equipped, inventory, and banked items. Any houses tied to the account will be demolished.<br><br>Do you wish to continue?", a.Username ), 0xFFC000, 420, 280, new WarningGumpCallback( AccountDelete_Callback ), m_State ) );
break;
}
case 26: // View all shared accounts
@ -2375,7 +2375,7 @@ namespace Server.Gumps
break;
if ( rads.Count > 0 )
from.SendGump( new WarningGump( 1060635, 30720, String.Format( "You are about to <em><basefont color=red>permanently delete</basefont></em> {0} marked account{1}. Likewise, all characters on the account{1} will be deleted, including equiped, inventory, and banked items. Any houses tied to the account{1} will be demolished.<br><br>Do you wish to continue?", rads.Count, rads.Count == 1 ? "" : "s" ), 0xFFC000, 420, 280, new WarningGumpCallback( Marked_Callback ), new object[]{ false, list, rads, m_ListPage } ) );
from.SendGump( new WarningGump( 1060635, 30720, String.Format( "You are about to <em><basefont color=red>permanently delete</basefont></em> {0} marked account{1}. Likewise, all characters on the account{1} will be deleted, including equipped, inventory, and banked items. Any houses tied to the account{1} will be demolished.<br><br>Do you wish to continue?", rads.Count, rads.Count == 1 ? "" : "s" ), 0xFFC000, 420, 280, new WarningGumpCallback( Marked_Callback ), new object[]{ false, list, rads, m_ListPage } ) );
else
from.SendGump( new NoticeGump( 1060637, 30720, "You have not yet marked any accounts. Place a check mark next to the accounts you wish to ban and then try again.", 0xFFC000, 420, 280, new NoticeGumpCallback( ResendGump_Callback ), new object[]{ list, rads, m_ListPage } ) );

2
Scripts/Holiday Stuff/Halloween/2006/Items/TwilightLantern.cs
View file

@ -15,7 +15,7 @@ namespace Server.Items
Hue = Utility.RandomBool() ? 244 : 997;
}
public override bool AllowEquipedCast( Mobile from )
public override bool AllowEquippedCast( Mobile from )
{
return true;
}

4
Scripts/Items/Armor/BaseArmor.cs
View file

@ -1408,9 +1408,9 @@ namespace Server.Items
}
}
public override bool AllowEquipedCast( Mobile from )
public override bool AllowEquippedCast( Mobile from )
{
if ( base.AllowEquipedCast( from ) )
if ( base.AllowEquippedCast( from ) )
return true;
return ( m_AosAttributes.SpellChanneling != 0 );

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

@ -467,9 +467,9 @@ namespace Server.Items
{
}
public override bool AllowEquipedCast( Mobile from )
public override bool AllowEquippedCast( Mobile from )
{
if ( base.AllowEquipedCast( from ) )
if ( base.AllowEquippedCast( from ) )
return true;
return ( m_AosAttributes.SpellChanneling != 0 );

2
Scripts/Items/Skill Items/Magical/Runebook.cs
View file

@ -163,7 +163,7 @@ namespace Server.Items
{
}
public override bool AllowEquipedCast( Mobile from )
public override bool AllowEquippedCast( Mobile from )
{
return true;
}

2
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -347,7 +347,7 @@ namespace Server.Items
return base.CanEquip( from );
}
public override bool AllowEquipedCast( Mobile from )
public override bool AllowEquippedCast( Mobile from )
{
return true;
}

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

@ -3105,9 +3105,9 @@ namespace Server.Items
/* list.Add( 1062613, Utility.FixHtml( m_EngravedText ) ); */
}
public override bool AllowEquipedCast( Mobile from )
public override bool AllowEquippedCast( Mobile from )
{
if ( base.AllowEquipedCast( from ) )
if ( base.AllowEquippedCast( from ) )
return true;
return ( m_AosAttributes.SpellChanneling != 0 );

2
Scripts/Mobiles/Animals/Mounts/BaseMount.cs
View file

@ -346,7 +346,7 @@ namespace Server.Mobiles
if ( m_Mount != null )
m_Mount.Rider = null;
return DeathMoveResult.RemainEquiped;
return DeathMoveResult.RemainEquipped;
}
public override void Serialize( GenericWriter writer )

2
Scripts/Mobiles/Animals/Mounts/Ethereals.cs
View file

@ -240,7 +240,7 @@ namespace Server.Mobiles
{
Rider = null;//get off, move to pack
return DeathMoveResult.RemainEquiped;
return DeathMoveResult.RemainEquipped;
}
public static void Dismount( Mobile m )

4
Scripts/Mobiles/PlayerMobile.cs
View file

@ -2345,9 +2345,9 @@ namespace Server.Mobiles
for ( int i = 0; i < Items.Count; ++i )
{
Item equiped = Items[i];
Item equipped = Items[i];
if ( item != equiped && FactionItem.Find( equiped ) != null )
if ( item != equipped && FactionItem.Find( equipped ) != null )
{
if ( --maxWearables == 0 )
{

2
Scripts/Skills/Stealing.cs
View file

@ -196,7 +196,7 @@ namespace Server.SkillHandlers
}
else if ( toSteal.Parent is Mobile )
{
m_Thief.SendLocalizedMessage( 1005585 ); // You cannot steal items which are equiped.
m_Thief.SendLocalizedMessage( 1005585 ); // You cannot steal items which are equipped.
}
else if ( root == m_Thief )
{

18
Server/Item.cs
View file

@ -184,7 +184,7 @@ namespace Server
/// </summary>
Update = 0x00000001,
/// <summary>
/// Resend the item only if it is equiped.
/// Resend the item only if it is equipped.
/// </summary>
EquipOnly = 0x00000002,
/// <summary>
@ -203,9 +203,9 @@ namespace Server
/// </summary>
MoveToCorpse,
/// <summary>
/// The item should remain equiped.
/// The item should remain equipped.
/// </summary>
RemainEquiped,
RemainEquipped,
/// <summary>
/// The item should be placed into the owners backpack.
/// </summary>
@ -1188,22 +1188,22 @@ namespace Server
}
/// <summary>
/// Overridable. Method checked to see if this item may be equiped while casting a spell. By default, this returns false. It is overriden on spellbook and spell channeling weapons or shields.
/// Overridable. Method checked to see if this item may be equipped while casting a spell. By default, this returns false. It is overriden on spellbook and spell channeling weapons or shields.
/// </summary>
/// <returns>True if it may, false if not.</returns>
/// <example>
/// <code>
/// public override bool AllowEquipedCast( Mobile from )
/// public override bool AllowEquippedCast( Mobile from )
/// {
/// if ( from.Int &gt;= 100 )
/// return true;
///
/// return base.AllowEquipedCast( from );
/// return base.AllowEquippedCast( from );
/// }</code>
///
/// When placed in an Item script, the item may be cast when equiped if the <paramref name="from" /> has 100 or more intelligence. Otherwise, it will drop to their backpack.
/// When placed in an Item script, the item may be cast when equipped if the <paramref name="from" /> has 100 or more intelligence. Otherwise, it will drop to their backpack.
/// </example>
public virtual bool AllowEquipedCast( Mobile from )
public virtual bool AllowEquippedCast( Mobile from )
{
return false;
}
@ -1242,7 +1242,7 @@ namespace Server
public virtual DeathMoveResult OnParentDeath( Mobile parent )
{
if ( !Movable )
return DeathMoveResult.RemainEquiped;
return DeathMoveResult.RemainEquipped;
else if ( parent.KeepsItemsOnDeath )
return DeathMoveResult.MoveToBackpack;
else if ( CheckBlessed( parent ) )

2
Server/Items/Containers.cs
View file

@ -131,7 +131,7 @@ namespace Server.Items
public override DeathMoveResult OnParentDeath( Mobile parent )
{
return DeathMoveResult.RemainEquiped;
return DeathMoveResult.RemainEquipped;
}
public BankBox( Mobile owner ) : base( 0xE7C )

10
Server/Mobile.cs
View file

@ -73,12 +73,12 @@ namespace Server
}
}
public class EquipedSkillMod : SkillMod
public class EquippedSkillMod : SkillMod
{
private Item m_Item;
private Mobile m_Mobile;
public EquipedSkillMod( SkillName skill, bool relative, double value, Item item, Mobile mobile )
public EquippedSkillMod( SkillName skill, bool relative, double value, Item item, Mobile mobile )
: base( skill, relative, value )
{
m_Item = item;
@ -497,7 +497,7 @@ namespace Server
public delegate bool AllowBeneficialHandler( Mobile from, Mobile target );
public delegate bool AllowHarmfulHandler( Mobile from, Mobile target );
public delegate Container CreateCorpseHandler( Mobile from, HairInfo hair, FacialHairInfo facialhair, List<Item> initialContent, List<Item> equipedItems );
public delegate Container CreateCorpseHandler( Mobile from, HairInfo hair, FacialHairInfo facialhair, List<Item> initialContent, List<Item> equippedItems );
public delegate int AOSStatusHandler( Mobile from, int index );
@ -1900,7 +1900,7 @@ namespace Server
public virtual void ClearHand( Item item )
{
if( item != null && item.Movable && !item.AllowEquipedCast( this ) )
if( item != null && item.Movable && !item.AllowEquippedCast( this ) )
{
Container pack = this.Backpack;
@ -6101,7 +6101,7 @@ namespace Server
}
/// <summary>
/// Overridable. Virtual event invoked when <paramref name="item" /> is <see cref="AddItem">added</see> from the Mobile, such as when it is equiped.
/// Overridable. Virtual event invoked when <paramref name="item" /> is <see cref="AddItem">added</see> from the Mobile, such as when it is equipped.
/// <seealso cref="Items" />
/// <seealso cref="OnItemRemoved" />
/// </summary>