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

Formatting #2 (#59)

Browse source
This commit is contained in:
Kamron Batman 2019-10-05 00:37:03 -07:00 • committed by GitHub
parent 096d39609e
commit 8e9221bb5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
400 changed files with 3688 additions and 5969 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Projects/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs
View file

@ -432,13 +432,13 @@ namespace Server.Mobiles
if (Statue != null) t = Statue.StatueType;
switch (t)
return t switch
{
case StatueType.Marble: return 1076189;
case StatueType.Jade: return 1076188;
case StatueType.Bronze: return 1076190;
default: return 1076173;
}
StatueType.Marble => 1076189,
StatueType.Jade => 1076188,
StatueType.Bronze => 1076190,
_ => 1076173
};
}
}

14
Projects/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs
View file

@ -27,7 +27,7 @@ namespace Server.Items
{
Point3D point = new Point3D(p.X, p.Y, p.Z);
if (map == null || !map.CanFit(point, 20))
if (map?.CanFit(point, 20) != true)
return false;
BaseHouse house = BaseHouse.FindHouseAt(point, map, 20);
@ -113,13 +113,13 @@ namespace Server.Items
public int GetTypeNumber(StatueType type)
{
switch (type)
return type switch
{
case StatueType.Marble: return 1076181;
case StatueType.Jade: return 1076180;
case StatueType.Bronze: return 1076230;
default: return 1076181;
}
StatueType.Marble => 1076181,
StatueType.Jade => 1076180,
StatueType.Bronze => 1076230,
_ => 1076181
};
}
}
}

34
Projects/Scripts/Engines/VeteranRewards/Character Statue Maker/Gumps/CharacterStatueGump.cs
View file

@ -72,14 +72,14 @@ namespace Server.Gumps
{
case StatueMaterial.Antique:
switch (type)
return type switch
{
case StatueType.Bronze: return 1076187;
case StatueType.Jade: return 1076186;
case StatueType.Marble: return 1076182;
}
StatueType.Bronze => 1076187,
StatueType.Jade => 1076186,
StatueType.Marble => 1076182,
_ => 1076187
};
return 1076187;
case StatueMaterial.Dark:
if (type == StatueType.Marble)
@ -94,18 +94,18 @@ namespace Server.Gumps
private int GetDirectionNumber(Direction direction)
{
switch (direction)
return direction switch
{
case Direction.North: return 1075389;
case Direction.Right: return 1075388;
case Direction.East: return 1075387;
case Direction.Down: return 1076204;
case Direction.South: return 1075386;
case Direction.Left: return 1075391;
case Direction.West: return 1075390;
case Direction.Up: return 1076205;
default: return 1075386;
}
Direction.North => 1075389,
Direction.Right => 1075388,
Direction.East => 1075387,
Direction.Down => 1076204,
Direction.South => 1075386,
Direction.Left => 1075391,
Direction.West => 1075390,
Direction.Up => 1076205,
_ => 1075386
};
}
public override void OnResponse(NetState state, RelayInfo info)

10
Projects/Scripts/Engines/VeteranRewards/RewardChoiceGump.cs
View file

@ -50,14 +50,8 @@ namespace Server.Engines.VeteranRewards
AddPage(1);
AddHtml(60, 35, 500, 70, "<B>Ultima Online Rewards Program</B><BR>" +
"Thank you for being a part of the Ultima Online community for a full " +
intervalAsString + ". " +
"As a token of our appreciation, you may select from the following in-game reward items listed below. " +
"The gift items will be attributed to the character you have logged-in with on the shard you are on when you chose the item(s). " +
"The number of rewards you are entitled to are listed below and are for your entire account. " +
"To read more about these rewards before making a selection, feel free to visit the uo.com site at " +
"<A HREF=\"http://www.uo.com/rewards\">http://www.uo.com/rewards</A>.", true, true);
AddHtml(60, 35, 500, 70,
$"<B>Ultima Online Rewards Program</B><BR>Thank you for being a part of the Ultima Online community for a full {intervalAsString}. As a token of our appreciation, you may select from the following in-game reward items listed below. The gift items will be attributed to the character you have logged-in with on the shard you are on when you chose the item(s). The number of rewards you are entitled to are listed below and are for your entire account. To read more about these rewards before making a selection, feel free to visit the uo.com site at <A HREF=\"http://www.uo.com/rewards\">http://www.uo.com/rewards</A>.", true, true);
RewardSystem.ComputeRewardInfo(m_From, out int cur, out int max);