Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/SAI: Extended SMART_TARGET_VEHICLE_PASSENGER to allow specifying seat mask instead of single seat index (can now target all passengers) (#21245)

Browse Source
This commit is contained in:
Moein
2018-01-16 23:58:41 +03:30
committed by Shauren
parent 3d7166c1c7
commit 891bca934e
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/3.3.5/2018_01_16_00_world.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `smart_scripts` SET `target_param1`=(1 << `target_param1`) WHERE `target_type`=29;

10
src/server/game/AI/SmartScripts/SmartScript.cpp
View File

@@ -2687,13 +2687,13 @@ void SmartScript::GetTargets(ObjectVector& targets, SmartScriptHolder const& e,
}
break;
}
case SMART_TARGET_VEHICLE_ACCESSORY:
case SMART_TARGET_VEHICLE_PASSENGER:
{
if (me && me->IsVehicle())
{
if (Unit* target = me->GetVehicleKit()->GetPassenger(e.target.vehicle.seat))
targets.push_back(target);
}
for (auto seatItr = me->GetVehicleKit()->Seats.begin(); seatItr != me->GetVehicleKit()->Seats.end(); ++seatItr)
if (!e.target.vehicle.seatMask || (e.target.vehicle.seatMask & (1 << seatItr->first)))
if (Unit* u = ObjectAccessor::GetUnit(*me, seatItr->second.Passenger.Guid))
targets.push_back(u);
break;
}
case SMART_TARGET_POSITION:

2
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
View File

@@ -484,7 +484,7 @@ bool SmartAIMgr::IsTargetValid(SmartScriptHolder const& e)
case SMART_TARGET_STORED:
case SMART_TARGET_LOOT_RECIPIENTS:
case SMART_TARGET_FARTHEST:
case SMART_TARGET_VEHICLE_ACCESSORY:
case SMART_TARGET_VEHICLE_PASSENGER:
break;
default:
TC_LOG_ERROR("sql.sql", "SmartAIMgr: Not handled target_type(%u), Entry %d SourceType %u Event %u Action %u, skipped.", e.GetTargetType(), e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType());

4
src/server/game/AI/SmartScripts/SmartScriptMgr.h
View File

@@ -1187,7 +1187,7 @@ enum SMARTAI_TARGETS
SMART_TARGET_CLOSEST_FRIENDLY = 26, // maxDist, playerOnly
SMART_TARGET_LOOT_RECIPIENTS = 27, // all players that have tagged this creature (for kill credit)
SMART_TARGET_FARTHEST = 28, // maxDist, playerOnly, isInLos
SMART_TARGET_VEHICLE_ACCESSORY = 29, // seat number (vehicle can target it's own accessory)
SMART_TARGET_VEHICLE_PASSENGER = 29, // seatMask (0 - all seats)
SMART_TARGET_END = 30
};
@@ -1315,7 +1315,7 @@ struct SmartTarget
struct
{
uint32 seat;
uint32 seatMask;
} vehicle;
};
};