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

4
Projects/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs
View file

@ -60,7 +60,7 @@ namespace Server.Engines.MLQuests.Gumps
}
case 1: // Okay
{
if (m_Owner == null || m_Owner.CheckComplete(m_From))
if (m_Owner?.CheckComplete(m_From) != false)
Offer(m_Owner, m_From, m_Race);
break;
@ -149,7 +149,7 @@ namespace Server.Engines.MLQuests.Gumps
AnimalForm.UnderTransformation(from) || !from.CanBeginAction<IncognitoSpell>() ||
from.IsBodyMod) // TODO: Does this cover everything?
from.SendLocalizedMessage(1073648); // You may only proceed while in your original state...
else if (from.Spell != null && from.Spell.IsCasting)
else if (from.Spell?.IsCasting == true)
from.SendLocalizedMessage(1073649); // One may not proceed while embracing magic...
else if (from.Poisoned)
from.SendLocalizedMessage(1073652); // You must be healthy to proceed...

27
Projects/Scripts/Engines/MLQuests/Items/RewardBags.cs
View file

@ -18,26 +18,15 @@ namespace Server.Engines.MLQuests.Items
for (; done < itemCount; ++done)
{
Item loot = null;
switch (Utility.Random(5))
var loot = Utility.Random(5) switch
{
case 0:
loot = Loot.RandomWeapon(false, true);
break;
case 1:
loot = Loot.RandomArmor(false, true);
break;
case 2:
loot = Loot.RandomRangedWeapon(false, true);
break;
case 3:
loot = Loot.RandomJewelry();
break;
case 4:
loot = Loot.RandomHat(false);
break;
}
0 => (Item)Loot.RandomWeapon(false, true),
1 => Loot.RandomArmor(false, true),
2 => Loot.RandomRangedWeapon(false, true),
3 => Loot.RandomJewelry(),
4 => Loot.RandomHat(false),
_ => null
};
if (loot == null)
continue;

2
Projects/Scripts/Engines/MLQuests/MLQuestContext.cs
View file

@ -259,7 +259,7 @@ namespace Server.Engines.MLQuests
MLQuest quest = MLQuestSystem.ReadQuestRef(reader);
DateTime nextAvailable = reader.ReadDateTime();
if (quest == null || !quest.RecordCompletion)
if (quest?.RecordCompletion != true)
return null; // forget about this record
return new MLDoneQuestInfo(quest, nextAvailable);

5
Projects/Scripts/Engines/MLQuests/MLQuestEntry.cs
View file

@ -335,12 +335,11 @@ namespace Server.Engines.MLQuests
foreach (Item rewardItem in rewards)
{
string rewardName = rewardItem.Name ?? string.Concat("#", rewardItem.LabelNumber);
string rewardName = rewardItem.Name ?? $"#{rewardItem.LabelNumber}";
if (rewardItem.Stackable)
Player.SendLocalizedMessage(1115917,
string.Concat(rewardItem.Amount, "\t",
rewardName)); // You receive a reward: ~1_QUANTITY~ ~2_ITEM~
$"{rewardItem.Amount}\t{rewardName}"); // You receive a reward: ~1_QUANTITY~ ~2_ITEM~
else
Player.SendLocalizedMessage(1074360, rewardName); // You receive a reward: ~1_REWARD~
}

2
Projects/Scripts/Engines/MLQuests/QuestArea.cs
View file

@ -45,7 +45,7 @@ namespace Server.Engines.MLQuests
if (!found)
Console.WriteLine("Warning: QuestArea region '{0}' does not exist (ForceMap = {1})", RegionName,
ForceMap == null ? "-null-" : ForceMap.ToString());
ForceMap?.ToString() ?? "-null-");
}
}
}