Thread: [Gridarta-commit] SF.net SVN: gridarta:[5575] trunk (Page 23)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5575
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5575&view=rev
Author:   akirschbaum
Date:     2008-10-21 19:03:12 +0000 (Tue, 21 Oct 2008)

Log Message:
-----------
Add Map|Next Exit and Map|Previous Exit: select next/previous exit tile on map.

Modified Paths:
--------------
    trunk/crossfire/ChangeLog
    trunk/crossfire/src/cfeditor/action.properties
    trunk/daimonin/ChangeLog
    trunk/daimonin/src/daieditor/action.properties
    trunk/src/app/net/sf/gridarta/gui/map/DefaultMapActions.java
    trunk/src/app/net/sf/gridarta/messages.properties
    trunk/src/app/net/sf/gridarta/messages_de.properties
    trunk/src/app/net/sf/gridarta/messages_fr.properties
    trunk/src/app/net/sf/gridarta/messages_sv.properties

Modified: trunk/crossfire/ChangeLog
===================================================================

--- trunk/crossfire/ChangeLog	2008-10-21 05:50:43 UTC (rev 5574)
+++ trunk/crossfire/ChangeLog	2008-10-21 19:03:12 UTC (rev 5575)
@@ -1,3 +1,8 @@
+2008-10-21  Andreas Kirschbaum
+
+	* Add Map|Next Exit and Map|Previous Exit: select next/previous
+	exit tile on map.
+
 2008-10-19  Andreas Kirschbaum
 
 	* Add map validator "Tile path invalid": checks whether tiled map

Modified: trunk/crossfire/src/cfeditor/action.properties
===================================================================
--- trunk/crossfire/src/cfeditor/action.properties	2008-10-21 05:50:43 UTC (rev 5574)
+++ trunk/crossfire/src/cfeditor/action.properties	2008-10-21 19:03:12 UTC (rev 5575)
@@ -27,7 +27,7 @@
 main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
 file.menu=createNew open recent close - save saveAs saveAll revert createImage - options - exit
 edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
-map.menu=autoJoin - enterExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize
+map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize
 archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
 #pickmaps.menu: See gridarta
 resources.menu=collectArches - reloadFaces - viewTreasurelists
@@ -42,7 +42,7 @@
 
 mapwindowFile.menu=save saveAs createImage - revert - close
 mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
-mapwindowMap.menu=gridVisible enterExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize
+mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize
 mapwindowCursor.menu=moveCursor - selectTile startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
 
 ##########

Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog	2008-10-21 05:50:43 UTC (rev 5574)
+++ trunk/daimonin/ChangeLog	2008-10-21 19:03:12 UTC (rev 5575)
@@ -1,3 +1,8 @@
+2008-10-21  Andreas Kirschbaum
+
+	* Add Map|Next Exit and Map|Previous Exit: select next/previous
+	exit tile on map.
+
 2008-10-13  Andreas Kirschbaum
 
 	* (Somewhat) fix "reload faces".

Modified: trunk/daimonin/src/daieditor/action.properties
===================================================================
--- trunk/daimonin/src/daieditor/action.properties	2008-10-21 05:50:43 UTC (rev 5574)
+++ trunk/daimonin/src/daieditor/action.properties	2008-10-21 19:03:12 UTC (rev 5575)
@@ -27,7 +27,7 @@
 main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
 file.menu=createNew open recent close - save saveAs saveAll revert createImage - options - exit
 edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
-map.menu=autoJoin - enterExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize
+map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize
 archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
 #pickmaps.menu: See gridarta
 resources.menu=collectArches collectSpells - reloadFaces - viewTreasurelists
@@ -42,7 +42,7 @@
 
 mapwindowFile.menu=save saveAs createImage - revert - close
 mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
-mapwindowMap.menu=gridVisible enterExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize
+mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize
 mapwindowCursor.menu=moveCursor - selectTile startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
 
 ##########

Modified: trunk/src/app/net/sf/gridarta/gui/map/DefaultMapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/DefaultMapActions.java	2008-10-21 05:50:43 UTC (rev 5574)
+++ trunk/src/app/net/sf/gridarta/gui/map/DefaultMapActions.java	2008-10-21 19:03:12 UTC (rev 5575)
@@ -35,6 +35,7 @@
 import net.sf.gridarta.GlobalSettings;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.MapManager;
+import net.sf.gridarta.Size2D;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
@@ -42,6 +43,7 @@
 import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
 import net.sf.gridarta.map.MapArchObject;
 import net.sf.gridarta.map.MapControl;
+import net.sf.gridarta.map.MapModel;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.ToggleAction;
 import org.jetbrains.annotations.NotNull;
@@ -90,6 +92,12 @@
     /** Action for "enter exit". */
     private final Action aEnterExit;
 
