Map Merger: различия между версиями
imported>SpaceManiac (Make instructions easier to understand) |
imported>SpaceManiac (More improvements) |
||
Строка 8: | Строка 8: | ||
# '''Ensure Python is in your PATH''': For Windows users, ensure that you check the "Add Python 3.6 to PATH" option in the installer. - see [https://file.house/DA6H.png here for example] | # '''Ensure Python is in your PATH''': For Windows users, ensure that you check the "Add Python 3.6 to PATH" option in the installer. - see [https://file.house/DA6H.png here for example] | ||
== Use as a Git | == Use as a Git hook (recommended) == | ||
# '''Install the hook''': Windows users open the <code>tools/hooks</code> folder and double-click <code>install.bat</code>. Other platforms run <code>tools/hooks/install.sh</code>. | |||
Once the Git hook is installed, no further manual intervention is needed and the map merger will run automatically any time you commit in Git. | |||
The dialog box or console output of the commit will show the map merger's log. You can check the git commit log to review changes, or run <code>tools/mapmerge2/precommit.py</code> manually to review changes before committing. | |||
== | == Run manually (not recommended) == | ||
This is the older method, and is simpler but requires careful manual use each time you want to make changes to the map. First: | This is the older method, and is simpler but requires careful manual use each time you want to make changes to the map. First: | ||
Строка 29: | Строка 29: | ||
# '''Run the map merger''': Run <code>tools/mapmerge2/mapmerge.bat</code> and select the map you edited to merge. | # '''Run the map merger''': Run <code>tools/mapmerge2/mapmerge.bat</code> and select the map you edited to merge. | ||
With this method, leaving the map open in DreamMaker or reviewing it after running the map merger makes it possible to accidentally save and overwrite the merged map with an unmerged map. Close DreamMaker entirely before manually running the map merger or be extra-careful not to overwrite the changes the map merger made. | |||
Версия от 21:54, 26 июня 2020
/tg/station uses a tool called the Map Merger to minimize differences between versions of maps and lay them out in a format known as TGM, developed by Remie. This makes changes easier for maintainers to review and less likely to conflict with changes made by others.
There are two ways of running the tool, each requiring some amount of setup. If you have trouble or need help, ask in #coderbus.
Basic Setup
- Install Python 3.6: If you don't already have Python installed, download and install version 3.6 or later.
- Ensure Python is in your PATH: For Windows users, ensure that you check the "Add Python 3.6 to PATH" option in the installer. - see here for example
Use as a Git hook (recommended)
- Install the hook: Windows users open the
tools/hooks
folder and double-clickinstall.bat
. Other platforms runtools/hooks/install.sh
.
Once the Git hook is installed, no further manual intervention is needed and the map merger will run automatically any time you commit in Git.
The dialog box or console output of the commit will show the map merger's log. You can check the git commit log to review changes, or run tools/mapmerge2/precommit.py
manually to review changes before committing.
Run manually (not recommended)
This is the older method, and is simpler but requires careful manual use each time you want to make changes to the map. First:
- Install dependencies: For Windows users, run
tools/mapmerge2/requirements-install.bat
. Non-Windows or advanced users can manually runpython -m pip install tools/mapmerge2/requirements.txt
.
Each time you want to edit a map, follow these steps:
- Prepare maps: Run
tools/mapmerge2/Prepare Maps.bat
to save a backup of all maps in their current state. - Make your changes: Don't forget to save.
- Exit DreamMaker: Optional, but ensures that you don't accidentally undo the map merger's work.
- Run the map merger: Run
tools/mapmerge2/mapmerge.bat
and select the map you edited to merge.
With this method, leaving the map open in DreamMaker or reviewing it after running the map merger makes it possible to accidentally save and overwrite the merged map with an unmerged map. Close DreamMaker entirely before manually running the map merger or be extra-careful not to overwrite the changes the map merger made.