From 4d6e584b6cfdfdd67976ffc42f29e12cc8c5539d Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Fri, 18 Sep 2020 18:41:26 -0700 Subject: [PATCH] Removes literal variables (#257) --- Projects/UOContent/Commands/Dupe.cs | 10 +-- .../Commands/Generic/Commands/BaseCommand.cs | 6 +- .../Commands/Generic/Commands/Commands.cs | 6 +- .../Commands/Generic/Commands/DesignInsert.cs | 4 +- .../Generic/Extensions/BaseExtension.cs | 2 +- .../Implementors/AreaCommandImplementor.cs | 2 +- .../ContainedCommandImplementor.cs | 2 +- .../Implementors/MultiCommandImplementor.cs | 2 +- .../Implementors/SingleCommandImplementor.cs | 2 +- Projects/UOContent/Commands/Handlers.cs | 30 +++---- .../UOContent/Commands/Object Creation/Add.cs | 34 ++++---- .../Commands/Object Creation/AddGump.cs | 6 +- .../Object Creation/CategorizedAddGump.cs | 6 +- .../Commands/Object Creation/GenTeleporter.cs | 6 +- Projects/UOContent/Commands/Properties.cs | 10 +-- Projects/UOContent/Commands/SkillsMenu.cs | 2 +- Projects/UOContent/Commands/Statics.cs | 22 ++--- .../Context Menus/AddToSpellbookEntry.cs | 8 +- .../UOContent/Engines/BulkOrders/BaseBOD.cs | 4 +- .../Engines/BulkOrders/Books/BulkOrderBook.cs | 8 +- .../UOContent/Engines/BulkOrders/LargeBOD.cs | 6 +- .../UOContent/Engines/BulkOrders/SmallBOD.cs | 6 +- .../Engines/CannedEvil/ChampionSpawn.cs | 4 +- Projects/UOContent/Engines/Chat/Channel.cs | 2 +- Projects/UOContent/Engines/Chat/Chat.cs | 4 +- .../Engines/Chat/ChatActionHandlers.cs | 44 +++++----- Projects/UOContent/Engines/Chat/ChatUser.cs | 2 +- Projects/UOContent/Engines/ConPVP/Arena.cs | 2 +- .../UOContent/Engines/ConPVP/DuelContext.cs | 18 ++-- .../UOContent/Engines/ConPVP/Games/CTF.cs | 6 +- .../Engines/ConPVP/Games/DoubleDom.cs | 2 +- .../Engines/ConPVP/Games/EventGame.cs | 2 +- .../Engines/ConPVP/Gumps/ArenaGump.cs | 6 +- .../Engines/ConPVP/Gumps/ConfirmSignupGump.cs | 20 ++--- .../Engines/ConPVP/Gumps/LadderGump.cs | 6 +- .../Engines/ConPVP/Gumps/ParticipantGump.cs | 18 ++-- .../Engines/ConPVP/TournamentSignupItem.cs | 4 +- Projects/UOContent/Engines/ConPVP/Trophy.cs | 6 +- .../UOContent/Engines/Craft/Core/CraftGump.cs | 4 +- .../UOContent/Engines/Craft/Core/CraftItem.cs | 62 +++++++------- .../UOContent/Engines/Craft/Core/CraftRes.cs | 6 +- .../Engines/Craft/Core/CraftSystem.cs | 2 +- .../UOContent/Engines/Craft/Core/Enhance.cs | 2 +- .../UOContent/Engines/Craft/Core/Repair.cs | 2 +- .../UOContent/Engines/Craft/DefAlchemy.cs | 2 +- .../UOContent/Engines/Craft/DefBlacksmithy.cs | 22 ++--- .../Engines/Craft/DefBowFletching.cs | 2 +- .../UOContent/Engines/Craft/DefCarpentry.cs | 4 +- .../UOContent/Engines/Craft/DefCartography.cs | 2 +- .../UOContent/Engines/Craft/DefCooking.cs | 2 +- .../Engines/Craft/DefGlassblowing.cs | 2 +- .../UOContent/Engines/Craft/DefInscription.cs | 2 +- .../UOContent/Engines/Craft/DefMasonry.cs | 2 +- .../UOContent/Engines/Craft/DefTailoring.cs | 2 +- .../UOContent/Engines/Craft/DefTinkering.cs | 6 +- .../Ethics/Evil/Mobiles/UnholySteed.cs | 4 +- .../Ethics/Evil/Powers/SummonFamiliar.cs | 2 +- .../Engines/Ethics/Evil/Powers/UnholySteed.cs | 2 +- .../Engines/Ethics/Hero/Mobiles/HolySteed.cs | 4 +- .../Engines/Ethics/Hero/Powers/HolySteed.cs | 2 +- .../Ethics/Hero/Powers/SummonFamiliar.cs | 2 +- .../Engines/Factions/Core/Faction.cs | 4 +- .../Engines/Factions/Core/Keywords.cs | 60 +++++++------- .../UOContent/Engines/Factions/Core/Town.cs | 2 +- .../Factions/Gumps/ElectionManagementGump.cs | 2 +- .../Engines/Factions/Items/JoinStone.cs | 4 +- .../Items/Power Faction Items/BloodRose.cs | 2 +- .../Power Faction Items/ClarityPotion.cs | 2 +- .../Power Faction Items/UrnOfAscension.cs | 6 +- .../UOContent/Engines/Factions/Items/Sigil.cs | 10 +-- .../Engines/Factions/Items/TownStone.cs | 6 +- .../Factions/Items/Traps/BaseFactionTrap.cs | 4 +- .../Factions/Mobiles/FactionWarHorse.cs | 8 +- .../Mobiles/Vendors/FactionHorseVendor.cs | 4 +- .../Engines/Harvest/Core/HarvestDefinition.cs | 4 +- .../Engines/Harvest/Core/HarvestSystem.cs | 16 ++-- .../Engines/Harvest/Core/HarvestTarget.cs | 8 +- Projects/UOContent/Engines/Harvest/Fishing.cs | 10 +-- .../Engines/Harvest/Lumberjacking.cs | 10 +-- Projects/UOContent/Engines/Harvest/Mining.cs | 36 ++++---- Projects/UOContent/Engines/Help/HelpGump.cs | 8 +- .../UOContent/Engines/Help/SpeechLogGump.cs | 4 +- .../Engines/MLQuests/Gumps/RaceChangeGump.cs | 16 ++-- .../Engines/MLQuests/Items/PrismaticAmber.cs | 6 +- .../Engines/MLQuests/Items/QuestGiverItem.cs | 8 +- .../Engines/MLQuests/Mobiles/BoonCollector.cs | 4 +- Projects/UOContent/Engines/Party/Party.cs | 26 +++--- .../UOContent/Engines/Party/PartyCommands.cs | 26 +++--- .../Engines/Party/RemovePartyTarget.cs | 2 +- .../Engines/Plants/MiscItems/OrangePetals.cs | 2 +- .../UOContent/Engines/Plants/PlantItem.cs | 8 +- .../Engines/Plants/PlantPourTarget.cs | 4 +- .../Engines/Plants/PollinateTarget.cs | 2 +- .../Engines/Plants/ReproductionGump.cs | 6 +- Projects/UOContent/Engines/Plants/Seed.cs | 6 +- .../Ambitious Solen Queen/Objectives.cs | 2 +- .../Quests/Collector/Items/Obsidian.cs | 16 ++-- .../Quests/Core/Items/EnchantedSextant.cs | 12 +-- .../Quests/Dark Tides/DarkTidesQuest.cs | 2 +- .../Quests/Dark Tides/Mobiles/Horus.cs | 2 +- .../Quests/Dark Tides/Mobiles/Mardoth.cs | 4 +- .../EminosUndertakingQuest.cs | 4 +- .../Items/EminosKatanaChest.cs | 2 +- .../Haochi's Trials/HaochisTrialsQuest.cs | 2 +- .../Items/HaochisTreasureChest.cs | 2 +- .../Quests/Haochi's Trials/Mobiles/Relnia.cs | 2 +- .../Solen Matriarch/Mobiles/SolenMatriarch.cs | 2 +- .../Quests/Solen Matriarch/Objectives.cs | 2 +- .../Study of the Solen Hive/Objectives.cs | 12 +-- .../The Summoning/Items/BellOfTheDead.cs | 4 +- .../Quests/The Summoning/Mobiles/Victoria.cs | 4 +- .../Items/SchmendrickApprenticeCorpse.cs | 4 +- .../Quests/Uzeraan Turmoil/Mobiles/Dryad.cs | 4 +- .../Uzeraan Turmoil/Mobiles/MilitiaFighter.cs | 6 +- .../Uzeraan Turmoil/UzeraanTurmoilQuest.cs | 8 +- .../UOContent/Engines/Spawners/BaseSpawner.cs | 6 +- .../CharacterStatuePlinth.cs | 2 +- Projects/UOContent/Engines/Virtues/Justice.cs | 2 +- .../UOContent/Engines/Virtues/Sacrifice.cs | 6 +- Projects/UOContent/Engines/Virtues/Valor.cs | 2 +- .../UOContent/Engines/Virtues/VirtueHelper.cs | 4 +- Projects/UOContent/Gumps/AddDoorGump.cs | 2 +- Projects/UOContent/Gumps/BanDurationGump.cs | 6 +- Projects/UOContent/Gumps/CommentsGump.cs | 4 +- Projects/UOContent/Gumps/Go/GoGump.cs | 14 ++-- Projects/UOContent/Gumps/HouseGumpAOS.cs | 82 +++++++++---------- Projects/UOContent/Gumps/PlayerVendorGumps.cs | 18 ++-- .../UOContent/Gumps/Props/SetObjectTarget.cs | 4 +- Projects/UOContent/Gumps/ReportMurderer.cs | 4 +- Projects/UOContent/Gumps/ResurrectGump.cs | 12 +-- Projects/UOContent/Gumps/RunebookGump.cs | 2 +- Projects/UOContent/Gumps/VendorRentalGumps.cs | 8 +- Projects/UOContent/Gumps/ViewHousesGump.cs | 2 +- Projects/UOContent/Gumps/WhoGump.cs | 4 +- .../Christmas/2010/Addons/FireFliesDeed.cs | 2 +- .../Halloween/2006/Engines/TrickOrTreat.cs | 6 +- .../Halloween/2011/Mobiles/PumpkinHead.cs | 4 +- .../Valentine/2011/Items/StValentinesBears.cs | 2 +- .../Valentine/2012/Items/CupidsArrow.cs | 2 +- .../UOContent/Items/Addons/AddonComponent.cs | 4 +- .../Items/Addons/AddonContainerComponent.cs | 6 +- .../Items/Addons/ArcheryButteAddon.cs | 16 ++-- .../Items/Addons/BaseAddonContainerDeed.cs | 14 ++-- .../UOContent/Items/Addons/BaseAddonDeed.cs | 12 +-- Projects/UOContent/Items/Addons/DartBoard.cs | 6 +- .../Items/Addons/FlourMillEastAddon.cs | 6 +- .../Items/Addons/FlourMillSouthAddon.cs | 6 +- .../UOContent/Items/Addons/PickpocketDips.cs | 10 +-- .../UOContent/Items/Addons/TrainingDummies.cs | 12 +-- Projects/UOContent/Items/Aquarium/Aquarium.cs | 24 +++--- .../Items/Aquarium/AquariumFishingNet.cs | 2 +- Projects/UOContent/Items/Armor/BaseArmor.cs | 24 +++--- .../Items/Armor/Leather/LeafGloves.cs | 2 +- .../Items/Armor/Leather/LeatherGloves.cs | 2 +- .../UOContent/Items/Clothing/BaseClothing.cs | 16 ++-- Projects/UOContent/Items/Clothing/Cloaks.cs | 2 +- .../UOContent/Items/Clothing/OuterTorso.cs | 2 +- Projects/UOContent/Items/Clothing/Shoes.cs | 4 +- .../UOContent/Items/Construction/Ankhs.cs | 2 +- .../Items/Construction/Doors/BaseDoor.cs | 16 ++-- .../Items/Construction/Doors/HouseDoors.cs | 6 +- .../Items/Construction/Signs/SubtextSign.cs | 2 +- .../UOContent/Items/Containers/Container.cs | 4 +- .../Items/Containers/LockableContainer.cs | 2 +- .../UOContent/Items/Containers/SalvageBag.cs | 8 +- .../UOContent/Items/Containers/Strongbox.cs | 4 +- .../Items/Containers/TrappableContainer.cs | 6 +- .../Items/Containers/TreasureMapChest.cs | 6 +- .../StealableArtifactsSpawner.cs | 8 +- .../Items/Deeds/DragonBardingDeed.cs | 2 +- .../Items/Deeds/HairRestylingDeed.cs | 4 +- .../UOContent/Items/Deeds/HolidayTreeDeed.cs | 2 +- .../Items/Deeds/VendorRentalContract.cs | 6 +- .../UOContent/Items/Farming/FarmableCrop.cs | 4 +- Projects/UOContent/Items/Food/Food.cs | 18 ++-- Projects/UOContent/Items/Games/BaseBoard.cs | 4 +- Projects/UOContent/Items/Games/BasePiece.cs | 2 +- .../Items/Games/Mahjong/MahjongDices.cs | 2 +- .../Items/Games/Mahjong/MahjongGame.cs | 4 +- Projects/UOContent/Items/Guilds/Guildstone.cs | 2 +- Projects/UOContent/Items/Jewels/BaseJewel.cs | 6 +- Projects/UOContent/Items/Lights/Candelabra.cs | 2 +- Projects/UOContent/Items/Maps/MapItem.cs | 6 +- Projects/UOContent/Items/Maps/TreasureMap.cs | 28 +++---- .../Blighted Grove/MelisandesFermentedWine.cs | 2 +- .../Misc/Blighted Grove/MelisandesHairDye.cs | 2 +- Projects/UOContent/Items/Misc/Bola.cs | 6 +- .../UOContent/Items/Misc/BulletinBoards.cs | 8 +- .../Items/Misc/CommunicationCrystals.cs | 4 +- .../UOContent/Items/Misc/DeceitBrazier.cs | 2 +- .../UOContent/Items/Misc/EffectController.cs | 4 +- Projects/UOContent/Items/Misc/Firebomb.cs | 2 +- .../Items/Misc/FlippableAddonAttribute.cs | 20 ++--- .../UOContent/Items/Misc/InteriorDecorator.cs | 20 ++--- Projects/UOContent/Items/Misc/OilCloth.cs | 4 +- Projects/UOContent/Items/Misc/Origami.cs | 2 +- .../Items/Misc/PlayerBulletinBoards.cs | 8 +- Projects/UOContent/Items/Misc/PowerCrystal.cs | 4 +- .../UOContent/Items/Misc/PowerGenerator.cs | 2 +- .../UOContent/Items/Misc/PromotionalToken.cs | 2 +- .../UOContent/Items/Misc/PublicMoongate.cs | 4 +- Projects/UOContent/Items/Misc/Teleporter.cs | 6 +- Projects/UOContent/Items/Misc/UnholyBone.cs | 8 +- Projects/UOContent/Items/Misc/Waypoint.cs | 6 +- Projects/UOContent/Items/Misc/WindChimes.cs | 6 +- .../HammerOfHephaestus.cs | 6 +- .../UOContent/Items/Quivers/BaseQuiver.cs | 2 +- .../Items/Resources/Fishing/MagicFish.cs | 2 +- .../Items/Resources/Tailor/YarnsAndThreads.cs | 2 +- .../UOContent/Items/Shields/ChaosShield.cs | 2 +- .../UOContent/Items/Shields/OrderShield.cs | 2 +- .../Items/Skill Items/Camping/Bedroll.cs | 2 +- .../Items/Skill Items/Camping/Kindling.cs | 2 +- .../Carpenter Items/TaxidermyKit.cs | 6 +- .../Items/Skill Items/Fishing/FishingPole.cs | 4 +- .../Fishing/Misc/SpecialFishingNet.cs | 4 +- .../Harvest Tools/BaseHarvestTool.cs | 6 +- .../Harvest Tools/ProspectorsTool.cs | 4 +- .../Skill Items/Magical/Misc/Moongate.cs | 14 ++-- .../Skill Items/Magical/Misc/PotionKeg.cs | 6 +- .../Skill Items/Magical/Misc/RecallRune.cs | 10 +-- .../Skill Items/Magical/Potions/BasePotion.cs | 4 +- .../BaseConflagrationPotion.cs | 18 ++-- .../BaseConfusionBlastPotion.cs | 8 +- .../Explosion Potions/BaseExplosionPotion.cs | 12 +-- .../Items/Skill Items/Magical/Runebook.cs | 6 +- .../Magical/Scrolls/SpellScroll.cs | 2 +- .../Items/Skill Items/Magical/Spellbook.cs | 24 +++--- .../Items/Skill Items/Misc/RepairDeed.cs | 8 +- .../Musical Instruments/BaseInstrument.cs | 6 +- .../Items/Skill Items/Ninjitsu/Fukiya.cs | 2 +- .../Skill Items/Ninjitsu/LeatherNinjaBelt.cs | 2 +- .../Skill Items/Ninjitsu/NinjaWeapons.cs | 10 +-- .../Tailor Items/Dyetubs/DyeTub.cs | 10 +-- .../Skill Items/Tailor Items/Misc/Dyes.cs | 10 +-- .../Skill Items/Tailor Items/Misc/Scissors.cs | 8 +- .../Items/Skill Items/Thief/DisguiseKit.cs | 18 ++-- .../Items/Skill Items/Tools/BaseTool.cs | 6 +- .../8th Anniversary Items/FountainOfLife.cs | 4 +- .../Blacksmithy/PowderOfTemperament.cs | 4 +- .../CreepyPortrait.cs | 2 +- .../DisturbingPortrait.cs | 2 +- .../MountedPixieBlue.cs | 2 +- .../MountedPixieGreen.cs | 2 +- .../MountedPixieLime.cs | 2 +- .../MountedPixieOrange.cs | 2 +- .../MountedPixieWhite.cs | 2 +- .../UnsettlingPortrait.cs | 2 +- .../Items/Special/Heritage Items/Curtains.cs | 4 +- .../Special/Heritage Items/Guillotine.cs | 4 +- .../Special/Holiday/Christmas/HolidayTree.cs | 2 +- .../Items/Special/Holiday/HolidayBell.cs | 4 +- .../Items/Special/Holiday/HolidayFoods.cs | 2 +- .../UOContent/Items/Special/Holiday/Wreath.cs | 6 +- .../Special/House Raffle/HouseRaffleStone.cs | 12 +-- .../Items/Special/ML/BaseImprisonedMobile.cs | 4 +- .../Items/Special/MonsterStatuette.cs | 2 +- .../Mutation Core/PlagueBeastBackpack.cs | 4 +- .../Special/Mutation Core/PlagueBeastBlood.cs | 2 +- .../Mutation Core/PlagueBeastOrgans.cs | 6 +- .../Special/Mutation Core/PlagueBeastVein.cs | 2 +- .../Rares/Containers/BaseWaterContainer.cs | 10 +-- .../UOContent/Items/Special/RewardCake.cs | 2 +- .../Items/Special/Solen Items/BagOfSending.cs | 12 +-- .../Special/Solen Items/BallOfSummoning.cs | 12 +-- .../Special/Solen Items/BraceletOfBinding.cs | 12 +-- .../Solen Items/PowderOfTranslocation.cs | 6 +- Projects/UOContent/Items/Special/SoulStone.cs | 24 +++--- .../Special/Special Scrolls/PowerScroll.cs | 6 +- .../Special Scrolls/ScrollofAlacrity.cs | 2 +- .../Special Scrolls/ScrollofTranscendence.cs | 6 +- .../Special/Special Scrolls/StatScroll.cs | 6 +- .../Veteran Rewards/AnkhOfSacrifice.cs | 2 +- .../Items/Special/Veteran Rewards/Cannon.cs | 8 +- .../Special/Veteran Rewards/MiningCart.cs | 18 ++-- .../Special/Veteran Rewards/MinotaurStatue.cs | 2 +- .../Special/Veteran Rewards/TreeStump.cs | 2 +- .../Veteran Rewards/WeaponEngravingTool.cs | 4 +- Projects/UOContent/Items/Suits/BaseSuit.cs | 6 +- .../UOContent/Items/Talismans/BaseTalisman.cs | 16 ++-- .../UOContent/Items/Traps/GiantSpikeTrap.cs | 2 +- Projects/UOContent/Items/Wands/BaseWand.cs | 8 +- Projects/UOContent/Items/Wands/IDWand.cs | 2 +- .../Items/Weapons/Abilities/WeaponAbility.cs | 4 +- .../UOContent/Items/Weapons/Axes/BaseAxe.cs | 4 +- .../Items/Weapons/Knives/ThrowingDagger.cs | 18 ++-- .../Items/Weapons/PoleArms/BasePoleArm.cs | 6 +- .../Items/Weapons/Staves/ShepherdsCrook.cs | 2 +- Projects/UOContent/Misc/Animations.cs | 2 +- .../Misc/Gifts/Winter2004/Mistletoe.cs | 6 +- Projects/UOContent/Misc/HardwareInfo.cs | 10 +-- Projects/UOContent/Misc/Keywords.cs | 14 ++-- Projects/UOContent/Misc/LootPack.cs | 10 +-- Projects/UOContent/Misc/MondainsLegacy.cs | 2 +- Projects/UOContent/Misc/Notoriety.cs | 2 +- .../UOContent/Misc/ProfanityProtection.cs | 2 +- Projects/UOContent/Misc/RegenRates.cs | 6 +- Projects/UOContent/Misc/RenameRequests.cs | 2 +- Projects/UOContent/Misc/ShardPoller.cs | 2 +- Projects/UOContent/Misc/SkillCheck.cs | 28 +++---- Projects/UOContent/Misc/ToggleItem.cs | 2 +- Projects/UOContent/Misc/WeightOverloading.cs | 2 +- .../Mobiles/AI/AIControlMobileTarget.cs | 2 +- Projects/UOContent/Mobiles/AI/BaseAI.cs | 16 ++-- .../UOContent/Mobiles/Animals/Cows/Cow.cs | 4 +- .../Mobiles/Animals/Misc/PackHorse.cs | 4 +- .../Mobiles/Animals/Mounts/BaseMount.cs | 8 +- .../Mobiles/Animals/Mounts/Ethereals.cs | 2 +- .../Mobiles/Familiars/BaseFamiliar.cs | 4 +- .../Mobiles/Familiars/HordeMinion.cs | 8 +- .../Mobiles/Monsters/AOS/DemonKnight.cs | 2 +- .../Mobiles/Monsters/AOS/ShadowKnight.cs | 2 +- .../Humanoid/Magic/GargoyleDestroyer.cs | 2 +- .../Monsters/LBR/Exodus/ExodusMinion.cs | 2 +- .../Monsters/LBR/Exodus/ExodusOverseer.cs | 2 +- .../ML/Humanoid/Magic/InterredGrizzle .cs | 4 +- .../Mobiles/Monsters/ML/Special/Ilhenir.cs | 2 +- .../Monsters/Misc/Magic/EtherealWarrior.cs | 18 ++-- .../Monsters/Misc/Melee/PlagueBeastLord.cs | 8 +- Projects/UOContent/Mobiles/Townfolk/Banker.cs | 2 +- .../UOContent/Mobiles/Townfolk/TownCrier.cs | 8 +- .../UOContent/Mobiles/Vendors/BaseVendor.cs | 26 +++--- .../Mobiles/Vendors/NPC/AnimalTrainer.cs | 20 ++--- .../Mobiles/Vendors/PlayerBarkeeper.cs | 2 +- .../UOContent/Mobiles/Vendors/PlayerVendor.cs | 26 +++--- .../UOContent/Mobiles/Vendors/RentedVendor.cs | 4 +- Projects/UOContent/Multis/BaseHouse.cs | 52 ++++++------ Projects/UOContent/Multis/Boats/BaseBoat.cs | 26 +++--- .../UOContent/Multis/Boats/BaseBoatDeed.cs | 10 +-- .../UOContent/Multis/Boats/BaseDockedBoat.cs | 10 +-- Projects/UOContent/Multis/Boats/Hold.cs | 2 +- .../UOContent/Multis/Boats/Strandedness.cs | 2 +- Projects/UOContent/Multis/Boats/TillerMan.cs | 8 +- Projects/UOContent/Multis/Deeds.cs | 10 +-- Projects/UOContent/Multis/HousePlacement.cs | 8 +- .../UOContent/Multis/HousePlacementTool.cs | 22 ++--- Projects/UOContent/Multis/HouseSign.cs | 4 +- Projects/UOContent/Regions/GuardedRegion.cs | 6 +- Projects/UOContent/Regions/HouseRegion.cs | 24 +++--- Projects/UOContent/Skills/Anatomy.cs | 2 +- Projects/UOContent/Skills/AnimalTaming.cs | 2 +- Projects/UOContent/Skills/ArmsLore.cs | 12 +-- Projects/UOContent/Skills/Begging.cs | 4 +- Projects/UOContent/Skills/EvalInt.cs | 2 +- Projects/UOContent/Skills/ForensicEval.cs | 14 ++-- Projects/UOContent/Skills/Inscribe.cs | 4 +- .../UOContent/Skills/ItemIdentification.cs | 2 +- Projects/UOContent/Skills/Peacemaking.cs | 8 +- Projects/UOContent/Skills/Poisoning.cs | 4 +- Projects/UOContent/Skills/RemoveTrap.cs | 4 +- Projects/UOContent/Skills/Snooping.cs | 8 +- Projects/UOContent/Skills/TasteID.cs | 4 +- .../SpecialSystems/Engines/TestCenter.cs | 10 +-- .../UOContent/Spells/Ninjitsu/FocusAttack.cs | 4 +- .../Spellweaving/Items/TransientItem.cs | 2 +- .../Spells/Targeting/RecallSpellTarget.cs | 12 +-- .../UOContent/Targets/BladedItemTarget.cs | 6 +- Projects/UOContent/Targets/MoveTarget.cs | 4 +- Projects/UOContent/Targets/PickMoveTarget.cs | 2 +- 359 files changed, 1306 insertions(+), 1306 deletions(-) diff --git a/Projects/UOContent/Commands/Dupe.cs b/Projects/UOContent/Commands/Dupe.cs index 3d01bf907..6e1a34026 100644 --- a/Projects/UOContent/Commands/Dupe.cs +++ b/Projects/UOContent/Commands/Dupe.cs @@ -138,16 +138,16 @@ namespace Server.Commands } else { - newItem.MoveToWorld(@from.Location, @from.Map); + newItem.MoveToWorld(from.Location, from.Map); } newItem.InvalidateProperties(); CommandLogging.WriteLine( - @from, + from, "{0} {1} duped {2} creating {3}", - @from.AccessLevel, - CommandLogging.Format(@from), + from.AccessLevel, + CommandLogging.Format(from), CommandLogging.Format(targ), CommandLogging.Format(newItem) ); @@ -166,7 +166,7 @@ namespace Server.Commands if (!done) { - @from.SendMessage("Unable to dupe. Item must have a 0 parameter constructor."); + from.SendMessage("Unable to dupe. Item must have a 0 parameter constructor."); } } } diff --git a/Projects/UOContent/Commands/Generic/Commands/BaseCommand.cs b/Projects/UOContent/Commands/Generic/Commands/BaseCommand.cs index 9dc2ebe37..3729ba606 100644 --- a/Projects/UOContent/Commands/Generic/Commands/BaseCommand.cs +++ b/Projects/UOContent/Commands/Generic/Commands/BaseCommand.cs @@ -114,11 +114,11 @@ namespace Server.Commands.Generic { var entry = m_Responses[i]; - @from.SendMessage(entry.ToString()); + from.SendMessage(entry.ToString()); if (flushToLog) { - CommandLogging.WriteLine(@from, entry.ToString()); + CommandLogging.WriteLine(from, entry.ToString()); } } } @@ -126,7 +126,7 @@ namespace Server.Commands.Generic { for (var i = 0; i < m_Failures.Count; ++i) { - @from.SendMessage(m_Failures[i].ToString()); + from.SendMessage(m_Failures[i].ToString()); } } diff --git a/Projects/UOContent/Commands/Generic/Commands/Commands.cs b/Projects/UOContent/Commands/Generic/Commands/Commands.cs index fd3edeb15..c8d3f6e3b 100644 --- a/Projects/UOContent/Commands/Generic/Commands/Commands.cs +++ b/Projects/UOContent/Commands/Generic/Commands/Commands.cs @@ -234,7 +234,7 @@ namespace Server.Commands.Generic { if (echo) { - gm.SendMessage("{0} : has opened their web browser to : {1}", @from.Name, url); + gm.SendMessage("{0} : has opened their web browser to : {1}", from.Name, url); } from.LaunchBrowser(url); @@ -243,7 +243,7 @@ namespace Server.Commands.Generic { if (echo) { - gm.SendMessage("{0} : has chosen not to open their web browser to : {1}", @from.Name, url); + gm.SendMessage("{0} : has chosen not to open their web browser to : {1}", from.Name, url); } from.SendMessage("You have chosen not to open your web browser."); @@ -446,7 +446,7 @@ namespace Server.Commands.Generic if (m_InGump) { - mob.SendGump(new MessageSentGump(mob, @from.Name, e.ArgString)); + mob.SendGump(new MessageSentGump(mob, from.Name, e.ArgString)); } else { diff --git a/Projects/UOContent/Commands/Generic/Commands/DesignInsert.cs b/Projects/UOContent/Commands/Generic/Commands/DesignInsert.cs index b0c312b09..7b31e855f 100644 --- a/Projects/UOContent/Commands/Generic/Commands/DesignInsert.cs +++ b/Projects/UOContent/Commands/Generic/Commands/DesignInsert.cs @@ -188,13 +188,13 @@ namespace Server.Commands.Generic { if (m_Foundations.Count == 0) { - @from.SendMessage( + from.SendMessage( "The item has been inserted into the house design. Press ESC when you are finished." ); } else { - @from.SendMessage("The item has been inserted into the house design."); + from.SendMessage("The item has been inserted into the house design."); } if (!m_Foundations.Contains(house)) diff --git a/Projects/UOContent/Commands/Generic/Extensions/BaseExtension.cs b/Projects/UOContent/Commands/Generic/Extensions/BaseExtension.cs index 74808f9f8..5aa2a700b 100644 --- a/Projects/UOContent/Commands/Generic/Extensions/BaseExtension.cs +++ b/Projects/UOContent/Commands/Generic/Extensions/BaseExtension.cs @@ -99,7 +99,7 @@ namespace Server.Commands.Generic foreach (var update in parsed) { - update.Optimize(@from, baseType, ref emitter); + update.Optimize(from, baseType, ref emitter); } if (size != args.Length) diff --git a/Projects/UOContent/Commands/Generic/Implementors/AreaCommandImplementor.cs b/Projects/UOContent/Commands/Generic/Implementors/AreaCommandImplementor.cs index e10ed2c79..a269e3756 100644 --- a/Projects/UOContent/Commands/Generic/Implementors/AreaCommandImplementor.cs +++ b/Projects/UOContent/Commands/Generic/Implementors/AreaCommandImplementor.cs @@ -49,7 +49,7 @@ namespace Server.Commands.Generic foreach (var obj in eable) { - if ((!mobiles || obj is Mobile) && BaseCommand.IsAccessible(@from, obj) && ext.IsValid(obj)) + if ((!mobiles || obj is Mobile) && BaseCommand.IsAccessible(from, obj) && ext.IsValid(obj)) { objs.Add(obj); } diff --git a/Projects/UOContent/Commands/Generic/Implementors/ContainedCommandImplementor.cs b/Projects/UOContent/Commands/Generic/Implementors/ContainedCommandImplementor.cs index a9d79adf8..f7598fb5a 100644 --- a/Projects/UOContent/Commands/Generic/Implementors/ContainedCommandImplementor.cs +++ b/Projects/UOContent/Commands/Generic/Implementors/ContainedCommandImplementor.cs @@ -21,7 +21,7 @@ namespace Server.Commands.Generic { if (command.ValidateArgs(this, new CommandEventArgs(from, command.Commands[0], GenerateArgString(args), args))) { - @from.BeginTarget( + from.BeginTarget( -1, command.ObjectTypes == ObjectTypes.All, TargetFlags.None, diff --git a/Projects/UOContent/Commands/Generic/Implementors/MultiCommandImplementor.cs b/Projects/UOContent/Commands/Generic/Implementors/MultiCommandImplementor.cs index aad5cedd7..87a030a61 100644 --- a/Projects/UOContent/Commands/Generic/Implementors/MultiCommandImplementor.cs +++ b/Projects/UOContent/Commands/Generic/Implementors/MultiCommandImplementor.cs @@ -17,7 +17,7 @@ namespace Server.Commands.Generic { if (command.ValidateArgs(this, new CommandEventArgs(from, command.Commands[0], GenerateArgString(args), args))) { - @from.BeginTarget( + from.BeginTarget( -1, command.ObjectTypes == ObjectTypes.All, TargetFlags.None, diff --git a/Projects/UOContent/Commands/Generic/Implementors/SingleCommandImplementor.cs b/Projects/UOContent/Commands/Generic/Implementors/SingleCommandImplementor.cs index 3e3b810ec..11aeb43bb 100644 --- a/Projects/UOContent/Commands/Generic/Implementors/SingleCommandImplementor.cs +++ b/Projects/UOContent/Commands/Generic/Implementors/SingleCommandImplementor.cs @@ -46,7 +46,7 @@ namespace Server.Commands.Generic { if (command.ValidateArgs(this, new CommandEventArgs(from, command.Commands[0], GenerateArgString(args), args))) { - @from.BeginTarget( + from.BeginTarget( -1, command.ObjectTypes == ObjectTypes.All, TargetFlags.None, diff --git a/Projects/UOContent/Commands/Handlers.cs b/Projects/UOContent/Commands/Handlers.cs index d80c5fe59..94a64219e 100644 --- a/Projects/UOContent/Commands/Handlers.cs +++ b/Projects/UOContent/Commands/Handlers.cs @@ -162,11 +162,11 @@ namespace Server.Commands if (pe?.Handler == from) { - @from.SendMessage("You may only use this command if you are handling their help page."); + from.SendMessage("You may only use this command if you are handling their help page."); } else { - @from.SendMessage("You may only use this command on someone who has paged you."); + from.SendMessage("You may only use this command on someone who has paged you."); } return; @@ -174,11 +174,11 @@ namespace Server.Commands if (targ.AddToBackpack(held)) { - @from.SendMessage("The item they were holding has been placed into their backpack."); + from.SendMessage("The item they were holding has been placed into their backpack."); } else { - @from.SendMessage("The item they were holding has been placed at their feet."); + from.SendMessage("The item they were holding has been placed at their feet."); } held.ClearBounce(); @@ -642,7 +642,7 @@ namespace Server.Commands { if (Insensitive.Equals(r.Name, name)) { - @from.MoveToWorld(r.GoLocation, map); + from.MoveToWorld(r.GoLocation, map); return; } } @@ -650,11 +650,11 @@ namespace Server.Commands if (ser != 0) { - @from.SendMessage("No object with that serial was found."); + from.SendMessage("No object with that serial was found."); } else { - @from.SendMessage("No region with that name was found."); + from.SendMessage("No region with that name was found."); } return; @@ -683,11 +683,11 @@ namespace Server.Commands var y = int.Parse(e.GetString(1)); var z = e.Length == 3 ? int.Parse(e.GetString(2)) : map.GetAverageZ(x, y); - @from.Location = new Point3D(x, y, z); + from.Location = new Point3D(x, y, z); } catch { - @from.SendMessage("Region name not found."); + from.SendMessage("Region name not found."); } } } @@ -709,11 +709,11 @@ namespace Server.Commands if (p != Point3D.Zero) { - @from.Location = p; + from.Location = p; } else { - @from.SendMessage("Sextant reverse lookup failed."); + from.SendMessage("Sextant reverse lookup failed."); } } } @@ -901,7 +901,7 @@ namespace Server.Commands if (targeted is Mobile mobile) { - @from.SendMenu(new EquipMenu(@from, mobile, GetEquip(mobile))); + from.SendMenu(new EquipMenu(from, mobile, GetEquip(mobile))); } } @@ -1036,7 +1036,7 @@ namespace Server.Commands } else { - box.DisplayTo(@from); + box.DisplayTo(from); } } else @@ -1133,11 +1133,11 @@ namespace Server.Commands { if (mobile.AccessLevel >= from.AccessLevel && mobile != from) { - @from.SendMessage("You can't do that to someone with higher Accesslevel than you!"); + from.SendMessage("You can't do that to someone with higher Accesslevel than you!"); } else { - @from.SendGump(new StuckMenu(@from, mobile, false)); + from.SendGump(new StuckMenu(from, mobile, false)); } } } diff --git a/Projects/UOContent/Commands/Object Creation/Add.cs b/Projects/UOContent/Commands/Object Creation/Add.cs index 8aa7a68cd..7c4f2b4e9 100644 --- a/Projects/UOContent/Commands/Object Creation/Add.cs +++ b/Projects/UOContent/Commands/Object Creation/Add.cs @@ -65,11 +65,11 @@ namespace Server.Commands if (start == end) { - sb.AppendFormat("at {0} in {1}", start, @from.Map); + sb.AppendFormat("at {0} in {1}", start, from.Map); } else { - sb.AppendFormat("from {0} to {1} in {2}", start, end, @from.Map); + sb.AppendFormat("from {0} to {1} in {2}", start, end, from.Map); } sb.Append(":"); @@ -126,7 +126,7 @@ namespace Server.Commands if (built > 0) { - @from.SendMessage( + from.SendMessage( "{0} object{1} generated in {2:F1} seconds.", built, built != 1 ? "s" : "", @@ -135,7 +135,7 @@ namespace Server.Commands } else { - SendUsage(type, @from); + SendUsage(type, from); } } @@ -195,11 +195,11 @@ namespace Server.Commands if (attr == null) { - @from.SendMessage("Property ({0}) not found.", propName); + from.SendMessage("Property ({0}) not found.", propName); } else if (from.AccessLevel < attr.WriteLevel) { - @from.SendMessage( + from.SendMessage( "Setting this property ({0}) requires at least {1} access level.", propName, Mobile.GetAccessLevelName(attr.WriteLevel) @@ -207,7 +207,7 @@ namespace Server.Commands } else if (!thisProp.CanWrite || attr.ReadOnly) { - @from.SendMessage("Property ({0}) is read only.", propName); + from.SendMessage("Property ({0}) is read only.", propName); } else { @@ -354,7 +354,7 @@ namespace Server.Commands { if (sendError) { - @from.SendMessage(result); + from.SendMessage(result); } hadError = true; @@ -404,7 +404,7 @@ namespace Server.Commands if (objectCount >= 20) { - @from.SendMessage("Constructing {0} objects, please wait.", objectCount); + from.SendMessage("Constructing {0} objects, please wait.", objectCount); } var sendError = true; @@ -448,7 +448,7 @@ namespace Server.Commands z = map.GetAverageZ(x, y); } - var built = Build(@from, ctor, values, props, realProps, ref sendError); + var built = Build(from, ctor, values, props, realProps, ref sendError); sb.AppendFormat("0x{0:X}; ", built.Serial.Value); @@ -500,7 +500,7 @@ namespace Server.Commands if (!foundCtor) { - @from.SendMessage("That type is not marked constructible."); + from.SendMessage("That type is not marked constructible."); } } @@ -557,14 +557,14 @@ namespace Server.Commands if (e.Length >= 1) { BoundingBoxPicker.Begin( - @from, + from, (map, start, end) => - TileBox_Callback(@from, start, end, new TileState(TileZType.Start, 0, e.Arguments, outline)) + TileBox_Callback(from, start, end, new TileState(TileZType.Start, 0, e.Arguments, outline)) ); } else { - @from.SendMessage( + from.SendMessage( "Format: {0} [params] [set {{ ...}}]", outline ? "Outline" : "Tile" ); @@ -656,14 +656,14 @@ namespace Server.Commands if (e.Length >= 1) { BoundingBoxPicker.Begin( - @from, + from, (map, start, end) => - TileBox_Callback(@from, start, end, new TileState(TileZType.MapAverage, 0, e.Arguments, outline)) + TileBox_Callback(from, start, end, new TileState(TileZType.MapAverage, 0, e.Arguments, outline)) ); } else { - @from.SendMessage( + from.SendMessage( "Format: {0}Avg [params] [set {{ ...}}]", outline ? "Outline" : "Tile" ); diff --git a/Projects/UOContent/Commands/Object Creation/AddGump.cs b/Projects/UOContent/Commands/Object Creation/AddGump.cs index df9e9b39b..6e7e02758 100644 --- a/Projects/UOContent/Commands/Object Creation/AddGump.cs +++ b/Projects/UOContent/Commands/Object Creation/AddGump.cs @@ -200,7 +200,7 @@ namespace Server.Gumps { if (m_Page > 0) { - @from.SendGump(new AddGump(@from, m_SearchString, m_Page - 1, m_SearchResults, true)); + from.SendGump(new AddGump(from, m_SearchString, m_Page - 1, m_SearchResults, true)); } break; @@ -209,7 +209,7 @@ namespace Server.Gumps { if ((m_Page + 1) * 10 < m_SearchResults.Length) { - @from.SendGump(new AddGump(@from, m_SearchString, m_Page + 1, m_SearchResults, true)); + from.SendGump(new AddGump(from, m_SearchString, m_Page + 1, m_SearchResults, true)); } break; @@ -279,7 +279,7 @@ namespace Server.Gumps { if (cancelType == TargetCancelType.Canceled) { - @from.SendGump(new AddGump(@from, m_SearchString, m_Page, m_SearchResults, true)); + from.SendGump(new AddGump(from, m_SearchString, m_Page, m_SearchResults, true)); } } } diff --git a/Projects/UOContent/Commands/Object Creation/CategorizedAddGump.cs b/Projects/UOContent/Commands/Object Creation/CategorizedAddGump.cs index 65f7ca76a..0c8cad82a 100644 --- a/Projects/UOContent/Commands/Object Creation/CategorizedAddGump.cs +++ b/Projects/UOContent/Commands/Object Creation/CategorizedAddGump.cs @@ -275,7 +275,7 @@ namespace Server.Gumps { if (m_Page > 0) { - @from.SendGump(new CategorizedAddGump(@from, m_Category, m_Page - 1)); + from.SendGump(new CategorizedAddGump(from, m_Category, m_Page - 1)); } break; @@ -284,7 +284,7 @@ namespace Server.Gumps { if ((m_Page + 1) * EntryCount < m_Category.Nodes.Length) { - @from.SendGump(new CategorizedAddGump(@from, m_Category, m_Page + 1)); + from.SendGump(new CategorizedAddGump(from, m_Category, m_Page + 1)); } break; @@ -295,7 +295,7 @@ namespace Server.Gumps if (index >= 0 && index < m_Category.Nodes.Length) { - m_Category.Nodes[index].OnClick(@from, m_Page); + m_Category.Nodes[index].OnClick(from, m_Page); } break; diff --git a/Projects/UOContent/Commands/Object Creation/GenTeleporter.cs b/Projects/UOContent/Commands/Object Creation/GenTeleporter.cs index cfcc41457..4c4a1c17c 100644 --- a/Projects/UOContent/Commands/Object Creation/GenTeleporter.cs +++ b/Projects/UOContent/Commands/Object Creation/GenTeleporter.cs @@ -66,7 +66,7 @@ namespace Server.Commands { if (count > 0) { - @from.SendMessage(WarningHue, $"Partial Completion, {count} Teleporters Removed."); + from.SendMessage(WarningHue, $"Partial Completion, {count} Teleporters Removed."); } return; @@ -88,12 +88,12 @@ namespace Server.Commands { if (c.DelCount > 0) { - @from.SendMessage(WarningHue, $"Partial Completion: {c.DelCount} Teleporters Removed."); + from.SendMessage(WarningHue, $"Partial Completion: {c.DelCount} Teleporters Removed."); } if (c.Count > 0) { - @from.SendMessage(WarningHue, $"Partial Completion: {c.Count} Teleporters Added."); + from.SendMessage(WarningHue, $"Partial Completion: {c.Count} Teleporters Added."); } return; diff --git a/Projects/UOContent/Commands/Properties.cs b/Projects/UOContent/Commands/Properties.cs index dcd63b3bc..fc96bd83f 100644 --- a/Projects/UOContent/Commands/Properties.cs +++ b/Projects/UOContent/Commands/Properties.cs @@ -544,7 +544,7 @@ namespace Server.Commands if (shouldLog) { CommandLogging.LogChangeProperty( - @from, + from, logObject, givenName, toSet?.ToString() ?? "(-null-)" @@ -607,11 +607,11 @@ namespace Server.Commands { if (!BaseCommand.IsAccessible(from, o)) { - @from.SendLocalizedMessage(500447); // That is not accessible. + from.SendLocalizedMessage(500447); // That is not accessible. } else { - @from.SendGump(new PropertiesGump(@from, o)); + from.SendGump(new PropertiesGump(from, o)); } } } @@ -794,12 +794,12 @@ namespace Server if ((access & PropertyAccess.Read) != 0 && from.AccessLevel < security.ReadLevel) { - throw new ReadAccessException(this, @from.AccessLevel, security.ReadLevel); + throw new ReadAccessException(this, from.AccessLevel, security.ReadLevel); } if ((access & PropertyAccess.Write) != 0 && (from.AccessLevel < security.WriteLevel || security.ReadOnly)) { - throw new WriteAccessException(this, @from.AccessLevel, security.ReadLevel); + throw new WriteAccessException(this, from.AccessLevel, security.ReadLevel); } } diff --git a/Projects/UOContent/Commands/SkillsMenu.cs b/Projects/UOContent/Commands/SkillsMenu.cs index 327f316e4..d66063663 100644 --- a/Projects/UOContent/Commands/SkillsMenu.cs +++ b/Projects/UOContent/Commands/SkillsMenu.cs @@ -32,7 +32,7 @@ namespace Server.Commands { if (o is Mobile mobile) { - @from.SendGump(new SkillsGump(@from, mobile)); + from.SendGump(new SkillsGump(from, mobile)); } } } diff --git a/Projects/UOContent/Commands/Statics.cs b/Projects/UOContent/Commands/Statics.cs index b80973469..ded3836ce 100644 --- a/Projects/UOContent/Commands/Statics.cs +++ b/Projects/UOContent/Commands/Statics.cs @@ -65,7 +65,7 @@ namespace Server if (map != null && map != Map.Internal) { SendWarning( - @from, + from, "You are about to freeze all items in {0}.", BaseFreezeWarning, map, @@ -141,19 +141,19 @@ namespace Server if (targetMap == null) { CommandLogging.WriteLine( - @from, + from, "{0} {1} invoking freeze for every item in every map", - @from.AccessLevel, - CommandLogging.Format(@from) + from.AccessLevel, + CommandLogging.Format(from) ); } else { CommandLogging.WriteLine( - @from, + from, "{0} {1} invoking freeze for every item in {0}", - @from.AccessLevel, - CommandLogging.Format(@from), + from.AccessLevel, + CommandLogging.Format(from), targetMap ); } @@ -380,7 +380,7 @@ namespace Server if (totalFrozen == 0 && badDataFile) { - @from.SendGump( + from.SendGump( new NoticeGump( 1060637, 30720, @@ -393,7 +393,7 @@ namespace Server } else { - @from.SendGump( + from.SendGump( new NoticeGump( 1060637, 30720, @@ -641,7 +641,7 @@ namespace Server if (totalUnfrozen == 0 && badDataFile) { - @from.SendGump( + from.SendGump( new NoticeGump( 1060637, 30720, @@ -654,7 +654,7 @@ namespace Server } else { - @from.SendGump( + from.SendGump( new NoticeGump( 1060637, 30720, diff --git a/Projects/UOContent/Context Menus/AddToSpellbookEntry.cs b/Projects/UOContent/Context Menus/AddToSpellbookEntry.cs index 17bc9275c..cb6622137 100644 --- a/Projects/UOContent/Context Menus/AddToSpellbookEntry.cs +++ b/Projects/UOContent/Context Menus/AddToSpellbookEntry.cs @@ -28,8 +28,8 @@ namespace Server.ContextMenus { if (targeted is Spellbook book) { - if (@from.CheckAlive() && !m_Scroll.Deleted && m_Scroll.Movable && m_Scroll.Amount >= 1 && - m_Scroll.CheckItemUse(@from)) + if (from.CheckAlive() && !m_Scroll.Deleted && m_Scroll.Movable && m_Scroll.Amount >= 1 && + m_Scroll.CheckItemUse(from)) { var type = Spellbook.GetTypeForSpell(m_Scroll.SpellID); @@ -38,7 +38,7 @@ namespace Server.ContextMenus } else if (book.HasSpell(m_Scroll.SpellID)) { - @from.SendLocalizedMessage(500179); // That spell is already present in that spellbook. + from.SendLocalizedMessage(500179); // That spell is already present in that spellbook. } else { @@ -50,7 +50,7 @@ namespace Server.ContextMenus m_Scroll.Consume(); - @from.Send(new PlaySound(0x249, book.GetWorldLocation())); + from.Send(new PlaySound(0x249, book.GetWorldLocation())); } } } diff --git a/Projects/UOContent/Engines/BulkOrders/BaseBOD.cs b/Projects/UOContent/Engines/BulkOrders/BaseBOD.cs index 8cd693229..0f92f8f09 100644 --- a/Projects/UOContent/Engines/BulkOrders/BaseBOD.cs +++ b/Projects/UOContent/Engines/BulkOrders/BaseBOD.cs @@ -132,13 +132,13 @@ namespace Server.Engines.BulkOrders { if (Complete) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1045166 ); // The maximum amount of requested items have already been combined to this deed. } else { - @from.Target = new BODTarget(this); + from.Target = new BODTarget(this); } } diff --git a/Projects/UOContent/Engines/BulkOrders/Books/BulkOrderBook.cs b/Projects/UOContent/Engines/BulkOrders/Books/BulkOrderBook.cs index 35c4fec84..9ec460a32 100644 --- a/Projects/UOContent/Engines/BulkOrders/Books/BulkOrderBook.cs +++ b/Projects/UOContent/Engines/BulkOrders/Books/BulkOrderBook.cs @@ -53,11 +53,11 @@ namespace Server.Engines.BulkOrders { if (!from.InRange(GetWorldLocation(), 2)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if (Entries.Count == 0) { - @from.SendLocalizedMessage(1062381); // The book is empty. + from.SendLocalizedMessage(1062381); // The book is empty. } else if (from is PlayerMobile mobile) { @@ -278,7 +278,7 @@ namespace Server.Engines.BulkOrders if (!string.IsNullOrEmpty(m_BookName)) { - LabelTo(@from, 1062481, m_BookName); + LabelTo(from, 1062481, m_BookName); } } @@ -288,7 +288,7 @@ namespace Server.Engines.BulkOrders if (from.CheckAlive() && IsChildOf(from.Backpack)) { - list.Add(new NameBookEntry(@from, this)); + list.Add(new NameBookEntry(from, this)); } SetSecureLevelEntry.AddTo(from, this, list); diff --git a/Projects/UOContent/Engines/BulkOrders/LargeBOD.cs b/Projects/UOContent/Engines/BulkOrders/LargeBOD.cs index b297409ea..95624a410 100644 --- a/Projects/UOContent/Engines/BulkOrders/LargeBOD.cs +++ b/Projects/UOContent/Engines/BulkOrders/LargeBOD.cs @@ -86,11 +86,11 @@ namespace Server.Engines.BulkOrders { if (IsChildOf(from.Backpack) || InSecureTrade || RootParent is PlayerVendor) { - @from.SendGump(new LargeBODGump(@from, this)); + from.SendGump(new LargeBODGump(from, this)); } else { - @from.SendLocalizedMessage(1045156); // You must have the deed in your backpack to use it. + from.SendLocalizedMessage(1045156); // You must have the deed in your backpack to use it. } } @@ -157,7 +157,7 @@ namespace Server.Engines.BulkOrders if (!Complete) { - BeginCombine(@from); + BeginCombine(from); } } } diff --git a/Projects/UOContent/Engines/BulkOrders/SmallBOD.cs b/Projects/UOContent/Engines/BulkOrders/SmallBOD.cs index ee9e6cecc..8e49d4698 100644 --- a/Projects/UOContent/Engines/BulkOrders/SmallBOD.cs +++ b/Projects/UOContent/Engines/BulkOrders/SmallBOD.cs @@ -85,11 +85,11 @@ namespace Server.Engines.BulkOrders { if (IsChildOf(from.Backpack) || InSecureTrade || RootParent is PlayerVendor) { - @from.SendGump(new SmallBODGump(@from, this)); + from.SendGump(new SmallBODGump(from, this)); } else { - @from.SendLocalizedMessage(1045156); // You must have the deed in your backpack to use it. + from.SendLocalizedMessage(1045156); // You must have the deed in your backpack to use it. } } @@ -185,7 +185,7 @@ namespace Server.Engines.BulkOrders if (m_AmountCur < AmountMax) { - BeginCombine(@from); + BeginCombine(from); } } } diff --git a/Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs b/Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs index 4f294fdac..4a843ab3e 100644 --- a/Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs +++ b/Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs @@ -901,11 +901,11 @@ namespace Server.Engines.CannedEvil { if (m_Active) { - LabelTo(@from, "{0} (Active; Level: {1}; Kills: {2}/{3})", m_Type, Level, m_Kills, MaxKills); + LabelTo(from, "{0} (Active; Level: {1}; Kills: {2}/{3})", m_Type, Level, m_Kills, MaxKills); } else { - LabelTo(@from, "{0} (Inactive)", m_Type); + LabelTo(from, "{0} (Inactive)", m_Type); } } diff --git a/Projects/UOContent/Engines/Chat/Channel.cs b/Projects/UOContent/Engines/Chat/Channel.cs index 431439562..b7f6546f6 100644 --- a/Projects/UOContent/Engines/Chat/Channel.cs +++ b/Projects/UOContent/Engines/Chat/Channel.cs @@ -376,7 +376,7 @@ namespace Server.Engines.Chat if (user.CheckOnline()) { - user.SendMessage(number, @from.Mobile, param1, param2); + user.SendMessage(number, from.Mobile, param1, param2); } else if (!Contains(user)) { diff --git a/Projects/UOContent/Engines/Chat/Chat.cs b/Projects/UOContent/Engines/Chat/Chat.cs index f28b7df0b..4e20310ef 100644 --- a/Projects/UOContent/Engines/Chat/Chat.cs +++ b/Projects/UOContent/Engines/Chat/Chat.cs @@ -49,7 +49,7 @@ namespace Server.Engines.Chat { if (chatName.Length > 0 && chatName != accountChatName) { - @from.SendMessage("You cannot change chat nickname once it has been set."); + from.SendMessage("You cannot change chat nickname once it has been set."); } } else @@ -104,7 +104,7 @@ namespace Server.Engines.Chat if (user == null) { - @from.SendMessage(32, name); // There is no player named '%1'. + from.SendMessage(32, name); // There is no player named '%1'. } return user; diff --git a/Projects/UOContent/Engines/Chat/ChatActionHandlers.cs b/Projects/UOContent/Engines/Chat/ChatActionHandlers.cs index f5e410be9..a68502c98 100644 --- a/Projects/UOContent/Engines/Chat/ChatActionHandlers.cs +++ b/Projects/UOContent/Engines/Chat/ChatActionHandlers.cs @@ -62,11 +62,11 @@ namespace Server.Engines.Chat { if (channel.CanTalk(from)) { - channel.SendIgnorableMessage(57, @from, @from.GetColorCharacter() + @from.Username, param); // %1: %2 + channel.SendIgnorableMessage(57, from, from.GetColorCharacter() + from.Username, param); // %1: %2 } else { - @from.SendMessage(36); // The moderator of this conference has not given you speaking privileges. + from.SendMessage(36); // The moderator of this conference has not given you speaking privileges. } } @@ -74,11 +74,11 @@ namespace Server.Engines.Chat { if (channel.CanTalk(from)) { - channel.SendIgnorableMessage(58, @from, @from.GetColorCharacter() + @from.Username, param); // %1 %2 + channel.SendIgnorableMessage(58, from, from.GetColorCharacter() + from.Username, param); // %1 %2 } else { - @from.SendMessage(36); // The moderator of this conference has not given you speaking privileges. + from.SendMessage(36); // The moderator of this conference has not given you speaking privileges. } } @@ -98,18 +98,18 @@ namespace Server.Engines.Chat if (target.IsIgnored(from)) { - @from.SendMessage( + from.SendMessage( 35, target.Username ); // %1 has chosen to ignore you. None of your messages to them will get through. } else if (target.IgnorePrivateMessage) { - @from.SendMessage(42, target.Username); // %1 has chosen to not receive private messages at the moment. + from.SendMessage(42, target.Username); // %1 has chosen to not receive private messages at the moment. } else { - target.SendMessage(59, @from.Mobile, @from.GetColorCharacter() + @from.Username, text); // [%1]: %2 + target.SendMessage(59, from.Mobile, from.GetColorCharacter() + from.Username, text); // [%1]: %2 } } @@ -209,11 +209,11 @@ namespace Server.Engines.Chat if (joined == null) { - @from.SendMessage(33, name); // There is no conference named '%1'. + from.SendMessage(33, name); // There is no conference named '%1'. } else { - joined.AddUser(@from, password); + joined.AddUser(from, password); } } @@ -285,11 +285,11 @@ namespace Server.Engines.Chat if (from.IsIgnored(target)) { - @from.RemoveIgnored(target); + from.RemoveIgnored(target); } else { - @from.AddIgnored(target); + from.AddIgnored(target); } } @@ -299,7 +299,7 @@ namespace Server.Engines.Chat if (target != null) { - channel.AddVoiced(target, @from); + channel.AddVoiced(target, from); } } @@ -309,7 +309,7 @@ namespace Server.Engines.Chat if (target != null) { - channel.RemoveVoiced(target, @from); + channel.RemoveVoiced(target, from); } } @@ -324,11 +324,11 @@ namespace Server.Engines.Chat if (channel.IsVoiced(target)) { - channel.RemoveVoiced(target, @from); + channel.RemoveVoiced(target, from); } else { - channel.AddVoiced(target, @from); + channel.AddVoiced(target, from); } } @@ -338,7 +338,7 @@ namespace Server.Engines.Chat if (target != null) { - channel.AddModerator(target, @from); + channel.AddModerator(target, from); } } @@ -348,7 +348,7 @@ namespace Server.Engines.Chat if (target != null) { - channel.RemoveModerator(target, @from); + channel.RemoveModerator(target, from); } } @@ -363,11 +363,11 @@ namespace Server.Engines.Chat if (channel.IsModerator(target)) { - channel.RemoveModerator(target, @from); + channel.RemoveModerator(target, from); } else { - channel.AddModerator(target, @from); + channel.AddModerator(target, from); } } @@ -387,11 +387,11 @@ namespace Server.Engines.Chat if (target.Anonymous) { - @from.SendMessage(41, target.Username); // %1 is remaining anonymous. + from.SendMessage(41, target.Username); // %1 is remaining anonymous. } else { - @from.SendMessage(43, target.Username, target.Mobile.Name); // %2 is known in the lands of Britannia as %2. + from.SendMessage(43, target.Username, target.Mobile.Name); // %2 is known in the lands of Britannia as %2. } } @@ -401,7 +401,7 @@ namespace Server.Engines.Chat if (target != null) { - channel.Kick(target, @from); + channel.Kick(target, from); } } diff --git a/Projects/UOContent/Engines/Chat/ChatUser.cs b/Projects/UOContent/Engines/Chat/ChatUser.cs index be0625618..e34e2ad94 100644 --- a/Projects/UOContent/Engines/Chat/ChatUser.cs +++ b/Projects/UOContent/Engines/Chat/ChatUser.cs @@ -82,7 +82,7 @@ namespace Server.Engines.Chat { if (Mobile.NetState != null) { - Mobile.Send(new ChatMessagePacket(@from, number, param1, param2)); + Mobile.Send(new ChatMessagePacket(from, number, param1, param2)); } } diff --git a/Projects/UOContent/Engines/ConPVP/Arena.cs b/Projects/UOContent/Engines/ConPVP/Arena.cs index 44610c7d8..9c338d3c0 100644 --- a/Projects/UOContent/Engines/ConPVP/Arena.cs +++ b/Projects/UOContent/Engines/ConPVP/Arena.cs @@ -45,7 +45,7 @@ namespace Server.Engines.ConPVP { if (from.AccessLevel >= AccessLevel.GameMaster) { - @from.SendGump(new PropertiesGump(@from, Arena)); + from.SendGump(new PropertiesGump(from, Arena)); } } diff --git a/Projects/UOContent/Engines/ConPVP/DuelContext.cs b/Projects/UOContent/Engines/ConPVP/DuelContext.cs index 321038ac7..2a0d4b7ec 100644 --- a/Projects/UOContent/Engines/ConPVP/DuelContext.cs +++ b/Projects/UOContent/Engines/ConPVP/DuelContext.cs @@ -174,7 +174,7 @@ namespace Server.Engines.ConPVP if (spell is RecallSpell) { - @from.SendMessage("You may not cast this spell."); + from.SendMessage("You may not cast this spell."); } string title; @@ -295,7 +295,7 @@ namespace Server.Engines.ConPVP if (message) { - @from.SendMessage("The dueling ruleset prevents you from using this combat ability."); + from.SendMessage("The dueling ruleset prevents you from using this combat ability."); } return false; @@ -414,7 +414,7 @@ namespace Server.Engines.ConPVP if (!(item is BaseRefreshPotion)) { - if (CantDoAnything(@from)) + if (CantDoAnything(from)) { return false; } @@ -700,7 +700,7 @@ namespace Server.Engines.ConPVP if (killer?.Player == true) { - killer.AddToBackpack(new Head(m_Tournament == null ? HeadType.Duel : HeadType.Tournament, @from.Name)); + killer.AddToBackpack(new Head(m_Tournament == null ? HeadType.Duel : HeadType.Tournament, from.Name)); } } @@ -708,11 +708,11 @@ namespace Server.Engines.ConPVP if (didntFit) { - @from.SendLocalizedMessage(1062472); // You gather some of your belongings. The rest remain on the corpse. + from.SendLocalizedMessage(1062472); // You gather some of your belongings. The rest remain on the corpse. } else { - @from.SendLocalizedMessage(1062471); // You quickly gather all of your belongings. + from.SendLocalizedMessage(1062471); // You quickly gather all of your belongings. } } @@ -1290,7 +1290,7 @@ namespace Server.Engines.ConPVP if (entry != null) { - @from.SendGump(new PropertiesGump(@from, entry)); + from.SendGump(new PropertiesGump(from, entry)); } } } @@ -1364,7 +1364,7 @@ namespace Server.Engines.ConPVP mob.SpeechHue, false, "I'm not a duelist, and quite frankly, I resent the implication.", - @from.NetState + from.NetState ); } else @@ -1374,7 +1374,7 @@ namespace Server.Engines.ConPVP 0x3B2, true, "It's probably better than you.", - @from.NetState + from.NetState ); } } diff --git a/Projects/UOContent/Engines/ConPVP/Games/CTF.cs b/Projects/UOContent/Engines/ConPVP/Games/CTF.cs index 7f284f085..49a78f60a 100644 --- a/Projects/UOContent/Engines/ConPVP/Games/CTF.cs +++ b/Projects/UOContent/Engines/ConPVP/Games/CTF.cs @@ -499,7 +499,7 @@ namespace Server.Engines.ConPVP if (passTo == from) { - @from.LocalOverheadMessage(MessageType.Regular, 0x26, false, "I can't pass to them."); + from.LocalOverheadMessage(MessageType.Regular, 0x26, false, "I can't pass to them."); } else if (passTeam == useTeam && passTo.PlaceInBackpack(this)) { @@ -507,12 +507,12 @@ namespace Server.Engines.ConPVP MessageType.Regular, 0x59, false, - $"{@from.Name} has passed you the cookies!" + $"{from.Name} has passed you the cookies!" ); } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x26, false, "I can't pass to them."); + from.LocalOverheadMessage(MessageType.Regular, 0x26, false, "I can't pass to them."); } } } diff --git a/Projects/UOContent/Engines/ConPVP/Games/DoubleDom.cs b/Projects/UOContent/Engines/ConPVP/Games/DoubleDom.cs index 7258cb7ff..f38c251a7 100644 --- a/Projects/UOContent/Engines/ConPVP/Games/DoubleDom.cs +++ b/Projects/UOContent/Engines/ConPVP/Games/DoubleDom.cs @@ -1198,7 +1198,7 @@ namespace Server.Engines.ConPVP if (team != null && team != TeamOwner) { - m_Game.Dominate(this, @from, team); + m_Game.Dominate(this, from, team); } } diff --git a/Projects/UOContent/Engines/ConPVP/Games/EventGame.cs b/Projects/UOContent/Engines/ConPVP/Games/EventGame.cs index c879a2c68..fecc2fdd4 100644 --- a/Projects/UOContent/Engines/ConPVP/Games/EventGame.cs +++ b/Projects/UOContent/Engines/ConPVP/Games/EventGame.cs @@ -40,7 +40,7 @@ namespace Server.Engines.ConPVP { if (from.AccessLevel >= AccessLevel.GameMaster) { - @from.SendGump(new PropertiesGump(@from, this)); + from.SendGump(new PropertiesGump(from, this)); } } } diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/ArenaGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/ArenaGump.cs index 85c5d7e46..466549483 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/ArenaGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/ArenaGump.cs @@ -55,7 +55,7 @@ namespace Server.Engines.ConPVP if (!from.Hidden || from.AccessLevel == AccessLevel.Player) { - Effects.PlaySound(@from.Location, @from.Map, 0x20E); + Effects.PlaySound(from.Location, from.Map, 0x20E); } return true; @@ -65,11 +65,11 @@ namespace Server.Engines.ConPVP { if (from.InRange(GetWorldLocation(), 1)) { - UseGate(@from); + UseGate(from); } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that } } diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs index ee1d8dfe8..6913769c4 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs @@ -337,7 +337,7 @@ namespace Server.Engines.ConPVP 0x35, false, "Excuse me? You are already signed up.", - @from.NetState + from.NetState ); } else @@ -347,7 +347,7 @@ namespace Server.Engines.ConPVP 0x22, false, "The tournament has already begun. You are too late to signup now.", - @from.NetState + from.NetState ); } } @@ -401,7 +401,7 @@ namespace Server.Engines.ConPVP 0x35, false, "You have not yet proven yourself a worthy dueler.", - @from.NetState + from.NetState ); } else @@ -411,7 +411,7 @@ namespace Server.Engines.ConPVP 0x35, false, $"{mob.Name} has not yet proven themselves a worthy dueler.", - @from.NetState + from.NetState ); } } @@ -445,7 +445,7 @@ namespace Server.Engines.ConPVP 0x35, false, "You have already entered this tournament.", - @from.NetState + from.NetState ); } else @@ -455,7 +455,7 @@ namespace Server.Engines.ConPVP 0x35, false, $"{mob.Name} has already entered this tournament.", - @from.NetState + from.NetState ); } } @@ -473,7 +473,7 @@ namespace Server.Engines.ConPVP 0x35, false, "You are already assigned to a duel. You must yield it before joining this tournament.", - @from.NetState + from.NetState ); } else @@ -483,7 +483,7 @@ namespace Server.Engines.ConPVP 0x35, false, $"{mobile.Name} is already assigned to a duel. They must yield it before joining this tournament.", - @from.NetState + from.NetState ); } @@ -583,11 +583,11 @@ namespace Server.Engines.ConPVP if (mob.Body.IsHuman) { - mob.SayTo(@from, 1005443); // Nay, I would rather stay here and watch a nail rust. + mob.SayTo(from, 1005443); // Nay, I would rather stay here and watch a nail rust. } else { - mob.SayTo(@from, 1005444); // The creature ignores your offer. + mob.SayTo(from, 1005444); // The creature ignores your offer. } } else if (AcceptDuelGump.IsIgnored(mob, from) || mob.Blessed) diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs index 13a4430b0..c5247c55c 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs @@ -153,7 +153,7 @@ namespace Server.Engines.ConPVP AddImage( 22, y + 5, 0x2616, 0x96C ); AddImage( 20, y + 7, 0x2616, 0x96C ); AddImage( 22, y + 7, 0x2616, 0x96C ); - + AddImage( 21, y + 6, 0x2616, 0x454 );*/ AddImage(x + 3, y + 4, 0x805); @@ -227,11 +227,11 @@ namespace Server.Engines.ConPVP if (info.ButtonID == 1 && m_Page > 0) { - @from.SendGump(new LadderGump(m_Ladder, m_Page - 1)); + from.SendGump(new LadderGump(m_Ladder, m_Page - 1)); } else if (info.ButtonID == 2 && (m_Page + 1) * 15 < Math.Min(m_List.Count, 150)) { - @from.SendGump(new LadderGump(m_Ladder, m_Page + 1)); + from.SendGump(new LadderGump(m_Ladder, m_Page + 1)); } } diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/ParticipantGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/ParticipantGump.cs index e99952bfb..390a3a7f3 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/ParticipantGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/ParticipantGump.cs @@ -129,7 +129,7 @@ namespace Server.Engines.ConPVP else if (Context.Participants.Count > 2) { /*Container cont = m_Participant.Stakes; - + if (cont != null) cont.Delete();*/ @@ -145,20 +145,20 @@ namespace Server.Engines.ConPVP /*else if (bid == 4) { m_From.SendGump( new ParticipantGump( m_From, m_Context, m_Participant ) ); - + Container cont = m_Participant.Stakes; - + if (cont != null && !cont.Deleted) { cont.DisplayTo( m_From ); - + Item[] checks = cont.FindItemsByType( typeof( BankCheck ) ); - + int gold = cont.TotalGold; - + for ( int i = 0; i < checks.Length; ++i ) gold += ((BankCheck)checks[i]).Worth; - + m_From.SendMessage( "This container has {0} item{1} and {2} stone{3}. In gold or check form there is a total of {4:D}gp.", cont.TotalItems, cont.TotalItems==1?"":"s", cont.TotalWeight, cont.TotalWeight==1?"":"s", gold ); } }*/ @@ -225,11 +225,11 @@ namespace Server.Engines.ConPVP { if (mob.Body.IsHuman) { - mob.SayTo(@from, 1005443); // Nay, I would rather stay here and watch a nail rust. + mob.SayTo(from, 1005443); // Nay, I would rather stay here and watch a nail rust. } else { - mob.SayTo(@from, 1005444); // The creature ignores your offer. + mob.SayTo(from, 1005444); // The creature ignores your offer. } } else if (AcceptDuelGump.IsIgnored(mob, from) || mob.Blessed) diff --git a/Projects/UOContent/Engines/ConPVP/TournamentSignupItem.cs b/Projects/UOContent/Engines/ConPVP/TournamentSignupItem.cs index 9385ccc88..74002acb7 100644 --- a/Projects/UOContent/Engines/ConPVP/TournamentSignupItem.cs +++ b/Projects/UOContent/Engines/ConPVP/TournamentSignupItem.cs @@ -55,7 +55,7 @@ namespace Server.Engines.ConPVP 0x35, false, "Excuse me? You are already signed up.", - @from.NetState + from.NetState ); } else @@ -65,7 +65,7 @@ namespace Server.Engines.ConPVP 0x22, false, "The tournament has already begun. You are too late to signup now.", - @from.NetState + from.NetState ); } } diff --git a/Projects/UOContent/Engines/ConPVP/Trophy.cs b/Projects/UOContent/Engines/ConPVP/Trophy.cs index ab2c6d2d6..c20400990 100644 --- a/Projects/UOContent/Engines/ConPVP/Trophy.cs +++ b/Projects/UOContent/Engines/ConPVP/Trophy.cs @@ -92,16 +92,16 @@ namespace Server.Items if (Owner != null) { - LabelTo(@from, "{0} -- {1}", Title, Owner.RawName); + LabelTo(from, "{0} -- {1}", Title, Owner.RawName); } else if (Title != null) { - LabelTo(@from, Title); + LabelTo(from, Title); } if (Date != DateTime.MinValue) { - LabelTo(@from, Date.ToString("d")); + LabelTo(from, Date.ToString("d")); } } diff --git a/Projects/UOContent/Engines/Craft/Core/CraftGump.cs b/Projects/UOContent/Engines/Craft/Core/CraftGump.cs index b00632384..50ee35ff9 100644 --- a/Projects/UOContent/Engines/Craft/Core/CraftGump.cs +++ b/Projects/UOContent/Engines/Craft/Core/CraftGump.cs @@ -207,11 +207,11 @@ namespace Server.Engines.Craft if (page == CraftPage.PickResource) { - CreateResList(false, @from); + CreateResList(false, from); } else if (page == CraftPage.PickResource2) { - CreateResList(true, @from); + CreateResList(true, from); } else if (context?.LastGroupIndex > -1) { diff --git a/Projects/UOContent/Engines/Craft/Core/CraftItem.cs b/Projects/UOContent/Engines/Craft/Core/CraftItem.cs index 55fa6b00d..345c7f0ea 100644 --- a/Projects/UOContent/Engines/Craft/Core/CraftItem.cs +++ b/Projects/UOContent/Engines/Craft/Core/CraftItem.cs @@ -312,17 +312,17 @@ namespace Server.Engines.Craft if (consumMana) { - @from.Mana -= Mana; + from.Mana -= Mana; } if (consumHits) { - @from.Hits -= Hits; + from.Hits -= Hits; } if (consumStam) { - @from.Stam -= Stam; + from.Stam -= Stam; } return true; @@ -416,8 +416,8 @@ namespace Server.Engines.Craft { for (var y = -2; y <= 2; ++y) { - var vx = @from.X + x; - var vy = @from.Y + y; + var vx = from.X + x; + var vy = from.Y + y; var tiles = map.Tiles.GetStaticTiles(vx, vy, true); @@ -426,7 +426,7 @@ namespace Server.Engines.Craft var z = tiles[i].Z; var id = tiles[i].ID; - if (z + 16 > @from.Z && @from.Z + 16 > z && Find(id, itemIDs)) + if (z + 16 > from.Z && from.Z + 16 > z && Find(id, itemIDs)) { return true; } @@ -914,7 +914,7 @@ namespace Server.Engines.Craft if (gainSkills) // This is a passive check. Success chance is entirely dependant on the main skill { - @from.CheckSkill(craftSkill.SkillToMake, minSkill, maxSkill); + from.CheckSkill(craftSkill.SkillToMake, minSkill, maxSkill); } } @@ -1074,11 +1074,11 @@ namespace Server.Engines.Craft { if (tool?.Deleted == false && tool.UsesRemaining > 0) { - @from.SendGump(new CraftGump(@from, craftSystem, tool, badCraft)); + from.SendGump(new CraftGump(from, craftSystem, tool, badCraft)); } else { - @from.SendLocalizedMessage(badCraft); + from.SendLocalizedMessage(badCraft); } return; @@ -1101,15 +1101,15 @@ namespace Server.Engines.Craft { if (tool?.Deleted == false && tool.UsesRemaining > 0) { - @from.SendGump(new CraftGump(@from, craftSystem, tool, checkMessage)); + from.SendGump(new CraftGump(from, craftSystem, tool, checkMessage)); } else if (checkMessage is int messageInt && messageInt > 0) { - @from.SendLocalizedMessage(messageInt); + from.SendLocalizedMessage(messageInt); } else { - @from.SendMessage(checkMessage.ToString()); + from.SendMessage(checkMessage.ToString()); } return; @@ -1136,15 +1136,15 @@ namespace Server.Engines.Craft { if (tool?.Deleted == false && tool.UsesRemaining > 0) { - @from.SendGump(new CraftGump(@from, craftSystem, tool, message)); + from.SendGump(new CraftGump(from, craftSystem, tool, message)); } else if (message is int messageIn && messageIn > 0) { - @from.SendLocalizedMessage(messageIn); + from.SendLocalizedMessage(messageIn); } else { - @from.SendMessage(message.ToString()); + from.SendMessage(message.ToString()); } return; @@ -1154,7 +1154,7 @@ namespace Server.Engines.Craft if (craftSystem is DefBlacksmithy) { - if (@from.FindItemOnLayer(Layer.OneHanded) is AncientSmithyHammer hammer && hammer != tool) + if (from.FindItemOnLayer(Layer.OneHanded) is AncientSmithyHammer hammer && hammer != tool) { hammer.UsesRemaining--; if (hammer.UsesRemaining < 1) @@ -1195,7 +1195,7 @@ namespace Server.Engines.Craft { if (item is ICraftable craftable) { - endquality = craftable.OnCraft(quality, makersMark, @from, craftSystem, typeRes, tool, this, resHue); + endquality = craftable.OnCraft(quality, makersMark, from, craftSystem, typeRes, tool, this, resHue); } else if (item.Hue == 0) { @@ -1219,7 +1219,7 @@ namespace Server.Engines.Craft if (from.AccessLevel > AccessLevel.Player) { CommandLogging.WriteLine( - @from, + from, "Crafting {0} with craft system {1}", CommandLogging.Format(item), craftSystem.GetType().Name @@ -1231,7 +1231,7 @@ namespace Server.Engines.Craft if (num == 0) { - num = craftSystem.PlayEndingEffect(@from, false, true, toolBroken, endquality, makersMark, this); + num = craftSystem.PlayEndingEffect(from, false, true, toolBroken, endquality, makersMark, this); } var queryFactionImbue = false; @@ -1261,7 +1261,7 @@ namespace Server.Engines.Craft if (availableSilver >= def.SilverCost) { - queryFactionImbue = Faction.IsNearType(@from, def.VendorType, 12); + queryFactionImbue = Faction.IsNearType(from, def.VendorType, 12); } } } @@ -1273,11 +1273,11 @@ namespace Server.Engines.Craft if (queryFactionImbue) { - @from.SendGump( + from.SendGump( new FactionImbueGump( quality, item, - @from, + from, craftSystem, tool, num, @@ -1289,22 +1289,22 @@ namespace Server.Engines.Craft } else if (tool?.Deleted == false && tool.UsesRemaining > 0) { - @from.SendGump(new CraftGump(@from, craftSystem, tool, num)); + from.SendGump(new CraftGump(from, craftSystem, tool, num)); } else if (num > 0) { - @from.SendLocalizedMessage(num); + from.SendLocalizedMessage(num); } } else if (!allRequiredSkills) { if (tool?.Deleted == false && tool.UsesRemaining > 0) { - @from.SendGump(new CraftGump(@from, craftSystem, tool, 1044153)); + from.SendGump(new CraftGump(from, craftSystem, tool, 1044153)); } else { - @from.SendLocalizedMessage(1044153); // You don't have the required skills to attempt this item. + from.SendLocalizedMessage(1044153); // You don't have the required skills to attempt this item. } } else @@ -1320,15 +1320,15 @@ namespace Server.Engines.Craft { if (tool?.Deleted == false && tool.UsesRemaining > 0) { - @from.SendGump(new CraftGump(@from, craftSystem, tool, message)); + from.SendGump(new CraftGump(from, craftSystem, tool, message)); } else if (message is int messageInt && messageInt > 0) { - @from.SendLocalizedMessage(messageInt); + from.SendLocalizedMessage(messageInt); } else { - @from.SendMessage(message.ToString()); + from.SendMessage(message.ToString()); } return; @@ -1351,11 +1351,11 @@ namespace Server.Engines.Craft if (!tool.Deleted && tool.UsesRemaining > 0) { - @from.SendGump(new CraftGump(@from, craftSystem, tool, num)); + from.SendGump(new CraftGump(from, craftSystem, tool, num)); } else if (num > 0) { - @from.SendLocalizedMessage(num); + from.SendLocalizedMessage(num); } } } diff --git a/Projects/UOContent/Engines/Craft/Core/CraftRes.cs b/Projects/UOContent/Engines/Craft/Core/CraftRes.cs index 9f87dbb84..b4f60eb5c 100644 --- a/Projects/UOContent/Engines/Craft/Core/CraftRes.cs +++ b/Projects/UOContent/Engines/Craft/Core/CraftRes.cs @@ -32,15 +32,15 @@ namespace Server.Engines.Craft { if (MessageNumber > 0) { - @from.SendLocalizedMessage(MessageNumber); + from.SendLocalizedMessage(MessageNumber); } else if (!string.IsNullOrEmpty(MessageString)) { - @from.SendMessage(MessageString); + from.SendMessage(MessageString); } else { - @from.SendLocalizedMessage(502925); // You don't have the resources required to make that item. + from.SendLocalizedMessage(502925); // You don't have the resources required to make that item. } } } diff --git a/Projects/UOContent/Engines/Craft/Core/CraftSystem.cs b/Projects/UOContent/Engines/Craft/Core/CraftSystem.cs index 22a7cbae7..c3e2c1e05 100644 --- a/Projects/UOContent/Engines/Craft/Core/CraftSystem.cs +++ b/Projects/UOContent/Engines/Craft/Core/CraftSystem.cs @@ -100,7 +100,7 @@ namespace Server.Engines.Craft // Verify if the type is in the list of the craftable item if (CraftItems.SearchFor(type) != null) { - realCraftItem.Craft(@from, this, typeRes, tool); + realCraftItem.Craft(from, this, typeRes, tool); } } diff --git a/Projects/UOContent/Engines/Craft/Core/Enhance.cs b/Projects/UOContent/Engines/Craft/Core/Enhance.cs index c04c4b29c..bf92d04ae 100644 --- a/Projects/UOContent/Engines/Craft/Core/Enhance.cs +++ b/Projects/UOContent/Engines/Craft/Core/Enhance.cs @@ -101,7 +101,7 @@ namespace Server.Engines.Craft if (craftSystem is DefBlacksmithy) { - if (@from.FindItemOnLayer(Layer.OneHanded) is AncientSmithyHammer hammer) + if (from.FindItemOnLayer(Layer.OneHanded) is AncientSmithyHammer hammer) { hammer.UsesRemaining--; if (hammer.UsesRemaining < 1) diff --git a/Projects/UOContent/Engines/Craft/Core/Repair.cs b/Projects/UOContent/Engines/Craft/Core/Repair.cs index 8944d3a92..a2e0913d8 100644 --- a/Projects/UOContent/Engines/Craft/Core/Repair.cs +++ b/Projects/UOContent/Engines/Craft/Core/Repair.cs @@ -78,7 +78,7 @@ namespace Server.Engines.Craft { if (m_Deed != null) { - return m_Deed.Check(@from); + return m_Deed.Check(from); } return true; diff --git a/Projects/UOContent/Engines/Craft/DefAlchemy.cs b/Projects/UOContent/Engines/Craft/DefAlchemy.cs index b27eaf254..91a9851ca 100644 --- a/Projects/UOContent/Engines/Craft/DefAlchemy.cs +++ b/Projects/UOContent/Engines/Craft/DefAlchemy.cs @@ -50,7 +50,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (failed) diff --git a/Projects/UOContent/Engines/Craft/DefBlacksmithy.cs b/Projects/UOContent/Engines/Craft/DefBlacksmithy.cs index 3dd1c5d61..e479253bc 100644 --- a/Projects/UOContent/Engines/Craft/DefBlacksmithy.cs +++ b/Projects/UOContent/Engines/Craft/DefBlacksmithy.cs @@ -13,16 +13,16 @@ namespace Server.Engines.Craft private DefBlacksmithy() : base(1, 1, 1.25) // base( 1, 2, 1.7 ) { /* - + base( MinCraftEffect, MaxCraftEffect, Delay ) - + MinCraftEffect : The minimum number of time the mobile will play the craft effect MaxCraftEffect : The maximum number of time the mobile will play the craft effect Delay : The delay between each craft effect - + Example: (3, 6, 1.7) would make the mobile do the PlayCraftEffect override function between 3 and 6 time, with a 1.7 second delay each time. - + */ } @@ -82,7 +82,7 @@ namespace Server.Engines.Craft { for (var y = -range; (!anvil || !forge) && y <= range; ++y) { - var tiles = map.Tiles.GetStaticTiles(@from.X + x, @from.Y + y, true); + var tiles = map.Tiles.GetStaticTiles(from.X + x, from.Y + y, true); for (var i = 0; (!anvil || !forge) && i < tiles.Length; ++i) { @@ -93,8 +93,8 @@ namespace Server.Engines.Craft if (isAnvil || isForge) { - if (@from.Z + 16 < tiles[i].Z || tiles[i].Z + 16 < @from.Z || - !@from.InLOS(new Point3D(@from.X + x, @from.Y + y, tiles[i].Z + tiles[i].Height / 2 + 1))) + if (from.Z + 16 < tiles[i].Z || tiles[i].Z + 16 < from.Z || + !from.InLOS(new Point3D(from.X + x, from.Y + y, tiles[i].Z + tiles[i].Height / 2 + 1))) { continue; } @@ -151,7 +151,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (failed) @@ -187,7 +187,7 @@ namespace Server.Engines.Craft /* Syntax for a SIMPLE craft item AddCraft( ObjectType, Group, MinSkill, MaxSkill, ResourceType, Amount, Message ) - + ObjectType : The type of the object you want to add to the build list. Group : The group in which the object will be showed in the craft menu. MinSkill : The minimum of skill value @@ -195,10 +195,10 @@ namespace Server.Engines.Craft ResourceType : The type of the resource the mobile need to create the item Amount : The amount of the ResourceType it need to create the item Message : String or Int for Localized. The message that will be sent to the mobile, if the specified resource is missing. - + Syntax for a COMPLEX craft item. A complex item is an item that need either more than only one skill, or more than only one resource. - + Coming soon.... */ diff --git a/Projects/UOContent/Engines/Craft/DefBowFletching.cs b/Projects/UOContent/Engines/Craft/DefBowFletching.cs index 0ce48898c..8c55830d5 100644 --- a/Projects/UOContent/Engines/Craft/DefBowFletching.cs +++ b/Projects/UOContent/Engines/Craft/DefBowFletching.cs @@ -52,7 +52,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (failed) diff --git a/Projects/UOContent/Engines/Craft/DefCarpentry.cs b/Projects/UOContent/Engines/Craft/DefCarpentry.cs index fa8e45ff6..aa710ed7e 100644 --- a/Projects/UOContent/Engines/Craft/DefCarpentry.cs +++ b/Projects/UOContent/Engines/Craft/DefCarpentry.cs @@ -50,7 +50,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (failed) @@ -380,7 +380,7 @@ namespace Server.Engines.Craft AddRecipe( index, 308 ); ForceNonExceptional( index ); SetNeededExpansion( index, Expansion.ML ); - + index = AddCraft( typeof( OrnateElvenChestEastDeed ), 1044292, 1073383, 94.7, 119.7, typeof( Log ), 1044041, 40, 1044351 ); AddRecipe( index, 309 ); ForceNonExceptional( index ); diff --git a/Projects/UOContent/Engines/Craft/DefCartography.cs b/Projects/UOContent/Engines/Craft/DefCartography.cs index af007e101..2673457e0 100644 --- a/Projects/UOContent/Engines/Craft/DefCartography.cs +++ b/Projects/UOContent/Engines/Craft/DefCartography.cs @@ -46,7 +46,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (failed) diff --git a/Projects/UOContent/Engines/Craft/DefCooking.cs b/Projects/UOContent/Engines/Craft/DefCooking.cs index 1d8d785c0..9425ff4b3 100644 --- a/Projects/UOContent/Engines/Craft/DefCooking.cs +++ b/Projects/UOContent/Engines/Craft/DefCooking.cs @@ -47,7 +47,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (failed) diff --git a/Projects/UOContent/Engines/Craft/DefGlassblowing.cs b/Projects/UOContent/Engines/Craft/DefGlassblowing.cs index 7217eca84..c7a2c8091 100644 --- a/Projects/UOContent/Engines/Craft/DefGlassblowing.cs +++ b/Projects/UOContent/Engines/Craft/DefGlassblowing.cs @@ -64,7 +64,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (failed) diff --git a/Projects/UOContent/Engines/Craft/DefInscription.cs b/Projects/UOContent/Engines/Craft/DefInscription.cs index e941d01dc..ea74632a9 100644 --- a/Projects/UOContent/Engines/Craft/DefInscription.cs +++ b/Projects/UOContent/Engines/Craft/DefInscription.cs @@ -87,7 +87,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (!typeofSpellScroll.IsAssignableFrom(item.ItemType)) // not a scroll diff --git a/Projects/UOContent/Engines/Craft/DefMasonry.cs b/Projects/UOContent/Engines/Craft/DefMasonry.cs index 4ebddaaad..b52eceba4 100644 --- a/Projects/UOContent/Engines/Craft/DefMasonry.cs +++ b/Projects/UOContent/Engines/Craft/DefMasonry.cs @@ -62,7 +62,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (failed) diff --git a/Projects/UOContent/Engines/Craft/DefTailoring.cs b/Projects/UOContent/Engines/Craft/DefTailoring.cs index 5786938d5..8af99b50a 100644 --- a/Projects/UOContent/Engines/Craft/DefTailoring.cs +++ b/Projects/UOContent/Engines/Craft/DefTailoring.cs @@ -75,7 +75,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (failed) diff --git a/Projects/UOContent/Engines/Craft/DefTinkering.cs b/Projects/UOContent/Engines/Craft/DefTinkering.cs index 142a38b89..6cd978e83 100644 --- a/Projects/UOContent/Engines/Craft/DefTinkering.cs +++ b/Projects/UOContent/Engines/Craft/DefTinkering.cs @@ -97,7 +97,7 @@ namespace Server.Engines.Craft { if (toolBroken) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool + from.SendLocalizedMessage(1044038); // You have worn out your tool } if (failed) @@ -710,11 +710,11 @@ namespace Server.Engines.Craft if (tool?.Deleted == false && tool.UsesRemaining > 0) { - @from.SendGump(new CraftGump(@from, m_TrapCraft.CraftSystem, tool, message)); + from.SendGump(new CraftGump(from, m_TrapCraft.CraftSystem, tool, message)); } else if (message > 0) { - @from.SendLocalizedMessage(message); + from.SendLocalizedMessage(message); } } } diff --git a/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholySteed.cs b/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholySteed.cs index 53618887b..5baa0466b 100644 --- a/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholySteed.cs +++ b/Projects/UOContent/Engines/Ethics/Evil/Mobiles/UnholySteed.cs @@ -71,11 +71,11 @@ namespace Server.Mobiles { if (Ethic.Find(from) != Ethic.Evil) { - @from.SendMessage("You may not ride this steed."); + from.SendMessage("You may not ride this steed."); } else { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Engines/Ethics/Evil/Powers/SummonFamiliar.cs b/Projects/UOContent/Engines/Ethics/Evil/Powers/SummonFamiliar.cs index 1195910ec..7737d48eb 100644 --- a/Projects/UOContent/Engines/Ethics/Evil/Powers/SummonFamiliar.cs +++ b/Projects/UOContent/Engines/Ethics/Evil/Powers/SummonFamiliar.cs @@ -18,7 +18,7 @@ namespace Server.Ethics.Evil { if (from.Familiar?.Deleted == true) { - @from.Familiar = null; + from.Familiar = null; } if (from.Familiar != null) diff --git a/Projects/UOContent/Engines/Ethics/Evil/Powers/UnholySteed.cs b/Projects/UOContent/Engines/Ethics/Evil/Powers/UnholySteed.cs index f2fc51914..121cdb081 100644 --- a/Projects/UOContent/Engines/Ethics/Evil/Powers/UnholySteed.cs +++ b/Projects/UOContent/Engines/Ethics/Evil/Powers/UnholySteed.cs @@ -18,7 +18,7 @@ namespace Server.Ethics.Evil { if (from.Steed?.Deleted == true) { - @from.Steed = null; + from.Steed = null; } if (from.Steed != null) diff --git a/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolySteed.cs b/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolySteed.cs index ff9d5735a..a3f088fd4 100644 --- a/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolySteed.cs +++ b/Projects/UOContent/Engines/Ethics/Hero/Mobiles/HolySteed.cs @@ -71,11 +71,11 @@ namespace Server.Mobiles { if (Ethic.Find(from) != Ethic.Hero) { - @from.SendMessage("You may not ride this steed."); + from.SendMessage("You may not ride this steed."); } else { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Engines/Ethics/Hero/Powers/HolySteed.cs b/Projects/UOContent/Engines/Ethics/Hero/Powers/HolySteed.cs index 1c2c5a373..a4b43b3fd 100644 --- a/Projects/UOContent/Engines/Ethics/Hero/Powers/HolySteed.cs +++ b/Projects/UOContent/Engines/Ethics/Hero/Powers/HolySteed.cs @@ -18,7 +18,7 @@ namespace Server.Ethics.Hero { if (from.Steed?.Deleted == true) { - @from.Steed = null; + from.Steed = null; } if (from.Steed != null) diff --git a/Projects/UOContent/Engines/Ethics/Hero/Powers/SummonFamiliar.cs b/Projects/UOContent/Engines/Ethics/Hero/Powers/SummonFamiliar.cs index 1206dfe47..14dc918ae 100644 --- a/Projects/UOContent/Engines/Ethics/Hero/Powers/SummonFamiliar.cs +++ b/Projects/UOContent/Engines/Ethics/Hero/Powers/SummonFamiliar.cs @@ -18,7 +18,7 @@ namespace Server.Ethics.Hero { if (from.Familiar?.Deleted == true) { - @from.Familiar = null; + from.Familiar = null; } if (from.Familiar != null) diff --git a/Projects/UOContent/Engines/Factions/Core/Faction.cs b/Projects/UOContent/Engines/Factions/Core/Faction.cs index e60f03a1a..884236b88 100644 --- a/Projects/UOContent/Engines/Factions/Core/Faction.cs +++ b/Projects/UOContent/Engines/Factions/Core/Faction.cs @@ -854,12 +854,12 @@ namespace Server.Factions if (faction != null) { - @from.SendGump(new ElectionManagementGump(faction.Election)); + from.SendGump(new ElectionManagementGump(faction.Election)); } // from.SendGump( new Gumps.PropertiesGump( from, faction.Election ) ); else { - @from.SendMessage("That stone has no faction assigned."); + from.SendMessage("That stone has no faction assigned."); } } else diff --git a/Projects/UOContent/Engines/Factions/Core/Keywords.cs b/Projects/UOContent/Engines/Factions/Core/Keywords.cs index bb4988b94..667729480 100644 --- a/Projects/UOContent/Engines/Factions/Core/Keywords.cs +++ b/Projects/UOContent/Engines/Factions/Core/Keywords.cs @@ -32,18 +32,18 @@ namespace Server.Factions { case 0x00E4: // *i wish to access the city treasury* { - var town = Town.FromRegion(@from.Region); + var town = Town.FromRegion(from.Region); - if (town?.IsFinance(@from) != true || !@from.Alive) + if (town?.IsFinance(from) != true || !from.Alive) { break; } - if (FactionGump.Exists(@from)) + if (FactionGump.Exists(from)) { - @from.SendLocalizedMessage(1042160); // You already have a faction menu open. + from.SendLocalizedMessage(1042160); // You already have a faction menu open. } - else if (town.Owner != null && @from is PlayerMobile mobile) + else if (town.Owner != null && from is PlayerMobile mobile) { mobile.SendGump(new FinanceGump(mobile, town.Owner, town)); } @@ -52,71 +52,71 @@ namespace Server.Factions } case 0x0ED: // *i am sheriff* { - var town = Town.FromRegion(@from.Region); + var town = Town.FromRegion(from.Region); - if (town?.IsSheriff(@from) != true || !@from.Alive) + if (town?.IsSheriff(from) != true || !from.Alive) { break; } - if (FactionGump.Exists(@from)) + if (FactionGump.Exists(from)) { - @from.SendLocalizedMessage(1042160); // You already have a faction menu open. + from.SendLocalizedMessage(1042160); // You already have a faction menu open. } else if (town.Owner != null) { - @from.SendGump(new SheriffGump((PlayerMobile)@from, town.Owner, town)); + from.SendGump(new SheriffGump((PlayerMobile)from, town.Owner, town)); } break; } case 0x00EF: // *you are fired* { - var town = Town.FromRegion(@from.Region); + var town = Town.FromRegion(from.Region); if (town == null) { break; } - if (town.IsFinance(@from) || town.IsSheriff(@from)) + if (town.IsFinance(from) || town.IsSheriff(from)) { - town.BeginOrderFiring(@from); + town.BeginOrderFiring(from); } break; } case 0x00E5: // *i wish to resign as finance minister* { - var pl = PlayerState.Find(@from); + var pl = PlayerState.Find(from); if (pl?.Finance != null) { pl.Finance.Finance = null; - @from.SendLocalizedMessage(1005081); // You have been fired as Finance Minister + from.SendLocalizedMessage(1005081); // You have been fired as Finance Minister } break; } case 0x00EE: // *i wish to resign as sheriff* { - var pl = PlayerState.Find(@from); + var pl = PlayerState.Find(from); if (pl?.Sheriff != null) { pl.Sheriff.Sheriff = null; - @from.SendLocalizedMessage(1010270); // You have been fired as Sheriff + from.SendLocalizedMessage(1010270); // You have been fired as Sheriff } break; } case 0x00E9: // *what is my faction term status* { - var pl = PlayerState.Find(@from); + var pl = PlayerState.Find(from); if (pl?.IsLeaving == true) { - if (Faction.CheckLeaveTimer(@from)) + if (Faction.CheckLeaveTimer(from)) { break; } @@ -125,7 +125,7 @@ namespace Server.Factions if (remaining.TotalDays >= 1) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1042743, remaining.TotalDays .ToString("N0") @@ -133,7 +133,7 @@ namespace Server.Factions } else if (remaining.TotalHours >= 1) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1042741, remaining.TotalHours .ToString("N0") @@ -141,43 +141,43 @@ namespace Server.Factions } else { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1042742 ); // Your term of service will come to an end in less than one hour. } } else if (pl != null) { - @from.SendLocalizedMessage(1042233); // You are not in the process of quitting the faction. + from.SendLocalizedMessage(1042233); // You are not in the process of quitting the faction. } break; } case 0x00EA: // *message faction* { - var faction = Faction.Find(@from); + var faction = Faction.Find(from); - if (faction?.IsCommander(@from) != true) + if (faction?.IsCommander(from) != true) { break; } - if (@from.AccessLevel == AccessLevel.Player && !faction.FactionMessageReady) + if (from.AccessLevel == AccessLevel.Player && !faction.FactionMessageReady) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1010264 ); // The required time has not yet passed since the last message was sent } else { - faction.BeginBroadcast(@from); + faction.BeginBroadcast(from); } break; } case 0x00EC: // *showscore* { - var pl = PlayerState.Find(@from); + var pl = PlayerState.Find(from); if (pl != null) { @@ -188,7 +188,7 @@ namespace Server.Factions } case 0x0178: // i honor your leadership { - Faction.Find(@from)?.BeginHonorLeadership(@from); + Faction.Find(from)?.BeginHonorLeadership(from); break; } } diff --git a/Projects/UOContent/Engines/Factions/Core/Town.cs b/Projects/UOContent/Engines/Factions/Core/Town.cs index 78aa5933f..285d3a0fe 100644 --- a/Projects/UOContent/Engines/Factions/Core/Town.cs +++ b/Projects/UOContent/Engines/Factions/Core/Town.cs @@ -216,7 +216,7 @@ namespace Server.Factions } else { - @from.SendMessage("That is not a {0}!", type); + from.SendMessage("That is not a {0}!", type); } } diff --git a/Projects/UOContent/Engines/Factions/Gumps/ElectionManagementGump.cs b/Projects/UOContent/Engines/Factions/Gumps/ElectionManagementGump.cs index 6d37be412..d431f58c8 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/ElectionManagementGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/ElectionManagementGump.cs @@ -180,7 +180,7 @@ namespace Server.Factions if (bid >= 0 && bid < m_Election.Candidates.Count) { - @from.SendGump(new ElectionManagementGump(m_Election, m_Election.Candidates[bid])); + from.SendGump(new ElectionManagementGump(m_Election, m_Election.Candidates[bid])); } } } diff --git a/Projects/UOContent/Engines/Factions/Items/JoinStone.cs b/Projects/UOContent/Engines/Factions/Items/JoinStone.cs index 1c7faae0c..48ead9fc3 100644 --- a/Projects/UOContent/Engines/Factions/Items/JoinStone.cs +++ b/Projects/UOContent/Engines/Factions/Items/JoinStone.cs @@ -42,11 +42,11 @@ namespace Server.Factions if (!from.InRange(GetWorldLocation(), 2)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if (FactionGump.Exists(from)) { - @from.SendLocalizedMessage(1042160); // You already have a faction menu open. + from.SendLocalizedMessage(1042160); // You already have a faction menu open. } else if (Faction.Find(from) == null && from is PlayerMobile mobile) { diff --git a/Projects/UOContent/Engines/Factions/Items/Power Faction Items/BloodRose.cs b/Projects/UOContent/Engines/Factions/Items/Power Faction Items/BloodRose.cs index 03757ed88..b5561a2b5 100644 --- a/Projects/UOContent/Engines/Factions/Items/Power Faction Items/BloodRose.cs +++ b/Projects/UOContent/Engines/Factions/Items/Power Faction Items/BloodRose.cs @@ -23,7 +23,7 @@ namespace Server if (from.Body.IsHuman && !from.Mounted) { - @from.Animate(34, 5, 1, true, false, 0); + from.Animate(34, 5, 1, true, false, 0); } var amount = Utility.Dice(3, 3, 3); diff --git a/Projects/UOContent/Engines/Factions/Items/Power Faction Items/ClarityPotion.cs b/Projects/UOContent/Engines/Factions/Items/Power Faction Items/ClarityPotion.cs index 2d1f7e084..217f7e7a3 100644 --- a/Projects/UOContent/Engines/Factions/Items/Power Faction Items/ClarityPotion.cs +++ b/Projects/UOContent/Engines/Factions/Items/Power Faction Items/ClarityPotion.cs @@ -26,7 +26,7 @@ namespace Server if (from.Body.IsHuman) { - @from.Animate(34, 5, 1, true, false, 0); + from.Animate(34, 5, 1, true, false, 0); } from.FixedParticles(0x375A, 10, 15, 5011, EffectLayer.Head); diff --git a/Projects/UOContent/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs b/Projects/UOContent/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs index acf2e31a7..2cd563541 100644 --- a/Projects/UOContent/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs +++ b/Projects/UOContent/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs @@ -27,7 +27,7 @@ namespace Server foreach (var mob in from.GetMobilesInRange(8)) { - if (mob.Player && !mob.Alive && @from.InLOS(mob)) + if (mob.Player && !mob.Alive && from.InLOS(mob)) { if (Faction.Find(mob) != ourFaction) { @@ -36,11 +36,11 @@ namespace Server var house = BaseHouse.FindHouseAt(mob); - if (house?.IsFriend(@from) != false || house.IsFriend(mob)) + if (house?.IsFriend(from) != false || house.IsFriend(mob)) { Faction.ClearSkillLoss(mob); - mob.SendGump(new ResurrectGump(mob, @from)); + mob.SendGump(new ResurrectGump(mob, from)); used = true; } } diff --git a/Projects/UOContent/Engines/Factions/Items/Sigil.cs b/Projects/UOContent/Engines/Factions/Items/Sigil.cs index 9fbf12b21..b1a6a7129 100644 --- a/Projects/UOContent/Engines/Factions/Items/Sigil.cs +++ b/Projects/UOContent/Engines/Factions/Items/Sigil.cs @@ -178,11 +178,11 @@ namespace Server.Factions { if (m_Corrupted.Definition.SigilControl.Number > 0) { - LabelTo(@from, m_Corrupted.Definition.SigilControl.Number); + LabelTo(from, m_Corrupted.Definition.SigilControl.Number); } else if (m_Corrupted.Definition.SigilControl.String != null) { - LabelTo(@from, m_Corrupted.Definition.SigilControl.String); + LabelTo(from, m_Corrupted.Definition.SigilControl.String); } } else @@ -192,15 +192,15 @@ namespace Server.Factions if (IsCorrupting) { - LabelTo(@from, 1042257); // This sigil is in the process of being corrupted. + LabelTo(from, 1042257); // This sigil is in the process of being corrupted. } else if (IsPurifying) { - LabelTo(@from, 1042258); // This sigil has been recently corrupted, and is undergoing purification. + LabelTo(from, 1042258); // This sigil has been recently corrupted, and is undergoing purification. } else { - LabelTo(@from, 1042259); // This sigil is not in the process of being corrupted. + LabelTo(from, 1042259); // This sigil is not in the process of being corrupted. } } diff --git a/Projects/UOContent/Engines/Factions/Items/TownStone.cs b/Projects/UOContent/Engines/Factions/Items/TownStone.cs index 59ee2489a..efac59f72 100644 --- a/Projects/UOContent/Engines/Factions/Items/TownStone.cs +++ b/Projects/UOContent/Engines/Factions/Items/TownStone.cs @@ -47,15 +47,15 @@ namespace Server.Factions if (m_Town.Owner == null || from.AccessLevel < AccessLevel.GameMaster && faction != m_Town.Owner) { - @from.SendLocalizedMessage(1010332); // Your faction does not control this town + from.SendLocalizedMessage(1010332); // Your faction does not control this town } else if (!m_Town.Owner.IsCommander(from)) { - @from.SendLocalizedMessage(1005242); // Only faction Leaders can use townstones + from.SendLocalizedMessage(1005242); // Only faction Leaders can use townstones } else if (FactionGump.Exists(from)) { - @from.SendLocalizedMessage(1042160); // You already have a faction menu open. + from.SendLocalizedMessage(1042160); // You already have a faction menu open. } else if (from is PlayerMobile mobile) { diff --git a/Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrap.cs b/Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrap.cs index bfa9bec01..5edea27c4 100644 --- a/Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrap.cs +++ b/Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrap.cs @@ -96,14 +96,14 @@ namespace Server.Factions Placer.SendMessage( "You have earned {0} silver pieces because {1} fell for your trap.", silverGiven, - @from.Name + from.Name ); } else { Placer.SendLocalizedMessage( 1042736, - $"{silverGiven} silver\t{@from.Name}" + $"{silverGiven} silver\t{from.Name}" ); // You have earned ~1_SILVER_AMOUNT~ pieces for vanquishing ~2_PLAYER_NAME~! } } diff --git a/Projects/UOContent/Engines/Factions/Mobiles/FactionWarHorse.cs b/Projects/UOContent/Engines/Factions/Mobiles/FactionWarHorse.cs index e718b64bb..4c9cf58fe 100644 --- a/Projects/UOContent/Engines/Factions/Mobiles/FactionWarHorse.cs +++ b/Projects/UOContent/Engines/Factions/Mobiles/FactionWarHorse.cs @@ -71,21 +71,21 @@ namespace Server.Factions if (pl == null) { - @from.SendLocalizedMessage(1010366); // You cannot mount a faction war horse! + from.SendLocalizedMessage(1010366); // You cannot mount a faction war horse! } else if (pl.Faction != Faction) { - @from.SendLocalizedMessage(1010367); // You cannot ride an opposing faction's war horse! + from.SendLocalizedMessage(1010367); // You cannot ride an opposing faction's war horse! } else if (pl.Rank.Rank < 2) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1010368 ); // You must achieve a faction rank of at least two before riding a war horse! } else { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs b/Projects/UOContent/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs index 15ea35068..cc2dad685 100644 --- a/Projects/UOContent/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs +++ b/Projects/UOContent/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs @@ -41,12 +41,12 @@ namespace Server.Factions MessageType.Regular, 0x3B2, 1042201, - @from.NetState + from.NetState ); // You are not in my faction, I cannot sell you a horse! } else if (FactionGump.Exists(from)) { - @from.SendLocalizedMessage(1042160); // You already have a faction menu open. + from.SendLocalizedMessage(1042160); // You already have a faction menu open. } else if (from is PlayerMobile mobile) { diff --git a/Projects/UOContent/Engines/Harvest/Core/HarvestDefinition.cs b/Projects/UOContent/Engines/Harvest/Core/HarvestDefinition.cs index ce5760a06..30c3948b4 100644 --- a/Projects/UOContent/Engines/Harvest/Core/HarvestDefinition.cs +++ b/Projects/UOContent/Engines/Harvest/Core/HarvestDefinition.cs @@ -85,11 +85,11 @@ namespace Server.Engines.Harvest { if (message.Number > 0) { - @from.SendLocalizedMessage(message.Number); + from.SendLocalizedMessage(message.Number); } else { - @from.SendMessage(message); + from.SendMessage(message); } } diff --git a/Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs b/Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs index 5c16103ac..574c94740 100644 --- a/Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs +++ b/Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs @@ -19,7 +19,7 @@ namespace Server.Engines.Harvest if (wornOut) { - @from.SendLocalizedMessage(1044038); // You have worn out your tool! + from.SendLocalizedMessage(1044038); // You have worn out your tool! } return !wornOut; @@ -36,7 +36,7 @@ namespace Server.Engines.Harvest if (!inRange) { - def.SendMessageTo(@from, timed ? def.TimedOutOfRangeMessage : def.OutOfRangeMessage); + def.SendMessageTo(from, timed ? def.TimedOutOfRangeMessage : def.OutOfRangeMessage); } return inRange; @@ -49,7 +49,7 @@ namespace Server.Engines.Harvest if (!available) { - def.SendMessageTo(@from, timed ? def.DoubleHarvestMessage : def.NoResourcesMessage); + def.SendMessageTo(from, timed ? def.DoubleHarvestMessage : def.NoResourcesMessage); } return available; @@ -132,7 +132,7 @@ namespace Server.Engines.Harvest if (vein != null) { - vein = MutateVein(@from, tool, def, bank, toHarvest, vein); + vein = MutateVein(from, tool, def, bank, toHarvest, vein); } if (vein == null) @@ -155,7 +155,7 @@ namespace Server.Engines.Harvest if (type != null) { - type = MutateType(type, @from, tool, def, map, loc, resource); + type = MutateType(type, from, tool, def, map, loc, resource); } if (type != null) @@ -220,7 +220,7 @@ namespace Server.Engines.Harvest if (Give(from, bonusItem, true) ) // Bonuses always allow placing at feet, even if pack is full irregrdless of def { - bonus.SendSuccessTo(@from); + bonus.SendSuccessTo(from); } else { @@ -249,7 +249,7 @@ namespace Server.Engines.Harvest if (type == null) { - def.SendMessageTo(@from, def.FailMessage); + def.SendMessageTo(from, def.FailMessage); } OnHarvestFinished(from, tool, def, vein, bank, resource, toHarvest); @@ -414,7 +414,7 @@ namespace Server.Engines.Harvest if (!from.Mounted) { - @from.Animate(def.EffectActions.RandomElement(), 5, 1, true, false, 0); + from.Animate(def.EffectActions.RandomElement(), 5, 1, true, false, 0); } } diff --git a/Projects/UOContent/Engines/Harvest/Core/HarvestTarget.cs b/Projects/UOContent/Engines/Harvest/Core/HarvestTarget.cs index 31fc694e3..1cc829855 100644 --- a/Projects/UOContent/Engines/Harvest/Core/HarvestTarget.cs +++ b/Projects/UOContent/Engines/Harvest/Core/HarvestTarget.cs @@ -28,7 +28,7 @@ namespace Server.Engines.Harvest if (itemID == 0xED3 || itemID == 0xEDF || itemID == 0xEE0 || itemID == 0xEE1 || itemID == 0xEE2 || itemID == 0xEE8) { - if (@from is PlayerMobile player) + if (from is PlayerMobile player) { var qs = player.Quest; if (!(qs is WitchApprenticeQuest)) @@ -61,11 +61,11 @@ namespace Server.Engines.Harvest if (!item.IsChildOf(from.Backpack)) { - @from.SendLocalizedMessage(1062334); // This item must be in your backpack to be used. + from.SendLocalizedMessage(1062334); // This item must be in your backpack to be used. } else if (obj.Axe(from, axe)) { - @from.PlaySound(0x13E); + from.PlaySound(0x13E); } } else if (m_System is Lumberjacking && targeted is ICarvable carvable) @@ -107,7 +107,7 @@ namespace Server.Engines.Harvest { if (container is TrappableContainer trappableContainer) { - trappableContainer.ExecuteTrap(@from); + trappableContainer.ExecuteTrap(from); } container.Destroy(); diff --git a/Projects/UOContent/Engines/Harvest/Fishing.cs b/Projects/UOContent/Engines/Harvest/Fishing.cs index 04fb315a7..caad3c27d 100644 --- a/Projects/UOContent/Engines/Harvest/Fishing.cs +++ b/Projects/UOContent/Engines/Harvest/Fishing.cs @@ -207,7 +207,7 @@ namespace Server.Engines.Harvest if (type == typeof(MessageInABottle)) { - return new MessageInABottle(@from.Map == Map.Felucca ? Map.Felucca : Map.Trammel); + return new MessageInABottle(from.Map == Map.Felucca ? Map.Felucca : Map.Trammel); } var pack = from.Backpack; @@ -468,11 +468,11 @@ namespace Server.Engines.Harvest if (number == 1043297 || ns.HighSeas) { - @from.SendLocalizedMessage(number, name); + from.SendLocalizedMessage(number, name); } else { - @from.SendLocalizedMessage(number, true, name); + from.SendLocalizedMessage(number, true, name); } } } @@ -489,7 +489,7 @@ namespace Server.Engines.Harvest { if (Core.ML) { - @from.RevealingAction(); + from.RevealingAction(); } Effects.SendLocationEffect(loc, map, 0x352D, 16, 4); @@ -508,7 +508,7 @@ namespace Server.Engines.Harvest if (Core.ML) { - @from.RevealingAction(); + from.RevealingAction(); } } diff --git a/Projects/UOContent/Engines/Harvest/Lumberjacking.cs b/Projects/UOContent/Engines/Harvest/Lumberjacking.cs index bcc3206aa..8f8f32d4f 100644 --- a/Projects/UOContent/Engines/Harvest/Lumberjacking.cs +++ b/Projects/UOContent/Engines/Harvest/Lumberjacking.cs @@ -162,20 +162,20 @@ namespace Server.Engines.Harvest MessageType.Regular, 0x3B2, 500450, - @from.NetState + from.NetState ); // You can only skin dead creatures. } else if (toHarvest is Item item) { - item.LabelTo(@from, 500464); // Use this on corpses to carve away meat and hide + item.LabelTo(from, 500464); // Use this on corpses to carve away meat and hide } else if (toHarvest is StaticTarget || toHarvest is LandTarget) { - @from.SendLocalizedMessage(500489); // You can't use an axe on that. + from.SendLocalizedMessage(500489); // You can't use an axe on that. } else { - @from.SendLocalizedMessage(1005213); // You can't do that + from.SendLocalizedMessage(1005213); // You can't do that } } @@ -185,7 +185,7 @@ namespace Server.Engines.Harvest if (Core.ML) { - @from.RevealingAction(); + from.RevealingAction(); } } diff --git a/Projects/UOContent/Engines/Harvest/Mining.cs b/Projects/UOContent/Engines/Harvest/Mining.cs index 235364a30..9ecc57ad5 100644 --- a/Projects/UOContent/Engines/Harvest/Mining.cs +++ b/Projects/UOContent/Engines/Harvest/Mining.cs @@ -283,7 +283,7 @@ namespace Server.Engines.Harvest { if (def != OreAndStone) { - return base.GetResourceType(@from, tool, def, map, loc, resource); + return base.GetResourceType(from, tool, def, map, loc, resource); } if (from.Skills.Mining.Base >= 100.0 && from is PlayerMobile pm && pm.StoneMining && pm.ToggleMiningStone @@ -321,11 +321,11 @@ namespace Server.Engines.Harvest { if (item is BaseGranite) { - @from.SendLocalizedMessage(1044606); // You carefully extract some workable stone from the ore vein! + from.SendLocalizedMessage(1044606); // You carefully extract some workable stone from the ore vein! } else { - base.SendSuccessTo(@from, item, resource); + base.SendSuccessTo(from, item, resource); } } @@ -389,7 +389,7 @@ namespace Server.Engines.Harvest { try { - var map = @from.Map; + var map = from.Map; if (map == null) { @@ -402,31 +402,31 @@ namespace Server.Engines.Harvest for (var i = 0; i < m_Offsets.Length; i += 2) { - var x = @from.X + m_Offsets[(offset + i) % m_Offsets.Length]; - var y = @from.Y + m_Offsets[(offset + i + 1) % m_Offsets.Length]; + var x = from.X + m_Offsets[(offset + i) % m_Offsets.Length]; + var y = from.Y + m_Offsets[(offset + i + 1) % m_Offsets.Length]; - if (map.CanSpawnMobile(x, y, @from.Z)) + if (map.CanSpawnMobile(x, y, from.Z)) { - spawned.OnBeforeSpawn(new Point3D(x, y, @from.Z), map); - spawned.MoveToWorld(new Point3D(x, y, @from.Z), map); - spawned.Combatant = @from; + spawned.OnBeforeSpawn(new Point3D(x, y, from.Z), map); + spawned.MoveToWorld(new Point3D(x, y, from.Z), map); + spawned.Combatant = from; return; } var z = map.GetAverageZ(x, y); - if (Math.Abs(z - @from.Z) < 10 && map.CanSpawnMobile(x, y, z)) + if (Math.Abs(z - from.Z) < 10 && map.CanSpawnMobile(x, y, z)) { spawned.OnBeforeSpawn(new Point3D(x, y, z), map); spawned.MoveToWorld(new Point3D(x, y, z), map); - spawned.Combatant = @from; + spawned.Combatant = from; return; } } - spawned.OnBeforeSpawn(@from.Location, @from.Map); - spawned.MoveToWorld(@from.Location, @from.Map); - spawned.Combatant = @from; + spawned.OnBeforeSpawn(from.Location, from.Map); + spawned.MoveToWorld(from.Location, from.Map); + spawned.Combatant = from; } } catch @@ -454,7 +454,7 @@ namespace Server.Engines.Harvest if (Core.ML) { - @from.RevealingAction(); + from.RevealingAction(); } } @@ -462,11 +462,11 @@ namespace Server.Engines.Harvest { if (toHarvest is LandTarget) { - @from.SendLocalizedMessage(501862); // You can't mine there. + from.SendLocalizedMessage(501862); // You can't mine there. } else { - @from.SendLocalizedMessage(501863); // You can't mine that. + from.SendLocalizedMessage(501863); // You can't mine that. } } } diff --git a/Projects/UOContent/Engines/Help/HelpGump.cs b/Projects/UOContent/Engines/Help/HelpGump.cs index 9025baa55..e5696a88c 100644 --- a/Projects/UOContent/Engines/Help/HelpGump.cs +++ b/Projects/UOContent/Engines/Help/HelpGump.cs @@ -419,7 +419,7 @@ namespace Server.Engines.Help { if (from.Region.IsPartOf()) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1114345, "", 0x35 @@ -427,11 +427,11 @@ namespace Server.Engines.Help } else if (from.Region.IsPartOf("Haven Island")) { - @from.SendLocalizedMessage(1041529); // You're already in Haven + from.SendLocalizedMessage(1041529); // You're already in Haven } else { - @from.MoveToWorld(new Point3D(3503, 2574, 14), Map.Trammel); + from.MoveToWorld(new Point3D(3503, 2574, 14), Map.Trammel); } } @@ -441,7 +441,7 @@ namespace Server.Engines.Help if (type != (PageType)(-1) && PageQueue.CheckAllowedToPage(from)) { - @from.SendGump(new PagePromptGump(@from, type)); + from.SendGump(new PagePromptGump(from, type)); } } } diff --git a/Projects/UOContent/Engines/Help/SpeechLogGump.cs b/Projects/UOContent/Engines/Help/SpeechLogGump.cs index 1feeb925f..591e3e6f7 100644 --- a/Projects/UOContent/Engines/Help/SpeechLogGump.cs +++ b/Projects/UOContent/Engines/Help/SpeechLogGump.cs @@ -115,7 +115,7 @@ namespace Server.Engines.Help { if (m_Page - 1 >= 0) { - @from.SendGump(new SpeechLogGump(m_Player, m_Log, m_Page - 1)); + from.SendGump(new SpeechLogGump(m_Player, m_Log, m_Page - 1)); } break; @@ -124,7 +124,7 @@ namespace Server.Engines.Help { if ((m_Page + 1) * MaxEntriesPerPage < m_Log.Count) { - @from.SendGump(new SpeechLogGump(m_Player, m_Log, m_Page + 1)); + from.SendGump(new SpeechLogGump(m_Player, m_Log, m_Page + 1)); } break; diff --git a/Projects/UOContent/Engines/MLQuests/Gumps/RaceChangeGump.cs b/Projects/UOContent/Engines/MLQuests/Gumps/RaceChangeGump.cs index 19a564ff8..534445893 100644 --- a/Projects/UOContent/Engines/MLQuests/Gumps/RaceChangeGump.cs +++ b/Projects/UOContent/Engines/MLQuests/Gumps/RaceChangeGump.cs @@ -153,37 +153,37 @@ namespace Server.Engines.MLQuests.Gumps if (from.Race == targetRace) { - @from.SendLocalizedMessage(1111918); // You are already that race. + from.SendLocalizedMessage(1111918); // You are already that race. } else if (!MondainsLegacy.CheckML(from, false)) { - @from.SendLocalizedMessage(1073651); // You must have Mondain's Legacy before proceeding... + from.SendLocalizedMessage(1073651); // You must have Mondain's Legacy before proceeding... } else if (!from.Alive) { - @from.SendLocalizedMessage(1073646); // Only the living may proceed... + from.SendLocalizedMessage(1073646); // Only the living may proceed... } else if (from.Mounted) { - @from.SendLocalizedMessage(1073647); // You may not continue while mounted... + from.SendLocalizedMessage(1073647); // You may not continue while mounted... } else if (!from.CanBeginAction() || DisguiseTimers.IsDisguised(from) || AnimalForm.UnderTransformation(from) || !from.CanBeginAction() || from.IsBodyMod) // TODO: Does this cover everything? { - @from.SendLocalizedMessage(1073648); // You may only proceed while in your original state... + from.SendLocalizedMessage(1073648); // You may only proceed while in your original state... } else if (from.Spell?.IsCasting == true) { - @from.SendLocalizedMessage(1073649); // One may not proceed while embracing magic... + from.SendLocalizedMessage(1073649); // One may not proceed while embracing magic... } else if (from.Poisoned) { - @from.SendLocalizedMessage(1073652); // You must be healthy to proceed... + from.SendLocalizedMessage(1073652); // You must be healthy to proceed... } else if (IsWearingEquipment(from)) { - @from.SendLocalizedMessage(1073650); // To proceed you must be unburdened by equipment... + from.SendLocalizedMessage(1073650); // To proceed you must be unburdened by equipment... } else { diff --git a/Projects/UOContent/Engines/MLQuests/Items/PrismaticAmber.cs b/Projects/UOContent/Engines/MLQuests/Items/PrismaticAmber.cs index 08e7d9f01..dcf074ddd 100644 --- a/Projects/UOContent/Engines/MLQuests/Items/PrismaticAmber.cs +++ b/Projects/UOContent/Engines/MLQuests/Items/PrismaticAmber.cs @@ -26,7 +26,7 @@ namespace Server.Items if (ret) { - DestroyItem(@from); + DestroyItem(from); } return ret; @@ -38,7 +38,7 @@ namespace Server.Items if (ret) { - DestroyItem(@from); + DestroyItem(from); } return ret; @@ -50,7 +50,7 @@ namespace Server.Items if (ret && Parent != from.Backpack) { - DestroyItem(@from); + DestroyItem(from); } return ret; diff --git a/Projects/UOContent/Engines/MLQuests/Items/QuestGiverItem.cs b/Projects/UOContent/Engines/MLQuests/Items/QuestGiverItem.cs index ad6121aa8..4389efdaa 100644 --- a/Projects/UOContent/Engines/MLQuests/Items/QuestGiverItem.cs +++ b/Projects/UOContent/Engines/MLQuests/Items/QuestGiverItem.cs @@ -43,11 +43,11 @@ namespace Server.Engines.MLQuests.Items { if (!from.InRange(GetWorldLocation(), 2)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if (!IsChildOf(from.Backpack)) { - @from.SendLocalizedMessage(1042593); // That is not in your backpack. + from.SendLocalizedMessage(1042593); // That is not in your backpack. } else if (MLQuestSystem.Enabled && CanGiveMLQuest && from is PlayerMobile mobile) { @@ -121,11 +121,11 @@ namespace Server.Engines.MLQuests.Items { if (!from.InRange(GetWorldLocation(), 2)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if (!IsChildOf(from.Backpack)) { - @from.SendLocalizedMessage(1042593); // That is not in your backpack. + from.SendLocalizedMessage(1042593); // That is not in your backpack. } else if (MLQuestSystem.Enabled && CanGiveMLQuest && from is PlayerMobile mobile) { diff --git a/Projects/UOContent/Engines/MLQuests/Mobiles/BoonCollector.cs b/Projects/UOContent/Engines/MLQuests/Mobiles/BoonCollector.cs index 8b0f051e7..89fa3e49f 100644 --- a/Projects/UOContent/Engines/MLQuests/Mobiles/BoonCollector.cs +++ b/Projects/UOContent/Engines/MLQuests/Mobiles/BoonCollector.cs @@ -90,11 +90,11 @@ namespace Server.Engines.MLQuests.Mobiles if (!from.Hidden && !from.HasGump() && !RaceChangeConfirmGump.IsPending(from.NetState) && CanTalkTo(from)) { - TalkTo(@from as PlayerMobile); + TalkTo(from as PlayerMobile); } else if (fromClick) { - DenyTalk(@from); + DenyTalk(from); } } diff --git a/Projects/UOContent/Engines/Party/Party.cs b/Projects/UOContent/Engines/Party/Party.cs index 3e9449357..861d37847 100644 --- a/Projects/UOContent/Engines/Party/Party.cs +++ b/Projects/UOContent/Engines/Party/Party.cs @@ -154,15 +154,15 @@ namespace Server.Engines.PartySystem if (m == from) { - p.SendPublicMessage(@from, "I killed myself !!"); + p.SendPublicMessage(from, "I killed myself !!"); } else if (m == null) { - p.SendPublicMessage(@from, "I was killed !!"); + p.SendPublicMessage(from, "I was killed !!"); } else { - p.SendPublicMessage(@from, $"I was killed by {m.Name} !!"); + p.SendPublicMessage(from, $"I was killed by {m.Name} !!"); } } } @@ -173,11 +173,11 @@ namespace Server.Engines.PartySystem if (p != null) { - new RejoinTimer(@from).Start(); + new RejoinTimer(from).Start(); } else { - @from.Party = null; + from.Party = null; } } @@ -348,7 +348,7 @@ namespace Server.Engines.PartySystem if (p == null) { - @from.Party = p = new Party(@from); + from.Party = p = new Party(from); } if (!p.Candidates.Contains(target)) @@ -405,7 +405,7 @@ namespace Server.Engines.PartySystem if (mob.Party != this) { - m_Listeners[i].SendMessage("[{0}]: {1}", @from.Name, text); + m_Listeners[i].SendMessage("[{0}]: {1}", from.Name, text); } } @@ -422,7 +422,7 @@ namespace Server.Engines.PartySystem if (mob.Party != this) { - m_Listeners[i].SendMessage("[{0}]->[{1}]: {2}", @from.Name, to.Name, text); + m_Listeners[i].SendMessage("[{0}]->[{1}]: {2}", from.Name, to.Name, text); } } @@ -444,13 +444,13 @@ namespace Server.Engines.PartySystem { p = Packet.Acquire( new UnicodeMessage( - @from.Serial, - @from.Body, + from.Serial, + from.Body, MessageType.Regular, - @from.SpeechHue, + from.SpeechHue, 3, - @from.Language, - @from.Name, + from.Language, + from.Name, text ) ); diff --git a/Projects/UOContent/Engines/Party/PartyCommands.cs b/Projects/UOContent/Engines/Party/PartyCommands.cs index db5ebcc05..e0cfb4c87 100644 --- a/Projects/UOContent/Engines/Party/PartyCommands.cs +++ b/Projects/UOContent/Engines/Party/PartyCommands.cs @@ -13,15 +13,15 @@ namespace Server.Engines.PartySystem if (p != null && p.Leader != from) { - @from.SendLocalizedMessage(1005453); // You may only add members to the party if you are the leader. + from.SendLocalizedMessage(1005453); // You may only add members to the party if you are the leader. } else if (p != null && p.Members.Count + p.Candidates.Count >= Party.Capacity) { - @from.SendLocalizedMessage(1008095); // You may only have 10 in your party (this includes candidates). + from.SendLocalizedMessage(1008095); // You may only have 10 in your party (this includes candidates). } else { - @from.Target = new AddPartyTarget(@from); + from.Target = new AddPartyTarget(from); } } @@ -57,11 +57,11 @@ namespace Server.Engines.PartySystem if (p?.Contains(target) == true) { - p.SendPrivateMessage(@from, target, text); + p.SendPrivateMessage(from, target, text); } else { - @from.SendLocalizedMessage(3000211); // You are not in a party. + from.SendLocalizedMessage(3000211); // You are not in a party. } } @@ -76,11 +76,11 @@ namespace Server.Engines.PartySystem if (p != null) { - p.SendPublicMessage(@from, text); + p.SendPublicMessage(from, text); } else { - @from.SendLocalizedMessage(3000211); // You are not in a party. + from.SendLocalizedMessage(3000211); // You are not in a party. } } @@ -102,11 +102,11 @@ namespace Server.Engines.PartySystem if (canLoot) { - @from.SendLocalizedMessage(1005447); // You have chosen to allow your party to loot your corpse. + from.SendLocalizedMessage(1005447); // You have chosen to allow your party to loot your corpse. } else { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1005448 ); // You have chosen to prevent your party from looting your corpse. } @@ -123,11 +123,11 @@ namespace Server.Engines.PartySystem if (leader == null || p?.Candidates.Contains(from) != true) { - @from.SendLocalizedMessage(3000222); // No one has invited you to be in a party. + from.SendLocalizedMessage(3000222); // No one has invited you to be in a party. } else if (p.Members.Count + p.Candidates.Count <= Party.Capacity) { - p.OnAccept(@from); + p.OnAccept(from); } } @@ -140,11 +140,11 @@ namespace Server.Engines.PartySystem if (leader == null || p?.Candidates.Contains(from) != true) { - @from.SendLocalizedMessage(3000222); // No one has invited you to be in a party. + from.SendLocalizedMessage(3000222); // No one has invited you to be in a party. } else { - p.OnDecline(@from, leader); + p.OnDecline(from, leader); } } } diff --git a/Projects/UOContent/Engines/Party/RemovePartyTarget.cs b/Projects/UOContent/Engines/Party/RemovePartyTarget.cs index 5d83e6c29..e8f9c57fb 100644 --- a/Projects/UOContent/Engines/Party/RemovePartyTarget.cs +++ b/Projects/UOContent/Engines/Party/RemovePartyTarget.cs @@ -21,7 +21,7 @@ namespace Server.Engines.PartySystem if (from == m) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1005446 ); // You may only remove yourself from a party if you are not the leader. } diff --git a/Projects/UOContent/Engines/Plants/MiscItems/OrangePetals.cs b/Projects/UOContent/Engines/Plants/MiscItems/OrangePetals.cs index 4aa652d95..4e994a274 100644 --- a/Projects/UOContent/Engines/Plants/MiscItems/OrangePetals.cs +++ b/Projects/UOContent/Engines/Plants/MiscItems/OrangePetals.cs @@ -29,7 +29,7 @@ namespace Server.Items { if (item != this) { - return base.CheckItemUse(@from, item); + return base.CheckItemUse(from, item); } if (from != RootParent) diff --git a/Projects/UOContent/Engines/Plants/PlantItem.cs b/Projects/UOContent/Engines/Plants/PlantItem.cs index 9ebb1fa05..b3c4bedae 100644 --- a/Projects/UOContent/Engines/Plants/PlantItem.cs +++ b/Projects/UOContent/Engines/Plants/PlantItem.cs @@ -178,19 +178,19 @@ namespace Server.Engines.Plants { if (m_PlantStatus >= PlantStatus.DeadTwigs) { - LabelTo(@from, LabelNumber); + LabelTo(from, LabelNumber); } else if (m_PlantStatus >= PlantStatus.DecorativePlant) { - LabelTo(@from, 1061924); // a decorative plant + LabelTo(from, 1061924); // a decorative plant } else if (m_PlantStatus >= PlantStatus.FullGrownPlant) { - LabelTo(@from, PlantTypeInfo.GetInfo(m_PlantType).Name); + LabelTo(from, PlantTypeInfo.GetInfo(m_PlantType).Name); } else { - LabelTo(@from, 1029913); // plant bowl + LabelTo(from, 1029913); // plant bowl } } diff --git a/Projects/UOContent/Engines/Plants/PlantPourTarget.cs b/Projects/UOContent/Engines/Plants/PlantPourTarget.cs index bce2dcbad..fc0a6144f 100644 --- a/Projects/UOContent/Engines/Plants/PlantPourTarget.cs +++ b/Projects/UOContent/Engines/Plants/PlantPourTarget.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Plants { if (!m_Plant.Deleted && from.InRange(m_Plant.GetWorldLocation(), 3) && targeted is Item item) { - m_Plant.Pour(@from, item); + m_Plant.Pour(from, item); } } @@ -23,7 +23,7 @@ namespace Server.Engines.Plants { if (from.HasGump()) { - @from.CloseGump(); + from.CloseGump(); } from.SendGump(new MainPlantGump(m_Plant)); diff --git a/Projects/UOContent/Engines/Plants/PollinateTarget.cs b/Projects/UOContent/Engines/Plants/PollinateTarget.cs index 038cc7b24..a63727f5a 100644 --- a/Projects/UOContent/Engines/Plants/PollinateTarget.cs +++ b/Projects/UOContent/Engines/Plants/PollinateTarget.cs @@ -88,7 +88,7 @@ namespace Server.Engines.Plants m_Plant.PlantStatus != PlantStatus.BowlOfDirt && from.InRange(m_Plant.GetWorldLocation(), 3) && m_Plant.IsUsableBy(from)) { - @from.SendGump(new ReproductionGump(m_Plant)); + from.SendGump(new ReproductionGump(m_Plant)); } } } diff --git a/Projects/UOContent/Engines/Plants/ReproductionGump.cs b/Projects/UOContent/Engines/Plants/ReproductionGump.cs index b77d2a79d..4e983681f 100644 --- a/Projects/UOContent/Engines/Plants/ReproductionGump.cs +++ b/Projects/UOContent/Engines/Plants/ReproductionGump.cs @@ -158,7 +158,7 @@ namespace Server.Engines.Plants { if (m_Plant.PlantStatus == PlantStatus.Stage9) { - @from.SendGump(new SetToDecorativeGump(m_Plant)); + from.SendGump(new SetToDecorativeGump(m_Plant)); } break; @@ -225,11 +225,11 @@ namespace Server.Engines.Plants { if (m_Plant.IsCrossable) { - m_Plant.LabelTo(@from, 1053056); // This plant has no resources to gather! + m_Plant.LabelTo(from, 1053056); // This plant has no resources to gather! } else { - m_Plant.LabelTo(@from, 1053055); // Mutated plants do not produce resources! + m_Plant.LabelTo(from, 1053055); // Mutated plants do not produce resources! } } else if (system.AvailableResources == 0) diff --git a/Projects/UOContent/Engines/Plants/Seed.cs b/Projects/UOContent/Engines/Plants/Seed.cs index 87e40483c..5b855d09f 100644 --- a/Projects/UOContent/Engines/Plants/Seed.cs +++ b/Projects/UOContent/Engines/Plants/Seed.cs @@ -224,15 +224,15 @@ namespace Server.Engines.Plants if (targeted is PlantItem plant) { - plant.PlantSeed(@from, m_Seed); + plant.PlantSeed(from, m_Seed); } else if (targeted is Item item) { - item.LabelTo(@from, 1061919); // You must use a seed on a bowl of dirt! + item.LabelTo(from, 1061919); // You must use a seed on a bowl of dirt! } else { - @from.SendLocalizedMessage(1061919); // You must use a seed on a bowl of dirt! + from.SendLocalizedMessage(1061919); // You must use a seed on a bowl of dirt! } } } diff --git a/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Objectives.cs b/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Objectives.cs index 9a6a435c0..bc1634b2f 100644 --- a/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Objectives.cs +++ b/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Objectives.cs @@ -43,7 +43,7 @@ namespace Server.Engines.Quests.Ambitious if (redSolen) { - return @from is RedSolenQueen; + return from is RedSolenQueen; } return from is BlackSolenQueen; diff --git a/Projects/UOContent/Engines/Quests/Collector/Items/Obsidian.cs b/Projects/UOContent/Engines/Quests/Collector/Items/Obsidian.cs index ea41f32c2..7e40799a8 100644 --- a/Projects/UOContent/Engines/Quests/Collector/Items/Obsidian.cs +++ b/Projects/UOContent/Engines/Quests/Collector/Items/Obsidian.cs @@ -161,15 +161,15 @@ namespace Server.Engines.Quests.Collector { if (m_Quantity < m_Partial) { - LabelTo(@from, 1055137); // a section of an obsidian statue + LabelTo(from, 1055137); // a section of an obsidian statue } else if (m_Quantity < m_Completed) { - LabelTo(@from, 1055138); // a partially reconstructed obsidian statue + LabelTo(from, 1055138); // a partially reconstructed obsidian statue } else { - LabelTo(@from, 1055139, m_StatueName); // an obsidian statue of ~1_STATUE_NAME~ + LabelTo(from, 1055139, m_StatueName); // an obsidian statue of ~1_STATUE_NAME~ } } @@ -189,7 +189,7 @@ namespace Server.Engines.Quests.Collector { if (!IsChildOf(from.Backpack)) { - @from.Send( + from.Send( new MessageLocalized( Serial, ItemID, @@ -204,7 +204,7 @@ namespace Server.Engines.Quests.Collector } else { - @from.Target = new InternalTarget(this); + from.Target = new InternalTarget(this); } } } @@ -243,7 +243,7 @@ namespace Server.Engines.Quests.Collector { for (var i = 0; i < m_Obsidian.Quantity - 1; i++) { - @from.AddToBackpack(new Obsidian()); + from.AddToBackpack(new Obsidian()); } m_Obsidian.Quantity = 1; @@ -283,10 +283,10 @@ namespace Server.Engines.Quests.Collector if (targObsidian.Quantity >= m_Completed) { - targObsidian.StatueName = RandomName(@from); + targObsidian.StatueName = RandomName(from); } - @from.Send( + from.Send( new AsciiMessage( targObsidian.Serial, targObsidian.ItemID, diff --git a/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs b/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs index e5a141cb5..dfc9138da 100644 --- a/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs +++ b/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs @@ -134,7 +134,7 @@ namespace Server.Items { foreach (var entry in moongates.Entries) { - var dist = @from.GetDistanceToSqrt(entry.Location); + var dist = from.GetDistanceToSqrt(entry.Location); if (moongateDistance > dist) { closestMoongate = entry.Location; @@ -149,7 +149,7 @@ namespace Server.Items { foreach (var p in banks) { - var dist = @from.GetDistanceToSqrt(p); + var dist = from.GetDistanceToSqrt(p); if (bankDistance > dist) { closestBank = p; @@ -165,11 +165,11 @@ namespace Server.Items } else if (moongateDistance > m_LongDistance) { - moonMsg = 1046449 + (int)@from.GetDirectionTo(closestMoongate); // A moongate is * from here + moonMsg = 1046449 + (int)from.GetDirectionTo(closestMoongate); // A moongate is * from here } else if (moongateDistance > m_ShortDistance) { - moonMsg = 1048010 + (int)@from.GetDirectionTo(closestMoongate); // There is a Moongate * of here. + moonMsg = 1048010 + (int)from.GetDirectionTo(closestMoongate); // There is a Moongate * of here. } else { @@ -185,11 +185,11 @@ namespace Server.Items } else if (bankDistance > m_LongDistance) { - bankMsg = 1046462 + (int)@from.GetDirectionTo(closestBank); // A town is * from here + bankMsg = 1046462 + (int)from.GetDirectionTo(closestBank); // A town is * from here } else if (bankDistance > m_ShortDistance) { - bankMsg = 1048002 + (int)@from.GetDirectionTo(closestBank); // There is a city Bank * of here. + bankMsg = 1048002 + (int)from.GetDirectionTo(closestBank); // There is a city Bank * of here. } else { diff --git a/Projects/UOContent/Engines/Quests/Dark Tides/DarkTidesQuest.cs b/Projects/UOContent/Engines/Quests/Dark Tides/DarkTidesQuest.cs index a368c0607..b6a490e08 100644 --- a/Projects/UOContent/Engines/Quests/Dark Tides/DarkTidesQuest.cs +++ b/Projects/UOContent/Engines/Quests/Dark Tides/DarkTidesQuest.cs @@ -96,7 +96,7 @@ namespace Server.Engines.Quests.Necro qs.IsObjectiveInProgress(typeof(FindWellOfTearsObjective)) || qs.IsObjectiveInProgress(typeof(UseCallingScrollObjective))) { - return @from.Backpack?.FindItemByType() == null; + return from.Backpack?.FindItemByType() == null; } } diff --git a/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/Horus.cs b/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/Horus.cs index db149b99e..3011dcfbb 100644 --- a/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/Horus.cs +++ b/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/Horus.cs @@ -125,7 +125,7 @@ namespace Server.Engines.Quests.Necro if (from.Alive) { - if (@from is PlayerMobile pm) + if (from is PlayerMobile pm) { var qs = pm.Quest; diff --git a/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs b/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs index c4e91ce4f..7cadf48bd 100644 --- a/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs +++ b/Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs @@ -39,12 +39,12 @@ namespace Server.Engines.Quests.Necro { if (horn.Charges < 10) { - SayTo(@from, 1049384); // I have recharged the item for you. + SayTo(from, 1049384); // I have recharged the item for you. horn.Charges = 10; } else { - SayTo(@from, 1049385); // That doesn't need recharging yet. + SayTo(from, 1049385); // That doesn't need recharging yet. } } else diff --git a/Projects/UOContent/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs b/Projects/UOContent/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs index b80b0c8b2..19e7930ed 100644 --- a/Projects/UOContent/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs +++ b/Projects/UOContent/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs @@ -110,7 +110,7 @@ namespace Server.Engines.Quests.Ninja { if (qs.IsObjectiveInProgress(typeof(GiveZoelNoteObjective))) { - return @from.Backpack?.FindItemByType() == null; + return from.Backpack?.FindItemByType() == null; } } @@ -130,7 +130,7 @@ namespace Server.Engines.Quests.Ninja { if (qs.IsObjectiveInProgress(typeof(GiveEminoSwordObjective))) { - return @from.Backpack?.FindItemByType() == null; + return from.Backpack?.FindItemByType() == null; } } diff --git a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs index db92617c3..146f93c7a 100644 --- a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs +++ b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs @@ -106,7 +106,7 @@ namespace Server.Engines.Quests.Ninja var obj = player.Quest.FindObjective(); if (obj?.StolenTreasure == true) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1063247 ); // The guard is watching you carefully! It would be unwise to remove another item from here. } diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs index 1a3791938..38946c006 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs @@ -113,7 +113,7 @@ namespace Server.Engines.Quests.Samurai { if (qs.IsObjectiveInProgress(typeof(FifthTrialReturnObjective))) { - return @from.Backpack?.FindItemByType() == null; + return from.Backpack?.FindItemByType() == null; } } diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs index 91488f70c..14ac82e76 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs @@ -58,7 +58,7 @@ namespace Server.Engines.Quests.Samurai var obj = player.Quest.FindObjective(); if (obj?.StolenTreasure == true) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1063247 ); // The guard is watching you carefully! It would be unwise to remove another item from here. } diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/Relnia.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/Relnia.cs index 2f6ce3322..de19d7bda 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/Relnia.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Mobiles/Relnia.cs @@ -60,7 +60,7 @@ namespace Server.Engines.Quests.Samurai obj.Complete(); qs.AddObjective(new FourthTrialReturnObjective(false)); - SayTo(@from, 1063241); // I thank thee. This gold will be a great help to me and mine! + SayTo(from, 1063241); // I thank thee. This gold will be a great help to me and mine! gold.Consume(); // Intentional difference from OSI: don't take all the gold of poor newbies! return gold.Deleted; diff --git a/Projects/UOContent/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs b/Projects/UOContent/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs index e5c44668a..027b3b33e 100644 --- a/Projects/UOContent/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs +++ b/Projects/UOContent/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs @@ -156,7 +156,7 @@ namespace Server.Engines.Quests.Matriarch if (from.Alive) { - if (@from is PlayerMobile pm) + if (from is PlayerMobile pm) { if (pm.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen) { diff --git a/Projects/UOContent/Engines/Quests/Solen Matriarch/Objectives.cs b/Projects/UOContent/Engines/Quests/Solen Matriarch/Objectives.cs index cbbb10b17..e2140a2ca 100644 --- a/Projects/UOContent/Engines/Quests/Solen Matriarch/Objectives.cs +++ b/Projects/UOContent/Engines/Quests/Solen Matriarch/Objectives.cs @@ -43,7 +43,7 @@ namespace Server.Engines.Quests.Matriarch if (redSolen) { - return @from is BlackSolenInfiltratorWarrior || @from is BlackSolenInfiltratorQueen; + return from is BlackSolenInfiltratorWarrior || from is BlackSolenInfiltratorQueen; } return from is RedSolenInfiltratorWarrior || from is RedSolenInfiltratorQueen; diff --git a/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Objectives.cs b/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Objectives.cs index c78a03154..125f00d8a 100644 --- a/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Objectives.cs +++ b/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Objectives.cs @@ -56,7 +56,7 @@ namespace Server.Engines.Quests.Naturalist { if (!nest.Special) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1054058 ); // You begin recording your completed notes on a bit of parchment. } @@ -69,7 +69,7 @@ namespace Server.Engines.Quests.Naturalist { if (m_StudyState != StudyState.Inactive) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1054046 ); // You abandon your study of the Solen Egg Nest without gathering the needed information. } @@ -100,24 +100,24 @@ namespace Server.Engines.Quests.Naturalist if (nest.Special) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1054056 ); // You notice something very odd about this Solen Egg Nest. You begin taking notes. } else { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1054045 ); // You begin studying the Solen Egg Nest to gather information. } if (from.Female) { - @from.PlaySound(0x30B); + from.PlaySound(0x30B); } else { - @from.PlaySound(0x419); + from.PlaySound(0x419); } } } diff --git a/Projects/UOContent/Engines/Quests/The Summoning/Items/BellOfTheDead.cs b/Projects/UOContent/Engines/Quests/The Summoning/Items/BellOfTheDead.cs index 6a2afb45f..627766811 100644 --- a/Projects/UOContent/Engines/Quests/The Summoning/Items/BellOfTheDead.cs +++ b/Projects/UOContent/Engines/Quests/The Summoning/Items/BellOfTheDead.cs @@ -33,11 +33,11 @@ namespace Server.Engines.Quests.Doom { if (from.InRange(GetWorldLocation(), 2)) { - BeginSummon(@from); + BeginSummon(from); } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Engines/Quests/The Summoning/Mobiles/Victoria.cs b/Projects/UOContent/Engines/Quests/The Summoning/Mobiles/Victoria.cs index 4fb4fedbf..e50c60404 100644 --- a/Projects/UOContent/Engines/Quests/The Summoning/Mobiles/Victoria.cs +++ b/Projects/UOContent/Engines/Quests/The Summoning/Mobiles/Victoria.cs @@ -102,7 +102,7 @@ namespace Server.Engines.Quests.Doom if (!bones.Deleted) { SayTo( - @from, + from, 1050038 ); // You have already given me all the Daemon bones necessary to weave the spell. Keep these for a later time. } @@ -112,7 +112,7 @@ namespace Server.Engines.Quests.Doom { // TODO: Accurate? SayTo( - @from, + from, 1050038 ); // You have already given me all the Daemon bones necessary to weave the spell. Keep these for a later time. } diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs index 44be3e506..50077499c 100644 --- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs +++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs @@ -89,7 +89,7 @@ namespace Server.Engines.Quests.Haven if (ItemID == 0x2006) // Corpse form { - @from.Send( + from.Send( new MessageLocalized( Serial, ItemID, @@ -104,7 +104,7 @@ namespace Server.Engines.Quests.Haven } else { - @from.Send( + from.Send( new MessageLocalized( Serial, ItemID, diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs index ee03d1d0c..8911f0e5a 100644 --- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs +++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs @@ -108,9 +108,9 @@ namespace Server.Engines.Quests.Haven if (from is PlayerMobile player) { if (player.Quest is UzeraanTurmoilQuest qs && dropped is Apple && - UzeraanTurmoilQuest.HasLostFertileDirt(@from)) + UzeraanTurmoilQuest.HasLostFertileDirt(from)) { - FocusTo(@from); + FocusTo(from); Item fertileDirt = new QuestFertileDirt(); diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs index 5735d5a8f..968530315 100644 --- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs +++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs @@ -127,7 +127,7 @@ namespace Server.Engines.Quests.Haven if (ItemID == 0x2006) // Corpse form { - @from.Send( + from.Send( new MessageLocalized( Serial, ItemID, @@ -142,7 +142,7 @@ namespace Server.Engines.Quests.Haven } else { - @from.Send( + from.Send( new MessageLocalized( Serial, ItemID, @@ -161,7 +161,7 @@ namespace Server.Engines.Quests.Haven { if (from.InRange(GetWorldLocation(), 2)) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1049661, "", 0x22 diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs index 1cd23c210..a0cd9ba56 100644 --- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs +++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs @@ -121,7 +121,7 @@ namespace Server.Engines.Quests.Haven { if (qs.IsObjectiveInProgress(typeof(ReturnScrollOfPowerObjective))) { - return @from.Backpack?.FindItemByType() == null; + return from.Backpack?.FindItemByType() == null; } } @@ -141,7 +141,7 @@ namespace Server.Engines.Quests.Haven { if (qs.IsObjectiveInProgress(typeof(ReturnFertileDirtObjective))) { - return @from.Backpack?.FindItemByType() == null; + return from.Backpack?.FindItemByType() == null; } } @@ -161,7 +161,7 @@ namespace Server.Engines.Quests.Haven { if (qs.IsObjectiveInProgress(typeof(ReturnDaemonBloodObjective))) { - return @from.Backpack?.FindItemByType() == null; + return from.Backpack?.FindItemByType() == null; } } @@ -181,7 +181,7 @@ namespace Server.Engines.Quests.Haven { if (qs.IsObjectiveInProgress(typeof(ReturnDaemonBoneObjective))) { - return @from.Backpack?.FindItemByType() == null; + return from.Backpack?.FindItemByType() == null; } } diff --git a/Projects/UOContent/Engines/Spawners/BaseSpawner.cs b/Projects/UOContent/Engines/Spawners/BaseSpawner.cs index 668792153..d7c9ee9cf 100644 --- a/Projects/UOContent/Engines/Spawners/BaseSpawner.cs +++ b/Projects/UOContent/Engines/Spawners/BaseSpawner.cs @@ -307,7 +307,7 @@ namespace Server.Engines.Spawners { if (from.AccessLevel >= AccessLevel.Developer) { - @from.SendGump(new SpawnerGump(this)); + from.SendGump(new SpawnerGump(this)); } } @@ -350,11 +350,11 @@ namespace Server.Engines.Spawners if (m_Running) { - LabelTo(@from, "[Running]"); + LabelTo(from, "[Running]"); } else { - LabelTo(@from, "[Off]"); + LabelTo(from, "[Off]"); } } diff --git a/Projects/UOContent/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs b/Projects/UOContent/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs index a29e3ab45..f5bbf953d 100644 --- a/Projects/UOContent/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs +++ b/Projects/UOContent/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs @@ -78,7 +78,7 @@ namespace Server.Items { if (m_Statue != null) { - @from.SendGump(new CharacterPlinthGump(m_Statue)); + from.SendGump(new CharacterPlinthGump(m_Statue)); } } diff --git a/Projects/UOContent/Engines/Virtues/Justice.cs b/Projects/UOContent/Engines/Virtues/Justice.cs index dbe51f361..2ab4c7a8a 100644 --- a/Projects/UOContent/Engines/Virtues/Justice.cs +++ b/Projects/UOContent/Engines/Virtues/Justice.cs @@ -202,7 +202,7 @@ namespace Server { if (VirtueHelper.Atrophy(from, VirtueName.Justice, LossAmount)) { - @from.SendLocalizedMessage(1049373); // You have lost some Justice. + from.SendLocalizedMessage(1049373); // You have lost some Justice. } pm.LastJusticeLoss = DateTime.UtcNow; diff --git a/Projects/UOContent/Engines/Virtues/Sacrifice.cs b/Projects/UOContent/Engines/Virtues/Sacrifice.cs index c78d6c812..17581f02c 100644 --- a/Projects/UOContent/Engines/Virtues/Sacrifice.cs +++ b/Projects/UOContent/Engines/Virtues/Sacrifice.cs @@ -23,11 +23,11 @@ namespace Server { if (from.Alive) { - @from.Target = new InternalTarget(); + from.Target = new InternalTarget(); } else { - Resurrect(@from); + Resurrect(from); } } else @@ -49,7 +49,7 @@ namespace Server { if (VirtueHelper.Atrophy(from, VirtueName.Sacrifice, LossAmount)) { - @from.SendLocalizedMessage(1052041); // You have lost some Sacrifice. + from.SendLocalizedMessage(1052041); // You have lost some Sacrifice. } var level = VirtueHelper.GetLevel(from, VirtueName.Sacrifice); diff --git a/Projects/UOContent/Engines/Virtues/Valor.cs b/Projects/UOContent/Engines/Virtues/Valor.cs index aa3e98c55..573994402 100644 --- a/Projects/UOContent/Engines/Virtues/Valor.cs +++ b/Projects/UOContent/Engines/Virtues/Valor.cs @@ -37,7 +37,7 @@ namespace Server { if (VirtueHelper.Atrophy(from, VirtueName.Valor, LossAmount)) { - @from.SendLocalizedMessage(1054040); // You have lost some Valor. + from.SendLocalizedMessage(1054040); // You have lost some Valor. } pm.LastValorLoss = DateTime.UtcNow; diff --git a/Projects/UOContent/Engines/Virtues/VirtueHelper.cs b/Projects/UOContent/Engines/Virtues/VirtueHelper.cs index b4b076172..53dbe411c 100644 --- a/Projects/UOContent/Engines/Virtues/VirtueHelper.cs +++ b/Projects/UOContent/Engines/Virtues/VirtueHelper.cs @@ -92,11 +92,11 @@ namespace Server if (current - amount >= 0) { - @from.Virtues.SetValue((int)virtue, current - amount); + from.Virtues.SetValue((int)virtue, current - amount); } else { - @from.Virtues.SetValue((int)virtue, 0); + from.Virtues.SetValue((int)virtue, 0); } return current > 0; diff --git a/Projects/UOContent/Gumps/AddDoorGump.cs b/Projects/UOContent/Gumps/AddDoorGump.cs index 52bbf5978..ba772c505 100644 --- a/Projects/UOContent/Gumps/AddDoorGump.cs +++ b/Projects/UOContent/Gumps/AddDoorGump.cs @@ -72,7 +72,7 @@ namespace Server.Gumps { if (button >= 0 && button < m_Types.Length) { - @from.SendGump(new AddDoorGump(button)); + from.SendGump(new AddDoorGump(button)); } } else diff --git a/Projects/UOContent/Gumps/BanDurationGump.cs b/Projects/UOContent/Gumps/BanDurationGump.cs index 6cd9fa24b..0077a4a62 100644 --- a/Projects/UOContent/Gumps/BanDurationGump.cs +++ b/Projects/UOContent/Gumps/BanDurationGump.cs @@ -235,7 +235,7 @@ namespace Server.Gumps { a.Comments.Add( new AccountComment( - @from.RawName, + from.RawName, $"Duration: {(duration == TimeSpan.MaxValue ? "Infinite" : duration.ToString())}, Comment: {comment}" ) ); @@ -244,11 +244,11 @@ namespace Server.Gumps if (duration == TimeSpan.MaxValue) { - @from.SendMessage("Ban Duration: Infinite"); + from.SendMessage("Ban Duration: Infinite"); } else { - @from.SendMessage("Ban Duration: {0}", duration); + from.SendMessage("Ban Duration: {0}", duration); } } else diff --git a/Projects/UOContent/Gumps/CommentsGump.cs b/Projects/UOContent/Gumps/CommentsGump.cs index 042ba35f8..f08e98f54 100644 --- a/Projects/UOContent/Gumps/CommentsGump.cs +++ b/Projects/UOContent/Gumps/CommentsGump.cs @@ -80,11 +80,11 @@ namespace Server.Gumps if (m.Account == null) { - @from.SendMessage("That player doesn't have an account loaded... weird."); + from.SendMessage("That player doesn't have an account loaded... weird."); } else { - @from.SendGump(new CommentsGump((Account)m.Account)); + from.SendGump(new CommentsGump((Account)m.Account)); } } diff --git a/Projects/UOContent/Gumps/Go/GoGump.cs b/Projects/UOContent/Gumps/Go/GoGump.cs index d95f9ae7b..2cdf41f5d 100644 --- a/Projects/UOContent/Gumps/Go/GoGump.cs +++ b/Projects/UOContent/Gumps/Go/GoGump.cs @@ -74,11 +74,11 @@ namespace Server.Gumps if (node == tree.Root) { - tree.LastBranch.Remove(@from); + tree.LastBranch.Remove(from); } else { - tree.LastBranch[@from] = node; + tree.LastBranch[from] = node; } m_Page = page; @@ -239,7 +239,7 @@ namespace Server.Gumps if (branch != null) { - @from.SendGump(new GoGump(0, @from, tree, branch)); + from.SendGump(new GoGump(0, from, tree, branch)); } } @@ -253,7 +253,7 @@ namespace Server.Gumps { if (m_Node.Parent != null) { - @from.SendGump(new GoGump(0, @from, m_Tree, m_Node.Parent)); + from.SendGump(new GoGump(0, from, m_Tree, m_Node.Parent)); } break; @@ -262,7 +262,7 @@ namespace Server.Gumps { if (m_Page > 0) { - @from.SendGump(new GoGump(m_Page - 1, @from, m_Tree, m_Node)); + from.SendGump(new GoGump(m_Page - 1, from, m_Tree, m_Node)); } break; @@ -271,7 +271,7 @@ namespace Server.Gumps { if ((m_Page + 1) * EntryCount < m_Node.Categories.Length + m_Node.Locations.Length) { - @from.SendGump(new GoGump(m_Page + 1, @from, m_Tree, m_Node)); + from.SendGump(new GoGump(m_Page + 1, from, m_Tree, m_Node)); } break; @@ -294,7 +294,7 @@ namespace Server.Gumps index -= m_Node.Categories.Length; if (index < m_Node.Locations.Length) { - @from.MoveToWorld(m_Node.Locations[index].Location, m_Tree.Map); + from.MoveToWorld(m_Node.Locations[index].Location, m_Tree.Map); } } diff --git a/Projects/UOContent/Gumps/HouseGumpAOS.cs b/Projects/UOContent/Gumps/HouseGumpAOS.cs index 46f85fe06..2b9ce8c9c 100644 --- a/Projects/UOContent/Gumps/HouseGumpAOS.cs +++ b/Projects/UOContent/Gumps/HouseGumpAOS.cs @@ -284,13 +284,13 @@ namespace Server.Gumps /*AddHtmlLocalized( 10, 170, 275, 20, 1011237, LabelColor, false, false ); // Number of locked down items: AddLabel( 310, 170, LabelHue, m_House.LockDownCount.ToString() ); - + AddHtmlLocalized( 10, 190, 275, 20, 1011238, LabelColor, false, false ); // Maximum locked down items: AddLabel( 310, 190, LabelHue, m_House.MaxLockDowns.ToString() ); - + AddHtmlLocalized( 10, 210, 275, 20, 1011239, LabelColor, false, false ); // Number of secure containers: AddLabel( 310, 210, LabelHue, m_House.SecureCount.ToString() ); - + AddHtmlLocalized( 10, 230, 275, 20, 1011240, LabelColor, false, false ); // Maximum number of secure containers: AddLabel( 310, 230, LabelHue, m_House.MaxSecures.ToString() );*/ @@ -682,7 +682,7 @@ namespace Server.Gumps { if (!house.Deleted) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, @from, house)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, from, house)); } } @@ -690,7 +690,7 @@ namespace Server.Gumps { if (!house.Deleted) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Customize, @from, house)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Customize, from, house)); } } @@ -814,7 +814,7 @@ namespace Server.Gumps { if (Banker.Deposit(from, -cost)) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1060397, (-cost).ToString() ); // ~1_AMOUNT~ gold has been deposited into your bank box. @@ -969,17 +969,17 @@ namespace Server.Gumps if (from.Map != sign.Map || !from.InRange(sign, 5)) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1062429 ); // You must be within five paces of the house sign to use this option. } else if (vendor.IsOwner(from)) { - vendor.SendOwnerGump(@from); + vendor.SendOwnerGump(from); } else { - vendor.OpenBackpack(@from); + vendor.OpenBackpack(from); } } @@ -1011,7 +1011,7 @@ namespace Server.Gumps { if (m_House.Public) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveBan, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveBan, from, m_House)); } break; @@ -1032,7 +1032,7 @@ namespace Server.Gumps { if (!m_House.Public) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveAccess, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveAccess, from, m_House)); } break; @@ -1076,7 +1076,7 @@ namespace Server.Gumps { if (isCoOwner) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.ListCoOwner, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.ListCoOwner, from, m_House)); } break; @@ -1097,7 +1097,7 @@ namespace Server.Gumps { if (isOwner) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveCoOwner, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveCoOwner, from, m_House)); } break; @@ -1106,7 +1106,7 @@ namespace Server.Gumps { if (isOwner) { - @from.SendGump( + from.SendGump( new WarningGump( 1060635, 30720, @@ -1114,7 +1114,7 @@ namespace Server.Gumps 32512, 420, 280, - okay => ClearCoOwners_Callback(@from, okay, m_House) + okay => ClearCoOwners_Callback(from, okay, m_House) ) ); } @@ -1143,7 +1143,7 @@ namespace Server.Gumps { if (isCoOwner) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveFriend, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveFriend, from, m_House)); } break; @@ -1152,7 +1152,7 @@ namespace Server.Gumps { if (isCoOwner) { - @from.SendGump( + from.SendGump( new WarningGump( 1060635, 30720, @@ -1160,7 +1160,7 @@ namespace Server.Gumps 32512, 420, 280, - okay => ClearFriends_Callback(@from, okay, m_House) + okay => ClearFriends_Callback(from, okay, m_House) ) ); } @@ -1293,7 +1293,7 @@ namespace Server.Gumps if (BaseHouse.NewVendorSystem) { - @from.SendGump( + from.SendGump( new NoticeGump( 1060637, 30720, @@ -1301,13 +1301,13 @@ namespace Server.Gumps 32512, 320, 180, - () => PublicPrivateNotice_Callback(@from, m_House) + () => PublicPrivateNotice_Callback(from, m_House) ) ); } else { - @from.SendGump( + from.SendGump( new NoticeGump( 1060637, 30720, @@ -1315,7 +1315,7 @@ namespace Server.Gumps 0xF8C000, 320, 180, - () => PublicPrivateNotice_Callback(@from, m_House) + () => PublicPrivateNotice_Callback(from, m_House) ) ); } @@ -1369,7 +1369,7 @@ namespace Server.Gumps if (e != null) { - @from.SendGump( + from.SendGump( new WarningGump( 1060635, 30720, @@ -1377,7 +1377,7 @@ namespace Server.Gumps 32512, 420, 280, - okay => ConvertHouse_Callback(@from, okay, m_House) + okay => ConvertHouse_Callback(from, okay, m_House) ) ); } @@ -1392,7 +1392,7 @@ namespace Server.Gumps { if (m_House.HasRentedVendors) { - @from.SendGump( + from.SendGump( new NoticeGump( 1060637, 30720, @@ -1400,13 +1400,13 @@ namespace Server.Gumps 32512, 320, 180, - () => CustomizeNotice_Callback(@from, m_House) + () => CustomizeNotice_Callback(from, m_House) ) ); } else if (m_House.HasAddonContainers) { - @from.SendGump( + from.SendGump( new NoticeGump( 1060637, 30720, @@ -1414,13 +1414,13 @@ namespace Server.Gumps 32512, 320, 180, - () => CustomizeNotice_Callback(@from, m_House) + () => CustomizeNotice_Callback(from, m_House) ) ); } else { - foundation.BeginCustomize(@from); + foundation.BeginCustomize(from); } } @@ -1449,7 +1449,7 @@ namespace Server.Gumps { if (isOwner && m_House.Public) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.ChangeSign, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.ChangeSign, from, m_House)); } break; @@ -1458,7 +1458,7 @@ namespace Server.Gumps { if (isOwner && isCustomizable) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.ChangeHanger, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.ChangeHanger, from, m_House)); } break; @@ -1467,7 +1467,7 @@ namespace Server.Gumps { if (isOwner && isCustomizable && foundation.Signpost != null) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.ChangePost, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.ChangePost, from, m_House)); } break; @@ -1476,7 +1476,7 @@ namespace Server.Gumps { if (isOwner && isCustomizable) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.ChangeFoundation, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.ChangeFoundation, from, m_House)); } break; @@ -1661,11 +1661,11 @@ namespace Server.Gumps if (m_House.CoOwners.Count > 0) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveCoOwner, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveCoOwner, from, m_House)); } else { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, from, m_House)); } } @@ -1679,11 +1679,11 @@ namespace Server.Gumps if (m_House.Friends.Count > 0) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveFriend, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveFriend, from, m_House)); } else { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, from, m_House)); } } @@ -1697,11 +1697,11 @@ namespace Server.Gumps if (m_House.Bans.Count > 0) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveBan, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveBan, from, m_House)); } else { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, from, m_House)); } } @@ -1715,11 +1715,11 @@ namespace Server.Gumps if (m_House.Access.Count > 0) { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveAccess, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.RemoveAccess, from, m_House)); } else { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, @from, m_House)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, from, m_House)); } } diff --git a/Projects/UOContent/Gumps/PlayerVendorGumps.cs b/Projects/UOContent/Gumps/PlayerVendorGumps.cs index 02dcafd9b..54bb5644e 100644 --- a/Projects/UOContent/Gumps/PlayerVendorGumps.cs +++ b/Projects/UOContent/Gumps/PlayerVendorGumps.cs @@ -68,7 +68,7 @@ namespace Server.Gumps if (from.Backpack != null) { - totalGold += @from.Backpack.GetAmount(typeof(Gold)); + totalGold += from.Backpack.GetAmount(typeof(Gold)); } totalGold += Banker.GetBalance(from); @@ -87,12 +87,12 @@ namespace Server.Gumps if (from.Backpack != null) { - leftPrice -= @from.Backpack.ConsumeUpTo(typeof(Gold), leftPrice); + leftPrice -= from.Backpack.ConsumeUpTo(typeof(Gold), leftPrice); } if (leftPrice > 0) { - Banker.Withdraw(@from, leftPrice); + Banker.Withdraw(from, leftPrice); } m_Vendor.HoldGold += m_VI.Price; @@ -260,7 +260,7 @@ namespace Server.Gumps if (info.ButtonID == 1 || info.ButtonID == 2) // See goods or Customize { - m_Vendor.CheckTeleport(@from); + m_Vendor.CheckTeleport(from); } if (!m_Vendor.CanInteractWith(from, true)) @@ -698,7 +698,7 @@ namespace Server.Gumps if (item != null) { - new PVHuePicker(item, m_Vendor, @from).SendTo(state); + new PVHuePicker(item, m_Vendor, from).SendTo(state); } } } @@ -1046,11 +1046,11 @@ namespace Server.Gumps { if (m_Vendor.HairItemID > 0) { - new PVHuePicker(m_Vendor, false, @from).SendTo(@from.NetState); + new PVHuePicker(m_Vendor, false, from).SendTo(from.NetState); } else { - @from.SendGump(new NewPlayerVendorCustomizeGump(m_Vendor)); + from.SendGump(new NewPlayerVendorCustomizeGump(m_Vendor)); } break; @@ -1067,11 +1067,11 @@ namespace Server.Gumps { if (m_Vendor.FacialHairItemID > 0) { - new PVHuePicker(m_Vendor, true, @from).SendTo(@from.NetState); + new PVHuePicker(m_Vendor, true, from).SendTo(from.NetState); } else { - @from.SendGump(new NewPlayerVendorCustomizeGump(m_Vendor)); + from.SendGump(new NewPlayerVendorCustomizeGump(m_Vendor)); } break; diff --git a/Projects/UOContent/Gumps/Props/SetObjectTarget.cs b/Projects/UOContent/Gumps/Props/SetObjectTarget.cs index 07b7282a6..19fa34dd2 100644 --- a/Projects/UOContent/Gumps/Props/SetObjectTarget.cs +++ b/Projects/UOContent/Gumps/Props/SetObjectTarget.cs @@ -66,11 +66,11 @@ namespace Server.Gumps { if (m_Type == typeof(Type)) { - @from.SendGump(new PropertiesGump(m_Mobile, m_Object, m_Stack, m_List, m_Page)); + from.SendGump(new PropertiesGump(m_Mobile, m_Object, m_Stack, m_List, m_Page)); } else { - @from.SendGump(new SetObjectGump(m_Property, m_Mobile, m_Object, m_Stack, m_Type, m_Page, m_List)); + from.SendGump(new SetObjectGump(m_Property, m_Mobile, m_Object, m_Stack, m_Type, m_Page, m_List)); } } } diff --git a/Projects/UOContent/Gumps/ReportMurderer.cs b/Projects/UOContent/Gumps/ReportMurderer.cs index aedac2575..7ad6cd800 100644 --- a/Projects/UOContent/Gumps/ReportMurderer.cs +++ b/Projects/UOContent/Gumps/ReportMurderer.cs @@ -127,7 +127,7 @@ namespace Server.Gumps { if (from.RecentlyReported.Contains(killer)) { - @from.RecentlyReported.Remove(killer); + from.RecentlyReported.Remove(killer); } } @@ -178,7 +178,7 @@ namespace Server.Gumps m_Idx++; if (m_Idx < m_Killers.Count) { - @from.SendGump(new ReportMurdererGump(@from, m_Killers, m_Idx)); + from.SendGump(new ReportMurdererGump(from, m_Killers, m_Idx)); } } diff --git a/Projects/UOContent/Gumps/ResurrectGump.cs b/Projects/UOContent/Gumps/ResurrectGump.cs index bfd5ef061..7a659e44b 100644 --- a/Projects/UOContent/Gumps/ResurrectGump.cs +++ b/Projects/UOContent/Gumps/ResurrectGump.cs @@ -243,31 +243,31 @@ namespace Server.Gumps if (from.RawStr * loss > 10) { - @from.RawStr = (int)(@from.RawStr * loss); + from.RawStr = (int)(from.RawStr * loss); } if (from.RawInt * loss > 10) { - @from.RawInt = (int)(@from.RawInt * loss); + from.RawInt = (int)(from.RawInt * loss); } if (from.RawDex * loss > 10) { - @from.RawDex = (int)(@from.RawDex * loss); + from.RawDex = (int)(from.RawDex * loss); } for (var s = 0; s < from.Skills.Length; s++) { - if (@from.Skills[s].Base * loss > 35) + if (from.Skills[s].Base * loss > 35) { - @from.Skills[s].Base *= loss; + from.Skills[s].Base *= loss; } } } if (from.Alive && m_HitsScalar > 0) { - @from.Hits = (int)(@from.HitsMax * m_HitsScalar); + from.Hits = (int)(from.HitsMax * m_HitsScalar); } } } diff --git a/Projects/UOContent/Gumps/RunebookGump.cs b/Projects/UOContent/Gumps/RunebookGump.cs index 687043238..b7bb8d81c 100644 --- a/Projects/UOContent/Gumps/RunebookGump.cs +++ b/Projects/UOContent/Gumps/RunebookGump.cs @@ -315,7 +315,7 @@ namespace Server.Gumps from.CloseGump(); if (!Core.ML) { - @from.SendGump(new RunebookGump(@from, Book)); + from.SendGump(new RunebookGump(from, Book)); } } else diff --git a/Projects/UOContent/Gumps/VendorRentalGumps.cs b/Projects/UOContent/Gumps/VendorRentalGumps.cs index ef86d0886..84872e6a0 100644 --- a/Projects/UOContent/Gumps/VendorRentalGumps.cs +++ b/Projects/UOContent/Gumps/VendorRentalGumps.cs @@ -156,7 +156,7 @@ namespace Server.Gumps if (index < VendorRentalDuration.Instances.Length) { - SetContractDuration(@from, VendorRentalDuration.Instances[index]); + SetContractDuration(from, VendorRentalDuration.Instances[index]); } } else @@ -329,7 +329,7 @@ namespace Server.Gumps { if (m_Contract.IsUsableBy(from, true, true, true, true)) { - @from.SendGump(new VendorRentalContractGump(m_Contract, @from)); + from.SendGump(new VendorRentalContractGump(m_Contract, from)); } } } @@ -594,7 +594,7 @@ namespace Server.Gumps { if (m_Vendor.CanInteractWith(from, false) && m_Vendor.IsLandlord(from)) { - @from.SendGump(new LandlordVendorRentalGump(m_Vendor)); + from.SendGump(new LandlordVendorRentalGump(m_Vendor)); } } } @@ -665,7 +665,7 @@ namespace Server.Gumps if (depositedGold > 0) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1060397, depositedGold.ToString() ); // ~1_AMOUNT~ gold has been deposited into your bank box. diff --git a/Projects/UOContent/Gumps/ViewHousesGump.cs b/Projects/UOContent/Gumps/ViewHousesGump.cs index cdd019298..83498e850 100644 --- a/Projects/UOContent/Gumps/ViewHousesGump.cs +++ b/Projects/UOContent/Gumps/ViewHousesGump.cs @@ -173,7 +173,7 @@ namespace Server.Gumps { if (targeted is Mobile mobile) { - @from.SendGump(new ViewHousesGump(@from, GetHouses(mobile), null)); + from.SendGump(new ViewHousesGump(from, GetHouses(mobile), null)); } } diff --git a/Projects/UOContent/Gumps/WhoGump.cs b/Projects/UOContent/Gumps/WhoGump.cs index f1cb8ab46..daff5f958 100644 --- a/Projects/UOContent/Gumps/WhoGump.cs +++ b/Projects/UOContent/Gumps/WhoGump.cs @@ -262,7 +262,7 @@ namespace Server.Gumps { if (m_Page > 0) { - @from.SendGump(new WhoGump(@from, m_Mobiles, m_Page - 1)); + from.SendGump(new WhoGump(from, m_Mobiles, m_Page - 1)); } break; @@ -271,7 +271,7 @@ namespace Server.Gumps { if ((m_Page + 1) * EntryCount < m_Mobiles.Count) { - @from.SendGump(new WhoGump(@from, m_Mobiles, m_Page + 1)); + from.SendGump(new WhoGump(from, m_Mobiles, m_Page + 1)); } break; diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs b/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs index 6f721d58a..c83a6d4ae 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs @@ -129,7 +129,7 @@ namespace Server.Items if (!from.SendGump(new FacingGump(this, from))) { - @from.SendLocalizedMessage(1150062); // You fail to re-deed the holiday fireflies. + from.SendLocalizedMessage(1150062); // You fail to re-deed the holiday fireflies. } } else diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs b/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs index c7166f233..f37b720c5 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs @@ -214,15 +214,15 @@ namespace Server.Engines.Events if (action == 0) { - Timer.DelayCall(OneSecond, OneSecond, 10, Bleeding, @from); + Timer.DelayCall(OneSecond, OneSecond, 10, Bleeding, from); } else if (action == 1) { - Timer.DelayCall(TimeSpan.FromSeconds(2), SolidHueMobile, @from); + Timer.DelayCall(TimeSpan.FromSeconds(2), SolidHueMobile, from); } else { - Timer.DelayCall(TimeSpan.FromSeconds(2), MakeTwin, @from); + Timer.DelayCall(TimeSpan.FromSeconds(2), MakeTwin, from); } } } diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs b/Projects/UOContent/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs index e1d0842b5..e1ac7c6b8 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs @@ -111,9 +111,9 @@ namespace Server.Mobiles { if (Utility.RandomBool()) { - if (@from?.Map != null && Map != Map.Internal && Map == @from.Map && @from.InRange(this, 12)) + if (from?.Map != null && Map != Map.Internal && Map == from.Map && from.InRange(this, 12)) { - SpillAcid(willKill ? this : @from, willKill ? 3 : 1); + SpillAcid(willKill ? this : from, willKill ? 3 : 1); } } diff --git a/Projects/UOContent/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs b/Projects/UOContent/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs index 9e0e2bc10..5855a78a5 100644 --- a/Projects/UOContent/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs +++ b/Projects/UOContent/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs @@ -125,7 +125,7 @@ namespace Server.Items { if (line != null) { - LabelTo(@from, cliloc, line); + LabelTo(from, cliloc, line); } } diff --git a/Projects/UOContent/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs b/Projects/UOContent/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs index ba59b8b48..d4f9c60de 100644 --- a/Projects/UOContent/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs +++ b/Projects/UOContent/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs @@ -72,7 +72,7 @@ namespace Server.Items if (IsSigned) { - LabelTo(@from, 1152273, $"{m_From}\t{m_To}"); // ~1_val~ is madly in love with ~2_val~ + LabelTo(from, 1152273, $"{m_From}\t{m_To}"); // ~1_val~ is madly in love with ~2_val~ } } diff --git a/Projects/UOContent/Items/Addons/AddonComponent.cs b/Projects/UOContent/Items/Addons/AddonComponent.cs index 769452c64..76f1bf742 100644 --- a/Projects/UOContent/Items/Addons/AddonComponent.cs +++ b/Projects/UOContent/Items/Addons/AddonComponent.cs @@ -204,11 +204,11 @@ namespace Server.Items { if (Addon != null && from.InRange(GetWorldLocation(), 3)) { - Addon.OnChop(@from); + Addon.OnChop(from); } else { - @from.SendLocalizedMessage(500446); // That is too far away. + from.SendLocalizedMessage(500446); // That is too far away. } } diff --git a/Projects/UOContent/Items/Addons/AddonContainerComponent.cs b/Projects/UOContent/Items/Addons/AddonContainerComponent.cs index 2f4d3fb59..2d1849cea 100644 --- a/Projects/UOContent/Items/Addons/AddonContainerComponent.cs +++ b/Projects/UOContent/Items/Addons/AddonContainerComponent.cs @@ -46,11 +46,11 @@ namespace Server.Items { if (Addon != null && from.InRange(GetWorldLocation(), 3)) { - Addon.OnChop(@from); + Addon.OnChop(from); } else { - @from.SendLocalizedMessage(500446); // That is too far away. + from.SendLocalizedMessage(500446); // That is too far away. } } @@ -58,7 +58,7 @@ namespace Server.Items { if (Addon != null) { - return Addon.OnDragDrop(@from, dropped); + return Addon.OnDragDrop(from, dropped); } return false; diff --git a/Projects/UOContent/Items/Addons/ArcheryButteAddon.cs b/Projects/UOContent/Items/Addons/ArcheryButteAddon.cs index 9c56c4f20..7f074ece3 100644 --- a/Projects/UOContent/Items/Addons/ArcheryButteAddon.cs +++ b/Projects/UOContent/Items/Addons/ArcheryButteAddon.cs @@ -48,11 +48,11 @@ namespace Server.Items { if ((Arrows > 0 || Bolts > 0) && from.InRange(GetWorldLocation(), 1)) { - Gather(@from); + Gather(from); } else { - Fire(@from); + Fire(from); } } @@ -62,12 +62,12 @@ namespace Server.Items if (Arrows > 0) { - @from.AddToBackpack(new Arrow(Arrows)); + from.AddToBackpack(new Arrow(Arrows)); } if (Bolts > 0) { - @from.AddToBackpack(new Bolt(Bolts)); + from.AddToBackpack(new Bolt(Bolts)); } Arrows = 0; @@ -85,7 +85,7 @@ namespace Server.Items if (!m_Entries.TryGetValue(from, out var e)) { - m_Entries[@from] = e = new ScoreEntry(); + m_Entries[from] = e = new ScoreEntry(); } return e; @@ -153,7 +153,7 @@ namespace Server.Items { if (isArrow) { - @from.LocalOverheadMessage( + from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 500594 @@ -161,7 +161,7 @@ namespace Server.Items } else if (isBolt) { - @from.LocalOverheadMessage( + from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 500595 @@ -169,7 +169,7 @@ namespace Server.Items } else { - SendLocalizedMessageTo(@from, 500593); // You must practice with ranged weapons on this. + SendLocalizedMessageTo(from, 500593); // You must practice with ranged weapons on this. } return; diff --git a/Projects/UOContent/Items/Addons/BaseAddonContainerDeed.cs b/Projects/UOContent/Items/Addons/BaseAddonContainerDeed.cs index 75f7b1f16..dc751fe0a 100644 --- a/Projects/UOContent/Items/Addons/BaseAddonContainerDeed.cs +++ b/Projects/UOContent/Items/Addons/BaseAddonContainerDeed.cs @@ -89,11 +89,11 @@ namespace Server.Items { if (IsChildOf(from.Backpack)) { - @from.Target = new InternalTarget(this); + from.Target = new InternalTarget(this); } else { - @from.SendLocalizedMessage(1062334); // This item must be in your backpack to be used. + from.SendLocalizedMessage(1062334); // This item must be in your backpack to be used. } } @@ -145,23 +145,23 @@ namespace Server.Items } else if (res == AddonFitResult.Blocked) { - @from.SendLocalizedMessage(500269); // You cannot build that there. + from.SendLocalizedMessage(500269); // You cannot build that there. } else if (res == AddonFitResult.NotInHouse) { - @from.SendLocalizedMessage(500274); // You can only place this in a house that you own! + from.SendLocalizedMessage(500274); // You can only place this in a house that you own! } else if (res == AddonFitResult.DoorsNotClosed) { - @from.SendMessage("You must close all house doors before placing this."); + from.SendMessage("You must close all house doors before placing this."); } else if (res == AddonFitResult.DoorTooClose) { - @from.SendLocalizedMessage(500271); // You cannot build near the door. + from.SendLocalizedMessage(500271); // You cannot build near the door. } else if (res == AddonFitResult.NoWall) { - @from.SendLocalizedMessage(500268); // This object needs to be mounted on something. + from.SendLocalizedMessage(500268); // This object needs to be mounted on something. } if (res == AddonFitResult.Valid) diff --git a/Projects/UOContent/Items/Addons/BaseAddonDeed.cs b/Projects/UOContent/Items/Addons/BaseAddonDeed.cs index 563a0b252..3b670567c 100644 --- a/Projects/UOContent/Items/Addons/BaseAddonDeed.cs +++ b/Projects/UOContent/Items/Addons/BaseAddonDeed.cs @@ -64,11 +64,11 @@ namespace Server.Items { if (IsChildOf(from.Backpack)) { - @from.Target = new InternalTarget(this); + from.Target = new InternalTarget(this); } else { - @from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. + from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. } } @@ -109,19 +109,19 @@ namespace Server.Items } else if (res == AddonFitResult.Blocked) { - @from.SendLocalizedMessage(500269); // You cannot build that there. + from.SendLocalizedMessage(500269); // You cannot build that there. } else if (res == AddonFitResult.NotInHouse) { - @from.SendLocalizedMessage(500274); // You can only place this in a house that you own! + from.SendLocalizedMessage(500274); // You can only place this in a house that you own! } else if (res == AddonFitResult.DoorTooClose) { - @from.SendLocalizedMessage(500271); // You cannot build near the door. + from.SendLocalizedMessage(500271); // You cannot build near the door. } else if (res == AddonFitResult.NoWall) { - @from.SendLocalizedMessage(500268); // This object needs to be mounted on something. + from.SendLocalizedMessage(500268); // This object needs to be mounted on something. } if (res == AddonFitResult.Valid) diff --git a/Projects/UOContent/Items/Addons/DartBoard.cs b/Projects/UOContent/Items/Addons/DartBoard.cs index 991c21ef9..7fc43c2ae 100644 --- a/Projects/UOContent/Items/Addons/DartBoard.cs +++ b/Projects/UOContent/Items/Addons/DartBoard.cs @@ -23,7 +23,7 @@ namespace Server.Items Direction dir; if (from.Location != Location) { - dir = @from.GetDirectionTo(this); + dir = from.GetDirectionTo(this); } else if (East) { @@ -53,11 +53,11 @@ namespace Server.Items if (canThrow) { - Throw(@from); + Throw(from); } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Addons/FlourMillEastAddon.cs b/Projects/UOContent/Items/Addons/FlourMillEastAddon.cs index 9c1887628..8fc24c6f9 100644 --- a/Projects/UOContent/Items/Addons/FlourMillEastAddon.cs +++ b/Projects/UOContent/Items/Addons/FlourMillEastAddon.cs @@ -162,15 +162,15 @@ namespace Server.Items { if (!from.InRange(GetWorldLocation(), 4) || !from.InLOS(this)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if (!IsFull) { - @from.SendLocalizedMessage(500997); // You need more wheat to make a sack of flour. + from.SendLocalizedMessage(500997); // You need more wheat to make a sack of flour. } else { - StartWorking(@from); + StartWorking(from); } } diff --git a/Projects/UOContent/Items/Addons/FlourMillSouthAddon.cs b/Projects/UOContent/Items/Addons/FlourMillSouthAddon.cs index c2e4cb54b..efe0015a4 100644 --- a/Projects/UOContent/Items/Addons/FlourMillSouthAddon.cs +++ b/Projects/UOContent/Items/Addons/FlourMillSouthAddon.cs @@ -151,15 +151,15 @@ namespace Server.Items { if (!from.InRange(GetWorldLocation(), 4) || !from.InLOS(this)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if (!IsFull) { - @from.SendLocalizedMessage(500997); // You need more wheat to make a sack of flour. + from.SendLocalizedMessage(500997); // You need more wheat to make a sack of flour. } else { - StartWorking(@from); + StartWorking(from); } } diff --git a/Projects/UOContent/Items/Addons/PickpocketDips.cs b/Projects/UOContent/Items/Addons/PickpocketDips.cs index c181497eb..85436e9c7 100644 --- a/Projects/UOContent/Items/Addons/PickpocketDips.cs +++ b/Projects/UOContent/Items/Addons/PickpocketDips.cs @@ -76,26 +76,26 @@ namespace Server.Items { if (!from.InRange(GetWorldLocation(), 1)) { - SendLocalizedMessageTo(@from, 501816); // You are too far away to do that. + SendLocalizedMessageTo(from, 501816); // You are too far away to do that. } else if (Swinging) { - SendLocalizedMessageTo(@from, 501815); // You have to wait until it stops swinging. + SendLocalizedMessageTo(from, 501815); // You have to wait until it stops swinging. } else if (from.Skills.Stealing.Base >= MaxSkill) { SendLocalizedMessageTo( - @from, + from, 501830 ); // Your ability to steal cannot improve any further by simply practicing on a dummy. } else if (from.Mounted) { - SendLocalizedMessageTo(@from, 501829); // You can't practice on this while on a mount. + SendLocalizedMessageTo(from, 501829); // You can't practice on this while on a mount. } else { - Use(@from); + Use(from); } } diff --git a/Projects/UOContent/Items/Addons/TrainingDummies.cs b/Projects/UOContent/Items/Addons/TrainingDummies.cs index 3acbc40a4..2d3597e8f 100644 --- a/Projects/UOContent/Items/Addons/TrainingDummies.cs +++ b/Projects/UOContent/Items/Addons/TrainingDummies.cs @@ -73,30 +73,30 @@ namespace Server.Items if (weapon is BaseRanged) { - SendLocalizedMessageTo(@from, 501822); // You can't practice ranged weapons on this. + SendLocalizedMessageTo(from, 501822); // You can't practice ranged weapons on this. } else if (weapon == null || !from.InRange(GetWorldLocation(), weapon.MaxRange)) { - SendLocalizedMessageTo(@from, 501816); // You are too far away to do that. + SendLocalizedMessageTo(from, 501816); // You are too far away to do that. } else if (Swinging) { - SendLocalizedMessageTo(@from, 501815); // You have to wait until it stops swinging. + SendLocalizedMessageTo(from, 501815); // You have to wait until it stops swinging. } else if (from.Skills[weapon.Skill].Base >= MaxSkill) { SendLocalizedMessageTo( - @from, + from, 501828 ); // Your skill cannot improve any further by simply practicing with a dummy. } else if (from.Mounted) { - SendLocalizedMessageTo(@from, 501829); // You can't practice on this while on a mount. + SendLocalizedMessageTo(from, 501829); // You can't practice on this while on a mount. } else { - Use(@from, weapon); + Use(from, weapon); } } diff --git a/Projects/UOContent/Items/Aquarium/Aquarium.cs b/Projects/UOContent/Items/Aquarium/Aquarium.cs index 3c3f713d4..9c223d69f 100644 --- a/Projects/UOContent/Items/Aquarium/Aquarium.cs +++ b/Projects/UOContent/Items/Aquarium/Aquarium.cs @@ -288,7 +288,7 @@ namespace Server.Items if (takeItem) { - @from.PlaySound(0x42); + from.PlaySound(0x42); } return takeItem; @@ -343,31 +343,31 @@ namespace Server.Items if (m_VacationLeft > 0) { - LabelTo(@from, 1074430, m_VacationLeft.ToString()); // Vacation days left: ~1_DAYS + LabelTo(from, 1074430, m_VacationLeft.ToString()); // Vacation days left: ~1_DAYS } if (Events.Count > 0) { - LabelTo(@from, 1074426, Events.Count.ToString()); // ~1_NUM~ event(s) to view! + LabelTo(from, 1074426, Events.Count.ToString()); // ~1_NUM~ event(s) to view! } if (m_RewardAvailable) { - LabelTo(@from, 1074362); // A reward is available! + LabelTo(from, 1074362); // A reward is available! } LabelTo(from, 1074247, $"{LiveCreatures}\t{MaxLiveCreatures}"); // Live Creatures: ~1_NUM~ / ~2_MAX~ if (DeadCreatures > 0) { - LabelTo(@from, 1074248, DeadCreatures.ToString()); // Dead Creatures: ~1_NUM~ + LabelTo(from, 1074248, DeadCreatures.ToString()); // Dead Creatures: ~1_NUM~ } var decorations = Items.Count - LiveCreatures - DeadCreatures; if (decorations > 0) { - LabelTo(@from, 1074249, (Items.Count - LiveCreatures - DeadCreatures).ToString()); // Decorations: ~1_NUM~ + LabelTo(from, 1074249, (Items.Count - LiveCreatures - DeadCreatures).ToString()); // Decorations: ~1_NUM~ } LabelTo(from, 1074250, $"#{FoodNumber()}"); // Food state: ~1_STATE~ @@ -375,16 +375,16 @@ namespace Server.Items if (m_Food.State == (int)FoodState.Dead) { - LabelTo(@from, 1074577, $"{m_Food.Added}\t{m_Food.Improve}"); // Food Added: ~1_CUR~ Needed: ~2_NEED~ + LabelTo(from, 1074577, $"{m_Food.Added}\t{m_Food.Improve}"); // Food Added: ~1_CUR~ Needed: ~2_NEED~ } else if (m_Food.State == (int)FoodState.Overfed) { - LabelTo(@from, 1074577, $"{m_Food.Added}\t{m_Food.Maintain}"); // Food Added: ~1_CUR~ Needed: ~2_NEED~ + LabelTo(from, 1074577, $"{m_Food.Added}\t{m_Food.Maintain}"); // Food Added: ~1_CUR~ Needed: ~2_NEED~ } else { LabelTo( - @from, + from, 1074253, $"{m_Food.Added}\t{m_Food.Maintain}\t{m_Food.Improve}" ); // Food Added: ~1_CUR~ Feed: ~2_NEED~ Improve: ~3_GROW~ @@ -392,16 +392,16 @@ namespace Server.Items if (m_Water.State == (int)WaterState.Dead) { - LabelTo(@from, 1074578, $"{m_Water.Added}\t{m_Water.Improve}"); // Water Added: ~1_CUR~ Needed: ~2_NEED~ + LabelTo(from, 1074578, $"{m_Water.Added}\t{m_Water.Improve}"); // Water Added: ~1_CUR~ Needed: ~2_NEED~ } else if (m_Water.State == (int)WaterState.Strong) { - LabelTo(@from, 1074578, $"{m_Water.Added}\t{m_Water.Maintain}"); // Water Added: ~1_CUR~ Needed: ~2_NEED~ + LabelTo(from, 1074578, $"{m_Water.Added}\t{m_Water.Maintain}"); // Water Added: ~1_CUR~ Needed: ~2_NEED~ } else { LabelTo( - @from, + from, 1074254, $"{m_Water.Added}\t{m_Water.Maintain}\t{m_Water.Improve}" ); // Water Added: ~1_CUR~ Maintain: ~2_NEED~ Improve: ~3_GROW~ diff --git a/Projects/UOContent/Items/Aquarium/AquariumFishingNet.cs b/Projects/UOContent/Items/Aquarium/AquariumFishingNet.cs index 7f099f5b5..6544cb73e 100644 --- a/Projects/UOContent/Items/Aquarium/AquariumFishingNet.cs +++ b/Projects/UOContent/Items/Aquarium/AquariumFishingNet.cs @@ -73,7 +73,7 @@ namespace Server.Items } else { - MoveToWorld(@from.Location, @from.Map); + MoveToWorld(from.Location, from.Map); } } } diff --git a/Projects/UOContent/Items/Armor/BaseArmor.cs b/Projects/UOContent/Items/Armor/BaseArmor.cs index e843a85f7..50d01cc23 100644 --- a/Projects/UOContent/Items/Armor/BaseArmor.cs +++ b/Projects/UOContent/Items/Armor/BaseArmor.cs @@ -492,7 +492,7 @@ namespace Server.Items if (makersMark) { - Crafter = @from; + Crafter = from; } var resourceType = typeRes ?? craftItem.Resources[0].ItemType; @@ -596,7 +596,7 @@ namespace Server.Items { var res = (Item)ActivatorUtil.CreateInstance(CraftResources.GetInfo(m_Resource).ResourceTypes[0]); - ScissorHelper(@from, res, PlayerConstructed ? item.Resources[0].Amount / 2 : 1); + ScissorHelper(from, res, PlayerConstructed ? item.Resources[0].Amount / 2 : 1); return true; } catch @@ -974,7 +974,7 @@ namespace Server.Items { if (Core.AOS) { - SkillBonuses.AddTo(@from); + SkillBonuses.AddTo(from); } from.Delta(MobileDelta.Armor); // Tell them armor rating has changed @@ -1585,11 +1585,11 @@ namespace Server.Items { if (RequiredRace == Race.Elf) { - @from.SendLocalizedMessage(1072203); // Only Elves may use this. + from.SendLocalizedMessage(1072203); // Only Elves may use this. } else { - @from.SendMessage("Only {0} may use this.", RequiredRace.PluralName); + from.SendMessage("Only {0} may use this.", RequiredRace.PluralName); } return false; @@ -1599,11 +1599,11 @@ namespace Server.Items { if (AllowFemaleWearer) { - @from.SendLocalizedMessage(1010388); // Only females can wear this. + from.SendLocalizedMessage(1010388); // Only females can wear this. } else { - @from.SendMessage("You may not wear this."); + from.SendMessage("You may not wear this."); } return false; @@ -1613,11 +1613,11 @@ namespace Server.Items { if (AllowMaleWearer) { - @from.SendLocalizedMessage(1063343); // Only males can wear this. + from.SendLocalizedMessage(1063343); // Only males can wear this. } else { - @from.SendMessage("You may not wear this."); + from.SendMessage("You may not wear this."); } return false; @@ -1683,17 +1683,17 @@ namespace Server.Items if (strBonus != 0) { - @from.AddStatMod(new StatMod(StatType.Str, $"{modName}Str", strBonus, TimeSpan.Zero)); + from.AddStatMod(new StatMod(StatType.Str, $"{modName}Str", strBonus, TimeSpan.Zero)); } if (dexBonus != 0) { - @from.AddStatMod(new StatMod(StatType.Dex, $"{modName}Dex", dexBonus, TimeSpan.Zero)); + from.AddStatMod(new StatMod(StatType.Dex, $"{modName}Dex", dexBonus, TimeSpan.Zero)); } if (intBonus != 0) { - @from.AddStatMod(new StatMod(StatType.Int, $"{modName}Int", intBonus, TimeSpan.Zero)); + from.AddStatMod(new StatMod(StatType.Int, $"{modName}Int", intBonus, TimeSpan.Zero)); } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeafGloves.cs b/Projects/UOContent/Items/Armor/Leather/LeafGloves.cs index 5db633aa7..02176f88b 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeafGloves.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeafGloves.cs @@ -136,7 +136,7 @@ namespace Server.Items if (IsArcane) { - LabelTo(@from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); + LabelTo(from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs b/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs index 75829f65d..76796808d 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs @@ -135,7 +135,7 @@ namespace Server.Items if (IsArcane) { - LabelTo(@from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); + LabelTo(from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); } } diff --git a/Projects/UOContent/Items/Clothing/BaseClothing.cs b/Projects/UOContent/Items/Clothing/BaseClothing.cs index 903055ccc..ef4e66eb6 100644 --- a/Projects/UOContent/Items/Clothing/BaseClothing.cs +++ b/Projects/UOContent/Items/Clothing/BaseClothing.cs @@ -152,7 +152,7 @@ namespace Server.Items if (makersMark) { - Crafter = @from; + Crafter = from; } if (DefaultResource != CraftResource.None) @@ -239,7 +239,7 @@ namespace Server.Items var res = (Item)ActivatorUtil.CreateInstance(resourceType); - ScissorHelper(@from, res, PlayerConstructed ? item.Resources[0].Amount / 2 : 1); + ScissorHelper(from, res, PlayerConstructed ? item.Resources[0].Amount / 2 : 1); res.LootType = LootType.Regular; @@ -394,11 +394,11 @@ namespace Server.Items { if (RequiredRace == Race.Elf) { - @from.SendLocalizedMessage(1072203); // Only Elves may use this. + from.SendLocalizedMessage(1072203); // Only Elves may use this. } else { - @from.SendMessage("Only {0} may use this.", RequiredRace.PluralName); + from.SendMessage("Only {0} may use this.", RequiredRace.PluralName); } return false; @@ -408,11 +408,11 @@ namespace Server.Items { if (AllowFemaleWearer) { - @from.SendLocalizedMessage(1010388); // Only females can wear this. + from.SendLocalizedMessage(1010388); // Only females can wear this. } else { - @from.SendMessage("You may not wear this."); + from.SendMessage("You may not wear this."); } return false; @@ -422,11 +422,11 @@ namespace Server.Items { if (AllowMaleWearer) { - @from.SendLocalizedMessage(1063343); // Only males can wear this. + from.SendLocalizedMessage(1063343); // Only males can wear this. } else { - @from.SendMessage("You may not wear this."); + from.SendMessage("You may not wear this."); } return false; diff --git a/Projects/UOContent/Items/Clothing/Cloaks.cs b/Projects/UOContent/Items/Clothing/Cloaks.cs index 5bd152b51..d0688bcd8 100644 --- a/Projects/UOContent/Items/Clothing/Cloaks.cs +++ b/Projects/UOContent/Items/Clothing/Cloaks.cs @@ -148,7 +148,7 @@ namespace Server.Items if (IsArcane) { - LabelTo(@from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); + LabelTo(from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); } } diff --git a/Projects/UOContent/Items/Clothing/OuterTorso.cs b/Projects/UOContent/Items/Clothing/OuterTorso.cs index 0724e71ec..8a9706ad8 100644 --- a/Projects/UOContent/Items/Clothing/OuterTorso.cs +++ b/Projects/UOContent/Items/Clothing/OuterTorso.cs @@ -596,7 +596,7 @@ namespace Server.Items if (IsArcane) { - LabelTo(@from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); + LabelTo(from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); } } diff --git a/Projects/UOContent/Items/Clothing/Shoes.cs b/Projects/UOContent/Items/Clothing/Shoes.cs index 7bd0a4bbd..0a51835fa 100644 --- a/Projects/UOContent/Items/Clothing/Shoes.cs +++ b/Projects/UOContent/Items/Clothing/Shoes.cs @@ -14,7 +14,7 @@ namespace Server.Items { if (DefaultResource == CraftResource.None) { - return base.Scissor(@from, scissors); + return base.Scissor(from, scissors); } from.SendLocalizedMessage(502440); // Scissors can not be used on that to produce anything. @@ -194,7 +194,7 @@ namespace Server.Items if (IsArcane) { - LabelTo(@from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); + LabelTo(from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); } } diff --git a/Projects/UOContent/Items/Construction/Ankhs.cs b/Projects/UOContent/Items/Construction/Ankhs.cs index 1cc6e0728..dc5a3fe56 100644 --- a/Projects/UOContent/Items/Construction/Ankhs.cs +++ b/Projects/UOContent/Items/Construction/Ankhs.cs @@ -22,7 +22,7 @@ namespace Server.Items if (Core.AOS) { - list.Add(new TitheEntry(@from)); + list.Add(new TitheEntry(from)); } } diff --git a/Projects/UOContent/Items/Construction/Doors/BaseDoor.cs b/Projects/UOContent/Items/Construction/Doors/BaseDoor.cs index daaa408d6..2b0692c1b 100644 --- a/Projects/UOContent/Items/Construction/Doors/BaseDoor.cs +++ b/Projects/UOContent/Items/Construction/Doors/BaseDoor.cs @@ -221,11 +221,11 @@ namespace Server.Items if (list.Count == 1) { - @from.SendMessage("Target the second door to link."); + from.SendMessage("Target the second door to link."); } else { - @from.SendMessage("Target another door to link. To complete the chain, retarget the first door."); + from.SendMessage("Target another door to link. To complete the chain, retarget the first door."); } } } @@ -440,11 +440,11 @@ namespace Server.Items { if (Hue == 0x44E && Map == Map.Malas) // doom door into healer room in doom { - SendLocalizedMessageTo(@from, 1060014); // Only the dead may pass. + SendLocalizedMessageTo(from, 1060014); // Only the dead may pass. } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 502503); // That is locked. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 502503); // That is locked. } return; @@ -458,11 +458,11 @@ namespace Server.Items if (m_Open) { - OnClosed(@from); + OnClosed(from); } else { - OnOpened(@from); + OnOpened(from); } if (UseChainedFunctionality) @@ -501,11 +501,11 @@ namespace Server.Items { if (from.AccessLevel == AccessLevel.Player && !from.InRange(GetWorldLocation(), 2)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else { - Use(@from); + Use(from); } } diff --git a/Projects/UOContent/Items/Construction/Doors/HouseDoors.cs b/Projects/UOContent/Items/Construction/Doors/HouseDoors.cs index 2326c5db7..de68dee7b 100644 --- a/Projects/UOContent/Items/Construction/Doors/HouseDoors.cs +++ b/Projects/UOContent/Items/Construction/Doors/HouseDoors.cs @@ -175,7 +175,7 @@ namespace Server.Items if (house?.IsFriend(from) == true && from.AccessLevel == AccessLevel.Player && house.RefreshDecay()) { - @from.SendLocalizedMessage(1043293); // Your house's age and contents have been refreshed. + from.SendLocalizedMessage(1043293); // Your house's age and contents have been refreshed. } if (house?.Public == true && !house.IsFriend(from)) @@ -190,11 +190,11 @@ namespace Server.Items { if (!CheckAccess(from)) { - @from.SendLocalizedMessage(1061637); // You are not allowed to access this. + from.SendLocalizedMessage(1061637); // You are not allowed to access this. } else { - base.Use(@from); + base.Use(from); } } diff --git a/Projects/UOContent/Items/Construction/Signs/SubtextSign.cs b/Projects/UOContent/Items/Construction/Signs/SubtextSign.cs index 017183650..7541fdfed 100644 --- a/Projects/UOContent/Items/Construction/Signs/SubtextSign.cs +++ b/Projects/UOContent/Items/Construction/Signs/SubtextSign.cs @@ -36,7 +36,7 @@ namespace Server.Items if (!string.IsNullOrEmpty(m_Subtext)) { - LabelTo(@from, m_Subtext); + LabelTo(from, m_Subtext); } } diff --git a/Projects/UOContent/Items/Containers/Container.cs b/Projects/UOContent/Items/Containers/Container.cs index 7d1a6d4a4..eb8f80986 100644 --- a/Projects/UOContent/Items/Containers/Container.cs +++ b/Projects/UOContent/Items/Containers/Container.cs @@ -152,11 +152,11 @@ namespace Server.Items { if (from.AccessLevel > AccessLevel.Player || from.InRange(GetWorldLocation(), 2) || RootParent is PlayerVendor) { - Open(@from); + Open(from); } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Containers/LockableContainer.cs b/Projects/UOContent/Items/Containers/LockableContainer.cs index f93f86195..54d0e3d92 100644 --- a/Projects/UOContent/Items/Containers/LockableContainer.cs +++ b/Projects/UOContent/Items/Containers/LockableContainer.cs @@ -349,7 +349,7 @@ namespace Server.Items if (IsShipwreckedItem) { - LabelTo(@from, 1041645); // recovered from a shipwreck + LabelTo(from, 1041645); // recovered from a shipwreck } } } diff --git a/Projects/UOContent/Items/Containers/SalvageBag.cs b/Projects/UOContent/Items/Containers/SalvageBag.cs index 3cd10f24f..c8f861ec1 100644 --- a/Projects/UOContent/Items/Containers/SalvageBag.cs +++ b/Projects/UOContent/Items/Containers/SalvageBag.cs @@ -280,7 +280,7 @@ namespace Server.Items for (var i = 0; i < items.Length; i++) { - @from.AddToBackpack(items[i]); + from.AddToBackpack(items[i]); } } @@ -331,7 +331,7 @@ namespace Server.Items if (from.CheckAlive()) { - m_Bag.SalvageAll(@from); + m_Bag.SalvageAll(from); } } } @@ -362,7 +362,7 @@ namespace Server.Items if (from.CheckAlive()) { - m_Bag.SalvageIngots(@from); + m_Bag.SalvageIngots(from); } } } @@ -393,7 +393,7 @@ namespace Server.Items if (from.CheckAlive()) { - m_Bag.SalvageCloth(@from); + m_Bag.SalvageCloth(from); } } } diff --git a/Projects/UOContent/Items/Containers/Strongbox.cs b/Projects/UOContent/Items/Containers/Strongbox.cs index 3b545bda0..daa48ecbc 100644 --- a/Projects/UOContent/Items/Containers/Strongbox.cs +++ b/Projects/UOContent/Items/Containers/Strongbox.cs @@ -46,7 +46,7 @@ namespace Server.Items { if (m_House?.Deleted != false || m_Owner?.Deleted != false || from == m_Owner || m_House.IsOwner(from)) { - Chop(@from); + Chop(from); } } @@ -109,7 +109,7 @@ namespace Server.Items if (CheckContentDisplay(from)) { - LabelTo(@from, "({0} items, {1} stones)", TotalItems, TotalWeight); + LabelTo(from, "({0} items, {1} stones)", TotalItems, TotalWeight); } } else diff --git a/Projects/UOContent/Items/Containers/TrappableContainer.cs b/Projects/UOContent/Items/Containers/TrappableContainer.cs index 9736a4208..5e53da254 100644 --- a/Projects/UOContent/Items/Containers/TrappableContainer.cs +++ b/Projects/UOContent/Items/Containers/TrappableContainer.cs @@ -40,7 +40,7 @@ namespace Server.Items if (TrapOnOpen) { - ExecuteTrap(@from); + ExecuteTrap(from); } } @@ -111,7 +111,7 @@ namespace Server.Items { if (from.InRange(loc, 1)) { - @from.Damage(TrapPower); + from.Damage(TrapPower); } // AOS.Damage( from, m_TrapPower, 0, 100, 0, 0, 0 ); @@ -198,7 +198,7 @@ namespace Server.Items { if (!TrapOnOpen || !ExecuteTrap(from)) { - base.Open(@from); + base.Open(from); } } diff --git a/Projects/UOContent/Items/Containers/TreasureMapChest.cs b/Projects/UOContent/Items/Containers/TreasureMapChest.cs index 0a93fc68c..86ce0f290 100644 --- a/Projects/UOContent/Items/Containers/TreasureMapChest.cs +++ b/Projects/UOContent/Items/Containers/TreasureMapChest.cs @@ -321,7 +321,7 @@ namespace Server.Items { if (m.Alive) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1046448 ); // You must first kill the guardians before you may open this chest. return true; @@ -390,7 +390,7 @@ namespace Server.Items if (Utility.RandomDouble() <= 0.1) // 10% chance to spawn a new monster { - TreasureMap.Spawn(Level, GetWorldLocation(), Map, @from, false); + TreasureMap.Spawn(Level, GetWorldLocation(), Map, from, false); } } @@ -486,7 +486,7 @@ namespace Server.Items if (from.Alive) { - list.Add(new RemoveEntry(@from, this)); + list.Add(new RemoveEntry(from, this)); } } diff --git a/Projects/UOContent/Items/Decoration Artifacts/StealableArtifactsSpawner.cs b/Projects/UOContent/Items/Decoration Artifacts/StealableArtifactsSpawner.cs index 871cd9c5c..dc66b0fac 100644 --- a/Projects/UOContent/Items/Decoration Artifacts/StealableArtifactsSpawner.cs +++ b/Projects/UOContent/Items/Decoration Artifacts/StealableArtifactsSpawner.cs @@ -183,11 +183,11 @@ namespace Server.Items if (Create()) { - @from.SendMessage("Stealable artifacts spawner generated."); + from.SendMessage("Stealable artifacts spawner generated."); } else { - @from.SendMessage("Stealable artifacts spawner already present."); + from.SendMessage("Stealable artifacts spawner already present."); } } @@ -199,11 +199,11 @@ namespace Server.Items if (Remove()) { - @from.SendMessage("Stealable artifacts spawner removed."); + from.SendMessage("Stealable artifacts spawner removed."); } else { - @from.SendMessage("Stealable artifacts spawner not present."); + from.SendMessage("Stealable artifacts spawner not present."); } } diff --git a/Projects/UOContent/Items/Deeds/DragonBardingDeed.cs b/Projects/UOContent/Items/Deeds/DragonBardingDeed.cs index bc0de0d85..992389321 100644 --- a/Projects/UOContent/Items/Deeds/DragonBardingDeed.cs +++ b/Projects/UOContent/Items/Deeds/DragonBardingDeed.cs @@ -63,7 +63,7 @@ namespace Server.Items if (makersMark) { - Crafter = @from; + Crafter = from; } var resourceType = typeRes ?? craftItem.Resources[0].ItemType; diff --git a/Projects/UOContent/Items/Deeds/HairRestylingDeed.cs b/Projects/UOContent/Items/Deeds/HairRestylingDeed.cs index 4a9841fc0..bc6810dfa 100644 --- a/Projects/UOContent/Items/Deeds/HairRestylingDeed.cs +++ b/Projects/UOContent/Items/Deeds/HairRestylingDeed.cs @@ -36,11 +36,11 @@ namespace Server.Items { if (!IsChildOf(from.Backpack)) { - @from.SendLocalizedMessage(1042001); // That must be in your pack... + from.SendLocalizedMessage(1042001); // That must be in your pack... } else { - @from.SendGump(new InternalGump(@from, this)); + from.SendGump(new InternalGump(from, this)); } } diff --git a/Projects/UOContent/Items/Deeds/HolidayTreeDeed.cs b/Projects/UOContent/Items/Deeds/HolidayTreeDeed.cs index 54431138a..62da60d24 100644 --- a/Projects/UOContent/Items/Deeds/HolidayTreeDeed.cs +++ b/Projects/UOContent/Items/Deeds/HolidayTreeDeed.cs @@ -109,7 +109,7 @@ namespace Server.Items if (ValidatePlacement(from, loc)) { - EndPlace(@from, type, loc); + EndPlace(from, type, loc); } } diff --git a/Projects/UOContent/Items/Deeds/VendorRentalContract.cs b/Projects/UOContent/Items/Deeds/VendorRentalContract.cs index aed5e43cc..03f3eb442 100644 --- a/Projects/UOContent/Items/Deeds/VendorRentalContract.cs +++ b/Projects/UOContent/Items/Deeds/VendorRentalContract.cs @@ -108,7 +108,7 @@ namespace Server.Items { if (sendMessage) { - @from.SendLocalizedMessage(1062343); // That item is currently in use. + from.SendLocalizedMessage(1062343); // That item is currently in use. } return false; @@ -125,7 +125,7 @@ namespace Server.Items { if (sendMessage) { - @from.SendLocalizedMessage(501853); // Target is too far away. + from.SendLocalizedMessage(501853); // Target is too far away. } return false; @@ -336,7 +336,7 @@ namespace Server.Items if (!house.LockDown(from, m_Contract)) { - @from.AddToBackpack(m_Contract); + from.AddToBackpack(m_Contract); } } } diff --git a/Projects/UOContent/Items/Farming/FarmableCrop.cs b/Projects/UOContent/Items/Farming/FarmableCrop.cs index af476a701..826b5cd06 100644 --- a/Projects/UOContent/Items/Farming/FarmableCrop.cs +++ b/Projects/UOContent/Items/Farming/FarmableCrop.cs @@ -28,11 +28,11 @@ namespace Server.Items if (!from.InRange(loc, 2) || !from.InLOS(this)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if (!m_Picked) { - OnPicked(@from, loc, map); + OnPicked(from, loc, map); } } diff --git a/Projects/UOContent/Items/Food/Food.cs b/Projects/UOContent/Items/Food/Food.cs index d00c10197..f8bbf4747 100644 --- a/Projects/UOContent/Items/Food/Food.cs +++ b/Projects/UOContent/Items/Food/Food.cs @@ -31,7 +31,7 @@ namespace Server.Items if (from.Alive) { - list.Add(new EatEntry(@from, this)); + list.Add(new EatEntry(from, this)); } } @@ -44,7 +44,7 @@ namespace Server.Items if (from.InRange(GetWorldLocation(), 1)) { - Eat(@from); + Eat(from); } } @@ -58,12 +58,12 @@ namespace Server.Items if (from.Body.IsHuman && !from.Mounted) { - @from.Animate(34, 5, 1, true, false, 0); + from.Animate(34, 5, 1, true, false, 0); } if (Poison != null) { - @from.ApplyPoison(Poisoner, Poison); + from.ApplyPoison(Poisoner, Poison); } Consume(); @@ -88,7 +88,7 @@ namespace Server.Items if (from.Stam < from.StamMax) { - @from.Stam += Utility.Random(6, 3) + fillFactor / 5; + from.Stam += Utility.Random(6, 3) + fillFactor / 5; } if (iHunger >= 20) @@ -102,19 +102,19 @@ namespace Server.Items if (iHunger < 5) { - @from.SendLocalizedMessage(500868); // You eat the food, but are still extremely hungry. + from.SendLocalizedMessage(500868); // You eat the food, but are still extremely hungry. } else if (iHunger < 10) { - @from.SendLocalizedMessage(500869); // You eat the food, and begin to feel more satiated. + from.SendLocalizedMessage(500869); // You eat the food, and begin to feel more satiated. } else if (iHunger < 15) { - @from.SendLocalizedMessage(500870); // After eating the food, you feel much less hungry. + from.SendLocalizedMessage(500870); // After eating the food, you feel much less hungry. } else { - @from.SendLocalizedMessage(500871); // You feel quite full after consuming the food. + from.SendLocalizedMessage(500871); // You feel quite full after consuming the food. } } diff --git a/Projects/UOContent/Items/Games/BaseBoard.cs b/Projects/UOContent/Items/Games/BaseBoard.cs index a29c1c4a8..8f2df16be 100644 --- a/Projects/UOContent/Items/Games/BaseBoard.cs +++ b/Projects/UOContent/Items/Games/BaseBoard.cs @@ -87,7 +87,7 @@ namespace Server.Items if (RootParent == from) { - @from.Send(p); + from.Send(p); } else { @@ -111,7 +111,7 @@ namespace Server.Items if (ValidateDefault(from, this)) { - list.Add(new DefaultEntry(@from, this)); + list.Add(new DefaultEntry(from, this)); } SetSecureLevelEntry.AddTo(from, this, list); diff --git a/Projects/UOContent/Items/Games/BasePiece.cs b/Projects/UOContent/Items/Games/BasePiece.cs index 6826effcb..887623ea2 100644 --- a/Projects/UOContent/Items/Games/BasePiece.cs +++ b/Projects/UOContent/Items/Games/BasePiece.cs @@ -56,7 +56,7 @@ namespace Server.Items } else { - base.OnSingleClick(@from); + base.OnSingleClick(from); } } diff --git a/Projects/UOContent/Items/Games/Mahjong/MahjongDices.cs b/Projects/UOContent/Items/Games/Mahjong/MahjongDices.cs index fae380cef..41666961c 100644 --- a/Projects/UOContent/Items/Games/Mahjong/MahjongDices.cs +++ b/Projects/UOContent/Items/Games/Mahjong/MahjongDices.cs @@ -36,7 +36,7 @@ namespace Server.Engines.Mahjong { Game.Players.SendLocalizedMessage( 1062695, - $"{@from.Name}\t{First}\t{Second}" + $"{from.Name}\t{First}\t{Second}" ); // ~1_name~ rolls the dice and gets a ~2_number~ and a ~3_number~! } } diff --git a/Projects/UOContent/Items/Games/Mahjong/MahjongGame.cs b/Projects/UOContent/Items/Games/Mahjong/MahjongGame.cs index 1f6e2ce94..396b651a5 100644 --- a/Projects/UOContent/Items/Games/Mahjong/MahjongGame.cs +++ b/Projects/UOContent/Items/Games/Mahjong/MahjongGame.cs @@ -208,7 +208,7 @@ namespace Server.Engines.Mahjong if (from != null) { - Players.SendLocalizedMessage(1062771, @from.Name); // ~1_name~ has reset the game. + Players.SendLocalizedMessage(1062771, from.Name); // ~1_name~ has reset the game. } Players.SendRelievePacket(true, true); @@ -340,7 +340,7 @@ namespace Server.Engines.Mahjong if (from.CheckAlive() && !m_Game.Deleted && m_Game.IsAccessibleTo(from) && m_Game.Players.GetInGameMobiles(true, false).Count == 0) { - m_Game.ResetGame(@from); + m_Game.ResetGame(from); } } } diff --git a/Projects/UOContent/Items/Guilds/Guildstone.cs b/Projects/UOContent/Items/Guilds/Guildstone.cs index fafa20327..a6578b217 100644 --- a/Projects/UOContent/Items/Guilds/Guildstone.cs +++ b/Projects/UOContent/Items/Guilds/Guildstone.cs @@ -89,7 +89,7 @@ namespace Server.Items if (deed != null) { - @from.AddToBackpack(deed); + from.AddToBackpack(deed); } } } diff --git a/Projects/UOContent/Items/Jewels/BaseJewel.cs b/Projects/UOContent/Items/Jewels/BaseJewel.cs index a12d6bf2a..42fe845d2 100644 --- a/Projects/UOContent/Items/Jewels/BaseJewel.cs +++ b/Projects/UOContent/Items/Jewels/BaseJewel.cs @@ -220,17 +220,17 @@ namespace Server.Items if (strBonus != 0) { - @from.AddStatMod(new StatMod(StatType.Str, $"{modName}Str", strBonus, TimeSpan.Zero)); + from.AddStatMod(new StatMod(StatType.Str, $"{modName}Str", strBonus, TimeSpan.Zero)); } if (dexBonus != 0) { - @from.AddStatMod(new StatMod(StatType.Dex, $"{modName}Dex", dexBonus, TimeSpan.Zero)); + from.AddStatMod(new StatMod(StatType.Dex, $"{modName}Dex", dexBonus, TimeSpan.Zero)); } if (intBonus != 0) { - @from.AddStatMod(new StatMod(StatType.Int, $"{modName}Int", intBonus, TimeSpan.Zero)); + from.AddStatMod(new StatMod(StatType.Int, $"{modName}Int", intBonus, TimeSpan.Zero)); } } diff --git a/Projects/UOContent/Items/Lights/Candelabra.cs b/Projects/UOContent/Items/Lights/Candelabra.cs index 244bb1c94..81889c01e 100644 --- a/Projects/UOContent/Items/Lights/Candelabra.cs +++ b/Projects/UOContent/Items/Lights/Candelabra.cs @@ -62,7 +62,7 @@ namespace Server.Items if (IsShipwreckedItem) { - LabelTo(@from, 1041645); // recovered from a shipwreck + LabelTo(from, 1041645); // recovered from a shipwreck } } } diff --git a/Projects/UOContent/Items/Maps/MapItem.cs b/Projects/UOContent/Items/Maps/MapItem.cs index 827dddc86..b973830ff 100644 --- a/Projects/UOContent/Items/Maps/MapItem.cs +++ b/Projects/UOContent/Items/Maps/MapItem.cs @@ -87,11 +87,11 @@ namespace Server.Items { if (from.InRange(GetWorldLocation(), 2)) { - DisplayTo(@from); + DisplayTo(from); } else { - @from.SendLocalizedMessage(500446); // That is too far away. + from.SendLocalizedMessage(500446); // That is too far away. } } @@ -118,7 +118,7 @@ namespace Server.Items for (var i = 0; i < Pins.Count; ++i) { - @from.Send(new MapAddPin(this, Pins[i])); + from.Send(new MapAddPin(this, Pins[i])); } from.Send(new MapSetEditable(this, ValidateEdit(from))); diff --git a/Projects/UOContent/Items/Maps/TreasureMap.cs b/Projects/UOContent/Items/Maps/TreasureMap.cs index 94e4316c9..d54ebb573 100644 --- a/Projects/UOContent/Items/Maps/TreasureMap.cs +++ b/Projects/UOContent/Items/Maps/TreasureMap.cs @@ -371,11 +371,11 @@ namespace Server.Items if (!m_Completed && m_Decoder == null) { - Decode(@from); + Decode(from); } else { - DisplayTo(@from); + DisplayTo(from); } } @@ -438,7 +438,7 @@ namespace Server.Items if (from.Skills.Cartography.Value < minSkill) { - @from.SendLocalizedMessage(503013); // The map is too difficult to attempt to decode. + from.SendLocalizedMessage(503013); // The map is too difficult to attempt to decode. } var maxSkill = minSkill + 60.0; @@ -546,22 +546,22 @@ namespace Server.Items { if (m_Level == 6) { - LabelTo(@from, 1063453); + LabelTo(from, 1063453); } else { - LabelTo(@from, 1041516 + m_Level); + LabelTo(from, 1041516 + m_Level); } } else { if (m_Level == 6) { - LabelTo(@from, 1041522, $"#{1063452}\t \t#{(m_Map == Map.Felucca ? 1041502 : 1041503)}"); + LabelTo(from, 1041522, $"#{1063452}\t \t#{(m_Map == Map.Felucca ? 1041502 : 1041503)}"); } else { - LabelTo(@from, 1041522, $"#{1041510 + m_Level}\t \t#{(m_Map == Map.Felucca ? 1041502 : 1041503)}"); + LabelTo(from, 1041522, $"#{1041510 + m_Level}\t \t#{(m_Map == Map.Felucca ? 1041502 : 1041503)}"); } } } @@ -706,17 +706,17 @@ namespace Server.Items if (!map.CanFit(x, y, z, 16, true)) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 503021 ); // You have found the treasure chest but something is keeping it from being dug up. } else if (from.BeginAction()) { - new DigTimer(@from, m_Map, new Point3D(x, y, z), map).Start(); + new DigTimer(from, m_Map, new Point3D(x, y, z), map).Start(); } else { - @from.SendLocalizedMessage(503020); // You are already digging treasure. + from.SendLocalizedMessage(503020); // You are already digging treasure. } } } @@ -724,11 +724,11 @@ namespace Server.Items { if (Utility.InRange(targ3D, chest3D0, 8)) // We're close, but not quite { - @from.SendLocalizedMessage(503032); // You dig and dig but no treasure seems to be here. + from.SendLocalizedMessage(503032); // You dig and dig but no treasure seems to be here. } else { - @from.SendLocalizedMessage(503035); // You dig and dig but fail to find any treasure. + from.SendLocalizedMessage(503035); // You dig and dig but fail to find any treasure. } } else @@ -1001,11 +1001,11 @@ namespace Server.Items if (HasDiggingTool(from)) { - m_Map.OnBeginDig(@from); + m_Map.OnBeginDig(from); } else { - @from.SendMessage("You must have a digging tool to dig for treasure."); + from.SendMessage("You must have a digging tool to dig for treasure."); } } } diff --git a/Projects/UOContent/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs b/Projects/UOContent/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs index 8ba41b13e..4a292c615 100644 --- a/Projects/UOContent/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs +++ b/Projects/UOContent/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs @@ -20,7 +20,7 @@ namespace Server.Items { if (MondainsLegacy.CheckML(from)) { - base.Drink(@from); + base.Drink(from); } } diff --git a/Projects/UOContent/Items/Misc/Blighted Grove/MelisandesHairDye.cs b/Projects/UOContent/Items/Misc/Blighted Grove/MelisandesHairDye.cs index f2e406b4c..24a51b8f8 100644 --- a/Projects/UOContent/Items/Misc/Blighted Grove/MelisandesHairDye.cs +++ b/Projects/UOContent/Items/Misc/Blighted Grove/MelisandesHairDye.cs @@ -19,7 +19,7 @@ namespace Server.Items { if (MondainsLegacy.CheckML(from)) { - @from.SendGump(new ConfirmGump(this)); + from.SendGump(new ConfirmGump(this)); } } else diff --git a/Projects/UOContent/Items/Misc/Bola.cs b/Projects/UOContent/Items/Misc/Bola.cs index 75c35316b..53aebb572 100644 --- a/Projects/UOContent/Items/Misc/Bola.cs +++ b/Projects/UOContent/Items/Misc/Bola.cs @@ -70,7 +70,7 @@ namespace Server.Items if (to is ChaosDragoon || to is ChaosDragoonElite) { - @from.SendLocalizedMessage(1042047); // You fail to knock the rider from its mount. + from.SendLocalizedMessage(1042047); // You fail to knock the rider from its mount. } var mt = to.Mount; @@ -83,7 +83,7 @@ namespace Server.Items { if (AnimalForm.UnderTransformation(mobile)) { - mobile.SendLocalizedMessage(1114066, @from.Name); // ~1_NAME~ knocked you out of animal form! + mobile.SendLocalizedMessage(1114066, from.Name); // ~1_NAME~ knocked you out of animal form! } else if (mobile.Mounted) { @@ -95,7 +95,7 @@ namespace Server.Items if (Core.AOS) /* only failsafe, attacker should already be dismounted */ { - (@from as PlayerMobile)?.SetMountBlock( + (from as PlayerMobile)?.SetMountBlock( BlockMountType.BolaRecovery, TimeSpan.FromSeconds(Core.ML ? 10 : 3), true diff --git a/Projects/UOContent/Items/Misc/BulletinBoards.cs b/Projects/UOContent/Items/Misc/BulletinBoards.cs index f7a005808..44584b3c1 100644 --- a/Projects/UOContent/Items/Misc/BulletinBoards.cs +++ b/Projects/UOContent/Items/Misc/BulletinBoards.cs @@ -169,11 +169,11 @@ namespace Server.Items state.Send(new BBDisplayBoard(this)); if (state.ContainerGridLines) { - state.Send(new ContainerContent6017(@from, this)); + state.Send(new ContainerContent6017(from, this)); } else { - state.Send(new ContainerContent(@from, this)); + state.Send(new ContainerContent(from, this)); } } else @@ -304,11 +304,11 @@ namespace Server.Items { if (thread == null) { - @from.SendMessage("You must wait {0} before creating a new thread.", FormatTS(ThreadCreateTime)); + from.SendMessage("You must wait {0} before creating a new thread.", FormatTS(ThreadCreateTime)); } else { - @from.SendMessage("You must wait {0} before replying to another thread.", FormatTS(ThreadReplyTime)); + from.SendMessage("You must wait {0} before replying to another thread.", FormatTS(ThreadReplyTime)); } return; diff --git a/Projects/UOContent/Items/Misc/CommunicationCrystals.cs b/Projects/UOContent/Items/Misc/CommunicationCrystals.cs index cca418f13..8b29232c7 100644 --- a/Projects/UOContent/Items/Misc/CommunicationCrystals.cs +++ b/Projects/UOContent/Items/Misc/CommunicationCrystals.cs @@ -115,7 +115,7 @@ namespace Server.Items if (Receivers.Count > 0) { - LabelTo(@from, 1060746, Receivers.Count.ToString()); // links: ~1_val~ + LabelTo(from, 1060746, Receivers.Count.ToString()); // links: ~1_val~ } } @@ -142,7 +142,7 @@ namespace Server.Items } else if (Charges > 0) { - receiver.TransmitMessage(@from, speech); + receiver.TransmitMessage(from, speech); Charges--; } else diff --git a/Projects/UOContent/Items/Misc/DeceitBrazier.cs b/Projects/UOContent/Items/Misc/DeceitBrazier.cs index c3ae59212..4420be7cb 100644 --- a/Projects/UOContent/Items/Misc/DeceitBrazier.cs +++ b/Projects/UOContent/Items/Misc/DeceitBrazier.cs @@ -201,7 +201,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(500446); // That is too far away. + from.SendLocalizedMessage(500446); // That is too far away. } } } diff --git a/Projects/UOContent/Items/Misc/EffectController.cs b/Projects/UOContent/Items/Misc/EffectController.cs index 29dc3ff0d..27f496dae 100644 --- a/Projects/UOContent/Items/Misc/EffectController.cs +++ b/Projects/UOContent/Items/Misc/EffectController.cs @@ -162,7 +162,7 @@ namespace Server.Items { if (TriggerType == EffectTriggerType.DoubleClick) { - DoEffect(@from); + DoEffect(from); } } @@ -337,7 +337,7 @@ namespace Server.Items { if (from == this) { - @from = EffectItem.Create(@from.Location, @from.Map, EffectItem.DefaultDuration); + from = EffectItem.Create(from.Location, from.Map, EffectItem.DefaultDuration); } if (to == this) diff --git a/Projects/UOContent/Items/Misc/Firebomb.cs b/Projects/UOContent/Items/Misc/Firebomb.cs index 845ce1c4e..62ce9d3b4 100644 --- a/Projects/UOContent/Items/Misc/Firebomb.cs +++ b/Projects/UOContent/Items/Misc/Firebomb.cs @@ -70,7 +70,7 @@ namespace Server.Items if (!m_Users.Contains(from)) { - m_Users.Add(@from); + m_Users.Add(from); } from.Target = new ThrowTarget(this); diff --git a/Projects/UOContent/Items/Misc/FlippableAddonAttribute.cs b/Projects/UOContent/Items/Misc/FlippableAddonAttribute.cs index 0ac1247a3..dc59247b8 100644 --- a/Projects/UOContent/Items/Misc/FlippableAddonAttribute.cs +++ b/Projects/UOContent/Items/Misc/FlippableAddonAttribute.cs @@ -45,7 +45,7 @@ namespace Server.Items ClearComponents(addon); - flipMethod.Invoke(addon, new object[] { @from, Directions[index] }); + flipMethod.Invoke(addon, new object[] { from, Directions[index] }); BaseHouse house = null; var result = AddonFitResult.Valid; @@ -54,14 +54,14 @@ namespace Server.Items if (addon is BaseAddon baseAddon) { - result = baseAddon.CouldFit(baseAddon.Location, @from.Map, @from, ref house); + result = baseAddon.CouldFit(baseAddon.Location, from.Map, from, ref house); } else if (addon is BaseAddonContainer container) { - result = container.CouldFit(container.Location, @from.Map, @from, ref house); + result = container.CouldFit(container.Location, from.Map, from, ref house); } - addon.Map = @from.Map; + addon.Map = from.Map; if (result != AddonFitResult.Valid) { @@ -76,27 +76,27 @@ namespace Server.Items ClearComponents(addon); - flipMethod.Invoke(addon, new object[2] { @from, Directions[index] }); + flipMethod.Invoke(addon, new object[2] { from, Directions[index] }); if (result == AddonFitResult.Blocked) { - @from.SendLocalizedMessage(500269); // You cannot build that there. + from.SendLocalizedMessage(500269); // You cannot build that there. } else if (result == AddonFitResult.NotInHouse) { - @from.SendLocalizedMessage(500274); // You can only place this in a house that you own! + from.SendLocalizedMessage(500274); // You can only place this in a house that you own! } else if (result == AddonFitResult.DoorsNotClosed) { - @from.SendMessage("You must close all house doors before placing this."); + from.SendMessage("You must close all house doors before placing this."); } else if (result == AddonFitResult.DoorTooClose) { - @from.SendLocalizedMessage(500271); // You cannot build near the door. + from.SendLocalizedMessage(500271); // You cannot build near the door. } else if (result == AddonFitResult.NoWall) { - @from.SendLocalizedMessage(500268); // This object needs to be mounted on something. + from.SendLocalizedMessage(500268); // This object needs to be mounted on something. } } diff --git a/Projects/UOContent/Items/Misc/InteriorDecorator.cs b/Projects/UOContent/Items/Misc/InteriorDecorator.cs index 18d9bfb70..493816a5e 100644 --- a/Projects/UOContent/Items/Misc/InteriorDecorator.cs +++ b/Projects/UOContent/Items/Misc/InteriorDecorator.cs @@ -74,12 +74,12 @@ namespace Server.Items if (!from.HasGump()) { - @from.SendGump(new InternalGump(this)); + from.SendGump(new InternalGump(this)); } if (m_Command != DecorateCommand.None) { - @from.Target = new InternalTarget(this); + from.Target = new InternalTarget(this); } } @@ -97,7 +97,7 @@ namespace Server.Items else*/ if (!InHouse(from)) { - @from.SendLocalizedMessage(502092); // You must be in your house to do this. + from.SendLocalizedMessage(502092); // You must be in your house to do this. } else { @@ -224,15 +224,15 @@ namespace Server.Items { if (item is AddonComponent && m_Decorator.Command == DecorateCommand.Up) { - @from.SendLocalizedMessage(1042274); // You cannot raise it up any higher. + from.SendLocalizedMessage(1042274); // You cannot raise it up any higher. } else if (item is AddonComponent && m_Decorator.Command == DecorateCommand.Down) { - @from.SendLocalizedMessage(1042275); // You cannot lower it down any further. + from.SendLocalizedMessage(1042275); // You cannot lower it down any further. } else { - @from.SendLocalizedMessage(1042271); // That is not locked down. + from.SendLocalizedMessage(1042271); // That is not locked down. } } else if (item is VendorRentalContract) @@ -267,7 +267,7 @@ namespace Server.Items { if (cancelType == TargetCancelType.Canceled) { - @from.CloseGump(); + from.CloseGump(); } } @@ -310,7 +310,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(1042273); // You cannot turn that. + from.SendLocalizedMessage(1042273); // You cannot turn that. } } @@ -324,7 +324,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(1042274); // You cannot raise it up any higher. + from.SendLocalizedMessage(1042274); // You cannot raise it up any higher. } } @@ -338,7 +338,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(1042275); // You cannot lower it down any further. + from.SendLocalizedMessage(1042275); // You cannot lower it down any further. } } diff --git a/Projects/UOContent/Items/Misc/OilCloth.cs b/Projects/UOContent/Items/Misc/OilCloth.cs index 97f545949..a75e06c5b 100644 --- a/Projects/UOContent/Items/Misc/OilCloth.cs +++ b/Projects/UOContent/Items/Misc/OilCloth.cs @@ -90,11 +90,11 @@ namespace Server.Items if (weapon.PoisonCharges > 0) { - @from.SendLocalizedMessage(1005423); // You have removed some of the caustic substance, but not all. + from.SendLocalizedMessage(1005423); // You have removed some of the caustic substance, but not all. } else { - @from.SendLocalizedMessage(1010497); // You have cleaned the item. + from.SendLocalizedMessage(1010497); // You have cleaned the item. } } } diff --git a/Projects/UOContent/Items/Misc/Origami.cs b/Projects/UOContent/Items/Misc/Origami.cs index 6b2799898..74f934e81 100644 --- a/Projects/UOContent/Items/Misc/Origami.cs +++ b/Projects/UOContent/Items/Misc/Origami.cs @@ -36,7 +36,7 @@ namespace Server.Items if (i != null) { - @from.AddToBackpack(i); + from.AddToBackpack(i); } from.SendLocalizedMessage(1070822); // You fold the paper into an interesting shape. diff --git a/Projects/UOContent/Items/Misc/PlayerBulletinBoards.cs b/Projects/UOContent/Items/Misc/PlayerBulletinBoards.cs index 04a1bc4bd..ffeed4382 100644 --- a/Projects/UOContent/Items/Misc/PlayerBulletinBoards.cs +++ b/Projects/UOContent/Items/Misc/PlayerBulletinBoards.cs @@ -162,7 +162,7 @@ namespace Server.Items { if (house.Public || !house.IsAosRules) { - return !house.IsBanned(@from); + return !house.IsBanned(from); } return house.HasAccess(from); @@ -174,15 +174,15 @@ namespace Server.Items if (house?.HasLockedDownItem(this) != true) { - @from.SendLocalizedMessage(1062396); // This bulletin board must be locked down in a house to be usable. + from.SendLocalizedMessage(1062396); // This bulletin board must be locked down in a house to be usable. } else if (!from.InRange(GetWorldLocation(), 2) || !from.InLOS(this)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if (CheckAccess(house, from)) { - @from.SendGump(new PlayerBBGump(@from, house, this, 0)); + from.SendGump(new PlayerBBGump(from, house, this, 0)); } } diff --git a/Projects/UOContent/Items/Misc/PowerCrystal.cs b/Projects/UOContent/Items/Misc/PowerCrystal.cs index b9ea45fb7..58d1ba015 100644 --- a/Projects/UOContent/Items/Misc/PowerCrystal.cs +++ b/Projects/UOContent/Items/Misc/PowerCrystal.cs @@ -17,11 +17,11 @@ namespace Server.Items { if (!from.InRange(GetWorldLocation(), 3)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else { - @from.SendAsciiMessage("This looks like part of a larger contraption."); + from.SendAsciiMessage("This looks like part of a larger contraption."); } } diff --git a/Projects/UOContent/Items/Misc/PowerGenerator.cs b/Projects/UOContent/Items/Misc/PowerGenerator.cs index e52440f57..5d0710ef9 100644 --- a/Projects/UOContent/Items/Misc/PowerGenerator.cs +++ b/Projects/UOContent/Items/Misc/PowerGenerator.cs @@ -263,7 +263,7 @@ namespace Server.Items for (var i = 0; i < SideLength; i++) { - @from.AddToBackpack(new ArcaneGem()); + from.AddToBackpack(new ArcaneGem()); } from.AddToBackpack(new Diamond(SideLength)); diff --git a/Projects/UOContent/Items/Misc/PromotionalToken.cs b/Projects/UOContent/Items/Misc/PromotionalToken.cs index d7e328ea6..264c5e6bd 100644 --- a/Projects/UOContent/Items/Misc/PromotionalToken.cs +++ b/Projects/UOContent/Items/Misc/PromotionalToken.cs @@ -148,7 +148,7 @@ namespace Server.Items { if (from?.Account != null) { - return new SoulstoneFragment(@from.Account.ToString()); + return new SoulstoneFragment(from.Account.ToString()); } return null; diff --git a/Projects/UOContent/Items/Misc/PublicMoongate.cs b/Projects/UOContent/Items/Misc/PublicMoongate.cs index 3b515706d..58900e4ef 100644 --- a/Projects/UOContent/Items/Misc/PublicMoongate.cs +++ b/Projects/UOContent/Items/Misc/PublicMoongate.cs @@ -34,11 +34,11 @@ namespace Server.Items if (from.InRange(GetWorldLocation(), 1)) { - UseGate(@from); + UseGate(from); } else { - @from.SendLocalizedMessage(500446); // That is too far away. + from.SendLocalizedMessage(500446); // That is too far away. } } diff --git a/Projects/UOContent/Items/Misc/Teleporter.cs b/Projects/UOContent/Items/Misc/Teleporter.cs index 98832ad41..1b24b7333 100644 --- a/Projects/UOContent/Items/Misc/Teleporter.cs +++ b/Projects/UOContent/Items/Misc/Teleporter.cs @@ -187,15 +187,15 @@ namespace Server.Items { if (m_MapDest != null && m_PointDest != Point3D.Zero) { - LabelTo(@from, "{0} [{1}]", m_PointDest, m_MapDest); + LabelTo(from, "{0} [{1}]", m_PointDest, m_MapDest); } else if (m_MapDest != null) { - LabelTo(@from, "[{0}]", m_MapDest); + LabelTo(from, "[{0}]", m_MapDest); } else if (m_PointDest != Point3D.Zero) { - LabelTo(@from, m_PointDest.ToString()); + LabelTo(from, m_PointDest.ToString()); } } else diff --git a/Projects/UOContent/Items/Misc/UnholyBone.cs b/Projects/UOContent/Items/Misc/UnholyBone.cs index f97833b29..78410b776 100644 --- a/Projects/UOContent/Items/Misc/UnholyBone.cs +++ b/Projects/UOContent/Items/Misc/UnholyBone.cs @@ -32,11 +32,11 @@ namespace Server.Items { if (ItemID == 0xF7E) { - @from.SendMessage("You destroy the bone."); + from.SendMessage("You destroy the bone."); } else { - @from.SendMessage("You destroy the bone pile."); + from.SendMessage("You destroy the bone pile."); } var gold = new Gold(25, 100); @@ -51,11 +51,11 @@ namespace Server.Items { if (ItemID == 0xF7E) { - @from.SendMessage("You damage the bone."); + from.SendMessage("You damage the bone."); } else { - @from.SendMessage("You damage the bone pile."); + from.SendMessage("You damage the bone pile."); } } } diff --git a/Projects/UOContent/Items/Misc/Waypoint.cs b/Projects/UOContent/Items/Misc/Waypoint.cs index 270d0212d..eaff5f78d 100644 --- a/Projects/UOContent/Items/Misc/Waypoint.cs +++ b/Projects/UOContent/Items/Misc/Waypoint.cs @@ -65,11 +65,11 @@ namespace Server.Items if (m_Next == null) { - LabelTo(@from, "(Unlinked)"); + LabelTo(from, "(Unlinked)"); } else { - LabelTo(@from, "(Linked: {0})", m_Next.Location); + LabelTo(from, "(Linked: {0})", m_Next.Location); } } @@ -113,7 +113,7 @@ namespace Server.Items } else { - @from.SendMessage("Target a way point."); + from.SendMessage("Target a way point."); } } } diff --git a/Projects/UOContent/Items/Misc/WindChimes.cs b/Projects/UOContent/Items/Misc/WindChimes.cs index 2c10e417f..06eb62e8d 100644 --- a/Projects/UOContent/Items/Misc/WindChimes.cs +++ b/Projects/UOContent/Items/Misc/WindChimes.cs @@ -62,11 +62,11 @@ namespace Server.Items { if (IsOwner(from)) { - @from.SendGump(new OnOffGump(this)); + from.SendGump(new OnOffGump(this)); } else { - @from.SendLocalizedMessage(502691); // You must be the owner to use this. + from.SendLocalizedMessage(502691); // You must be the owner to use this. } } @@ -123,7 +123,7 @@ namespace Server.Items if (newValue && !m_Chimes.IsLockedDown) { - @from.SendLocalizedMessage(502693); // Remember, this only works when locked down. + from.SendLocalizedMessage(502693); // Remember, this only works when locked down. } } else diff --git a/Projects/UOContent/Items/New Haven Quest Rewards/HammerOfHephaestus.cs b/Projects/UOContent/Items/New Haven Quest Rewards/HammerOfHephaestus.cs index c1c0667ea..1a51fab42 100644 --- a/Projects/UOContent/Items/New Haven Quest Rewards/HammerOfHephaestus.cs +++ b/Projects/UOContent/Items/New Haven Quest Rewards/HammerOfHephaestus.cs @@ -36,15 +36,15 @@ namespace Server.Items if (!IsChildOf(from.Backpack) && Parent != from ) // TODO: These checks don't match EA, but they match BaseTool for now { - @from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. + from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. } else if (UsesRemaining <= 0) { - @from.SendLocalizedMessage(1072306); // You must wait a moment for it to recharge. + from.SendLocalizedMessage(1072306); // You must wait a moment for it to recharge. } else { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Items/Quivers/BaseQuiver.cs b/Projects/UOContent/Items/Quivers/BaseQuiver.cs index b3f1c2b58..5ce8ee470 100644 --- a/Projects/UOContent/Items/Quivers/BaseQuiver.cs +++ b/Projects/UOContent/Items/Quivers/BaseQuiver.cs @@ -118,7 +118,7 @@ namespace Server.Items if (makersMark) { - Crafter = @from; + Crafter = from; } return quality; diff --git a/Projects/UOContent/Items/Resources/Fishing/MagicFish.cs b/Projects/UOContent/Items/Resources/Fishing/MagicFish.cs index 66718a5ef..c8beb3117 100644 --- a/Projects/UOContent/Items/Resources/Fishing/MagicFish.cs +++ b/Projects/UOContent/Items/Resources/Fishing/MagicFish.cs @@ -23,7 +23,7 @@ namespace Server.Items if (!applied) { - @from.SendLocalizedMessage(502173); // You are already under a similar effect. + from.SendLocalizedMessage(502173); // You are already under a similar effect. } return applied; diff --git a/Projects/UOContent/Items/Resources/Tailor/YarnsAndThreads.cs b/Projects/UOContent/Items/Resources/Tailor/YarnsAndThreads.cs index c1f4ad12a..427b1bb35 100644 --- a/Projects/UOContent/Items/Resources/Tailor/YarnsAndThreads.cs +++ b/Projects/UOContent/Items/Resources/Tailor/YarnsAndThreads.cs @@ -86,7 +86,7 @@ namespace Server.Items if (targeted is Item item) { - item.SendLocalizedMessageTo(@from, 1010001 + loom.Phase++); + item.SendLocalizedMessageTo(from, 1010001 + loom.Phase++); } } else diff --git a/Projects/UOContent/Items/Shields/ChaosShield.cs b/Projects/UOContent/Items/Shields/ChaosShield.cs index e8f2dd247..055b1a245 100644 --- a/Projects/UOContent/Items/Shields/ChaosShield.cs +++ b/Projects/UOContent/Items/Shields/ChaosShield.cs @@ -52,7 +52,7 @@ namespace Server.Items { if (Validate(Parent as Mobile)) { - base.OnSingleClick(@from); + base.OnSingleClick(from); } } diff --git a/Projects/UOContent/Items/Shields/OrderShield.cs b/Projects/UOContent/Items/Shields/OrderShield.cs index 8d0675872..7d5307737 100644 --- a/Projects/UOContent/Items/Shields/OrderShield.cs +++ b/Projects/UOContent/Items/Shields/OrderShield.cs @@ -57,7 +57,7 @@ namespace Server.Items { if (Validate(Parent as Mobile)) { - base.OnSingleClick(@from); + base.OnSingleClick(from); } } diff --git a/Projects/UOContent/Items/Skill Items/Camping/Bedroll.cs b/Projects/UOContent/Items/Skill Items/Camping/Bedroll.cs index f60437ba0..5bbdb5df4 100644 --- a/Projects/UOContent/Items/Skill Items/Camping/Bedroll.cs +++ b/Projects/UOContent/Items/Skill Items/Camping/Bedroll.cs @@ -51,7 +51,7 @@ namespace Server.Items if (entry?.Safe == true) { - @from.SendGump(new LogoutGump(entry, this)); + from.SendGump(new LogoutGump(entry, this)); } } } diff --git a/Projects/UOContent/Items/Skill Items/Camping/Kindling.cs b/Projects/UOContent/Items/Skill Items/Camping/Kindling.cs index 5aebc39d4..3ee2cb6d5 100644 --- a/Projects/UOContent/Items/Skill Items/Camping/Kindling.cs +++ b/Projects/UOContent/Items/Skill Items/Camping/Kindling.cs @@ -61,7 +61,7 @@ namespace Server.Items if (!Deleted && Parent == null) { - @from.PlaceInBackpack(this); + from.PlaceInBackpack(this); } new Campfire().MoveToWorld(fireLocation, from.Map); diff --git a/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs b/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs index 6fecf07f7..1a285abfa 100644 --- a/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs +++ b/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs @@ -496,7 +496,7 @@ namespace Server.Items if (northWall && westWall) { - switch (@from.Direction & Direction.Mask) + switch (from.Direction & Direction.Mask) { case Direction.North: case Direction.South: @@ -509,7 +509,7 @@ namespace Server.Items break; default: - @from.SendMessage("Turn to face the wall on which to hang this trophy."); + from.SendMessage("Turn to face the wall on which to hang this trophy."); return; } } @@ -526,7 +526,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(1042626); // The trophy must be placed next to a wall. + from.SendLocalizedMessage(1042626); // The trophy must be placed next to a wall. } if (itemID > 0) diff --git a/Projects/UOContent/Items/Skill Items/Fishing/FishingPole.cs b/Projects/UOContent/Items/Skill Items/Fishing/FishingPole.cs index a12ce0b42..2c16aab5f 100644 --- a/Projects/UOContent/Items/Skill Items/Fishing/FishingPole.cs +++ b/Projects/UOContent/Items/Skill Items/Fishing/FishingPole.cs @@ -24,11 +24,11 @@ namespace Server.Items if (!from.InLOS(loc) || !from.InRange(loc, 2)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3E9, 1019045); // I can't reach that + from.LocalOverheadMessage(MessageType.Regular, 0x3E9, 1019045); // I can't reach that } else { - Fishing.System.BeginHarvesting(@from, this); + Fishing.System.BeginHarvesting(from, this); } } diff --git a/Projects/UOContent/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs b/Projects/UOContent/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs index f00a8f21e..357a124f6 100644 --- a/Projects/UOContent/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs +++ b/Projects/UOContent/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs @@ -165,7 +165,7 @@ namespace Server.Items { for (var i = 1; i < Amount; ++i) // these were stackable before, doh { - @from.AddToBackpack(new SpecialFishingNet()); + from.AddToBackpack(new SpecialFishingNet()); } } @@ -276,7 +276,7 @@ namespace Server.Items if (index == 14) { - FinishEffect(p, Map, @from); + FinishEffect(p, Map, from); } else { diff --git a/Projects/UOContent/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs b/Projects/UOContent/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs index f8bff4064..4456dac5f 100644 --- a/Projects/UOContent/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs +++ b/Projects/UOContent/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs @@ -65,7 +65,7 @@ namespace Server.Items if (makersMark) { - Crafter = @from; + Crafter = from; } return quality; @@ -141,11 +141,11 @@ namespace Server.Items { if (IsChildOf(from.Backpack) || Parent == from) { - HarvestSystem.BeginHarvesting(@from, this); + HarvestSystem.BeginHarvesting(from, this); } else { - @from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. + from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. } } diff --git a/Projects/UOContent/Items/Skill Items/Harvest Tools/ProspectorsTool.cs b/Projects/UOContent/Items/Skill Items/Harvest Tools/ProspectorsTool.cs index d059f52b3..1a1363be4 100644 --- a/Projects/UOContent/Items/Skill Items/Harvest Tools/ProspectorsTool.cs +++ b/Projects/UOContent/Items/Skill Items/Harvest Tools/ProspectorsTool.cs @@ -55,11 +55,11 @@ namespace Server.Items { if (IsChildOf(from.Backpack) || Parent == from) { - @from.Target = new InternalTarget(this); + from.Target = new InternalTarget(this); } else { - @from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. + from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. } } diff --git a/Projects/UOContent/Items/Skill Items/Magical/Misc/Moongate.cs b/Projects/UOContent/Items/Skill Items/Magical/Misc/Moongate.cs index f373def87..7f46db2aa 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Misc/Moongate.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Misc/Moongate.cs @@ -51,11 +51,11 @@ namespace Server.Items if (from.InRange(GetWorldLocation(), 1)) { - CheckGate(@from, 1); + CheckGate(from, 1); } else { - @from.SendLocalizedMessage(500446); // That is too far away. + from.SendLocalizedMessage(500446); // That is too far away. } } @@ -164,7 +164,7 @@ namespace Server.Items { if (message) { - @from.SendLocalizedMessage(500446); // That is too far away. + from.SendLocalizedMessage(500446); // That is too far away. } return false; @@ -180,7 +180,7 @@ namespace Server.Items { if (from.AccessLevel == AccessLevel.Player || !from.Hidden) { - @from.Send(new PlaySound(0x20E, @from.Location)); + from.Send(new PlaySound(0x20E, from.Location)); } from.CloseGump(); @@ -211,11 +211,11 @@ namespace Server.Items if (TargetMap != null) { - BeginConfirmation(@from); + BeginConfirmation(from); } else { - @from.SendMessage("This moongate does not seem to go anywhere."); + from.SendMessage("This moongate does not seem to go anywhere."); } } @@ -283,7 +283,7 @@ namespace Server.Items { if (okay) { - EndConfirmation(@from); + EndConfirmation(from); } } diff --git a/Projects/UOContent/Items/Skill Items/Magical/Misc/PotionKeg.cs b/Projects/UOContent/Items/Skill Items/Magical/Misc/PotionKeg.cs index eb18ef030..79019ba69 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Misc/PotionKeg.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Misc/PotionKeg.cs @@ -235,7 +235,7 @@ namespace Server.Items if (--Held == 0) { - @from.SendLocalizedMessage(502245); // The keg is now empty. + from.SendLocalizedMessage(502245); // The keg is now empty. } } else @@ -293,7 +293,7 @@ namespace Server.Items if (!pot.Deleted) { - pot.Bounce(@from); + pot.Bounce(from); } return true; @@ -323,7 +323,7 @@ namespace Server.Items if (!pot.Deleted) { - pot.Bounce(@from); + pot.Bounce(from); } return true; diff --git a/Projects/UOContent/Items/Skill Items/Magical/Misc/RecallRune.cs b/Projects/UOContent/Items/Skill Items/Magical/Misc/RecallRune.cs index 4a76a96b2..d723710ea 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Misc/RecallRune.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Misc/RecallRune.cs @@ -262,7 +262,7 @@ namespace Server.Items if (m_TargetMap == Map.Tokuno) { LabelTo( - @from, + from, House != null ? 1063260 : 1063259, string.Format(RuneFormat, desc) ); // ~1_val~ (Tokuno Islands)[(House)] @@ -270,7 +270,7 @@ namespace Server.Items else if (m_TargetMap == Map.Malas) { LabelTo( - @from, + from, House != null ? 1062454 : 1060804, string.Format(RuneFormat, desc) ); // ~1_val~ (Malas)[(House)] @@ -278,7 +278,7 @@ namespace Server.Items else if (m_TargetMap == Map.Felucca) { LabelTo( - @from, + from, House != null ? 1062452 : 1060805, string.Format(RuneFormat, desc) ); // ~1_val~ (Felucca)[(House)] @@ -286,7 +286,7 @@ namespace Server.Items else if (m_TargetMap == Map.Trammel) { LabelTo( - @from, + from, House != null ? 1062453 : 1060806, string.Format(RuneFormat, desc) ); // ~1_val~ (Trammel)[(House)] @@ -294,7 +294,7 @@ namespace Server.Items else { LabelTo( - @from, + from, House != null ? "{0} ({1})(House)" : "{0} ({1})", string.Format(RuneFormat, desc), m_TargetMap diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs index bf3a5bc6c..3d3dab230 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs @@ -157,11 +157,11 @@ namespace Server.Items if (from.Backpack?.Deleted != false) { - @from.Backpack.DropItem(pot); + from.Backpack.DropItem(pot); } else { - pot.MoveToWorld(@from.Location, @from.Map); + pot.MoveToWorld(from.Location, from.Map); } pot.Drink(from); diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs index e09425319..7b08b59ef 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs @@ -49,7 +49,7 @@ namespace Server.Items if (!m_Users.Contains(from)) { - m_Users.Add(@from); + m_Users.Add(from); } from.Target = new ThrowTarget(this); @@ -83,7 +83,7 @@ namespace Server.Items { if (m_Users[i].Target is ThrowTarget targ && targ.Potion == this) { - Target.Cancel(@from); + Target.Cancel(from); } } @@ -96,9 +96,9 @@ namespace Server.Items { var p = new Point3D(loc.X + i, loc.Y + j, loc.Z); - if (map.CanFit(p, 12, true, false) && @from.InLOS(p)) + if (map.CanFit(p, 12, true, false) && from.InLOS(p)) { - new InternalItem(@from, p, map, MinDamage, MaxDamage); + new InternalItem(from, p, map, MinDamage, MaxDamage); } } } @@ -162,7 +162,7 @@ namespace Server.Items } else { - to = new Entity(Serial.Zero, new Point3D(p), @from.Map); + to = new Entity(Serial.Zero, new Point3D(p), from.Map); } Effects.SendMovingEffect(from, to, 0xF0D, 7, 0, false, false, Potion.Hue); @@ -308,12 +308,12 @@ namespace Server.Items foreach (var m in m_Item.GetMobilesInRange(0)) { - if (m.Z + 16 > m_Item.Z && m_Item.Z + 12 > m.Z && (!Core.AOS || m != @from) && - SpellHelper.ValidIndirectTarget(@from, m) && @from.CanBeHarmful(m, false)) + if (m.Z + 16 > m_Item.Z && m_Item.Z + 12 > m.Z && (!Core.AOS || m != from) && + SpellHelper.ValidIndirectTarget(from, m) && from.CanBeHarmful(m, false)) { - @from.DoHarmful(m); + from.DoHarmful(m); - AOS.Damage(m, @from, m_Item.GetDamage(), 0, 100, 0, 0, 0); + AOS.Damage(m, from, m_Item.GetDamage(), 0, 100, 0, 0, 0); m.PlaySound(0x208); } } diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs index 226c8b0b2..67cb5f046 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs @@ -50,7 +50,7 @@ namespace Server.Items if (!m_Users.Contains(from)) { - m_Users.Add(@from); + m_Users.Add(from); } from.Target = new ThrowTarget(this); @@ -84,7 +84,7 @@ namespace Server.Items { if (m_Users[i].Target is ThrowTarget targ && targ.Potion == this) { - Target.Cancel(@from); + Target.Cancel(from); } } @@ -104,7 +104,7 @@ namespace Server.Items continue; } - mon.Pacify(@from, DateTime.UtcNow + TimeSpan.FromSeconds(5.0)); // TODO check + mon.Pacify(from, DateTime.UtcNow + TimeSpan.FromSeconds(5.0)); // TODO check } } } @@ -180,7 +180,7 @@ namespace Server.Items } else { - to = new Entity(Serial.Zero, new Point3D(p), @from.Map); + to = new Entity(Serial.Zero, new Point3D(p), from.Map); } Effects.SendMovingEffect(from, to, 0xF0D, 7, 0, false, false, Potion.Hue); diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs index 564e5b5f4..593e46d20 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs @@ -60,7 +60,7 @@ namespace Server.Items if (Map == Map.Internal) { - return @from; + return from; } return this; @@ -88,7 +88,7 @@ namespace Server.Items if (!Users.Contains(from)) { - Users.Add(@from); + Users.Add(from); } from.Target = new ThrowTarget(this); @@ -105,7 +105,7 @@ namespace Server.Items TimeSpan.FromSeconds(1.0), TimeSpan.FromSeconds(1.25), 5, - () => Detonate_OnTick(@from, timer--) + () => Detonate_OnTick(from, timer--) ); // 3.6 seconds explosion delay } else @@ -114,7 +114,7 @@ namespace Server.Items TimeSpan.FromSeconds(0.75), TimeSpan.FromSeconds(1.0), 4, - () => Detonate_OnTick(@from, timer--) + () => Detonate_OnTick(from, timer--) ); // 2.6 seconds explosion delay } } @@ -174,7 +174,7 @@ namespace Server.Items if (InstantExplosion) { - Explode(@from, true, loc, map); + Explode(from, true, loc, map); } else { @@ -213,7 +213,7 @@ namespace Server.Items if (direct) { - alchemyBonus = (int)(@from.Skills.Alchemy.Value / (Core.AOS ? 5 : 10)); + alchemyBonus = (int)(from.Skills.Alchemy.Value / (Core.AOS ? 5 : 10)); } var eable = map.GetObjectsInRange(loc, ExplosionRange, LeveledExplosion); diff --git a/Projects/UOContent/Items/Skill Items/Magical/Runebook.cs b/Projects/UOContent/Items/Skill Items/Magical/Runebook.cs index dcea428ac..1db34f331 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Runebook.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Runebook.cs @@ -136,7 +136,7 @@ namespace Server.Items if (makersMark) { - Crafter = @from; + Crafter = from; } m_Quality = (BookQuality)(quality - 1); @@ -322,14 +322,14 @@ namespace Server.Items { if (m_Description?.Length > 0) { - LabelTo(@from, m_Description); + LabelTo(from, m_Description); } base.OnSingleClick(from); if (m_Crafter != null) { - LabelTo(@from, 1050043, m_Crafter.Name); + LabelTo(from, 1050043, m_Crafter.Name); } } diff --git a/Projects/UOContent/Items/Skill Items/Magical/Scrolls/SpellScroll.cs b/Projects/UOContent/Items/Skill Items/Magical/Scrolls/SpellScroll.cs index 9beb0c112..173470ad6 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Scrolls/SpellScroll.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Scrolls/SpellScroll.cs @@ -83,7 +83,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(502345); // This spell has been temporarily disabled. + from.SendLocalizedMessage(502345); // This spell has been temporarily disabled. } } } diff --git a/Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs b/Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs index d2df1a104..2fb4e1233 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs @@ -219,7 +219,7 @@ namespace Server.Items if (makersMark) { - Crafter = @from; + Crafter = from; } m_Quality = (BookQuality)(quality - 1); @@ -340,11 +340,11 @@ namespace Server.Items if (move != null) { - SpecialMove.SetCurrentMove(@from, move); + SpecialMove.SetCurrentMove(from, move); } else { - SpellRegistry.NewSpell(spellId, @from, null)?.Cast(); + SpellRegistry.NewSpell(spellId, from, null)?.Cast(); } } @@ -359,7 +359,7 @@ namespace Server.Items if (book?.HasSpell(spellID) != true) { - book = Find(@from, spellID); + book = Find(from, spellID); } if (book?.HasSpell(spellID) == true) @@ -380,7 +380,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(502345); // This spell has been temporarily disabled. + from.SendLocalizedMessage(502345); // This spell has been temporarily disabled. } } } @@ -463,7 +463,7 @@ namespace Server.Items if (!m_Table.TryGetValue(from, out var list)) { - m_Table[@from] = list = FindAllSpellbooks(@from); + m_Table[from] = list = FindAllSpellbooks(from); } else { @@ -626,17 +626,17 @@ namespace Server.Items if (strBonus != 0) { - @from.AddStatMod(new StatMod(StatType.Str, $"{modName}Str", strBonus, TimeSpan.Zero)); + from.AddStatMod(new StatMod(StatType.Str, $"{modName}Str", strBonus, TimeSpan.Zero)); } if (dexBonus != 0) { - @from.AddStatMod(new StatMod(StatType.Dex, $"{modName}Dex", dexBonus, TimeSpan.Zero)); + from.AddStatMod(new StatMod(StatType.Dex, $"{modName}Dex", dexBonus, TimeSpan.Zero)); } if (intBonus != 0) { - @from.AddStatMod(new StatMod(StatType.Int, $"{modName}Int", intBonus, TimeSpan.Zero)); + from.AddStatMod(new StatMod(StatType.Int, $"{modName}Int", intBonus, TimeSpan.Zero)); } } @@ -910,7 +910,7 @@ namespace Server.Items if (m_Crafter != null) { - LabelTo(@from, 1050043, m_Crafter.Name); // crafted by ~1_NAME~ + LabelTo(from, 1050043, m_Crafter.Name); // crafted by ~1_NAME~ } LabelTo(from, 1042886, SpellCount.ToString()); @@ -922,11 +922,11 @@ namespace Server.Items if (Parent == from || pack != null && Parent == pack) { - DisplayTo(@from); + DisplayTo(from); } else { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 500207 ); // The spellbook must be in your backpack (and not in a container within) to open. } diff --git a/Projects/UOContent/Items/Skill Items/Misc/RepairDeed.cs b/Projects/UOContent/Items/Skill Items/Misc/RepairDeed.cs index 827388295..e9ec386a6 100644 --- a/Projects/UOContent/Items/Skill Items/Misc/RepairDeed.cs +++ b/Projects/UOContent/Items/Skill Items/Misc/RepairDeed.cs @@ -127,7 +127,7 @@ namespace Server.Items if (m_Crafter != null) { - LabelTo(@from, 1050043, m_Crafter.Name); // crafted by ~1_NAME~ + LabelTo(from, 1050043, m_Crafter.Name); // crafted by ~1_NAME~ } } @@ -170,7 +170,7 @@ namespace Server.Items { if (Check(from)) { - Repair.Do(@from, RepairSkillInfo.GetInfo(m_Skill).System, this); + Repair.Do(from, RepairSkillInfo.GetInfo(m_Skill).System, this); } } @@ -178,11 +178,11 @@ namespace Server.Items { if (!IsChildOf(from.Backpack)) { - @from.SendLocalizedMessage(1047012); // The contract must be in your backpack to use it. + from.SendLocalizedMessage(1047012); // The contract must be in your backpack to use it. } else if (!VerifyRegion(from)) { - TextDefinition.SendMessageTo(@from, RepairSkillInfo.GetInfo(m_Skill).NotNearbyMessage); + TextDefinition.SendMessageTo(from, RepairSkillInfo.GetInfo(m_Skill).NotNearbyMessage); } else { diff --git a/Projects/UOContent/Items/Skill Items/Musical Instruments/BaseInstrument.cs b/Projects/UOContent/Items/Skill Items/Musical Instruments/BaseInstrument.cs index c4e1e8c39..7b285197f 100644 --- a/Projects/UOContent/Items/Skill Items/Musical Instruments/BaseInstrument.cs +++ b/Projects/UOContent/Items/Skill Items/Musical Instruments/BaseInstrument.cs @@ -124,7 +124,7 @@ namespace Server.Items if (makersMark) { - Crafter = @from; + Crafter = from; } return quality; @@ -579,11 +579,11 @@ namespace Server.Items if (CheckMusicianship(from)) { - PlayInstrumentWell(@from); + PlayInstrumentWell(from); } else { - PlayInstrumentBadly(@from); + PlayInstrumentBadly(from); } } else diff --git a/Projects/UOContent/Items/Skill Items/Ninjitsu/Fukiya.cs b/Projects/UOContent/Items/Skill Items/Ninjitsu/Fukiya.cs index 8bbcfff63..fbc502329 100644 --- a/Projects/UOContent/Items/Skill Items/Ninjitsu/Fukiya.cs +++ b/Projects/UOContent/Items/Skill Items/Ninjitsu/Fukiya.cs @@ -80,7 +80,7 @@ namespace Server.Items { if (from.Body.IsHuman && !from.Mounted) { - @from.Animate(33, 2, 1, true, true, 0); + from.Animate(33, 2, 1, true, true, 0); } from.PlaySound(0x223); diff --git a/Projects/UOContent/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs b/Projects/UOContent/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs index a7ff91cef..3578fd94c 100644 --- a/Projects/UOContent/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs +++ b/Projects/UOContent/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs @@ -82,7 +82,7 @@ namespace Server.Items { if (from.Body.IsHuman) { - @from.Animate(@from.Mounted ? 26 : 9, 7, 1, true, false, 0); + from.Animate(from.Mounted ? 26 : 9, 7, 1, true, false, 0); } from.PlaySound(0x23A); diff --git a/Projects/UOContent/Items/Skill Items/Ninjitsu/NinjaWeapons.cs b/Projects/UOContent/Items/Skill Items/Ninjitsu/NinjaWeapons.cs index 3cee4cc3b..225c7ba6f 100644 --- a/Projects/UOContent/Items/Skill Items/Ninjitsu/NinjaWeapons.cs +++ b/Projects/UOContent/Items/Skill Items/Ninjitsu/NinjaWeapons.cs @@ -47,7 +47,7 @@ namespace Server.Items { if (CanUseWeapon(from, weapon)) { - @from.BeginTarget(weapon.WeaponMaxRange, false, TargetFlags.Harmful, OnTarget, weapon); + from.BeginTarget(weapon.WeaponMaxRange, false, TargetFlags.Harmful, OnTarget, weapon); } } @@ -69,7 +69,7 @@ namespace Server.Items if (CombatCheck(from, target)) { - Timer.DelayCall(TimeSpan.FromSeconds(1.0), OnHit, @from, target, weapon); + Timer.DelayCall(TimeSpan.FromSeconds(1.0), OnHit, from, target, weapon); } Timer.DelayCall(TimeSpan.FromSeconds(2.5), ResetUsing, from); @@ -125,7 +125,7 @@ namespace Server.Items if (weapon.Poison == null && ammo.Poison != null || weapon.Poison != null && ammo.Poison != null && weapon.Poison.Level != ammo.Poison.Level) { - Unload(@from, weapon); + Unload(from, weapon); need = Math.Min(MaxUses, ammo.UsesRemaining); } } @@ -299,11 +299,11 @@ namespace Server.Items { if (EvilOmenSpell.TryEndEffect(target)) { - target.ApplyPoison(@from, Poison.GetPoison(weapon.Poison.Level + 1)); + target.ApplyPoison(from, Poison.GetPoison(weapon.Poison.Level + 1)); } else { - target.ApplyPoison(@from, weapon.Poison); + target.ApplyPoison(from, weapon.Poison); } weapon.PoisonCharges--; diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs index 404fc2836..40c228547 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs @@ -143,15 +143,15 @@ namespace Server.Items { if (!from.InRange(m_Tub.GetWorldLocation(), 1) || !from.InRange(item.GetWorldLocation(), 1)) { - @from.SendLocalizedMessage(500446); // That is too far away. + from.SendLocalizedMessage(500446); // That is too far away. } else if (item.Parent is Mobile) { - @from.SendLocalizedMessage(500861); // Can't Dye clothing that is being worn. + from.SendLocalizedMessage(500861); // Can't Dye clothing that is being worn. } else if (dyable.Dye(from, m_Tub)) { - @from.PlaySound(0x23E); + from.PlaySound(0x23E); } } else if ((FurnitureAttribute.Check(item) || item is PotionKeg) && m_Tub.AllowFurniture) @@ -172,11 +172,11 @@ namespace Server.Items if (house == null || !house.HasLockedDownItem(item) && !house.HasSecureItem(item)) { - @from.SendLocalizedMessage(501022); // Furniture must be locked down to paint it. + from.SendLocalizedMessage(501022); // Furniture must be locked down to paint it. } else if (!house.IsCoOwner(from)) { - @from.SendLocalizedMessage(501023); // You must be the owner to use this item. + from.SendLocalizedMessage(501023); // You must be the owner to use this item. } else { diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Dyes.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Dyes.cs index 2654644b6..ed601f36e 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Dyes.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Dyes.cs @@ -7,10 +7,10 @@ namespace Server.Items { /* public bool ShowUsesRemaining { get { return false; } set { } } - + [CommandProperty( AccessLevel.GameMaster )] public virtual int UsesRemaining { get { return m_UsesRemaining; } set { m_UsesRemaining = value; } } - + private int m_UsesRemaining; */ @@ -69,15 +69,15 @@ namespace Server.Items { if (tub.MetallicHues) /* OSI has three metallic tubs now */ { - @from.SendGump(new MetallicHuePicker(@from, SetTubHue, tub)); + from.SendGump(new MetallicHuePicker(from, SetTubHue, tub)); } else if (tub.CustomHuePicker != null) { - @from.SendGump(new CustomHuePickerGump(@from, tub.CustomHuePicker, SetTubHue, tub)); + from.SendGump(new CustomHuePickerGump(from, tub.CustomHuePicker, SetTubHue, tub)); } else { - @from.SendHuePicker(new InternalPicker(tub)); + from.SendHuePicker(new InternalPicker(tub)); } } else if (tub is BlackDyeTub) diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Scissors.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Scissors.cs index 6eea8855d..86dbcbf1a 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Scissors.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Scissors.cs @@ -87,9 +87,9 @@ namespace Server.Items { if (item is IScissorable obj && (obj is PlagueBeastInnard || obj is PlagueBeastMutationCore)) { - if (CanScissor(@from, obj) && obj.Scissor(@from, m_Item)) + if (CanScissor(from, obj) && obj.Scissor(from, m_Item)) { - @from.PlaySound(0x248); + from.PlaySound(0x248); } } } @@ -97,7 +97,7 @@ namespace Server.Items { if (CanScissor(from, obj) && obj.Scissor(from, m_Item)) { - @from.PlaySound(0x248); + from.PlaySound(0x248); } } else @@ -112,7 +112,7 @@ namespace Server.Items { if (CanScissor(from, obj) && obj.Scissor(from, m_Item)) { - @from.PlaySound(0x248); + from.PlaySound(0x248); } } else diff --git a/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs b/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs index 74a7567c2..fd6095298 100644 --- a/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs +++ b/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs @@ -42,35 +42,35 @@ namespace Server.Items if (!IsChildOf(from.Backpack)) { - @from.SendLocalizedMessage(1042001); + from.SendLocalizedMessage(1042001); } else if (pm == null || pm.NpcGuild != NpcGuild.ThievesGuild) { - @from.SendLocalizedMessage(501702); + from.SendLocalizedMessage(501702); } else if (Stealing.SuspendOnMurder && pm.Kills > 0) { - @from.SendLocalizedMessage(501703); + from.SendLocalizedMessage(501703); } else if (!from.CanBeginAction()) { - @from.SendLocalizedMessage(501704); + from.SendLocalizedMessage(501704); } else if (Sigil.ExistsOn(from)) { - @from.SendLocalizedMessage(1010465); // You cannot disguise yourself while holding a sigil + from.SendLocalizedMessage(1010465); // You cannot disguise yourself while holding a sigil } else if (TransformationSpellHelper.UnderTransformation(from)) { - @from.SendLocalizedMessage(1061634); + from.SendLocalizedMessage(1061634); } else if (from.BodyMod == 183 || from.BodyMod == 184) { - @from.SendLocalizedMessage(1040002); + from.SendLocalizedMessage(1040002); } else if (!from.CanBeginAction() || from.IsBodyMod) { - @from.SendLocalizedMessage(501705); + from.SendLocalizedMessage(501705); } else { @@ -84,7 +84,7 @@ namespace Server.Items { if (ValidateUse(from)) { - @from.SendGump(new DisguiseGump(@from, this, true, false)); + from.SendGump(new DisguiseGump(from, this, true, false)); } } } diff --git a/Projects/UOContent/Items/Skill Items/Tools/BaseTool.cs b/Projects/UOContent/Items/Skill Items/Tools/BaseTool.cs index 4840a0ab1..fe5eabbff 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/BaseTool.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/BaseTool.cs @@ -70,7 +70,7 @@ namespace Server.Items if (makersMark) { - Crafter = @from; + Crafter = from; } return quality; @@ -169,11 +169,11 @@ namespace Server.Items // Blacksmithing shows the gump regardless of proximity of an anvil and forge after SE if (num > 0 && (num != 1044267 || !Core.SE)) { - @from.SendLocalizedMessage(num); + from.SendLocalizedMessage(num); } else { - @from.SendGump(new CraftGump(@from, system, this, null)); + from.SendGump(new CraftGump(from, system, this, null)); } } else diff --git a/Projects/UOContent/Items/Special/8th Anniversary Items/FountainOfLife.cs b/Projects/UOContent/Items/Special/8th Anniversary Items/FountainOfLife.cs index e17343dac..097f1ba70 100644 --- a/Projects/UOContent/Items/Special/8th Anniversary Items/FountainOfLife.cs +++ b/Projects/UOContent/Items/Special/8th Anniversary Items/FountainOfLife.cs @@ -93,7 +93,7 @@ namespace Server.Items if (allow) { - Enhance(@from); + Enhance(from); } return allow; @@ -111,7 +111,7 @@ namespace Server.Items if (allow) { - Enhance(@from); + Enhance(from); } return allow; diff --git a/Projects/UOContent/Items/Special/Bulk Order Rewards/Blacksmithy/PowderOfTemperament.cs b/Projects/UOContent/Items/Special/Bulk Order Rewards/Blacksmithy/PowderOfTemperament.cs index 4d8d64b45..cb64a2583 100644 --- a/Projects/UOContent/Items/Special/Bulk Order Rewards/Blacksmithy/PowderOfTemperament.cs +++ b/Projects/UOContent/Items/Special/Bulk Order Rewards/Blacksmithy/PowderOfTemperament.cs @@ -85,11 +85,11 @@ namespace Server.Items { if (IsChildOf(from.Backpack)) { - @from.Target = new InternalTarget(this); + from.Target = new InternalTarget(this); } else { - @from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. + from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. } } diff --git a/Projects/UOContent/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs b/Projects/UOContent/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs index 48c995a3f..75db1575f 100644 --- a/Projects/UOContent/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs +++ b/Projects/UOContent/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs @@ -25,7 +25,7 @@ namespace Server.Items } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Special/Evil Home Decor Collection/DisturbingPortrait.cs b/Projects/UOContent/Items/Special/Evil Home Decor Collection/DisturbingPortrait.cs index 1c02ab645..461b043b9 100644 --- a/Projects/UOContent/Items/Special/Evil Home Decor Collection/DisturbingPortrait.cs +++ b/Projects/UOContent/Items/Special/Evil Home Decor Collection/DisturbingPortrait.cs @@ -28,7 +28,7 @@ namespace Server.Items } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieBlue.cs b/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieBlue.cs index e9a25dfdf..a0471566c 100644 --- a/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieBlue.cs +++ b/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieBlue.cs @@ -23,7 +23,7 @@ namespace Server.Items } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieGreen.cs b/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieGreen.cs index 58e79c9ea..0421348b1 100644 --- a/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieGreen.cs +++ b/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieGreen.cs @@ -23,7 +23,7 @@ namespace Server.Items } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieLime.cs b/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieLime.cs index b84eb381c..4263cd3db 100644 --- a/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieLime.cs +++ b/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieLime.cs @@ -23,7 +23,7 @@ namespace Server.Items } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieOrange.cs b/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieOrange.cs index 41a54aa6a..e4c135522 100644 --- a/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieOrange.cs +++ b/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieOrange.cs @@ -23,7 +23,7 @@ namespace Server.Items } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieWhite.cs b/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieWhite.cs index 5308a1cc6..6d15eeb94 100644 --- a/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieWhite.cs +++ b/Projects/UOContent/Items/Special/Evil Home Decor Collection/MountedPixieWhite.cs @@ -23,7 +23,7 @@ namespace Server.Items } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Special/Evil Home Decor Collection/UnsettlingPortrait.cs b/Projects/UOContent/Items/Special/Evil Home Decor Collection/UnsettlingPortrait.cs index ed5945bae..ee92194eb 100644 --- a/Projects/UOContent/Items/Special/Evil Home Decor Collection/UnsettlingPortrait.cs +++ b/Projects/UOContent/Items/Special/Evil Home Decor Collection/UnsettlingPortrait.cs @@ -28,7 +28,7 @@ namespace Server.Items } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Special/Heritage Items/Curtains.cs b/Projects/UOContent/Items/Special/Heritage Items/Curtains.cs index d7365011a..3c8c0412a 100644 --- a/Projects/UOContent/Items/Special/Heritage Items/Curtains.cs +++ b/Projects/UOContent/Items/Special/Heritage Items/Curtains.cs @@ -34,7 +34,7 @@ namespace Server.Items if (Addon != null) { - if (@from.InRange(Location, 1)) + if (from.InRange(Location, 1)) { foreach (var c in Addon.Components) { @@ -46,7 +46,7 @@ namespace Server.Items } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } } diff --git a/Projects/UOContent/Items/Special/Heritage Items/Guillotine.cs b/Projects/UOContent/Items/Special/Heritage Items/Guillotine.cs index b66670f23..13d90f03c 100644 --- a/Projects/UOContent/Items/Special/Heritage Items/Guillotine.cs +++ b/Projects/UOContent/Items/Special/Heritage Items/Guillotine.cs @@ -121,11 +121,11 @@ namespace Server.Items if (from.Female) { - @from.PlaySound(Utility.RandomMinMax(0x150, 0x153)); + from.PlaySound(Utility.RandomMinMax(0x150, 0x153)); } else { - @from.PlaySound(Utility.RandomMinMax(0x15A, 0x15D)); + from.PlaySound(Utility.RandomMinMax(0x15A, 0x15D)); } from.LocalOverheadMessage( diff --git a/Projects/UOContent/Items/Special/Holiday/Christmas/HolidayTree.cs b/Projects/UOContent/Items/Special/Holiday/Christmas/HolidayTree.cs index 2a134f617..bf58d7e48 100644 --- a/Projects/UOContent/Items/Special/Holiday/Christmas/HolidayTree.cs +++ b/Projects/UOContent/Items/Special/Holiday/Christmas/HolidayTree.cs @@ -265,7 +265,7 @@ namespace Server.Items { if (m_Tree?.Deleted == false) { - m_Tree.OnDoubleClick(@from); + m_Tree.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Items/Special/Holiday/HolidayBell.cs b/Projects/UOContent/Items/Special/Holiday/HolidayBell.cs index 41dfaf98b..33b131645 100644 --- a/Projects/UOContent/Items/Special/Holiday/HolidayBell.cs +++ b/Projects/UOContent/Items/Special/Holiday/HolidayBell.cs @@ -82,11 +82,11 @@ { if (!from.InRange(GetWorldLocation(), 2)) { - @from.SendLocalizedMessage(500446); // That is too far away. + from.SendLocalizedMessage(500446); // That is too far away. } else { - @from.PlaySound(m_SoundID); + from.PlaySound(m_SoundID); } } diff --git a/Projects/UOContent/Items/Special/Holiday/HolidayFoods.cs b/Projects/UOContent/Items/Special/Holiday/HolidayFoods.cs index 7714fc15d..20f92bee0 100644 --- a/Projects/UOContent/Items/Special/Holiday/HolidayFoods.cs +++ b/Projects/UOContent/Items/Special/Holiday/HolidayFoods.cs @@ -28,7 +28,7 @@ namespace Server.Items { if (!m_ToothAches.TryGetValue(from, out var timer)) { - m_ToothAches[@from] = timer = new CandyCaneTimer(@from); + m_ToothAches[from] = timer = new CandyCaneTimer(from); } return timer; diff --git a/Projects/UOContent/Items/Special/Holiday/Wreath.cs b/Projects/UOContent/Items/Special/Holiday/Wreath.cs index 4dde978cd..12bb95082 100644 --- a/Projects/UOContent/Items/Special/Holiday/Wreath.cs +++ b/Projects/UOContent/Items/Special/Holiday/Wreath.cs @@ -243,11 +243,11 @@ namespace Server.Items if (northWall && westWall) { - @from.SendGump(new WreathDeedGump(@from, loc, this)); + from.SendGump(new WreathDeedGump(from, loc, this)); } else { - PlaceAddon(@from, loc, northWall, westWall); + PlaceAddon(from, loc, northWall, westWall); } } else @@ -283,7 +283,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(1062840); // The decoration must be placed next to a wall. + from.SendLocalizedMessage(1062840); // The decoration must be placed next to a wall. } if (itemID > 0) diff --git a/Projects/UOContent/Items/Special/House Raffle/HouseRaffleStone.cs b/Projects/UOContent/Items/Special/House Raffle/HouseRaffleStone.cs index 308675648..99497b5d5 100644 --- a/Projects/UOContent/Items/Special/House Raffle/HouseRaffleStone.cs +++ b/Projects/UOContent/Items/Special/House Raffle/HouseRaffleStone.cs @@ -455,11 +455,11 @@ namespace Server.Items if (m_State == HouseRaffleState.Inactive) { - list.Add(new ActivateEntry(@from, this)); + list.Add(new ActivateEntry(from, this)); } else { - list.Add(new ManagementEntry(@from, this)); + list.Add(new ManagementEntry(from, this)); } } } @@ -479,15 +479,15 @@ namespace Server.Items if (HasEntered(from)) { - @from.SendMessage(MessageHue, "You have already entered this plot's raffle."); + from.SendMessage(MessageHue, "You have already entered this plot's raffle."); } else if (IsAtIPLimit(from)) { - @from.SendMessage(MessageHue, "You may not enter this plot's raffle."); + from.SendMessage(MessageHue, "You may not enter this plot's raffle."); } else { - @from.SendGump( + from.SendGump( new WarningGump( 1150470, 0x7F00, @@ -495,7 +495,7 @@ namespace Server.Items 0xFFFFFF, 420, 280, - okay => Purchase_Callback(@from, okay) + okay => Purchase_Callback(from, okay) ) ); // CONFIRM TICKET PURCHASE } diff --git a/Projects/UOContent/Items/Special/ML/BaseImprisonedMobile.cs b/Projects/UOContent/Items/Special/ML/BaseImprisonedMobile.cs index 050209954..f4a3e9519 100644 --- a/Projects/UOContent/Items/Special/ML/BaseImprisonedMobile.cs +++ b/Projects/UOContent/Items/Special/ML/BaseImprisonedMobile.cs @@ -20,11 +20,11 @@ namespace Server.Items { if (IsChildOf(from.Backpack)) { - @from.SendGump(new ConfirmBreakCrystalGump(this)); + from.SendGump(new ConfirmBreakCrystalGump(this)); } else { - @from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. + from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. } } diff --git a/Projects/UOContent/Items/Special/MonsterStatuette.cs b/Projects/UOContent/Items/Special/MonsterStatuette.cs index 0bbe228bd..5741cc2dc 100644 --- a/Projects/UOContent/Items/Special/MonsterStatuette.cs +++ b/Projects/UOContent/Items/Special/MonsterStatuette.cs @@ -319,7 +319,7 @@ namespace Server.Items if (newValue && !m_Statuette.IsLockedDown) { - @from.SendLocalizedMessage(502693); // Remember, this only works when locked down. + from.SendLocalizedMessage(502693); // Remember, this only works when locked down. } } else diff --git a/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastBackpack.cs b/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastBackpack.cs index e0115d399..672285179 100644 --- a/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastBackpack.cs +++ b/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastBackpack.cs @@ -115,7 +115,7 @@ namespace Server.Items { if (dropped is PlagueBeastInnard || dropped is PlagueBeastGland) { - return base.TryDropItem(@from, dropped, sendFullMessage); + return base.TryDropItem(from, dropped, sendFullMessage); } return false; @@ -141,7 +141,7 @@ namespace Server.Items if (cx >= x && cx <= x + r.Width && cy >= y && cy <= y + r.Height) { - innard.OnDragDrop(@from, item); + innard.OnDragDrop(from, item); break; } } diff --git a/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastBlood.cs b/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastBlood.cs index 686784c54..8a504850c 100644 --- a/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastBlood.cs +++ b/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastBlood.cs @@ -69,7 +69,7 @@ namespace Server.Items { if (pack.Items[i] is PlagueBeastMainOrgan main && main.Complete) { - main.FinishOpening(@from); + main.FinishOpening(from); } } } diff --git a/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastOrgans.cs b/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastOrgans.cs index b5d4cbd77..e4c1b3f72 100644 --- a/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastOrgans.cs +++ b/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastOrgans.cs @@ -121,7 +121,7 @@ namespace Server.Items { if (!Opened) { - FinishOpening(@from); + FinishOpening(from); } } @@ -306,7 +306,7 @@ namespace Server.Items { if (!Opened && m_Veins > 0 && --m_Veins == 0) { - FinishOpening(@from); + FinishOpening(from); } } else @@ -546,7 +546,7 @@ namespace Server.Items if (m_Brains == 4) { - FinishOpening(@from); + FinishOpening(from); } return true; diff --git a/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastVein.cs b/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastVein.cs index a110f3f8a..f6439a1a2 100644 --- a/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastVein.cs +++ b/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastVein.cs @@ -61,7 +61,7 @@ namespace Server.Items if (Organ is PlagueBeastRubbleOrgan organ) { - organ.OnVeinCut(@from, this); + organ.OnVeinCut(from, this); } } diff --git a/Projects/UOContent/Items/Special/Rares/Containers/BaseWaterContainer.cs b/Projects/UOContent/Items/Special/Rares/Containers/BaseWaterContainer.cs index debc3e849..9c353c6b5 100644 --- a/Projects/UOContent/Items/Special/Rares/Containers/BaseWaterContainer.cs +++ b/Projects/UOContent/Items/Special/Rares/Containers/BaseWaterContainer.cs @@ -59,7 +59,7 @@ { if (IsEmpty) { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } @@ -73,11 +73,11 @@ { if (Name == null) { - LabelTo(@from, LabelNumber); + LabelTo(from, LabelNumber); } else { - LabelTo(@from, Name); + LabelTo(from, Name); } } } @@ -92,11 +92,11 @@ { if (Name == null) { - LabelTo(@from, LabelNumber); + LabelTo(from, LabelNumber); } else { - LabelTo(@from, Name); + LabelTo(from, Name); } } } diff --git a/Projects/UOContent/Items/Special/RewardCake.cs b/Projects/UOContent/Items/Special/RewardCake.cs index 718c764f9..af77b591c 100644 --- a/Projects/UOContent/Items/Special/RewardCake.cs +++ b/Projects/UOContent/Items/Special/RewardCake.cs @@ -42,7 +42,7 @@ namespace Server.Items { if (!from.InRange(GetWorldLocation(), 1)) { - @from.LocalOverheadMessage(MessageType.Regular, 906, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 906, 1019045); // I can't reach that. } } diff --git a/Projects/UOContent/Items/Special/Solen Items/BagOfSending.cs b/Projects/UOContent/Items/Special/Solen Items/BagOfSending.cs index c1e2c2436..142664a06 100644 --- a/Projects/UOContent/Items/Special/Solen Items/BagOfSending.cs +++ b/Projects/UOContent/Items/Special/Solen Items/BagOfSending.cs @@ -122,7 +122,7 @@ namespace Server.Items if (from.Alive) { - list.Add(new UseBagEntry(this, Charges > 0 && IsChildOf(@from.Backpack))); + list.Add(new UseBagEntry(this, Charges > 0 && IsChildOf(from.Backpack))); } } @@ -130,24 +130,24 @@ namespace Server.Items { if (from.Region.IsPartOf()) { - @from.SendMessage("You may not do that in jail."); + from.SendMessage("You may not do that in jail."); } else if (!IsChildOf(from.Backpack)) { MessageHelper.SendLocalizedMessageTo( this, - @from, + from, 1062334, 0x59 ); // The bag of sending must be in your backpack. } else if (Charges == 0) { - MessageHelper.SendLocalizedMessageTo(this, @from, 1042544, 0x59); // This item is out of charges. + MessageHelper.SendLocalizedMessageTo(this, from, 1042544, 0x59); // This item is out of charges. } else { - @from.Target = new SendTarget(this); + from.Target = new SendTarget(this); } } @@ -210,7 +210,7 @@ namespace Server.Items if (from.CheckAlive()) { - m_Bag.OnDoubleClick(@from); + m_Bag.OnDoubleClick(from); } } } diff --git a/Projects/UOContent/Items/Special/Solen Items/BallOfSummoning.cs b/Projects/UOContent/Items/Special/Solen Items/BallOfSummoning.cs index b9262625a..f589a1058 100644 --- a/Projects/UOContent/Items/Special/Solen Items/BallOfSummoning.cs +++ b/Projects/UOContent/Items/Special/Solen Items/BallOfSummoning.cs @@ -148,11 +148,11 @@ namespace Server.Items if (Pet == null) { - LinkPet(@from); + LinkPet(from); } else { - CastSummonPet(@from); + CastSummonPet(from); } } @@ -251,11 +251,11 @@ namespace Server.Items { if (Core.ML) { - new PetSummoningSpell(this, @from).Cast(); + new PetSummoningSpell(this, from).Cast(); } else { - SummonPet(@from); + SummonPet(from); } } } @@ -277,7 +277,7 @@ namespace Server.Items if (pet.Summoned) { - pet.SummonMaster = @from; + pet.SummonMaster = from; } pet.ControlTarget = from; @@ -379,7 +379,7 @@ namespace Server.Items if (from.CheckAlive()) { - m_Callback(@from); + m_Callback(from); } } } diff --git a/Projects/UOContent/Items/Special/Solen Items/BraceletOfBinding.cs b/Projects/UOContent/Items/Special/Solen Items/BraceletOfBinding.cs index b3b920f9e..172d21d29 100644 --- a/Projects/UOContent/Items/Special/Solen Items/BraceletOfBinding.cs +++ b/Projects/UOContent/Items/Special/Solen Items/BraceletOfBinding.cs @@ -127,11 +127,11 @@ namespace Server.Items if (Bound == null) { - Bind(@from); + Bind(from); } else { - Activate(@from); + Activate(from); } } @@ -182,11 +182,11 @@ namespace Server.Items if (!IsChildOf(from)) { - @from.SendLocalizedMessage(1042664); // You must have the object in your backpack to use it. + from.SendLocalizedMessage(1042664); // You must have the object in your backpack to use it. } else { - CheckUse(@from, true); + CheckUse(from, true); } } @@ -289,7 +289,7 @@ namespace Server.Items if (successMessage) { - @from.SendLocalizedMessage(1054015); // The bracelet's twin is available for transport. + from.SendLocalizedMessage(1054015); // The bracelet's twin is available for transport. } return true; @@ -389,7 +389,7 @@ namespace Server.Items if (from.CheckAlive()) { - m_Callback(@from); + m_Callback(from); } } } diff --git a/Projects/UOContent/Items/Special/Solen Items/PowderOfTranslocation.cs b/Projects/UOContent/Items/Special/Solen Items/PowderOfTranslocation.cs index 20abedc94..4d0ef2ac4 100644 --- a/Projects/UOContent/Items/Special/Solen Items/PowderOfTranslocation.cs +++ b/Projects/UOContent/Items/Special/Solen Items/PowderOfTranslocation.cs @@ -30,11 +30,11 @@ namespace Server.Items { if (from.InRange(GetWorldLocation(), 2)) { - @from.Target = new InternalTarget(this); + from.Target = new InternalTarget(this); } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } } @@ -108,7 +108,7 @@ namespace Server.Items if (transItem is Item item) { - MessageHelper.SendLocalizedMessageTo(item, @from, 1054139, transItem.TranslocationItemName, 0x43); + MessageHelper.SendLocalizedMessageTo(item, from, 1054139, transItem.TranslocationItemName, 0x43); } } } diff --git a/Projects/UOContent/Items/Special/SoulStone.cs b/Projects/UOContent/Items/Special/SoulStone.cs index efb42d02f..3035fa8e3 100644 --- a/Projects/UOContent/Items/Special/SoulStone.cs +++ b/Projects/UOContent/Items/Special/SoulStone.cs @@ -261,11 +261,11 @@ namespace Server.Items if (IsEmpty) { - @from.SendGump(new SelectSkillGump(this, @from)); + from.SendGump(new SelectSkillGump(this, from)); } else { - @from.SendGump(new ConfirmTransferGump(this, @from)); + from.SendGump(new ConfirmTransferGump(this, from)); } } @@ -763,21 +763,21 @@ namespace Server.Items if (requiredAmount > 0) { - for (var i = 0; i < @from.Skills.Length; ++i) + for (var i = 0; i < from.Skills.Length; ++i) { - if (@from.Skills[i].Lock != SkillLock.Down) + if (from.Skills[i].Lock != SkillLock.Down) { continue; } - if (requiredAmount >= @from.Skills[i].BaseFixedPoint) + if (requiredAmount >= from.Skills[i].BaseFixedPoint) { - requiredAmount -= @from.Skills[i].BaseFixedPoint; - @from.Skills[i].Base = 0.0; + requiredAmount -= from.Skills[i].BaseFixedPoint; + from.Skills[i].Base = 0.0; } else { - @from.Skills[i].BaseFixedPoint -= requiredAmount; + from.Skills[i].BaseFixedPoint -= requiredAmount; break; } } @@ -825,7 +825,7 @@ namespace Server.Items { if (--frag.UsesRemaining <= 0) { - @from.SendLocalizedMessage(1070974); // You have used up your soulstone fragment. + from.SendLocalizedMessage(1070974); // You have used up your soulstone fragment. } } } @@ -927,11 +927,11 @@ namespace Server.Items if (m_Stone.IsEmpty) { - @from.SendGump(new SelectSkillGump(m_Stone, @from)); + from.SendGump(new SelectSkillGump(m_Stone, from)); } else { - @from.SendGump(new ConfirmTransferGump(m_Stone, @from)); + from.SendGump(new ConfirmTransferGump(m_Stone, from)); } } } @@ -1025,7 +1025,7 @@ namespace Server.Items { if (m_UsesRemaining <= 0) { - @from.SendLocalizedMessage(1070975); // That soulstone fragment has no more uses. + from.SendLocalizedMessage(1070975); // That soulstone fragment has no more uses. return false; } } diff --git a/Projects/UOContent/Items/Special/Special Scrolls/PowerScroll.cs b/Projects/UOContent/Items/Special/Special Scrolls/PowerScroll.cs index 9def6904d..dc08615da 100644 --- a/Projects/UOContent/Items/Special/Special Scrolls/PowerScroll.cs +++ b/Projects/UOContent/Items/Special/Special Scrolls/PowerScroll.cs @@ -58,7 +58,7 @@ namespace Server.Items SkillName.Mysticism, SkillName.Imbuing }; - + private static SkillName[] m_HSSkills = new SkillName[] { SkillName.Fishing @@ -185,11 +185,11 @@ namespace Server.Items if (level >= 0.0 && level <= 3.0 && Value % 5.0 == 0.0) { - LabelTo(@from, 1049639 + (int)level, GetNameLocalized()); + LabelTo(from, 1049639 + (int)level, GetNameLocalized()); } else { - LabelTo(@from, "a power scroll of {0} ({1} Skill)", GetName(), Value); + LabelTo(from, "a power scroll of {0} ({1} Skill)", GetName(), Value); } } diff --git a/Projects/UOContent/Items/Special/Special Scrolls/ScrollofAlacrity.cs b/Projects/UOContent/Items/Special/Special Scrolls/ScrollofAlacrity.cs index 2dc10140e..d9320fc2c 100644 --- a/Projects/UOContent/Items/Special/Special Scrolls/ScrollofAlacrity.cs +++ b/Projects/UOContent/Items/Special/Special Scrolls/ScrollofAlacrity.cs @@ -54,7 +54,7 @@ namespace Server.Items if (!objective.Expired && objective is GainSkillObjectiveInstance objectiveInstance && objectiveInstance.Handles(Skill)) { - @from.SendMessage("You are already under the effect of an enhanced skillgain quest."); + from.SendMessage("You are already under the effect of an enhanced skillgain quest."); return false; } } diff --git a/Projects/UOContent/Items/Special/Special Scrolls/ScrollofTranscendence.cs b/Projects/UOContent/Items/Special/Special Scrolls/ScrollofTranscendence.cs index ce2236287..5c8092824 100644 --- a/Projects/UOContent/Items/Special/Special Scrolls/ScrollofTranscendence.cs +++ b/Projects/UOContent/Items/Special/Special Scrolls/ScrollofTranscendence.cs @@ -65,7 +65,7 @@ namespace Server.Items if (!objective.Expired && objective is GainSkillObjectiveInstance objectiveInstance && objectiveInstance.Handles(Skill)) { - @from.SendMessage("You are already under the effect of an enhanced skillgain quest."); + from.SendMessage("You are already under the effect of an enhanced skillgain quest."); return false; } } @@ -108,9 +108,9 @@ namespace Server.Items for (var i = 0; i < ns; i++) // skill must point down and its value must be enough { - if (@from.Skills[i].Lock == SkillLock.Down && @from.Skills[i].Base >= newValue) + if (from.Skills[i].Lock == SkillLock.Down && from.Skills[i].Base >= newValue) { - @from.Skills[i].Base -= newValue; + from.Skills[i].Base -= newValue; canGain = true; break; } diff --git a/Projects/UOContent/Items/Special/Special Scrolls/StatScroll.cs b/Projects/UOContent/Items/Special/Special Scrolls/StatScroll.cs index 0fa9fa8e6..eabd749db 100644 --- a/Projects/UOContent/Items/Special/Special Scrolls/StatScroll.cs +++ b/Projects/UOContent/Items/Special/Special Scrolls/StatScroll.cs @@ -69,11 +69,11 @@ namespace Server.Items if (level >= 0 && level <= 4 && (int)Value % 5 == 0) { - LabelTo(@from, 1049463 + level, "#1049476"); + LabelTo(from, 1049463 + level, "#1049476"); } else { - LabelTo(@from, "a scroll of power ({0}{1} Maximum Stats)", Value - 225 >= 0 ? "+" : "", Value - 225); + LabelTo(from, "a scroll of power ({0}{1} Maximum Stats)", Value - 225 >= 0 ? "+" : "", Value - 225); } } @@ -115,7 +115,7 @@ namespace Server.Items } else { - @from.StatCap = (int)Value; + from.StatCap = (int)Value; } Effects.SendLocationParticles( diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs b/Projects/UOContent/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs index 8bf3a9528..67c8ab2d0 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs @@ -316,7 +316,7 @@ namespace Server.Items if (!Deleted) { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs b/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs index 6f2868b64..a2d0becdf 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs @@ -164,11 +164,11 @@ namespace Server.Items if (Validate(keg) > 0) { - @from.SendGump(new InternalGump(this, keg)); + from.SendGump(new InternalGump(this, keg)); } else { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1076198 ); // You do not have a full keg of explosion potions needed to recharge the cannon. } @@ -326,7 +326,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(1076203); // Target out of range. + from.SendLocalizedMessage(1076203); // Target out of range. } } else @@ -457,7 +457,7 @@ namespace Server.Items if (!Deleted) { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/MiningCart.cs b/Projects/UOContent/Items/Special/Veteran Rewards/MiningCart.cs index b004148c6..f5c35ace1 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/MiningCart.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/MiningCart.cs @@ -139,7 +139,7 @@ namespace Server.Items if (!from.InRange(GetWorldLocation(), 2) || !from.InLOS(this) || !(from.Z - Z > -3 && from.Z - Z < 3)) { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if (house?.HasSecureAccess(from, SecureLevel.Friends) == true) { @@ -167,10 +167,10 @@ namespace Server.Items // ReSharper disable once PossibleNullReferenceException ingots.Amount = amount; - if (!@from.PlaceInBackpack(ingots)) + if (!from.PlaceInBackpack(ingots)) { ingots.Delete(); - @from.SendLocalizedMessage(1078837); // Your backpack is full! Please make room and try again. + from.SendLocalizedMessage(1078837); // Your backpack is full! Please make room and try again. } else { @@ -180,7 +180,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(1094725); // There are no more resources available at this time. + from.SendLocalizedMessage(1094725); // There are no more resources available at this time. } break; @@ -212,10 +212,10 @@ namespace Server.Items var amount = Math.Min(5, Gems); gems.Amount = amount; - if (!@from.PlaceInBackpack(gems)) + if (!from.PlaceInBackpack(gems)) { gems.Delete(); - @from.SendLocalizedMessage(1078837); // Your backpack is full! Please make room and try again. + from.SendLocalizedMessage(1078837); // Your backpack is full! Please make room and try again. } else { @@ -225,7 +225,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(1094725); // There are no more resources available at this time. + from.SendLocalizedMessage(1094725); // There are no more resources available at this time. } break; @@ -233,7 +233,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(1061637); // You are not allowed to access this. + from.SendLocalizedMessage(1061637); // You are not allowed to access this. } } @@ -347,7 +347,7 @@ namespace Server.Items if (!Deleted) { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/MinotaurStatue.cs b/Projects/UOContent/Items/Special/Veteran Rewards/MinotaurStatue.cs index f0c93a786..3e8129b20 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/MinotaurStatue.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/MinotaurStatue.cs @@ -138,7 +138,7 @@ namespace Server.Items if (!Deleted) { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/TreeStump.cs b/Projects/UOContent/Items/Special/Veteran Rewards/TreeStump.cs index c7db7e91b..1777cbbd2 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/TreeStump.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/TreeStump.cs @@ -245,7 +245,7 @@ namespace Server.Items if (!Deleted) { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/WeaponEngravingTool.cs b/Projects/UOContent/Items/Special/Veteran Rewards/WeaponEngravingTool.cs index b8d1d93dd..878e2876f 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/WeaponEngravingTool.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/WeaponEngravingTool.cs @@ -85,11 +85,11 @@ namespace Server.Items { if (from.Backpack.FindItemByType() != null) { - @from.SendGump(new ConfirmGump(this, null)); + from.SendGump(new ConfirmGump(this, null)); } else { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1076166 ); // You do not have a blue diamond needed to recharge the engraving tool. } diff --git a/Projects/UOContent/Items/Suits/BaseSuit.cs b/Projects/UOContent/Items/Suits/BaseSuit.cs index 2b206d1aa..8e0475f59 100644 --- a/Projects/UOContent/Items/Suits/BaseSuit.cs +++ b/Projects/UOContent/Items/Suits/BaseSuit.cs @@ -60,7 +60,7 @@ namespace Server.Items { if (Validate()) { - base.OnSingleClick(@from); + base.OnSingleClick(from); } } @@ -68,7 +68,7 @@ namespace Server.Items { if (Validate()) { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } @@ -78,7 +78,7 @@ namespace Server.Items { if (from.AccessLevel < AccessLevel) { - @from.SendMessage("You may not wear this."); + from.SendMessage("You may not wear this."); } return from.AccessLevel >= AccessLevel; diff --git a/Projects/UOContent/Items/Talismans/BaseTalisman.cs b/Projects/UOContent/Items/Talismans/BaseTalisman.cs index ba1fccac3..b4ae53147 100644 --- a/Projects/UOContent/Items/Talismans/BaseTalisman.cs +++ b/Projects/UOContent/Items/Talismans/BaseTalisman.cs @@ -498,19 +498,19 @@ namespace Server.Items if (item is Board) { - @from.SendLocalizedMessage(1075000); // You have been given some wooden boards. + from.SendLocalizedMessage(1075000); // You have been given some wooden boards. } else if (item is IronIngot) { - @from.SendLocalizedMessage(1075001); // You have been given some ingots. + from.SendLocalizedMessage(1075001); // You have been given some ingots. } else if (item is Bandage) { - @from.SendLocalizedMessage(1075002); // You have been given some clean bandages. + from.SendLocalizedMessage(1075002); // You have been given some clean bandages. } else if (m_Summoner?.Name != null) { - @from.SendLocalizedMessage(1074853, m_Summoner.Name.ToString()); // You have been given ~1_name~ + from.SendLocalizedMessage(1074853, m_Summoner.Name.ToString()); // You have been given ~1_name~ } } else if (obj is BaseCreature mob) @@ -542,7 +542,7 @@ namespace Server.Items if (m_Removal != TalismanRemoval.None) { - @from.Target = new TalismanTarget(this); + from.Target = new TalismanTarget(this); } } @@ -1272,7 +1272,7 @@ namespace Server.Items if (target != from) { - @from.SendLocalizedMessage(1072409); // Your targets curses have been lifted + from.SendLocalizedMessage(1072409); // Your targets curses have been lifted } break; @@ -1299,7 +1299,7 @@ namespace Server.Items if (target != from) { - @from.SendLocalizedMessage(1072406); // Your Targets lasting damage effects have been removed! + from.SendLocalizedMessage(1072406); // Your Targets lasting damage effects have been removed! } break; @@ -1324,7 +1324,7 @@ namespace Server.Items if (target != from) { - @from.SendLocalizedMessage(1072403); // Your target's wards have been removed! + from.SendLocalizedMessage(1072403); // Your target's wards have been removed! } break; diff --git a/Projects/UOContent/Items/Traps/GiantSpikeTrap.cs b/Projects/UOContent/Items/Traps/GiantSpikeTrap.cs index b0a49094f..b0679a036 100644 --- a/Projects/UOContent/Items/Traps/GiantSpikeTrap.cs +++ b/Projects/UOContent/Items/Traps/GiantSpikeTrap.cs @@ -30,7 +30,7 @@ namespace Server.Items if (from.Alive && CheckRange(from.Location, 0)) { - SpellHelper.Damage(TimeSpan.FromTicks(1), @from, @from, Utility.Dice(10, 7, 0)); + SpellHelper.Damage(TimeSpan.FromTicks(1), from, from, Utility.Dice(10, 7, 0)); } } diff --git a/Projects/UOContent/Items/Wands/BaseWand.cs b/Projects/UOContent/Items/Wands/BaseWand.cs index c864693f0..41d05b145 100644 --- a/Projects/UOContent/Items/Wands/BaseWand.cs +++ b/Projects/UOContent/Items/Wands/BaseWand.cs @@ -95,7 +95,7 @@ namespace Server.Items if (Charges == 0) { - @from.SendLocalizedMessage(1019073); // This item is out of charges. + from.SendLocalizedMessage(1019073); // This item is out of charges. } ApplyDelayTo(from); @@ -124,11 +124,11 @@ namespace Server.Items { if (Charges > 0) { - OnWandUse(@from); + OnWandUse(from); } else { - @from.SendLocalizedMessage(1019073); // This item is out of charges. + from.SendLocalizedMessage(1019073); // This item is out of charges. } } else @@ -301,7 +301,7 @@ namespace Server.Items if (OnWandTarget(from, o)) { - ConsumeCharge(@from); + ConsumeCharge(from); } } diff --git a/Projects/UOContent/Items/Wands/IDWand.cs b/Projects/UOContent/Items/Wands/IDWand.cs index 3fd6e9a30..30670ef39 100644 --- a/Projects/UOContent/Items/Wands/IDWand.cs +++ b/Projects/UOContent/Items/Wands/IDWand.cs @@ -44,7 +44,7 @@ namespace Server.Items if (!Core.AOS) { - item.OnSingleClick(@from); + item.OnSingleClick(from); } return true; diff --git a/Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs b/Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs index f216cfde3..3dbd092f3 100644 --- a/Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs +++ b/Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs @@ -208,14 +208,14 @@ namespace Server.Items if (reqTactics) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1079308, reqSkill.ToString() ); // You need ~1_SKILL_REQUIREMENT~ weapon and tactics skill to perform that attack } else { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1060182, reqSkill.ToString() ); // You need ~1_SKILL_REQUIREMENT~ weapon skill to perform that attack diff --git a/Projects/UOContent/Items/Weapons/Axes/BaseAxe.cs b/Projects/UOContent/Items/Weapons/Axes/BaseAxe.cs index c7dae8b37..e25f029fb 100644 --- a/Projects/UOContent/Items/Weapons/Axes/BaseAxe.cs +++ b/Projects/UOContent/Items/Weapons/Axes/BaseAxe.cs @@ -108,7 +108,7 @@ namespace Server.Items if (!(HarvestSystem is Mining)) { - @from.SendLocalizedMessage(1010018); // What do you want to use this item on? + from.SendLocalizedMessage(1010018); // What do you want to use this item on? } HarvestSystem.BeginHarvesting(from, this); @@ -120,7 +120,7 @@ namespace Server.Items if (HarvestSystem != null) { - BaseHarvestTool.AddContextMenuEntries(@from, this, list, HarvestSystem); + BaseHarvestTool.AddContextMenuEntries(from, this, list, HarvestSystem); } } diff --git a/Projects/UOContent/Items/Weapons/Knives/ThrowingDagger.cs b/Projects/UOContent/Items/Weapons/Knives/ThrowingDagger.cs index 2e2d80a02..0bb223cc7 100644 --- a/Projects/UOContent/Items/Weapons/Knives/ThrowingDagger.cs +++ b/Projects/UOContent/Items/Weapons/Knives/ThrowingDagger.cs @@ -61,23 +61,23 @@ namespace Server.Items if (!from.Items.Contains(m_Dagger)) { - @from.SendMessage("You must be holding that weapon to use it."); + from.SendMessage("You must be holding that weapon to use it."); } else if (targeted is Mobile m) { - if (m != @from && @from.HarmfulCheck(m)) + if (m != from && from.HarmfulCheck(m)) { - var to = @from.GetDirectionTo(m); + var to = from.GetDirectionTo(m); - @from.Direction = to; + from.Direction = to; - @from.Animate(@from.Mounted ? 26 : 9, 7, 1, true, false, 0); + from.Animate(from.Mounted ? 26 : 9, 7, 1, true, false, 0); if (Utility.RandomDouble() >= Math.Sqrt(m.Dex / 100.0) * 0.8) { - @from.MovingEffect(m, 0x1BFE, 7, 1, false, false, 0x481, 0); + from.MovingEffect(m, 0x1BFE, 7, 1, false, false, 0x481, 0); - AOS.Damage(m, @from, Utility.Random(5, @from.Str / 10), 100, 0, 0, 0, 0); + AOS.Damage(m, from, Utility.Random(5, from.Str / 10), 100, 0, 0, 0, 0); m_Dagger.MoveToWorld(m.Location, m.Map); } @@ -125,9 +125,9 @@ namespace Server.Items m_Dagger.MoveToWorld(new Point3D(x, y, m.Z), m.Map); - @from.MovingEffect(m_Dagger, 0x1BFE, 7, 1, false, false, 0x481, 0); + from.MovingEffect(m_Dagger, 0x1BFE, 7, 1, false, false, 0x481, 0); - @from.SendMessage("You miss."); + from.SendMessage("You miss."); } } } diff --git a/Projects/UOContent/Items/Weapons/PoleArms/BasePoleArm.cs b/Projects/UOContent/Items/Weapons/PoleArms/BasePoleArm.cs index b8858a825..6825b2a4a 100644 --- a/Projects/UOContent/Items/Weapons/PoleArms/BasePoleArm.cs +++ b/Projects/UOContent/Items/Weapons/PoleArms/BasePoleArm.cs @@ -58,11 +58,11 @@ namespace Server.Items if (IsChildOf(from.Backpack) || Parent == from) { - HarvestSystem.BeginHarvesting(@from, this); + HarvestSystem.BeginHarvesting(from, this); } else { - @from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. + from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. } } @@ -72,7 +72,7 @@ namespace Server.Items if (HarvestSystem != null) { - BaseHarvestTool.AddContextMenuEntries(@from, this, list, HarvestSystem); + BaseHarvestTool.AddContextMenuEntries(from, this, list, HarvestSystem); } } diff --git a/Projects/UOContent/Items/Weapons/Staves/ShepherdsCrook.cs b/Projects/UOContent/Items/Weapons/Staves/ShepherdsCrook.cs index 9c0d3b5f5..390162a07 100644 --- a/Projects/UOContent/Items/Weapons/Staves/ShepherdsCrook.cs +++ b/Projects/UOContent/Items/Weapons/Staves/ShepherdsCrook.cs @@ -159,7 +159,7 @@ namespace Server.Items MessageType.Regular, 0x3B2, 502471, - @from.NetState + from.NetState ); // That wasn't even challenging. } diff --git a/Projects/UOContent/Misc/Animations.cs b/Projects/UOContent/Misc/Animations.cs index 201b0be52..da8eb527e 100644 --- a/Projects/UOContent/Misc/Animations.cs +++ b/Projects/UOContent/Misc/Animations.cs @@ -18,7 +18,7 @@ namespace Server.Misc if (action > 0 && from.Alive && !from.Mounted && from.Body.IsHuman) { - @from.Animate(action, 5, 1, true, false, 0); + from.Animate(action, 5, 1, true, false, 0); } } } diff --git a/Projects/UOContent/Misc/Gifts/Winter2004/Mistletoe.cs b/Projects/UOContent/Misc/Gifts/Winter2004/Mistletoe.cs index af4b98894..344b5346c 100644 --- a/Projects/UOContent/Misc/Gifts/Winter2004/Mistletoe.cs +++ b/Projects/UOContent/Misc/Gifts/Winter2004/Mistletoe.cs @@ -249,11 +249,11 @@ namespace Server.Items if (northWall && westWall) { - @from.SendGump(new MistletoeDeedGump(@from, loc, this)); + from.SendGump(new MistletoeDeedGump(from, loc, this)); } else { - PlaceAddon(@from, loc, northWall, westWall); + PlaceAddon(from, loc, northWall, westWall); } } else @@ -289,7 +289,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(1070883); // The mistletoe must be placed next to a wall. + from.SendLocalizedMessage(1070883); // The mistletoe must be placed next to a wall. } if (itemID > 0) diff --git a/Projects/UOContent/Misc/HardwareInfo.cs b/Projects/UOContent/Misc/HardwareInfo.cs index abe79630f..898501da0 100644 --- a/Projects/UOContent/Misc/HardwareInfo.cs +++ b/Projects/UOContent/Misc/HardwareInfo.cs @@ -113,21 +113,21 @@ namespace Server if (hwInfo != null) { CommandLogging.WriteLine( - @from, + from, "{0} {1} viewing hardware info of {2}", - @from.AccessLevel, - CommandLogging.Format(@from), + from.AccessLevel, + CommandLogging.Format(from), CommandLogging.Format(m) ); } if (hwInfo != null) { - @from.SendGump(new PropertiesGump(@from, hwInfo)); + from.SendGump(new PropertiesGump(from, hwInfo)); } else { - @from.SendMessage("No hardware information for that account was found."); + from.SendMessage("No hardware information for that account was found."); } } else diff --git a/Projects/UOContent/Misc/Keywords.cs b/Projects/UOContent/Misc/Keywords.cs index 6770fc981..fa0d95cca 100644 --- a/Projects/UOContent/Misc/Keywords.cs +++ b/Projects/UOContent/Misc/Keywords.cs @@ -23,7 +23,7 @@ namespace Server.Misc { case 0x002A: // *i resign from my guild* { - ((Guild)@from.Guild)?.RemoveMember(@from); + ((Guild)from.Guild)?.RemoveMember(from); break; } @@ -31,16 +31,16 @@ namespace Server.Misc { if (!Core.SE) { - @from.SendMessage("Short Term Murders : {0}", @from.ShortTermMurders); - @from.SendMessage("Long Term Murders : {0}", @from.Kills); + from.SendMessage("Short Term Murders : {0}", from.ShortTermMurders); + from.SendMessage("Long Term Murders : {0}", from.Kills); } else { - @from.SendMessage( + from.SendMessage( 0x3B2, "Short Term Murders: {0} Long Term Murders: {1}", - @from.ShortTermMurders, - @from.Kills + from.ShortTermMurders, + from.Kills ); } @@ -48,7 +48,7 @@ namespace Server.Misc } case 0x0035: // i renounce my young player status* { - if (@from is PlayerMobile mobile && mobile.Young && !mobile.HasGump()) + if (from is PlayerMobile mobile && mobile.Young && !mobile.HasGump()) { mobile.SendGump(new RenounceYoungGump()); } diff --git a/Projects/UOContent/Misc/LootPack.cs b/Projects/UOContent/Misc/LootPack.cs index bb0f45fa5..5fb39f601 100644 --- a/Projects/UOContent/Misc/LootPack.cs +++ b/Projects/UOContent/Misc/LootPack.cs @@ -183,7 +183,7 @@ namespace Server if (item != null) { - if (!item.Stackable || !cont.TryDropItem(@from, item, false)) + if (!item.Stackable || !cont.TryDropItem(from, item, false)) { cont.DropItem(item); } @@ -572,7 +572,7 @@ namespace Server { new LootPackItem( typeof( ParrotItem ), 1 ) }; - + public static readonly LootPack Parrot = new LootPack( new LootPackEntry[] { new LootPackEntry( false, ParrotItem, 10.00, 1 ) @@ -697,7 +697,7 @@ namespace Server if (rnd < item.Chance) { - return Mutate(@from, luckChance, item.Construct(IsInTokuno(@from), IsMondain(@from))); + return Mutate(from, luckChance, item.Construct(IsInTokuno(from), IsMondain(from))); } rnd -= item.Chance; @@ -822,7 +822,7 @@ namespace Server if (from != null && weapon.AccuracyLevel == 0 && weapon.DamageLevel == 0 && weapon.DurabilityLevel == 0 && weapon.Slayer == SlayerName.None && Utility.Random(100) < 5) { - weapon.Slayer = SlayerGroup.GetLootSlayerType(@from.GetType()); + weapon.Slayer = SlayerGroup.GetLootSlayerType(from.GetType()); } } else if (item is BaseArmor armor) @@ -849,7 +849,7 @@ namespace Server } else { - slayer = SlayerGroup.GetLootSlayerType(@from.GetType()); + slayer = SlayerGroup.GetLootSlayerType(from.GetType()); } if (slayer == SlayerName.None) diff --git a/Projects/UOContent/Misc/MondainsLegacy.cs b/Projects/UOContent/Misc/MondainsLegacy.cs index 3c097f2f3..7047e8d1f 100644 --- a/Projects/UOContent/Misc/MondainsLegacy.cs +++ b/Projects/UOContent/Misc/MondainsLegacy.cs @@ -69,7 +69,7 @@ namespace Server if (message) { - @from.SendLocalizedMessage(1072791); // You must upgrade to Mondain's Legacy in order to use that item. + from.SendLocalizedMessage(1072791); // You must upgrade to Mondain's Legacy in order to use that item. } return false; diff --git a/Projects/UOContent/Misc/Notoriety.cs b/Projects/UOContent/Misc/Notoriety.cs index 2fb1b2447..05b4b8978 100644 --- a/Projects/UOContent/Misc/Notoriety.cs +++ b/Projects/UOContent/Misc/Notoriety.cs @@ -134,7 +134,7 @@ namespace Server.Misc if ((!Core.ML || map == Faction.Facet) && targetFaction != null) { - if (Faction.Find(@from, true) != targetFaction) + if (Faction.Find(from, true) != targetFaction) { return false; } diff --git a/Projects/UOContent/Misc/ProfanityProtection.cs b/Projects/UOContent/Misc/ProfanityProtection.cs index b065c9d97..ab33a9699 100644 --- a/Projects/UOContent/Misc/ProfanityProtection.cs +++ b/Projects/UOContent/Misc/ProfanityProtection.cs @@ -131,7 +131,7 @@ namespace Server.Misc StartDisallowed )) { - e.Blocked = !OnProfanityDetected(@from, e.Speech); + e.Blocked = !OnProfanityDetected(from, e.Speech); } } } diff --git a/Projects/UOContent/Misc/RegenRates.cs b/Projects/UOContent/Misc/RegenRates.cs index e9f11b80e..dbfa9fe42 100644 --- a/Projects/UOContent/Misc/RegenRates.cs +++ b/Projects/UOContent/Misc/RegenRates.cs @@ -83,7 +83,7 @@ namespace Server.Misc if (CheckAnimal(from, typeof(Dog)) || CheckAnimal(from, typeof(Cat))) { - points += @from.Skills.Ninjitsu.Fixed / 30; + points += from.Skills.Ninjitsu.Fixed / 30; } return TimeSpan.FromSeconds(1.0 / (0.1 * (1 + points))); @@ -141,7 +141,7 @@ namespace Server.Misc if (!from.Meditating) { - CheckBonusSkill(@from, @from.Mana, @from.ManaMax, SkillName.Meditation); + CheckBonusSkill(from, from.Mana, from.ManaMax, SkillName.Meditation); } double rate; @@ -239,7 +239,7 @@ namespace Server.Misc if (!Core.AOS) { - rating += GetArmorMeditationValue(@from.ShieldArmor as BaseArmor); + rating += GetArmorMeditationValue(from.ShieldArmor as BaseArmor); } rating += GetArmorMeditationValue(from.NeckArmor as BaseArmor); diff --git a/Projects/UOContent/Misc/RenameRequests.cs b/Projects/UOContent/Misc/RenameRequests.cs index 83b0aaca0..3fe5a33f3 100644 --- a/Projects/UOContent/Misc/RenameRequests.cs +++ b/Projects/UOContent/Misc/RenameRequests.cs @@ -34,7 +34,7 @@ namespace Server.Misc { if (name.IndexOf(disallowed[i]) != -1) { - @from.SendLocalizedMessage(1072622); // That name isn't very polite. + from.SendLocalizedMessage(1072622); // That name isn't very polite. return; } } diff --git a/Projects/UOContent/Misc/ShardPoller.cs b/Projects/UOContent/Misc/ShardPoller.cs index a84cfcef4..cd726941e 100644 --- a/Projects/UOContent/Misc/ShardPoller.cs +++ b/Projects/UOContent/Misc/ShardPoller.cs @@ -218,7 +218,7 @@ namespace Server.Misc { if (from.AccessLevel >= AccessLevel.Administrator) { - @from.SendGump(new ShardPollGump(@from, this, true, null)); + from.SendGump(new ShardPollGump(from, this, true, null)); } } diff --git a/Projects/UOContent/Misc/SkillCheck.cs b/Projects/UOContent/Misc/SkillCheck.cs index 94a6e7c30..bc119a24a 100644 --- a/Projects/UOContent/Misc/SkillCheck.cs +++ b/Projects/UOContent/Misc/SkillCheck.cs @@ -178,7 +178,7 @@ namespace Server.Misc if (from.Alive && (gc >= Utility.RandomDouble() && AllowGain(from, skill, amObj) || skill.Base < 10.0)) { - Gain(@from, skill); + Gain(from, skill); } return success; @@ -310,15 +310,15 @@ namespace Server.Misc if (from.StrLock == StatLockType.Up && info.StrGain / 33.3 > Utility.RandomDouble()) { - GainStat(@from, Stat.Str); + GainStat(from, Stat.Str); } else if (from.DexLock == StatLockType.Up && info.DexGain / 33.3 > Utility.RandomDouble()) { - GainStat(@from, Stat.Dex); + GainStat(from, Stat.Dex); } else if (from.IntLock == StatLockType.Up && info.IntGain / 33.3 > Utility.RandomDouble()) { - GainStat(@from, Stat.Int); + GainStat(from, Stat.Int); } } } @@ -338,7 +338,7 @@ namespace Server.Misc { if (!(from is BaseCreature creature && creature.Controlled)) { - if (@from.RawStatTotal >= @from.StatCap) + if (from.RawStatTotal >= from.StatCap) { return false; } @@ -365,17 +365,17 @@ namespace Server.Misc { if (CanLower(from, Stat.Dex) && (from.RawDex < from.RawInt || !CanLower(from, Stat.Int))) { - --@from.RawDex; + --from.RawDex; } else if (CanLower(from, Stat.Int)) { - --@from.RawInt; + --from.RawInt; } } if (CanRaise(from, Stat.Str)) { - ++@from.RawStr; + ++from.RawStr; } break; @@ -386,17 +386,17 @@ namespace Server.Misc { if (CanLower(from, Stat.Str) && (from.RawStr < from.RawInt || !CanLower(from, Stat.Int))) { - --@from.RawStr; + --from.RawStr; } else if (CanLower(from, Stat.Int)) { - --@from.RawInt; + --from.RawInt; } } if (CanRaise(from, Stat.Dex)) { - ++@from.RawDex; + ++from.RawDex; } break; @@ -407,17 +407,17 @@ namespace Server.Misc { if (CanLower(from, Stat.Str) && (from.RawStr < from.RawDex || !CanLower(from, Stat.Dex))) { - --@from.RawStr; + --from.RawStr; } else if (CanLower(from, Stat.Dex)) { - --@from.RawDex; + --from.RawDex; } } if (CanRaise(from, Stat.Int)) { - ++@from.RawInt; + ++from.RawInt; } break; diff --git a/Projects/UOContent/Misc/ToggleItem.cs b/Projects/UOContent/Misc/ToggleItem.cs index 780d0b738..29c98d10c 100644 --- a/Projects/UOContent/Misc/ToggleItem.cs +++ b/Projects/UOContent/Misc/ToggleItem.cs @@ -48,7 +48,7 @@ namespace Server.Items } else { - @from.SendLocalizedMessage(500446); // That is too far away. + from.SendLocalizedMessage(500446); // That is too far away. } } } diff --git a/Projects/UOContent/Misc/WeightOverloading.cs b/Projects/UOContent/Misc/WeightOverloading.cs index 219bd4724..d5fe9031a 100644 --- a/Projects/UOContent/Misc/WeightOverloading.cs +++ b/Projects/UOContent/Misc/WeightOverloading.cs @@ -82,7 +82,7 @@ namespace Server.Misc if (from.Stam * 100 / Math.Max(from.StamMax, 1) < 10) { - --@from.Stam; + --from.Stam; } if (from.Stam == 0) diff --git a/Projects/UOContent/Mobiles/AI/AIControlMobileTarget.cs b/Projects/UOContent/Mobiles/AI/AIControlMobileTarget.cs index 4af5b68bc..2ceb4276c 100644 --- a/Projects/UOContent/Mobiles/AI/AIControlMobileTarget.cs +++ b/Projects/UOContent/Mobiles/AI/AIControlMobileTarget.cs @@ -36,7 +36,7 @@ namespace Server.Targets { for (var i = 0; i < m_List.Count; ++i) { - m_List[i].EndPickTarget(@from, m, Order); + m_List[i].EndPickTarget(from, m, Order); } } } diff --git a/Projects/UOContent/Mobiles/AI/BaseAI.cs b/Projects/UOContent/Mobiles/AI/BaseAI.cs index 90b87b102..112e5aaa4 100644 --- a/Projects/UOContent/Mobiles/AI/BaseAI.cs +++ b/Projects/UOContent/Mobiles/AI/BaseAI.cs @@ -170,7 +170,7 @@ namespace Server.Mobiles if (m_Mobile.CanDrop) { - list.Add(new InternalEntry(@from, 6109, 14, m_Mobile, this, OrderType.Drop)); // Command: Drop + list.Add(new InternalEntry(from, 6109, 14, m_Mobile, this, OrderType.Drop)); // Command: Drop } list.Add(new InternalEntry(from, 6111, 14, m_Mobile, this, OrderType.Attack)); // Command: Kill @@ -220,15 +220,15 @@ namespace Server.Mobiles { if (order == OrderType.Transfer) { - @from.SendLocalizedMessage(502038); // Click on the person to transfer ownership to. + from.SendLocalizedMessage(502038); // Click on the person to transfer ownership to. } else if (order == OrderType.Friend) { - @from.SendLocalizedMessage(502020); // Click on the player whom you wish to make a co-owner. + from.SendLocalizedMessage(502020); // Click on the player whom you wish to make a co-owner. } else if (order == OrderType.Unfriend) { - @from.SendLocalizedMessage(1070948); // Click on the player whom you wish to remove as a co-owner. + from.SendLocalizedMessage(1070948); // Click on the player whom you wish to remove as a co-owner. } from.Target = new AIControlMobileTarget(this, order); @@ -2634,12 +2634,12 @@ namespace Server.Mobiles { for (var a = 0; a < count; ++a) { - if (a < m_Mobile.Aggressed.Count && m_Mobile.Aggressed[a].Attacker == @from) + if (a < m_Mobile.Aggressed.Count && m_Mobile.Aggressed[a].Attacker == from) { return true; } - if (a < m_Mobile.Aggressors.Count && m_Mobile.Aggressors[a].Defender == @from) + if (a < m_Mobile.Aggressors.Count && m_Mobile.Aggressors[a].Defender == from) { return true; } @@ -3016,9 +3016,9 @@ namespace Server.Mobiles m_Creature.PlaySound(m_Creature.GetIdleSound()); - var args = $"{@from.Name}\t{m_Creature.Name}\t{to.Name}"; + var args = $"{from.Name}\t{m_Creature.Name}\t{to.Name}"; - @from.SendLocalizedMessage(1043253, args); // You have transferred your pet to ~3_GETTER~. + from.SendLocalizedMessage(1043253, args); // You have transferred your pet to ~3_GETTER~. to.SendLocalizedMessage( 1043252, args diff --git a/Projects/UOContent/Mobiles/Animals/Cows/Cow.cs b/Projects/UOContent/Mobiles/Animals/Cows/Cow.cs index 30ebaa1fb..c2a0efbfc 100644 --- a/Projects/UOContent/Mobiles/Animals/Cows/Cow.cs +++ b/Projects/UOContent/Mobiles/Animals/Cows/Cow.cs @@ -92,12 +92,12 @@ namespace Server.Mobiles { if (!from.InLOS(this) || !from.InRange(Location, 2)) { - @from.SendLocalizedMessage(1080400); // You can not milk the cow from this location. + from.SendLocalizedMessage(1080400); // You can not milk the cow from this location. } if (Controlled && ControlMaster != from) { - @from.SendLocalizedMessage(1071182); // The cow nimbly escapes your attempts to milk it. + from.SendLocalizedMessage(1071182); // The cow nimbly escapes your attempts to milk it. } if (Milk == 0 && MilkedOn + TimeSpan.FromDays(1) > DateTime.UtcNow) diff --git a/Projects/UOContent/Mobiles/Animals/Misc/PackHorse.cs b/Projects/UOContent/Mobiles/Animals/Misc/PackHorse.cs index 097424bf2..52a9841a9 100644 --- a/Projects/UOContent/Mobiles/Animals/Misc/PackHorse.cs +++ b/Projects/UOContent/Mobiles/Animals/Misc/PackHorse.cs @@ -163,7 +163,7 @@ namespace Server.Mobiles { if (CheckAccess(animal, from)) { - list.Add(new PackAnimalBackpackEntry(animal, @from)); + list.Add(new PackAnimalBackpackEntry(animal, from)); } } @@ -226,7 +226,7 @@ namespace Server.Mobiles if (item != null) { - @from.Use(item); + from.Use(item); } } } diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs b/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs index 9ba99a47d..313c10be2 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs @@ -219,11 +219,11 @@ namespace Server.Mobiles { if (Core.AOS) // You cannot ride a mount in your current form. { - PrivateOverheadMessage(MessageType.Regular, 0x3B2, 1062061, @from.NetState); + PrivateOverheadMessage(MessageType.Regular, 0x3B2, 1062061, from.NetState); } else { - @from.SendLocalizedMessage(1061628); // You can't do that while polymorphed. + from.SendLocalizedMessage(1061628); // You can't do that while polymorphed. } return; @@ -271,12 +271,12 @@ namespace Server.Mobiles MessageType.Regular, 0x3B2, 1049692, - @from.NetState + from.NetState ); // This mount is too ill to ride. } else { - Rider = @from; + Rider = from; } } else if (!Controlled && !Summoned) diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/Ethereals.cs b/Projects/UOContent/Mobiles/Animals/Mounts/Ethereals.cs index 8badf02e0..0e84a4a0e 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/Ethereals.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/Ethereals.cs @@ -205,7 +205,7 @@ namespace Server.Mobiles { if (Validate(from)) { - new EtherealSpell(this, @from).Cast(); + new EtherealSpell(this, from).Cast(); } } diff --git a/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs b/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs index 1cddcf9bd..8b5901cfd 100644 --- a/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs +++ b/Projects/UOContent/Mobiles/Familiars/BaseFamiliar.cs @@ -115,7 +115,7 @@ namespace Server.Mobiles if (from.Alive && Controlled && from == ControlMaster && from.InRange(this, 14)) { - list.Add(new ReleaseEntry(@from, this)); + list.Add(new ReleaseEntry(from, this)); } } @@ -123,7 +123,7 @@ namespace Server.Mobiles { if (!Deleted && Controlled && from == ControlMaster && from.CheckAlive()) { - EndRelease(@from); + EndRelease(from); } } diff --git a/Projects/UOContent/Mobiles/Familiars/HordeMinion.cs b/Projects/UOContent/Mobiles/Familiars/HordeMinion.cs index 39c1415cd..c795fb515 100644 --- a/Projects/UOContent/Mobiles/Familiars/HordeMinion.cs +++ b/Projects/UOContent/Mobiles/Familiars/HordeMinion.cs @@ -109,7 +109,7 @@ namespace Server.Mobiles { if (okay) { - EndRelease(@from); + EndRelease(from); } } @@ -117,13 +117,13 @@ namespace Server.Mobiles { if (Backpack?.Items.Count > 0) { - @from.SendGump( - new WarningGump(1060635, 30720, 1061672, 32512, 420, 280, okay => ConfirmRelease_Callback(@from, okay)) + from.SendGump( + new WarningGump(1060635, 30720, 1061672, 32512, 420, 280, okay => ConfirmRelease_Callback(from, okay)) ); } else { - EndRelease(@from); + EndRelease(from); } } diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/DemonKnight.cs b/Projects/UOContent/Mobiles/Monsters/AOS/DemonKnight.cs index 68dcf3a7b..3886782ca 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/DemonKnight.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/DemonKnight.cs @@ -246,7 +246,7 @@ namespace Server.Mobiles if (Utility.RandomDouble() < 0.05) { - Timer.DelayCall(TimeSpan.FromSeconds(1.0), CreateBones_Callback, @from); + Timer.DelayCall(TimeSpan.FromSeconds(1.0), CreateBones_Callback, from); } m_InHere = false; diff --git a/Projects/UOContent/Mobiles/Monsters/AOS/ShadowKnight.cs b/Projects/UOContent/Mobiles/Monsters/AOS/ShadowKnight.cs index 25bec78f7..1d83a13e2 100644 --- a/Projects/UOContent/Mobiles/Monsters/AOS/ShadowKnight.cs +++ b/Projects/UOContent/Mobiles/Monsters/AOS/ShadowKnight.cs @@ -151,7 +151,7 @@ namespace Server.Mobiles Combatant = null; Effects.SendLocationParticles( - EffectItem.Create(@from, map, EffectItem.DefaultDuration), + EffectItem.Create(from, map, EffectItem.DefaultDuration), 0x3728, 10, 10, diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs index cf5e47c5e..26fa9b698 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs @@ -69,7 +69,7 @@ namespace Server.Mobiles { if (from?.Alive == true && Utility.RandomDouble() < 0.4) { - ThrowHatchet(@from); + ThrowHatchet(from); } } diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs index 8bb9b26b9..9d2cc5581 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs @@ -106,7 +106,7 @@ namespace Server.Mobiles { if (from?.Alive == true && Utility.RandomDouble() < 0.4) { - SendEBolt(@from); + SendEBolt(from); } if (!FieldActive) diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs index 742367266..09aa5a9d7 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs @@ -100,7 +100,7 @@ namespace Server.Mobiles { if (from?.Alive == true && Utility.RandomDouble() < 0.4) { - SendEBolt(@from); + SendEBolt(from); } if (!FieldActive) diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs index 82ced789a..25d4ee271 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs @@ -43,7 +43,7 @@ namespace Server.Mobiles public override bool OnBeforeDeath() { SpillAcid( 1, 4, 10, 6, 10 ); - + return base.OnBeforeDeath(); } */ @@ -96,7 +96,7 @@ namespace Server.Mobiles { if (map == null) { - return @from; + return from; } var loc = new Point3D(RandomPoint(X), RandomPoint(Y), Z); diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Special/Ilhenir.cs b/Projects/UOContent/Mobiles/Monsters/ML/Special/Ilhenir.cs index d23c9d139..423ca518c 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Special/Ilhenir.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Special/Ilhenir.cs @@ -282,7 +282,7 @@ namespace Server.Mobiles { if (map == null) { - return @from; + return from; } var loc = new Point3D(RandomPoint(X), RandomPoint(Y), Z); diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs index 36b3a5c91..70d16037c 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs @@ -68,19 +68,19 @@ namespace Server.Mobiles { if (!from.Alive && from is PlayerMobile) { - if (!@from.Frozen && DateTime.UtcNow >= m_NextResurrect && InRange(@from, 4) && !InRange(oldLocation, 4) && - InLOS(@from)) + if (!from.Frozen && DateTime.UtcNow >= m_NextResurrect && InRange(from, 4) && !InRange(oldLocation, 4) && + InLOS(from)) { m_NextResurrect = DateTime.UtcNow + ResurrectDelay; - if (!@from.Criminal && @from.Kills < 5 && @from.Karma > 0) + if (!from.Criminal && from.Kills < 5 && from.Karma > 0) { - if (@from.Map?.CanFit(@from.Location, 16, false, false) == true) + if (from.Map?.CanFit(from.Location, 16, false, false) == true) { - Direction = GetDirectionTo(@from); - @from.PlaySound(0x1F2); - @from.FixedEffect(0x376A, 10, 16); - @from.CloseGump(); - @from.SendGump(new ResurrectGump(@from, ResurrectMessage.Healer)); + Direction = GetDirectionTo(from); + from.PlaySound(0x1F2); + from.FixedEffect(0x376A, 10, 16); + from.CloseGump(); + from.SendGump(new ResurrectGump(from, ResurrectMessage.Healer)); } } } diff --git a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs index 041fab9a1..658afdbf0 100644 --- a/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs +++ b/Projects/UOContent/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs @@ -105,7 +105,7 @@ namespace Server.Mobiles MessageType.Regular, 0x3B2, 1071919, - @from.Name, + from.Name, m.NetState ); // * ~1_VAL~ slices through the plague beast's amorphous tissue * } @@ -140,7 +140,7 @@ namespace Server.Mobiles { if (OpenedBy != null && Backpack != null) { - Backpack.DisplayTo(@from); + Backpack.DisplayTo(from); } else { @@ -148,7 +148,7 @@ namespace Server.Mobiles MessageType.Regular, 0x3B2, 1071917, - @from.NetState + from.NetState ); // * You attempt to tear open the amorphous flesh, but it resists * } } @@ -158,7 +158,7 @@ namespace Server.Mobiles { if (IsAccessibleTo(from) && (dropped is PlagueBeastInnard || dropped is PlagueBeastGland)) { - return base.OnDragDrop(@from, dropped); + return base.OnDragDrop(from, dropped); } return false; diff --git a/Projects/UOContent/Mobiles/Townfolk/Banker.cs b/Projects/UOContent/Mobiles/Townfolk/Banker.cs index 5985d9d8d..0d4eb20d6 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Banker.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Banker.cs @@ -463,7 +463,7 @@ namespace Server.Mobiles { if (from.Alive) { - list.Add(new OpenBankEntry(@from, this)); + list.Add(new OpenBankEntry(from, this)); } base.AddCustomContextEntries(from, list); diff --git a/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs b/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs index 0a31f5634..889524813 100644 --- a/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs +++ b/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs @@ -194,11 +194,11 @@ namespace Server.Mobiles { if (m_Entry != null) { - @from.SendMessage("Message deleted."); + from.SendMessage("Message deleted."); } else { - @from.SendLocalizedMessage(502980); // Message entry cancelled. + from.SendLocalizedMessage(502980); // Message entry cancelled. } } @@ -495,11 +495,11 @@ namespace Server.Mobiles { if (from.AccessLevel >= AccessLevel.GameMaster) { - @from.SendGump(new TownCrierGump(@from, this)); + from.SendGump(new TownCrierGump(from, this)); } else { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs b/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs index d0c930692..e92fc642f 100644 --- a/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs +++ b/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs @@ -983,29 +983,29 @@ namespace Server.Mobiles if (ns.ContainerGridLines) { - @from.Send(new VendorBuyContent6017(list)); + from.Send(new VendorBuyContent6017(list)); } else { - @from.Send(new VendorBuyContent(list)); + from.Send(new VendorBuyContent(list)); } from.Send(new VendorBuyList(this, list)); if (ns.HighSeas) { - @from.Send(new DisplayBuyListHS(this)); + from.Send(new DisplayBuyListHS(this)); } else { - @from.Send(new DisplayBuyList(this)); + from.Send(new DisplayBuyList(this)); } from.Send(new MobileStatusExtended(from)); // make sure their gold amount is sent for (var i = 0; i < opls.Count; ++i) { - @from.Send(opls[i]); + from.Send(opls[i]); } SayTo(from, 500186); // Greetings. Have a look around. @@ -1027,7 +1027,7 @@ namespace Server.Mobiles if (pack != null) { - @from.Send(new EquipUpdate(pack)); + from.Send(new EquipUpdate(pack)); } pack = FindItemOnLayer(Layer.ShopResale); @@ -1107,7 +1107,7 @@ namespace Server.Mobiles if (!(smallBod != null || largeBod != null)) { - return base.OnDragDrop(@from, dropped); + return base.OnDragDrop(from, dropped); } var pm = from as PlayerMobile; @@ -1148,16 +1148,16 @@ namespace Server.Mobiles if (reward != null) { - @from.AddToBackpack(reward); + from.AddToBackpack(reward); } if (gold > 1000) { - @from.AddToBackpack(new BankCheck(gold)); + from.AddToBackpack(new BankCheck(gold)); } else if (gold > 0) { - @from.AddToBackpack(new Gold(gold)); + from.AddToBackpack(new Gold(gold)); } Titles.AwardFame(from, fame, true); @@ -1415,17 +1415,17 @@ namespace Server.Mobiles { if (SupportsBulkOrders(from)) { - list.Add(new BulkOrderInfoEntry(@from, this)); + list.Add(new BulkOrderInfoEntry(from, this)); } if (IsActiveSeller) { - list.Add(new VendorBuyEntry(@from, this)); + list.Add(new VendorBuyEntry(from, this)); } if (IsActiveBuyer) { - list.Add(new VendorSellEntry(@from, this)); + list.Add(new VendorSellEntry(from, this)); } } diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs b/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs index 3ac08ed27..676268737 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs @@ -49,7 +49,7 @@ namespace Server.Mobiles if (from.Stabled.Count > 0) { - list.Add(new ClaimAllEntry(this, @from)); + list.Add(new ClaimAllEntry(this, from)); } } @@ -136,11 +136,11 @@ namespace Server.Mobiles if (list.Count > 0) { - @from.SendGump(new ClaimListGump(this, @from, list)); + from.SendGump(new ClaimListGump(this, from, list)); } else { - SayTo(@from, 502671); // But I have no animals stabled with me at the moment! + SayTo(from, 502671); // But I have no animals stabled with me at the moment! } } @@ -332,15 +332,15 @@ namespace Server.Mobiles if (claimed) { - SayTo(@from, 1042559); // Here you go... and good day to you! + SayTo(from, 1042559); // Here you go... and good day to you! } else if (stabled == 0) { - SayTo(@from, 502671); // But I have no animals stabled with me at the moment! + SayTo(from, 502671); // But I have no animals stabled with me at the moment! } else if (claimByName) { - BeginClaimList(@from); + BeginClaimList(from); } } @@ -352,7 +352,7 @@ namespace Server.Mobiles if (pet.Summoned) { - pet.SummonMaster = @from; + pet.SummonMaster = from; } pet.ControlTarget = from; @@ -507,15 +507,15 @@ namespace Server.Mobiles { if (targeted is BaseCreature creature) { - m_Trainer.EndStable(@from, creature); + m_Trainer.EndStable(from, creature); } else if (targeted == from) { - m_Trainer.SayTo(@from, 502672); // HA HA HA! Sorry, I am not an inn. + m_Trainer.SayTo(from, 502672); // HA HA HA! Sorry, I am not an inn. } else { - m_Trainer.SayTo(@from, 1048053); // You can't stable that! + m_Trainer.SayTo(from, 1048053); // You can't stable that! } } } diff --git a/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs b/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs index 8023ee883..0203126e1 100644 --- a/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs +++ b/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs @@ -377,7 +377,7 @@ namespace Server.Mobiles if (IsOwner(from) && from.InLOS(this)) { - list.Add(new ManageBarkeeperEntry(@from, this)); + list.Add(new ManageBarkeeperEntry(from, this)); } } diff --git a/Projects/UOContent/Mobiles/Vendors/PlayerVendor.cs b/Projects/UOContent/Mobiles/Vendors/PlayerVendor.cs index c5e1dafcb..0310e8a6d 100644 --- a/Projects/UOContent/Mobiles/Vendors/PlayerVendor.cs +++ b/Projects/UOContent/Mobiles/Vendors/PlayerVendor.cs @@ -216,20 +216,20 @@ namespace Server.Mobiles { if (!vi.IsForSale) { - item.LabelTo(@from, 1043307); // Price: Not for sale. + item.LabelTo(from, 1043307); // Price: Not for sale. } else if (vi.IsForFree) { - item.LabelTo(@from, 1043306); // Price: FREE! + item.LabelTo(from, 1043306); // Price: FREE! } else { - item.LabelTo(@from, 1043304, vi.FormattedPrice); // Price: ~1_COST~ + item.LabelTo(from, 1043304, vi.FormattedPrice); // Price: ~1_COST~ } if (!string.IsNullOrEmpty(vi.Description)) { - item.LabelTo(@from, "Description: {0}", vi.Description); + item.LabelTo(from, "Description: {0}", vi.Description); } } } @@ -931,7 +931,7 @@ namespace Server.Mobiles { if (newItem) { - OnItemGiven(@from, item); + OnItemGiven(from, item); } return true; @@ -947,7 +947,7 @@ namespace Server.Mobiles { if (GetVendorItem(item) == null) { - Timer.DelayCall(OnItemGiven, @from, item); + Timer.DelayCall(OnItemGiven, from, item); } return true; @@ -1005,7 +1005,7 @@ namespace Server.Mobiles if (ownerOnly) { - return IsOwner(@from); + return IsOwner(from); } if (House?.IsBanned(from) == true && !IsOwner(from)) @@ -1023,11 +1023,11 @@ namespace Server.Mobiles { if (IsOwner(from)) { - SendOwnerGump(@from); + SendOwnerGump(from); } else if (CanInteractWith(from, false)) { - OpenBackpack(@from); + OpenBackpack(from); } } @@ -1304,7 +1304,7 @@ namespace Server.Mobiles { if (m.CanSee(e.Mobile) && m.InLOS(e.Mobile)) { - m.OpenBackpack(@from); + m.OpenBackpack(from); } } @@ -1447,7 +1447,7 @@ namespace Server.Mobiles { if (targeted is Item item) { - TryToBuy(item, @from); + TryToBuy(item, from); } } } @@ -1528,11 +1528,11 @@ namespace Server.Mobiles { if (item is LockableContainer container && container.Locked) { - m_Vendor.SayTo(@from, 1043298); // Locked items may not be made not-for-sale. + m_Vendor.SayTo(from, 1043298); // Locked items may not be made not-for-sale. } else if (item.Items.Count > 0) { - m_Vendor.SayTo(@from, 1043299); // To be not for sale, all items in a container must be for sale. + m_Vendor.SayTo(from, 1043299); // To be not for sale, all items in a container must be for sale. } else { diff --git a/Projects/UOContent/Mobiles/Vendors/RentedVendor.cs b/Projects/UOContent/Mobiles/Vendors/RentedVendor.cs index 12ccbea5a..9ef1ca18a 100644 --- a/Projects/UOContent/Mobiles/Vendors/RentedVendor.cs +++ b/Projects/UOContent/Mobiles/Vendors/RentedVendor.cs @@ -272,7 +272,7 @@ namespace Server.Mobiles if (depositedGold > 0) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1060397, depositedGold.ToString() ); // ~1_AMOUNT~ gold has been deposited into your bank box. @@ -280,7 +280,7 @@ namespace Server.Mobiles if (m_Vendor.RentalGold > 0) { - @from.SendLocalizedMessage(500390); // Your bank box is full. + from.SendLocalizedMessage(500390); // Your bank box is full. } } } diff --git a/Projects/UOContent/Multis/BaseHouse.cs b/Projects/UOContent/Multis/BaseHouse.cs index 1a66af03f..04cc63f81 100644 --- a/Projects/UOContent/Multis/BaseHouse.cs +++ b/Projects/UOContent/Multis/BaseHouse.cs @@ -1354,12 +1354,12 @@ namespace Server.Multis if (item is ISecurable securable) { - return HasSecureAccess(@from, securable.Level); + return HasSecureAccess(from, securable.Level); } if (item is Container) { - return IsCoOwner(@from); + return IsCoOwner(from); } if (item.Stackable) @@ -1369,12 +1369,12 @@ namespace Server.Multis if (item is BaseLight) { - return IsFriend(@from); + return IsFriend(from); } if (item is PotionKeg) { - return IsFriend(@from); + return IsFriend(from); } if (item is Dices) @@ -1859,7 +1859,7 @@ namespace Server.Multis { if (from != null) { - door.KeyValue = CreateKeys(@from); + door.KeyValue = CreateKeys(from); } AddDoor(door, xOffset, yOffset, zOffset); @@ -1956,9 +1956,9 @@ namespace Server.Multis if (from.Z + 16 >= p.Z && p.Z + 16 >= from.Z) { - if (@from.InRange(p, 1)) + if (from.InRange(p, 1)) { - @from.SendLocalizedMessage(502120); // You cannot place a trash barrel near a door or near steps. + from.SendLocalizedMessage(502120); // You cannot place a trash barrel near a door or near steps. return; } } @@ -2148,7 +2148,7 @@ namespace Server.Multis if (!isValid) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1062067 ); // In order to transfer the house, you and the recipient must both be outside the building and within two paces of the house sign. } @@ -2527,9 +2527,9 @@ namespace Server.Multis if (from.Z + 16 >= p.Z && p.Z + 16 >= from.Z) { - if (@from.InRange(p, 1)) + if (from.InRange(p, 1)) { - @from.SendLocalizedMessage(502113); // You cannot place a strongbox near a door or near steps. + from.SendLocalizedMessage(502113); // You cannot place a strongbox near a door or near steps. return; } } @@ -3912,7 +3912,7 @@ namespace Server.Multis { if (component.Addon != null) { - m_House.Release(@from, component.Addon); + m_House.Release(from, component.Addon); } } else @@ -3942,7 +3942,7 @@ namespace Server.Multis { if (component.Addon != null) { - m_House.LockDown(@from, component.Addon); + m_House.LockDown(from, component.Addon); } } else @@ -3995,7 +3995,7 @@ namespace Server.Multis { if (component.Addon != null) { - m_House.ReleaseSecure(@from, component.Addon); + m_House.ReleaseSecure(from, component.Addon); } } else @@ -4020,7 +4020,7 @@ namespace Server.Multis { if (component.Addon != null) { - m_House.AddSecure(@from, component.Addon); + m_House.AddSecure(from, component.Addon); } } else @@ -4057,11 +4057,11 @@ namespace Server.Multis if (targeted is Mobile mobile) { - m_House.Kick(@from, mobile); + m_House.Kick(from, mobile); } else { - @from.SendLocalizedMessage(501347); // You cannot eject that from the house! + from.SendLocalizedMessage(501347); // You cannot eject that from the house! } } } @@ -4090,11 +4090,11 @@ namespace Server.Multis { if (m_Banning) { - m_House.Ban(@from, mobile); + m_House.Ban(from, mobile); } else { - m_House.RemoveBan(@from, mobile); + m_House.RemoveBan(from, mobile); } } else @@ -4124,11 +4124,11 @@ namespace Server.Multis if (targeted is Mobile mobile) { - m_House.GrantAccess(@from, mobile); + m_House.GrantAccess(from, mobile); } else { - @from.SendLocalizedMessage(1060712); // That is not a player. + from.SendLocalizedMessage(1060712); // That is not a player. } } } @@ -4157,11 +4157,11 @@ namespace Server.Multis { if (m_Add) { - m_House.AddCoOwner(@from, mobile); + m_House.AddCoOwner(from, mobile); } else { - m_House.RemoveCoOwner(@from, mobile); + m_House.RemoveCoOwner(from, mobile); } } else @@ -4195,11 +4195,11 @@ namespace Server.Multis { if (m_Add) { - m_House.AddFriend(@from, mobile); + m_House.AddFriend(from, mobile); } else { - m_House.RemoveFriend(@from, mobile); + m_House.RemoveFriend(from, mobile); } } else @@ -4224,11 +4224,11 @@ namespace Server.Multis { if (targeted is Mobile mobile) { - m_House.BeginConfirmTransfer(@from, mobile); + m_House.BeginConfirmTransfer(from, mobile); } else { - @from.SendLocalizedMessage(501384); // Only a player can own a house! + from.SendLocalizedMessage(501384); // Only a player can own a house! } } } diff --git a/Projects/UOContent/Multis/Boats/BaseBoat.cs b/Projects/UOContent/Multis/Boats/BaseBoat.cs index 6614c88b9..1d5ace8c1 100644 --- a/Projects/UOContent/Multis/Boats/BaseBoat.cs +++ b/Projects/UOContent/Multis/Boats/BaseBoat.cs @@ -756,31 +756,31 @@ namespace Server.Multis if (result == DryDockResult.Dead) { - @from.SendLocalizedMessage(502493); // You appear to be dead. + from.SendLocalizedMessage(502493); // You appear to be dead. } else if (result == DryDockResult.NoKey) { - @from.SendLocalizedMessage(502494); // You must have a key to the ship to dock the boat. + from.SendLocalizedMessage(502494); // You must have a key to the ship to dock the boat. } else if (result == DryDockResult.NotAnchored) { - @from.SendLocalizedMessage(1010570); // You must lower the anchor to dock the boat. + from.SendLocalizedMessage(1010570); // You must lower the anchor to dock the boat. } else if (result == DryDockResult.Mobiles) { - @from.SendLocalizedMessage(502495); // You cannot dock the ship with beings on board! + from.SendLocalizedMessage(502495); // You cannot dock the ship with beings on board! } else if (result == DryDockResult.Items) { - @from.SendLocalizedMessage(502496); // You cannot dock the ship with a cluttered deck. + from.SendLocalizedMessage(502496); // You cannot dock the ship with a cluttered deck. } else if (result == DryDockResult.Hold) { - @from.SendLocalizedMessage(502497); // Make sure your hold is empty, and try again! + from.SendLocalizedMessage(502497); // Make sure your hold is empty, and try again! } else if (result == DryDockResult.Valid) { - @from.SendGump(new ConfirmDryDockGump(@from, this)); + from.SendGump(new ConfirmDryDockGump(from, this)); } } @@ -795,27 +795,27 @@ namespace Server.Multis if (result == DryDockResult.Dead) { - @from.SendLocalizedMessage(502493); // You appear to be dead. + from.SendLocalizedMessage(502493); // You appear to be dead. } else if (result == DryDockResult.NoKey) { - @from.SendLocalizedMessage(502494); // You must have a key to the ship to dock the boat. + from.SendLocalizedMessage(502494); // You must have a key to the ship to dock the boat. } else if (result == DryDockResult.NotAnchored) { - @from.SendLocalizedMessage(1010570); // You must lower the anchor to dock the boat. + from.SendLocalizedMessage(1010570); // You must lower the anchor to dock the boat. } else if (result == DryDockResult.Mobiles) { - @from.SendLocalizedMessage(502495); // You cannot dock the ship with beings on board! + from.SendLocalizedMessage(502495); // You cannot dock the ship with beings on board! } else if (result == DryDockResult.Items) { - @from.SendLocalizedMessage(502496); // You cannot dock the ship with a cluttered deck. + from.SendLocalizedMessage(502496); // You cannot dock the ship with a cluttered deck. } else if (result == DryDockResult.Hold) { - @from.SendLocalizedMessage(502497); // Make sure your hold is empty, and try again! + from.SendLocalizedMessage(502497); // Make sure your hold is empty, and try again! } if (result != DryDockResult.Valid) diff --git a/Projects/UOContent/Multis/Boats/BaseBoatDeed.cs b/Projects/UOContent/Multis/Boats/BaseBoatDeed.cs index 327e79baa..49ee0708c 100644 --- a/Projects/UOContent/Multis/Boats/BaseBoatDeed.cs +++ b/Projects/UOContent/Multis/Boats/BaseBoatDeed.cs @@ -79,11 +79,11 @@ namespace Server.Multis { if (Core.SE) { - @from.SendLocalizedMessage(502482); // Where do you wish to place the ship? + from.SendLocalizedMessage(502482); // Where do you wish to place the ship? } else { - @from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 502482); // Where do you wish to place the ship? + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 502482); // Where do you wish to place the ship? } from.Target = new InternalTarget(this); @@ -185,15 +185,15 @@ namespace Server.Multis if (region.IsPartOf()) { - @from.SendLocalizedMessage(502488); // You can not place a ship inside a dungeon. + from.SendLocalizedMessage(502488); // You can not place a ship inside a dungeon. } else if (region.IsPartOf() || region.IsPartOf()) { - @from.SendLocalizedMessage(1042549); // A boat may not be placed in this area. + from.SendLocalizedMessage(1042549); // A boat may not be placed in this area. } else { - m_Deed.OnPlacement(@from, p); + m_Deed.OnPlacement(from, p); } } } diff --git a/Projects/UOContent/Multis/Boats/BaseDockedBoat.cs b/Projects/UOContent/Multis/Boats/BaseDockedBoat.cs index 3b006298b..f4c681837 100644 --- a/Projects/UOContent/Multis/Boats/BaseDockedBoat.cs +++ b/Projects/UOContent/Multis/Boats/BaseDockedBoat.cs @@ -118,11 +118,11 @@ namespace Server.Multis { if (m_ShipName != null) { - LabelTo(@from, m_ShipName); + LabelTo(from, m_ShipName); } else { - base.OnSingleClick(@from); + base.OnSingleClick(from); } } @@ -207,15 +207,15 @@ namespace Server.Multis if (region.IsPartOf()) { - @from.SendLocalizedMessage(502488); // You can not place a ship inside a dungeon. + from.SendLocalizedMessage(502488); // You can not place a ship inside a dungeon. } else if (region.IsPartOf() || region.IsPartOf()) { - @from.SendLocalizedMessage(1042549); // A boat may not be placed in this area. + from.SendLocalizedMessage(1042549); // A boat may not be placed in this area. } else { - m_Model.OnPlacement(@from, p); + m_Model.OnPlacement(from, p); } } } diff --git a/Projects/UOContent/Multis/Boats/Hold.cs b/Projects/UOContent/Multis/Boats/Hold.cs index 56ffd1594..c7a5b3bf6 100644 --- a/Projects/UOContent/Multis/Boats/Hold.cs +++ b/Projects/UOContent/Multis/Boats/Hold.cs @@ -88,7 +88,7 @@ namespace Server.Items } else { - base.OnDoubleClick(@from); + base.OnDoubleClick(from); } } diff --git a/Projects/UOContent/Multis/Boats/Strandedness.cs b/Projects/UOContent/Multis/Boats/Strandedness.cs index f6046f70d..15808b14c 100644 --- a/Projects/UOContent/Multis/Boats/Strandedness.cs +++ b/Projects/UOContent/Multis/Boats/Strandedness.cs @@ -191,7 +191,7 @@ namespace Server.Misc if (canFit) { - @from.Location = new Point3D(x, y, z); + from.Location = new Point3D(x, y, z); } } } diff --git a/Projects/UOContent/Multis/Boats/TillerMan.cs b/Projects/UOContent/Multis/Boats/TillerMan.cs index 4b6664826..b7b48c3c2 100644 --- a/Projects/UOContent/Multis/Boats/TillerMan.cs +++ b/Projects/UOContent/Multis/Boats/TillerMan.cs @@ -62,11 +62,11 @@ namespace Server.Items { if (m_Boat?.ShipName != null) { - LabelTo(@from, 1042884, m_Boat.ShipName); // the tiller man of the ~1_SHIP_NAME~ + LabelTo(from, 1042884, m_Boat.ShipName); // the tiller man of the ~1_SHIP_NAME~ } else { - base.OnSingleClick(@from); + base.OnSingleClick(from); } } @@ -74,11 +74,11 @@ namespace Server.Items { if (m_Boat?.Contains(from) == true) { - m_Boat.BeginRename(@from); + m_Boat.BeginRename(from); } else { - m_Boat?.BeginDryDock(@from); + m_Boat?.BeginDryDock(from); } } diff --git a/Projects/UOContent/Multis/Deeds.cs b/Projects/UOContent/Multis/Deeds.cs index 4c54f4087..7b9f41356 100644 --- a/Projects/UOContent/Multis/Deeds.cs +++ b/Projects/UOContent/Multis/Deeds.cs @@ -24,27 +24,27 @@ namespace Server.Multis.Deeds if (from.AccessLevel >= AccessLevel.GameMaster || reg.AllowHousing(from, p)) { - m_Deed.OnPlacement(@from, p); + m_Deed.OnPlacement(from, p); } else if (reg.IsPartOf()) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 501270 ); // Lord British has decreed a 'no build' period, thus you cannot build this house at this time. } else if (reg.IsPartOf() || reg.IsPartOf()) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1043287 ); // The house could not be created here. Either something is blocking the house, or the house would not be on valid terrain. } else if (reg.IsPartOf()) { - @from.SendLocalizedMessage(1150493); // You must have a deed for this plot of land in order to build here. + from.SendLocalizedMessage(1150493); // You must have a deed for this plot of land in order to build here. } else { - @from.SendLocalizedMessage(501265); // Housing can not be created in this area. + from.SendLocalizedMessage(501265); // Housing can not be created in this area. } } } diff --git a/Projects/UOContent/Multis/HousePlacement.cs b/Projects/UOContent/Multis/HousePlacement.cs index 54312c65d..9c23fa38d 100644 --- a/Projects/UOContent/Multis/HousePlacement.cs +++ b/Projects/UOContent/Multis/HousePlacement.cs @@ -113,7 +113,7 @@ namespace Server.Multis var reg = Region.Find(testPoint, map); - if (!reg.AllowHousing(@from, testPoint)) // Cannot place houses in dungeons, towns, treasure map areas etc + if (!reg.AllowHousing(from, testPoint)) // Cannot place houses in dungeons, towns, treasure map areas etc { if (reg.IsPartOf()) { @@ -426,9 +426,9 @@ namespace Server.Multis } } /*Point2D yardPoint = yard[i]; - + IPooledEnumerable eable = map.GetMultiTilesAt( yardPoint.X, yardPoint.Y ); - + foreach ( StaticTile[] tile in eable ) { for ( int j = 0; j < tile.Length; ++j ) @@ -440,7 +440,7 @@ namespace Server.Multis } } } - + eable.Free();*/ return HousePlacementResult.Valid; diff --git a/Projects/UOContent/Multis/HousePlacementTool.cs b/Projects/UOContent/Multis/HousePlacementTool.cs index 6408128db..cee856cfa 100644 --- a/Projects/UOContent/Multis/HousePlacementTool.cs +++ b/Projects/UOContent/Multis/HousePlacementTool.cs @@ -30,11 +30,11 @@ namespace Server.Items { if (IsChildOf(from.Backpack)) { - @from.SendGump(new HousePlacementCategoryGump(@from)); + from.SendGump(new HousePlacementCategoryGump(from)); } else { - @from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. + from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. } } @@ -268,27 +268,27 @@ namespace Server.Items if (from.AccessLevel >= AccessLevel.GameMaster || reg.AllowHousing(from, p)) { - m_Placed = m_Entry.OnPlacement(@from, p); + m_Placed = m_Entry.OnPlacement(from, p); } else if (reg.IsPartOf()) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 501270 ); // Lord British has decreed a 'no build' period, thus you cannot build this house at this time. } else if (reg.IsPartOf() || reg.IsPartOf()) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1043287 ); // The house could not be created here. Either something is blocking the house, or the house would not be on valid terrain. } else if (reg.IsPartOf()) { - @from.SendLocalizedMessage(1150493); // You must have a deed for this plot of land in order to build here. + from.SendLocalizedMessage(1150493); // You must have a deed for this plot of land in order to build here. } else { - @from.SendLocalizedMessage(501265); // Housing can not be created in this area. + from.SendLocalizedMessage(501265); // Housing can not be created in this area. } } } @@ -302,7 +302,7 @@ namespace Server.Items if (!m_Placed) { - @from.SendGump(new HousePlacementListGump(@from, m_Entries)); + from.SendGump(new HousePlacementListGump(from, m_Entries)); } } } @@ -1960,15 +1960,15 @@ namespace Server.Items if (Type == typeof(HouseFoundation)) { - args = new object[] { @from, MultiID, m_Storage, m_Lockdowns }; + args = new object[] { from, MultiID, m_Storage, m_Lockdowns }; } else if (Type == typeof(SmallOldHouse) || Type == typeof(SmallShop) || Type == typeof(TwoStoryHouse)) { - args = new object[] { @from, MultiID }; + args = new object[] { from, MultiID }; } else { - args = new object[] { @from }; + args = new object[] { from }; } return ActivatorUtil.CreateInstance(Type, args) as BaseHouse; diff --git a/Projects/UOContent/Multis/HouseSign.cs b/Projects/UOContent/Multis/HouseSign.cs index 90e991ad8..9d0c252d0 100644 --- a/Projects/UOContent/Multis/HouseSign.cs +++ b/Projects/UOContent/Multis/HouseSign.cs @@ -246,13 +246,13 @@ namespace Server.Multis if (from.Map != m_Sign.Map || !from.InRange(m_Sign, 5)) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1062429 ); // You must be within five paces of the house sign to use this option. } else { - @from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Vendors, @from, m_Sign.Owner)); + from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Vendors, from, m_Sign.Owner)); } } } diff --git a/Projects/UOContent/Regions/GuardedRegion.cs b/Projects/UOContent/Regions/GuardedRegion.cs index 1dd744e62..6ed3b244d 100644 --- a/Projects/UOContent/Regions/GuardedRegion.cs +++ b/Projects/UOContent/Regions/GuardedRegion.cs @@ -80,15 +80,15 @@ namespace Server.Regions if (reg == null) { - @from.SendMessage("You are not in a guardable region."); + from.SendMessage("You are not in a guardable region."); } else if (reg.Disabled) { - @from.SendMessage("The guards in this region have been disabled."); + from.SendMessage("The guards in this region have been disabled."); } else { - @from.SendMessage("This region is actively guarded."); + from.SendMessage("This region is actively guarded."); } } diff --git a/Projects/UOContent/Regions/HouseRegion.cs b/Projects/UOContent/Regions/HouseRegion.cs index 0f0c6c6ec..baa229eb4 100644 --- a/Projects/UOContent/Regions/HouseRegion.cs +++ b/Projects/UOContent/Regions/HouseRegion.cs @@ -65,11 +65,11 @@ namespace Server.Regions { if (item is Container) { - item.SendLocalizedMessageTo(@from, 501647); // That is secure. + item.SendLocalizedMessageTo(from, 501647); // That is secure. } else { - item.SendLocalizedMessageTo(@from, 1061637); // You are not allowed to access this. + item.SendLocalizedMessageTo(from, 1061637); // You are not allowed to access this. } return true; @@ -167,7 +167,7 @@ namespace Server.Regions if (!Core.SE) { - @from.SendLocalizedMessage(501284); // You may not enter. + from.SendLocalizedMessage(501284); // You may not enter. } return false; @@ -177,7 +177,7 @@ namespace Server.Regions { if (!Core.SE) { - @from.SendLocalizedMessage(501284); // You may not enter. + from.SendLocalizedMessage(501284); // You may not enter. } return false; @@ -200,7 +200,7 @@ namespace Server.Regions House.IsOwner(from) && from.Alive && !from.HasGump()) { - @from.SendGump(new NoticeGump(1060635, 30720, 1061826, 32512, 320, 180)); + from.SendGump(new NoticeGump(1060635, 30720, 1061826, 32512, 320, 180)); } return true; @@ -334,26 +334,26 @@ namespace Server.Regions { if (isOwner) { - @from.SendLocalizedMessage(502109); // Owners do not get a strongbox of their own. + from.SendLocalizedMessage(502109); // Owners do not get a strongbox of their own. } else if (isCoOwner) { - House.AddStrongBox(@from); + House.AddStrongBox(from); } else { - @from.SendLocalizedMessage(1010587); // You are not a co-owner of this house. + from.SendLocalizedMessage(1010587); // You are not a co-owner of this house. } } else if (e.HasKeyword(0x28)) // trash barrel { if (isCoOwner) { - House.AddTrashBarrel(@from); + House.AddTrashBarrel(from); } else { - @from.SendLocalizedMessage(1010587); // You are not a co-owner of this house. + from.SendLocalizedMessage(1010587); // You are not a co-owner of this house. } } } @@ -385,11 +385,11 @@ namespace Server.Regions { if (House.HasLockedDownItem(item)) { - item.LabelTo(@from, 501643); // [locked down] + item.LabelTo(from, 501643); // [locked down] } else if (House.HasSecureItem(item)) { - item.LabelTo(@from, 501644); // [locked down & secure] + item.LabelTo(from, 501644); // [locked down & secure] } } diff --git a/Projects/UOContent/Skills/Anatomy.cs b/Projects/UOContent/Skills/Anatomy.cs index 80f6d7ec7..aeff35f7e 100644 --- a/Projects/UOContent/Skills/Anatomy.cs +++ b/Projects/UOContent/Skills/Anatomy.cs @@ -110,7 +110,7 @@ namespace Server.SkillHandlers MessageType.Regular, 0x3B2, 1038303 + stmMod, - @from.NetState + from.NetState ); // That being is at [10,20,...] percent endurance. } } diff --git a/Projects/UOContent/Skills/AnimalTaming.cs b/Projects/UOContent/Skills/AnimalTaming.cs index a8eba8f4b..9922bad83 100644 --- a/Projects/UOContent/Skills/AnimalTaming.cs +++ b/Projects/UOContent/Skills/AnimalTaming.cs @@ -107,7 +107,7 @@ namespace Server.SkillHandlers { if (m_SetSkillTime) { - @from.NextSkillTime = Core.TickCount; + from.NextSkillTime = Core.TickCount; } } diff --git a/Projects/UOContent/Skills/ArmsLore.cs b/Projects/UOContent/Skills/ArmsLore.cs index 80d069530..e778dfe18 100644 --- a/Projects/UOContent/Skills/ArmsLore.cs +++ b/Projects/UOContent/Skills/ArmsLore.cs @@ -56,28 +56,28 @@ namespace Server.SkillHandlers if (type == WeaponType.Ranged) { - @from.SendLocalizedMessage(1038224 + damage * 9); + from.SendLocalizedMessage(1038224 + damage * 9); } else if (type == WeaponType.Piercing) { - @from.SendLocalizedMessage(1038218 + hand + damage * 9); + from.SendLocalizedMessage(1038218 + hand + damage * 9); } else if (type == WeaponType.Slashing) { - @from.SendLocalizedMessage(1038220 + hand + damage * 9); + from.SendLocalizedMessage(1038220 + hand + damage * 9); } else if (type == WeaponType.Bashing) { - @from.SendLocalizedMessage(1038222 + hand + damage * 9); + from.SendLocalizedMessage(1038222 + hand + damage * 9); } else { - @from.SendLocalizedMessage(1038216 + hand + damage * 9); + from.SendLocalizedMessage(1038216 + hand + damage * 9); } if (weap.Poison != null && weap.PoisonCharges > 0) { - @from.SendLocalizedMessage(1038284); // It appears to have poison smeared on it. + from.SendLocalizedMessage(1038284); // It appears to have poison smeared on it. } } else diff --git a/Projects/UOContent/Skills/Begging.cs b/Projects/UOContent/Skills/Begging.cs index 3e3e9f577..f694fb12d 100644 --- a/Projects/UOContent/Skills/Begging.cs +++ b/Projects/UOContent/Skills/Begging.cs @@ -37,7 +37,7 @@ namespace Server.SkillHandlers { if (m_SetSkillTime) { - @from.NextSkillTime = Core.TickCount; + from.NextSkillTime = Core.TickCount; } } @@ -93,7 +93,7 @@ namespace Server.SkillHandlers if (number != -1) { - @from.SendLocalizedMessage(number); + from.SendLocalizedMessage(number); } } diff --git a/Projects/UOContent/Skills/EvalInt.cs b/Projects/UOContent/Skills/EvalInt.cs index c22004450..5c9c8db04 100644 --- a/Projects/UOContent/Skills/EvalInt.cs +++ b/Projects/UOContent/Skills/EvalInt.cs @@ -88,7 +88,7 @@ namespace Server.SkillHandlers MessageType.Regular, 0x3B2, 1038202 + mnMod, - @from.NetState + from.NetState ); // That being is at [10,20,...] percent mental strength. } } diff --git a/Projects/UOContent/Skills/ForensicEval.cs b/Projects/UOContent/Skills/ForensicEval.cs index 877b85ace..de0cd457b 100644 --- a/Projects/UOContent/Skills/ForensicEval.cs +++ b/Projects/UOContent/Skills/ForensicEval.cs @@ -37,11 +37,11 @@ namespace Server.SkillHandlers { if (target is PlayerMobile pm && pm.NpcGuild == NpcGuild.ThievesGuild) { - @from.SendLocalizedMessage(501004); // That individual is a thief! + from.SendLocalizedMessage(501004); // That individual is a thief! } else { - @from.SendLocalizedMessage(501003); // You notice nothing unusual. + from.SendLocalizedMessage(501003); // You notice nothing unusual. } } else @@ -55,19 +55,19 @@ namespace Server.SkillHandlers { if (c.m_Forensicist != null) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1042750, c.m_Forensicist ); // The forensicist ~1_NAME~ has already discovered that: } else { - c.m_Forensicist = @from.Name; + c.m_Forensicist = from.Name; } if (((Body)c.Amount).IsHuman) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1042751, c.Killer == null ? "no one" : c.Killer.Name ); // This person was killed by ~1_KILLER_NAME~ @@ -105,11 +105,11 @@ namespace Server.SkillHandlers { if (p.Picker != null) { - @from.SendLocalizedMessage(1042749, p.Picker.Name); // This lock was opened by ~1_PICKER_NAME~ + from.SendLocalizedMessage(1042749, p.Picker.Name); // This lock was opened by ~1_PICKER_NAME~ } else { - @from.SendLocalizedMessage(501003); // You notice nothing unusual. + from.SendLocalizedMessage(501003); // You notice nothing unusual. } } } diff --git a/Projects/UOContent/Skills/Inscribe.cs b/Projects/UOContent/Skills/Inscribe.cs index e1423478d..4006652f6 100644 --- a/Projects/UOContent/Skills/Inscribe.cs +++ b/Projects/UOContent/Skills/Inscribe.cs @@ -102,7 +102,7 @@ namespace Server.SkillHandlers { if (cancelType == TargetCancelType.Timeout) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 501619 ); // You have waited too long to make your inscribe selection, your inscription attempt has timed out. } @@ -162,7 +162,7 @@ namespace Server.SkillHandlers { if (cancelType == TargetCancelType.Timeout) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 501619 ); // You have waited too long to make your inscribe selection, your inscription attempt has timed out. } diff --git a/Projects/UOContent/Skills/ItemIdentification.cs b/Projects/UOContent/Skills/ItemIdentification.cs index be8cbd13a..0724bce80 100644 --- a/Projects/UOContent/Skills/ItemIdentification.cs +++ b/Projects/UOContent/Skills/ItemIdentification.cs @@ -41,7 +41,7 @@ namespace Server.Items if (!Core.AOS) { - item.OnSingleClick(@from); + item.OnSingleClick(from); } } else diff --git a/Projects/UOContent/Skills/Peacemaking.cs b/Projects/UOContent/Skills/Peacemaking.cs index 37b79f821..94812633f 100644 --- a/Projects/UOContent/Skills/Peacemaking.cs +++ b/Projects/UOContent/Skills/Peacemaking.cs @@ -46,7 +46,7 @@ namespace Server.SkillHandlers { if (m_SetSkillTime) { - @from.NextSkillTime = Core.TickCount; + from.NextSkillTime = Core.TickCount; } } @@ -126,19 +126,19 @@ namespace Server.SkillHandlers if (bc?.BardPacified == false) { - bc.Pacify(@from, DateTime.UtcNow + TimeSpan.FromSeconds(1.0)); + bc.Pacify(from, DateTime.UtcNow + TimeSpan.FromSeconds(1.0)); } } if (!calmed) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1049648 ); // You play hypnotic music, but there is nothing in range for you to calm. } else { - @from.SendLocalizedMessage(500615); // You play your hypnotic music, stopping the battle. + from.SendLocalizedMessage(500615); // You play your hypnotic music, stopping the battle. } } } diff --git a/Projects/UOContent/Skills/Poisoning.cs b/Projects/UOContent/Skills/Poisoning.cs index 2be70dcd4..1b074cb82 100644 --- a/Projects/UOContent/Skills/Poisoning.cs +++ b/Projects/UOContent/Skills/Poisoning.cs @@ -89,13 +89,13 @@ namespace Server.SkillHandlers { if (Core.AOS) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1060204 ); // You cannot poison that! You can only poison infectious weapons, food or drink. } else { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 502145 ); // You cannot poison that! You can only poison bladed or piercing weapons, food or drink. } diff --git a/Projects/UOContent/Skills/RemoveTrap.cs b/Projects/UOContent/Skills/RemoveTrap.cs index 39d22524a..ba00e8f37 100644 --- a/Projects/UOContent/Skills/RemoveTrap.cs +++ b/Projects/UOContent/Skills/RemoveTrap.cs @@ -110,7 +110,7 @@ namespace Server.SkillHandlers if (silver > 0) { - @from.SendLocalizedMessage( + from.SendLocalizedMessage( 1008113, true, silver.ToString( @@ -129,7 +129,7 @@ namespace Server.SkillHandlers if (!isOwner) { - kit.ConsumeCharge(@from); + kit.ConsumeCharge(from); } } } diff --git a/Projects/UOContent/Skills/Snooping.cs b/Projects/UOContent/Skills/Snooping.cs index 8bafc926c..43f894fe3 100644 --- a/Projects/UOContent/Skills/Snooping.cs +++ b/Projects/UOContent/Skills/Snooping.cs @@ -18,7 +18,7 @@ namespace Server.SkillHandlers if (to.Player) { - return @from.CanBeHarmful(to, false, true); // normal restrictions + return from.CanBeHarmful(to, false, true); // normal restrictions } if ((map?.Rules & MapRules.HarmfulRestrictions) == 0) @@ -72,7 +72,7 @@ namespace Server.SkillHandlers foreach (var ns in eable) { - if (ns.Mobile != @from) + if (ns.Mobile != from) { ns.Mobile.SendMessage(message); } @@ -84,7 +84,7 @@ namespace Server.SkillHandlers if (from.AccessLevel == AccessLevel.Player) { - Titles.AwardKarma(@from, -4, true); + Titles.AwardKarma(from, -4, true); } if (from.AccessLevel > AccessLevel.Player || from.CheckTargetSkill(SkillName.Snooping, cont, 0.0, 100.0)) @@ -102,7 +102,7 @@ namespace Server.SkillHandlers if (from.Skills.Hiding.Value / 2 < Utility.Random(100)) { - @from.RevealingAction(); + from.RevealingAction(); } } } diff --git a/Projects/UOContent/Skills/TasteID.cs b/Projects/UOContent/Skills/TasteID.cs index dbbf8f416..121386e56 100644 --- a/Projects/UOContent/Skills/TasteID.cs +++ b/Projects/UOContent/Skills/TasteID.cs @@ -38,11 +38,11 @@ namespace Server.SkillHandlers { if (food.Poison != null) { - food.SendLocalizedMessageTo(@from, 1038284); // It appears to have poison smeared on it. + food.SendLocalizedMessageTo(from, 1038284); // It appears to have poison smeared on it. } else { - food.SendLocalizedMessageTo(@from, 1010600); // You detect nothing unusual about this substance. + food.SendLocalizedMessageTo(from, 1010600); // You detect nothing unusual about this substance. } } else diff --git a/Projects/UOContent/SpecialSystems/Engines/TestCenter.cs b/Projects/UOContent/SpecialSystems/Engines/TestCenter.cs index 26cf7696c..fe1ff790a 100644 --- a/Projects/UOContent/SpecialSystems/Engines/TestCenter.cs +++ b/Projects/UOContent/SpecialSystems/Engines/TestCenter.cs @@ -46,19 +46,19 @@ namespace Server.Misc if (Insensitive.Equals(name, "str")) { - ChangeStrength(@from, (int)value); + ChangeStrength(from, (int)value); } else if (Insensitive.Equals(name, "dex")) { - ChangeDexterity(@from, (int)value); + ChangeDexterity(from, (int)value); } else if (Insensitive.Equals(name, "int")) { - ChangeIntelligence(@from, (int)value); + ChangeIntelligence(from, (int)value); } else { - ChangeSkill(@from, name, value); + ChangeSkill(from, name, value); } } catch @@ -164,7 +164,7 @@ namespace Server.Misc if (skill.Owner.Total - oldFixedPoint + newFixedPoint > skill.Owner.Cap) { - @from.SendMessage("You can not exceed the skill cap. Try setting another skill lower first."); + from.SendMessage("You can not exceed the skill cap. Try setting another skill lower first."); } else { diff --git a/Projects/UOContent/Spells/Ninjitsu/FocusAttack.cs b/Projects/UOContent/Spells/Ninjitsu/FocusAttack.cs index 95bf55a9c..c7edb6526 100644 --- a/Projects/UOContent/Spells/Ninjitsu/FocusAttack.cs +++ b/Projects/UOContent/Spells/Ninjitsu/FocusAttack.cs @@ -22,14 +22,14 @@ namespace Server.Spells.Ninjitsu if (handOne != null && !(handOne is BaseRanged)) { - return base.Validate(@from); + return base.Validate(from); } Item handTwo = from.FindItemOnLayer(Layer.TwoHanded) as BaseWeapon; if (handTwo != null && !(handTwo is BaseRanged)) { - return base.Validate(@from); + return base.Validate(from); } from.SendLocalizedMessage(1063097); // You must be wielding a melee weapon without a shield to use this ability. diff --git a/Projects/UOContent/Spells/Spellweaving/Items/TransientItem.cs b/Projects/UOContent/Spells/Spellweaving/Items/TransientItem.cs index eb5ec0e6a..182313d4f 100644 --- a/Projects/UOContent/Spells/Spellweaving/Items/TransientItem.cs +++ b/Projects/UOContent/Spells/Spellweaving/Items/TransientItem.cs @@ -35,7 +35,7 @@ namespace Server.Items { if (InvalidTransferMessage != null) { - TextDefinition.SendMessageTo(@from, InvalidTransferMessage); + TextDefinition.SendMessageTo(from, InvalidTransferMessage); } Delete(); diff --git a/Projects/UOContent/Spells/Targeting/RecallSpellTarget.cs b/Projects/UOContent/Spells/Targeting/RecallSpellTarget.cs index 0c81b27db..aead21c64 100644 --- a/Projects/UOContent/Spells/Targeting/RecallSpellTarget.cs +++ b/Projects/UOContent/Spells/Targeting/RecallSpellTarget.cs @@ -27,7 +27,7 @@ namespace Server.Spells } else { - @from.SendLocalizedMessage(501805); // That rune is not yet marked. + from.SendLocalizedMessage(501805); // That rune is not yet marked. } } else if (o is Runebook runebook) @@ -40,7 +40,7 @@ namespace Server.Spells } else { - @from.SendLocalizedMessage(502354); // Target is not marked. + from.SendLocalizedMessage(502354); // Target is not marked. } } else if (m_ToBoat && o is Key key && key.KeyValue != 0 && key.Link is BaseBoat boat) @@ -51,15 +51,15 @@ namespace Server.Spells } else { - @from.Send( + from.Send( new MessageLocalized( - @from.Serial, - @from.Body, + from.Serial, + from.Body, MessageType.Regular, 0x3B2, 3, 502357, - @from.Name, + from.Name, "" ) ); // I can not recall from that object. diff --git a/Projects/UOContent/Targets/BladedItemTarget.cs b/Projects/UOContent/Targets/BladedItemTarget.cs index 1f277b62c..51c99d5ae 100644 --- a/Projects/UOContent/Targets/BladedItemTarget.cs +++ b/Projects/UOContent/Targets/BladedItemTarget.cs @@ -16,11 +16,11 @@ namespace Server.Targets { if (targeted is UnholyBone bone && from.InRange(bone, 12)) { - bone.Carve(@from, m_Item); + bone.Carve(from, m_Item); } else { - base.OnTargetOutOfRange(@from, targeted); + base.OnTargetOutOfRange(from, targeted); } } @@ -39,7 +39,7 @@ namespace Server.Targets { if (!pet.Controlled || pet.ControlMaster != from) { - @from.SendLocalizedMessage(1053022); // You cannot remove barding from a swamp dragon you do not own. + from.SendLocalizedMessage(1053022); // You cannot remove barding from a swamp dragon you do not own. } else { diff --git a/Projects/UOContent/Targets/MoveTarget.cs b/Projects/UOContent/Targets/MoveTarget.cs index 3de2bcc13..078fa5437 100644 --- a/Projects/UOContent/Targets/MoveTarget.cs +++ b/Projects/UOContent/Targets/MoveTarget.cs @@ -38,14 +38,14 @@ namespace Server.Targets { if (!item.Deleted) { - item.MoveToWorld(new Point3D(p), @from.Map); + item.MoveToWorld(new Point3D(p), from.Map); } } else if (m_Object is Mobile m) { if (!m.Deleted) { - m.MoveToWorld(new Point3D(p), @from.Map); + m.MoveToWorld(new Point3D(p), from.Map); } } } diff --git a/Projects/UOContent/Targets/PickMoveTarget.cs b/Projects/UOContent/Targets/PickMoveTarget.cs index 310c7e83a..433eb5652 100644 --- a/Projects/UOContent/Targets/PickMoveTarget.cs +++ b/Projects/UOContent/Targets/PickMoveTarget.cs @@ -19,7 +19,7 @@ namespace Server.Targets if (o is Item || o is Mobile) { - @from.Target = new MoveTarget(o); + from.Target = new MoveTarget(o); } } }