BUG shared file with BBAI

[entwood]

I believe this file is shared between BUG and BBAI. Is it ok or the correct procedure to overlay and use the BBAI file when merging BUG and BBAI? or does this present any sort of issue?

CIV4EventInfos.xml

 

[MadmanAtW]

I believe (and I don't work on either project, so don't necessarily take my word, but I did a diff and looked at the differences) that you should keep the BUG version of that file. It's the same as the BBAI version except it adds some python callbacks.

 

[EmperorFool]

BUG and BBAI both include the Python and XML fixes from the unofficial patch. Unfortunately, we have different release cycles and thus different versions of the UP. I would keep whichever file is newer in this case or grab the latest file from the UP itself.

It gets really complicated including the UP in our mods, but we do it because it's easier for the user that uses only one or the other.

 

[MadmanAtW]

In that case, having looked in the UP SVN I think the BBAI version is the correct one to keep.