Setting up mapmerge 2 - Proxima-Project/Proxi-Bay12 GitHub Wiki

Mapmerge2 is an tool that improves readability of map changes and allows for better conflict resolution.

Prerequisites

  1. Mapmerge2 relies on Python 3.6, available here.
    • Select option to include in PATH during install.
  2. After installing Python, run requirements-install.bat in tools/mapmerge2/.

Automatic commit hook method

  1. Run install.bat in tools/hooks.
    • Non-Windows users, run install.sh.

This should automatically do everything for you now when committing a change.

Manual method

  1. Run Prepare Maps.bat before making changes. (Must repeat only in every new branch.)
  2. Make your map changes and save.
  3. Exit Dream Maker and don't open again until after committing.
  4. Run mapmerge.bat and select edited map when prompted.

Your map has now been formatted correctly and can be committed.

Converting dmms to TGM

  1. Run convert.py.
  2. Select ID numbers of the maps to convert.
  3. Commit your changes!

Help!

Head over to Discord/IRC and speak up in the coding channel. Someone there should be able to help you.