I having a rough go at merging of two file. I am trying to merge the Jako animal leveling system basecreature.cs into my current basecreature.cs that has Daats. I have tried winmerge and windif(sp) with zero luck. Any help would be great!
 
Thanks! I labeled them Daats and Jako to identify them in an easy manner. Both are basecreature.cs
 

Attachments

  • Daats.cs
    169.3 KB · Views: 2
  • Jako.cs
    166.3 KB · Views: 2
Here you go. All regions that were added (even not exactly part of Jako) are marked #region Jako/#endregion. Some sections were easily merged and they retained their original #region Jako Taming/#endregion

Let me know if you have more issues
 

Attachments

  • [ServUO.com]-Daats.cs
    182.4 KB · Views: 8
  • [ServUO.com]-Jako.cs
    166.3 KB · Views: 5
Back