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

47
Projects/Scripts/Engines/BulkOrders/Books/BOBGump.cs
View file

@ -279,35 +279,26 @@ namespace Server.Engines.BulkOrders
if (f.Type == 2 && !isLarge)
return false;
switch (f.Material)
return f.Material switch
{
default:
return true;
case 1: return deedType == BODType.Smith;
case 2: return deedType == BODType.Tailor;
case 3:
return mat == BulkMaterialType.None &&
BGTClassifier.Classify(deedType, itemType) == BulkGenericType.Iron;
case 4: return mat == BulkMaterialType.DullCopper;
case 5: return mat == BulkMaterialType.ShadowIron;
case 6: return mat == BulkMaterialType.Copper;
case 7: return mat == BulkMaterialType.Bronze;
case 8: return mat == BulkMaterialType.Gold;
case 9: return mat == BulkMaterialType.Agapite;
case 10: return mat == BulkMaterialType.Verite;
case 11: return mat == BulkMaterialType.Valorite;
case 12:
return mat == BulkMaterialType.None &&
BGTClassifier.Classify(deedType, itemType) == BulkGenericType.Cloth;
case 13:
return mat == BulkMaterialType.None &&
BGTClassifier.Classify(deedType, itemType) == BulkGenericType.Leather;
case 14: return mat == BulkMaterialType.Spined;
case 15: return mat == BulkMaterialType.Horned;
case 16: return mat == BulkMaterialType.Barbed;
}
1 => (deedType == BODType.Smith),
2 => (deedType == BODType.Tailor),
3 => (mat == BulkMaterialType.None && BGTClassifier.Classify(deedType, itemType) == BulkGenericType.Iron),
4 => (mat == BulkMaterialType.DullCopper),
5 => (mat == BulkMaterialType.ShadowIron),
6 => (mat == BulkMaterialType.Copper),
7 => (mat == BulkMaterialType.Bronze),
8 => (mat == BulkMaterialType.Gold),
9 => (mat == BulkMaterialType.Agapite),
10 => (mat == BulkMaterialType.Verite),
11 => (mat == BulkMaterialType.Valorite),
12 => (mat == BulkMaterialType.None && BGTClassifier.Classify(deedType, itemType) == BulkGenericType.Cloth),
13 => (mat == BulkMaterialType.None && BGTClassifier.Classify(deedType, itemType) == BulkGenericType.Leather),
14 => (mat == BulkMaterialType.Spined),
15 => (mat == BulkMaterialType.Horned),
16 => (mat == BulkMaterialType.Barbed),
_ => true
};
}
public int GetIndexForPage(int page)

2
Projects/Scripts/Engines/BulkOrders/Books/BOBLargeEntry.cs
View file

@ -78,10 +78,8 @@ namespace Server.Engines.BulkOrders
LargeBulkEntry[] entries = new LargeBulkEntry[Entries.Length];
for (int i = 0; i < Entries.Length; ++i)
{
entries[i] = new LargeBulkEntry(null,
new SmallBulkEntry(Entries[i].ItemType, Entries[i].Number, Entries[i].Graphic)) { Amount = Entries[i].AmountCur };
}
return entries;
}

148
Projects/Scripts/Engines/BulkOrders/LargeBOD.cs
View file

