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

Upgrades code style - First batch (#22)

Browse source
This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 • committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scripts/Items/Special/Special Scrolls/PowerScroll.cs
View file

@ -9,7 +9,7 @@ namespace Server.Items
{
public class PowerScroll : SpecialScroll
{
public override int Message { get { return 1049469; } } /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
public override int Message => 1049469; /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
* When used, the effect is not immediately seen without a gain of points with that skill or statistics.
* You can view your maximum skill values in your skills window.
* You can view your maximum statistic value in your statistics window. */
@ -29,7 +29,7 @@ namespace Server.Items
}
}
public override string DefaultTitle{ get{ return String.Format( "<basefont color=#FFFFFF>Power Scroll ({0} Skill):</basefont>", Value ); } }
public override string DefaultTitle => String.Format( "<basefont color=#FFFFFF>Power Scroll ({0} Skill):</basefont>", Value );
private static SkillName[] m_Skills = new SkillName[]
{
@ -253,4 +253,4 @@ namespace Server.Items
}
}
}
}
}

38
Scripts/Items/Special/Special Scrolls/ScrollofAlacrity.cs
View file

@ -31,18 +31,18 @@ namespace Server.Items
{
public class ScrollofAlacrity : SpecialScroll
{
public override int LabelNumber { get { return 1078604; } } // Scroll of Alacrity
public override int Message { get { return 1078602; } } /*Using a Scroll of Transcendence for a given skill will permanently increase your current
public override int LabelNumber => 1078604; // Scroll of Alacrity
public override int Message => 1078602; /*Using a Scroll of Transcendence for a given skill will permanently increase your current
*level in that skill by the amount of points displayed on the scroll.
*As you may not gain skills beyond your maximum skill cap, any excess points will be lost.*/
public override string DefaultTitle { get { return String.Format( "<basefont color=#FFFFFF>Scroll of Alacrity:</basefont>" ); } }
public override string DefaultTitle => String.Format( "<basefont color=#FFFFFF>Scroll of Alacrity:</basefont>" );
public ScrollofAlacrity() : this( SkillName.Alchemy )
{
}
[Constructible]
public ScrollofAlacrity( SkillName skill ) : base( skill, 0.0 )
{
@ -60,20 +60,20 @@ namespace Server.Items
list.Add(1071345, "{0} 15 Minutes", GetName()); // Skill: ~1_val~
}
public override bool CanUse( Mobile from )
{
if ( !base.CanUse( from ) )
return false;
PlayerMobile pm = from as PlayerMobile;
if ( pm == null )
return false;
#region Mondain's Legacy
/* to add when skillgain quests will be implemented
for (int i = pm.Quests.Count - 1; i >= 0; i--)
{
BaseQuest quest = pm.Quests[i];
@ -89,10 +89,10 @@ namespace Server.Items
}
}
}
*/
#endregion
#region Scroll of Alacrity
if (pm.AcceleratedStart > DateTime.UtcNow)
{
@ -100,7 +100,7 @@ namespace Server.Items
return false;
}
#endregion
return true;
}
@ -108,12 +108,12 @@ namespace Server.Items
{
if ( !CanUse( from ) )
return;
PlayerMobile pm = from as PlayerMobile;
if ( pm == null )
return;
double tskill = from.Skills[Skill].Base;
double tcap = from.Skills[Skill].Cap;
@ -123,9 +123,9 @@ namespace Server.Items
*If you are at your total skill cap, you must use a Powerscroll to increase your current skill cap.*/
return;
}
from.SendLocalizedMessage( 1077956 ); // You are infused with intense energy. You are under the effects of an accelerated skillgain scroll.
Effects.PlaySound( from.Location, from.Map, 0x1E9 );
Effects.SendTargetParticles( from, 0x373A, 35, 45, 0x00, 0x00, 9502, (EffectLayer)255, 0x100 );

38
Scripts/Items/Special/Special Scrolls/ScrollofTranscendence.cs
View file

@ -9,13 +9,13 @@ namespace Server.Items
{
public class ScrollofTranscendence : SpecialScroll
{
public override int LabelNumber { get { return 1094934; } } // Scroll of Transcendence
public override int Message { get { return 1094933; } } /*Using a Scroll of Transcendence for a given skill will permanently increase your current
public override int LabelNumber => 1094934; // Scroll of Transcendence
public override int Message => 1094933; /*Using a Scroll of Transcendence for a given skill will permanently increase your current
*level in that skill by the amount of points displayed on the scroll.
*As you may not gain skills beyond your maximum skill cap, any excess points will be lost.*/
public override string DefaultTitle { get { return String.Format( "<basefont color=#FFFFFF>Scroll of Transcendence ({0} Skill):</basefont>", Value ); } }
public override string DefaultTitle => String.Format( "<basefont color=#FFFFFF>Scroll of Transcendence ({0} Skill):</basefont>", Value );
public static ScrollofTranscendence CreateRandom( int min, int max )
{
@ -27,7 +27,7 @@ namespace Server.Items
public ScrollofTranscendence() : this( SkillName.Alchemy, 0.0 )
{
}
[Constructible]
public ScrollofTranscendence( SkillName skill, double value ) : base( skill, value )
{
@ -48,20 +48,20 @@ namespace Server.Items
else
list.Add(1076759, "{0}\t{1} Skill Points", GetName(), Value);
}
public override bool CanUse( Mobile from )
{
if ( !base.CanUse( from ) )
return false;
PlayerMobile pm = from as PlayerMobile;
if ( pm == null )
return false;
#region Mondain's Legacy
/* to add when skillgain quests will be implemented
for (int i = pm.Quests.Count - 1; i >= 0; i--)
{
BaseQuest quest = pm.Quests[i];
@ -77,10 +77,10 @@ namespace Server.Items
}
}
}
*/
#endregion
#region Scroll of Alacrity
if (pm.AcceleratedStart > DateTime.UtcNow)
{
@ -88,7 +88,7 @@ namespace Server.Items
return false;
}
#endregion
return true;
}
@ -96,11 +96,11 @@ namespace Server.Items
{
if ( !CanUse( from ) )
return;
double tskill = from.Skills[Skill].Base; // value of skill without item bonuses etc
double tcap = from.Skills[Skill].Cap; // maximum value permitted
bool canGain = false;
double newValue = Value;
if ( ( tskill + newValue ) > tcap )
@ -126,7 +126,7 @@ namespace Server.Items
else
canGain = true;
}
if ( !canGain )
{
from.SendLocalizedMessage( 1094935 ); /*You cannot increase this skill at this time. The skill may be locked or set to lower in your skill menu.
@ -135,7 +135,7 @@ namespace Server.Items
}
from.SendLocalizedMessage( 1049513, GetNameLocalized() ); // You feel a surge of magic as the scroll enhances your ~1_type~!
from.Skills[Skill].Base += newValue;
Effects.PlaySound( from.Location, from.Map, 0x1F7 );
@ -144,7 +144,7 @@ namespace Server.Items
Delete();
}
public override void Serialize( GenericWriter writer )
{
base.Serialize(writer);

2
Scripts/Items/Special/Special Scrolls/SpecialScroll.cs
View file

@ -21,7 +21,7 @@ namespace Server.Items
#endregion
public abstract int Message{ get; }
public virtual int Title{ get { return 0; } }
public virtual int Title => 0;
public abstract string DefaultTitle{ get; }
public SpecialScroll( SkillName skill, double value ) : base( 0x14F0 )

30
Scripts/Items/Special/Special Scrolls/StatScroll.cs
View file

@ -8,11 +8,11 @@ namespace Server.Items
{
public class StatCapScroll : SpecialScroll
{
public override int Message { get { return 1049469; } } /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
public override int Message => 1049469; /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics.
* When used, the effect is not immediately seen without a gain of points with that skill or statistics.
* You can view your maximum skill values in your skills window.
* You can view your maximum statistic value in your statistics window. */
public override int Title
public override int Title
{
get
{
@ -24,17 +24,17 @@ namespace Server.Items
* Mythical Scroll (+15 Maximum Stats): OR
* Legendary Scroll (+20 Maximum Stats): OR
* Ultimate Scroll (+25 Maximum Stats): */
return 0;
}
}
public override string DefaultTitle { get { return String.Format( "<basefont color=#FFFFFF>Power Scroll ({0}{1} Maximum Stats):</basefont>", ( (int)Value - 225 ) >= 0 ? "+" : "", (int)Value - 225 ); } }
public override string DefaultTitle => String.Format( "<basefont color=#FFFFFF>Power Scroll ({0}{1} Maximum Stats):</basefont>", ( (int)Value - 225 ) >= 0 ? "+" : "", (int)Value - 225 );
public StatCapScroll() : this( 105 )
{
}
[Constructible]
public StatCapScroll( int value ) : base( SkillName.Alchemy, value )
{
@ -48,7 +48,7 @@ namespace Server.Items
public override void AddNameProperty(ObjectPropertyList list)
{
int level = ( (int)Value - 230 ) / 5;
if ( level >= 0 && level <= 4 && (int)Value % 5 == 0 )
list.Add( 1049463 + level, "#1049476" ); /* a wonderous scroll of ~1_type~ (+5 Maximum Stats) OR
* an exalted scroll of ~1_type~ (+10 Maximum Stats) OR
@ -62,32 +62,32 @@ namespace Server.Items
public override void OnSingleClick( Mobile from )
{
int level = ( (int)Value - 230 ) / 5;
if ( level >= 0 && level <= 4 && (int)Value % 5 == 0 )
base.LabelTo( from, 1049463 + level, "#1049476" );
else
base.LabelTo( from, "a scroll of power ({0}{1} Maximum Stats)", (Value - 225) >= 0 ? "+" : "", Value - 225 );
}
public override bool CanUse( Mobile from )
{
if ( !base.CanUse( from ) )
return false;
int newValue = (int)Value;
if ( from is PlayerMobile && ((PlayerMobile)from).HasStatReward )
newValue += 5;
if ( from.StatCap >= newValue )
{
from.SendLocalizedMessage( 1049510 ); // Your stats are too high for this power scroll.
return false;
}
return true;
}
public override void Use( Mobile from )
{
if ( !CanUse( from ) )
@ -129,4 +129,4 @@ namespace Server.Items
Insured = false;
}
}
}
}