diff --git a/README.md b/README.md index ad66407d8..a7cecf42d 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,12 @@ CypherCore is an open source server project for World of Warcraft written in C#. The current support game version is: 9.1.5.41488 ### Prerequisites -* Visual Studio 2022 with .NET 6.0 [Download](https://www.visualstudio.com/downloads/) -* Mysql Database 5.6 or higher [Download](https://dev.mysql.com/downloads/mysql/) +* .NET 6.0 SDK [Download](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) +* MariaDB 10.6 or higher [Download](https://mariadb.org/download/) +* Optional: Visual Studio 2022, Visual Studio Code or Jetbrains Rider ### Server Setup -* Download and Complie the Extractor [Download](https://github.com/CypherCore/Tools) +* ~~Download and Complie the Extractor [Download](https://github.com/CypherCore/Tools)~~ Use TrinityCore extractors for now * Run all extractors in the wow directory * Copy all created folders into server directory (ex: C:\CypherCore\Data) * Make sure Conf files are updated and point the the correct folders and sql user and databases @@ -19,7 +20,7 @@ The current support game version is: 9.1.5.41488 * Extract the sql files into the core sql folder (ex: C:\CypherCore\sql) ### Playing -* Must use Arctium WoW Client Launcher [Download](https://arctium.io) (World of Warcraft -> Private Server Launcher -> Shadowlands) +* Must use Arctium WoW Client Launcher [Download](https://arctium.io/wow) ### Support / General Info * Check out our Discord [Here](https://discord.gg/tCx3JbJ5qQ) @@ -27,4 +28,4 @@ The current support game version is: 9.1.5.41488 ### Legal * Blizzard, Battle.net, World of Warcraft, and all associated logos and designs are trademarks or registered trademarks of Blizzard Entertainment. -* All other trademarks are the property of their respective owners. This project is **not** affiliated with Blizzard Entertainment or any of their family of sites. +* All other trademarks are the property of their respective owners. This project is **not** affiliated with Blizzard Entertainment or any of their family of sites. \ No newline at end of file diff --git a/Source/Game/Chat/Commands/DebugCommands.cs b/Source/Game/Chat/Commands/DebugCommands.cs index 6e7e3f9b6..dc6848016 100644 --- a/Source/Game/Chat/Commands/DebugCommands.cs +++ b/Source/Game/Chat/Commands/DebugCommands.cs @@ -88,9 +88,6 @@ namespace Game.Chat if (!target || !target.IsAIEnabled()) return false; - if (!int.TryParse(duration_str, out int tempDuration)) - tempDuration = 0; - TimeSpan duration = durationArg != 0 ? TimeSpan.FromSeconds(durationArg) : TimeSpan.Zero; if (duration <= TimeSpan.Zero || duration >= TimeSpan.FromMinutes(30)) // arbitrary upper limit duration = TimeSpan.FromMinutes(3); diff --git a/Source/Scripts/World/GameObject.cs b/Source/Scripts/World/GameObject.cs index 84fc94466..0109565d7 100644 --- a/Source/Scripts/World/GameObject.cs +++ b/Source/Scripts/World/GameObject.cs @@ -565,49 +565,6 @@ namespace Scripts.World.GameObjects } } - [Script] - class go_jotunheim_cage : GameObjectAI - { - public go_jotunheim_cage(GameObject go) : base(go) { } - - public override bool GossipHello(Player player) - { - me.UseDoorOrButton(); - Creature pPrisoner = me.FindNearestCreature(CreatureIds.EbonBladePrisonerHuman, 5.0f, true); - if (!pPrisoner) - { - pPrisoner = me.FindNearestCreature(CreatureIds.EbonBladePrisonerTroll, 5.0f, true); - if (!pPrisoner) - { - pPrisoner = me.FindNearestCreature(CreatureIds.EbonBladePrisonerOrc, 5.0f, true); - if (!pPrisoner) - pPrisoner = me.FindNearestCreature(CreatureIds.EbonBladePrisonerNe, 5.0f, true); - } - } - if (!pPrisoner || !pPrisoner.IsAlive()) - return false; - - pPrisoner.DisappearAndDie(); - player.KilledMonsterCredit(CreatureIds.EbonBladePrisonerHuman); - switch (pPrisoner.GetEntry()) - { - case CreatureIds.EbonBladePrisonerHuman: - player.CastSpell(player, SpellIds.SummonBladeKnightH, true); - break; - case CreatureIds.EbonBladePrisonerNe: - player.CastSpell(player, SpellIds.SummonBladeKnightNe, true); - break; - case CreatureIds.EbonBladePrisonerTroll: - player.CastSpell(player, SpellIds.SummonBladeKnightTroll, true); - break; - case CreatureIds.EbonBladePrisonerOrc: - player.CastSpell(player, SpellIds.SummonBladeKnightOrc, true); - break; - } - return true; - } - } - [Script] class go_table_theka : GameObjectAI { diff --git a/Source/WorldServer/WorldServer.conf.dist b/Source/WorldServer/WorldServer.conf.dist index 891c15943..467fa3983 100644 --- a/Source/WorldServer/WorldServer.conf.dist +++ b/Source/WorldServer/WorldServer.conf.dist @@ -1,5 +1,5 @@ ############################################### -# Cypher BNet Server Configuration File # +# Cypher World Server Configuration File # ############################################### ###################################################################################################