Map Merger: Difference between revisions

← Older edit

Map Merger (view source)

Revision as of 05:24, 11 April 2021

324 bytes added , 05:24, 11 April 2021

Adds disclaimer on python version not being definite. See https://discord.com/channels/134720091576205312/825400622852603914/830551839056986184

Veeblefetzer

833

edits

@@ Line 1: / Line 1: @@
-Before any change to a map, it is good to use the Map Merger tools. What these do is cut down the number of lines which Dream Maker thinks have changed, since it usually interprets any change to the map as a rewrite of all ~8000 lines.
+'''Before you PR any change to a map, you need to use the Map Merger tools.'''
-The Map Merger tools presently only work for windows as they utilize .bat files.
+This is required for a few reasons:
-If you have difficulty using these tools, ask for help in [[Community|#coderbus]]
+# It rewrites the map to minimize differences between different versions of the map (DreamMakers map editor rewrites a lot of the tile keys). This makes the git diff between different map changes much smaller.
+# Maintainers can actually verify the changes you are making are what you say they are by simply viewing the diff (for small changes at least).
+# The less changes there are in any given map diff, the easier it is for git to merge it without running into unexpected conflicts, which in most cases you have to either manually resolve or require you to remap your changes.
-== Using the tools ==
+If you have difficulty using these tools, ask for help in [https://discord.gg/0keg6hQH05Ha8OfO #mapping].
+==Using mapmerger==
 {|
 |-
-|'''1. Install Java'''
+|'''1. Install Python 3.7'''
-|If you don't have Java already installed it can be downloaded from: [http://www.java.com/en/download/index.jsp]
+|It can be found [https://www.python.org/downloads/ here]. Future versions of Python may or may not work, the following guide was tested with Python 3.7.
 |-
-|'''2. PATH Java'''
+|'''2. PATH Python'''
-|To test if Java is in your PATH, open Git Bash and type "Java". If it says "unknown command" you will need to add JAVA/bin to your PATH. See here for how: [https://www.java.com/en/download/help/path.xml]
+|This step is mostly applicable to windows users, you must make sure to add python to your path. [https://file.house/DA6H.png There will be an option for this when you install python.]
 |-
 |'''3. Prepare Maps'''
-|Run "Prepare Maps.bat" in the tools/mapmerge/ directory.
+|Run "Prepare Maps.bat" in the \tools\mapmerge2 directory.
 |-
 |'''4. Edit your map'''
-|Make your changes to the map here. Remember to save them!
+|Make your changes to the map here. Remember to save them and compile!
 |-
 |'''5. Clean map'''
-|Run "Run Map Merge.bat" in the tools/mapmerge/ directory. Don't worry if it says there are ~8000 differences, just ignore that for now.
+|Run "mapmerge.bat" in the \tools\mapmerge2 directory. Scroll through the list and type the appropriate map number(s).
 |-
 |'''7. Check differences'''
-|Use your application of choice to look at the differences between revisions of your code. If it's reading ~8000 line differences then you've done something wrong, go back and try again.
+|Use your git application of choice to look at the differences between revisions of your code and commit the result.
 |-
 |'''8. Commit'''
-|Your map is now ready to be committed, rejoice and wait for conflicts.
+|Your map is now ready to be committed.
 |}
 [[Category:Guides]] [[Category:Game Resources]]
 {{Contribution guides}}