@ -2,32 +2,32 @@ using Server.Mobiles;
namespace Server.Engines.BulkOrders
{
public abstract class LargeBOD : BaseBOD
{
private LargeBulkEntry[] m_Entries;
public abstract class LargeBOD : BaseBOD
{
private LargeBulkEntry[] m_Entries;
public LargeBulkEntry[] Entries
public LargeBulkEntry[] Entries
{
get => m_Entries;
set{ m_Entries = value; InvalidateProperties(); }
set{ m_Entries = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public override bool Complete
{
get
{
for ( int i = 0; i < m_Entries.Length; ++i )
if ( m_Entries[i].Amount < AmountMax )
return false;
[CommandProperty( AccessLevel.GameMaster )]
public override bool Complete
{
get
{
for ( int i = 0; i < m_Entries.Length; ++i )
if ( m_Entries[i].Amount < AmountMax )
return false;
return true;
}
}
return true;
}
}
public override int LabelNumber => 1045151; // a bulk order deed
public override int LabelNumber => 1045151; // a bulk order deed
public LargeBOD(int hue, int amountMax, bool requireExeptional, BulkMaterialType material, LargeBulkEntry[] entries) :
public LargeBOD(int hue, int amountMax, bool requireExeptional, BulkMaterialType material, LargeBulkEntry[] entries) :
base(hue, amountMax, requireExeptional, material) =>
m_Entries = entries;
@ -35,43 +35,43 @@ namespace Server.Engines.BulkOrders
{
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
list.Add( 1060655 ); // large bulk order
list.Add( 1060655 ); // large bulk order
if ( RequireExceptional )
list.Add( 1045141 ); // All items must be exceptional.
if ( RequireExceptional )
list.Add( 1045141 ); // All items must be exceptional.
if ( Material != BulkMaterialType.None )
list.Add( LargeBODGump.GetMaterialNumberFor( Material ) ); // All items must be made with x material.
if ( Material != BulkMaterialType.None )
list.Add( LargeBODGump.GetMaterialNumberFor( Material ) ); // All items must be made with x material.
list.Add( 1060656, AmountMax.ToString() ); // amount to make: ~1_val~
list.Add( 1060656, AmountMax.ToString() ); // amount to make: ~1_val~
for ( int i = 0; i < m_Entries.Length; ++i )
list.Add( 1060658 + i, "#{0}\t{1}", m_Entries[i].Details.Number, m_Entries[i].Amount ); // ~1_val~: ~2_val~
}
for ( int i = 0; i < m_Entries.Length; ++i )
list.Add( 1060658 + i, "#{0}\t{1}", m_Entries[i].Details.Number, m_Entries[i].Amount ); // ~1_val~: ~2_val~
}
public override void OnDoubleClickNotAccessible( Mobile from )
{
OnDoubleClick( from );
}
public override void OnDoubleClickNotAccessible( Mobile from )
{
OnDoubleClick( from );
}
public override void OnDoubleClickSecureTrade( Mobile from )
{
OnDoubleClick( from );
}
public override void OnDoubleClickSecureTrade( Mobile from )
{
OnDoubleClick( from );
}
public override void OnDoubleClick( Mobile from )
{
if ( IsChildOf( from.Backpack ) || InSecureTrade || RootParent is PlayerVendor )
from.SendGump( new LargeBODGump( from, this ) );
else
from.SendLocalizedMessage( 1045156 ); // You must have the deed in your backpack to use it.
}
public override void OnDoubleClick( Mobile from )
{
if ( IsChildOf( from.Backpack ) || InSecureTrade || RootParent is PlayerVendor )
from.SendGump( new LargeBODGump( from, this ) );
else
from.SendLocalizedMessage( 1045156 ); // You must have the deed in your backpack to use it.
}
public override void EndCombine(Mobile from, Item item)
public override void EndCombine(Mobile from, Item item)
{
if (!(item is SmallBOD small))
{
@ -82,13 +82,11 @@ namespace Server.Engines.BulkOrders
LargeBulkEntry entry = null;
for (int i = 0; i < m_Entries.Length; ++i)
{
if (m_Entries[i].Details.Type == small.Type)
{
entry = m_Entries[i];
break;
}
}
if (entry == null)
{
@ -134,40 +132,40 @@ namespace Server.Engines.BulkOrders
}
}
public LargeBOD(Serial serial) : base(serial)
{
}
public LargeBOD(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.WriteEncodedInt( 0 ); // version
writer.WriteEncodedInt( 0 ); // version
writer.Write( m_Entries.Length );
writer.Write( m_Entries.Length );
for ( int i = 0; i < m_Entries.Length; ++i )
m_Entries[i].Serialize( writer );
}
for ( int i = 0; i < m_Entries.Length; ++i )
m_Entries[i].Serialize( writer );
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadEncodedInt();
int version = reader.ReadEncodedInt();
switch ( version )
{
case 0:
{
m_Entries = new LargeBulkEntry[reader.ReadInt()];
switch ( version )
{
case 0:
{
m_Entries = new LargeBulkEntry[reader.ReadInt()];
for ( int i = 0; i < m_Entries.Length; ++i )
m_Entries[i] = new LargeBulkEntry( this, reader );
for ( int i = 0; i < m_Entries.Length; ++i )
m_Entries[i] = new LargeBulkEntry( this, reader );
break;
}
}
}
}
break;
}
}
}
}
}

