crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add game object attribute normalization to MapNormalizer editor script. Now game object attributes are written in canonical order and attributes redundant with the archetype are removed. 

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12059 282e977c-c81d-0410-88c4-b93c2d0d6712
master
akirschbaum 2009-07-12 14:40:31 +00:00
parent d519e887dc
commit f78a046c17
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
editor/scripts/MapNormalizer
View File

@ -3,10 +3,22 @@
<name>MapNormalizer</name> <name>MapNormalizer</name>
<code><![CDATA[import java.io.File; <code><![CDATA[import java.io.File;
import java.util.Iterator; import java.util.Iterator;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.shrinkmapsizedialog.ShrinkMapSizeUtils; import net.sf.gridarta.gui.shrinkmapsizedialog.ShrinkMapSizeUtils;
import net.sf.gridarta.io.RecursiveFileIterator; import net.sf.gridarta.io.RecursiveFileIterator;
import net.sf.gridarta.map.mapmodel.MapModel;
import net.sf.gridarta.map.mapmodel.MapSquare;
import net.sf.gridarta.utils.CommonConstants; import net.sf.gridarta.utils.CommonConstants;
void normalizeGameObject(GameObject gameObject) {
Iterator it = gameObject.iterator();
while (it.hasNext()) {
normalizeGameObject(it.next());
}
gameObject.setObjectText(gameObject.getArchetype().diffArchText(gameObject.getObjectText(), false));
}
void normalizeMap(File mapFile, String mapPath) { void normalizeMap(File mapFile, String mapPath) {
print(mapPath); print(mapPath);
@ -17,18 +29,32 @@ void normalizeMap(File mapFile, String mapPath) {
} }
try { try {
if (!mapPath.startsWith("/styles") mapModel = map.getMapModel();
&& !mapPath.startsWith("/editor")) { mapModel.beginTransaction("Normalize");
mapModel = map.getMapModel(); try {
mapArchObject = mapModel.getMapArchObject(); if (!mapPath.startsWith("/styles")
int shrinkFlags = 0; && !mapPath.startsWith("/editor/pickmaps")
if (mapArchObject.getTilePath(CommonConstants.NORTH).length() <= 0 && mapArchObject.getTilePath(CommonConstants.SOUTH).length() <= 0) { && !mapPath.startsWith("/editor/walls")) {
shrinkFlags |= ShrinkMapSizeUtils.SHRINK_EAST; mapArchObject = mapModel.getMapArchObject();
int shrinkFlags = 0;
if (mapArchObject.getTilePath(CommonConstants.NORTH).length() <= 0 && mapArchObject.getTilePath(CommonConstants.SOUTH).length() <= 0) {
shrinkFlags |= ShrinkMapSizeUtils.SHRINK_EAST;
}
if (mapArchObject.getTilePath(CommonConstants.EAST).length() <= 0 && mapArchObject.getTilePath(CommonConstants.WEST).length() <= 0) {
shrinkFlags |= ShrinkMapSizeUtils.SHRINK_SOUTH;
}
ShrinkMapSizeUtils.shrinkMap(mapModel, shrinkFlags);
} }
if (mapArchObject.getTilePath(CommonConstants.EAST).length() <= 0 && mapArchObject.getTilePath(CommonConstants.WEST).length() <= 0) {
shrinkFlags |= ShrinkMapSizeUtils.SHRINK_SOUTH; Iterator it = mapModel.iterator ();
while (it.hasNext()) {
Iterator it2 = it.next().iterator();
while (it2.hasNext()) {
normalizeGameObject(it2.next());
}
} }
ShrinkMapSizeUtils.shrinkMap(mapModel, shrinkFlags); } finally {
mapModel.endTransaction();
} }
if (map.getMapModel().isModified()) { if (map.getMapModel().isModified()) {