How do I merge two versions of one file together? -1 reply

  • 1
  • 2

Please wait...

Amraam

I follow teh Moo!

50 XP

30th April 2008

0 Uploads

749 Posts

0 Threads

#1 10 years ago

Hey all,

I have OL2 and FCAR installed. I want to download some weapons mods.

Namely this L85 mod:L85 Weapon Pack, Stalker Downloads, Stalker Weapon

However it uses the same files as OL2 so I can't just CnP.

So how would I get that working in Ol2?

Thanks!




Atrocious

Oblivion Lost supplier

50 XP

25th March 2008

0 Uploads

1,448 Posts

0 Threads

#2 10 years ago

Use Winmerge (URL) or Compare It

Winmerge has an online manual (URL) to learn the functionality.

I'm going to post some screenshots later.




Amraam

I follow teh Moo!

50 XP

30th April 2008

0 Uploads

749 Posts

0 Threads

#3 10 years ago

Atrocious;4384291Use Winmerge (URL) or Compare It

Winmerge has an online manual (URL) to learn the functionality.

I'm going to post some screenshots later.

Wow thanks that's an awesome program! Perfect for what I need :)




Atrocious

Oblivion Lost supplier

50 XP

25th March 2008

0 Uploads

1,448 Posts

0 Threads

#4 10 years ago

Here are some more tips with screenshots. In the examples, I assume that on the left there is the new file and on the right the old one. So you want to transfer changes from left to right. Example one:

Spoiler: Show

moveblocksmr6.jpg

This is the easiest case. On the left something new came into the file. Just move it over to the right.

Example two:

Spoiler: Show

attentionoverwriteqn7.jpg

Nearly the same as before, but if you look closely, you'll notice that the gun on the right side is not listed on the left. If you just move the block from the left to the right, you will overwrite the right gun. This may be okay, but maybe you want to keep it, so you'd have to copy the left block and put it underneath the right weapon.

Example three:

Spoiler: Show
chardiffnodiffme4.jpg In this case, the lines are not completely different. The dark orange parts are equal and the light orange parts are different. But: In the example above, there is no real difference. The first bright orange blocks show only that there are spaces or TABs that are non-existent in the left file. The second bright orange parts actually have different content, but since the content is behind ; it is not used by the file. Everything behind a ; in an ltx file is a comment. So don't worry about changes there.

Example four:

Spoiler: Show

chardiffcommentrw0.jpg

Another case where the lines are nearly different. On the left, the line has been commented-out. By putting a ; the modder disabled the line. It's your task to consider if the line is needed to be active in your merge, or if it should be commented-out as well. If you activate that line or put in other lines into an ltx file, make sure the line doesn't already exist somewhere!

Example five:

Spoiler: Show

scriptvo9.jpg

The other examples were about ltx files. Now this is an example about script files. For merging script files you should have some understanding of scripting. In cases like this one, it is your task to decide whether the left or the right script part is appropriate for your merge. Should you keep the riginal or put in the new line? Not always easy to decide.

Good luck! Please don't ask authors of mods about help, because your merging doesn't work properly. That's a general request, not especially to the thread starter. If merging fails, it is most probably because the merger didn't have enough knowledge about what he was doing.




Lord Pariah

Forlorn Hopes Crusader

50 XP

10th June 2008

0 Uploads

304 Posts

0 Threads

#5 10 years ago

does this utility allow you to add new line in the correct place to a modded ltx file? example i have mod 1 stating trader supplies as follows: ammo_9x18_fmj = 5, 1 ammo_9x18_pmm = 5, 1 ammo_9x19_pbp = 5, 1 ammo_9x19_fmj = 5, 1

in the new mod mod 2 we have ammo_9x18_fmj = 5, 1 ammo_9x18_pmm = 5, 1 ammo_9x19_pbp = 5, 1 ammo_9x19_fmj = 5, 1 ammo_12.5x54_abf = 5, 1

would it add this line in the correct place IE supplies start, or would it add this line at the end of the document? if so is by hand the best method still for modding?




Atrocious

Oblivion Lost supplier

50 XP

25th March 2008

0 Uploads

1,448 Posts

0 Threads

#6 10 years ago

It will add stuff wherever you tell it to. Can be in the middle of the document, as well. It doesn't do things automatically. It just compares two files and looks for common parts and differences. Then it shows you both files next to each other, with each line next to the referring line from the other file. That doesn't always work. But in most cases it finds the correct relations.




Lord Pariah

Forlorn Hopes Crusader

50 XP

10th June 2008

0 Uploads

304 Posts

0 Threads

#7 10 years ago

ah ok thanks. So if you have the time Manual is still the best best for a crash free game. Thanks




Amraam

I follow teh Moo!

50 XP

30th April 2008

0 Uploads

749 Posts

0 Threads

#8 10 years ago

Obviously I would get permission first, but if anyone wants the merged files that will add the L85 weapon pack into an OL2 modded game, let me know and I can forward them onto you :)

The L85 shotgun version is awesome :D




Amraam

I follow teh Moo!

50 XP

30th April 2008

0 Uploads

749 Posts

0 Threads

#9 10 years ago
Lord Pariah;4384806ah ok thanks. So if you have the time Manual is still the best best for a crash free game. Thanks

Yeh IMO, editing the trader files the old fashioned way is best. helps you to understand what it all does too.

However, editing those weapon files etc is definitely best done with the likes of WinMerge. Otherwise, you'd be there forever comparing every line in dozens of files.




Guest

I didn't make it!

0 XP

 
#10 10 years ago

Amraam;4388584Yeh IMO, editing the trader files the old fashioned way is best. helps you to understand what it all does too.

However, editing those weapon files etc is definitely best done with the likes of WinMerge. Otherwise, you'd be there forever comparing every line in dozens of files.

Have you tried Smart Mod Manager?

It has successfully merged several weapons packs into both ABC and OL2 for me.

Use the earlier version, I have not had any luck with the most recent release.




  • 1
  • 2