Use versioned user map directories.

Makefile

@@ -362,8 +362,9 @@ all-dependencies: cli-dependencies windows-dependencies osx-dependencies
 version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml
 	@for i in $? ; do \
 		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
-		awk '{sub("\tmodchooser:.*$$","\tmodchooser: $(VERSION)"); print $0}' $${i}.tmp > $${i} && \
+		awk '{sub("\tmodchooser:.*$$","\tmodchooser: $(VERSION)"); print $0}' $${i}.tmp > $${i}.tmp2 && \
-		rm $${i}.tmp ; \
+		awk '{sub("/[^/]*@User$$", "/$(VERSION)@User"); print $0}' $${i}.tmp2 > $${i} && \
+		rm $${i}.tmp $${i}.tmp2; \
 	done
 
 docs: utility mods version

mods/cnc/mod.yaml

@@ -33,7 +33,7 @@ Packages:
 
 MapFolders:
 	./mods/cnc/maps@System
-	~^maps/cnc@User
+	~^maps/cnc/{DEV_VERSION}@User
 
 Rules:
 	./mods/cnc/rules/misc.yaml

mods/d2k/mod.yaml

@@ -22,7 +22,7 @@ Packages:
 
 MapFolders:
 	d2k:maps@System
-	~^maps/d2k@User
+	~^maps/d2k/{DEV_VERSION}@User
 
 Rules:
 	d2k:rules/misc.yaml

mods/ra/mod.yaml

@@ -32,7 +32,7 @@ Packages:
 
 MapFolders:
 	./mods/ra/maps@System
-	~^maps/ra@User
+	~^maps/ra/{DEV_VERSION}@User
 
 Rules:
 	./mods/ra/rules/misc.yaml

mods/ts/mod.yaml

@@ -55,7 +55,7 @@ Packages:
 
 MapFolders:
 	./mods/ts/maps@System
-	~^maps/ts@User
+	~^maps/ts/{DEV_VERSION}@User
 
 Rules:
 	./mods/ts/rules/ai.yaml