38
Projects/Scripts/Engines/BulkOrders/LargeSmithBOD.cs
View file

@ -23,34 +23,18 @@ namespace Server.Engines.BulkOrders
int rand = Utility.Random(8);
switch (rand)
entries = rand switch
{
default:
case 0:
entries = LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeRing);
break;
case 1:
entries = LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargePlate);
break;
case 2:
entries = LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeChain);
break;
case 3:
entries = LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeAxes);
break;
case 4:
entries = LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeFencing);
break;
case 5:
entries = LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeMaces);
break;
case 6:
entries = LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargePolearms);
break;
case 7:
entries = LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeSwords);
break;
}
0 => LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeRing),
1 => LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargePlate),
2 => LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeChain),
3 => LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeAxes),
4 => LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeFencing),
5 => LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeMaces),
6 => LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargePolearms),
7 => LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeSwords),
_ => LargeBulkEntry.ConvertEntries(this, LargeBulkEntry.LargeRing)
};
if (rand > 2 && rand < 8)
useMaterials = false;

55
Projects/Scripts/Engines/BulkOrders/Rewards.cs
View file

@ -381,17 +381,13 @@ namespace Server.Engines.BulkOrders
private static Item CreateMiningGloves(int type)
{
switch (type)
return type switch
{
case 1:
return new LeatherGlovesOfMining(1);
case 3:
return new StuddedGlovesOfMining(3);
case 5:
return new RingmailGlovesOfMining(5);
default:
throw new InvalidOperationException();
}
1 => (Item)new LeatherGlovesOfMining(1),
3 => new StuddedGlovesOfMining(3),
5 => new RingmailGlovesOfMining(5),
_ => throw new InvalidOperationException()
};
}
private static Item CreateGargoylesPickaxe(int type) => new GargoylesPickaxe();
@ -651,38 +647,35 @@ namespace Server.Engines.BulkOrders
private static Item CreateStretchedHide(int type)
{
switch (Utility.Random(4))
return Utility.Random(4) switch
{
default:
return new SmallStretchedHideEastDeed();
case 1: return new SmallStretchedHideSouthDeed();
case 2: return new MediumStretchedHideEastDeed();
case 3: return new MediumStretchedHideSouthDeed();
}
1 => (Item)new SmallStretchedHideSouthDeed(),
2 => new MediumStretchedHideEastDeed(),
3 => new MediumStretchedHideSouthDeed(),
_ => new SmallStretchedHideEastDeed()
};
}
private static Item CreateTapestry(int type)
{
switch (Utility.Random(4))
return Utility.Random(4) switch
{
default:
return new LightFlowerTapestryEastDeed();
case 1: return new LightFlowerTapestrySouthDeed();
case 2: return new DarkFlowerTapestryEastDeed();
case 3: return new DarkFlowerTapestrySouthDeed();
}
1 => (Item)new LightFlowerTapestrySouthDeed(),
2 => new DarkFlowerTapestryEastDeed(),
3 => new DarkFlowerTapestrySouthDeed(),
_ => new LightFlowerTapestryEastDeed()
};
}
private static Item CreateBearRug(int type)
{
switch (Utility.Random(4))
return Utility.Random(4) switch
{
default:
return new BrownBearRugEastDeed();
case 1: return new BrownBearRugSouthDeed();
case 2: return new PolarBearRugEastDeed();
case 3: return new PolarBearRugSouthDeed();
}
1 => (Item)new BrownBearRugSouthDeed(),
2 => new PolarBearRugEastDeed(),
3 => new PolarBearRugSouthDeed(),
_ => new BrownBearRugEastDeed()
};
}
private static Item CreateRunicKit(int type)

107
Projects/Scripts/Engines/BulkOrders/SmallBOD.cs
View file

