diff options
| -rw-r--r-- | sql/updates/world/master/2021_12_21_21_world_2020_02_16_07_world.sql | 64 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_sholazar_basin.cpp | 105 |
2 files changed, 64 insertions, 105 deletions
diff --git a/sql/updates/world/master/2021_12_21_21_world_2020_02_16_07_world.sql b/sql/updates/world/master/2021_12_21_21_world_2020_02_16_07_world.sql new file mode 100644 index 00000000000..68e09498b32 --- /dev/null +++ b/sql/updates/world/master/2021_12_21_21_world_2020_02_16_07_world.sql @@ -0,0 +1,64 @@ +-- +SET @PLANE := 28710; +SET @PILOT := 28646; +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='', `speed_walk`=10, `speed_run`=1 WHERE `entry`=@PLANE; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@PLANE AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(@PLANE, 0, 0, 1, 11, 0, 100, 512, 0, 0, 0, 0, 0, 60, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Just Summoned - Turn Fly On'), +(@PLANE, 0, 1, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 53, 0, @PLANE, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Just Summoned - Start WP'), +(@PLANE, 0, 2, 0, 40, 0, 100, 512, 5, @PLANE, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, @PILOT, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Reached WP5 -Say'), +(@PLANE, 0, 3, 0, 40, 0, 100, 512, 11, @PLANE, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, @PILOT, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Reached WP11 -Say'), +(@PLANE, 0, 4, 0, 40, 0, 100, 512, 12, @PLANE, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 19, @PILOT, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Reached WP12 -Say'), +(@PLANE, 0, 5, 0, 40, 0, 100, 512, 14, @PLANE, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 19, @PILOT, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Reached WP14 -Say'), +(@PLANE, 0, 6, 0, 40, 0, 100, 512, 15, @PLANE, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 19, @PILOT, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Reached WP15 -Say'), +(@PLANE, 0, 7, 0, 40, 0, 100, 512, 17, @PLANE, 0, 0, 0, 1, 5, 0, 0, 0, 0, 0, 19, @PILOT, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Reached WP17 -Say'), +(@PLANE, 0, 8, 0, 40, 0, 100, 512, 21, @PLANE, 0, 0, 0, 1, 6, 0, 0, 0, 0, 0, 19, @PILOT, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Reached WP21 -Say'), +(@PLANE, 0, 9, 10, 40, 0, 100, 512, 25, @PLANE, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Reached WP21 -Say'), +(@PLANE, 0, 10, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 11, 52255, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Reached WP21 - cast Engine on Fire'), +(@PLANE, 0, 11, 0, 28, 0, 100, 512, 0, 0, 0, 0, 0, 134, 44795, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Passenger Removed - Cast Parachute'), +(@PLANE, 0, 12, 13, 8, 0, 100, 512, 52226, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Spell Hit - Set Phase 2'), +(@PLANE, 0, 13, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 11, 50630, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Spell Hit - Cast Eject All Passengers'), +(@PLANE, 0, 14, 0, 40, 0, 100, 512, 26, @PLANE, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Reached WP26 -Turn Run ON'), +(@PLANE, 0, 15, 0, 28, 2, 100, 512, 0, 0, 0, 0, 0, 134, 53328, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Passenger Removed (Phase 2) - Cast Credit'), +(@PLANE, 0, 16, 0, 11, 0, 100, 512, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Spawn -Set Phase 1'), +(@PLANE, 0, 17, 0, 28, 1, 100, 512, 0, 0, 0, 0, 0, 6, 12671, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Vics Flying Machine - On Passenger Removed (Phase 1) - Fail Quest'); + +DELETE FROM `waypoint_data` WHERE `id`=@PLANE; +DELETE FROM `waypoints` WHERE `entry`=@PLANE; +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(@PLANE,1,5494.87,4747.031,-187.8783, "Vic's Flying Machine"), +(@PLANE,2,5485.906,4740.681,-184.5172, "Vic's Flying Machine"), +(@PLANE,3,5472.882,4732.441,-172.1562, "Vic's Flying Machine"), +(@PLANE,4,5460.913,4712.542,-157.8784, "Vic's Flying Machine"), +(@PLANE,5,5452.147,4673.518,-137.8906, "Vic's Flying Machine"), +(@PLANE,6,5449.777,4630.711,-126.6684, "Vic's Flying Machine"), +(@PLANE,7,5507.432,4506.089,-126.6684, "Vic's Flying Machine"), +(@PLANE,8,5586.811,4465.319,-126.6684, "Vic's Flying Machine"), +(@PLANE,9,5676.111,4437.874,-126.6684, "Vic's Flying Machine"), +(@PLANE,10,5756.449,4391.051,-91.25155, "Vic's Flying Machine"), +(@PLANE,11,5817.163,4269.269,-91.25155, "Vic's Flying Machine"), +(@PLANE,12,5856.145,4202.824,-68.29334, "Vic's Flying Machine"), +(@PLANE,13,5921.523,4105.534,-68.29334, "Vic's Flying Machine"), +(@PLANE,14,5995.021,4029.883,-13.97897, "Vic's Flying Machine"), +(@PLANE,15,6118.298,3883.733,94.11866, "Vic's Flying Machine"), +(@PLANE,16,6132.932,3750.75,176.5123, "Vic's Flying Machine"), +(@PLANE,17,6165.863,3748.196,198.9567, "Vic's Flying Machine"), +(@PLANE,18,6208.277,3782.189,196.8455, "Vic's Flying Machine"), +(@PLANE,19,6227.615,3836.871,191.6234, "Vic's Flying Machine"), +(@PLANE,20,6218.483,3885.17,191.6234, "Vic's Flying Machine"), +(@PLANE,21,6197.045,3890.053,191.6234, "Vic's Flying Machine"), +(@PLANE,22,6168.752,3864.161,191.6234, "Vic's Flying Machine"), +(@PLANE,23,6204.037,3807.239,191.6234, "Vic's Flying Machine"), +(@PLANE,24,6232.975,3820.852,191.6234, "Vic's Flying Machine"), +(@PLANE,25,6219.879,3854.341,166.6234, "Vic's Flying Machine"), +(@PLANE,26,6210.428,3855.185,154.4848, "Vic's Flying Machine"); + +UPDATE `creature_template_movement` SET `Swim`=1,`Ground`=1,`Flight`=2 WHERE `CreatureId`=28710; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` =14 AND `SourceGroup`=9750; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14, 9750, 13376, 0, 0, 8, 0, 12671, 0, 0, 0, 0, 0, '', 'Pilot Vic Show different gossip if player has rewarded quest 12671 '), +(14, 9750, 13375, 0, 0, 8, 0, 12671, 0, 0, 1, 0, 0, '', 'Pilot Vic Show different gossip if player is not rewarded quest 12671'); + +DELETE FROM `vehicle_template_accessory` WHERE `entry` IN (28710); +INSERT INTO `vehicle_template_accessory` (`entry`,`accessory_entry`, `seat_id`, `minion`, `description`) VALUES +(28710,28646,0,1,'Vics Flying Machine'); diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 1fbe817b82c..d0702789a66 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -597,110 +597,6 @@ public: }; /*###### -## Quest: Reconnaissance Flight (12671) -######*/ -enum ReconnaissanceFlight -{ - NPC_PLANE = 28710, // Vic's Flying Machine - NPC_PILOT = 28646, - - VIC_SAY_0 = 0, - VIC_SAY_1 = 1, - VIC_SAY_2 = 2, - VIC_SAY_3 = 3, - VIC_SAY_4 = 4, - VIC_SAY_5 = 5, - VIC_SAY_6 = 6, - PLANE_EMOTE = 0, - - SPELL_ENGINE = 52255, // Engine on Fire - - SPELL_LAND = 52226, // Land Flying Machine - SPELL_CREDIT = 53328 // Land Flying Machine Credit -}; - -class npc_vics_flying_machine : public CreatureScript -{ -public: - npc_vics_flying_machine() : CreatureScript("npc_vics_flying_machine") { } - - struct npc_vics_flying_machineAI : public VehicleAI - { - npc_vics_flying_machineAI(Creature* creature) : VehicleAI(creature) { } - - void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) override - { - if (apply && passenger->GetTypeId() == TYPEID_PLAYER) - { - /// @workaround - Because accessory gets unmounted when using vehicle_template_accessory. - /// When vehicle spawns accessory is mounted to seat 0,but when player mounts - /// he uses the same seat (instead of mounting to seat 1) kicking the accessory out. - passenger->ChangeSeat(1, false); - me->GetVehicleKit()->InstallAccessory(NPC_PILOT, 0, true, TEMPSUMMON_DEAD_DESPAWN, 0); - me->GetMotionMaster()->MovePath(NPC_PLANE, false); - } - } - - void MovementInform(uint32 type, uint32 id) override - { - if (type != WAYPOINT_MOTION_TYPE) - return; - - if (Creature* pilot = GetClosestCreatureWithEntry(me, NPC_PILOT, 10)) - switch (id) - { - case 5: - pilot->AI()->Talk(VIC_SAY_0); - break; - case 11: - pilot->AI()->Talk(VIC_SAY_1); - break; - case 12: - pilot->AI()->Talk(VIC_SAY_2); - break; - case 14: - pilot->AI()->Talk(VIC_SAY_3); - break; - case 15: - pilot->AI()->Talk(VIC_SAY_4); - break; - case 17: - pilot->AI()->Talk(VIC_SAY_5); - break; - case 21: - pilot->AI()->Talk(VIC_SAY_6); - break; - case 25: - Talk(PLANE_EMOTE); - DoCast(SPELL_ENGINE); - me->AddUnitFlag2(UNIT_FLAG2_FORCE_MOVEMENT); - break; - } - } - - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override - { - if (spell->Id == SPELL_LAND) - { - Unit* passenger = me->GetVehicleKit()->GetPassenger(1); // player should be on seat 1 - if (passenger && passenger->GetTypeId() == TYPEID_PLAYER) - { - passenger->CastSpell(passenger, SPELL_CREDIT, true); - passenger->ExitVehicle(); - } - } - } - - void UpdateAI(uint32 /*diff*/) override { } - }; - - CreatureAI* GetAI(Creature* creature) const override - { - return new npc_vics_flying_machineAI(creature); - } -}; - -/*###### ## Quest Dreadsaber Mastery: Stalking the Prey (12550) ######*/ @@ -796,7 +692,6 @@ void AddSC_sholazar_basin() new spell_q12620_the_lifewarden_wrath(); new spell_q12589_shoot_rjr(); new npc_haiphoon(); - new npc_vics_flying_machine(); new spell_shango_tracks(); RegisterSpellScript(spell_q12611_deathbolt); } |