+    /** Action for "next exit". */
+    private final Action aNextExit;
+
+    /** Action for "previous exit". */
+    private final Action aPrevExit;
+
     /** Action for "enter xxx map". */
     private final Action[] aDirections = new Action[directionsMap.length];
 
@@ -182,6 +190,8 @@
         aAutoJoin = (ToggleAction) actionFactory.createToggle(true, "autoJoin", this);
         aShrinkMapSize = actionFactory.createAction(true, "shrinkMapSize", this);
         aEnterExit = actionFactory.createAction(true, "enterExit", this);
+        aNextExit = actionFactory.createAction(true, "nextExit", this);
+        aPrevExit = actionFactory.createAction(true, "prevExit", this);
         autoJoin = prefs.getBoolean(AUTOJOIN_KEY, false);
 
         for (int i = 0; i < directionsMap.length; i++) {
@@ -320,6 +330,120 @@
         enterMap(currentMapListener.getCurrentMapView(), path, 0, exitPos);
     }
 
+    /**
+     * Select the next exit.
+     */
+    public void nextExit() {
+        final MapView<G, A, R, V> mapView = getNextExitEnabled();
+        if (mapView == null) {
+            return;
+        }
+
+        final MapCursor mapCursor = mapView.getMapViewBasic().getMapCursor();
+        final Point cursorLocation = mapCursor.getLocation();
+        if (cursorLocation == null) {
+            selectExit(mapView, -1, 0, 1);
+        } else {
+            selectExit(mapView, cursorLocation.x, cursorLocation.y, 1);
+        }
+    }
+
+    /**
+     * Select the previous exit.
+     */
+    public void prevExit() {
+        final MapView<G, A, R, V> mapView = getPrevExitEnabled();
+        if (mapView == null) {
+            return;
+        }
+
+        final MapCursor mapCursor = mapView.getMapViewBasic().getMapCursor();
+        final Point cursorLocation = mapCursor.getLocation();
+        if (cursorLocation == null) {
+            final Size2D mapSize = mapView.getMapControl().getMapModel().getMapSize();
+            selectExit(mapView, mapSize.getWidth(), mapSize.getHeight() - 1, -1);
+        } else {
+            selectExit(mapView, cursorLocation.x, cursorLocation.y, -1);
+        }
+    }
+
+    /**
+     * Selects an exit tile.
+     * @param mapView the map view to operate on
+     * @param xStart the x-coordinate to start searching
+     * @param yStart the y-coordinate to start searching
+     * @param direction the direction to search
+     */
+    private void selectExit(final MapView<G, A, R, V> mapView, final int xStart, final int yStart, final int direction) {
+        final MapCursor mapCursor = mapView.getMapViewBasic().getMapCursor();
+        final MapModel<G, A, R> mapModel = mapView.getMapControl().getMapModel();
+        final Size2D mapSize = mapModel.getMapSize();
+        final int width = mapSize.getWidth();
+        final int height = mapSize.getHeight();
+        final Point point = new Point(xStart, yStart);
+        final G currentExit = getValidExit(mapModel, point);
+        for (int i = width * height; i > 0; i--) {
+            if (direction > 0) {
+                point.x++;
+                if (point.x >= width) {
+                    point.x = 0;
+                    point.y++;
+                    if (point.y >= height) {
+                        point.y = 0;
+                    }
+                }
+            } else {
+                point.x--;
+                if (point.x < 0) {
+                    point.x = width - 1;
+                    point.y--;
+                    if (point.y < 0) {
+                        point.y = height - 1;
+                    }
+                }
+            }
+
+            final G exit = getValidExit(mapModel, point);
+            if (exit != null && exit != currentExit) {
+                mapCursor.setLocation(point);
+                return;
+            }
+        }
+        if (currentExit == null) {
+            mapCursor.setLocation(null);
+        }
+    }
+
+    /**
+     * Returns an exit game object on a given map tile.
+     * @param mapModel the map model to check
+     * @param point the map tile to check
+     * @return the head of the exit game object or <code>null</code> if none
+     * was found
+     */
+    @Nullable
+    private G getValidExit(@NotNull final MapModel<G, A, R> mapModel, @Nullable final Point point) {
+        return point == null ? null : getValidExit(mapModel.getExit(point));
+    }
+
+    /**
+     * Returns whether the given game object is an exit game object.
+     * @param exit the game object to check
+     * @return the game object's head if it is an exit game object or else
+     * <code>null</code>
+     */
+    @Nullable
+    private G getValidExit(@Nullable final G exit) {
+        if (exit == null) {
+            return null;
+        }
+        final G head = exit.getHead();
+        if (!exitMatcher.isMatching(head) || head.getAttributeString("slaying").length() <= 0) {
+            return null;
+        }
+        return head;
+    }
+
     /** Action method for entering the north map. */
     public void enterNorthMap() {
         enterMap(CommonConstants.NORTH);
@@ -521,20 +645,38 @@
             return null;
         }
 
