Jump to content
hambeast

[TUTORIAL] How to use Diffmerge to update custom scripts and overrides

Recommended Posts

We all know that feeling, you just got your server tweaked and optimized just how you like it and an Epoch update comes out!  OH NO! what do we do?  Wait for the mod authors to release their own patch?  Hell no!  We diffmerge!

 

If you followed my guide on how to override mod files, you may be asking "what happens if the files we overrode changed on an update?"  well the answer depends if it was changed.  Here is how you can locate all the changes if there are any and make the changes needed to keep your server running.

 

What you'll need: Diffmerge, A working copy of DayZEpoch Server, modifications

Difficulty: Advanced

 

 

Scenario 1: An epoch mod update came out and you being a good admin want to make sure there were no changes made to your reference file.

For this guide, we will assume you modified the variables.sqf by using my tutorial

 

  • Locate the files you have made changes to
  • Locate the original file
  • Diffmerge the two files and compare changes, merging where necessary
  • Right click your original file and select "Diffmerge->Open With Diffmerge"
  • Click "Browse" on the 2nd line referencing the "right" file.  Note diffmerge always goes from left to right.  Meaning the file you wish to change or update needs to be on the right hand side!

Here's what the diffmerge window looks like, note the changes in red.  You can see where we added the new class reference.

WoSoCBn.png

 

If we click the down arrow (Next Change) we can scroll all the way to the right and see where we added our new skin

 

2Iw0pNC.png

 

 

That's it.  Just take a look at all the changes and use your reasoning to determine if you need to make changes.

 

If you are being studious, you may have noticed a few more changes near the bottom of the file represented by the red "-" on the left.  Ignore these, normally you would only see the top two changes.

Share this post


Link to post
Share on other sites

WOW THANKS SOO MUCH

this may remove my fear of trying to find the changes in 1.0.4.2 and 1.0.4.2a

I have not upgraded my server yet. been procrastinating  didn't want to re-script everything I looked for an hour or so to see if I could see any changes

I heard it was only in server_monitor but I didnt see any changes...

maybe this great tool will help find it...

 

thankz

Share this post


Link to post
Share on other sites

WOW THANKS SOO MUCH

this may remove my fear of trying to find the changes in 1.0.4.2 and 1.0.4.2a

I have not upgraded my server yet. been procrastinating  didn't want to re-script everything I looked for an hour or so to see if I could see any changes

I heard it was only in server_monitor but I didnt see any changes...

maybe this great tool will help find it...

 

thankz

No Problem! Glad I could help yout.

 

You do know theres a plugin for Notepad++, that is way better then Diffmerge, right?

And can it compare entire directory trees?  If so, I'll have to check it out.  One major bonus diffmerge has going for it is comparing entire PBO's to eachother.

 

Here is a screenshot for those who don't know.  This is the difference in the Dayz_Epoch_Server.pbo from 1.0.4.2 to 1.0.4.2a.  As we can see, there are only 2 files with changes made between these versions.  Now we don't have to hunt down every single file.  

pwq7P7H.png

 

edit:  Here's a pic showing more changes going from 1.0.4 to 1.0.4.2a

a3SVBr4.png

Share this post


Link to post
Share on other sites

The plugin can be download stright from Notepad++, its under the plugins--->Get more Plugins, Only one called Compare. Then it works great. I dont recommed the whole directoy scan, since it will show epochs updated from vx.x to the new server and that might cause people to fu*k up, so just remeber what mods were put in and what files were edited.

Share this post


Link to post
Share on other sites

I would suggest all to download Ultraedit and Ultracompare. Its Notepad++ on steroids.

Its 'compare' program is the best i've seen

 

But it is also US$99 for both and Notepad++ is free.  DiffMerge, whilst free seems to have nagware to register for a small fee (how much is the fee ?).

 

I did like Ultraedit when I did the free trial but probably not $99 over Notepad ++.  Saying that, Notepad++ text colouring is a bit annoying with some items being light blue or grey on a white background.  Makes reading printed copies hard as well but that is more due to the syntax highlighting configuration I suspect.

 

RB

Share this post


Link to post
Share on other sites

We all know that feeling, you just got your server tweaked and optimized just how you like it and an Epoch update comes out!  OH NO! what do we do?  Wait for the mod authors to release their own patch?  Hell no!  We diffmerge!

 

....

 

Nice writeup.

 

Have been using wingrep and windiff and Notepad ++ but will now also take a look at this.  Could help work out what changes users need to make to get a newly developed mod working (changes sometimes go unrecorded when debugging) :).

 

RB

Share this post


Link to post
Share on other sites

Nice writeup.

 

Have been using wingrep and windiff and Notepad ++ but will now also take a look at this.  Could help work out what changes users need to make to get a newly developed mod working (changes sometimes go unrecorded when debugging) :).

 

RB

 

thanks, I also find windows grep to be extremely useful.  Mostly for locating variables or finding guids in log files.

 

Be careful tho, I've seen windows grep lock files so if you have an automated build process going it could screw with that.

Share this post


Link to post
Share on other sites

I downloaded the trial version of Ultraedit and UltraCompare.   Sure UltraCompare does a line-for-line and character-by-character comparison but I don't see anything about the editor knowing anything about .SQF files or any other filetypes in the Arma2/Epoch filesystem.  And I did a quick Google search for anyone that has created an import files that tell it how to handle .SQF files.   No luck.  At least there is one for Notepad++ - so tell me again what makes Ultraedit so great for Arma2 files?

Share this post


Link to post
Share on other sites

