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

34
Projects/Scripts/Items/Containers/BaseTreasureChest.cs
View file

@ -95,32 +95,16 @@ namespace Server.Items
protected virtual void SetLockLevel()
{
switch (Level)
RequiredSkill = Level switch
{
case TreasureLevel.Level1:
RequiredSkill = LockLevel = 5;
break;
case TreasureLevel.Level2:
RequiredSkill = LockLevel = 20;
break;
case TreasureLevel.Level3:
RequiredSkill = LockLevel = 50;
break;
case TreasureLevel.Level4:
RequiredSkill = LockLevel = 70;
break;
case TreasureLevel.Level5:
RequiredSkill = LockLevel = 90;
break;
case TreasureLevel.Level6:
RequiredSkill = LockLevel = 100;
break;
}
TreasureLevel.Level1 => (LockLevel = 5),
TreasureLevel.Level2 => (LockLevel = 20),
TreasureLevel.Level3 => (LockLevel = 50),
TreasureLevel.Level4 => (LockLevel = 70),
TreasureLevel.Level5 => (LockLevel = 90),
TreasureLevel.Level6 => (LockLevel = 100),
_ => RequiredSkill
};
}
private void StartResetTimer()

42
Projects/Scripts/Items/Containers/FurnitureContainer.cs
View file

@ -335,21 +335,14 @@ namespace Server.Items
t.Start();
m_Table[c] = t;
switch (c.ItemID)
c.ItemID = c.ItemID switch
{
case 0xA4D:
c.ItemID = 0xA4C;
break;
case 0xA4F:
c.ItemID = 0xA4E;
break;
case 0xA51:
c.ItemID = 0xA50;
break;
case 0xA53:
c.ItemID = 0xA52;
break;
}
0xA4D => 0xA4C,
0xA4F => 0xA4E,
0xA51 => 0xA50,
0xA53 => 0xA52,
_ => c.ItemID
};
}
return true;
@ -364,21 +357,14 @@ namespace Server.Items
}
if (c is Armoire || c is FancyArmoire)
switch (c.ItemID)
c.ItemID = c.ItemID switch
{
case 0xA4C:
c.ItemID = 0xA4D;
break;
case 0xA4E:
c.ItemID = 0xA4F;
break;
case 0xA50:
c.ItemID = 0xA51;
break;
case 0xA52:
c.ItemID = 0xA53;
break;
}
0xA4C => 0xA4D,
0xA4E => 0xA4F,
0xA50 => 0xA51,
0xA52 => 0xA53,
_ => c.ItemID
};
}
}

3
Projects/Scripts/Items/Containers/MarkContainer.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Linq;
using Server.Commands;
namespace Server.Items
{
@ -115,7 +114,7 @@ namespace Server.Items
}
private static void CreateMalasPassage(int x, int y, int z, int xTarget, int yTarget, int zTarget, bool bone,
bool locked)
bool locked)
{
Point3D location = new Point3D(x, y, z);

47
Projects/Scripts/Items/Containers/ParagonChest.cs
View file

@ -79,22 +79,14 @@ namespace Server.Items
public void Flip()
{
switch (ItemID)
ItemID = ItemID switch
{
case 0x9AB:
ItemID = 0xE7C;
break;
case 0xE7C:
ItemID = 0x9AB;
break;
case 0xE40:
ItemID = 0xE41;
break;
case 0xE41:
ItemID = 0xE40;
break;
}
0x9AB => 0xE7C,
0xE7C => 0x9AB,
0xE40 => 0xE41,
0xE41 => 0xE40,
_ => ItemID
};
}
private void Fill(int level)
@ -104,24 +96,15 @@ namespace Server.Items
TrapLevel = level;
Locked = true;
switch (level)
RequiredSkill = level switch
{
case 1:
RequiredSkill = 36;
break;
case 2:
RequiredSkill = 76;
break;
case 3:
RequiredSkill = 84;
break;
case 4:
RequiredSkill = 92;
break;
case 5:
RequiredSkill = 100;
break;
}
1 => 36,
2 => 76,
3 => 84,
4 => 92,
5 => 100,
_ => RequiredSkill
};
LockLevel = RequiredSkill - 10;
MaxLockLevel = RequiredSkill + 40;

