diff --git a/Distribution/Data/items.cfg b/Distribution/Data/items.cfg index 96def1bc4..b4e3c3f43 100644 --- a/Distribution/Data/items.cfg +++ b/Distribution/Data/items.cfg @@ -83,7 +83,7 @@ Items (Item) + Entertainment (BaseInstrument; BaseBoard; Dices) + Instruments (BaseInstrument) + Games (BaseBoard; Dices) - + Construction (BaseDoor; BaseFloor; Container; DecorativeShield1; DecorativeShield2; DecorativeShield3; DecorativeShield4; DecorativeShield5; DecorativeShield6; DecorativeShield7; DecorativeShield8; DecorativeShield9; DecorativeShield10; DecorativeShield11; DecorativeShieldSword1North; DecorativeShieldSword1West; DecorativeShieldSword2North; DecorativeShieldSword2West; DecorativeBowWest; DecorativeBowNorth; DecorativeAxeNorth; DecorativeAxeWest; DecorativeSwordNorth; DecorativeSwordWest; DecorativeDAxeNorth; DecorativeDAxeWest; LargePainting; WomanPortrait1; WomanPortrait2; ManPortrait1; ManPortrait2; LadyPortrait1; LadyPortrait2; Tapestry1N; Tapestry2N; Tapestry2W; Tapestry3N; Tapestry3W; Tapestry4N; Tapestry4W; Tapestry5N; Tapestry5W; Tapestry6N; Tapestry6W; RuinedFallenChairA; RuinedArmoire; RuinedBookcase; RuinedBooks; CoveredChair; RuinedFallenChairB; RuinedChair; RuinedClock; RuinedDrawers; RuinedPainting; WoodDebris; Rope; IronWire; SilverWire; GoldWire; CopperWire; Whip; PaintsAndBrush; WoodenBench; FancyWoodenChairCushion; WoodenChairCushion; WoodenChair; BambooChair; Stool; FootStool; Throne; WoodenThrone; LargeTable; Nightstand; YewWoodTable; WritingTable; Easle; TallMusicStand; ShortMusicStand) + + Construction (BaseDoor; BaseFloor; Container; DecorativeShield1; DecorativeShield2; DecorativeShield3; DecorativeShield4; DecorativeShield5; DecorativeShield6; DecorativeShield7; DecorativeShield8; DecorativeShield9; DecorativeShield10; DecorativeShield11; DecorativeShieldSword1North; DecorativeShieldSword1West; DecorativeShieldSword2North; DecorativeShieldSword2West; DecorativeBowWest; DecorativeBowNorth; DecorativeAxeNorth; DecorativeAxeWest; DecorativeSwordNorth; DecorativeSwordWest; DecorativeDAxeNorth; DecorativeDAxeWest; LargePainting; WomanPortrait1; WomanPortrait2; ManPortrait1; ManPortrait2; LadyPortrait1; LadyPortrait2; Tapestry1N; Tapestry2N; Tapestry2W; Tapestry3N; Tapestry3W; Tapestry4N; Tapestry4W; Tapestry5N; Tapestry5W; Tapestry6N; Tapestry6W; RuinedFallenChairA; RuinedArmoire; RuinedBookcase; RuinedBooks; CoveredChair; RuinedFallenChairB; RuinedChair; RuinedClock; RuinedDrawers; RuinedPainting; WoodDebris; Rope; IronWire; SilverWire; GoldWire; CopperWire; Whip; PaintsAndBrush; WoodenBench; FancyWoodenChairCushion; WoodenChairCushion; WoodenChair; BambooChair; Stool; FootStool; Throne; WoodenThrone; LargeTable; Nightstand; YewWoodTable; WritingTable; Easel; TallMusicStand; ShortMusicStand) + Decoration (DecorativeShield1; DecorativeShield2; DecorativeShield3; DecorativeShield4; DecorativeShield5; DecorativeShield6; DecorativeShield7; DecorativeShield8; DecorativeShield9; DecorativeShield10; DecorativeShield11; DecorativeShieldSword1North; DecorativeShieldSword1West; DecorativeShieldSword2North; DecorativeShieldSword2West; DecorativeBowWest; DecorativeBowNorth; DecorativeAxeNorth; DecorativeAxeWest; DecorativeSwordNorth; DecorativeSwordWest; DecorativeDAxeNorth; DecorativeDAxeWest; LargePainting; WomanPortrait1; WomanPortrait2; ManPortrait1; ManPortrait2; LadyPortrait1; LadyPortrait2; Tapestry1N; Tapestry2N; Tapestry2W; Tapestry3N; Tapestry3W; Tapestry4N; Tapestry4W; Tapestry5N; Tapestry5W; Tapestry6N; Tapestry6W) + Shields (DecorativeShield1; DecorativeShield2; DecorativeShield3; DecorativeShield4; DecorativeShield5; DecorativeShield6; DecorativeShield7; DecorativeShield8; DecorativeShield9; DecorativeShield10; DecorativeShield11; DecorativeShieldSword1North; DecorativeShieldSword1West; DecorativeShieldSword2North; DecorativeShieldSword2West) + Weapons (DecorativeBowWest; DecorativeBowNorth; DecorativeAxeNorth; DecorativeAxeWest; DecorativeSwordNorth; DecorativeSwordWest; DecorativeDAxeNorth; DecorativeDAxeWest) @@ -94,10 +94,10 @@ Items (Item) + Doors (BaseDoor) + Floors (BaseFloor) + Containers (Container) - + Furniture (WoodenBench; FancyWoodenChairCushion; WoodenChairCushion; WoodenChair; BambooChair; Stool; FootStool; Throne; WoodenThrone; LargeTable; Nightstand; YewWoodTable; WritingTable; Easle; TallMusicStand; ShortMusicStand) + + Furniture (WoodenBench; FancyWoodenChairCushion; WoodenChairCushion; WoodenChair; BambooChair; Stool; FootStool; Throne; WoodenThrone; LargeTable; Nightstand; YewWoodTable; WritingTable; Easel; TallMusicStand; ShortMusicStand) + Chairs (WoodenBench; FancyWoodenChairCushion; WoodenChairCushion; WoodenChair; BambooChair; Stool; FootStool; Throne; WoodenThrone) + Tables (LargeTable; Nightstand; YewWoodTable; WritingTable) - + Other (Easle; TallMusicStand; ShortMusicStand) + + Other (Easel; TallMusicStand; ShortMusicStand) + Lights (BaseLight) + Food & Drink (Food; CookableFood; BaseBeverage; Glass) + Ready to eat (Food) @@ -125,7 +125,7 @@ Items (Item) + Standard (SpellScroll) + Circle #1 (ClumsyScroll; CreateFoodScroll; FeeblemindScroll; HealScroll; MagicArrowScroll; NightSightScroll; ReactiveArmorScroll; WeakenScroll) + Circle #2 (AgilityScroll; CunningScroll; CureScroll; HarmScroll; MagicTrapScroll; MagicUnTrapScroll; ProtectionScroll; StrengthScroll) - + Circle #3 (BlessScroll; FireballScroll; MagicLockScroll; PoisonScroll; TelekinisisScroll; TeleportScroll; UnlockScroll; WallOfStoneScroll) + + Circle #3 (BlessScroll; FireballScroll; MagicLockScroll; PoisonScroll; TelekinesisScroll; TeleportScroll; UnlockScroll; WallOfStoneScroll) + Circle #4 (ArchCureScroll; ArchProtectionScroll; CurseScroll; FireFieldScroll; GreaterHealScroll; LightningScroll; ManaDrainScroll; RecallScroll) + Circle #5 (BladeSpiritsScroll; DispelFieldScroll; IncognitoScroll; MagicReflectScroll; MindBlastScroll; ParalyzeScroll; PoisonFieldScroll; SummonCreatureScroll) + Circle #6 (DispelScroll; EnergyBoltScroll; ExplosionScroll; InvisibilityScroll; MarkScroll; MassCurseScroll; ParalyzeFieldScroll; RevealScroll) @@ -140,4 +140,4 @@ Items (Item) + Refresh (BaseRefreshPotion) + Strength (BaseStrengthPotion) + Ethereal Mounts (EtherealMount) - + Uncategorized (Item) \ No newline at end of file + + Uncategorized (Item) diff --git a/Projects/UOContent/Engines/Craft/DefCarpentry.cs b/Projects/UOContent/Engines/Craft/DefCarpentry.cs index 8a898d1ee..8598fcb8f 100644 --- a/Projects/UOContent/Engines/Craft/DefCarpentry.cs +++ b/Projects/UOContent/Engines/Craft/DefCarpentry.cs @@ -75,7 +75,7 @@ namespace Server.Engines.Craft AddCraft(typeof(BarrelLid), 1044294, 1027608, 11.0, 36.0, typeof(Log), 1044041, 4, 1044351); AddCraft(typeof(ShortMusicStand), 1044294, 1044313, 78.9, 103.9, typeof(Log), 1044041, 15, 1044351); AddCraft(typeof(TallMusicStand), 1044294, 1044315, 81.5, 106.5, typeof(Log), 1044041, 20, 1044351); - AddCraft(typeof(Easle), 1044294, 1044317, 86.8, 111.8, typeof(Log), 1044041, 20, 1044351); + AddCraft(typeof(Easel), 1044294, 1044317, 86.8, 111.8, typeof(Log), 1044041, 20, 1044351); if (Core.SE) { diff --git a/Projects/UOContent/Engines/Craft/DefInscription.cs b/Projects/UOContent/Engines/Craft/DefInscription.cs index 73d3039ff..ab528747b 100644 --- a/Projects/UOContent/Engines/Craft/DefInscription.cs +++ b/Projects/UOContent/Engines/Craft/DefInscription.cs @@ -210,7 +210,7 @@ namespace Server.Engines.Craft AddSpell(typeof(FireballScroll), Reg.BlackPearl); AddSpell(typeof(MagicLockScroll), Reg.Bloodmoss, Reg.Garlic, Reg.SulfurousAsh); AddSpell(typeof(PoisonScroll), Reg.Nightshade); - AddSpell(typeof(TelekinisisScroll), Reg.Bloodmoss, Reg.MandrakeRoot); + AddSpell(typeof(TelekinesisScroll), Reg.Bloodmoss, Reg.MandrakeRoot); AddSpell(typeof(TeleportScroll), Reg.Bloodmoss, Reg.MandrakeRoot); AddSpell(typeof(UnlockScroll), Reg.Bloodmoss, Reg.SulfurousAsh); AddSpell(typeof(WallOfStoneScroll), Reg.Bloodmoss, Reg.Garlic); diff --git a/Projects/UOContent/Items/Construction/Misc/Easle.cs b/Projects/UOContent/Items/Construction/Misc/Easel.cs similarity index 73% rename from Projects/UOContent/Items/Construction/Misc/Easle.cs rename to Projects/UOContent/Items/Construction/Misc/Easel.cs index 2fe0a7dcc..967d36b66 100644 --- a/Projects/UOContent/Items/Construction/Misc/Easle.cs +++ b/Projects/UOContent/Items/Construction/Misc/Easel.cs @@ -2,12 +2,12 @@ namespace Server.Items { [Furniture] [Flippable(0xF65, 0xF67, 0xF69)] - public class Easle : Item + public class Easel : Item { [Constructible] - public Easle() : base(0xF65) => Weight = 25.0; + public Easel() : base(0xF65) => Weight = 25.0; - public Easle(Serial serial) : base(serial) + public Easel(Serial serial) : base(serial) { } @@ -28,4 +28,4 @@ namespace Server.Items Weight = 25.0; } } -} \ No newline at end of file +} diff --git a/Projects/UOContent/Items/Skill Items/Magical/Scrolls/Third Circle/TelekinisisScroll.cs b/Projects/UOContent/Items/Skill Items/Magical/Scrolls/Third Circle/TelekinesisScroll.cs similarity index 65% rename from Projects/UOContent/Items/Skill Items/Magical/Scrolls/Third Circle/TelekinisisScroll.cs rename to Projects/UOContent/Items/Skill Items/Magical/Scrolls/Third Circle/TelekinesisScroll.cs index 07378276c..fb3e92809 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Scrolls/Third Circle/TelekinisisScroll.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Scrolls/Third Circle/TelekinesisScroll.cs @@ -1,13 +1,13 @@ namespace Server.Items { - public class TelekinisisScroll : SpellScroll + public class TelekinesisScroll : SpellScroll { [Constructible] - public TelekinisisScroll(int amount = 1) : base(20, 0x1F41, amount) + public TelekinesisScroll(int amount = 1) : base(20, 0x1F41, amount) { } - public TelekinisisScroll(Serial serial) : base(serial) + public TelekinesisScroll(Serial serial) : base(serial) { } diff --git a/Projects/UOContent/Misc/CharacterCreation.cs b/Projects/UOContent/Misc/CharacterCreation.cs index d4de0f5cc..a412f8a7d 100644 --- a/Projects/UOContent/Misc/CharacterCreation.cs +++ b/Projects/UOContent/Misc/CharacterCreation.cs @@ -1265,7 +1265,7 @@ namespace Server.Misc PackItem(new PoisonScroll()); break; case 20: - PackItem(new TelekinisisScroll()); + PackItem(new TelekinesisScroll()); break; case 21: PackItem(new TeleportScroll()); diff --git a/Projects/UOContent/Misc/Loot.cs b/Projects/UOContent/Misc/Loot.cs index 4687e208f..03cb9fd14 100644 --- a/Projects/UOContent/Misc/Loot.cs +++ b/Projects/UOContent/Misc/Loot.cs @@ -185,7 +185,7 @@ namespace Server typeof(AgilityScroll), typeof(CunningScroll), typeof(CureScroll), typeof(HarmScroll), typeof(MagicTrapScroll), typeof(MagicUnTrapScroll), typeof(ProtectionScroll), typeof(StrengthScroll), typeof(BlessScroll), typeof(FireballScroll), typeof(MagicLockScroll), typeof(PoisonScroll), - typeof(TelekinisisScroll), typeof(TeleportScroll), typeof(UnlockScroll), typeof(WallOfStoneScroll), + typeof(TelekinesisScroll), typeof(TeleportScroll), typeof(UnlockScroll), typeof(WallOfStoneScroll), typeof(ArchCureScroll), typeof(ArchProtectionScroll), typeof(CurseScroll), typeof(FireFieldScroll), typeof(GreaterHealScroll), typeof(LightningScroll), typeof(ManaDrainScroll), typeof(RecallScroll), typeof(BladeSpiritsScroll), typeof(DispelFieldScroll), typeof(IncognitoScroll), typeof(MagicReflectScroll),