traponinet

This is patch from Wojta's repository (branch vehicle) clean, nothing added and nothing is deleted vehicle patch for MaNGOS core [9848]: http://filebeam.com/4d401ec9906297ee31430df6fc7f19c8 Thanks to Wojta that still develops a vehicle. Enjoy

@limpnau This patch is for clean MaNGOS source code only! and the patch failed, because the insider42's repository (branch 333) is with different code (with many custom patches).

I regret that I caused the problem with Dual-spec, but the patch that breaks Dual-spec was for this: quote from my notes: I found another solution that does not conflict with Dual-spec in the normal maps, but in Dungeons still not possible to switch between Primary and Secondary Talents. diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index abdf46e..027d92d 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -362,7 +376,10 @@ Spell::Spell( Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid o UpdateOriginalCasterPointer(); for(int i = 0; i < MAX_EFFECT_INDEX; ++i) - m_currentBasePoints[i] = m_spellInfo->CalculateSimpleValue(SpellEffectIndex(i)); + if (caster->GetMap()->IsDungeon()) + m_currentBasePoints[i] = m_spellInfo->EffectBasePoints[i]; + else + m_currentBasePoints[i] = m_spellInfo->CalculateSimpleValue(SpellEffectIndex(i)); m_spellState = SPELL_STATE_NULL; Especially for Wojta, please read post #341

I mean to test vehicle patch for the problem with Dual-spec The patch made the vehicle to work well, nothing more! the rest is done by the database example: /* Wintergrasp Tower Cannon */ DELETE FROM npc_spellclick_spells WHERE npc_entry IN (28366); INSERT INTO npc_spellclick_spells VALUES (28366, 60968, 0, 0, 0, 1); REPLACE INTO creature_template_addon VALUES (28366, 0, 0, 0, 0, 0, 160, NULL, NULL); REPLACE INTO vehicle_data VALUES (160, 5, 51362, 51421, 0, 0, 0, 0, 0, 0, 0, 0, 0); REPLACE INTO vehicle_seat_data VALUES (2029, 1); /* Salvaged Siege Turret */ DELETE FROM npc_spellclick_spells WHERE npc_entry = 33067; INSERT INTO npc_spellclick_spells VALUES (33067, 67373, 0, 0, 0, 1); REPLACE INTO creature_template_addon VALUES (33067, 0, 0, 0, 0, 0, 337, NULL, NULL); REPLACE INTO vehicle_data VALUES (337, 5, 62358, 64677, 62359, 0, 0, 0, 0, 0, 0, 0, 0); REPLACE INTO vehicle_data VALUES (336, 4, 62345, 62522, 62346, 0, 0, 0, 0, 0, 0, 0, 0); REPLACE INTO vehicle_seat_data VALUES (3006, 1), (3010, 1), (4026, 8), (4027, 8), (3009, 8); UPDATE `creature_template` SET `minhealth` = 1134000, `maxhealth` = 1134000 WHERE `entry` = 33067; UPDATE `creature_template` SET `unit_flags` = 16384 WHERE `entry` = 33067; DELETE FROM `creature` WHERE `id`= 33067; /* Gunner Salvaged Demolisher */ DELETE FROM npc_spellclick_spells WHERE npc_entry IN (33167); INSERT INTO npc_spellclick_spells VALUES (33167, 67373, 0, 0, 0, 1); REPLACE INTO creature_template_addon VALUES (33167, 0, 0, 0, 0, 0, 345, NULL, NULL); REPLACE INTO vehicle_data VALUES (345, 5, 62634, 64979, 62479, 62471, 0, 62428, 0, 0, 0, 0, 0); REPLACE INTO vehicle_data VALUES (338, 4, 62306, 62490, 62308, 62324, 0, 0, 0, 0, 0, 0, 0); REPLACE INTO vehicle_seat_data VALUES (3077, 1), (3106, 8); REPLACE INTO vehicle_seat_data VALUES (3011, 1), (3146, 8), (3013, 8), (3147, 8); UPDATE `creature_template` SET `unit_flags` = 16384 WHERE `entry` = 33167; UPDATE `creature_template` SET `minhealth` = 630000, `maxhealth` = 630000 WHERE `entry` = 33167; DELETE FROM `creature` WHERE `id`=33167; Note: in unifieddb 'Wintergrasp Tower Cannon' are not yet spawned. vehicle+mount still not works and you can not take passenger with your mount bike and all species of Mammoths are no longer vehicle, they are only mount. btw If you want the player when leaving the vehicle to go down near the vehicle, then use this patch: diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 5e4f22a..2d5545d 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -13691,8 +13691,8 @@ void Unit::ExitVehicle() float x = GetPositionX(); float y = GetPositionY(); - float z = GetPositionZ() + 2.0f; - GetClosePoint(x, y, z, 2.0f + v_size); + float z = GetPositionZ(); + GetClosePoint(x, y, z, 0); SendMonsterMove(x, y, z, SPLINETYPE_NORMAL, SPLINEFLAG_WALKMODE, 0); } }

