Darkruler

If you look at the first post by Laise, you can see i just recycled that part and yes, it compiles @ Janu, as far as i can see...exactly the same code

On line 5337, you can see m_spellInfo->Id is working (no change to it in recent MaNGOS commits) http://github.com/mangos/mangos/blob/master/src/game/SpellEffects.cpp

I think you somehow merged wrong... vehicle patch added 2 columns to creature_template_addon, in total there should be 9 fields on vehicle-enabled cores (right?) so the error is correct...did you change anything to your database?

good idea, stupid code (well, not stupid... but could be done more convenient i guess)

Oh, and forgot to add: making a patch file for someone isn't going to help him achieve the knowledge for the next time he encounters merge errors, helping him to solve it through git is a good, visual, way IMO

Yes, IMO he should solve it himself or ask for help in the SUPPORT section as the merge error is not caused by vehicles...this patch is meant to be implemented in the master branch..not work together with other custom patches (again, IMO) I see this as posting in the wrong thread... I was willing to help too...

as far as i understand, this is about solving merge conflicts which has nothing to do with the vehicle patch as for Biali...make a public repo and add me as a collaborator and i will solve the merge conflicts for you

I believe i've read somewhere that im allowed to bump once a day... so BUMP

Hey Blueboy... do you mind updating your repo? [9843] created a compile error and i can't seem to find a way to solve this (because of rollType not being an Uint8 anymore but an enumeration)

You called the thread "[Dev] Vehicles" which tells me this thread is about developing vehicles for implementation in the master GIT... and for implementation most things (if not all) related to vehicles should be working...that includes instances and vehicle related quests *Just my opinion* I think Tasssadar's should work with the newest rev... git pull git://github.com/Tasssadar/Valhalla-Project.git vehicle

That was not my intention... sorry if i made it seem like it was... the commits are commented and thus it's easy to see which piece you can cut out if you don't want it (at announcer parts.. "// PvP Announcer" is on top, in token part there's "// PvP Token" or smth on top... so even people who don't know what cherry-picking means should be able to figure it out IMO

Ah, yeah sorry... lol...must've been a bit sleepy Anyway, updated my post...perhaps this will suit your needs?

isn't this easy enough? Celestial Steed: diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 5f8439e..a76efd7 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -5806,6 +5806,38 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx) m_caster->CastSpell(unitTarget, 72588, true); return; } + case 75614: // Celestial Steed case 72286: // Invincible { if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; // Prevent stacking of mounts unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED); uint16 skillval = ((Player*)unitTarget)->GetSkillValue(SKILL_RIDING); if (!skillval) return; if (skillval >= 225) { - uint32 spellid = skillval >= 300 ? 72284 : 72283; + if m_spellInfo->Id == 72286 + uint32 spellid = skillval >= 300 ? 72284 : 72283; + else if m_spellInfo->Id == 75614 + uint32 spellid = skillval >= 300 ? 76153 : 75617; SpellEntry const *pSpell = sSpellStore.LookupEntry(spellid); // zone check uint32 zone, area; unitTarget->GetZoneAndAreaId(zone, area); SpellCastResult locRes= sSpellMgr.GetSpellAllowedInLocationError(pSpell, unitTarget->GetMapId(), zone, area, unitTarget->GetCharmerOrOwnerPlayerOrPlayerItself()); if (locRes != SPELL_CAST_OK || !((Player*)unitTarget)->IsKnowHowFlyIn(unitTarget->GetMapId(),zone)) + { - unitTarget->CastSpell(unitTarget, 72282, true); + if m_spellInfo->Id == 72286 + unitTarget->CastSpell(unitTarget, 72282, true); + else if m_spellInfo->Id == 75614 + unitTarget->CastSpell(unitTarget, 75620, true); + } else unitTarget->CastSpell(unitTarget, pSpell, true); } else if (skillval >= 150) - unitTarget->CastSpell(unitTarget, 72282, true); + { + if m_spellInfo->Id == 72286 + unitTarget->CastSpell(unitTarget, 72282, true); + else if m_spellInfo->Id == 75614 + unitTarget->CastSpell(unitTarget, 75620, true); + } else - unitTarget->CastSpell(unitTarget, 72281, true); + { + if m_spellInfo->Id == 72286 + unitTarget->CastSpell(unitTarget, 72281, true); + else if m_spellInfo->Id == 75614 + unitTarget->CastSpell(unitTarget, 75619, true); + } return; }

something like if GetInstanceId != 0 _player->GetGroup()->Disband(true); Note: just guessing

Found this thread...might as well share this: http://github.com/Hellscream/Core/commit/43023770f04208b6933191b7ff20d8f7ac67d0f3 http://github.com/Hellscream/Core/commit/d24da97402ac167ee625ea5473d424cff1c42751 before you ask..no i'm not going to split the commit (it's both PvP announcer and PvP Token in one)

I'm running http://github.com/Tasssadar/Valhalla-Project/tree/vehicle with your Oculus and Tester20's ram spell fix...that's all

Traponinet... do you or do you not have dualspec and vehicles working together (in other words... can you still switch back to the 1st spec after switching to the 2nd) if yes: can you post the fix? i don't want to remove the old vehicle patch from my core to apply a new patch...

I totally agree... and i think Traponinet (if he/she wants to) should start the repo and add collaborators that can prove theirselves

The problem is that you can't switch back to the first spec after you've switched to the 2nd one (caused by the Vehicle patch...verified by various users)

Compile error in the SD2 AI part... 1>..\\scripts\\world\\npcs_special.cpp(2193) : error C2027: use of undefined type 'Spell' 1> c:\\sources\\hellscreamcore - kopie\\src\\game\\Unit.h(295) : see declaration of 'Spell' which also causes 1>..\\scripts\\world\\npcs_special.cpp(2193) : error C2227: left of '->m_targets' must point to class/struct/union/generic type 1>..\\scripts\\world\\npcs_special.cpp(2193) : error C2228: left of '.getUnitTargetGUID' must have class/struct/union the piece of code in which this occurs is if (Spell* pSpell = pOwner->GetCurrentSpell(CURRENT_GENERIC_SPELL)) targetGUID = pSpell->m_targets.getUnitTargetGUID(); MaNGOS rev = 9788 Anyone an idea on how to solve this? NVM, have to include spell.h sorry to bother you guys! :cool:

This is not directly related to the MaNGOS support section, ask this on the UDB forums

perhaps this is what you're looking for? http://github.com/Tasssadar/Valhalla-Project/commit/74b7b5ff8be8febf07493d913bf81d2512b2121f

Changed into a patch file, thanks for the hint Faramir... it DOES look better (and applying is easier)

a space in a comment can't have caused this Salja...