50
Projects/Scripts/Items/Containers/SalvageBag.cs
View file

@ -63,35 +63,18 @@ namespace Server.Items
if (craftResource.Amount < 2)
return false; // Not enough metal to resmelt
double difficulty = 0.0;
switch (resource)
var difficulty = resource switch
{
case CraftResource.DullCopper:
difficulty = 65.0;
break;
case CraftResource.ShadowIron:
difficulty = 70.0;
break;
case CraftResource.Copper:
difficulty = 75.0;
break;
case CraftResource.Bronze:
difficulty = 80.0;
break;
case CraftResource.Gold:
difficulty = 85.0;
break;
case CraftResource.Agapite:
difficulty = 90.0;
break;
case CraftResource.Verite:
difficulty = 95.0;
break;
case CraftResource.Valorite:
difficulty = 99.0;
break;
}
CraftResource.DullCopper => 65.0,
CraftResource.ShadowIron => 70.0,
CraftResource.Copper => 75.0,
CraftResource.Bronze => 80.0,
CraftResource.Gold => 85.0,
CraftResource.Agapite => 90.0,
CraftResource.Verite => 95.0,
CraftResource.Valorite => 99.0,
_ => 0.0
};
Type resourceType = info.ResourceTypes[0];
Item ingot = (Item)Activator.CreateInstance(resourceType);
@ -224,7 +207,7 @@ namespace Server.Items
private void SalvageCloth(Mobile from)
{
Scissors scissors = from.Backpack.FindItemByType<Scissors>();
if (scissors == null)
{
from.SendLocalizedMessage(1079823); // You need scissors in order to salvage cloth.
@ -253,16 +236,13 @@ namespace Server.Items
from.SendLocalizedMessage(1079974,
$"{salvaged}\t{salvaged + notSalvaged}"); // Salvaged: ~1_COUNT~/~2_NUM~ tailored items
Item[] items = FindItemsByType(new[]{
typeof(Leather), typeof(Cloth), typeof(SpinedLeather), typeof(HornedLeather), typeof(BarbedLeather),
typeof(Bandage), typeof(Bone)
});
for (int i = 0; i < items.Length; i++)
{
from.AddToBackpack(items[i]);
}
for (int i = 0; i < items.Length; i++) from.AddToBackpack(items[i]);
}
private void SalvageAll(Mobile from)
@ -376,4 +356,4 @@ namespace Server.Items
#endregion
}
}
}

63
Projects/Scripts/Items/Containers/TreasureMapChest.cs
View file

@ -159,27 +159,16 @@ namespace Server.Items
cont.TrapPower = level * 25;
cont.TrapLevel = level;
switch (level)
cont.RequiredSkill = level switch
{
case 1:
cont.RequiredSkill = 36;
break;
case 2:
cont.RequiredSkill = 76;
break;
case 3:
cont.RequiredSkill = 84;
break;
case 4:
cont.RequiredSkill = 92;
break;
case 5:
cont.RequiredSkill = 100;
break;
case 6:
cont.RequiredSkill = 100;
break;
}
1 => 36,
2 => 76,
3 => 84,
4 => 92,
5 => 100,
6 => 100,
_ => cont.RequiredSkill
};
cont.LockLevel = cont.RequiredSkill - 10;
cont.MaxLockLevel = cont.RequiredSkill + 40;
@ -195,32 +184,16 @@ namespace Server.Items
if (Core.SE)
{
switch (level)
numberItems = level switch
{
case 1:
numberItems = 5;
break;
case 2:
numberItems = 10;
break;
case 3:
numberItems = 15;
break;
case 4:
numberItems = 38;
break;
case 5:
numberItems = 50;
break;
case 6:
numberItems = 60;
break;
default:
numberItems = 0;
break;
}
;
1 => 5,
2 => 10,
3 => 15,
4 => 38,
5 => 50,
6 => 60,
_ => 0
};
}
else
{