We can not continue without your vehicle development and please keep working on vehicle, because I have not so much knowledge as you. No doubt in this that everybody wants You to keep repo up-to-date. And if you have time, maybe an update once a week would be wonderful for us for now. and finally many thanks for your work so far.

I have not been correct for patches from @tester20 - patch 'some fix for ramm spells' and from @Anti - patch 'energy, power, steam etc.' Nothing wrong with these patches, still work correctly. Thanks tester20 and Anti for patches.

Then you can use this patch, from Wojta's repository (branch vehicle) maybe He has no time to update repository, (or do not want?) but, warn you that still have conflict with dual-spec. Thanks to Wojta naturally! (for vehicle patch)

patch deleted, because this old Netsky's vehicle patch, also have conflict with Dual Talent Specialization. Oops I forgot this hack for DK quest 'Massacre At Light's Point', (vehicle 'Scourge Gryphon' for return/escape from the ship, already working) /* Click on Inconspicuous Mine Car to teleport on Shipboard, hack q12701 for now */ UPDATE `gameobject_template` SET `data10` = 70104 WHERE `entry` = 190767; REPLACE INTO spell_script_target (`entry`,`type`,`targetEntry`) VALUES (70104, 1, 28833); /* unifieddb fix Scourge Gryphon */ UPDATE creature_template SET minhealth = 53980, maxhealth = 53980 WHERE entry = 28864;

@Andy200877 and @Biali the database has no relevance in this case and decision is here: UPDATE quest_template SET ReqSpellCast1 = 51859, ReqSpellCast2 = 51859, ReqSpellCast3 = 51859, ReqSpellCast4 = 51859 WHERE entry = 12641; Edit: I do not know why 'tester20' deleted this important part from the .SQL file

The mammoth is not spawn, but if you want two players to sit, then that's it: /*Traveler's Tundra Mammoth */ DELETE FROM npc_spellclick_spells WHERE npc_entry in (32633, 32640); INSERT INTO npc_spellclick_spells VALUES (32633, 52196, 0, 0, 0, 0); INSERT INTO npc_spellclick_spells VALUES (32640, 52196, 0, 0, 0, 0); REPLACE INTO creature_template_addon VALUES (32633, 0, 0, 0, 0, 0, 312, NULL, NULL); REPLACE INTO creature_template_addon VALUES (32640, 0, 0, 1, 0, 0, 312, NULL, NULL); REPLACE INTO vehicle_data VALUES (312, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); /* Grand Ice Mammoth */ DELETE FROM npc_spellclick_spells WHERE npc_entry in (31857); INSERT INTO npc_spellclick_spells VALUES (31857, 52196, 0, 0, 0, 0); REPLACE INTO creature_template_addon VALUES (31857, 0, 0, 0, 0, 0, 312, NULL, NULL); REPLACE INTO vehicle_seat_data VALUES (2764, 1), (2765, 2); Or for two passengers only, but this is useless because no one to drive (vehicle + mount not works for now) /*All Mammoths (two passengers only) */ REPLACE INTO vehicle_seat_data VALUES (2764, 2), (2765, 2);

