Merging LUA

[jgoasrec]

I hope someone can help me...
I'm using mac to play civ5 BNW so I download the civ5mod files.
I want to use two different mods, but they both change cityview.lua, hence, they conflict each other when I play Civ5 and do not work correctly.

My question is is there a way to merge both lua files so that there is no conflict?
What are the considerations before merging two lua files?

 

[whoward69]

First question you need to answer is "Are both mods working on the same copy of the core file?"

Given that BNW has only just come out, there is a good chance that one mod may be using CityView.lua from G&K and the other from BNW - if not, the chances of merging them are slim to nil (as you'll be inadvertently copying old stuff into a new core file, or vice versa)

Assuming both mods ARE working from the same core file, you just need a good "diff" program - whatever the Mac equivalent of WinDiff or BeyondCompare is

 

[jgoasrec]

I would be using FileMerge for Mac.

Assuming, they are working on the same core file. Do I proceed in just copying all the changes from one lua to another?

 

[whoward69]

I would be using FileMerge for Mac.

Assuming, they are working on the same core file. Do I proceed in just copying all the changes from one lua to another?

Basically. But then copy them all back over the other file as well, as you can't guarantee the load order of the lua files

 

[jgoasrec]

thanks I will try it! =D

 

[jgoasrec]

it still doesn't work. =(

 

[whoward69]

Enable logging and check the lua.log file - you've possibly made an error with the merge

 

[jgoasrec]

how do i enable logging?