Brilliant tutorial. Thanks for making and sharing this mate. I've been getting around to learning about this for a while now but this is immensely helpful.

 

A really useful string to have in your bow.

Share this post


Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...

  • Similar Content

    • By Nytrex
      Hello there!
      Not my first work, but also not the best!
      I'm just starting a own server, and adding a bit of customstuff for the future players.
      I wanted to share that stuff with you, so you can use it aswell, if you going to like it.
      Screenshots at the end Quote
      Tested on a ARMA 2 DAYZ Epoch server - 1.0.6.1
      I also changed the important "Map_" classnames to "Land_" so there will be loot in all the barracks, and the Super market :)
      Download: http://www.mediafire.com/file/b2winspp45saavs/balota.sqf
      1. Create folder for all your buildings in your dayz_server.pbo // Skip this if you already got one!
      2. Put the downloaded balota.sqf in this folder" 
      3. Go to your dayz_server.pbo again, head to the "init" folder, and add at the bottom from server_functions.sqf this:
       
      4. Repack your dayz_server-pbo, upload it again - There you go! 
       
      Screenshots:
       
      If youre are interested in the server, take look here: Community Server by Impact eSport
      Thanks for tuning in! If you find any bugs, just let me know them!
    • By Gabriel12237
      Hello Community i need help .

      Sorry for my bad english. Im from germany and i need help.

      I Have Advanced trading and Single currency 3.0 (without global banking) from zupa, and when i sell or buy in the normal trading menu , the trader dont use coins from me. With advanced trading menu the trader use coins for the item.

      Pls help me.

      Thx
    • By chi
      I have looked but can't find any info on this anywhere....
       
      I wanted all of my buildables to be set to right click the toolbox. I have it all set up right with 46 items in the drop down menu. The drop down menu will not load and it breaks the crafting window when I load that many. I haven't tried to figure out how many possible entries I can have in the drop down menu without breaking anything, but i did just try to put 4 items in it and it worked fine.
      Does anyone know:
      ---how many entries the menu will hold without breaking
      ---If it is possible to change the max number of items it holds
      ---Or if i just have to make a second right click entry for the toolbox and have a whole other crafting window pop up with a different sets of items?
       
      Thanks in advance!!!
    • By mgm
      Following the forum software upgrade, this post became invisible. I can't seem to make it work any more not sure what's wrong and don't have the time to mess with it any more.
       
      Here is a quick fix, I took the code 1st post BB code and converted to HTML.
      Published the resulting HTML code in GitLab repo at https://gitlab.com/themgm/Arma_3_Misc/raw/master/HOWTO_setup_Arma_3_Epoch_Dedicated_Server/HOWTO_setup_Arma_3_Epoch_Dedicated_Server.html
       
      Sadly the one above does show as TEXT and not HTML web page.
       
      Here is a hack to the hack, I copy & pasted the code to a web developer pastebin-like site, here is the link:
      http://output.jsbin.com/cejamiwaxa
       
      Until I have time to troubleshoot just use the above link please.
       
      To mods: this new forum software does seem to suck BTW :(
       
    • By Zupa
      Version 2.1 Released.
      Alternative selling/buying system. ( Run default & this one next to each other ).
      Supported:
      Config traders Single Currency & Default Currency Selling/Buying everything from and to Gear/Vehicle/Backpack Not supported
       No database traders (database traders make your server slow)  No ability to buy or sell vehicles. What was added to 2.0  Default Currency Supported Item Filter Info display of selected Item Buying to gear and backpack What was added to 2.1Fixed content display of vehicles and backpacks. Description
      Sell directly from backpack, gear or the vehicle ( close) where you were driver from. Decide which items you sell. Traders will only make it possible to trade the items they accept ( goes fully automatic, so only items they accept will be listed on the left).
      You push items to the right to sell, only the items on the right willl get sold.
      Safety measurements
      Double checks what was deleted from backpacks/vehicles so that people can not cheat. Can only sell from your backpack and the vehicle were u was the last driver from ( in 30m radius)  
      Update 1.0 - 2.0 instructions  Delete your old 'zupa' folder  Paste the new 'zupa' folder  Edit the config.sqf to match your server  Done https://github.com/DevZupa/AdvancedTrading/releases/tag/v2.1   Items only show for admins when using infiSTAR AH & Admintools ?! Update infiSTAR to latest version. edit config.sqf to reflect your server correctly.  
      Installation instructions
      Code:
      https://github.com/DevZupa/AdvancedTrading/releases/tag/v2.1
      Install Instructions
      0. Drop the zupa folder in your mission file   1. In your fn_selfactions.sqf
      Place:
      _buyV = player addAction ["<t color='#0059FF'>Advanced Trading</t>", "zupa\advancedTrading\init.sqf",(_traderMenu select 0), 999, true, false, "",""]; s_player_parts set [count s_player_parts,_buyV]; above
      // Database menu _buy = player addAction [localize "STR_EPOCH_PLAYER_289", "\z\addons\dayz_code\actions\show_dialog.sqf",(_traderMenu select 0), 999, true, false, "",""]; s_player_parts set [count s_player_parts,_buy]; 2. in description.ext, add the following on the bottom
      #include "zupa\advancedTrading\ZSCdefines.hpp" // if u don't have it from ZSC #include "zupa\advancedTrading\advancedTrading.hpp" 3. Add the following exceptions to your antihack if needed
      AdvancedTrading 711197 4. Edit the config.sqf to match your server.
       
      Screenshots:
       
       

       
  • Advertisement
  • Supporters
  • Discord

×
×
  • Create New...