Quick Question (hopefully)

[andyplaysgames]

I haven't messed with my server back end much for a while so I'm a bit rusty on it.
I wanted to update my LSB and the game itself as I am quite a bit outdated, but I need a refresher on how to do that without corrupting the whole thing and needing to start over.
I want to protect the characters I've made and if possible, protect my server settings, shop additions, that type of thing as I assume LSB will revert to original versions of the store and shops I've edited. That for the most part is the extent of the changes I've made.
Please refresh me on how to do a basic LSB update and I assume a manual client update would be needed as well although that is pretty straightforward.

Thanks

[cocosolos]

The quick start guide in the wiki has a section for updating. Expand the section for your platform then scroll down to the To Update section. Before you run the dbtool.py update step, you can do dbtool.py backup to backup your database, or set auto_backup in config.yaml to 1 (for a full backup) or 2 (for protected character data only). You shouldn't be editing server/settings/default/ so if your settings are in server/settings/ they should be fine, but pay attention to any conflicts git tells you about.

Anything that you've changed in the database (mob stats or drops for instance) will be reset, so make sure you're using the module system when you can instead of directly using sql queries or editing files.

The client setup guide has a section on updating the client.

[andyplaysgames]

Ok so here is what I did:
So I followed the steps through the Build ALL step and when restarting my 4 processes I get this message in the map window and it immediately closes.

[cocosolos]

Re-run the dbtool step but do this instead dbtool.py update full. It'll pull in the missing triggers. I'm not sure what caused that but I had the same issue.

[andyplaysgames]

I have the dbtool open and ready to do something with it, but it isn't actually telling me what option to do.

[andyplaysgames]

Ok running the db update option now.

[andyplaysgames]

Hmm, got a red message that was too fast to read mid way through the update and the window closes.

[andyplaysgames]

Ok THIS time i'll do exactly what coco says after more thoroughly reading it.

[andyplaysgames]

Sorry for the newbish questions:
I did the update full command instead and eventually got to log in (had to grab the newest xiloader as well as update the SE client).
Then I started getting all of this junk when loading MAP. (and a lot more than the screen shot shows)

But after this was still able to get as far as the character select screen and got error 0033
So then I thought well I'll just re run the whole update process then saw that I must not have dealt with these 'merges' the first time around.

So now my question is how do i deal with these merges?
These are scripts that I have made changes to but they work. (adding items for sale in these vendors, increasing kick attack dmg etc).

[cocosolos]

When you try to pull in changes from LSB, and you also have made changes to the same file, git doesn't know what to do and you need to read through the code and figure out if your code is still compatible the the new code and adjust it as needed.

You need to resolve the merge conflicts. There are all kinds of tools to assist you with this but it's gonna be preference so I suggest hitting up Google on how to resolve merge conflicts for suggestions.

[andyplaysgames]

Question: the "git rm " command. Does the rm mean Remerge or Remove? I suspect remove because once I did the whole process again some of these files were missing and I have to create them again manually to get the errors in "MAP" to go away.
/em facepalm

[andyplaysgames]

Ok so after much frustration I delete the whole server folder and followed the initial steps to step up the server from scratch. I seem to have been successful at that, but now I am having trouble logging into the game. Getting POL 0033 and can't get to character select screen. I feel like maybe my DB (which still exists in Heidi) maybe it's talking to my server?

[andyplaysgames]

Ok i got things working again. Not sure how. But i am in the game and playing with characters intact. /shrug