@ -95,83 +95,82 @@ namespace Server.Engines.BulkOrders
public static BulkMaterialType GetMaterial(CraftResource resource)
{
switch (resource)
return resource switch
{
case CraftResource.DullCopper: return BulkMaterialType.DullCopper;
case CraftResource.ShadowIron: return BulkMaterialType.ShadowIron;
case CraftResource.Copper: return BulkMaterialType.Copper;
case CraftResource.Bronze: return BulkMaterialType.Bronze;
case CraftResource.Gold: return BulkMaterialType.Gold;
case CraftResource.Agapite: return BulkMaterialType.Agapite;
case CraftResource.Verite: return BulkMaterialType.Verite;
case CraftResource.Valorite: return BulkMaterialType.Valorite;
case CraftResource.SpinedLeather: return BulkMaterialType.Spined;
case CraftResource.HornedLeather: return BulkMaterialType.Horned;
case CraftResource.BarbedLeather: return BulkMaterialType.Barbed;
}
return BulkMaterialType.None;
CraftResource.DullCopper => BulkMaterialType.DullCopper,
CraftResource.ShadowIron => BulkMaterialType.ShadowIron,
CraftResource.Copper => BulkMaterialType.Copper,
CraftResource.Bronze => BulkMaterialType.Bronze,
CraftResource.Gold => BulkMaterialType.Gold,
CraftResource.Agapite => BulkMaterialType.Agapite,
CraftResource.Verite => BulkMaterialType.Verite,
CraftResource.Valorite => BulkMaterialType.Valorite,
CraftResource.SpinedLeather => BulkMaterialType.Spined,
CraftResource.HornedLeather => BulkMaterialType.Horned,
CraftResource.BarbedLeather => BulkMaterialType.Barbed,
_ => BulkMaterialType.None
};
}
public override void EndCombine(Mobile from, Item item)
{
Type objectType = item.GetType();
if (m_AmountCur >= AmountMax)
if (m_AmountCur >= AmountMax)
{
from.SendLocalizedMessage(
1045166); // The maximum amount of requested items have already been combined to this deed.
}
else if (Type == null || objectType != Type && !objectType.IsSubclassOf(Type) ||
!(item is BaseWeapon) && !(item is BaseArmor) && !(item is BaseClothing))
{
from.SendLocalizedMessage(1045169); // The item is not in the request.
}
else
{
BaseArmor armor = item as BaseArmor;
BaseClothing clothing = item as BaseClothing;
BulkMaterialType material = GetMaterial(armor?.Resource ?? clothing?.Resource ?? CraftResource.None);
if (Material >= BulkMaterialType.DullCopper && Material <= BulkMaterialType.Valorite &&
material != Material)
{
from.SendLocalizedMessage(
1045166); // The maximum amount of requested items have already been combined to this deed.
from.SendLocalizedMessage(1045168); // The item is not made from the requested ore.
}
else if (Type == null || objectType != Type && !objectType.IsSubclassOf(Type) ||
!(item is BaseWeapon) && !(item is BaseArmor) && !(item is BaseClothing))
else if (Material >= BulkMaterialType.Spined && Material <= BulkMaterialType.Barbed &&
material != Material)
{
from.SendLocalizedMessage(1045169); // The item is not in the request.
from.SendLocalizedMessage(1049352); // The item is not made from the requested leather type.
}
else
{
BaseArmor armor = item as BaseArmor;
BaseClothing clothing = item as BaseClothing;
bool isExceptional;
BulkMaterialType material = GetMaterial(armor?.Resource ?? clothing?.Resource ?? CraftResource.None);
if (item is BaseWeapon weapon)
isExceptional = weapon.Quality == WeaponQuality.Exceptional;
else if (armor != null)
isExceptional = armor.Quality == ArmorQuality.Exceptional;
else
isExceptional = clothing.Quality == ClothingQuality.Exceptional;
if (Material >= BulkMaterialType.DullCopper && Material <= BulkMaterialType.Valorite &&
material != Material)
if (RequireExceptional && !isExceptional)
{
from.SendLocalizedMessage(1045168); // The item is not made from the requested ore.
}
else if (Material >= BulkMaterialType.Spined && Material <= BulkMaterialType.Barbed &&
material != Material)
{
from.SendLocalizedMessage(1049352); // The item is not made from the requested leather type.
from.SendLocalizedMessage(1045167); // The item must be exceptional.
}
else
{
bool isExceptional;
item.Delete();
++AmountCur;
if (item is BaseWeapon weapon)
isExceptional = weapon.Quality == WeaponQuality.Exceptional;
else if (armor != null)
isExceptional = armor.Quality == ArmorQuality.Exceptional;
else
isExceptional = clothing.Quality == ClothingQuality.Exceptional;
from.SendLocalizedMessage(1045170); // The item has been combined with the deed.
from.SendGump(new SmallBODGump(from, this));
if (RequireExceptional && !isExceptional)
{
from.SendLocalizedMessage(1045167); // The item must be exceptional.
}
else
{
item.Delete();
++AmountCur;
from.SendLocalizedMessage(1045170); // The item has been combined with the deed.
from.SendGump(new SmallBODGump(from, this));
if (m_AmountCur < AmountMax)
BeginCombine(from);
}
if (m_AmountCur < AmountMax)
BeginCombine(from);
}
}
}
}
public override void Serialize(GenericWriter writer)

