diff --git a/editor/scripts/MapValidator b/editor/scripts/MapValidator
new file mode 100644
index 000000000..1c11a1091
--- /dev/null
+++ b/editor/scripts/MapValidator
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<script>
+  <name>MapValidator</name>
+  <code><![CDATA[import java.io.File;
+import java.util.Iterator;
+import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.map.validation.ErrorCollector;
+import net.sf.gridarta.map.validation.ValidationError;
+
+void checkMap(File mapFile, String mapPath) {
+    map = mainControl.getMapManager().openMapFile(mapFile, false);
+    if (map == null) {
+        print(mapPath + ":");
+        print("- cannot load map file");
+        return;
+    }
+    ErrorCollector errorCollector;
+    try {
+        errorCollector = mainControl.runMapValidation(map.getMapModel());
+    } finally {
+        if (map.nViews() <= 0) {
+            mainControl.getMapManager().closeLevel(map);
+        }
+    }
+
+    StringBuffer sb = new StringBuffer();
+    int numberOfErrors = 0;
+    Iterator it = errorCollector.iterator();
+    while (it.hasNext()) {
+        ValidationError validationError = it.next();
+
+        if (errorLimit > 0 && numberOfErrors >= errorLimit) {
+            print("- <skipping more errors>");
+            break;
+        }
+
+        if (numberOfErrors == 0) {
+            print(mapPath + ":");
+        }
+        numberOfErrors++;
+
+        sb.setLength(0);
+        sb.append("- ");
+
+        sb.append(validationError);
+
+        GameObject gameObject = validationError.getGameObject();
+        if (gameObject != null) {
+            sb.append(" [").append(gameObject.getBestName()).append(']');
+        }
+
+        String parameter = validationError.getParameter();
+        if (parameter != null) {
+            sb.append(" [").append(parameter).append(']');
+        }
+
+        print(sb);
+    }
+}
+
+void checkDirectory(File mapFile, String mapPath) {
+    File[] files = mapFile.listFiles();
+    for (File file : files) {
+        String name = file.getName();
+        if (!name.equals(".svn") && !name.equals("README")) {
+            checkMaps(file, mapPath + "/" + file.getName());
+        }
+    }
+}
+
+void checkMaps(File mapFile, String mapPath) {
+    if (mapFile.isDirectory()) {
+        checkDirectory(mapFile, mapPath);
+    } else if (mapFile.isFile()) {
+        checkMap(mapFile, mapPath);
+    }
+}
+
+if (baseDirectory == null || baseDirectory.length() <= 0) {
+    baseDirectory = "/";
+}
+print("Checking maps below " + baseDirectory + "...");
+if (baseDirectory.endsWith("/")) {
+    baseDirectory = baseDirectory.substring(0, baseDirectory.length() - 1);
+}
+
+checkMaps(new File(mainControl.getMapDefaultFolder() + baseDirectory), baseDirectory);
+
+print("Done.");]]></code>
+  <mode>
+    <autoboot>false</autoboot>
+    <bash>true</bash>
+    <filter>false</filter>
+  </mode>
+  <parameter>
+    <name>baseDirectory</name>
+    <description>Base Directory</description>
+    <type>java.lang.String</type>
+    <value>/</value>
+  </parameter>
+  <parameter>
+    <name>errorLimit</name>
+    <description>Maximum number of errors to show for each map; 0=show all errors</description>
+    <type>java.lang.Integer</type>
+    <value>20</value>
+    <minimum>0</minimum>
+    <maximum>2147483647</maximum>
+  </parameter>
+</script>
+
diff --git a/editor/scripts/WorldMaker b/editor/scripts/WorldMaker
new file mode 100644
index 000000000..3b3e1e04a
--- /dev/null
+++ b/editor/scripts/WorldMaker
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<script>
+  <name>WorldMaker</name>
+  <code><![CDATA[import java.io.*;
+import cfeditor.IGUIConstants;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+
+/*
+ * Functions declaration
+ */
+File getSimpleFilename(File mapFile) {
+    String mapFilename = mapFile.getPath();
+    int i = mapFilename.lastIndexOf(File.separator);
+    if (i > 0) {
+        mapFilename = mapFilename.substring(i + 1);
+    }
+    return new File(mapFilename);
+}
+
+File getPngImageFilename(File mapFile) {
+    return new File(Location + PictureDirectory + getSimpleFilename(mapFile) + ".png");
+}
+
+boolean updateMap(File mapFile, File pictureFile) {
+    if (!mapFile.exists()) {
+        return false;
+    }
+    if (pictureFile.exists() && pictureFile.lastModified() >= mapFile.lastModified()) {
+        return false;
+    }
+    print("converting " + mapFile + " to " + pictureFile + ".");
+    map = mainControl.getMapManager().openMapFile(mapFile, false);
+    if (map == null) {
+        return false;
+    }
+    try {
+        try {
+            ImageIO.write(map.getFullImage(), "png", pictureFile);
+        } catch (IOException ex) {
+            print("cannot write " + pictureFile + ": " + ex.getMessage());
+            return false;
+        }
+    } finally {
+        if (map.nViews() <= 0) {
+            mainControl.getMapManager().closeLevel(map);
+        }
+    }
+    return true;
+}
+
+boolean runCommand(String cmd) {
+    f = File.createTempFile("WMaker", ".sh");
+    FileWriter out = new FileWriter(f);
+    out.write(cmd);
+    out.close();
+    print("running " + cmd);
+    Process p = Runtime.getRuntime().exec("sh " + f.getAbsolutePath());
+    p.waitFor();
+    f.delete();
+    return p.exitValue() == 0;
+}
+
+/*
+ * Running code
+ */
+void checkDaList() {
+    DestWidth = TileWidth.intValue() * NumX.intValue();
+    DestHeight = TileHeight.intValue() * NumY.intValue();
+
+    if (Location == null || Location.length() < 1) {
+        Location = mainControl.getMapDefaultFolder();
+        print("autodetected location " + Location);
+    }
+
+    print("World map will be " + DestWidth + "x" + DestHeight + " in size");
+    if (!Location.endsWith(File.separator)) {
+        Location = Location + File.separator;
+    }
+
+    if (!PictureDirectory.endsWith(File.separator)) {
+        PictureDirectory = PictureDirectory + File.separator;
+    }
+    new File(Location + PictureDirectory).mkdirs();
+
+    HashSet mapList = new HashSet();
+    boolean firstRun = false;
+    if (new File(Location + PictureDirectory + WorldPicture + ".ppm").exists()) {
+        runCommand("cp " + Location + PictureDirectory + WorldPicture + ".ppm /tmp/tmp.ppm");
+    } else {
+        runCommand("ppmmake \\#000 " + DestWidth + " " + DestHeight + " > /tmp/tmp.ppm");
+        firstRun = true;
+        print("Creating images for the first time.");
+    }
+
+    for (int x = 0; x < NumX.intValue(); x++) {
+        for (int y = 0; y < NumY.intValue(); y++) {
+            currentX = StartX.intValue() + x;
+            currentY = StartY.intValue() + y;
+            currentMap = new File(Location + MapFilename + "_" + currentX + "_" + currentY);
+            currentPicture = getPngImageFilename(currentMap);
+            didUpdate = updateMap(currentMap, currentPicture);
+            if ((didUpdate || firstRun) && currentPicture.exists()) {
+                runCommand("pngtopnm " + currentPicture + " | pnmscale -xysize " + TileWidth + " " + TileHeight + " > /tmp/ppm.tmp");
+                sx = x * TileWidth.intValue();
+                sy = y * TileHeight.intValue();
+                runCommand("pnmpaste /tmp/ppm.tmp " + sx + " " + sy + " /tmp/tmp.ppm > /tmp/tmp.ppm1");
+                runCommand("rm -f /tmp/tmp.ppm");
+                runCommand("mv /tmp/tmp.ppm1 /tmp/tmp.ppm");
+            }
+        }
+    }
+    runCommand("mv /tmp/tmp.ppm " + Location + PictureDirectory + WorldPicture + ".ppm");
+    print("converting to png if possible.\n");
+    runCommand("pnmtopng " + Location + PictureDirectory + WorldPicture + ".ppm > /tmp/tmp.png");
+    runCommand("mv /tmp/tmp.png " + Location + PictureDirectory + WorldPicture + ".png");
+}
+
+checkDaList();
+print("Done!");]]></code>
+  <mode>
+    <autoboot>false</autoboot>
+    <bash>true</bash>
+    <filter>false</filter>
+  </mode>
+  <parameter>
+    <name>Location</name>
+    <description>Specify the map directory to use by this script. Leave empty for auto</description>
+    <type>java.lang.String</type>
+    <value />
+  </parameter>
+  <parameter>
+    <name>MapFilename</name>
+    <description>This map file name will be appended to the 'Location' parameter and '_mapx_mapy' will be added at the end</description>
+    <type>java.lang.String</type>
+    <value>world/world</value>
+  </parameter>
+  <parameter>
+    <name>TileWidth</name>
+    <description>The width in pixel of each generate map image</description>
+    <type>java.lang.Integer</type>
+    <value>50</value>
+    <minimum>0</minimum>
+    <maximum>2000</maximum>
+  </parameter>
+  <parameter>
+    <name>TileHeight</name>
+    <description>The height in pixel of each generated map image</description>
+    <type>java.lang.Integer</type>
+    <value>50</value>
+    <minimum>0</minimum>
+    <maximum>2000</maximum>
+  </parameter>
+  <parameter>
+    <name>NumX</name>
+    <description>The number of maps along X axis to analyze</description>
+    <type>java.lang.Integer</type>
+    <value>30</value>
+    <minimum>0</minimum>
+    <maximum>50000</maximum>
+  </parameter>
+  <parameter>
+    <name>NumY</name>
+    <description>The number of maps along Y axis to analyze</description>
+    <type>java.lang.Integer</type>
+    <value>30</value>
+    <minimum>0</minimum>
+    <maximum>50000</maximum>
+  </parameter>
+  <parameter>
+    <name>StartX</name>
+    <description>The first coordinate along X axis to analyze</description>
+    <type>java.lang.Integer</type>
+    <value>100</value>
+    <minimum>0</minimum>
+    <maximum>50000</maximum>
+  </parameter>
+  <parameter>
+    <name>StartY</name>
+    <description>The first coordinate along Y axis to analyze</description>
+    <type>java.lang.Integer</type>
+    <value>100</value>
+    <minimum>0</minimum>
+    <maximum>50000</maximum>
+  </parameter>
+  <parameter>
+    <name>PictureDirectory</name>
+    <description>The subdirectory where to put pictures</description>
+    <type>java.lang.String</type>
+    <value>images</value>
+  </parameter>
+  <parameter>
+    <name>WorldPicture</name>
+    <description>The picture which will store the world map</description>
+    <type>java.lang.String</type>
+    <value>worldmap</value>
+  </parameter>
+  <parameter>
+    <name>CheckDelay</name>
+    <description>The delay in milliseconds between map checks</description>
+    <type>java.lang.Integer</type>
+    <value>15000</value>
+    <minimum>0</minimum>
+    <maximum>86400000</maximum>
+  </parameter>
+</script>
+