Fix vehicle summoning logic and add combat/flying checks

Corrects vehicle menu item to use vehicleData.Id instead of CreatureId. Adds a combat check to prevent vehicle summoning while in combat. Improves flying vehicle summoning by checking riding skill and restricting flying in certain maps and no-fly zones. Fixes vehicle summoning to use the correct CreatureId and updates event lambda parameters.

Author: Nyeriah

src/mod_chromiecraft_smartstone_handler.cpp

@@ -540,7 +540,7 @@ void Smartstone::LoadVehicles()
             vehicleData.Flags = fields[4].Get<uint32>();
             Vehicles.push_back(vehicleData);
             MenuItems[ACTION_TYPE_VEHICLE].push_back(MenuItem{
-                vehicleData.CreatureId,
+                vehicleData.Id,
                 vehicleData.Description,
                 0, // NpcTextId
                 GOSSIP_ICON_TABARD,

src/mod_chromiecraft_smartstone_scripts.cpp

@@ -254,28 +254,42 @@ class item_chromiecraft_smartstone : public ItemScript
                     break;
                 }
 
+                if (player->IsInCombat())
+                {
+                    player->SendSystemMessage("You cannot summon a vehicle while in combat.");
+                    break;
+                }
+
                 SmartstoneVehicleData vehicleData = sSmartstone->GetVehicleData(actionId);
 
                 if (vehicleData.HasFlag(SMARTSTONE_VEHICLE_FLAG_FLY))
                 {
+                    if (!player->GetSkillValue(SKILL_RIDING) < 225)
+                    {
+                        player->SendSystemMessage("You need Expert Riding skill to fly this vehicle.");
+                        break;
+                    }
+
+                    uint32 mapId = player->GetMapId();
                     Battlefield* Bf = sBattlefieldMgr->GetBattlefieldToZoneId(player->GetZoneId());
                     if (AreaTableEntry const* pArea = sAreaTableStore.LookupEntry(player->GetAreaId()))
-                        if ((pArea->flags & AREA_FLAG_NO_FLY_ZONE) || (Bf && !Bf->CanFlyIn()))
+                        if ((pArea->flags & AREA_FLAG_NO_FLY_ZONE) || (Bf && !Bf->CanFlyIn()) ||
+                            (mapId == MAP_KALIMDOR || mapId == MAP_EASTERN_KINGDOMS))
                         {
                             player->SendSystemMessage("You may not fly here.");
                             break;
                         }
                 }
 
-                Creature* creature = player->SummonCreature(actionId, *player, TEMPSUMMON_MANUAL_DESPAWN);
+                Creature* creature = player->SummonCreature(vehicleData.CreatureId, *player, TEMPSUMMON_MANUAL_DESPAWN);
 
                 if (!creature)
                     break;
 
                 if (!vehicleData.HasFlag(SMARTSTONE_VEHICLE_FLAG_FOLLOW))
                 {
                     ObjectGuid vehicleGuid = creature->GetGUID();
-                    player->m_Events.AddEventAtOffset([player, actionId, vehicleGuid] {
+                    player->m_Events.AddEventAtOffset([player, vehicleGuid] {
                         if (Creature* vehicle = ObjectAccessor::GetCreature(*player, vehicleGuid))
                         {
                             player->CastCustomSpell(60683, SPELLVALUE_BASE_POINT0, 1, vehicle, true);