-        final G selectedExit = selectedSquareView.getSelectedGameObject();
-        if (selectedExit != null && exitMatcher.isMatching(selectedExit.getHead()) && selectedExit.getHead().getAttributeString("slaying").length() > 0) {
+        final G selectedExit = getValidExit(selectedSquareView.getSelectedGameObject());
+        if (selectedExit != null) {
             return selectedExit.getHead();
         }
 
-        final G cursorExit = mapView.getMapControl().getMapModel().getExit(mapView.getMapViewBasic().getMapCursor().getLocation());
-        if (cursorExit != null && exitMatcher.isMatching(cursorExit) && cursorExit.getAttributeString("slaying").length() > 0) {
-            return cursorExit.getHead();
+        final G cursorExit = getValidExit(mapView.getMapControl().getMapModel(), mapView.getMapViewBasic().getMapCursor().getLocation());
+        if (cursorExit != null) {
+            return cursorExit;
         }
 
         return null;
     }
 
     /**
+     * Determines whether "next exit" is enabled.
+     * @return the map view if "next exit" is enabled
+     */
+    @Nullable
+    private MapView<G, A, R, V> getNextExitEnabled() {
+        return currentMapListener.getCurrentMapView();
+    }
+
+    /**
+     * Determines whether "previous exit" is enabled.
+     * @return the map view if "previous exit" is enabled
+     */
+    @Nullable
+    private MapView<G, A, R, V> getPrevExitEnabled() {
+        return currentMapListener.getCurrentMapView();
+    }
+
+    /**
      * Determine whether "enter xxx map" is enabled.
      * @param direction the direction to go
      * @return the destination map, or <code>null</code> if "enter xxx map" is
@@ -564,6 +706,8 @@
         aMapCreateView.setEnabled(getCreateViewEnabled() != null);
         aMapProperties.setEnabled(getMapPropertiesEnabled() != null);
         aEnterExit.setEnabled(getEnterExitEnabled() != null);
+        aNextExit.setEnabled(getNextExitEnabled() != null);
+        aPrevExit.setEnabled(getPrevExitEnabled() != null);
         for (int i = 0; i < directionsDir.length; i++) {
             aDirections[i].setEnabled(getEnterMapEnabled(directionsDir[i]) != null);
         }

Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties	2008-10-21 05:50:43 UTC (rev 5574)
+++ trunk/src/app/net/sf/gridarta/messages.properties	2008-10-21 19:03:12 UTC (rev 5575)
@@ -134,6 +134,13 @@
 enterExitNotSaved.title=Map not saved
 enterExitNotSaved.message=You must save the map first to follow a relative path.
 
+nextExit.text=Next Exit
+nextExit.mnemonic=N
+nextExit.accel=ctrl shift pressed E
+
+prevExit.text=Previous Exit
+prevExit.mnemonic=P
+
 enterNorthMap.text=Enter North Map
 
 enterNorthEastMap.text=Enter Northeast Map

Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties	2008-10-21 05:50:43 UTC (rev 5574)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties	2008-10-21 19:03:12 UTC (rev 5575)
@@ -120,6 +120,12 @@
 enterExitNotSaved.title=Karte nicht gesichert
 enterExitNotSaved.message=Der Ausgang verwendet einen relativen Dateinamen. Um ihm zu folgen m\xFCssen Sie die Karte vorher sichern.
 
+nextExit.text=N\xE4chster Ausgang
+nextExit.mnemonic=N
+
+prevExit.text=Vorheriger Ausgang
+prevExit.mnemonic=O
+
 enterNorthMap.text=Gehe zu Nord-Karte
 
 enterNorthEastMap.text=Gehe zu Nordost-Karte

Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties	2008-10-21 05:50:43 UTC (rev 5574)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties	2008-10-21 19:03:12 UTC (rev 5575)
@@ -119,6 +119,12 @@
 #enterExitNotSaved.title=
 #enterExitNotSaved.message=
 
+#nextExit.text=
+#nextExit.mnemonic=
+
+#prevExit.text=
+prevExit.mnemonic=
+
 enterNorthMap.text=Aller Carte Nord
 
 enterNorthEastMap.text=Aller Carte Nord-Est

Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties	2008-10-21 05:50:43 UTC (rev 5574)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties	2008-10-21 19:03:12 UTC (rev 5575)
@@ -119,6 +119,12 @@
 #enterExitNotSaved.title=
 #enterExitNotSaved.message=
 
+#nextExit.text=
+#nextExit.mnemonic=
+
+#prevExit.text=
+#prevExit.mnemonic=
+
 enterNorthMap.text=G\xE5 norr
 
 enterNorthEastMap.text=G\xE5 nordost


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Gridarta-commit] SF.net SVN: gridarta:[5575] trunk (Page 23)

gridarta-commit