50
Projects/Scripts/Engines/BulkOrders/SmallSmithBOD.cs
View file

@ -96,44 +96,22 @@ namespace Server.Engines.BulkOrders
for (int i = 0; i < 20; ++i)
{
BulkMaterialType check = GetRandomMaterial(BulkMaterialType.DullCopper, m_BlacksmithMaterialChances);
double skillReq = 0.0;
switch (check)
var skillReq = check switch
{
case BulkMaterialType.DullCopper:
skillReq = 65.0;
break;
case BulkMaterialType.ShadowIron:
skillReq = 70.0;
break;
case BulkMaterialType.Copper:
skillReq = 75.0;
break;
case BulkMaterialType.Bronze:
skillReq = 80.0;
break;
case BulkMaterialType.Gold:
skillReq = 85.0;
break;
case BulkMaterialType.Agapite:
skillReq = 90.0;
break;
case BulkMaterialType.Verite:
skillReq = 95.0;
break;
case BulkMaterialType.Valorite:
skillReq = 100.0;
break;
case BulkMaterialType.Spined:
skillReq = 65.0;
break;
case BulkMaterialType.Horned:
skillReq = 80.0;
break;
case BulkMaterialType.Barbed:
skillReq = 99.0;
break;
}
BulkMaterialType.DullCopper => 65.0,
BulkMaterialType.ShadowIron => 70.0,
BulkMaterialType.Copper => 75.0,
BulkMaterialType.Bronze => 80.0,
BulkMaterialType.Gold => 85.0,
BulkMaterialType.Agapite => 90.0,
BulkMaterialType.Verite => 95.0,
BulkMaterialType.Valorite => 100.0,
BulkMaterialType.Spined => 65.0,
BulkMaterialType.Horned => 80.0,
BulkMaterialType.Barbed => 99.0,
_ => 0.0
};
if (theirSkill >= skillReq)
{

42
Projects/Scripts/Engines/BulkOrders/SmallTailorBOD.cs
View file

@ -92,38 +92,20 @@ namespace Server.Engines.BulkOrders
for (int i = 0; i < 20; ++i)
{
BulkMaterialType check = GetRandomMaterial(BulkMaterialType.Spined, m_TailoringMaterialChances);
double skillReq = 0.0;
switch (check)
var skillReq = check switch
{
case BulkMaterialType.DullCopper:
skillReq = 65.0;
break;
case BulkMaterialType.Bronze:
skillReq = 80.0;
break;
case BulkMaterialType.Gold:
skillReq = 85.0;
break;
case BulkMaterialType.Agapite:
skillReq = 90.0;
break;
case BulkMaterialType.Verite:
skillReq = 95.0;
break;
case BulkMaterialType.Valorite:
skillReq = 100.0;
break;
case BulkMaterialType.Spined:
skillReq = 65.0;
break;
case BulkMaterialType.Horned:
skillReq = 80.0;
break;
case BulkMaterialType.Barbed:
skillReq = 99.0;
break;
}
BulkMaterialType.DullCopper => 65.0,
BulkMaterialType.Bronze => 80.0,
BulkMaterialType.Gold => 85.0,
BulkMaterialType.Agapite => 90.0,
BulkMaterialType.Verite => 95.0,
BulkMaterialType.Valorite => 100.0,
BulkMaterialType.Spined => 65.0,
BulkMaterialType.Horned => 80.0,
BulkMaterialType.Barbed => 99.0,
_ => 0.0
};
if (theirSkill >= skillReq)
{