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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,12 +67,8 @@ namespace Server.Items
private static List<SkillName> _Skills = new List<SkillName>();
public PowerScroll() : this(SkillName.Alchemy, 0.0)
{
}
[Constructible]
public PowerScroll(SkillName skill, double value) : base(skill, value)
public PowerScroll(SkillName skill = SkillName.Alchemy, double value = 0.0) : base(skill, value)
{
Hue = 0x481;
@ -245,4 +241,4 @@ namespace Server.Items
}
}
}
}
}

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

@ -142,23 +142,23 @@ namespace Server.Items
AddHtmlLocalized(40, 48, 387, 100, m_Scroll.Message, true, true);
AddHtmlLocalized(125, 148, 200, 20, 1049478, 0xFFFFFF, false, false); // Do you wish to use this scroll?
AddHtmlLocalized(125, 148, 200, 20, 1049478, 0xFFFFFF); // Do you wish to use this scroll?
AddButton(100, 172, 4005, 4007, 1, GumpButtonType.Reply, 0);
AddHtmlLocalized(135, 172, 120, 20, 1046362, 0xFFFFFF, false, false); // Yes
AddButton(100, 172, 4005, 4007, 1);
AddHtmlLocalized(135, 172, 120, 20, 1046362, 0xFFFFFF); // Yes
AddButton(275, 172, 4005, 4007, 0, GumpButtonType.Reply, 0);
AddHtmlLocalized(310, 172, 120, 20, 1046363, 0xFFFFFF, false, false); // No
AddButton(275, 172, 4005, 4007, 0);
AddHtmlLocalized(310, 172, 120, 20, 1046363, 0xFFFFFF); // No
if (m_Scroll.Title != 0)
AddHtmlLocalized(40, 20, 260, 20, m_Scroll.Title, 0xFFFFFF, false, false);
AddHtmlLocalized(40, 20, 260, 20, m_Scroll.Title, 0xFFFFFF);
else
AddHtml(40, 20, 260, 20, m_Scroll.DefaultTitle, false, false);
AddHtml(40, 20, 260, 20, m_Scroll.DefaultTitle);
if (m_Scroll is StatCapScroll)
AddHtmlLocalized(310, 20, 120, 20, 1038019, 0xFFFFFF, false, false); // Power
AddHtmlLocalized(310, 20, 120, 20, 1038019, 0xFFFFFF); // Power
else
AddHtmlLocalized(310, 20, 120, 20, AosSkillBonuses.GetLabel(m_Scroll.Skill), 0xFFFFFF, false, false);
AddHtmlLocalized(310, 20, 120, 20, AosSkillBonuses.GetLabel(m_Scroll.Skill), 0xFFFFFF);
}
public override void OnResponse(NetState state, RelayInfo info)
@ -168,4 +168,4 @@ namespace Server.Items
}
}
}
}
}

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

@ -4,12 +4,8 @@ namespace Server.Items
{
public class StatCapScroll : SpecialScroll
{
public StatCapScroll() : this(105)
{
}
[Constructible]
public StatCapScroll(int value) : base(SkillName.Alchemy, value)
public StatCapScroll(int value = 105) : base(SkillName.Alchemy, value)
{
Hue = 0x481;
}
@ -132,4 +128,4 @@ namespace Server.Items
Insured = false;
}
}
}
}