What do you want for them? 1. Vehicle + mount? -> I can not help for now 2. Two players to sit on the vehicle? (driver and passenger) this is possible from a database: /* Salvaged Chopper */ REPLACE INTO vehicle_seat_data VALUES (3005, 1), (3004, 2);

@Darkruler yes I am not the author of the patch "fix for ramm spells" (it was a mistake of Tasssadar) and properly should be so: Update for ram spells by tester20 Thanks for the new vehicle repository.

fix to the driver to sit correctly (in forward direction) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index f1c130e..54af44d 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -13614,7 +13614,7 @@ void Unit::EnterVehicle(Vehicle *vehicle, int8 seat_id, bool force) data << uint8(4); // unknown data << float(0); // facing angle - data << uint32(SPLINEFLAG_UNKNOWN9); + data << uint32(SPLINEFLAG_UNKNOWN5); data << uint32(0); // Time in between points data << uint32(1); // 1 single waypoint diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp index 4c9c081..cb66b5c 100644 --- a/src/game/Vehicle.cpp +++ b/src/game/Vehicle.cpp @@ -490,6 +490,7 @@ void Vehicle::AddPassenger(Unit *unit, int8 seatId, bool force) unit->SetUInt64Value(UNIT_FIELD_CHARM, GetGUID()); if(unit->GetTypeId() == TYPEID_PLAYER) { + ((Player*)unit)->SetMover(this); ((Player*)unit)->SetMoverInQueve(this); ((Player*)unit)->SetClientControl(this, 1); } important note: after copy/paste the patch add one empty line at bottom (otherwise the patch will fail) or make corrections by hand, (the patch is so small). note: and reminded to install this small patch after the vehicle patch ( do not forget to patch it with command: patch -p1 < name.patch )

This time you are very quick, bravo! many thanks from me to all developers of MaNGOS.

