From 83dcf536d88de0889471c66cd9a8ac8d3ea9f90f Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Fri, 14 Sep 2018 12:56:58 -0700 Subject: [PATCH] Removes implicit this. --- Scripts/Accounting/Account.cs | 20 +- Scripts/Commands/Add.cs | 4 +- Scripts/Commands/Docs.cs | 14 +- .../Generic/Extensions/BaseExtension.cs | 4 +- .../Extensions/Compilers/SortCompiler.cs | 2 +- .../Generic/Implementors/ObjectConditional.cs | 2 +- Scripts/Commands/Handlers.cs | 4 +- Scripts/Context Menus/OpenBankEntry.cs | 2 +- .../Engines/BulkOrders/Books/BOBFilterGump.cs | 2 +- Scripts/Engines/BulkOrders/Books/BOBGump.cs | 2 +- .../Engines/BulkOrders/Books/BODBuyGump.cs | 2 +- Scripts/Engines/BulkOrders/LargeSmithBOD.cs | 20 +- Scripts/Engines/BulkOrders/LargeTailorBOD.cs | 20 +- Scripts/Engines/BulkOrders/SmallSmithBOD.cs | 44 ++-- Scripts/Engines/BulkOrders/SmallTailorBOD.cs | 44 ++-- .../CannedEvil/ChampionSkullBrazier.cs | 10 +- .../CannedEvil/ChampionSkullPlatform.cs | 2 +- Scripts/Engines/CannedEvil/ChampionSpawn.cs | 8 +- Scripts/Engines/ConPVP/DuelContext.cs | 6 +- Scripts/Engines/ConPVP/Games/BombingRun.cs | 172 +++++++-------- Scripts/Engines/ConPVP/Games/CTF.cs | 8 +- Scripts/Engines/ConPVP/Games/DoubleDom.cs | 24 +- Scripts/Engines/ConPVP/Games/KingOfTheHill.cs | 14 +- Scripts/Engines/ConPVP/Ladder.cs | 4 +- Scripts/Engines/ConPVP/SafeZone.cs | 2 +- Scripts/Engines/ConPVP/Tournament.cs | 6 +- Scripts/Engines/ConPVP/Trophy.cs | 2 +- Scripts/Engines/Craft/Core/CraftItem.cs | 4 +- .../Engines/Craft/Core/QueryMakersMarkGump.cs | 2 +- Scripts/Engines/Craft/Core/Recipes.cs | 4 +- Scripts/Engines/Craft/DefTinkering.cs | 4 +- Scripts/Engines/Doom/GauntletSpawner.cs | 12 +- .../Doom/LeverPuzzle/LeverPuzzleItems.cs | 4 +- .../Doom/LeverPuzzle/LeverPuzzleRegions.cs | 4 +- Scripts/Engines/Ethics/Core/Persistance.cs | 8 +- Scripts/Engines/Ethics/Core/Power.cs | 2 +- Scripts/Engines/Ethics/Evil/Powers/Blight.cs | 2 +- .../Ethics/Evil/Powers/SummonFamiliar.cs | 4 +- .../Engines/Ethics/Evil/Powers/UnholyItem.cs | 8 +- .../Engines/Ethics/Evil/Powers/UnholySense.cs | 2 +- .../Ethics/Evil/Powers/UnholyShield.cs | 4 +- .../Engines/Ethics/Evil/Powers/UnholySteed.cs | 2 +- Scripts/Engines/Ethics/Hero/Powers/Bless.cs | 2 +- .../Engines/Ethics/Hero/Powers/HolyItem.cs | 8 +- .../Engines/Ethics/Hero/Powers/HolySense.cs | 2 +- .../Engines/Ethics/Hero/Powers/HolyShield.cs | 4 +- .../Engines/Ethics/Hero/Powers/HolySteed.cs | 2 +- .../Ethics/Hero/Powers/SummonFamiliar.cs | 4 +- Scripts/Engines/Factions/Core/Faction.cs | 10 +- Scripts/Engines/Factions/Core/Reflector.cs | 2 +- .../Engines/Factions/Core/StrongholdRegion.cs | 2 +- Scripts/Engines/Factions/Core/Town.cs | 2 +- .../Power Faction Items/GemOfEmpowerment.cs | 2 +- .../Power Faction Items/PowerFactionItem.cs | 10 +- .../Items/Power Faction Items/StormsEye.cs | 12 +- .../Power Faction Items/UrnOfAscension.cs | 2 +- Scripts/Engines/Factions/Items/Sigil.cs | 2 +- .../Factions/Items/Traps/BaseFactionTrap.cs | 4 +- .../Factions/Items/Traps/FactionGasTrap.cs | 2 +- .../Factions/Items/Traps/FactionSawTrap.cs | 2 +- .../Factions/Items/Traps/FactionSpikeTrap.cs | 2 +- .../Factions/Mobiles/FactionWarHorse.cs | 2 +- .../Mobiles/Guards/BaseFactionGuard.cs | 10 +- .../Mobiles/Vendors/FactionHorseVendor.cs | 4 +- Scripts/Engines/Help/HelpGump.cs | 4 +- Scripts/Engines/Help/PageQueue.cs | 2 +- Scripts/Engines/Help/StuckMenu.cs | 2 +- .../Engines/Khaldun/KhaldunPitTeleporter.cs | 2 +- .../Khaldun/Mobiles/GrimmochDrummel.cs | 2 +- Scripts/Engines/Khaldun/PuzzleChest.cs | 2 +- Scripts/Engines/Khaldun/RaisableItem.cs | 4 +- .../MLQuests/Definitions/Spellweaving.cs | 6 +- .../Engines/MLQuests/Gumps/RaceChangeGump.cs | 2 +- Scripts/Engines/MyRunUO/MyRunUO.cs | 4 +- Scripts/Engines/Party/Party.cs | 12 +- Scripts/Engines/Party/PartyCommands.cs | 2 +- .../Engines/Plants/MiscItems/GreenThorns.cs | 2 +- .../Engines/Plants/MiscItems/OrangePetals.cs | 4 +- Scripts/Engines/Plants/PlantBowl.cs | 2 +- Scripts/Engines/Plants/PlantItem.cs | 6 +- .../AmbitiousQueenQuest.cs | 24 +- .../Mobiles/AmbitiousSolenQueen.cs | 10 +- .../Quests/Collector/CollectorQuest.cs | 86 ++++---- .../Quests/Collector/Items/Obsidian.cs | 14 +- .../Collector/Mobiles/ElwoodMcCarrin.cs | 10 +- .../Quests/Core/Items/DynamicTeleporter.cs | 2 +- .../Quests/Core/Items/HornOfRetreat.cs | 2 +- Scripts/Engines/Quests/Core/QuestObjective.cs | 4 +- Scripts/Engines/Quests/Core/QuestSystem.cs | 8 +- .../Quests/Dark Tides/Conversations.cs | 2 +- .../Quests/Dark Tides/DarkTidesQuest.cs | 70 +++--- .../Quests/Dark Tides/Items/KronusScroll.cs | 10 +- .../Quests/Dark Tides/Mobiles/Mardoth.cs | 6 +- .../EminosUndertakingQuest.cs | 66 +++--- .../Items/EminosKatanaChest.cs | 4 +- .../Items/GuardianBarrier.cs | 4 +- .../Haochi's Trials/HaochisTrialsQuest.cs | 72 +++--- .../Items/HaochisTreasureChest.cs | 4 +- .../Haochi's Trials/Items/HonorCandle.cs | 2 +- .../Solen Matriarch/Mobiles/SolenMatriarch.cs | 24 +- .../Solen Matriarch/SolenMatriarchQuest.cs | 30 +-- .../Quests/The Summoning/Mobiles/Chyloth.cs | 6 +- .../Quests/The Summoning/Mobiles/Victoria.cs | 2 +- .../Quests/The Summoning/TheSummoningQuest.cs | 8 +- .../Items/SchmendrickApprenticeCorpse.cs | 10 +- .../Uzeraan Turmoil/Mobiles/MilitiaFighter.cs | 6 +- .../Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs | 6 +- .../Uzeraan Turmoil/UzeraanTurmoilQuest.cs | 66 +++--- .../Items/HagApprenticeCorpse.cs | 2 +- .../Witch Apprentice/Mobiles/Blackheart.cs | 2 +- .../Witch Apprentice/Mobiles/Grizelda.cs | 12 +- .../Quests/Witch Apprentice/Objectives.cs | 10 +- .../Witch Apprentice/WitchApprenticeQuest.cs | 44 ++-- Scripts/Engines/RemoteAdmin/Network.cs | 4 +- .../Objects/Charts/ChartItemCollection.cs | 36 +-- .../Objects/Reports/ItemValueCollection.cs | 36 +-- .../Objects/Reports/ReportColumnCollection.cs | 36 +-- .../Objects/Reports/ReportItemCollection.cs | 36 +-- .../Objects/Snapshots/SnapshotCollection.cs | 36 +-- .../Engines/Reports/Objects/Staffing/Info.cs | 4 +- .../Objects/Staffing/PageInfoCollection.cs | 36 +-- .../Objects/Staffing/QueueStatusCollection.cs | 36 +-- .../Staffing/ResponseInfoCollection.cs | 36 +-- .../Reports/Persistance/PersistableObject.cs | 2 +- .../PersistableObjectCollection.cs | 38 ++-- Scripts/Engines/Reports/Reports.cs | 2 +- Scripts/Engines/Spawner/Spawner.cs | 16 +- .../BasePigmentsOfTokuno.cs | 2 +- .../Treasures of Tokuno/TreasuresOfTokuno.cs | 2 +- .../Engines/VeteranRewards/RewardSystem.cs | 2 +- Scripts/Engines/Virtues/Justice.cs | 2 +- Scripts/Engines/Virtues/VirtueGump.cs | 2 +- Scripts/Engines/Virtues/VirtueHelper.cs | 2 +- Scripts/Gumps/AddGump.cs | 2 +- Scripts/Gumps/AdminGump.cs | 10 +- Scripts/Gumps/BanDurationGump.cs | 2 +- Scripts/Gumps/BaseConfirmGump.cs | 2 +- Scripts/Gumps/ConfirmReleaseGump.cs | 2 +- Scripts/Gumps/Guilds/GuildAbbrvPrompt.cs | 2 +- Scripts/Gumps/Guilds/GuildDeclareWarPrompt.cs | 2 +- Scripts/Gumps/Guilds/GuildGump.cs | 2 +- Scripts/Gumps/Guilds/GuildNamePrompt.cs | 2 +- .../New Guild System/Create Guild Gump.cs | 4 +- .../Guilds/New Guild System/DiplomacyGump.cs | 12 +- .../New Guild System/GuildMemberInfoGump.cs | 2 +- .../New Guild System/GuildRosterGump.cs | 10 +- .../Guilds/New Guild System/OtherGuildInfo.cs | 2 +- Scripts/Gumps/NoticeGump.cs | 2 +- Scripts/Gumps/ViewHousesGump.cs | 2 +- Scripts/Gumps/WarningGump.cs | 2 +- .../Halloween/2006/Engines/TrickOrTreat.cs | 4 +- .../Halloween/2006/Items/HalloweenPumpkin.cs | 2 +- .../Halloween/2009/Foods/MrPlainsCookies.cs | 4 +- Scripts/Items/Addons/AddonComponent.cs | 4 +- Scripts/Items/Addons/BallotBox.cs | 2 +- Scripts/Items/Addons/BaseAddon.cs | 4 +- Scripts/Items/Addons/BaseAddonContainer.cs | 4 +- .../Items/Addons/BaseAddonContainerDeed.cs | 2 +- Scripts/Items/Addons/BaseAddonDeed.cs | 2 +- Scripts/Items/Addons/DartBoard.cs | 10 +- Scripts/Items/Addons/FlourMillEastAddon.cs | 4 +- Scripts/Items/Addons/FlourMillSouthAddon.cs | 4 +- Scripts/Items/Addons/GozaMats.cs | 16 +- .../Items/Addons/LargeStoneTableEastAddon.cs | 2 +- .../Items/Addons/LargeStoneTableSouthAddon.cs | 2 +- .../Items/Addons/MediumStoneTableEastAddon.cs | 2 +- Scripts/Items/Addons/SHTeleporter.cs | 2 +- Scripts/Items/Addons/ShrineOfWisdomAddon.cs | 2 +- Scripts/Items/Aquarium/Aquarium.cs | 28 +-- .../Items/Armor/Artifacts/LeggingsOfBane.cs | 6 +- Scripts/Items/Armor/BaseArmor.cs | 14 +- Scripts/Items/Body Parts/Head.cs | 4 +- Scripts/Items/Books/BaseBook.cs | 14 +- Scripts/Items/Clothing/BaseClothing.cs | 8 +- Scripts/Items/Clothing/Cloaks.cs | 2 +- Scripts/Items/Construction/Doors/BaseDoor.cs | 6 +- Scripts/Items/Construction/Doors/Doors.cs | 26 +-- .../Items/Construction/Doors/HouseDoors.cs | 8 +- .../Items/Construction/Doors/SecretDoors.cs | 12 +- Scripts/Items/Containers/BaseTreasureChest.cs | 14 +- Scripts/Items/Containers/Container.cs | 8 +- .../Items/Containers/FillableContainers.cs | 10 +- Scripts/Items/Containers/LockableContainer.cs | 4 +- Scripts/Items/Containers/SalvageBag.cs | 2 +- Scripts/Items/Containers/Strongbox.cs | 2 +- .../Items/Containers/TrappableContainer.cs | 8 +- Scripts/Items/Containers/TreasureMapChest.cs | 10 +- .../BaseDecorationArtifact.cs | 4 +- .../SEDecorationArtifacts.cs | 16 +- .../StealableArtifactsSpawner.cs | 14 +- Scripts/Items/Deeds/BarkeepContract.cs | 4 +- Scripts/Items/Deeds/DragonBardingDeed.cs | 10 +- Scripts/Items/Deeds/HolidayTreeDeed.cs | 4 +- Scripts/Items/Deeds/NameChangeDeed.cs | 2 +- Scripts/Items/Deeds/VendorRentalContract.cs | 4 +- Scripts/Items/Facial/Beard.cs | 4 +- Scripts/Items/Facial/Hair.cs | 4 +- Scripts/Items/Farming/FarmableCrop.cs | 10 +- Scripts/Items/Food/Beverage.cs | 54 ++--- Scripts/Items/Food/BeverageEmpty.cs | 4 +- Scripts/Items/Food/CookableFood.cs | 2 +- Scripts/Items/Food/Cooking.cs | 4 +- Scripts/Items/Food/Food.cs | 126 +++++------ Scripts/Items/Food/Fruits.cs | 72 +++--- Scripts/Items/Food/Vegetables.cs | 24 +- Scripts/Items/Games/BaseBoard.cs | 4 +- Scripts/Items/Games/Dices.cs | 4 +- Scripts/Items/Guilds/Guildstone.cs | 8 +- Scripts/Items/Jewels/BaseJewel.cs | 4 +- Scripts/Items/Lights/BaseLight.cs | 2 +- Scripts/Items/Maps/MapItem.cs | 2 +- Scripts/Items/Maps/TreasureMap.cs | 12 +- Scripts/Items/Misc/BankCheck.cs | 2 +- Scripts/Items/Misc/Blocker.cs | 2 +- Scripts/Items/Misc/Bola.cs | 8 +- Scripts/Items/Misc/BulletinBoards.cs | 10 +- Scripts/Items/Misc/CommunicationCrystals.cs | 28 +-- Scripts/Items/Misc/Corpses/Corpse.cs | 28 +-- Scripts/Items/Misc/Corpses/DecayedCorpse.cs | 2 +- Scripts/Items/Misc/DeceitBrazier.cs | 8 +- Scripts/Items/Misc/Gold.cs | 4 +- Scripts/Items/Misc/Guillotine.cs | 10 +- Scripts/Items/Misc/HairDye.cs | 2 +- Scripts/Items/Misc/InteriorDecorator.cs | 6 +- Scripts/Items/Misc/Key.cs | 4 +- Scripts/Items/Misc/KeyRing.cs | 22 +- Scripts/Items/Misc/LOSBlocker.cs | 4 +- Scripts/Items/Misc/Origami.cs | 2 +- Scripts/Items/Misc/PlayerBulletinBoards.cs | 2 +- Scripts/Items/Misc/PlayerVendorDeed.cs | 4 +- Scripts/Items/Misc/PowerCrystal.cs | 2 +- Scripts/Items/Misc/PublicMoongate.cs | 2 +- Scripts/Items/Misc/SerpentPillar.cs | 4 +- Scripts/Items/Misc/SpecialBeardDye.cs | 2 +- Scripts/Items/Misc/SpecialHairDye.cs | 2 +- Scripts/Items/Misc/Teleporter.cs | 2 +- Scripts/Items/Misc/TrashBarrel.cs | 2 +- Scripts/Items/Misc/WarningItem.cs | 2 +- Scripts/Items/Misc/Waypoint.cs | 4 +- Scripts/Items/Misc/WindChimes.cs | 4 +- Scripts/Items/Resources/Blacksmithing/Ore.cs | 2 +- Scripts/Items/Shields/BaseShield.cs | 4 +- .../Blacksmith Items/Misc/AnvilForge.cs | 4 +- .../Blacksmith Items/Misc/LargeForge.cs | 12 +- Scripts/Items/Skill Items/Camping/Bedroll.cs | 12 +- Scripts/Items/Skill Items/Camping/Campfire.cs | 30 +-- Scripts/Items/Skill Items/Camping/Kindling.cs | 10 +- .../Carpenter Items/TaxidermyKit.cs | 18 +- Scripts/Items/Skill Items/Fishing/Misc/SOS.cs | 2 +- .../Items/Skill Items/Fishing/Misc/Sextant.cs | 4 +- .../Fishing/Misc/ShipwreckedItem.cs | 6 +- .../Fishing/Misc/SpecialFishingNet.cs | 4 +- .../Harvest Tools/BaseHarvestTool.cs | 2 +- .../Skill Items/Magical/Misc/Moongate.cs | 4 +- .../Skill Items/Magical/Misc/PotionKeg.cs | 4 +- .../Agility Potions/BaseAgilityPotion.cs | 4 +- .../Skill Items/Magical/Potions/BasePotion.cs | 6 +- .../Potions/Cure Potions/BaseCurePotion.cs | 4 +- .../Explosion Potions/BaseExplosionPotion.cs | 6 +- .../Potions/Heal Potions/BaseHealPotion.cs | 4 +- .../Skill Items/Magical/Potions/NightSight.cs | 4 +- .../Poison Potions/BasePoisonPotion.cs | 4 +- .../Refresh Potions/BaseRefreshPotion.cs | 4 +- .../Strength Potions/BaseStrengthPotion.cs | 4 +- .../Magical/Scrolls/SpellScroll.cs | 4 +- .../Items/Skill Items/Magical/Spellbook.cs | 14 +- Scripts/Items/Skill Items/Misc/FireHorn.cs | 6 +- .../Items/Skill Items/Misc/RecipeScroll.cs | 8 +- Scripts/Items/Skill Items/Misc/RepairDeed.cs | 6 +- .../Musical Instruments/BaseInstrument.cs | 2 +- Scripts/Items/Skill Items/Specialized/Sand.cs | 4 +- .../Tailor Items/Dyetubs/DyeTub.cs | 2 +- .../Tailor Items/Dyetubs/SpecialDyeTub.cs | 2 +- Scripts/Items/Skill Items/Tools/BaseTool.cs | 2 +- .../Dawn's Music Box/DawnsMusicBox.cs | 2 +- .../Special/AoS Promotional/LuckyNecklace.cs | 2 +- .../Blacksmithy/GlovesOfMining.cs | 2 +- .../Special/Heritage Items/IronMaiden.cs | 2 +- .../Special/Holiday/Christmas/HolidayTree.cs | 6 +- Scripts/Items/Special/Holiday/Wreath.cs | 22 +- .../Special/House Raffle/HouseRaffleRegion.cs | 2 +- .../Special/House Raffle/HouseRaffleStone.cs | 2 +- .../Items/Special/ML/GrizzledMareStatuette.cs | 2 +- Scripts/Items/Special/MonsterStatuette.cs | 4 +- .../Items/Special/Rares/Containers/Bucket.cs | 2 +- .../Special/Rares/Containers/WaterBarrel.cs | 2 +- .../Special/Rares/Containers/WaterTub.cs | 2 +- Scripts/Items/Special/RewardCake.cs | 2 +- .../Items/Special/Solen Items/BagOfSending.cs | 22 +- .../Special/Solen Items/BallOfSummoning.cs | 34 +-- .../Special/Solen Items/BraceletOfBinding.cs | 38 ++-- .../Solen Items/PowderOfTranslocation.cs | 2 +- Scripts/Items/Special/SoulStone.cs | 18 +- .../Special/Special Scrolls/PowerScroll.cs | 6 +- .../Special/Special Scrolls/SpecialScroll.cs | 2 +- .../Special/Special Scrolls/StatScroll.cs | 4 +- .../Special/Valentines/2007/ValentinesCard.cs | 2 +- .../Items/Special/Veteran Rewards/Brazier.cs | 2 +- .../Special/Veteran Rewards/MiningCart.cs | 2 +- .../Special/Veteran Rewards/TreeStump.cs | 2 +- .../Special/Veteran Rewards/WallBanner.cs | 2 +- .../Veteran Rewards/WeaponEngravingTool.cs | 4 +- Scripts/Items/Talismans/RandomTalisman.cs | 20 +- Scripts/Items/Traps/BaseTrap.cs | 4 +- Scripts/Items/Traps/FlameSpurtTrap.cs | 6 +- Scripts/Items/Traps/GasTrap.cs | 2 +- Scripts/Items/Traps/SawTrap.cs | 2 +- Scripts/Items/Traps/SpikeTrap.cs | 12 +- Scripts/Items/Traps/StoneFaceTrap.cs | 8 +- .../TreasureChests/TreasureChestLevel1.cs | 18 +- .../TreasureChests/TreasureChestLevel2.cs | 38 ++-- .../TreasureChests/TreasureChestLevel3.cs | 18 +- .../TreasureChests/TreasureChestLevel4.cs | 22 +- Scripts/Items/Wands/BaseWand.cs | 2 +- Scripts/Items/Weapons/Abilities/Dismount.cs | 4 +- .../Weapons/Abilities/FrenziedWhirlwind.cs | 4 +- .../Items/Weapons/Abilities/TalonStrike.cs | 4 +- .../Items/Weapons/Abilities/WeaponAbility.cs | 2 +- Scripts/Items/Weapons/Axes/BaseAxe.cs | 8 +- Scripts/Items/Weapons/BaseWeapon.cs | 20 +- .../ML Weapons/Artifacts/ColdForgedBlade.cs | 2 +- .../ML Weapons/Artifacts/LuminousRuneBlade.cs | 2 +- .../Artifacts/OverseerSunderedBlade.cs | 2 +- Scripts/Misc/AOS.cs | 2 +- Scripts/Misc/AutoRestart.cs | 4 +- Scripts/Misc/AutoSave.cs | 4 +- Scripts/Misc/BuffIcons.cs | 4 +- Scripts/Misc/CharacterCreation.cs | 2 +- Scripts/Misc/Cleanup.cs | 2 +- Scripts/Misc/Emitter.cs | 4 +- Scripts/Misc/Gifts/Winter2004/Mistletoe.cs | 22 +- Scripts/Misc/Guild.cs | 32 +-- Scripts/Misc/LightCycle.cs | 2 +- Scripts/Misc/LootPack.cs | 2 +- Scripts/Misc/Notoriety.cs | 10 +- Scripts/Misc/ServerList.cs | 2 +- Scripts/Misc/TreasureMapProtection.cs | 2 +- Scripts/Misc/VendorGenerator.cs | 2 +- Scripts/Mobiles/AI/BaseAI.cs | 6 +- Scripts/Mobiles/Animals/Mounts/BaseMount.cs | 4 +- Scripts/Mobiles/Animals/Mounts/Ethereals.cs | 2 +- Scripts/Mobiles/Animals/Mounts/Hiryu.cs | 2 +- Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs | 2 +- Scripts/Mobiles/Animals/Mounts/Unicorn.cs | 4 +- Scripts/Mobiles/Animals/Slimes/Jwilson.cs | 18 +- .../Town Critters/(UO 3D Only) Parrot.cs | 16 +- Scripts/Mobiles/BaseCreature.cs | 180 +++++++-------- Scripts/Mobiles/Familiars/BaseFamiliar.cs | 4 +- Scripts/Mobiles/Familiars/HordeMinion.cs | 6 +- Scripts/Mobiles/Familiars/ShadowWisp.cs | 10 +- Scripts/Mobiles/Guards/ArcherGuard.cs | 8 +- Scripts/Mobiles/Guards/WarriorGuard.cs | 8 +- Scripts/Mobiles/Healers/BaseHealer.cs | 6 +- Scripts/Mobiles/Monsters/AOS/DemonKnight.cs | 6 +- Scripts/Mobiles/Monsters/AOS/Revenant.cs | 4 +- Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs | 14 +- .../Monsters/Humanoid/Magic/Betrayer.cs | 10 +- .../Humanoid/Magic/GargoyleDestroyer.cs | 4 +- .../Monsters/Humanoid/Magic/SavageShaman.cs | 6 +- .../Monsters/Humanoid/Magic/Succubus.cs | 4 +- .../Monsters/Humanoid/Melee/Brigand.cs | 2 +- .../Monsters/Humanoid/Melee/ElfBrigand.cs | 2 +- .../Monsters/Humanoid/Melee/Executioner.cs | 10 +- .../Monsters/Humanoid/Melee/Juggernaut.cs | 4 +- .../Humanoid/Melee/KhaldunSummoner.cs | 4 +- .../Monsters/Humanoid/Melee/KhaldunZealot.cs | 4 +- .../Monsters/Humanoid/Melee/OrcBomber.cs | 2 +- .../Monsters/Humanoid/Melee/OrcBrute.cs | 6 +- .../Monsters/Humanoid/Melee/RestlessSoul.cs | 2 +- .../Monsters/Humanoid/Melee/SavageRider.cs | 2 +- .../Humanoid/Melee/SpawnedOrcishLord.cs | 2 +- .../Monsters/LBR/Exodus/ExodusMinion.cs | 18 +- .../Monsters/LBR/Exodus/ExodusOverseer.cs | 18 +- .../Monsters/LBR/Jukas/ChaosDragoon.cs | 2 +- .../Monsters/LBR/Jukas/ChaosDragoonElite.cs | 2 +- .../Mobiles/Monsters/LBR/Jukas/JukaLord.cs | 2 +- .../Mobiles/Monsters/LBR/Jukas/JukaMage.cs | 4 +- .../Mobiles/Monsters/LBR/Meers/MeerCaptain.cs | 10 +- .../Mobiles/Monsters/LBR/Meers/MeerEternal.cs | 38 ++-- .../Mobiles/Monsters/LBR/Meers/MeerMage.cs | 10 +- .../Mobiles/Monsters/LBR/Meers/MeerWarrior.cs | 2 +- .../Monsters/ML/Misc/Magic/GreaterDragon.cs | 4 +- .../Mobiles/Monsters/ML/Special/Meraktus.cs | 6 +- Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs | 8 +- .../Monsters/Misc/Melee/AnimatedWeapon.cs | 2 +- Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs | 10 +- .../Monsters/Misc/Melee/PlagueBeast.cs | 18 +- .../Monsters/Misc/Melee/PlagueSpawn.cs | 2 +- .../Mobiles/Monsters/Plant/Melee/BogThing.cs | 12 +- .../Mobiles/Monsters/SE/DeathWatchBeetle.cs | 6 +- Scripts/Mobiles/Monsters/SE/FanDancer.cs | 4 +- Scripts/Mobiles/Monsters/SE/FireBeetle.cs | 2 +- Scripts/Mobiles/Monsters/SE/Yamandon.cs | 6 +- Scripts/Mobiles/PlayerMobile.cs | 206 +++++++++--------- Scripts/Mobiles/Special/Barracoon.cs | 10 +- Scripts/Mobiles/Special/BaseChampion.cs | 6 +- Scripts/Mobiles/Special/BaseShieldGuard.cs | 4 +- .../Mobiles/Special/CapturedHordeMinion.cs | 2 +- Scripts/Mobiles/Special/Dummy.cs | 8 +- Scripts/Mobiles/Special/DummySpecific.cs | 118 +++++----- Scripts/Mobiles/Special/Harrower.cs | 20 +- Scripts/Mobiles/Special/LordOaks.cs | 18 +- Scripts/Mobiles/Special/Neira.cs | 4 +- Scripts/Mobiles/Special/Paragon.cs | 2 +- Scripts/Mobiles/Special/Rikktor.cs | 6 +- Scripts/Mobiles/Special/Semidar.cs | 6 +- Scripts/Mobiles/Special/Serado.cs | 6 +- Scripts/Mobiles/Special/Silvani.cs | 8 +- Scripts/Mobiles/Townfolk/Actor.cs | 10 +- Scripts/Mobiles/Townfolk/Artist.cs | 10 +- Scripts/Mobiles/Townfolk/Banker.cs | 34 +-- Scripts/Mobiles/Townfolk/BaseEscortable.cs | 8 +- Scripts/Mobiles/Townfolk/BrideGroom.cs | 2 +- Scripts/Mobiles/Townfolk/Gypsy.cs | 10 +- Scripts/Mobiles/Townfolk/HarborMaster.cs | 10 +- Scripts/Mobiles/Townfolk/Sculptor.cs | 10 +- Scripts/Mobiles/Townfolk/TownCrier.cs | 10 +- Scripts/Mobiles/Vendors/BaseVendor.cs | 60 ++--- Scripts/Mobiles/Vendors/GenericBuy.cs | 2 +- Scripts/Mobiles/Vendors/NPC/Alchemist.cs | 2 +- Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs | 6 +- Scripts/Mobiles/Vendors/NPC/Armorer.cs | 4 +- Scripts/Mobiles/Vendors/NPC/Blacksmith.cs | 8 +- Scripts/Mobiles/Vendors/NPC/Bowyer.cs | 4 +- Scripts/Mobiles/Vendors/NPC/Butcher.cs | 4 +- Scripts/Mobiles/Vendors/NPC/Carpenter.cs | 2 +- Scripts/Mobiles/Vendors/NPC/Cook.cs | 2 +- .../Mobiles/Vendors/NPC/CustomHairstylist.cs | 2 +- Scripts/Mobiles/Vendors/NPC/Farmer.cs | 2 +- Scripts/Mobiles/Vendors/NPC/Fisherman.cs | 2 +- .../NPC/Guildmasters/BaseGuildmaster.cs | 14 +- .../NPC/Guildmasters/BlacksmithGuildmaster.cs | 8 +- .../NPC/Guildmasters/HealerGuildmaster.cs | 2 +- .../NPC/Guildmasters/MageGuildmaster.cs | 4 +- .../NPC/Guildmasters/ThiefGuildmaster.cs | 8 +- Scripts/Mobiles/Vendors/NPC/IronWorker.cs | 2 +- Scripts/Mobiles/Vendors/NPC/Mage.cs | 2 +- Scripts/Mobiles/Vendors/NPC/Miner.cs | 8 +- Scripts/Mobiles/Vendors/NPC/Ranger.cs | 8 +- Scripts/Mobiles/Vendors/NPC/Scribe.cs | 2 +- Scripts/Mobiles/Vendors/NPC/Shipwright.cs | 2 +- Scripts/Mobiles/Vendors/NPC/TavernKeeper.cs | 2 +- Scripts/Mobiles/Vendors/NPC/Thief.cs | 8 +- Scripts/Mobiles/Vendors/NPC/Waiter.cs | 2 +- Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs | 2 +- Scripts/Mobiles/Vendors/PlayerBarkeeper.cs | 10 +- Scripts/Mobiles/Vendors/PlayerVendor.cs | 60 ++--- Scripts/Multis/BaseHouse.cs | 96 ++++---- Scripts/Multis/Boats/BaseBoat.cs | 26 +-- Scripts/Multis/Boats/Plank.cs | 10 +- Scripts/Multis/Camps/BaseCamp.cs | 2 +- Scripts/Multis/HouseFoundation.cs | 14 +- Scripts/Multis/HousePlacementTool.cs | 4 +- Scripts/Multis/HouseSign.cs | 8 +- Scripts/Multis/HouseTeleporter.cs | 2 +- Scripts/Multis/MovingCrate.cs | 28 +-- Scripts/Multis/PreviewHouse.cs | 8 +- Scripts/Regions/BaseRegion.cs | 36 ++- Scripts/Regions/DungeonRegion.cs | 2 +- Scripts/Regions/GuardedRegion.cs | 4 +- Scripts/Regions/HouseRegion.cs | 6 +- Scripts/Regions/Spawning/SpawnDefinition.cs | 2 +- Scripts/Regions/Spawning/SpawnEntry.cs | 10 +- Scripts/Skills/Anatomy.cs | 2 +- Scripts/Skills/EvalInt.cs | 2 +- Scripts/Skills/Inscribe.cs | 14 +- Scripts/Skills/Meditation.cs | 2 +- Scripts/Skills/Stealing.cs | 2 +- .../Items/Stones/GamblingStone.cs | 2 +- Scripts/Spells/Base/SpecialMove.cs | 8 +- Scripts/Spells/Base/Spell.cs | 6 +- Scripts/Spells/Base/SpellHelper.cs | 6 +- Scripts/Spells/Chivalry/CloseWounds.cs | 2 +- Scripts/Spells/Chivalry/PaladinSpell.cs | 2 +- Scripts/Spells/Chivalry/SacredJourney.cs | 4 +- Scripts/Spells/Fifth/MindBlast.cs | 4 +- Scripts/Spells/Fifth/Paralyze.cs | 2 +- Scripts/Spells/First/Clumsy.cs | 2 +- Scripts/Spells/First/Feeblemind.cs | 2 +- Scripts/Spells/First/Heal.cs | 2 +- Scripts/Spells/First/MagicArrow.cs | 2 +- Scripts/Spells/First/Weaken.cs | 2 +- Scripts/Spells/Fourth/ArchProtection.cs | 4 +- Scripts/Spells/Fourth/Curse.cs | 2 +- Scripts/Spells/Fourth/GreaterHeal.cs | 2 +- Scripts/Spells/Fourth/Lightning.cs | 2 +- Scripts/Spells/Fourth/ManaDrain.cs | 2 +- Scripts/Spells/Fourth/Recall.cs | 4 +- .../Gargoyle/SpellDefinitions/FlySpell.cs | 22 +- Scripts/Spells/Ninjitsu/AnimalForm.cs | 8 +- Scripts/Spells/Ninjitsu/ShadowJump.cs | 4 +- Scripts/Spells/Second/Harm.cs | 2 +- Scripts/Spells/Second/Protection.cs | 2 +- Scripts/Spells/Seventh/FlameStrike.cs | 2 +- Scripts/Spells/Seventh/ManaVampire.cs | 2 +- Scripts/Spells/Sixth/EnergyBolt.cs | 2 +- Scripts/Spells/Sixth/Explosion.cs | 2 +- Scripts/Spells/Spellweaving/AttuneWeapon.cs | 2 +- .../Spellweaving/Items/TransientItem.cs | 8 +- Scripts/Spells/Third/Fireball.cs | 2 +- Scripts/Spells/Third/Poison.cs | 2 +- Scripts/Spells/Third/Teleport.cs | 6 +- Server/ClientVersion.cs | 2 +- Server/Diagnostics/PacketProfile.cs | 2 +- Server/Geometry.cs | 20 +- Server/Gumps/Gump.cs | 2 +- Server/IEntity.cs | 4 +- Server/Item.cs | 128 +++++------ Server/Items/BaseMulti.cs | 18 +- Server/Items/Container.cs | 28 +-- Server/Items/Containers.cs | 6 +- Server/Items/SecureTradeContainer.cs | 6 +- Server/Map.cs | 2 +- Server/Mobile.cs | 192 ++++++++-------- Server/Network/NetState.cs | 8 +- Server/Network/PacketHandlers.cs | 12 +- Server/Network/Packets.cs | 124 +++++------ Server/Network/SendQueue.cs | 2 +- Server/Persistence/BinaryMemoryWriter.cs | 2 +- Server/Persistence/DualSaveStrategy.cs | 2 +- Server/Persistence/DynamicSaveStrategy.cs | 2 +- Server/Persistence/FileQueue.cs | 10 +- Server/Persistence/ParallelSaveStrategy.cs | 8 +- Server/Persistence/QueuedMemoryWriter.cs | 6 +- Server/Persistence/SequentialFileWriter.cs | 6 +- Server/Persistence/StandardSaveStrategy.cs | 2 +- Server/Poison.cs | 2 +- Server/Region.cs | 10 +- Server/Serial.cs | 2 +- Server/Serialization.cs | 6 +- Server/Skills.cs | 2 +- Server/Utility.cs | 16 +- Server/World.cs | 4 +- 533 files changed, 2804 insertions(+), 2806 deletions(-) diff --git a/Scripts/Accounting/Account.cs b/Scripts/Accounting/Account.cs index 189dd3ba4..44a79191b 100644 --- a/Scripts/Accounting/Account.cs +++ b/Scripts/Accounting/Account.cs @@ -36,7 +36,7 @@ namespace Server.Accounting /// public void Delete() { - for ( int i = 0; i < this.Length; ++i ) + for ( int i = 0; i < Length; ++i ) { Mobile m = this[i]; @@ -235,12 +235,12 @@ namespace Server.Accounting { get { - if ( this.AccessLevel != AccessLevel.Player ) + if ( AccessLevel != AccessLevel.Player ) return false; TimeSpan inactiveLength = DateTime.UtcNow - m_LastLogin; - return (inactiveLength > ((this.Count == 0) ? EmptyInactiveDuration : InactiveDuration)); + return (inactiveLength > ((Count == 0) ? EmptyInactiveDuration : InactiveDuration)); } } @@ -546,7 +546,7 @@ namespace Server.Accounting public void RemoveYoungStatus( int message ) { - this.Young = false; + Young = false; for ( int i = 0; i < m_Mobiles.Length; i++ ) { @@ -690,7 +690,7 @@ namespace Server.Accounting } m_TotalGameTime = totalGameTime; - if ( this.Young ) + if ( Young ) CheckYoung(); Accounts.Add( this ); @@ -871,7 +871,7 @@ namespace Server.Accounting } public bool HasAccess( IPAddress ipAddress ) { - AccessLevel level = Misc.AccountHandler.LockdownLevel; + AccessLevel level = AccountHandler.LockdownLevel; if ( level > AccessLevel.Player ) { @@ -883,7 +883,7 @@ namespace Server.Accounting } else { - for ( int i = 0; !hasAccess && i < this.Length; ++i ) + for ( int i = 0; !hasAccess && i < Length; ++i ) { Mobile m = this[i]; @@ -954,7 +954,7 @@ namespace Server.Accounting } public bool CheckAccess( IPAddress ipAddress ) { - bool hasAccess = this.HasAccess( ipAddress ); + bool hasAccess = HasAccess( ipAddress ); if ( hasAccess ) { LogAccess( ipAddress ); @@ -1111,7 +1111,7 @@ namespace Server.Accounting { int count = 0; - for ( int i = 0; i < this.Length; ++i ) + for ( int i = 0; i < Length; ++i ) { if ( this[i] != null ) ++count; @@ -1192,7 +1192,7 @@ namespace Server.Accounting public int CompareTo( object obj ) { if ( obj is Account account ) - return this.CompareTo( account ); + return CompareTo( account ); throw new ArgumentException(); } diff --git a/Scripts/Commands/Add.cs b/Scripts/Commands/Add.cs index e2e9ab524..6ee2b5f59 100644 --- a/Scripts/Commands/Add.cs +++ b/Scripts/Commands/Add.cs @@ -510,7 +510,7 @@ namespace Server.Commands for ( int i = 0; i < subArgs.Length; ++i ) subArgs[i] = e.Arguments[i + 5]; - Add.Invoke( e.Mobile, p, p2, subArgs, null, outline, false ); + Invoke( e.Mobile, p, p2, subArgs, null, outline, false ); } else { @@ -530,7 +530,7 @@ namespace Server.Commands for ( int i = 0; i < subArgs.Length; ++i ) subArgs[i] = e.Arguments[i + 5]; - Add.Invoke( e.Mobile, p, p2, subArgs, null, outline, false ); + Invoke( e.Mobile, p, p2, subArgs, null, outline, false ); } else { diff --git a/Scripts/Commands/Docs.cs b/Scripts/Commands/Docs.cs index 61e994706..9fa24a9b9 100644 --- a/Scripts/Commands/Docs.cs +++ b/Scripts/Commands/Docs.cs @@ -2095,7 +2095,7 @@ namespace Server.Commands if ( info.m_Declaring == null ) nsHtml.WriteLine( " "+info.LinkName( "../types/" ) + "
" ); - using( StreamWriter typeHtml = Docs.GetWriter( info.FileName ) ) + using( StreamWriter typeHtml = GetWriter( info.FileName ) ) { typeHtml.WriteLine( "" ); typeHtml.WriteLine( " " ); @@ -2399,7 +2399,7 @@ namespace Server.Commands string rootType = type.Name.Substring( 0, index ); StringBuilder nameBuilder = new StringBuilder( rootType ); - StringBuilder fnamBuilder = new StringBuilder( "docs/types/" + Docs.SanitizeType( rootType ) ); + StringBuilder fnamBuilder = new StringBuilder( "docs/types/" + SanitizeType( rootType ) ); StringBuilder linkBuilder; if ( DontLink( type ) )//if ( DontLink( rootType ) ) linkBuilder = new StringBuilder( "" + rootType + "" ); @@ -2421,8 +2421,8 @@ namespace Server.Commands linkBuilder.Append( ',' ); } - string sanitizedName = Docs.SanitizeType( typeArguments[i].Name ); - string aliasedName = Docs.AliasForName( sanitizedName ); + string sanitizedName = SanitizeType( typeArguments[i].Name ); + string aliasedName = AliasForName( sanitizedName ); nameBuilder.Append( sanitizedName ); fnamBuilder.Append( "T" ); @@ -2444,15 +2444,15 @@ namespace Server.Commands if ( name == null ) typeName = type.Name; else typeName = name; - if ( fnam == null ) fileName = "docs/types/" + Docs.SanitizeType( type.Name ) + ".html"; + if ( fnam == null ) fileName = "docs/types/" + SanitizeType( type.Name ) + ".html"; else fileName = fnam + ".html"; if ( link == null ) { if ( DontLink( type ) ) //if ( DontLink( type.Name ) ) - linkName = "" + Docs.SanitizeType( type.Name ) + ""; + linkName = "" + SanitizeType( type.Name ) + ""; else - linkName = "" + Docs.SanitizeType( type.Name ) + ""; + linkName = "" + SanitizeType( type.Name ) + ""; } else linkName = link; diff --git a/Scripts/Commands/Generic/Extensions/BaseExtension.cs b/Scripts/Commands/Generic/Extensions/BaseExtension.cs index 72de1da0b..b8a7b1a3e 100644 --- a/Scripts/Commands/Generic/Extensions/BaseExtension.cs +++ b/Scripts/Commands/Generic/Extensions/BaseExtension.cs @@ -53,7 +53,7 @@ namespace Server.Commands.Generic public bool IsValid( object obj ) { - for ( int i = 0; i < this.Count; ++i ) + for ( int i = 0; i < Count; ++i ) { if ( !this[i].IsValid( obj ) ) return false; @@ -64,7 +64,7 @@ namespace Server.Commands.Generic public void Filter( ArrayList list ) { - for ( int i = 0; i < this.Count; ++i ) + for ( int i = 0; i < Count; ++i ) this[i].Filter( list ); } diff --git a/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs b/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs index 27b829597..f241b943f 100644 --- a/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs +++ b/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs @@ -44,7 +44,7 @@ namespace Server.Commands.Generic { m_Property = property; - this.IsAscending = isAscending; + IsAscending = isAscending; } } diff --git a/Scripts/Commands/Generic/Implementors/ObjectConditional.cs b/Scripts/Commands/Generic/Implementors/ObjectConditional.cs index c3c565048..cdc70dc4c 100644 --- a/Scripts/Commands/Generic/Implementors/ObjectConditional.cs +++ b/Scripts/Commands/Generic/Implementors/ObjectConditional.cs @@ -87,7 +87,7 @@ namespace Server.Commands.Generic public static ObjectConditional ParseDirect( Mobile from, string[] args, int offset, int size ) { if ( args == null || size == 0 ) - return ObjectConditional.Empty; + return Empty; int index = 0; diff --git a/Scripts/Commands/Handlers.cs b/Scripts/Commands/Handlers.cs index e63f2ec3a..4f15e303e 100644 --- a/Scripts/Commands/Handlers.cs +++ b/Scripts/Commands/Handlers.cs @@ -385,7 +385,7 @@ namespace Server.Commands public override void OnCancel( NetState state ) { - state.Mobile.SendMenu( new EquipMenu( state.Mobile, m_Mobile, ViewEqTarget.GetEquip( m_Mobile ) ) ); + state.Mobile.SendMenu( new EquipMenu( state.Mobile, m_Mobile, GetEquip( m_Mobile ) ) ); } public override void OnResponse( NetState state, int index ) @@ -935,7 +935,7 @@ namespace Server.Commands [Description( "View some stats about the server." )] public static void Stats_OnCommand( CommandEventArgs e ) { - e.Mobile.SendMessage( "Open Connections: {0}", Network.NetState.Instances.Count ); + e.Mobile.SendMessage( "Open Connections: {0}", NetState.Instances.Count ); e.Mobile.SendMessage( "Mobiles: {0}", World.Mobiles.Count ); e.Mobile.SendMessage( "Items: {0}", World.Items.Count ); } diff --git a/Scripts/Context Menus/OpenBankEntry.cs b/Scripts/Context Menus/OpenBankEntry.cs index 908c0d6a3..a3781749b 100644 --- a/Scripts/Context Menus/OpenBankEntry.cs +++ b/Scripts/Context Menus/OpenBankEntry.cs @@ -20,7 +20,7 @@ namespace Server.ContextMenus } else { - this.Owner.From.BankBox.Open(); + Owner.From.BankBox.Open(); } } } diff --git a/Scripts/Engines/BulkOrders/Books/BOBFilterGump.cs b/Scripts/Engines/BulkOrders/Books/BOBFilterGump.cs index 8205e3a68..14310cf59 100644 --- a/Scripts/Engines/BulkOrders/Books/BOBFilterGump.cs +++ b/Scripts/Engines/BulkOrders/Books/BOBFilterGump.cs @@ -91,7 +91,7 @@ namespace Server.Engines.BulkOrders } } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { BOBFilter f = ( m_From.UseOwnFilter ? m_From.BOBFilter : m_Book.Filter ); diff --git a/Scripts/Engines/BulkOrders/Books/BOBGump.cs b/Scripts/Engines/BulkOrders/Books/BOBGump.cs index 11c273113..3b0e1b6a4 100644 --- a/Scripts/Engines/BulkOrders/Books/BOBGump.cs +++ b/Scripts/Engines/BulkOrders/Books/BOBGump.cs @@ -242,7 +242,7 @@ namespace Server.Engines.BulkOrders { } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { int index = info.ButtonID; diff --git a/Scripts/Engines/BulkOrders/Books/BODBuyGump.cs b/Scripts/Engines/BulkOrders/Books/BODBuyGump.cs index 6d8f97837..e8d2040db 100644 --- a/Scripts/Engines/BulkOrders/Books/BODBuyGump.cs +++ b/Scripts/Engines/BulkOrders/Books/BODBuyGump.cs @@ -12,7 +12,7 @@ namespace Server.Engines.BulkOrders private int m_Price; private int m_Page; - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { if ( info.ButtonID == 2 ) { diff --git a/Scripts/Engines/BulkOrders/LargeSmithBOD.cs b/Scripts/Engines/BulkOrders/LargeSmithBOD.cs index 492859a5d..7c6dc81b3 100644 --- a/Scripts/Engines/BulkOrders/LargeSmithBOD.cs +++ b/Scripts/Engines/BulkOrders/LargeSmithBOD.cs @@ -64,20 +64,20 @@ namespace Server.Engines.BulkOrders else material = BulkMaterialType.None; - this.Hue = hue; - this.AmountMax = amountMax; - this.Entries = entries; - this.RequireExceptional = reqExceptional; - this.Material = material; + Hue = hue; + AmountMax = amountMax; + Entries = entries; + RequireExceptional = reqExceptional; + Material = material; } public LargeSmithBOD( int amountMax, bool reqExceptional, BulkMaterialType mat, LargeBulkEntry[] entries ) { - this.Hue = 0x44E; - this.AmountMax = amountMax; - this.Entries = entries; - this.RequireExceptional = reqExceptional; - this.Material = mat; + Hue = 0x44E; + AmountMax = amountMax; + Entries = entries; + RequireExceptional = reqExceptional; + Material = mat; } public override List ComputeRewards( bool full ) diff --git a/Scripts/Engines/BulkOrders/LargeTailorBOD.cs b/Scripts/Engines/BulkOrders/LargeTailorBOD.cs index 6a1b158c2..87e86ffa9 100644 --- a/Scripts/Engines/BulkOrders/LargeTailorBOD.cs +++ b/Scripts/Engines/BulkOrders/LargeTailorBOD.cs @@ -59,20 +59,20 @@ namespace Server.Engines.BulkOrders else material = BulkMaterialType.None; - this.Hue = hue; - this.AmountMax = amountMax; - this.Entries = entries; - this.RequireExceptional = reqExceptional; - this.Material = material; + Hue = hue; + AmountMax = amountMax; + Entries = entries; + RequireExceptional = reqExceptional; + Material = material; } public LargeTailorBOD( int amountMax, bool reqExceptional, BulkMaterialType mat, LargeBulkEntry[] entries ) { - this.Hue = 0x483; - this.AmountMax = amountMax; - this.Entries = entries; - this.RequireExceptional = reqExceptional; - this.Material = mat; + Hue = 0x483; + AmountMax = amountMax; + Entries = entries; + RequireExceptional = reqExceptional; + Material = mat; } public override List ComputeRewards( bool full ) diff --git a/Scripts/Engines/BulkOrders/SmallSmithBOD.cs b/Scripts/Engines/BulkOrders/SmallSmithBOD.cs index d50a6b57a..bcc3322de 100644 --- a/Scripts/Engines/BulkOrders/SmallSmithBOD.cs +++ b/Scripts/Engines/BulkOrders/SmallSmithBOD.cs @@ -163,13 +163,13 @@ namespace Server.Engines.BulkOrders private SmallSmithBOD( SmallBulkEntry entry, BulkMaterialType material, int amountMax, bool reqExceptional ) { - this.Hue = 0x44E; - this.AmountMax = amountMax; - this.Type = entry.Type; - this.Number = entry.Number; - this.Graphic = entry.Graphic; - this.RequireExceptional = reqExceptional; - this.Material = material; + Hue = 0x44E; + AmountMax = amountMax; + Type = entry.Type; + Number = entry.Number; + Graphic = entry.Graphic; + RequireExceptional = reqExceptional; + Material = material; } [Constructible] @@ -199,26 +199,26 @@ namespace Server.Engines.BulkOrders SmallBulkEntry entry = entries[Utility.Random( entries.Length )]; - this.Hue = hue; - this.AmountMax = amountMax; - this.Type = entry.Type; - this.Number = entry.Number; - this.Graphic = entry.Graphic; - this.RequireExceptional = reqExceptional; - this.Material = material; + Hue = hue; + AmountMax = amountMax; + Type = entry.Type; + Number = entry.Number; + Graphic = entry.Graphic; + RequireExceptional = reqExceptional; + Material = material; } } public SmallSmithBOD( int amountCur, int amountMax, Type type, int number, int graphic, bool reqExceptional, BulkMaterialType mat ) { - this.Hue = 0x44E; - this.AmountMax = amountMax; - this.AmountCur = amountCur; - this.Type = type; - this.Number = number; - this.Graphic = graphic; - this.RequireExceptional = reqExceptional; - this.Material = mat; + Hue = 0x44E; + AmountMax = amountMax; + AmountCur = amountCur; + Type = type; + Number = number; + Graphic = graphic; + RequireExceptional = reqExceptional; + Material = mat; } public SmallSmithBOD( Serial serial ) : base( serial ) diff --git a/Scripts/Engines/BulkOrders/SmallTailorBOD.cs b/Scripts/Engines/BulkOrders/SmallTailorBOD.cs index a54291b20..3102cf411 100644 --- a/Scripts/Engines/BulkOrders/SmallTailorBOD.cs +++ b/Scripts/Engines/BulkOrders/SmallTailorBOD.cs @@ -155,13 +155,13 @@ namespace Server.Engines.BulkOrders private SmallTailorBOD( SmallBulkEntry entry, BulkMaterialType material, int amountMax, bool reqExceptional ) { - this.Hue = 0x483; - this.AmountMax = amountMax; - this.Type = entry.Type; - this.Number = entry.Number; - this.Graphic = entry.Graphic; - this.RequireExceptional = reqExceptional; - this.Material = material; + Hue = 0x483; + AmountMax = amountMax; + Type = entry.Type; + Number = entry.Number; + Graphic = entry.Graphic; + RequireExceptional = reqExceptional; + Material = material; } [Constructible] @@ -191,26 +191,26 @@ namespace Server.Engines.BulkOrders SmallBulkEntry entry = entries[Utility.Random( entries.Length )]; - this.Hue = hue; - this.AmountMax = amountMax; - this.Type = entry.Type; - this.Number = entry.Number; - this.Graphic = entry.Graphic; - this.RequireExceptional = reqExceptional; - this.Material = material; + Hue = hue; + AmountMax = amountMax; + Type = entry.Type; + Number = entry.Number; + Graphic = entry.Graphic; + RequireExceptional = reqExceptional; + Material = material; } } public SmallTailorBOD( int amountCur, int amountMax, Type type, int number, int graphic, bool reqExceptional, BulkMaterialType mat ) { - this.Hue = 0x483; - this.AmountMax = amountMax; - this.AmountCur = amountCur; - this.Type = type; - this.Number = number; - this.Graphic = graphic; - this.RequireExceptional = reqExceptional; - this.Material = mat; + Hue = 0x483; + AmountMax = amountMax; + AmountCur = amountCur; + Type = type; + Number = number; + Graphic = graphic; + RequireExceptional = reqExceptional; + Material = mat; } public SmallTailorBOD( Serial serial ) : base( serial ) diff --git a/Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs b/Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs index 19c867bc9..5c79acdb7 100644 --- a/Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs +++ b/Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs @@ -52,7 +52,7 @@ namespace Server.Engines.CannedEvil if ( m_Skull != null && m_Skull.Deleted ) Skull = null; - if ( from.Map != this.Map || !from.InRange( GetWorldLocation(), 3 ) ) + if ( from.Map != Map || !from.InRange( GetWorldLocation(), 3 ) ) { from.SendLocalizedMessage( 500446 ); // That is too far away. } @@ -79,7 +79,7 @@ namespace Server.Engines.CannedEvil if ( m_Skull != null && m_Skull.Deleted ) Skull = null; - if ( from.Map != this.Map || !from.InRange( GetWorldLocation(), 3 ) ) + if ( from.Map != Map || !from.InRange( GetWorldLocation(), 3 ) ) { from.SendLocalizedMessage( 500446 ); // That is too far away. } @@ -101,12 +101,12 @@ namespace Server.Engines.CannedEvil } else { - if ( skull.Type == this.Type ) + if ( skull.Type == Type ) { skull.Movable = false; - skull.MoveToWorld( GetWorldTop(), this.Map ); + skull.MoveToWorld( GetWorldTop(), Map ); - this.Skull = skull; + Skull = skull; } else { diff --git a/Scripts/Engines/CannedEvil/ChampionSkullPlatform.cs b/Scripts/Engines/CannedEvil/ChampionSkullPlatform.cs index ca8e2c4a7..8f117822a 100644 --- a/Scripts/Engines/CannedEvil/ChampionSkullPlatform.cs +++ b/Scripts/Engines/CannedEvil/ChampionSkullPlatform.cs @@ -55,7 +55,7 @@ namespace Server.Engines.CannedEvil { if ( Validate( m_Power ) && Validate( m_Enlightenment ) && Validate( m_Venom ) && Validate( m_Pain ) && Validate( m_Greed ) && Validate( m_Death ) ) { - Mobile harrower = Harrower.Spawn( new Point3D( X, Y, Z + 6 ), this.Map ); + Mobile harrower = Harrower.Spawn( new Point3D( X, Y, Z + 6 ), Map ); if ( harrower == null ) return; diff --git a/Scripts/Engines/CannedEvil/ChampionSpawn.cs b/Scripts/Engines/CannedEvil/ChampionSpawn.cs index c9f135671..57923ca20 100644 --- a/Scripts/Engines/CannedEvil/ChampionSpawn.cs +++ b/Scripts/Engines/CannedEvil/ChampionSpawn.cs @@ -94,7 +94,7 @@ namespace Server.Engines.CannedEvil if ( m_Region != null ) m_Region.Unregister(); - if ( !Deleted && this.Map != Map.Internal ) + if ( !Deleted && Map != Map.Internal ) { m_Region = new ChampionSpawnRegion( this ); m_Region.Register(); @@ -626,7 +626,7 @@ namespace Server.Engines.CannedEvil if ( !m_ConfinedRoaming ) { - bc.Home = this.Location; + bc.Home = Location; bc.RangeHome = (int)(Math.Sqrt( m_SpawnArea.Width * m_SpawnArea.Width + m_SpawnArea.Height * m_SpawnArea.Height )/2); } else @@ -684,7 +684,7 @@ namespace Server.Engines.CannedEvil public int GetSubLevel() { - int level = this.Level; + int level = Level; if ( level <= Level1 ) return 0; @@ -1199,7 +1199,7 @@ namespace Server.Engines.CannedEvil public ChampionSpawn ChampionSpawn => m_Spawn; - public ChampionSpawnRegion( ChampionSpawn spawn ) : base( null, spawn.Map, Region.Find( spawn.Location, spawn.Map ), spawn.SpawnArea ) + public ChampionSpawnRegion( ChampionSpawn spawn ) : base( null, spawn.Map, Find( spawn.Location, spawn.Map ), spawn.SpawnArea ) { m_Spawn = spawn; } diff --git a/Scripts/Engines/ConPVP/DuelContext.cs b/Scripts/Engines/ConPVP/DuelContext.cs index f7136f958..fa1c9a177 100644 --- a/Scripts/Engines/ConPVP/DuelContext.cs +++ b/Scripts/Engines/ConPVP/DuelContext.cs @@ -122,7 +122,7 @@ namespace Server.Engines.ConPVP if ( CantDoAnything( from ) ) return false; - if ( spell is Server.Spells.Fourth.RecallSpell ) + if ( spell is Spells.Fourth.RecallSpell ) from.SendMessage( "You may not cast this spell." ); string title = null, option = null; @@ -2203,7 +2203,7 @@ namespace Server.Engines.ConPVP public override void CheckGate(Mobile m, int range) { - if ( DuelContext.CheckCombat( m ) ) + if ( CheckCombat( m ) ) { m.SendMessage( 0x22, "You have recently been in combat with another player and cannot use this moongate." ); } @@ -2215,7 +2215,7 @@ namespace Server.Engines.ConPVP public override void UseGate( Mobile m ) { - if ( DuelContext.CheckCombat( m ) ) + if ( CheckCombat( m ) ) { m.SendMessage( 0x22, "You have recently been in combat with another player and cannot use this moongate." ); } diff --git a/Scripts/Engines/ConPVP/Games/BombingRun.cs b/Scripts/Engines/ConPVP/Games/BombingRun.cs index bd148a9e8..894841eb9 100644 --- a/Scripts/Engines/ConPVP/Games/BombingRun.cs +++ b/Scripts/Engines/ConPVP/Games/BombingRun.cs @@ -146,9 +146,9 @@ namespace Server.Engines.ConPVP public void DropTo( Mobile mob, Mobile killer ) { if ( mob != null && !mob.Deleted ) - this.MoveToWorld( mob.Location, mob.Map ); + MoveToWorld( mob.Location, mob.Map ); else if ( killer != null && !killer.Deleted ) - this.MoveToWorld( killer.Location, killer.Map ); + MoveToWorld( killer.Location, killer.Map ); else if ( m_Game != null ) m_Game.ReturnBomb(); } @@ -169,10 +169,10 @@ namespace Server.Engines.ConPVP { base.OnLocationChange(oldLocation); - if ( m_Flying || !Visible || m_Game == null || this.Parent != null ) + if ( m_Flying || !Visible || m_Game == null || Parent != null ) return; - IPooledEnumerable eable = this.GetClientsInRange( 0 ); + IPooledEnumerable eable = GetClientsInRange( 0 ); foreach ( NetState ns in eable ) { Mobile m = ns.Mobile; @@ -202,9 +202,9 @@ namespace Server.Engines.ConPVP { m.Target = new BombTarget( this, m ); } - else if ( this.Parent == null ) + else if ( Parent == null ) { - if ( m.InRange( this.Location, 1 ) && m.Location.Z != this.Z ) + if ( m.InRange( Location, 1 ) && m.Location.Z != Z ) { BRTeamInfo useTeam = m_Game.GetTeamInfo( m ); if ( useTeam == null ) @@ -284,9 +284,9 @@ namespace Server.Engines.ConPVP pt.Z += item.ItemData.CalcHeight + 1; m_Flying = true; - this.Visible = false; + Visible = false; m_Thrower = from; - this.MoveToWorld( this.GetWorldLocation(), from.Map ); + MoveToWorld( GetWorldLocation(), from.Map ); BeginFlight( pt ); return true; @@ -294,8 +294,8 @@ namespace Server.Engines.ConPVP private void HitObject( Point3D ballLoc, int objZ, int objHeight ) { - DoAnim( this.GetWorldLocation(), ballLoc, this.Map ); - this.MoveToWorld( ballLoc ); + DoAnim( GetWorldLocation(), ballLoc, Map ); + MoveToWorld( ballLoc ); m_Path.Clear(); m_PathIdx = 0; @@ -326,13 +326,13 @@ namespace Server.Engines.ConPVP private void DoAnim( Point3D start, Point3D end, Map map ) { Effects.SendMovingEffect( new Entity( Serial.Zero, start, map ), new Entity( Serial.Zero, end, map ), - this.ItemID, 15, 0, false, false, this.Hue, 0 ); + ItemID, 15, 0, false, false, Hue, 0 ); } private void DoCatch( Mobile m ) { m_Flying = false; - this.Visible = true; + Visible = true; if ( m == null || !m.Alive || !m.Player || m_Game == null ) return; @@ -342,7 +342,7 @@ namespace Server.Engines.ConPVP if ( useTeam == null ) return; - DoAnim( this.GetWorldLocation(), m.Location, m.Map ); + DoAnim( GetWorldLocation(), m.Location, m.Map ); string verb = "caught"; @@ -350,7 +350,7 @@ namespace Server.Engines.ConPVP verb = "intercepted"; if ( !TakeBomb( m, useTeam, verb ) ) - this.MoveToWorld( m.Location, m.Map ); + MoveToWorld( m.Location, m.Map ); } private Point3DList m_Path = new Point3DList(); @@ -358,7 +358,7 @@ namespace Server.Engines.ConPVP private void BeginFlight( Point3D dest ) { - Point3D org = this.GetWorldLocation(); + Point3D org = GetWorldLocation(); org.Z += 10; // always add 10 at the start cause we're coming from a mobile's eye level @@ -483,28 +483,28 @@ namespace Server.Engines.ConPVP int height; bool found = false; - if ( m_PathIdx < m_Path.Count && this.Map != null && this.Map.Tiles != null && this.Map != Map.Internal ) + if ( m_PathIdx < m_Path.Count && Map != null && Map.Tiles != null && Map != Map.Internal ) { int pathCheckEnd = m_PathIdx + 5; if ( m_Path.Count < pathCheckEnd ) pathCheckEnd = m_Path.Count; - this.Visible = false; + Visible = false; if ( m_PathIdx > 0 ) // move to the next location - this.MoveToWorld( m_Path[m_PathIdx - 1] ); + MoveToWorld( m_Path[m_PathIdx - 1] ); - Point3D pTop = new Point3D( this.GetWorldLocation() ), pBottom = new Point3D( m_Path[pathCheckEnd-1] ); + Point3D pTop = new Point3D( GetWorldLocation() ), pBottom = new Point3D( m_Path[pathCheckEnd-1] ); Utility.FixPoints( ref pTop, ref pBottom ); for ( int i = m_PathIdx; i < pathCheckEnd; i++ ) { Point3D point = m_Path[i]; - LandTile landTile = this.Map.Tiles.GetLandTile( point.X, point.Y ); + LandTile landTile = Map.Tiles.GetLandTile( point.X, point.Y ); int landZ = 0, landAvg = 0, landTop = 0; - this.Map.GetAverageZ( point.X, point.Y, ref landZ, ref landAvg, ref landTop ); + Map.GetAverageZ( point.X, point.Y, ref landZ, ref landAvg, ref landTop ); if ( landZ <= point.Z && landTop >= point.Z && !landTile.Ignored ) { @@ -512,12 +512,12 @@ namespace Server.Engines.ConPVP return; } - StaticTile[] statics = this.Map.Tiles.GetStaticTiles( point.X, point.Y, true ); + StaticTile[] statics = Map.Tiles.GetStaticTiles( point.X, point.Y, true ); if ( landTile.ID == 0x244 && statics.Length == 0 ) // 0x244 = invalid land tile { bool empty = true; - IPooledEnumerable eable = this.Map.GetItemsInRange( point, 0 ); + IPooledEnumerable eable = Map.GetItemsInRange( point, 0 ); foreach ( Item item in eable ) { @@ -549,7 +549,7 @@ namespace Server.Engines.ConPVP if ( i > m_PathIdx ) point = m_Path[i-1]; else - point = this.GetWorldLocation(); + point = GetWorldLocation(); HitObject( point, t.Z, height ); return; } @@ -558,7 +558,7 @@ namespace Server.Engines.ConPVP Rectangle2D rect = new Rectangle2D( pTop.X, pTop.Y, ( pBottom.X - pTop.X ) + 1, ( pBottom.Y - pTop.Y ) + 1 ); - IPooledEnumerable area = this.Map.GetItemsInBounds( rect ); + IPooledEnumerable area = Map.GetItemsInBounds( rect ); foreach ( Item i in area ) { if ( i == this || i.ItemID >= 0x4000 ) @@ -593,7 +593,7 @@ namespace Server.Engines.ConPVP if ( j > m_PathIdx ) point = m_Path[j-1]; else - point = this.GetWorldLocation(); + point = GetWorldLocation(); break; } } @@ -604,9 +604,9 @@ namespace Server.Engines.ConPVP area.Free(); if ( i is BRGoal goal ) { - Point3D oldLoc = new Point3D( this.GetWorldLocation() ); + Point3D oldLoc = new Point3D( GetWorldLocation() ); if ( CheckScore( goal, m_Thrower, 3 ) ) - DoAnim( oldLoc, point, this.Map ); + DoAnim( oldLoc, point, Map ); else HitObject( point, loc.Z, height ); } @@ -619,7 +619,7 @@ namespace Server.Engines.ConPVP area.Free(); - IPooledEnumerable clients = this.Map.GetClientsInBounds( rect ); + IPooledEnumerable clients = Map.GetClientsInBounds( rect ); foreach ( NetState ns in clients) { Mobile m = ns.Mobile; @@ -657,20 +657,20 @@ namespace Server.Engines.ConPVP m_PathIdx = pathCheckEnd; if ( m_PathIdx > 0 && m_PathIdx - 1 < m_Path.Count ) - DoAnim( this.GetWorldLocation(), m_Path[m_PathIdx - 1], this.Map ); + DoAnim( GetWorldLocation(), m_Path[m_PathIdx - 1], Map ); Timer.DelayCall( TimeSpan.FromSeconds( 0.1 ), new TimerCallback( ContinueFlight ) ).Start(); } else { if ( m_PathIdx > 0 && m_PathIdx - 1 < m_Path.Count ) - this.MoveToWorld( m_Path[m_PathIdx - 1] ); + MoveToWorld( m_Path[m_PathIdx - 1] ); else if ( m_Path.Count > 0 ) - this.MoveToWorld( m_Path.Last ); + MoveToWorld( m_Path.Last ); - int myZ = this.Map.GetAverageZ( this.X, this.Y ); + int myZ = Map.GetAverageZ( X, Y ); - StaticTile[] statics = this.Map.Tiles.GetStaticTiles( this.X, this.Y, true ); + StaticTile[] statics = Map.Tiles.GetStaticTiles( X, Y, true ); for ( int j = 0; j < statics.Length; j++ ) { StaticTile t = statics[j]; @@ -678,25 +678,25 @@ namespace Server.Engines.ConPVP ItemData id = TileData.ItemTable[t.ID & TileData.MaxItemValue]; height = id.CalcHeight; - if ( t.Z + height > myZ && t.Z + height <= this.Z ) + if ( t.Z + height > myZ && t.Z + height <= Z ) myZ = t.Z + height; } - IPooledEnumerable eable = this.GetItemsInRange( 0 ); + IPooledEnumerable eable = GetItemsInRange( 0 ); foreach ( Item item in eable ) { if ( item.Visible && item != this ) { height = item.ItemData.CalcHeight; - if ( item.Z + height > myZ && item.Z + height <= this.Z ) + if ( item.Z + height > myZ && item.Z + height <= Z ) myZ = item.Z + height; } } eable.Free(); - this.Z = myZ; + Z = myZ; m_Flying = false; - this.Visible = true; + Visible = true; m_Path.Clear(); m_PathIdx = 0; @@ -738,7 +738,7 @@ namespace Server.Engines.ConPVP m_Game.ReturnBomb(); m_Flying = false; - this.Visible = true; + Visible = true; m_Path.Clear(); m_PathIdx = 0; @@ -799,62 +799,62 @@ namespace Server.Engines.ConPVP private void Remake() { - foreach ( AddonComponent ac in this.Components ) + foreach ( AddonComponent ac in Components ) { ac.Addon = null; ac.Delete(); } - this.Components.Clear(); + Components.Clear(); // stairs - this.AddComponent( new AddonComponent( 0x74D ), -1, +1, -5 ); - this.AddComponent( new AddonComponent( 0x71F ), 0, +1, -5 ); - this.AddComponent( new AddonComponent( 0x74B ), +1, +1, -5 ); - this.AddComponent( new AddonComponent( 0x736 ), +1, 0, -5 ); - this.AddComponent( new AddonComponent( 0x74C ), +1, -1, -5 ); - this.AddComponent( new AddonComponent( 0x737 ), 0, -1, -5 ); - this.AddComponent( new AddonComponent( 0x74A ), -1, -1, -5 ); - this.AddComponent( new AddonComponent( 0x749 ), -1, 0, -5 ); + AddComponent( new AddonComponent( 0x74D ), -1, +1, -5 ); + AddComponent( new AddonComponent( 0x71F ), 0, +1, -5 ); + AddComponent( new AddonComponent( 0x74B ), +1, +1, -5 ); + AddComponent( new AddonComponent( 0x736 ), +1, 0, -5 ); + AddComponent( new AddonComponent( 0x74C ), +1, -1, -5 ); + AddComponent( new AddonComponent( 0x737 ), 0, -1, -5 ); + AddComponent( new AddonComponent( 0x74A ), -1, -1, -5 ); + AddComponent( new AddonComponent( 0x749 ), -1, 0, -5 ); // Center Sparkle - this.AddComponent( new AddonComponent( 0x375A ), 0, 0, -1 ); + AddComponent( new AddonComponent( 0x375A ), 0, 0, -1 ); if ( !m_North ) { // Pillars - this.AddComponent( new AddonComponent( 0x0CE ), 0, +1, -2 ); - this.AddComponent( new AddonComponent( 0x0CC ), 0, -1, -2 ); - this.AddComponent( new AddonComponent( 0x0D0 ), 0, 0, -2 ); + AddComponent( new AddonComponent( 0x0CE ), 0, +1, -2 ); + AddComponent( new AddonComponent( 0x0CC ), 0, -1, -2 ); + AddComponent( new AddonComponent( 0x0D0 ), 0, 0, -2 ); // Yellow parts - this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, +1, 7 ); - this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, 0, 16 ); - this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, -1, 7 ); + AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, +1, 7 ); + AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, 0, 16 ); + AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, -1, 7 ); // Blue Sparkles - this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), 0, +1, 12 ); - this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), 0, +1, -1 ); - this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), 0, -1, 12 ); - this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), 0, -1, -1 ); + AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), 0, +1, 12 ); + AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), 0, +1, -1 ); + AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), 0, -1, 12 ); + AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), 0, -1, -1 ); } else { // Pillars - this.AddComponent( new AddonComponent( 0x0CF ), +1, 0, -2 ); - this.AddComponent( new AddonComponent( 0x0CC ), -1, 0, -2 ); - this.AddComponent( new AddonComponent( 0x0D1 ), 0, 0, -2 ); + AddComponent( new AddonComponent( 0x0CF ), +1, 0, -2 ); + AddComponent( new AddonComponent( 0x0CC ), -1, 0, -2 ); + AddComponent( new AddonComponent( 0x0D1 ), 0, 0, -2 ); // Yellow parts - this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), +1, 0, 7 ); - this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, 0, 16 ); - this.AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), -1, 0, 7 ); + AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), +1, 0, 7 ); + AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), 0, 0, 16 ); + AddComponent( SetHue( new AddonComponent( 0x0DF ), 0x499 ), -1, 0, 7 ); // Blue Sparkles - this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), +1, 0, 12 ); - this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), +1, 0, -1 ); - this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), -1, 0, 12 ); - this.AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), -1, 0, -1 ); + AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), +1, 0, 12 ); + AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), +1, 0, -1 ); + AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), -1, 0, 12 ); + AddComponent( SetHue( new AddonComponent( 0x377A ), 0x84C ), -1, 0, -1 ); } } @@ -863,9 +863,9 @@ namespace Server.Engines.ConPVP [Constructible] public BRGoal() { - this.ItemID = 0x51D; - this.Hue = 0x84C; - this.Visible = true; + ItemID = 0x51D; + Hue = 0x84C; + Visible = true; Remake(); } @@ -902,7 +902,7 @@ namespace Server.Engines.ConPVP } } - this.Hue = 0x84C; + Hue = 0x84C; } public override bool ShareHue => false; @@ -914,9 +914,9 @@ namespace Server.Engines.ConPVP { m_Team = value; if ( m_Team != null && m_Team.Color != 0 ) - this.Hue = m_Team.Color; + Hue = m_Team.Color; else - this.Hue = 0x84C; + Hue = 0x84C; } } @@ -934,9 +934,9 @@ namespace Server.Engines.ConPVP return false; if ( m_Team != null && m_Team.Color != 0 ) - this.Hue = m_Team.Color; + Hue = m_Team.Color; else - this.Hue = 0x84C; + Hue = 0x84C; if ( m.Backpack.FindItemByType( typeof( BRBomb ), true ) is BRBomb b ) b.CheckScore( this, m, 7 ); @@ -1180,13 +1180,13 @@ namespace Server.Engines.ConPVP public int CompareTo( object obj ) { BRPlayerInfo pi = (BRPlayerInfo)obj; - int res = pi.Captures.CompareTo( this.Captures ); + int res = pi.Captures.CompareTo( Captures ); if ( res == 0 ) { - res = pi.Score.CompareTo( this.Score ); + res = pi.Score.CompareTo( Score ); if ( res == 0 ) - res = pi.Kills.CompareTo( this.Kills ); + res = pi.Kills.CompareTo( Kills ); } return res; } @@ -1255,13 +1255,13 @@ namespace Server.Engines.ConPVP public int CompareTo( object obj ) { BRTeamInfo ti = (BRTeamInfo)obj; - int res = ti.Captures.CompareTo( this.Captures ); + int res = ti.Captures.CompareTo( Captures ); if ( res == 0 ) { - res = ti.Score.CompareTo( this.Score ); + res = ti.Score.CompareTo( Score ); if ( res == 0 ) - res = ti.Kills.CompareTo( this.Kills ); + res = ti.Kills.CompareTo( Kills ); } return res; } @@ -1399,7 +1399,7 @@ namespace Server.Engines.ConPVP public override string ToString() { if ( m_Name != null ) - return String.Format( "({0}) ...", this.Name ); + return String.Format( "({0}) ...", Name ); else return "..."; } diff --git a/Scripts/Engines/ConPVP/Games/CTF.cs b/Scripts/Engines/ConPVP/Games/CTF.cs index 513dacaf3..e67972244 100644 --- a/Scripts/Engines/ConPVP/Games/CTF.cs +++ b/Scripts/Engines/ConPVP/Games/CTF.cs @@ -268,9 +268,9 @@ namespace Server.Engines.ConPVP } else if ( ourTeam == useTeam ) { - if ( this.Location == m_TeamInfo.Origin && this.Map == m_TeamInfo.Game.Facet ) + if ( Location == m_TeamInfo.Origin && Map == m_TeamInfo.Game.Facet ) { - from.Send( new UnicodeMessage( this.Serial, this.ItemID, MessageType.Regular, 0x3B2, 3, "ENU", this.Name, "Touch me not for I am chaste." ) ); + from.Send( new UnicodeMessage( Serial, ItemID, MessageType.Regular, 0x3B2, 3, "ENU", Name, "Touch me not for I am chaste." ) ); } else { @@ -350,7 +350,7 @@ namespace Server.Engines.ConPVP private void Countdown_OnTick() { - Mobile owner = this.RootParent as Mobile; + Mobile owner = RootParent as Mobile; switch ( m_ReturnCount ) { @@ -1055,7 +1055,7 @@ namespace Server.Engines.ConPVP if ( hadFlag ) playerInfo.Score += 4; // fragged flag carrier - if ( mob.InRange( teamInfo.Origin, 24 ) && mob.Map == this.Facet ) + if ( mob.InRange( teamInfo.Origin, 24 ) && mob.Map == Facet ) playerInfo.Score += 1; // fragged in base -- guarding for ( int i = 0; i < m_Controller.TeamInfo.Length; ++i ) diff --git a/Scripts/Engines/ConPVP/Games/DoubleDom.cs b/Scripts/Engines/ConPVP/Games/DoubleDom.cs index 63ab67ad4..58d8671e8 100644 --- a/Scripts/Engines/ConPVP/Games/DoubleDom.cs +++ b/Scripts/Engines/ConPVP/Games/DoubleDom.cs @@ -664,15 +664,15 @@ namespace Server.Engines.ConPVP playerInfo.Score += 1; // base frag // extra points for killing someone on the waypoint - if ( this.Controller.PointA != null ) + if ( Controller.PointA != null ) { - if ( mob.InRange( this.Controller.PointA, 2 ) ) + if ( mob.InRange( Controller.PointA, 2 ) ) playerInfo.Score += 1; } - if ( this.Controller.PointB != null ) + if ( Controller.PointB != null ) { - if ( mob.InRange( this.Controller.PointB, 2 ) ) + if ( mob.InRange( Controller.PointB, 2 ) ) playerInfo.Score += 1; } } @@ -1058,9 +1058,9 @@ namespace Server.Engines.ConPVP [Constructible] public DDWayPoint() { - this.ItemID = 0x519; - this.Visible = true; - this.Name = "SET MY NAME"; + ItemID = 0x519; + Visible = true; + Name = "SET MY NAME"; AddComponent( new DDStep( 0x7A8 ), -1, -1, -5 ); AddComponent( new DDStep( 0x7A6 ), 0, -1, -5 ); @@ -1130,7 +1130,7 @@ namespace Server.Engines.ConPVP { for (int i=0;i= 0.0 ) { - if ( this.Recipe == null || !(from is PlayerMobile) || ((PlayerMobile)from).HasRecipe( this.Recipe ) ) + if ( Recipe == null || !(from is PlayerMobile) || ((PlayerMobile)from).HasRecipe( Recipe ) ) { int badCraft = craftSystem.CanCraft( from, tool, m_Type ); diff --git a/Scripts/Engines/Craft/Core/QueryMakersMarkGump.cs b/Scripts/Engines/Craft/Core/QueryMakersMarkGump.cs index 19463611b..3643d75bb 100644 --- a/Scripts/Engines/Craft/Core/QueryMakersMarkGump.cs +++ b/Scripts/Engines/Craft/Core/QueryMakersMarkGump.cs @@ -38,7 +38,7 @@ namespace Server.Engines.Craft AddButton( 20, 125, 4005, 4007, 0, GumpButtonType.Reply, 0 ); } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { bool makersMark = ( info.ButtonID == 1 ); diff --git a/Scripts/Engines/Craft/Core/Recipes.cs b/Scripts/Engines/Craft/Core/Recipes.cs index 82a864c9c..af7afd4d8 100644 --- a/Scripts/Engines/Craft/Core/Recipes.cs +++ b/Scripts/Engines/Craft/Core/Recipes.cs @@ -20,7 +20,7 @@ namespace Server.Engines.Craft Mobile m = e.Mobile; m.SendMessage( "Target a player to teach them all of the recipies." ); - m.BeginTarget( -1, false, Server.Targeting.TargetFlags.None, new TargetCallback( + m.BeginTarget( -1, false, Targeting.TargetFlags.None, new TargetCallback( delegate( Mobile from, object targeted ) { if ( targeted is PlayerMobile mobile ) @@ -45,7 +45,7 @@ namespace Server.Engines.Craft Mobile m = e.Mobile; m.SendMessage( "Target a player to have them forget all of the recipies they've learned." ); - m.BeginTarget( -1, false, Server.Targeting.TargetFlags.None, new TargetCallback( + m.BeginTarget( -1, false, Targeting.TargetFlags.None, new TargetCallback( delegate( Mobile from, object targeted ) { if ( targeted is PlayerMobile mobile ) diff --git a/Scripts/Engines/Craft/DefTinkering.cs b/Scripts/Engines/Craft/DefTinkering.cs index e9527020e..2a666745c 100644 --- a/Scripts/Engines/Craft/DefTinkering.cs +++ b/Scripts/Engines/Craft/DefTinkering.cs @@ -470,13 +470,13 @@ namespace Server.Engines.Craft public override Item CompleteCraft( out int message ) { - message = Verify( this.Container ); + message = Verify( Container ); if ( message == 0 ) { int trapLevel = (int)(From.Skills.Tinkering.Value / 10); - Container.TrapType = this.TrapType; + Container.TrapType = TrapType; Container.TrapPower = trapLevel * 9; Container.TrapLevel = trapLevel; Container.TrapOnLockpick = true; diff --git a/Scripts/Engines/Doom/GauntletSpawner.cs b/Scripts/Engines/Doom/GauntletSpawner.cs index c2a58476d..1f9316e7b 100644 --- a/Scripts/Engines/Doom/GauntletSpawner.cs +++ b/Scripts/Engines/Doom/GauntletSpawner.cs @@ -184,7 +184,7 @@ namespace Server.Engines.Doom if ( m_Region != null ) return; - Map map = this.Map; + Map map = Map; if ( map == null || map == Map.Internal ) return; @@ -217,7 +217,7 @@ namespace Server.Engines.Doom public virtual void SpawnTrap() { - Map map = this.Map; + Map map = Map; if ( map == null ) return; @@ -248,7 +248,7 @@ namespace Server.Engines.Doom { int x = Utility.Random( m_RegionBounds.X, m_RegionBounds.Width ); int y = Utility.Random( m_RegionBounds.Y, m_RegionBounds.Height ); - int z = this.Z; + int z = Z; if ( !map.CanFit( x, y, z, 16, false, false ) ) z = map.GetAverageZ( x, y ); @@ -269,7 +269,7 @@ namespace Server.Engines.Doom { int playerCount = 0; - Map map = this.Map; + Map map = Map; if ( map != null ) { @@ -335,7 +335,7 @@ namespace Server.Engines.Doom item.Delete(); else if ( obj is Mobile mob ) { - mob.MoveToWorld( GetWorldLocation(), this.Map ); + mob.MoveToWorld( GetWorldLocation(), Map ); m_Creatures.Add( mob ); } @@ -669,7 +669,7 @@ namespace Server.Engines.Doom private GauntletSpawner m_Spawner; public GauntletRegion( GauntletSpawner spawner, Map map ) - : base( null, map, Region.Find( spawner.Location, spawner.Map ), spawner.RegionBounds ) + : base( null, map, Find( spawner.Location, spawner.Map ), spawner.RegionBounds ) { m_Spawner = spawner; diff --git a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs index c093fb021..f3f04271b 100644 --- a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs +++ b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs @@ -19,7 +19,7 @@ namespace Server.Engines.Doom public override void OnDoubleClick( Mobile m ) { - if ( !m.InRange( this.GetWorldLocation(), 3 ) ) + if ( !m.InRange( GetWorldLocation(), 3 ) ) return; if ( m_Controller.Enabled ) return; @@ -169,7 +169,7 @@ namespace Server.Engines.Doom } else { - Server.Mobiles.BaseCreature.TeleportPets( m, LeverPuzzleController.lr_Exit, Map.Malas ); + BaseCreature.TeleportPets( m, LeverPuzzleController.lr_Exit, Map.Malas ); m.MoveToWorld( LeverPuzzleController.lr_Exit, Map.Malas ); return false; } diff --git a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleRegions.cs b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleRegions.cs index 0c8f8c139..b99f93a79 100644 --- a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleRegions.cs +++ b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleRegions.cs @@ -8,7 +8,7 @@ namespace Server.Engines.Doom private LeverPuzzleController Controller; public LampRoomRegion ( LeverPuzzleController controller ) - : base( null, Map.Malas, Region.Find( LeverPuzzleController.lr_Enter, Map.Malas ), LeverPuzzleController.lr_Rect ) + : base( null, Map.Malas, Find( LeverPuzzleController.lr_Enter, Map.Malas ), LeverPuzzleController.lr_Rect ) { Controller = controller; Register(); @@ -97,7 +97,7 @@ namespace Server.Engines.Doom } public LeverPuzzleRegion ( LeverPuzzleController controller, int[] loc ) - : base( null, Map.Malas, Region.Find( LeverPuzzleController.lr_Enter, Map.Malas ), new Rectangle2D(loc[0],loc[1],1,1) ) + : base( null, Map.Malas, Find( LeverPuzzleController.lr_Enter, Map.Malas ), new Rectangle2D(loc[0],loc[1],1,1) ) { Controller = controller; Register(); diff --git a/Scripts/Engines/Ethics/Core/Persistance.cs b/Scripts/Engines/Ethics/Core/Persistance.cs index 7f2347744..c0844b029 100644 --- a/Scripts/Engines/Ethics/Core/Persistance.cs +++ b/Scripts/Engines/Ethics/Core/Persistance.cs @@ -32,8 +32,8 @@ namespace Server.Ethics writer.Write( (int) 0 ); // version - for ( int i = 0; i < Ethics.Ethic.Ethics.Length; ++i ) - Ethics.Ethic.Ethics[i].Serialize( writer ); + for ( int i = 0; i < Ethic.Ethics.Length; ++i ) + Ethic.Ethics[i].Serialize( writer ); } public override void Deserialize( GenericReader reader ) @@ -46,8 +46,8 @@ namespace Server.Ethics { case 0: { - for ( int i = 0; i < Ethics.Ethic.Ethics.Length; ++i ) - Ethics.Ethic.Ethics[i].Deserialize( reader ); + for ( int i = 0; i < Ethic.Ethics.Length; ++i ) + Ethic.Ethics[i].Deserialize( reader ); break; } diff --git a/Scripts/Engines/Ethics/Core/Power.cs b/Scripts/Engines/Ethics/Core/Power.cs index 512f97369..b1cf219be 100644 --- a/Scripts/Engines/Ethics/Core/Power.cs +++ b/Scripts/Engines/Ethics/Core/Power.cs @@ -13,7 +13,7 @@ namespace Server.Ethics if ( from.Power < m_Definition.Power ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You lack the power to invoke this ability." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You lack the power to invoke this ability." ); return false; } diff --git a/Scripts/Engines/Ethics/Evil/Powers/Blight.cs b/Scripts/Engines/Ethics/Evil/Powers/Blight.cs index 911a77d20..130e862ae 100644 --- a/Scripts/Engines/Ethics/Evil/Powers/Blight.cs +++ b/Scripts/Engines/Ethics/Evil/Powers/Blight.cs @@ -62,7 +62,7 @@ namespace Server.Ethics.Evil Effects.PlaySound( p, from.Mobile.Map, 0x1FB ); - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You curse the area." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You curse the area." ); FinishInvoke( from ); } diff --git a/Scripts/Engines/Ethics/Evil/Powers/SummonFamiliar.cs b/Scripts/Engines/Ethics/Evil/Powers/SummonFamiliar.cs index 8bb8c9774..adfd5c8cc 100644 --- a/Scripts/Engines/Ethics/Evil/Powers/SummonFamiliar.cs +++ b/Scripts/Engines/Ethics/Evil/Powers/SummonFamiliar.cs @@ -22,7 +22,7 @@ namespace Server.Ethics.Evil if ( from.Familiar != null ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You already have an unholy familiar." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You already have an unholy familiar." ); return; } @@ -34,7 +34,7 @@ namespace Server.Ethics.Evil UnholyFamiliar familiar = new UnholyFamiliar(); - if ( Mobiles.BaseCreature.Summon( familiar, from.Mobile, from.Mobile.Location, 0x217, TimeSpan.FromHours( 1.0 ) ) ) + if ( BaseCreature.Summon( familiar, from.Mobile, from.Mobile.Location, 0x217, TimeSpan.FromHours( 1.0 ) ) ) { from.Familiar = familiar; diff --git a/Scripts/Engines/Ethics/Evil/Powers/UnholyItem.cs b/Scripts/Engines/Ethics/Evil/Powers/UnholyItem.cs index 88666cced..c0146b1b5 100644 --- a/Scripts/Engines/Ethics/Evil/Powers/UnholyItem.cs +++ b/Scripts/Engines/Ethics/Evil/Powers/UnholyItem.cs @@ -27,19 +27,19 @@ namespace Server.Ethics.Evil if ( !(obj is Item item) ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You may not imbue that." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You may not imbue that." ); return; } if ( item.Parent != from.Mobile ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You may only imbue items you are wearing." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You may only imbue items you are wearing." ); return; } if ( ( item.SavedFlags & 0x300 ) != 0 ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "That has already beem imbued." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "That has already beem imbued." ); return; } @@ -60,7 +60,7 @@ namespace Server.Ethics.Evil } else { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You may not imbue that." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You may not imbue that." ); } } } diff --git a/Scripts/Engines/Ethics/Evil/Powers/UnholySense.cs b/Scripts/Engines/Ethics/Evil/Powers/UnholySense.cs index 737cd15eb..256dddb99 100644 --- a/Scripts/Engines/Ethics/Evil/Powers/UnholySense.cs +++ b/Scripts/Engines/Ethics/Evil/Powers/UnholySense.cs @@ -85,7 +85,7 @@ namespace Server.Ethics.Evil sb.Append( '.' ); } - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x59, false, sb.ToString() ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x59, false, sb.ToString() ); FinishInvoke( from ); } diff --git a/Scripts/Engines/Ethics/Evil/Powers/UnholyShield.cs b/Scripts/Engines/Ethics/Evil/Powers/UnholyShield.cs index e9067299b..a00541497 100644 --- a/Scripts/Engines/Ethics/Evil/Powers/UnholyShield.cs +++ b/Scripts/Engines/Ethics/Evil/Powers/UnholyShield.cs @@ -16,13 +16,13 @@ namespace Server.Ethics.Evil { if ( from.IsShielded ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You are already under the protection of an unholy shield." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You are already under the protection of an unholy shield." ); return; } from.BeginShield(); - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You are now under the protection of an unholy shield." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You are now under the protection of an unholy shield." ); FinishInvoke( from ); } diff --git a/Scripts/Engines/Ethics/Evil/Powers/UnholySteed.cs b/Scripts/Engines/Ethics/Evil/Powers/UnholySteed.cs index d59927c24..a60cc1495 100644 --- a/Scripts/Engines/Ethics/Evil/Powers/UnholySteed.cs +++ b/Scripts/Engines/Ethics/Evil/Powers/UnholySteed.cs @@ -21,7 +21,7 @@ namespace Server.Ethics.Evil if ( from.Steed != null ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You already have an unholy steed." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You already have an unholy steed." ); return; } diff --git a/Scripts/Engines/Ethics/Hero/Powers/Bless.cs b/Scripts/Engines/Ethics/Hero/Powers/Bless.cs index 1a4d0a1a5..753f7c4ec 100644 --- a/Scripts/Engines/Ethics/Hero/Powers/Bless.cs +++ b/Scripts/Engines/Ethics/Hero/Powers/Bless.cs @@ -63,7 +63,7 @@ namespace Server.Ethics.Hero Effects.PlaySound( p, from.Mobile.Map, 0x299 ); - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You consecrate the area." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You consecrate the area." ); FinishInvoke( from ); } diff --git a/Scripts/Engines/Ethics/Hero/Powers/HolyItem.cs b/Scripts/Engines/Ethics/Hero/Powers/HolyItem.cs index 4f4bc175a..fce594f28 100644 --- a/Scripts/Engines/Ethics/Hero/Powers/HolyItem.cs +++ b/Scripts/Engines/Ethics/Hero/Powers/HolyItem.cs @@ -27,19 +27,19 @@ namespace Server.Ethics.Hero if ( !(obj is Item item) ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You may not imbue that." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You may not imbue that." ); return; } if ( item.Parent != from.Mobile ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You may only imbue items you are wearing." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You may only imbue items you are wearing." ); return; } if ( ( item.SavedFlags & 0x300 ) != 0 ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "That has already beem imbued." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "That has already beem imbued." ); return; } @@ -60,7 +60,7 @@ namespace Server.Ethics.Hero } else { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You may not imbue that." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You may not imbue that." ); } } } diff --git a/Scripts/Engines/Ethics/Hero/Powers/HolySense.cs b/Scripts/Engines/Ethics/Hero/Powers/HolySense.cs index 82f511a52..b4a114173 100644 --- a/Scripts/Engines/Ethics/Hero/Powers/HolySense.cs +++ b/Scripts/Engines/Ethics/Hero/Powers/HolySense.cs @@ -85,7 +85,7 @@ namespace Server.Ethics.Hero sb.Append( '.' ); } - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x59, false, sb.ToString() ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x59, false, sb.ToString() ); FinishInvoke( from ); } diff --git a/Scripts/Engines/Ethics/Hero/Powers/HolyShield.cs b/Scripts/Engines/Ethics/Hero/Powers/HolyShield.cs index f664fc68a..c8799b925 100644 --- a/Scripts/Engines/Ethics/Hero/Powers/HolyShield.cs +++ b/Scripts/Engines/Ethics/Hero/Powers/HolyShield.cs @@ -16,13 +16,13 @@ namespace Server.Ethics.Hero { if ( from.IsShielded ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You are already under the protection of a holy shield." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You are already under the protection of a holy shield." ); return; } from.BeginShield(); - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You are now under the protection of a holy shield." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You are now under the protection of a holy shield." ); FinishInvoke( from ); } diff --git a/Scripts/Engines/Ethics/Hero/Powers/HolySteed.cs b/Scripts/Engines/Ethics/Hero/Powers/HolySteed.cs index 3665e3206..1c859e089 100644 --- a/Scripts/Engines/Ethics/Hero/Powers/HolySteed.cs +++ b/Scripts/Engines/Ethics/Hero/Powers/HolySteed.cs @@ -21,7 +21,7 @@ namespace Server.Ethics.Hero if ( from.Steed != null ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You already have a holy steed." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You already have a holy steed." ); return; } diff --git a/Scripts/Engines/Ethics/Hero/Powers/SummonFamiliar.cs b/Scripts/Engines/Ethics/Hero/Powers/SummonFamiliar.cs index c0795aa5f..47194e0c1 100644 --- a/Scripts/Engines/Ethics/Hero/Powers/SummonFamiliar.cs +++ b/Scripts/Engines/Ethics/Hero/Powers/SummonFamiliar.cs @@ -22,7 +22,7 @@ namespace Server.Ethics.Hero if ( from.Familiar != null ) { - from.Mobile.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, false, "You already have a holy familiar." ); + from.Mobile.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, false, "You already have a holy familiar." ); return; } @@ -34,7 +34,7 @@ namespace Server.Ethics.Hero HolyFamiliar familiar = new HolyFamiliar(); - if ( Mobiles.BaseCreature.Summon( familiar, from.Mobile, from.Mobile.Location, 0x217, TimeSpan.FromHours( 1.0 ) ) ) + if ( BaseCreature.Summon( familiar, from.Mobile, from.Mobile.Location, 0x217, TimeSpan.FromHours( 1.0 ) ) ) { from.Familiar = familiar; diff --git a/Scripts/Engines/Factions/Core/Faction.cs b/Scripts/Engines/Factions/Core/Faction.cs index 9bd88ebe4..17e2e67a8 100644 --- a/Scripts/Engines/Factions/Core/Faction.cs +++ b/Scripts/Engines/Factions/Core/Faction.cs @@ -592,7 +592,7 @@ namespace Server.Factions sigils[i].ReturnHome(); } - List factions = Faction.Factions; + List factions = Factions; for ( int i = 0; i < factions.Count; ++i ) { @@ -644,7 +644,7 @@ namespace Server.Factions sigils[i].ReturnHome(); } - List factions = Faction.Factions; + List factions = Factions; for ( int i = 0; i < factions.Count; ++i ) { @@ -997,7 +997,7 @@ namespace Server.Factions if ( smallest == null ) return true; // sanity - if ( StabilityFactor > 0 && (((this.Members.Count + influx) * 100) / StabilityFactor) > smallest.Members.Count ) + if ( StabilityFactor > 0 && (((Members.Count + influx) * 100) / StabilityFactor) > smallest.Members.Count ) return false; return true; @@ -1052,7 +1052,7 @@ namespace Server.Factions { Faction victimFaction = bc.FactionAllegiance; - if ( bc.Map == Faction.Facet && victimFaction != null && killerState.Faction != victimFaction ) + if ( bc.Map == Facet && victimFaction != null && killerState.Faction != victimFaction ) { int silver = killerState.Faction.AwardSilver( killer, bc.FactionSilverWorth ); @@ -1061,7 +1061,7 @@ namespace Server.Factions } #region Ethics - if ( bc.Map == Faction.Facet && bc.GetEthicAllegiance( killer ) == BaseCreature.Allegiance.Enemy ) + if ( bc.Map == Facet && bc.GetEthicAllegiance( killer ) == BaseCreature.Allegiance.Enemy ) { Ethics.Player killerEPL = Ethics.Player.Find( killer ); diff --git a/Scripts/Engines/Factions/Core/Reflector.cs b/Scripts/Engines/Factions/Core/Reflector.cs index bf0cc84ee..c92964ded 100644 --- a/Scripts/Engines/Factions/Core/Reflector.cs +++ b/Scripts/Engines/Factions/Core/Reflector.cs @@ -26,7 +26,7 @@ namespace Server.Factions get { if ( m_Factions == null ) - Reflector.ProcessTypes(); + ProcessTypes(); return m_Factions; } diff --git a/Scripts/Engines/Factions/Core/StrongholdRegion.cs b/Scripts/Engines/Factions/Core/StrongholdRegion.cs index bf5a42dbd..53f672ffb 100644 --- a/Scripts/Engines/Factions/Core/StrongholdRegion.cs +++ b/Scripts/Engines/Factions/Core/StrongholdRegion.cs @@ -13,7 +13,7 @@ namespace Server.Factions set => m_Faction = value; } - public StrongholdRegion( Faction faction ) : base( faction.Definition.FriendlyName, Faction.Facet, Region.DefaultPriority, faction.Definition.Stronghold.Area ) + public StrongholdRegion( Faction faction ) : base( faction.Definition.FriendlyName, Faction.Facet, DefaultPriority, faction.Definition.Stronghold.Area ) { m_Faction = faction; diff --git a/Scripts/Engines/Factions/Core/Town.cs b/Scripts/Engines/Factions/Core/Town.cs index 73f2d59c1..6456b4c60 100644 --- a/Scripts/Engines/Factions/Core/Town.cs +++ b/Scripts/Engines/Factions/Core/Town.cs @@ -436,7 +436,7 @@ namespace Server.Factions Sheriff = null; Finance = null; - TownMonolith monolith = this.Monolith; + TownMonolith monolith = Monolith; if ( monolith != null ) monolith.Faction = f; diff --git a/Scripts/Engines/Factions/Items/Power Faction Items/GemOfEmpowerment.cs b/Scripts/Engines/Factions/Items/Power Faction Items/GemOfEmpowerment.cs index 7c4dfaedd..cb99b479b 100644 --- a/Scripts/Engines/Factions/Items/Power Faction Items/GemOfEmpowerment.cs +++ b/Scripts/Engines/Factions/Items/Power Faction Items/GemOfEmpowerment.cs @@ -15,7 +15,7 @@ namespace Server { public override bool Use( Mobile from ) { if ( Faction.ClearSkillLoss( from ) ) { - from.LocalOverheadMessage( Server.Network.MessageType.Regular, 2219, false, "The gem shatters as you invoke its power." ); + from.LocalOverheadMessage( Network.MessageType.Regular, 2219, false, "The gem shatters as you invoke its power." ); from.PlaySound( 909 ); from.FixedEffect( 0x373A, 10, 30 ); diff --git a/Scripts/Engines/Factions/Items/Power Faction Items/PowerFactionItem.cs b/Scripts/Engines/Factions/Items/Power Faction Items/PowerFactionItem.cs index a5f89ac35..6698cf66c 100644 --- a/Scripts/Engines/Factions/Items/Power Faction Items/PowerFactionItem.cs +++ b/Scripts/Engines/Factions/Items/Power Faction Items/PowerFactionItem.cs @@ -23,7 +23,7 @@ namespace Server { _screamed = true; _mobile.PlaySound( _mobile.Female ? 814 : 1088 ); - _mobile.PublicOverheadMessage( Server.Network.MessageType.Regular, 2118, false, "Aaaaah!" ); + _mobile.PublicOverheadMessage( Network.MessageType.Regular, 2118, false, "Aaaaah!" ); } _mobile.Damage( Utility.Dice( 2, 6, 0 ) ); @@ -82,7 +82,7 @@ namespace Server { killer.SendSound( 1470 ); killer.LocalOverheadMessage( - Server.Network.MessageType.Regular, 2119, false, + Network.MessageType.Regular, 2119, false, "You notice a strange item on the corpse, and decide to pick it up." ); @@ -110,14 +110,14 @@ namespace Server { } else if ( from is PlayerMobile mobile && mobile.DuelContext != null ) { mobile.SendMessage( "You can't use that." ); } else if ( Faction.Find( from ) == null ) { - from.LocalOverheadMessage( Server.Network.MessageType.Regular, 2119, false, "The object vanishes from your hands as you touch it." ); + from.LocalOverheadMessage( Network.MessageType.Regular, 2119, false, "The object vanishes from your hands as you touch it." ); Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), delegate { - from.LocalOverheadMessage( Server.Network.MessageType.Regular, 2118, false, "You feel a strange tingling sensation throughout your body." ); + from.LocalOverheadMessage( Network.MessageType.Regular, 2118, false, "You feel a strange tingling sensation throughout your body." ); } ); Timer.DelayCall( TimeSpan.FromSeconds( 4.0 ), delegate { - from.LocalOverheadMessage( Server.Network.MessageType.Regular, 2118, false, "Your skin begins to burn." ); + from.LocalOverheadMessage( Network.MessageType.Regular, 2118, false, "Your skin begins to burn." ); } ); new DestructionTimer( from ).Start(); diff --git a/Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs b/Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs index a57275dab..bd0249b91 100644 --- a/Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs +++ b/Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs @@ -17,9 +17,9 @@ namespace Server { } public override bool Use( Mobile user ) { - if ( this.Movable ) { - user.BeginTarget( 12, true, Server.Targeting.TargetFlags.None, delegate( Mobile from, object obj ) { - if ( this.Movable && !this.Deleted ) { + if ( Movable ) { + user.BeginTarget( 12, true, Targeting.TargetFlags.None, delegate( Mobile from, object obj ) { + if ( Movable && !Deleted ) { if ( obj is IPoint3D pt ) { SpellHelper.GetSurfaceTop( ref pt ); @@ -27,15 +27,15 @@ namespace Server { Map facet = from.Map; if ( facet != null && facet.CanFit( pt.X, pt.Y, pt.Z, 16, false, false, true ) ) { - this.Movable = false; + Movable = false; Effects.SendMovingEffect( from, new Entity( Serial.Zero, origin, facet ), - this.ItemID & 0x3FFF, 7, 0, false, false, this.Hue - 1, 0 + ItemID & 0x3FFF, 7, 0, false, false, Hue - 1, 0 ); Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), delegate { - this.Delete(); + Delete(); Effects.PlaySound( origin, facet, 530 ); Effects.PlaySound( origin, facet, 263 ); diff --git a/Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs b/Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs index 52f67ff4a..7d230fc0a 100644 --- a/Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs +++ b/Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs @@ -37,7 +37,7 @@ namespace Server { } if ( used ) { - from.LocalOverheadMessage( Server.Network.MessageType.Regular, 2219, false, "The urn shatters as you invoke its power." ); + from.LocalOverheadMessage( Network.MessageType.Regular, 2219, false, "The urn shatters as you invoke its power." ); from.PlaySound( 64 ); Effects.PlaySound( from.Location, from.Map, 1481 ); diff --git a/Scripts/Engines/Factions/Items/Sigil.cs b/Scripts/Engines/Factions/Items/Sigil.cs index 9db4111ea..a2dcfe595 100644 --- a/Scripts/Engines/Factions/Items/Sigil.cs +++ b/Scripts/Engines/Factions/Items/Sigil.cs @@ -263,7 +263,7 @@ namespace Server.Factions from.SendLocalizedMessage( 1005223 ); // You cannot give the sigil to someone not in a faction else if ( fromFaction != toFaction ) from.SendLocalizedMessage( 1005222 ); // You cannot give the sigil to someone not in your faction - else if ( Sigil.ExistsOn( targ ) ) + else if ( ExistsOn( targ ) ) from.SendLocalizedMessage( 1005220 ); // You cannot give this sigil to someone who already has a sigil else if ( !targ.Alive ) from.SendLocalizedMessage( 1042248 ); // You cannot give a sigil to a dead person. diff --git a/Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs b/Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs index a50349756..36caa9def 100644 --- a/Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs +++ b/Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs @@ -74,7 +74,7 @@ namespace Server.Factions Conceal(); DoVisibleEffect(); - Effects.PlaySound( this.Location, this.Map, this.EffectSound ); + Effects.PlaySound( Location, Map, EffectSound ); DoAttackEffect( from ); int silverToAward = ( from.Alive ? 20 : 40 ); @@ -120,7 +120,7 @@ namespace Server.Factions { foreach( Item item in m.GetItemsInRange( p, 0 ) ) { - if ( item is BaseFactionTrap trap && trap.Faction == this.Faction ) + if ( item is BaseFactionTrap trap && trap.Faction == Faction ) return 1075263; // There is already a trap belonging to your faction at this location.; } } diff --git a/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs index 72f79cad1..fa2f857b4 100644 --- a/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs +++ b/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs @@ -15,7 +15,7 @@ namespace Server.Factions public override void DoVisibleEffect() { - Effects.SendLocationEffect( this.Location, this.Map, 0x3709, 28, 10, 0x1D3, 5 ); + Effects.SendLocationEffect( Location, Map, 0x3709, 28, 10, 0x1D3, 5 ); } public override void DoAttackEffect( Mobile m ) diff --git a/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs index d53ef2472..be27743ee 100644 --- a/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs +++ b/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs @@ -15,7 +15,7 @@ namespace Server.Factions public override void DoVisibleEffect() { - Effects.SendLocationEffect( this.Location, this.Map, 0x11AD, 25, 10 ); + Effects.SendLocationEffect( Location, Map, 0x11AD, 25, 10 ); } public override void DoAttackEffect( Mobile m ) diff --git a/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs index 5270aeb72..f73e96804 100644 --- a/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs +++ b/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs @@ -15,7 +15,7 @@ namespace Server.Factions public override void DoVisibleEffect() { - Effects.SendLocationEffect( this.Location, this.Map, 0x11A4, 12, 6 ); + Effects.SendLocationEffect( Location, Map, 0x11A4, 12, 6 ); } public override void DoAttackEffect( Mobile m ) diff --git a/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs b/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs index 6f173efce..bc14aec45 100644 --- a/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs +++ b/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs @@ -74,7 +74,7 @@ namespace Server.Factions if ( pl == null ) from.SendLocalizedMessage( 1010366 ); // You cannot mount a faction war horse! - else if ( pl.Faction != this.Faction ) + else if ( pl.Faction != Faction ) from.SendLocalizedMessage( 1010367 ); // You cannot ride an opposing faction's war horse! else if ( pl.Rank.Rank < 2 ) from.SendLocalizedMessage( 1010368 ); // You must achieve a faction rank of at least two before riding a war horse! diff --git a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs index e578e6af1..e218fc47d 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs @@ -147,7 +147,7 @@ namespace Server.Factions private bool WasNamed( string speech ) { - string name = this.Name; + string name = Name; return ( name != null && Insensitive.StartsWith( speech, name ) ); } @@ -164,17 +164,17 @@ namespace Server.Factions { if ( m_Town == null || !m_Town.IsSheriff( from ) ) { - this.Say( 1042189 ); // I don't work for you! + Say( 1042189 ); // I don't work for you! } - else if ( Town.FromRegion( this.Region ) == m_Town ) + else if ( Town.FromRegion( Region ) == m_Town ) { - this.Say( 1042180 ); // Your orders, sire? + Say( 1042180 ); // Your orders, sire? m_OrdersEnd = DateTime.UtcNow + TimeSpan.FromSeconds( 10.0 ); } } else if ( DateTime.UtcNow < m_OrdersEnd ) { - if ( m_Town != null && m_Town.IsSheriff( from ) && Town.FromRegion( this.Region ) == m_Town ) + if ( m_Town != null && m_Town.IsSheriff( from ) && Town.FromRegion( Region ) == m_Town ) { m_OrdersEnd = DateTime.UtcNow + TimeSpan.FromSeconds( 10.0 ); diff --git a/Scripts/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs b/Scripts/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs index ec7ff6627..037d015f9 100644 --- a/Scripts/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs +++ b/Scripts/Engines/Factions/Mobiles/Vendors/FactionHorseVendor.cs @@ -38,12 +38,12 @@ namespace Server.Factions public override void VendorBuy( Mobile from ) { - if ( this.Faction == null || Faction.Find( from, true ) != this.Faction ) + if ( Faction == null || Faction.Find( from, true ) != Faction ) PrivateOverheadMessage( MessageType.Regular, 0x3B2, 1042201, 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. else if ( from is PlayerMobile mobile ) - mobile.SendGump( new HorseBreederGump( mobile, this.Faction ) ); + mobile.SendGump( new HorseBreederGump( mobile, Faction ) ); } public override void VendorSell( Mobile from ) diff --git a/Scripts/Engines/Help/HelpGump.cs b/Scripts/Engines/Help/HelpGump.cs index 6480a8056..d31ce02fc 100644 --- a/Scripts/Engines/Help/HelpGump.cs +++ b/Scripts/Engines/Help/HelpGump.cs @@ -221,11 +221,11 @@ namespace Server.Engines.Help { BaseHouse house = BaseHouse.FindHouseAt( from ); - if ( house != null && house.IsAosRules && !from.Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) ) // Dueling + if ( house != null && house.IsAosRules && !from.Region.IsPartOf( typeof( ConPVP.SafeZone ) ) ) // Dueling { from.Location = house.BanLocation; } - else if ( from.Region.IsPartOf( typeof( Server.Regions.Jail ) ) ) + else if ( from.Region.IsPartOf( typeof( Regions.Jail ) ) ) { from.SendLocalizedMessage( 1114345, "", 0x35 ); // You'll need a better jailbreak plan than that! } diff --git a/Scripts/Engines/Help/PageQueue.cs b/Scripts/Engines/Help/PageQueue.cs index 4726aad4a..89d3a7a82 100644 --- a/Scripts/Engines/Help/PageQueue.cs +++ b/Scripts/Engines/Help/PageQueue.cs @@ -301,7 +301,7 @@ namespace Server.Engines.Help using ( StringWriter writer = new StringWriter() ) { - writer.WriteLine( "RunUO Speech Log Page - {0}", PageQueue.GetPageTypeName( entry.Type ) ); + writer.WriteLine( "RunUO Speech Log Page - {0}", GetPageTypeName( entry.Type ) ); writer.WriteLine(); writer.WriteLine( "From: '{0}', Account: '{1}'", sender.RawName, sender.Account is Account ? sender.Account.Username : "???" ); diff --git a/Scripts/Engines/Help/StuckMenu.cs b/Scripts/Engines/Help/StuckMenu.cs index 06870c9e6..d40ec6857 100644 --- a/Scripts/Engines/Help/StuckMenu.cs +++ b/Scripts/Engines/Help/StuckMenu.cs @@ -282,7 +282,7 @@ namespace Server.Menus.Questions else destMap = m_Mobile.Kills >= 5 ? Map.Felucca : Map.Trammel; - Mobiles.BaseCreature.TeleportPets( m_Mobile, dest, destMap ); + BaseCreature.TeleportPets( m_Mobile, dest, destMap ); m_Mobile.MoveToWorld( dest, destMap ); } } diff --git a/Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs b/Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs index 104410a44..bfe9ab3d1 100644 --- a/Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs +++ b/Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs @@ -66,7 +66,7 @@ namespace Server.Items if ( m.InRange( this, 3 ) ) { - Server.Mobiles.BaseCreature.TeleportPets( m, m_PointDest, m_MapDest ); + Mobiles.BaseCreature.TeleportPets( m, m_PointDest, m_MapDest ); m.MoveToWorld( m_PointDest, m_MapDest ); } diff --git a/Scripts/Engines/Khaldun/Mobiles/GrimmochDrummel.cs b/Scripts/Engines/Khaldun/Mobiles/GrimmochDrummel.cs index 50d6e021d..5443ee081 100644 --- a/Scripts/Engines/Khaldun/Mobiles/GrimmochDrummel.cs +++ b/Scripts/Engines/Khaldun/Mobiles/GrimmochDrummel.cs @@ -96,7 +96,7 @@ namespace Server.Mobiles Gold gold = new Gold( Utility.RandomMinMax( 190, 230 ) ); gold.MoveToWorld( Location, Map ); - Container pack = this.Backpack; + Container pack = Backpack; if ( pack != null ) { pack.Movable = true; diff --git a/Scripts/Engines/Khaldun/PuzzleChest.cs b/Scripts/Engines/Khaldun/PuzzleChest.cs index 52782ac00..c9dba5f78 100644 --- a/Scripts/Engines/Khaldun/PuzzleChest.cs +++ b/Scripts/Engines/Khaldun/PuzzleChest.cs @@ -272,7 +272,7 @@ namespace Server.Items { int correctCylinders, correctColors; - if ( solution.Matches( this.Solution, out correctCylinders, out correctColors ) ) + if ( solution.Matches( Solution, out correctCylinders, out correctColors ) ) { LockPick( m ); diff --git a/Scripts/Engines/Khaldun/RaisableItem.cs b/Scripts/Engines/Khaldun/RaisableItem.cs index 7ceb5763c..768f11bf0 100644 --- a/Scripts/Engines/Khaldun/RaisableItem.cs +++ b/Scripts/Engines/Khaldun/RaisableItem.cs @@ -115,7 +115,7 @@ namespace Server.Items m_Step = 0; TimeSpan delay = m_CloseTime - DateTime.UtcNow; - Timer.DelayCall( delay > TimeSpan.Zero ? delay : TimeSpan.Zero, new TimerCallback( Start ) ); + DelayCall( delay > TimeSpan.Zero ? delay : TimeSpan.Zero, new TimerCallback( Start ) ); return; } @@ -173,7 +173,7 @@ namespace Server.Items m_CloseDelay = reader.ReadTimeSpan(); int elevation = reader.ReadEncodedInt(); - this.Z -= elevation; + Z -= elevation; } } } \ No newline at end of file diff --git a/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs b/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs index a5928d887..9b538f41d 100644 --- a/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs +++ b/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs @@ -22,9 +22,9 @@ namespace Server.Engines.MLQuests.Definitions Effects.SendLocationParticles( EffectItem.Create( pm.Location, pm.Map, EffectItem.DefaultDuration ), 0, 0, 0, 0, 0, 5060, 0 ); Effects.PlaySound( pm.Location, pm.Map, 0x243 ); - Effects.SendMovingParticles( new Entity( Server.Serial.Zero, new Point3D( pm.X - 6, pm.Y - 6, pm.Z + 15 ), pm.Map ), pm, 0x36D4, 7, 0, false, true, 0x497, 0, 9502, 1, 0, (EffectLayer)255, 0x100 ); - Effects.SendMovingParticles( new Entity( Server.Serial.Zero, new Point3D( pm.X - 4, pm.Y - 6, pm.Z + 15 ), pm.Map ), pm, 0x36D4, 7, 0, false, true, 0x497, 0, 9502, 1, 0, (EffectLayer)255, 0x100 ); - Effects.SendMovingParticles( new Entity( Server.Serial.Zero, new Point3D( pm.X - 6, pm.Y - 4, pm.Z + 15 ), pm.Map ), pm, 0x36D4, 7, 0, false, true, 0x497, 0, 9502, 1, 0, (EffectLayer)255, 0x100 ); + Effects.SendMovingParticles( new Entity( Serial.Zero, new Point3D( pm.X - 6, pm.Y - 6, pm.Z + 15 ), pm.Map ), pm, 0x36D4, 7, 0, false, true, 0x497, 0, 9502, 1, 0, (EffectLayer)255, 0x100 ); + Effects.SendMovingParticles( new Entity( Serial.Zero, new Point3D( pm.X - 4, pm.Y - 6, pm.Z + 15 ), pm.Map ), pm, 0x36D4, 7, 0, false, true, 0x497, 0, 9502, 1, 0, (EffectLayer)255, 0x100 ); + Effects.SendMovingParticles( new Entity( Serial.Zero, new Point3D( pm.X - 6, pm.Y - 4, pm.Z + 15 ), pm.Map ), pm, 0x36D4, 7, 0, false, true, 0x497, 0, 9502, 1, 0, (EffectLayer)255, 0x100 ); Effects.SendTargetParticles( pm, 0x375A, 35, 90, 0x00, 0x00, 9502, (EffectLayer)255, 0x100 ); } diff --git a/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs b/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs index 412a03eb1..e3e2dd190 100644 --- a/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs +++ b/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs @@ -262,7 +262,7 @@ namespace Server.Engines.MLQuests.Gumps public sealed class CloseRaceChanger : Packet { - public static readonly Packet Instance = Packet.SetStatic( new CloseRaceChanger() ); + public static readonly Packet Instance = SetStatic( new CloseRaceChanger() ); private CloseRaceChanger() : base( 0xBF ) diff --git a/Scripts/Engines/MyRunUO/MyRunUO.cs b/Scripts/Engines/MyRunUO/MyRunUO.cs index 7d7211109..e69c1b4d2 100644 --- a/Scripts/Engines/MyRunUO/MyRunUO.cs +++ b/Scripts/Engines/MyRunUO/MyRunUO.cs @@ -20,7 +20,7 @@ namespace Server.Engines.MyRunUO { if ( Config.Enabled ) { - Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), Config.CharacterUpdateInterval, new TimerCallback( Begin ) ); + DelayCall( TimeSpan.FromSeconds( 10.0 ), Config.CharacterUpdateInterval, new TimerCallback( Begin ) ); CommandSystem.Register( "InitMyRunUO", AccessLevel.Administrator, new CommandEventHandler( InitMyRunUO_OnCommand ) ); CommandSystem.Register( "UpdateMyRunUO", AccessLevel.Administrator, new CommandEventHandler( UpdateMyRunUO_OnCommand ) ); @@ -608,7 +608,7 @@ namespace Server.Engines.MyRunUO public void CollectGuilds( DateTime endTime ) { - m_List.AddRange( Guild.List.Values ); + m_List.AddRange( BaseGuild.List.Values ); m_Stage = Stage.DumpingGuilds; m_Index = 0; } diff --git a/Scripts/Engines/Party/Party.cs b/Scripts/Engines/Party/Party.cs index 7ca970381..d788059e8 100644 --- a/Scripts/Engines/Party/Party.cs +++ b/Scripts/Engines/Party/Party.cs @@ -35,7 +35,7 @@ namespace Server.Engines.PartySystem { if ( obj is Mobile mobile ) { - Party p = Party.Get( mobile ); + Party p = Get( mobile ); if ( p == null ) { @@ -57,7 +57,7 @@ namespace Server.Engines.PartySystem public static void EventSink_PlayerDeath( PlayerDeathEventArgs e ) { Mobile from = e.Mobile; - Party p = Party.Get( from ); + Party p = Get( from ); if ( p != null ) { @@ -83,7 +83,7 @@ namespace Server.Engines.PartySystem protected override void OnTick() { - Party p = Party.Get( m_Mobile ); + Party p = Get( m_Mobile ); if ( p == null ) return; @@ -116,7 +116,7 @@ namespace Server.Engines.PartySystem public static void EventSink_Login( LoginEventArgs e ) { Mobile from = e.Mobile; - Party p = Party.Get( from ); + Party p = Get( from ); if ( p != null ) new RejoinTimer( from ).Start(); @@ -127,7 +127,7 @@ namespace Server.Engines.PartySystem public static void EventSink_Logout( LogoutEventArgs e ) { Mobile from = e.Mobile; - Party p = Party.Get( from ); + Party p = Get( from ); if ( p != null ) p.Remove( from ); @@ -294,7 +294,7 @@ namespace Server.Engines.PartySystem return; } - Party p = Party.Get( from ); + Party p = Get( from ); if ( p == null ) from.Party = p = new Party( from ); diff --git a/Scripts/Engines/Party/PartyCommands.cs b/Scripts/Engines/Party/PartyCommands.cs index 0b087aa8a..3eb3ed21a 100644 --- a/Scripts/Engines/Party/PartyCommands.cs +++ b/Scripts/Engines/Party/PartyCommands.cs @@ -4,7 +4,7 @@ namespace Server.Engines.PartySystem { public static void Initialize() { - PartyCommands.Handler = new PartyCommandHandlers(); + Handler = new PartyCommandHandlers(); } public override void OnAdd( Mobile from ) diff --git a/Scripts/Engines/Plants/MiscItems/GreenThorns.cs b/Scripts/Engines/Plants/MiscItems/GreenThorns.cs index 0e11d255e..e3fc9f1f8 100644 --- a/Scripts/Engines/Plants/MiscItems/GreenThorns.cs +++ b/Scripts/Engines/Plants/MiscItems/GreenThorns.cs @@ -97,7 +97,7 @@ namespace Server.Items from.NonlocalOverheadMessage( MessageType.Emote, 0x961, 1061915, from.Name ); // * ~1_PLAYER_NAME~ pushes a strange green thorn into the ground. * from.BeginAction( typeof( GreenThorns ) ); - new GreenThorns.EndActionTimer( from ).Start(); + new EndActionTimer( from ).Start(); effect.Start(); } diff --git a/Scripts/Engines/Plants/MiscItems/OrangePetals.cs b/Scripts/Engines/Plants/MiscItems/OrangePetals.cs index c85599766..8809bff2f 100644 --- a/Scripts/Engines/Plants/MiscItems/OrangePetals.cs +++ b/Scripts/Engines/Plants/MiscItems/OrangePetals.cs @@ -32,7 +32,7 @@ namespace Server.Items if ( item != this ) return base.CheckItemUse( from, item ); - if ( from != this.RootParent ) + if ( from != RootParent ) { from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. return false; @@ -59,7 +59,7 @@ namespace Server.Items AddContext( from, new OrangePetalsContext( timer ) ); - this.Consume(); + Consume(); } private static Hashtable m_Table = new Hashtable(); diff --git a/Scripts/Engines/Plants/PlantBowl.cs b/Scripts/Engines/Plants/PlantBowl.cs index f77ac8a6a..94d4e2e2f 100644 --- a/Scripts/Engines/Plants/PlantBowl.cs +++ b/Scripts/Engines/Plants/PlantBowl.cs @@ -81,7 +81,7 @@ namespace Server.Engines.Plants } } } - else if ( PlantBowl.IsDirtPatch( targeted ) ) + else if ( IsDirtPatch( targeted ) ) { PlantItem fullBowl = new PlantItem( false ); diff --git a/Scripts/Engines/Plants/PlantItem.cs b/Scripts/Engines/Plants/PlantItem.cs index afe42b36e..0eb1ee87d 100644 --- a/Scripts/Engines/Plants/PlantItem.cs +++ b/Scripts/Engines/Plants/PlantItem.cs @@ -168,10 +168,10 @@ namespace Server.Engines.Plants public bool IsGrowable => m_PlantStatus >= PlantStatus.BowlOfDirt && m_PlantStatus <= PlantStatus.Stage9; [CommandProperty( AccessLevel.GameMaster )] - public bool IsCrossable => PlantHueInfo.IsCrossable( this.PlantHue ) && PlantTypeInfo.IsCrossable( this.PlantType ); + public bool IsCrossable => PlantHueInfo.IsCrossable( PlantHue ) && PlantTypeInfo.IsCrossable( PlantType ); [CommandProperty( AccessLevel.GameMaster )] - public bool Reproduces => PlantHueInfo.CanReproduce( this.PlantHue ) && PlantTypeInfo.CanReproduce( this.PlantType ); + public bool Reproduces => PlantHueInfo.CanReproduce( PlantHue ) && PlantTypeInfo.CanReproduce( PlantType ); private static ArrayList m_Instances = new ArrayList(); @@ -315,7 +315,7 @@ namespace Server.Engines.Plants if ( m_PlantStatus >= PlantStatus.DecorativePlant ) return; - Point3D loc = this.GetWorldLocation(); + Point3D loc = GetWorldLocation(); if ( !from.InLOS( loc ) || !from.InRange( loc, 2 ) ) { diff --git a/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs b/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs index c5408edae..4c357b1ab 100644 --- a/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs +++ b/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs @@ -8,18 +8,18 @@ namespace Server.Engines.Quests.Ambitious { private static Type[] m_TypeReferenceTable = new[] { - typeof( Ambitious.DontOfferConversation ), - typeof( Ambitious.AcceptConversation ), - typeof( Ambitious.DuringKillQueensConversation ), - typeof( Ambitious.GatherFungiConversation ), - typeof( Ambitious.DuringFungiGatheringConversation ), - typeof( Ambitious.EndConversation ), - typeof( Ambitious.FullBackpackConversation ), - typeof( Ambitious.End2Conversation ), - typeof( Ambitious.KillQueensObjective ), - typeof( Ambitious.ReturnAfterKillsObjective ), - typeof( Ambitious.GatherFungiObjective ), - typeof( Ambitious.GetRewardObjective ) + typeof( DontOfferConversation ), + typeof( AcceptConversation ), + typeof( DuringKillQueensConversation ), + typeof( GatherFungiConversation ), + typeof( DuringFungiGatheringConversation ), + typeof( EndConversation ), + typeof( FullBackpackConversation ), + typeof( End2Conversation ), + typeof( KillQueensObjective ), + typeof( ReturnAfterKillsObjective ), + typeof( GatherFungiObjective ), + typeof( GetRewardObjective ) }; public override Type[] TypeReferenceTable => m_TypeReferenceTable; diff --git a/Scripts/Engines/Quests/Ambitious Solen Queen/Mobiles/AmbitiousSolenQueen.cs b/Scripts/Engines/Quests/Ambitious Solen Queen/Mobiles/AmbitiousSolenQueen.cs index f3f0af479..40587b7fc 100644 --- a/Scripts/Engines/Quests/Ambitious Solen Queen/Mobiles/AmbitiousSolenQueen.cs +++ b/Scripts/Engines/Quests/Ambitious Solen Queen/Mobiles/AmbitiousSolenQueen.cs @@ -30,9 +30,9 @@ namespace Server.Engines.Quests.Ambitious public override void OnTalk( PlayerMobile player, bool contextMenu ) { - this.Direction = GetDirectionTo( player ); + Direction = GetDirectionTo( player ); - if ( player.Quest is AmbitiousQueenQuest qs && qs.RedSolen == this.RedSolen ) + if ( player.Quest is AmbitiousQueenQuest qs && qs.RedSolen == RedSolen ) { if ( qs.IsObjectiveInProgress( typeof( KillQueensObjective ) ) ) { @@ -78,7 +78,7 @@ namespace Server.Engines.Quests.Ambitious } else { - QuestSystem newQuest = new AmbitiousQueenQuest( player, this.RedSolen ); + QuestSystem newQuest = new AmbitiousQueenQuest( player, RedSolen ); if ( player.Quest == null && QuestSystem.CanOfferQuest( player, typeof( AmbitiousQueenQuest ) ) ) { @@ -93,11 +93,11 @@ namespace Server.Engines.Quests.Ambitious public override bool OnDragDrop( Mobile from, Item dropped ) { - this.Direction = GetDirectionTo( from ); + Direction = GetDirectionTo( from ); if ( from is PlayerMobile player ) { - if ( player.Quest is AmbitiousQueenQuest qs && qs.RedSolen == this.RedSolen ) + if ( player.Quest is AmbitiousQueenQuest qs && qs.RedSolen == RedSolen ) { QuestObjective obj = qs.FindObjective( typeof( GatherFungiObjective ) ); diff --git a/Scripts/Engines/Quests/Collector/CollectorQuest.cs b/Scripts/Engines/Quests/Collector/CollectorQuest.cs index ca1c945e9..7f7a3aa5e 100644 --- a/Scripts/Engines/Quests/Collector/CollectorQuest.cs +++ b/Scripts/Engines/Quests/Collector/CollectorQuest.cs @@ -7,49 +7,49 @@ namespace Server.Engines.Quests.Collector { private static Type[] m_TypeReferenceTable = new[] { - typeof( Collector.DontOfferConversation ), - typeof( Collector.DeclineConversation ), - typeof( Collector.AcceptConversation ), - typeof( Collector.ElwoodDuringFishConversation ), - typeof( Collector.ReturnPearlsConversation ), - typeof( Collector.AlbertaPaintingConversation ), - typeof( Collector.AlbertaStoolConversation ), - typeof( Collector.AlbertaEndPaintingConversation ), - typeof( Collector.AlbertaAfterPaintingConversation ), - typeof( Collector.ElwoodDuringPainting1Conversation ), - typeof( Collector.ElwoodDuringPainting2Conversation ), - typeof( Collector.ReturnPaintingConversation ), - typeof( Collector.GabrielAutographConversation ), - typeof( Collector.GabrielNoSheetMusicConversation ), - typeof( Collector.NoSheetMusicConversation ), - typeof( Collector.GetSheetMusicConversation ), - typeof( Collector.GabrielSheetMusicConversation ), - typeof( Collector.GabrielIgnoreConversation ), - typeof( Collector.ElwoodDuringAutograph1Conversation ), - typeof( Collector.ElwoodDuringAutograph2Conversation ), - typeof( Collector.ElwoodDuringAutograph3Conversation ), - typeof( Collector.ReturnAutographConversation ), - typeof( Collector.TomasToysConversation ), - typeof( Collector.TomasDuringCollectingConversation ), - typeof( Collector.ReturnImagesConversation ), - typeof( Collector.ElwoodDuringToys1Conversation ), - typeof( Collector.ElwoodDuringToys2Conversation ), - typeof( Collector.ElwoodDuringToys3Conversation ), - typeof( Collector.FullEndConversation ), - typeof( Collector.FishPearlsObjective ), - typeof( Collector.ReturnPearlsObjective ), - typeof( Collector.FindAlbertaObjective ), - typeof( Collector.SitOnTheStoolObjective ), - typeof( Collector.ReturnPaintingObjective ), - typeof( Collector.FindGabrielObjective ), - typeof( Collector.FindSheetMusicObjective ), - typeof( Collector.ReturnSheetMusicObjective ), - typeof( Collector.ReturnAutographObjective ), - typeof( Collector.FindTomasObjective ), - typeof( Collector.CaptureImagesObjective ), - typeof( Collector.ReturnImagesObjective ), - typeof( Collector.ReturnToysObjective ), - typeof( Collector.MakeRoomObjective ) + typeof( DontOfferConversation ), + typeof( DeclineConversation ), + typeof( AcceptConversation ), + typeof( ElwoodDuringFishConversation ), + typeof( ReturnPearlsConversation ), + typeof( AlbertaPaintingConversation ), + typeof( AlbertaStoolConversation ), + typeof( AlbertaEndPaintingConversation ), + typeof( AlbertaAfterPaintingConversation ), + typeof( ElwoodDuringPainting1Conversation ), + typeof( ElwoodDuringPainting2Conversation ), + typeof( ReturnPaintingConversation ), + typeof( GabrielAutographConversation ), + typeof( GabrielNoSheetMusicConversation ), + typeof( NoSheetMusicConversation ), + typeof( GetSheetMusicConversation ), + typeof( GabrielSheetMusicConversation ), + typeof( GabrielIgnoreConversation ), + typeof( ElwoodDuringAutograph1Conversation ), + typeof( ElwoodDuringAutograph2Conversation ), + typeof( ElwoodDuringAutograph3Conversation ), + typeof( ReturnAutographConversation ), + typeof( TomasToysConversation ), + typeof( TomasDuringCollectingConversation ), + typeof( ReturnImagesConversation ), + typeof( ElwoodDuringToys1Conversation ), + typeof( ElwoodDuringToys2Conversation ), + typeof( ElwoodDuringToys3Conversation ), + typeof( FullEndConversation ), + typeof( FishPearlsObjective ), + typeof( ReturnPearlsObjective ), + typeof( FindAlbertaObjective ), + typeof( SitOnTheStoolObjective ), + typeof( ReturnPaintingObjective ), + typeof( FindGabrielObjective ), + typeof( FindSheetMusicObjective ), + typeof( ReturnSheetMusicObjective ), + typeof( ReturnAutographObjective ), + typeof( FindTomasObjective ), + typeof( CaptureImagesObjective ), + typeof( ReturnImagesObjective ), + typeof( ReturnToysObjective ), + typeof( MakeRoomObjective ) }; public override Type[] TypeReferenceTable => m_TypeReferenceTable; diff --git a/Scripts/Engines/Quests/Collector/Items/Obsidian.cs b/Scripts/Engines/Quests/Collector/Items/Obsidian.cs index a30eb0d89..57603eedc 100644 --- a/Scripts/Engines/Quests/Collector/Items/Obsidian.cs +++ b/Scripts/Engines/Quests/Collector/Items/Obsidian.cs @@ -168,7 +168,7 @@ namespace Server.Engines.Quests.Collector public override void OnClick() { Mobile from = Owner.From; - if ( !m_Obsidian.Deleted && m_Obsidian.Quantity >= Obsidian.m_Partial && m_Obsidian.Quantity < Obsidian.m_Completed && m_Obsidian.IsChildOf( from.Backpack ) && from.CheckAlive() ) + if ( !m_Obsidian.Deleted && m_Obsidian.Quantity >= m_Partial && m_Obsidian.Quantity < m_Completed && m_Obsidian.IsChildOf( from.Backpack ) && from.CheckAlive() ) { for ( int i = 0; i < m_Obsidian.Quantity - 1; i++ ) from.AddToBackpack( new Obsidian() ); @@ -200,27 +200,27 @@ namespace Server.Engines.Quests.Collector protected override void OnTarget( Mobile from, object targeted ) { - if ( m_Obsidian.Deleted || m_Obsidian.Quantity >= Obsidian.m_Completed || !(targeted is Item targ) ) + if ( m_Obsidian.Deleted || m_Obsidian.Quantity >= m_Completed || !(targeted is Item targ) ) return; if ( m_Obsidian.IsChildOf( from.Backpack ) && targ.IsChildOf( from.Backpack ) && targ is Obsidian targObsidian && targ != m_Obsidian ) { - if ( targObsidian.Quantity < Obsidian.m_Completed ) + if ( targObsidian.Quantity < m_Completed ) { - if ( targObsidian.Quantity + m_Obsidian.Quantity <= Obsidian.m_Completed ) + if ( targObsidian.Quantity + m_Obsidian.Quantity <= m_Completed ) { targObsidian.Quantity += m_Obsidian.Quantity; m_Obsidian.Delete(); } else { - int delta = Obsidian.m_Completed - targObsidian.Quantity; + int delta = m_Completed - targObsidian.Quantity; targObsidian.Quantity += delta; m_Obsidian.Quantity -= delta; } - if ( targObsidian.Quantity >= Obsidian.m_Completed ) - targObsidian.StatueName = Obsidian.RandomName( from ); + if ( targObsidian.Quantity >= m_Completed ) + targObsidian.StatueName = RandomName( from ); from.Send( new AsciiMessage( targObsidian.Serial, targObsidian.ItemID, MessageType.Regular, 0x59, 3, m_Obsidian.Name, "Something Happened." ) ); diff --git a/Scripts/Engines/Quests/Collector/Mobiles/ElwoodMcCarrin.cs b/Scripts/Engines/Quests/Collector/Mobiles/ElwoodMcCarrin.cs index 38a035000..3e1fee978 100644 --- a/Scripts/Engines/Quests/Collector/Mobiles/ElwoodMcCarrin.cs +++ b/Scripts/Engines/Quests/Collector/Mobiles/ElwoodMcCarrin.cs @@ -179,9 +179,9 @@ namespace Server.Engines.Quests.Collector } else { - weapon.DamageLevel = (WeaponDamageLevel)BaseCreature.RandomMinMaxScaled( 2, 3 ); - weapon.AccuracyLevel = (WeaponAccuracyLevel)BaseCreature.RandomMinMaxScaled( 2, 3 ); - weapon.DurabilityLevel = (WeaponDurabilityLevel)BaseCreature.RandomMinMaxScaled( 2, 3 ); + weapon.DamageLevel = (WeaponDamageLevel)RandomMinMaxScaled( 2, 3 ); + weapon.AccuracyLevel = (WeaponAccuracyLevel)RandomMinMaxScaled( 2, 3 ); + weapon.DurabilityLevel = (WeaponDurabilityLevel)RandomMinMaxScaled( 2, 3 ); } bag.DropItem( weapon ); @@ -204,8 +204,8 @@ namespace Server.Engines.Quests.Collector BaseArmor armor = Loot.RandomArmorOrShield(); item = armor; - armor.ProtectionLevel = (ArmorProtectionLevel)BaseCreature.RandomMinMaxScaled( 2, 3 ); - armor.Durability = (ArmorDurabilityLevel)BaseCreature.RandomMinMaxScaled( 2, 3 ); + armor.ProtectionLevel = (ArmorProtectionLevel)RandomMinMaxScaled( 2, 3 ); + armor.Durability = (ArmorDurabilityLevel)RandomMinMaxScaled( 2, 3 ); } bag.DropItem( item ); diff --git a/Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs b/Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs index 58fb55e13..76a9e1647 100644 --- a/Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs +++ b/Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs @@ -38,7 +38,7 @@ namespace Server.Engines.Quests return false; } - pm.SendLocalizedMessage( this.NotWorkingMessage ); + pm.SendLocalizedMessage( NotWorkingMessage ); } return base.OnMoveOver( m ); diff --git a/Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs b/Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs index db377f4fa..252c2d759 100644 --- a/Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs +++ b/Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs @@ -97,7 +97,7 @@ namespace Server.Engines.Quests m_PlayTimer = null; - HornOfRetreatMoongate gate = new HornOfRetreatMoongate( this.DestLoc, this.DestMap, from, this.Hue ); + HornOfRetreatMoongate gate = new HornOfRetreatMoongate( DestLoc, DestMap, from, Hue ); gate.MoveToWorld( from.Location, from.Map ); diff --git a/Scripts/Engines/Quests/Core/QuestObjective.cs b/Scripts/Engines/Quests/Core/QuestObjective.cs index d532300f5..ae91ec2f1 100644 --- a/Scripts/Engines/Quests/Core/QuestObjective.cs +++ b/Scripts/Engines/Quests/Core/QuestObjective.cs @@ -101,12 +101,12 @@ namespace Server.Engines.Quests public virtual void RenderMessage( BaseQuestGump gump ) { - gump.AddHtmlObject( 70, 130, 300, 100, this.Message, BaseQuestGump.Blue, false, false ); + gump.AddHtmlObject( 70, 130, 300, 100, Message, BaseQuestGump.Blue, false, false ); } public virtual void RenderProgress( BaseQuestGump gump ) { - gump.AddHtmlObject( 70, 260, 270, 100, this.Completed ? 1049077 : 1049078, BaseQuestGump.Blue, false, false ); + gump.AddHtmlObject( 70, 260, 270, 100, Completed ? 1049077 : 1049078, BaseQuestGump.Blue, false, false ); } public virtual void CheckCompletionStatus() diff --git a/Scripts/Engines/Quests/Core/QuestSystem.cs b/Scripts/Engines/Quests/Core/QuestSystem.cs index 59aedf437..ba663d7cd 100644 --- a/Scripts/Engines/Quests/Core/QuestSystem.cs +++ b/Scripts/Engines/Quests/Core/QuestSystem.cs @@ -125,7 +125,7 @@ namespace Server.Engines.Quests public virtual void BaseDeserialize( GenericReader reader ) { - Type[] referenceTable = this.TypeReferenceTable; + Type[] referenceTable = TypeReferenceTable; int version = reader.ReadEncodedInt(); @@ -177,7 +177,7 @@ namespace Server.Engines.Quests public virtual void BaseSerialize( GenericWriter writer ) { - Type[] referenceTable = this.TypeReferenceTable; + Type[] referenceTable = TypeReferenceTable; writer.WriteEncodedInt( (int) 0 ); // version @@ -315,7 +315,7 @@ namespace Server.Engines.Quests { m_From.Quest = null; - TimeSpan restartDelay = this.RestartDelay; + TimeSpan restartDelay = RestartDelay; if ( ( completed && restartDelay > TimeSpan.Zero ) || ( !completed && restartDelay == TimeSpan.MaxValue ) ) { @@ -326,7 +326,7 @@ namespace Server.Engines.Quests bool found = false; - Type ourQuestType = this.GetType(); + Type ourQuestType = GetType(); for ( int i = 0; i < doneQuests.Count; ++i ) { diff --git a/Scripts/Engines/Quests/Dark Tides/Conversations.cs b/Scripts/Engines/Quests/Dark Tides/Conversations.cs index 6273094e4..524099748 100644 --- a/Scripts/Engines/Quests/Dark Tides/Conversations.cs +++ b/Scripts/Engines/Quests/Dark Tides/Conversations.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Quests.Necro public override void OnRead() { - Container bag = Mardoth.GetNewContainer(); + Container bag = BaseQuester.GetNewContainer(); bag.DropItem( new DarkTidesHorn() ); diff --git a/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs b/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs index c9cbdbd5e..bd758e687 100644 --- a/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs +++ b/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs @@ -7,41 +7,41 @@ namespace Server.Engines.Quests.Necro { private static Type[] m_TypeReferenceTable = new[] { - typeof( Necro.AcceptConversation ), - typeof( Necro.AnimateMaabusCorpseObjective ), - typeof( Necro.BankerConversation ), - typeof( Necro.CashBankCheckObjective ), - typeof( Necro.FetchAbraxusScrollObjective ), - typeof( Necro.FindBankObjective ), - typeof( Necro.FindCallingScrollObjective ), - typeof( Necro.FindCityOfLightObjective ), - typeof( Necro.FindCrystalCaveObjective ), - typeof( Necro.FindMaabusCorpseObjective ), - typeof( Necro.FindMaabusTombObjective ), - typeof( Necro.FindMardothAboutKronusObjective ), - typeof( Necro.FindMardothAboutVaultObjective ), - typeof( Necro.FindMardothEndObjective ), - typeof( Necro.FindVaultOfSecretsObjective ), - typeof( Necro.FindWellOfTearsObjective ), - typeof( Necro.HorusConversation ), - typeof( Necro.LostCallingScrollConversation ), - typeof( Necro.MaabasConversation ), - typeof( Necro.MardothEndConversation ), - typeof( Necro.MardothKronusConversation ), - typeof( Necro.MardothVaultConversation ), - typeof( Necro.RadarConversation ), - typeof( Necro.ReadAbraxusScrollConversation ), - typeof( Necro.ReadAbraxusScrollObjective ), - typeof( Necro.ReanimateMaabusConversation ), - typeof( Necro.RetrieveAbraxusScrollObjective ), - typeof( Necro.ReturnToCrystalCaveObjective ), - typeof( Necro.SecondHorusConversation ), - typeof( Necro.SpeakCavePasswordObjective ), - typeof( Necro.UseCallingScrollObjective ), - typeof( Necro.VaultOfSecretsConversation ), - typeof( Necro.FindHorusAboutRewardObjective ), - typeof( Necro.HealConversation ), - typeof( Necro.HorusRewardConversation ) + typeof( AcceptConversation ), + typeof( AnimateMaabusCorpseObjective ), + typeof( BankerConversation ), + typeof( CashBankCheckObjective ), + typeof( FetchAbraxusScrollObjective ), + typeof( FindBankObjective ), + typeof( FindCallingScrollObjective ), + typeof( FindCityOfLightObjective ), + typeof( FindCrystalCaveObjective ), + typeof( FindMaabusCorpseObjective ), + typeof( FindMaabusTombObjective ), + typeof( FindMardothAboutKronusObjective ), + typeof( FindMardothAboutVaultObjective ), + typeof( FindMardothEndObjective ), + typeof( FindVaultOfSecretsObjective ), + typeof( FindWellOfTearsObjective ), + typeof( HorusConversation ), + typeof( LostCallingScrollConversation ), + typeof( MaabasConversation ), + typeof( MardothEndConversation ), + typeof( MardothKronusConversation ), + typeof( MardothVaultConversation ), + typeof( RadarConversation ), + typeof( ReadAbraxusScrollConversation ), + typeof( ReadAbraxusScrollObjective ), + typeof( ReanimateMaabusConversation ), + typeof( RetrieveAbraxusScrollObjective ), + typeof( ReturnToCrystalCaveObjective ), + typeof( SecondHorusConversation ), + typeof( SpeakCavePasswordObjective ), + typeof( UseCallingScrollObjective ), + typeof( VaultOfSecretsConversation ), + typeof( FindHorusAboutRewardObjective ), + typeof( HealConversation ), + typeof( HorusRewardConversation ) }; public override Type[] TypeReferenceTable => m_TypeReferenceTable; diff --git a/Scripts/Engines/Quests/Dark Tides/Items/KronusScroll.cs b/Scripts/Engines/Quests/Dark Tides/Items/KronusScroll.cs index 1ef8ba39d..3f6aceacb 100644 --- a/Scripts/Engines/Quests/Dark Tides/Items/KronusScroll.cs +++ b/Scripts/Engines/Quests/Dark Tides/Items/KronusScroll.cs @@ -103,11 +103,11 @@ namespace Server.Engines.Quests.Necro if ( m_Step == 4 ) { - int baseX = KronusScroll.m_WellOfTearsArea.X; - int baseY = KronusScroll.m_WellOfTearsArea.Y; - int width = KronusScroll.m_WellOfTearsArea.Width; - int height = KronusScroll.m_WellOfTearsArea.Height; - Map map = KronusScroll.m_WellOfTearsMap; + int baseX = m_WellOfTearsArea.X; + int baseY = m_WellOfTearsArea.Y; + int width = m_WellOfTearsArea.Width; + int height = m_WellOfTearsArea.Height; + Map map = m_WellOfTearsMap; Effects.SendLocationParticles( EffectItem.Create( m_Player.Location, m_Player.Map, TimeSpan.FromSeconds( 1.0 ) ), 0, 0, 0, 0x13C4 ); Effects.PlaySound( m_Player.Location, m_Player.Map, 0x243 ); diff --git a/Scripts/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs b/Scripts/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs index 58e0d9549..1817fa981 100644 --- a/Scripts/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs +++ b/Scripts/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs @@ -141,9 +141,9 @@ namespace Server.Engines.Quests.Necro } else { - weapon.DamageLevel = (WeaponDamageLevel)BaseCreature.RandomMinMaxScaled( 2, 4 ); - weapon.AccuracyLevel = (WeaponAccuracyLevel)BaseCreature.RandomMinMaxScaled( 2, 4 ); - weapon.DurabilityLevel = (WeaponDurabilityLevel)BaseCreature.RandomMinMaxScaled( 2, 4 ); + weapon.DamageLevel = (WeaponDamageLevel)RandomMinMaxScaled( 2, 4 ); + weapon.AccuracyLevel = (WeaponAccuracyLevel)RandomMinMaxScaled( 2, 4 ); + weapon.DurabilityLevel = (WeaponDurabilityLevel)RandomMinMaxScaled( 2, 4 ); } cont.DropItem( weapon ); diff --git a/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs b/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs index 398637a08..e0a2f7ddd 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs @@ -7,39 +7,39 @@ namespace Server.Engines.Quests.Ninja { private static Type[] m_TypeReferenceTable = new[] { - typeof( Ninja.AcceptConversation ), - typeof( Ninja.FindZoelConversation ), - typeof( Ninja.RadarConversation ), - typeof( Ninja.EnterCaveConversation ), - typeof( Ninja.SneakPastGuardiansConversation ), - typeof( Ninja.NeedToHideConversation ), - typeof( Ninja.UseTeleporterConversation ), - typeof( Ninja.GiveZoelNoteConversation ), - typeof( Ninja.LostNoteConversation ), - typeof( Ninja.GainInnInformationConversation ), - typeof( Ninja.ReturnFromInnConversation ), - typeof( Ninja.SearchForSwordConversation ), - typeof( Ninja.HallwayWalkConversation ), - typeof( Ninja.ReturnSwordConversation ), - typeof( Ninja.SlayHenchmenConversation ), - typeof( Ninja.ContinueSlayHenchmenConversation ), - typeof( Ninja.GiveEminoSwordConversation ), - typeof( Ninja.LostSwordConversation ), - typeof( Ninja.EarnGiftsConversation ), - typeof( Ninja.EarnLessGiftsConversation ), - typeof( Ninja.FindEminoBeginObjective ), - typeof( Ninja.FindZoelObjective ), - typeof( Ninja.EnterCaveObjective ), - typeof( Ninja.SneakPastGuardiansObjective ), - typeof( Ninja.UseTeleporterObjective ), - typeof( Ninja.GiveZoelNoteObjective ), - typeof( Ninja.GainInnInformationObjective ), - typeof( Ninja.ReturnFromInnObjective ), - typeof( Ninja.SearchForSwordObjective ), - typeof( Ninja.HallwayWalkObjective ), - typeof( Ninja.ReturnSwordObjective ), - typeof( Ninja.SlayHenchmenObjective ), - typeof( Ninja.GiveEminoSwordObjective ) + typeof( AcceptConversation ), + typeof( FindZoelConversation ), + typeof( RadarConversation ), + typeof( EnterCaveConversation ), + typeof( SneakPastGuardiansConversation ), + typeof( NeedToHideConversation ), + typeof( UseTeleporterConversation ), + typeof( GiveZoelNoteConversation ), + typeof( LostNoteConversation ), + typeof( GainInnInformationConversation ), + typeof( ReturnFromInnConversation ), + typeof( SearchForSwordConversation ), + typeof( HallwayWalkConversation ), + typeof( ReturnSwordConversation ), + typeof( SlayHenchmenConversation ), + typeof( ContinueSlayHenchmenConversation ), + typeof( GiveEminoSwordConversation ), + typeof( LostSwordConversation ), + typeof( EarnGiftsConversation ), + typeof( EarnLessGiftsConversation ), + typeof( FindEminoBeginObjective ), + typeof( FindZoelObjective ), + typeof( EnterCaveObjective ), + typeof( SneakPastGuardiansObjective ), + typeof( UseTeleporterObjective ), + typeof( GiveZoelNoteObjective ), + typeof( GainInnInformationObjective ), + typeof( ReturnFromInnObjective ), + typeof( SearchForSwordObjective ), + typeof( HallwayWalkObjective ), + typeof( ReturnSwordObjective ), + typeof( SlayHenchmenObjective ), + typeof( GiveEminoSwordObjective ) }; public override Type[] TypeReferenceTable => m_TypeReferenceTable; diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs b/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs index 19b52228c..53ec9a9ae 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs @@ -23,8 +23,8 @@ namespace Server.Engines.Quests.Ninja private void GenerateTreasure() { - for ( int i = this.Items.Count - 1; i >= 0; i-- ) - this.Items[i].Delete(); + for ( int i = Items.Count - 1; i >= 0; i-- ) + Items[i].Delete(); for ( int i = 0; i < 75; i++ ) { diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Items/GuardianBarrier.cs b/Scripts/Engines/Quests/Emino's Undertaking/Items/GuardianBarrier.cs index b2ab808e3..bac072b91 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Items/GuardianBarrier.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Items/GuardianBarrier.cs @@ -17,7 +17,7 @@ namespace Server.Engines.Quests.Ninja return true; // If the mobile is to the north of the barrier, allow him to pass - if ( this.Y >= m.Y ) + if ( Y >= m.Y ) return true; if ( m is BaseCreature creature ) @@ -25,7 +25,7 @@ namespace Server.Engines.Quests.Ninja Mobile master = creature.GetMaster(); // Allow creatures to cross from the south to the north only if their master is near to the north - return master != null && this.Y >= master.Y && master.InRange(this, 4); + return master != null && Y >= master.Y && master.InRange(this, 4); } if ( m is PlayerMobile pm ) diff --git a/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs b/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs index 5e2d61d98..9c2c8ab15 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs @@ -7,42 +7,42 @@ namespace Server.Engines.Quests.Samurai { private static Type[] m_TypeReferenceTable = new[] { - typeof( Samurai.AcceptConversation ), - typeof( Samurai.RadarConversation ), - typeof( Samurai.FirstTrialIntroConversation ), - typeof( Samurai.FirstTrialKillConversation ), - typeof( Samurai.GainKarmaConversation ), - typeof( Samurai.SecondTrialIntroConversation ), - typeof( Samurai.SecondTrialAttackConversation ), - typeof( Samurai.ThirdTrialIntroConversation ), - typeof( Samurai.ThirdTrialKillConversation ), - typeof( Samurai.FourthTrialIntroConversation ), - typeof( Samurai.FourthTrialCatsConversation ), - typeof( Samurai.FifthTrialIntroConversation ), - typeof( Samurai.FifthTrialReturnConversation ), - typeof( Samurai.LostSwordConversation ), - typeof( Samurai.SixthTrialIntroConversation ), - typeof( Samurai.SeventhTrialIntroConversation ), - typeof( Samurai.EndConversation ), - typeof( Samurai.FindHaochiObjective ), - typeof( Samurai.FirstTrialIntroObjective ), - typeof( Samurai.FirstTrialKillObjective ), - typeof( Samurai.FirstTrialReturnObjective ), - typeof( Samurai.SecondTrialIntroObjective ), - typeof( Samurai.SecondTrialAttackObjective ), - typeof( Samurai.SecondTrialReturnObjective ), - typeof( Samurai.ThirdTrialIntroObjective ), - typeof( Samurai.ThirdTrialKillObjective ), - typeof( Samurai.ThirdTrialReturnObjective ), - typeof( Samurai.FourthTrialIntroObjective ), - typeof( Samurai.FourthTrialCatsObjective ), - typeof( Samurai.FourthTrialReturnObjective ), - typeof( Samurai.FifthTrialIntroObjective ), - typeof( Samurai.FifthTrialReturnObjective ), - typeof( Samurai.SixthTrialIntroObjective ), - typeof( Samurai.SixthTrialReturnObjective ), - typeof( Samurai.SeventhTrialIntroObjective ), - typeof( Samurai.SeventhTrialReturnObjective ) + typeof( AcceptConversation ), + typeof( RadarConversation ), + typeof( FirstTrialIntroConversation ), + typeof( FirstTrialKillConversation ), + typeof( GainKarmaConversation ), + typeof( SecondTrialIntroConversation ), + typeof( SecondTrialAttackConversation ), + typeof( ThirdTrialIntroConversation ), + typeof( ThirdTrialKillConversation ), + typeof( FourthTrialIntroConversation ), + typeof( FourthTrialCatsConversation ), + typeof( FifthTrialIntroConversation ), + typeof( FifthTrialReturnConversation ), + typeof( LostSwordConversation ), + typeof( SixthTrialIntroConversation ), + typeof( SeventhTrialIntroConversation ), + typeof( EndConversation ), + typeof( FindHaochiObjective ), + typeof( FirstTrialIntroObjective ), + typeof( FirstTrialKillObjective ), + typeof( FirstTrialReturnObjective ), + typeof( SecondTrialIntroObjective ), + typeof( SecondTrialAttackObjective ), + typeof( SecondTrialReturnObjective ), + typeof( ThirdTrialIntroObjective ), + typeof( ThirdTrialKillObjective ), + typeof( ThirdTrialReturnObjective ), + typeof( FourthTrialIntroObjective ), + typeof( FourthTrialCatsObjective ), + typeof( FourthTrialReturnObjective ), + typeof( FifthTrialIntroObjective ), + typeof( FifthTrialReturnObjective ), + typeof( SixthTrialIntroObjective ), + typeof( SixthTrialReturnObjective ), + typeof( SeventhTrialIntroObjective ), + typeof( SeventhTrialReturnObjective ) }; public override Type[] TypeReferenceTable => m_TypeReferenceTable; diff --git a/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs b/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs index 13ed05cec..4ee91988c 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs @@ -23,8 +23,8 @@ namespace Server.Engines.Quests.Samurai private void GenerateTreasure() { - for ( int i = this.Items.Count - 1; i >= 0; i-- ) - this.Items[i].Delete(); + for ( int i = Items.Count - 1; i >= 0; i-- ) + Items[i].Delete(); for ( int i = 0; i < 75; i++ ) { diff --git a/Scripts/Engines/Quests/Haochi's Trials/Items/HonorCandle.cs b/Scripts/Engines/Quests/Haochi's Trials/Items/HonorCandle.cs index 5f7f288ff..f1f08a308 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Items/HonorCandle.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Items/HonorCandle.cs @@ -42,7 +42,7 @@ namespace Server.Engines.Quests.Samurai if ( obj != null && !obj.Completed ) obj.Complete(); - this.SendLocalizedMessageTo( from, 1063251 ); // You light a candle in honor. + SendLocalizedMessageTo( from, 1063251 ); // You light a candle in honor. } } } diff --git a/Scripts/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs b/Scripts/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs index d09d3f385..a1f5c5301 100644 --- a/Scripts/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs +++ b/Scripts/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs @@ -30,17 +30,17 @@ namespace Server.Engines.Quests.Matriarch public override bool CanTalkTo( PlayerMobile to ) { - if ( SolenMatriarchQuest.IsFriend( to, this.RedSolen ) ) + if ( SolenMatriarchQuest.IsFriend( to, RedSolen ) ) return true; - return to.Quest is SolenMatriarchQuest qs && qs.RedSolen == this.RedSolen; + return to.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen; } public override void OnTalk( PlayerMobile player, bool contextMenu ) { - this.Direction = GetDirectionTo( player ); + Direction = GetDirectionTo( player ); - if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == this.RedSolen ) + if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen ) { if ( qs.IsObjectiveInProgress( typeof( KillInfiltratorsObjective ) ) ) { @@ -89,9 +89,9 @@ namespace Server.Engines.Quests.Matriarch } } } - else if ( SolenMatriarchQuest.IsFriend( player, this.RedSolen ) ) + else if ( SolenMatriarchQuest.IsFriend( player, RedSolen ) ) { - QuestSystem newQuest = new SolenMatriarchQuest( player, this.RedSolen ); + QuestSystem newQuest = new SolenMatriarchQuest( player, RedSolen ); if ( player.Quest == null && QuestSystem.CanOfferQuest( player, typeof( SolenMatriarchQuest ) ) ) { @@ -110,13 +110,13 @@ namespace Server.Engines.Quests.Matriarch { if ( dropped is Seed ) { - if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == this.RedSolen ) + if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen ) { SayTo( player, 1054080 ); // Thank you for that plant seed. Those have such wonderful flavor. } else { - QuestSystem newQuest = new SolenMatriarchQuest( player, this.RedSolen ); + QuestSystem newQuest = new SolenMatriarchQuest( player, RedSolen ); if ( player.Quest == null && QuestSystem.CanOfferQuest( player, typeof( SolenMatriarchQuest ) ) ) { @@ -124,7 +124,7 @@ namespace Server.Engines.Quests.Matriarch } else { - newQuest.AddConversation( new DontOfferConversation( SolenMatriarchQuest.IsFriend( player, this.RedSolen ) ) ); + newQuest.AddConversation( new DontOfferConversation( SolenMatriarchQuest.IsFriend( player, RedSolen ) ) ); } } @@ -150,7 +150,7 @@ namespace Server.Engines.Quests.Matriarch { if ( from is PlayerMobile pm ) { - if ( pm.Quest is SolenMatriarchQuest qs && qs.RedSolen == this.RedSolen ) + if ( pm.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen ) { if ( qs.IsObjectiveInProgress( typeof( ProcessFungiObjective ) ) ) { @@ -209,9 +209,9 @@ namespace Server.Engines.Quests.Matriarch public void OnGivenFungi( PlayerMobile player, ZoogiFungus fungi ) { - this.Direction = GetDirectionTo( player ); + Direction = GetDirectionTo( player ); - if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == this.RedSolen ) + if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen ) { QuestObjective obj = qs.FindObjective( typeof( ProcessFungiObjective ) ); diff --git a/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs b/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs index f4c2547f4..607f14b29 100644 --- a/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs +++ b/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs @@ -8,21 +8,21 @@ namespace Server.Engines.Quests.Matriarch { private static Type[] m_TypeReferenceTable = new[] { - typeof( Matriarch.DontOfferConversation ), - typeof( Matriarch.AcceptConversation ), - typeof( Matriarch.DuringKillInfiltratorsConversation ), - typeof( Matriarch.GatherWaterConversation ), - typeof( Matriarch.DuringWaterGatheringConversation ), - typeof( Matriarch.ProcessFungiConversation ), - typeof( Matriarch.DuringFungiProcessConversation ), - typeof( Matriarch.FullBackpackConversation ), - typeof( Matriarch.EndConversation ), - typeof( Matriarch.KillInfiltratorsObjective ), - typeof( Matriarch.ReturnAfterKillsObjective ), - typeof( Matriarch.GatherWaterObjective ), - typeof( Matriarch.ReturnAfterWaterObjective ), - typeof( Matriarch.ProcessFungiObjective ), - typeof( Matriarch.GetRewardObjective ) + typeof( DontOfferConversation ), + typeof( AcceptConversation ), + typeof( DuringKillInfiltratorsConversation ), + typeof( GatherWaterConversation ), + typeof( DuringWaterGatheringConversation ), + typeof( ProcessFungiConversation ), + typeof( DuringFungiProcessConversation ), + typeof( FullBackpackConversation ), + typeof( EndConversation ), + typeof( KillInfiltratorsObjective ), + typeof( ReturnAfterKillsObjective ), + typeof( GatherWaterObjective ), + typeof( ReturnAfterWaterObjective ), + typeof( ProcessFungiObjective ), + typeof( GetRewardObjective ) }; public override Type[] TypeReferenceTable => m_TypeReferenceTable; diff --git a/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs b/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs index 6cfc93b49..f58bbfe7b 100644 --- a/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs +++ b/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs @@ -86,8 +86,8 @@ namespace Server.Engines.Quests.Doom if ( Deleted ) return; - Point3D loc = this.Location; - Map map = this.Map; + Point3D loc = Location; + Map map = Map; Effects.SendLocationParticles( EffectItem.Create( loc, map, EffectItem.DefaultDuration ), 0x3728, 10, 10, 0, 0, 2023, 0 ); Effects.PlaySound( loc, map, 0x1FE ); @@ -170,7 +170,7 @@ namespace Server.Engines.Quests.Doom Effects.SendLocationParticles( EffectItem.Create( loc, map, EffectItem.DefaultDuration ), 0x3728, 10, 10, 0, 0, 2023, 0 ); Effects.PlaySound( loc, map, 0x1FE ); - BaseCreature.TeleportPets( from, loc, map ); + TeleportPets( from, loc, map ); from.MoveToWorld( loc, map ); } diff --git a/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs b/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs index 89f0e52ba..f73baa5fe 100644 --- a/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs +++ b/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs @@ -42,7 +42,7 @@ namespace Server.Engines.Quests.Doom { get { - if ( m_Altar == null || m_Altar.Deleted || m_Altar.Map != this.Map || !Utility.InRange( m_Altar.Location, this.Location, AltarRange ) ) + if ( m_Altar == null || m_Altar.Deleted || m_Altar.Map != Map || !Utility.InRange( m_Altar.Location, Location, AltarRange ) ) { foreach ( Item item in GetItemsInRange( AltarRange ) ) { diff --git a/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs b/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs index 7c1867de0..76b7036ff 100644 --- a/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs +++ b/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs @@ -8,10 +8,10 @@ namespace Server.Engines.Quests.Doom { private static Type[] m_TypeReferenceTable = new[] { - typeof( Doom.AcceptConversation ), - typeof( Doom.CollectBonesObjective ), - typeof( Doom.VanquishDaemonConversation ), - typeof( Doom.VanquishDaemonObjective ) + typeof( AcceptConversation ), + typeof( CollectBonesObjective ), + typeof( VanquishDaemonConversation ), + typeof( VanquishDaemonObjective ) }; public override Type[] TypeReferenceTable => m_TypeReferenceTable; diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs index d2fc5d294..958ecb581 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs @@ -101,7 +101,7 @@ namespace Server.Engines.Quests.Haven if ( ItemID == 0x2006 ) // Corpse form { list.Add( "a human corpse" ); - list.Add( 1049144, this.Name ); // the remains of ~1_NAME~ the apprentice + list.Add( 1049144, Name ); // the remains of ~1_NAME~ the apprentice } else { @@ -111,7 +111,7 @@ namespace Server.Engines.Quests.Haven public override void OnSingleClick( Mobile from ) { - int hue = Notoriety.GetHue( Server.Misc.NotorietyHandlers.CorpseNotoriety( from, this ) ); + int hue = Notoriety.GetHue( Misc.NotorietyHandlers.CorpseNotoriety( from, this ) ); if ( ItemID == 0x2006 ) // Corpse form from.Send( new MessageLocalized( Serial, ItemID, MessageType.Label, hue, 3, 1049144, "", Name ) ); // the remains of ~1_NAME~ the apprentice @@ -121,7 +121,7 @@ namespace Server.Engines.Quests.Haven public override void Open( Mobile from, bool checkSelfLoot ) { - if ( !from.InRange( this.GetWorldLocation(), 2 ) ) + if ( !from.InRange( GetWorldLocation(), 2 ) ) return; if ( from is PlayerMobile player ) @@ -158,13 +158,13 @@ namespace Server.Engines.Quests.Haven public override void OnLocationChange( Point3D oldLoc ) { if ( m_Lantern != null && !m_Lantern.Deleted ) - m_Lantern.Location = new Point3D( this.X, this.Y + 1, this.Z ); + m_Lantern.Location = new Point3D( X, Y + 1, Z ); } public override void OnMapChange() { if ( m_Lantern != null && !m_Lantern.Deleted ) - m_Lantern.Map = this.Map; + m_Lantern.Map = Map; } public override void OnAfterDelete() diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs index 4268fad34..29c616dd2 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs @@ -99,7 +99,7 @@ namespace Server.Engines.Quests.Haven if ( ItemID == 0x2006 ) // Corpse form { list.Add( "a human corpse" ); - list.Add( 1049318, this.Name ); // the remains of ~1_NAME~ the militia fighter + list.Add( 1049318, Name ); // the remains of ~1_NAME~ the militia fighter } else { @@ -109,7 +109,7 @@ namespace Server.Engines.Quests.Haven public override void OnSingleClick( Mobile from ) { - int hue = Notoriety.GetHue( Server.Misc.NotorietyHandlers.CorpseNotoriety( from, this ) ); + int hue = Notoriety.GetHue( Misc.NotorietyHandlers.CorpseNotoriety( from, this ) ); if ( ItemID == 0x2006 ) // Corpse form from.Send( new MessageLocalized( Serial, ItemID, MessageType.Label, hue, 3, 1049318, "", Name ) ); // the remains of ~1_NAME~ the militia fighter @@ -119,7 +119,7 @@ namespace Server.Engines.Quests.Haven public override void Open( Mobile from, bool checkSelfLoot ) { - if ( from.InRange( this.GetWorldLocation(), 2 ) ) + if ( from.InRange( GetWorldLocation(), 2 ) ) { from.SendLocalizedMessage( 1049661, "", 0x22 ); // Thinking about his sacrifice, you can't bring yourself to loot the body of this militia fighter. } diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs index 84de4214f..dca3c4bbc 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs @@ -326,9 +326,9 @@ namespace Server.Engines.Quests.Haven } else { - weapon.DamageLevel = (WeaponDamageLevel)BaseCreature.RandomMinMaxScaled( 2, 4 ); - weapon.AccuracyLevel = (WeaponAccuracyLevel)BaseCreature.RandomMinMaxScaled( 2, 4 ); - weapon.DurabilityLevel = (WeaponDurabilityLevel)BaseCreature.RandomMinMaxScaled( 2, 4 ); + weapon.DamageLevel = (WeaponDamageLevel)RandomMinMaxScaled( 2, 4 ); + weapon.AccuracyLevel = (WeaponAccuracyLevel)RandomMinMaxScaled( 2, 4 ); + weapon.DurabilityLevel = (WeaponDurabilityLevel)RandomMinMaxScaled( 2, 4 ); } weapon.Slayer = SlayerName.Silver; diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs index 6152fb6c3..1407a3450 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs @@ -7,39 +7,39 @@ namespace Server.Engines.Quests.Haven { private static Type[] m_TypeReferenceTable = new[] { - typeof( Haven.AcceptConversation ), - typeof( Haven.UzeraanTitheConversation ), - typeof( Haven.UzeraanFirstTaskConversation ), - typeof( Haven.UzeraanReportConversation ), - typeof( Haven.SchmendrickConversation ), - typeof( Haven.UzeraanScrollOfPowerConversation ), - typeof( Haven.DryadConversation ), - typeof( Haven.UzeraanFertileDirtConversation ), - typeof( Haven.UzeraanDaemonBloodConversation ), - typeof( Haven.UzeraanDaemonBoneConversation ), - typeof( Haven.BankerConversation ), - typeof( Haven.RadarConversation ), - typeof( Haven.LostScrollOfPowerConversation ), - typeof( Haven.LostFertileDirtConversation ), - typeof( Haven.DryadAppleConversation ), - typeof( Haven.LostDaemonBloodConversation ), - typeof( Haven.LostDaemonBoneConversation ), - typeof( Haven.FindUzeraanBeginObjective ), - typeof( Haven.TitheGoldObjective ), - typeof( Haven.FindUzeraanFirstTaskObjective ), - typeof( Haven.KillHordeMinionsObjective ), - typeof( Haven.FindUzeraanAboutReportObjective ), - typeof( Haven.FindSchmendrickObjective ), - typeof( Haven.FindApprenticeObjective ), - typeof( Haven.ReturnScrollOfPowerObjective ), - typeof( Haven.FindDryadObjective ), - typeof( Haven.ReturnFertileDirtObjective ), - typeof( Haven.GetDaemonBloodObjective ), - typeof( Haven.ReturnDaemonBloodObjective ), - typeof( Haven.GetDaemonBoneObjective ), - typeof( Haven.ReturnDaemonBoneObjective ), - typeof( Haven.CashBankCheckObjective ), - typeof( Haven.FewReagentsConversation ) + typeof( AcceptConversation ), + typeof( UzeraanTitheConversation ), + typeof( UzeraanFirstTaskConversation ), + typeof( UzeraanReportConversation ), + typeof( SchmendrickConversation ), + typeof( UzeraanScrollOfPowerConversation ), + typeof( DryadConversation ), + typeof( UzeraanFertileDirtConversation ), + typeof( UzeraanDaemonBloodConversation ), + typeof( UzeraanDaemonBoneConversation ), + typeof( BankerConversation ), + typeof( RadarConversation ), + typeof( LostScrollOfPowerConversation ), + typeof( LostFertileDirtConversation ), + typeof( DryadAppleConversation ), + typeof( LostDaemonBloodConversation ), + typeof( LostDaemonBoneConversation ), + typeof( FindUzeraanBeginObjective ), + typeof( TitheGoldObjective ), + typeof( FindUzeraanFirstTaskObjective ), + typeof( KillHordeMinionsObjective ), + typeof( FindUzeraanAboutReportObjective ), + typeof( FindSchmendrickObjective ), + typeof( FindApprenticeObjective ), + typeof( ReturnScrollOfPowerObjective ), + typeof( FindDryadObjective ), + typeof( ReturnFertileDirtObjective ), + typeof( GetDaemonBloodObjective ), + typeof( ReturnDaemonBloodObjective ), + typeof( GetDaemonBoneObjective ), + typeof( ReturnDaemonBoneObjective ), + typeof( CashBankCheckObjective ), + typeof( FewReagentsConversation ) }; public override Type[] TypeReferenceTable => m_TypeReferenceTable; diff --git a/Scripts/Engines/Quests/Witch Apprentice/Items/HagApprenticeCorpse.cs b/Scripts/Engines/Quests/Witch Apprentice/Items/HagApprenticeCorpse.cs index 1c7b3d0fa..38e3ff6fd 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Items/HagApprenticeCorpse.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Items/HagApprenticeCorpse.cs @@ -55,7 +55,7 @@ namespace Server.Engines.Quests.Hag public override void Open( Mobile from, bool checkSelfLoot ) { - if ( !from.InRange( this.GetWorldLocation(), 2 ) ) + if ( !from.InRange( GetWorldLocation(), 2 ) ) return; if ( from is PlayerMobile player ) diff --git a/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs b/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs index d7dd3b181..f55ab279d 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs @@ -90,7 +90,7 @@ namespace Server.Engines.Quests.Hag private void Heave() { - this.PublicOverheadMessage( Network.MessageType.Regular, 0x3B2, 500849 ); // *hic* + PublicOverheadMessage( Network.MessageType.Regular, 0x3B2, 500849 ); // *hic* Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 60, 180 ) ), new TimerCallback( Heave ) ); } diff --git a/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Grizelda.cs b/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Grizelda.cs index 414d9ebfd..4d8c03ccb 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Grizelda.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Grizelda.cs @@ -107,7 +107,7 @@ namespace Server.Engines.Quests.Hag cont.DropItem( new Cauldron() ); cont.DropItem( new MoonfireBrew() ); - cont.DropItem( new TreasureMap( Utility.RandomMinMax( 1, 4 ), this.Map ) ); + cont.DropItem( new TreasureMap( Utility.RandomMinMax( 1, 4 ), Map ) ); cont.DropItem( new Gold( 2000, 2200 ) ); if ( Utility.RandomBool() ) @@ -120,9 +120,9 @@ namespace Server.Engines.Quests.Hag } else { - weapon.DamageLevel = (WeaponDamageLevel)BaseCreature.RandomMinMaxScaled( 2, 3 ); - weapon.AccuracyLevel = (WeaponAccuracyLevel)BaseCreature.RandomMinMaxScaled( 2, 3 ); - weapon.DurabilityLevel = (WeaponDurabilityLevel)BaseCreature.RandomMinMaxScaled( 2, 3 ); + weapon.DamageLevel = (WeaponDamageLevel)RandomMinMaxScaled( 2, 3 ); + weapon.AccuracyLevel = (WeaponAccuracyLevel)RandomMinMaxScaled( 2, 3 ); + weapon.DurabilityLevel = (WeaponDurabilityLevel)RandomMinMaxScaled( 2, 3 ); } cont.DropItem( weapon ); @@ -145,8 +145,8 @@ namespace Server.Engines.Quests.Hag BaseArmor armor = Loot.RandomArmorOrShield(); item = armor; - armor.ProtectionLevel = (ArmorProtectionLevel)BaseCreature.RandomMinMaxScaled( 2, 3 ); - armor.Durability = (ArmorDurabilityLevel)BaseCreature.RandomMinMaxScaled( 2, 3 ); + armor.ProtectionLevel = (ArmorProtectionLevel)RandomMinMaxScaled( 2, 3 ); + armor.Durability = (ArmorDurabilityLevel)RandomMinMaxScaled( 2, 3 ); } cont.DropItem( item ); diff --git a/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs b/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs index 4610c018a..2566e721a 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs @@ -314,7 +314,7 @@ namespace Server.Engines.Quests.Hag { get { - IngredientInfo info = IngredientInfo.Get( this.Ingredient ); + IngredientInfo info = IngredientInfo.Get( Ingredient ); return info.Quantity; } @@ -359,7 +359,7 @@ namespace Server.Engines.Quests.Hag { if ( !Completed ) { - IngredientInfo info = IngredientInfo.Get( this.Ingredient ); + IngredientInfo info = IngredientInfo.Get( Ingredient ); gump.AddHtmlLocalized( 70, 260, 270, 100, info.Name, BaseQuestGump.Blue, false, false ); gump.AddLabel( 70, 280, 0x64, CurProgress.ToString() ); @@ -377,7 +377,7 @@ namespace Server.Engines.Quests.Hag if ( Completed ) return false; - IngredientInfo info = IngredientInfo.Get( this.Ingredient ); + IngredientInfo info = IngredientInfo.Get( Ingredient ); Type fromType = from.GetType(); for ( int i = 0; i < info.Creatures.Length; i++ ) @@ -391,7 +391,7 @@ namespace Server.Engines.Quests.Hag public override void OnKill( BaseCreature creature, Container corpse ) { - IngredientInfo info = IngredientInfo.Get( this.Ingredient ); + IngredientInfo info = IngredientInfo.Get( Ingredient ); for ( int i = 0; i < info.Creatures.Length; i++ ) { @@ -410,7 +410,7 @@ namespace Server.Engines.Quests.Hag public override void OnComplete() { - if ( this.Ingredient != Ingredient.Whiskey ) + if ( Ingredient != Ingredient.Whiskey ) { NextStep(); } diff --git a/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs b/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs index 6ab2edcdd..b2456d3ed 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs @@ -7,28 +7,28 @@ namespace Server.Engines.Quests.Hag { private static Type[] m_TypeReferenceTable = new[] { - typeof( Hag.FindApprenticeObjective ), - typeof( Hag.FindGrizeldaAboutMurderObjective ), - typeof( Hag.KillImpsObjective ), - typeof( Hag.FindZeefzorpulObjective ), - typeof( Hag.ReturnRecipeObjective ), - typeof( Hag.FindIngredientObjective ), - typeof( Hag.ReturnIngredientsObjective ), - typeof( Hag.DontOfferConversation ), - typeof( Hag.AcceptConversation ), - typeof( Hag.HagDuringCorpseSearchConversation ), - typeof( Hag.ApprenticeCorpseConversation ), - typeof( Hag.MurderConversation ), - typeof( Hag.HagDuringImpSearchConversation ), - typeof( Hag.ImpDeathConversation ), - typeof( Hag.ZeefzorpulConversation ), - typeof( Hag.RecipeConversation ), - typeof( Hag.HagDuringIngredientsConversation ), - typeof( Hag.BlackheartFirstConversation ), - typeof( Hag.BlackheartNoPirateConversation ), - typeof( Hag.BlackheartPirateConversation ), - typeof( Hag.EndConversation ), - typeof( Hag.RecentlyFinishedConversation ) + typeof( FindApprenticeObjective ), + typeof( FindGrizeldaAboutMurderObjective ), + typeof( KillImpsObjective ), + typeof( FindZeefzorpulObjective ), + typeof( ReturnRecipeObjective ), + typeof( FindIngredientObjective ), + typeof( ReturnIngredientsObjective ), + typeof( DontOfferConversation ), + typeof( AcceptConversation ), + typeof( HagDuringCorpseSearchConversation ), + typeof( ApprenticeCorpseConversation ), + typeof( MurderConversation ), + typeof( HagDuringImpSearchConversation ), + typeof( ImpDeathConversation ), + typeof( ZeefzorpulConversation ), + typeof( RecipeConversation ), + typeof( HagDuringIngredientsConversation ), + typeof( BlackheartFirstConversation ), + typeof( BlackheartNoPirateConversation ), + typeof( BlackheartPirateConversation ), + typeof( EndConversation ), + typeof( RecentlyFinishedConversation ) }; public override Type[] TypeReferenceTable => m_TypeReferenceTable; diff --git a/Scripts/Engines/RemoteAdmin/Network.cs b/Scripts/Engines/RemoteAdmin/Network.cs index 6209f69e7..44dcd259d 100644 --- a/Scripts/Engines/RemoteAdmin/Network.cs +++ b/Scripts/Engines/RemoteAdmin/Network.cs @@ -126,7 +126,7 @@ namespace Server.RemoteAdmin } else if ( cmd == 0xFF ) { - string statStr = String.Format( ", Name={0}, Age={1}, Clients={2}, Items={3}, Chars={4}, Mem={5}K, Ver={6}", Server.Misc.ServerList.ServerName, (int)(DateTime.UtcNow - Server.Items.Clock.ServerStart).TotalHours, NetState.Instances.Count, World.Items.Count, World.Mobiles.Count, (int)(System.GC.GetTotalMemory( false ) / 1024), ProtocolVersion ); + string statStr = String.Format( ", Name={0}, Age={1}, Clients={2}, Items={3}, Chars={4}, Mem={5}K, Ver={6}", Misc.ServerList.ServerName, (int)(DateTime.UtcNow - Items.Clock.ServerStart).TotalHours, NetState.Instances.Count, World.Items.Count, World.Mobiles.Count, (int)(GC.GetTotalMemory( false ) / 1024), ProtocolVersion ); state.Send( new UOGInfo( statStr ) ); state.Dispose(); } @@ -278,6 +278,6 @@ namespace Server.RemoteAdmin m_OnLine( line ); } - public override System.Text.Encoding Encoding => System.Text.Encoding.ASCII; + public override Encoding Encoding => Encoding.ASCII; } } diff --git a/Scripts/Engines/Reports/Objects/Charts/ChartItemCollection.cs b/Scripts/Engines/Reports/Objects/Charts/ChartItemCollection.cs index 5678bd6b6..136385706 100644 --- a/Scripts/Engines/Reports/Objects/Charts/ChartItemCollection.cs +++ b/Scripts/Engines/Reports/Objects/Charts/ChartItemCollection.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports /// /// Strongly typed collection of Server.Engines.Reports.ChartItem. /// - public class ChartItemCollection : System.Collections.CollectionBase + public class ChartItemCollection : CollectionBase { /// @@ -30,10 +30,10 @@ namespace Server.Engines.Reports /// /// Gets or sets the value of the Server.Engines.Reports.ChartItem at a specific position in the ChartItemCollection. /// - public Server.Engines.Reports.ChartItem this[int index] + public ChartItem this[int index] { - get => ((Server.Engines.Reports.ChartItem)(this.List[index])); - set => this.List[index] = value; + get => ((ChartItem)(List[index])); + set => List[index] = value; } public int Add( string name, int value ) @@ -46,9 +46,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ChartItem instance. /// The position into which the new element was inserted. - public int Add(Server.Engines.Reports.ChartItem value) + public int Add(ChartItem value) { - return this.List.Add(value); + return List.Add(value); } /// @@ -56,9 +56,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ChartItem instance to search for. /// True if the Server.Engines.Reports.ChartItem instance is in the collection; otherwise false. - public bool Contains(Server.Engines.Reports.ChartItem value) + public bool Contains(ChartItem value) { - return this.List.Contains(value); + return List.Contains(value); } /// @@ -66,18 +66,18 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ChartItem instance to find. /// The zero-based index of the specified Server.Engines.Reports.ChartItem instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Engines.Reports.ChartItem value) + public int IndexOf(ChartItem value) { - return this.List.IndexOf(value); + return List.IndexOf(value); } /// /// Removes a specified Server.Engines.Reports.ChartItem instance from this collection. /// /// The Server.Engines.Reports.ChartItem instance to remove. - public void Remove(Server.Engines.Reports.ChartItem value) + public void Remove(ChartItem value) { - this.List.Remove(value); + List.Remove(value); } /// @@ -94,15 +94,15 @@ namespace Server.Engines.Reports /// /// Zero-based index. /// The Server.Engines.Reports.ChartItem instance to insert. - public void Insert(int index, Server.Engines.Reports.ChartItem value) + public void Insert(int index, ChartItem value) { - this.List.Insert(index, value); + List.Insert(index, value); } /// /// Strongly typed enumerator of Server.Engines.Reports.ChartItem. /// - public class ChartItemCollectionEnumerator : System.Collections.IEnumerator + public class ChartItemCollectionEnumerator : IEnumerator { /// @@ -113,7 +113,7 @@ namespace Server.Engines.Reports /// /// Current element pointed to. /// - private Server.Engines.Reports.ChartItem _currentElement; + private ChartItem _currentElement; /// /// Collection to enumerate. @@ -133,7 +133,7 @@ namespace Server.Engines.Reports /// /// Gets the Server.Engines.Reports.ChartItem object in the enumerated ChartItemCollection currently indexed by this instance. /// - public Server.Engines.Reports.ChartItem Current + public ChartItem Current { get { @@ -187,7 +187,7 @@ namespace Server.Engines.Reports < (_collection.Count - 1))) { _index = (_index + 1); - _currentElement = this._collection[_index]; + _currentElement = _collection[_index]; return true; } _index = _collection.Count; diff --git a/Scripts/Engines/Reports/Objects/Reports/ItemValueCollection.cs b/Scripts/Engines/Reports/Objects/Reports/ItemValueCollection.cs index 60d9192ee..cd3c5538a 100644 --- a/Scripts/Engines/Reports/Objects/Reports/ItemValueCollection.cs +++ b/Scripts/Engines/Reports/Objects/Reports/ItemValueCollection.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports /// /// Strongly typed collection of Server.Engines.Reports.ItemValue. /// - public class ItemValueCollection : System.Collections.CollectionBase + public class ItemValueCollection : CollectionBase { /// @@ -30,10 +30,10 @@ namespace Server.Engines.Reports /// /// Gets or sets the value of the Server.Engines.Reports.ItemValue at a specific position in the ItemValueCollection. /// - public Server.Engines.Reports.ItemValue this[int index] + public ItemValue this[int index] { - get => ((Server.Engines.Reports.ItemValue)(this.List[index])); - set => this.List[index] = value; + get => ((ItemValue)(List[index])); + set => List[index] = value; } public int Add( string value ) @@ -51,9 +51,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ItemValue instance. /// The position into which the new element was inserted. - public int Add(Server.Engines.Reports.ItemValue value) + public int Add(ItemValue value) { - return this.List.Add(value); + return List.Add(value); } /// @@ -61,9 +61,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ItemValue instance to search for. /// True if the Server.Engines.Reports.ItemValue instance is in the collection; otherwise false. - public bool Contains(Server.Engines.Reports.ItemValue value) + public bool Contains(ItemValue value) { - return this.List.Contains(value); + return List.Contains(value); } /// @@ -71,18 +71,18 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ItemValue instance to find. /// The zero-based index of the specified Server.Engines.Reports.ItemValue instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Engines.Reports.ItemValue value) + public int IndexOf(ItemValue value) { - return this.List.IndexOf(value); + return List.IndexOf(value); } /// /// Removes a specified Server.Engines.Reports.ItemValue instance from this collection. /// /// The Server.Engines.Reports.ItemValue instance to remove. - public void Remove(Server.Engines.Reports.ItemValue value) + public void Remove(ItemValue value) { - this.List.Remove(value); + List.Remove(value); } /// @@ -99,15 +99,15 @@ namespace Server.Engines.Reports /// /// Zero-based index. /// The Server.Engines.Reports.ItemValue instance to insert. - public void Insert(int index, Server.Engines.Reports.ItemValue value) + public void Insert(int index, ItemValue value) { - this.List.Insert(index, value); + List.Insert(index, value); } /// /// Strongly typed enumerator of Server.Engines.Reports.ItemValue. /// - public class ItemValueCollectionEnumerator : System.Collections.IEnumerator + public class ItemValueCollectionEnumerator : IEnumerator { /// @@ -118,7 +118,7 @@ namespace Server.Engines.Reports /// /// Current element pointed to. /// - private Server.Engines.Reports.ItemValue _currentElement; + private ItemValue _currentElement; /// /// Collection to enumerate. @@ -138,7 +138,7 @@ namespace Server.Engines.Reports /// /// Gets the Server.Engines.Reports.ItemValue object in the enumerated ItemValueCollection currently indexed by this instance. /// - public Server.Engines.Reports.ItemValue Current + public ItemValue Current { get { @@ -192,7 +192,7 @@ namespace Server.Engines.Reports < (_collection.Count - 1))) { _index = (_index + 1); - _currentElement = this._collection[_index]; + _currentElement = _collection[_index]; return true; } _index = _collection.Count; diff --git a/Scripts/Engines/Reports/Objects/Reports/ReportColumnCollection.cs b/Scripts/Engines/Reports/Objects/Reports/ReportColumnCollection.cs index d3aa00ca8..f1c2ce7b6 100644 --- a/Scripts/Engines/Reports/Objects/Reports/ReportColumnCollection.cs +++ b/Scripts/Engines/Reports/Objects/Reports/ReportColumnCollection.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports /// /// Strongly typed collection of Server.Engines.Reports.ReportColumn. /// - public class ReportColumnCollection : System.Collections.CollectionBase + public class ReportColumnCollection : CollectionBase { /// @@ -30,10 +30,10 @@ namespace Server.Engines.Reports /// /// Gets or sets the value of the Server.Engines.Reports.ReportColumn at a specific position in the ReportColumnCollection. /// - public Server.Engines.Reports.ReportColumn this[int index] + public ReportColumn this[int index] { - get => ((Server.Engines.Reports.ReportColumn)(this.List[index])); - set => this.List[index] = value; + get => ((ReportColumn)(List[index])); + set => List[index] = value; } public int Add( string width, string align ) @@ -51,9 +51,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ReportColumn instance. /// The position into which the new element was inserted. - public int Add(Server.Engines.Reports.ReportColumn value) + public int Add(ReportColumn value) { - return this.List.Add(value); + return List.Add(value); } /// @@ -61,9 +61,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ReportColumn instance to search for. /// True if the Server.Engines.Reports.ReportColumn instance is in the collection; otherwise false. - public bool Contains(Server.Engines.Reports.ReportColumn value) + public bool Contains(ReportColumn value) { - return this.List.Contains(value); + return List.Contains(value); } /// @@ -71,18 +71,18 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ReportColumn instance to find. /// The zero-based index of the specified Server.Engines.Reports.ReportColumn instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Engines.Reports.ReportColumn value) + public int IndexOf(ReportColumn value) { - return this.List.IndexOf(value); + return List.IndexOf(value); } /// /// Removes a specified Server.Engines.Reports.ReportColumn instance from this collection. /// /// The Server.Engines.Reports.ReportColumn instance to remove. - public void Remove(Server.Engines.Reports.ReportColumn value) + public void Remove(ReportColumn value) { - this.List.Remove(value); + List.Remove(value); } /// @@ -99,15 +99,15 @@ namespace Server.Engines.Reports /// /// Zero-based index. /// The Server.Engines.Reports.ReportColumn instance to insert. - public void Insert(int index, Server.Engines.Reports.ReportColumn value) + public void Insert(int index, ReportColumn value) { - this.List.Insert(index, value); + List.Insert(index, value); } /// /// Strongly typed enumerator of Server.Engines.Reports.ReportColumn. /// - public class ReportColumnCollectionEnumerator : System.Collections.IEnumerator + public class ReportColumnCollectionEnumerator : IEnumerator { /// @@ -118,7 +118,7 @@ namespace Server.Engines.Reports /// /// Current element pointed to. /// - private Server.Engines.Reports.ReportColumn _currentElement; + private ReportColumn _currentElement; /// /// Collection to enumerate. @@ -138,7 +138,7 @@ namespace Server.Engines.Reports /// /// Gets the Server.Engines.Reports.ReportColumn object in the enumerated ReportColumnCollection currently indexed by this instance. /// - public Server.Engines.Reports.ReportColumn Current + public ReportColumn Current { get { @@ -192,7 +192,7 @@ namespace Server.Engines.Reports < (_collection.Count - 1))) { _index = (_index + 1); - _currentElement = this._collection[_index]; + _currentElement = _collection[_index]; return true; } _index = _collection.Count; diff --git a/Scripts/Engines/Reports/Objects/Reports/ReportItemCollection.cs b/Scripts/Engines/Reports/Objects/Reports/ReportItemCollection.cs index bd86a4122..86b67c343 100644 --- a/Scripts/Engines/Reports/Objects/Reports/ReportItemCollection.cs +++ b/Scripts/Engines/Reports/Objects/Reports/ReportItemCollection.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports /// /// Strongly typed collection of Server.Engines.Reports.ReportItem. /// - public class ReportItemCollection : System.Collections.CollectionBase + public class ReportItemCollection : CollectionBase { /// @@ -30,10 +30,10 @@ namespace Server.Engines.Reports /// /// Gets or sets the value of the Server.Engines.Reports.ReportItem at a specific position in the ReportItemCollection. /// - public Server.Engines.Reports.ReportItem this[int index] + public ReportItem this[int index] { - get => ((Server.Engines.Reports.ReportItem)(this.List[index])); - set => this.List[index] = value; + get => ((ReportItem)(List[index])); + set => List[index] = value; } public int Add( string name, object value ) @@ -56,9 +56,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ReportItem instance. /// The position into which the new element was inserted. - public int Add(Server.Engines.Reports.ReportItem value) + public int Add(ReportItem value) { - return this.List.Add(value); + return List.Add(value); } /// @@ -66,9 +66,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ReportItem instance to search for. /// True if the Server.Engines.Reports.ReportItem instance is in the collection; otherwise false. - public bool Contains(Server.Engines.Reports.ReportItem value) + public bool Contains(ReportItem value) { - return this.List.Contains(value); + return List.Contains(value); } /// @@ -76,18 +76,18 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ReportItem instance to find. /// The zero-based index of the specified Server.Engines.Reports.ReportItem instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Engines.Reports.ReportItem value) + public int IndexOf(ReportItem value) { - return this.List.IndexOf(value); + return List.IndexOf(value); } /// /// Removes a specified Server.Engines.Reports.ReportItem instance from this collection. /// /// The Server.Engines.Reports.ReportItem instance to remove. - public void Remove(Server.Engines.Reports.ReportItem value) + public void Remove(ReportItem value) { - this.List.Remove(value); + List.Remove(value); } /// @@ -104,15 +104,15 @@ namespace Server.Engines.Reports /// /// Zero-based index. /// The Server.Engines.Reports.ReportItem instance to insert. - public void Insert(int index, Server.Engines.Reports.ReportItem value) + public void Insert(int index, ReportItem value) { - this.List.Insert(index, value); + List.Insert(index, value); } /// /// Strongly typed enumerator of Server.Engines.Reports.ReportItem. /// - public class ReportItemCollectionEnumerator : System.Collections.IEnumerator + public class ReportItemCollectionEnumerator : IEnumerator { /// @@ -123,7 +123,7 @@ namespace Server.Engines.Reports /// /// Current element pointed to. /// - private Server.Engines.Reports.ReportItem _currentElement; + private ReportItem _currentElement; /// /// Collection to enumerate. @@ -143,7 +143,7 @@ namespace Server.Engines.Reports /// /// Gets the Server.Engines.Reports.ReportItem object in the enumerated ReportItemCollection currently indexed by this instance. /// - public Server.Engines.Reports.ReportItem Current + public ReportItem Current { get { @@ -197,7 +197,7 @@ namespace Server.Engines.Reports < (_collection.Count - 1))) { _index = (_index + 1); - _currentElement = this._collection[_index]; + _currentElement = _collection[_index]; return true; } _index = _collection.Count; diff --git a/Scripts/Engines/Reports/Objects/Snapshots/SnapshotCollection.cs b/Scripts/Engines/Reports/Objects/Snapshots/SnapshotCollection.cs index 3ab53c411..ebf42b725 100644 --- a/Scripts/Engines/Reports/Objects/Snapshots/SnapshotCollection.cs +++ b/Scripts/Engines/Reports/Objects/Snapshots/SnapshotCollection.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports /// /// Strongly typed collection of Server.Engines.Reports.Snapshot. /// - public class SnapshotCollection : System.Collections.CollectionBase + public class SnapshotCollection : CollectionBase { /// @@ -30,10 +30,10 @@ namespace Server.Engines.Reports /// /// Gets or sets the value of the Server.Engines.Reports.Snapshot at a specific position in the SnapshotCollection. /// - public Server.Engines.Reports.Snapshot this[int index] + public Snapshot this[int index] { - get => ((Server.Engines.Reports.Snapshot)(this.List[index])); - set => this.List[index] = value; + get => ((Snapshot)(List[index])); + set => List[index] = value; } /// @@ -41,9 +41,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.Snapshot instance. /// The position into which the new element was inserted. - public int Add(Server.Engines.Reports.Snapshot value) + public int Add(Snapshot value) { - return this.List.Add(value); + return List.Add(value); } /// @@ -51,9 +51,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.Snapshot instance to search for. /// True if the Server.Engines.Reports.Snapshot instance is in the collection; otherwise false. - public bool Contains(Server.Engines.Reports.Snapshot value) + public bool Contains(Snapshot value) { - return this.List.Contains(value); + return List.Contains(value); } /// @@ -61,18 +61,18 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.Snapshot instance to find. /// The zero-based index of the specified Server.Engines.Reports.Snapshot instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Engines.Reports.Snapshot value) + public int IndexOf(Snapshot value) { - return this.List.IndexOf(value); + return List.IndexOf(value); } /// /// Removes a specified Server.Engines.Reports.Snapshot instance from this collection. /// /// The Server.Engines.Reports.Snapshot instance to remove. - public void Remove(Server.Engines.Reports.Snapshot value) + public void Remove(Snapshot value) { - this.List.Remove(value); + List.Remove(value); } /// @@ -89,15 +89,15 @@ namespace Server.Engines.Reports /// /// Zero-based index. /// The Server.Engines.Reports.Snapshot instance to insert. - public void Insert(int index, Server.Engines.Reports.Snapshot value) + public void Insert(int index, Snapshot value) { - this.List.Insert(index, value); + List.Insert(index, value); } /// /// Strongly typed enumerator of Server.Engines.Reports.Snapshot. /// - public class SnapshotCollectionEnumerator : System.Collections.IEnumerator + public class SnapshotCollectionEnumerator : IEnumerator { /// @@ -108,7 +108,7 @@ namespace Server.Engines.Reports /// /// Current element pointed to. /// - private Server.Engines.Reports.Snapshot _currentElement; + private Snapshot _currentElement; /// /// Collection to enumerate. @@ -128,7 +128,7 @@ namespace Server.Engines.Reports /// /// Gets the Server.Engines.Reports.Snapshot object in the enumerated SnapshotCollection currently indexed by this instance. /// - public Server.Engines.Reports.Snapshot Current + public Snapshot Current { get { @@ -182,7 +182,7 @@ namespace Server.Engines.Reports < (_collection.Count - 1))) { _index = (_index + 1); - _currentElement = this._collection[_index]; + _currentElement = _collection[_index]; return true; } _index = _collection.Count; diff --git a/Scripts/Engines/Reports/Objects/Staffing/Info.cs b/Scripts/Engines/Reports/Objects/Staffing/Info.cs index deaf04104..113f07dfd 100644 --- a/Scripts/Engines/Reports/Objects/Staffing/Info.cs +++ b/Scripts/Engines/Reports/Objects/Staffing/Info.cs @@ -80,10 +80,10 @@ namespace Server.Engines.Reports BaseInfo cmp = obj as BaseInfo; int v = cmp.GetPageCount( cmp is StaffInfo ? PageResolution.Handled : PageResolution.None, DateTime.UtcNow - m_SortRange, DateTime.UtcNow ) - - this.GetPageCount( this is StaffInfo ? PageResolution.Handled : PageResolution.None, DateTime.UtcNow - m_SortRange, DateTime.UtcNow ); + - GetPageCount( this is StaffInfo ? PageResolution.Handled : PageResolution.None, DateTime.UtcNow - m_SortRange, DateTime.UtcNow ); if ( v == 0 ) - v = String.Compare( this.Display, cmp.Display ); + v = String.Compare( Display, cmp.Display ); return v; } diff --git a/Scripts/Engines/Reports/Objects/Staffing/PageInfoCollection.cs b/Scripts/Engines/Reports/Objects/Staffing/PageInfoCollection.cs index b901f2435..682221ebd 100644 --- a/Scripts/Engines/Reports/Objects/Staffing/PageInfoCollection.cs +++ b/Scripts/Engines/Reports/Objects/Staffing/PageInfoCollection.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports /// /// Strongly typed collection of Server.Engines.Reports.PageInfo. /// - public class PageInfoCollection : System.Collections.CollectionBase + public class PageInfoCollection : CollectionBase { /// @@ -30,10 +30,10 @@ namespace Server.Engines.Reports /// /// Gets or sets the value of the Server.Engines.Reports.PageInfo at a specific position in the PageInfoCollection. /// - public Server.Engines.Reports.PageInfo this[int index] + public PageInfo this[int index] { - get => ((Server.Engines.Reports.PageInfo)(this.List[index])); - set => this.List[index] = value; + get => ((PageInfo)(List[index])); + set => List[index] = value; } /// @@ -41,9 +41,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.PageInfo instance. /// The position into which the new element was inserted. - public int Add(Server.Engines.Reports.PageInfo value) + public int Add(PageInfo value) { - return this.List.Add(value); + return List.Add(value); } /// @@ -51,9 +51,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.PageInfo instance to search for. /// True if the Server.Engines.Reports.PageInfo instance is in the collection; otherwise false. - public bool Contains(Server.Engines.Reports.PageInfo value) + public bool Contains(PageInfo value) { - return this.List.Contains(value); + return List.Contains(value); } /// @@ -61,18 +61,18 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.PageInfo instance to find. /// The zero-based index of the specified Server.Engines.Reports.PageInfo instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Engines.Reports.PageInfo value) + public int IndexOf(PageInfo value) { - return this.List.IndexOf(value); + return List.IndexOf(value); } /// /// Removes a specified Server.Engines.Reports.PageInfo instance from this collection. /// /// The Server.Engines.Reports.PageInfo instance to remove. - public void Remove(Server.Engines.Reports.PageInfo value) + public void Remove(PageInfo value) { - this.List.Remove(value); + List.Remove(value); } /// @@ -89,15 +89,15 @@ namespace Server.Engines.Reports /// /// Zero-based index. /// The Server.Engines.Reports.PageInfo instance to insert. - public void Insert(int index, Server.Engines.Reports.PageInfo value) + public void Insert(int index, PageInfo value) { - this.List.Insert(index, value); + List.Insert(index, value); } /// /// Strongly typed enumerator of Server.Engines.Reports.PageInfo. /// - public class PageInfoCollectionEnumerator : System.Collections.IEnumerator + public class PageInfoCollectionEnumerator : IEnumerator { /// @@ -108,7 +108,7 @@ namespace Server.Engines.Reports /// /// Current element pointed to. /// - private Server.Engines.Reports.PageInfo _currentElement; + private PageInfo _currentElement; /// /// Collection to enumerate. @@ -128,7 +128,7 @@ namespace Server.Engines.Reports /// /// Gets the Server.Engines.Reports.PageInfo object in the enumerated PageInfoCollection currently indexed by this instance. /// - public Server.Engines.Reports.PageInfo Current + public PageInfo Current { get { @@ -182,7 +182,7 @@ namespace Server.Engines.Reports < (_collection.Count - 1))) { _index = (_index + 1); - _currentElement = this._collection[_index]; + _currentElement = _collection[_index]; return true; } _index = _collection.Count; diff --git a/Scripts/Engines/Reports/Objects/Staffing/QueueStatusCollection.cs b/Scripts/Engines/Reports/Objects/Staffing/QueueStatusCollection.cs index d1d3156d9..0e5fc8b7f 100644 --- a/Scripts/Engines/Reports/Objects/Staffing/QueueStatusCollection.cs +++ b/Scripts/Engines/Reports/Objects/Staffing/QueueStatusCollection.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports /// /// Strongly typed collection of Server.Engines.Reports.QueueStatus. /// - public class QueueStatusCollection : System.Collections.CollectionBase + public class QueueStatusCollection : CollectionBase { /// @@ -30,10 +30,10 @@ namespace Server.Engines.Reports /// /// Gets or sets the value of the Server.Engines.Reports.QueueStatus at a specific position in the QueueStatusCollection. /// - public Server.Engines.Reports.QueueStatus this[int index] + public QueueStatus this[int index] { - get => ((Server.Engines.Reports.QueueStatus)(this.List[index])); - set => this.List[index] = value; + get => ((QueueStatus)(List[index])); + set => List[index] = value; } /// @@ -41,9 +41,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.QueueStatus instance. /// The position into which the new element was inserted. - public int Add(Server.Engines.Reports.QueueStatus value) + public int Add(QueueStatus value) { - return this.List.Add(value); + return List.Add(value); } /// @@ -51,9 +51,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.QueueStatus instance to search for. /// True if the Server.Engines.Reports.QueueStatus instance is in the collection; otherwise false. - public bool Contains(Server.Engines.Reports.QueueStatus value) + public bool Contains(QueueStatus value) { - return this.List.Contains(value); + return List.Contains(value); } /// @@ -61,18 +61,18 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.QueueStatus instance to find. /// The zero-based index of the specified Server.Engines.Reports.QueueStatus instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Engines.Reports.QueueStatus value) + public int IndexOf(QueueStatus value) { - return this.List.IndexOf(value); + return List.IndexOf(value); } /// /// Removes a specified Server.Engines.Reports.QueueStatus instance from this collection. /// /// The Server.Engines.Reports.QueueStatus instance to remove. - public void Remove(Server.Engines.Reports.QueueStatus value) + public void Remove(QueueStatus value) { - this.List.Remove(value); + List.Remove(value); } /// @@ -89,15 +89,15 @@ namespace Server.Engines.Reports /// /// Zero-based index. /// The Server.Engines.Reports.QueueStatus instance to insert. - public void Insert(int index, Server.Engines.Reports.QueueStatus value) + public void Insert(int index, QueueStatus value) { - this.List.Insert(index, value); + List.Insert(index, value); } /// /// Strongly typed enumerator of Server.Engines.Reports.QueueStatus. /// - public class QueueStatusCollectionEnumerator : System.Collections.IEnumerator + public class QueueStatusCollectionEnumerator : IEnumerator { /// @@ -108,7 +108,7 @@ namespace Server.Engines.Reports /// /// Current element pointed to. /// - private Server.Engines.Reports.QueueStatus _currentElement; + private QueueStatus _currentElement; /// /// Collection to enumerate. @@ -128,7 +128,7 @@ namespace Server.Engines.Reports /// /// Gets the Server.Engines.Reports.QueueStatus object in the enumerated QueueStatusCollection currently indexed by this instance. /// - public Server.Engines.Reports.QueueStatus Current + public QueueStatus Current { get { @@ -182,7 +182,7 @@ namespace Server.Engines.Reports < (_collection.Count - 1))) { _index = (_index + 1); - _currentElement = this._collection[_index]; + _currentElement = _collection[_index]; return true; } _index = _collection.Count; diff --git a/Scripts/Engines/Reports/Objects/Staffing/ResponseInfoCollection.cs b/Scripts/Engines/Reports/Objects/Staffing/ResponseInfoCollection.cs index 80e2914b1..e458266c4 100644 --- a/Scripts/Engines/Reports/Objects/Staffing/ResponseInfoCollection.cs +++ b/Scripts/Engines/Reports/Objects/Staffing/ResponseInfoCollection.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports /// /// Strongly typed collection of Server.Engines.Reports.ResponseInfo. /// - public class ResponseInfoCollection : System.Collections.CollectionBase + public class ResponseInfoCollection : CollectionBase { /// @@ -30,10 +30,10 @@ namespace Server.Engines.Reports /// /// Gets or sets the value of the Server.Engines.Reports.ResponseInfo at a specific position in the ResponseInfoCollection. /// - public Server.Engines.Reports.ResponseInfo this[int index] + public ResponseInfo this[int index] { - get => ((Server.Engines.Reports.ResponseInfo)(this.List[index])); - set => this.List[index] = value; + get => ((ResponseInfo)(List[index])); + set => List[index] = value; } public int Add( string sentBy, string message ) @@ -46,9 +46,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ResponseInfo instance. /// The position into which the new element was inserted. - public int Add(Server.Engines.Reports.ResponseInfo value) + public int Add(ResponseInfo value) { - return this.List.Add(value); + return List.Add(value); } /// @@ -56,9 +56,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ResponseInfo instance to search for. /// True if the Server.Engines.Reports.ResponseInfo instance is in the collection; otherwise false. - public bool Contains(Server.Engines.Reports.ResponseInfo value) + public bool Contains(ResponseInfo value) { - return this.List.Contains(value); + return List.Contains(value); } /// @@ -66,18 +66,18 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.ResponseInfo instance to find. /// The zero-based index of the specified Server.Engines.Reports.ResponseInfo instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Engines.Reports.ResponseInfo value) + public int IndexOf(ResponseInfo value) { - return this.List.IndexOf(value); + return List.IndexOf(value); } /// /// Removes a specified Server.Engines.Reports.ResponseInfo instance from this collection. /// /// The Server.Engines.Reports.ResponseInfo instance to remove. - public void Remove(Server.Engines.Reports.ResponseInfo value) + public void Remove(ResponseInfo value) { - this.List.Remove(value); + List.Remove(value); } /// @@ -94,15 +94,15 @@ namespace Server.Engines.Reports /// /// Zero-based index. /// The Server.Engines.Reports.ResponseInfo instance to insert. - public void Insert(int index, Server.Engines.Reports.ResponseInfo value) + public void Insert(int index, ResponseInfo value) { - this.List.Insert(index, value); + List.Insert(index, value); } /// /// Strongly typed enumerator of Server.Engines.Reports.ResponseInfo. /// - public class ResponseInfoCollectionEnumerator : System.Collections.IEnumerator + public class ResponseInfoCollectionEnumerator : IEnumerator { /// @@ -113,7 +113,7 @@ namespace Server.Engines.Reports /// /// Current element pointed to. /// - private Server.Engines.Reports.ResponseInfo _currentElement; + private ResponseInfo _currentElement; /// /// Collection to enumerate. @@ -133,7 +133,7 @@ namespace Server.Engines.Reports /// /// Gets the Server.Engines.Reports.ResponseInfo object in the enumerated ResponseInfoCollection currently indexed by this instance. /// - public Server.Engines.Reports.ResponseInfo Current + public ResponseInfo Current { get { @@ -187,7 +187,7 @@ namespace Server.Engines.Reports < (_collection.Count - 1))) { _index = (_index + 1); - _currentElement = this._collection[_index]; + _currentElement = _collection[_index]; return true; } _index = _collection.Count; diff --git a/Scripts/Engines/Reports/Persistance/PersistableObject.cs b/Scripts/Engines/Reports/Persistance/PersistableObject.cs index 4bc62429e..0bb83aa1c 100644 --- a/Scripts/Engines/Reports/Persistance/PersistableObject.cs +++ b/Scripts/Engines/Reports/Persistance/PersistableObject.cs @@ -14,7 +14,7 @@ namespace Server.Engines.Reports public void Serialize( PersistanceWriter op ) { - op.BeginObject( this.TypeID ); + op.BeginObject( TypeID ); SerializeAttributes( op ); op.BeginChildren(); SerializeChildren( op ); diff --git a/Scripts/Engines/Reports/Persistance/PersistableObjectCollection.cs b/Scripts/Engines/Reports/Persistance/PersistableObjectCollection.cs index c1ac03801..40f116409 100644 --- a/Scripts/Engines/Reports/Persistance/PersistableObjectCollection.cs +++ b/Scripts/Engines/Reports/Persistance/PersistableObjectCollection.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports /// /// Strongly typed collection of Server.Engines.Reports.PersistableObject. /// - public class ObjectCollection : System.Collections.CollectionBase + public class ObjectCollection : CollectionBase { /// @@ -30,10 +30,10 @@ namespace Server.Engines.Reports /// /// Gets or sets the value of the Server.Engines.Reports.PersistableObject at a specific position in the ObjectCollection. /// - public Server.Engines.Reports.PersistableObject this[int index] + public PersistableObject this[int index] { - get => ((Server.Engines.Reports.PersistableObject)(this.List[index])); - set => this.List[index] = value; + get => ((PersistableObject)(List[index])); + set => List[index] = value; } /// @@ -41,14 +41,14 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.PersistableObject instance. /// The position into which the new element was inserted. - public int Add(Server.Engines.Reports.PersistableObject value) + public int Add(PersistableObject value) { - return this.List.Add(value); + return List.Add(value); } public void AddRange( PersistableObject[] col ) { - this.InnerList.AddRange( col ); + InnerList.AddRange( col ); } /// @@ -56,9 +56,9 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.PersistableObject instance to search for. /// True if the Server.Engines.Reports.PersistableObject instance is in the collection; otherwise false. - public bool Contains(Server.Engines.Reports.PersistableObject value) + public bool Contains(PersistableObject value) { - return this.List.Contains(value); + return List.Contains(value); } /// @@ -66,18 +66,18 @@ namespace Server.Engines.Reports /// /// Server.Engines.Reports.PersistableObject instance to find. /// The zero-based index of the specified Server.Engines.Reports.PersistableObject instance. If the object is not found, the return value is -1. - public int IndexOf(Server.Engines.Reports.PersistableObject value) + public int IndexOf(PersistableObject value) { - return this.List.IndexOf(value); + return List.IndexOf(value); } /// /// Removes a specified Server.Engines.Reports.PersistableObject instance from this collection. /// /// The Server.Engines.Reports.PersistableObject instance to remove. - public void Remove(Server.Engines.Reports.PersistableObject value) + public void Remove(PersistableObject value) { - this.List.Remove(value); + List.Remove(value); } /// @@ -94,15 +94,15 @@ namespace Server.Engines.Reports /// /// Zero-based index. /// The Server.Engines.Reports.PersistableObject instance to insert. - public void Insert(int index, Server.Engines.Reports.PersistableObject value) + public void Insert(int index, PersistableObject value) { - this.List.Insert(index, value); + List.Insert(index, value); } /// /// Strongly typed enumerator of Server.Engines.Reports.PersistableObject. /// - public class ObjectCollectionEnumerator : System.Collections.IEnumerator + public class ObjectCollectionEnumerator : IEnumerator { /// @@ -113,7 +113,7 @@ namespace Server.Engines.Reports /// /// Current element pointed to. /// - private Server.Engines.Reports.PersistableObject _currentElement; + private PersistableObject _currentElement; /// /// Collection to enumerate. @@ -133,7 +133,7 @@ namespace Server.Engines.Reports /// /// Gets the Server.Engines.Reports.PersistableObject object in the enumerated ObjectCollection currently indexed by this instance. /// - public Server.Engines.Reports.PersistableObject Current + public PersistableObject Current { get { @@ -187,7 +187,7 @@ namespace Server.Engines.Reports < (_collection.Count - 1))) { _index = (_index + 1); - _currentElement = this._collection[_index]; + _currentElement = _collection[_index]; return true; } _index = _collection.Count; diff --git a/Scripts/Engines/Reports/Reports.cs b/Scripts/Engines/Reports/Reports.cs index 9fb2fc910..94d798a8d 100644 --- a/Scripts/Engines/Reports/Reports.cs +++ b/Scripts/Engines/Reports/Reports.cs @@ -60,7 +60,7 @@ namespace Server.Engines.Reports FillSnapshot( ss ); m_StatsHistory.Snapshots.Add( ss ); - m_StaffHistory.QueueStats.Add( new QueueStatus( Engines.Help.PageQueue.List.Count ) ); + m_StaffHistory.QueueStats.Add( new QueueStatus( Help.PageQueue.List.Count ) ); ThreadPool.QueueUserWorkItem( new WaitCallback( UpdateOutput ), ss ); } diff --git a/Scripts/Engines/Spawner/Spawner.cs b/Scripts/Engines/Spawner/Spawner.cs index f13abca8e..d772fed67 100644 --- a/Scripts/Engines/Spawner/Spawner.cs +++ b/Scripts/Engines/Spawner/Spawner.cs @@ -503,7 +503,7 @@ namespace Server.Mobiles m_Spawned.Add( m, entry ); entry.Spawned.Add( m ); - Point3D loc = ( m is BaseVendor ? this.Location : GetSpawnPosition( m, map ) ); + Point3D loc = ( m is BaseVendor ? Location : GetSpawnPosition( m, map ) ); m.OnBeforeSpawn( loc, map ); InvalidateProperties(); @@ -524,8 +524,8 @@ namespace Server.Mobiles if ( m_Team > 0 ) c.Team = m_Team; - c.Home = this.Location; - c.HomeMap = this.Map; + c.Home = Location; + c.HomeMap = Map; } m.Spawner = this; @@ -605,22 +605,22 @@ namespace Server.Mobiles if ( waterMob ) { - if ( IsValidWater( map, x, y, this.Z ) ) - return new Point3D( x, y, this.Z ); + if ( IsValidWater( map, x, y, Z ) ) + return new Point3D( x, y, Z ); else if ( IsValidWater( map, x, y, mapZ ) ) return new Point3D( x, y, mapZ ); } if ( !waterOnlyMob ) { - if ( map.CanSpawnMobile( x, y, this.Z ) ) - return new Point3D( x, y, this.Z ); + if ( map.CanSpawnMobile( x, y, Z ) ) + return new Point3D( x, y, Z ); else if ( map.CanSpawnMobile( x, y, mapZ ) ) return new Point3D( x, y, mapZ ); } } - return this.Location; + return Location; } public static bool IsValidWater( Map map, int x, int y, int z ) diff --git a/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs b/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs index 844de4c97..d47c60ebf 100644 --- a/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs +++ b/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs @@ -108,7 +108,7 @@ namespace Server.Items if ( IsAccessibleTo( from ) && from.InRange( GetWorldLocation(), 3 ) ) { from.SendLocalizedMessage( 1070929 ); // Select the artifact or enhanced magic item to dye. - from.BeginTarget( 3, false, Server.Targeting.TargetFlags.None, new TargetStateCallback( InternalCallback ), this ); + from.BeginTarget( 3, false, Targeting.TargetFlags.None, new TargetStateCallback( InternalCallback ), this ); } else from.SendLocalizedMessage( 502436 ); // That is not accessible. diff --git a/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs b/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs index 160f7836f..e368f83bb 100644 --- a/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs +++ b/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs @@ -108,7 +108,7 @@ namespace Server.Misc { Region r = m.Region; - if ( r.IsPartOf( typeof( Server.Regions.HouseRegion ) ) || Server.Multis.BaseBoat.FindBoatAt( m, m.Map ) != null ) + if ( r.IsPartOf( typeof( Regions.HouseRegion ) ) || Multis.BaseBoat.FindBoatAt( m, m.Map ) != null ) return false; //TODO: a CanReach of something check as opposed to above? diff --git a/Scripts/Engines/VeteranRewards/RewardSystem.cs b/Scripts/Engines/VeteranRewards/RewardSystem.cs index 202a2b988..273318a03 100644 --- a/Scripts/Engines/VeteranRewards/RewardSystem.cs +++ b/Scripts/Engines/VeteranRewards/RewardSystem.cs @@ -44,7 +44,7 @@ namespace Server.Engines.VeteranRewards for ( int j = 0; j < entries.Count; ++j ) { //RewardEntry entry = entries[j]; - if ( RewardSystem.HasAccess( mob, entries[j] ) ) + if ( HasAccess( mob, entries[j] ) ) { return true; } diff --git a/Scripts/Engines/Virtues/Justice.cs b/Scripts/Engines/Virtues/Justice.cs index d501dfe6b..48c935a3c 100644 --- a/Scripts/Engines/Virtues/Justice.cs +++ b/Scripts/Engines/Virtues/Justice.cs @@ -225,7 +225,7 @@ namespace Server AddImageTiled( 0, 0, 1, 217, 9155 ); } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { if ( info.ButtonID == 2 ) { diff --git a/Scripts/Engines/Virtues/VirtueGump.cs b/Scripts/Engines/Virtues/VirtueGump.cs index 342f9ea04..983b25f3b 100644 --- a/Scripts/Engines/Virtues/VirtueGump.cs +++ b/Scripts/Engines/Virtues/VirtueGump.cs @@ -163,7 +163,7 @@ namespace Server return String.Format( "{{ gumppic {0} {1} {2} hue={3} class=VirtueGumpItem }}", X, Y, GumpID, Hue ); } - private static byte[] m_Class = Gump.StringToBuffer( " class=VirtueGumpItem" ); + private static byte[] m_Class = StringToBuffer( " class=VirtueGumpItem" ); public override void AppendTo( NetState ns, IGumpWriter disp ) { diff --git a/Scripts/Engines/Virtues/VirtueHelper.cs b/Scripts/Engines/Virtues/VirtueHelper.cs index 23c96b9ef..9869824fc 100644 --- a/Scripts/Engines/Virtues/VirtueHelper.cs +++ b/Scripts/Engines/Virtues/VirtueHelper.cs @@ -135,7 +135,7 @@ namespace Server bool gainedPath = false; string virtueName = Enum.GetName( typeof( VirtueName ), virtue ); - if ( VirtueHelper.Award( pm, virtue, amount, ref gainedPath ) ) + if ( Award( pm, virtue, amount, ref gainedPath ) ) { // TODO: Localize? if ( gainedPath ) diff --git a/Scripts/Gumps/AddGump.cs b/Scripts/Gumps/AddGump.cs index e0acd5037..caf98b3a4 100644 --- a/Scripts/Gumps/AddGump.cs +++ b/Scripts/Gumps/AddGump.cs @@ -185,7 +185,7 @@ namespace Server.Gumps else if ( p is Mobile m ) p = m.Location; - Server.Commands.Add.Invoke( from, new Point3D( p ), new Point3D( p ), new[]{ m_Type.Name } ); + Commands.Add.Invoke( from, new Point3D( p ), new Point3D( p ), new[]{ m_Type.Name } ); from.Target = new InternalTarget( m_Type, m_SearchResults, m_SearchString, m_Page ); } diff --git a/Scripts/Gumps/AdminGump.cs b/Scripts/Gumps/AdminGump.cs index ae3f356d2..5fa36af37 100644 --- a/Scripts/Gumps/AdminGump.cs +++ b/Scripts/Gumps/AdminGump.cs @@ -419,7 +419,7 @@ namespace Server.Gumps AddHtml( 20, 150, 380, 80, Color( "When enabled, only clients with an access level equal to or greater than the specified lockdown level may access the server. After setting a lockdown level, use the Purge Invalid Clients button to disconnect those clients without access.", LabelColor32 ), false, false ); - AccessLevel level = Misc.AccountHandler.LockdownLevel; + AccessLevel level = AccountHandler.LockdownLevel; bool isLockedDown = ( level > AccessLevel.Player ); AddSelectedButton( 20, 230, GetButtonID( 3, 500 ), "Not Locked Down", !isLockedDown ); @@ -1624,7 +1624,7 @@ namespace Server.Gumps from.SendGump( new AdminGump( from, AdminGumpPage.AccountDetails_Access_ClientIPs, 0, null, notice, a ) ); } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( NetState sender, RelayInfo info ) { int val = info.ButtonID - 1; @@ -1833,9 +1833,9 @@ namespace Server.Gumps case 503: case 504: { - Misc.AccountHandler.LockdownLevel = (AccessLevel)(index - 500); + AccountHandler.LockdownLevel = (AccessLevel)(index - 500); - if ( Misc.AccountHandler.LockdownLevel > AccessLevel.Player ) + if ( AccountHandler.LockdownLevel > AccessLevel.Player ) notice = "The lockdown level has been changed."; else notice = "The server is now accessible to everyone."; @@ -1845,7 +1845,7 @@ namespace Server.Gumps case 510: { - AccessLevel level = Misc.AccountHandler.LockdownLevel; + AccessLevel level = AccountHandler.LockdownLevel; if ( level > AccessLevel.Player ) { diff --git a/Scripts/Gumps/BanDurationGump.cs b/Scripts/Gumps/BanDurationGump.cs index 05a1ae4fe..5fa52138f 100644 --- a/Scripts/Gumps/BanDurationGump.cs +++ b/Scripts/Gumps/BanDurationGump.cs @@ -70,7 +70,7 @@ namespace Server.Gumps AddTextField( x + 35, y + 20, 100, 20, idx ); } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { Mobile from = sender.Mobile; diff --git a/Scripts/Gumps/BaseConfirmGump.cs b/Scripts/Gumps/BaseConfirmGump.cs index 6afed9ddf..9b95900c1 100644 --- a/Scripts/Gumps/BaseConfirmGump.cs +++ b/Scripts/Gumps/BaseConfirmGump.cs @@ -55,7 +55,7 @@ namespace Server.Gumps AddButton( 265, 220, 0xF7, 0xF8, (int) Buttons.Confirm, GumpButtonType.Reply, 0 ); } - public override void OnResponse( Server.Network.NetState state, RelayInfo info ) + public override void OnResponse( Network.NetState state, RelayInfo info ) { if ( info.ButtonID == (int) Buttons.Confirm ) { diff --git a/Scripts/Gumps/ConfirmReleaseGump.cs b/Scripts/Gumps/ConfirmReleaseGump.cs index e8d05ca01..80852b7e0 100644 --- a/Scripts/Gumps/ConfirmReleaseGump.cs +++ b/Scripts/Gumps/ConfirmReleaseGump.cs @@ -28,7 +28,7 @@ namespace Server.Gumps AddHtmlLocalized( 170, 80, 75, 20, 1011012, false, false ); // CANCEL } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { if ( info.ButtonID == 2 ) { diff --git a/Scripts/Gumps/Guilds/GuildAbbrvPrompt.cs b/Scripts/Gumps/Guilds/GuildAbbrvPrompt.cs index 207faa91f..5ad261caf 100644 --- a/Scripts/Gumps/Guilds/GuildAbbrvPrompt.cs +++ b/Scripts/Gumps/Guilds/GuildAbbrvPrompt.cs @@ -35,7 +35,7 @@ namespace Server.Gumps if ( text.Length > 0 ) { - if ( Guild.FindByAbbrev( text ) != null ) + if ( BaseGuild.FindByAbbrev( text ) != null ) { m_Mobile.SendMessage( "{0} conflicts with the abbreviation of an existing guild.", text ); } diff --git a/Scripts/Gumps/Guilds/GuildDeclareWarPrompt.cs b/Scripts/Gumps/Guilds/GuildDeclareWarPrompt.cs index c52b35b3d..1f3f1d5aa 100644 --- a/Scripts/Gumps/Guilds/GuildDeclareWarPrompt.cs +++ b/Scripts/Gumps/Guilds/GuildDeclareWarPrompt.cs @@ -33,7 +33,7 @@ namespace Server.Gumps if ( text.Length >= 3 ) { - List guilds = Utility.CastConvertList( Guild.Search( text ) ); + List guilds = Utility.CastConvertList( BaseGuild.Search( text ) ); GuildGump.EnsureClosed( m_Mobile ); diff --git a/Scripts/Gumps/Guilds/GuildGump.cs b/Scripts/Gumps/Guilds/GuildGump.cs index 9680f43c8..4aa292a68 100644 --- a/Scripts/Gumps/Guilds/GuildGump.cs +++ b/Scripts/Gumps/Guilds/GuildGump.cs @@ -179,7 +179,7 @@ namespace Server.Gumps } case 5: // Membership candidates { - GuildGump.EnsureClosed( m_Mobile ); + EnsureClosed( m_Mobile ); m_Mobile.SendGump( new GuildCandidatesGump( m_Mobile, m_Guild ) ); break; diff --git a/Scripts/Gumps/Guilds/GuildNamePrompt.cs b/Scripts/Gumps/Guilds/GuildNamePrompt.cs index 993d52402..7e21a9740 100644 --- a/Scripts/Gumps/Guilds/GuildNamePrompt.cs +++ b/Scripts/Gumps/Guilds/GuildNamePrompt.cs @@ -35,7 +35,7 @@ namespace Server.Gumps if ( text.Length > 0 ) { - if ( Guild.FindByName( text ) != null ) + if ( BaseGuild.FindByName( text ) != null ) { m_Mobile.SendMessage( "{0} conflicts with the name of an existing guild.", text ); } diff --git a/Scripts/Gumps/Guilds/New Guild System/Create Guild Gump.cs b/Scripts/Gumps/Guilds/New Guild System/Create Guild Gump.cs index ce157c9c9..3750df7f0 100644 --- a/Scripts/Gumps/Guilds/New Guild System/Create Guild Gump.cs +++ b/Scripts/Gumps/Guilds/New Guild System/Create Guild Gump.cs @@ -61,9 +61,9 @@ namespace Server.Guilds pm.SendLocalizedMessage( 1063036, Guild.NameLimit.ToString() ); // A guild name cannot be more than ~1_val~ characters in length. else if ( guildAbbrev.Length > Guild.AbbrevLimit ) pm.SendLocalizedMessage( 1063037, Guild.AbbrevLimit.ToString() ); // An abbreviation cannot exceed ~1_val~ characters in length. - else if ( Guild.FindByAbbrev( guildAbbrev ) != null || !BaseGuildGump.CheckProfanity( guildAbbrev ) ) + else if ( BaseGuild.FindByAbbrev( guildAbbrev ) != null || !BaseGuildGump.CheckProfanity( guildAbbrev ) ) pm.SendLocalizedMessage( 501153 ); // That abbreviation is not available. - else if ( Guild.FindByName( guildName ) != null || !BaseGuildGump.CheckProfanity( guildName ) ) + else if ( BaseGuild.FindByName( guildName ) != null || !BaseGuildGump.CheckProfanity( guildName ) ) pm.SendLocalizedMessage( 1063000 ); // That guild name is not available. else if ( !Banker.Withdraw( pm, Guild.RegistrationFee ) ) pm.SendLocalizedMessage( 1063001, Guild.RegistrationFee.ToString() ); // You do not possess the ~1_val~ gold piece fee required to create a guild. diff --git a/Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs b/Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs index dd13db091..1c080fa6c 100644 --- a/Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs +++ b/Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs @@ -105,12 +105,12 @@ namespace Server.Guilds TextDefinition m_LowerText; public GuildDiplomacyGump( PlayerMobile pm, Guild g ) - : this( pm, g, GuildDiplomacyGump.NameComparer.Instance, true, "", 0, GuildDisplayType.All, Utility.CastConvertList( new List( Guild.List.Values ) ), (1063136 + (int)GuildDisplayType.All) ) + : this( pm, g, NameComparer.Instance, true, "", 0, GuildDisplayType.All, Utility.CastConvertList( new List( BaseGuild.List.Values ) ), (1063136 + (int)GuildDisplayType.All) ) { } public GuildDiplomacyGump( PlayerMobile pm, Guild g, IComparer currentComparer, bool ascending, string filter, int startNumber, GuildDisplayType display ) - : this( pm, g, currentComparer, ascending, filter, startNumber, display, Utility.CastConvertList( new List( Guild.List.Values ) ), (1063136 + (int)display) ) + : this( pm, g, currentComparer, ascending, filter, startNumber, display, Utility.CastConvertList( new List( BaseGuild.List.Values ) ), (1063136 + (int)display) ) { } @@ -120,7 +120,7 @@ namespace Server.Guilds } public GuildDiplomacyGump( PlayerMobile pm, Guild g, bool ascending, string filter, int startNumber, List list, TextDefinition lowerText ) - : this( pm, g, GuildDiplomacyGump.NameComparer.Instance, ascending, filter, startNumber, GuildDisplayType.All, list, lowerText ) + : this( pm, g, NameComparer.Instance, ascending, filter, startNumber, GuildDisplayType.All, list, lowerText ) { } @@ -128,9 +128,9 @@ namespace Server.Guilds : base( pm, g, list, currentComparer, ascending, filter, startNumber, new[] { - new InfoField( 1062954, 280, GuildDiplomacyGump.NameComparer.Instance ), //Guild Name - new InfoField( 1062957, 50, GuildDiplomacyGump.AbbrevComparer.Instance ), //Abbrev - new InfoField( 1062958, 120, new GuildDiplomacyGump.StatusComparer( g ) ) //Guild Title + new InfoField( 1062954, 280, NameComparer.Instance ), //Guild Name + new InfoField( 1062957, 50, AbbrevComparer.Instance ), //Abbrev + new InfoField( 1062958, 120, new StatusComparer( g ) ) //Guild Title }) { diff --git a/Scripts/Gumps/Guilds/New Guild System/GuildMemberInfoGump.cs b/Scripts/Gumps/Guilds/New Guild System/GuildMemberInfoGump.cs index 0fa60fcb3..8476f54c6 100644 --- a/Scripts/Gumps/Guilds/New Guild System/GuildMemberInfoGump.cs +++ b/Scripts/Gumps/Guilds/New Guild System/GuildMemberInfoGump.cs @@ -204,7 +204,7 @@ namespace Server.Guilds if ( title.Length > 20 ) from.SendLocalizedMessage( 501178 ); // That title is too long. - else if ( !BaseGuildGump.CheckProfanity( title ) ) + else if ( !CheckProfanity( title ) ) from.SendLocalizedMessage( 501179 ); // That title is disallowed. else { diff --git a/Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs b/Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs index 51f4de689..3dc6b9653 100644 --- a/Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs +++ b/Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs @@ -108,13 +108,13 @@ namespace Server.Guilds private static InfoField[] m_Fields = new[] { - new InfoField( 1062955, 130, GuildRosterGump.NameComparer.Instance ), //Name - new InfoField( 1062956, 80, GuildRosterGump.RankComparer.Instance ), //Rank - new InfoField( 1062952, 80, GuildRosterGump.LastOnComparer.Instance), //Last On - new InfoField( 1062953, 150, GuildRosterGump.TitleComparer.Instance ) //Guild Title + new InfoField( 1062955, 130, NameComparer.Instance ), //Name + new InfoField( 1062956, 80, RankComparer.Instance ), //Rank + new InfoField( 1062952, 80, LastOnComparer.Instance), //Last On + new InfoField( 1062953, 150, TitleComparer.Instance ) //Guild Title }; - public GuildRosterGump( PlayerMobile pm, Guild g ) : this( pm, g, GuildRosterGump.LastOnComparer.Instance, false, "", 0 ) + public GuildRosterGump( PlayerMobile pm, Guild g ) : this( pm, g, LastOnComparer.Instance, false, "", 0 ) { } diff --git a/Scripts/Gumps/Guilds/New Guild System/OtherGuildInfo.cs b/Scripts/Gumps/Guilds/New Guild System/OtherGuildInfo.cs index 4a2e79203..251e39061 100644 --- a/Scripts/Gumps/Guilds/New Guild System/OtherGuildInfo.cs +++ b/Scripts/Gumps/Guilds/New Guild System/OtherGuildInfo.cs @@ -614,7 +614,7 @@ namespace Server.Guilds { string name = Utility.FixHtml( text.Trim() ); - if ( !BaseGuildGump.CheckProfanity( name ) ) + if ( !CheckProfanity( name ) ) pm.SendLocalizedMessage( 1070886 ); // That alliance name is not allowed. else if ( name.Length > Guild.NameLimit ) pm.SendLocalizedMessage( 1070887, Guild.NameLimit.ToString() ); // An alliance name cannot exceed ~1_val~ characters in length. diff --git a/Scripts/Gumps/NoticeGump.cs b/Scripts/Gumps/NoticeGump.cs index 2ed400671..82797f709 100644 --- a/Scripts/Gumps/NoticeGump.cs +++ b/Scripts/Gumps/NoticeGump.cs @@ -38,7 +38,7 @@ namespace Server.Gumps AddHtmlLocalized( 40, height - 30, 120, 20, 1011036, 32767, false, false ); // OKAY } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { if ( info.ButtonID == 1 ) m_Callback?.Invoke( sender.Mobile, m_State ); diff --git a/Scripts/Gumps/ViewHousesGump.cs b/Scripts/Gumps/ViewHousesGump.cs index d838b58a1..0c00a68f9 100644 --- a/Scripts/Gumps/ViewHousesGump.cs +++ b/Scripts/Gumps/ViewHousesGump.cs @@ -182,7 +182,7 @@ namespace Server.Gumps } } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { if ( m_Selection == null ) { diff --git a/Scripts/Gumps/WarningGump.cs b/Scripts/Gumps/WarningGump.cs index db374ed41..6e3ed182d 100644 --- a/Scripts/Gumps/WarningGump.cs +++ b/Scripts/Gumps/WarningGump.cs @@ -52,7 +52,7 @@ namespace Server.Gumps } } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { if (m_Callback == null) return; diff --git a/Scripts/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs b/Scripts/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs index cb0c3f09e..b8b06d89b 100644 --- a/Scripts/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs +++ b/Scripts/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs @@ -120,7 +120,7 @@ namespace Server.Engines.Events public static void Bleeding( Mobile m_From ) { - if ( TrickOrTreat.CheckMobile( m_From ) ) + if ( CheckMobile( m_From ) ) { if ( m_From.Location != Point3D.Zero ) { @@ -201,7 +201,7 @@ namespace Server.Engines.Events public static void DeleteTwin( Mobile m_Twin ) { - if ( TrickOrTreat.CheckMobile( m_Twin ) ) + if ( CheckMobile( m_Twin ) ) { m_Twin.Delete(); } diff --git a/Scripts/Holiday Stuff/Halloween/2006/Items/HalloweenPumpkin.cs b/Scripts/Holiday Stuff/Halloween/2006/Items/HalloweenPumpkin.cs index ce1c56b36..3f73f1bfc 100644 --- a/Scripts/Holiday Stuff/Halloween/2006/Items/HalloweenPumpkin.cs +++ b/Scripts/Holiday Stuff/Halloween/2006/Items/HalloweenPumpkin.cs @@ -19,7 +19,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( !from.InRange( this.GetWorldLocation(), 2 ) ) + if ( !from.InRange( GetWorldLocation(), 2 ) ) return; bool douse = false; diff --git a/Scripts/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs b/Scripts/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs index f2f65d9d1..a004104f2 100644 --- a/Scripts/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs +++ b/Scripts/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs @@ -8,8 +8,8 @@ public MrPlainsCookies( ) : base( 0x160C ) { - this.Weight = 1.0; - this.FillFactor = 4; + Weight = 1.0; + FillFactor = 4; Hue = 0xF4; } diff --git a/Scripts/Items/Addons/AddonComponent.cs b/Scripts/Items/Addons/AddonComponent.cs index d72135ca7..ef71a3d5b 100644 --- a/Scripts/Items/Addons/AddonComponent.cs +++ b/Scripts/Items/Addons/AddonComponent.cs @@ -1,6 +1,6 @@ namespace Server.Items { - [Server.Engines.Craft.Anvil] + [Engines.Craft.Anvil] public class AnvilComponent : AddonComponent { [Constructible] @@ -27,7 +27,7 @@ namespace Server.Items } } - [Server.Engines.Craft.Forge] + [Engines.Craft.Forge] public class ForgeComponent : AddonComponent { [Constructible] diff --git a/Scripts/Items/Addons/BallotBox.cs b/Scripts/Items/Addons/BallotBox.cs index 23b4daf33..ae699590b 100644 --- a/Scripts/Items/Addons/BallotBox.cs +++ b/Scripts/Items/Addons/BallotBox.cs @@ -84,7 +84,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( !from.InRange( this.GetWorldLocation(), 2 ) ) + if ( !from.InRange( GetWorldLocation(), 2 ) ) { from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that. } diff --git a/Scripts/Items/Addons/BaseAddon.cs b/Scripts/Items/Addons/BaseAddon.cs index c040c3f17..7eb52055e 100644 --- a/Scripts/Items/Addons/BaseAddon.cs +++ b/Scripts/Items/Addons/BaseAddon.cs @@ -106,7 +106,7 @@ namespace Server.Items public virtual BaseAddonDeed Deed => null; - Item IAddon.Deed => this.Deed; + Item IAddon.Deed => Deed; public List Components => m_Components; @@ -240,7 +240,7 @@ namespace Server.Items { base.Hue = value; - if ( !Deleted && this.ShareHue && m_Components != null ) + if ( !Deleted && ShareHue && m_Components != null ) { foreach ( AddonComponent c in m_Components ) c.Hue = value; diff --git a/Scripts/Items/Addons/BaseAddonContainer.cs b/Scripts/Items/Addons/BaseAddonContainer.cs index 43528727b..4e44b8c69 100644 --- a/Scripts/Items/Addons/BaseAddonContainer.cs +++ b/Scripts/Items/Addons/BaseAddonContainer.cs @@ -18,7 +18,7 @@ namespace Server.Items { base.Hue = value; - if ( !Deleted && this.ShareHue && m_Components != null ) + if ( !Deleted && ShareHue && m_Components != null ) { Hue = value; @@ -47,7 +47,7 @@ namespace Server.Items } } - Item IAddon.Deed => this.Deed; + Item IAddon.Deed => Deed; public virtual bool RetainDeedHue => false; public virtual bool NeedsWall => false; diff --git a/Scripts/Items/Addons/BaseAddonContainerDeed.cs b/Scripts/Items/Addons/BaseAddonContainerDeed.cs index 45c78d868..8b2ecd283 100644 --- a/Scripts/Items/Addons/BaseAddonContainerDeed.cs +++ b/Scripts/Items/Addons/BaseAddonContainerDeed.cs @@ -123,7 +123,7 @@ namespace Server.Items BaseAddonContainer addon = m_Deed.Addon; addon.Resource = m_Deed.Resource; - Server.Spells.SpellHelper.GetSurfaceTop( ref p ); + Spells.SpellHelper.GetSurfaceTop( ref p ); BaseHouse house = null; diff --git a/Scripts/Items/Addons/BaseAddonDeed.cs b/Scripts/Items/Addons/BaseAddonDeed.cs index c88b78ced..712bc7d55 100644 --- a/Scripts/Items/Addons/BaseAddonDeed.cs +++ b/Scripts/Items/Addons/BaseAddonDeed.cs @@ -89,7 +89,7 @@ namespace Server.Items { BaseAddon addon = m_Deed.Addon; - Server.Spells.SpellHelper.GetSurfaceTop( ref p ); + Spells.SpellHelper.GetSurfaceTop( ref p ); BaseHouse house = null; diff --git a/Scripts/Items/Addons/DartBoard.cs b/Scripts/Items/Addons/DartBoard.cs index b6f4eabc8..fc0b739e5 100644 --- a/Scripts/Items/Addons/DartBoard.cs +++ b/Scripts/Items/Addons/DartBoard.cs @@ -5,9 +5,9 @@ namespace Server.Items public class DartBoard : AddonComponent { public override bool NeedsWall => true; - public override Point3D WallPosition => this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 ); + public override Point3D WallPosition => East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 ); - public bool East => this.ItemID == 0x1E2F; + public bool East => ItemID == 0x1E2F; [Constructible] public DartBoard() : this( true ) @@ -26,9 +26,9 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { Direction dir; - if ( from.Location != this.Location ) + if ( from.Location != Location ) dir = from.GetDirectionTo( this ); - else if ( this.East ) + else if ( East ) dir = Direction.West; else dir = Direction.North; @@ -39,7 +39,7 @@ namespace Server.Items if ( !from.InRange( this, 4 ) || !from.InLOS( this ) ) canThrow = false; - else if ( this.East ) + else if ( East ) canThrow = ( dir == Direction.Left || dir == Direction.West || dir == Direction.Up ); else canThrow = ( dir == Direction.Up || dir == Direction.North || dir == Direction.Right ); diff --git a/Scripts/Items/Addons/FlourMillEastAddon.cs b/Scripts/Items/Addons/FlourMillEastAddon.cs index 39138f026..68ed801c8 100644 --- a/Scripts/Items/Addons/FlourMillEastAddon.cs +++ b/Scripts/Items/Addons/FlourMillEastAddon.cs @@ -60,7 +60,7 @@ namespace Server.Items m_Timer = null; } - if ( state is Mobile from && !from.Deleted && !this.Deleted && IsFull ) + if ( state is Mobile from && !from.Deleted && !Deleted && IsFull ) { SackFlour flour = new SackFlour(); @@ -115,7 +115,7 @@ namespace Server.Items public void UpdateStage( FlourMillStage stage ) { - List components = this.Components; + List components = Components; int[][] stageTable = m_StageTable; diff --git a/Scripts/Items/Addons/FlourMillSouthAddon.cs b/Scripts/Items/Addons/FlourMillSouthAddon.cs index 71a0fd732..bd2105004 100644 --- a/Scripts/Items/Addons/FlourMillSouthAddon.cs +++ b/Scripts/Items/Addons/FlourMillSouthAddon.cs @@ -46,7 +46,7 @@ namespace Server.Items m_Timer = null; } - if ( state is Mobile from && !from.Deleted && !this.Deleted && IsFull ) + if ( state is Mobile from && !from.Deleted && !Deleted && IsFull ) { SackFlour flour = new SackFlour(); @@ -101,7 +101,7 @@ namespace Server.Items public void UpdateStage( FlourMillStage stage ) { - List components = this.Components; + List components = Components; int[][] stageTable = m_StageTable; diff --git a/Scripts/Items/Addons/GozaMats.cs b/Scripts/Items/Addons/GozaMats.cs index f64c58ae7..51140b16d 100644 --- a/Scripts/Items/Addons/GozaMats.cs +++ b/Scripts/Items/Addons/GozaMats.cs @@ -40,7 +40,7 @@ namespace Server.Items public class GozaMatEastDeed : BaseAddonDeed { - public override BaseAddon Addon => new GozaMatEastAddon( this.Hue ); + public override BaseAddon Addon => new GozaMatEastAddon( Hue ); public override int LabelNumber => 1030404; // goza (east) [Constructible] @@ -107,7 +107,7 @@ namespace Server.Items public class GozaMatSouthDeed : BaseAddonDeed { - public override BaseAddon Addon => new GozaMatSouthAddon( this.Hue ); + public override BaseAddon Addon => new GozaMatSouthAddon( Hue ); public override int LabelNumber => 1030405; // goza (south) [Constructible] @@ -174,7 +174,7 @@ namespace Server.Items public class SquareGozaMatEastDeed : BaseAddonDeed { - public override BaseAddon Addon => new SquareGozaMatEastAddon( this.Hue ); + public override BaseAddon Addon => new SquareGozaMatEastAddon( Hue ); public override int LabelNumber => 1030407; // square goza (east) [Constructible] @@ -240,7 +240,7 @@ namespace Server.Items public class SquareGozaMatSouthDeed : BaseAddonDeed { - public override BaseAddon Addon => new SquareGozaMatSouthAddon( this.Hue ); + public override BaseAddon Addon => new SquareGozaMatSouthAddon( Hue ); public override int LabelNumber => 1030406; // square goza (south) @@ -308,7 +308,7 @@ namespace Server.Items public class BrocadeGozaMatEastDeed : BaseAddonDeed { - public override BaseAddon Addon => new BrocadeGozaMatEastAddon( this.Hue ); + public override BaseAddon Addon => new BrocadeGozaMatEastAddon( Hue ); public override int LabelNumber => 1030408; // brocade goza (east) [Constructible] @@ -374,7 +374,7 @@ namespace Server.Items public class BrocadeGozaMatSouthDeed : BaseAddonDeed { - public override BaseAddon Addon => new BrocadeGozaMatSouthAddon( this.Hue ); + public override BaseAddon Addon => new BrocadeGozaMatSouthAddon( Hue ); public override int LabelNumber => 1030409; // brocade goza (south) [Constructible] @@ -439,7 +439,7 @@ namespace Server.Items public class BrocadeSquareGozaMatEastDeed : BaseAddonDeed { - public override BaseAddon Addon => new BrocadeSquareGozaMatEastAddon( this.Hue ); + public override BaseAddon Addon => new BrocadeSquareGozaMatEastAddon( Hue ); public override int LabelNumber => 1030411; // brocade square goza (east) [Constructible] @@ -505,7 +505,7 @@ namespace Server.Items public class BrocadeSquareGozaMatSouthDeed : BaseAddonDeed { - public override BaseAddon Addon => new BrocadeSquareGozaMatSouthAddon( this.Hue ); + public override BaseAddon Addon => new BrocadeSquareGozaMatSouthAddon( Hue ); public override int LabelNumber => 1030410; // brocade square goza (south) diff --git a/Scripts/Items/Addons/LargeStoneTableEastAddon.cs b/Scripts/Items/Addons/LargeStoneTableEastAddon.cs index 2ba40b0bd..00265d756 100644 --- a/Scripts/Items/Addons/LargeStoneTableEastAddon.cs +++ b/Scripts/Items/Addons/LargeStoneTableEastAddon.cs @@ -41,7 +41,7 @@ namespace Server.Items public class LargeStoneTableEastDeed : BaseAddonDeed { - public override BaseAddon Addon => new LargeStoneTableEastAddon( this.Hue ); + public override BaseAddon Addon => new LargeStoneTableEastAddon( Hue ); public override int LabelNumber => 1044511; // large stone table (east) [Constructible] diff --git a/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs b/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs index 21490d1c8..a29ab7c79 100644 --- a/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs +++ b/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs @@ -41,7 +41,7 @@ namespace Server.Items public class LargeStoneTableSouthDeed : BaseAddonDeed { - public override BaseAddon Addon => new LargeStoneTableSouthAddon( this.Hue ); + public override BaseAddon Addon => new LargeStoneTableSouthAddon( Hue ); public override int LabelNumber => 1044512; // large stone table (South) [Constructible] diff --git a/Scripts/Items/Addons/MediumStoneTableEastAddon.cs b/Scripts/Items/Addons/MediumStoneTableEastAddon.cs index 0d195039f..7fa53201a 100644 --- a/Scripts/Items/Addons/MediumStoneTableEastAddon.cs +++ b/Scripts/Items/Addons/MediumStoneTableEastAddon.cs @@ -40,7 +40,7 @@ namespace Server.Items public class MediumStoneTableEastDeed : BaseAddonDeed { - public override BaseAddon Addon => new MediumStoneTableEastAddon( this.Hue ); + public override BaseAddon Addon => new MediumStoneTableEastAddon( Hue ); public override int LabelNumber => 1044508; // stone table (east) [Constructible] diff --git a/Scripts/Items/Addons/SHTeleporter.cs b/Scripts/Items/Addons/SHTeleporter.cs index 8d1e56938..14f91086c 100644 --- a/Scripts/Items/Addons/SHTeleporter.cs +++ b/Scripts/Items/Addons/SHTeleporter.cs @@ -85,7 +85,7 @@ namespace Server.Items Map map = m_TeleDest.Map; Point3D p = m_TeleDest.TelePoint; - Server.Mobiles.BaseCreature.TeleportPets( m, p, map ); + Mobiles.BaseCreature.TeleportPets( m, p, map ); m.MoveToWorld( p, map ); } diff --git a/Scripts/Items/Addons/ShrineOfWisdomAddon.cs b/Scripts/Items/Addons/ShrineOfWisdomAddon.cs index 251e3f864..8b5185062 100644 --- a/Scripts/Items/Addons/ShrineOfWisdomAddon.cs +++ b/Scripts/Items/Addons/ShrineOfWisdomAddon.cs @@ -31,7 +31,7 @@ namespace Server.Items } } - [Server.Engines.Craft.Forge] + [Engines.Craft.Forge] public class ShrineOfWisdomComponent : AddonComponent { public override int LabelNumber => 1062046; // Shrine of Wisdom diff --git a/Scripts/Items/Aquarium/Aquarium.cs b/Scripts/Items/Aquarium/Aquarium.cs index 29782b355..8ce891932 100644 --- a/Scripts/Items/Aquarium/Aquarium.cs +++ b/Scripts/Items/Aquarium/Aquarium.cs @@ -292,40 +292,40 @@ namespace Server.Items base.OnSingleClick( from ); if ( m_VacationLeft > 0 ) - this.LabelTo( from, 1074430, m_VacationLeft.ToString() ); // Vacation days left: ~1_DAYS + LabelTo( from, 1074430, m_VacationLeft.ToString() ); // Vacation days left: ~1_DAYS if ( m_Events.Count > 0 ) - this.LabelTo( from, 1074426, m_Events.Count.ToString() ); // ~1_NUM~ event(s) to view! + LabelTo( from, 1074426, m_Events.Count.ToString() ); // ~1_NUM~ event(s) to view! if ( m_RewardAvailable ) - this.LabelTo( from, 1074362 ); // A reward is available! + LabelTo( from, 1074362 ); // A reward is available! - this.LabelTo( from, 1074247, String.Format("{0}\t{1}", m_LiveCreatures, MaxLiveCreatures) ); // Live Creatures: ~1_NUM~ / ~2_MAX~ + LabelTo( from, 1074247, String.Format("{0}\t{1}", m_LiveCreatures, MaxLiveCreatures) ); // Live Creatures: ~1_NUM~ / ~2_MAX~ if ( DeadCreatures > 0 ) - this.LabelTo( from, 1074248, DeadCreatures.ToString() ); // Dead Creatures: ~1_NUM~ + LabelTo( from, 1074248, DeadCreatures.ToString() ); // Dead Creatures: ~1_NUM~ int decorations = Items.Count - m_LiveCreatures - DeadCreatures; if ( decorations > 0 ) - this.LabelTo( from, 1074249, (Items.Count - m_LiveCreatures - DeadCreatures).ToString() ); // Decorations: ~1_NUM~ + LabelTo( from, 1074249, (Items.Count - m_LiveCreatures - DeadCreatures).ToString() ); // Decorations: ~1_NUM~ - this.LabelTo( from, 1074250, "#" + FoodNumber() ); // Food state: ~1_STATE~ - this.LabelTo( from, 1074251, "#" + WaterNumber() ); // Water state: ~1_STATE~ + LabelTo( from, 1074250, "#" + FoodNumber() ); // Food state: ~1_STATE~ + LabelTo( from, 1074251, "#" + WaterNumber() ); // Water state: ~1_STATE~ if ( m_Food.State == (int) FoodState.Dead ) - this.LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Improve) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~ + LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Improve) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~ else if ( m_Food.State == (int) FoodState.Overfed ) - this.LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Maintain) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~ + LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Maintain) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~ else - this.LabelTo( from, 1074253, String.Format("{0}\t{1}\t{2}", m_Food.Added, m_Food.Maintain, m_Food.Improve) ); // Food Added: ~1_CUR~ Feed: ~2_NEED~ Improve: ~3_GROW~ + LabelTo( from, 1074253, String.Format("{0}\t{1}\t{2}", m_Food.Added, m_Food.Maintain, m_Food.Improve) ); // Food Added: ~1_CUR~ Feed: ~2_NEED~ Improve: ~3_GROW~ if ( m_Water.State == (int) WaterState.Dead ) - this.LabelTo( from, 1074578, String.Format("{0}\t{1}", m_Water.Added, m_Water.Improve) ); // Water Added: ~1_CUR~ Needed: ~2_NEED~ + LabelTo( from, 1074578, String.Format("{0}\t{1}", m_Water.Added, m_Water.Improve) ); // Water Added: ~1_CUR~ Needed: ~2_NEED~ else if ( m_Water.State == (int) WaterState.Strong ) - this.LabelTo( from, 1074578, String.Format("{0}\t{1}", m_Water.Added, m_Water.Maintain) ); // Water Added: ~1_CUR~ Needed: ~2_NEED~ + LabelTo( from, 1074578, String.Format("{0}\t{1}", m_Water.Added, m_Water.Maintain) ); // Water Added: ~1_CUR~ Needed: ~2_NEED~ else - this.LabelTo( from, 1074254, String.Format("{0}\t{1}\t{2}", m_Water.Added, m_Water.Maintain, m_Water.Improve) ); // Water Added: ~1_CUR~ Maintain: ~2_NEED~ Improve: ~3_GROW~ + LabelTo( from, 1074254, String.Format("{0}\t{1}\t{2}", m_Water.Added, m_Water.Maintain, m_Water.Improve) ); // Water Added: ~1_CUR~ Maintain: ~2_NEED~ Improve: ~3_GROW~ } public override void AddNameProperties( ObjectPropertyList list ) diff --git a/Scripts/Items/Armor/Artifacts/LeggingsOfBane.cs b/Scripts/Items/Armor/Artifacts/LeggingsOfBane.cs index 8415b3ab4..b9016ff8c 100644 --- a/Scripts/Items/Armor/Artifacts/LeggingsOfBane.cs +++ b/Scripts/Items/Armor/Artifacts/LeggingsOfBane.cs @@ -15,7 +15,7 @@ namespace Server.Items { Hue = 0x4F5; ArmorAttributes.DurabilityBonus = 100; - this.HitPoints = this.MaxHitPoints = 255; //Cause the Durability bonus and such and the min/max hits as well as all other hits being whole #'s... + HitPoints = MaxHitPoints = 255; //Cause the Durability bonus and such and the min/max hits as well as all other hits being whole #'s... Attributes.BonusStam = 8; Attributes.AttackChance = 20; } @@ -39,8 +39,8 @@ namespace Server.Items if ( version <= 1 ) { - if ( this.HitPoints > 255 || this.MaxHitPoints > 255 ) - this.HitPoints = this.MaxHitPoints = 255; + if ( HitPoints > 255 || MaxHitPoints > 255 ) + HitPoints = MaxHitPoints = 255; } if ( version < 1 ) diff --git a/Scripts/Items/Armor/BaseArmor.cs b/Scripts/Items/Armor/BaseArmor.cs index d984c1625..eb6108e8f 100644 --- a/Scripts/Items/Armor/BaseArmor.cs +++ b/Scripts/Items/Armor/BaseArmor.cs @@ -231,7 +231,7 @@ namespace Server.Items m_Resource = value; - if ( CraftItem.RetainsColor( this.GetType() ) ) + if ( CraftItem.RetainsColor( GetType() ) ) { Hue = CraftResources.GetHue(m_Resource); } @@ -414,7 +414,7 @@ namespace Server.Items { get { - switch ( this.Layer ) + switch ( Layer ) { default: case Layer.Neck: return ArmorBodyType.Gorget; @@ -1111,7 +1111,7 @@ namespace Server.Items m_HitPoints = m_MaxHitPoints = Utility.RandomMinMax( InitMinHits, InitMaxHits ); - this.Layer = (Layer)ItemData.Quality; + Layer = (Layer)ItemData.Quality; m_AosAttributes = new AosAttributes( this ); m_AosArmorAttributes = new AosArmorAttributes( this ); @@ -1213,7 +1213,7 @@ namespace Server.Items if ( strBonus != 0 || dexBonus != 0 || intBonus != 0 ) { - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); if ( strBonus != 0 ) from.AddStatMod( new StatMod( StatType.Str, modName + "Str", strBonus, TimeSpan.Zero ) ); @@ -1232,7 +1232,7 @@ namespace Server.Items { if ( parent is Mobile m ) { - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); m.RemoveStatMod( modName + "Str" ); m.RemoveStatMod( modName + "Dex" ); @@ -1311,7 +1311,7 @@ namespace Server.Items private string GetNameString() { - string name = this.Name; + string name = Name; if ( name == null ) name = String.Format( "#{0}", LabelNumber ); @@ -1547,7 +1547,7 @@ namespace Server.Items } else { - this.LabelTo( from, Name ); + LabelTo( from, Name ); number = 1041000; } diff --git a/Scripts/Items/Body Parts/Head.cs b/Scripts/Items/Body Parts/Head.cs index 7dcd1d821..64584b306 100644 --- a/Scripts/Items/Body Parts/Head.cs +++ b/Scripts/Items/Body Parts/Head.cs @@ -98,7 +98,7 @@ namespace Server.Items break; case 0: - string format = this.Name; + string format = Name; if ( format != null ) { @@ -118,7 +118,7 @@ namespace Server.Items } m_PlayerName = format; - this.Name = null; + Name = null; break; } diff --git a/Scripts/Items/Books/BaseBook.cs b/Scripts/Items/Books/BaseBook.cs index da8205c05..23e014654 100644 --- a/Scripts/Items/Books/BaseBook.cs +++ b/Scripts/Items/Books/BaseBook.cs @@ -99,7 +99,7 @@ namespace Server.Items m_Author = author; m_Writable = writable; - BookContent content = this.DefaultContent; + BookContent content = DefaultContent; if ( content == null ) { @@ -119,7 +119,7 @@ namespace Server.Items { m_Writable = writable; - BookContent content = this.DefaultContent; + BookContent content = DefaultContent; if ( content == null ) { @@ -159,7 +159,7 @@ namespace Server.Items { base.Serialize( writer ); - BookContent content = this.DefaultContent; + BookContent content = DefaultContent; SaveFlags flags = SaveFlags.None; @@ -214,7 +214,7 @@ namespace Server.Items case 3: case 2: { - BookContent content = this.DefaultContent; + BookContent content = DefaultContent; SaveFlags flags = (SaveFlags) reader.ReadByte(); @@ -263,7 +263,7 @@ namespace Server.Items } else { - BookContent content = this.DefaultContent; + BookContent content = DefaultContent; if ( content != null ) m_Pages = content.Copy(); @@ -325,7 +325,7 @@ namespace Server.Items { StringBuilder sb = new StringBuilder(); - foreach( BookPageInfo bpi in this.m_Pages ) + foreach( BookPageInfo bpi in m_Pages ) { foreach( string line in bpi.Lines ) { @@ -343,7 +343,7 @@ namespace Server.Items { List lines = new List(); - foreach( BookPageInfo bpi in this.m_Pages ) + foreach( BookPageInfo bpi in m_Pages ) { lines.AddRange( bpi.Lines ); } diff --git a/Scripts/Items/Clothing/BaseClothing.cs b/Scripts/Items/Clothing/BaseClothing.cs index 6011940aa..6f58339ed 100644 --- a/Scripts/Items/Clothing/BaseClothing.cs +++ b/Scripts/Items/Clothing/BaseClothing.cs @@ -267,7 +267,7 @@ namespace Server.Items if ( strBonus == 0 && dexBonus == 0 && intBonus == 0 ) return; - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); if ( strBonus != 0 ) parent.AddStatMod( new StatMod( StatType.Str, modName + "Str", strBonus, TimeSpan.Zero ) ); @@ -350,7 +350,7 @@ namespace Server.Items if ( Core.AOS ) m_AosSkillBonuses.Remove(); - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); mob.RemoveStatMod( modName + "Str" ); mob.RemoveStatMod( modName + "Dex" ); @@ -498,7 +498,7 @@ namespace Server.Items private string GetNameString() { - string name = this.Name; + string name = Name; if ( name == null ) name = String.Format( "#{0}", LabelNumber ); @@ -673,7 +673,7 @@ namespace Server.Items } else { - this.LabelTo( from, Name ); + LabelTo( from, Name ); number = 1041000; } diff --git a/Scripts/Items/Clothing/Cloaks.cs b/Scripts/Items/Clothing/Cloaks.cs index 846314958..73414e780 100644 --- a/Scripts/Items/Clothing/Cloaks.cs +++ b/Scripts/Items/Clothing/Cloaks.cs @@ -220,7 +220,7 @@ namespace Server.Items if ( !base.CanEquip( m ) ) return false; - return !m_IsRewardItem || Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( m, this, new object[]{ Hue, m_LabelNumber } ); + return !m_IsRewardItem || RewardSystem.CheckIsUsableBy( m, this, new object[]{ Hue, m_LabelNumber } ); } [Constructible] diff --git a/Scripts/Items/Construction/Doors/BaseDoor.cs b/Scripts/Items/Construction/Doors/BaseDoor.cs index 7c56f0c6e..94fe0579a 100644 --- a/Scripts/Items/Construction/Doors/BaseDoor.cs +++ b/Scripts/Items/Construction/Doors/BaseDoor.cs @@ -405,7 +405,7 @@ namespace Server.Items from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 502502 ); // That is locked, but you open it with your godly powers. //from.Send( new MessageLocalized( Serial, ItemID, MessageType.Regular, 0x3B2, 3, 502502, "", "" ) ); // That is locked, but you open it with your godly powers. } - else if ( Key.ContainsKey( from.Backpack, this.KeyValue ) ) + else if ( Key.ContainsKey( from.Backpack, KeyValue ) ) { from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 501282 ); // You quickly unlock, open, and relock the door } @@ -416,7 +416,7 @@ namespace Server.Items else { if ( Hue == 0x44E && Map == Map.Malas ) // doom door into healer room in doom - this.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. @@ -445,7 +445,7 @@ namespace Server.Items { Open = !m_Open; - BaseDoor link = this.Link; + BaseDoor link = Link; if ( m_Open && link != null && !link.Open ) link.Open = true; diff --git a/Scripts/Items/Construction/Doors/Doors.cs b/Scripts/Items/Construction/Doors/Doors.cs index 8004df9a1..27680ac44 100644 --- a/Scripts/Items/Construction/Doors/Doors.cs +++ b/Scripts/Items/Construction/Doors/Doors.cs @@ -20,7 +20,7 @@ namespace Server.Items public class IronGateShort : BaseDoor { [Constructible] - public IronGateShort( DoorFacing facing ) : base( 0x84c + (2 * (int)facing), 0x84d + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) ) + public IronGateShort( DoorFacing facing ) : base( 0x84c + (2 * (int)facing), 0x84d + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) ) { } @@ -46,7 +46,7 @@ namespace Server.Items public class IronGate : BaseDoor { [Constructible] - public IronGate( DoorFacing facing ) : base( 0x824 + (2 * (int)facing), 0x825 + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) ) + public IronGate( DoorFacing facing ) : base( 0x824 + (2 * (int)facing), 0x825 + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) ) { } @@ -72,7 +72,7 @@ namespace Server.Items public class LightWoodGate : BaseDoor { [Constructible] - public LightWoodGate( DoorFacing facing ) : base( 0x839 + (2 * (int)facing), 0x83A + (2 * (int)facing), 0xEB, 0xF2, BaseDoor.GetOffset( facing ) ) + public LightWoodGate( DoorFacing facing ) : base( 0x839 + (2 * (int)facing), 0x83A + (2 * (int)facing), 0xEB, 0xF2, GetOffset( facing ) ) { } @@ -98,7 +98,7 @@ namespace Server.Items public class DarkWoodGate : BaseDoor { [Constructible] - public DarkWoodGate( DoorFacing facing ) : base( 0x866 + (2 * (int)facing), 0x867 + (2 * (int)facing), 0xEB, 0xF2, BaseDoor.GetOffset( facing ) ) + public DarkWoodGate( DoorFacing facing ) : base( 0x866 + (2 * (int)facing), 0x867 + (2 * (int)facing), 0xEB, 0xF2, GetOffset( facing ) ) { } @@ -124,7 +124,7 @@ namespace Server.Items public class MetalDoor : BaseDoor { [Constructible] - public MetalDoor( DoorFacing facing ) : base( 0x675 + (2 * (int)facing), 0x676 + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) ) + public MetalDoor( DoorFacing facing ) : base( 0x675 + (2 * (int)facing), 0x676 + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) ) { } @@ -150,7 +150,7 @@ namespace Server.Items public class BarredMetalDoor : BaseDoor { [Constructible] - public BarredMetalDoor( DoorFacing facing ) : base( 0x685 + (2 * (int)facing), 0x686 + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) ) + public BarredMetalDoor( DoorFacing facing ) : base( 0x685 + (2 * (int)facing), 0x686 + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) ) { } @@ -176,7 +176,7 @@ namespace Server.Items public class BarredMetalDoor2 : BaseDoor { [Constructible] - public BarredMetalDoor2( DoorFacing facing ) : base( 0x1FED + (2 * (int)facing), 0x1FEE + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) ) + public BarredMetalDoor2( DoorFacing facing ) : base( 0x1FED + (2 * (int)facing), 0x1FEE + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) ) { } @@ -202,7 +202,7 @@ namespace Server.Items public class RattanDoor : BaseDoor { [Constructible] - public RattanDoor( DoorFacing facing ) : base( 0x695 + (2 * (int)facing), 0x696 + (2 * (int)facing), 0xEB, 0xF2, BaseDoor.GetOffset( facing ) ) + public RattanDoor( DoorFacing facing ) : base( 0x695 + (2 * (int)facing), 0x696 + (2 * (int)facing), 0xEB, 0xF2, GetOffset( facing ) ) { } @@ -228,7 +228,7 @@ namespace Server.Items public class DarkWoodDoor : BaseDoor { [Constructible] - public DarkWoodDoor( DoorFacing facing ) : base( 0x6A5 + (2 * (int)facing), 0x6A6 + (2 * (int)facing), 0xEA, 0xF1, BaseDoor.GetOffset( facing ) ) + public DarkWoodDoor( DoorFacing facing ) : base( 0x6A5 + (2 * (int)facing), 0x6A6 + (2 * (int)facing), 0xEA, 0xF1, GetOffset( facing ) ) { } @@ -254,7 +254,7 @@ namespace Server.Items public class MediumWoodDoor : BaseDoor { [Constructible] - public MediumWoodDoor( DoorFacing facing ) : base( 0x6B5 + (2 * (int)facing), 0x6B6 + (2 * (int)facing), 0xEA, 0xF1, BaseDoor.GetOffset( facing ) ) + public MediumWoodDoor( DoorFacing facing ) : base( 0x6B5 + (2 * (int)facing), 0x6B6 + (2 * (int)facing), 0xEA, 0xF1, GetOffset( facing ) ) { } @@ -280,7 +280,7 @@ namespace Server.Items public class MetalDoor2 : BaseDoor { [Constructible] - public MetalDoor2( DoorFacing facing ) : base( 0x6C5 + (2 * (int)facing), 0x6C6 + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) ) + public MetalDoor2( DoorFacing facing ) : base( 0x6C5 + (2 * (int)facing), 0x6C6 + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) ) { } @@ -306,7 +306,7 @@ namespace Server.Items public class LightWoodDoor : BaseDoor { [Constructible] - public LightWoodDoor( DoorFacing facing ) : base( 0x6D5 + (2 * (int)facing), 0x6D6 + (2 * (int)facing), 0xEA, 0xF1, BaseDoor.GetOffset( facing ) ) + public LightWoodDoor( DoorFacing facing ) : base( 0x6D5 + (2 * (int)facing), 0x6D6 + (2 * (int)facing), 0xEA, 0xF1, GetOffset( facing ) ) { } @@ -332,7 +332,7 @@ namespace Server.Items public class StrongWoodDoor : BaseDoor { [Constructible] - public StrongWoodDoor( DoorFacing facing ) : base( 0x6E5 + (2 * (int)facing), 0x6E6 + (2 * (int)facing), 0xEA, 0xF1, BaseDoor.GetOffset( facing ) ) + public StrongWoodDoor( DoorFacing facing ) : base( 0x6E5 + (2 * (int)facing), 0x6E6 + (2 * (int)facing), 0xEA, 0xF1, GetOffset( facing ) ) { } diff --git a/Scripts/Items/Construction/Doors/HouseDoors.cs b/Scripts/Items/Construction/Doors/HouseDoors.cs index 2f96bac3c..67b7457d2 100644 --- a/Scripts/Items/Construction/Doors/HouseDoors.cs +++ b/Scripts/Items/Construction/Doors/HouseDoors.cs @@ -9,7 +9,7 @@ namespace Server.Items public class MetalHouseDoor : BaseHouseDoor { [Constructible] - public MetalHouseDoor( DoorFacing facing ) : base( facing, 0x675 + (2 * (int)facing), 0x676 + (2 * (int)facing), 0xEC, 0xF3, BaseDoor.GetOffset( facing ) ) + public MetalHouseDoor( DoorFacing facing ) : base( facing, 0x675 + (2 * (int)facing), 0x676 + (2 * (int)facing), 0xEC, 0xF3, GetOffset( facing ) ) { } @@ -35,7 +35,7 @@ namespace Server.Items public class DarkWoodHouseDoor : BaseHouseDoor { [Constructible] - public DarkWoodHouseDoor( DoorFacing facing ) : base( facing, 0x6A5 + (2 * (int)facing), 0x6A6 + (2 * (int)facing), 0xEA, 0xF1, BaseDoor.GetOffset( facing ) ) + public DarkWoodHouseDoor( DoorFacing facing ) : base( facing, 0x6A5 + (2 * (int)facing), 0x6A6 + (2 * (int)facing), 0xEA, 0xF1, GetOffset( facing ) ) { } @@ -67,7 +67,7 @@ namespace Server.Items [Constructible] public GenericHouseDoor( DoorFacing facing, int baseItemID, int openedSound, int closedSound, bool autoAdjust ) - : base( facing, baseItemID + (autoAdjust ? (2 * (int)facing) : 0), baseItemID + 1 + (autoAdjust ? (2 * (int)facing) : 0), openedSound, closedSound, BaseDoor.GetOffset( facing ) ) + : base( facing, baseItemID + (autoAdjust ? (2 * (int)facing) : 0), baseItemID + 1 + (autoAdjust ? (2 * (int)facing) : 0), openedSound, closedSound, GetOffset( facing ) ) { } @@ -128,7 +128,7 @@ namespace Server.Items if ( Open ) loc = new Point3D( X - Offset.X, Y - Offset.Y, Z - Offset.Z ); else - loc = this.Location; + loc = Location; return BaseHouse.FindHouseAt( loc, Map, 20 ); } diff --git a/Scripts/Items/Construction/Doors/SecretDoors.cs b/Scripts/Items/Construction/Doors/SecretDoors.cs index 271560d53..c4515e36a 100644 --- a/Scripts/Items/Construction/Doors/SecretDoors.cs +++ b/Scripts/Items/Construction/Doors/SecretDoors.cs @@ -3,7 +3,7 @@ namespace Server.Items public class SecretStoneDoor1 : BaseDoor { [Constructible] - public SecretStoneDoor1( DoorFacing facing ) : base( 0xE8 + (2 * (int)facing), 0xE9 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) ) + public SecretStoneDoor1( DoorFacing facing ) : base( 0xE8 + (2 * (int)facing), 0xE9 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) ) { } @@ -29,7 +29,7 @@ namespace Server.Items public class SecretDungeonDoor : BaseDoor { [Constructible] - public SecretDungeonDoor( DoorFacing facing ) : base( 0x314 + (2 * (int)facing), 0x315 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) ) + public SecretDungeonDoor( DoorFacing facing ) : base( 0x314 + (2 * (int)facing), 0x315 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) ) { } @@ -55,7 +55,7 @@ namespace Server.Items public class SecretStoneDoor2 : BaseDoor { [Constructible] - public SecretStoneDoor2( DoorFacing facing ) : base( 0x324 + (2 * (int)facing), 0x325 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) ) + public SecretStoneDoor2( DoorFacing facing ) : base( 0x324 + (2 * (int)facing), 0x325 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) ) { } @@ -81,7 +81,7 @@ namespace Server.Items public class SecretWoodenDoor : BaseDoor { [Constructible] - public SecretWoodenDoor( DoorFacing facing ) : base( 0x334 + (2 * (int)facing), 0x335 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) ) + public SecretWoodenDoor( DoorFacing facing ) : base( 0x334 + (2 * (int)facing), 0x335 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) ) { } @@ -107,7 +107,7 @@ namespace Server.Items public class SecretLightWoodDoor : BaseDoor { [Constructible] - public SecretLightWoodDoor( DoorFacing facing ) : base( 0x344 + (2 * (int)facing), 0x345 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) ) + public SecretLightWoodDoor( DoorFacing facing ) : base( 0x344 + (2 * (int)facing), 0x345 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) ) { } @@ -133,7 +133,7 @@ namespace Server.Items public class SecretStoneDoor3 : BaseDoor { [Constructible] - public SecretStoneDoor3( DoorFacing facing ) : base( 0x354 + (2 * (int)facing), 0x355 + (2 * (int)facing), 0xED, 0xF4, BaseDoor.GetOffset( facing ) ) + public SecretStoneDoor3( DoorFacing facing ) : base( 0x354 + (2 * (int)facing), 0x355 + (2 * (int)facing), 0xED, 0xF4, GetOffset( facing ) ) { } diff --git a/Scripts/Items/Containers/BaseTreasureChest.cs b/Scripts/Items/Containers/BaseTreasureChest.cs index 34f021510..10f68e926 100644 --- a/Scripts/Items/Containers/BaseTreasureChest.cs +++ b/Scripts/Items/Containers/BaseTreasureChest.cs @@ -67,7 +67,7 @@ namespace Server.Items { get { - if ( this.Locked ) + if ( Locked ) return "a locked treasure chest"; return "a treasure chest"; @@ -103,27 +103,27 @@ namespace Server.Items switch( m_TreasureLevel ) { case TreasureLevel.Level1: - this.RequiredSkill = this.LockLevel = 5; + RequiredSkill = LockLevel = 5; break; case TreasureLevel.Level2: - this.RequiredSkill = this.LockLevel = 20; + RequiredSkill = LockLevel = 20; break; case TreasureLevel.Level3: - this.RequiredSkill = this.LockLevel = 50; + RequiredSkill = LockLevel = 50; break; case TreasureLevel.Level4: - this.RequiredSkill = this.LockLevel = 70; + RequiredSkill = LockLevel = 70; break; case TreasureLevel.Level5: - this.RequiredSkill = this.LockLevel = 90; + RequiredSkill = LockLevel = 90; break; case TreasureLevel.Level6: - this.RequiredSkill = this.LockLevel = 100; + RequiredSkill = LockLevel = 100; break; } } diff --git a/Scripts/Items/Containers/Container.cs b/Scripts/Items/Containers/Container.cs index e735cdc53..3a21dfbdf 100644 --- a/Scripts/Items/Containers/Container.cs +++ b/Scripts/Items/Containers/Container.cs @@ -33,7 +33,7 @@ namespace Server.Items public override bool CheckHold( Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight ) { - if ( this.IsSecure && !BaseHouse.CheckHold( m, this, item, message, checkItems, plusItems, plusWeight ) ) + if ( IsSecure && !BaseHouse.CheckHold( m, this, item, message, checkItems, plusItems, plusWeight ) ) return false; return base.CheckHold( m, item, message, checkItems, plusItems, plusWeight ); @@ -72,7 +72,7 @@ namespace Server.Items return false; } - List list = this.Items; + List list = Items; for ( int i = 0; i < list.Count; ++i ) { @@ -124,7 +124,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( from.AccessLevel > AccessLevel.Player || from.InRange( this.GetWorldLocation(), 2 ) || this.RootParent is PlayerVendor ) + if ( from.AccessLevel > AccessLevel.Player || from.InRange( GetWorldLocation(), 2 ) || RootParent is PlayerVendor ) Open( from ); else from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that. @@ -173,7 +173,7 @@ namespace Server.Items public override void OnItemRemoved( Item item ) { if ( Items.Count == 0 ) - this.Delete(); + Delete(); base.OnItemRemoved( item ); } diff --git a/Scripts/Items/Containers/FillableContainers.cs b/Scripts/Items/Containers/FillableContainers.cs index 32612ef17..3df1e35fc 100644 --- a/Scripts/Items/Containers/FillableContainers.cs +++ b/Scripts/Items/Containers/FillableContainers.cs @@ -73,7 +73,7 @@ namespace Server.Items if ( m_Content != null ) return; - m_Content = FillableContent.Acquire( this.GetWorldLocation(), this.Map ); + m_Content = FillableContent.Acquire( GetWorldLocation(), Map ); if ( m_Content != null ) Respawn(); @@ -99,7 +99,7 @@ namespace Server.Items { int count = 0; - foreach( Item item in this.Items ) + foreach( Item item in Items ) { count += item.Amount; } @@ -115,7 +115,7 @@ namespace Server.Items { if ( m_RespawnTimer == null ) { - int mins = Utility.RandomMinMax( this.MinRespawnMinutes, this.MaxRespawnMinutes ); + int mins = Utility.RandomMinMax( MinRespawnMinutes, MaxRespawnMinutes ); TimeSpan delay = TimeSpan.FromMinutes( mins ); m_NextRespawnTime = DateTime.UtcNow + delay; @@ -198,7 +198,7 @@ namespace Server.Items if ( item != null ) { - List list = this.Items; + List list = Items; for( int j = 0; j < list.Count; ++j ) { @@ -734,7 +734,7 @@ namespace Server.Items 1, new[] { - typeof( Mobiles.Alchemist ) + typeof( Alchemist ) }, new[] { diff --git a/Scripts/Items/Containers/LockableContainer.cs b/Scripts/Items/Containers/LockableContainer.cs index d0ba14985..b67877399 100644 --- a/Scripts/Items/Containers/LockableContainer.cs +++ b/Scripts/Items/Containers/LockableContainer.cs @@ -288,9 +288,9 @@ namespace Server.Items Locked = false; Picker = from; - if ( this.TrapOnLockpick && ExecuteTrap( from ) ) + if ( TrapOnLockpick && ExecuteTrap( from ) ) { - this.TrapOnLockpick = false; + TrapOnLockpick = false; } } diff --git a/Scripts/Items/Containers/SalvageBag.cs b/Scripts/Items/Containers/SalvageBag.cs index f5cf365f6..c2ea11acd 100644 --- a/Scripts/Items/Containers/SalvageBag.cs +++ b/Scripts/Items/Containers/SalvageBag.cs @@ -237,7 +237,7 @@ namespace Server.Items from.SendLocalizedMessage( 1079974, String.Format( "{0}\t{1}", salvaged, salvaged + notSalvaged ) ); // Salvaged: ~1_COUNT~/~2_NUM~ tailored items - foreach (Item i in this.FindItemsByType(typeof(Item), true)) + foreach (Item i in FindItemsByType(typeof(Item), true)) { if ( ( i is Leather ) || ( i is Cloth ) || ( i is SpinedLeather ) || ( i is HornedLeather ) || ( i is BarbedLeather ) || ( i is Bandage ) || ( i is Bone ) ) { diff --git a/Scripts/Items/Containers/Strongbox.cs b/Scripts/Items/Containers/Strongbox.cs index d248d0b29..ede73a21b 100644 --- a/Scripts/Items/Containers/Strongbox.cs +++ b/Scripts/Items/Containers/Strongbox.cs @@ -151,7 +151,7 @@ namespace Server.Items metalBox.AddItem( subItem ); } - this.Delete(); + Delete(); return metalBox; } diff --git a/Scripts/Items/Containers/TrappableContainer.cs b/Scripts/Items/Containers/TrappableContainer.cs index c798abe8b..02d529025 100644 --- a/Scripts/Items/Containers/TrappableContainer.cs +++ b/Scripts/Items/Containers/TrappableContainer.cs @@ -68,8 +68,8 @@ namespace Server.Items { if ( m_TrapType != TrapType.None ) { - Point3D loc = this.GetWorldLocation(); - Map facet = this.Map; + Point3D loc = GetWorldLocation(); + Map facet = Map; if ( from.AccessLevel >= AccessLevel.GameMaster ) { @@ -189,7 +189,7 @@ namespace Server.Items Effects.SendLocationParticles( EffectItem.Create( Location, Map, EffectItem.DefaultDuration ), 0x376A, 9, 32, 5022 ); Effects.PlaySound( Location, Map, 0x1F5 ); - if ( this.TrapOnOpen ) + if ( TrapOnOpen ) { ExecuteTrap( from ); } @@ -197,7 +197,7 @@ namespace Server.Items public override void Open( Mobile from ) { - if ( !this.TrapOnOpen || !ExecuteTrap( from ) ) + if ( !TrapOnOpen || !ExecuteTrap( from ) ) base.Open( from ); } diff --git a/Scripts/Items/Containers/TreasureMapChest.cs b/Scripts/Items/Containers/TreasureMapChest.cs index a19b4cbff..88ad814be 100644 --- a/Scripts/Items/Containers/TreasureMapChest.cs +++ b/Scripts/Items/Containers/TreasureMapChest.cs @@ -284,12 +284,12 @@ namespace Server.Items public override bool CheckLocked( Mobile from ) { - if ( !this.Locked ) + if ( !Locked ) return false; - if ( this.Level == 0 && from.AccessLevel < AccessLevel.GameMaster ) + if ( Level == 0 && from.AccessLevel < AccessLevel.GameMaster ) { - foreach ( Mobile m in this.Guardians ) + foreach ( Mobile m in Guardians ) { if ( m.Alive ) { @@ -322,7 +322,7 @@ namespace Server.Items if ( p != null && p.Contains( m ) ) return true; - Map map = this.Map; + Map map = Map; if ( map != null && (map.Rules & MapRules.HarmfulRestrictions) == 0 ) { @@ -475,7 +475,7 @@ namespace Server.Items return; from.SendLocalizedMessage( 1048124, "", 0x8A5 ); // The old, rusted chest crumbles when you hit it. - this.Delete(); + Delete(); } private class RemoveGump : Gump diff --git a/Scripts/Items/Decoration Artifacts/BaseDecorationArtifact.cs b/Scripts/Items/Decoration Artifacts/BaseDecorationArtifact.cs index bdaa189b9..bea3ce605 100644 --- a/Scripts/Items/Decoration Artifacts/BaseDecorationArtifact.cs +++ b/Scripts/Items/Decoration Artifacts/BaseDecorationArtifact.cs @@ -15,7 +15,7 @@ namespace Server.Items { base.GetProperties( list ); - list.Add( 1061078, this.ArtifactRarity.ToString() ); // artifact rarity ~1_val~ + list.Add( 1061078, ArtifactRarity.ToString() ); // artifact rarity ~1_val~ } public BaseDecorationArtifact( Serial serial ) : base( serial ) @@ -52,7 +52,7 @@ namespace Server.Items { base.AddNameProperties( list ); - list.Add( 1061078, this.ArtifactRarity.ToString() ); // artifact rarity ~1_val~ + list.Add( 1061078, ArtifactRarity.ToString() ); // artifact rarity ~1_val~ } public BaseDecorationContainerArtifact( Serial serial ) : base( serial ) diff --git a/Scripts/Items/Decoration Artifacts/SEDecorationArtifacts.cs b/Scripts/Items/Decoration Artifacts/SEDecorationArtifacts.cs index e3b31eb16..41dca8643 100644 --- a/Scripts/Items/Decoration Artifacts/SEDecorationArtifacts.cs +++ b/Scripts/Items/Decoration Artifacts/SEDecorationArtifacts.cs @@ -1418,28 +1418,28 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public bool IsOn { - get => this.ItemID == 0x24BF; - set => this.ItemID = value ? 0x24BF : 0x24C0; + get => ItemID == 0x24BF; + set => ItemID = value ? 0x24BF : 0x24C0; } [Constructible] public TowerLanternArtifact() : base( 0x24C0 ) { - this.Light = LightType.Circle225; + Light = LightType.Circle225; } public override void OnDoubleClick( Mobile from ) { - if ( from.InRange( this.GetWorldLocation(), 2 ) ) + if ( from.InRange( GetWorldLocation(), 2 ) ) { - if ( this.IsOn ) + if ( IsOn ) { - this.IsOn = false; + IsOn = false; from.PlaySound( 0x3BE ); } else { - this.IsOn = true; + IsOn = true; from.PlaySound( 0x47 ); } } @@ -1467,7 +1467,7 @@ namespace Server.Items int version = reader.ReadEncodedInt(); if ( version == 0 ) - this.Light = LightType.Circle225; + Light = LightType.Circle225; } } #endregion diff --git a/Scripts/Items/Decoration Artifacts/StealableArtifactsSpawner.cs b/Scripts/Items/Decoration Artifacts/StealableArtifactsSpawner.cs index ebf919632..9f73fcf24 100644 --- a/Scripts/Items/Decoration Artifacts/StealableArtifactsSpawner.cs +++ b/Scripts/Items/Decoration Artifacts/StealableArtifactsSpawner.cs @@ -44,7 +44,7 @@ namespace Server.Items item.Hue = m_Hue; item.Movable = false; - item.MoveToWorld( this.Location, this.Map ); + item.MoveToWorld( Location, Map ); return item; } @@ -263,8 +263,8 @@ namespace Server.Items { if ( m_Item != null && value == null ) { - int delay = Utility.RandomMinMax( this.Entry.MinDelay, this.Entry.MaxDelay ); - this.NextRespawn = DateTime.UtcNow + TimeSpan.FromMinutes( delay ); + int delay = Utility.RandomMinMax( Entry.MinDelay, Entry.MaxDelay ); + NextRespawn = DateTime.UtcNow + TimeSpan.FromMinutes( delay ); } if ( Instance != null ) @@ -299,12 +299,12 @@ namespace Server.Items public void CheckRespawn() { - if ( this.Item != null && ( this.Item.Deleted || this.Item.Movable || this.Item.Parent != null ) ) - this.Item = null; + if ( Item != null && ( Item.Deleted || Item.Movable || Item.Parent != null ) ) + Item = null; - if ( this.Item == null && DateTime.UtcNow >= this.NextRespawn ) + if ( Item == null && DateTime.UtcNow >= NextRespawn ) { - this.Item = this.Entry.CreateInstance(); + Item = Entry.CreateInstance(); } } } diff --git a/Scripts/Items/Deeds/BarkeepContract.cs b/Scripts/Items/Deeds/BarkeepContract.cs index d237595a6..cebbb5494 100644 --- a/Scripts/Items/Deeds/BarkeepContract.cs +++ b/Scripts/Items/Deeds/BarkeepContract.cs @@ -48,7 +48,7 @@ namespace Server.Items v.Direction = from.Direction & Direction.Mask; v.MoveToWorld( from.Location, from.Map ); - this.Delete(); + Delete(); } else { @@ -82,7 +82,7 @@ namespace Server.Items v.Direction = from.Direction & Direction.Mask; v.MoveToWorld( from.Location, from.Map ); - this.Delete(); + Delete(); } } } diff --git a/Scripts/Items/Deeds/DragonBardingDeed.cs b/Scripts/Items/Deeds/DragonBardingDeed.cs index 547cb29ab..c5778ffd4 100644 --- a/Scripts/Items/Deeds/DragonBardingDeed.cs +++ b/Scripts/Items/Deeds/DragonBardingDeed.cs @@ -70,14 +70,14 @@ namespace Server.Items } else { - pet.BardingExceptional = this.Exceptional; - pet.BardingCrafter = this.Crafter; + pet.BardingExceptional = Exceptional; + pet.BardingCrafter = Crafter; pet.BardingHP = pet.BardingMaxHP; - pet.BardingResource = this.Resource; + pet.BardingResource = Resource; pet.HasBarding = true; - pet.Hue = this.Hue; + pet.Hue = Hue; - this.Delete(); + Delete(); from.SendLocalizedMessage( 1053027 ); // You place the barding on your swamp dragon. Use a bladed item on your dragon to remove the armor. } diff --git a/Scripts/Items/Deeds/HolidayTreeDeed.cs b/Scripts/Items/Deeds/HolidayTreeDeed.cs index ec82947ea..72612b549 100644 --- a/Scripts/Items/Deeds/HolidayTreeDeed.cs +++ b/Scripts/Items/Deeds/HolidayTreeDeed.cs @@ -43,7 +43,7 @@ namespace Server.Items if ( from.AccessLevel >= AccessLevel.GameMaster ) return true; - if ( !from.InRange( this.GetWorldLocation(), 1 ) ) + if ( !from.InRange( GetWorldLocation(), 1 ) ) { from.SendLocalizedMessage( 500446 ); // That is too far away. return false; @@ -101,7 +101,7 @@ namespace Server.Items public void EndPlace( Mobile from, HolidayTreeType type, Point3D loc ) { - this.Delete(); + Delete(); HolidayTree tree = new HolidayTree( from, type, loc ); BaseHouse.FindHouseAt( tree )?.Addons.Add( tree ); } diff --git a/Scripts/Items/Deeds/NameChangeDeed.cs b/Scripts/Items/Deeds/NameChangeDeed.cs index f8126f4b7..a03ec4a90 100644 --- a/Scripts/Items/Deeds/NameChangeDeed.cs +++ b/Scripts/Items/Deeds/NameChangeDeed.cs @@ -35,7 +35,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( this.RootParent == from ) + if ( RootParent == from ) { from.CloseGump( typeof( NameChangeDeedGump ) ); from.SendGump( new NameChangeDeedGump( this ) ); diff --git a/Scripts/Items/Deeds/VendorRentalContract.cs b/Scripts/Items/Deeds/VendorRentalContract.cs index 8ef1a997b..42bc7e39d 100644 --- a/Scripts/Items/Deeds/VendorRentalContract.cs +++ b/Scripts/Items/Deeds/VendorRentalContract.cs @@ -103,7 +103,7 @@ namespace Server.Items public bool IsUsableBy( Mobile from, bool byLandlord, bool byBackpack, bool noOfferee, bool sendMessage ) { - if ( this.Deleted || !from.CheckAlive( sendMessage ) ) + if ( Deleted || !from.CheckAlive( sendMessage ) ) return false; if ( noOfferee && Offeree != null ) @@ -119,7 +119,7 @@ namespace Server.Items if ( byLandlord && IsLandlord( from ) ) { - if ( from.Map != this.Map || !from.InRange( this, 5 ) ) + if ( from.Map != Map || !from.InRange( this, 5 ) ) { if ( sendMessage ) from.SendLocalizedMessage( 501853 ); // Target is too far away. diff --git a/Scripts/Items/Facial/Beard.cs b/Scripts/Items/Facial/Beard.cs index d820a81fb..7657e5b69 100644 --- a/Scripts/Items/Facial/Beard.cs +++ b/Scripts/Items/Facial/Beard.cs @@ -43,8 +43,8 @@ namespace Server.Items { //Dupe( Amount ); - parent.FacialHairItemID = this.ItemID; - parent.FacialHairHue = this.Hue; + parent.FacialHairItemID = ItemID; + parent.FacialHairHue = Hue; return DeathMoveResult.MoveToCorpse; } diff --git a/Scripts/Items/Facial/Hair.cs b/Scripts/Items/Facial/Hair.cs index 77cc53f30..7e98d9b61 100644 --- a/Scripts/Items/Facial/Hair.cs +++ b/Scripts/Items/Facial/Hair.cs @@ -91,8 +91,8 @@ namespace Server.Items { // Dupe( Amount ); - parent.HairItemID = this.ItemID; - parent.HairHue = this.Hue; + parent.HairItemID = ItemID; + parent.HairHue = Hue; return DeathMoveResult.MoveToCorpse; } diff --git a/Scripts/Items/Farming/FarmableCrop.cs b/Scripts/Items/Farming/FarmableCrop.cs index 436ce1bec..8a87bcd42 100644 --- a/Scripts/Items/Farming/FarmableCrop.cs +++ b/Scripts/Items/Farming/FarmableCrop.cs @@ -17,8 +17,8 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - Map map = this.Map; - Point3D loc = this.Location; + Map map = Map; + Point3D loc = Location; if ( Parent != null || Movable || IsLockedDown || IsSecure || map == null || map == Map.Internal ) return; @@ -47,12 +47,12 @@ namespace Server.Items public void Unlink() { - ISpawner se = this.Spawner; + ISpawner se = Spawner; if ( se != null ) { - this.Spawner.Remove( this ); - this.Spawner = null; + Spawner.Remove( this ); + Spawner = null; } } diff --git a/Scripts/Items/Food/Beverage.cs b/Scripts/Items/Food/Beverage.cs index 2e54ca2fc..3fbb9f6a8 100644 --- a/Scripts/Items/Food/Beverage.cs +++ b/Scripts/Items/Food/Beverage.cs @@ -489,9 +489,9 @@ namespace Server.Items public override void Deserialize( GenericReader reader ) { if ( CheckType( "PitcherWater" ) || CheckType( "GlassPitcher" ) ) - base.InternalDeserialize( reader, false ); + InternalDeserialize( reader, false ); else - base.InternalDeserialize( reader, true ); + InternalDeserialize( reader, true ); int version = reader.ReadInt(); @@ -711,18 +711,18 @@ namespace Server.Items if ( bev.IsEmpty || !bev.ValidateUse( from, true ) ) return; - this.Content = bev.Content; - this.Poison = bev.Poison; - this.Poisoner = bev.Poisoner; + Content = bev.Content; + Poison = bev.Poison; + Poisoner = bev.Poisoner; - if ( bev.Quantity > this.MaxQuantity ) + if ( bev.Quantity > MaxQuantity ) { - this.Quantity = this.MaxQuantity; - bev.Quantity -= this.MaxQuantity; + Quantity = MaxQuantity; + bev.Quantity -= MaxQuantity; } else { - this.Quantity += bev.Quantity; + Quantity += bev.Quantity; bev.Quantity = 0; } } @@ -758,18 +758,18 @@ namespace Server.Items return; } - this.Content = BeverageType.Water; - this.Poison = null; - this.Poisoner = null; + Content = BeverageType.Water; + Poison = null; + Poisoner = null; - if ( src.Quantity > this.MaxQuantity ) + if ( src.Quantity > MaxQuantity ) { - this.Quantity = this.MaxQuantity; - src.Quantity -= this.MaxQuantity; + Quantity = MaxQuantity; + src.Quantity -= MaxQuantity; } else { - this.Quantity += src.Quantity; + Quantity += src.Quantity; src.Quantity = 0; } @@ -913,7 +913,7 @@ namespace Server.Items } // *hic* - m_Drunk.PublicOverheadMessage( Network.MessageType.Regular, 0x3B2, 500849 ); + m_Drunk.PublicOverheadMessage( MessageType.Regular, 0x3B2, 500849 ); } if ( m_Drunk.BAC <= 0 ) @@ -939,7 +939,7 @@ namespace Server.Items if ( !bev.ValidateUse( from, true ) ) return; - if ( bev.IsFull && bev.Content == this.Content ) + if ( bev.IsFull && bev.Content == Content ) { from.SendLocalizedMessage( 500848 ); // Couldn't pour it there. It was already full. } @@ -949,19 +949,19 @@ namespace Server.Items } else { - bev.Content = this.Content; - bev.Poison = this.Poison; - bev.Poisoner = this.Poisoner; + bev.Content = Content; + bev.Poison = Poison; + bev.Poisoner = Poisoner; - if ( this.Quantity > bev.MaxQuantity ) + if ( Quantity > bev.MaxQuantity ) { bev.Quantity = bev.MaxQuantity; - this.Quantity -= bev.MaxQuantity; + Quantity -= bev.MaxQuantity; } else { - bev.Quantity += this.Quantity; - this.Quantity = 0; + bev.Quantity += Quantity; + Quantity = 0; } from.PlaySound( 0x4E ); @@ -976,7 +976,7 @@ namespace Server.Items { int bac = 0; - switch( this.Content ) + switch( Content ) { case BeverageType.Ale: bac = 1; break; case BeverageType.Wine: bac = 2; break; @@ -1028,7 +1028,7 @@ namespace Server.Items } else if ( targ is AddonComponent component && ( component.Addon is WaterVatEast || component.Addon is WaterVatSouth ) && - this.Content == BeverageType.Water ) + Content == BeverageType.Water ) { if ( from is PlayerMobile player ) { diff --git a/Scripts/Items/Food/BeverageEmpty.cs b/Scripts/Items/Food/BeverageEmpty.cs index 90a8269cc..a14bf4b8d 100644 --- a/Scripts/Items/Food/BeverageEmpty.cs +++ b/Scripts/Items/Food/BeverageEmpty.cs @@ -6,7 +6,7 @@ namespace Server.Items [Constructible] public Glass() : base( 0x1f81 ) { - this.Weight = 0.1; + Weight = 0.1; } public Glass( Serial serial ) : base( serial ) @@ -33,7 +33,7 @@ namespace Server.Items [Constructible] public GlassBottle() : base( 0xe2b ) { - this.Weight = 0.3; + Weight = 0.3; } public GlassBottle( Serial serial ) : base( serial ) diff --git a/Scripts/Items/Food/CookableFood.cs b/Scripts/Items/Food/CookableFood.cs index 268d45b05..e3def4abd 100644 --- a/Scripts/Items/Food/CookableFood.cs +++ b/Scripts/Items/Food/CookableFood.cs @@ -104,7 +104,7 @@ namespace Server.Items { if ( m_Item.Deleted ) return; - if ( CookableFood.IsHeatSource( targeted ) ) + if ( IsHeatSource( targeted ) ) { if ( from.BeginAction( typeof( CookableFood ) ) ) { diff --git a/Scripts/Items/Food/Cooking.cs b/Scripts/Items/Food/Cooking.cs index 4f9fc7d89..9bf0b8377 100644 --- a/Scripts/Items/Food/Cooking.cs +++ b/Scripts/Items/Food/Cooking.cs @@ -623,8 +623,8 @@ namespace Server.Items { int needs = mill.MaxFlour - mill.CurFlour; - if ( needs > this.Amount ) - needs = this.Amount; + if ( needs > Amount ) + needs = Amount; mill.CurFlour += needs; Consume( needs ); diff --git a/Scripts/Items/Food/Food.cs b/Scripts/Items/Food/Food.cs index 78600043e..0d6f6fcae 100644 --- a/Scripts/Items/Food/Food.cs +++ b/Scripts/Items/Food/Food.cs @@ -50,7 +50,7 @@ namespace Server.Items base.GetContextMenuEntries( from, list ); if ( from.Alive ) - list.Add( new ContextMenus.EatEntry( from, this ) ); + list.Add( new EatEntry( from, this ) ); } public override void OnDoubleClick( Mobile from ) @@ -58,7 +58,7 @@ namespace Server.Items if ( !Movable ) return; - if ( from.InRange( this.GetWorldLocation(), 1 ) ) + if ( from.InRange( GetWorldLocation(), 1 ) ) { Eat( from ); } @@ -189,8 +189,8 @@ namespace Server.Items [Constructible] public BreadLoaf( int amount ) : base( amount, 0x103B ) { - this.Weight = 1.0; - this.FillFactor = 3; + Weight = 1.0; + FillFactor = 3; } public BreadLoaf( Serial serial ) : base( serial ) @@ -222,8 +222,8 @@ namespace Server.Items [Constructible] public Bacon( int amount ) : base( amount, 0x979 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Bacon( Serial serial ) : base( serial ) @@ -255,8 +255,8 @@ namespace Server.Items [Constructible] public SlabOfBacon( int amount ) : base( amount, 0x976 ) { - this.Weight = 1.0; - this.FillFactor = 3; + Weight = 1.0; + FillFactor = 3; } public SlabOfBacon( Serial serial ) : base( serial ) @@ -290,7 +290,7 @@ namespace Server.Items [Constructible] public FishSteak( int amount ) : base( amount, 0x97B ) { - this.FillFactor = 3; + FillFactor = 3; } public FishSteak( Serial serial ) : base( serial ) @@ -324,7 +324,7 @@ namespace Server.Items [Constructible] public CheeseWheel( int amount ) : base( amount, 0x97E ) { - this.FillFactor = 3; + FillFactor = 3; } public CheeseWheel( Serial serial ) : base( serial ) @@ -358,7 +358,7 @@ namespace Server.Items [Constructible] public CheeseWedge( int amount ) : base( amount, 0x97D ) { - this.FillFactor = 3; + FillFactor = 3; } public CheeseWedge( Serial serial ) : base( serial ) @@ -392,7 +392,7 @@ namespace Server.Items [Constructible] public CheeseSlice( int amount ) : base( amount, 0x97C ) { - this.FillFactor = 1; + FillFactor = 1; } public CheeseSlice( Serial serial ) : base( serial ) @@ -424,8 +424,8 @@ namespace Server.Items [Constructible] public FrenchBread( int amount ) : base( amount, 0x98C ) { - this.Weight = 2.0; - this.FillFactor = 3; + Weight = 2.0; + FillFactor = 3; } public FrenchBread( Serial serial ) : base( serial ) @@ -458,8 +458,8 @@ namespace Server.Items [Constructible] public FriedEggs( int amount ) : base( amount, 0x9B6 ) { - this.Weight = 1.0; - this.FillFactor = 4; + Weight = 1.0; + FillFactor = 4; } public FriedEggs( Serial serial ) : base( serial ) @@ -491,8 +491,8 @@ namespace Server.Items [Constructible] public CookedBird( int amount ) : base( amount, 0x9B7 ) { - this.Weight = 1.0; - this.FillFactor = 5; + Weight = 1.0; + FillFactor = 5; } public CookedBird( Serial serial ) : base( serial ) @@ -524,8 +524,8 @@ namespace Server.Items [Constructible] public RoastPig( int amount ) : base( amount, 0x9BB ) { - this.Weight = 45.0; - this.FillFactor = 20; + Weight = 45.0; + FillFactor = 20; } public RoastPig( Serial serial ) : base( serial ) @@ -557,8 +557,8 @@ namespace Server.Items [Constructible] public Sausage( int amount ) : base( amount, 0x9C0 ) { - this.Weight = 1.0; - this.FillFactor = 4; + Weight = 1.0; + FillFactor = 4; } public Sausage( Serial serial ) : base( serial ) @@ -590,8 +590,8 @@ namespace Server.Items [Constructible] public Ham( int amount ) : base( amount, 0x9C9 ) { - this.Weight = 1.0; - this.FillFactor = 5; + Weight = 1.0; + FillFactor = 5; } public Ham( Serial serial ) : base( serial ) @@ -619,8 +619,8 @@ namespace Server.Items public Cake() : base( 0x9E9 ) { Stackable = false; - this.Weight = 1.0; - this.FillFactor = 10; + Weight = 1.0; + FillFactor = 10; } public Cake( Serial serial ) : base( serial ) @@ -652,8 +652,8 @@ namespace Server.Items [Constructible] public Ribs( int amount ) : base( amount, 0x9F2 ) { - this.Weight = 1.0; - this.FillFactor = 5; + Weight = 1.0; + FillFactor = 5; } public Ribs( Serial serial ) : base( serial ) @@ -681,8 +681,8 @@ namespace Server.Items public Cookies() : base( 0x160b ) { Stackable = Core.ML; - this.Weight = 1.0; - this.FillFactor = 4; + Weight = 1.0; + FillFactor = 4; } public Cookies( Serial serial ) : base( serial ) @@ -710,8 +710,8 @@ namespace Server.Items public Muffins() : base( 0x9eb ) { Stackable = false; - this.Weight = 1.0; - this.FillFactor = 4; + Weight = 1.0; + FillFactor = 4; } public Muffins( Serial serial ) : base( serial ) @@ -742,8 +742,8 @@ namespace Server.Items public CheesePizza() : base( 0x1040 ) { Stackable = false; - this.Weight = 1.0; - this.FillFactor = 6; + Weight = 1.0; + FillFactor = 6; } public CheesePizza( Serial serial ) : base( serial ) @@ -773,8 +773,8 @@ namespace Server.Items public SausagePizza() : base( 0x1040 ) { Stackable = false; - this.Weight = 1.0; - this.FillFactor = 6; + Weight = 1.0; + FillFactor = 6; } public SausagePizza( Serial serial ) : base( serial ) @@ -835,8 +835,8 @@ namespace Server.Items public FruitPie() : base( 0x1041 ) { Stackable = false; - this.Weight = 1.0; - this.FillFactor = 5; + Weight = 1.0; + FillFactor = 5; } public FruitPie( Serial serial ) : base( serial ) @@ -866,8 +866,8 @@ namespace Server.Items public MeatPie() : base( 0x1041 ) { Stackable = false; - this.Weight = 1.0; - this.FillFactor = 5; + Weight = 1.0; + FillFactor = 5; } public MeatPie( Serial serial ) : base( serial ) @@ -897,8 +897,8 @@ namespace Server.Items public PumpkinPie() : base( 0x1041 ) { Stackable = false; - this.Weight = 1.0; - this.FillFactor = 5; + Weight = 1.0; + FillFactor = 5; } public PumpkinPie( Serial serial ) : base( serial ) @@ -928,8 +928,8 @@ namespace Server.Items public ApplePie() : base( 0x1041 ) { Stackable = false; - this.Weight = 1.0; - this.FillFactor = 5; + Weight = 1.0; + FillFactor = 5; } public ApplePie( Serial serial ) : base( serial ) @@ -959,8 +959,8 @@ namespace Server.Items public PeachCobbler() : base( 0x1041 ) { Stackable = false; - this.Weight = 1.0; - this.FillFactor = 5; + Weight = 1.0; + FillFactor = 5; } public PeachCobbler( Serial serial ) : base( serial ) @@ -990,8 +990,8 @@ namespace Server.Items public Quiche() : base( 0x1041 ) { Stackable = Core.ML; - this.Weight = 1.0; - this.FillFactor = 5; + Weight = 1.0; + FillFactor = 5; } public Quiche( Serial serial ) : base( serial ) @@ -1023,8 +1023,8 @@ namespace Server.Items [Constructible] public LambLeg( int amount ) : base( amount, 0x160a ) { - this.Weight = 2.0; - this.FillFactor = 5; + Weight = 2.0; + FillFactor = 5; } public LambLeg( Serial serial ) : base( serial ) @@ -1056,8 +1056,8 @@ namespace Server.Items [Constructible] public ChickenLeg( int amount ) : base( amount, 0x1608 ) { - this.Weight = 1.0; - this.FillFactor = 4; + Weight = 1.0; + FillFactor = 4; } public ChickenLeg( Serial serial ) : base( serial ) @@ -1090,8 +1090,8 @@ namespace Server.Items [Constructible] public HoneydewMelon( int amount ) : base( amount, 0xC74 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public HoneydewMelon( Serial serial ) : base( serial ) @@ -1124,8 +1124,8 @@ namespace Server.Items [Constructible] public YellowGourd( int amount ) : base( amount, 0xC64 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public YellowGourd( Serial serial ) : base( serial ) @@ -1158,8 +1158,8 @@ namespace Server.Items [Constructible] public GreenGourd( int amount ) : base( amount, 0xC66 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public GreenGourd( Serial serial ) : base( serial ) @@ -1192,8 +1192,8 @@ namespace Server.Items [Constructible] public EarOfCorn( int amount ) : base( amount, 0xC81 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public EarOfCorn( Serial serial ) : base( serial ) @@ -1225,8 +1225,8 @@ namespace Server.Items [Constructible] public Turnip( int amount ) : base( amount, 0xD3A ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Turnip( Serial serial ) : base( serial ) @@ -1253,7 +1253,7 @@ namespace Server.Items [Constructible] public SheafOfHay() : base( 0xF36 ) { - this.Weight = 10.0; + Weight = 10.0; } public SheafOfHay( Serial serial ) : base( serial ) diff --git a/Scripts/Items/Food/Fruits.cs b/Scripts/Items/Food/Fruits.cs index a2feaae40..9f3ebe08f 100644 --- a/Scripts/Items/Food/Fruits.cs +++ b/Scripts/Items/Food/Fruits.cs @@ -49,8 +49,8 @@ namespace Server.Items [Constructible] public Banana( int amount ) : base( amount, 0x171f ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Banana( Serial serial ) : base( serial ) @@ -82,8 +82,8 @@ namespace Server.Items [Constructible] public Bananas( int amount ) : base( amount, 0x1721 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Bananas( Serial serial ) : base( serial ) @@ -114,8 +114,8 @@ namespace Server.Items [Constructible] public SplitCoconut( int amount ) : base( amount, 0x1725 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public SplitCoconut( Serial serial ) : base( serial ) @@ -146,8 +146,8 @@ namespace Server.Items [Constructible] public Lemon( int amount ) : base( amount, 0x1728 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Lemon( Serial serial ) : base( serial ) @@ -178,8 +178,8 @@ namespace Server.Items [Constructible] public Lemons( int amount ) : base( amount, 0x1729 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Lemons( Serial serial ) : base( serial ) @@ -210,8 +210,8 @@ namespace Server.Items [Constructible] public Lime( int amount ) : base( amount, 0x172a ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Lime( Serial serial ) : base( serial ) @@ -242,8 +242,8 @@ namespace Server.Items [Constructible] public Limes( int amount ) : base( amount, 0x172B ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Limes( Serial serial ) : base( serial ) @@ -274,8 +274,8 @@ namespace Server.Items [Constructible] public Coconut( int amount ) : base( amount, 0x1726 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Coconut( Serial serial ) : base( serial ) @@ -306,8 +306,8 @@ namespace Server.Items [Constructible] public OpenCoconut( int amount ) : base( amount, 0x1723 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public OpenCoconut( Serial serial ) : base( serial ) @@ -338,8 +338,8 @@ namespace Server.Items [Constructible] public Dates( int amount ) : base( amount, 0x1727 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Dates( Serial serial ) : base( serial ) @@ -370,8 +370,8 @@ namespace Server.Items [Constructible] public Grapes( int amount ) : base( amount, 0x9D1 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Grapes( Serial serial ) : base( serial ) @@ -402,8 +402,8 @@ namespace Server.Items [Constructible] public Peach( int amount ) : base( amount, 0x9D2 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Peach( Serial serial ) : base( serial ) @@ -434,8 +434,8 @@ namespace Server.Items [Constructible] public Pear( int amount ) : base( amount, 0x994 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Pear( Serial serial ) : base( serial ) @@ -466,8 +466,8 @@ namespace Server.Items [Constructible] public Apple( int amount ) : base( amount, 0x9D0 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Apple( Serial serial ) : base( serial ) @@ -498,8 +498,8 @@ namespace Server.Items [Constructible] public Watermelon( int amount ) : base( amount, 0xC5C ) { - this.Weight = 5.0; - this.FillFactor = 5; + Weight = 5.0; + FillFactor = 5; } public Watermelon( Serial serial ) : base( serial ) @@ -539,8 +539,8 @@ namespace Server.Items [Constructible] public SmallWatermelon( int amount ) : base( amount, 0xC5D ) { - this.Weight = 5.0; - this.FillFactor = 5; + Weight = 5.0; + FillFactor = 5; } public SmallWatermelon( Serial serial ) : base( serial ) @@ -572,8 +572,8 @@ namespace Server.Items [Constructible] public Squash( int amount ) : base( amount, 0xc72 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Squash( Serial serial ) : base( serial ) @@ -605,8 +605,8 @@ namespace Server.Items [Constructible] public Cantaloupe( int amount ) : base( amount, 0xc79 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Cantaloupe( Serial serial ) : base( serial ) diff --git a/Scripts/Items/Food/Vegetables.cs b/Scripts/Items/Food/Vegetables.cs index 9070378cc..017c1d591 100644 --- a/Scripts/Items/Food/Vegetables.cs +++ b/Scripts/Items/Food/Vegetables.cs @@ -11,8 +11,8 @@ namespace Server.Items [Constructible] public Carrot( int amount ) : base( amount, 0xc78 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Carrot( Serial serial ) : base( serial ) @@ -44,8 +44,8 @@ namespace Server.Items [Constructible] public Cabbage( int amount ) : base( amount, 0xc7b ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Cabbage( Serial serial ) : base( serial ) @@ -77,8 +77,8 @@ namespace Server.Items [Constructible] public Onion( int amount ) : base( amount, 0xc6d ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Onion( Serial serial ) : base( serial ) @@ -110,8 +110,8 @@ namespace Server.Items [Constructible] public Lettuce( int amount ) : base( amount, 0xc70 ) { - this.Weight = 1.0; - this.FillFactor = 1; + Weight = 1.0; + FillFactor = 1; } public Lettuce( Serial serial ) : base( serial ) @@ -143,8 +143,8 @@ namespace Server.Items [Constructible] public Pumpkin( int amount ) : base( amount, 0xC6A ) { - this.Weight = 1.0; - this.FillFactor = 8; + Weight = 1.0; + FillFactor = 8; } public Pumpkin( Serial serial ) : base( serial ) @@ -184,8 +184,8 @@ namespace Server.Items [Constructible] public SmallPumpkin( int amount ) : base( amount, 0xC6C ) { - this.Weight = 1.0; - this.FillFactor = 8; + Weight = 1.0; + FillFactor = 8; } public SmallPumpkin( Serial serial ) : base( serial ) diff --git a/Scripts/Items/Games/BaseBoard.cs b/Scripts/Items/Games/BaseBoard.cs index d11b12ac2..8fecd6392 100644 --- a/Scripts/Items/Games/BaseBoard.cs +++ b/Scripts/Items/Games/BaseBoard.cs @@ -93,7 +93,7 @@ namespace Server.Items } else { - foreach ( NetState state in this.GetClientsInRange( 2 ) ) + foreach ( NetState state in GetClientsInRange( 2 ) ) state.Send( p ); } @@ -152,7 +152,7 @@ namespace Server.Items public override void OnClick() { - if ( BaseBoard.ValidateDefault( m_From, m_Board ) ) + if ( ValidateDefault( m_From, m_Board ) ) m_Board.Reset(); } } diff --git a/Scripts/Items/Games/Dices.cs b/Scripts/Items/Games/Dices.cs index 08d03b58c..4da5a795e 100644 --- a/Scripts/Items/Games/Dices.cs +++ b/Scripts/Items/Games/Dices.cs @@ -16,7 +16,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( !from.InRange( this.GetWorldLocation(), 2 ) ) + if ( !from.InRange( GetWorldLocation(), 2 ) ) return; Roll( from ); @@ -32,7 +32,7 @@ namespace Server.Items public void Roll( Mobile from ) { - this.PublicOverheadMessage( MessageType.Regular, 0, false, string.Format( "*{0} rolls {1}, {2}*", from.Name, Utility.Random( 1, 6 ), Utility.Random( 1, 6 ) ) ); + PublicOverheadMessage( MessageType.Regular, 0, false, string.Format( "*{0} rolls {1}, {2}*", from.Name, Utility.Random( 1, 6 ), Utility.Random( 1, 6 ) ) ); } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Guilds/Guildstone.cs b/Scripts/Items/Guilds/Guildstone.cs index 33133a518..3df1c2923 100644 --- a/Scripts/Items/Guilds/Guildstone.cs +++ b/Scripts/Items/Guilds/Guildstone.cs @@ -112,7 +112,7 @@ namespace Server.Items Timer.DelayCall( TimeSpan.Zero, new TimerCallback( AddToHouse ) ); if ( !Guild.NewGuildSystem && m_Guild == null ) - this.Delete(); + Delete(); } private void AddToHouse() @@ -161,11 +161,11 @@ namespace Server.Items if ( (name = m_Guild.Name) == null || (name = name.Trim()).Length <= 0 ) name = "(unnamed)"; - this.LabelTo( from, name ); + LabelTo( from, name ); } else if ( m_GuildName != null ) { - this.LabelTo( from, m_GuildName ); + LabelTo( from, m_GuildName ); } } @@ -226,7 +226,7 @@ namespace Server.Items public bool CouldFit( IPoint3D p, Map map ) { - return map.CanFit( p.X, p.Y, p.Z, this.ItemData.Height ); + return map.CanFit( p.X, p.Y, p.Z, ItemData.Height ); } #endregion diff --git a/Scripts/Items/Jewels/BaseJewel.cs b/Scripts/Items/Jewels/BaseJewel.cs index 4041bf72f..1fc5cdca3 100644 --- a/Scripts/Items/Jewels/BaseJewel.cs +++ b/Scripts/Items/Jewels/BaseJewel.cs @@ -148,7 +148,7 @@ namespace Server.Items if ( strBonus != 0 || dexBonus != 0 || intBonus != 0 ) { - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); if ( strBonus != 0 ) from.AddStatMod( new StatMod( StatType.Str, modName + "Str", strBonus, TimeSpan.Zero ) ); @@ -170,7 +170,7 @@ namespace Server.Items { m_AosSkillBonuses.Remove(); - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); from.RemoveStatMod( modName + "Str" ); from.RemoveStatMod( modName + "Dex" ); diff --git a/Scripts/Items/Lights/BaseLight.cs b/Scripts/Items/Lights/BaseLight.cs index 77010341a..a5d46e720 100644 --- a/Scripts/Items/Lights/BaseLight.cs +++ b/Scripts/Items/Lights/BaseLight.cs @@ -159,7 +159,7 @@ namespace Server.Items if ( m_Protected && from.AccessLevel == AccessLevel.Player ) return; - if ( !from.InRange( this.GetWorldLocation(), 2 ) ) + if ( !from.InRange( GetWorldLocation(), 2 ) ) return; if ( m_Burning ) diff --git a/Scripts/Items/Maps/MapItem.cs b/Scripts/Items/Maps/MapItem.cs index 18ff953bf..ca5cf21a2 100644 --- a/Scripts/Items/Maps/MapItem.cs +++ b/Scripts/Items/Maps/MapItem.cs @@ -180,7 +180,7 @@ namespace Server.Items public virtual bool Validate( Mobile from ) { - if ( !from.CanSee( this ) || from.Map != this.Map || !from.Alive || InSecureTrade ) + if ( !from.CanSee( this ) || from.Map != Map || !from.Alive || InSecureTrade ) return false; else if ( from.AccessLevel >= AccessLevel.GameMaster ) return true; diff --git a/Scripts/Items/Maps/TreasureMap.cs b/Scripts/Items/Maps/TreasureMap.cs index 2049e79fb..a65243726 100644 --- a/Scripts/Items/Maps/TreasureMap.cs +++ b/Scripts/Items/Maps/TreasureMap.cs @@ -289,7 +289,7 @@ namespace Server.Items { from.SendLocalizedMessage( 503020 ); // You are already digging treasure. } - else if ( from.Map != this.m_Map ) + else if ( from.Map != m_Map ) { from.SendLocalizedMessage( 1010479 ); // You seem to be in the right place, but may be on the wrong facet! } @@ -625,9 +625,9 @@ namespace Server.Items if ( from is PlayerMobile mobile && mobile.Young ) return true; - if ( from == this.Decoder ) + if ( from == Decoder ) { - this.Level = 1; + Level = 1; from.SendLocalizedMessage( 1046446 ); // This is now a level one treasure map. return true; } @@ -779,7 +779,7 @@ namespace Server.Items m_Map = map; if ( !enabled ) - this.Flags |= CMEFlags.Disabled; + Flags |= CMEFlags.Disabled; } public override void OnClick() @@ -912,12 +912,12 @@ namespace Server.Items public void Turn1() { - this.ItemID = 0x913; + ItemID = 0x913; } public void Turn2() { - this.ItemID = 0x914; + ItemID = 0x914; } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Misc/BankCheck.cs b/Scripts/Items/Misc/BankCheck.cs index 03764481d..693afb329 100644 --- a/Scripts/Items/Misc/BankCheck.cs +++ b/Scripts/Items/Misc/BankCheck.cs @@ -246,7 +246,7 @@ namespace Server.Items if (qs is Haven.UzeraanTurmoilQuest) { - var obj = qs.FindObjective(typeof(Engines.Quests.Haven.CashBankCheckObjective)); + var obj = qs.FindObjective(typeof(Haven.CashBankCheckObjective)); if (obj != null && !obj.Completed) { diff --git a/Scripts/Items/Misc/Blocker.cs b/Scripts/Items/Misc/Blocker.cs index c3fa41094..11fdae665 100644 --- a/Scripts/Items/Misc/Blocker.cs +++ b/Scripts/Items/Misc/Blocker.cs @@ -43,7 +43,7 @@ namespace Server.Items { public GMItemPacket( Item item ) : base( 0x1A ) { - this.EnsureCapacity( 20 ); + EnsureCapacity( 20 ); // 14 base length // +2 - Amount diff --git a/Scripts/Items/Misc/Bola.cs b/Scripts/Items/Misc/Bola.cs index 177aadaab..0e8b3d09c 100644 --- a/Scripts/Items/Misc/Bola.cs +++ b/Scripts/Items/Misc/Bola.cs @@ -42,7 +42,7 @@ namespace Server.Items { from.SendLocalizedMessage( 1040016 ); // You cannot use this while riding a mount } - else if ( Server.Spells.Ninjitsu.AnimalForm.UnderTransformation( from ) ) + else if ( Spells.Ninjitsu.AnimalForm.UnderTransformation( from ) ) { from.SendLocalizedMessage( 1070902 ); // You can't use this while in an animal form! } @@ -80,7 +80,7 @@ namespace Server.Items if (to is PlayerMobile mobile) { - if (Server.Spells.Ninjitsu.AnimalForm.UnderTransformation(mobile)) + if (Spells.Ninjitsu.AnimalForm.UnderTransformation(mobile)) { mobile.SendLocalizedMessage(1114066, from.Name); // ~1_NAME~ knocked you out of animal form! } @@ -172,11 +172,11 @@ namespace Server.Items { from.SendLocalizedMessage( 1040016 ); // You cannot use this while riding a mount } - else if ( Server.Spells.Ninjitsu.AnimalForm.UnderTransformation( from ) ) + else if ( Spells.Ninjitsu.AnimalForm.UnderTransformation( from ) ) { from.SendLocalizedMessage( 1070902 ); // You can't use this while in an animal form! } - else if (!to.Mounted && !Server.Spells.Ninjitsu.AnimalForm.UnderTransformation(to)) + else if (!to.Mounted && !Spells.Ninjitsu.AnimalForm.UnderTransformation(to)) { from.SendLocalizedMessage( 1049628 ); // You have no reason to throw a bola at that. } diff --git a/Scripts/Items/Misc/BulletinBoards.cs b/Scripts/Items/Misc/BulletinBoards.cs index a3314b0d8..6faa7ac4b 100644 --- a/Scripts/Items/Misc/BulletinBoards.cs +++ b/Scripts/Items/Misc/BulletinBoards.cs @@ -78,7 +78,7 @@ namespace Server.Items public virtual void Cleanup() { - List items = this.Items; + List items = Items; for ( int i = items.Count - 1; i >= 0; --i ) { @@ -99,7 +99,7 @@ namespace Server.Items private void RecurseDelete( BulletinMessage msg ) { List found = new List(); - List items = this.Items; + List items = Items; for ( int i = items.Count - 1; i >= 0; --i ) { @@ -122,7 +122,7 @@ namespace Server.Items public virtual bool GetLastPostTime( Mobile poster, bool onlyCheckRoot, ref DateTime lastPostTime ) { - List items = this.Items; + List items = Items; bool wasSet = false; for ( int i = 0; i < items.Count; ++i ) @@ -168,7 +168,7 @@ namespace Server.Items if ( from.AccessLevel >= AccessLevel.GameMaster ) return true; - return ( from.Map == this.Map && from.InRange( GetWorldLocation(), 2 ) ); + return ( from.Map == Map && from.InRange( GetWorldLocation(), 2 ) ); } public void PostMessage( Mobile from, BulletinMessage thread, string subject, string[] lines ) @@ -331,7 +331,7 @@ namespace Server.Items return m_Time.ToString( "MMM dd, yyyy" ); } - public override bool CheckTarget( Mobile from, Server.Targeting.Target targ, object targeted ) + public override bool CheckTarget( Mobile from, Targeting.Target targ, object targeted ) { return false; } diff --git a/Scripts/Items/Misc/CommunicationCrystals.cs b/Scripts/Items/Misc/CommunicationCrystals.cs index fc7734e49..3dede38a7 100644 --- a/Scripts/Items/Misc/CommunicationCrystals.cs +++ b/Scripts/Items/Misc/CommunicationCrystals.cs @@ -55,10 +55,10 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public bool Active { - get => this.ItemID == 0x1ECD; + get => ItemID == 0x1ECD; set { - this.ItemID = value ? 0x1ECD : 0x1ED0; + ItemID = value ? 0x1ECD : 0x1ED0; InvalidateProperties(); } } @@ -99,9 +99,9 @@ namespace Server.Items { base.GetProperties( list ); - list.Add( this.Active ? 1060742 : 1060743 ); // active / inactive + list.Add( Active ? 1060742 : 1060743 ); // active / inactive list.Add( 1060745 ); // broadcast - list.Add( 1060741, this.Charges.ToString() ); // charges: ~1_val~ + list.Add( 1060741, Charges.ToString() ); // charges: ~1_val~ if ( Receivers.Count > 0 ) list.Add( 1060746, Receivers.Count.ToString() ); // links: ~1_val~ @@ -111,9 +111,9 @@ namespace Server.Items { base.OnSingleClick( from ); - LabelTo( from, this.Active ? 1060742 : 1060743 ); // active / inactive + LabelTo( from, Active ? 1060742 : 1060743 ); // active / inactive LabelTo( from, 1060745 ); // broadcast - LabelTo( from, 1060741, this.Charges.ToString() ); // charges: ~1_val~ + LabelTo( from, 1060741, Charges.ToString() ); // charges: ~1_val~ if ( Receivers.Count > 0 ) LabelTo( from, 1060746, Receivers.Count.ToString() ); // links: ~1_val~ @@ -145,7 +145,7 @@ namespace Server.Items } else { - this.Active = false; + Active = false; break; } } @@ -298,10 +298,10 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public bool Active { - get => this.ItemID == 0x1ED1; + get => ItemID == 0x1ED1; set { - this.ItemID = value ? 0x1ED1 : 0x1ED0; + ItemID = value ? 0x1ED1 : 0x1ED0; InvalidateProperties(); } } @@ -342,7 +342,7 @@ namespace Server.Items { base.GetProperties( list ); - list.Add( this.Active ? 1060742 : 1060743 ); // active / inactive + list.Add( Active ? 1060742 : 1060743 ); // active / inactive list.Add( 1060744 ); // receiver } @@ -350,22 +350,22 @@ namespace Server.Items { base.OnSingleClick( from ); - LabelTo( from, this.Active ? 1060742 : 1060743 ); // active / inactive + LabelTo( from, Active ? 1060742 : 1060743 ); // active / inactive LabelTo( from, 1060744 ); // receiver } public void TransmitMessage( Mobile from, string message ) { - if ( !this.Active ) + if ( !Active ) return; string text = String.Format( "{0} says {1}", from.Name, message ); - if ( this.RootParent is Mobile mobile ) + if ( RootParent is Mobile mobile ) { mobile.SendMessage( 0x2B2, "Crystal: " + text ); } - else if ( this.RootParent is Item item ) + else if ( RootParent is Item item ) { item.PublicOverheadMessage( MessageType.Regular, 0x2B2, false, "Crystal: " + text ); } diff --git a/Scripts/Items/Misc/Corpses/Corpse.cs b/Scripts/Items/Misc/Corpses/Corpse.cs index 1732175f0..df6c934b9 100644 --- a/Scripts/Items/Misc/Corpses/Corpse.cs +++ b/Scripts/Items/Misc/Corpses/Corpse.cs @@ -159,7 +159,7 @@ namespace Server.Items private void AssignInstancedLoot() { - if ( m_Aggressors.Count == 0 || this.Items.Count == 0 ) + if ( m_Aggressors.Count == 0 || Items.Count == 0 ) return; if ( m_InstancedItems == null ) @@ -168,9 +168,9 @@ namespace Server.Items List m_Stackables = new List(); List m_Unstackables = new List(); - for ( int i = 0; i < this.Items.Count; i++ ) + for ( int i = 0; i < Items.Count; i++ ) { - Item item = this.Items[i]; + Item item = Items[i]; if ( item.LootType != LootType.Cursed ) //Don't have curesd items take up someone's item spot.. (?) { @@ -240,9 +240,9 @@ namespace Server.Items public void AddCarvedItem( Item carved, Mobile carver ) { - this.DropItem( carved ); + DropItem( carved ); - if ( this.InstancedCorpse ) + if ( InstancedCorpse ) { if ( m_InstancedItems == null ) m_InstancedItems = new Dictionary(); @@ -954,7 +954,7 @@ namespace Server.Items if ( !IsCriminalAction( from ) ) return true; - Map map = this.Map; + Map map = Map; if ( map == null || (map.Rules & MapRules.HarmfulRestrictions) != 0 ) return false; @@ -986,10 +986,10 @@ namespace Server.Items public virtual void Open( Mobile from, bool checkSelfLoot ) { - if ( from.AccessLevel > AccessLevel.Player || from.InRange( this.GetWorldLocation(), 2 ) ) + if ( from.AccessLevel > AccessLevel.Player || from.InRange( GetWorldLocation(), 2 ) ) { #region Self Looting - if ( checkSelfLoot && from == m_Owner && !GetFlag( CorpseFlag.SelfLooted ) && this.Items.Count != 0 ) + if ( checkSelfLoot && from == m_Owner && !GetFlag( CorpseFlag.SelfLooted ) && Items.Count != 0 ) { if ( from.FindItemOnLayer( Layer.OuterTorso ) is DeathRobe robe ) { @@ -1017,7 +1017,7 @@ namespace Server.Items } } - List items = new List( this.Items ); + List items = new List( Items ); bool didntFit = false; @@ -1045,7 +1045,7 @@ namespace Server.Items from.PlaySound( 0x3E3 ); - if ( this.Items.Count != 0 ) + if ( Items.Count != 0 ) { from.SendLocalizedMessage( 1062472 ); // You gather some of your belongings. The rest remain on the corpse. } @@ -1152,18 +1152,18 @@ namespace Server.Items if ( m_CorpseName != null ) list.Add( m_CorpseName ); else - list.Add( 1046414, this.Name ); // the remains of ~1_NAME~ + list.Add( 1046414, Name ); // the remains of ~1_NAME~ } else // Bone form { - list.Add( 1046414, this.Name ); // the remains of ~1_NAME~ + list.Add( 1046414, Name ); // the remains of ~1_NAME~ } } public override void OnAosSingleClick( Mobile from ) { int hue = Notoriety.GetHue( NotorietyHandlers.CorpseNotoriety( from, this ) ); - ObjectPropertyList opl = this.PropertyList; + ObjectPropertyList opl = PropertyList; if ( opl.Header > 0 ) from.Send( new MessageLocalized( Serial, ItemID, MessageType.Label, hue, 3, opl.Header, Name, opl.HeaderArgs ) ); @@ -1188,7 +1188,7 @@ namespace Server.Items public void Carve( Mobile from, Item item ) { - if ( IsCriminalAction( from ) && this.Map != null && (this.Map.Rules & MapRules.HarmfulRestrictions) != 0 ) + if ( IsCriminalAction( from ) && Map != null && (Map.Rules & MapRules.HarmfulRestrictions) != 0 ) { if ( m_Owner == null || !m_Owner.Player ) from.SendLocalizedMessage( 1005035 ); // You did not earn the right to loot this creature! diff --git a/Scripts/Items/Misc/Corpses/DecayedCorpse.cs b/Scripts/Items/Misc/Corpses/DecayedCorpse.cs index 308819aef..0434caca8 100644 --- a/Scripts/Items/Misc/Corpses/DecayedCorpse.cs +++ b/Scripts/Items/Misc/Corpses/DecayedCorpse.cs @@ -68,7 +68,7 @@ namespace Server.Items public override void OnSingleClick( Mobile from ) { - this.LabelTo( from, 1046414, Name ); // the remains of ~1_NAME~ + LabelTo( from, 1046414, Name ); // the remains of ~1_NAME~ } public DecayedCorpse( Serial serial ) : base( serial ) diff --git a/Scripts/Items/Misc/DeceitBrazier.cs b/Scripts/Items/Misc/DeceitBrazier.cs index 1b37b13d7..9aee6b949 100644 --- a/Scripts/Items/Misc/DeceitBrazier.cs +++ b/Scripts/Items/Misc/DeceitBrazier.cs @@ -162,13 +162,13 @@ namespace Server.Items int y = Location.Y + (Utility.Random( (m_SpawnRange * 2) + 1 ) - m_SpawnRange); int z = Map.GetAverageZ( x, y ); - if ( Map.CanSpawnMobile( new Point2D( x, y ), this.Z ) ) - return new Point3D( x, y, this.Z ); + if ( Map.CanSpawnMobile( new Point2D( x, y ), Z ) ) + return new Point3D( x, y, Z ); else if ( Map.CanSpawnMobile( new Point2D( x, y ), z ) ) return new Point3D( x, y, z ); } - return this.Location; + return Location; } public virtual void DoEffect( Point3D loc, Map map ) @@ -185,7 +185,7 @@ namespace Server.Items { if ( m_NextSpawn < DateTime.UtcNow ) { - Map map = this.Map; + Map map = Map; BaseCreature bc = (BaseCreature)Activator.CreateInstance( m_Creatures[Utility.Random( m_Creatures.Length )] ); if ( bc != null ) diff --git a/Scripts/Items/Misc/Gold.cs b/Scripts/Items/Misc/Gold.cs index a2a1ec513..ccb06e69a 100644 --- a/Scripts/Items/Misc/Gold.cs +++ b/Scripts/Items/Misc/Gold.cs @@ -41,7 +41,7 @@ namespace Server.Items protected override void OnAmountChange( int oldValue ) { - int newValue = this.Amount; + int newValue = Amount; UpdateTotal( this, TotalType.Gold, newValue - oldValue ); } @@ -119,7 +119,7 @@ namespace Server.Items int baseTotal = base.GetTotal( type ); if ( type == TotalType.Gold ) - baseTotal += this.Amount; + baseTotal += Amount; return baseTotal; } diff --git a/Scripts/Items/Misc/Guillotine.cs b/Scripts/Items/Misc/Guillotine.cs index b47f95b23..3566a7229 100644 --- a/Scripts/Items/Misc/Guillotine.cs +++ b/Scripts/Items/Misc/Guillotine.cs @@ -16,13 +16,13 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( !from.InRange( this.GetWorldLocation(), 2 ) || !from.InLOS( this ) ) + if ( !from.InRange( GetWorldLocation(), 2 ) || !from.InLOS( this ) ) { from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that } else if ( Visible && ( ItemID == 4656 || ItemID == 4702 ) && DateTime.UtcNow >= m_NextUse ) { - Point3D p = this.GetWorldLocation(); + Point3D p = GetWorldLocation(); if ( 1 > Utility.Random( Math.Max( Math.Abs( from.X - p.X ), Math.Abs( from.Y - p.Y ) ) ) ) { @@ -31,7 +31,7 @@ namespace Server.Items Spells.SpellHelper.Damage( TimeSpan.FromSeconds( 0.5 ), from, Utility.Dice( 2, 10, 5 ) ); } - Effects.PlaySound( this.GetWorldLocation(), this.Map, 0x387 ); + Effects.PlaySound( GetWorldLocation(), Map, 0x387 ); Timer.DelayCall( TimeSpan.FromSeconds( 0.25 ), new TimerCallback( Down1 ) ); Timer.DelayCall( TimeSpan.FromSeconds( 0.50 ), new TimerCallback( Down2 ) ); @@ -51,8 +51,8 @@ namespace Server.Items { ItemID = ( ItemID == 4678 ? 4679 : 4713 ); - Point3D p = this.GetWorldLocation(); - Map f = this.Map; + Point3D p = GetWorldLocation(); + Map f = Map; if ( f == null ) return; diff --git a/Scripts/Items/Misc/HairDye.cs b/Scripts/Items/Misc/HairDye.cs index ce8d8ad2c..bb5e4ed89 100644 --- a/Scripts/Items/Misc/HairDye.cs +++ b/Scripts/Items/Misc/HairDye.cs @@ -33,7 +33,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( from.InRange( this.GetWorldLocation(), 1 ) ) + if ( from.InRange( GetWorldLocation(), 1 ) ) { from.CloseGump( typeof( HairDyeGump ) ); from.SendGump( new HairDyeGump( this ) ); diff --git a/Scripts/Items/Misc/InteriorDecorator.cs b/Scripts/Items/Misc/InteriorDecorator.cs index dee6491aa..711e6b59c 100644 --- a/Scripts/Items/Misc/InteriorDecorator.cs +++ b/Scripts/Items/Misc/InteriorDecorator.cs @@ -61,7 +61,7 @@ namespace Server.Items if ( !CheckUse( this, from ) ) return; - if ( from.FindGump( typeof( InteriorDecorator.InternalGump ) ) == null ) + if ( from.FindGump( typeof( InternalGump ) ) == null ) from.SendGump( new InternalGump( this ) ); if ( m_Command != DecorateCommand.None ) @@ -148,7 +148,7 @@ namespace Server.Items protected override void OnTarget( Mobile from, object targeted ) { - if ( targeted is Item item && InteriorDecorator.CheckUse( m_Decorator, from ) ) + if ( targeted is Item item && CheckUse( m_Decorator, from ) ) { BaseHouse house = BaseHouse.FindHouseAt( from ); @@ -226,7 +226,7 @@ namespace Server.Items protected override void OnTargetCancel( Mobile from, TargetCancelType cancelType ) { if ( cancelType == TargetCancelType.Canceled ) - from.CloseGump( typeof( InteriorDecorator.InternalGump ) ); + from.CloseGump( typeof( InternalGump ) ); } private static void Turn( Item item, Mobile from ) diff --git a/Scripts/Items/Misc/Key.cs b/Scripts/Items/Misc/Key.cs index 11840f1b4..9aaa06e7a 100644 --- a/Scripts/Items/Misc/Key.cs +++ b/Scripts/Items/Misc/Key.cs @@ -212,7 +212,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( !this.IsChildOf( from.Backpack ) ) + if ( !IsChildOf( from.Backpack ) ) { from.SendLocalizedMessage( 501661 ); // That key is unreachable. return; @@ -268,7 +268,7 @@ namespace Server.Items public bool UseOn( Mobile from, ILockable o ) { - if ( o.KeyValue == this.KeyValue ) + if ( o.KeyValue == KeyValue ) { if ( o is BaseDoor door && !door.UseLocks() ) return false; diff --git a/Scripts/Items/Misc/KeyRing.cs b/Scripts/Items/Misc/KeyRing.cs index cf5bda1cd..1c624573f 100644 --- a/Scripts/Items/Misc/KeyRing.cs +++ b/Scripts/Items/Misc/KeyRing.cs @@ -21,7 +21,7 @@ namespace Server.Items public override bool OnDragDrop( Mobile from, Item dropped ) { - if ( !this.IsChildOf( from.Backpack ) ) + if ( !IsChildOf( from.Backpack ) ) { from.SendLocalizedMessage( 1060640 ); // The item must be in your backpack to use it. return false; @@ -32,7 +32,7 @@ namespace Server.Items from.SendLocalizedMessage( 501689 ); // Only non-blank keys can be put on a keyring. return false; } - if ( this.Keys.Count >= MaxKeys ) + if ( Keys.Count >= MaxKeys ) { from.SendLocalizedMessage( 1008138 ); // This keyring is full. return false; @@ -45,7 +45,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( !this.IsChildOf( from.Backpack ) ) + if ( !IsChildOf( from.Backpack ) ) { from.SendLocalizedMessage( 1060640 ); // The item must be in your backpack to use it. return; @@ -116,7 +116,7 @@ namespace Server.Items public void Open( Mobile from ) { - if ( !(this.Parent is Container cont) ) + if ( !(Parent is Container cont) ) return; for ( int i = m_Keys.Count - 1; i >= 0; i-- ) @@ -161,14 +161,14 @@ namespace Server.Items private void UpdateItemID() { - if ( this.Keys.Count < 1 ) - this.ItemID = 0x1011; - else if ( this.Keys.Count < 3 ) - this.ItemID = 0x1769; - else if ( this.Keys.Count < 5 ) - this.ItemID = 0x176A; + if ( Keys.Count < 1 ) + ItemID = 0x1011; + else if ( Keys.Count < 3 ) + ItemID = 0x1769; + else if ( Keys.Count < 5 ) + ItemID = 0x176A; else - this.ItemID = 0x176B; + ItemID = 0x176B; } public KeyRing( Serial serial ) : base( serial ) diff --git a/Scripts/Items/Misc/LOSBlocker.cs b/Scripts/Items/Misc/LOSBlocker.cs index 1cf55ca33..ccfd144ad 100644 --- a/Scripts/Items/Misc/LOSBlocker.cs +++ b/Scripts/Items/Misc/LOSBlocker.cs @@ -46,14 +46,14 @@ namespace Server.Items int version = reader.ReadInt(); if ( version < 1 && ItemID == 0x2199 ) - this.ItemID = 0x21A2; + ItemID = 0x21A2; } public sealed class GMItemPacket : Packet { public GMItemPacket( Item item ) : base( 0x1A ) { - this.EnsureCapacity( 20 ); + EnsureCapacity( 20 ); // 14 base length // +2 - Amount diff --git a/Scripts/Items/Misc/Origami.cs b/Scripts/Items/Misc/Origami.cs index e01da150b..e44a891a5 100644 --- a/Scripts/Items/Misc/Origami.cs +++ b/Scripts/Items/Misc/Origami.cs @@ -21,7 +21,7 @@ namespace Server.Items } else { - this.Delete(); + Delete(); Item i = null; diff --git a/Scripts/Items/Misc/PlayerBulletinBoards.cs b/Scripts/Items/Misc/PlayerBulletinBoards.cs index ec255ad63..230e88fdc 100644 --- a/Scripts/Items/Misc/PlayerBulletinBoards.cs +++ b/Scripts/Items/Misc/PlayerBulletinBoards.cs @@ -187,7 +187,7 @@ namespace Server.Items if ( house == null || !house.IsLockedDown( this ) ) from.SendLocalizedMessage( 1062396 ); // This bulletin board must be locked down in a house to be usable. - else if ( !from.InRange( this.GetWorldLocation(), 2 ) || !from.InLOS( this ) ) + else if ( !from.InRange( GetWorldLocation(), 2 ) || !from.InLOS( this ) ) from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that. else if ( CheckAccess( house, from ) ) from.SendGump( new PlayerBBGump( from, house, this, 0 ) ); diff --git a/Scripts/Items/Misc/PlayerVendorDeed.cs b/Scripts/Items/Misc/PlayerVendorDeed.cs index 5474730f5..43ee6ab6d 100644 --- a/Scripts/Items/Misc/PlayerVendorDeed.cs +++ b/Scripts/Items/Misc/PlayerVendorDeed.cs @@ -49,7 +49,7 @@ namespace Server.Items v.SayTo( from, 503246 ); // Ah! it feels good to be working again. - this.Delete(); + Delete(); } else { @@ -93,7 +93,7 @@ namespace Server.Items v.SayTo( from, 503246 ); // Ah! it feels good to be working again. - this.Delete(); + Delete(); } } } diff --git a/Scripts/Items/Misc/PowerCrystal.cs b/Scripts/Items/Misc/PowerCrystal.cs index 732a91cfa..3ca6f816e 100644 --- a/Scripts/Items/Misc/PowerCrystal.cs +++ b/Scripts/Items/Misc/PowerCrystal.cs @@ -18,7 +18,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( !from.InRange( this.GetWorldLocation(), 3 )) + if ( !from.InRange( GetWorldLocation(), 3 )) from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that. else from.SendAsciiMessage( "This looks like part of a larger contraption." ); diff --git a/Scripts/Items/Misc/PublicMoongate.cs b/Scripts/Items/Misc/PublicMoongate.cs index 5436d825a..9ae57cc45 100644 --- a/Scripts/Items/Misc/PublicMoongate.cs +++ b/Scripts/Items/Misc/PublicMoongate.cs @@ -49,7 +49,7 @@ namespace Server.Items { if ( m is PlayerMobile ) { - if ( !Utility.InRange( m.Location, this.Location, 1 ) && Utility.InRange( oldLocation, this.Location, 1 ) ) + if ( !Utility.InRange( m.Location, Location, 1 ) && Utility.InRange( oldLocation, Location, 1 ) ) m.CloseGump( typeof( MoongateGump ) ); } } diff --git a/Scripts/Items/Misc/SerpentPillar.cs b/Scripts/Items/Misc/SerpentPillar.cs index 8be852551..77102fc03 100644 --- a/Scripts/Items/Misc/SerpentPillar.cs +++ b/Scripts/Items/Misc/SerpentPillar.cs @@ -53,14 +53,14 @@ namespace Server.Items { Mobile from = e.Mobile; - if ( !e.Handled && from.InRange( this, 10 ) && e.Speech.ToLower() == this.Word ) + if ( !e.Handled && from.InRange( this, 10 ) && e.Speech.ToLower() == Word ) { BaseBoat boat = BaseBoat.FindBoatAt( from, from.Map ); if ( boat == null ) return; - if ( !this.Active ) + if ( !Active ) { if ( boat.TillerMan != null ) boat.TillerMan.Say( 502507 ); // Ar, Legend has it that these pillars are inactive! No man knows how it might be undone! diff --git a/Scripts/Items/Misc/SpecialBeardDye.cs b/Scripts/Items/Misc/SpecialBeardDye.cs index 877ef1c75..a295ba08f 100644 --- a/Scripts/Items/Misc/SpecialBeardDye.cs +++ b/Scripts/Items/Misc/SpecialBeardDye.cs @@ -34,7 +34,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( from.InRange( this.GetWorldLocation(), 1 ) ) + if ( from.InRange( GetWorldLocation(), 1 ) ) { from.CloseGump( typeof( SpecialBeardDyeGump ) ); from.SendGump( new SpecialBeardDyeGump( this ) ); diff --git a/Scripts/Items/Misc/SpecialHairDye.cs b/Scripts/Items/Misc/SpecialHairDye.cs index d5d54b4fc..190e7b1fe 100644 --- a/Scripts/Items/Misc/SpecialHairDye.cs +++ b/Scripts/Items/Misc/SpecialHairDye.cs @@ -34,7 +34,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( from.InRange( this.GetWorldLocation(), 1 ) ) + if ( from.InRange( GetWorldLocation(), 1 ) ) { from.CloseGump( typeof( SpecialHairDyeGump ) ); from.SendGump( new SpecialHairDyeGump( this ) ); diff --git a/Scripts/Items/Misc/Teleporter.cs b/Scripts/Items/Misc/Teleporter.cs index 4379a8dd2..f4003a90f 100644 --- a/Scripts/Items/Misc/Teleporter.cs +++ b/Scripts/Items/Misc/Teleporter.cs @@ -194,7 +194,7 @@ namespace Server.Items if (p == Point3D.Zero) p = m.Location; - Server.Mobiles.BaseCreature.TeleportPets(m, p, map); + BaseCreature.TeleportPets(m, p, map); bool sendEffect = (!m.Hidden || m.AccessLevel == AccessLevel.Player); diff --git a/Scripts/Items/Misc/TrashBarrel.cs b/Scripts/Items/Misc/TrashBarrel.cs index dceca857c..e00e1d32a 100644 --- a/Scripts/Items/Misc/TrashBarrel.cs +++ b/Scripts/Items/Misc/TrashBarrel.cs @@ -105,7 +105,7 @@ namespace Server.Items public void Empty( int message ) { - List items = this.Items; + List items = Items; if ( items.Count > 0 ) { diff --git a/Scripts/Items/Misc/WarningItem.cs b/Scripts/Items/Misc/WarningItem.cs index e3e8d3c96..1ffce81d7 100644 --- a/Scripts/Items/Misc/WarningItem.cs +++ b/Scripts/Items/Misc/WarningItem.cs @@ -101,7 +101,7 @@ namespace Server.Items m_Broadcasting = true; - SendMessage( triggerer, this.OnlyToTriggerer, m_WarningString, m_WarningNumber ); + SendMessage( triggerer, OnlyToTriggerer, m_WarningString, m_WarningNumber ); if ( NeighborRange >= 0 ) { diff --git a/Scripts/Items/Misc/Waypoint.cs b/Scripts/Items/Misc/Waypoint.cs index 46703c9e4..b9cc592a1 100644 --- a/Scripts/Items/Misc/Waypoint.cs +++ b/Scripts/Items/Misc/Waypoint.cs @@ -24,8 +24,8 @@ namespace Server.Items [Constructible] public WayPoint() : base( 0x1f14 ) { - this.Hue = 0x498; - this.Visible = false; + Hue = 0x498; + Visible = false; //this.Movable = false; } diff --git a/Scripts/Items/Misc/WindChimes.cs b/Scripts/Items/Misc/WindChimes.cs index 59b162c18..dce9395c0 100644 --- a/Scripts/Items/Misc/WindChimes.cs +++ b/Scripts/Items/Misc/WindChimes.cs @@ -27,8 +27,8 @@ namespace Server.Items public override void OnMovement( Mobile m, Point3D oldLocation ) { - if ( m_TurnedOn && IsLockedDown && (!m.Hidden || m.AccessLevel == AccessLevel.Player) && Utility.InRange( m.Location, this.Location, 2 ) && !Utility.InRange( oldLocation, this.Location, 2 ) ) - Effects.PlaySound( this.Location, this.Map, m_Sounds[Utility.Random( m_Sounds.Length )] ); + if ( m_TurnedOn && IsLockedDown && (!m.Hidden || m.AccessLevel == AccessLevel.Player) && Utility.InRange( m.Location, Location, 2 ) && !Utility.InRange( oldLocation, Location, 2 ) ) + Effects.PlaySound( Location, Map, m_Sounds[Utility.Random( m_Sounds.Length )] ); base.OnMovement( m, oldLocation ); } diff --git a/Scripts/Items/Resources/Blacksmithing/Ore.cs b/Scripts/Items/Resources/Blacksmithing/Ore.cs index 084dbf9cc..8ffc07387 100644 --- a/Scripts/Items/Resources/Blacksmithing/Ore.cs +++ b/Scripts/Items/Resources/Blacksmithing/Ore.cs @@ -141,7 +141,7 @@ namespace Server.Items { from.SendLocalizedMessage( 500447 ); // That is not accessible } - else if ( from.InRange( this.GetWorldLocation(), 2 ) ) + else if ( from.InRange( GetWorldLocation(), 2 ) ) { from.SendLocalizedMessage( 501971 ); // Select the forge on which to smelt the ore, or another pile of ore with which to combine it. from.Target = new InternalTarget( this ); diff --git a/Scripts/Items/Shields/BaseShield.cs b/Scripts/Items/Shields/BaseShield.cs index 6f8d1dd59..31189a24b 100644 --- a/Scripts/Items/Shields/BaseShield.cs +++ b/Scripts/Items/Shields/BaseShield.cs @@ -45,7 +45,7 @@ namespace Server.Items { get { - Mobile m = this.Parent as Mobile; + Mobile m = Parent as Mobile; double ar = base.ArmorRating; if ( m != null ) @@ -114,7 +114,7 @@ namespace Server.Items if ( !(Parent is Mobile owner) ) return damage; - double ar = this.ArmorRating; + double ar = ArmorRating; double chance = (owner.Skills[SkillName.Parry].Value - (ar * 2.0)) / 100.0; if ( chance < 0.01 ) diff --git a/Scripts/Items/Skill Items/Blacksmith Items/Misc/AnvilForge.cs b/Scripts/Items/Skill Items/Blacksmith Items/Misc/AnvilForge.cs index 2538ab487..ce42a143e 100644 --- a/Scripts/Items/Skill Items/Blacksmith Items/Misc/AnvilForge.cs +++ b/Scripts/Items/Skill Items/Blacksmith Items/Misc/AnvilForge.cs @@ -1,7 +1,7 @@ namespace Server.Items { [FlippableAttribute( 0xFAF, 0xFB0 )] - [Server.Engines.Craft.Anvil] + [Engines.Craft.Anvil] public class Anvil : Item { [Constructible] @@ -29,7 +29,7 @@ namespace Server.Items } } - [Server.Engines.Craft.Forge] + [Engines.Craft.Forge] public class Forge : Item { [Constructible] diff --git a/Scripts/Items/Skill Items/Blacksmith Items/Misc/LargeForge.cs b/Scripts/Items/Skill Items/Blacksmith Items/Misc/LargeForge.cs index 007a4b14b..5f10caf81 100644 --- a/Scripts/Items/Skill Items/Blacksmith Items/Misc/LargeForge.cs +++ b/Scripts/Items/Skill Items/Blacksmith Items/Misc/LargeForge.cs @@ -1,6 +1,6 @@ namespace Server.Items { - [Server.Engines.Craft.Forge] + [Engines.Craft.Forge] public class LargeForgeWest : Item { private InternalItem m_Item; @@ -65,7 +65,7 @@ namespace Server.Items m_Item2 = reader.ReadItem() as InternalItem2; } - [Server.Engines.Craft.Forge] + [Engines.Craft.Forge] private class InternalItem : Item { private LargeForgeWest m_Item; @@ -120,7 +120,7 @@ namespace Server.Items } } - [Server.Engines.Craft.Forge] + [Engines.Craft.Forge] private class InternalItem2 : Item { private LargeForgeWest m_Item; @@ -176,7 +176,7 @@ namespace Server.Items } } - [Server.Engines.Craft.Forge] + [Engines.Craft.Forge] public class LargeForgeEast : Item { private InternalItem m_Item; @@ -241,7 +241,7 @@ namespace Server.Items m_Item2 = reader.ReadItem() as InternalItem2; } - [Server.Engines.Craft.Forge] + [Engines.Craft.Forge] private class InternalItem : Item { private LargeForgeEast m_Item; @@ -296,7 +296,7 @@ namespace Server.Items } } - [Server.Engines.Craft.Forge] + [Engines.Craft.Forge] private class InternalItem2 : Item { private LargeForgeEast m_Item; diff --git a/Scripts/Items/Skill Items/Camping/Bedroll.cs b/Scripts/Items/Skill Items/Camping/Bedroll.cs index a4c5d11ff..9d44366dd 100644 --- a/Scripts/Items/Skill Items/Camping/Bedroll.cs +++ b/Scripts/Items/Skill Items/Camping/Bedroll.cs @@ -20,7 +20,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( this.Parent != null || !this.VerifyMove( from ) ) + if ( Parent != null || !VerifyMove( from ) ) return; if ( !from.InRange( this, 2 ) ) @@ -29,18 +29,18 @@ namespace Server.Items return; } - if ( this.ItemID == 0xA57 ) // rolled + if ( ItemID == 0xA57 ) // rolled { - Direction dir = PlayerMobile.GetDirection4( from.Location, this.Location ); + Direction dir = PlayerMobile.GetDirection4( from.Location, Location ); if ( dir == Direction.North || dir == Direction.South ) - this.ItemID = 0xA55; + ItemID = 0xA55; else - this.ItemID = 0xA56; + ItemID = 0xA56; } else // unrolled { - this.ItemID = 0xA57; + ItemID = 0xA57; if ( !from.HasGump( typeof( LogoutGump ) ) ) { diff --git a/Scripts/Items/Skill Items/Camping/Campfire.cs b/Scripts/Items/Skill Items/Camping/Campfire.cs index 95c08034a..d1ba87da2 100644 --- a/Scripts/Items/Skill Items/Camping/Campfire.cs +++ b/Scripts/Items/Skill Items/Camping/Campfire.cs @@ -57,7 +57,7 @@ namespace Server.Items { get { - switch ( this.ItemID ) + switch ( ItemID ) { case 0xDE3: return CampfireStatus.Burning; @@ -71,24 +71,24 @@ namespace Server.Items } set { - if ( this.Status == value ) + if ( Status == value ) return; switch ( value ) { case CampfireStatus.Burning: - this.ItemID = 0xDE3; - this.Light = LightType.Circle300; + ItemID = 0xDE3; + Light = LightType.Circle300; break; case CampfireStatus.Extinguishing: - this.ItemID = 0xDE9; - this.Light = LightType.Circle150; + ItemID = 0xDE9; + Light = LightType.Circle150; break; default: - this.ItemID = 0xDEA; - this.Light = LightType.ArchedWindowEast; + ItemID = 0xDEA; + Light = LightType.ArchedWindowEast; ClearEntries(); break; } @@ -98,16 +98,16 @@ namespace Server.Items private void OnTick() { DateTime now = DateTime.UtcNow; - TimeSpan age = now - this.Created; + TimeSpan age = now - Created; if ( age >= TimeSpan.FromSeconds( 100.0 ) ) - this.Delete(); + Delete(); else if ( age >= TimeSpan.FromSeconds( 90.0 ) ) - this.Status = CampfireStatus.Off; + Status = CampfireStatus.Off; else if ( age >= TimeSpan.FromSeconds( 60.0 ) ) - this.Status = CampfireStatus.Extinguishing; + Status = CampfireStatus.Extinguishing; - if ( this.Status == CampfireStatus.Off || this.Deleted ) + if ( Status == CampfireStatus.Off || Deleted ) return; foreach ( CampfireEntry entry in new ArrayList( m_Entries ) ) @@ -123,7 +123,7 @@ namespace Server.Items } } - IPooledEnumerable eable = this.GetClientsInRange( SecureRange ); + IPooledEnumerable eable = GetClientsInRange( SecureRange ); foreach ( NetState state in eable ) { @@ -172,7 +172,7 @@ namespace Server.Items int version = reader.ReadInt(); - this.Delete(); + Delete(); } } diff --git a/Scripts/Items/Skill Items/Camping/Kindling.cs b/Scripts/Items/Skill Items/Camping/Kindling.cs index 4186083fc..699262e03 100644 --- a/Scripts/Items/Skill Items/Camping/Kindling.cs +++ b/Scripts/Items/Skill Items/Camping/Kindling.cs @@ -41,10 +41,10 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( !this.VerifyMove( from ) ) + if ( !VerifyMove( from ) ) return; - if ( !from.InRange( this.GetWorldLocation(), 2 ) ) + if ( !from.InRange( GetWorldLocation(), 2 ) ) { from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that. return; @@ -64,7 +64,7 @@ namespace Server.Items { Consume(); - if ( !this.Deleted && this.Parent == null ) + if ( !Deleted && Parent == null ) from.PlaceInBackpack( this ); new Campfire().MoveToWorld( fireLocation, from.Map ); @@ -76,8 +76,8 @@ namespace Server.Items if ( from.Region.IsPartOf( typeof( DungeonRegion ) ) ) return Point3D.Zero; - if ( this.Parent == null ) - return this.Location; + if ( Parent == null ) + return Location; ArrayList list = new ArrayList( 4 ); diff --git a/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs b/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs index 1739f837c..9ed23f2ed 100644 --- a/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs +++ b/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs @@ -247,10 +247,10 @@ namespace Server.Items public bool CouldFit( IPoint3D p, Map map ) { - if ( !map.CanFit( p.X, p.Y, p.Z, this.ItemData.Height ) ) + if ( !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) ) return false; - if ( this.ItemID == m_NorthID ) + if ( ItemID == m_NorthID ) return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ); // North wall else return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // West wall @@ -300,21 +300,21 @@ namespace Server.Items private void FixMovingCrate() { - if ( this.Deleted ) + if ( Deleted ) return; - if ( this.Movable || this.IsLockedDown ) + if ( Movable || IsLockedDown ) { - Item deed = this.Deed; + Item deed = Deed; - if ( this.Parent is Item item ) + if ( Parent is Item item ) { item.AddItem( deed ); - deed.Location = this.Location; + deed.Location = Location; } else { - deed.MoveToWorld( this.Location, this.Map ); + deed.MoveToWorld( Location, Map ); } Delete(); @@ -331,7 +331,7 @@ namespace Server.Items { if ( from.InRange( GetWorldLocation(), 1 ) ) { - from.AddToBackpack( this.Deed ); + from.AddToBackpack( Deed ); Delete(); } else diff --git a/Scripts/Items/Skill Items/Fishing/Misc/SOS.cs b/Scripts/Items/Skill Items/Fishing/Misc/SOS.cs index 06c32f8af..13f6fe402 100644 --- a/Scripts/Items/Skill Items/Fishing/Misc/SOS.cs +++ b/Scripts/Items/Skill Items/Fishing/Misc/SOS.cs @@ -131,7 +131,7 @@ namespace Server.Items } case 0: { - m_TargetMap = this.Map; + m_TargetMap = Map; if ( m_TargetMap == null || m_TargetMap == Map.Internal ) m_TargetMap = Map.Trammel; diff --git a/Scripts/Items/Skill Items/Fishing/Misc/Sextant.cs b/Scripts/Items/Skill Items/Fishing/Misc/Sextant.cs index 3917ee405..019ecf96a 100644 --- a/Scripts/Items/Skill Items/Fishing/Misc/Sextant.cs +++ b/Scripts/Items/Skill Items/Fishing/Misc/Sextant.cs @@ -35,9 +35,9 @@ namespace Server.Items int xMins = 0, yMins = 0; bool xEast = false, ySouth = false; - if ( Sextant.Format( from.Location, from.Map, ref xLong, ref yLat, ref xMins, ref yMins, ref xEast, ref ySouth ) ) + if ( Format( from.Location, from.Map, ref xLong, ref yLat, ref xMins, ref yMins, ref xEast, ref ySouth ) ) { - string location = String.Format( "{0}° {1}'{2}, {3}° {4}'{5}", yLat, yMins, ySouth ? "S" : "N", xLong, xMins, xEast ? "E" : "W" ); + string location = String.Format( "{0}� {1}'{2}, {3}� {4}'{5}", yLat, yMins, ySouth ? "S" : "N", xLong, xMins, xEast ? "E" : "W" ); from.LocalOverheadMessage( MessageType.Regular, from.SpeechHue, false, location ); } } diff --git a/Scripts/Items/Skill Items/Fishing/Misc/ShipwreckedItem.cs b/Scripts/Items/Skill Items/Fishing/Misc/ShipwreckedItem.cs index d8a01e639..11626121d 100644 --- a/Scripts/Items/Skill Items/Fishing/Misc/ShipwreckedItem.cs +++ b/Scripts/Items/Skill Items/Fishing/Misc/ShipwreckedItem.cs @@ -11,17 +11,17 @@ namespace Server.Items { public ShipwreckedItem( int itemID ) : base( itemID ) { - int weight = this.ItemData.Weight; + int weight = ItemData.Weight; if ( weight >= 255 ) weight = 1; - this.Weight = weight; + Weight = weight; } public override void OnSingleClick( Mobile from ) { - this.LabelTo( from, 1050039, String.Format( "#{0}\t#1041645", LabelNumber ) ); + LabelTo( from, 1050039, String.Format( "#{0}\t#1041645", LabelNumber ) ); } public override void AddNameProperties( ObjectPropertyList list ) diff --git a/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs b/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs index d9533300a..a6e0878df 100644 --- a/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs +++ b/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs @@ -221,7 +221,7 @@ namespace Server.Items if ( index == 14 ) FinishEffect( p, Map, from ); else - this.Z -= 1; + Z -= 1; } } @@ -252,7 +252,7 @@ namespace Server.Items LandTile t = map.Tiles.GetLandTile( tx, ty ); - if ( t.Z == p.Z && ( (t.ID >= 0xA8 && t.ID <= 0xAB) || (t.ID >= 0x136 && t.ID <= 0x137) ) && !Spells.SpellHelper.CheckMulti( new Point3D( tx, ty, p.Z ), map ) ) + if ( t.Z == p.Z && ( (t.ID >= 0xA8 && t.ID <= 0xAB) || (t.ID >= 0x136 && t.ID <= 0x137) ) && !SpellHelper.CheckMulti( new Point3D( tx, ty, p.Z ), map ) ) { x = tx; y = ty; diff --git a/Scripts/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs b/Scripts/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs index 7806897c8..66518c74b 100644 --- a/Scripts/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs +++ b/Scripts/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs @@ -148,7 +148,7 @@ namespace Server.Items bool stoneMining = ( mobile.StoneMining && mobile.Skills[SkillName.Mining].Base >= 100.0 ); if ( mobile.ToggleMiningStone == value || ( value && !stoneMining ) ) - this.Flags |= CMEFlags.Disabled; + Flags |= CMEFlags.Disabled; } public override void OnClick() diff --git a/Scripts/Items/Skill Items/Magical/Misc/Moongate.cs b/Scripts/Items/Skill Items/Magical/Misc/Moongate.cs index 4aab20440..3a8584ead 100644 --- a/Scripts/Items/Skill Items/Magical/Misc/Moongate.cs +++ b/Scripts/Items/Skill Items/Magical/Misc/Moongate.cs @@ -161,10 +161,10 @@ namespace Server.Items public virtual bool ValidateUse( Mobile from, bool message ) { - if ( from.Deleted || this.Deleted ) + if ( from.Deleted || Deleted ) return false; - if ( from.Map != this.Map || !from.InRange( this, 1 ) ) + if ( from.Map != Map || !from.InRange( this, 1 ) ) { if ( message ) from.SendLocalizedMessage( 500446 ); // That is too far away. diff --git a/Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs b/Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs index 7fa36979d..45ee7678d 100644 --- a/Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs +++ b/Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs @@ -43,7 +43,7 @@ namespace Server.Items { int held = Math.Max( 0, Math.Min( m_Held, 100 ) ); - this.Weight = 20 + ((held * 80) / 100); + Weight = 20 + ((held * 80) / 100); } public PotionKeg( Serial serial ) : base( serial ) @@ -160,7 +160,7 @@ namespace Server.Items else number = 502258; // The keg is completely full. - this.LabelTo( from, number ); + LabelTo( from, number ); } public override void OnDoubleClick( Mobile from ) diff --git a/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs index 241ae94b4..70cc5e50f 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs @@ -47,10 +47,10 @@ namespace Server.Items { if ( DoAgility( from ) ) { - BasePotion.PlayDrinkEffect( from ); + PlayDrinkEffect( from ); if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) ) - this.Consume(); + Consume(); } } } diff --git a/Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs b/Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs index 40f11e4e9..e32999fe4 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs @@ -89,13 +89,13 @@ namespace Server.Items if ( !Movable ) return; - if ( from.InRange( this.GetWorldLocation(), 1 ) ) + if ( from.InRange( GetWorldLocation(), 1 ) ) { if (!RequireFreeHand || HasFreeHand(from)) { if (this is BaseExplosionPotion && Amount > 1) { - BasePotion pot = (BasePotion)Activator.CreateInstance(this.GetType()); + BasePotion pot = (BasePotion)Activator.CreateInstance(GetType()); if (pot != null) { @@ -114,7 +114,7 @@ namespace Server.Items } else { - this.Drink( from ); + Drink( from ); } } else diff --git a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs index bb37ec6cf..17d5bc8b9 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs @@ -84,13 +84,13 @@ namespace Server.Items { DoCure( from ); - BasePotion.PlayDrinkEffect( from ); + PlayDrinkEffect( from ); from.FixedParticles( 0x373A, 10, 15, 5012, EffectLayer.Waist ); from.PlaySound( 0x1E0 ); if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) ) - this.Consume(); + Consume(); } else { diff --git a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs index 5e793c258..d509e2883 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs @@ -42,12 +42,12 @@ namespace Server.Items public virtual object FindParent( Mobile from ) { - Mobile m = this.HeldBy; + Mobile m = HeldBy; if ( m != null && m.Holding == this ) return m; - object obj = this.RootParent; + object obj = RootParent; if ( obj != null ) return obj; @@ -73,7 +73,7 @@ namespace Server.Items } ThrowTarget targ = from.Target as ThrowTarget; - this.Stackable = false; // Scavenged explosion potions won't stack with those ones in backpack, and still will explode. + Stackable = false; // Scavenged explosion potions won't stack with those ones in backpack, and still will explode. if ( targ != null && targ.Potion == this ) return; diff --git a/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs index f15812a43..6d50670fd 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs @@ -53,10 +53,10 @@ namespace Server.Items { DoHeal( from ); - BasePotion.PlayDrinkEffect( from ); + PlayDrinkEffect( from ); if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) ) - this.Consume(); + Consume(); Timer.DelayCall( TimeSpan.FromSeconds( Delay ), new TimerStateCallback( ReleaseHealLock ), from ); } diff --git a/Scripts/Items/Skill Items/Magical/Potions/NightSight.cs b/Scripts/Items/Skill Items/Magical/Potions/NightSight.cs index d52fd6950..d8037844c 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/NightSight.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/NightSight.cs @@ -35,10 +35,10 @@ namespace Server.Items from.FixedParticles( 0x376A, 9, 32, 5007, EffectLayer.Waist ); from.PlaySound( 0x1E3 ); - BasePotion.PlayDrinkEffect( from ); + PlayDrinkEffect( from ); if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) ) - this.Consume(); + Consume(); } else { diff --git a/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs index de35d32cf..05530c8d5 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs @@ -38,10 +38,10 @@ namespace Server.Items { DoPoison( from ); - BasePotion.PlayDrinkEffect( from ); + PlayDrinkEffect( from ); if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) ) - this.Consume(); + Consume(); } } } \ No newline at end of file diff --git a/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs index 0a42f9c02..3315cd37d 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs @@ -32,10 +32,10 @@ namespace Server.Items { from.Stam += Scale( from, (int)(Refresh * from.StamMax) ); - BasePotion.PlayDrinkEffect( from ); + PlayDrinkEffect( from ); if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) ) - this.Consume(); + Consume(); } else { diff --git a/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs index 0077af7ba..21bdd2af7 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs @@ -47,10 +47,10 @@ namespace Server.Items { if ( DoStrength( from ) ) { - BasePotion.PlayDrinkEffect( from ); + PlayDrinkEffect( from ); if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) ) - this.Consume(); + Consume(); } } } diff --git a/Scripts/Items/Skill Items/Magical/Scrolls/SpellScroll.cs b/Scripts/Items/Skill Items/Magical/Scrolls/SpellScroll.cs index 58fa42848..c9893361d 100644 --- a/Scripts/Items/Skill Items/Magical/Scrolls/SpellScroll.cs +++ b/Scripts/Items/Skill Items/Magical/Scrolls/SpellScroll.cs @@ -62,8 +62,8 @@ namespace Server.Items { base.GetContextMenuEntries( from, list ); - if ( from.Alive && this.Movable ) - list.Add( new ContextMenus.AddToSpellbookEntry() ); + if ( from.Alive && Movable ) + list.Add( new AddToSpellbookEntry() ); } public override void OnDoubleClick( Mobile from ) diff --git a/Scripts/Items/Skill Items/Magical/Spellbook.cs b/Scripts/Items/Skill Items/Magical/Spellbook.cs index 83c4e4e5a..7efa3c306 100644 --- a/Scripts/Items/Skill Items/Magical/Spellbook.cs +++ b/Scripts/Items/Skill Items/Magical/Spellbook.cs @@ -102,7 +102,7 @@ namespace Server.Items case 7: type = SpellbookType.Mystic; break; } - Spellbook book = Spellbook.Find( from, -1, type ); + Spellbook book = Find( from, -1, type ); if ( book != null ) book.DisplayTo( from ); @@ -353,7 +353,7 @@ namespace Server.Items { SpellbookType type = GetTypeForSpell( scroll.SpellID ); - if ( type != this.SpellbookType ) + if ( type != SpellbookType ) { return false; } @@ -452,7 +452,7 @@ namespace Server.Items if ( strBonus != 0 || dexBonus != 0 || intBonus != 0 ) { - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); if ( strBonus != 0 ) from.AddStatMod( new StatMod( StatType.Str, modName + "Str", strBonus, TimeSpan.Zero ) ); @@ -474,7 +474,7 @@ namespace Server.Items { m_AosSkillBonuses.Remove(); - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); from.RemoveStatMod( modName + "Str" ); from.RemoveStatMod( modName + "Dex" ); @@ -506,7 +506,7 @@ namespace Server.Items if ( Parent == null ) { - to.Send( this.WorldPacket ); + to.Send( WorldPacket ); } else if ( Parent is Item ) { @@ -668,9 +668,9 @@ namespace Server.Items base.OnSingleClick( from ); if ( m_Crafter != null ) - this.LabelTo( from, 1050043, m_Crafter.Name ); // crafted by ~1_NAME~ + LabelTo( from, 1050043, m_Crafter.Name ); // crafted by ~1_NAME~ - this.LabelTo( from, 1042886, m_Count.ToString() ); + LabelTo( from, 1042886, m_Count.ToString() ); } public override void OnDoubleClick( Mobile from ) diff --git a/Scripts/Items/Skill Items/Misc/FireHorn.cs b/Scripts/Items/Skill Items/Misc/FireHorn.cs index 26d9b552c..cd1302d59 100644 --- a/Scripts/Items/Skill Items/Misc/FireHorn.cs +++ b/Scripts/Items/Skill Items/Misc/FireHorn.cs @@ -23,10 +23,10 @@ namespace Server.Items private bool CheckUse( Mobile from ) { - if ( !this.IsAccessibleTo( from ) ) + if ( !IsAccessibleTo( from ) ) return false; - if ( from.Map != this.Map || !from.InRange( GetWorldLocation(), 2 ) ) + if ( from.Map != Map || !from.InRange( GetWorldLocation(), 2 ) ) { from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that. return false; @@ -171,7 +171,7 @@ namespace Server.Items if ( Utility.RandomDouble() < breakChance ) { from.SendLocalizedMessage( 1049619 ); // The fire horn crumbles in your hands. - this.Delete(); + Delete(); } } diff --git a/Scripts/Items/Skill Items/Misc/RecipeScroll.cs b/Scripts/Items/Skill Items/Misc/RecipeScroll.cs index 2b21be0a3..395df92ac 100644 --- a/Scripts/Items/Skill Items/Misc/RecipeScroll.cs +++ b/Scripts/Items/Skill Items/Misc/RecipeScroll.cs @@ -32,7 +32,7 @@ namespace Server.Items { base.GetProperties( list ); - Recipe r = this.Recipe; + Recipe r = Recipe; if ( r != null ) list.Add( 1049644, r.TextDefinition.ToString() ); // [~1_stuff~] @@ -57,13 +57,13 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( !from.InRange( this.GetWorldLocation(), 2 ) ) + if ( !from.InRange( GetWorldLocation(), 2 ) ) { from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that. return; } - Recipe r = this.Recipe; + Recipe r = Recipe; if ( r != null && from is PlayerMobile pm ) { @@ -76,7 +76,7 @@ namespace Server.Items { pm.SendLocalizedMessage( 1073451, r.TextDefinition.ToString() ); // You have learned a new recipe: ~1_RECIPE~ pm.AcquireRecipe( r ); - this.Delete(); + Delete(); } else { diff --git a/Scripts/Items/Skill Items/Misc/RepairDeed.cs b/Scripts/Items/Skill Items/Misc/RepairDeed.cs index 4c800a82c..21428d5a4 100644 --- a/Scripts/Items/Skill Items/Misc/RepairDeed.cs +++ b/Scripts/Items/Skill Items/Misc/RepairDeed.cs @@ -110,10 +110,10 @@ namespace Server.Items if ( Deleted || !from.CanSee( this ) ) return; - this.LabelTo( from, 1061133, String.Format( "{0}\t{1}", GetSkillTitle( m_SkillLevel ).ToString(), RepairSkillInfo.GetInfo( m_Skill ).Name ) ); // A repair service contract from ~1_SKILL_TITLE~ ~2_SKILL_NAME~. + LabelTo( from, 1061133, String.Format( "{0}\t{1}", GetSkillTitle( m_SkillLevel ).ToString(), RepairSkillInfo.GetInfo( m_Skill ).Name ) ); // A repair service contract from ~1_SKILL_TITLE~ ~2_SKILL_NAME~. if ( m_Crafter != null ) - this.LabelTo( from, 1050043, m_Crafter.Name ); // crafted by ~1_NAME~ + LabelTo( from, 1050043, m_Crafter.Name ); // crafted by ~1_NAME~ } [Constructible] @@ -208,7 +208,7 @@ namespace Server.Items if ( !m.Region.IsPartOf( typeof( TownRegion ) ) ) return false; - return Server.Factions.Faction.IsNearType( m, RepairSkillInfo.GetInfo( m_Skill ).NearbyTypes, 6 ); + return Factions.Faction.IsNearType( m, RepairSkillInfo.GetInfo( m_Skill ).NearbyTypes, 6 ); } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs b/Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs index a07eb9de3..e3ef5ee83 100644 --- a/Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs +++ b/Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs @@ -410,7 +410,7 @@ namespace Server.Items } else { - this.LabelTo( from, Name ); + LabelTo( from, Name ); number = 1041000; } diff --git a/Scripts/Items/Skill Items/Specialized/Sand.cs b/Scripts/Items/Skill Items/Specialized/Sand.cs index b3e375f2c..df7c04b97 100644 --- a/Scripts/Items/Skill Items/Specialized/Sand.cs +++ b/Scripts/Items/Skill Items/Specialized/Sand.cs @@ -37,8 +37,8 @@ namespace Server.Items int version = reader.ReadInt(); - if ( version == 0 && this.Name == "sand" ) - this.Name = null; + if ( version == 0 && Name == "sand" ) + Name = null; } } } diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs index 6ff63d506..60eb198fc 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs @@ -119,7 +119,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( from.InRange( this.GetWorldLocation(), 1 ) ) + if ( from.InRange( GetWorldLocation(), 1 ) ) { from.SendLocalizedMessage( TargetMessage ); from.Target = new InternalTarget( this ); diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs index 8f37a8fb9..c388f3015 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs @@ -24,7 +24,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( m_IsRewardItem && !Engines.VeteranRewards.RewardSystem.CheckIsUsableBy( from, this, null ) ) + if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; base.OnDoubleClick( from ); diff --git a/Scripts/Items/Skill Items/Tools/BaseTool.cs b/Scripts/Items/Skill Items/Tools/BaseTool.cs index aad3f7100..3b7207010 100644 --- a/Scripts/Items/Skill Items/Tools/BaseTool.cs +++ b/Scripts/Items/Skill Items/Tools/BaseTool.cs @@ -128,7 +128,7 @@ namespace Server.Items { if ( IsChildOf( from.Backpack ) || Parent == from ) { - CraftSystem system = this.CraftSystem; + CraftSystem system = CraftSystem; int num = system.CanCraft( from, this, null ); diff --git a/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs b/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs index 1ad78c01e..156d68de6 100644 --- a/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs +++ b/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs @@ -9,7 +9,7 @@ namespace Server.Items { public sealed class StopMusic : Packet { - public static readonly Packet Instance = Packet.SetStatic( new StopMusic() ); + public static readonly Packet Instance = SetStatic( new StopMusic() ); public StopMusic() : base( 0x6D, 3 ) { diff --git a/Scripts/Items/Special/AoS Promotional/LuckyNecklace.cs b/Scripts/Items/Special/AoS Promotional/LuckyNecklace.cs index e22731a3a..085af49bf 100644 --- a/Scripts/Items/Special/AoS Promotional/LuckyNecklace.cs +++ b/Scripts/Items/Special/AoS Promotional/LuckyNecklace.cs @@ -9,7 +9,7 @@ public LuckyNecklace( ) : base( 0x1088, Layer.Neck ) { - base.Attributes.Luck = 200; + Attributes.Luck = 200; LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/GlovesOfMining.cs b/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/GlovesOfMining.cs index a70f4f029..890c7c188 100644 --- a/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/GlovesOfMining.cs +++ b/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/GlovesOfMining.cs @@ -196,7 +196,7 @@ namespace Server.Items { m_Bonus = bonus; - this.Hue = CraftResources.GetHue( (CraftResource)Utility.RandomMinMax( (int)CraftResource.DullCopper, (int)CraftResource.Valorite ) ); + Hue = CraftResources.GetHue( (CraftResource)Utility.RandomMinMax( (int)CraftResource.DullCopper, (int)CraftResource.Valorite ) ); } public override void GetProperties( ObjectPropertyList list ) diff --git a/Scripts/Items/Special/Heritage Items/IronMaiden.cs b/Scripts/Items/Special/Heritage Items/IronMaiden.cs index 43770804f..43ece53e5 100644 --- a/Scripts/Items/Special/Heritage Items/IronMaiden.cs +++ b/Scripts/Items/Special/Heritage Items/IronMaiden.cs @@ -19,7 +19,7 @@ namespace Server.Items public override void OnComponentUsed( AddonComponent c, Mobile from ) { - if ( from.InRange( this.GetWorldLocation(), 2 ) && from.InLOS( this.GetWorldLocation() ) ) + if ( from.InRange( GetWorldLocation(), 2 ) && from.InLOS( GetWorldLocation() ) ) { if ( Utility.RandomBool() ) { diff --git a/Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs b/Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs index 6c186d13b..f69537447 100644 --- a/Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs +++ b/Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs @@ -198,7 +198,7 @@ namespace Server.Items private void AddItem( int x, int y, int z, Item item ) { - item.MoveToWorld( new Point3D( this.Location.X + x, this.Location.Y + y, this.Location.Z + z ), this.Map ); + item.MoveToWorld( new Point3D( Location.X + x, Location.Y + y, Location.Z + z ), Map ); m_Components.Add( item ); } @@ -278,13 +278,13 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( from.InRange( this.GetWorldLocation(), 1 ) ) + if ( from.InRange( GetWorldLocation(), 1 ) ) { if ( m_Placer == null || from == m_Placer || from.AccessLevel >= AccessLevel.GameMaster ) { from.AddToBackpack( new HolidayTreeDeed() ); - this.Delete(); + Delete(); BaseHouse house = BaseHouse.FindHouseAt( this ); diff --git a/Scripts/Items/Special/Holiday/Wreath.cs b/Scripts/Items/Special/Holiday/Wreath.cs index bcfe2ff37..bbdd33a61 100644 --- a/Scripts/Items/Special/Holiday/Wreath.cs +++ b/Scripts/Items/Special/Holiday/Wreath.cs @@ -26,10 +26,10 @@ namespace Server.Items public bool CouldFit( IPoint3D p, Map map ) { - if ( !map.CanFit( p.X, p.Y, p.Z, this.ItemData.Height ) ) + if ( !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) ) return false; - if ( this.ItemID == 0x232C ) + if ( ItemID == 0x232C ) return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ); // North wall else return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // West wall @@ -53,28 +53,28 @@ namespace Server.Items private void FixMovingCrate() { - if ( this.Deleted ) + if ( Deleted ) return; - if ( this.Movable || this.IsLockedDown ) + if ( Movable || IsLockedDown ) { - Item deed = this.Deed; + Item deed = Deed; - if ( this.Parent is Item item ) + if ( Parent is Item item ) { item.AddItem( deed ); - deed.Location = this.Location; + deed.Location = Location; } else { - deed.MoveToWorld( this.Location, this.Map ); + deed.MoveToWorld( Location, Map ); } Delete(); } } - public Item Deed => new WreathDeed( this.Hue ); + public Item Deed => new WreathDeed( Hue ); public override void OnDoubleClick( Mobile from ) { @@ -82,7 +82,7 @@ namespace Server.Items if ( house != null && house.IsCoOwner( from ) ) { - if ( from.InRange( this.GetWorldLocation(), 3 ) ) + if ( from.InRange( GetWorldLocation(), 3 ) ) { from.CloseGump( typeof( WreathAddonGump ) ); from.SendGump( new WreathAddonGump( from, this ) ); @@ -269,7 +269,7 @@ namespace Server.Items if ( itemID > 0 ) { - Item addon = new WreathAddon( this.Hue ); + Item addon = new WreathAddon( Hue ); addon.ItemID = itemID; addon.MoveToWorld( loc, from.Map ); diff --git a/Scripts/Items/Special/House Raffle/HouseRaffleRegion.cs b/Scripts/Items/Special/House Raffle/HouseRaffleRegion.cs index 54e5c0b8d..9d87cb8f8 100644 --- a/Scripts/Items/Special/House Raffle/HouseRaffleRegion.cs +++ b/Scripts/Items/Special/House Raffle/HouseRaffleRegion.cs @@ -10,7 +10,7 @@ namespace Server.Regions private HouseRaffleStone m_Stone; public HouseRaffleRegion( HouseRaffleStone stone ) - : base( null, stone.PlotFacet, Region.DefaultPriority, stone.PlotBounds ) + : base( null, stone.PlotFacet, DefaultPriority, stone.PlotBounds ) { m_Stone = stone; } diff --git a/Scripts/Items/Special/House Raffle/HouseRaffleStone.cs b/Scripts/Items/Special/House Raffle/HouseRaffleStone.cs index af1e63328..c947c29d0 100644 --- a/Scripts/Items/Special/House Raffle/HouseRaffleStone.cs +++ b/Scripts/Items/Special/House Raffle/HouseRaffleStone.cs @@ -673,7 +673,7 @@ namespace Server.Items : base( from, stone, 5113 ) // Start { if ( !stone.ValidLocation() ) - Flags |= Network.CMEFlags.Disabled; + Flags |= CMEFlags.Disabled; } public override void OnClick() diff --git a/Scripts/Items/Special/ML/GrizzledMareStatuette.cs b/Scripts/Items/Special/ML/GrizzledMareStatuette.cs index 7f74ec25c..8b661077c 100644 --- a/Scripts/Items/Special/ML/GrizzledMareStatuette.cs +++ b/Scripts/Items/Special/ML/GrizzledMareStatuette.cs @@ -50,7 +50,7 @@ namespace Server.Mobiles public virtual void OnAfterDeserialize_Callback() { - HellSteed.SetStats( this ); + SetStats( this ); Name = m_Myname; } diff --git a/Scripts/Items/Special/MonsterStatuette.cs b/Scripts/Items/Special/MonsterStatuette.cs index 24b3dceb8..9e7328576 100644 --- a/Scripts/Items/Special/MonsterStatuette.cs +++ b/Scripts/Items/Special/MonsterStatuette.cs @@ -198,12 +198,12 @@ namespace Server.Items public override void OnMovement( Mobile m, Point3D oldLocation ) { - if ( m_TurnedOn && IsLockedDown && (!m.Hidden || m.AccessLevel == AccessLevel.Player) && Utility.InRange( m.Location, this.Location, 2 ) && !Utility.InRange( oldLocation, this.Location, 2 ) ) + if ( m_TurnedOn && IsLockedDown && (!m.Hidden || m.AccessLevel == AccessLevel.Player) && Utility.InRange( m.Location, Location, 2 ) && !Utility.InRange( oldLocation, Location, 2 ) ) { int[] sounds = MonsterStatuetteInfo.GetInfo( m_Type ).Sounds; if ( sounds.Length > 0 ) - Effects.PlaySound( this.Location, this.Map, sounds[Utility.Random( sounds.Length )] ); + Effects.PlaySound( Location, Map, sounds[Utility.Random( sounds.Length )] ); } base.OnMovement( m, oldLocation ); diff --git a/Scripts/Items/Special/Rares/Containers/Bucket.cs b/Scripts/Items/Special/Rares/Containers/Bucket.cs index bc5437820..13cc48d5b 100644 --- a/Scripts/Items/Special/Rares/Containers/Bucket.cs +++ b/Scripts/Items/Special/Rares/Containers/Bucket.cs @@ -17,7 +17,7 @@ [Constructible] public Bucket( bool filled ) - : base( ( filled ) ? Bucket.fItemID : Bucket.vItemID, filled ) + : base( ( filled ) ? fItemID : vItemID, filled ) { } diff --git a/Scripts/Items/Special/Rares/Containers/WaterBarrel.cs b/Scripts/Items/Special/Rares/Containers/WaterBarrel.cs index 74eb0b3cc..20edd8d0b 100644 --- a/Scripts/Items/Special/Rares/Containers/WaterBarrel.cs +++ b/Scripts/Items/Special/Rares/Containers/WaterBarrel.cs @@ -19,7 +19,7 @@ [Constructible] public WaterBarrel( bool filled ) - : base( ( filled ) ? WaterBarrel.fItemID : WaterBarrel.vItemID, filled ) + : base( ( filled ) ? fItemID : vItemID, filled ) { } diff --git a/Scripts/Items/Special/Rares/Containers/WaterTub.cs b/Scripts/Items/Special/Rares/Containers/WaterTub.cs index ee8b49318..46cc881f0 100644 --- a/Scripts/Items/Special/Rares/Containers/WaterTub.cs +++ b/Scripts/Items/Special/Rares/Containers/WaterTub.cs @@ -17,7 +17,7 @@ [Constructible] public Tub( bool filled ) - : base( ( filled ) ? Tub.fItemID : Tub.vItemID, filled ) + : base( ( filled ) ? fItemID : vItemID, filled ) { } diff --git a/Scripts/Items/Special/RewardCake.cs b/Scripts/Items/Special/RewardCake.cs index 2b46035d7..c79b55e0c 100644 --- a/Scripts/Items/Special/RewardCake.cs +++ b/Scripts/Items/Special/RewardCake.cs @@ -23,7 +23,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if (! from.InRange( this.GetWorldLocation(), 1 )) + if (! from.InRange( GetWorldLocation(), 1 )) { from.LocalOverheadMessage( MessageType.Regular, 906, 1019045 ); // I can't reach that. } diff --git a/Scripts/Items/Special/Solen Items/BagOfSending.cs b/Scripts/Items/Special/Solen Items/BagOfSending.cs index a63286bdf..036a10d7e 100644 --- a/Scripts/Items/Special/Solen Items/BagOfSending.cs +++ b/Scripts/Items/Special/Solen Items/BagOfSending.cs @@ -35,8 +35,8 @@ namespace Server.Items get => m_Charges; set { - if ( value > this.MaxCharges ) - m_Charges = this.MaxCharges; + if ( value > MaxCharges ) + m_Charges = MaxCharges; else if ( value < 0 ) m_Charges = 0; else @@ -52,8 +52,8 @@ namespace Server.Items get => m_Recharges; set { - if ( value > this.MaxRecharges ) - m_Recharges = this.MaxRecharges; + if ( value > MaxRecharges ) + m_Recharges = MaxRecharges; else if ( value < 0 ) m_Recharges = 0; else @@ -83,9 +83,9 @@ namespace Server.Items switch ( value ) { - case BagOfSendingHue.Yellow: this.Hue = 0x8A5; break; - case BagOfSendingHue.Blue: this.Hue = 0x8AD; break; - case BagOfSendingHue.Red: this.Hue = 0x89B; break; + case BagOfSendingHue.Yellow: Hue = 0x8A5; break; + case BagOfSendingHue.Blue: Hue = 0x8AD; break; + case BagOfSendingHue.Red: Hue = 0x89B; break; } } } @@ -100,7 +100,7 @@ namespace Server.Items { Weight = 2.0; - this.BagOfSendingHue = hue; + BagOfSendingHue = hue; m_Charges = Utility.RandomMinMax( 3, 9 ); } @@ -157,11 +157,11 @@ namespace Server.Items { from.SendMessage( "You may not do that in jail." ); } - else if ( !this.IsChildOf( from.Backpack ) ) + else if ( !IsChildOf( from.Backpack ) ) { MessageHelper.SendLocalizedMessageTo(this, from, 1062334, 0x59); // The bag of sending must be in your backpack. } - else if ( this.Charges == 0 ) + else if ( Charges == 0 ) { MessageHelper.SendLocalizedMessageTo( this, from, 1042544, 0x59 ); // This item is out of charges. } @@ -213,7 +213,7 @@ namespace Server.Items { MessageHelper.SendLocalizedMessageTo( m_Bag, from, 1054108, 0x59 ); // The bag of sending rejects the cursed item. } - else if ( !item.VerifyMove( from ) || item is Server.Engines.Quests.QuestItem || item.Nontransferable ) + else if ( !item.VerifyMove( from ) || item is Engines.Quests.QuestItem || item.Nontransferable ) { MessageHelper.SendLocalizedMessageTo( m_Bag, from, 1054109, 0x59 ); // The bag of sending rejects that item. } diff --git a/Scripts/Items/Special/Solen Items/BallOfSummoning.cs b/Scripts/Items/Special/Solen Items/BallOfSummoning.cs index 392025759..3c0479760 100644 --- a/Scripts/Items/Special/Solen Items/BallOfSummoning.cs +++ b/Scripts/Items/Special/Solen Items/BallOfSummoning.cs @@ -23,8 +23,8 @@ namespace Server.Items get => m_Charges; set { - if ( value > this.MaxCharges ) - m_Charges = this.MaxCharges; + if ( value > MaxCharges ) + m_Charges = MaxCharges; else if ( value < 0 ) m_Charges = 0; else @@ -40,8 +40,8 @@ namespace Server.Items get => m_Recharges; set { - if ( value > this.MaxRecharges ) - m_Recharges = this.MaxRecharges; + if ( value > MaxRecharges ) + m_Recharges = MaxRecharges; else if ( value < 0 ) m_Recharges = 0; else @@ -109,7 +109,7 @@ namespace Server.Items { base.GetContextMenuEntries( from, list ); - if ( from.Alive && this.RootParent == from ) + if ( from.Alive && RootParent == from ) { if ( Pet == null ) { @@ -144,7 +144,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( this.RootParent != from ) // TODO: Previous implementation allowed use on ground, without house protection checks. What is the correct behavior? + if ( RootParent != from ) // TODO: Previous implementation allowed use on ground, without house protection checks. What is the correct behavior? { from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1042001 ); // That must be in your pack for you to use it. return; @@ -170,9 +170,9 @@ namespace Server.Items public void LinkPet( Mobile from ) { - BaseCreature pet = this.Pet; + BaseCreature pet = Pet; - if ( Deleted || pet != null || this.RootParent != from ) + if ( Deleted || pet != null || RootParent != from ) return; from.SendLocalizedMessage( 1054114 ); // Target your pet that you wish to link to this Crystal Ball of Pet Summoning. @@ -227,9 +227,9 @@ namespace Server.Items public void CastSummonPet( Mobile from ) { - BaseCreature pet = this.Pet; + BaseCreature pet = Pet; - if ( Deleted || pet == null || this.RootParent != from ) + if ( Deleted || pet == null || RootParent != from ) return; if ( Charges == 0 ) @@ -252,9 +252,9 @@ namespace Server.Items { MessageHelper.SendLocalizedMessageTo( this, from, 1054127, 0x22 ); // The Crystal Ball fills with a red mist. You appear to have let your bond to your pet deteriorate. } - else if ( from.Map == Map.Ilshenar || from.Region.IsPartOf( typeof( DungeonRegion ) ) || from.Region.IsPartOf( typeof( Jail ) ) || from.Region.IsPartOf( typeof( Server.Engines.ConPVP.SafeZone ) ) ) + else if ( from.Map == Map.Ilshenar || from.Region.IsPartOf( typeof( DungeonRegion ) ) || from.Region.IsPartOf( typeof( Jail ) ) || from.Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) ) { - from.Send( new AsciiMessage( this.Serial, this.ItemID, MessageType.Regular, 0x22, 3, "", "You cannot summon your pet to this location." ) ); + from.Send( new AsciiMessage( Serial, ItemID, MessageType.Regular, 0x22, 3, "", "You cannot summon your pet to this location." ) ); } else if ( Core.ML && from is PlayerMobile mobile && DateTime.UtcNow < mobile.LastPetBallTime.AddSeconds( 15.0 ) ) { @@ -273,7 +273,7 @@ namespace Server.Items public void SummonPet( Mobile from ) { - BaseCreature pet = this.Pet; + BaseCreature pet = Pet; if ( pet == null ) return; @@ -310,7 +310,7 @@ namespace Server.Items public void UnlinkPet( Mobile from ) { - if ( !Deleted && Pet != null && this.RootParent == from ) + if ( !Deleted && Pet != null && RootParent == from ) { Pet = null; @@ -325,7 +325,7 @@ namespace Server.Items private void InternalUpdatePetName() { - BaseCreature pet = this.Pet; + BaseCreature pet = Pet; if ( pet == null ) m_PetName = ""; @@ -348,7 +348,7 @@ namespace Server.Items writer.WriteEncodedInt( (int) m_Recharges ); writer.WriteEncodedInt( (int) m_Charges ); - writer.Write( (Mobile) this.Pet ); + writer.Write( (Mobile) Pet ); writer.Write( (string) m_PetName ); } @@ -368,7 +368,7 @@ namespace Server.Items case 0: { m_Charges = Math.Min( reader.ReadEncodedInt(), MaxCharges ); - this.Pet = (BaseCreature) reader.ReadMobile(); + Pet = (BaseCreature) reader.ReadMobile(); m_PetName = reader.ReadString(); break; } diff --git a/Scripts/Items/Special/Solen Items/BraceletOfBinding.cs b/Scripts/Items/Special/Solen Items/BraceletOfBinding.cs index b045ec6fc..ac9b9fd63 100644 --- a/Scripts/Items/Special/Solen Items/BraceletOfBinding.cs +++ b/Scripts/Items/Special/Solen Items/BraceletOfBinding.cs @@ -23,8 +23,8 @@ namespace Server.Items get => m_Charges; set { - if ( value > this.MaxCharges ) - m_Charges = this.MaxCharges; + if ( value > MaxCharges ) + m_Charges = MaxCharges; else if ( value < 0 ) m_Charges = 0; else @@ -40,8 +40,8 @@ namespace Server.Items get => m_Recharges; set { - if ( value > this.MaxRecharges ) - m_Recharges = this.MaxRecharges; + if ( value > MaxRecharges ) + m_Recharges = MaxRecharges; else if ( value < 0 ) m_Recharges = 0; else @@ -106,9 +106,9 @@ namespace Server.Items { base.GetContextMenuEntries( from, list ); - if ( from.Alive && this.IsChildOf( from ) ) + if ( from.Alive && IsChildOf( from ) ) { - BraceletOfBinding bound = this.Bound; + BraceletOfBinding bound = Bound; list.Add( new BraceletEntry( new BraceletCallback( Activate ), 6170, bound != null ) ); list.Add( new BraceletEntry( new BraceletCallback( Search ), 6171, bound != null ) ); @@ -142,7 +142,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - BraceletOfBinding bound = this.Bound; + BraceletOfBinding bound = Bound; if ( Bound == null ) { @@ -156,12 +156,12 @@ namespace Server.Items public void Activate( Mobile from ) { - BraceletOfBinding bound = this.Bound; + BraceletOfBinding bound = Bound; if ( Deleted || bound == null ) return; - if ( !this.IsChildOf( from ) ) + if ( !IsChildOf( from ) ) { from.SendLocalizedMessage( 1042664 ); // You must have the object in your backpack to use it. } @@ -218,12 +218,12 @@ namespace Server.Items public void Search( Mobile from ) { - BraceletOfBinding bound = this.Bound; + BraceletOfBinding bound = Bound; if ( Deleted || bound == null ) return; - if ( !this.IsChildOf( from ) ) + if ( !IsChildOf( from ) ) { from.SendLocalizedMessage( 1042664 ); // You must have the object in your backpack to use it. } @@ -235,7 +235,7 @@ namespace Server.Items private bool CheckUse( Mobile from, bool successMessage ) { - BraceletOfBinding bound = this.Bound; + BraceletOfBinding bound = Bound; if ( bound == null ) return false; @@ -295,17 +295,17 @@ namespace Server.Items from.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle?? return false; } - else if ( Server.Misc.WeightOverloading.IsOverloaded( from ) ) + else if ( Misc.WeightOverloading.IsOverloaded( from ) ) { from.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move. return false; } - else if ( from.Region.IsPartOf( typeof( Server.Regions.Jail ) ) ) + else if ( from.Region.IsPartOf( typeof( Regions.Jail ) ) ) { from.SendLocalizedMessage( 1114345, "", 0x35 ); // You'll need a better jailbreak plan than that! return false; } - else if ( boundRoot.Region.IsPartOf( typeof( Server.Regions.Jail ) ) ) + else if ( boundRoot.Region.IsPartOf( typeof( Regions.Jail ) ) ) { from.SendLocalizedMessage( 1019004 ); // You are not allowed to travel there. return false; @@ -324,7 +324,7 @@ namespace Server.Items if ( Deleted ) return; - if ( !this.IsChildOf( from ) ) + if ( !IsChildOf( from ) ) { from.SendLocalizedMessage( 1042664 ); // You must have the object in your backpack to use it. } @@ -383,7 +383,7 @@ namespace Server.Items if ( Deleted ) return; - if ( !this.IsChildOf( from ) ) + if ( !IsChildOf( from ) ) { from.SendLocalizedMessage( 1042664 ); // You must have the object in your backpack to use it. } @@ -439,7 +439,7 @@ namespace Server.Items writer.WriteEncodedInt( (int) m_Charges ); writer.Write( (string) m_Inscription ); - writer.Write( (Item) this.Bound ); + writer.Write( (Item) Bound ); } public override void Deserialize( GenericReader reader ) @@ -459,7 +459,7 @@ namespace Server.Items { m_Charges = Math.Min( reader.ReadEncodedInt(), MaxCharges ); m_Inscription = reader.ReadString(); - this.Bound = (BraceletOfBinding) reader.ReadItem(); + Bound = (BraceletOfBinding) reader.ReadItem(); break; } } diff --git a/Scripts/Items/Special/Solen Items/PowderOfTranslocation.cs b/Scripts/Items/Special/Solen Items/PowderOfTranslocation.cs index 0b77b941c..1f547d56f 100644 --- a/Scripts/Items/Special/Solen Items/PowderOfTranslocation.cs +++ b/Scripts/Items/Special/Solen Items/PowderOfTranslocation.cs @@ -29,7 +29,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( from.InRange( this.GetWorldLocation(), 2 ) ) + if ( from.InRange( GetWorldLocation(), 2 ) ) { from.Target = new InternalTarget( this ); } diff --git a/Scripts/Items/Special/SoulStone.cs b/Scripts/Items/Special/SoulStone.cs index fff949374..83f9d7084 100644 --- a/Scripts/Items/Special/SoulStone.cs +++ b/Scripts/Items/Special/SoulStone.cs @@ -33,7 +33,7 @@ namespace Server.Items m_ActiveItemID = value; if ( !IsEmpty ) - this.ItemID = m_ActiveItemID; + ItemID = m_ActiveItemID; } } @@ -46,7 +46,7 @@ namespace Server.Items m_InactiveItemID = value; if ( IsEmpty ) - this.ItemID = m_InactiveItemID; + ItemID = m_InactiveItemID; } } @@ -86,9 +86,9 @@ namespace Server.Items m_SkillValue = value; if ( !IsEmpty ) - this.ItemID = m_ActiveItemID; + ItemID = m_ActiveItemID; else - this.ItemID = m_InactiveItemID; + ItemID = m_InactiveItemID; InvalidateProperties(); } @@ -131,7 +131,7 @@ namespace Server.Items if ( !IsEmpty ) list.Add( 1070721, "#{0}\t{1:0.0}", AosSkillBonuses.GetLabel( Skill ), SkillValue ); // Skill stored: ~1_skillname~ ~2_skillamount~ - string name = this.LastUserName; + string name = LastUserName; if ( name == null ) name = String.Format( "#{0}", 1074235 ); // Unknown @@ -158,16 +158,16 @@ namespace Server.Items PlayerMobile pm = from as PlayerMobile; - if ( this.Deleted || !this.IsAccessibleTo( from ) ) + if ( Deleted || !IsAccessibleTo( from ) ) { return false; } - else if ( from.Map != this.Map || !from.InRange( GetWorldLocation(), 2 ) ) + else if ( from.Map != Map || !from.InRange( GetWorldLocation(), 2 ) ) { from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that. return false; } - else if ( this.Account != null && ( !(from.Account is Account) || from.Account.Username != this.Account ) ) + else if ( Account != null && ( !(from.Account is Account) || from.Account.Username != Account ) ) { from.SendLocalizedMessage( 1070714 ); // This is an Account Bound Soulstone, and your character is not bound to it. You cannot use this Soulstone. return false; @@ -238,7 +238,7 @@ namespace Server.Items from.CloseGump( typeof( ConfirmRemovalGump ) ); from.CloseGump( typeof( ErrorGump ) ); - if ( this.IsEmpty ) + if ( IsEmpty ) from.SendGump( new SelectSkillGump( this, from ) ); else from.SendGump( new ConfirmTransferGump( this, from ) ); diff --git a/Scripts/Items/Special/Special Scrolls/PowerScroll.cs b/Scripts/Items/Special/Special Scrolls/PowerScroll.cs index 4af2fcec8..61909cd6b 100644 --- a/Scripts/Items/Special/Special Scrolls/PowerScroll.cs +++ b/Scripts/Items/Special/Special Scrolls/PowerScroll.cs @@ -154,7 +154,7 @@ namespace Server.Items { Hue = 0x481; - if ( Value == 105.0 || skill == Server.SkillName.Blacksmith || skill == Server.SkillName.Tailoring ) + if ( Value == 105.0 || skill == SkillName.Blacksmith || skill == SkillName.Tailoring ) LootType = LootType.Regular; } @@ -180,9 +180,9 @@ namespace Server.Items double level = ( Value - 105.0 ) / 5.0; if ( level >= 0.0 && level <= 3.0 && Value % 5.0 == 0.0 ) - base.LabelTo( from, 1049639 + (int)level, GetNameLocalized() ); + LabelTo( from, 1049639 + (int)level, GetNameLocalized() ); else - base.LabelTo( from, "a power scroll of {0} ({1} Skill)", GetName(), Value ); + LabelTo( from, "a power scroll of {0} ({1} Skill)", GetName(), Value ); } public override bool CanUse( Mobile from ) diff --git a/Scripts/Items/Special/Special Scrolls/SpecialScroll.cs b/Scripts/Items/Special/Special Scrolls/SpecialScroll.cs index 91e34e484..5467741d4 100644 --- a/Scripts/Items/Special/Special Scrolls/SpecialScroll.cs +++ b/Scripts/Items/Special/Special Scrolls/SpecialScroll.cs @@ -87,7 +87,7 @@ namespace Server.Items if ( !CanUse( from ) ) return; - from.CloseGump( typeof( SpecialScroll.InternalGump ) ); + from.CloseGump( typeof( InternalGump ) ); from.SendGump( new InternalGump( from, this ) ); } diff --git a/Scripts/Items/Special/Special Scrolls/StatScroll.cs b/Scripts/Items/Special/Special Scrolls/StatScroll.cs index 1e4a48fb4..5566885f9 100644 --- a/Scripts/Items/Special/Special Scrolls/StatScroll.cs +++ b/Scripts/Items/Special/Special Scrolls/StatScroll.cs @@ -61,9 +61,9 @@ namespace Server.Items int level = ( (int)Value - 230 ) / 5; if ( level >= 0 && level <= 4 && (int)Value % 5 == 0 ) - base.LabelTo( from, 1049463 + level, "#1049476" ); + LabelTo( from, 1049463 + level, "#1049476" ); else - base.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 ); } public override bool CanUse( Mobile from ) diff --git a/Scripts/Items/Special/Valentines/2007/ValentinesCard.cs b/Scripts/Items/Special/Valentines/2007/ValentinesCard.cs index d162a75f5..1ca77289b 100644 --- a/Scripts/Items/Special/Valentines/2007/ValentinesCard.cs +++ b/Scripts/Items/Special/Valentines/2007/ValentinesCard.cs @@ -60,7 +60,7 @@ namespace Server.Items { if (m_To == null) { - if (this.IsChildOf(from)) + if (IsChildOf(from)) { from.BeginTarget(10, false, TargetFlags.None, new TargetCallback(OnTarget)); diff --git a/Scripts/Items/Special/Veteran Rewards/Brazier.cs b/Scripts/Items/Special/Veteran Rewards/Brazier.cs index 9419ead12..28467311d 100644 --- a/Scripts/Items/Special/Veteran Rewards/Brazier.cs +++ b/Scripts/Items/Special/Veteran Rewards/Brazier.cs @@ -69,7 +69,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( !from.InRange( this.GetWorldLocation(), 2 ) ) + if ( !from.InRange( GetWorldLocation(), 2 ) ) { from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that. } diff --git a/Scripts/Items/Special/Veteran Rewards/MiningCart.cs b/Scripts/Items/Special/Veteran Rewards/MiningCart.cs index 735b590a8..12ed6c541 100644 --- a/Scripts/Items/Special/Veteran Rewards/MiningCart.cs +++ b/Scripts/Items/Special/Veteran Rewards/MiningCart.cs @@ -159,7 +159,7 @@ namespace Server.Items if (!from.InRange(GetWorldLocation(), 2) || !from.InLOS(this) || !((from.Z - Z) > -3 && (from.Z - Z) < 3)) { - from.LocalOverheadMessage(Network.MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if ( house != null && house.HasSecureAccess( from, SecureLevel.Friends ) ) { diff --git a/Scripts/Items/Special/Veteran Rewards/TreeStump.cs b/Scripts/Items/Special/Veteran Rewards/TreeStump.cs index 4460a1dbc..195c6efd4 100644 --- a/Scripts/Items/Special/Veteran Rewards/TreeStump.cs +++ b/Scripts/Items/Special/Veteran Rewards/TreeStump.cs @@ -82,7 +82,7 @@ namespace Server.Items if (!from.InRange(GetWorldLocation(), 2) || !from.InLOS(this) || !((from.Z - Z) > -3 && (from.Z - Z) < 3)) { - from.LocalOverheadMessage(Network.MessageType.Regular, 0x3B2, 1019045); // I can't reach that. + from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that. } else if ( house != null && house.HasSecureAccess( from, SecureLevel.Friends ) ) { diff --git a/Scripts/Items/Special/Veteran Rewards/WallBanner.cs b/Scripts/Items/Special/Veteran Rewards/WallBanner.cs index 4dc9a6e44..aacc78c42 100644 --- a/Scripts/Items/Special/Veteran Rewards/WallBanner.cs +++ b/Scripts/Items/Special/Veteran Rewards/WallBanner.cs @@ -7,7 +7,7 @@ namespace Server.Items public class WallBannerComponent : AddonComponent, IDyable { public override bool NeedsWall => true; - public override Point3D WallPosition => this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 ); + public override Point3D WallPosition => East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 ); public bool East => ((WallBanner)Addon).East; diff --git a/Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs b/Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs index bd1b2af6f..b5dba90e9 100644 --- a/Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs +++ b/Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs @@ -237,7 +237,7 @@ namespace Server.Items AddTextEntry( 75, 245, 350, 40, 0x0, (int) Buttons.Text, "" ); } - public override void OnResponse( Server.Network.NetState state, RelayInfo info ) + public override void OnResponse( Network.NetState state, RelayInfo info ) { if ( m_Tool == null || m_Tool.Deleted || m_Target == null || m_Target.Deleted ) return; @@ -314,7 +314,7 @@ namespace Server.Items AddHtmlLocalized( 40, 109, 100, 20, 1060051, 0x7FFF, false, false ); // CANCEL } - public override void OnResponse( Server.Network.NetState state, RelayInfo info ) + public override void OnResponse( Network.NetState state, RelayInfo info ) { if ( m_Engraver == null || m_Engraver.Deleted ) return; diff --git a/Scripts/Items/Talismans/RandomTalisman.cs b/Scripts/Items/Talismans/RandomTalisman.cs index 82b22e0fb..c60baefb8 100644 --- a/Scripts/Items/Talismans/RandomTalisman.cs +++ b/Scripts/Items/Talismans/RandomTalisman.cs @@ -5,15 +5,15 @@ namespace Server.Items [Constructible] public RandomTalisman() : base( GetRandomItemID() ) { - Summoner = BaseTalisman.GetRandomSummoner(); + Summoner = GetRandomSummoner(); if ( Summoner.IsEmpty ) { - Removal = BaseTalisman.GetRandomRemoval(); + Removal = GetRandomRemoval(); if ( Removal != TalismanRemoval.None ) { - MaxCharges = BaseTalisman.GetRandomCharges(); + MaxCharges = GetRandomCharges(); MaxChargeTime = 1200; } } @@ -27,13 +27,13 @@ namespace Server.Items MaxChargeTime = 1800; } - Blessed = BaseTalisman.GetRandomBlessed(); - Slayer = BaseTalisman.GetRandomSlayer(); - Protection = BaseTalisman.GetRandomProtection(); - Killer = BaseTalisman.GetRandomKiller(); - Skill = BaseTalisman.GetRandomSkill(); - ExceptionalBonus = BaseTalisman.GetRandomExceptional(); - SuccessBonus = BaseTalisman.GetRandomSuccessful(); + Blessed = GetRandomBlessed(); + Slayer = GetRandomSlayer(); + Protection = GetRandomProtection(); + Killer = GetRandomKiller(); + Skill = GetRandomSkill(); + ExceptionalBonus = GetRandomExceptional(); + SuccessBonus = GetRandomSuccessful(); Charges = MaxCharges; } diff --git a/Scripts/Items/Traps/BaseTrap.cs b/Scripts/Items/Traps/BaseTrap.cs index 748223eb6..729b73657 100644 --- a/Scripts/Items/Traps/BaseTrap.cs +++ b/Scripts/Items/Traps/BaseTrap.cs @@ -19,7 +19,7 @@ namespace Server.Items public virtual int GetEffectHue() { - int hue = this.Hue & 0x3FFF; + int hue = Hue & 0x3FFF; if ( hue < 2 ) return 0; @@ -34,7 +34,7 @@ namespace Server.Items public bool CheckRange( Point3D loc, int range ) { - return ( (this.Z + 8) >= loc.Z && (loc.Z + 16) > this.Z ) + return ( (Z + 8) >= loc.Z && (loc.Z + 16) > Z ) && Utility.InRange( GetWorldLocation(), loc, range ); } diff --git a/Scripts/Items/Traps/FlameSpurtTrap.cs b/Scripts/Items/Traps/FlameSpurtTrap.cs index 07d9dee74..fd331f2d8 100644 --- a/Scripts/Items/Traps/FlameSpurtTrap.cs +++ b/Scripts/Items/Traps/FlameSpurtTrap.cs @@ -28,7 +28,7 @@ namespace Server.Items public virtual void CheckTimer() { - Map map = this.Map; + Map map = Map; if ( map != null && map.GetSector( GetWorldLocation() ).Active ) StartTimer(); @@ -84,7 +84,7 @@ namespace Server.Items if ( !mob.Player || !mob.Alive || mob.AccessLevel > AccessLevel.Player ) continue; - if ( ( (this.Z + 8) >= mob.Z && (mob.Z + 16) > this.Z ) ) + if ( ( (Z + 8) >= mob.Z && (mob.Z + 16) > Z ) ) { foundPlayer = true; break; @@ -101,7 +101,7 @@ namespace Server.Items else if ( m_Spurt == null || m_Spurt.Deleted ) { m_Spurt = new Static( 0x3709 ); - m_Spurt.MoveToWorld( this.Location, this.Map ); + m_Spurt.MoveToWorld( Location, Map ); Effects.PlaySound( GetWorldLocation(), Map, 0x309 ); } diff --git a/Scripts/Items/Traps/GasTrap.cs b/Scripts/Items/Traps/GasTrap.cs index 7404eb234..ff2da4b5f 100644 --- a/Scripts/Items/Traps/GasTrap.cs +++ b/Scripts/Items/Traps/GasTrap.cs @@ -81,7 +81,7 @@ namespace Server.Items if ( m_Poison == null || !from.Player || !from.Alive || from.AccessLevel > AccessLevel.Player ) return; - Effects.SendLocationEffect( Location, Map, GetBaseID( this.Type ) - 2, 16, 3, GetEffectHue(), 0 ); + Effects.SendLocationEffect( Location, Map, GetBaseID( Type ) - 2, 16, 3, GetEffectHue(), 0 ); Effects.PlaySound( Location, Map, 0x231 ); from.ApplyPoison( from, m_Poison ); diff --git a/Scripts/Items/Traps/SawTrap.cs b/Scripts/Items/Traps/SawTrap.cs index f186d3a85..caa9c681b 100644 --- a/Scripts/Items/Traps/SawTrap.cs +++ b/Scripts/Items/Traps/SawTrap.cs @@ -64,7 +64,7 @@ namespace Server.Items if ( !from.Alive || from.AccessLevel > AccessLevel.Player ) return; - Effects.SendLocationEffect( Location, Map, GetBaseID( this.Type ) + 1, 6, 3, GetEffectHue(), 0 ); + Effects.SendLocationEffect( Location, Map, GetBaseID( Type ) + 1, 6, 3, GetEffectHue(), 0 ); Effects.PlaySound( Location, Map, 0x21C ); Spells.SpellHelper.Damage( TimeSpan.FromTicks( 1 ), from, from, Utility.RandomMinMax( 5, 15 ) ); diff --git a/Scripts/Items/Traps/SpikeTrap.cs b/Scripts/Items/Traps/SpikeTrap.cs index 1a5e8a6da..43c41ba74 100644 --- a/Scripts/Items/Traps/SpikeTrap.cs +++ b/Scripts/Items/Traps/SpikeTrap.cs @@ -30,7 +30,7 @@ namespace Server.Items } set { - bool extended = this.Extended; + bool extended = Extended; ItemID = ( extended ? GetExtendedID( value ) : GetBaseID( value ) ); } @@ -38,13 +38,13 @@ namespace Server.Items public bool Extended { - get => ( ItemID == GetExtendedID( this.Type ) ); + get => ( ItemID == GetExtendedID( Type ) ); set { if ( value ) - ItemID = GetExtendedID( this.Type ); + ItemID = GetExtendedID( Type ); else - ItemID = GetBaseID( this.Type ); + ItemID = GetBaseID( Type ); } } @@ -100,7 +100,7 @@ namespace Server.Items if ( !from.Alive || from.AccessLevel > AccessLevel.Player ) return; - Effects.SendLocationEffect( Location, Map, GetBaseID( this.Type ) + 1, 18, 3, GetEffectHue(), 0 ); + Effects.SendLocationEffect( Location, Map, GetBaseID( Type ) + 1, 18, 3, GetEffectHue(), 0 ); Effects.PlaySound( Location, Map, 0x22C ); foreach ( Mobile mob in GetMobilesInRange( 0 ) ) @@ -123,7 +123,7 @@ namespace Server.Items public virtual void OnSpikeRetracted() { Extended = false; - Effects.SendLocationEffect( Location, Map, GetExtendedID( this.Type ) - 1, 6, 3, GetEffectHue(), 0 ); + Effects.SendLocationEffect( Location, Map, GetExtendedID( Type ) - 1, 6, 3, GetEffectHue(), 0 ); } public SpikeTrap( Serial serial ) : base( serial ) diff --git a/Scripts/Items/Traps/StoneFaceTrap.cs b/Scripts/Items/Traps/StoneFaceTrap.cs index 1c584e0cf..daaa0eef9 100644 --- a/Scripts/Items/Traps/StoneFaceTrap.cs +++ b/Scripts/Items/Traps/StoneFaceTrap.cs @@ -27,7 +27,7 @@ namespace Server.Items } set { - bool breathing = this.Breathing; + bool breathing = Breathing; ItemID = ( breathing ? GetFireID( value ) : GetBaseID( value ) ); } @@ -35,13 +35,13 @@ namespace Server.Items public bool Breathing { - get => ( ItemID == GetFireID( this.Type ) ); + get => ( ItemID == GetFireID( Type ) ); set { if ( value ) - ItemID = GetFireID( this.Type ); + ItemID = GetFireID( Type ); else - ItemID = GetBaseID( this.Type ); + ItemID = GetBaseID( Type ); } } diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel1.cs b/Scripts/Items/TreasureChests/TreasureChestLevel1.cs index 349f4696b..8e2f26970 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel1.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel1.cs @@ -19,18 +19,18 @@ namespace Server.Items switch( Utility.RandomList( 0, 1, 2 ) ) { case 0:// Large Crate - this.ItemID = ( UseFirstItemId ? 0xe3c : 0xe3d ); - this.GumpID = 0x44; + ItemID = ( UseFirstItemId ? 0xe3c : 0xe3d ); + GumpID = 0x44; break; case 1:// Medium Crate - this.ItemID = ( UseFirstItemId ? 0xe3e : 0xe3f ); - this.GumpID = 0x44; + ItemID = ( UseFirstItemId ? 0xe3e : 0xe3f ); + GumpID = 0x44; break; case 2:// Small Crate - this.ItemID = ( UseFirstItemId ? 0x9a9 : 0xe7e ); - this.GumpID = 0x44; + ItemID = ( UseFirstItemId ? 0x9a9 : 0xe7e ); + GumpID = 0x44; break; } } @@ -45,7 +45,7 @@ namespace Server.Items public TreasureChestLevel1() : base( 0xE41 ) { - this.SetChestAppearance(); + SetChestAppearance(); Movable = false; TrapType = TrapType.DartTrap; @@ -53,8 +53,8 @@ namespace Server.Items Locked = true; RequiredSkill = 57; - LockLevel = this.RequiredSkill - Utility.Random( 1, 10 ); - MaxLockLevel = this.RequiredSkill + Utility.Random( 1, 10 ); + LockLevel = RequiredSkill - Utility.Random( 1, 10 ); + MaxLockLevel = RequiredSkill + Utility.Random( 1, 10 ); // According to OSI, loot in level 1 chest is: // Gold 25 - 50 diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel2.cs b/Scripts/Items/TreasureChests/TreasureChestLevel2.cs index 0dace56af..a3f33dab4 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel2.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel2.cs @@ -19,43 +19,43 @@ namespace Server.Items switch( Utility.RandomList( 0, 1, 2, 3, 4, 5, 6, 7 ) ) { case 0:// Large Crate - this.ItemID = ( UseFirstItemId ? 0xe3c : 0xe3d ); - this.GumpID = 0x44; + ItemID = ( UseFirstItemId ? 0xe3c : 0xe3d ); + GumpID = 0x44; break; case 1:// Medium Crate - this.ItemID = ( UseFirstItemId ? 0xe3e : 0xe3f ); - this.GumpID = 0x44; + ItemID = ( UseFirstItemId ? 0xe3e : 0xe3f ); + GumpID = 0x44; break; case 2:// Small Crate - this.ItemID = ( UseFirstItemId ? 0x9a9 : 0xe7e ); - this.GumpID = 0x44; + ItemID = ( UseFirstItemId ? 0x9a9 : 0xe7e ); + GumpID = 0x44; break; case 3:// Wooden Chest - this.ItemID = ( UseFirstItemId ? 0xe42 : 0xe43 ); - this.GumpID = 0x49; + ItemID = ( UseFirstItemId ? 0xe42 : 0xe43 ); + GumpID = 0x49; break; case 4:// Metal Chest - this.ItemID = ( UseFirstItemId ? 0x9ab : 0xe7c ); - this.GumpID = 0x4A; + ItemID = ( UseFirstItemId ? 0x9ab : 0xe7c ); + GumpID = 0x4A; break; case 5:// Metal Golden Chest - this.ItemID = ( UseFirstItemId ? 0xe40 : 0xe41 ); - this.GumpID = 0x42; + ItemID = ( UseFirstItemId ? 0xe40 : 0xe41 ); + GumpID = 0x42; break; case 6:// Keg - this.ItemID = ( UseFirstItemId ? 0xe7f : 0xe7f ); - this.GumpID = 0x3e; + ItemID = ( UseFirstItemId ? 0xe7f : 0xe7f ); + GumpID = 0x3e; break; case 7:// Barrel - this.ItemID = ( UseFirstItemId ? 0xe77 : 0xe77 ); - this.GumpID = 0x3e; + ItemID = ( UseFirstItemId ? 0xe77 : 0xe77 ); + GumpID = 0x3e; break; } } @@ -70,7 +70,7 @@ namespace Server.Items public TreasureChestLevel2() : base( 0xE41 ) { - this.SetChestAppearance(); + SetChestAppearance(); Movable = false; TrapType = TrapType.ExplosionTrap; @@ -78,8 +78,8 @@ namespace Server.Items Locked = true; RequiredSkill = 72; - LockLevel = this.RequiredSkill - Utility.Random( 1, 10 ); - MaxLockLevel = this.RequiredSkill + Utility.Random( 1, 10 ); ; + LockLevel = RequiredSkill - Utility.Random( 1, 10 ); + MaxLockLevel = RequiredSkill + Utility.Random( 1, 10 ); ; // According to OSI, loot in level 2 chest is: // Gold 80 - 150 diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel3.cs b/Scripts/Items/TreasureChests/TreasureChestLevel3.cs index 84fa757ad..772ecadd0 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel3.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel3.cs @@ -18,18 +18,18 @@ namespace Server.Items switch( Utility.RandomList( 0, 1, 2 ) ) { case 0:// Wooden Chest - this.ItemID = ( UseFirstItemId ? 0xe42 : 0xe43 ); - this.GumpID = 0x49; + ItemID = ( UseFirstItemId ? 0xe42 : 0xe43 ); + GumpID = 0x49; break; case 1:// Metal Chest - this.ItemID = ( UseFirstItemId ? 0x9ab : 0xe7c ); - this.GumpID = 0x4A; + ItemID = ( UseFirstItemId ? 0x9ab : 0xe7c ); + GumpID = 0x4A; break; case 2:// Metal Golden Chest - this.ItemID = ( UseFirstItemId ? 0xe40 : 0xe41 ); - this.GumpID = 0x42; + ItemID = ( UseFirstItemId ? 0xe40 : 0xe41 ); + GumpID = 0x42; break; } } @@ -44,7 +44,7 @@ namespace Server.Items public TreasureChestLevel3() : base( 0xE41 ) { - this.SetChestAppearance(); + SetChestAppearance(); Movable = false; TrapType = TrapType.PoisonTrap; @@ -52,8 +52,8 @@ namespace Server.Items Locked = true; RequiredSkill = 84; - LockLevel = this.RequiredSkill - Utility.Random( 1, 10 ); - MaxLockLevel = this.RequiredSkill + Utility.Random( 1, 10 ); ; + LockLevel = RequiredSkill - Utility.Random( 1, 10 ); + MaxLockLevel = RequiredSkill + Utility.Random( 1, 10 ); ; // According to OSI, loot in level 3 chest is: // Gold 250 - 350 diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel4.cs b/Scripts/Items/TreasureChests/TreasureChestLevel4.cs index 64a0a4d50..e8e7aef99 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel4.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel4.cs @@ -19,23 +19,23 @@ namespace Server.Items switch( Utility.Random( 4 ) ) { case 0:// Wooden Chest - this.ItemID = ( UseFirstItemId ? 0xe42 : 0xe43 ); - this.GumpID = 0x49; + ItemID = ( UseFirstItemId ? 0xe42 : 0xe43 ); + GumpID = 0x49; break; case 1:// Metal Chest - this.ItemID = ( UseFirstItemId ? 0x9ab : 0xe7c ); - this.GumpID = 0x4A; + ItemID = ( UseFirstItemId ? 0x9ab : 0xe7c ); + GumpID = 0x4A; break; case 2:// Metal Golden Chest - this.ItemID = ( UseFirstItemId ? 0xe40 : 0xe41 ); - this.GumpID = 0x42; + ItemID = ( UseFirstItemId ? 0xe40 : 0xe41 ); + GumpID = 0x42; break; case 3:// Keg - this.ItemID = 0xe7f; - this.GumpID = 0x3e; + ItemID = 0xe7f; + GumpID = 0x3e; break; } } @@ -50,7 +50,7 @@ namespace Server.Items public TreasureChestLevel4() : base( 0xE41 ) { - this.SetChestAppearance(); + SetChestAppearance(); Movable = false; TrapType = TrapType.ExplosionTrap; @@ -58,8 +58,8 @@ namespace Server.Items Locked = true; RequiredSkill = 92; - LockLevel = this.RequiredSkill - Utility.Random( 1, 10 ); - MaxLockLevel = this.RequiredSkill + Utility.Random( 1, 10 ); ; + LockLevel = RequiredSkill - Utility.Random( 1, 10 ); + MaxLockLevel = RequiredSkill + Utility.Random( 1, 10 ); ; // According to OSI, loot in level 4 chest is: // Gold 500 - 900 diff --git a/Scripts/Items/Wands/BaseWand.cs b/Scripts/Items/Wands/BaseWand.cs index 075707a1a..9d445ae40 100644 --- a/Scripts/Items/Wands/BaseWand.cs +++ b/Scripts/Items/Wands/BaseWand.cs @@ -210,7 +210,7 @@ namespace Server.Items } else { - this.LabelTo( from, Name ); + LabelTo( from, Name ); number = 1041000; } diff --git a/Scripts/Items/Weapons/Abilities/Dismount.cs b/Scripts/Items/Weapons/Abilities/Dismount.cs index a15b7200f..6b015900d 100644 --- a/Scripts/Items/Weapons/Abilities/Dismount.cs +++ b/Scripts/Items/Weapons/Abilities/Dismount.cs @@ -48,7 +48,7 @@ namespace Server.Items IMount mount = defender.Mount; - if (mount == null && !Server.Spells.Ninjitsu.AnimalForm.UnderTransformation( defender ) ) + if (mount == null && !Spells.Ninjitsu.AnimalForm.UnderTransformation( defender ) ) { attacker.SendLocalizedMessage( 1060848 ); // This attack only works on mounted targets return; @@ -74,7 +74,7 @@ namespace Server.Items if (defender is PlayerMobile mobile) { - if (Server.Spells.Ninjitsu.AnimalForm.UnderTransformation(mobile)) + if (Spells.Ninjitsu.AnimalForm.UnderTransformation(mobile)) { mobile.SendLocalizedMessage(1114066, attacker.Name); // ~1_NAME~ knocked you out of animal form! } diff --git a/Scripts/Items/Weapons/Abilities/FrenziedWhirlwind.cs b/Scripts/Items/Weapons/Abilities/FrenziedWhirlwind.cs index 9579b9b79..715a436a6 100644 --- a/Scripts/Items/Weapons/Abilities/FrenziedWhirlwind.cs +++ b/Scripts/Items/Weapons/Abilities/FrenziedWhirlwind.cs @@ -133,7 +133,7 @@ namespace Server.Items if ( !m_Defender.Alive || m_DamageRemaining <= 0 ) { Stop(); - Server.Items.FrenziedWhirlwind.Registry.Remove( m_Defender ); + Registry.Remove( m_Defender ); return; } @@ -154,7 +154,7 @@ namespace Server.Items if ( !m_Defender.Alive || m_DamageRemaining <= 0 ) { Stop(); - Server.Items.FrenziedWhirlwind.Registry.Remove( m_Defender ); + Registry.Remove( m_Defender ); } } } diff --git a/Scripts/Items/Weapons/Abilities/TalonStrike.cs b/Scripts/Items/Weapons/Abilities/TalonStrike.cs index 67621c8f3..5606fd075 100644 --- a/Scripts/Items/Weapons/Abilities/TalonStrike.cs +++ b/Scripts/Items/Weapons/Abilities/TalonStrike.cs @@ -75,7 +75,7 @@ namespace Server.Items if ( !m_Defender.Alive || m_DamageRemaining <= 0 ) { Stop(); - Server.Items.TalonStrike.Registry.Remove( m_Defender ); + Registry.Remove( m_Defender ); return; } @@ -97,7 +97,7 @@ namespace Server.Items if ( !m_Defender.Alive || m_DamageRemaining <= 0 ) { Stop(); - Server.Items.TalonStrike.Registry.Remove( m_Defender ); + Registry.Remove( m_Defender ); } } } diff --git a/Scripts/Items/Weapons/Abilities/WeaponAbility.cs b/Scripts/Items/Weapons/Abilities/WeaponAbility.cs index 9d127dabd..eb9f5a058 100644 --- a/Scripts/Items/Weapons/Abilities/WeaponAbility.cs +++ b/Scripts/Items/Weapons/Abilities/WeaponAbility.cs @@ -66,7 +66,7 @@ namespace Server.Items mana -= 5; double scalar = 1.0; - if ( !Server.Spells.Necromancy.MindRotSpell.GetMindRotScalar( from, ref scalar ) ) + if ( !Spells.Necromancy.MindRotSpell.GetMindRotScalar( from, ref scalar ) ) scalar = 1.0; // Lower Mana Cost = 40% diff --git a/Scripts/Items/Weapons/Axes/BaseAxe.cs b/Scripts/Items/Weapons/Axes/BaseAxe.cs index 2c8dc4cd8..edfdbeb5a 100644 --- a/Scripts/Items/Weapons/Axes/BaseAxe.cs +++ b/Scripts/Items/Weapons/Axes/BaseAxe.cs @@ -85,16 +85,16 @@ namespace Server.Items if ( !from.InLOS( loc ) || !from.InRange( loc, 2 ) ) { - from.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3E9, 1019045 ); // I can't reach that + from.LocalOverheadMessage( MessageType.Regular, 0x3E9, 1019045 ); // I can't reach that return; } - else if ( !this.IsAccessibleTo( from ) ) + else if ( !IsAccessibleTo( from ) ) { - this.PublicOverheadMessage( MessageType.Regular, 0x3E9, 1061637 ); // You are not allowed to access this. + PublicOverheadMessage( MessageType.Regular, 0x3E9, 1061637 ); // You are not allowed to access this. return; } - if ( !(this.HarvestSystem is Mining) ) + if ( !(HarvestSystem is Mining) ) from.SendLocalizedMessage( 1010018 ); // What do you want to use this item on? HarvestSystem.BeginHarvesting( from, this ); diff --git a/Scripts/Items/Weapons/BaseWeapon.cs b/Scripts/Items/Weapons/BaseWeapon.cs index 9b9a8abb7..31c56094a 100644 --- a/Scripts/Items/Weapons/BaseWeapon.cs +++ b/Scripts/Items/Weapons/BaseWeapon.cs @@ -535,12 +535,12 @@ namespace Server.Items if ( base.CheckConflictingLayer( m, item, layer ) ) return true; - if ( this.Layer == Layer.TwoHanded && layer == Layer.OneHanded ) + if ( Layer == Layer.TwoHanded && layer == Layer.OneHanded ) { m.SendLocalizedMessage( 500214 ); // You already have something in both hands. return true; } - else if ( this.Layer == Layer.OneHanded && layer == Layer.TwoHanded && !(item is BaseShield) && !(item is BaseEquipableLight) ) + else if ( Layer == Layer.OneHanded && layer == Layer.TwoHanded && !(item is BaseShield) && !(item is BaseEquipableLight) ) { m.SendLocalizedMessage( 500215 ); // You can only wield one weapon at a time. return true; @@ -608,7 +608,7 @@ namespace Server.Items { Mobile m = from; - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); if ( strBonus != 0 ) m.AddStatMod( new StatMod( StatType.Str, modName + "Str", strBonus, TimeSpan.Zero ) ); @@ -661,7 +661,7 @@ namespace Server.Items { BaseWeapon weapon = m.Weapon as BaseWeapon; - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); m.RemoveStatMod( modName + "Str" ); m.RemoveStatMod( modName + "Dex" ); @@ -849,7 +849,7 @@ namespace Server.Items public virtual TimeSpan GetDelay( Mobile m ) { - double speed = this.Speed; + double speed = Speed; if ( speed == 0 ) return TimeSpan.FromHours( 1.0 ); @@ -1798,7 +1798,7 @@ namespace Server.Items attacker.DoHarmful( defender ); - Spells.MagerySpell sp = new Spells.Sixth.DispelSpell( attacker, null ); + MagerySpell sp = new Spells.Sixth.DispelSpell( attacker, null ); if ( sp.CheckResisted( defender ) ) { @@ -2168,7 +2168,7 @@ namespace Server.Items int defenseMasteryMalus = 0; // Defense Mastery gives a -50%/-80% malus to damage. - if ( Server.Items.DefenseMastery.GetMalus( attacker, ref defenseMasteryMalus ) ) + if ( DefenseMastery.GetMalus( attacker, ref defenseMasteryMalus ) ) damageBonus -= defenseMasteryMalus; int discordanceEffect = 0; @@ -2854,7 +2854,7 @@ namespace Server.Items if ( parentMobile != null && (strBonus != 0 || dexBonus != 0 || intBonus != 0) ) { - string modName = this.Serial.ToString(); + string modName = Serial.ToString(); if ( strBonus != 0 ) parentMobile.AddStatMod( new StatMod( StatType.Str, modName + "Str", strBonus, TimeSpan.Zero ) ); @@ -2912,7 +2912,7 @@ namespace Server.Items private string GetNameString() { - string name = this.Name; + string name = Name; if ( name == null ) name = String.Format( "#{0}", LabelNumber ); @@ -3340,7 +3340,7 @@ namespace Server.Items } else { - this.LabelTo( from, Name ); + LabelTo( from, Name ); number = 1041000; } diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/ColdForgedBlade.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/ColdForgedBlade.cs index 859e57b7f..8af7ea4b6 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/ColdForgedBlade.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/ColdForgedBlade.cs @@ -13,7 +13,7 @@ namespace Server.Items Attributes.WeaponSpeed = 25; Attributes.WeaponDamage = 50; - Hue = this.GetElementalDamageHue(); + Hue = GetElementalDamageHue(); } public override void GetDamageTypes( Mobile wielder, out int phys, out int fire, out int cold, out int pois, out int nrgy, out int chaos, out int direct ) diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/LuminousRuneBlade.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/LuminousRuneBlade.cs index b27667fa9..e2069a2ec 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/LuminousRuneBlade.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/LuminousRuneBlade.cs @@ -13,7 +13,7 @@ namespace Server.Items Attributes.WeaponSpeed = 25; Attributes.WeaponDamage = 55; - Hue = this.GetElementalDamageHue(); + Hue = GetElementalDamageHue(); } public override void GetDamageTypes( Mobile wielder, out int phys, out int fire, out int cold, out int pois, out int nrgy, out int chaos, out int direct ) diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/OverseerSunderedBlade.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/OverseerSunderedBlade.cs index dbf44d6f1..42655b308 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/OverseerSunderedBlade.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/OverseerSunderedBlade.cs @@ -15,7 +15,7 @@ namespace Server.Items Attributes.WeaponSpeed = 35; Attributes.WeaponDamage = 45; - Hue = this.GetElementalDamageHue(); + Hue = GetElementalDamageHue(); } public override void GetDamageTypes( Mobile wielder, out int phys, out int fire, out int cold, out int pois, out int nrgy, out int chaos, out int direct ) diff --git a/Scripts/Misc/AOS.cs b/Scripts/Misc/AOS.cs index 98b0e17b0..0555143ae 100644 --- a/Scripts/Misc/AOS.cs +++ b/Scripts/Misc/AOS.cs @@ -60,7 +60,7 @@ namespace Server return 0; if ( phys == 0 && fire == 100 && cold == 0 && pois == 0 && nrgy == 0 ) - Mobiles.MeerMage.StopEffect( m, true ); + MeerMage.StopEffect( m, true ); if ( !Core.AOS ) { diff --git a/Scripts/Misc/AutoRestart.cs b/Scripts/Misc/AutoRestart.cs index e51ecabc1..b8e197a61 100644 --- a/Scripts/Misc/AutoRestart.cs +++ b/Scripts/Misc/AutoRestart.cs @@ -68,14 +68,14 @@ namespace Server.Misc if ( WarningDelay > TimeSpan.Zero ) { Warning_Callback(); - Timer.DelayCall( WarningDelay, WarningDelay, new TimerCallback( Warning_Callback ) ); + DelayCall( WarningDelay, WarningDelay, new TimerCallback( Warning_Callback ) ); } AutoSave.Save(); m_Restarting = true; - Timer.DelayCall( RestartDelay, new TimerCallback( Restart_Callback ) ); + DelayCall( RestartDelay, new TimerCallback( Restart_Callback ) ); } } } \ No newline at end of file diff --git a/Scripts/Misc/AutoSave.cs b/Scripts/Misc/AutoSave.cs index 11b6e8709..bab411e85 100644 --- a/Scripts/Misc/AutoSave.cs +++ b/Scripts/Misc/AutoSave.cs @@ -66,13 +66,13 @@ namespace Server.Misc else World.Broadcast( 0x35, true, "The world will save in {0} second{1}.", s, s != 1 ? "s" : "" ); - Timer.DelayCall( m_Warning, new TimerCallback( Save ) ); + DelayCall( m_Warning, new TimerCallback( Save ) ); } } public static void Save() { - AutoSave.Save( false ); + Save( false ); } public static void Save( bool permitBackgroundWrite ) diff --git a/Scripts/Misc/BuffIcons.cs b/Scripts/Misc/BuffIcons.cs index 1afe6ff8c..07cd867a2 100644 --- a/Scripts/Misc/BuffIcons.cs +++ b/Scripts/Misc/BuffIcons.cs @@ -231,7 +231,7 @@ namespace Server { bool hasArgs = (args != null); - this.EnsureCapacity( (hasArgs ? (48 + args.ToString().Length * 2): 44) ); + EnsureCapacity( (hasArgs ? (48 + args.ToString().Length * 2): 44) ); m_Stream.Write( (int)mob.Serial ); @@ -284,7 +284,7 @@ namespace Server public RemoveBuffPacket( Mobile mob, BuffIcon iconID ) : base( 0xDF ) { - this.EnsureCapacity( 13 ); + EnsureCapacity( 13 ); m_Stream.Write( (int)mob.Serial ); m_Stream.Write( (short)iconID ); //ID diff --git a/Scripts/Misc/CharacterCreation.cs b/Scripts/Misc/CharacterCreation.cs index 717b102f5..9ad794a1b 100644 --- a/Scripts/Misc/CharacterCreation.cs +++ b/Scripts/Misc/CharacterCreation.cs @@ -724,7 +724,7 @@ namespace Server.Misc { m_Mobile = m; m_Message = message; - this.Start(); + Start(); } protected override void OnTick() diff --git a/Scripts/Misc/Cleanup.cs b/Scripts/Misc/Cleanup.cs index 9545b3255..a002fdb16 100644 --- a/Scripts/Misc/Cleanup.cs +++ b/Scripts/Misc/Cleanup.cs @@ -125,7 +125,7 @@ namespace Server.Misc if ( item is Fists ) return false; - if ( item is ICommodity || item is Multis.BaseBoat + if ( item is ICommodity || item is BaseBoat || item is Fish || item is BigFish || item is BasePotion || item is Food || item is CookableFood || item is SpecialFishingNet || item is BaseMagicFish diff --git a/Scripts/Misc/Emitter.cs b/Scripts/Misc/Emitter.cs index ab20185a0..324bd1544 100644 --- a/Scripts/Misc/Emitter.cs +++ b/Scripts/Misc/Emitter.cs @@ -80,7 +80,7 @@ namespace Server this.type = type; this.method = method; - this.parms = method.GetParameters(); + parms = method.GetParameters(); } } @@ -479,7 +479,7 @@ namespace Server public bool CompareTo( int sign, Callback argGenerator ) { - Type active = this.Active; + Type active = Active; MethodInfo compareTo = active.GetMethod( "CompareTo", new[] { active } ); diff --git a/Scripts/Misc/Gifts/Winter2004/Mistletoe.cs b/Scripts/Misc/Gifts/Winter2004/Mistletoe.cs index 1ceb7a429..e23359513 100644 --- a/Scripts/Misc/Gifts/Winter2004/Mistletoe.cs +++ b/Scripts/Misc/Gifts/Winter2004/Mistletoe.cs @@ -26,10 +26,10 @@ namespace Server.Items public bool CouldFit( IPoint3D p, Map map ) { - if ( !map.CanFit( p.X, p.Y, p.Z, this.ItemData.Height ) ) + if ( !map.CanFit( p.X, p.Y, p.Z, ItemData.Height ) ) return false; - if ( this.ItemID == 0x2375 ) + if ( ItemID == 0x2375 ) return BaseAddon.IsWall( p.X, p.Y - 1, p.Z, map ); // North wall else return BaseAddon.IsWall( p.X - 1, p.Y, p.Z, map ); // West wall @@ -53,28 +53,28 @@ namespace Server.Items private void FixMovingCrate() { - if ( this.Deleted ) + if ( Deleted ) return; - if ( this.Movable || this.IsLockedDown ) + if ( Movable || IsLockedDown ) { - Item deed = this.Deed; + Item deed = Deed; - if ( this.Parent is Item item ) + if ( Parent is Item item ) { item.AddItem( deed ); - deed.Location = this.Location; + deed.Location = Location; } else { - deed.MoveToWorld( this.Location, this.Map ); + deed.MoveToWorld( Location, Map ); } Delete(); } } - public Item Deed => new MistletoeDeed( this.Hue ); + public Item Deed => new MistletoeDeed( Hue ); public override void OnDoubleClick( Mobile from ) { @@ -82,7 +82,7 @@ namespace Server.Items if ( house != null && house.IsCoOwner( from ) ) { - if ( from.InRange( this.GetWorldLocation(), 3 ) ) + if ( from.InRange( GetWorldLocation(), 3 ) ) { from.CloseGump( typeof( MistletoeAddonGump ) ); from.SendGump( new MistletoeAddonGump( from, this ) ); @@ -283,7 +283,7 @@ namespace Server.Items if ( itemID > 0 ) { - Item addon = new MistletoeAddon( this.Hue ); + Item addon = new MistletoeAddon( Hue ); addon.ItemID = itemID; addon.MoveToWorld( loc, from.Map ); diff --git a/Scripts/Misc/Guild.cs b/Scripts/Misc/Guild.cs index 7d465db34..03bacd179 100644 --- a/Scripts/Misc/Guild.cs +++ b/Scripts/Misc/Guild.cs @@ -200,7 +200,7 @@ namespace Server.Guilds if ( g.Alliance != this || !m_PendingMembers.Contains( g ) || m_Members.Contains( g ) ) return; - g.GuildMessage( 1070760, this.Name ); // Your Guild has joined the ~1_ALLIANCENAME~ Alliance. + g.GuildMessage( 1070760, Name ); // Your Guild has joined the ~1_ALLIANCENAME~ Alliance. AllianceMessage( 1070761, g.Name ); // A new Guild has joined your Alliance: ~1_GUILDNAME~ m_PendingMembers.Remove( g ); @@ -220,7 +220,7 @@ namespace Server.Guilds m_Members.Remove( g ); g.InvalidateMemberProperties(); - g.GuildMessage( 1070763, this.Name ); // Your Guild has been removed from the ~1_ALLIANCENAME~ Alliance. + g.GuildMessage( 1070763, Name ); // Your Guild has been removed from the ~1_ALLIANCENAME~ Alliance. AllianceMessage( 1070764, g.Name ); // A Guild has left your Alliance: ~1_GUILDNAME~ } @@ -555,7 +555,7 @@ namespace Server.Guilds protected override void OnTick() { - foreach( Guild g in Guild.List.Values ) + foreach( Guild g in BaseGuild.List.Values ) g.CheckExpiredWars(); } } @@ -685,7 +685,7 @@ namespace Server.Guilds } set { - AllianceInfo current = this.Alliance; + AllianceInfo current = Alliance; if ( value == current ) return; @@ -778,7 +778,7 @@ namespace Server.Guilds if ( status != WarStatus.InProgress ) { - AllianceInfo myAlliance = this.Alliance; + AllianceInfo myAlliance = Alliance; bool inAlliance = myAlliance?.IsMember( this ) == true; AllianceInfo otherAlliance = g?.Alliance; @@ -795,7 +795,7 @@ namespace Server.Guilds InvalidateMemberProperties(); } - this.AcceptedWars.Remove( w ); + AcceptedWars.Remove( w ); if ( g != null ) { @@ -804,12 +804,12 @@ namespace Server.Guilds if ( otherInAlliance ) { - otherAlliance.AllianceMessage( 1070739 + (int)status, ( inAlliance ? this.Alliance.Name : this.Name ) ); + otherAlliance.AllianceMessage( 1070739 + (int)status, ( inAlliance ? Alliance.Name : Name ) ); otherAlliance.InvalidateMemberProperties(); } else { - g.GuildMessage( 1070739 + (int)status, (inAlliance ? this.Alliance.Name : this.Name) ); + g.GuildMessage( 1070739 + (int)status, (inAlliance ? Alliance.Name : Name) ); g.InvalidateMemberProperties(); } @@ -826,7 +826,7 @@ namespace Server.Guilds if ( w.Status != WarStatus.Pending ) { //All sanity in here - this.PendingWars.Remove( w ); + PendingWars.Remove( w ); g?.PendingWars.Remove( g.FindPendingWar( this ) ); } @@ -995,7 +995,7 @@ namespace Server.Guilds set { if ( value != null ) - this.AddMember( value ); //Also removes from old guild. + AddMember( value ); //Also removes from old guild. if ( m_Leader is PlayerMobile leader && leader?.Guild == this ) leader.GuildRank = RankDefinition.Member; @@ -1020,7 +1020,7 @@ namespace Server.Guilds { m_Leader = null; - BaseGuild.List.Remove( this.Id ); + List.Remove( Id ); foreach ( Mobile m in m_Members ) { @@ -1099,8 +1099,8 @@ namespace Server.Guilds #region Serialization public override void Serialize( GenericWriter writer ) { - if ( this.LastFealty+TimeSpan.FromDays( 1.0 ) < DateTime.UtcNow ) - this.CalculateGuildmaster(); + if ( LastFealty+TimeSpan.FromDays( 1.0 ) < DateTime.UtcNow ) + CalculateGuildmaster(); CheckExpiredWars(); @@ -1283,14 +1283,14 @@ namespace Server.Guilds CheckExpiredWars(); - AllianceInfo alliance = this.Alliance; + AllianceInfo alliance = Alliance; alliance?.CheckLeader(); - alliance = this.Alliance; //CheckLeader could possibly change the value of this.Alliance + alliance = Alliance; //CheckLeader could possibly change the value of this.Alliance if ( alliance != null && !alliance.IsMember( this ) && !alliance.IsPendingMember( this ) ) //This block is there to fix a bug in the code in an older version. - this.Alliance = null; //Will call Alliance.RemoveGuild which will set it null & perform all the pertient checks as far as alliacne disbanding + Alliance = null; //Will call Alliance.RemoveGuild which will set it null & perform all the pertient checks as far as alliacne disbanding } diff --git a/Scripts/Misc/LightCycle.cs b/Scripts/Misc/LightCycle.cs index efba55b8d..89a5da3b4 100644 --- a/Scripts/Misc/LightCycle.cs +++ b/Scripts/Misc/LightCycle.cs @@ -69,7 +69,7 @@ namespace Server int hours, minutes; - Server.Items.Clock.GetTime( from.Map, from.X, from.Y, out hours, out minutes ); + Items.Clock.GetTime( from.Map, from.X, from.Y, out hours, out minutes ); /* OSI times: * diff --git a/Scripts/Misc/LootPack.cs b/Scripts/Misc/LootPack.cs index d375fd8dc..aed407eb2 100644 --- a/Scripts/Misc/LootPack.cs +++ b/Scripts/Misc/LootPack.cs @@ -75,7 +75,7 @@ namespace Server { checkLuck = false; - if ( LootPack.CheckLuck( luckChance ) ) + if ( CheckLuck( luckChance ) ) shouldAdd = ( entry.Chance > Utility.Random( 10000 ) ); } diff --git a/Scripts/Misc/Notoriety.cs b/Scripts/Misc/Notoriety.cs index b690b3562..6dab3a8fd 100644 --- a/Scripts/Misc/Notoriety.cs +++ b/Scripts/Misc/Notoriety.cs @@ -98,10 +98,10 @@ namespace Server.Misc if ( (pmFrom?.DuelContext != null && pmFrom.DuelContext.Started) || (pmTarg?.DuelContext != null && pmTarg.DuelContext.Started) ) return false; - if ( from.Region.GetRegion( typeof( Engines.ConPVP.SafeZone ) ) is SafeZone sz /*&& sz.IsDisabled()*/ ) + if ( from.Region.GetRegion( typeof( SafeZone ) ) is SafeZone sz /*&& sz.IsDisabled()*/ ) return false; - sz = target.Region.GetRegion( typeof( Engines.ConPVP.SafeZone ) ) as Engines.ConPVP.SafeZone; + sz = target.Region.GetRegion( typeof( SafeZone ) ) as SafeZone; if ( sz != null /*&& sz.IsDisabled()*/ ) return false; @@ -172,10 +172,10 @@ namespace Server.Misc if ( (pmFrom?.DuelContext != null && pmFrom.DuelContext.Started) || (pmTarg?.DuelContext != null && pmTarg.DuelContext.Started) ) return false; - if ( from.Region.GetRegion( typeof( Engines.ConPVP.SafeZone ) ) is SafeZone sz /*&& sz.IsDisabled()*/ ) + if ( from.Region.GetRegion( typeof( SafeZone ) ) is SafeZone sz /*&& sz.IsDisabled()*/ ) return false; - sz = target.Region.GetRegion( typeof( Engines.ConPVP.SafeZone ) ) as Engines.ConPVP.SafeZone; + sz = target.Region.GetRegion( typeof( SafeZone ) ) as SafeZone; if ( sz != null /*&& sz.IsDisabled()*/ ) return false; @@ -388,7 +388,7 @@ namespace Server.Misc if ( bcTarg?.InitialInnocent != true ) { - if ( !target.Body.IsHuman && !target.Body.IsGhost && !IsPet( bcTarg ) && pmTarg == null || !Core.ML && !target.CanBeginAction( typeof( Server.Spells.Seventh.PolymorphSpell ) ) ) + if ( !target.Body.IsHuman && !target.Body.IsGhost && !IsPet( bcTarg ) && pmTarg == null || !Core.ML && !target.CanBeginAction( typeof( Spells.Seventh.PolymorphSpell ) ) ) return Notoriety.CanBeAttacked; } diff --git a/Scripts/Misc/ServerList.cs b/Scripts/Misc/ServerList.cs index c1eb5672a..a7cafc2d2 100644 --- a/Scripts/Misc/ServerList.cs +++ b/Scripts/Misc/ServerList.cs @@ -172,7 +172,7 @@ namespace Server.Misc private static IPAddress FindPublicAddress() { try { - WebRequest req = HttpWebRequest.Create( "https://api.ipify.org" ); + WebRequest req = WebRequest.Create( "https://api.ipify.org" ); req.Timeout = 15000; diff --git a/Scripts/Misc/TreasureMapProtection.cs b/Scripts/Misc/TreasureMapProtection.cs index a0669ba32..55f9d1bf2 100644 --- a/Scripts/Misc/TreasureMapProtection.cs +++ b/Scripts/Misc/TreasureMapProtection.cs @@ -8,7 +8,7 @@ namespace Server { private const int Range = 5; // No house may be placed within 5 tiles of the treasure - public TreasureRegion( int x, int y, Map map ): base( null, map, Region.DefaultPriority, new Rectangle2D( x - Range, y - Range, 1 + (Range * 2), 1 + (Range * 2) ) ) + public TreasureRegion( int x, int y, Map map ): base( null, map, DefaultPriority, new Rectangle2D( x - Range, y - Range, 1 + (Range * 2), 1 + (Range * 2) ) ) { GoLocation = new Point3D( x, y, map.GetAverageZ( x, y ) ); diff --git a/Scripts/Misc/VendorGenerator.cs b/Scripts/Misc/VendorGenerator.cs index 9bc37fcbe..031d526ac 100644 --- a/Scripts/Misc/VendorGenerator.cs +++ b/Scripts/Misc/VendorGenerator.cs @@ -10,7 +10,7 @@ namespace Server { public static void Initialize() { - CommandSystem.Register( "VendorGen", AccessLevel.Administrator, new CommandEventHandler( VendorGenerator.VendorGen_OnCommand ) ); + CommandSystem.Register( "VendorGen", AccessLevel.Administrator, new CommandEventHandler( VendorGen_OnCommand ) ); } private static Rectangle2D[] m_BritRegions = new[] diff --git a/Scripts/Mobiles/AI/BaseAI.cs b/Scripts/Mobiles/AI/BaseAI.cs index 87dfc3ae9..a108b20e5 100644 --- a/Scripts/Mobiles/AI/BaseAI.cs +++ b/Scripts/Mobiles/AI/BaseAI.cs @@ -1616,7 +1616,7 @@ namespace Server.Mobiles { Name = creature.Name; } - else if (this.ItemID == ShrinkTable.DefaultItemID || creature.GetType().IsDefined(typeof(FriendlyNameAttribute), false) || creature is Reptalon) + else if (ItemID == ShrinkTable.DefaultItemID || creature.GetType().IsDefined(typeof(FriendlyNameAttribute), false) || creature is Reptalon) Name = FriendlyNameAttribute.GetFriendlyNameFor(creature.GetType()).ToString(); //(As Per OSI)No name. Normally, set by the ItemID of the Shrink Item unless we either explicitly set it with an Attribute, or, no lookup found @@ -1976,7 +1976,7 @@ namespace Server.Mobiles { using (StreamWriter op = new StreamWriter("nan_transform.txt", true)) { - op.WriteLine(String.Format("NaN in TransformMoveDelay: {0}, {1}, {2}, {3}", DateTime.UtcNow, this.GetType().ToString(), m_Mobile == null ? "null" : m_Mobile.GetType().ToString(), m_Mobile.HitsMax)); + op.WriteLine(String.Format("NaN in TransformMoveDelay: {0}, {1}, {2}, {3}", DateTime.UtcNow, GetType().ToString(), m_Mobile == null ? "null" : m_Mobile.GetType().ToString(), m_Mobile.HitsMax)); } return 1.0; @@ -2501,7 +2501,7 @@ namespace Server.Mobiles continue; // It also must abide by harmful spell rules. - if (!Server.Spells.SpellHelper.ValidIndirectTarget(m_Mobile.SummonMaster, m)) + if (!SpellHelper.ValidIndirectTarget(m_Mobile.SummonMaster, m)) continue; // Animated creatures cannot attack players directly. diff --git a/Scripts/Mobiles/Animals/Mounts/BaseMount.cs b/Scripts/Mobiles/Animals/Mounts/BaseMount.cs index 35ee00897..a4992af07 100644 --- a/Scripts/Mobiles/Animals/Mounts/BaseMount.cs +++ b/Scripts/Mobiles/Animals/Mounts/BaseMount.cs @@ -162,7 +162,7 @@ namespace Server.Mobiles if ( canAccess ) { - if ( this.Poisoned ) + if ( Poisoned ) PrivateOverheadMessage( Network.MessageType.Regular, 0x3B2, 1049692, from.NetState ); // This mount is too ill to ride. else Rider = from; @@ -240,7 +240,7 @@ namespace Server.Mobiles if ( m_InternalItem != null ) value.AddItem( m_InternalItem ); - value.Direction = this.Direction; + value.Direction = Direction; Internalize(); diff --git a/Scripts/Mobiles/Animals/Mounts/Ethereals.cs b/Scripts/Mobiles/Animals/Mounts/Ethereals.cs index 08e99dae2..88e756dc9 100644 --- a/Scripts/Mobiles/Animals/Mounts/Ethereals.cs +++ b/Scripts/Mobiles/Animals/Mounts/Ethereals.cs @@ -5,7 +5,7 @@ using Server.Engines.VeteranRewards; namespace Server.Mobiles { - public class EtherealMount : Item, IMount, IMountItem, Engines.VeteranRewards.IRewardItem + public class EtherealMount : Item, IMount, IMountItem, IRewardItem { private int m_MountedID; private int m_RegularID; diff --git a/Scripts/Mobiles/Animals/Mounts/Hiryu.cs b/Scripts/Mobiles/Animals/Mounts/Hiryu.cs index 5e140a1ef..53aaa8eaf 100644 --- a/Scripts/Mobiles/Animals/Mounts/Hiryu.cs +++ b/Scripts/Mobiles/Animals/Mounts/Hiryu.cs @@ -236,7 +236,7 @@ namespace Server.Mobiles Timer.DelayCall( TimeSpan.Zero, delegate { Hue = GetHue(); } ); if ( version <= 1 ) - Timer.DelayCall( TimeSpan.Zero, delegate { if ( InternalItem != null ) { InternalItem.Hue = this.Hue; } } ); + Timer.DelayCall( TimeSpan.Zero, delegate { if ( InternalItem != null ) { InternalItem.Hue = Hue; } } ); if ( version < 2 ) { diff --git a/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs b/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs index 24cc409ff..22460d5d8 100644 --- a/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs +++ b/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs @@ -236,7 +236,7 @@ namespace Server.Mobiles Timer.DelayCall( TimeSpan.Zero, delegate { Hue = GetHue(); } ); if ( version <= 1 ) - Timer.DelayCall( TimeSpan.Zero, delegate { if ( InternalItem != null ) { InternalItem.Hue = this.Hue; } } ); + Timer.DelayCall( TimeSpan.Zero, delegate { if ( InternalItem != null ) { InternalItem.Hue = Hue; } } ); if ( version < 2 ) { diff --git a/Scripts/Mobiles/Animals/Mounts/Unicorn.cs b/Scripts/Mobiles/Animals/Mounts/Unicorn.cs index b5592e34b..8ea6e7a26 100644 --- a/Scripts/Mobiles/Animals/Mounts/Unicorn.cs +++ b/Scripts/Mobiles/Animals/Mounts/Unicorn.cs @@ -29,14 +29,14 @@ namespace Server.Mobiles if ( p != null ) { - int chanceToCure = 10000 + (int)(this.Skills[SkillName.Magery].Value * 75) - ((p.Level + 1) * (Core.AOS ? (p.Level < 4 ? 3300 : 3100) : 1750)); + int chanceToCure = 10000 + (int)(Skills[SkillName.Magery].Value * 75) - ((p.Level + 1) * (Core.AOS ? (p.Level < 4 ? 3300 : 3100) : 1750)); chanceToCure /= 100; if ( chanceToCure > Utility.Random( 100 ) ) { if ( Rider.CurePoison( this ) ) //TODO: Confirm if mount is the one flagged for curing it or the rider is { - Rider.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3B2, true, "Your mount senses you are in danger and aids you with magic." ); + Rider.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, true, "Your mount senses you are in danger and aids you with magic." ); Rider.FixedParticles( 0x373A, 10, 15, 5012, EffectLayer.Waist ); Rider.PlaySound( 0x1E0 ); // Cure spell effect. Rider.PlaySound( 0xA9 ); // Unicorn's whinny. diff --git a/Scripts/Mobiles/Animals/Slimes/Jwilson.cs b/Scripts/Mobiles/Animals/Slimes/Jwilson.cs index eafaa5f34..931b94800 100644 --- a/Scripts/Mobiles/Animals/Slimes/Jwilson.cs +++ b/Scripts/Mobiles/Animals/Slimes/Jwilson.cs @@ -9,18 +9,18 @@ namespace Server.Mobiles public Jwilson() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { Hue = Utility.RandomList(0x89C,0x8A2,0x8A8,0x8AE); - this.Body = 0x33; - this.VirtualArmor = 8; + Body = 0x33; + VirtualArmor = 8; - this.InitStats(Utility.Random(22,13),Utility.Random(16,6),Utility.Random(16,5)); + InitStats(Utility.Random(22,13),Utility.Random(16,6),Utility.Random(16,5)); - this.Skills[SkillName.Wrestling].Base = Utility.Random(24,17); - this.Skills[SkillName.Tactics].Base = Utility.Random(18,14); - this.Skills[SkillName.MagicResist].Base = Utility.Random(15,6); - this.Skills[SkillName.Poisoning].Base = Utility.Random(31,20); + Skills[SkillName.Wrestling].Base = Utility.Random(24,17); + Skills[SkillName.Tactics].Base = Utility.Random(18,14); + Skills[SkillName.MagicResist].Base = Utility.Random(15,6); + Skills[SkillName.Poisoning].Base = Utility.Random(31,20); - this.Fame = Utility.Random(0,1249); - this.Karma = Utility.Random(0,-624); + Fame = Utility.Random(0,1249); + Karma = Utility.Random(0,-624); } public Jwilson(Serial serial) : base(serial) diff --git a/Scripts/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs b/Scripts/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs index c9fd08541..30c97004a 100644 --- a/Scripts/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs +++ b/Scripts/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs @@ -8,17 +8,17 @@ namespace Server.Mobiles [Constructible] public Parrot() : base(AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) { - this.Body = 831; - this.VirtualArmor = Utility.Random(0,6); + Body = 831; + VirtualArmor = Utility.Random(0,6); - this.InitStats((10),Utility.Random(25,16),(10)); + InitStats((10),Utility.Random(25,16),(10)); - this.Skills[SkillName.Wrestling].Base = (6); - this.Skills[SkillName.Tactics].Base = (6); - this.Skills[SkillName.MagicResist].Base = (5); + Skills[SkillName.Wrestling].Base = (6); + Skills[SkillName.Tactics].Base = (6); + Skills[SkillName.MagicResist].Base = (5); - this.Fame = Utility.Random(0,1249); - this.Karma = Utility.Random(0,-624); + Fame = Utility.Random(0,1249); + Karma = Utility.Random(0,-624); Tamable = true; ControlSlots = 1; diff --git a/Scripts/Mobiles/BaseCreature.cs b/Scripts/Mobiles/BaseCreature.cs index 052174d8e..0e0041612 100644 --- a/Scripts/Mobiles/BaseCreature.cs +++ b/Scripts/Mobiles/BaseCreature.cs @@ -698,7 +698,7 @@ namespace Server.Mobiles BreathPlayAngerSound(); BreathPlayAngerAnimation(); - this.Direction = this.GetDirectionTo( target ); + Direction = GetDirectionTo( target ); Timer.DelayCall( TimeSpan.FromSeconds( BreathEffectDelay ), new TimerStateCallback( BreathEffect_Callback ), target ); } @@ -817,13 +817,13 @@ namespace Server.Mobiles public void SpillAcid( Mobile target, int Amount ) { - if ( (target != null && target.Map == null) || this.Map == null ) + if ( (target != null && target.Map == null) || Map == null ) return; for ( int i = 0; i < Amount; ++i ) { - Point3D loc = this.Location; - Map map = this.Map; + Point3D loc = Location; + Map map = Map; Item acid = NewHarmfulItem(); if ( target?.Map != null && Amount == 1 ) @@ -930,7 +930,7 @@ namespace Server.Mobiles public virtual bool IsFriend( Mobile m ) { - OppositionGroup g = this.OppositionGroup; + OppositionGroup g = OppositionGroup; if ( g != null && g.IsEnemy( this, m ) ) return false; @@ -983,7 +983,7 @@ namespace Server.Mobiles public virtual bool IsEnemy( Mobile m ) { - OppositionGroup g = this.OppositionGroup; + OppositionGroup g = OppositionGroup; if ( g != null && g.IsEnemy( this, m ) ) return true; @@ -1003,7 +1003,7 @@ namespace Server.Mobiles if ( m is PlayerMobile mobile && mobile.HonorActive ) return false; - if ( !(m is BaseCreature c) || m is Server.Engines.Quests.Haven.MilitiaFighter ) + if ( !(m is BaseCreature c) || m is Engines.Quests.Haven.MilitiaFighter ) return true; if ( TransformationSpellHelper.UnderTransformation( m, typeof( EtherealVoyageSpell ) ) ) @@ -1059,7 +1059,7 @@ namespace Server.Mobiles double dMinTameSkill = m_MinTameSkill; - if ( dMinTameSkill > -24.9 && Server.SkillHandlers.AnimalTaming.CheckMastery( m, this ) ) + if ( dMinTameSkill > -24.9 && AnimalTaming.CheckMastery( m, this ) ) dMinTameSkill = -24.9; int taming = (int)((useBaseSkill ? m.Skills[SkillName.AnimalTaming].Base : m.Skills[SkillName.AnimalTaming].Value ) * 10); @@ -1123,7 +1123,7 @@ namespace Server.Mobiles if ( !Summoned ) return false; - Type type = this.GetType(); + Type type = GetType(); bool contains = false; @@ -1150,15 +1150,15 @@ namespace Server.Mobiles public override void Damage( int amount, Mobile from ) { - int oldHits = this.Hits; + int oldHits = Hits; - if ( Core.AOS && !this.Summoned && this.Controlled && 0.2 > Utility.RandomDouble() ) + if ( Core.AOS && !Summoned && Controlled && 0.2 > Utility.RandomDouble() ) amount = (int)(amount * BonusPetDamageScalar); - if ( Spells.Necromancy.EvilOmenSpell.TryEndEffect( this ) ) + if ( EvilOmenSpell.TryEndEffect( this ) ) amount = (int)(amount * 1.25); - Mobile oath = Spells.Necromancy.BloodOathSpell.GetBloodOath( from ); + Mobile oath = BloodOathSpell.GetBloodOath( from ); if ( oath == this ) { @@ -1170,7 +1170,7 @@ namespace Server.Mobiles if ( SubdueBeforeTame && !Controlled ) { - if ( (oldHits > (this.HitsMax / 10)) && (this.Hits <= (this.HitsMax / 10)) ) + if ( (oldHits > (HitsMax / 10)) && (Hits <= (HitsMax / 10)) ) PublicOverheadMessage( MessageType.Regular, 0x3B2, false, "* The creature has been beaten into subjugation! *" ); } } @@ -1198,7 +1198,7 @@ namespace Server.Mobiles if ( !Alive || IsDeadPet ) return ApplyPoisonResult.Immune; - if ( Spells.Necromancy.EvilOmenSpell.TryEndEffect( this ) ) + if ( EvilOmenSpell.TryEndEffect( this ) ) poison = PoisonImpl.IncreaseLevel( poison ); ApplyPoisonResult result = base.ApplyPoison( from, poison ); @@ -1344,9 +1344,9 @@ namespace Server.Mobiles set => m_ManaMax = value; } - public virtual bool CanOpenDoors => !this.Body.IsAnimal && !this.Body.IsSea; + public virtual bool CanOpenDoors => !Body.IsAnimal && !Body.IsSea; - public virtual bool CanMoveOverObstacles => Core.AOS || this.Body.IsMonster; + public virtual bool CanMoveOverObstacles => Core.AOS || Body.IsMonster; public virtual bool CanDestroyObstacles => false; @@ -1412,7 +1412,7 @@ namespace Server.Mobiles WeightOverloading.FatigueOnDamage( this, amount ); - InhumanSpeech speechType = this.SpeechType; + InhumanSpeech speechType = SpeechType; if ( speechType != null && !willKill ) speechType.OnDamage( this, amount ); @@ -1583,7 +1583,7 @@ namespace Server.Mobiles if ( scales != 0 ) { - ScaleType sc = this.ScaleType; + ScaleType sc = ScaleType; switch ( sc ) { @@ -1664,7 +1664,7 @@ namespace Server.Mobiles ChangeAIType(AI); - InhumanSpeech speechType = this.SpeechType; + InhumanSpeech speechType = SpeechType; speechType?.OnConstruct( this ); @@ -2048,12 +2048,12 @@ namespace Server.Mobiles AddFollowers(); if ( IsAnimatedDead ) - Spells.Necromancy.AnimateDeadSpell.Register( m_SummonMaster, this ); + AnimateDeadSpell.Register( m_SummonMaster, this ); } public virtual bool IsHumanInTown() { - return ( Body.IsHuman && Region.IsPartOf( typeof( Regions.GuardedRegion ) ) ); + return ( Body.IsHuman && Region.IsPartOf( typeof( GuardedRegion ) ) ); } public virtual bool CheckGold( Mobile from, Item dropped ) @@ -2075,9 +2075,9 @@ namespace Server.Mobiles { Direction = GetDirectionTo( from ); - int oldSpeechHue = this.SpeechHue; + int oldSpeechHue = SpeechHue; - this.SpeechHue = 0x23F; + SpeechHue = 0x23F; SayTo( from, "Thou art giving me gold?" ); if ( dropped.Amount >= 400 ) @@ -2085,10 +2085,10 @@ namespace Server.Mobiles else SayTo( from, "Money is always welcome." ); - this.SpeechHue = 0x3B2; + SpeechHue = 0x3B2; SayTo( from, 501548 ); // I thank thee. - this.SpeechHue = oldSpeechHue; + SpeechHue = oldSpeechHue; dropped.Delete(); return true; @@ -2788,7 +2788,7 @@ namespace Server.Mobiles FocusMob = null; if ( IsAnimatedDead ) - Spells.Necromancy.AnimateDeadSpell.Unregister( m_SummonMaster, this ); + AnimateDeadSpell.Unregister( m_SummonMaster, this ); if ( MLQuestSystem.Enabled ) MLQuestSystem.HandleDeletion( this ); @@ -2799,13 +2799,13 @@ namespace Server.Mobiles public void DebugSay( string text ) { if ( m_DebugAI ) - this.PublicOverheadMessage( MessageType.Regular, 41, false, text ); + PublicOverheadMessage( MessageType.Regular, 41, false, text ); } public void DebugSay( string format, params object[] args ) { if ( m_DebugAI ) - this.PublicOverheadMessage( MessageType.Regular, 41, false, String.Format( format, args ) ); + PublicOverheadMessage( MessageType.Regular, 41, false, String.Format( format, args ) ); } /* @@ -2867,7 +2867,7 @@ namespace Server.Mobiles { int iCount = 0; - foreach ( Mobile m in this.GetMobilesInRange( iRange ) ) + foreach ( Mobile m in GetMobilesInRange( iRange ) ) { if (m != this && m is BaseCreature creature && !creature.Deleted && creature.Team == Team && CanSee( creature )) { @@ -2895,12 +2895,12 @@ namespace Server.Mobiles return; Owner.From.TargetLocked = true; - SkillHandlers.AnimalTaming.DisableMessage = true; + AnimalTaming.DisableMessage = true; if ( Owner.From.UseSkill( SkillName.AnimalTaming ) ) Owner.From.Target.Invoke( Owner.From, m_Mobile ); - SkillHandlers.AnimalTaming.DisableMessage = false; + AnimalTaming.DisableMessage = false; Owner.From.TargetLocked = false; } } @@ -3105,8 +3105,8 @@ namespace Server.Mobiles { base.AggressiveAction( aggressor, criminal ); - if ( this.ControlMaster != null ) - if ( NotorietyHandlers.CheckAggressor( this.ControlMaster.Aggressors, aggressor ) ) + if ( ControlMaster != null ) + if ( NotorietyHandlers.CheckAggressor( ControlMaster.Aggressors, aggressor ) ) aggressor.Aggressors.Add( AggressorInfo.Create( this, aggressor, true ) ); OrderType ct = m_ControlOrder; @@ -3184,7 +3184,7 @@ namespace Server.Mobiles if ( CanTeach && from.Alive ) { - Skills ourSkills = this.Skills; + Skills ourSkills = Skills; Skills theirSkills = from.Skills; for ( int i = 0; i < ourSkills.Length && i < theirSkills.Length; ++i ) @@ -3207,7 +3207,7 @@ namespace Server.Mobiles public override bool HandlesOnSpeech( Mobile from ) { - InhumanSpeech speechType = this.SpeechType; + InhumanSpeech speechType = SpeechType; if ( speechType != null && (speechType.Flags & IHSFlags.OnSpeech) != 0 && from.InRange( this, 3 ) ) return true; @@ -3217,7 +3217,7 @@ namespace Server.Mobiles public override void OnSpeech( SpeechEventArgs e ) { - InhumanSpeech speechType = this.SpeechType; + InhumanSpeech speechType = SpeechType; if ( speechType != null && speechType.OnSpeech( this, e.Mobile, e.Speech ) ) e.Handled = true; @@ -3259,7 +3259,7 @@ namespace Server.Mobiles if ( target == this || target == m_ControlMaster || target == m_SummonMaster || (!Controlled && !Summoned) ) return; - List list = this.Aggressors; + List list = Aggressors; for ( int i = 0; i < list.Count; ++i ) { @@ -3269,7 +3269,7 @@ namespace Server.Mobiles return; } - list = this.Aggressed; + list = Aggressed; for ( int i = 0; i < list.Count; ++i ) { @@ -3428,7 +3428,7 @@ namespace Server.Mobiles ForceReacquire(); } - InhumanSpeech speechType = this.SpeechType; + InhumanSpeech speechType = SpeechType; speechType?.OnMovement( this, m, oldLocation ); @@ -3462,12 +3462,12 @@ namespace Server.Mobiles if ( !Body.IsHuman || Kills >= 5 || AlwaysMurderer || AlwaysAttackable || m.Kills < 5 || !m.InRange( Location, 12 ) || !m.Alive ) return; - if ( this.Region.GetRegion( typeof( GuardedRegion ) ) is GuardedRegion guardedRegion ) + if ( Region.GetRegion( typeof( GuardedRegion ) ) is GuardedRegion guardedRegion ) { if ( !guardedRegion.IsDisabled() && guardedRegion.IsGuardCandidate( m ) && BeginAction( typeof( GuardedRegion ) ) ) { Say( 1013037 + Utility.Random( 16 ) ); - guardedRegion.CallGuards( this.Location ); + guardedRegion.CallGuards( Location ); Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), new TimerCallback( ReleaseGuardLock ) ); @@ -3666,7 +3666,7 @@ namespace Server.Mobiles if ( Skills[name].Base > Skills[name].Cap ) { if ( Core.SE ) - this.SkillsCap += ( Skills[name].BaseFixedPoint - Skills[name].CapFixedPoint ); + SkillsCap += ( Skills[name].BaseFixedPoint - Skills[name].CapFixedPoint ); Skills[name].Cap = Skills[name].Base; } @@ -3682,7 +3682,7 @@ namespace Server.Mobiles if ( Skills[name].Base > Skills[name].Cap ) { if ( Core.SE ) - this.SkillsCap += ( Skills[name].BaseFixedPoint - Skills[name].CapFixedPoint ); + SkillsCap += ( Skills[name].BaseFixedPoint - Skills[name].CapFixedPoint ); Skills[name].Cap = Skills[name].Base; } @@ -4174,12 +4174,12 @@ namespace Server.Mobiles { if ( from.AccessLevel >= AccessLevel.GameMaster && !Body.IsHuman ) { - Container pack = this.Backpack; + Container pack = Backpack; pack?.DisplayTo( from ); } - if ( this.DeathAdderCharmable && from.CanBeHarmful( this, false ) ) + if ( DeathAdderCharmable && from.CanBeHarmful( this, false ) ) { if ( SummonFamiliarSpell.Table[from] is DeathAdder da && !da.Deleted ) { @@ -4279,9 +4279,9 @@ namespace Server.Mobiles { int treasureLevel = TreasureMapLevel; - if ( treasureLevel == 1 && this.Map == Map.Trammel && TreasureMap.IsInHavenIsland( this ) ) + if ( treasureLevel == 1 && Map == Map.Trammel && TreasureMap.IsInHavenIsland( this ) ) { - Mobile killer = this.LastKiller; + Mobile killer = LastKiller; if ( killer is BaseCreature bc ) killer = bc.GetMaster(); @@ -4295,7 +4295,7 @@ namespace Server.Mobiles if ( treasureLevel >= 0 ) { if ( m_Paragon && Paragon.ChestChance > Utility.RandomDouble() ) - PackItem( new ParagonChest( this.Name, treasureLevel ) ); + PackItem( new ParagonChest( Name, treasureLevel ) ); else if ( (Map == Map.Felucca || Map == Map.Trammel) && TreasureMap.LootChance >= Utility.RandomDouble() ) PackItem( new TreasureMap( treasureLevel, Map ) ); } @@ -4329,7 +4329,7 @@ namespace Server.Mobiles if ( IsAnimatedDead ) Effects.SendLocationEffect( Location, Map, 0x3728, 13, 1, 0x461, 4 ); - InhumanSpeech speechType = this.SpeechType; + InhumanSpeech speechType = SpeechType; speechType?.OnDeath( this ); @@ -4507,10 +4507,10 @@ namespace Server.Mobiles if ( IsBonded ) { - int sound = this.GetDeathSound(); + int sound = GetDeathSound(); if ( sound >= 0 ) - Effects.PlaySound( this, this.Map, sound ); + Effects.PlaySound( this, Map, sound ); Warmode = false; @@ -4530,7 +4530,7 @@ namespace Server.Mobiles SendIncomingPacket(); // TODO: This can be done in Parallel if there are lots of them. - List aggressors = this.Aggressors; + List aggressors = Aggressors; for ( int i = 0; i < aggressors.Count; ++i ) { @@ -4540,7 +4540,7 @@ namespace Server.Mobiles info.Attacker.Combatant = null; } - List aggressed = this.Aggressed; + List aggressed = Aggressed; for ( int i = 0; i < aggressed.Count; ++i ) { @@ -4550,16 +4550,16 @@ namespace Server.Mobiles info.Defender.Combatant = null; } - Mobile owner = this.ControlMaster; + Mobile owner = ControlMaster; - if ( owner == null || owner.Deleted || owner.Map != this.Map || !owner.InRange( this, 12 ) || !this.CanSee( owner ) || !this.InLOS( owner ) ) + if ( owner == null || owner.Deleted || owner.Map != Map || !owner.InRange( this, 12 ) || !CanSee( owner ) || !InLOS( owner ) ) { - if ( this.OwnerAbandonTime == DateTime.MinValue ) - this.OwnerAbandonTime = DateTime.UtcNow; + if ( OwnerAbandonTime == DateTime.MinValue ) + OwnerAbandonTime = DateTime.UtcNow; } else { - this.OwnerAbandonTime = DateTime.MinValue; + OwnerAbandonTime = DateTime.MinValue; } GiftOfLifeSpell.HandleDeath( this ); @@ -4579,7 +4579,7 @@ namespace Server.Mobiles totalKarma += ((totalKarma/10)*3); } - List list = GetLootingRights( this.DamageEntries, this.HitsMax ); + List list = GetLootingRights( DamageEntries, HitsMax ); List titles = new List(); List fame = new List(); List karma = new List(); @@ -4758,11 +4758,11 @@ namespace Server.Mobiles } else { - ISpawner se = this.Spawner; + ISpawner se = Spawner; if ( se?.UnlinkOnTaming == true ) { - this.Spawner.Remove( this ); - this.Spawner = null; + Spawner.Remove( this ); + Spawner = null; } if ( m.Followers + ControlSlots > m.FollowersMax ) @@ -4799,12 +4799,12 @@ namespace Server.Mobiles { base.OnRegionChange( Old, New ); - if ( this.Controlled ) + if ( Controlled ) { - if ( this.Spawner is SpawnEntry se && !se.UnlinkOnTaming && ( New == null || !New.AcceptsSpawnsFrom( se.Region ) ) ) + if ( Spawner is SpawnEntry se && !se.UnlinkOnTaming && ( New == null || !New.AcceptsSpawnsFrom( se.Region ) ) ) { - this.Spawner.Remove( this ); - this.Spawner = null; + Spawner.Remove( this ); + Spawner = null; } } } @@ -4931,7 +4931,7 @@ namespace Server.Mobiles public virtual void Heal( Mobile patient ) { - if ( !Alive || this.Map == Map.Internal || !CanBeBeneficial( patient, true, true ) || patient.Map != this.Map || !InRange( patient, HealEndRange ) ) + if ( !Alive || Map == Map.Internal || !CanBeBeneficial( patient, true, true ) || patient.Map != Map || !InRange( patient, HealEndRange ) ) { StopHeal(); return; @@ -5087,9 +5087,9 @@ namespace Server.Mobiles if ( CanBreath && tc - m_NextBreathTime >= 0 ) // tested: controlled dragons do breath fire, what about summoned skeletal dragons? { - Mobile target = this.Combatant; + Mobile target = Combatant; - if ( target != null && target.Alive && !target.IsDeadBondedPet && CanBeHarmful( target ) && target.Map == this.Map && !IsDeadBondedPet && target.InRange( this, BreathRange ) && InLOS( target ) && !BardPacified ) + if ( target != null && target.Alive && !target.IsDeadBondedPet && CanBeHarmful( target ) && target.Map == Map && !IsDeadBondedPet && target.InRange( this, BreathRange ) && InLOS( target ) && !BardPacified ) { if ( ( Core.TickCount - m_NextBreathTime ) < 30000 && Utility.RandomBool() ) { @@ -5102,9 +5102,9 @@ namespace Server.Mobiles if ( ( CanHeal || CanHealOwner ) && Alive && !IsHealing && !BardPacified ) { - Mobile owner = this.ControlMaster; + Mobile owner = ControlMaster; - if ( owner != null && CanHealOwner && tc - m_NextHealOwnerTime >= 0 && CanBeBeneficial( owner, true, true ) && owner.Map == this.Map && InRange( owner, HealStartRange ) && InLOS( owner ) && owner.Hits < HealOwnerTrigger * owner.HitsMax ) + if ( owner != null && CanHealOwner && tc - m_NextHealOwnerTime >= 0 && CanBeBeneficial( owner, true, true ) && owner.Map == Map && InRange( owner, HealStartRange ) && InLOS( owner ) && owner.Hits < HealOwnerTrigger * owner.HitsMax ) { HealStart( owner ); @@ -5118,15 +5118,15 @@ namespace Server.Mobiles } } - if (ReturnsToHome && this.IsSpawnerBound() && !this.InRange(Home, RangeHome) ) + if (ReturnsToHome && IsSpawnerBound() && !InRange(Home, RangeHome) ) { if ((Combatant == null) && (Warmode == false) && Utility.RandomDouble() < .10) /* some throttling */ { - m_FailedReturnHome = !this.Move(GetDirectionTo(Home.X, Home.Y)) ? m_FailedReturnHome + 1 : 0; + m_FailedReturnHome = !Move(GetDirectionTo(Home.X, Home.Y)) ? m_FailedReturnHome + 1 : 0; if (m_FailedReturnHome > 5) { - this.SetLocation(this.Home, true); + SetLocation(Home, true); m_FailedReturnHome = 0; } @@ -5148,7 +5148,7 @@ namespace Server.Mobiles { Corpse toRummage = null; - IPooledEnumerable eable = this.GetItemsInRange(2); + IPooledEnumerable eable = GetItemsInRange(2); foreach ( Corpse item in eable ) { if ( item.Items.Count > 0 ) @@ -5162,7 +5162,7 @@ namespace Server.Mobiles if ( toRummage == null ) return false; - Container pack = this.Backpack; + Container pack = Backpack; if ( pack == null ) return false; @@ -5211,7 +5211,7 @@ namespace Server.Mobiles if ( !Core.ML ) { - this.PublicOverheadMessage( MessageType.Emote, EmoteHue, false, "*looks furious*" ); + PublicOverheadMessage( MessageType.Emote, EmoteHue, false, "*looks furious*" ); } if ( bSuccess ) @@ -5247,7 +5247,7 @@ namespace Server.Mobiles public bool FindMyName( string str, bool bWithAll ) { - string name = this.Name; + string name = Name; if ( name == null || str.Length < name.Length ) return false; @@ -5317,23 +5317,23 @@ namespace Server.Mobiles IsDeadPet = false; - Effects.SendPacket( Location, Map, new BondedStatus( 0, this.Serial, 0 ) ); + Effects.SendPacket( Location, Map, new BondedStatus( 0, Serial, 0 ) ); - this.SendIncomingPacket(); - this.SendIncomingPacket(); + SendIncomingPacket(); + SendIncomingPacket(); OnAfterResurrect(); - Mobile owner = this.ControlMaster; + Mobile owner = ControlMaster; - if ( owner == null || owner.Deleted || owner.Map != this.Map || !owner.InRange( this, 12 ) || !this.CanSee( owner ) || !this.InLOS( owner ) ) + if ( owner == null || owner.Deleted || owner.Map != Map || !owner.InRange( this, 12 ) || !CanSee( owner ) || !InLOS( owner ) ) { - if ( this.OwnerAbandonTime == DateTime.MinValue ) - this.OwnerAbandonTime = DateTime.UtcNow; + if ( OwnerAbandonTime == DateTime.MinValue ) + OwnerAbandonTime = DateTime.UtcNow; } else { - this.OwnerAbandonTime = DateTime.MinValue; + OwnerAbandonTime = DateTime.MinValue; } CheckStatTimers(); @@ -5348,7 +5348,7 @@ namespace Server.Mobiles } public virtual bool PlayerRangeSensitive //If they are following a waypoint, they'll continue to follow it even if players aren't around - => (this.CurrentWayPoint == null); + => (CurrentWayPoint == null); /* until we are sure about who should be getting deleted, move them instead */ /* On OSI, they despawn */ @@ -5366,7 +5366,7 @@ namespace Server.Mobiles public override void OnSectorDeactivate() { - if ( !Deleted && ReturnsToHome && IsSpawnerBound() && !this.InRange( Home, ( RangeHome + 5 ) ) ) + if ( !Deleted && ReturnsToHome && IsSpawnerBound() && !InRange( Home, ( RangeHome + 5 ) ) ) { Timer.DelayCall( TimeSpan.FromSeconds( ( Utility.Random( 45 ) + 15 ) ), new TimerCallback( GoHome_Callback ) ); @@ -5386,7 +5386,7 @@ namespace Server.Mobiles { if ( !( ( Map.GetSector( X, Y ) ).Active ) ) { - this.SetLocation( Home, true ); + SetLocation( Home, true ); if ( !( ( Map.GetSector( X, Y ) ).Active ) ) { diff --git a/Scripts/Mobiles/Familiars/BaseFamiliar.cs b/Scripts/Mobiles/Familiars/BaseFamiliar.cs index 320162d3b..151834bee 100644 --- a/Scripts/Mobiles/Familiars/BaseFamiliar.cs +++ b/Scripts/Mobiles/Familiars/BaseFamiliar.cs @@ -122,8 +122,8 @@ namespace Server.Mobiles public virtual void DropPackContents() { - Map map = this.Map; - Container pack = this.Backpack; + Map map = Map; + Container pack = Backpack; if ( map != null && map != Map.Internal && pack != null ) { diff --git a/Scripts/Mobiles/Familiars/HordeMinion.cs b/Scripts/Mobiles/Familiars/HordeMinion.cs index 6ac5e3ffa..626f735a4 100644 --- a/Scripts/Mobiles/Familiars/HordeMinion.cs +++ b/Scripts/Mobiles/Familiars/HordeMinion.cs @@ -65,14 +65,14 @@ namespace Server.Mobiles m_NextPickup = DateTime.UtcNow + TimeSpan.FromSeconds( Utility.RandomMinMax( 5, 10 ) ); - Container pack = this.Backpack; + Container pack = Backpack; if ( pack == null ) return; ArrayList list = new ArrayList(); - foreach ( Item item in this.GetItemsInRange( 2 ) ) + foreach ( Item item in GetItemsInRange( 2 ) ) { if ( item.Movable && item.Stackable ) list.Add( item ); @@ -112,7 +112,7 @@ namespace Server.Mobiles public override void BeginRelease( Mobile from ) { - Container pack = this.Backpack; + Container pack = Backpack; if ( pack != null && pack.Items.Count > 0 ) from.SendGump( new WarningGump( 1060635, 30720, 1061672, 32512, 420, 280, new WarningGumpCallback( ConfirmRelease_Callback ), null ) ); diff --git a/Scripts/Mobiles/Familiars/ShadowWisp.cs b/Scripts/Mobiles/Familiars/ShadowWisp.cs index 0a26db48d..9f2f8a9b0 100644 --- a/Scripts/Mobiles/Familiars/ShadowWisp.cs +++ b/Scripts/Mobiles/Familiars/ShadowWisp.cs @@ -49,25 +49,25 @@ namespace Server.Mobiles m_NextFlare = DateTime.UtcNow + TimeSpan.FromSeconds( 5.0 + (25.0 * Utility.RandomDouble()) ); - this.FixedEffect( 0x37C4, 1, 12, 1109, 6 ); - this.PlaySound( 0x1D3 ); + FixedEffect( 0x37C4, 1, 12, 1109, 6 ); + PlaySound( 0x1D3 ); Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), new TimerCallback( Flare ) ); } private void Flare() { - Mobile caster = this.ControlMaster; + Mobile caster = ControlMaster; if ( caster == null ) - caster = this.SummonMaster; + caster = SummonMaster; if ( caster == null ) return; ArrayList list = new ArrayList(); - foreach ( Mobile m in this.GetMobilesInRange( 5 ) ) + foreach ( Mobile m in GetMobilesInRange( 5 ) ) { if ( m.Player && m.Alive && !m.IsDeadBondedPet && m.Karma <= 0 && m.AccessLevel < AccessLevel.Counselor ) list.Add( m ); diff --git a/Scripts/Mobiles/Guards/ArcherGuard.cs b/Scripts/Mobiles/Guards/ArcherGuard.cs index 104c5bd50..ea7f7d47a 100644 --- a/Scripts/Mobiles/Guards/ArcherGuard.cs +++ b/Scripts/Mobiles/Guards/ArcherGuard.cs @@ -71,8 +71,8 @@ namespace Server.Mobiles Skills[SkillName.MagicResist].Base = 120.0; Skills[SkillName.DetectHidden].Base = 100.0; - this.NextCombatTime = Core.TickCount + 500; - this.Focus = target; + NextCombatTime = Core.TickCount + 500; + Focus = target; } public ArcherGuard( Serial serial ) : base( serial ) @@ -103,7 +103,7 @@ namespace Server.Mobiles m_Focus = value; if ( value != null ) - this.AggressiveAction( value ); + AggressiveAction( value ); Combatant = value; @@ -210,7 +210,7 @@ namespace Server.Mobiles protected override void OnTick() { - BaseGuard.Spawn( m_Focus, m_Focus, 1, true ); + Spawn( m_Focus, m_Focus, 1, true ); } } diff --git a/Scripts/Mobiles/Guards/WarriorGuard.cs b/Scripts/Mobiles/Guards/WarriorGuard.cs index 5a3a5e4a6..87f31801f 100644 --- a/Scripts/Mobiles/Guards/WarriorGuard.cs +++ b/Scripts/Mobiles/Guards/WarriorGuard.cs @@ -86,8 +86,8 @@ namespace Server.Mobiles Skills[SkillName.MagicResist].Base = 120.0; Skills[SkillName.DetectHidden].Base = 100.0; - this.NextCombatTime = Core.TickCount + 500; - this.Focus = target; + NextCombatTime = Core.TickCount + 500; + Focus = target; } public WarriorGuard( Serial serial ) : base( serial ) @@ -118,7 +118,7 @@ namespace Server.Mobiles m_Focus = value; if ( value != null ) - this.AggressiveAction( value ); + AggressiveAction( value ); Combatant = value; @@ -225,7 +225,7 @@ namespace Server.Mobiles protected override void OnTick() { - BaseGuard.Spawn( m_Focus, m_Focus, 1, true ); + Spawn( m_Focus, m_Focus, 1, true ); } } diff --git a/Scripts/Mobiles/Healers/BaseHealer.cs b/Scripts/Mobiles/Healers/BaseHealer.cs index 7fb5a16f4..b9946b399 100644 --- a/Scripts/Mobiles/Healers/BaseHealer.cs +++ b/Scripts/Mobiles/Healers/BaseHealer.cs @@ -24,7 +24,7 @@ namespace Server.Mobiles AI = AIType.AI_Mage; ActiveSpeed = 0.2; PassiveSpeed = 0.8; - RangePerception = BaseCreature.DefaultRangePerception; + RangePerception = DefaultRangePerception; FightMode = FightMode.Aggressor; } @@ -130,7 +130,7 @@ namespace Server.Mobiles OfferResurrection( m ); } } - else if ( this.HealsYoungPlayers && m.Hits < m.HitsMax && m is PlayerMobile mobile && mobile.Young ) + else if ( HealsYoungPlayers && m.Hits < m.HitsMax && m is PlayerMobile mobile && mobile.Young ) { OfferHeal( mobile ); } @@ -155,7 +155,7 @@ namespace Server.Mobiles AI = AIType.AI_Mage; ActiveSpeed = 0.2; PassiveSpeed = 0.8; - RangePerception = BaseCreature.DefaultRangePerception; + RangePerception = DefaultRangePerception; FightMode = FightMode.Aggressor; } } diff --git a/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs b/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs index bd08d63fc..4ae92cf9a 100644 --- a/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs +++ b/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs @@ -77,7 +77,7 @@ namespace Server.Mobiles public static Mobile FindRandomPlayer( BaseCreature creature ) { - List rights = BaseCreature.GetLootingRights( creature.DamageEntries, creature.HitsMax ); + List rights = GetLootingRights( creature.DamageEntries, creature.HitsMax ); for ( int i = rights.Count - 1; i >= 0; --i ) { @@ -157,8 +157,8 @@ namespace Server.Mobiles { base.OnDeath( c ); - if ( !Summoned && !NoKillAwards && DemonKnight.CheckArtifactChance( this ) ) - DemonKnight.DistributeArtifact( this ); + if ( !Summoned && !NoKillAwards && CheckArtifactChance( this ) ) + DistributeArtifact( this ); } [Constructible] diff --git a/Scripts/Mobiles/Monsters/AOS/Revenant.cs b/Scripts/Mobiles/Monsters/AOS/Revenant.cs index 4fb8690ef..71fb1502e 100644 --- a/Scripts/Mobiles/Monsters/AOS/Revenant.cs +++ b/Scripts/Mobiles/Monsters/AOS/Revenant.cs @@ -134,9 +134,9 @@ namespace Server.Mobiles PlaySound( 0x37D ); } - if (m_Target.Hidden && InRange(m_Target, 3) && Core.TickCount - this.NextSkillTime >= 0 && UseSkill(SkillName.DetectHidden)) + if (m_Target.Hidden && InRange(m_Target, 3) && Core.TickCount - NextSkillTime >= 0 && UseSkill(SkillName.DetectHidden)) { - Target targ = this.Target; + Target targ = Target; if ( targ != null ) targ.Invoke( this, this ); diff --git a/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs b/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs index 5ba3bef3c..27be90dbe 100644 --- a/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs +++ b/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs @@ -99,7 +99,7 @@ namespace Server.Mobiles { if ( Hidden ) { - Effects.PlaySound( this.Location, this.Map, 0x2C8 ); + Effects.PlaySound( Location, Map, 0x2C8 ); Combatant = null; } else @@ -117,7 +117,7 @@ namespace Server.Mobiles { if ( !m_HasTeleportedAway && Hits < (HitsMax / 2) ) { - Map map = this.Map; + Map map = Map; if ( map != null ) { @@ -131,16 +131,16 @@ namespace Server.Mobiles if ( !map.CanFit( x, y, z, 16, false, false ) ) continue; - Point3D from = this.Location; + Point3D from = Location; Point3D to = new Point3D( x, y, z ); if ( !InLOS( to ) ) continue; - this.Location = to; - this.ProcessDelta(); - this.Hidden = true; - this.Combatant = null; + Location = to; + ProcessDelta(); + Hidden = true; + Combatant = null; Effects.SendLocationParticles( EffectItem.Create( from, map, EffectItem.DefaultDuration ), 0x3728, 10, 10, 2023 ); Effects.SendLocationParticles( EffectItem.Create( to, map, EffectItem.DefaultDuration ), 0x3728, 10, 10, 5023 ); diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs index 15db63759..8820a9349 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs @@ -109,10 +109,10 @@ namespace Server.Mobiles m_Stunning = true; defender.Animate( 21, 6, 1, true, false, 0 ); - this.PlaySound( 0xEE ); + PlaySound( 0xEE ); defender.LocalOverheadMessage( MessageType.Regular, 0x3B2, false, "You have been stunned by a colossal blow!" ); - if ( this.Weapon is BaseWeapon weapon ) + if ( Weapon is BaseWeapon weapon ) weapon.OnHit( this, defender ); if ( defender.Alive ) @@ -148,10 +148,10 @@ namespace Server.Mobiles if ( Utility.RandomBool() ) { - this.FixedParticles( 0x376A, 9, 32, 0x2539, EffectLayer.LeftHand ); - this.PlaySound( 0x1DE ); + FixedParticles( 0x376A, 9, 32, 0x2539, EffectLayer.LeftHand ); + PlaySound( 0x1DE ); - foreach ( Mobile m in this.GetMobilesInRange( 2 ) ) + foreach ( Mobile m in GetMobilesInRange( 2 ) ) { if ( m != this && IsEnemy( m ) ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs index 0bebcb8af..4a4af8b32 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs @@ -80,8 +80,8 @@ namespace Server.Mobiles public void ThrowHatchet( Mobile to ) { int damage = 50; - this.MovingEffect( to, 0xF43, 10, 0, false, false ); - this.DoHarmful( to ); + MovingEffect( to, 0xF43, 10, 0, false, false ); + DoHarmful( to ); AOS.Damage( to, this, damage, 100, 0, 0, 0, 0 ); } diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs index 1aea739b7..51da8434f 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs @@ -110,12 +110,12 @@ namespace Server.Mobiles public void BeginSavageDance() { - if ( this.Map == null ) + if ( Map == null ) return; ArrayList list = new ArrayList(); - foreach ( Mobile m in this.GetMobilesInRange( 8 ) ) + foreach ( Mobile m in GetMobilesInRange( 8 ) ) { if ( m != this && m is SavageShaman ) list.Add( m ); @@ -149,7 +149,7 @@ namespace Server.Mobiles ArrayList list = new ArrayList(); - foreach ( Mobile m in this.GetMobilesInRange( 8 ) ) + foreach ( Mobile m in GetMobilesInRange( 8 ) ) list.Add( m ); if ( list.Count > 0 ) diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs index 42db20e7f..70a6eb5bd 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs @@ -56,12 +56,12 @@ namespace Server.Mobiles { ArrayList list = new ArrayList(); - foreach ( Mobile m in this.GetMobilesInRange( 2 ) ) + foreach ( Mobile m in GetMobilesInRange( 2 ) ) { if ( m == this || !CanBeHarmful( m ) ) continue; - if ( m is BaseCreature creature && (creature.Controlled || creature.Summoned || creature.Team != this.Team) ) + if ( m is BaseCreature creature && (creature.Controlled || creature.Summoned || creature.Team != Team) ) list.Add( m ); else if ( m.Player ) list.Add( m ); diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Brigand.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Brigand.cs index 2d9f88846..f2b65e795 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Brigand.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Brigand.cs @@ -13,7 +13,7 @@ namespace Server.Mobiles Title = "the brigand"; Hue = Utility.RandomSkinHue(); - if ( this.Female = Utility.RandomBool() ) + if ( Female = Utility.RandomBool() ) { Body = 0x191; Name = NameList.RandomName( "female" ); diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs index 1aca8c880..f54f1c8d8 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs @@ -15,7 +15,7 @@ namespace Server.Mobiles Race = Race.Elf; Hue = Race.RandomSkinHue(); - if ( this.Female = Utility.RandomBool() ) + if ( Female = Utility.RandomBool() ) { Body = 0x25E; Name = NameList.RandomName( "female elf brigand" ); diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Executioner.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Executioner.cs index 324f0b594..77f4bc737 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Executioner.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Executioner.cs @@ -11,16 +11,16 @@ namespace Server.Mobiles Title = "the executioner"; Hue = Utility.RandomSkinHue(); - if ( this.Female = Utility.RandomBool() ) + if ( Female = Utility.RandomBool() ) { - this.Body = 0x191; - this.Name = NameList.RandomName( "female" ); + Body = 0x191; + Name = NameList.RandomName( "female" ); AddItem( new Skirt( Utility.RandomRedHue() ) ); } else { - this.Body = 0x190; - this.Name = NameList.RandomName( "male" ); + Body = 0x190; + Name = NameList.RandomName( "male" ); AddItem( new ShortPants( Utility.RandomRedHue() ) ); } diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs index 0acdf48d8..5be10248b 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs @@ -107,10 +107,10 @@ namespace Server.Mobiles m_Stunning = true; defender.Animate( 21, 6, 1, true, false, 0 ); - this.PlaySound( 0xEE ); + PlaySound( 0xEE ); defender.LocalOverheadMessage( MessageType.Regular, 0x3B2, false, "You have been stunned by a colossal blow!" ); - if ( this.Weapon is BaseWeapon weapon ) + if ( Weapon is BaseWeapon weapon ) weapon.OnHit( this, defender ); if ( defender.Alive ) diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs index 88f32a75d..c58d56fa8 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs @@ -98,8 +98,8 @@ namespace Server.Mobiles public override bool OnBeforeDeath() { BoneMagi rm = new BoneMagi(); - rm.Team = this.Team; - rm.Combatant = this.Combatant; + rm.Team = Team; + rm.Combatant = Combatant; rm.NoKillAwards = true; if ( rm.Backpack == null ) diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs index 1b047cc37..d73ce86c3 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs @@ -107,8 +107,8 @@ namespace Server.Mobiles public override bool OnBeforeDeath() { BoneKnight rm = new BoneKnight(); - rm.Team = this.Team; - rm.Combatant = this.Combatant; + rm.Team = Team; + rm.Combatant = Combatant; rm.NoKillAwards = true; if ( rm.Backpack == null ) diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs index 20dc4d497..d6459f609 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs @@ -114,7 +114,7 @@ namespace Server.Mobiles { DoHarmful( m ); - this.MovingParticles( m, 0x1C19, 1, 0, false, true, 0, 0, 9502, 6014, 0x11D, EffectLayer.Waist, 0 ); + MovingParticles( m, 0x1C19, 1, 0, false, true, 0, 0, 9502, 6014, 0x11D, EffectLayer.Waist, 0 ); new InternalTimer( m, this ).Start(); } diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs index 9276edaf9..e6fdbf625 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs @@ -106,7 +106,7 @@ namespace Server.Mobiles int orcs = 0; - foreach ( Mobile m in this.GetMobilesInRange( 10 ) ) + foreach ( Mobile m in GetMobilesInRange( 10 ) ) { if ( m is OrcishLord ) ++orcs; @@ -116,7 +116,7 @@ namespace Server.Mobiles { BaseCreature orc = new SpawnedOrcishLord(); - orc.Team = this.Team; + orc.Team = Team; Point3D loc = target.Location; bool validLocation = false; @@ -127,7 +127,7 @@ namespace Server.Mobiles int y = target.Y + Utility.Random( 3 ) - 1; int z = map.GetAverageZ( x, y ); - if ( validLocation = map.CanFit( x, y, this.Z, 16, false, false ) ) + if ( validLocation = map.CanFit( x, y, Z, 16, false, false ) ) loc = new Point3D( x, y, Z ); else if ( validLocation = map.CanFit( x, y, z, 16, false, false ) ) loc = new Point3D( x, y, z ); diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs index 6732a580e..b65ff03ea 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs @@ -61,7 +61,7 @@ namespace Server.Mobiles for ( int i = 0; i < list.Count; ++i ) { - if ( list[i] is ContextMenus.PaperdollEntry ) + if ( list[i] is PaperdollEntry ) list.RemoveAt( i-- ); } } diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs index 90b52b66d..289c5677d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs @@ -61,7 +61,7 @@ namespace Server.Mobiles public override bool OnBeforeDeath() { - IMount mount = this.Mount; + IMount mount = Mount; if ( mount != null ) mount.Rider = null; diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/SpawnedOrcishLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/SpawnedOrcishLord.cs index 46b165c2d..713808387 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/SpawnedOrcishLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/SpawnedOrcishLord.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles [Constructible] public SpawnedOrcishLord() { - Container pack = this.Backpack; + Container pack = Backpack; if ( pack != null ) pack.Delete(); diff --git a/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs b/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs index 4b725103f..997d05859 100644 --- a/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs +++ b/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs @@ -113,14 +113,14 @@ namespace Server.Mobiles if ( !m_FieldActive ) { // should there be an effect when spells nullifying is on? - this.FixedParticles( 0, 10, 0, 0x2522, EffectLayer.Waist ); + FixedParticles( 0, 10, 0, 0x2522, EffectLayer.Waist ); } else if ( m_FieldActive && !CanUseField ) { m_FieldActive = false; // TODO: message and effect when field turns down; cannot be verified on OSI due to a bug - this.FixedParticles( 0x3735, 1, 30, 0x251F, EffectLayer.Waist ); + FixedParticles( 0x3735, 1, 30, 0x251F, EffectLayer.Waist ); } } @@ -130,7 +130,7 @@ namespace Server.Mobiles if ( m_FieldActive ) { - this.FixedParticles( 0x376A, 20, 10, 0x2530, EffectLayer.Waist ); + FixedParticles( 0x376A, 20, 10, 0x2530, EffectLayer.Waist ); PlaySound( 0x2F4 ); @@ -156,17 +156,17 @@ namespace Server.Mobiles { bool move = base.Move( d ); - if ( move && m_FieldActive && this.Combatant != null ) - this.FixedParticles( 0, 10, 0, 0x2530, EffectLayer.Waist ); + if ( move && m_FieldActive && Combatant != null ) + FixedParticles( 0, 10, 0, 0x2530, EffectLayer.Waist ); return move; } public void SendEBolt( Mobile to ) { - this.MovingParticles( to, 0x379F, 7, 0, false, true, 0xBE3, 0xFCB, 0x211 ); + MovingParticles( to, 0x379F, 7, 0, false, true, 0xBE3, 0xFCB, 0x211 ); to.PlaySound( 0x229 ); - this.DoHarmful( to ); + DoHarmful( to ); AOS.Damage( to, this, 50, 0, 0, 0, 0, 100 ); } @@ -187,8 +187,8 @@ namespace Server.Mobiles m_FieldActive = CanUseField; - if ( this.Name == "Exodus Minion" ) - this.Name = null; + if ( Name == "Exodus Minion" ) + Name = null; } } } diff --git a/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs b/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs index a125799fd..fd4ad5c38 100644 --- a/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs +++ b/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs @@ -109,14 +109,14 @@ namespace Server.Mobiles if ( !m_FieldActive ) { // should there be an effect when spells nullifying is on? - this.FixedParticles( 0, 10, 0, 0x2522, EffectLayer.Waist ); + FixedParticles( 0, 10, 0, 0x2522, EffectLayer.Waist ); } else if ( m_FieldActive && !CanUseField ) { m_FieldActive = false; // TODO: message and effect when field turns down; cannot be verified on OSI due to a bug - this.FixedParticles( 0x3735, 1, 30, 0x251F, EffectLayer.Waist ); + FixedParticles( 0x3735, 1, 30, 0x251F, EffectLayer.Waist ); } } @@ -126,7 +126,7 @@ namespace Server.Mobiles if ( m_FieldActive ) { - this.FixedParticles( 0x376A, 20, 10, 0x2530, EffectLayer.Waist ); + FixedParticles( 0x376A, 20, 10, 0x2530, EffectLayer.Waist ); PlaySound( 0x2F4 ); @@ -152,17 +152,17 @@ namespace Server.Mobiles { bool move = base.Move( d ); - if ( move && m_FieldActive && this.Combatant != null ) - this.FixedParticles( 0, 10, 0, 0x2530, EffectLayer.Waist ); + if ( move && m_FieldActive && Combatant != null ) + FixedParticles( 0, 10, 0, 0x2530, EffectLayer.Waist ); return move; } public void SendEBolt( Mobile to ) { - this.MovingParticles( to, 0x379F, 7, 0, false, true, 0xBE3, 0xFCB, 0x211 ); + MovingParticles( to, 0x379F, 7, 0, false, true, 0xBE3, 0xFCB, 0x211 ); to.PlaySound( 0x229 ); - this.DoHarmful( to ); + DoHarmful( to ); AOS.Damage( to, this, 50, 0, 0, 0, 0, 100 ); } @@ -183,8 +183,8 @@ namespace Server.Mobiles m_FieldActive = CanUseField; - if ( this.Name == "Exodus Overseer" ) - this.Name = null; + if ( Name == "Exodus Overseer" ) + Name = null; } } } diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs index 89b56bfae..3e4be734a 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs @@ -149,7 +149,7 @@ namespace Server.Mobiles public override bool OnBeforeDeath() { - IMount mount = this.Mount; + IMount mount = Mount; if ( mount != null ) mount.Rider = null; diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs index 524183b5a..bd49ca618 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs @@ -165,7 +165,7 @@ namespace Server.Mobiles public override bool OnBeforeDeath() { - IMount mount = this.Mount; + IMount mount = Mount; if ( mount != null ) { diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs index 3e01775f9..33ee36f50 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs @@ -76,7 +76,7 @@ namespace Server.Mobiles "{0}!! You will pay for that!" }; - this.Say( true, String.Format( toSay[Utility.Random( toSay.Length )], from.Name ) ); + Say( true, String.Format( toSay[Utility.Random( toSay.Length )], from.Name ) ); } base.OnDamage( amount, from, willKill ); diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs index ae4c40958..742f7a2d5 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs @@ -106,7 +106,7 @@ namespace Server.Mobiles { JukaLord toBuff = null; - foreach ( Mobile m in this.GetMobilesInRange( 8 ) ) + foreach ( Mobile m in GetMobilesInRange( 8 ) ) { if ( m is JukaLord lord && IsFriend( lord ) && lord.Combatant != null && CanBeBeneficial( lord ) && lord.CanBeginAction( typeof( JukaMage ) ) && InLOS( lord ) ) { @@ -122,7 +122,7 @@ namespace Server.Mobiles m_NextAbilityTime = DateTime.UtcNow + TimeSpan.FromSeconds( Utility.RandomMinMax( 30, 60 ) ); toBuff.Say( true, "Give me the power to destroy my enemies!" ); - this.Say( true, "Fight well my lord!" ); + Say( true, "Fight well my lord!" ); DoBeneficial( toBuff ); diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs index 9cf279ced..4dab034eb 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs @@ -109,11 +109,11 @@ namespace Server.Mobiles public override void OnThink() { - if ( Combatant != null && this.MagicDamageAbsorb < 1 ) + if ( Combatant != null && MagicDamageAbsorb < 1 ) { - this.MagicDamageAbsorb = Utility.RandomMinMax( 5, 7 ); - this.FixedParticles( 0x375A, 10, 15, 5037, EffectLayer.Waist ); - this.PlaySound( 0x1E9 ); + MagicDamageAbsorb = Utility.RandomMinMax( 5, 7 ); + FixedParticles( 0x375A, 10, 15, 5037, EffectLayer.Waist ); + PlaySound( 0x1E9 ); } if ( DateTime.UtcNow >= m_NextAbilityTime ) @@ -122,7 +122,7 @@ namespace Server.Mobiles ArrayList list = new ArrayList(); - foreach ( Mobile m in this.GetMobilesInRange( 8 ) ) + foreach ( Mobile m in GetMobilesInRange( 8 ) ) { if ( m is MeerWarrior && IsFriend( m ) && CanBeBeneficial( m ) && m.Hits < m.HitsMax && !m.Poisoned && !MortalStrike.IsWounded( m ) ) list.Add( m ); diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs index 2322683de..cf878ffca 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs @@ -80,8 +80,8 @@ namespace Server.Mobiles { m_NextAbilityTime += TimeSpan.FromSeconds( 2.5 ); - this.Say( true, "Beware, mortals! You have provoked my wrath!" ); - this.FixedParticles( 0x376A, 10, 10, 9537, 33, 0, EffectLayer.Waist ); + Say( true, "Beware, mortals! You have provoked my wrath!" ); + FixedParticles( 0x376A, 10, 10, 9537, 33, 0, EffectLayer.Waist ); Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), new TimerCallback( DoAreaLeech_Finish ) ); } @@ -90,15 +90,15 @@ namespace Server.Mobiles { ArrayList list = new ArrayList(); - foreach ( Mobile m in this.GetMobilesInRange( 6 ) ) + foreach ( Mobile m in GetMobilesInRange( 6 ) ) { - if ( this.CanBeHarmful( m ) && this.IsEnemy( m ) ) + if ( CanBeHarmful( m ) && IsEnemy( m ) ) list.Add( m ); } if ( list.Count == 0 ) { - this.Say( true, "Bah! You have escaped my grasp this time, mortal!" ); + Say( true, "Bah! You have escaped my grasp this time, mortal!" ); } else { @@ -125,17 +125,17 @@ namespace Server.Mobiles m.MovingParticles( this, 0x36F4, 1, 0, false, false, 32, 0, 9535, 1, 0, (EffectLayer)255, 0x100 ); m.MovingParticles( this, 0x0001, 1, 0, false, true, 32, 0, 9535, 9536, 0, (EffectLayer)255, 0 ); - this.DoHarmful( m ); - this.Hits += AOS.Damage( m, this, damage, 100, 0, 0, 0, 0 ); + DoHarmful( m ); + Hits += AOS.Damage( m, this, damage, 100, 0, 0, 0, 0 ); } - this.Say( true, "If I cannot cleanse thy soul, I will destroy it!" ); + Say( true, "If I cannot cleanse thy soul, I will destroy it!" ); } } private void DoFocusedLeech( Mobile combatant, string message ) { - this.Say( true, message ); + Say( true, message ); Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), new TimerStateCallback( DoFocusedLeech_Stage1 ), combatant ); } @@ -144,11 +144,11 @@ namespace Server.Mobiles { Mobile combatant = (Mobile)state; - if ( this.CanBeHarmful( combatant ) ) + if ( CanBeHarmful( combatant ) ) { - this.MovingParticles( combatant, 0x36FA, 1, 0, false, false, 1108, 0, 9533, 1, 0, (EffectLayer)255, 0x100 ); - this.MovingParticles( combatant, 0x0001, 1, 0, false, true, 1108, 0, 9533, 9534, 0, (EffectLayer)255, 0 ); - this.PlaySound( 0x1FB ); + MovingParticles( combatant, 0x36FA, 1, 0, false, false, 1108, 0, 9533, 1, 0, (EffectLayer)255, 0x100 ); + MovingParticles( combatant, 0x0001, 1, 0, false, true, 1108, 0, 9533, 9534, 0, (EffectLayer)255, 0 ); + PlaySound( 0x1FB ); Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), new TimerStateCallback( DoFocusedLeech_Stage2 ), combatant ); } @@ -158,14 +158,14 @@ namespace Server.Mobiles { Mobile combatant = (Mobile)state; - if ( this.CanBeHarmful( combatant ) ) + if ( CanBeHarmful( combatant ) ) { combatant.MovingParticles( this, 0x36F4, 1, 0, false, false, 32, 0, 9535, 1, 0, (EffectLayer)255, 0x100 ); combatant.MovingParticles( this, 0x0001, 1, 0, false, true, 32, 0, 9535, 9536, 0, (EffectLayer)255, 0 ); - this.PlaySound( 0x209 ); - this.DoHarmful( combatant ); - this.Hits += AOS.Damage( combatant, this, Utility.RandomMinMax( 30, 40 ) - (Core.AOS ? 0 : 10), 100, 0, 0, 0, 0 ); + PlaySound( 0x209 ); + DoHarmful( combatant ); + Hits += AOS.Damage( combatant, this, Utility.RandomMinMax( 30, 40 ) - (Core.AOS ? 0 : 10), 100, 0, 0, 0, 0 ); } } @@ -173,9 +173,9 @@ namespace Server.Mobiles { if ( DateTime.UtcNow >= m_NextAbilityTime ) { - Mobile combatant = this.Combatant; + Mobile combatant = Combatant; - if ( combatant != null && combatant.Map == this.Map && combatant.InRange( this, 12 ) ) + if ( combatant != null && combatant.Map == Map && combatant.InRange( this, 12 ) ) { m_NextAbilityTime = DateTime.UtcNow + TimeSpan.FromSeconds( Utility.RandomMinMax( 10, 15 ) ); diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs index ffe340d1d..06c937fab 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs @@ -80,9 +80,9 @@ namespace Server.Mobiles { if ( DateTime.UtcNow >= m_NextAbilityTime ) { - Mobile combatant = this.Combatant; + Mobile combatant = Combatant; - if ( combatant != null && combatant.Map == this.Map && combatant.InRange( this, 12 ) && IsEnemy( combatant ) && !UnderEffect( combatant ) ) + if ( combatant != null && combatant.Map == Map && combatant.InRange( this, 12 ) && IsEnemy( combatant ) && !UnderEffect( combatant ) ) { m_NextAbilityTime = DateTime.UtcNow + TimeSpan.FromSeconds( Utility.RandomMinMax( 20, 30 ) ); @@ -90,7 +90,7 @@ namespace Server.Mobiles { if ( bc.Controlled && bc.ControlMaster != null && !bc.ControlMaster.Deleted && bc.ControlMaster.Alive ) { - if ( bc.ControlMaster.Map == this.Map && bc.ControlMaster.InRange( this, 12 ) && !UnderEffect( bc.ControlMaster ) ) + if ( bc.ControlMaster.Map == Map && bc.ControlMaster.InRange( this, 12 ) && !UnderEffect( bc.ControlMaster ) ) { Combatant = combatant = bc.ControlMaster; } @@ -127,11 +127,11 @@ namespace Server.Mobiles rabid.FocusMob = combatant; rabid.MoveToWorld( loc, combatant.Map ); } - this.Say( 1071932 ); //Creatures of the forest, I call to thee! Aid me in the fight against all that is evil! + Say( 1071932 ); //Creatures of the forest, I call to thee! Aid me in the fight against all that is evil! } else if ( combatant.Player ) { - this.Say( true, "I call a plague of insects to sting your flesh!" ); + Say( true, "I call a plague of insects to sting your flesh!" ); m_Table[combatant] = Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 7.0 ), new TimerStateCallback( DoEffect ), new object[]{ combatant, 0 } ); } } diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs index 4e6e05674..c7dd80695 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs @@ -53,7 +53,7 @@ namespace Server.Mobiles { if ( from != null && !willKill && amount > 3 && from != null && !InRange( from, 7 ) ) { - this.MovingEffect( from, 0xF51, 10, 0, false, false ); + MovingEffect( from, 0xF51, 10, 0, false, false ); SpellHelper.Damage( TimeSpan.FromSeconds( 1.0 ), from, this, Utility.RandomMinMax( 30, 40 ) - (Core.AOS ? 0 : 10), 100, 0, 0, 0, 0 ); } diff --git a/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs b/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs index ff78f1b64..ca4f1f1b8 100644 --- a/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs +++ b/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs @@ -90,8 +90,8 @@ namespace Server.Mobiles if ( version == 0 ) { - Server.SkillHandlers.AnimalTaming.ScaleStats( this, 0.50 ); - Server.SkillHandlers.AnimalTaming.ScaleSkills( this, 0.80, 0.90 ); // 90% * 80% = 72% of original skills trainable to 90% + SkillHandlers.AnimalTaming.ScaleStats( this, 0.50 ); + SkillHandlers.AnimalTaming.ScaleSkills( this, 0.80, 0.90 ); // 90% * 80% = 72% of original skills trainable to 90% Skills[SkillName.Magery].Base = Skills[SkillName.Magery].Cap; // Greater dragons have a 90% cap reduction and 90% skill reduction on magery } } diff --git a/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs b/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs index 1dbd512ad..384c9153d 100644 --- a/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs +++ b/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs @@ -167,15 +167,15 @@ namespace Server.Mobiles public void Earthquake() { - Map map = this.Map; + Map map = Map; if (map == null) return; ArrayList targets = new ArrayList(); - foreach (Mobile m in this.GetMobilesInRange(8)) + foreach (Mobile m in GetMobilesInRange(8)) { if (m == this || !CanBeHarmful(m)) continue; - if (m is BaseCreature creature && (creature.Controlled || creature.Summoned || creature.Team != this.Team)) + if (m is BaseCreature creature && (creature.Controlled || creature.Summoned || creature.Team != Team)) targets.Add(m); else if (m.Player) targets.Add(m); diff --git a/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs b/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs index 93dc9ba36..8404946c6 100644 --- a/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs +++ b/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs @@ -78,7 +78,7 @@ namespace Server.Mobiles public void SpawnPixies( Mobile target ) { - Map map = this.Map; + Map map = Map; if ( map == null ) return; @@ -89,11 +89,11 @@ namespace Server.Mobiles { Pixie pixie = new Pixie(); - pixie.Team = this.Team; + pixie.Team = Team; pixie.FightMode = FightMode.Closest; bool validLocation = false; - Point3D loc = this.Location; + Point3D loc = Location; for ( int j = 0; !validLocation && j < 10; ++j ) { @@ -101,7 +101,7 @@ namespace Server.Mobiles int y = Y + Utility.Random( 3 ) - 1; int z = map.GetAverageZ( x, y ); - if ( validLocation = map.CanFit( x, y, this.Z, 16, false, false ) ) + if ( validLocation = map.CanFit( x, y, Z, 16, false, false ) ) loc = new Point3D( x, y, Z ); else if ( validLocation = map.CanFit( x, y, z, 16, false, false ) ) loc = new Point3D( x, y, z ); diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs b/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs index a20514c16..57e927a20 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs @@ -13,7 +13,7 @@ namespace Server.Mobiles public override double GetFightModeRanking( Mobile m, FightMode acqType, bool bPlayerOnly ) { - return m.Str / Math.Max( this.GetDistanceToSqrt( m ), 1.0 ); + return m.Str / Math.Max( GetDistanceToSqrt( m ), 1.0 ); } public override string DefaultName => "an animated weapon"; diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs b/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs index adb21d52d..d18f6864c 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs @@ -155,10 +155,10 @@ namespace Server.Mobiles m_Stunning = true; defender.Animate( 21, 6, 1, true, false, 0 ); - this.PlaySound( 0xEE ); + PlaySound( 0xEE ); defender.LocalOverheadMessage( MessageType.Regular, 0x3B2, false, "You have been stunned by a colossal blow!" ); - if ( this.Weapon is BaseWeapon weapon ) + if ( Weapon is BaseWeapon weapon ) weapon.OnHit( this, defender ); if ( defender.Alive ) @@ -185,12 +185,12 @@ namespace Server.Mobiles { if ( Controlled || Summoned ) { - Mobile master = ( this.ControlMaster ); + Mobile master = ( ControlMaster ); if ( master == null ) - master = this.SummonMaster; + master = SummonMaster; - if ( master != null && master.Player && master.Map == this.Map && master.InRange( Location, 20 ) ) + if ( master != null && master.Player && master.Map == Map && master.InRange( Location, 20 ) ) { if ( master.Mana >= amount ) { diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs index 2a9ed2766..663fc4282 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeast.cs @@ -89,12 +89,12 @@ namespace Server.Mobiles public override void OnDamagedBySpell( Mobile caster ) { - if ( this.Map != null && caster != this && 0.25 > Utility.RandomDouble() ) + if ( Map != null && caster != this && 0.25 > Utility.RandomDouble() ) { BaseCreature spawn = new PlagueSpawn( this ); - spawn.Team = this.Team; - spawn.MoveToWorld( this.Location, this.Map ); + spawn.Team = Team; + spawn.MoveToWorld( Location, Map ); spawn.Combatant = caster; Say( 1053034 ); // * The plague beast creates another beast from its flesh! * @@ -108,12 +108,12 @@ namespace Server.Mobiles public override void OnGotMeleeAttack( Mobile attacker ) { - if ( this.Map != null && attacker != this && 0.25 > Utility.RandomDouble() ) + if ( Map != null && attacker != this && 0.25 > Utility.RandomDouble() ) { BaseCreature spawn = new PlagueSpawn( this ); - spawn.Team = this.Team; - spawn.MoveToWorld( this.Location, this.Map ); + spawn.Team = Team; + spawn.MoveToWorld( Location, Map ); spawn.Combatant = attacker; Say( 1053034 ); // * The plague beast creates another beast from its flesh! * @@ -222,7 +222,7 @@ namespace Server.Mobiles { int maxhits = 2000; - if ( this.IsParagon ) + if ( IsParagon ) maxhits = (int)(maxhits * Paragon.HitsBuff); if ( hp < 1000 && !Core.AOS ) @@ -232,9 +232,9 @@ namespace Server.Mobiles { HitsMaxSeed = maxhits; - int newHits = this.Hits + hp + Utility.RandomMinMax( 10, 20 ); // increase the hp until it hits if it goes over it'll max at 2000 + int newHits = Hits + hp + Utility.RandomMinMax( 10, 20 ); // increase the hp until it hits if it goes over it'll max at 2000 - this.Hits = Math.Min( maxhits, newHits ); + Hits = Math.Min( maxhits, newHits ); // Also provide heal for each devour on top of the hp increase } else diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs index 05955b337..0c14ac28f 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueSpawn.cs @@ -41,7 +41,7 @@ namespace Server.Mobiles for ( int i = 0; i < list.Count; ++i ) { - if ( list[i] is ContextMenus.PaperdollEntry ) + if ( list[i] is PaperdollEntry ) list.RemoveAt( i-- ); } } diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs b/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs index 3de8e0b77..277360c01 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs @@ -76,17 +76,17 @@ namespace Server.Mobiles public void SpawnBogling( Mobile m ) { - Map map = this.Map; + Map map = Map; if ( map == null ) return; Bogling spawned = new Bogling(); - spawned.Team = this.Team; + spawned.Team = Team; bool validLocation = false; - Point3D loc = this.Location; + Point3D loc = Location; for ( int j = 0; !validLocation && j < 10; ++j ) { @@ -94,7 +94,7 @@ namespace Server.Mobiles int y = Y + Utility.Random( 3 ) - 1; int z = map.GetAverageZ( x, y ); - if ( validLocation = map.CanFit( x, y, this.Z, 16, false, false ) ) + if ( validLocation = map.CanFit( x, y, Z, 16, false, false ) ) loc = new Point3D( x, y, Z ); else if ( validLocation = map.CanFit( x, y, z, 16, false, false ) ) loc = new Point3D( x, y, z ); @@ -108,7 +108,7 @@ namespace Server.Mobiles { ArrayList toEat = new ArrayList(); - foreach ( Mobile m in this.GetMobilesInRange( 2 ) ) + foreach ( Mobile m in GetMobilesInRange( 2 ) ) { if ( m is Bogling ) toEat.Add( m ); @@ -130,7 +130,7 @@ namespace Server.Mobiles { base.OnGotMeleeAttack( attacker ); - if ( this.Hits > (this.HitsMax / 4) ) + if ( Hits > (HitsMax / 4) ) { if ( 0.25 >= Utility.RandomDouble() ) SpawnBogling( attacker ); diff --git a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs index a0b776759..2e22211bd 100644 --- a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs +++ b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs @@ -91,7 +91,7 @@ namespace Server.Mobiles public override void AlterMeleeDamageTo( Mobile to, ref int damage ) { - if ( Utility.RandomBool() && (this.Mana > 14) && to != null ) + if ( Utility.RandomBool() && (Mana > 14) && to != null ) { damage = (damage + (damage / 2)); to.SendLocalizedMessage( 1060091 ); // You take extra damage from the crushing attack! @@ -117,9 +117,9 @@ namespace Server.Mobiles public void PoisonAttack( Mobile m ) { DoHarmful( m ); - this.MovingParticles( m, 0x36D4, 1, 0, false, false, 0x3F, 0, 0x1F73, 1, 0, (EffectLayer)255, 0x100 ); + MovingParticles( m, 0x36D4, 1, 0, false, false, 0x3F, 0, 0x1F73, 1, 0, (EffectLayer)255, 0x100 ); m.ApplyPoison( this, Poison.Regular ); - m.SendLocalizedMessage( 1070821, this.Name ); // %s spits a poisonous substance at you! + m.SendLocalizedMessage( 1070821, Name ); // %s spits a poisonous substance at you! } public override int Hides => 8; diff --git a/Scripts/Mobiles/Monsters/SE/FanDancer.cs b/Scripts/Mobiles/Monsters/SE/FanDancer.cs index 531520f7b..ea2d76227 100644 --- a/Scripts/Mobiles/Monsters/SE/FanDancer.cs +++ b/Scripts/Mobiles/Monsters/SE/FanDancer.cs @@ -77,7 +77,7 @@ namespace Server.Mobiles * Effect: - To: "0x57D4F5B" - ItemId: "0x27A3" - ItemIdName: "Tessen" - FromLocation: "(992 299, 24)" - ToLocation: "(992 308, 22)" - Speed: "10" - Duration: "0" - FixedDirection: "False" - Explode: "False" - Hue: "0x0" - Render: "0x0" * Damage: 50-65 */ - Effects.SendPacket( attacker, attacker.Map, new HuedEffect( EffectType.Moving, Serial.Zero, Serial.Zero, 0x27A3, this.Location, attacker.Location, 10, 0, false, false, 0, 0 ) ); + Effects.SendPacket( attacker, attacker.Map, new HuedEffect( EffectType.Moving, Serial.Zero, Serial.Zero, 0x27A3, Location, attacker.Location, 10, 0, false, false, 0, 0 ) ); AOS.Damage( attacker, this, Utility.RandomMinMax( 50, 65 ), 100, 0, 0, 0, 0 ); } } @@ -92,7 +92,7 @@ namespace Server.Mobiles * Effect: - To: "0x57D4F5B" - ItemId: "0x27A3" - ItemIdName: "Tessen" - FromLocation: "(992 299, 24)" - ToLocation: "(992 308, 22)" - Speed: "10" - Duration: "0" - FixedDirection: "False" - Explode: "False" - Hue: "0x0" - Render: "0x0" * Damage: 50-65 */ - Effects.SendPacket( attacker, attacker.Map, new HuedEffect( EffectType.Moving, Serial.Zero, Serial.Zero, 0x27A3, this.Location, attacker.Location, 10, 0, false, false, 0, 0 ) ); + Effects.SendPacket( attacker, attacker.Map, new HuedEffect( EffectType.Moving, Serial.Zero, Serial.Zero, 0x27A3, Location, attacker.Location, 10, 0, false, false, 0, 0 ) ); AOS.Damage( attacker, this, Utility.RandomMinMax( 50, 65 ), 100, 0, 0, 0, 0 ); } } diff --git a/Scripts/Mobiles/Monsters/SE/FireBeetle.cs b/Scripts/Mobiles/Monsters/SE/FireBeetle.cs index f97493b3a..5f46f17a7 100644 --- a/Scripts/Mobiles/Monsters/SE/FireBeetle.cs +++ b/Scripts/Mobiles/Monsters/SE/FireBeetle.cs @@ -2,7 +2,7 @@ using Server.Items; namespace Server.Mobiles { - [Server.Engines.Craft.Forge] + [Engines.Craft.Forge] public class FireBeetle : BaseMount { public override string CorpseName => "a fire beetle corpse"; diff --git a/Scripts/Mobiles/Monsters/SE/Yamandon.cs b/Scripts/Mobiles/Monsters/SE/Yamandon.cs index d2260b591..44eca7fec 100644 --- a/Scripts/Mobiles/Monsters/SE/Yamandon.cs +++ b/Scripts/Mobiles/Monsters/SE/Yamandon.cs @@ -77,7 +77,7 @@ namespace Server.Mobiles private void DoCounter( Mobile attacker ) { - if ( this.Map == null ) + if ( Map == null ) return; if ( attacker is BaseCreature creature && creature.BardProvoked ) @@ -105,7 +105,7 @@ namespace Server.Mobiles if ( target == null || !target.InRange( this, 18 ) ) target = attacker; - this.Animate( 10, 4, 1, true, false, 0 ); + Animate( 10, 4, 1, true, false, 0 ); ArrayList targets = new ArrayList(); @@ -114,7 +114,7 @@ namespace Server.Mobiles if ( m == this || !CanBeHarmful( m ) ) continue; - if ( m is BaseCreature bc && (bc.Controlled || bc.Summoned || bc.Team != this.Team)) + if ( m is BaseCreature bc && (bc.Controlled || bc.Summoned || bc.Team != Team)) targets.Add( m ); else if ( m.Player && m.Alive ) targets.Add( m ); diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs index 0149cdd2c..ec20c0529 100644 --- a/Scripts/Mobiles/PlayerMobile.cs +++ b/Scripts/Mobiles/PlayerMobile.cs @@ -226,12 +226,12 @@ namespace Server.Mobiles } } - public Server.Guilds.RankDefinition GuildRank + public Guilds.RankDefinition GuildRank { get { - if ( this.AccessLevel >= AccessLevel.GameMaster ) - return Server.Guilds.RankDefinition.Leader; + if ( AccessLevel >= AccessLevel.GameMaster ) + return Guilds.RankDefinition.Leader; else return m_GuildRank; } @@ -747,9 +747,9 @@ namespace Server.Mobiles { if ( dismount ) { - if ( this.Mount != null ) + if ( Mount != null ) { - this.Mount.Rider = null; + Mount.Rider = null; } else if ( AnimalForm.UnderTransformation( this ) ) { @@ -779,7 +779,7 @@ namespace Server.Mobiles if ( type != ResistanceType.Physical && 60 < max && Spells.Fourth.CurseSpell.UnderEffect( this ) ) max = 60; - if ( Core.ML && this.Race == Race.Elf && type == ResistanceType.Energy ) + if ( Core.ML && Race == Race.Elf && type == ResistanceType.Energy ) max += 5; //Intended to go after the 60 max from curse return max; @@ -791,7 +791,7 @@ namespace Server.Mobiles UpdateResistances(); } - public override int MaxWeight => (((Core.ML && this.Race == Race.Human) ? 100 : 40) + (int)(3.5 * this.Str)); + public override int MaxWeight => (((Core.ML && Race == Race.Human) ? 100 : 40) + (int)(3.5 * Str)); private int m_LastGlobalLight = -1, m_LastPersonalLight = -1; @@ -805,17 +805,17 @@ namespace Server.Mobiles { global = LightCycle.ComputeLevelFor( this ); - bool racialNightSight = (Core.ML && this.Race == Race.Elf); + bool racialNightSight = (Core.ML && Race == Race.Elf); - if ( this.LightLevel < 21 && ( AosAttributes.GetValue( this, AosAttribute.NightSight ) > 0 || racialNightSight )) + if ( LightLevel < 21 && ( AosAttributes.GetValue( this, AosAttribute.NightSight ) > 0 || racialNightSight )) personal = 21; else - personal = this.LightLevel; + personal = LightLevel; } public override void CheckLightLevels( bool forceResend ) { - NetState ns = this.NetState; + NetState ns = NetState; if ( ns == null ) return; @@ -865,7 +865,7 @@ namespace Server.Mobiles { if (Mana < m_ExecutesLightningStrike) { - LightningStrike.ClearCurrentMove(this); + SpecialMove.ClearCurrentMove(this); } } } @@ -913,7 +913,7 @@ namespace Server.Mobiles if ( m_NoDeltaRecursion || Map == null || Map == Map.Internal ) return; - if ( this.Items == null ) + if ( Items == null ) return; m_NoDeltaRecursion = true; @@ -927,16 +927,16 @@ namespace Server.Mobiles if ( Map == null || Map == Map.Internal ) return; - List items = this.Items; + List items = Items; if ( items == null ) return; bool moved = false; - int str = this.Str; - int dex = this.Dex; - int intel = this.Int; + int str = Str; + int dex = Dex; + int intel = Int; #region Factions int factionItemCount = 0; @@ -994,7 +994,7 @@ namespace Server.Mobiles drop = true; else if ( intel < weapon.IntRequirement ) drop = true; - else if ( weapon.RequiredRace != null && weapon.RequiredRace != this.Race ) + else if ( weapon.RequiredRace != null && weapon.RequiredRace != Race ) drop = true; if ( drop ) @@ -1021,7 +1021,7 @@ namespace Server.Mobiles { drop = true; } - else if ( armor.RequiredRace != null && armor.RequiredRace != this.Race ) + else if ( armor.RequiredRace != null && armor.RequiredRace != Race ) { drop = true; } @@ -1067,7 +1067,7 @@ namespace Server.Mobiles { drop = true; } - else if ( clothing.RequiredRace != null && clothing.RequiredRace != this.Race ) + else if ( clothing.RequiredRace != null && clothing.RequiredRace != Race ) { drop = true; } @@ -1247,13 +1247,13 @@ namespace Server.Mobiles public override void OnSubItemAdded( Item item ) { - if ( AccessLevel < AccessLevel.GameMaster && item.IsChildOf( this.Backpack ) ) + if ( AccessLevel < AccessLevel.GameMaster && item.IsChildOf( Backpack ) ) { int maxWeight = WeightOverloading.GetMaxWeight( this ); - int curWeight = Mobile.BodyWeight + this.TotalWeight; + int curWeight = BodyWeight + TotalWeight; if ( curWeight > maxWeight ) - this.SendLocalizedMessage( 1019035, true, String.Format( " : {0} / {1}", curWeight, maxWeight ) ); + SendLocalizedMessage( 1019035, true, String.Format( " : {0} / {1}", curWeight, maxWeight ) ); } base.OnSubItemAdded(item); @@ -1304,7 +1304,7 @@ namespace Server.Mobiles Mana = Mana; } - if ( this.NetState != null ) + if ( NetState != null ) CheckLightLevels( false ); InvalidateMyRunUO(); @@ -1321,7 +1321,7 @@ namespace Server.Mobiles Mana = Mana; } - if ( this.NetState != null ) + if ( NetState != null ) CheckLightLevels( false ); InvalidateMyRunUO(); @@ -1363,7 +1363,7 @@ namespace Server.Mobiles if ( Core.AOS ) { - strBase = this.Str; //this.Str already includes GetStatOffset/str + strBase = Str; //this.Str already includes GetStatOffset/str strOffs = AosAttributes.GetValue( this, AosAttribute.BonusHits ); if ( Core.ML && strOffs > 25 && AccessLevel <= AccessLevel.Player ) @@ -1374,7 +1374,7 @@ namespace Server.Mobiles } else { - strBase = this.RawStr; + strBase = RawStr; } return (strBase / 2) + 50 + strOffs; @@ -1396,7 +1396,7 @@ namespace Server.Mobiles { get { - if ( Core.ML && this.AccessLevel == AccessLevel.Player ) + if ( Core.ML && AccessLevel == AccessLevel.Player ) return Math.Min( base.Str, 150 ); return base.Str; @@ -1409,7 +1409,7 @@ namespace Server.Mobiles { get { - if ( Core.ML && this.AccessLevel == AccessLevel.Player ) + if ( Core.ML && AccessLevel == AccessLevel.Player ) return Math.Min( base.Int, 150 ); return base.Int; @@ -1422,7 +1422,7 @@ namespace Server.Mobiles { get { - if ( Core.ML && this.AccessLevel == AccessLevel.Player ) + if ( Core.ML && AccessLevel == AccessLevel.Player ) return Math.Min( base.Dex, 150 ); return base.Dex; @@ -1434,7 +1434,7 @@ namespace Server.Mobiles public override bool Move( Direction d ) { - NetState ns = this.NetState; + NetState ns = NetState; if ( ns != null ) { @@ -1453,11 +1453,11 @@ namespace Server.Mobiles bool res; if ( !Alive ) - Server.Movement.MovementImpl.IgnoreMovableImpassables = true; + Movement.MovementImpl.IgnoreMovableImpassables = true; res = base.Move( d ); - Server.Movement.MovementImpl.IgnoreMovableImpassables = false; + Movement.MovementImpl.IgnoreMovableImpassables = false; if ( !res ) return false; @@ -1478,7 +1478,7 @@ namespace Server.Mobiles newZ = foundation.Z + HouseFoundation.GetLevelZ( context.Level, context.Foundation ); - int newX = this.X, newY = this.Y; + int newX = X, newY = Y; Movement.Movement.Offset( d, ref newX, ref newY ); int startX = foundation.X + foundation.Components.Min.X + 1; @@ -1538,7 +1538,7 @@ namespace Server.Mobiles { m_NextProtectionCheck = 10; - Regions.GuardedRegion reg = (Regions.GuardedRegion) this.Region.GetRegion( typeof( Regions.GuardedRegion ) ); + GuardedRegion reg = (GuardedRegion) Region.GetRegion( typeof( GuardedRegion ) ); bool isProtected = ( reg != null && !reg.IsDisabled() ); if ( isProtected != m_LastProtectedMessage ) @@ -1564,7 +1564,7 @@ namespace Server.Mobiles if ( !isTeleport && AccessLevel == AccessLevel.Player ) { // moving, not teleporting - int zDrop = ( this.Location.Z - loc.Z ); + int zDrop = ( Location.Z - loc.Z ); if ( zDrop > 20 ) // we fell more than one story Hits -= ((zDrop / 20) * 10) - 5; // deal some damage; does not kill, disrupt, etc @@ -1641,7 +1641,7 @@ namespace Server.Mobiles if ( Alive && Core.Expansion >= Expansion.AOS ) { Party theirParty = from.Party as Party; - Party ourParty = this.Party as Party; + Party ourParty = Party as Party; if ( theirParty == null && ourParty == null ) { list.Add( new AddToPartyEntry( from, this ) ); @@ -1670,10 +1670,10 @@ namespace Server.Mobiles { Mobile prot = m_JusticeProtectors[i]; - string args = String.Format( "{0}\t{1}", this.Name, prot.Name ); + string args = String.Format( "{0}\t{1}", Name, prot.Name ); prot.SendLocalizedMessage( 1049371, args ); // The protective relationship between ~1_PLAYER1~ and ~2_PLAYER2~ has been ended. - this.SendLocalizedMessage( 1049371, args ); // The protective relationship between ~1_PLAYER1~ and ~2_PLAYER2~ has been ended. + SendLocalizedMessage( 1049371, args ); // The protective relationship between ~1_PLAYER1~ and ~2_PLAYER2~ has been ended. } m_JusticeProtectors.Clear(); @@ -2127,7 +2127,7 @@ namespace Server.Mobiles private void ToggleQuestItemTarget() { - Server.Engines.MLQuests.Gumps.BaseQuestGump.CloseOtherGumps( this ); + Engines.MLQuests.Gumps.BaseQuestGump.CloseOtherGumps( this ); CloseGump( typeof( Server.Engines.MLQuests.Gumps.QuestLogDetailedGump ) ); CloseGump( typeof( Server.Engines.MLQuests.Gumps.QuestLogGump ) ); CloseGump( typeof( Server.Engines.MLQuests.Gumps.QuestOfferGump ) ); @@ -2190,7 +2190,7 @@ namespace Server.Mobiles BaseHouse house = BaseHouse.FindHouseAt( this ); if ( house != null ) - this.Location = house.BanLocation; + Location = house.BanLocation; } private delegate void ContextCallback(); @@ -2292,7 +2292,7 @@ namespace Server.Mobiles } #endregion - if ( this.AccessLevel < AccessLevel.GameMaster && item.Layer != Layer.Mount && this.HasTrade ) + if ( AccessLevel < AccessLevel.GameMaster && item.Layer != Layer.Mount && HasTrade ) { BounceInfo bounce = item.GetBounce(); @@ -2300,7 +2300,7 @@ namespace Server.Mobiles { if ( bounce.m_Parent is Item parent ) { - if ( parent == this.Backpack || parent.IsChildOf( this.Backpack ) ) + if ( parent == Backpack || parent.IsChildOf( Backpack ) ) return true; } else if ( bounce.m_Parent == this ) @@ -2324,7 +2324,7 @@ namespace Server.Mobiles { if ( to.Holding != null ) msgNum = 1062727; // You cannot trade with someone who is dragging something. - else if ( this.HasTrade ) + else if ( HasTrade ) msgNum = 1062781; // You are already trading with someone else! else if ( to.HasTrade ) msgNum = 1062779; // That person is already involved in a trade @@ -2340,7 +2340,7 @@ namespace Server.Mobiles plusWeight += cont.TotalWeight; } - if ( this.Backpack == null || !this.Backpack.CheckHold( this, item, false, checkItems, plusItems, plusWeight ) ) + if ( Backpack == null || !Backpack.CheckHold( this, item, false, checkItems, plusItems, plusWeight ) ) msgNum = 1004040; // You would not be able to hold this if the trade failed. else if ( to.Backpack == null || !to.Backpack.CheckHold( to, item, false, checkItems, plusItems, plusWeight ) ) msgNum = 1004039; // The recipient of this trade would not be able to carry this. @@ -2394,8 +2394,8 @@ namespace Server.Mobiles if ( from.AccessLevel >= AccessLevel.GameMaster ) return true; - Container pack = this.Backpack; - if ( from == this && this.HasTrade && ( target == pack || target.IsChildOf( pack ) ) ) + Container pack = Backpack; + if ( from == this && HasTrade && ( target == pack || target.IsChildOf( pack ) ) ) { BounceInfo bounce = item.GetBounce(); @@ -2426,7 +2426,7 @@ namespace Server.Mobiles HouseFoundation foundation = context.Foundation; - int newX = this.X, newY = this.Y; + int newX = X, newY = Y; int newZ = foundation.Z + HouseFoundation.GetLevelZ( context.Level, context.Foundation ); int startX = foundation.X + foundation.Components.Min.X + 1; @@ -2539,11 +2539,11 @@ namespace Server.Mobiles public override void Resurrect() { - bool wasAlive = this.Alive; + bool wasAlive = Alive; base.Resurrect(); - if ( this.Alive && !wasAlive ) + if ( Alive && !wasAlive ) { Item deathRobe = new DeathRobe(); @@ -2556,7 +2556,7 @@ namespace Server.Mobiles { get { - if ( Core.ML && this.Race == Race.Human ) + if ( Core.ML && Race == Race.Human ) return 20.0; return 0; @@ -2581,7 +2581,7 @@ namespace Server.Mobiles { if (!item.Deleted && (item.LootType == LootType.Blessed || item.Insured)) { - if (this.Backpack != item.Parent) + if (Backpack != item.Parent) { return true; } @@ -2607,11 +2607,11 @@ namespace Server.Mobiles } } - m_EquipSnapshot = new List( this.Items ); + m_EquipSnapshot = new List( Items ); m_NonAutoreinsuredItems = 0; m_InsuranceCost = 0; - m_InsuranceAward = base.FindMostRecentDamager( false ); + m_InsuranceAward = FindMostRecentDamager( false ); if ( m_InsuranceAward is BaseCreature creature ) { @@ -2697,7 +2697,7 @@ namespace Server.Mobiles DeathMoveResult res = base.GetParentMoveResultFor( item ); - if ( res == DeathMoveResult.MoveToCorpse && item.Movable && this.Young ) + if ( res == DeathMoveResult.MoveToCorpse && item.Movable && Young ) res = DeathMoveResult.MoveToBackpack; return res; @@ -2714,7 +2714,7 @@ namespace Server.Mobiles DeathMoveResult res = base.GetInventoryMoveResultFor( item ); - if ( res == DeathMoveResult.MoveToCorpse && item.Movable && this.Young ) + if ( res == DeathMoveResult.MoveToCorpse && item.Movable && Young ) res = DeathMoveResult.MoveToBackpack; return res; @@ -2767,7 +2767,7 @@ namespace Server.Mobiles Criminal = true; } - if ( this.Kills >= 5 && DateTime.UtcNow >= m_NextJustAward ) + if ( Kills >= 5 && DateTime.UtcNow >= m_NextJustAward ) { Mobile m = FindMostRecentDamager( false ); @@ -2780,9 +2780,9 @@ namespace Server.Mobiles int pointsToGain = 0; - pointsToGain += (int) Math.Sqrt( this.GameTime.TotalSeconds * 4 ); + pointsToGain += (int) Math.Sqrt( GameTime.TotalSeconds * 4 ); pointsToGain *= 5; - pointsToGain += (int) Math.Pow( this.Skills.Total / 250, 2 ); + pointsToGain += (int) Math.Pow( Skills.Total / 250, 2 ); if ( VirtueHelper.Award( m, VirtueName.Justice, pointsToGain, ref gainedPath ) ) { @@ -2805,7 +2805,7 @@ namespace Server.Mobiles pm.SendLocalizedMessage( 1060397, pm.m_InsuranceBonus.ToString() ); // ~1_AMOUNT~ gold has been deposited into your bank box. } - Mobile killer = this.FindMostRecentDamager( true ); + Mobile killer = FindMostRecentDamager( true ); if ( killer is BaseCreature bcKiller ) { @@ -2814,7 +2814,7 @@ namespace Server.Mobiles killer = master; } - if ( this.Young && m_DuelContext == null ) + if ( Young && m_DuelContext == null ) { if ( YoungDeathTeleport() ) Timer.DelayCall( TimeSpan.FromSeconds( 2.5 ), new TimerCallback( SendYoungDeathNotice ) ); @@ -3027,7 +3027,7 @@ namespace Server.Mobiles { if ( Guilds.Guild.NewGuildSystem && (type == MessageType.Guild || type == MessageType.Alliance) ) { - if ( !(this.Guild is Guild g) ) + if ( !(Guild is Guild g) ) { SendLocalizedMessage( 1063142 ); // You are not in a guild! } @@ -3087,10 +3087,10 @@ namespace Server.Mobiles public override void Damage( int amount, Mobile from ) { - if ( Spells.Necromancy.EvilOmenSpell.TryEndEffect( this ) ) + if ( EvilOmenSpell.TryEndEffect( this ) ) amount = (int)(amount * 1.25); - Mobile oath = Spells.Necromancy.BloodOathSpell.GetBloodOath( from ); + Mobile oath = BloodOathSpell.GetBloodOath( from ); /* Per EA's UO Herald Pub48 (ML): * ((resist spellsx10)/20 + 10=percentage of damage resisted) @@ -3136,7 +3136,7 @@ namespace Server.Mobiles if ( !Alive ) return ApplyPoisonResult.Immune; - if ( Spells.Necromancy.EvilOmenSpell.TryEndEffect( this ) ) + if ( EvilOmenSpell.TryEndEffect( this ) ) poison = PoisonImpl.IncreaseLevel( poison ); ApplyPoisonResult result = base.ApplyPoison( from, poison ); @@ -3149,7 +3149,7 @@ namespace Server.Mobiles public override bool CheckPoisonImmunity( Mobile from, Poison poison ) { - if ( this.Young && (DuelContext == null || !DuelContext.Started || DuelContext.Finished) ) + if ( Young && (DuelContext == null || !DuelContext.Started || DuelContext.Finished) ) return true; return base.CheckPoisonImmunity( from, poison ); @@ -3157,7 +3157,7 @@ namespace Server.Mobiles public override void OnPoisonImmunity( Mobile from, Poison poison ) { - if ( this.Young && (DuelContext == null || !DuelContext.Started || DuelContext.Finished) ) + if ( Young && (DuelContext == null || !DuelContext.Started || DuelContext.Finished) ) SendLocalizedMessage( 502808 ); // You would have been poisoned, were you not new to the land of Britannia. Be careful in the future. else base.OnPoisonImmunity( from, poison ); @@ -3201,7 +3201,7 @@ namespace Server.Mobiles public bool AntiMacroCheck( Skill skill, object obj ) { - if ( obj == null || m_AntiMacroTable == null || this.AccessLevel != AccessLevel.Player ) + if ( obj == null || m_AntiMacroTable == null || AccessLevel != AccessLevel.Player ) return true; Hashtable tbl = (Hashtable)m_AntiMacroTable[skill]; @@ -3514,7 +3514,7 @@ namespace Server.Mobiles if ( AccessLevel > AccessLevel.Player ) m_IgnoreMobiles = true; - List list = this.Stabled; + List list = Stabled; for ( int i = 0; i < list.Count; ++i ) { @@ -3671,7 +3671,7 @@ namespace Server.Mobiles writer.Write( m_LongTermElapse ); writer.Write( m_ShortTermElapse ); - writer.Write( this.GameTime ); + writer.Write( GameTime ); } public static void CheckAtrophies( Mobile m ) @@ -3687,14 +3687,14 @@ namespace Server.Mobiles public void CheckKillDecay() { - if ( m_ShortTermElapse < this.GameTime ) + if ( m_ShortTermElapse < GameTime ) { m_ShortTermElapse += TimeSpan.FromHours( 8 ); if ( ShortTermMurders > 0 ) --ShortTermMurders; } - if ( m_LongTermElapse < this.GameTime ) + if ( m_LongTermElapse < GameTime ) { m_LongTermElapse += TimeSpan.FromHours( 40 ); if ( Kills > 0 ) @@ -3704,8 +3704,8 @@ namespace Server.Mobiles public void ResetKillTime() { - m_ShortTermElapse = this.GameTime + TimeSpan.FromHours( 8 ); - m_LongTermElapse = this.GameTime + TimeSpan.FromHours( 40 ); + m_ShortTermElapse = GameTime + TimeSpan.FromHours( 8 ); + m_LongTermElapse = GameTime + TimeSpan.FromHours( 40 ); } [CommandProperty( AccessLevel.GameMaster )] @@ -3840,7 +3840,7 @@ namespace Server.Mobiles Faction faction = pl.Faction; if ( faction.Commander == this ) - text = String.Concat( this.Female ? "(Commanding Lady of the " : "(Commanding Lord of the ", faction.Definition.FriendlyName, ")" ); + text = String.Concat( Female ? "(Commanding Lady of the " : "(Commanding Lord of the ", faction.Definition.FriendlyName, ")" ); else if ( pl.Sheriff != null ) text = String.Concat( "(The Sheriff of ", pl.Sheriff.Definition.FriendlyName, ", ", faction.Definition.FriendlyName, ")" ); else if ( pl.Finance != null ) @@ -3885,7 +3885,7 @@ namespace Server.Mobiles } else if ( AllowedStealthSteps-- <= 0 ) { - Server.SkillHandlers.Stealth.OnUse( this ); + SkillHandlers.Stealth.OnUse( this ); } } else @@ -4014,7 +4014,7 @@ namespace Server.Mobiles public override void OnKillsChange( int oldValue ) { - if ( this.Young && this.Kills > oldValue ) + if ( Young && Kills > oldValue ) { ((Account)Account)?.RemoveYoungStatus( 0 ); } @@ -4027,7 +4027,7 @@ namespace Server.Mobiles InvalidateMyRunUO(); } - public override void OnGuildChange( Server.Guilds.BaseGuild oldGuild ) + public override void OnGuildChange( BaseGuild oldGuild ) { InvalidateMyRunUO(); } @@ -4049,7 +4049,7 @@ namespace Server.Mobiles public override void OnSkillChange( SkillName skill, double oldBase ) { - if ( this.Young && this.SkillsTotal >= 4500 ) + if ( Young && SkillsTotal >= 4500 ) { ((Account)Account)?.RemoveYoungStatus( 1019036 ); // You have successfully obtained a respectable skill level, and have outgrown your status as a young player! } @@ -4096,24 +4096,24 @@ namespace Server.Mobiles public override int ComputeMovementSpeed( Direction dir, bool checkTurning ) { - if ( checkTurning && (dir & Direction.Mask) != (this.Direction & Direction.Mask) ) - return Mobile.RunMount; // We are NOT actually moving (just a direction change) + if ( checkTurning && (dir & Direction.Mask) != (Direction & Direction.Mask) ) + return RunMount; // We are NOT actually moving (just a direction change) TransformContext context = TransformationSpellHelper.GetContext( this ); if ( context != null && context.Type == typeof( ReaperFormSpell ) ) - return Mobile.WalkFoot; + return WalkFoot; bool running = ( (dir & Direction.Running) != 0 ); - bool onHorse = ( this.Mount != null ); + bool onHorse = ( Mount != null ); AnimalFormContext animalContext = AnimalForm.GetContext( this ); if ( onHorse || (animalContext != null && animalContext.SpeedBoost) ) - return ( running ? Mobile.RunMount : Mobile.WalkMount ); + return ( running ? RunMount : WalkMount ); - return ( running ? Mobile.RunFoot : Mobile.WalkFoot ); + return ( running ? RunFoot : WalkFoot ); } public static bool MovementThrottle_Callback( NetState ns ) @@ -4172,12 +4172,12 @@ namespace Server.Mobiles private void DeltaEnemies( Type oldType, Type newType ) { - foreach ( Mobile m in this.GetMobilesInRange( 18 ) ) + foreach ( Mobile m in GetMobilesInRange( 18 ) ) { Type t = m.GetType(); if ( t == oldType || t == newType ) { - NetState ns = this.NetState; + NetState ns = NetState; if ( ns != null ) { if ( ns.StygianAbyss ) { @@ -4355,7 +4355,7 @@ namespace Server.Mobiles } #endregion - if ( Core.ML && this.Map == Faction.Facet ) + if ( Core.ML && Map == Faction.Facet ) { Faction faction = Faction.Find( this ); @@ -4384,7 +4384,7 @@ namespace Server.Mobiles public bool CheckYoungProtection( Mobile from ) { - if ( !this.Young ) + if ( !Young ) return false; if ( Region is BaseRegion region && !region.YoungProtected ) @@ -4393,7 +4393,7 @@ namespace Server.Mobiles if ( @from is BaseCreature creature && creature.IgnoreYoungProtection ) return false; - if ( this.Quest != null && this.Quest.IgnoreYoungProtection( from ) ) + if ( Quest != null && Quest.IgnoreYoungProtection( from ) ) return false; if ( DateTime.UtcNow - m_LastYoungMessage > TimeSpan.FromMinutes( 1.0 ) ) @@ -4465,16 +4465,16 @@ namespace Server.Mobiles public bool YoungDeathTeleport() { - if ( this.Region.IsPartOf( typeof( Jail ) ) - || this.Region.IsPartOf( "Samurai start location" ) - || this.Region.IsPartOf( "Ninja start location" ) - || this.Region.IsPartOf( "Ninja cave" ) ) + if ( Region.IsPartOf( typeof( Jail ) ) + || Region.IsPartOf( "Samurai start location" ) + || Region.IsPartOf( "Ninja start location" ) + || Region.IsPartOf( "Ninja cave" ) ) return false; Point3D loc; Map map; - DungeonRegion dungeon = (DungeonRegion) this.Region.GetRegion( typeof( DungeonRegion ) ); + DungeonRegion dungeon = (DungeonRegion) Region.GetRegion( typeof( DungeonRegion ) ); if ( dungeon != null && dungeon.EntranceLocation != Point3D.Zero ) { loc = dungeon.EntranceLocation; @@ -4482,8 +4482,8 @@ namespace Server.Mobiles } else { - loc = this.Location; - map = this.Map; + loc = Location; + map = Map; } Point3D[] list; @@ -4517,13 +4517,13 @@ namespace Server.Mobiles } } - this.MoveToWorld( dest, map ); + MoveToWorld( dest, map ); return true; } private void SendYoungDeathNotice() { - this.SendGump( new YoungDeathNotice() ); + SendGump( new YoungDeathNotice() ); } #endregion @@ -4535,7 +4535,7 @@ namespace Server.Mobiles public override void OnSpeech( SpeechEventArgs e ) { - if ( SpeechLog.Enabled && this.NetState != null ) + if ( SpeechLog.Enabled && NetState != null ) { if ( m_SpeechLog == null ) m_SpeechLog = new SpeechLog(); @@ -4919,7 +4919,7 @@ namespace Server.Mobiles if ( !BuffInfo.Enabled || m_BuffTable == null ) return; - NetState state = this.NetState; + NetState state = NetState; if ( state != null && state.BuffIcon ) { @@ -4944,7 +4944,7 @@ namespace Server.Mobiles m_BuffTable.Add( b.ID, b ); - NetState state = this.NetState; + NetState state = NetState; if ( state != null && state.BuffIcon ) { @@ -4972,7 +4972,7 @@ namespace Server.Mobiles m_BuffTable.Remove( b ); - NetState state = this.NetState; + NetState state = NetState; if ( state != null && state.BuffIcon ) { diff --git a/Scripts/Mobiles/Special/Barracoon.cs b/Scripts/Mobiles/Special/Barracoon.cs index 4fd18b317..ff8067203 100644 --- a/Scripts/Mobiles/Special/Barracoon.cs +++ b/Scripts/Mobiles/Special/Barracoon.cs @@ -137,14 +137,14 @@ namespace Server.Mobiles public void SpawnRatmen( Mobile target ) { - Map map = this.Map; + Map map = Map; if ( map == null ) return; int rats = 0; - foreach ( Mobile m in this.GetMobilesInRange( 10 ) ) + foreach ( Mobile m in GetMobilesInRange( 10 ) ) { if ( m is Ratman || m is RatmanArcher || m is RatmanMage ) ++rats; @@ -168,10 +168,10 @@ namespace Server.Mobiles case 4: rat = new RatmanMage(); break; } - rat.Team = this.Team; + rat.Team = Team; bool validLocation = false; - Point3D loc = this.Location; + Point3D loc = Location; for ( int j = 0; !validLocation && j < 10; ++j ) { @@ -179,7 +179,7 @@ namespace Server.Mobiles int y = Y + Utility.Random( 3 ) - 1; int z = map.GetAverageZ( x, y ); - if ( validLocation = map.CanFit( x, y, this.Z, 16, false, false ) ) + if ( validLocation = map.CanFit( x, y, Z, 16, false, false ) ) loc = new Point3D( x, y, Z ); else if ( validLocation = map.CanFit( x, y, z, 16, false, false ) ) loc = new Point3D( x, y, z ); diff --git a/Scripts/Mobiles/Special/BaseChampion.cs b/Scripts/Mobiles/Special/BaseChampion.cs index 30ed8ab38..37ac0b5ca 100644 --- a/Scripts/Mobiles/Special/BaseChampion.cs +++ b/Scripts/Mobiles/Special/BaseChampion.cs @@ -98,7 +98,7 @@ namespace Server.Mobiles return; List toGive = new List(); - List rights = BaseCreature.GetLootingRights( this.DamageEntries, this.HitsMax ); + List rights = GetLootingRights( DamageEntries, HitsMax ); for ( int i = rights.Count - 1; i >= 0; --i ) { @@ -218,7 +218,7 @@ namespace Server.Mobiles if ( NoGoodies ) return base.OnBeforeDeath(); - Map map = this.Map; + Map map = Map; if ( map != null ) { @@ -243,7 +243,7 @@ namespace Server.Mobiles if ( Map == Map.Felucca ) { //TODO: Confirm SE change or AoS one too? - List rights = BaseCreature.GetLootingRights( this.DamageEntries, this.HitsMax ); + List rights = GetLootingRights( DamageEntries, HitsMax ); List toGive = new List(); for ( int i = rights.Count - 1; i >= 0; --i ) diff --git a/Scripts/Mobiles/Special/BaseShieldGuard.cs b/Scripts/Mobiles/Special/BaseShieldGuard.cs index 5699771a9..2ba5e0296 100644 --- a/Scripts/Mobiles/Special/BaseShieldGuard.cs +++ b/Scripts/Mobiles/Special/BaseShieldGuard.cs @@ -80,7 +80,7 @@ namespace Server.Mobiles public override bool HandlesOnSpeech( Mobile from ) { - if ( from.InRange( this.Location, 2 ) ) + if ( from.InRange( Location, 2 ) ) return true; return base.HandlesOnSpeech( from ); @@ -88,7 +88,7 @@ namespace Server.Mobiles public override void OnSpeech( SpeechEventArgs e ) { - if ( !e.Handled && e.HasKeyword( Keyword ) && e.Mobile.InRange( this.Location, 2 ) ) + if ( !e.Handled && e.HasKeyword( Keyword ) && e.Mobile.InRange( Location, 2 ) ) { e.Handled = true; diff --git a/Scripts/Mobiles/Special/CapturedHordeMinion.cs b/Scripts/Mobiles/Special/CapturedHordeMinion.cs index 90969c39a..f12d848dc 100644 --- a/Scripts/Mobiles/Special/CapturedHordeMinion.cs +++ b/Scripts/Mobiles/Special/CapturedHordeMinion.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles [Constructible] public CapturedHordeMinion() { - this.FightMode = FightMode.None; + FightMode = FightMode.None; } public override bool InitialInnocent => true; diff --git a/Scripts/Mobiles/Special/Dummy.cs b/Scripts/Mobiles/Special/Dummy.cs index d64e14b71..149e91e52 100644 --- a/Scripts/Mobiles/Special/Dummy.cs +++ b/Scripts/Mobiles/Special/Dummy.cs @@ -21,11 +21,11 @@ namespace Server.Mobiles [Constructible] public Dummy(AIType iAI, FightMode iFightMode, int iRangePerception, int iRangeFight, double dActiveSpeed, double dPassiveSpeed) : base(iAI, iFightMode, iRangePerception, iRangeFight, dActiveSpeed, dPassiveSpeed) { - this.Body = 400 + Utility.Random(2); - this.Hue = Utility.RandomSkinHue(); + Body = 400 + Utility.Random(2); + Hue = Utility.RandomSkinHue(); - this.Skills[SkillName.DetectHidden].Base = 100; - this.Skills[SkillName.MagicResist].Base = 120; + Skills[SkillName.DetectHidden].Base = 100; + Skills[SkillName.MagicResist].Base = 120; Team = Utility.Random(3); diff --git a/Scripts/Mobiles/Special/DummySpecific.cs b/Scripts/Mobiles/Special/DummySpecific.cs index eb689f21b..6681159dd 100644 --- a/Scripts/Mobiles/Special/DummySpecific.cs +++ b/Scripts/Mobiles/Special/DummySpecific.cs @@ -26,11 +26,11 @@ namespace Server.Mobiles int jHue = 25 + Team * 40; // Skills and Stats - this.InitStats( 125, 125, 90 ); - this.Skills[SkillName.Macing].Base = 120; - this.Skills[SkillName.Anatomy].Base = 120; - this.Skills[SkillName.Healing].Base = 120; - this.Skills[SkillName.Tactics].Base = 120; + InitStats( 125, 125, 90 ); + Skills[SkillName.Macing].Base = 120; + Skills[SkillName.Anatomy].Base = 120; + Skills[SkillName.Healing].Base = 120; + Skills[SkillName.Tactics].Base = 120; // Equip WarHammer war = new WarHammer(); @@ -99,11 +99,11 @@ namespace Server.Mobiles int jHue = 25 + Team * 40; // Skills and Stats - this.InitStats( 125, 125, 90 ); - this.Skills[SkillName.Fencing].Base = 120; - this.Skills[SkillName.Anatomy].Base = 120; - this.Skills[SkillName.Healing].Base = 120; - this.Skills[SkillName.Tactics].Base = 120; + InitStats( 125, 125, 90 ); + Skills[SkillName.Fencing].Base = 120; + Skills[SkillName.Anatomy].Base = 120; + Skills[SkillName.Healing].Base = 120; + Skills[SkillName.Tactics].Base = 120; // Equip Spear ssp = new Spear(); @@ -172,12 +172,12 @@ namespace Server.Mobiles int jHue = 25 + Team * 40; // Skills and Stats - this.InitStats( 125, 125, 90 ); - this.Skills[SkillName.Swords].Base = 120; - this.Skills[SkillName.Anatomy].Base = 120; - this.Skills[SkillName.Healing].Base = 120; - this.Skills[SkillName.Tactics].Base = 120; - this.Skills[SkillName.Parry].Base = 120; + InitStats( 125, 125, 90 ); + Skills[SkillName.Swords].Base = 120; + Skills[SkillName.Anatomy].Base = 120; + Skills[SkillName.Healing].Base = 120; + Skills[SkillName.Tactics].Base = 120; + Skills[SkillName.Parry].Base = 120; // Equip Katana kat = new Katana(); @@ -246,13 +246,13 @@ namespace Server.Mobiles int jHue = 25 + Team * 40; // Skills and Stats - this.InitStats( 90, 90, 125 ); - this.Skills[SkillName.Magery].Base = 120; - this.Skills[SkillName.EvalInt].Base = 120; - this.Skills[SkillName.Inscribe].Base = 100; - this.Skills[SkillName.Wrestling].Base = 120; - this.Skills[SkillName.Meditation].Base = 120; - this.Skills[SkillName.Poisoning].Base = 100; + InitStats( 90, 90, 125 ); + Skills[SkillName.Magery].Base = 120; + Skills[SkillName.EvalInt].Base = 120; + Skills[SkillName.Inscribe].Base = 100; + Skills[SkillName.Wrestling].Base = 120; + Skills[SkillName.Meditation].Base = 120; + Skills[SkillName.Poisoning].Base = 100; // Equip Spellbook book = new Spellbook(); @@ -314,13 +314,13 @@ namespace Server.Mobiles int jHue = 25 + Team * 40; // Skills and Stats - this.InitStats( 90, 90, 125 ); - this.Skills[SkillName.Magery].Base = 100; - this.Skills[SkillName.EvalInt].Base = 120; - this.Skills[SkillName.Anatomy].Base = 80; - this.Skills[SkillName.Wrestling].Base = 80; - this.Skills[SkillName.Meditation].Base = 100; - this.Skills[SkillName.Poisoning].Base = 100; + InitStats( 90, 90, 125 ); + Skills[SkillName.Magery].Base = 100; + Skills[SkillName.EvalInt].Base = 120; + Skills[SkillName.Anatomy].Base = 80; + Skills[SkillName.Wrestling].Base = 80; + Skills[SkillName.Meditation].Base = 100; + Skills[SkillName.Poisoning].Base = 100; // Equip Spellbook book = new Spellbook(); @@ -404,14 +404,14 @@ namespace Server.Mobiles int jHue = 25 + Team * 40; // Skills and Stats - this.InitStats( 125, 125, 125 ); - this.Skills[SkillName.Magery].Base = 120; - this.Skills[SkillName.EvalInt].Base = 120; - this.Skills[SkillName.Anatomy].Base = 120; - this.Skills[SkillName.Wrestling].Base = 120; - this.Skills[SkillName.Meditation].Base = 120; - this.Skills[SkillName.Poisoning].Base = 100; - this.Skills[SkillName.Inscribe].Base = 100; + InitStats( 125, 125, 125 ); + Skills[SkillName.Magery].Base = 120; + Skills[SkillName.EvalInt].Base = 120; + Skills[SkillName.Anatomy].Base = 120; + Skills[SkillName.Wrestling].Base = 120; + Skills[SkillName.Meditation].Base = 120; + Skills[SkillName.Poisoning].Base = 100; + Skills[SkillName.Inscribe].Base = 100; // Equip Spellbook book = new Spellbook(); @@ -499,13 +499,13 @@ namespace Server.Mobiles int jHue = 25 + Team * 40; // Skills and Stats - this.InitStats( 125, 125, 125 ); - this.Skills[SkillName.Magery].Base = 120; - this.Skills[SkillName.EvalInt].Base = 120; - this.Skills[SkillName.Anatomy].Base = 120; - this.Skills[SkillName.Wrestling].Base = 120; - this.Skills[SkillName.Meditation].Base = 120; - this.Skills[SkillName.Healing].Base = 100; + InitStats( 125, 125, 125 ); + Skills[SkillName.Magery].Base = 120; + Skills[SkillName.EvalInt].Base = 120; + Skills[SkillName.Anatomy].Base = 120; + Skills[SkillName.Wrestling].Base = 120; + Skills[SkillName.Meditation].Base = 120; + Skills[SkillName.Healing].Base = 100; // Equip Spellbook book = new Spellbook(); @@ -588,13 +588,13 @@ namespace Server.Mobiles int jHue = 25 + Team * 40; // Skills and Stats - this.InitStats( 105, 105, 105 ); - this.Skills[SkillName.Magery].Base = 120; - this.Skills[SkillName.EvalInt].Base = 120; - this.Skills[SkillName.Swords].Base = 120; - this.Skills[SkillName.Tactics].Base = 120; - this.Skills[SkillName.Meditation].Base = 120; - this.Skills[SkillName.Poisoning].Base = 100; + InitStats( 105, 105, 105 ); + Skills[SkillName.Magery].Base = 120; + Skills[SkillName.EvalInt].Base = 120; + Skills[SkillName.Swords].Base = 120; + Skills[SkillName.Tactics].Base = 120; + Skills[SkillName.Meditation].Base = 120; + Skills[SkillName.Poisoning].Base = 100; // Equip Spellbook book = new Spellbook(); @@ -705,13 +705,13 @@ namespace Server.Mobiles int jHue = 25 + Team * 40; // Skills and Stats - this.InitStats( 105, 105, 105 ); - this.Skills[SkillName.Healing].Base = 120; - this.Skills[SkillName.Anatomy].Base = 120; - this.Skills[SkillName.Stealing].Base = 120; - this.Skills[SkillName.ArmsLore].Base = 100; - this.Skills[SkillName.Meditation].Base = 120; - this.Skills[SkillName.Wrestling].Base = 120; + InitStats( 105, 105, 105 ); + Skills[SkillName.Healing].Base = 120; + Skills[SkillName.Anatomy].Base = 120; + Skills[SkillName.Stealing].Base = 120; + Skills[SkillName.ArmsLore].Base = 100; + Skills[SkillName.Meditation].Base = 120; + Skills[SkillName.Wrestling].Base = 120; // Equip Spellbook book = new Spellbook(); diff --git a/Scripts/Mobiles/Special/Harrower.cs b/Scripts/Mobiles/Special/Harrower.cs index c38ec4448..84f67af34 100644 --- a/Scripts/Mobiles/Special/Harrower.cs +++ b/Scripts/Mobiles/Special/Harrower.cs @@ -150,7 +150,7 @@ namespace Server.Mobiles Say( 1049499 ); // Behold my true form! - Map map = this.Map; + Map map = Map; if ( map != null ) { @@ -167,11 +167,11 @@ namespace Server.Mobiles { int rdist = 10 + dist; - x = this.X + (int)(rx * rdist); - y = this.Y + (int)(ry * rdist); + x = X + (int)(rx * rdist); + y = Y + (int)(ry * rdist); z = map.GetAverageZ( x, y ); - if ( !(ok = map.CanFit( x, y, this.Z, 16, false, false ) ) ) + if ( !(ok = map.CanFit( x, y, Z, 16, false, false ) ) ) ok = map.CanFit( x, y, z, 16, false, false ); if ( dist >= 0 ) @@ -185,7 +185,7 @@ namespace Server.Mobiles HarrowerTentacles spawn = new HarrowerTentacles( this ); - spawn.Team = this.Team; + spawn.Team = Team; spawn.MoveToWorld( new Point3D( x, y, z ), map ); @@ -250,7 +250,7 @@ namespace Server.Mobiles public void GivePowerScrolls() { List toGive = new List(); - List rights = BaseCreature.GetLootingRights( this.DamageEntries, this.HitsMax ); + List rights = GetLootingRights( DamageEntries, HitsMax ); for ( int i = rights.Count - 1; i >= 0; --i ) { @@ -327,7 +327,7 @@ namespace Server.Mobiles { if ( m_TrueForm ) { - List rights = BaseCreature.GetLootingRights( this.DamageEntries, this.HitsMax ); + List rights = GetLootingRights( DamageEntries, HitsMax ); for ( int i = rights.Count - 1; i >= 0; --i ) { @@ -341,7 +341,7 @@ namespace Server.Mobiles { GivePowerScrolls(); - Map map = this.Map; + Map map = Map; if ( map != null ) { @@ -582,8 +582,8 @@ namespace Server.Mobiles m.Location = to; - Server.Spells.SpellHelper.Turn( m_Owner, toTeleport ); - Server.Spells.SpellHelper.Turn( toTeleport, m_Owner ); + Spells.SpellHelper.Turn( m_Owner, toTeleport ); + Spells.SpellHelper.Turn( toTeleport, m_Owner ); m.ProcessDelta(); diff --git a/Scripts/Mobiles/Special/LordOaks.cs b/Scripts/Mobiles/Special/LordOaks.cs index 53defff7e..8d80c5e4a 100644 --- a/Scripts/Mobiles/Special/LordOaks.cs +++ b/Scripts/Mobiles/Special/LordOaks.cs @@ -80,12 +80,12 @@ namespace Server.Mobiles public void SpawnPixies( Mobile target ) { - Map map = this.Map; + Map map = Map; if ( map == null ) return; - this.Say( 1042154 ); // You shall never defeat me as long as I have my queen! + Say( 1042154 ); // You shall never defeat me as long as I have my queen! int newPixies = Utility.RandomMinMax( 3, 6 ); @@ -93,11 +93,11 @@ namespace Server.Mobiles { Pixie pixie = new Pixie(); - pixie.Team = this.Team; + pixie.Team = Team; pixie.FightMode = FightMode.Closest; bool validLocation = false; - Point3D loc = this.Location; + Point3D loc = Location; for ( int j = 0; !validLocation && j < 10; ++j ) { @@ -105,7 +105,7 @@ namespace Server.Mobiles int y = Y + Utility.Random( 3 ) - 1; int z = map.GetAverageZ( x, y ); - if ( validLocation = map.CanFit( x, y, this.Z, 16, false, false ) ) + if ( validLocation = map.CanFit( x, y, Z, 16, false, false ) ) loc = new Point3D( x, y, Z ); else if ( validLocation = map.CanFit( x, y, z, 16, false, false ) ) loc = new Point3D( x, y, z ); @@ -143,18 +143,18 @@ namespace Server.Mobiles public void CheckQueen() { - if ( this.Map == null ) + if ( Map == null ) return; if ( !m_SpawnedQueen ) { - this.Say( 1042153 ); // Come forth my queen! + Say( 1042153 ); // Come forth my queen! m_Queen = new Silvani(); - ((BaseCreature)m_Queen).Team = this.Team; + ((BaseCreature)m_Queen).Team = Team; - m_Queen.MoveToWorld( this.Location, this.Map ); + m_Queen.MoveToWorld( Location, Map ); m_SpawnedQueen = true; } diff --git a/Scripts/Mobiles/Special/Neira.cs b/Scripts/Mobiles/Special/Neira.cs index 3adae0eb6..17da1e943 100644 --- a/Scripts/Mobiles/Special/Neira.cs +++ b/Scripts/Mobiles/Special/Neira.cs @@ -82,7 +82,7 @@ namespace Server.Mobiles public override bool OnBeforeDeath() { - IMount mount = this.Mount; + IMount mount = Mount; if ( mount != null ) mount.Rider = null; @@ -227,7 +227,7 @@ namespace Server.Mobiles public void AddUnholyBone( Mobile target, double chanceToThrow ) { - if ( this.Map == null ) + if ( Map == null ) return; if ( chanceToThrow >= Utility.RandomDouble() ) diff --git a/Scripts/Mobiles/Special/Paragon.cs b/Scripts/Mobiles/Special/Paragon.cs index d296af2fe..c0c15223d 100644 --- a/Scripts/Mobiles/Special/Paragon.cs +++ b/Scripts/Mobiles/Special/Paragon.cs @@ -22,7 +22,7 @@ namespace Server.Mobiles public ParagonStamRegen( Mobile m ) : base( FastRegenRate, FastRegenRate ) { - this.Priority = TimerPriority.FiftyMS; + Priority = TimerPriority.FiftyMS; m_Owner = m as BaseCreature; } diff --git a/Scripts/Mobiles/Special/Rikktor.cs b/Scripts/Mobiles/Special/Rikktor.cs index 8db8bcba5..466d0869e 100644 --- a/Scripts/Mobiles/Special/Rikktor.cs +++ b/Scripts/Mobiles/Special/Rikktor.cs @@ -76,19 +76,19 @@ namespace Server.Mobiles public void Earthquake() { - Map map = this.Map; + Map map = Map; if ( map == null ) return; ArrayList targets = new ArrayList(); - foreach ( Mobile m in this.GetMobilesInRange( 8 ) ) + foreach ( Mobile m in GetMobilesInRange( 8 ) ) { if ( m == this || !CanBeHarmful( m ) ) continue; - if ( m is BaseCreature && (((BaseCreature)m).Controlled || ((BaseCreature)m).Summoned || ((BaseCreature)m).Team != this.Team) ) + if ( m is BaseCreature && (((BaseCreature)m).Controlled || ((BaseCreature)m).Summoned || ((BaseCreature)m).Team != Team) ) targets.Add( m ); else if ( m.Player ) targets.Add( m ); diff --git a/Scripts/Mobiles/Special/Semidar.cs b/Scripts/Mobiles/Special/Semidar.cs index 6f98bfc6c..9a3733341 100644 --- a/Scripts/Mobiles/Special/Semidar.cs +++ b/Scripts/Mobiles/Special/Semidar.cs @@ -77,17 +77,17 @@ namespace Server.Mobiles public void DrainLife() { - if ( this.Map == null ) + if ( Map == null ) return; ArrayList list = new ArrayList(); - foreach ( Mobile m in this.GetMobilesInRange( 2 ) ) + foreach ( Mobile m in GetMobilesInRange( 2 ) ) { if ( m == this || !CanBeHarmful( m ) ) continue; - if ( m is BaseCreature && (((BaseCreature)m).Controlled || ((BaseCreature)m).Summoned || ((BaseCreature)m).Team != this.Team) ) + if ( m is BaseCreature && (((BaseCreature)m).Controlled || ((BaseCreature)m).Summoned || ((BaseCreature)m).Team != Team) ) list.Add( m ); else if ( m.Player ) list.Add( m ); diff --git a/Scripts/Mobiles/Special/Serado.cs b/Scripts/Mobiles/Special/Serado.cs index 86eabfbc0..5d6eadc2f 100644 --- a/Scripts/Mobiles/Special/Serado.cs +++ b/Scripts/Mobiles/Special/Serado.cs @@ -110,7 +110,7 @@ namespace Server.Mobiles private void DoCounter( Mobile attacker ) { - if ( this.Map == null || ( attacker is BaseCreature && ((BaseCreature)attacker).BardProvoked ) ) + if ( Map == null || ( attacker is BaseCreature && ((BaseCreature)attacker).BardProvoked ) ) return; if ( 0.2 > Utility.RandomDouble() ) @@ -135,7 +135,7 @@ namespace Server.Mobiles if ( target == null || !target.InRange( this, 25 ) ) target = attacker; - this.Animate( 10, 4, 1, true, false, 0 ); + Animate( 10, 4, 1, true, false, 0 ); ArrayList targets = new ArrayList(); @@ -144,7 +144,7 @@ namespace Server.Mobiles if ( m == this || !CanBeHarmful( m ) ) continue; - if ( m is BaseCreature && (((BaseCreature)m).Controlled || ((BaseCreature)m).Summoned || ((BaseCreature)m).Team != this.Team) ) + if ( m is BaseCreature && (((BaseCreature)m).Controlled || ((BaseCreature)m).Summoned || ((BaseCreature)m).Team != Team) ) targets.Add( m ); else if ( m.Player ) targets.Add( m ); diff --git a/Scripts/Mobiles/Special/Silvani.cs b/Scripts/Mobiles/Special/Silvani.cs index 75b858fee..f439bc992 100644 --- a/Scripts/Mobiles/Special/Silvani.cs +++ b/Scripts/Mobiles/Special/Silvani.cs @@ -54,7 +54,7 @@ namespace Server.Mobiles public void SpawnPixies( Mobile target ) { - Map map = this.Map; + Map map = Map; if ( map == null ) return; @@ -65,11 +65,11 @@ namespace Server.Mobiles { Pixie pixie = new Pixie(); - pixie.Team = this.Team; + pixie.Team = Team; pixie.FightMode = FightMode.Closest; bool validLocation = false; - Point3D loc = this.Location; + Point3D loc = Location; for ( int j = 0; !validLocation && j < 10; ++j ) { @@ -77,7 +77,7 @@ namespace Server.Mobiles int y = Y + Utility.Random( 3 ) - 1; int z = map.GetAverageZ( x, y ); - if ( validLocation = map.CanFit( x, y, this.Z, 16, false, false ) ) + if ( validLocation = map.CanFit( x, y, Z, 16, false, false ) ) loc = new Point3D( x, y, Z ); else if ( validLocation = map.CanFit( x, y, z, 16, false, false ) ) loc = new Point3D( x, y, z ); diff --git a/Scripts/Mobiles/Townfolk/Actor.cs b/Scripts/Mobiles/Townfolk/Actor.cs index 16aa15d96..50c9bc9ca 100644 --- a/Scripts/Mobiles/Townfolk/Actor.cs +++ b/Scripts/Mobiles/Townfolk/Actor.cs @@ -13,17 +13,17 @@ namespace Server.Mobiles Hue = Utility.RandomSkinHue(); - if ( this.Female = Utility.RandomBool() ) + if ( Female = Utility.RandomBool() ) { - this.Body = 0x191; - this.Name = NameList.RandomName( "female" ); + Body = 0x191; + Name = NameList.RandomName( "female" ); AddItem( new FancyDress( Utility.RandomDyedHue() ) ); Title = "the actress"; } else { - this.Body = 0x190; - this.Name = NameList.RandomName( "male" ); + Body = 0x190; + Name = NameList.RandomName( "male" ); AddItem( new LongPants( Utility.RandomNeutralHue() ) ); AddItem( new FancyShirt( Utility.RandomDyedHue() ) ); Title = "the actor"; diff --git a/Scripts/Mobiles/Townfolk/Artist.cs b/Scripts/Mobiles/Townfolk/Artist.cs index 71086daff..043234cff 100644 --- a/Scripts/Mobiles/Townfolk/Artist.cs +++ b/Scripts/Mobiles/Townfolk/Artist.cs @@ -20,15 +20,15 @@ namespace Server.Mobiles Hue = Utility.RandomSkinHue(); - if ( this.Female = Utility.RandomBool() ) + if ( Female = Utility.RandomBool() ) { - this.Body = 0x191; - this.Name = NameList.RandomName( "female" ); + Body = 0x191; + Name = NameList.RandomName( "female" ); } else { - this.Body = 0x190; - this.Name = NameList.RandomName( "male" ); + Body = 0x190; + Name = NameList.RandomName( "male" ); } AddItem( new Doublet( Utility.RandomDyedHue() ) ); AddItem( new Sandals( Utility.RandomNeutralHue() ) ); diff --git a/Scripts/Mobiles/Townfolk/Banker.cs b/Scripts/Mobiles/Townfolk/Banker.cs index afa5bde86..5149520b1 100644 --- a/Scripts/Mobiles/Townfolk/Banker.cs +++ b/Scripts/Mobiles/Townfolk/Banker.cs @@ -272,7 +272,7 @@ namespace Server.Mobiles public override bool HandlesOnSpeech( Mobile from ) { - if ( from.InRange( this.Location, 12 ) ) + if ( from.InRange( Location, 12 ) ) return true; return base.HandlesOnSpeech( from ); @@ -280,7 +280,7 @@ namespace Server.Mobiles public override void OnSpeech( SpeechEventArgs e ) { - if ( !e.Handled && e.Mobile.InRange( this.Location, 12 ) ) + if ( !e.Handled && e.Mobile.InRange( Location, 12 ) ) { for ( int i = 0; i < e.Keywords.Length; ++i ) { @@ -294,7 +294,7 @@ namespace Server.Mobiles if ( e.Mobile.Criminal ) { - this.Say( 500389 ); // I will not do business with a criminal! + Say( 500389 ); // I will not do business with a criminal! break; } @@ -311,11 +311,11 @@ namespace Server.Mobiles if ( (!Core.ML && amount > 5000) || (Core.ML && amount > 60000) ) { - this.Say( 500381 ); // Thou canst not withdraw so much at one time! + Say( 500381 ); // Thou canst not withdraw so much at one time! } else if (pack == null || pack.Deleted || !(pack.TotalWeight < pack.MaxWeight) || !(pack.TotalItems < pack.MaxItems)) { - this.Say(1048147); // Your backpack can't hold anything else. + Say(1048147); // Your backpack can't hold anything else. } else if (amount > 0) { @@ -323,13 +323,13 @@ namespace Server.Mobiles if (box == null || !Withdraw(e.Mobile, amount)) { - this.Say(500384); // Ah, art thou trying to fool me? Thou hast not so much gold! + Say(500384); // Ah, art thou trying to fool me? Thou hast not so much gold! } else { pack.DropItem(new Gold(amount)); - this.Say(1010005); // Thou hast withdrawn gold from thy account. + Say(1010005); // Thou hast withdrawn gold from thy account. } } } @@ -342,17 +342,17 @@ namespace Server.Mobiles if ( e.Mobile.Criminal ) { - this.Say( 500389 ); // I will not do business with a criminal! + Say( 500389 ); // I will not do business with a criminal! break; } if ( AccountGold.Enabled && e.Mobile.Account != null ) { - this.Say( 1155855, String.Format("{0:#,0}\t{1:#,0}", e.Mobile.Account.TotalPlat, e.Mobile.Account.TotalGold) ); // Thy current bank balance is ~1_AMOUNT~ platinum and ~2_AMOUNT~ gold. + Say( 1155855, String.Format("{0:#,0}\t{1:#,0}", e.Mobile.Account.TotalPlat, e.Mobile.Account.TotalGold) ); // Thy current bank balance is ~1_AMOUNT~ platinum and ~2_AMOUNT~ gold. } else { - this.Say( 1042759, GetBalance(e.Mobile).ToString("#,0") ); // Thy current bank balance is ~1_AMOUNT~ gold. + Say( 1042759, GetBalance(e.Mobile).ToString("#,0") ); // Thy current bank balance is ~1_AMOUNT~ gold. } break; @@ -363,7 +363,7 @@ namespace Server.Mobiles if ( e.Mobile.Criminal ) { - this.Say( 500378 ); // Thou art a criminal and cannot access thy bank box. + Say( 500378 ); // Thou art a criminal and cannot access thy bank box. break; } @@ -380,7 +380,7 @@ namespace Server.Mobiles if ( e.Mobile.Criminal ) { - this.Say( 500389 ); // I will not do business with a criminal! + Say( 500389 ); // I will not do business with a criminal! break; } @@ -395,11 +395,11 @@ namespace Server.Mobiles if ( amount < 5000 ) { - this.Say( 1010006 ); // We cannot create checks for such a paltry amount of gold! + Say( 1010006 ); // We cannot create checks for such a paltry amount of gold! } else if ( amount > 1000000 ) { - this.Say( 1010007 ); // Our policies prevent us from creating checks worth that much! + Say( 1010007 ); // Our policies prevent us from creating checks worth that much! } else { @@ -409,17 +409,17 @@ namespace Server.Mobiles if ( !box.TryDropItem( e.Mobile, check, false ) ) { - this.Say( 500386 ); // There's not enough room in your bankbox for the check! + Say( 500386 ); // There's not enough room in your bankbox for the check! check.Delete(); } else if ( !box.ConsumeTotal( typeof( Gold ), amount ) ) { - this.Say( 500384 ); // Ah, art thou trying to fool me? Thou hast not so much gold! + Say( 500384 ); // Ah, art thou trying to fool me? Thou hast not so much gold! check.Delete(); } else { - this.Say( 1042673, AffixType.Append, amount.ToString(), "" ); // Into your bank box I have placed a check in the amount of: + Say( 1042673, AffixType.Append, amount.ToString(), "" ); // Into your bank box I have placed a check in the amount of: } } } diff --git a/Scripts/Mobiles/Townfolk/BaseEscortable.cs b/Scripts/Mobiles/Townfolk/BaseEscortable.cs index b69ded8c9..ce12cdb8e 100644 --- a/Scripts/Mobiles/Townfolk/BaseEscortable.cs +++ b/Scripts/Mobiles/Townfolk/BaseEscortable.cs @@ -282,7 +282,7 @@ namespace Server.Mobiles if ( MLQuestSystem.Enabled ) return false; - if (from.InRange(this.Location, 3)) + if (from.InRange(Location, 3)) return true; return base.HandlesOnSpeech(from); @@ -294,7 +294,7 @@ namespace Server.Mobiles EDI dest = GetDestination(); - if (dest != null && !e.Handled && e.Mobile.InRange(this.Location, 3)) + if (dest != null && !e.Handled && e.Mobile.InRange(Location, 3)) { if (e.HasKeyword(0x1D)) // *destination* e.Handled = SayDestinationTo(e.Mobile); @@ -377,7 +377,7 @@ namespace Server.Mobiles if ( MLQuestSystem.Enabled || master == null ) return master; - if (master.Deleted || master.Map != this.Map || !master.InRange(Location, 30) || !master.Alive) + if (master.Deleted || master.Map != Map || !master.InRange(Location, 30) || !master.Alive) { StopFollow(); @@ -475,7 +475,7 @@ namespace Server.Mobiles { pm.SendLocalizedMessage(1053004); // You must wait about a day before you can gain in compassion again. } - else if (VirtueHelper.Award(pm, VirtueName.Compassion, this.IsPrisoner ? 400 : 200, ref gainedPath)) + else if (VirtueHelper.Award(pm, VirtueName.Compassion, IsPrisoner ? 400 : 200, ref gainedPath)) { if (gainedPath) pm.SendLocalizedMessage(1053005); // You have achieved a path in compassion! diff --git a/Scripts/Mobiles/Townfolk/BrideGroom.cs b/Scripts/Mobiles/Townfolk/BrideGroom.cs index b9df6d46e..fb63cf3dc 100644 --- a/Scripts/Mobiles/Townfolk/BrideGroom.cs +++ b/Scripts/Mobiles/Townfolk/BrideGroom.cs @@ -52,7 +52,7 @@ namespace Server.Mobiles else HairItemID = 0x203C; - HairHue = this.Race.RandomHairHue(); + HairHue = Race.RandomHairHue(); PackGold( 200, 250 ); } diff --git a/Scripts/Mobiles/Townfolk/Gypsy.cs b/Scripts/Mobiles/Townfolk/Gypsy.cs index 74f83c1d7..d3374fcd2 100644 --- a/Scripts/Mobiles/Townfolk/Gypsy.cs +++ b/Scripts/Mobiles/Townfolk/Gypsy.cs @@ -20,10 +20,10 @@ namespace Server.Mobiles Hue = Utility.RandomSkinHue(); - if ( this.Female = Utility.RandomBool() ) + if ( Female = Utility.RandomBool() ) { - this.Body = 0x191; - this.Name = NameList.RandomName( "female" ); + Body = 0x191; + Name = NameList.RandomName( "female" ); AddItem( new Kilt( Utility.RandomDyedHue() ) ); AddItem( new Shirt( Utility.RandomDyedHue() ) ); AddItem( new ThighBoots() ); @@ -31,8 +31,8 @@ namespace Server.Mobiles } else { - this.Body = 0x190; - this.Name = NameList.RandomName( "male" ); + Body = 0x190; + Name = NameList.RandomName( "male" ); AddItem( new ShortPants( Utility.RandomNeutralHue() ) ); AddItem( new Shirt( Utility.RandomDyedHue() ) ); AddItem( new Sandals() ); diff --git a/Scripts/Mobiles/Townfolk/HarborMaster.cs b/Scripts/Mobiles/Townfolk/HarborMaster.cs index 24ff40dd3..fce448cbb 100644 --- a/Scripts/Mobiles/Townfolk/HarborMaster.cs +++ b/Scripts/Mobiles/Townfolk/HarborMaster.cs @@ -20,16 +20,16 @@ namespace Server.Mobiles Blessed = true; - if ( this.Female = Utility.RandomBool() ) + if ( Female = Utility.RandomBool() ) { - this.Body = 0x191; - this.Name = NameList.RandomName( "female" ); + Body = 0x191; + Name = NameList.RandomName( "female" ); Title = "the Harbor Mistress"; } else { - this.Body = 0x190; - this.Name = NameList.RandomName( "male" ); + Body = 0x190; + Name = NameList.RandomName( "male" ); Title = "the Harbor Master"; } AddItem( new Shirt( Utility.RandomDyedHue() ) ); diff --git a/Scripts/Mobiles/Townfolk/Sculptor.cs b/Scripts/Mobiles/Townfolk/Sculptor.cs index 110f9c10a..40050116d 100644 --- a/Scripts/Mobiles/Townfolk/Sculptor.cs +++ b/Scripts/Mobiles/Townfolk/Sculptor.cs @@ -14,16 +14,16 @@ namespace Server.Mobiles Title = "the sculptor"; Hue = Utility.RandomSkinHue(); - if ( this.Female = Utility.RandomBool() ) + if ( Female = Utility.RandomBool() ) { - this.Body = 0x191; - this.Name = NameList.RandomName( "female" ); + Body = 0x191; + Name = NameList.RandomName( "female" ); AddItem( new Kilt( Utility.RandomNeutralHue() ) ); } else { - this.Body = 0x190; - this.Name = NameList.RandomName( "male" ); + Body = 0x190; + Name = NameList.RandomName( "male" ); AddItem( new LongPants( Utility.RandomNeutralHue() ) ); } diff --git a/Scripts/Mobiles/Townfolk/TownCrier.cs b/Scripts/Mobiles/Townfolk/TownCrier.cs index 13f2f3f5e..6f5e6137e 100644 --- a/Scripts/Mobiles/Townfolk/TownCrier.cs +++ b/Scripts/Mobiles/Townfolk/TownCrier.cs @@ -481,15 +481,15 @@ namespace Server.Mobiles if ( !Core.AOS ) NameHue = 0x35; - if ( this.Female = Utility.RandomBool() ) + if ( Female = Utility.RandomBool() ) { - this.Body = 0x191; - this.Name = NameList.RandomName( "female" ); + Body = 0x191; + Name = NameList.RandomName( "female" ); } else { - this.Body = 0x190; - this.Name = NameList.RandomName( "male" ); + Body = 0x190; + Name = NameList.RandomName( "male" ); } AddItem( new FancyShirt( Utility.RandomBlueHue() ) ); diff --git a/Scripts/Mobiles/Vendors/BaseVendor.cs b/Scripts/Mobiles/Vendors/BaseVendor.cs index fec9d97e8..9823785e8 100644 --- a/Scripts/Mobiles/Vendors/BaseVendor.cs +++ b/Scripts/Mobiles/Vendors/BaseVendor.cs @@ -81,7 +81,7 @@ namespace Server.Mobiles #region Faction public virtual int GetPriceScalar() { - Town town = Town.FromRegion( this.Region ); + Town town = Town.FromRegion( Region ); if ( town != null ) return ( 100 + town.Tax ); @@ -160,7 +160,7 @@ namespace Server.Mobiles { LoadSBInfo(); - this.Title = title; + Title = title; InitBody(); InitOutfit(); @@ -297,7 +297,7 @@ namespace Server.Mobiles public virtual bool CheckTokuno() { - if ( this.Map != Map.Tokuno ) + if ( Map != Map.Tokuno ) return false; NameList n; @@ -307,7 +307,7 @@ namespace Server.Mobiles else n = NameList.GetNameList( "tokuno male" ); - if ( !n.ContainsName( this.Name ) ) + if ( !n.ContainsName( Name ) ) TurnToTokuno(); return true; @@ -316,14 +316,14 @@ namespace Server.Mobiles public virtual void TurnToTokuno() { if ( Female ) - this.Name = NameList.RandomName( "tokuno female" ); + Name = NameList.RandomName( "tokuno female" ); else - this.Name = NameList.RandomName( "tokuno male" ); + Name = NameList.RandomName( "tokuno male" ); } public virtual bool CheckGargoyle() { - Map map = this.Map; + Map map = Map; if ( map != Map.Ilshenar ) return false; @@ -339,7 +339,7 @@ namespace Server.Mobiles public virtual bool CheckNecromancer() { - Map map = this.Map; + Map map = Map; if ( map != Map.Malas ) return false; @@ -379,9 +379,9 @@ namespace Server.Mobiles public virtual void TurnToNecromancer() { - for ( int i = 0; i < this.Items.Count; ++i ) + for ( int i = 0; i < Items.Count; ++i ) { - Item item = this.Items[i]; + Item item = Items[i]; if ( item is Hair || item is Beard ) item.Hue = 0; @@ -397,9 +397,9 @@ namespace Server.Mobiles public virtual void TurnToGargoyle() { - for ( int i = 0; i < this.Items.Count; ++i ) + for ( int i = 0; i < Items.Count; ++i ) { - Item item = this.Items[i]; + Item item = Items[i]; if ( item is BaseClothing || item is Hair || item is Beard ) item.Delete(); @@ -417,7 +417,7 @@ namespace Server.Mobiles public virtual void CapitalizeTitle() { - string title = this.Title; + string title = Title; if ( title == null ) return; @@ -435,7 +435,7 @@ namespace Server.Mobiles split[i] = Char.ToUpper( split[i][0] ).ToString(); } - this.Title = String.Join( " ", split ); + Title = String.Join( " ", split ); } public virtual int GetHairHue() @@ -493,7 +493,7 @@ namespace Server.Mobiles { m_LastRestock = DateTime.UtcNow; - IBuyItemInfo[] buyInfo = this.GetBuyInfo(); + IBuyItemInfo[] buyInfo = GetBuyInfo(); foreach ( IBuyItemInfo bii in buyInfo ) bii.OnRestock(); @@ -522,11 +522,11 @@ namespace Server.Mobiles int count = 0; List list; - IBuyItemInfo[] buyInfo = this.GetBuyInfo(); - IShopSellInfo[] sellInfo = this.GetSellInfo(); + IBuyItemInfo[] buyInfo = GetBuyInfo(); + IShopSellInfo[] sellInfo = GetSellInfo(); list = new List( buyInfo.Length ); - Container cont = this.BuyPack; + Container cont = BuyPack; List opls = null; @@ -781,7 +781,7 @@ namespace Server.Mobiles private GenericBuyInfo LookupDisplayObject( object obj ) { - IBuyItemInfo[] buyInfo = this.GetBuyInfo(); + IBuyItemInfo[] buyInfo = GetBuyInfo(); for ( int i = 0; i < buyInfo.Length; ++i ) { GenericBuyInfo gbi = (GenericBuyInfo)buyInfo[i]; @@ -938,7 +938,7 @@ namespace Server.Mobiles { ProcessSinglePurchase( buy, gbi, validBuy, ref controlSlots, ref fullPurchase, ref totalCost ); } - else if ( item != this.BuyPack && item.IsChildOf( this.BuyPack ) ) + else if ( item != BuyPack && item.IsChildOf( BuyPack ) ) { if ( amount > item.Amount ) amount = item.Amount; @@ -1055,7 +1055,7 @@ namespace Server.Mobiles } else { - buyItem = Mobile.LiftItemDupe( item, item.Amount - amount ); + buyItem = LiftItemDupe( item, item.Amount - amount ); if ( buyItem == null ) buyItem = item; @@ -1108,12 +1108,12 @@ namespace Server.Mobiles public virtual bool CheckVendorAccess( Mobile from ) { - GuardedRegion reg = (GuardedRegion)this.Region.GetRegion( typeof( GuardedRegion ) ); + GuardedRegion reg = (GuardedRegion)Region.GetRegion( typeof( GuardedRegion ) ); if ( reg != null && !reg.CheckVendorAccess( this, from ) ) return false; - if ( this.Region != from.Region ) + if ( Region != from.Region ) { reg = (GuardedRegion)from.Region.GetRegion( typeof( GuardedRegion ) ); @@ -1141,7 +1141,7 @@ namespace Server.Mobiles seller.PlaySound( 0x32 ); IShopSellInfo[] info = GetSellInfo(); - IBuyItemInfo[] buyInfo = this.GetBuyInfo(); + IBuyItemInfo[] buyInfo = GetBuyInfo(); int GiveGold = 0; int Sold = 0; Container cont; @@ -1202,11 +1202,11 @@ namespace Server.Mobiles if ( !found ) { - cont = this.BuyPack; + cont = BuyPack; if ( amount < resp.Item.Amount ) { - Item item = Mobile.LiftItemDupe( resp.Item, resp.Item.Amount - amount ); + Item item = LiftItemDupe( resp.Item, resp.Item.Amount - amount ); if ( item != null ) { @@ -1274,7 +1274,7 @@ namespace Server.Mobiles writer.Write( (int)1 ); // version - List sbInfos = this.SBInfos; + List sbInfos = SBInfos; for ( int i = 0; sbInfos != null && i < sbInfos.Count; ++i ) { @@ -1317,7 +1317,7 @@ namespace Server.Mobiles LoadSBInfo(); - List sbInfos = this.SBInfos; + List sbInfos = SBInfos; switch ( version ) { @@ -1416,7 +1416,7 @@ namespace Server.ContextMenus public override void OnClick() { - m_Vendor.VendorBuy( this.Owner.From ); + m_Vendor.VendorBuy( Owner.From ); } } @@ -1433,7 +1433,7 @@ namespace Server.ContextMenus public override void OnClick() { - m_Vendor.VendorSell( this.Owner.From ); + m_Vendor.VendorSell( Owner.From ); } } } diff --git a/Scripts/Mobiles/Vendors/GenericBuy.cs b/Scripts/Mobiles/Vendors/GenericBuy.cs index dcacec965..9ae0f301e 100644 --- a/Scripts/Mobiles/Vendors/GenericBuy.cs +++ b/Scripts/Mobiles/Vendors/GenericBuy.cs @@ -134,7 +134,7 @@ namespace Server.Mobiles if ( m_DisplayEntity != null && !IsDeleted( m_DisplayEntity ) ) return m_DisplayEntity; - bool canCache = this.CanCacheDisplay; + bool canCache = CanCacheDisplay; if ( canCache ) m_DisplayEntity = DisplayCache.Cache.Lookup( m_Type ); diff --git a/Scripts/Mobiles/Vendors/NPC/Alchemist.cs b/Scripts/Mobiles/Vendors/NPC/Alchemist.cs index 39509201e..a4fb14663 100644 --- a/Scripts/Mobiles/Vendors/NPC/Alchemist.cs +++ b/Scripts/Mobiles/Vendors/NPC/Alchemist.cs @@ -27,7 +27,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.Robe( Utility.RandomPinkHue() ) ); + AddItem( new Items.Robe( Utility.RandomPinkHue() ) ); } public Alchemist( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs b/Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs index e7816680c..94528544c 100644 --- a/Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs +++ b/Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs @@ -215,7 +215,7 @@ namespace Server.Mobiles public void EndClaimList( Mobile from, BaseCreature pet ) { - if ( pet == null || pet.Deleted || from.Map != this.Map || !from.Stabled.Contains( pet ) || !from.CheckAlive() ) + if ( pet == null || pet.Deleted || from.Map != Map || !from.Stabled.Contains( pet ) || !from.CheckAlive() ) return; if ( !from.InRange( this, 14 ) ) @@ -322,7 +322,7 @@ namespace Server.Mobiles pet.StabledBy = from; if ( Core.SE ) - pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully happy + pet.Loyalty = MaxLoyalty; // Wonderfully happy from.Stabled.Add( pet ); @@ -416,7 +416,7 @@ namespace Server.Mobiles pet.StabledBy = null; if ( Core.SE ) - pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully Happy + pet.Loyalty = MaxLoyalty; // Wonderfully Happy } public override bool HandlesOnSpeech( Mobile from ) diff --git a/Scripts/Mobiles/Vendors/NPC/Armorer.cs b/Scripts/Mobiles/Vendors/NPC/Armorer.cs index 4772ab7ad..4da92adbf 100644 --- a/Scripts/Mobiles/Vendors/NPC/Armorer.cs +++ b/Scripts/Mobiles/Vendors/NPC/Armorer.cs @@ -66,8 +66,8 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.HalfApron( Utility.RandomYellowHue() ) ); - AddItem( new Server.Items.Bascinet() ); + AddItem( new Items.HalfApron( Utility.RandomYellowHue() ) ); + AddItem( new Items.Bascinet() ); } public Armorer( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Blacksmith.cs b/Scripts/Mobiles/Vendors/NPC/Blacksmith.cs index 854da9d0a..7c7caf8de 100644 --- a/Scripts/Mobiles/Vendors/NPC/Blacksmith.cs +++ b/Scripts/Mobiles/Vendors/NPC/Blacksmith.cs @@ -58,7 +58,7 @@ namespace Server.Mobiles { base.InitOutfit(); - Item item = ( Utility.RandomBool() ? null : new Server.Items.RingmailChest() ); + Item item = ( Utility.RandomBool() ? null : new Items.RingmailChest() ); if ( item != null && !EquipItem( item ) ) { @@ -67,10 +67,10 @@ namespace Server.Mobiles } if ( item == null ) - AddItem( new Server.Items.FullApron() ); + AddItem( new Items.FullApron() ); - AddItem( new Server.Items.Bascinet() ); - AddItem( new Server.Items.SmithHammer() ); + AddItem( new Items.Bascinet() ); + AddItem( new Items.SmithHammer() ); } #region Bulk Orders diff --git a/Scripts/Mobiles/Vendors/NPC/Bowyer.cs b/Scripts/Mobiles/Vendors/NPC/Bowyer.cs index 9dcf7f11f..4ba273355 100644 --- a/Scripts/Mobiles/Vendors/NPC/Bowyer.cs +++ b/Scripts/Mobiles/Vendors/NPC/Bowyer.cs @@ -26,8 +26,8 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.Bow() ); - AddItem( new Server.Items.LeatherGorget() ); + AddItem( new Items.Bow() ); + AddItem( new Items.LeatherGorget() ); } public override void InitSBInfo() diff --git a/Scripts/Mobiles/Vendors/NPC/Butcher.cs b/Scripts/Mobiles/Vendors/NPC/Butcher.cs index ffb64676f..df896d3a6 100644 --- a/Scripts/Mobiles/Vendors/NPC/Butcher.cs +++ b/Scripts/Mobiles/Vendors/NPC/Butcher.cs @@ -22,8 +22,8 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.HalfApron() ); - AddItem( new Server.Items.Cleaver() ); + AddItem( new Items.HalfApron() ); + AddItem( new Items.Cleaver() ); } public Butcher( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Carpenter.cs b/Scripts/Mobiles/Vendors/NPC/Carpenter.cs index bea241485..ca2ce1215 100644 --- a/Scripts/Mobiles/Vendors/NPC/Carpenter.cs +++ b/Scripts/Mobiles/Vendors/NPC/Carpenter.cs @@ -30,7 +30,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.HalfApron() ); + AddItem( new Items.HalfApron() ); } public Carpenter( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Cook.cs b/Scripts/Mobiles/Vendors/NPC/Cook.cs index 6673461e2..d1a555985 100644 --- a/Scripts/Mobiles/Vendors/NPC/Cook.cs +++ b/Scripts/Mobiles/Vendors/NPC/Cook.cs @@ -28,7 +28,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.HalfApron() ); + AddItem( new Items.HalfApron() ); } public Cook( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs b/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs index fa9f316c0..79ebf5a59 100644 --- a/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs +++ b/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs @@ -65,7 +65,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.Robe( Utility.RandomPinkHue() ) ); + AddItem( new Items.Robe( Utility.RandomPinkHue() ) ); } public override void InitSBInfo() diff --git a/Scripts/Mobiles/Vendors/NPC/Farmer.cs b/Scripts/Mobiles/Vendors/NPC/Farmer.cs index 0e8d049f9..4d58adff6 100644 --- a/Scripts/Mobiles/Vendors/NPC/Farmer.cs +++ b/Scripts/Mobiles/Vendors/NPC/Farmer.cs @@ -31,7 +31,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.WideBrimHat( Utility.RandomNeutralHue() ) ); + AddItem( new Items.WideBrimHat( Utility.RandomNeutralHue() ) ); } public Farmer( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Fisherman.cs b/Scripts/Mobiles/Vendors/NPC/Fisherman.cs index 3ba180801..3273dddf7 100644 --- a/Scripts/Mobiles/Vendors/NPC/Fisherman.cs +++ b/Scripts/Mobiles/Vendors/NPC/Fisherman.cs @@ -24,7 +24,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.FishingPole() ); + AddItem( new Items.FishingPole() ); } public Fisherman( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs index 06373e5a5..f838b6d22 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs @@ -47,14 +47,14 @@ namespace Server.Mobiles public virtual bool WasNamed( string speech ) { - string name = this.Name; + string name = Name; return ( name != null && Insensitive.StartsWith( speech, name ) ); } public override bool HandlesOnSpeech( Mobile from ) { - if ( from.InRange( this.Location, 2 ) ) + if ( from.InRange( Location, 2 ) ) return true; return base.HandlesOnSpeech( from ); @@ -64,13 +64,13 @@ namespace Server.Mobiles { Mobile from = e.Mobile; - if ( !e.Handled && from is PlayerMobile && from.InRange( this.Location, 2 ) && WasNamed( e.Speech ) ) + if ( !e.Handled && from is PlayerMobile && from.InRange( Location, 2 ) && WasNamed( e.Speech ) ) { PlayerMobile pm = (PlayerMobile)from; if ( e.HasKeyword( 0x0004 ) ) // *join* | *member* { - if ( pm.NpcGuild == this.NpcGuild ) + if ( pm.NpcGuild == NpcGuild ) SayTo( from, 501047 ); // Thou art already a member of our guild. else if ( pm.NpcGuild != NpcGuild.None ) SayTo( from, 501046 ); // Thou must resign from thy other guild first. @@ -83,7 +83,7 @@ namespace Server.Mobiles } else if ( e.HasKeyword( 0x0005 ) ) // *resign* | *quit* { - if ( pm.NpcGuild != this.NpcGuild ) + if ( pm.NpcGuild != NpcGuild ) { SayTo( from, 501052 ); // Thou dost not belong to my guild! } @@ -110,7 +110,7 @@ namespace Server.Mobiles { PlayerMobile pm = (PlayerMobile)from; - if ( pm.NpcGuild == this.NpcGuild ) + if ( pm.NpcGuild == NpcGuild ) { SayTo( from, 501047 ); // Thou art already a member of our guild. } @@ -126,7 +126,7 @@ namespace Server.Mobiles { SayWelcomeTo( from ); - pm.NpcGuild = this.NpcGuild; + pm.NpcGuild = NpcGuild; pm.NpcGuildJoinTime = DateTime.UtcNow; pm.NpcGuildGameTime = pm.GameTime; diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs index 9cfbec0c3..385cc837f 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs @@ -27,7 +27,7 @@ namespace Server.Mobiles { base.InitOutfit(); - Item item = ( Utility.RandomBool() ? null : new Server.Items.RingmailChest() ); + Item item = ( Utility.RandomBool() ? null : new Items.RingmailChest() ); if ( item != null && !EquipItem( item ) ) { @@ -36,10 +36,10 @@ namespace Server.Mobiles } if ( item == null ) - AddItem( new Server.Items.FullApron() ); + AddItem( new Items.FullApron() ); - AddItem( new Server.Items.Bascinet() ); - AddItem( new Server.Items.SmithHammer() ); + AddItem( new Items.Bascinet() ); + AddItem( new Items.SmithHammer() ); } public BlacksmithGuildmaster( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs index 366f43f40..3e541e624 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs @@ -20,7 +20,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.Robe( Utility.RandomYellowHue() ) ); + AddItem( new Items.Robe( Utility.RandomYellowHue() ) ); } public HealerGuildmaster( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs index 6cc308320..4fb2f6eba 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs @@ -22,8 +22,8 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.Robe( Utility.RandomBlueHue() ) ); - AddItem( new Server.Items.GnarledStaff() ); + AddItem( new Items.Robe( Utility.RandomBlueHue() ) ); + AddItem( new Items.GnarledStaff() ); } public MageGuildmaster( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs index 23029e154..c2ccf1d27 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs @@ -28,9 +28,9 @@ namespace Server.Mobiles base.InitOutfit(); if ( Utility.RandomBool() ) - AddItem( new Server.Items.Kryss() ); + AddItem( new Kryss() ); else - AddItem( new Server.Items.Dagger() ); + AddItem( new Dagger() ); } public override bool CheckCustomReqs( PlayerMobile pm ) @@ -61,7 +61,7 @@ namespace Server.Mobiles public override bool HandlesOnSpeech( Mobile from ) { - if ( from.InRange( this.Location, 2 ) ) + if ( from.InRange( Location, 2 ) ) return true; return base.HandlesOnSpeech( from ); @@ -71,7 +71,7 @@ namespace Server.Mobiles { Mobile from = e.Mobile; - if ( !e.Handled && from is PlayerMobile && from.InRange( this.Location, 2 ) && e.HasKeyword( 0x1F ) ) // *disguise* + if ( !e.Handled && from is PlayerMobile && from.InRange( Location, 2 ) && e.HasKeyword( 0x1F ) ) // *disguise* { PlayerMobile pm = (PlayerMobile)from; diff --git a/Scripts/Mobiles/Vendors/NPC/IronWorker.cs b/Scripts/Mobiles/Vendors/NPC/IronWorker.cs index bd1bc6850..e6d55e00a 100644 --- a/Scripts/Mobiles/Vendors/NPC/IronWorker.cs +++ b/Scripts/Mobiles/Vendors/NPC/IronWorker.cs @@ -46,7 +46,7 @@ namespace Server.Mobiles { base.InitOutfit(); - Item item = ( Utility.RandomBool() ? null : new Server.Items.RingmailChest() ); + Item item = ( Utility.RandomBool() ? null : new RingmailChest() ); if ( item != null && !EquipItem( item ) ) { diff --git a/Scripts/Mobiles/Vendors/NPC/Mage.cs b/Scripts/Mobiles/Vendors/NPC/Mage.cs index a1cae0d85..3616a75ec 100644 --- a/Scripts/Mobiles/Vendors/NPC/Mage.cs +++ b/Scripts/Mobiles/Vendors/NPC/Mage.cs @@ -31,7 +31,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.Robe( Utility.RandomBlueHue() ) ); + AddItem( new Items.Robe( Utility.RandomBlueHue() ) ); } public Mage( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Miner.cs b/Scripts/Mobiles/Vendors/NPC/Miner.cs index d9138cb31..750638b04 100644 --- a/Scripts/Mobiles/Vendors/NPC/Miner.cs +++ b/Scripts/Mobiles/Vendors/NPC/Miner.cs @@ -22,10 +22,10 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.FancyShirt( 0x3E4 ) ); - AddItem( new Server.Items.LongPants( 0x192 ) ); - AddItem( new Server.Items.Pickaxe() ); - AddItem( new Server.Items.ThighBoots( 0x283 ) ); + AddItem( new Items.FancyShirt( 0x3E4 ) ); + AddItem( new Items.LongPants( 0x192 ) ); + AddItem( new Items.Pickaxe() ); + AddItem( new Items.ThighBoots( 0x283 ) ); } public Miner( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Ranger.cs b/Scripts/Mobiles/Vendors/NPC/Ranger.cs index 7060a352e..0f77360d2 100644 --- a/Scripts/Mobiles/Vendors/NPC/Ranger.cs +++ b/Scripts/Mobiles/Vendors/NPC/Ranger.cs @@ -27,10 +27,10 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.Shirt( Utility.RandomNeutralHue() ) ); - AddItem( new Server.Items.LongPants( Utility.RandomNeutralHue() ) ); - AddItem( new Server.Items.Bow() ); - AddItem( new Server.Items.ThighBoots( Utility.RandomNeutralHue() ) ); + AddItem( new Items.Shirt( Utility.RandomNeutralHue() ) ); + AddItem( new Items.LongPants( Utility.RandomNeutralHue() ) ); + AddItem( new Items.Bow() ); + AddItem( new Items.ThighBoots( Utility.RandomNeutralHue() ) ); } public Ranger( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Scribe.cs b/Scripts/Mobiles/Vendors/NPC/Scribe.cs index 7d4ae6378..2ff5a85bf 100644 --- a/Scripts/Mobiles/Vendors/NPC/Scribe.cs +++ b/Scripts/Mobiles/Vendors/NPC/Scribe.cs @@ -31,7 +31,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.Robe( Utility.RandomNeutralHue() ) ); + AddItem( new Items.Robe( Utility.RandomNeutralHue() ) ); } public override bool HandlesOnSpeech( Mobile from ) diff --git a/Scripts/Mobiles/Vendors/NPC/Shipwright.cs b/Scripts/Mobiles/Vendors/NPC/Shipwright.cs index 6d18b58c5..736af7497 100644 --- a/Scripts/Mobiles/Vendors/NPC/Shipwright.cs +++ b/Scripts/Mobiles/Vendors/NPC/Shipwright.cs @@ -23,7 +23,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.SmithHammer() ); + AddItem( new Items.SmithHammer() ); } public Shipwright( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/TavernKeeper.cs b/Scripts/Mobiles/Vendors/NPC/TavernKeeper.cs index 93dfb39ff..ea0391ded 100644 --- a/Scripts/Mobiles/Vendors/NPC/TavernKeeper.cs +++ b/Scripts/Mobiles/Vendors/NPC/TavernKeeper.cs @@ -21,7 +21,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.HalfApron() ); + AddItem( new Items.HalfApron() ); } public TavernKeeper( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Thief.cs b/Scripts/Mobiles/Vendors/NPC/Thief.cs index 7d19bb297..e4583604a 100644 --- a/Scripts/Mobiles/Vendors/NPC/Thief.cs +++ b/Scripts/Mobiles/Vendors/NPC/Thief.cs @@ -27,10 +27,10 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.Shirt( Utility.RandomNeutralHue() ) ); - AddItem( new Server.Items.LongPants( Utility.RandomNeutralHue() ) ); - AddItem( new Server.Items.Dagger() ); - AddItem( new Server.Items.ThighBoots( Utility.RandomNeutralHue() ) ); + AddItem( new Items.Shirt( Utility.RandomNeutralHue() ) ); + AddItem( new Items.LongPants( Utility.RandomNeutralHue() ) ); + AddItem( new Items.Dagger() ); + AddItem( new Items.ThighBoots( Utility.RandomNeutralHue() ) ); } public Thief( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Waiter.cs b/Scripts/Mobiles/Vendors/NPC/Waiter.cs index 3d43a164a..01ba7142e 100644 --- a/Scripts/Mobiles/Vendors/NPC/Waiter.cs +++ b/Scripts/Mobiles/Vendors/NPC/Waiter.cs @@ -22,7 +22,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.HalfApron() ); + AddItem( new Items.HalfApron() ); } public Waiter( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs b/Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs index d29bce48c..bda6d5de5 100644 --- a/Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs +++ b/Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs @@ -39,7 +39,7 @@ namespace Server.Mobiles { base.InitOutfit(); - AddItem( new Server.Items.HalfApron() ); + AddItem( new Items.HalfApron() ); } #region Bulk Orders diff --git a/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs b/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs index 6bd221baf..040844728 100644 --- a/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs +++ b/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs @@ -198,7 +198,7 @@ namespace Server.Mobiles AddItem( new HalfApron( Utility.RandomBrightHue() ) ); - Container pack = this.Backpack; + Container pack = Backpack; if ( pack != null ) pack.Delete(); @@ -213,7 +213,7 @@ namespace Server.Mobiles else Hue = 0x83F4; // hue is not random - Container pack = this.Backpack; + Container pack = Backpack; if ( pack != null ) pack.Delete(); @@ -270,7 +270,7 @@ namespace Server.Mobiles if ( !base.OnBeforeDeath() ) return false; - Item shoes = this.FindItemOnLayer( Layer.Shoes ); + Item shoes = FindItemOnLayer( Layer.Shoes ); if ( shoes is Sandals ) shoes.Hue = 0; @@ -359,7 +359,7 @@ namespace Server.Mobiles public bool IsOwner( Mobile from ) { - if ( from == null || from.Deleted || this.Deleted ) + if ( from == null || from.Deleted || Deleted ) return false; if ( from.AccessLevel > AccessLevel.GameMaster ) @@ -457,7 +457,7 @@ namespace Server.Mobiles public void EndChangeTitle( Mobile from, string title, bool vendor ) { - this.Title = title; + Title = title; LoadSBInfo(); } diff --git a/Scripts/Mobiles/Vendors/PlayerVendor.cs b/Scripts/Mobiles/Vendors/PlayerVendor.cs index 89edcfe51..a7dd28c49 100644 --- a/Scripts/Mobiles/Vendors/PlayerVendor.cs +++ b/Scripts/Mobiles/Vendors/PlayerVendor.cs @@ -479,15 +479,15 @@ namespace Server.Mobiles if ( !Core.AOS ) NameHue = 0x35; - if ( this.Female = Utility.RandomBool() ) + if ( Female = Utility.RandomBool() ) { - this.Body = 0x191; - this.Name = NameList.RandomName( "female" ); + Body = 0x191; + Name = NameList.RandomName( "female" ); } else { - this.Body = 0x190; - this.Name = NameList.RandomName( "male" ); + Body = 0x190; + Name = NameList.RandomName( "male" ); } } @@ -634,12 +634,12 @@ namespace Server.Mobiles { List list = new List(); - foreach ( Item item in this.Items ) - if ( item.Movable && item != this.Backpack && item.Layer != Layer.Hair && item.Layer != Layer.FacialHair ) + foreach ( Item item in Items ) + if ( item.Movable && item != Backpack && item.Layer != Layer.Hair && item.Layer != Layer.FacialHair ) list.Add( item ); - if ( this.Backpack != null ) - list.AddRange( this.Backpack.Items ); + if ( Backpack != null ) + list.AddRange( Backpack.Items ); return list; } @@ -668,7 +668,7 @@ namespace Server.Mobiles if ( list.Count > 0 || HoldGold > 0 ) // No case 1 { - if ( ( !toBackpack || this.Map == Map.Internal ) && House != null && House.IsAosRules ) // Case 2 + if ( ( !toBackpack || Map == Map.Internal ) && House != null && House.IsAosRules ) // Case 2 { if ( House.IsOwner( Owner ) ) // Move to moving crate { @@ -696,7 +696,7 @@ namespace Server.Mobiles House.VendorInventories.Add( inventory ); } } - else if ( ( toBackpack || House == null || !House.IsAosRules ) && this.Map != Map.Internal ) // Case 3 - Move to backpack + else if ( ( toBackpack || House == null || !House.IsAosRules ) && Map != Map.Internal ) // Case 3 - Move to backpack { Container backpack = new Backpack(); @@ -708,7 +708,7 @@ namespace Server.Mobiles backpack.DropItem( item ); } - backpack.MoveToWorld( this.Location, this.Map ); + backpack.MoveToWorld( Location, Map ); } } @@ -817,7 +817,7 @@ namespace Server.Mobiles { Item parent = item.Parent as Item; - if ( parent == this.Backpack ) + if ( parent == Backpack ) return true; if ( parent is Container ) @@ -862,7 +862,7 @@ namespace Server.Mobiles { base.OnItemRemoved( item ); - if ( item == this.Backpack ) + if ( item == Backpack ) { foreach ( Item subItem in item.Items ) { @@ -883,11 +883,11 @@ namespace Server.Mobiles { if ( BaseHouse.NewVendorSystem ) { - if ( this.HoldGold < 1000000 ) + if ( HoldGold < 1000000 ) { SayTo( from, 503210 ); // I'll take that to fund my services. - this.HoldGold += item.Amount; + HoldGold += item.Amount; item.Delete(); return true; @@ -901,11 +901,11 @@ namespace Server.Mobiles } else { - if ( this.BankAccount < 1000000 ) + if ( BankAccount < 1000000 ) { SayTo( from, 503210 ); // I'll take that to fund my services. - this.BankAccount += item.Amount; + BankAccount += item.Amount; item.Delete(); return true; @@ -922,7 +922,7 @@ namespace Server.Mobiles { bool newItem = ( GetVendorItem( item ) == null ); - if ( this.Backpack != null && this.Backpack.TryDropItem( from, item, false ) ) + if ( Backpack != null && Backpack.TryDropItem( from, item, false ) ) { if ( newItem ) OnItemGiven( from, item ); @@ -993,7 +993,7 @@ namespace Server.Mobiles public override bool CheckNonlocalLift( Mobile from, Item item ) { - if ( item.IsChildOf( this.Backpack ) ) + if ( item.IsChildOf( Backpack ) ) { if ( IsOwner( from ) ) { @@ -1074,11 +1074,11 @@ namespace Server.Mobiles public void OpenBackpack( Mobile from ) { - if ( this.Backpack != null ) + if ( Backpack != null ) { SayTo( from, IsOwner( from ) ? 1010642 : 503208 ); // Take a look at my/your goods. - this.Backpack.DisplayTo( from ); + Backpack.DisplayTo( from ); } } @@ -1172,7 +1172,7 @@ namespace Server.Mobiles public void Dismiss( Mobile from ) { - Container pack = this.Backpack; + Container pack = Backpack; if ( pack != null && pack.Items.Count > 0 ) { @@ -1207,7 +1207,7 @@ namespace Server.Mobiles public bool CheckTeleport( Mobile to ) { - if ( Deleted || !IsOwner( to ) || House == null || this.Map == Map.Internal ) + if ( Deleted || !IsOwner( to ) || House == null || Map == Map.Internal ) return false; if ( House.IsInside( to ) || to.Map != House.Map || !House.InRange( to, 5 ) ) @@ -1216,9 +1216,9 @@ namespace Server.Mobiles if ( Placeholder == null ) { Placeholder = new PlayerVendorPlaceholder( this ); - Placeholder.MoveToWorld( this.Location, this.Map ); + Placeholder.MoveToWorld( Location, Map ); - this.MoveToWorld( to.Location, to.Map ); + MoveToWorld( to.Location, to.Map ); to.SendLocalizedMessage( 1062431 ); // This vendor has been moved out of the house to your current location temporarily. The vendor will return home automatically after two minutes have passed once you are done managing its inventory or customizing it. } @@ -1273,7 +1273,7 @@ namespace Server.Mobiles public bool WasNamed( string speech ) { - return this.Name != null && Insensitive.StartsWith( speech, this.Name ); + return Name != null && Insensitive.StartsWith( speech, Name ); } public override void OnSpeech( SpeechEventArgs e ) @@ -1356,7 +1356,7 @@ namespace Server.Mobiles { if ( IsOwner( from ) ) { - this.Direction = this.GetDirectionTo( from ); + Direction = GetDirectionTo( from ); e.Handled = true; } @@ -1384,7 +1384,7 @@ namespace Server.Mobiles protected override void OnTick() { - m_Vendor.m_NextPayTime = DateTime.UtcNow + this.Interval; + m_Vendor.m_NextPayTime = DateTime.UtcNow + Interval; int pay; int totalGold; @@ -1710,7 +1710,7 @@ namespace Server.Mobiles { if ( m_Vendor != null && !m_Vendor.Deleted ) { - m_Vendor.MoveToWorld( this.Location, this.Map ); + m_Vendor.MoveToWorld( Location, Map ); m_Vendor.Placeholder = null; } } diff --git a/Scripts/Multis/BaseHouse.cs b/Scripts/Multis/BaseHouse.cs index 350479e68..e6fb77572 100644 --- a/Scripts/Multis/BaseHouse.cs +++ b/Scripts/Multis/BaseHouse.cs @@ -150,7 +150,7 @@ namespace Server.Multis { get { - DecayType type = this.DecayType; + DecayType type = DecayType; return ( type == DecayType.Condemned || type == DecayType.ManualRefresh ); } @@ -228,7 +228,7 @@ namespace Server.Multis if ( DecayType == DecayType.Condemned ) return false; - DecayLevel oldLevel = this.DecayLevel; + DecayLevel oldLevel = DecayLevel; m_LastRefreshed = DateTime.UtcNow; @@ -243,7 +243,7 @@ namespace Server.Multis public virtual bool CheckDecay() { - if ( !Deleted && this.DecayLevel == DecayLevel.Collapsed ) + if ( !Deleted && DecayLevel == DecayLevel.Collapsed ) { Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Decay_Sandbox ) ); return true; @@ -729,7 +729,7 @@ namespace Server.Multis { foreach ( IEntity entity in GetHouseEntities() ) { - Point3D relLoc = new Point3D( entity.X - this.X, entity.Y - this.Y, entity.Z - this.Z ); + Point3D relLoc = new Point3D( entity.X - X, entity.Y - Y, entity.Z - Z ); RelocatedEntity relocEntity = new RelocatedEntity( entity, relLoc ); RelocatedEntities.Add( relocEntity ); @@ -746,7 +746,7 @@ namespace Server.Multis foreach ( RelocatedEntity relocEntity in RelocatedEntities ) { Point3D relLoc = relocEntity.RelativeLocation; - Point3D location = new Point3D( relLoc.X + this.X, relLoc.Y + this.Y, relLoc.Z + this.Z ); + Point3D location = new Point3D( relLoc.X + X, relLoc.Y + Y, relLoc.Z + Z ); IEntity entity = relocEntity.Entity; if ( entity is Item ) @@ -757,9 +757,9 @@ namespace Server.Multis { if ( item is IAddon ) { - if ( ((IAddon)item).CouldFit( location, this.Map ) ) + if ( ((IAddon)item).CouldFit( location, Map ) ) { - item.MoveToWorld( location, this.Map ); + item.MoveToWorld( location, Map ); continue; } } @@ -778,9 +778,9 @@ namespace Server.Multis requireSurface = false; } - if ( this.Map.CanFit( location.X, location.Y, location.Z, height, false, false, requireSurface ) ) + if ( Map.CanFit( location.X, location.Y, location.Z, height, false, false, requireSurface ) ) { - item.MoveToWorld( location, this.Map ); + item.MoveToWorld( location, Map ); continue; } } @@ -867,9 +867,9 @@ namespace Server.Multis if ( !mobile.Deleted ) { - if ( this.Map.CanFit( location, 16, false, false ) ) + if ( Map.CanFit( location, 16, false, false ) ) { - mobile.MoveToWorld( location, this.Map ); + mobile.MoveToWorld( location, Map ); } else { @@ -892,16 +892,16 @@ namespace Server.Multis public List GetItems() { - if ( this.Map == null || this.Map == Map.Internal ) + if ( Map == null || Map == Map.Internal ) return new List(); - Point2D start = new Point2D( this.X + Components.Min.X, this.Y + Components.Min.Y ); - Point2D end = new Point2D( this.X + Components.Max.X + 1, this.Y + Components.Max.Y + 1 ); + Point2D start = new Point2D( X + Components.Min.X, Y + Components.Min.Y ); + Point2D end = new Point2D( X + Components.Max.X + 1, Y + Components.Max.Y + 1 ); Rectangle2D rect = new Rectangle2D( start, end ); List list = new List(); - IPooledEnumerable eable = this.Map.GetItemsInBounds( rect ); + IPooledEnumerable eable = Map.GetItemsInBounds( rect ); foreach ( Item item in eable ) if ( item.Movable && IsInside( item ) ) @@ -914,7 +914,7 @@ namespace Server.Multis public List GetMobiles() { - if ( this.Map == null || this.Map == Map.Internal ) + if ( Map == null || Map == Map.Internal ) return new List(); List list = new List(); @@ -940,8 +940,8 @@ namespace Server.Multis public static void Configure() { - Item.LockedDownFlag = 1; - Item.SecureFlag = 2; + LockedDownFlag = 1; + SecureFlag = 2; Timer.DelayCall( TimeSpan.FromMinutes( 1.0 ), TimeSpan.FromMinutes( 1.0 ), new TimerCallback( Decay_OnTick ) ); } @@ -1084,7 +1084,7 @@ namespace Server.Multis public bool IsInside( Mobile m ) { - if ( m == null || m.Deleted || m.Map != this.Map ) + if ( m == null || m.Deleted || m.Map != Map ) return false; return IsInside( m.Location, 16 ); @@ -1092,7 +1092,7 @@ namespace Server.Multis public bool IsInside( Item item ) { - if ( item == null || item.Deleted || item.Map != this.Map ) + if ( item == null || item.Deleted || item.Map != Map ) return false; return IsInside( item.Location, item.ItemData.Height ); @@ -1160,7 +1160,7 @@ namespace Server.Multis if ( x < 0 || x >= mcl.Width || y < 0 || y >= mcl.Height ) return false; - if ( this is HouseFoundation && y < (mcl.Height-1) && p.Z >= this.Z ) + if ( this is HouseFoundation && y < (mcl.Height-1) && p.Z >= Z ) return true; StaticTile[] tiles = mcl.Tiles[x][y]; @@ -1179,7 +1179,7 @@ namespace Server.Multis if ( (id >= 0xB95 && id <= 0xC0E) || (id >= 0xC43 && id <= 0xC44) ) continue; - int tileZ = tile.Z + this.Z; + int tileZ = tile.Z + Z; if ( p.Z == tileZ || (p.Z + height) > tileZ ) return true; @@ -1235,7 +1235,7 @@ namespace Server.Multis m_MaxLockDowns = MaxLockDown; m_MaxSecures = MaxSecure; - m_RelativeBanLocation = this.BaseBanLocation; + m_RelativeBanLocation = BaseBanLocation; UpdateRegion(); @@ -1265,20 +1265,20 @@ namespace Server.Multis UpdateRegion(); if ( m_Sign != null && !m_Sign.Deleted ) - m_Sign.Map = this.Map; + m_Sign.Map = Map; if ( m_Doors != null ) { foreach ( Item item in m_Doors ) - item.Map = this.Map; + item.Map = Map; } foreach ( IEntity entity in GetHouseEntities() ) { if ( entity is Item ) - ((Item)entity).Map = this.Map; + ((Item)entity).Map = Map; else - ((Mobile)entity).Map = this.Map; + ((Mobile)entity).Map = Map; } } @@ -1296,7 +1296,7 @@ namespace Server.Multis if ( m_Region != null ) m_Region.Unregister(); - if ( this.Map != null ) + if ( Map != null ) { m_Region = new HouseRegion( this ); m_Region.Register(); @@ -1483,7 +1483,7 @@ namespace Server.Multis public void AddDoor( BaseDoor door, int xoff, int yoff, int zoff ) { - door.MoveToWorld( new Point3D( xoff+this.X, yoff+this.Y, zoff+this.Z ), this.Map ); + door.MoveToWorld( new Point3D( xoff+X, yoff+Y, zoff+Z ), Map ); m_Doors.Add( door ); } @@ -1530,7 +1530,7 @@ namespace Server.Multis public void SetSign( int xoff, int yoff, int zoff ) { m_Sign = new HouseSign( this ); - m_Sign.MoveToWorld( new Point3D( this.X + xoff, this.Y + yoff, this.Z + zoff ), this.Map ); + m_Sign.MoveToWorld( new Point3D( X + xoff, Y + yoff, Z + zoff ), Map ); } private void SetLockdown( Item i, bool locked ) @@ -1618,7 +1618,7 @@ namespace Server.Multis { m.SendLocalizedMessage( 501736 ); // You must lockdown the container first! } - else if ( !(item is VendorRentalContract) && ( IsAosRules ? (!CheckAosLockdowns( amt ) || !CheckAosStorage( amt )) : (this.LockDownCount + amt) > m_MaxLockDowns ) ) + else if ( !(item is VendorRentalContract) && ( IsAosRules ? (!CheckAosLockdowns( amt ) || !CheckAosStorage( amt )) : (LockDownCount + amt) > m_MaxLockDowns ) ) { m.SendLocalizedMessage( 1005379 );//That would exceed the maximum lock down limit for this house } @@ -1719,7 +1719,7 @@ namespace Server.Multis if ( Deleted || m_House == null || m_House.Deleted || !m_House.IsOwner( from ) || !from.CheckAlive() || !to.CheckAlive() ) return false; - if ( BaseHouse.HasAccountHouse( to ) ) + if ( HasAccountHouse( to ) ) { from.SendLocalizedMessage( 501388 ); // You cannot transfer ownership to another house owner or co-owner! return false; @@ -1804,7 +1804,7 @@ namespace Server.Multis } else if ( to.Player ) { - if ( BaseHouse.HasAccountHouse( to ) ) + if ( HasAccountHouse( to ) ) { from.SendLocalizedMessage( 501388 ); // You cannot transfer ownership to another house owner or co-owner! } @@ -1824,8 +1824,8 @@ namespace Server.Multis } else { - to.CloseGump( typeof( Gumps.HouseTransferGump ) ); - to.SendGump( new Gumps.HouseTransferGump( from, to, this ) ); + to.CloseGump( typeof( HouseTransferGump ) ); + to.SendGump( new HouseTransferGump( from, to, this ) ); } } } @@ -1844,8 +1844,8 @@ namespace Server.Multis if ( CheckTransferPosition( from, to ) ) { - to.CloseGump( typeof( Gumps.HouseTransferGump ) ); - to.SendGump( new Gumps.HouseTransferGump( from, to, this ) ); + to.CloseGump( typeof( HouseTransferGump ) ); + to.SendGump( new HouseTransferGump( from, to, this ) ); } } @@ -1868,7 +1868,7 @@ namespace Server.Multis } else if ( to.Player ) { - if ( BaseHouse.HasAccountHouse( to ) ) + if ( HasAccountHouse( to ) ) { from.SendLocalizedMessage( 501388 ); // You cannot transfer ownership to another house owner or co-owner! } @@ -1913,7 +1913,7 @@ namespace Server.Multis if ( IsLockedDown( item ) ) { - item.PublicOverheadMessage( Server.Network.MessageType.Label, 0x3B2, 501657 );//[no longer locked down] + item.PublicOverheadMessage( MessageType.Label, 0x3B2, 501657 );//[no longer locked down] SetLockdown( item, false ); //TidyItemList( m_LockDowns ); @@ -1958,7 +1958,7 @@ namespace Server.Multis if ( info != null ) { m.CloseGump( typeof ( SetSecureLevelGump ) ); - m.SendGump( new Gumps.SetSecureLevelGump( m_Owner, info, this ) ); + m.SendGump( new SetSecureLevelGump( m_Owner, info, this ) ); } else if ( item.Parent != null ) { @@ -1994,7 +1994,7 @@ namespace Server.Multis item.Movable = false; m.CloseGump( typeof ( SetSecureLevelGump ) ); - m.SendGump( new Gumps.SetSecureLevelGump( m_Owner, info, this ) ); + m.SendGump( new SetSecureLevelGump( m_Owner, info, this ) ); } } } @@ -2060,7 +2060,7 @@ namespace Server.Multis item.Movable = true; item.SetLastMoved(); - item.PublicOverheadMessage( Server.Network.MessageType.Label, 0x3B2, 501656 );//[no longer secure] + item.PublicOverheadMessage( MessageType.Label, 0x3B2, 501656 );//[no longer secure] m_Secures.RemoveAt( i ); return; } @@ -2617,7 +2617,7 @@ namespace Server.Multis case 0: { if ( version < 14 ) - m_RelativeBanLocation = this.BaseBanLocation; + m_RelativeBanLocation = BaseBanLocation; if ( version < 12 ) { @@ -2871,9 +2871,9 @@ namespace Server.Multis return m_Region.GoLocation; Point3D rel = m_RelativeBanLocation; - return new Point3D( this.X + rel.X, this.Y + rel.Y, this.Z + rel.Z ); + return new Point3D( X + rel.X, Y + rel.Y, Z + rel.Z ); } - set => this.RelativeBanLocation = new Point3D( value.X - this.X, value.Y - this.Y, value.Z - this.Z ); + set => RelativeBanLocation = new Point3D( value.X - X, value.Y - Y, value.Z - Z ); } [CommandProperty( AccessLevel.GameMaster )] @@ -2885,7 +2885,7 @@ namespace Server.Multis m_RelativeBanLocation = value; if ( m_Region != null ) - m_Region.GoLocation = new Point3D( this.X + value.X, this.Y + value.Y, this.Z + value.Z ); + m_Region.GoLocation = new Point3D( X + value.X, Y + value.Y, Z + value.Z ); } } @@ -3433,7 +3433,7 @@ namespace Server.Multis public virtual Guildstone FindGuildstone() { - Map map = this.Map; + Map map = Map; if ( map == null ) return null; @@ -3932,7 +3932,7 @@ namespace Server.Multis private Mobile m_RegionOwner; public TempNoHousingRegion( BaseHouse house, Mobile regionowner ) - : base( null, house.Map, Region.DefaultPriority, house.Region.Area ) + : base( null, house.Map, DefaultPriority, house.Region.Area ) { Register(); diff --git a/Scripts/Multis/Boats/BaseBoat.cs b/Scripts/Multis/Boats/BaseBoat.cs index 849cd524a..bde5dbc11 100644 --- a/Scripts/Multis/Boats/BaseBoat.cs +++ b/Scripts/Multis/Boats/BaseBoat.cs @@ -965,14 +965,14 @@ namespace Server.Multis return false; } - else if ( this.Map != MapItem.Map || !this.Contains( MapItem.GetWorldLocation() ) ) + else if ( Map != MapItem.Map || !Contains( MapItem.GetWorldLocation() ) ) { if ( message && TillerMan != null ) TillerMan.Say( 502514 ); // The map is too far away from me, sir. return false; } - else if ( ( this.Map != Map.Trammel && this.Map != Map.Felucca ) || NextNavPoint < 0 || NextNavPoint >= MapItem.Pins.Count ) + else if ( ( Map != Map.Trammel && Map != Map.Felucca ) || NextNavPoint < 0 || NextNavPoint >= MapItem.Pins.Count ) { if ( message && TillerMan != null ) TillerMan.Say( 1042551 ); // I don't see that navpoint, sir. @@ -1076,7 +1076,7 @@ namespace Server.Multis } else { - if ( m_MoveTimer != null && this.Order != BoatOrder.Move ) + if ( m_MoveTimer != null && Order != BoatOrder.Move ) { m_MoveTimer.Stop(); m_MoveTimer = null; @@ -1332,8 +1332,8 @@ namespace Server.Multis public Direction GetMovementFor( int x, int y, out int maxSpeed ) { - int dx = x - this.X; - int dy = y - this.Y; + int dx = x - X; + int dy = y - Y; int adx = Math.Abs( dx ); int ady = Math.Abs( dy ); @@ -1355,7 +1355,7 @@ namespace Server.Multis Direction dir; int speed, clientSpeed; - if ( this.Order == BoatOrder.Move ) + if ( Order == BoatOrder.Move ) { dir = m_Moving; speed = m_Speed; @@ -1368,14 +1368,14 @@ namespace Server.Multis return false; } - else if ( this.Map != MapItem.Map || !this.Contains( MapItem.GetWorldLocation() ) ) + else if ( Map != MapItem.Map || !Contains( MapItem.GetWorldLocation() ) ) { if ( message && TillerMan != null ) TillerMan.Say( 502514 ); // The map is too far away from me, sir. return false; } - else if ( ( this.Map != Map.Trammel && this.Map != Map.Felucca ) || NextNavPoint < 0 || NextNavPoint >= MapItem.Pins.Count ) + else if ( ( Map != Map.Trammel && Map != Map.Felucca ) || NextNavPoint < 0 || NextNavPoint >= MapItem.Pins.Count ) { if ( message && TillerMan != null ) TillerMan.Say( 1042551 ); // I don't see that navpoint, sir. @@ -1394,14 +1394,14 @@ namespace Server.Multis if ( maxSpeed == 0 ) { - if ( message && this.Order == BoatOrder.Single && TillerMan != null ) + if ( message && Order == BoatOrder.Single && TillerMan != null ) TillerMan.Say( 1042874, (NextNavPoint + 1).ToString() ); // We have arrived at nav point ~1_POINT_NUM~ , sir. if ( NextNavPoint + 1 < MapItem.Pins.Count ) { NextNavPoint++; - if ( this.Order == BoatOrder.Course ) + if ( Order == BoatOrder.Course ) { if ( message && TillerMan != null ) TillerMan.Say( 1042875, (NextNavPoint + 1).ToString() ); // Heading to nav point ~1_POINT_NUM~, sir. @@ -1415,7 +1415,7 @@ namespace Server.Multis { NextNavPoint = -1; - if ( message && this.Order == BoatOrder.Course && TillerMan != null ) + if ( message && Order == BoatOrder.Course && TillerMan != null ) TillerMan.Say( 502515 ); // The course is completed, sir. return false; @@ -1427,7 +1427,7 @@ namespace Server.Multis else if ( dir == Right || dir == BackwardRight ) return Turn( 2, true ); - speed = Math.Min( this.Speed, maxSpeed ); + speed = Math.Min( Speed, maxSpeed ); clientSpeed = 0x4; } @@ -1637,7 +1637,7 @@ namespace Server.Multis public bool SetFacing( Direction facing ) { - if ( Parent != null || this.Map == null ) + if ( Parent != null || Map == null ) return false; if ( CheckDecay() ) diff --git a/Scripts/Multis/Boats/Plank.cs b/Scripts/Multis/Boats/Plank.cs index c241f85f4..a5f0972da 100644 --- a/Scripts/Multis/Boats/Plank.cs +++ b/Scripts/Multis/Boats/Plank.cs @@ -179,7 +179,7 @@ namespace Server.Items { z = from.Z + j; - if ( map.CanFit( x, y, z, 16, false, false ) && !Server.Spells.SpellHelper.CheckMulti( new Point3D( x, y, z ), map ) && !Region.Find( new Point3D( x, y, z ), map ).IsPartOf( typeof( Factions.StrongholdRegion ) ) ) + if ( map.CanFit( x, y, z, 16, false, false ) && !Spells.SpellHelper.CheckMulti( new Point3D( x, y, z ), map ) && !Region.Find( new Point3D( x, y, z ), map ).IsPartOf( typeof( StrongholdRegion ) ) ) { if ( i == 1 && j >= -2 && j <= 2 ) return true; @@ -191,7 +191,7 @@ namespace Server.Items z = map.GetAverageZ( x, y ); - if ( map.CanFit( x, y, z, 16, false, false ) && !Server.Spells.SpellHelper.CheckMulti( new Point3D( x, y, z ), map ) && !Region.Find( new Point3D( x, y, z ), map ).IsPartOf( typeof( Factions.StrongholdRegion ) ) ) + if ( map.CanFit( x, y, z, 16, false, false ) && !Spells.SpellHelper.CheckMulti( new Point3D( x, y, z ), map ) && !Region.Find( new Point3D( x, y, z ), map ).IsPartOf( typeof( StrongholdRegion ) ) ) { if ( i == 1 ) return true; @@ -216,7 +216,7 @@ namespace Server.Items if ( map == null || Deleted ) return false; - foreach ( object o in this.GetObjectsInRange( 0 ) ) + foreach ( object o in GetObjectsInRange( 0 ) ) { if ( o != this ) return false; @@ -286,12 +286,12 @@ namespace Server.Items } else if ( !Locked ) { - from.Location = new Point3D( this.X, this.Y, this.Z + 3 ); + from.Location = new Point3D( X, Y, Z + 3 ); } else if ( from.AccessLevel >= AccessLevel.GameMaster ) { from.LocalOverheadMessage( Network.MessageType.Regular, 0x00, 502502 ); // That is locked but your godly powers allow access - from.Location = new Point3D( this.X, this.Y, this.Z + 3 ); + from.Location = new Point3D( X, Y, Z + 3 ); } else { diff --git a/Scripts/Multis/Camps/BaseCamp.cs b/Scripts/Multis/Camps/BaseCamp.cs index 10f57e402..80ab833d2 100644 --- a/Scripts/Multis/Camps/BaseCamp.cs +++ b/Scripts/Multis/Camps/BaseCamp.cs @@ -86,7 +86,7 @@ namespace Server.Multis if ( m is BaseVendor || m is Banker ) m.Direction = Direction.South; - m.MoveToWorld( loc, this.Map ); + m.MoveToWorld( loc, Map ); } public virtual void OnEnter( Mobile m ) diff --git a/Scripts/Multis/HouseFoundation.cs b/Scripts/Multis/HouseFoundation.cs index fe7ff2683..1b9e0f962 100644 --- a/Scripts/Multis/HouseFoundation.cs +++ b/Scripts/Multis/HouseFoundation.cs @@ -177,16 +177,16 @@ namespace Server.Multis base.OnMapChange(); if ( m_SignHanger != null ) - m_SignHanger.Map = this.Map; + m_SignHanger.Map = Map; if ( m_Signpost != null ) - m_Signpost.Map = this.Map; + m_Signpost.Map = Map; if ( m_Fixtures == null ) return; for( int i = 0; i < m_Fixtures.Count; ++i ) - m_Fixtures[i].Map = this.Map; + m_Fixtures[i].Map = Map; } public void ClearFixtures( Mobile from ) @@ -582,7 +582,7 @@ namespace Server.Multis public void CheckSignpost() { - MultiComponentList mcl = this.Components; + MultiComponentList mcl = Components; int x = mcl.Min.X; int y = mcl.Height - 2 - mcl.Center.Y; @@ -956,7 +956,7 @@ namespace Server.Multis int newPrice = oldPrice + CustomizationCost + ((DesignState.Components.List.Length - ( CurrentState.Components.List.Length + CurrentState.Fixtures.Length )) * 500); int cost = newPrice - oldPrice; - if ( !this.Deleted ) { // Temporary Fix. We should be booting a client out of customization mode in the delete handler. + if ( !Deleted ) { // Temporary Fix. We should be booting a client out of customization mode in the delete handler. if ( from.AccessLevel >= AccessLevel.GameMaster && cost != 0 ) { from.SendMessage( "{0} gold would have been {1} your bank if you were not a GM.", cost.ToString(), ((cost > 0 )? "withdrawn from" : "deposited into" ) ); @@ -1065,7 +1065,7 @@ namespace Server.Multis { get { - MultiComponentList mcl = this.Components; + MultiComponentList mcl = Components; if ( mcl.Width >= 14 || mcl.Height >= 14 ) return 4; @@ -2411,7 +2411,7 @@ namespace Server.Multis lock (m_DeflatedBufferPool) m_DeflatedBufferPool.ReleaseBuffer(m_DeflatedBuffer); - m_Stream.Seek( 15, System.IO.SeekOrigin.Begin ); + m_Stream.Seek( 15, SeekOrigin.Begin ); Write( (short)totalLength ); // Buffer length Write( (byte)planeCount ); // Plane count diff --git a/Scripts/Multis/HousePlacementTool.cs b/Scripts/Multis/HousePlacementTool.cs index 7813db543..4d815e47a 100644 --- a/Scripts/Multis/HousePlacementTool.cs +++ b/Scripts/Multis/HousePlacementTool.cs @@ -85,7 +85,7 @@ namespace Server.Items AddHtmlLocalized( 45, 80, 200, 20, 1060392, LabelColor, false, false ); // 3-Story Customizable Houses } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { if ( !m_From.CheckAlive() || m_From.Backpack == null || m_From.Backpack.FindItemByType( typeof( HousePlacementTool ) ) == null ) return; @@ -193,7 +193,7 @@ namespace Server.Items } } - public override void OnResponse( Server.Network.NetState sender, RelayInfo info ) + public override void OnResponse( Network.NetState sender, RelayInfo info ) { if ( !m_From.CheckAlive() || m_From.Backpack == null || m_From.Backpack.FindItemByType( typeof( HousePlacementTool ) ) == null ) return; diff --git a/Scripts/Multis/HouseSign.cs b/Scripts/Multis/HouseSign.cs index 6c509c1ea..81fc06af8 100644 --- a/Scripts/Multis/HouseSign.cs +++ b/Scripts/Multis/HouseSign.cs @@ -210,7 +210,7 @@ namespace Server.Multis public override void OnClick() { - Mobile from = this.Owner.From; + Mobile from = Owner.From; if ( !from.CheckAlive() || m_Sign.Deleted || m_Sign.Owner == null || !m_Sign.Owner.AreThereAvailableVendorsFor( from ) ) return; @@ -237,7 +237,7 @@ namespace Server.Multis public override void OnClick() { - Mobile from = this.Owner.From; + Mobile from = Owner.From; if ( m_Sign.Deleted || m_Sign.Owner == null || m_Sign.Owner.VendorInventories.Count == 0 || !from.CheckAlive() ) return; @@ -281,8 +281,8 @@ namespace Server.Multis } } - if ( this.Name == "a house sign" ) - this.Name = null; + if ( Name == "a house sign" ) + Name = null; } } } diff --git a/Scripts/Multis/HouseTeleporter.cs b/Scripts/Multis/HouseTeleporter.cs index 52334eb36..084c70ce8 100644 --- a/Scripts/Multis/HouseTeleporter.cs +++ b/Scripts/Multis/HouseTeleporter.cs @@ -163,7 +163,7 @@ namespace Server.Items Point3D p = target.GetWorldTop(); Map map = target.Map; - Server.Mobiles.BaseCreature.TeleportPets( m, p, map ); + Mobiles.BaseCreature.TeleportPets( m, p, map ); m.MoveToWorld( p, map ); diff --git a/Scripts/Multis/MovingCrate.cs b/Scripts/Multis/MovingCrate.cs index e3af9a044..7b9b058ec 100644 --- a/Scripts/Multis/MovingCrate.cs +++ b/Scripts/Multis/MovingCrate.cs @@ -53,7 +53,7 @@ namespace Server.Multis public override void DropItem( Item dropped ) { // 1. Try to stack the item - foreach ( Item item in this.Items ) + foreach ( Item item in Items ) { if ( item is PackingBox ) { @@ -70,7 +70,7 @@ namespace Server.Multis } // 2. Try to drop the item into an existing container - foreach ( Item item in this.Items ) + foreach ( Item item in Items ) { if ( item is PackingBox ) { @@ -92,7 +92,7 @@ namespace Server.Multis Point3D location = GetFreeLocation(); if ( location != Point3D.Zero ) { - this.AddItem( subContainer ); + AddItem( subContainer ); subContainer.Location = location; } else @@ -105,17 +105,17 @@ namespace Server.Multis { bool[,] positions = new bool[Rows, Columns]; - foreach ( Item item in this.Items ) + foreach ( Item item in Items ) { if ( item is PackingBox ) { - int i = (item.Y - this.Bounds.Y) / VerticalSpacing; + int i = (item.Y - Bounds.Y) / VerticalSpacing; if ( i < 0 ) i = 0; else if ( i >= Rows ) i = Rows - 1; - int j = (item.X - this.Bounds.X) / HorizontalSpacing; + int j = (item.X - Bounds.X) / HorizontalSpacing; if ( j < 0 ) j = 0; else if ( j >= Columns ) @@ -131,8 +131,8 @@ namespace Server.Multis { if ( !positions[i, j] ) { - int x = this.Bounds.X + j * HorizontalSpacing; - int y = this.Bounds.Y + i * VerticalSpacing; + int x = Bounds.X + j * HorizontalSpacing; + int y = Bounds.Y + i * VerticalSpacing; return new Point3D( x, y, 0 ); } @@ -169,7 +169,7 @@ namespace Server.Multis { base.OnItemRemoved( item ); - if ( this.TotalItems == 0 ) + if ( TotalItems == 0 ) Delete(); } @@ -196,14 +196,14 @@ namespace Server.Multis } List toRemove = new List(); - foreach ( Item item in this.Items ) + foreach ( Item item in Items ) if ( item is PackingBox && item.Items.Count == 0 ) toRemove.Add( item ); foreach ( Item item in toRemove ) item.Delete(); - if ( this.TotalItems == 0 ) + if ( TotalItems == 0 ) Delete(); else Internalize(); @@ -244,7 +244,7 @@ namespace Server.Multis } else { - Timer.DelayCall( TimeSpan.Zero, this.Delete ); + Timer.DelayCall( TimeSpan.Zero, Delete ); } if ( version == 0 ) @@ -299,7 +299,7 @@ namespace Server.Multis { base.OnItemRemoved( item ); - if ( item.GetBounce() == null && this.TotalItems == 0 ) + if ( item.GetBounce() == null && TotalItems == 0 ) Delete(); } @@ -307,7 +307,7 @@ namespace Server.Multis { base.OnItemBounceCleared( item ); - if ( this.TotalItems == 0 ) + if ( TotalItems == 0 ) Delete(); } diff --git a/Scripts/Multis/PreviewHouse.cs b/Scripts/Multis/PreviewHouse.cs index 2dcc38273..1474919f2 100644 --- a/Scripts/Multis/PreviewHouse.cs +++ b/Scripts/Multis/PreviewHouse.cs @@ -13,7 +13,7 @@ namespace Server.Multis { m_Components = new List(); - MultiComponentList mcl = this.Components; + MultiComponentList mcl = Components; for ( int i = 1; i < mcl.List.Length; ++i ) { @@ -48,7 +48,7 @@ namespace Server.Multis { Item item = m_Components[i]; - item.MoveToWorld( new Point3D( item.X + xOffset, item.Y + yOffset, item.Z + zOffset ), this.Map ); + item.MoveToWorld( new Point3D( item.X + xOffset, item.Y + yOffset, item.Z + zOffset ), Map ); } } @@ -63,7 +63,7 @@ namespace Server.Multis { Item item = m_Components[i]; - item.Map = this.Map; + item.Map = Map; } } @@ -120,7 +120,7 @@ namespace Server.Multis } } - Timer.DelayCall( TimeSpan.Zero, new TimerCallback( this.Delete ) ); + Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Delete ) ); } private class DecayTimer : Timer diff --git a/Scripts/Regions/BaseRegion.cs b/Scripts/Regions/BaseRegion.cs index cbbf3cdd3..a23d447d4 100644 --- a/Scripts/Regions/BaseRegion.cs +++ b/Scripts/Regions/BaseRegion.cs @@ -25,7 +25,7 @@ namespace Server.Regions public static void Configure() { - Region.DefaultRegionType = typeof( BaseRegion ); + DefaultRegionType = typeof( BaseRegion ); } private string m_RuneName; @@ -70,7 +70,7 @@ namespace Server.Regions { base.OnUnregister(); - this.Spawns = null; + Spawns = null; } public static string GetRuneNameFor( Region region ) @@ -106,9 +106,7 @@ namespace Server.Regions if ( !region.AllowSpawn() ) return false; - BaseRegion br = region as BaseRegion; - - if ( br != null ) + if ( region is BaseRegion br ) { if ( br.Spawns != null ) { @@ -133,11 +131,11 @@ namespace Server.Regions public override void OnEnter(Mobile m) { - if (m is PlayerMobile && ((PlayerMobile)m).Young) + if (m is PlayerMobile mobile && mobile.Young) { - if (!this.YoungProtected) + if (!YoungProtected) { - m.SendGump(new YoungDungeonWarning()); + mobile.SendGump(new YoungDungeonWarning()); } } } @@ -163,9 +161,9 @@ namespace Server.Regions return; // Test if area rectangles are overlapping, and in that case break them into smaller non overlapping rectangles - for ( int i = 0; i < this.Area.Length; i++ ) + for ( int i = 0; i < Area.Length; i++ ) { - m_RectBuffer2.Add( this.Area[i] ); + m_RectBuffer2.Add( Area[i] ); for ( int j = 0; j < m_RectBuffer1.Count && m_RectBuffer2.Count > 0; j++ ) { @@ -231,7 +229,7 @@ namespace Server.Regions public Point3D RandomSpawnLocation( int spawnHeight, bool land, bool water, Point3D home, int range ) { - Map map = this.Map; + Map map = Map; if ( map == Map.Internal ) return Point3D.Zero; @@ -277,9 +275,9 @@ namespace Server.Regions y = Utility.RandomMinMax( home.Y - range, home.Y + range ); minZ = int.MaxValue; maxZ = int.MinValue; - for ( int j = 0; j < this.Area.Length; j++ ) + for ( int j = 0; j < Area.Length; j++ ) { - Rectangle3D rect = this.Area[j]; + Rectangle3D rect = Area[j]; if ( x >= rect.Start.X && x < rect.End.X && y >= rect.Start.Y && y < rect.End.Y ) { @@ -407,7 +405,7 @@ namespace Server.Regions m_SpawnBuffer1.Clear(); - if ( !Region.Find( new Point3D( x, y, z ), map ).AcceptsSpawnsFrom( this ) ) + if ( !Find( new Point3D( x, y, z ), map ).AcceptsSpawnsFrom( this ) ) { m_SpawnBuffer2.Clear(); continue; @@ -472,12 +470,12 @@ namespace Server.Regions public override string ToString() { - if ( this.Name != null ) - return this.Name; - else if ( this.RuneName != null ) - return this.RuneName; + if ( Name != null ) + return Name; + else if ( RuneName != null ) + return RuneName; else - return this.GetType().Name; + return GetType().Name; } public BaseRegion( string name, Map map, int priority, params Rectangle2D[] area ) : base( name, map, priority, area ) diff --git a/Scripts/Regions/DungeonRegion.cs b/Scripts/Regions/DungeonRegion.cs index b4d050e45..8371204a4 100644 --- a/Scripts/Regions/DungeonRegion.cs +++ b/Scripts/Regions/DungeonRegion.cs @@ -39,7 +39,7 @@ namespace Server.Regions public override bool CanUseStuckMenu( Mobile m ) { - if ( this.Map == Map.Felucca ) + if ( Map == Map.Felucca ) return false; return base.CanUseStuckMenu( m ); diff --git a/Scripts/Regions/GuardedRegion.cs b/Scripts/Regions/GuardedRegion.cs index 2a344aec6..ec612b447 100644 --- a/Scripts/Regions/GuardedRegion.cs +++ b/Scripts/Regions/GuardedRegion.cs @@ -115,7 +115,7 @@ namespace Server.Regions { get { - if ( this.Map == Map.Ilshenar || this.Map == Map.Malas ) + if ( Map == Map.Ilshenar || Map == Map.Malas ) return typeof( ArcherGuard ); else return typeof( WarriorGuard ); @@ -152,7 +152,7 @@ namespace Server.Regions bool disabled = false; if ( ReadBoolean( el, "disabled", ref disabled, false ) ) - this.Disabled = disabled; + Disabled = disabled; } public override bool OnBeginSpellCast( Mobile m, ISpell s ) diff --git a/Scripts/Regions/HouseRegion.cs b/Scripts/Regions/HouseRegion.cs index 7eb816ecd..820bd8c10 100644 --- a/Scripts/Regions/HouseRegion.cs +++ b/Scripts/Regions/HouseRegion.cs @@ -8,7 +8,7 @@ namespace Server.Regions { public class HouseRegion : BaseRegion { - public static readonly int HousePriority = Region.DefaultPriority + 1; + public static readonly int HousePriority = DefaultPriority + 1; private BaseHouse m_House; @@ -31,7 +31,7 @@ namespace Server.Regions Point3D ban = house.RelativeBanLocation; - this.GoLocation = new Point3D( house.X + ban.X, house.Y + ban.Y, house.Z + ban.Z ); + GoLocation = new Point3D( house.X + ban.X, house.Y + ban.Y, house.Z + ban.Z ); } public override bool AllowHousing( Mobile from, Point3D p ) @@ -51,7 +51,7 @@ namespace Server.Regions for ( int i = 0; i < area.Length; i++ ) { Rectangle2D rect = houseArea[i]; - area[i] = Region.ConvertTo3D( new Rectangle2D( x + rect.Start.X, y + rect.Start.Y, rect.Width, rect.Height ) ); + area[i] = ConvertTo3D( new Rectangle2D( x + rect.Start.X, y + rect.Start.Y, rect.Width, rect.Height ) ); } return area; diff --git a/Scripts/Regions/Spawning/SpawnDefinition.cs b/Scripts/Regions/Spawning/SpawnDefinition.cs index 6ace98bc7..f9a22e6d4 100644 --- a/Scripts/Regions/Spawning/SpawnDefinition.cs +++ b/Scripts/Regions/Spawning/SpawnDefinition.cs @@ -114,7 +114,7 @@ namespace Server.Regions Region region = entry.Region; Map map = region.Map; - Point3D loc = entry.RandomSpawnLocation( this.Height, this.Land, this.Water ); + Point3D loc = entry.RandomSpawnLocation( Height, Land, Water ); if ( loc == Point3D.Zero ) return null; diff --git a/Scripts/Regions/Spawning/SpawnEntry.cs b/Scripts/Regions/Spawning/SpawnEntry.cs index 99a2a806a..2b05f27f2 100644 --- a/Scripts/Regions/Spawning/SpawnEntry.cs +++ b/Scripts/Regions/Spawning/SpawnEntry.cs @@ -57,7 +57,7 @@ namespace Server.Regions public bool Running => m_Running; public bool Complete => m_SpawnedObjects.Count >= m_Max; - public bool Spawning => m_Running && !this.Complete; + public bool Spawning => m_Running && !Complete; public SpawnEntry( int id, BaseRegion region, Point3D home, int range, Direction direction, SpawnDefinition definition, int max, TimeSpan minSpawnTime, TimeSpan maxSpawnTime ) { @@ -117,7 +117,7 @@ namespace Server.Regions spawn.Spawner = this; if ( spawn is BaseCreature ) - ((BaseCreature)spawn).RemoveIfUntamed = this.RemoveIfUntamed; + ((BaseCreature)spawn).RemoveIfUntamed = RemoveIfUntamed; } void ISpawner.Remove( ISpawnable spawn ) @@ -138,7 +138,7 @@ namespace Server.Regions private void CheckTimer() { - if ( this.Spawning ) + if ( Spawning ) { if ( m_SpawnTimer == null ) { @@ -192,7 +192,7 @@ namespace Server.Regions { InternalDeleteSpawnedObjects(); - for ( int i = 0; !this.Complete && i < m_Max; i++ ) + for ( int i = 0; !Complete && i < m_Max; i++ ) Spawn(); m_Running = true; @@ -259,7 +259,7 @@ namespace Server.Regions { m_NextSpawn = reader.ReadDeltaTime(); - if ( this.Spawning ) + if ( Spawning ) { if ( m_SpawnTimer != null ) m_SpawnTimer.Stop(); diff --git a/Scripts/Skills/Anatomy.cs b/Scripts/Skills/Anatomy.cs index 6f385de64..b9809253b 100644 --- a/Scripts/Skills/Anatomy.cs +++ b/Scripts/Skills/Anatomy.cs @@ -14,7 +14,7 @@ namespace Server.SkillHandlers public static TimeSpan OnUse( Mobile m ) { - m.Target = new Anatomy.InternalTarget(); + m.Target = new InternalTarget(); m.SendLocalizedMessage( 500321 ); // Whom shall I examine? diff --git a/Scripts/Skills/EvalInt.cs b/Scripts/Skills/EvalInt.cs index e96825a6c..3eb5b0ea4 100644 --- a/Scripts/Skills/EvalInt.cs +++ b/Scripts/Skills/EvalInt.cs @@ -14,7 +14,7 @@ namespace Server.SkillHandlers public static TimeSpan OnUse( Mobile m ) { - m.Target = new EvalInt.InternalTarget(); + m.Target = new InternalTarget(); m.SendLocalizedMessage( 500906 ); // What do you wish to evaluate? diff --git a/Scripts/Skills/Inscribe.cs b/Scripts/Skills/Inscribe.cs index 668a51d38..dd39a3b26 100644 --- a/Scripts/Skills/Inscribe.cs +++ b/Scripts/Skills/Inscribe.cs @@ -84,9 +84,9 @@ namespace Server.SkillHandlers BaseBook book = targeted as BaseBook; if ( book == null ) from.SendLocalizedMessage( 1046296 ); // That is not a book - else if ( Inscribe.IsEmpty( book ) ) + else if ( IsEmpty( book ) ) from.SendLocalizedMessage( 501611 ); // Can't copy an empty book. - else if ( Inscribe.GetUser( book ) != null ) + else if ( GetUser( book ) != null ) from.SendLocalizedMessage( 501621 ); // Someone else is inscribing that item. else { @@ -94,7 +94,7 @@ namespace Server.SkillHandlers from.Target = target; from.SendLocalizedMessage( 501612 ); // Select a book to copy this to. target.BeginTimeout( from, TimeSpan.FromMinutes( 1.0 ) ); - Inscribe.SetUser( book, from ); + SetUser( book, from ); } } @@ -123,19 +123,19 @@ namespace Server.SkillHandlers if ( bookDst == null ) from.SendLocalizedMessage( 1046296 ); // That is not a book - else if ( Inscribe.IsEmpty( m_BookSrc ) ) + else if ( IsEmpty( m_BookSrc ) ) from.SendLocalizedMessage( 501611 ); // Can't copy an empty book. else if ( bookDst == m_BookSrc ) from.SendLocalizedMessage( 501616 ); // Cannot copy a book onto itself. else if ( !bookDst.Writable ) from.SendLocalizedMessage( 501614 ); // Cannot write into that book. - else if ( Inscribe.GetUser( bookDst ) != null ) + else if ( GetUser( bookDst ) != null ) from.SendLocalizedMessage( 501621 ); // Someone else is inscribing that item. else { if ( from.CheckTargetSkill( SkillName.Inscribe, bookDst, 0, 50 ) ) { - Inscribe.Copy( m_BookSrc, bookDst ); + Copy( m_BookSrc, bookDst ); from.SendLocalizedMessage( 501618 ); // You make a copy of the book. from.PlaySound( 0x249 ); @@ -155,7 +155,7 @@ namespace Server.SkillHandlers protected override void OnTargetFinish( Mobile from ) { - Inscribe.CancelUser( m_BookSrc ); + CancelUser( m_BookSrc ); } } } diff --git a/Scripts/Skills/Meditation.cs b/Scripts/Skills/Meditation.cs index 99cd00e76..3f8acb113 100644 --- a/Scripts/Skills/Meditation.cs +++ b/Scripts/Skills/Meditation.cs @@ -49,7 +49,7 @@ namespace Server.SkillHandlers return TimeSpan.FromSeconds( Core.AOS ? 10.0 : 5.0 ); } - else if ( Core.AOS && Server.Misc.RegenRates.GetArmorOffset( m ) > 0 ) + else if ( Core.AOS && Misc.RegenRates.GetArmorOffset( m ) > 0 ) { m.SendLocalizedMessage( 500135 ); // Regenerative forces cannot penetrate your armor! diff --git a/Scripts/Skills/Stealing.cs b/Scripts/Skills/Stealing.cs index d4b4cc295..c2656bc96 100644 --- a/Scripts/Skills/Stealing.cs +++ b/Scripts/Skills/Stealing.cs @@ -387,7 +387,7 @@ namespace Server.SkillHandlers } else { - m.Target = new Stealing.StealingTarget( m ); + m.Target = new StealingTarget( m ); m.RevealingAction(); m.SendLocalizedMessage( 502698 ); // Which item do you want to steal? diff --git a/Scripts/SpecialSystems/Items/Stones/GamblingStone.cs b/Scripts/SpecialSystems/Items/Stones/GamblingStone.cs index 7c0c0987d..653a7b5d9 100644 --- a/Scripts/SpecialSystems/Items/Stones/GamblingStone.cs +++ b/Scripts/SpecialSystems/Items/Stones/GamblingStone.cs @@ -35,7 +35,7 @@ namespace Server.Items public override void OnSingleClick( Mobile from ) { base.OnSingleClick( from ); - base.LabelTo( from, "Jackpot: {0}gp", m_GamblePot ); + LabelTo( from, "Jackpot: {0}gp", m_GamblePot ); } public override void OnDoubleClick( Mobile from ) diff --git a/Scripts/Spells/Base/SpecialMove.cs b/Scripts/Spells/Base/SpecialMove.cs index 52afbe83f..d8bee31cc 100644 --- a/Scripts/Spells/Base/SpecialMove.cs +++ b/Scripts/Spells/Base/SpecialMove.cs @@ -87,7 +87,7 @@ namespace Server.Spells { double scalar = 1.0; - if ( !Server.Spells.Necromancy.MindRotSpell.GetMindRotScalar( m, ref scalar ) ) + if ( !Necromancy.MindRotSpell.GetMindRotScalar( m, ref scalar ) ) scalar = 1.0; // Lower Mana Cost = 40% @@ -133,7 +133,7 @@ namespace Server.Spells Timer timer = new SpecialMoveTimer( from ); timer.Start(); - AddContext( from, new SpecialMoveContext( timer, this.GetType() ) ); + AddContext( from, new SpecialMoveContext( timer, GetType() ) ); } } } @@ -143,13 +143,13 @@ namespace Server.Spells if ( !from.Player ) return true; - if ( Bushido.HonorableExecution.IsUnderPenalty( from ) ) + if ( HonorableExecution.IsUnderPenalty( from ) ) { from.SendLocalizedMessage( 1063024 ); // You cannot perform this special move right now. return false; } - if ( Ninjitsu.AnimalForm.UnderTransformation( from ) ) + if ( AnimalForm.UnderTransformation( from ) ) { from.SendLocalizedMessage( 1063024 ); // You cannot perform this special move right now. return false; diff --git a/Scripts/Spells/Base/Spell.cs b/Scripts/Spells/Base/Spell.cs index 1558664c2..fed73426b 100644 --- a/Scripts/Spells/Base/Spell.cs +++ b/Scripts/Spells/Base/Spell.cs @@ -438,7 +438,7 @@ namespace Server.Spells OnDisturb( type, false ); - Targeting.Target.Cancel( m_Caster ); + Target.Cancel( m_Caster ); if ( Core.AOS && m_Caster.Player && type == DisturbType.Hurt ) DoHurtFizzle(); @@ -529,7 +529,7 @@ namespace Server.Spells SayMantra(); - TimeSpan castDelay = this.GetCastDelay(); + TimeSpan castDelay = GetCastDelay(); if ( ShowHandMovement && ( m_Caster.Body.IsHuman || ( m_Caster.Player && m_Caster.Body.IsMonster ) ) ) { @@ -612,7 +612,7 @@ namespace Server.Spells { double scalar = 1.0; - if ( !Necromancy.MindRotSpell.GetMindRotScalar( Caster, ref scalar ) ) + if ( !MindRotSpell.GetMindRotScalar( Caster, ref scalar ) ) scalar = 1.0; // Lower Mana Cost = 40% diff --git a/Scripts/Spells/Base/SpellHelper.cs b/Scripts/Spells/Base/SpellHelper.cs index 72af63c5c..2cb13bfc5 100644 --- a/Scripts/Spells/Base/SpellHelper.cs +++ b/Scripts/Spells/Base/SpellHelper.cs @@ -475,7 +475,7 @@ namespace Server.Spells Point3D p = new Point3D( caster ); - if ( SpellHelper.FindValidSpawnLocation( map, ref p, true ) ) + if ( FindValidSpawnLocation( map, ref p, true ) ) { BaseCreature.Summon( creature, caster, p, sound, duration ); return; @@ -631,7 +631,7 @@ namespace Server.Spells return false; } - if ( caster != null && caster.AccessLevel == AccessLevel.Player && caster.Region.IsPartOf( typeof( Regions.Jail ) ) ) + if ( caster != null && caster.AccessLevel == AccessLevel.Player && caster.Region.IsPartOf( typeof( Jail ) ) ) { caster.SendLocalizedMessage( 1114345 ); // You'll need a better jailbreak plan than that! return false; @@ -1351,7 +1351,7 @@ namespace Server.Spells if ( !((Body)transformSpell.Body).IsHuman ) { - Mobiles.IMount mt = caster.Mount; + IMount mt = caster.Mount; if ( mt != null ) mt.Rider = null; diff --git a/Scripts/Spells/Chivalry/CloseWounds.cs b/Scripts/Spells/Chivalry/CloseWounds.cs index 3b3e8d2f4..08e0e1618 100644 --- a/Scripts/Spells/Chivalry/CloseWounds.cs +++ b/Scripts/Spells/Chivalry/CloseWounds.cs @@ -58,7 +58,7 @@ namespace Server.Spells.Chivalry { Caster.SendLocalizedMessage( 500955 ); // That being is not damaged! } - else if ( m.Poisoned || Server.Items.MortalStrike.IsWounded( m ) ) + else if ( m.Poisoned || Items.MortalStrike.IsWounded( m ) ) { Caster.LocalOverheadMessage( MessageType.Regular, 0x3B2, (Caster == m) ? 1005000 : 1010398 ); } diff --git a/Scripts/Spells/Chivalry/PaladinSpell.cs b/Scripts/Spells/Chivalry/PaladinSpell.cs index f17432cc1..283381a12 100644 --- a/Scripts/Spells/Chivalry/PaladinSpell.cs +++ b/Scripts/Spells/Chivalry/PaladinSpell.cs @@ -46,7 +46,7 @@ namespace Server.Spells.Chivalry public override bool CheckFizzle() { - int requiredTithing = this.RequiredTithing; + int requiredTithing = RequiredTithing; if ( AosAttributes.GetValue( Caster, AosAttribute.LowerRegCost ) > Utility.Random( 100 ) ) requiredTithing = 0; diff --git a/Scripts/Spells/Chivalry/SacredJourney.cs b/Scripts/Spells/Chivalry/SacredJourney.cs index 096decbaf..704c8020d 100644 --- a/Scripts/Spells/Chivalry/SacredJourney.cs +++ b/Scripts/Spells/Chivalry/SacredJourney.cs @@ -64,7 +64,7 @@ namespace Server.Spells.Chivalry Caster.SendLocalizedMessage( 1061282 ); // You cannot use the Sacred Journey ability to flee from combat. return false; } - else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) ) + else if ( Misc.WeightOverloading.IsOverloaded( Caster ) ) { Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move. return false; @@ -105,7 +105,7 @@ namespace Server.Spells.Chivalry { Caster.SendLocalizedMessage( 1061282 ); // You cannot use the Sacred Journey ability to flee from combat. } - else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) ) + else if ( Misc.WeightOverloading.IsOverloaded( Caster ) ) { Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move. } diff --git a/Scripts/Spells/Fifth/MindBlast.cs b/Scripts/Spells/Fifth/MindBlast.cs index 63d51b3e6..3c57846a1 100644 --- a/Scripts/Spells/Fifth/MindBlast.cs +++ b/Scripts/Spells/Fifth/MindBlast.cs @@ -61,7 +61,7 @@ namespace Server.Spells.Fifth SpellHelper.Turn( from, target ); - SpellHelper.CheckReflect( (int)this.Circle, ref from, ref target ); + SpellHelper.CheckReflect( (int)Circle, ref from, ref target ); int damage = (int)((Caster.Skills[SkillName.Magery].Value + Caster.Int) / 5); @@ -79,7 +79,7 @@ namespace Server.Spells.Fifth SpellHelper.Turn( from, target ); - SpellHelper.CheckReflect( (int)this.Circle, ref from, ref target ); + SpellHelper.CheckReflect( (int)Circle, ref from, ref target ); // Algorithm: (highestStat - lowestStat) / 2 [- 50% if resisted] diff --git a/Scripts/Spells/Fifth/Paralyze.cs b/Scripts/Spells/Fifth/Paralyze.cs index 1de825528..7029928af 100644 --- a/Scripts/Spells/Fifth/Paralyze.cs +++ b/Scripts/Spells/Fifth/Paralyze.cs @@ -41,7 +41,7 @@ namespace Server.Spells.Fifth { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); double duration; diff --git a/Scripts/Spells/First/Clumsy.cs b/Scripts/Spells/First/Clumsy.cs index 03a045b5a..ec4173fef 100644 --- a/Scripts/Spells/First/Clumsy.cs +++ b/Scripts/Spells/First/Clumsy.cs @@ -34,7 +34,7 @@ namespace Server.Spells.First { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); SpellHelper.AddStatCurse( Caster, m, StatType.Dex ); diff --git a/Scripts/Spells/First/Feeblemind.cs b/Scripts/Spells/First/Feeblemind.cs index 45d3971aa..8f90c4f86 100644 --- a/Scripts/Spells/First/Feeblemind.cs +++ b/Scripts/Spells/First/Feeblemind.cs @@ -34,7 +34,7 @@ namespace Server.Spells.First { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); SpellHelper.AddStatCurse( Caster, m, StatType.Int ); diff --git a/Scripts/Spells/First/Heal.cs b/Scripts/Spells/First/Heal.cs index 139c56d73..d9992f9b4 100644 --- a/Scripts/Spells/First/Heal.cs +++ b/Scripts/Spells/First/Heal.cs @@ -55,7 +55,7 @@ namespace Server.Spells.First { Caster.LocalOverheadMessage( MessageType.Regular, 0x3B2, 500951 ); // You cannot heal that. } - else if ( m.Poisoned || Server.Items.MortalStrike.IsWounded( m ) ) + else if ( m.Poisoned || Items.MortalStrike.IsWounded( m ) ) { Caster.LocalOverheadMessage( MessageType.Regular, 0x22, (Caster == m) ? 1005000 : 1010398 ); } diff --git a/Scripts/Spells/First/MagicArrow.cs b/Scripts/Spells/First/MagicArrow.cs index 00573af7c..83f7c8b81 100644 --- a/Scripts/Spells/First/MagicArrow.cs +++ b/Scripts/Spells/First/MagicArrow.cs @@ -38,7 +38,7 @@ namespace Server.Spells.First SpellHelper.Turn( source, m ); - SpellHelper.CheckReflect( (int)this.Circle, ref source, ref m ); + SpellHelper.CheckReflect( (int)Circle, ref source, ref m ); double damage; diff --git a/Scripts/Spells/First/Weaken.cs b/Scripts/Spells/First/Weaken.cs index c83004dce..19983fd08 100644 --- a/Scripts/Spells/First/Weaken.cs +++ b/Scripts/Spells/First/Weaken.cs @@ -34,7 +34,7 @@ namespace Server.Spells.First { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); SpellHelper.AddStatCurse( Caster, m, StatType.Str ); diff --git a/Scripts/Spells/Fourth/ArchProtection.cs b/Scripts/Spells/Fourth/ArchProtection.cs index f9e3b522e..56aca7738 100644 --- a/Scripts/Spells/Fourth/ArchProtection.cs +++ b/Scripts/Spells/Fourth/ArchProtection.cs @@ -68,7 +68,7 @@ namespace Server.Spells.Fourth if ( m == Caster || ( party != null && party.Contains( m ) ) ) { Caster.DoBeneficial( m ); - Spells.Second.ProtectionSpell.Toggle( Caster, m ); + Second.ProtectionSpell.Toggle( Caster, m ); } } } @@ -139,7 +139,7 @@ namespace Server.Spells.Fourth protected override void OnTick() { - ArchProtectionSpell.RemoveEntry( m_Owner ); + RemoveEntry( m_Owner ); } } diff --git a/Scripts/Spells/Fourth/Curse.cs b/Scripts/Spells/Fourth/Curse.cs index bba04e153..abc64ebac 100644 --- a/Scripts/Spells/Fourth/Curse.cs +++ b/Scripts/Spells/Fourth/Curse.cs @@ -52,7 +52,7 @@ namespace Server.Spells.Fourth { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); SpellHelper.AddStatCurse( Caster, m, StatType.Str ); SpellHelper.DisableSkillCheck = true; SpellHelper.AddStatCurse( Caster, m, StatType.Dex ); diff --git a/Scripts/Spells/Fourth/GreaterHeal.cs b/Scripts/Spells/Fourth/GreaterHeal.cs index 96b931116..e31d26044 100644 --- a/Scripts/Spells/Fourth/GreaterHeal.cs +++ b/Scripts/Spells/Fourth/GreaterHeal.cs @@ -56,7 +56,7 @@ namespace Server.Spells.Fourth { Caster.LocalOverheadMessage( MessageType.Regular, 0x3B2, 500951 ); // You cannot heal that. } - else if ( m.Poisoned || Server.Items.MortalStrike.IsWounded( m ) ) + else if ( m.Poisoned || Items.MortalStrike.IsWounded( m ) ) { Caster.LocalOverheadMessage( MessageType.Regular, 0x22, (Caster == m) ? 1005000 : 1010398 ); } diff --git a/Scripts/Spells/Fourth/Lightning.cs b/Scripts/Spells/Fourth/Lightning.cs index 6f6eb2b9a..d92773e68 100644 --- a/Scripts/Spells/Fourth/Lightning.cs +++ b/Scripts/Spells/Fourth/Lightning.cs @@ -35,7 +35,7 @@ namespace Server.Spells.Fourth { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); double damage; diff --git a/Scripts/Spells/Fourth/ManaDrain.cs b/Scripts/Spells/Fourth/ManaDrain.cs index 30d68f331..5eba78d55 100644 --- a/Scripts/Spells/Fourth/ManaDrain.cs +++ b/Scripts/Spells/Fourth/ManaDrain.cs @@ -56,7 +56,7 @@ namespace Server.Spells.Fourth { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); if ( m.Spell != null ) m.Spell.OnCasterHurt(); diff --git a/Scripts/Spells/Fourth/Recall.cs b/Scripts/Spells/Fourth/Recall.cs index ea3d79ceb..abcee9ed5 100644 --- a/Scripts/Spells/Fourth/Recall.cs +++ b/Scripts/Spells/Fourth/Recall.cs @@ -68,7 +68,7 @@ namespace Server.Spells.Fourth Caster.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle?? return false; } - else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) ) + else if ( Misc.WeightOverloading.IsOverloaded( Caster ) ) { Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move. return false; @@ -109,7 +109,7 @@ namespace Server.Spells.Fourth { Caster.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle?? } - else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) ) + else if ( Misc.WeightOverloading.IsOverloaded( Caster ) ) { Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move. } diff --git a/Scripts/Spells/Gargoyle/SpellDefinitions/FlySpell.cs b/Scripts/Spells/Gargoyle/SpellDefinitions/FlySpell.cs index 7f0111694..df9a3f9f6 100644 --- a/Scripts/Spells/Gargoyle/SpellDefinitions/FlySpell.cs +++ b/Scripts/Spells/Gargoyle/SpellDefinitions/FlySpell.cs @@ -41,8 +41,8 @@ namespace Server.Spells public void Stop() { - this.m_Stop = true; - this.Disturb(DisturbType.Hurt, false, false); + m_Stop = true; + Disturb(DisturbType.Hurt, false, false); } public override bool CheckDisturb(DisturbType type, bool checkFirst, bool resistable) @@ -63,19 +63,19 @@ namespace Server.Spells public override void OnDisturb(DisturbType type, bool message) { - if (message && !this.m_Stop) - this.Caster.SendLocalizedMessage(1113192); // You have been disrupted while attempting to fly! + if (message && !m_Stop) + Caster.SendLocalizedMessage(1113192); // You have been disrupted while attempting to fly! } public override void OnCast() { - this.Caster.Flying = false; - BuffInfo.RemoveBuff(this.Caster, BuffIcon.Fly); - this.Caster.Animate(60, 10, 1, true, false, 0); - this.Caster.SendLocalizedMessage(1112567); // You are flying. - this.Caster.Flying = true; - BuffInfo.AddBuff(this.Caster, new BuffInfo(BuffIcon.Fly, 1112567)); - this.FinishSequence(); + Caster.Flying = false; + BuffInfo.RemoveBuff(Caster, BuffIcon.Fly); + Caster.Animate(60, 10, 1, true, false, 0); + Caster.SendLocalizedMessage(1112567); // You are flying. + Caster.Flying = true; + BuffInfo.AddBuff(Caster, new BuffInfo(BuffIcon.Fly, 1112567)); + FinishSequence(); } } } \ No newline at end of file diff --git a/Scripts/Spells/Ninjitsu/AnimalForm.cs b/Scripts/Spells/Ninjitsu/AnimalForm.cs index 5638d6146..242272c14 100644 --- a/Scripts/Spells/Ninjitsu/AnimalForm.cs +++ b/Scripts/Spells/Ninjitsu/AnimalForm.cs @@ -18,7 +18,7 @@ namespace Server.Spells.Ninjitsu public static void OnLogin(LoginEventArgs e) { - AnimalFormContext context = AnimalForm.GetContext(e.Mobile); + AnimalFormContext context = GetContext(e.Mobile); if (context != null && context.SpeedBoost) e.Mobile.Send(SpeedControl.MountSpeed); @@ -483,7 +483,7 @@ namespace Server.Spells.Ninjitsu { } #endregion - else if (AnimalForm.Morph(m_Caster, entryID) == MorphResult.Fail) + else if (Morph(m_Caster, entryID) == MorphResult.Fail) { m_Caster.LocalOverheadMessage( MessageType.Regular, 0x3B2, 502632 ); // The spell fizzles. m_Caster.FixedParticles( 0x3735, 1, 30, 9503, EffectLayer.Waist ); @@ -585,7 +585,7 @@ namespace Server.Spells.Ninjitsu m_Mobile.Freeze(TimeSpan.FromSeconds(1)); m_Mobile.PlaySound(0x16A); - Timer.DelayCall(TimeSpan.FromSeconds(1.3), new TimerStateCallback(BreathEffect_Callback), m_LastTarget); + DelayCall(TimeSpan.FromSeconds(1.3), new TimerStateCallback(BreathEffect_Callback), m_LastTarget); } m_Counter = Math.Min((int)m_Mobile.GetDistanceToSqrt(m_LastTarget), 10); @@ -602,7 +602,7 @@ namespace Server.Spells.Ninjitsu m_Mobile.PlaySound(0x227); Effects.SendMovingEffect(m_Mobile, target, 0x36D4, 5, 0, false, false, 0, 0); - Timer.DelayCall(TimeSpan.FromSeconds(1), new TimerStateCallback(BreathDamage_Callback), target); + DelayCall(TimeSpan.FromSeconds(1), new TimerStateCallback(BreathDamage_Callback), target); } } diff --git a/Scripts/Spells/Ninjitsu/ShadowJump.cs b/Scripts/Spells/Ninjitsu/ShadowJump.cs index dbd86d926..d6432868c 100644 --- a/Scripts/Spells/Ninjitsu/ShadowJump.cs +++ b/Scripts/Spells/Ninjitsu/ShadowJump.cs @@ -68,7 +68,7 @@ namespace Server.Spells.Ninjitsu { Caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil. } - else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) ) + else if ( Misc.WeightOverloading.IsOverloaded( Caster ) ) { Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move. } @@ -100,7 +100,7 @@ namespace Server.Spells.Ninjitsu m.PlaySound( 0x512 ); - Server.SkillHandlers.Stealth.OnUse( m ); // stealth check after the a jump + SkillHandlers.Stealth.OnUse( m ); // stealth check after the a jump } FinishSequence(); diff --git a/Scripts/Spells/Second/Harm.cs b/Scripts/Spells/Second/Harm.cs index d90018a08..9708c5616 100644 --- a/Scripts/Spells/Second/Harm.cs +++ b/Scripts/Spells/Second/Harm.cs @@ -42,7 +42,7 @@ namespace Server.Spells.Second { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); double damage; diff --git a/Scripts/Spells/Second/Protection.cs b/Scripts/Spells/Second/Protection.cs index 5b0ca63b4..ad17660a5 100644 --- a/Scripts/Spells/Second/Protection.cs +++ b/Scripts/Spells/Second/Protection.cs @@ -176,7 +176,7 @@ namespace Server.Spells.Second protected override void OnTick() { - ProtectionSpell.Registry.Remove( m_Caster ); + Registry.Remove( m_Caster ); DefensiveSpell.Nullify( m_Caster ); } } diff --git a/Scripts/Spells/Seventh/FlameStrike.cs b/Scripts/Spells/Seventh/FlameStrike.cs index ad4857d55..c448c8bcd 100644 --- a/Scripts/Spells/Seventh/FlameStrike.cs +++ b/Scripts/Spells/Seventh/FlameStrike.cs @@ -35,7 +35,7 @@ namespace Server.Spells.Seventh { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); double damage; diff --git a/Scripts/Spells/Seventh/ManaVampire.cs b/Scripts/Spells/Seventh/ManaVampire.cs index f0a6ce950..9ce3e8891 100644 --- a/Scripts/Spells/Seventh/ManaVampire.cs +++ b/Scripts/Spells/Seventh/ManaVampire.cs @@ -35,7 +35,7 @@ namespace Server.Spells.Seventh { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); if ( m.Spell != null ) m.Spell.OnCasterHurt(); diff --git a/Scripts/Spells/Sixth/EnergyBolt.cs b/Scripts/Spells/Sixth/EnergyBolt.cs index f19e63a2f..2bffc94b1 100644 --- a/Scripts/Spells/Sixth/EnergyBolt.cs +++ b/Scripts/Spells/Sixth/EnergyBolt.cs @@ -37,7 +37,7 @@ namespace Server.Spells.Sixth SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, ref source, ref m ); + SpellHelper.CheckReflect( (int)Circle, ref source, ref m ); double damage; diff --git a/Scripts/Spells/Sixth/Explosion.cs b/Scripts/Spells/Sixth/Explosion.cs index 3551ccd66..f1f79834a 100644 --- a/Scripts/Spells/Sixth/Explosion.cs +++ b/Scripts/Spells/Sixth/Explosion.cs @@ -41,7 +41,7 @@ namespace Server.Spells.Sixth SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int) this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int) Circle, Caster, ref m ); InternalTimer t = new InternalTimer( this, attacker, defender, m ); t.Start(); diff --git a/Scripts/Spells/Spellweaving/AttuneWeapon.cs b/Scripts/Spells/Spellweaving/AttuneWeapon.cs index b206bd24c..872586199 100644 --- a/Scripts/Spells/Spellweaving/AttuneWeapon.cs +++ b/Scripts/Spells/Spellweaving/AttuneWeapon.cs @@ -124,7 +124,7 @@ namespace Server.Spells.Spellweaving m_Table.Remove( m_Mobile ); - Timer.DelayCall( TimeSpan.FromSeconds( 120 ), delegate { m_Mobile.EndAction( typeof( AttuneWeaponSpell ) ); } ); + DelayCall( TimeSpan.FromSeconds( 120 ), delegate { m_Mobile.EndAction( typeof( AttuneWeaponSpell ) ); } ); BuffInfo.RemoveBuff( m_Mobile, BuffIcon.AttuneWeapon ); } } diff --git a/Scripts/Spells/Spellweaving/Items/TransientItem.cs b/Scripts/Spells/Spellweaving/Items/TransientItem.cs index 46c42ef11..a2614fbe5 100644 --- a/Scripts/Spells/Spellweaving/Items/TransientItem.cs +++ b/Scripts/Spells/Spellweaving/Items/TransientItem.cs @@ -30,7 +30,7 @@ namespace Server.Items if ( InvalidTransferMessage != null ) TextDefinition.SendMessageTo( from, InvalidTransferMessage ); - this.Delete(); + Delete(); } public virtual TextDefinition InvalidTransferMessage => null; @@ -39,16 +39,16 @@ namespace Server.Items public virtual void Expire( Mobile parent ) { if ( parent != null ) - parent.SendLocalizedMessage( 1072515, (this.Name == null ? String.Format( "#{0}", LabelNumber ): this.Name) ); // The ~1_name~ expired... + parent.SendLocalizedMessage( 1072515, (Name == null ? String.Format( "#{0}", LabelNumber ): Name) ); // The ~1_name~ expired... Effects.PlaySound( GetWorldLocation(), Map, 0x201 ); - this.Delete(); + Delete(); } public virtual void SendTimeRemainingMessage( Mobile to ) { - to.SendLocalizedMessage( 1072516, String.Format( "{0}\t{1}", (this.Name == null ? String.Format( "#{0}", LabelNumber ): this.Name), (int)m_LifeSpan.TotalSeconds ) ); // ~1_name~ will expire in ~2_val~ seconds! + to.SendLocalizedMessage( 1072516, String.Format( "{0}\t{1}", (Name == null ? String.Format( "#{0}", LabelNumber ): Name), (int)m_LifeSpan.TotalSeconds ) ); // ~1_name~ will expire in ~2_val~ seconds! } public override void OnDelete() diff --git a/Scripts/Spells/Third/Fireball.cs b/Scripts/Spells/Third/Fireball.cs index b66678a21..75cd90a5b 100644 --- a/Scripts/Spells/Third/Fireball.cs +++ b/Scripts/Spells/Third/Fireball.cs @@ -36,7 +36,7 @@ namespace Server.Spells.Third SpellHelper.Turn( source, m ); - SpellHelper.CheckReflect( (int)this.Circle, ref source, ref m ); + SpellHelper.CheckReflect( (int)Circle, ref source, ref m ); double damage; diff --git a/Scripts/Spells/Third/Poison.cs b/Scripts/Spells/Third/Poison.cs index 33843c292..7e1e5dc02 100644 --- a/Scripts/Spells/Third/Poison.cs +++ b/Scripts/Spells/Third/Poison.cs @@ -32,7 +32,7 @@ namespace Server.Spells.Third { SpellHelper.Turn( Caster, m ); - SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); + SpellHelper.CheckReflect( (int)Circle, Caster, ref m ); if ( m.Spell != null ) m.Spell.OnCasterHurt(); diff --git a/Scripts/Spells/Third/Teleport.cs b/Scripts/Spells/Third/Teleport.cs index 10aa389fa..7ed087259 100644 --- a/Scripts/Spells/Third/Teleport.cs +++ b/Scripts/Spells/Third/Teleport.cs @@ -27,7 +27,7 @@ namespace Server.Spells.Third Caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil. return false; } - else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) ) + else if ( Misc.WeightOverloading.IsOverloaded( Caster ) ) { Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move. return false; @@ -55,7 +55,7 @@ namespace Server.Spells.Third { Caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil. } - else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) ) + else if ( Misc.WeightOverloading.IsOverloaded( Caster ) ) { Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move. } @@ -102,7 +102,7 @@ namespace Server.Spells.Third foreach ( Item item in eable ) { - if ( item is Server.Spells.Sixth.ParalyzeFieldSpell.InternalItem || item is Server.Spells.Fifth.PoisonFieldSpell.InternalItem || item is Server.Spells.Fourth.FireFieldSpell.FireFieldItem ) + if ( item is Sixth.ParalyzeFieldSpell.InternalItem || item is Fifth.PoisonFieldSpell.InternalItem || item is Fourth.FireFieldSpell.FireFieldItem ) item.OnMoveOver( m ); } diff --git a/Server/ClientVersion.cs b/Server/ClientVersion.cs index e3028c384..b26f60e17 100644 --- a/Server/ClientVersion.cs +++ b/Server/ClientVersion.cs @@ -233,7 +233,7 @@ namespace Server public static bool IsNull( object x ) { - return Object.ReferenceEquals( x, null ); + return ReferenceEquals( x, null ); } public int Compare( object x, object y ) diff --git a/Server/Diagnostics/PacketProfile.cs b/Server/Diagnostics/PacketProfile.cs index 2c5a805f2..848fc6000 100644 --- a/Server/Diagnostics/PacketProfile.cs +++ b/Server/Diagnostics/PacketProfile.cs @@ -30,7 +30,7 @@ namespace Server.Diagnostics { public long TotalLength => _totalLength; - public double AverageLength => ( double ) _totalLength / Math.Max( 1, this.Count ); + public double AverageLength => ( double ) _totalLength / Math.Max( 1, Count ); protected BasePacketProfile(string name) : base( name ) { diff --git a/Server/Geometry.cs b/Server/Geometry.cs index df5a383e1..f277fba51 100644 --- a/Server/Geometry.cs +++ b/Server/Geometry.cs @@ -87,7 +87,7 @@ namespace Server public int CompareTo( object other ) { if ( other is Point2D d ) - return this.CompareTo( d ); + return CompareTo( d ); if ( other == null ) return -1; @@ -120,7 +120,7 @@ namespace Server public static bool operator == ( Point2D l, IPoint2D r ) { - if ( Object.ReferenceEquals( r, null ) ) + if ( ReferenceEquals( r, null ) ) return false; return l.m_X == r.X && l.m_Y == r.Y; @@ -128,7 +128,7 @@ namespace Server public static bool operator != ( Point2D l, IPoint2D r ) { - if ( Object.ReferenceEquals( r, null ) ) + if ( ReferenceEquals( r, null ) ) return false; return l.m_X !=r.X || l.m_Y != r.Y; @@ -146,7 +146,7 @@ namespace Server public static bool operator > ( Point2D l, IPoint2D r ) { - if ( Object.ReferenceEquals( r, null ) ) + if ( ReferenceEquals( r, null ) ) return false; return l.m_X > r.X && l.m_Y > r.Y; @@ -164,7 +164,7 @@ namespace Server public static bool operator < ( Point2D l, IPoint2D r ) { - if ( Object.ReferenceEquals( r, null ) ) + if ( ReferenceEquals( r, null ) ) return false; return l.m_X < r.X && l.m_Y < r.Y; @@ -182,7 +182,7 @@ namespace Server public static bool operator >= ( Point2D l, IPoint2D r ) { - if ( Object.ReferenceEquals( r, null ) ) + if ( ReferenceEquals( r, null ) ) return false; return l.m_X >= r.X && l.m_Y >= r.Y; @@ -200,7 +200,7 @@ namespace Server public static bool operator <= ( Point2D l, IPoint2D r ) { - if ( Object.ReferenceEquals( r, null ) ) + if ( ReferenceEquals( r, null ) ) return false; return l.m_X <= r.X && l.m_Y <= r.Y; @@ -306,7 +306,7 @@ namespace Server public static bool operator ==( Point3D l, IPoint3D r ) { - if ( Object.ReferenceEquals( r, null ) ) + if ( ReferenceEquals( r, null ) ) return false; return l.m_X == r.X && l.m_Y == r.Y && l.m_Z == r.Z; @@ -314,7 +314,7 @@ namespace Server public static bool operator !=( Point3D l, IPoint3D r ) { - if ( Object.ReferenceEquals( r, null ) ) + if ( ReferenceEquals( r, null ) ) return false; return l.m_X != r.X || l.m_Y != r.Y || l.m_Z != r.Z; @@ -338,7 +338,7 @@ namespace Server public int CompareTo( object other ) { if ( other is Point3D d ) - return this.CompareTo( d ); + return CompareTo( d ); if ( other == null ) return -1; diff --git a/Server/Gumps/Gump.cs b/Server/Gumps/Gump.cs index db1813b87..39bc5cae4 100644 --- a/Server/Gumps/Gump.cs +++ b/Server/Gumps/Gump.cs @@ -58,7 +58,7 @@ namespace Server.Gumps m_X = x; m_Y = y; - m_TypeID = GetTypeID( this.GetType() ); + m_TypeID = GetTypeID( GetType() ); m_Entries = new List(); m_Strings = new List(); diff --git a/Server/IEntity.cs b/Server/IEntity.cs index 11610ce7a..27a00199e 100644 --- a/Server/IEntity.cs +++ b/Server/IEntity.cs @@ -46,13 +46,13 @@ namespace Server public int CompareTo( Entity other ) { - return this.CompareTo( (IEntity) other ); + return CompareTo( (IEntity) other ); } public int CompareTo( object other ) { if ( other == null || other is IEntity ) - return this.CompareTo( (IEntity) other ); + return CompareTo( (IEntity) other ); throw new ArgumentException(); } diff --git a/Server/Item.cs b/Server/Item.cs index 75d55c541..506f1dbd6 100644 --- a/Server/Item.cs +++ b/Server/Item.cs @@ -572,13 +572,13 @@ namespace Server public int CompareTo( Item other ) { - return this.CompareTo( (IEntity) other ); + return CompareTo( (IEntity) other ); } public int CompareTo( object other ) { if ( other == null || other is IEntity ) - return this.CompareTo( (IEntity) other ); + return CompareTo( (IEntity) other ); throw new ArgumentException(); } @@ -927,7 +927,7 @@ namespace Server /// public virtual void AddNameProperty( ObjectPropertyList list ) { - string name = this.Name; + string name = Name; if ( name == null ) { @@ -1011,7 +1011,7 @@ namespace Server /// public virtual void AddWeightProperty( ObjectPropertyList list ) { - int weight = this.PileWeight + this.TotalWeight; + int weight = PileWeight + TotalWeight; if ( weight == 1 ) { list.Add( 1072788, weight.ToString() ); //Weight: ~1_WEIGHT~ stone @@ -1032,7 +1032,7 @@ namespace Server else if ( IsLockedDown ) AddLockedDownProperty( list ); - Mobile blessedFor = this.BlessedFor; + Mobile blessedFor = BlessedFor; if ( blessedFor != null && !blessedFor.Deleted ) AddBlessedForProperty( list, blessedFor ); @@ -1126,7 +1126,7 @@ namespace Server m_Parent = null; - BounceInfo bounce = this.GetBounce(); + BounceInfo bounce = GetBounce(); if ( bounce != null ) { @@ -1342,7 +1342,7 @@ namespace Server Mobile m = state.Mobile; if ( m.InRange( oldLocation, GetUpdateRange( m ) ) ) { - state.Send( this.RemovePacket ); + state.Send( RemovePacket ); } } @@ -1351,7 +1351,7 @@ namespace Server } m_Location = location; - this.OnLocationChange( oldRealLocation ); + OnLocationChange( oldRealLocation ); ReleaseWorldPackets(); @@ -1399,7 +1399,7 @@ namespace Server Mobile m = state.Mobile; if ( !m.InRange( location, GetUpdateRange( m ) ) ) { - state.Send( this.RemovePacket ); + state.Send( RemovePacket ); } } @@ -1409,7 +1409,7 @@ namespace Server Point3D oldInternalLocation = m_Location; m_Location = location; - this.OnLocationChange( oldRealLocation ); + OnLocationChange( oldRealLocation ); ReleaseWorldPackets(); @@ -1805,7 +1805,7 @@ namespace Server Mobile m = state.Mobile; if ( !m.CanSee( this ) && m.InRange( worldLoc, GetUpdateRange( m ) ) ) { - state.Send( this.RemovePacket ); + state.Send( RemovePacket ); } } @@ -1911,7 +1911,7 @@ namespace Server Delta( ItemDelta.Update ); - this.OnMapChange(); + OnMapChange(); if ( old == null || old == Map.Internal ) InvalidateProperties(); @@ -2166,7 +2166,7 @@ namespace Server Map map = m_Map; if ( map == null ) - return Server.Map.NullEnumerable.Instance; + return Map.NullEnumerable.Instance; if ( m_Parent == null ) return map.GetObjectsInRange( m_Location, range ); @@ -2179,7 +2179,7 @@ namespace Server Map map = m_Map; if ( map == null ) - return Server.Map.NullEnumerable.Instance; + return Map.NullEnumerable.Instance; if ( m_Parent == null ) return map.GetItemsInRange( m_Location, range ); @@ -2192,7 +2192,7 @@ namespace Server Map map = m_Map; if ( map == null ) - return Server.Map.NullEnumerable.Instance; + return Map.NullEnumerable.Instance; if ( m_Parent == null ) return map.GetMobilesInRange( m_Location, range ); @@ -2205,7 +2205,7 @@ namespace Server Map map = m_Map; if ( map == null ) - return Server.Map.NullEnumerable.Instance; + return Map.NullEnumerable.Instance; if ( m_Parent == null ) return map.GetClientsInRange( m_Location, range ); @@ -2367,7 +2367,7 @@ namespace Server { string name = reader.ReadString(); - if ( name != this.DefaultName ) + if ( name != DefaultName ) AcquireCompactInfo().m_Name = name; } @@ -2487,7 +2487,7 @@ namespace Server { string name = reader.ReadString(); - if ( name != this.DefaultName ) + if ( name != DefaultName ) AcquireCompactInfo().m_Name = name; } @@ -2583,7 +2583,7 @@ namespace Server string name = reader.ReadString(); - if ( name != this.DefaultName ) + if ( name != DefaultName ) AcquireCompactInfo().m_Name = name; Serial parent = reader.ReadInt(); @@ -2646,7 +2646,7 @@ namespace Server } } - if ( this.HeldBy != null ) + if ( HeldBy != null ) Timer.DelayCall( TimeSpan.Zero, new TimerCallback( FixHolding_Sandbox ) ); //if ( version < 9 ) @@ -2655,11 +2655,11 @@ namespace Server private void FixHolding_Sandbox() { - Mobile heldBy = this.HeldBy; + Mobile heldBy = HeldBy; if ( heldBy != null ) { - if ( this.GetBounce() != null ) + if ( GetBounce() != null ) { Bounce( heldBy ); } @@ -2696,11 +2696,11 @@ namespace Server protected virtual Packet GetWorldPacketFor( NetState state ) { if ( state.HighSeas ) - return this.WorldPacketHS; + return WorldPacketHS; else if ( state.StygianAbyss ) - return this.WorldPacketSA; + return WorldPacketSA; else - return this.WorldPacket; + return WorldPacket; } public virtual bool IsVirtualItem => false; @@ -2775,22 +2775,22 @@ namespace Server if ( info != null && info.m_Weight != -1 ) return info.m_Weight; - return this.DefaultWeight; + return DefaultWeight; } set { - if ( this.Weight != value ) + if ( Weight != value ) { CompactInfo info = AcquireCompactInfo(); - int oldPileWeight = this.PileWeight; + int oldPileWeight = PileWeight; info.m_Weight = value; if ( info.m_Weight == -1 ) VerifyCompactInfo(); - int newPileWeight = this.PileWeight; + int newPileWeight = PileWeight; UpdateTotal( this, TotalType.Weight, newPileWeight - oldPileWeight ); @@ -2800,7 +2800,7 @@ namespace Server } [CommandProperty( AccessLevel.Counselor, AccessLevel.GameMaster )] - public int PileWeight => (int)Math.Ceiling( this.Weight * this.Amount ); + public int PileWeight => (int)Math.Ceiling( Weight * Amount ); public virtual int HuedItemID => m_ItemID; @@ -2915,14 +2915,14 @@ namespace Server if ( item == this ) { - Console.WriteLine( "Warning: Adding item to itself: [0x{0:X} {1}].AddItem( [0x{2:X} {3}] )", this.Serial.Value, this.GetType().Name, item.Serial.Value, item.GetType().Name ); + Console.WriteLine( "Warning: Adding item to itself: [0x{0:X} {1}].AddItem( [0x{2:X} {3}] )", Serial.Value, GetType().Name, item.Serial.Value, item.GetType().Name ); Console.WriteLine( new System.Diagnostics.StackTrace() ); return; } if ( IsChildOf( item ) ) { - Console.WriteLine( "Warning: Adding parent item to child: [0x{0:X} {1}].AddItem( [0x{2:X} {3}] )", this.Serial.Value, this.GetType().Name, item.Serial.Value, item.GetType().Name ); + Console.WriteLine( "Warning: Adding parent item to child: [0x{0:X} {1}].AddItem( [0x{2:X} {3}] )", Serial.Value, GetType().Name, item.Serial.Value, item.GetType().Name ); Console.WriteLine( new System.Diagnostics.StackTrace() ); return; } @@ -3060,7 +3060,7 @@ namespace Server } } - SecureTradeContainer stc = this.GetSecureTradeCont(); + SecureTradeContainer stc = GetSecureTradeCont(); SecureTrade st = stc?.Trade; @@ -3253,16 +3253,16 @@ namespace Server public virtual void OnDelete() { - if (this.Spawner != null) + if (Spawner != null) { - this.Spawner.Remove(this); - this.Spawner = null; + Spawner.Remove(this); + Spawner = null; } } public virtual void OnParentDeleted( IEntity parent ) { - this.Delete(); + Delete(); } public virtual void FreeCache() @@ -3337,9 +3337,9 @@ namespace Server if ( p == null ) { if ( ascii ) - p = new AsciiMessage( m_Serial, m_ItemID, type, hue, 3, this.Name, text ); + p = new AsciiMessage( m_Serial, m_ItemID, type, hue, 3, Name, text ); else - p = new UnicodeMessage( m_Serial, m_ItemID, type, hue, 3, "ENU", this.Name, text ); + p = new UnicodeMessage( m_Serial, m_ItemID, type, hue, 3, "ENU", Name, text ); p.Acquire(); } @@ -3375,7 +3375,7 @@ namespace Server if ( m.CanSee( this ) && m.InRange( worldLoc, GetUpdateRange( m ) ) ) { if ( p == null ) - p = Packet.Acquire( new MessageLocalized( m_Serial, m_ItemID, type, hue, 3, number, this.Name, args ) ); + p = Packet.Acquire( new MessageLocalized( m_Serial, m_ItemID, type, hue, 3, number, Name, args ) ); state.Send( p ); } @@ -3495,7 +3495,7 @@ namespace Server Mobile m = state.Mobile; if ( !m.InRange( value, GetUpdateRange( m ) ) ) { - state.Send( this.RemovePacket ); + state.Send( RemovePacket ); } } @@ -3543,7 +3543,7 @@ namespace Server ReleaseWorldPackets(); } - this.OnLocationChange( oldLocation ); + OnLocationChange( oldLocation ); } } } @@ -3578,12 +3578,12 @@ namespace Server { if ( m_ItemID != value ) { - int oldPileWeight = this.PileWeight; + int oldPileWeight = PileWeight; m_ItemID = value; ReleaseWorldPackets(); - int newPileWeight = this.PileWeight; + int newPileWeight = PileWeight; UpdateTotal( this, TotalType.Weight, newPileWeight - oldPileWeight ); @@ -3605,7 +3605,7 @@ namespace Server if ( info?.m_Name != null ) return info.m_Name; - return this.DefaultName; + return DefaultName; } set { @@ -3688,12 +3688,12 @@ namespace Server if ( oldValue != value ) { - int oldPileWeight = this.PileWeight; + int oldPileWeight = PileWeight; m_Amount = value; ReleaseWorldPackets(); - int newPileWeight = this.PileWeight; + int newPileWeight = PileWeight; UpdateTotal( this, TotalType.Weight, newPileWeight - oldPileWeight ); @@ -4063,7 +4063,7 @@ namespace Server Mobile m = state.Mobile; if ( m.InRange( worldLoc, GetUpdateRange( m ) ) ) { - state.Send( this.RemovePacket ); + state.Send( RemovePacket ); } } @@ -4233,7 +4233,7 @@ namespace Server parentMobile.OnSubItemBounceCleared( item ); } - public virtual bool CheckTarget( Mobile from, Server.Targeting.Target targ, object targeted ) + public virtual bool CheckTarget( Mobile from, Targeting.Target targ, object targeted ) { if ( m_Parent is Item item ) return item.CheckTarget( from, targ, targeted ); @@ -4352,10 +4352,10 @@ namespace Server public virtual void OnAosSingleClick( Mobile from ) { - ObjectPropertyList opl = this.PropertyList; + ObjectPropertyList opl = PropertyList; if ( opl.Header > 0 ) - from.Send( new MessageLocalized( m_Serial, m_ItemID, MessageType.Label, 0x3B2, 3, opl.Header, this.Name, opl.HeaderArgs ) ); + from.Send( new MessageLocalized( m_Serial, m_ItemID, MessageType.Label, 0x3B2, 3, opl.Header, Name, opl.HeaderArgs ) ); } public virtual void OnSingleClick( Mobile from ) @@ -4370,7 +4370,7 @@ namespace Server if ( ns != null ) { - if ( this.Name == null ) + if ( Name == null ) { if ( m_Amount <= 1 ) ns.Send( new MessageLocalized( m_Serial, m_ItemID, MessageType.Label, 0x3B2, 3, LabelNumber, "", "" ) ); @@ -4379,7 +4379,7 @@ namespace Server } else { - ns.Send( new UnicodeMessage( m_Serial, m_ItemID, MessageType.Label, 0x3B2, 3, "ENU", "", this.Name + ( m_Amount > 1 ? " : " + m_Amount : "" ) ) ); + ns.Send( new UnicodeMessage( m_Serial, m_ItemID, MessageType.Label, 0x3B2, 3, "ENU", "", Name + ( m_Amount > 1 ? " : " + m_Amount : "" ) ) ); } } } @@ -4407,10 +4407,10 @@ namespace Server Amount -= amount; int ourHue = Hue; - Map thisMap = this.Map; - IEntity thisParent = this.m_Parent; - Point3D worldLoc = this.GetWorldLocation(); - LootType type = this.LootType; + Map thisMap = Map; + IEntity thisParent = m_Parent; + Point3D worldLoc = GetWorldLocation(); + LootType type = LootType; if ( Amount == 0 ) Delete(); @@ -4434,10 +4434,10 @@ namespace Server public virtual void Consume( int amount ) { - this.Amount -= amount; + Amount -= amount; - if ( this.Amount <= 0 ) - this.Delete(); + if ( Amount <= 0 ) + Delete(); } public virtual void ReplaceWith( Item newItem ) @@ -4517,7 +4517,7 @@ namespace Server if ( m_LootType == LootType.Blessed || (Mobile.InsuranceEnabled && Insured) ) return true; - return ( m != null && m == this.BlessedFor ); + return ( m != null && m == BlessedFor ); } public virtual bool CheckNewbied() @@ -4530,7 +4530,7 @@ namespace Server if ( Mobile.InsuranceEnabled && Insured ) return false; - if ( this.BlessedFor != null ) + if ( BlessedFor != null ) return false; return ( m_LootType == LootType.Regular ); @@ -4557,7 +4557,7 @@ namespace Server World.AddItem( this ); - Type ourType = this.GetType(); + Type ourType = GetType(); m_TypeRef = World.m_ItemTypes.IndexOf( ourType ); if ( m_TypeRef == -1 ) @@ -4577,7 +4577,7 @@ namespace Server { m_Serial = serial; - Type ourType = this.GetType(); + Type ourType = GetType(); m_TypeRef = World.m_ItemTypes.IndexOf( ourType ); if ( m_TypeRef == -1 ) diff --git a/Server/Items/BaseMulti.cs b/Server/Items/BaseMulti.cs index b16221657..37aa5ffee 100644 --- a/Server/Items/BaseMulti.cs +++ b/Server/Items/BaseMulti.cs @@ -39,7 +39,7 @@ namespace Server.Items get => base.ItemID; set { if ( base.ItemID != value ) { - Map facet = ( this.Parent == null ? this.Map : null ); + Map facet = ( Parent == null ? Map : null ); if ( facet != null ) { facet.OnLeave( this ); @@ -57,8 +57,8 @@ namespace Server.Items [Obsolete( "Replace with calls to OnLeave and OnEnter surrounding component invalidation.", true )] public virtual void RefreshComponents() { - if ( this.Parent == null ) { - Map facet = this.Map; + if ( Parent == null ) { + Map facet = Map; if ( facet != null ) { facet.OnLeave( this ); @@ -71,7 +71,7 @@ namespace Server.Items { get { - MultiComponentList mcl = this.Components; + MultiComponentList mcl = Components; if ( mcl.List.Length > 0 ) { int id = mcl.List[0].m_ItemID; @@ -117,10 +117,10 @@ namespace Server.Items public virtual bool Contains( int x, int y ) { - MultiComponentList mcl = this.Components; + MultiComponentList mcl = Components; - x -= this.X + mcl.Min.m_X; - y -= this.Y + mcl.Min.m_Y; + x -= X + mcl.Min.m_X; + y -= Y + mcl.Min.m_Y; return x >= 0 && x < mcl.Width @@ -131,7 +131,7 @@ namespace Server.Items public bool Contains( Mobile m ) { - if ( m.Map == this.Map ) + if ( m.Map == Map ) return Contains( m.X, m.Y ); else return false; @@ -139,7 +139,7 @@ namespace Server.Items public bool Contains( Item item ) { - if ( item.Map == this.Map ) + if ( item.Map == Map ) return Contains( item.X, item.Y ); else return false; diff --git a/Server/Items/Container.cs b/Server/Items/Container.cs index c5ee10d2e..c19ea6cc3 100644 --- a/Server/Items/Container.cs +++ b/Server/Items/Container.cs @@ -73,11 +73,11 @@ namespace Server.Items get => base.ItemID; set { - int oldID = this.ItemID; + int oldID = ItemID; base.ItemID = value; - if ( this.ItemID != oldID ) + if ( ItemID != oldID ) UpdateContainerData(); } } @@ -126,7 +126,7 @@ namespace Server.Items public virtual void UpdateContainerData() { - this.ContainerData = ContainerData.GetData( this.ItemID ); + ContainerData = ContainerData.GetData( ItemID ); } public virtual Rectangle2D Bounds => ContainerData.Bounds; @@ -199,9 +199,9 @@ namespace Server.Items return false; } - int maxItems = this.MaxItems; + int maxItems = MaxItems; - if ( checkItems && maxItems != 0 && (this.TotalItems + plusItems + item.TotalItems + (item.IsVirtualItem ? 0 : 1)) > maxItems ) + if ( checkItems && maxItems != 0 && (TotalItems + plusItems + item.TotalItems + (item.IsVirtualItem ? 0 : 1)) > maxItems ) { if ( message ) SendFullItemsMessage( m, item ); @@ -209,7 +209,7 @@ namespace Server.Items return false; } - if ( MaxWeight != 0 && (this.TotalWeight + plusWeight + item.TotalWeight + item.PileWeight) > MaxWeight ) + if ( MaxWeight != 0 && (TotalWeight + plusWeight + item.TotalWeight + item.PileWeight) > MaxWeight ) { if ( message ) SendFullWeightMessage( m, item ); @@ -218,7 +218,7 @@ namespace Server.Items } } - object parent = this.Parent; + object parent = Parent; while ( parent != null ) { @@ -1490,7 +1490,7 @@ namespace Server.Items public virtual bool TryDropItem( Mobile from, Item dropped, bool sendFullMessage, bool playSound ) { - List list = this.Items; + List list = Items; for ( int i = 0; i < list.Count; ++i ) { @@ -1524,7 +1524,7 @@ namespace Server.Items { Item dropped = droppedItems[i]; - List list = this.Items; + List list = Items; bool stacked = false; @@ -1600,7 +1600,7 @@ namespace Server.Items AddItem( dropped ); Rectangle2D bounds = dropped.GetGraphicBounds(); - Rectangle2D ourBounds = this.Bounds; + Rectangle2D ourBounds = Bounds; int x, y; @@ -1653,7 +1653,7 @@ namespace Server.Items { if ( DisplaysContent ) { - object root = this.RootParent; + object root = RootParent; if ( root == null || root is Item || root == from || from.AccessLevel > AccessLevel.Player ) return true; @@ -1705,7 +1705,7 @@ namespace Server.Items if ( ObjectPropertyList.Enabled ) { - List items = this.Items; + List items = Items; for ( int i = 0; i < items.Count; ++i ) to.Send( items[i].OPLPacket ); @@ -1722,7 +1722,7 @@ namespace Server.Items if ( m_Openers != null ) { Point3D worldLoc = GetWorldLocation(); - Map map = this.Map; + Map map = Map; for ( int i = 0; i < m_Openers.Count; ++i ) { @@ -1782,7 +1782,7 @@ namespace Server.Items public override void OnDoubleClick( Mobile from ) { - if ( from.AccessLevel > AccessLevel.Player || from.InRange( this.GetWorldLocation(), 2 ) ) + if ( from.AccessLevel > AccessLevel.Player || from.InRange( GetWorldLocation(), 2 ) ) DisplayTo( from ); else from.SendLocalizedMessage( 500446 ); // That is too far away. diff --git a/Server/Items/Containers.cs b/Server/Items/Containers.cs index b73bf543b..2ba17219a 100644 --- a/Server/Items/Containers.cs +++ b/Server/Items/Containers.cs @@ -84,8 +84,8 @@ namespace Server.Items } } - if ( this.ItemID == 0xE41 ) - this.ItemID = 0xE7C; + if ( ItemID == 0xE41 ) + ItemID = 0xE7C; } private static bool m_SendRemovePacket; @@ -99,7 +99,7 @@ namespace Server.Items m_Open = false; if ( m_Owner != null && m_SendRemovePacket ) - m_Owner.Send( this.RemovePacket ); + m_Owner.Send( RemovePacket ); } public override void OnSingleClick( Mobile from ) diff --git a/Server/Items/SecureTradeContainer.cs b/Server/Items/SecureTradeContainer.cs index e37f23b27..de47cf914 100644 --- a/Server/Items/SecureTradeContainer.cs +++ b/Server/Items/SecureTradeContainer.cs @@ -49,10 +49,10 @@ namespace Server.Items Mobile to; - if ( this.Trade.From.Container != this ) - to = this.Trade.From.Mobile; + if ( Trade.From.Container != this ) + to = Trade.From.Mobile; else - to = this.Trade.To.Mobile; + to = Trade.To.Mobile; return m.CheckTrade( to, item, this, message, checkItems, plusItems, plusWeight ); } diff --git a/Server/Map.cs b/Server/Map.cs index b2bcd8933..bd8a39726 100644 --- a/Server/Map.cs +++ b/Server/Map.cs @@ -1150,7 +1150,7 @@ namespace Server if ( regName != null ) { if ( m_Regions.ContainsKey( regName ) ) - Console.WriteLine( "Warning: Duplicate region name '{0}' for map '{1}'", regName, this.Name ); + Console.WriteLine( "Warning: Duplicate region name '{0}' for map '{1}'", regName, Name ); else m_Regions[regName] = reg; } diff --git a/Server/Mobile.cs b/Server/Mobile.cs index a29856844..db1aedeef 100644 --- a/Server/Mobile.cs +++ b/Server/Mobile.cs @@ -439,7 +439,7 @@ namespace Server public MobileNotConnectedException( Mobile source, string message ) : base( message ) { - this.Source = source.ToString(); + Source = source.ToString(); } } @@ -478,13 +478,13 @@ namespace Server public int CompareTo( Mobile other ) { - return this.CompareTo( (IEntity)other ); + return CompareTo( (IEntity)other ); } public int CompareTo( object other ) { if ( other == null || other is IEntity ) - return this.CompareTo( (IEntity)other ); + return CompareTo( (IEntity)other ); throw new ArgumentException(); } @@ -766,15 +766,15 @@ namespace Server } set { - Race oldRace = this.Race; + Race oldRace = Race; m_Race = value; if ( m_Race == null ) m_Race = Race.DefaultRace; - this.Body = m_Race.Body( this ); - this.UpdateResistances(); + Body = m_Race.Body( this ); + UpdateResistances(); Delta( MobileDelta.Race ); @@ -916,11 +916,11 @@ namespace Server for( int i = 0; i < m_Resistances.Length; ++i ) m_Resistances[i] = 0; - m_Resistances[0] += this.BasePhysicalResistance; - m_Resistances[1] += this.BaseFireResistance; - m_Resistances[2] += this.BaseColdResistance; - m_Resistances[3] += this.BasePoisonResistance; - m_Resistances[4] += this.BaseEnergyResistance; + m_Resistances[0] += BasePhysicalResistance; + m_Resistances[1] += BaseFireResistance; + m_Resistances[2] += BaseColdResistance; + m_Resistances[3] += BasePoisonResistance; + m_Resistances[4] += BaseEnergyResistance; for( int i = 0; m_ResistMods != null && i < m_ResistMods.Count; ++i ) { @@ -985,7 +985,7 @@ namespace Server public virtual void OnAosSingleClick( Mobile from ) { - ObjectPropertyList opl = this.PropertyList; + ObjectPropertyList opl = PropertyList; if ( opl.Header > 0 ) { @@ -1121,7 +1121,7 @@ namespace Server m_Aggressors.RemoveAt( i ); info.Free(); - if ( m_NetState != null && this.CanSee( attacker ) && Utility.InUpdateRange( m_Location, attacker.m_Location ) ) { + if ( m_NetState != null && CanSee( attacker ) && Utility.InUpdateRange( m_Location, attacker.m_Location ) ) { m_NetState.Send(MobileIncoming.Create(m_NetState, this, attacker)); } } @@ -1142,7 +1142,7 @@ namespace Server m_Aggressed.RemoveAt( i ); info.Free(); - if ( m_NetState != null && this.CanSee( defender ) && Utility.InUpdateRange( m_Location, defender.m_Location ) ) { + if ( m_NetState != null && CanSee( defender ) && Utility.InUpdateRange( m_Location, defender.m_Location ) ) { m_NetState.Send(MobileIncoming.Create(m_NetState, this, defender)); } } @@ -1545,7 +1545,7 @@ namespace Server m_Paralyzed = value; Delta( MobileDelta.Flags ); - this.SendLocalizedMessage( m_Paralyzed ? 502381 : 502382 ); + SendLocalizedMessage( m_Paralyzed ? 502381 : 502382 ); if ( m_ParaTimer != null ) { @@ -1721,7 +1721,7 @@ namespace Server { if ( item != null && item.Movable && !item.AllowEquippedCast( this ) ) { - Container pack = this.Backpack; + Container pack = Backpack; if ( pack == null ) AddToBackpack( item ); @@ -1741,9 +1741,9 @@ namespace Server public virtual bool RegenThroughPoison => m_GlobalRegenThroughPoison; - public virtual bool CanRegenHits => this.Alive && (RegenThroughPoison || !this.Poisoned); - public virtual bool CanRegenStam => this.Alive; - public virtual bool CanRegenMana => this.Alive; + public virtual bool CanRegenHits => Alive && (RegenThroughPoison || !Poisoned); + public virtual bool CanRegenStam => Alive; + public virtual bool CanRegenMana => Alive; #region Timers @@ -1752,9 +1752,9 @@ namespace Server private Mobile m_Owner; public ManaTimer( Mobile m ) - : base( Mobile.GetManaRegenRate( m ), Mobile.GetManaRegenRate( m ) ) + : base( GetManaRegenRate( m ), GetManaRegenRate( m ) ) { - this.Priority = TimerPriority.FiftyMS; + Priority = TimerPriority.FiftyMS; m_Owner = m; } @@ -1763,7 +1763,7 @@ namespace Server if ( m_Owner.CanRegenMana )// m_Owner.Alive ) m_Owner.Mana++; - Delay = Interval = Mobile.GetManaRegenRate( m_Owner ); + Delay = Interval = GetManaRegenRate( m_Owner ); } } @@ -1772,9 +1772,9 @@ namespace Server private Mobile m_Owner; public HitsTimer( Mobile m ) - : base( Mobile.GetHitsRegenRate( m ), Mobile.GetHitsRegenRate( m ) ) + : base( GetHitsRegenRate( m ), GetHitsRegenRate( m ) ) { - this.Priority = TimerPriority.FiftyMS; + Priority = TimerPriority.FiftyMS; m_Owner = m; } @@ -1783,7 +1783,7 @@ namespace Server if ( m_Owner.CanRegenHits )// m_Owner.Alive && !m_Owner.Poisoned ) m_Owner.Hits++; - Delay = Interval = Mobile.GetHitsRegenRate( m_Owner ); + Delay = Interval = GetHitsRegenRate( m_Owner ); } } @@ -1792,9 +1792,9 @@ namespace Server private Mobile m_Owner; public StamTimer( Mobile m ) - : base( Mobile.GetStamRegenRate( m ), Mobile.GetStamRegenRate( m ) ) + : base( GetStamRegenRate( m ), GetStamRegenRate( m ) ) { - this.Priority = TimerPriority.FiftyMS; + Priority = TimerPriority.FiftyMS; m_Owner = m; } @@ -1803,7 +1803,7 @@ namespace Server if ( m_Owner.CanRegenStam )// m_Owner.Alive ) m_Owner.Stam++; - Delay = Interval = Mobile.GetStamRegenRate( m_Owner ); + Delay = Interval = GetStamRegenRate( m_Owner ); } } @@ -1839,7 +1839,7 @@ namespace Server public ParalyzedTimer( Mobile m, TimeSpan duration ) : base( duration ) { - this.Priority = TimerPriority.TwentyFiveMS; + Priority = TimerPriority.TwentyFiveMS; m_Mobile = m; } @@ -1856,7 +1856,7 @@ namespace Server public FrozenTimer( Mobile m, TimeSpan duration ) : base( duration ) { - this.Priority = TimerPriority.TwentyFiveMS; + Priority = TimerPriority.TwentyFiveMS; m_Mobile = m; } @@ -1914,7 +1914,7 @@ namespace Server public ExpireCombatantTimer( Mobile m ) : base( TimeSpan.FromMinutes( 1.0 ) ) { - this.Priority = TimerPriority.FiveSeconds; + Priority = TimerPriority.FiveSeconds; m_Mobile = m; } @@ -1939,7 +1939,7 @@ namespace Server public ExpireCriminalTimer( Mobile m ) : base( m_ExpireCriminalDelay ) { - this.Priority = TimerPriority.FiveSeconds; + Priority = TimerPriority.FiveSeconds; m_Mobile = m; } @@ -2190,7 +2190,7 @@ namespace Server { m_Aggressors.Add( AggressorInfo.Create( aggressor, this, criminal ) ); // new AggressorInfo( aggressor, this, criminal, true ) ); - if ( this.CanSee( aggressor ) ) { + if ( CanSee( aggressor ) ) { m_NetState?.Send(MobileIncoming.Create(m_NetState, this, aggressor)); } @@ -2204,7 +2204,7 @@ namespace Server { aggressor.m_Aggressed.Add( AggressorInfo.Create( aggressor, this, criminal ) ); // new AggressorInfo( aggressor, this, criminal, false ) ); - if ( this.CanSee( aggressor ) ) { + if ( CanSee( aggressor ) ) { m_NetState?.Send(MobileIncoming.Create(m_NetState, this, aggressor)); } @@ -2236,7 +2236,7 @@ namespace Server m_Aggressed.RemoveAt( i ); info.Free(); - if ( m_NetState != null && this.CanSee( aggressed ) ) { + if ( m_NetState != null && CanSee( aggressed ) ) { m_NetState.Send(MobileIncoming.Create(m_NetState, this, aggressed)); } @@ -2263,7 +2263,7 @@ namespace Server m_Aggressors.RemoveAt( i ); info.Free(); - if ( m_NetState != null && this.CanSee( aggressor ) ) { + if ( m_NetState != null && CanSee( aggressor ) ) { m_NetState.Send(MobileIncoming.Create(m_NetState, this, aggressor)); } @@ -2439,7 +2439,7 @@ namespace Server { Target t = new SimpleTarget( range, flags, allowGround, callback ); - this.Target = t; + Target = t; return t; } @@ -2466,7 +2466,7 @@ namespace Server { Target t = new SimpleStateTarget( range, flags, allowGround, callback, state ); - this.Target = t; + Target = t; return t; } @@ -2492,7 +2492,7 @@ namespace Server { Target t = new SimpleStateTarget(range, flags, allowGround, callback, state); - this.Target = t; + Target = t; return t; } @@ -2594,14 +2594,14 @@ namespace Server { Prompt p = new SimplePrompt( callback, cancelCallback ); - this.Prompt = p; + Prompt = p; return p; } public Prompt BeginPrompt( PromptCallback callback, bool callbackHandlesCancel ) { Prompt p = new SimplePrompt( callback, callbackHandlesCancel ); - this.Prompt = p; + Prompt = p; return p; } public Prompt BeginPrompt( PromptCallback callback ) @@ -2653,14 +2653,14 @@ namespace Server { Prompt p = new SimpleStatePrompt( callback, cancelCallback, state ); - this.Prompt = p; + Prompt = p; return p; } public Prompt BeginPrompt( PromptStateCallback callback, bool callbackHandlesCancel, object state ) { Prompt p = new SimpleStatePrompt( callback, callbackHandlesCancel, state ); - this.Prompt = p; + Prompt = p; return p; } public Prompt BeginPrompt( PromptStateCallback callback, object state ) @@ -2712,14 +2712,14 @@ namespace Server { Prompt p = new SimpleStatePrompt(callback, cancelCallback, state); - this.Prompt = p; + Prompt = p; return p; } public Prompt BeginPrompt(PromptStateCallback callback, bool callbackHandlesCancel, T state) { Prompt p = new SimpleStatePrompt(callback, callbackHandlesCancel, state); - this.Prompt = p; + Prompt = p; return p; } public Prompt BeginPrompt(PromptStateCallback callback, T state) @@ -2775,7 +2775,7 @@ namespace Server { if ( m_Hidden && m_AccessLevel == AccessLevel.Player ) { - if ( m_AllowedStealthSteps-- <= 0 || (d & Direction.Running) != 0 || this.Mounted ) + if ( m_AllowedStealthSteps-- <= 0 || (d & Direction.Running) != 0 || Mounted ) RevealingAction(); } @@ -3131,7 +3131,7 @@ namespace Server public int ComputeMovementSpeed() { - return ComputeMovementSpeed( this.Direction, false ); + return ComputeMovementSpeed( Direction, false ); } public int ComputeMovementSpeed( Direction dir ) @@ -3189,7 +3189,7 @@ namespace Server int number; - if ( this.AccessLevel > AccessLevel.Player ) + if ( AccessLevel > AccessLevel.Player ) { number = shoved.m_Hidden ? 1019041 : 1019040; } @@ -3247,7 +3247,7 @@ namespace Server Criminal = true; - this.Region.OnCriminalAction( this, message ); + Region.OnCriminalAction( this, message ); } public virtual bool IsSnoop( Mobile from ) @@ -3306,7 +3306,7 @@ namespace Server Mana = 0; BodyMod = 0; - Body = this.Race.AliveBody( this ); + Body = Race.AliveBody( this ); ProcessDeltaQueue(); @@ -3321,8 +3321,8 @@ namespace Server item.Delete(); } - this.SendIncomingPacket(); - this.SendIncomingPacket(); + SendIncomingPacket(); + SendIncomingPacket(); OnAfterResurrect(); @@ -3596,7 +3596,7 @@ namespace Server List itemsCopy = new List( m_Items ); - Container pack = this.Backpack; + Container pack = Backpack; for( int i = 0; i < itemsCopy.Count; ++i ) { @@ -3683,7 +3683,7 @@ namespace Server state.Send( animPacket ); if ( !state.Mobile.CanSee( this ) ) { - state.Send( this.RemovePacket ); + state.Send( RemovePacket ); } } } @@ -3724,10 +3724,10 @@ namespace Server /// public virtual void OnDeath( Container c ) { - int sound = this.GetDeathSound(); + int sound = GetDeathSound(); if ( sound >= 0 ) - Effects.PlaySound( this, this.Map, sound ); + Effects.PlaySound( this, Map, sound ); if ( !m_Player ) { @@ -3741,7 +3741,7 @@ namespace Server BodyMod = 0; //Body = this.Female ? 0x193 : 0x192; - Body = this.Race.GhostBody( this ); + Body = Race.GhostBody( this ); Item deathShroud = new Item( 0x204E ); @@ -3874,7 +3874,7 @@ namespace Server public virtual void Use( Item item ) { - if ( item == null || item.Deleted || item.QuestItem || this.Deleted ) + if ( item == null || item.Deleted || item.QuestItem || Deleted ) return; DisruptiveAction(); @@ -3906,7 +3906,7 @@ namespace Server okay = false; else if ( root is Mobile mobile && mobile.IsSnoop( this ) ) item.OnSnoop( this ); - else if ( this.Region.OnDoubleClick( this, item ) ) + else if ( Region.OnDoubleClick( this, item ) ) okay = true; if ( okay ) @@ -3923,7 +3923,7 @@ namespace Server public virtual void Use( Mobile m ) { - if ( m == null || m.Deleted || this.Deleted ) + if ( m == null || m.Deleted || Deleted ) return; DisruptiveAction(); @@ -3937,7 +3937,7 @@ namespace Server m.OnDoubleClickCantSee( this ); else if ( !CheckAlive( false ) ) m.OnDoubleClickDead( this ); - else if ( this.Region.OnDoubleClick( this, m ) && !m.Deleted ) + else if ( Region.OnDoubleClick( this, m ) && !m.Deleted ) m.OnDoubleClick( this ); } @@ -4413,7 +4413,7 @@ namespace Server Map map = m_Map; if ( map == null ) - return Server.Map.NullEnumerable.Instance; + return Map.NullEnumerable.Instance; return map.GetItemsInRange( m_Location, range ); } @@ -4423,7 +4423,7 @@ namespace Server Map map = m_Map; if ( map == null ) - return Server.Map.NullEnumerable.Instance; + return Map.NullEnumerable.Instance; return map.GetObjectsInRange( m_Location, range ); } @@ -4437,7 +4437,7 @@ namespace Server Map map = m_Map; if (map == null) - return Server.Map.NullEnumerable.Instance; + return Map.NullEnumerable.Instance; return map.GetMobilesInRange(m_Location, range); } @@ -4447,7 +4447,7 @@ namespace Server Map map = m_Map; if ( map == null ) - return Server.Map.NullEnumerable.Instance; + return Map.NullEnumerable.Instance; return map.GetClientsInRange( m_Location, range ); } @@ -4488,7 +4488,7 @@ namespace Server SpeechEventArgs regArgs = new SpeechEventArgs( this, text, type, hue, keywords ); EventSink.InvokeSpeech( regArgs ); - this.Region.OnSpeech( regArgs ); + Region.OnSpeech( regArgs ); OnSaid( regArgs ); if ( regArgs.Blocked ) @@ -4836,7 +4836,7 @@ namespace Server if ( !CanBeDamaged() || m_Deleted ) return; - if ( !this.Region.OnDamage( this, ref amount ) ) + if ( !Region.OnDamage( this, ref amount ) ) return; if ( amount > 0 ) @@ -4877,7 +4877,7 @@ namespace Server OnDamage( amount, from, newHits < 0 ); - IMount m = this.Mount; + IMount m = Mount; if ( m != null && informMount ) m.OnRiderDamaged( amount, from, newHits < 0 ); @@ -5544,7 +5544,7 @@ namespace Server if ( (hairflag & 0x02) != 0 ) m_FacialHair.Serialize( writer ); - writer.Write( this.Race ); + writer.Write( Race ); writer.Write( (int)m_TithingPoints ); @@ -6234,7 +6234,7 @@ namespace Server foreach( NetState state in eable ) { if ( state != m_NetState && (everyone || !state.Mobile.CanSee( this )) ) - state.Send( this.RemovePacket ); + state.Send( RemovePacket ); } eable.Free(); @@ -6416,9 +6416,9 @@ namespace Server if ( m_Squelched ) { if ( Core.ML ) - this.SendLocalizedMessage( 500168 ); // You can not say anything, you have been muted. + SendLocalizedMessage( 500168 ); // You can not say anything, you have been muted. else - this.SendMessage( "You can not say anything, you have been squelched." ); //Cliloc ITSELF changed during ML. + SendMessage( "You can not say anything, you have been squelched." ); //Cliloc ITSELF changed during ML. e.Blocked = true; } @@ -6760,7 +6760,7 @@ namespace Server OnHarmfulAction( target, isCriminal ); target.AggressiveAction( this, isCriminal ); - this.Region.OnDidHarmful( this, target ); + Region.OnDidHarmful( this, target ); target.Region.OnGotHarmful( this, target ); if ( !indirect ) @@ -7554,7 +7554,7 @@ namespace Server foreach (NetState state in eable) { if (!state.Mobile.CanSee(this)) { - state.Send(this.RemovePacket); + state.Send(RemovePacket); } else { state.Send(MobileIncoming.Create(state, state.Mobile, this)); @@ -7806,7 +7806,7 @@ namespace Server m_GuildTitle = value; if ( m_Guild != null && !m_Guild.Disbanded && m_GuildTitle != null ) - this.SendLocalizedMessage( 1018026, true, m_GuildTitle ); // Your guild title has changed : + SendLocalizedMessage( 1018026, true, m_GuildTitle ); // Your guild title has changed : InvalidateProperties(); @@ -8011,7 +8011,7 @@ namespace Server /// public virtual void OnPoisonImmunity( Mobile from, Poison poison ) { - this.PublicOverheadMessage( MessageType.Emote, 0x3B2, 1005534 ); // * The poison seems to have no effect. * + PublicOverheadMessage( MessageType.Emote, 0x3B2, 1005534 ); // * The poison seems to have no effect. * } /// @@ -8033,8 +8033,8 @@ namespace Server { if ( poison != null ) { - this.LocalOverheadMessage( MessageType.Regular, 0x21, 1042857 + (poison.Level * 2) ); - this.NonlocalOverheadMessage( MessageType.Regular, 0x21, 1042858 + (poison.Level * 2), Name ); + LocalOverheadMessage( MessageType.Regular, 0x21, 1042857 + (poison.Level * 2) ); + NonlocalOverheadMessage( MessageType.Regular, 0x21, 1042858 + (poison.Level * 2), Name ); } } @@ -8106,7 +8106,7 @@ namespace Server } Poison oldPoison = m_Poison; - this.Poison = poison; + Poison = poison; OnPoisoned( from, poison, oldPoison ); @@ -8152,7 +8152,7 @@ namespace Server if ( CheckCure( from ) ) { Poison oldPoison = m_Poison; - this.Poison = null; + Poison = null; OnCured( from, oldPoison ); @@ -8292,10 +8292,10 @@ namespace Server get { if ( m_Region == null ) - if ( this.Map == null ) + if ( Map == null ) return Map.Internal.DefaultRegion; else - return this.Map.DefaultRegion; + return Map.DefaultRegion; else return m_Region; } @@ -8567,7 +8567,7 @@ namespace Server foreach( NetState ns in eable ) { if ( ns != m_NetState && !Utility.InUpdateRange( newLocation, ns.Mobile.Location ) ) { - ns.Send( this.RemovePacket ); + ns.Send( RemovePacket ); } } @@ -8687,7 +8687,7 @@ namespace Server OnLocationChange( oldLocation ); - this.Region.OnLocationChanged( this, oldLocation ); + Region.OnLocationChanged( this, oldLocation ); } } @@ -9021,7 +9021,7 @@ namespace Server if ( item.Deleted ) return false; - Container pack = this.Backpack; + Container pack = Backpack; return pack != null && pack.TryDropItem( this, item, false ); } @@ -9056,7 +9056,7 @@ namespace Server public virtual bool CheckNonlocalLift( Mobile from, Item item ) { - if ( from == this || (from.AccessLevel > this.AccessLevel && from.AccessLevel >= AccessLevel.GameMaster) ) + if ( from == this || (from.AccessLevel > AccessLevel && from.AccessLevel >= AccessLevel.GameMaster) ) return true; return false; @@ -9124,7 +9124,7 @@ namespace Server { if ( from == this ) { - Container pack = this.Backpack; + Container pack = Backpack; if ( pack != null ) return dropped.DropToItem( from, pack, new Point3D( -1, -1, 0 ) ); @@ -9241,7 +9241,7 @@ namespace Server public virtual bool CheckNonlocalDrop( Mobile from, Item item, Item target ) { - if ( from == this || (from.AccessLevel > this.AccessLevel && from.AccessLevel >= AccessLevel.GameMaster) ) + if ( from == this || (from.AccessLevel > AccessLevel && from.AccessLevel >= AccessLevel.GameMaster) ) return true; return false; @@ -9267,7 +9267,7 @@ namespace Server public virtual bool AllowEquipFrom( Mobile mob ) { - return (mob == this || (mob.AccessLevel >= AccessLevel.GameMaster && mob.AccessLevel > this.AccessLevel)); + return (mob == this || (mob.AccessLevel >= AccessLevel.GameMaster && mob.AccessLevel > AccessLevel)); } public virtual bool EquipItem( Item item ) @@ -9301,7 +9301,7 @@ namespace Server m_NextSkillTime = Core.TickCount; m_DamageEntries = new List(); - Type ourType = this.GetType(); + Type ourType = GetType(); m_TypeRef = World.m_MobileTypes.IndexOf( ourType ); if ( m_TypeRef == -1 ) @@ -9314,13 +9314,13 @@ namespace Server public Mobile() { m_Region = Map.Internal.DefaultRegion; - m_Serial = Server.Serial.NewMobile; + m_Serial = Serial.NewMobile; DefaultMobileInit(); World.AddMobile( this ); - Type ourType = this.GetType(); + Type ourType = GetType(); m_TypeRef = World.m_MobileTypes.IndexOf( ourType ); if ( m_TypeRef == -1 ) @@ -9687,7 +9687,7 @@ namespace Server if ( beholder != m && beholder.CanSee( m ) ) { if ( sendRemove ) - state.Send(this.RemovePacket); + state.Send(RemovePacket); if ( sendIncoming ) { @@ -9792,7 +9792,7 @@ namespace Server } if ( sendOPLUpdate ) - state.Send(this.OPLPacket); + state.Send(OPLPacket); } } @@ -9920,7 +9920,7 @@ namespace Server if ( !Alive ) { if ( message ) - this.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019048 ); // I am dead and cannot do that. + LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019048 ); // I am dead and cannot do that. return false; } @@ -10354,7 +10354,7 @@ namespace Server /// public virtual void OnStatsQuery( Mobile from ) { - if ( from.Map == this.Map && Utility.InUpdateRange( this, from ) && from.CanSee( this ) ) + if ( from.Map == Map && Utility.InUpdateRange( this, from ) && from.CanSee( this ) ) from.Send( new MobileStatus( from, this, m_NetState ) ); if ( from == this ) diff --git a/Server/Network/NetState.cs b/Server/Network/NetState.cs index ae2148733..5ab27004e 100644 --- a/Server/Network/NetState.cs +++ b/Server/Network/NetState.cs @@ -1138,7 +1138,7 @@ namespace Server.Network { for ( int i = ExpansionInfo.Table.Length - 1; i >= 0; i-- ) { ExpansionInfo info = ExpansionInfo.Table[i]; - if ( ( info.RequiredClient != null && this.Version >= info.RequiredClient ) || ( ( this.Flags & info.ClientFlags ) != 0 ) ) { + if ( ( info.RequiredClient != null && Version >= info.RequiredClient ) || ( ( Flags & info.ClientFlags ) != 0 ) ) { return info; } } @@ -1147,16 +1147,16 @@ namespace Server.Network { } } - public Expansion Expansion => ( Expansion ) this.ExpansionInfo.ID; + public Expansion Expansion => ( Expansion ) ExpansionInfo.ID; public bool SupportsExpansion( ExpansionInfo info, bool checkCoreExpansion ) { if ( info == null || ( checkCoreExpansion && ( int ) Core.Expansion < info.ID ) ) return false; if ( info.RequiredClient != null ) - return ( this.Version >= info.RequiredClient ); + return ( Version >= info.RequiredClient ); - return ( ( this.Flags & info.ClientFlags ) != 0 ); + return ( ( Flags & info.ClientFlags ) != 0 ); } public bool SupportsExpansion( Expansion ex, bool checkCoreExpansion ) { diff --git a/Server/Network/PacketHandlers.cs b/Server/Network/PacketHandlers.cs index 0c88897bc..20d6a0710 100644 --- a/Server/Network/PacketHandlers.cs +++ b/Server/Network/PacketHandlers.cs @@ -2161,7 +2161,7 @@ namespace Server.Network state.Send(new MobileIncoming(m, m)); //state.Send( new MobileAttributes( m ) ); state.Send(new MobileStatus(m, m)); - state.Send(Server.Network.SetWarMode.Instantiate(m.Warmode)); + state.Send(Network.SetWarMode.Instantiate(m.Warmode)); m.SendEverything(); @@ -2169,7 +2169,7 @@ namespace Server.Network state.Send(new MobileUpdate(m)); //state.Send( new MobileAttributes( m ) ); state.Send(new MobileStatus(m, m)); - state.Send(Server.Network.SetWarMode.Instantiate(m.Warmode)); + state.Send(Network.SetWarMode.Instantiate(m.Warmode)); state.Send(new MobileIncoming(m, m)); } else if ( state.StygianAbyss ) { state.Send( new MobileUpdate( m ) ); @@ -2182,7 +2182,7 @@ namespace Server.Network state.Send( new MobileIncomingSA( m, m ) ); //state.Send( new MobileAttributes( m ) ); state.Send( new MobileStatus( m, m ) ); - state.Send( Server.Network.SetWarMode.Instantiate( m.Warmode ) ); + state.Send( Network.SetWarMode.Instantiate( m.Warmode ) ); m.SendEverything(); @@ -2190,7 +2190,7 @@ namespace Server.Network state.Send( new MobileUpdate( m ) ); //state.Send( new MobileAttributes( m ) ); state.Send( new MobileStatus( m, m ) ); - state.Send( Server.Network.SetWarMode.Instantiate( m.Warmode ) ); + state.Send( Network.SetWarMode.Instantiate( m.Warmode ) ); state.Send( new MobileIncomingSA( m, m ) ); } else { state.Send( new MobileUpdateOld( m ) ); @@ -2203,7 +2203,7 @@ namespace Server.Network state.Send( new MobileIncomingOld( m, m ) ); //state.Send( new MobileAttributes( m ) ); state.Send( new MobileStatus( m, m ) ); - state.Send( Server.Network.SetWarMode.Instantiate( m.Warmode ) ); + state.Send( Network.SetWarMode.Instantiate( m.Warmode ) ); m.SendEverything(); @@ -2211,7 +2211,7 @@ namespace Server.Network state.Send( new MobileUpdateOld( m ) ); //state.Send( new MobileAttributes( m ) ); state.Send( new MobileStatus( m, m ) ); - state.Send( Server.Network.SetWarMode.Instantiate( m.Warmode ) ); + state.Send( Network.SetWarMode.Instantiate( m.Warmode ) ); state.Send( new MobileIncomingOld( m, m ) ); } diff --git a/Server/Network/Packets.cs b/Server/Network/Packets.cs index 80acb4ca6..66700ef74 100644 --- a/Server/Network/Packets.cs +++ b/Server/Network/Packets.cs @@ -280,7 +280,7 @@ namespace Server.Network { public ObjectHelpResponse( IEntity e, string text ) : base( 0xB7 ) { - this.EnsureCapacity( 9 + (text.Length * 2) ); + EnsureCapacity( 9 + (text.Length * 2) ); m_Stream.Write( (int) e.Serial ); m_Stream.WriteBigUniNull( text ); @@ -292,7 +292,7 @@ namespace Server.Network public VendorBuyContent( List list ) : base( 0x3c ) { - this.EnsureCapacity( list.Count*19 + 5 ); + EnsureCapacity( list.Count*19 + 5 ); m_Stream.Write( (short)list.Count ); @@ -320,7 +320,7 @@ namespace Server.Network { public VendorBuyContent6017( List list ) : base( 0x3c ) { - this.EnsureCapacity( list.Count*20 + 5 ); + EnsureCapacity( list.Count*20 + 5 ); m_Stream.Write( (short)list.Count ); @@ -369,7 +369,7 @@ namespace Server.Network public VendorBuyList( Mobile vendor, List list ) : base( 0x74 ) { - this.EnsureCapacity( 256 ); + EnsureCapacity( 256 ); m_Stream.Write( (int)(!(vendor.FindItemOnLayer( Layer.ShopBuy ) is Container BuyPack) ? Serial.MinusOne : BuyPack.Serial) ); @@ -396,7 +396,7 @@ namespace Server.Network { public VendorSellList( Mobile shopkeeper, ICollection sis ) : base( 0x9E ) { - this.EnsureCapacity( 256 ); + EnsureCapacity( 256 ); m_Stream.Write( (int) shopkeeper.Serial ); @@ -458,7 +458,7 @@ namespace Server.Network { public StatLockInfo( Mobile m ) : base( 0xBF ) { - this.EnsureCapacity( 12 ); + EnsureCapacity( 12 ); m_Stream.Write( (short) 0x19 ); m_Stream.Write( (byte) 2 ); @@ -525,7 +525,7 @@ namespace Server.Network { EquipInfoAttribute[] attrs = info.Attributes; - this.EnsureCapacity( 17 + (info.Crafter == null ? 0 : 6 + info.Crafter.Name == null ? 0 : info.Crafter.Name.Length) + (info.Unidentified ? 4 : 0) + (attrs.Length * 6) ); + EnsureCapacity( 17 + (info.Crafter == null ? 0 : 6 + info.Crafter.Name == null ? 0 : info.Crafter.Name.Length) + (info.Unidentified ? 4 : 0) + (attrs.Length * 6) ); m_Stream.Write( (short) 0x10 ); m_Stream.Write( (int) item.Serial ); @@ -627,7 +627,7 @@ namespace Server.Network { public UnicodePrompt( Prompt prompt ) : base( 0xC2 ) { - this.EnsureCapacity( 21 ); + EnsureCapacity( 21 ); m_Stream.Write( (int) prompt.Serial ); m_Stream.Write( (int) prompt.Serial ); @@ -641,7 +641,7 @@ namespace Server.Network { public ChangeCharacter( IAccount a ) : base( 0x81 ) { - this.EnsureCapacity( 305 ); + EnsureCapacity( 305 ); int count = 0; @@ -678,8 +678,8 @@ namespace Server.Network public sealed class DeathStatus : Packet { - public static readonly Packet Dead = Packet.SetStatic( new DeathStatus( true ) ); - public static readonly Packet Alive = Packet.SetStatic( new DeathStatus( false ) ); + public static readonly Packet Dead = SetStatic( new DeathStatus( true ) ); + public static readonly Packet Alive = SetStatic( new DeathStatus( false ) ); public static Packet Instantiate( bool dead ) { @@ -694,9 +694,9 @@ namespace Server.Network public sealed class SpeedControl : Packet { - public static readonly Packet WalkSpeed = Packet.SetStatic( new SpeedControl( 2 ) ); - public static readonly Packet MountSpeed = Packet.SetStatic( new SpeedControl( 1 ) ); - public static readonly Packet Disable = Packet.SetStatic( new SpeedControl( 0 ) ); + public static readonly Packet WalkSpeed = SetStatic( new SpeedControl( 2 ) ); + public static readonly Packet MountSpeed = SetStatic( new SpeedControl( 1 ) ); + public static readonly Packet Disable = SetStatic( new SpeedControl( 0 ) ); public SpeedControl( int speedControl ) : base( 0xBF ) @@ -719,7 +719,7 @@ namespace Server.Network { public BondedStatus( int val1, Serial serial, int val2 ) : base( 0xBF ) { - this.EnsureCapacity( 11 ); + EnsureCapacity( 11 ); m_Stream.Write( (short) 0x19 ); m_Stream.Write( (byte) val1 ); @@ -746,7 +746,7 @@ namespace Server.Network { public DisplayItemListMenu( ItemListMenu menu ) : base( 0x7C ) { - this.EnsureCapacity( 256 ); + EnsureCapacity( 256 ); m_Stream.Write( (int) ((IMenu)menu).Serial ); m_Stream.Write( (short) 0 ); @@ -793,7 +793,7 @@ namespace Server.Network { public DisplayQuestionMenu( QuestionMenu menu ) : base( 0x7C ) { - this.EnsureCapacity( 256 ); + EnsureCapacity( 256 ); m_Stream.Write( (int) ((IMenu)menu).Serial ); m_Stream.Write( (short) 0 ); @@ -897,7 +897,7 @@ namespace Server.Network int length = (byte) entries.Length; - this.EnsureCapacity( 12 + (length * 8) ); + EnsureCapacity( 12 + (length * 8) ); m_Stream.Write( (short) 0x14 ); m_Stream.Write( (short) 0x02 ); @@ -946,7 +946,7 @@ namespace Server.Network int length = (byte) entries.Length; - this.EnsureCapacity( 12 + (length * 8) ); + EnsureCapacity( 12 + (length * 8) ); m_Stream.Write( (short) 0x14 ); m_Stream.Write( (short) 0x01 ); @@ -1021,7 +1021,7 @@ namespace Server.Network { public CloseGump( int typeID, int buttonID ) : base( 0xBF ) { - this.EnsureCapacity( 13 ); + EnsureCapacity( 13 ); m_Stream.Write( (short) 0x04 ); m_Stream.Write( (int) typeID ); @@ -1068,7 +1068,7 @@ namespace Server.Network { public WorldItem( Item item ) : base( 0x1A ) { - this.EnsureCapacity( 20 ); + EnsureCapacity( 20 ); // 14 base length // +2 - Amount @@ -1284,7 +1284,7 @@ namespace Server.Network { public UnkD3( Mobile beholder, Mobile beheld ) : base( 0xD3 ) { - this.EnsureCapacity( 256 ); + EnsureCapacity( 256 ); //int //short @@ -1327,7 +1327,7 @@ namespace Server.Network { public GQRequest() : base( 0xC3 ) { - this.EnsureCapacity( 256 ); + EnsureCapacity( 256 ); m_Stream.Write( (int) 1 ); m_Stream.Write( (int) 2 ); // ID @@ -1386,7 +1386,7 @@ namespace Server.Network { public ClientVersionReq() : base( 0xBD ) { - this.EnsureCapacity( 3 ); + EnsureCapacity( 3 ); } } @@ -1397,7 +1397,7 @@ namespace Server.Network { public AssistVersionReq( int unk ) : base( 0xBE ) { - this.EnsureCapacity( 7 ); + EnsureCapacity( 7 ); m_Stream.Write( (int) unk ); } @@ -1582,7 +1582,7 @@ namespace Server.Network public sealed class ScreenFadeOut : ScreenEffect { - public static readonly Packet Instance = Packet.SetStatic( new ScreenFadeOut() ); + public static readonly Packet Instance = SetStatic( new ScreenFadeOut() ); public ScreenFadeOut() : base( ScreenEffectType.FadeOut ) @@ -1592,7 +1592,7 @@ namespace Server.Network public sealed class ScreenFadeIn : ScreenEffect { - public static readonly Packet Instance = Packet.SetStatic( new ScreenFadeIn() ); + public static readonly Packet Instance = SetStatic( new ScreenFadeIn() ); public ScreenFadeIn() : base( ScreenEffectType.FadeIn ) @@ -1602,7 +1602,7 @@ namespace Server.Network public sealed class ScreenFadeInOut : ScreenEffect { - public static readonly Packet Instance = Packet.SetStatic( new ScreenFadeInOut() ); + public static readonly Packet Instance = SetStatic( new ScreenFadeInOut() ); public ScreenFadeInOut() : base( ScreenEffectType.FadeInOut ) @@ -1612,7 +1612,7 @@ namespace Server.Network public sealed class ScreenLightFlash : ScreenEffect { - public static readonly Packet Instance = Packet.SetStatic( new ScreenLightFlash() ); + public static readonly Packet Instance = SetStatic( new ScreenLightFlash() ); public ScreenLightFlash() : base( ScreenEffectType.LightFlash ) @@ -1622,7 +1622,7 @@ namespace Server.Network public sealed class ScreenDarkFlash : ScreenEffect { - public static readonly Packet Instance = Packet.SetStatic( new ScreenDarkFlash() ); + public static readonly Packet Instance = SetStatic( new ScreenDarkFlash() ); public ScreenDarkFlash() : base( ScreenEffectType.DarkFlash ) @@ -1763,7 +1763,7 @@ namespace Server.Network { public SpellbookContent( int count, int offset, ulong content, Item item ) : base( 0x3C ) { - this.EnsureCapacity( 5 + (count * 19) ); + EnsureCapacity( 5 + (count * 19) ); int written = 0; @@ -1797,7 +1797,7 @@ namespace Server.Network { public SpellbookContent6017( int count, int offset, ulong content, Item item ) : base( 0x3C ) { - this.EnsureCapacity( 5 + (count * 20) ); + EnsureCapacity( 5 + (count * 20) ); int written = 0; @@ -1909,7 +1909,7 @@ namespace Server.Network List items = beheld.Items; int count = items.Count; - this.EnsureCapacity( 5 + (count * 19) ); + EnsureCapacity( 5 + (count * 19) ); long pos = m_Stream.Position; @@ -1950,7 +1950,7 @@ namespace Server.Network List items = beheld.Items; int count = items.Count; - this.EnsureCapacity( 5 + (count * 20) ); + EnsureCapacity( 5 + (count * 20) ); long pos = m_Stream.Position; @@ -1987,8 +1987,8 @@ namespace Server.Network public sealed class SetWarMode : Packet { - public static readonly Packet InWarMode = Packet.SetStatic( new SetWarMode( true ) ); - public static readonly Packet InPeaceMode = Packet.SetStatic( new SetWarMode( false ) ); + public static readonly Packet InWarMode = SetStatic( new SetWarMode( true ) ); + public static readonly Packet InPeaceMode = SetStatic( new SetWarMode( false ) ); public static Packet Instantiate( bool mode ) { @@ -2065,7 +2065,7 @@ namespace Server.Network { public SkillUpdate( Skills skills ) : base( 0x3A ) { - this.EnsureCapacity( 6 + (skills.Length * 9) ); + EnsureCapacity( 6 + (skills.Length * 9) ); m_Stream.Write( (byte) 0x02 ); // type: absolute, capped @@ -2104,7 +2104,7 @@ namespace Server.Network { public SkillChange( Skill skill ) : base( 0x3A ) { - this.EnsureCapacity( 13 ); + EnsureCapacity( 13 ); double v = skill.NonRacialValue; int uv = (int)(v * 10); @@ -2135,7 +2135,7 @@ namespace Server.Network { if ( url == null ) url = ""; - this.EnsureCapacity( 4 + url.Length ); + EnsureCapacity( 4 + url.Length ); m_Stream.WriteAsciiNull( url ); } @@ -2196,7 +2196,7 @@ namespace Server.Network if ( hue == 0 ) hue = 0x3B2; - this.EnsureCapacity( 50 + (args.Length * 2) ); + EnsureCapacity( 50 + (args.Length * 2) ); m_Stream.Write( (int) serial ); m_Stream.Write( (short) graphic ); @@ -2296,7 +2296,7 @@ namespace Server.Network public sealed class CancelTarget : Packet { - public static readonly Packet Instance = Packet.SetStatic( new CancelTarget() ); + public static readonly Packet Instance = SetStatic( new CancelTarget() ); public CancelTarget() : base( 0x6C, 19 ) { @@ -2613,7 +2613,7 @@ namespace Server.Network { if ( layout == null ) layout = ""; - this.EnsureCapacity( 256 ); + EnsureCapacity( 256 ); m_Stream.Write( (int) g.Serial ); m_Stream.Write( (int) g.TypeID ); @@ -2679,7 +2679,7 @@ namespace Server.Network public sealed class PlayMusic : Packet { - public static readonly Packet InvalidInstance = Packet.SetStatic( new PlayMusic( MusicName.Invalid ) ); + public static readonly Packet InvalidInstance = SetStatic( new PlayMusic( MusicName.Invalid ) ); private static Packet[] m_Instances = new Packet[60]; @@ -2696,7 +2696,7 @@ namespace Server.Network p = m_Instances[v]; if ( p == null ) - m_Instances[v] = p = Packet.SetStatic( new PlayMusic( name ) ); + m_Instances[v] = p = SetStatic( new PlayMusic( name ) ); } else { @@ -2718,7 +2718,7 @@ namespace Server.Network { if ( text == null ) text = ""; - this.EnsureCapacity( 10 + text.Length ); + EnsureCapacity( 10 + text.Length ); m_Stream.Write( (byte) type ); m_Stream.Write( (int) tip ); @@ -2743,7 +2743,7 @@ namespace Server.Network { public MapChange( Mobile m ) : base( 0xBF ) { - this.EnsureCapacity( 6 ); + EnsureCapacity( 6 ); m_Stream.Write( (short) 0x08 ); m_Stream.Write( (byte) (m.Map == null ? 0 : m.Map.MapID) ); @@ -2988,7 +2988,7 @@ namespace Server.Network if ( name == null ) name = ""; - this.EnsureCapacity( 37 ); + EnsureCapacity( 37 ); m_Stream.Write( (int) m.Serial ); m_Stream.WriteAsciiFixed( name, 30 ); @@ -3027,7 +3027,7 @@ namespace Server.Network string name = m.Name; if ( name == null ) name = ""; - this.EnsureCapacity( 43 ); + EnsureCapacity( 43 ); m_Stream.Write( (int) m.Serial ); m_Stream.WriteAsciiFixed( name, 30 ); @@ -3366,7 +3366,7 @@ namespace Server.Network if (beheld.FacialHairItemID > 0) count++; - this.EnsureCapacity(23 + (count * 9)); + EnsureCapacity(23 + (count * 9)); int hue = beheld.Hue; @@ -3474,7 +3474,7 @@ namespace Server.Network if ( beheld.FacialHairItemID > 0 ) count++; - this.EnsureCapacity( 23 + (count * 9) ); + EnsureCapacity( 23 + (count * 9) ); int hue = beheld.Hue; @@ -3600,7 +3600,7 @@ namespace Server.Network if ( beheld.FacialHairItemID > 0 ) count++; - this.EnsureCapacity( 23 + (count * 9) ); + EnsureCapacity( 23 + (count * 9) ); int hue = beheld.Hue; @@ -3716,7 +3716,7 @@ namespace Server.Network if ( hue == 0 ) hue = 0x3B2; - this.EnsureCapacity( 45 + text.Length ); + EnsureCapacity( 45 + text.Length ); m_Stream.Write( (int) serial ); m_Stream.Write( (short) graphic ); @@ -3739,7 +3739,7 @@ namespace Server.Network if ( hue == 0 ) hue = 0x3B2; - this.EnsureCapacity( 50 + (text.Length * 2) ); + EnsureCapacity( 50 + (text.Length * 2) ); m_Stream.Write( (int) serial ); m_Stream.Write( (short) graphic ); @@ -3853,7 +3853,7 @@ namespace Server.Network public sealed class LoginComplete : Packet { - public static readonly Packet Instance = Packet.SetStatic( new LoginComplete() ); + public static readonly Packet Instance = SetStatic( new LoginComplete() ); public LoginComplete() : base( 0x55, 1 ) { @@ -3942,7 +3942,7 @@ namespace Server.Network { public CharacterListUpdate( IAccount a ) : base( 0x86 ) { - this.EnsureCapacity( 4 + (a.Length * 60) ); + EnsureCapacity( 4 + (a.Length * 60) ); int highSlot = -1; @@ -4043,7 +4043,7 @@ namespace Server.Network { public CharacterList( IAccount a, CityInfo[] info ) : base( 0xA9 ) { - this.EnsureCapacity( 11 + (a.Length * 60) + (info.Length * 89) ); + EnsureCapacity( 11 + (a.Length * 60) + (info.Length * 89) ); int highSlot = -1; @@ -4144,7 +4144,7 @@ namespace Server.Network { public CharacterListOld( IAccount a, CityInfo[] info ) : base( 0xA9 ) { - this.EnsureCapacity( 9 + (a.Length * 60) + (info.Length * 63) ); + EnsureCapacity( 9 + (a.Length * 60) + (info.Length * 63) ); int highSlot = -1; @@ -4227,7 +4227,7 @@ namespace Server.Network public sealed class ClearWeaponAbility : Packet { - public static readonly Packet Instance = Packet.SetStatic( new ClearWeaponAbility() ); + public static readonly Packet Instance = SetStatic( new ClearWeaponAbility() ); public ClearWeaponAbility() : base( 0xBF ) { @@ -4273,7 +4273,7 @@ namespace Server.Network if ( hue == 0 ) hue = 0x3B2; - this.EnsureCapacity( 52 + affix.Length + (args.Length * 2) ); + EnsureCapacity( 52 + affix.Length + (args.Length * 2) ); m_Stream.Write( (int) serial ); m_Stream.Write( (short) graphic ); @@ -4341,7 +4341,7 @@ namespace Server.Network { public AccountLoginAck( ServerInfo[] info ) : base( 0xA8 ) { - this.EnsureCapacity( 6 + (info.Length * 40) ); + EnsureCapacity( 6 + (info.Length * 40) ); m_Stream.Write( (byte) 0x5D ); // Unknown @@ -4367,7 +4367,7 @@ namespace Server.Network if ( unknown == null ) unknown = ""; if ( caption == null ) caption = ""; - this.EnsureCapacity( 16 + unknown.Length + caption.Length ); + EnsureCapacity( 16 + unknown.Length + caption.Length ); m_Stream.Write( (int) serial ); m_Stream.Write( (short) gumpID ); @@ -4583,7 +4583,7 @@ namespace Server.Network { using (StreamWriter op = new StreamWriter("net_opt.log", true)) { - op.WriteLine("Redundant compile for packet {0}, use Acquire() and Release()", this.GetType()); + op.WriteLine("Redundant compile for packet {0}, use Acquire() and Release()", GetType()); op.WriteLine(new System.Diagnostics.StackTrace()); } } diff --git a/Server/Network/SendQueue.cs b/Server/Network/SendQueue.cs index b67d725e8..adb79456e 100644 --- a/Server/Network/SendQueue.cs +++ b/Server/Network/SendQueue.cs @@ -58,7 +58,7 @@ namespace Server.Network { } public int Write( byte[] buffer, int offset, int length ) { - int write = Math.Min( length, this.Available ); + int write = Math.Min( length, Available ); System.Buffer.BlockCopy( buffer, offset, _buffer, _length, write ); diff --git a/Server/Persistence/BinaryMemoryWriter.cs b/Server/Persistence/BinaryMemoryWriter.cs index 061f02b4e..e7a483bd0 100644 --- a/Server/Persistence/BinaryMemoryWriter.cs +++ b/Server/Persistence/BinaryMemoryWriter.cs @@ -28,7 +28,7 @@ namespace Server { public BinaryMemoryWriter() : base( new MemoryStream( 512 ), true ) { - this.stream = this.UnderlyingStream as MemoryStream; + stream = UnderlyingStream as MemoryStream; } private static byte[] indexBuffer; diff --git a/Server/Persistence/DualSaveStrategy.cs b/Server/Persistence/DualSaveStrategy.cs index 01659f523..bc6287a22 100644 --- a/Server/Persistence/DualSaveStrategy.cs +++ b/Server/Persistence/DualSaveStrategy.cs @@ -29,7 +29,7 @@ namespace Server { public override void Save( SaveMetrics metrics, bool permitBackgroundWrite ) { - this.PermitBackgroundWrite = permitBackgroundWrite; + PermitBackgroundWrite = permitBackgroundWrite; Thread saveThread = new Thread( delegate() { SaveItems(metrics); diff --git a/Server/Persistence/DynamicSaveStrategy.cs b/Server/Persistence/DynamicSaveStrategy.cs index 654605ca5..827b3c065 100644 --- a/Server/Persistence/DynamicSaveStrategy.cs +++ b/Server/Persistence/DynamicSaveStrategy.cs @@ -53,7 +53,7 @@ namespace Server public override void Save(SaveMetrics metrics, bool permitBackgroundWrite) { - this._metrics = metrics; + _metrics = metrics; OpenFiles(); diff --git a/Server/Persistence/FileQueue.cs b/Server/Persistence/FileQueue.cs index 4261123ce..62cf3a328 100644 --- a/Server/Persistence/FileQueue.cs +++ b/Server/Persistence/FileQueue.cs @@ -51,7 +51,7 @@ namespace Server { } public void Commit() { - owner.Commit( this, this.slot ); + owner.Commit( this, slot ); } } @@ -93,14 +93,14 @@ namespace Server { throw new ArgumentNullException( "callback" ); } - this.syncRoot = new object(); + syncRoot = new object(); - this.active = new Chunk[concurrentWrites]; - this.pending = new Queue(); + active = new Chunk[concurrentWrites]; + pending = new Queue(); this.callback = callback; - this.idle = new ManualResetEvent( true ); + idle = new ManualResetEvent( true ); } private void Append( Page page ) { diff --git a/Server/Persistence/ParallelSaveStrategy.cs b/Server/Persistence/ParallelSaveStrategy.cs index c1fddd6a3..414432d5b 100644 --- a/Server/Persistence/ParallelSaveStrategy.cs +++ b/Server/Persistence/ParallelSaveStrategy.cs @@ -282,13 +282,13 @@ namespace Server { public Consumer( ParallelSaveStrategy owner, int bufferSize ) { this.owner = owner; - this.buffer = new ConsumableEntry[bufferSize]; + buffer = new ConsumableEntry[bufferSize]; - for ( int i = 0; i < this.buffer.Length; ++i ) { - this.buffer[i].writer = new BinaryMemoryWriter(); + for ( int i = 0; i < buffer.Length; ++i ) { + buffer[i].writer = new BinaryMemoryWriter(); } - this.completionEvent = new ManualResetEvent( false ); + completionEvent = new ManualResetEvent( false ); thread = new Thread( Processor ); diff --git a/Server/Persistence/QueuedMemoryWriter.cs b/Server/Persistence/QueuedMemoryWriter.cs index 7eb1f3993..a111e377a 100644 --- a/Server/Persistence/QueuedMemoryWriter.cs +++ b/Server/Persistence/QueuedMemoryWriter.cs @@ -40,7 +40,7 @@ namespace Server public QueuedMemoryWriter() : base(new MemoryStream(1024 * 1024), true) { - this._memStream = this.UnderlyingStream as MemoryStream; + _memStream = UnderlyingStream as MemoryStream; } public void QueueForIndex(ISerializable serializable, int size) @@ -57,7 +57,7 @@ namespace Server public void CommitTo(SequentialFileWriter dataFile, SequentialFileWriter indexFile) { - this.Flush(); + Flush(); int memLength = (int)_memStream.Position; @@ -115,7 +115,7 @@ namespace Server } } - this.Close(); //We're done with this writer. + Close(); //We're done with this writer. } } } \ No newline at end of file diff --git a/Server/Persistence/SequentialFileWriter.cs b/Server/Persistence/SequentialFileWriter.cs index 25dbc106c..43a3551ba 100644 --- a/Server/Persistence/SequentialFileWriter.cs +++ b/Server/Persistence/SequentialFileWriter.cs @@ -37,7 +37,7 @@ namespace Server { this.metrics = metrics; - this.fileStream = FileOperations.OpenSequentialStream( path, FileMode.Create, FileAccess.Write, FileShare.None ); + fileStream = FileOperations.OpenSequentialStream( path, FileMode.Create, FileAccess.Write, FileShare.None ); fileQueue = new FileQueue( Math.Max( 1, FileOperations.Concurrency ), @@ -61,7 +61,7 @@ namespace Server { chunk.Commit(); } else { if ( writeCallback == null ) { - writeCallback = this.OnWrite; + writeCallback = OnWrite; } fileStream.BeginWrite( chunk.Buffer, chunk.Offset, chunk.Size, writeCallback, chunk ); @@ -109,7 +109,7 @@ namespace Server { public override bool CanWrite => true; - public override long Length => this.Position; + public override long Length => Position; public override int Read( byte[] buffer, int offset, int count ) { throw new InvalidOperationException(); diff --git a/Server/Persistence/StandardSaveStrategy.cs b/Server/Persistence/StandardSaveStrategy.cs index c6176e31c..fc0cdedba 100644 --- a/Server/Persistence/StandardSaveStrategy.cs +++ b/Server/Persistence/StandardSaveStrategy.cs @@ -45,7 +45,7 @@ namespace Server { set => _permitBackgroundWrite = value; } - protected bool UseSequentialWriters => (StandardSaveStrategy.SaveType == SaveOption.Normal || !_permitBackgroundWrite); + protected bool UseSequentialWriters => (SaveType == SaveOption.Normal || !_permitBackgroundWrite); public override void Save(SaveMetrics metrics, bool permitBackgroundWrite) { diff --git a/Server/Poison.cs b/Server/Poison.cs index b44688955..cd08477ab 100644 --- a/Server/Poison.cs +++ b/Server/Poison.cs @@ -35,7 +35,7 @@ namespace Server public override string ToString() { - return this.Name; + return Name; } diff --git a/Server/Region.cs b/Server/Region.cs index 952b26bbc..fea55d434 100644 --- a/Server/Region.cs +++ b/Server/Region.cs @@ -216,7 +216,7 @@ namespace Server m_Parent = parent; m_Area = area; m_Dynamic = true; - m_Music = this.DefaultMusic; + m_Music = DefaultMusic; if ( m_Parent == null ) { @@ -503,7 +503,7 @@ namespace Server throw new ArgumentException( "obj is not a Region", nameof(obj) ); // Dynamic regions go first - if ( this.Dynamic ) + if ( Dynamic ) { if ( !reg.Dynamic ) return -1; @@ -513,13 +513,13 @@ namespace Server return 1; } - int thisPriority = this.Priority; + int thisPriority = Priority; int regPriority = reg.Priority; if ( thisPriority != regPriority ) return ( regPriority - thisPriority ); - return ( reg.ChildLevel - this.ChildLevel ); + return ( reg.ChildLevel - ChildLevel ); } public override string ToString() @@ -988,7 +988,7 @@ namespace Server } - MusicName music = this.DefaultMusic; + MusicName music = DefaultMusic; ReadEnum( xml["music"], "name", ref music, false ); diff --git a/Server/Serial.cs b/Server/Serial.cs index fc5f0b573..f07b8db04 100644 --- a/Server/Serial.cs +++ b/Server/Serial.cs @@ -81,7 +81,7 @@ namespace Server public int CompareTo( object other ) { if ( other is Serial serial ) - return this.CompareTo( serial ); + return CompareTo( serial ); if ( other == null ) return -1; diff --git a/Server/Serialization.cs b/Server/Serialization.cs index f0edacb8c..630dbc447 100644 --- a/Server/Serialization.cs +++ b/Server/Serialization.cs @@ -1440,7 +1440,7 @@ namespace Server public void Worker() { - AsyncWriter.m_ThreadCount++; + m_ThreadCount++; int lastCount = 0; @@ -1459,9 +1459,9 @@ namespace Server if ( m_Owner.m_Closed ) m_Owner.m_File.Close(); - AsyncWriter.m_ThreadCount--; + m_ThreadCount--; - if (AsyncWriter.m_ThreadCount <= 0) + if (m_ThreadCount <= 0) World.NotifyDiskWriteComplete(); } } diff --git a/Server/Skills.cs b/Server/Skills.cs index b65715cb1..03e0153e6 100644 --- a/Server/Skills.cs +++ b/Server/Skills.cs @@ -306,7 +306,7 @@ namespace Server get { //There has to be this distinction between the racial values and not to account for gaining skills and these skills aren't displayed nor Totaled up. - double value = this.NonRacialValue; + double value = NonRacialValue; double raceBonus = m_Owner.Owner.RacialSkillBonus; diff --git a/Server/Utility.cs b/Server/Utility.cs index f1d59bc9d..8f04d4186 100644 --- a/Server/Utility.cs +++ b/Server/Utility.cs @@ -455,7 +455,7 @@ namespace Server } } - int b = (byte)(Utility.GetAddressValue( ip ) >> (i * 8)); + int b = (byte)(GetAddressValue( ip ) >> (i * 8)); if ( b < lowPart || b > highPart ) return false; @@ -466,7 +466,7 @@ namespace Server public static bool IPMatchClassC( IPAddress ip1, IPAddress ip2 ) { - return ( (Utility.GetAddressValue( ip1 ) & 0xFFFFFF) == (Utility.GetAddressValue( ip2 ) & 0xFFFFFF) ); + return ( (GetAddressValue( ip1 ) & 0xFFFFFF) == (GetAddressValue( ip2 ) & 0xFFFFFF) ); } public static int InsensitiveCompare( string first, string second ) @@ -987,10 +987,10 @@ namespace Server /// public static int RandomBrightHue() { - if ( Utility.RandomDouble() < 0.1 ) - return Utility.RandomList( 0x62, 0x71 ); + if ( RandomDouble() < 0.1 ) + return RandomList( 0x62, 0x71 ); - return Utility.RandomList( 0x03, 0x0D, 0x13, 0x1C, 0x21, 0x30, 0x37, 0x3A, 0x44, 0x59 ); + return RandomList( 0x03, 0x0D, 0x13, 0x1C, 0x21, 0x30, 0x37, 0x3A, 0x44, 0x59 ); } //[Obsolete( "Depreciated, use the methods for the Mobile's race", false )] @@ -1112,17 +1112,17 @@ namespace Server public static SkillName RandomSkill() { - return m_AllSkills[Utility.Random(m_AllSkills.Length - ( Core.ML ? 0 : Core.SE ? 1 : Core.AOS ? 3 : 6 ) )]; + return m_AllSkills[Random(m_AllSkills.Length - ( Core.ML ? 0 : Core.SE ? 1 : Core.AOS ? 3 : 6 ) )]; } public static SkillName RandomCombatSkill() { - return m_CombatSkills[Utility.Random(m_CombatSkills.Length)]; + return m_CombatSkills[Random(m_CombatSkills.Length)]; } public static SkillName RandomCraftSkill() { - return m_CraftSkills[Utility.Random(m_CraftSkills.Length)]; + return m_CraftSkills[Random(m_CraftSkills.Length)]; } public static void FixPoints( ref Point3D top, ref Point3D bottom ) diff --git a/Server/World.cs b/Server/World.cs index 84bede52b..495f96e40 100644 --- a/Server/World.cs +++ b/Server/World.cs @@ -668,7 +668,7 @@ namespace Server { NetState.FlushAll(); NetState.Pause(); - World.WaitForWriteCompletion();//Blocks Save until current disk flush is done. + WaitForWriteCompletion();//Blocks Save until current disk flush is done. m_Saving = true; @@ -707,7 +707,7 @@ namespace Server { m_Saving = false; if (!permitBackgroundWrite) - World.NotifyDiskWriteComplete(); //Sets the DiskWriteHandle. If we allow background writes, we leave this upto the individual save strategies. + NotifyDiskWriteComplete(); //Sets the DiskWriteHandle. If we allow background writes, we leave this upto the individual save strategies. ProcessSafetyQueues();