search

Rochet2 / TrinityCore

Rochet2's stuff for TC
https://rochet2.github.io
89 stars 144 forks source link

I can't use both reforging and Transmog script. #150

Open Krutok opened 11 months ago

Krutok commented 11 months ago

Can it be that you can't use transmog and reforging at the same time, because if I install the transmog and then want to install the reforging, there are only conflicts.

From https://github.com/Rochet2/TrinityCore
 * branch                  transmog_legion_3.3.5 -> FETCH_HEAD
 * [new branch]            transmog_legion_3.3.5 -> rochet2/transmog_legion_3.3.5
Updating 1bea4aab45..5f5be9fa30
Fast-forward
 cmake/options.cmake                                                                     |    1 +
 sql/custom/characters/2018_11_15_00_world_transmog.sql                                  |   25 ++++
 src/server/database/Database/Implementation/CharacterDatabase.cpp                       |   16 ++-
 src/server/database/Database/Implementation/CharacterDatabase.h                         |    6 +
 src/server/game/Accounts/AccountMgr.cpp                                                 |    4 +
 src/server/game/DataStores/DBCStores.cpp                                                |    4 +-
 src/server/game/DataStores/DBCStores.h                                                  |    2 +-
 src/server/game/Entities/Item/Item.cpp                                                  |   13 ++
 src/server/game/Entities/Item/Item.h                                                    |    9 +-
 src/server/game/Entities/Item/Transmogrification.cpp                                    | 1237 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/server/game/Entities/Item/Transmogrification.h                                      |  139 ++++++++++++++++++
 src/server/game/Entities/Item/TransmogrificationDefines.h                               |  100 +++++++++++++
 src/server/game/Entities/Player/Player.cpp                                              |  153 +++++++++++++++++++-
 src/server/game/Entities/Player/Player.h                                                |   14 ++
 src/server/game/Guilds/GuildMgr.cpp                                                     |    2 +-
 src/server/game/Handlers/CharacterHandler.cpp                                           |    8 ++
 src/server/game/Handlers/ItemHandler.cpp                                                |    4 +-
 src/server/game/Handlers/SpellHandler.cpp                                               |    7 +-
 src/server/game/Spells/SpellEffects.cpp                                                 |    3 +
 src/server/game/World/World.cpp                                                         |    5 +
 src/server/scripts/Custom/Transmog/CHANGELOG.md                                         |  141 ++++++++++++++++++
 src/server/scripts/Custom/Transmog/README.md                                            |   52 +++++++
 src/server/scripts/Custom/Transmog/Transmogrifier.cpp                                   |  780 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/server/scripts/Custom/Transmog/sql/completed_quest_items_to_transmog_collection.sql |   35 +++++
 src/server/scripts/Custom/Transmog/sql/world_NPC.sql                                    |    6 +
 src/server/scripts/Custom/custom_script_loader.cpp                                      |    2 +
 src/server/scripts/Spells/spell_generic.cpp                                             |   21 ++-
 src/server/shared/DataStores/DBCStructure.h                                             |    2 -
 src/server/shared/DataStores/DBCfmt.h                                                   |    2 +-
 src/server/worldserver/worldserver.conf.dist                                            |  209 +++++++++++++++++++++++++++
 30 files changed, 2981 insertions(+), 21 deletions(-)
 create mode 100644 sql/custom/characters/2018_11_15_00_world_transmog.sql
 create mode 100644 src/server/game/Entities/Item/Transmogrification.cpp
 create mode 100644 src/server/game/Entities/Item/Transmogrification.h
 create mode 100644 src/server/game/Entities/Item/TransmogrificationDefines.h
 create mode 100644 src/server/scripts/Custom/Transmog/CHANGELOG.md
 create mode 100644 src/server/scripts/Custom/Transmog/README.md
 create mode 100644 src/server/scripts/Custom/Transmog/Transmogrifier.cpp
 create mode 100644 src/server/scripts/Custom/Transmog/sql/completed_quest_items_to_transmog_collection.sql
 create mode 100644 src/server/scripts/Custom/Transmog/sql/world_NPC.sql
From https://github.com/Rochet2/TrinityCore
  * branch reforming_3.3.5 -> FETCH_HEAD
  * [new branch] reforging_3.3.5 -> rochet2/reforging_3.3.5
Auto-merging src/server/scripts/Custom/custom_script_loader.cpp
CONFLICT (content): Merge conflict in src/server/scripts/Custom/custom_script_loader.cpp
Auto-merging src/server/game/Entities/Player/Player.h
CONFLICT (content): Merge conflict in src/server/game/Entities/Player/Player.h
Auto-merging src/server/game/Entities/Player/Player.cpp
Automatic merge failed; fix conflicts and then commit the result.

It would be nice if you could use both.

Rochet2 commented 10 months ago

I have not found any good ways to make the installation easier. Suggestions are welcome.

Currently you would normally use git apply --reject which applies all it can and creates .rej files that you need to apply manually because automaton cannot do it.

Krutok commented 10 months ago

Alternatively, if you pack transmog and reforging in one patch? But I think the effort would be greater then, right?