TrinityCore 3.3.5 Rochet2 scripts and Sunwellcore

[BuxBunny]

Hello,
I was wondering if Sunwellcore and Rochet scripts (mainly : Transmog / Multivendor / itemgossip ) are compatible with eachother, because I can't seem to pull them into the source (merge conflit).
Thank you.

 

[Rochet2]

You should not try to pull. Pulling is intended only for vanilla TC.

I recommend trying applying the modifications as .diff

 

[BuxBunny]

You should not try to pull. Pulling is intended only for vanilla TC.

I recommend trying applying the modifications as .diff

My whole life is built on a lie *sighs*


EDIT :
tried diff

root@ns3033723 MINGW64 ~/Desktop/sc/Sunwell (master)
$ git apply transmog.diff
error: patch failed: src/server/game/DataStores/DBCStores.cpp:122
error: src/server/game/DataStores/DBCStores.cpp: patch does not apply
error: patch failed: src/server/game/DataStores/DBCStores.h:134
error: src/server/game/DataStores/DBCStores.h: patch does not apply
error: patch failed: src/server/game/DataStores/DBCStructure.h:1171
error: src/server/game/DataStores/DBCStructure.h: patch does not apply
error: patch failed: src/server/game/DataStores/DBCfmt.h:75
error: src/server/game/DataStores/DBCfmt.h: patch does not apply
error: patch failed: src/server/game/Entities/Player/Player.cpp:12078
error: src/server/game/Entities/Player/Player.cpp: patch does not apply
error: patch failed: src/server/game/Entities/Player/Player.h:29
error: src/server/game/Entities/Player/Player.h: patch does not apply
error: patch failed: src/server/game/Handlers/SpellHandler.cpp:26
error: src/server/game/Handlers/SpellHandler.cpp: patch does not apply
error: src/server/scripts/Custom/custom_script_loader.cpp: No such file or directory
error: patch failed: src/server/scripts/Spells/spell_generic.cpp:38
error: src/server/scripts/Spells/spell_generic.cpp: patch does not apply
error: patch failed: src/server/worldserver/worldserver.conf.dist:3719
error: src/server/worldserver/worldserver.conf.dist: patch does not apply

 

[Rochet2]

The multivendor and gossip should work better.
But transmog is quite different. Sunwell doesnt match TC in many places due to rather recent changes.
You just have to either use --reject flag when applying and fix the code yourself,
or you can try find an older diff and use that .. and probably fix some of the code yourself.