strategyonly
C2C Supreme Commander
Are you saying that if your file and the new BUG file both modify the same line, it's harder to merge?
No, thats not what i mean, I am saying is
1. You have "see run", i have: "if iBuildingType == gc.getInfoTypeForString( 'BUILDING_BRIDGE' ):
pPID = pPlayer.getID()"
2. You have "run run", i have : "see run"
3. You have "Run", i have: pPlayer = gc.getPlayer(pCity.plot().getOwner())
Winmerge does not pick up on these, only if they are supposed to be in the same area.
So i'd have to go line by line, and in big python files, well for ME that would almost be impossible. (No python experience)
And i know if you even miss a "." you could mess the whole file up.
I guess its hard for me to explain, cause i dont know python, but you think its easy because you KNOW python, but thats like me being a Dentist and you being a Physician. Both Dr's but have no idea what the other does.
btw, i dont have BUG in my mod already, if thats what your saying also.
And again if i use BUG in the Custom Area like you'll said in a regular game(no mod), works ok, but as soon as i use MY mod, nothing.
If you dont have time to merge thats ok, i just wanted the eye candy stuff anyways, like Great General, and the bigger white "arrows" area near the bottom middle right area, i really dont like all the arrows icons before them though. (looks messy).
If you can thats great if not, thats ok also.