Vehicle Drake for the Oculus chain quests (13124, 13126, 13127 and 13128) patch for new MaNGOS core, which support wow patch 3.3.3a diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index abdf46e..027d92d 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -362,7 +376,10 @@ Spell::Spell( Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid o UpdateOriginalCasterPointer(); for(int i = 0; i < MAX_EFFECT_INDEX; ++i) - m_currentBasePoints[i] = m_spellInfo->CalculateSimpleValue(SpellEffectIndex(i)); + if (caster->GetMap()->IsDungeon()) + m_currentBasePoints[i] = m_spellInfo->EffectBasePoints[i]; + else + m_currentBasePoints[i] = m_spellInfo->CalculateSimpleValue(SpellEffectIndex(i)); m_spellState = SPELL_STATE_NULL; Important Note: without this core patch the items: Emerald/Ruby/Amber Essence, teleports player in his home area (very unpleasant bug). only in Dungeons not possible to switch between Primary and Secondary Talents for now. and the .SQL part for database mangos: /* the Oculus chain quests (13124, 13126, 13127 and 13128) */ DELETE FROM spell_script_target where entry IN (49460, 49346, 49464); DELETE FROM npc_spellclick_spells where npc_entry IN (27755, 27692, 27756); DELETE FROM creature_template_addon where entry IN (27755, 27692, 27756); /* Amber Drake */ INSERT INTO spell_script_target VALUES (49460, 1, 27755); INSERT INTO npc_spellclick_spells VALUES (27755, 49459, 0, 0, 0, 1); INSERT INTO creature_template_addon VALUES (27755, 0, 0, 0, 0, 0, 29, NULL, '48602 0 48602 2'); REPLACE INTO vehicle_data VALUES (29, 12, 49840, 49838, 49592, 0, 0, 0, 0, 0, 0, 0, 0); REPLACE INTO vehicle_seat_data VALUES (422, 3); /* Emerald Drake */ INSERT INTO spell_script_target VALUES (49346, 1, 27692); INSERT INTO npc_spellclick_spells VALUES (27692, 49427, 0, 0, 0, 1); INSERT INTO creature_template_addon VALUES (27692, 0, 0, 0, 0, 0, 39, NULL, '48602 0 48602 2'); REPLACE INTO vehicle_data VALUES (39, 12, 50328, 50341, 50344, 0, 0, 0, 0, 0, 0, 0, 0); REPLACE INTO vehicle_seat_data VALUES (662, 3); /* Ruby Drake */ INSERT INTO spell_script_target VALUES (49464, 1, 27756); INSERT INTO npc_spellclick_spells VALUES (27756, 49463, 0, 0, 0, 1); INSERT INTO creature_template_addon VALUES (27756, 0, 0, 0, 0, 0, 43, NULL, '48602 0 48602 2'); REPLACE INTO vehicle_data VALUES (43, 12, 50232, 50248, 50240, 0, 0, 0, 0, 0, 0, 0, 0); REPLACE INTO vehicle_seat_data VALUES (742, 3); /* Belgaristrasz and his companions give Drake, after completed quest (13124) */ UPDATE creature_template SET npcflag = npcflag|1 WHERE entry IN (27657, 27658, 27659); UPDATE `creature_template` SET `gossip_menu_id` = 27657 WHERE `entry` = 27657; UPDATE `creature_template` SET `gossip_menu_id` = 27658 WHERE `entry` = 27658; UPDATE `creature_template` SET `gossip_menu_id` = 27659 WHERE `entry` = 27659; DELETE FROM gossip_scripts WHERE id IN (27657, 27658, 27659); INSERT INTO gossip_scripts VALUES (27657,0,17,37815,1,0,0,0,0,0,0,0,0), (27658,0,17,37860,1,0,0,0,0,0,0,0,0), (27659,0,17,37859,1,0,0,0,0,0,0,0,0); DELETE FROM gossip_menu_option WHERE menu_id IN (27657, 27658, 27659); INSERT INTO gossip_menu_option VALUES (27657,0,0,'Take the Emerald Essence if you want to fly on the wings of the Green Flight.',1,1,0,0,27657,0,0,NULL,9,13126,0,16,37815,1,0,0,0), (27657,1,0,'Take the Emerald Essence if you want to fly on the wings of the Green Flight.',1,1,0,0,27657,0,0,NULL,9,13127,0,16,37815,1,0,0,0), (27657,2,0,'Take the Emerald Essence if you want to fly on the wings of the Green Flight.',1,1,0,0,27657,0,0,NULL,9,13128,0,16,37815,1,0,0,0), (27659,0,0,'Take the Amber Essence if you want to fly on the wings of the Bronze Flight.',1,1,0,0,27659,0,0,NULL,9,13126,0,16,37859,1,0,0,0), (27659,1,0,'Take the Amber Essence if you want to fly on the wings of the Bronze Flight.',1,1,0,0,27659,0,0,NULL,9,13127,0,16,37859,1,0,0,0), (27659,2,0,'Take the Amber Essence if you want to fly on the wings of the Bronze Flight.',1,1,0,0,27659,0,0,NULL,9,13128,0,16,37859,1,0,0,0), (27658,1,0,'Take the Ruby Essence if you want to fly on the wings of the Red Flight.',1,1,0,0,27658,0,0,NULL,9,13126,0,16,37860,1,0,0,0), (27658,2,0,'Take the Ruby Essence if you want to fly on the wings of the Red Flight.',1,1,0,0,27658,0,0,NULL,9,13127,0,16,37860,1,0,0,0), (27658,3,0,'Take the Ruby Essence if you want to fly on the wings of the Red Flight.',1,1,0,0,27658,0,0,NULL,9,13128,0,16,37860,1,0,0,0), (27658,0,0,'GOSSIP_OPTION_QUESTGIVER',2,2,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0); /* hack for broken Nexus Portal */ UPDATE gameobject_template SET data0 = 49665 WHERE entry = 189985; UPDATE spell_target_position SET id = 49665 WHERE id = 49305; Edit: if you want (Drake Flag Visual) red flag on the back of the player when ride a Drake http://www.wowhead.com/item=37860#screenshots:id=159140 Then take this core patch for: (when the player dismiss a Drake to remove a red flag) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index d150a20..da67cd9 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -8077,6 +8077,7 @@ void Aura::HandleAuraControlVehicle(bool apply, bool Real) { // some SPELL_AURA_CONTROL_VEHICLE auras have a dummy effect on the player - remove them caster->RemoveAurasDueToSpell(GetId()); + caster->RemoveSingleSpellAurasFromStack(53797); } } Take and this .SQL file for database mangos: (put a red flag to the player) DELETE FROM npc_spellclick_spells where spell_id = 53797; INSERT INTO npc_spellclick_spells VALUES (27755, 53797, 0, 0, 0, 1), (27692, 53797, 0, 0, 0, 1), (27756, 53797, 0, 0, 0, 1); Last note: Do not use the command: gm on when you ride a Drake, otherwise the Drake's spells will not work.

You talk about a quest 'The Struggle Persists' (http://www.wowhead.com/?quest=13124) so, after killing the boss 'Drakos the Interrogator' (http://www.wowhead.com/?npc=27654), from wowhead.com: so it's the items, which spawn dragons (the vehicles), but these NPCs need a script to give the items. also need a script for 'Drake Flag Visual' (http://www.wowhead.com/?spell=53797) Ruby Essence http://www.wowhead.com/?item=37860 Emerald Essence http://www.wowhead.com/?item=37815 Amber Essence http://www.wowhead.com/?item=37859 I have only the data for tables: spell_script_target, npc_spellclick_spells, creature_template_addon, vehicle_data and vehicle_seat_data.

@Darkhunter after the merger of repositories (mangos [9609] and Valhalla-Project branch vehicle), I fixed the errors (CONFLICT) like this: ../src/game/Player.cpp -<<<<<<< HEAD data.appendPackGUID(aura->GetCasterGUID()); -======= - if(aura->GetCaster()) - data << aura->GetCaster()->GetPackGUID(); - else - data << uint8(0); ->>>>>>> 932a090a6d8bc1238e22c81aaad88d41a3c75050 and ../src/game/SpellAuras.cpp -<<<<<<< HEAD data.appendPackGUID(GetCasterGUID()); -======= - if(GetCaster()) - data << GetCaster()->GetPackGUID(); - else - data << uint8(0); ->>>>>>> 932a090a6d8bc1238e22c81aaad88d41a3c75050 Note: I mean, that I deleted all rows with a minus sign (-) before them.

@wellqfk do not worry, maybe you forgotten for other similar row in file SQLStorage.cpp because both tables (creature_addon and creature_template_addon) have of 9 columns. Note: these are the correct data const char CreatureDataAddonInfofmt[]="iiiiiiiss"; const char CreatureInfoAddonInfofmt[]="iiiiiiiss";

@wellqfk wait for Wojta to fix it in his repository.

The patch consists of three parts: 1. for mangos source 2. for scriptdev2 source 3. and for database mangos

Perfect! part of the errors are fixed.

You do not need from this patch, trust me the patch is not updated, because it is very buggy and your server will crash. but if you want it, I will make update soon.

after the merger of repositories (mangos [9605] and Valhalla-Project branch vehicle), then from folder 'sql' open the file 'v10_vehicle_test_data.sql' and find: speed and change to: speed_run (it has three times) or wait for Wojta to fix it in his repository, and thanks to Wojta for vehicles support.

The patches are from your repository without any change in the code and I just update them for a newest revision of mangos source code, but O.K. I can understand what your point and will stop to share the patches, and thank you for developing on patch for vehicles.

edit: enough with these patches, because there is a good news: Tasssadar / Valhalla-Project is back and you can use: http://github.com/Tasssadar/Valhalla-Project/commits/vehicle