mrelfire

Try looking through the commit log and undo any commits that added it. (I tried but couldn't find it)

this is my problem

Sorry to say this.. But I weren't able to pull a single revision from xeross's branch. I keep having this /game/World.h file conflict.

2010-04-19 18:28:11 [dbg] CONFLICT (content): Merge conflict in src/game/World.h

2010-04-19 18:28:11 [std] Automatic merge failed; fix conflicts and then commit the result.

All the times I used a clean MaNGOS. Only thing I did was git pull to add the AHBot. If I'm doing something wrong, please tell me what to do.

Thank you

Yes there is a merge conflit to solve manually

can anyone confirm that xeross' ahbot branch buyer works? since switching from naicisum's ahbot to xeross' i'm noticing the buyer fails to do anything (yes, settings are enabled)

It is working.

I have tryed to ocmpile this morning with latest mangos core and I have this problem :

10>..\\..\\src\\game\\PlayerbotAI.cpp(507) : error C2065: 'SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED' : undeclared identifier

10>..\\..\\src\\game\\PlayerbotAI.cpp(517) : error C2065: 'SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED' : undeclared identifier

Modify DBC, not allowed to discuss here I think so all I will say.

I do not want to modify the dbc at all, just the code to take into account the values.

Before we had a table where we were able to change the max number of people inside a dungeon.

today it is linked (as I understood) to dbc files.

Any ideas to bypass this limitation please ?

Can you xeross155 take jsee code for wordl.h please ?

mrelfire: Awesome job dude, how could I ever forgot that one

Pushed to ahbot repo: http://github.com/xeross/mangos/commit/bcc75708e8548e1b0f04220fca0f86f5b92ac2e4

you should thanks jsee

Please a "Patch" file

I know you like us to clone a repositry but this mean you need to keep your repository updated with the mangos repository .... i would prefer a patch file that i can add

Thanks

you can create a patch file from a repository, it it better tou update the git repository, after you do what you want

The variable never gets initalized from config.

Code diff:

diff --git a/src/game/AuctionHouseBot.cpp b/src/game/AuctionHouseBot.cpp

index b4a60d2..26ff572 100644

--- a/src/game/AuctionHouseBot.cpp

+++ b/src/game/AuctionHouseBot.cpp

@@ -874,6 +874,8 @@ void AuctionHouseBot::Initialize()

{

debug_Out = sConfig.GetIntDefault("AuctionHouseBot.DEBUG", 0);

+ ItemsPerCycle = sWorld.getConfig(CONFIG_UINT32_AHBOT_ITEMS_CYCLE);

+

if (!sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_AUCTION))

{

LoadValues(&AllianceConfig);

This is it !!!! it works ! Thanks !

Read gigelfs comment, searched through the code. Quickly ... ~1 minute:

// Added by AHBot, Unknown use (Commented)
   /*if(sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
       AH->auctioneer = 23442;
   else
       AH->auctioneer = GUID_LOPART(auctioneer);*/

You commented a line you didn't understand. That was (a) a bad idea and (b) causes at least gigelfs trouble, don't know about the others, stopped following this thread. That's why I don't know if uncommenting will solve all your problems. Haven't checked the rest of your branch, as I still use the old Naicisum branch with MinimalLoad modification by chucky.black.

Skirnir

I do not manage to solve the conflict problems with the old Naicisum branch, can you share your results please ?

Weird they both work fine for me, I'll try creating a new transparent testing setup with a fresh install.

Please can you provide your full patch file with you sql tables ?

Seems there's some kind of weird condition needed for the items to appear in the auction house, though I have no idea what it could be.

More than that, because the "buyer" dosen't work also

This is what i have done...

- use mangos core as the baseline (git.exe clone git://github.com/mangos/mangos.git %local_git_ahbot%)

- patch you redepository above this baseline (git.exe pull git://github.com/xeross/mangos.git ahbot)

-Edit Merge issues

as Mrelfire says Then extracted my Auctionhouse.cpp and auctionhouse.h into the game folder and compile..

Items are in my auctionhouse

so the only difference left are the sql table (can you extract it please in sql format so we can try to insert it "like yours")

and the config files (can you share yours ?)

when you resolve the conflict : do you add things ? do you just remove the "<<<" ?

is your auction house owner has something specific (level , race,... ?)

P.S.

I have 2 different configs in my auctionhousebot table (I have 2 servers) but I end up in the same loading

of items which is stranged

I am totally clueless to why it is working for me but not for others, I'll try creating an isolated test environment, this is just weird

Do you follow these steps:

- use mangos core as the baseline (git.exe clone git://github.com/mangos/mangos.git %local_git_ahbot%)

- patch you redepository above this baseline (git.exe pull git://github.com/xeross/mangos.git ahbot)

For those that have nothing in the auctionhouse.. Did you take the two files out of my .rar i loaded and extract them into the source/game folder?

Yes I did

and

========AuctionHouseBot========

loaded 9 grey trade goods

loaded 566 white trade goods

loaded 89 green trade goods

loaded 31 blue trade goods

loaded 3 purple trade goods

loaded 1 orange trade goods

loaded 0 yellow trade goods

loaded 1300 grey items

loaded 2891 white items

loaded 5499 green items

loaded 1739 blue items

loaded 788 purple items

loaded 0 orange items

loaded 1 yellow items

AuctionHouseBot> [AHBot-x001] is now loaded

AuctionHouseBot> updated by Xeross (Original by Naicisum, ChrisK, Paradox)

AuctionHouseBot> Includes AHBuyer by Kerbe and Paradox

WORLD: World initialized

SERVER STARTUP TIME: 0 minutes 50 seconds

but nothing inside the auction house.

is it link to a problem link to the insert goods inside the AH ?

Use git mergetool and resolve your conflicts with the default merge utility or use your favorite, once you configure Git to use it as the default.

I can do it manually but is not fun

and second I still have nothing into the AH, so it is weird

a smal conflict with latest core upgrade

From git://github.com/blueboy/mangos

* branch master -> FETCH_HEAD

Auto-merging src/game/CharacterHandler.cpp

Auto-merging src/game/Chat.cpp

Auto-merging src/game/Chat.h

Auto-merging src/game/ChatHandler.cpp

Auto-merging src/game/Group.cpp

Auto-merging src/game/GroupHandler.cpp

CONFLICT (content): Merge conflict in src/game/GroupHandler.cpp

Auto-merging src/game/Makefile.am

Auto-merging src/game/Player.cpp

Auto-merging src/game/Player.h

Auto-merging src/game/QueryHandler.cpp

Auto-merging src/game/QuestHandler.cpp

Auto-merging src/game/WorldSession.cpp

Auto-merging src/mangosd/mangosd.conf.dist.in

Auto-merging win/VC90/game.vcproj

Automatic merge failed; fix conflicts and then commit the result.

instead of

git clone git://github.com/mangos/mangos.git

you do

git clone  git://github.com/xeross/mangos.git
git checkout -b ahbot origin/ahbot

And then you'll have your ahbot modified mangos.

Yes but if you use your patch above latest mangos version

From git://github.com/xeross/mangos

* branch ahbot -> FETCH_HEAD

Auto-merging src/game/AuctionHouseHandler.cpp

Auto-merging src/game/AuctionHouseMgr.cpp

Auto-merging src/game/Chat.cpp

Auto-merging src/game/Chat.h

Auto-merging src/game/Level3.cpp

Auto-merging src/game/Mail.cpp

Auto-merging src/game/Player.h

Auto-merging src/game/World.cpp

Auto-merging src/game/World.h

CONFLICT (content): Merge conflict in src/game/World.h

Auto-merging src/mangosd/mangosd.conf.dist.in

Auto-merging win/VC100/game.vcxproj

Automatic merge failed; fix conflicts and then commit the result.

Hmm merge errors are quite normal, especially when using multiple patches, you need to use some merge tool to fix them, I still need to write a tutorial about that.

unfortunately you are my first patch.

=> I have manually resolved the conflict, change the conf files and nothing. I am sutck and no clues where to look for.

I do not change my sql config files because it was working before

any ideas ?

I am still having problems with xeross155 'repo, I have some merged problems

Am I the only one ?

The auction house is broken with the latest mangos core

welcome back balrok I am ready to use your patch and hope it will be implemented inside the core system

Did every step you posted and it just makes a blank patch file called playerbot.patch with 0kb size. and nothing inside that file.

instead of creating a patch, clone the directory from blueboy, or directly apply using git, the "git blueboy"'s branch above yours

You take his. ALL mine is, is a filebeam upload of the auctionhouse.cpp and auctionhouse.h files. So use his as you normally would then just extract my fixes to the correct folder. If you already have Xeross's Repo just extract mine into the Src/Game/ Folder So it overwrites his files.

Sorry im used to SVN and not git so im not sure how to create a patch atm...

BTW Tested and confirmed working with a fresh compilation of mangos rev 9672

No problems, I have tryed Xeross155's files and it is working. Yours change something else?