prepare merge

Author: Shauren

…tes/world/3.3.5/2026_05_250_00_world.sql …ates/world/3.3.5/2026_07_16_00_world.sqlsql/updates/world/3.3.5/2026_05_250_00_world.sql renamed to sql/updates/world/3.3.5/2026_07_16_00_world.sql sql/updates/world/3.3.5/2026_05_250_00_world.sql renamed to sql/updates/world/3.3.5/2026_07_16_00_world.sql

@@ -18,10 +18,10 @@ DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup`
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ConditionStringValue1`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
 (15,1541,0,0,0,47,0,3628,10,0,'',0,0,0,'',"Group 0: Show Gossip Option 0 if player has taken quest 'You Are Rakh'likh, Demon'"),
 (15,1541,0,0,0,2,0,10757,1,0,'',0,0,0,'',"Group 0: Show Gossip Option 0 if player has item 'Ward of the Defiler'"),
-(15,1541,0,0,0,60,0,0,0,0,'',1,0,0,'',"Group 0: Show Gossip Option 0 if player is not in group"),
+(15,1541,0,0,0,60,0,0,0,0,'',0,0,0,'',"Group 0: Show Gossip Option 0 if player is not in group"),
 
 (15,1541,1,0,0,47,0,3628,10,0,'',0,0,0,'',"Group 0: Show Gossip Option 1 if player has taken quest 'You Are Rakh'likh, Demon'"),
 (15,1541,1,0,0,2,0,10757,1,0,'',0,0,0,'',"Group 0: Show Gossip Option 1 if player has item 'Ward of the Defiler'"),
-(15,1541,1,0,0,60,0,0,0,0,'',0,0,0,'',"Group 0: Show Gossip Option 1 if player is in group");
+(15,1541,1,0,0,60,0,1,0,0,'',0,0,0,'',"Group 0: Show Gossip Option 1 if player is in group");
 
-UPDATE `spell_script_names` SET `ScriptName` = 'spell_eastern_kingdoms_teleport_to_razelikh_group' WHERE `ScriptName` = 'spell_razelikh_teleport_group';
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_blasted_lands_teleport_to_razelikh_group' WHERE `ScriptName` = 'spell_razelikh_teleport_group';

src/server/game/Conditions/ConditionMgr.cpp

@@ -21,6 +21,7 @@
 #include "DatabaseEnv.h"
 #include "GameEventMgr.h"
 #include "GameObject.h"
+#include "Group.h"
 #include "InstanceScript.h"
 #include "Log.h"
 #include "LootMgr.h"
@@ -127,8 +128,28 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND
     { "Private Object",           false, false, false, false },
     { "String ID",                false, false, false,  true },
     { "Label",                    false, false, false, false },
+    { "Group status",              true, false, false, false }
 };
 
+static bool MeetsGroupStatusCondition(Player const* player, GroupStatusCondition status)
+{
+    Group const* group = player->GetGroup();
+    switch (status)
+    {
+        case GroupStatusCondition::NotInGroup:
+            return group == nullptr;
+        case GroupStatusCondition::InGroup:
+            return group != nullptr;
+        case GroupStatusCondition::InGroupButNotInRaid:
+            return group && !group->isRaidGroup();
+        case GroupStatusCondition::InRaid:
+            return group && group->isRaidGroup();
+        case GroupStatusCondition::NotInGroupOrNotInRaid:
+            return !group || !group->isRaidGroup();
+    }
+    return false;
+}
+
 // Checks if object meets the condition
 // Can have CONDITION_SOURCE_TYPE_NONE && !mReferenceId if called from a special event (ie: SmartAI)
 bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
@@ -548,10 +569,10 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
                 condMeets = go->HasStringId(ConditionStringValue1);
             break;
         }
-        case CONDITION_GROUP:
+        case CONDITION_GROUP_STATUS:
         {
-            if (Player* player = object->ToPlayer())
-                condMeets = player->GetGroup();
+            if (Player const* player = object->ToPlayer())
+                condMeets = MeetsGroupStatusCondition(player, GroupStatusCondition(ConditionValue1));
             break;
         }
         default:
@@ -756,7 +777,7 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const
         case CONDITION_STRING_ID:
             mask |= GRID_MAP_TYPE_MASK_CREATURE | GRID_MAP_TYPE_MASK_GAMEOBJECT;
             break;
-        case CONDITION_GROUP:
+        case CONDITION_GROUP_STATUS:
             mask |= GRID_MAP_TYPE_MASK_PLAYER;
             break;
         default:
@@ -2410,12 +2431,18 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const
                 return false;
             }
             break;
+        case CONDITION_GROUP_STATUS:
+            if (cond->ConditionValue1 > uint32(GroupStatusCondition::NotInGroupOrNotInRaid))
+            {
+                TC_LOG_ERROR("sql.sql", "{} has non invalid group status condition value1 ({}), skipped.", cond->ToString(true), cond->ConditionValue1);
+                return false;
+            }
+            break;
         case CONDITION_IN_WATER:
         case CONDITION_CHARMED:
         case CONDITION_TAXI:
         case CONDITION_GAMEMASTER:
         case CONDITION_STRING_ID:
-        case CONDITION_GROUP:
         default:
             break;
         case CONDITION_BATTLE_PET_COUNT:

src/server/game/Conditions/ConditionMgr.h

@@ -95,7 +95,7 @@ enum ConditionTypes
     CONDITION_PRIVATE_OBJECT           = 57,                   // 0                      0              0                  true if entity is private object
     CONDITION_STRING_ID                = 58,
     CONDITION_LABEL                    = 59,                   //                                                          only for master branch
-    CONDITION_GROUP                    = 60,                   // 0                      0              0                  true if player is in group
+    CONDITION_GROUP_STATUS             = 60,                   // GroupStatus            0              0                  true if player group status is (0 = not in group, 1 = in group, 2 = in group but not in raid, 3 = in raid group, 4 = not in group or not in raid)
     CONDITION_MAX
 };
 
@@ -184,6 +184,15 @@ enum InstanceInfo
     INSTANCE_INFO_DATA64
 };
 
+enum class GroupStatusCondition : uint32
+{
+    NotInGroup              = 0,
+    InGroup                 = 1,
+    InGroupButNotInRaid     = 2,
+    InRaid                  = 3,
+    NotInGroupOrNotInRaid   = 4
+};
+
 enum MaxConditionTargets
 {
     MAX_CONDITION_TARGETS = 3

src/server/scripts/EasternKingdoms/eastern_kingdoms.cpp

@@ -200,36 +200,6 @@ class spell_eastern_kingdoms_thaumaturgy_channel : public AuraScript
     }
 };
 
-/*######
-## Quest 3628: You Are Rakh'likh, Demon
-######*/
-
-enum YouAreRakhlikhDemon
-{
-    SPELL_TELEPORT_TO_RAZELIKH_GROUP     = 27694
-};
-
-// 27686 - Teleport to Razelikh (GROUP)
-class spell_eastern_kingdoms_teleport_to_razelikh_group : public SpellScript
-{
-    PrepareSpellScript(spell_eastern_kingdoms_teleport_to_razelikh_group);
-
-    bool Validate(SpellInfo const* /*spellInfo*/) override
-    {
-        return ValidateSpellInfo({ SPELL_TELEPORT_TO_RAZELIKH_GROUP });
-    }
-
-    void HandleScript(SpellEffIndex /*effIndex*/)
-    {
-        GetHitUnit()->CastSpell(nullptr, SPELL_TELEPORT_TO_RAZELIKH_GROUP, true);
-    }
-
-    void Register() override
-    {
-        OnEffectHitTarget += SpellEffectFn(spell_eastern_kingdoms_teleport_to_razelikh_group::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
-    }
-};
-
 void AddSC_eastern_kingdoms()
 {
     RegisterSpellScript(spell_eastern_kingdoms_duskwither_spire_up);
@@ -239,5 +209,4 @@ void AddSC_eastern_kingdoms()
     RegisterSpellScript(spell_eastern_kingdoms_dead_scar_bombing_run);
     RegisterSpellScript(spell_eastern_kingdoms_dawnblade_attack);
     RegisterSpellScript(spell_eastern_kingdoms_thaumaturgy_channel);
-    RegisterSpellScript(spell_eastern_kingdoms_teleport_to_razelikh_group);
 }

src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp

@@ -177,7 +177,7 @@ void AddSC_zulgurub();
 void AddSC_eastern_kingdoms();
 //void AddSC_alterac_mountains();
 //void AddSC_arathi_highlands();
-//void AddSC_blasted_lands();
+void AddSC_blasted_lands();
 void AddSC_duskwood();
 void AddSC_eastern_plaguelands();
 void AddSC_elwynn_forest();
@@ -358,7 +358,7 @@ void AddEasternKingdomsScripts()
     AddSC_eastern_kingdoms();
     //AddSC_alterac_mountains();
     //AddSC_arathi_highlands();
-    //AddSC_blasted_lands();
+    AddSC_blasted_lands();
     AddSC_duskwood();
     AddSC_eastern_plaguelands();
     AddSC_elwynn_forest();

src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp

@@ -0,0 +1,55 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ScriptMgr.h"
+#include "SpellScript.h"
+#include "Unit.h"
+
+/*######
+## Quest 3628: You Are Rakh'likh, Demon
+######*/
+
+enum YouAreRakhlikhDemon
+{
+    SPELL_TELEPORT_TO_RAZELIKH_GROUP = 27694
+};
+
+// 27686 - Teleport to Razelikh (GROUP)
+class spell_blasted_lands_teleport_to_razelikh_group : public SpellScript
+{
+    PrepareSpellScript(spell_blasted_lands_teleport_to_razelikh_group);
+
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_TELEPORT_TO_RAZELIKH_GROUP });
+    }
+
+    void HandleScript(SpellEffIndex /*effIndex*/)
+    {
+        GetHitUnit()->CastSpell(nullptr, SPELL_TELEPORT_TO_RAZELIKH_GROUP, true);
+    }
+
+    void Register() override
+    {
+        OnEffectHitTarget += SpellEffectFn(spell_blasted_lands_teleport_to_razelikh_group::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+    }
+};
+
+void AddSC_blasted_lands()
+{
+    RegisterSpellScript(spell_blasted_lands_teleport_to_razelikh_group);
+}