VASSAL Engine

Revision: 4036
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4036&view=rev
Author:   morvael
Date:     2008-08-12 12:46:10 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
Strategic movement shader, some fixes to movement shader, enchancement to supply shaders.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrCommandEncoder.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderAxisHQSupply.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderSovietHQSupply.java

Added Paths:
-----------
    VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java

Removed Paths:
-------------
    VSQL-src/branches/morvael/rsr/RsrDynamicProperty.java

Modified: VSQL-src/branches/morvael/rsr/RsrCommandEncoder.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrCommandEncoder.java	2008-08-12 04:20:33 UTC (rev 4035)
+++ VSQL-src/branches/morvael/rsr/RsrCommandEncoder.java	2008-08-12 12:46:10 UTC (rev 4036)
@@ -9,9 +9,6 @@
 public class RsrCommandEncoder extends BasicCommandEncoder {
 
 	public Decorator createDecorator(String type, GamePiece inner) {
-		if (type.startsWith(RsrDynamicProperty.ID)) {
-			return new RsrDynamicProperty(type, inner);
-		} else
 		if (type.startsWith(TerrainMapCounterAreaCommand.ID)) {
 			return new TerrainMapCounterAreaCommand(type, inner);
 		} else

Deleted: VSQL-src/branches/morvael/rsr/RsrDynamicProperty.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrDynamicProperty.java	2008-08-12 04:20:33 UTC (rev 4035)
+++ VSQL-src/branches/morvael/rsr/RsrDynamicProperty.java	2008-08-12 12:46:10 UTC (rev 4036)
@@ -1,227 +0,0 @@
-package rsr;
-
-import java.awt.Component;
-import java.awt.Rectangle;
-import java.awt.Shape;
-
-import javax.swing.BoxLayout;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
-import javax.swing.KeyStroke;
-
-import VASSAL.build.GameModule;
-import VASSAL.build.module.documentation.HelpFile;
-import VASSAL.command.Command;
-import VASSAL.configure.StringConfigurer;
-import VASSAL.counters.Decorator;
-import VASSAL.counters.EditablePiece;
-import VASSAL.counters.GamePiece;
-import VASSAL.counters.KeyCommand;
-import VASSAL.counters.PieceEditor;
-import VASSAL.tools.SequenceEncoder;
-
-/**
- * Trait that contains a property accessible via getProperty() and updateable
- * dynamically via key commands
- * 
- * @author rkinney
- * 
- */
-public class RsrDynamicProperty extends Decorator implements EditablePiece {
-	public static final String ID = "RsrDynamicProperty;";
-
-	protected String key = "";
-	protected String value;
-	protected KeyCommand[] commands;
-
-	public RsrDynamicProperty() {
-		this(ID, null);
-	}
-
-	public RsrDynamicProperty(String type, GamePiece p) {
-		mySetType(type);
-		setInner(p);
-	}
-
-	public String getDescription() {
-		String d = "Rsr Dynamic Property";
-		if (key.length() > 0) {
-			d += " - " + key;
-		}
-		return d;
-	}
-
-	public String myGetType() {
-		SequenceEncoder se = new SequenceEncoder(';');
-		se.append(key);
-		return ID + se.getValue();
-	}
-
-	public void mySetType(String type) {
-		SequenceEncoder.Decoder st = new SequenceEncoder.Decoder(type, ';');
-		st.nextToken(); // Discard ID
-		key = st.nextToken("");
-		value = null;
-		commands = null;
-	}
-
-	public String myGetState() {
-		return getValue();
-	}
-
-	public void mySetState(String state) {
-		setValue(state);
-	}
-
-	public Rectangle boundingBox() {
-		return piece.boundingBox();
-	}
-
-	public Shape getShape() {
-		return piece.getShape();
-	}
-
-	public String getName() {
-		return piece.getName();
-	}
-
-	public void draw(java.awt.Graphics g, int x, int y, java.awt.Component obs,
-			double zoom) {
-		piece.draw(g, x, y, obs, zoom);
-	}
-
-	protected KeyCommand[] myGetKeyCommands() {
-		if (commands == null) {
-			commands = new KeyCommand[0];
-		}
-		return commands;
-	}
-
-	public Command myKeyEvent(KeyStroke stroke) {
-		//updateValue();
-		return null;
-	}
-
-	public VASSAL.build.module.documentation.HelpFile getHelpFile() {
-		return HelpFile.getReferenceManualPage("RsrDynamicProperty.htm");
-	}
-
-	public PieceEditor getEditor() {
-		return new Ed(this);
-	}
-
-	// =============
-	public Object getProperty(Object key) {
-		if (key.equals(this.key)) {
-			return getValue();
-		}
-		return super.getProperty(key);
-	}
-
-	public void setProperty(Object key, Object value) {
-		if (key.equals(this.key)) {
-			//setValue((String) value);
-		} else {
-			super.setProperty(key, value);
-		}
-	}
-
-	public Component getComponent() {
-		return getMap() != null ? getMap().getView().getTopLevelAncestor()
-				: GameModule.getGameModule().getFrame();
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public String getValue() {
-		if (value == null) {
-			updateValue();
-		}
-		return value;
-	}
-
-	public void setValue(String value) {
-		//this.value = value;
-	}
-
-	protected void updateValue() {
-		try {
-			if ("Attack".equals(key)) {
-				double a = Double.parseDouble(getProperty(
-						"Attack_" + getProperty("CurrentStep")).toString());
-				double s;
-				String supply = getProperty("CurrentSupply").toString();
-				if (supply.length() > 0) {
-					s = 0.5;
-				} else {
-					s = 1.0;
-				}
-				value = String.valueOf((int) Math.round(a * s));
-			} else if ("Defend".equals(key)) {
-				double d = Double.parseDouble(getProperty(
-						"Defend_" + getProperty("CurrentStep")).toString());
-				double s;
-				String supply = getProperty("CurrentSupply").toString();
-				if (supply.indexOf("Out") >= 0) {
-					s = 0.5;
-				} else {
-					s = 1.0;
-				}
-				value = String.valueOf((int) Math.round(d * s));
-			} else if ("Movement".equals(key)) {
-				double m = Double.parseDouble(getProperty("Movement")
-						.toString());
-				double s;
-				String supply = getProperty("CurrentSupply").toString();
-				if (supply.length() > 0) {
-					s = 0.5;
-				} else {
-					s = 1.0;
-				}
-				value = String.valueOf((int) Math.round(m * s));
-			} else {
-				value = "?";
-			}
-		} catch (Exception e) {
-			value = "!";
-		}
-	}
-
-	protected static class Ed implements PieceEditor {
-		protected JPanel panel;
-		protected StringConfigurer keyConfigurer;
-
-		public Ed(final RsrDynamicProperty trait) {
-			panel = new JPanel();
-			panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-
-			panel.add(new JLabel(
-					"Contributed by morvael",
-					JLabel.CENTER));
-			panel.add(new JSeparator());
-			panel.add(new JLabel(" "));
-
-			keyConfigurer = new StringConfigurer(null, "Key:  ", trait.key);
-			panel.add(keyConfigurer.getControls());
-		}
-
-		public Component getControls() {
-			return panel;
-		}
-
-		public String getType() {
-			SequenceEncoder se = new SequenceEncoder(';');
-			se.append(keyConfigurer.getValueString());
-			return RsrDynamicProperty.ID + se.getValue();
-		}
-
-		public String getState() {
-			return null;
-		}
-
-	}
-
-}

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderAxisHQSupply.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderAxisHQSupply.java	2008-08-12 04:20:33 UTC (rev 4035)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderAxisHQSupply.java	2008-08-12 12:46:10 UTC (rev 4036)
@@ -23,6 +23,8 @@
 	private Set<HexRef> occupiedByFriend;
 	private Set<HexRef> occupiedByEnemy;
 	private Set<HexRef> inEnemyZOC;
+	private boolean isAttritionCheck;
+	private double rangeMod;
 	
 	public RsrMapShaderAxisHQSupply() {
 		super();
@@ -32,12 +34,22 @@
 	public void reset(TerrainMapShader mapShader, Map map, TerrainHexGrid grid, TerrainMap terrainMap, String params, GamePiece piece) {
 		super.reset(mapShader, map, grid, terrainMap, params, piece);
 		supplyParams = params.split(";");
+		try {
+			isAttritionCheck = supplyParams[2].equals("Attrition");
+		} catch (Exception e) {
+			isAttritionCheck = false;
+		}
 		//Helsinki;Finnish
 		//Bucharest;Romanian
+		//+Attrition/Normal
+		rangeMod = isAttritionCheck ? 2.0 : 1.0;
 	}
 	
 	@Override
 	public void start(HashMap<HexRef, TerrainMapShaderCost> selectedHexes) {
+		if ((isAttritionCheck) && (piece == null)) {
+			return;
+		}		
 		//find hex control
 		filterFriendlyPieceGroups(SIDE_AXIS);
 		occupiedByFriend = getHexesOccupiedByFriend();
@@ -47,7 +59,7 @@
 		//find supply sources
 		for (HexRef hr : getPossibleSupplySources(SIDE_AXIS, supplyParams[0])) {
 			if (canEnter(hr)) {
-				selectedHexes.put(hr, create(null, true, 4.0, false, null));
+				selectedHexes.put(hr, create(null, true, rangeMod * 4.0, false, null));
 			}			
 		}
 		//find all hexes with railroad line of communication to supply sources
@@ -56,7 +68,7 @@
 		for (GamePiece gp : filterPieces("Type=Headquarters", "Nationality=" + supplyParams[1])) {
 			HexRef hr = grid.getHexPos(gp.getPosition());
 			if ((withLOC.contains(hr)) && (canEnter(hr))) {
-				selectedHexes.put(hr, create(null, true, 4.0, false, null));
+				selectedHexes.put(hr, create(null, true, rangeMod * 4.0, false, null));
 			}
 		}
 		//find hexes with partisans

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2008-08-12 04:20:33 UTC (rev 4035)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2008-08-12 12:46:10 UTC (rev 4036)
@@ -71,8 +71,8 @@
 	private Board turnBoard;
 	private GamePiece turnPiece;
 	private GamePiece phasePiece;
-	private HashMap<HexRef, ArrayList<GamePiece>> friendlyPieceGroups;
-	private HashMap<HexRef, ArrayList<GamePiece>> hostilePieceGroups;	
+	protected HashMap<HexRef, ArrayList<GamePiece>> friendlyPieceGroups;
+	protected HashMap<HexRef, ArrayList<GamePiece>> hostilePieceGroups;	
 	
 	protected RsrMapShaderBase() {
 		super();
@@ -370,4 +370,35 @@
 		}
 	}
 	
+	protected void getHexesInRange(Set<HexRef> result, HexRef hex, int range) {
+		result.add(hex);
+		Set<HexRef> helper1 = new HashSet<HexRef>();
+		helper1.add(hex);
+		Set<HexRef> helper2 = new HashSet<HexRef>();
+		Set<HexRef> helper3;
+		for (int r=0; r<range; r++) {
+			for (HexRef hr : helper1) {
+				HexRef[] neighbours = mapShader.getAdjacentHexes(hr);
+				for (int i=0; i<neighbours.length; i++) {
+					if (neighbours[i] == null) {
+						break;
+					}
+					helper2.add(neighbours[i]);
+					result.add(neighbours[i]);
+				}				
+			}
+			helper3 = helper2;
+			helper2 = helper1;
+			helper1 = helper3;
+			helper2.clear();
+		}
+		
+	}
+	
+	protected Set<HexRef> getHexesInRange(HexRef hex, int range) {
+		Set<HexRef> result = new HashSet<HexRef>();
+		getHexesInRange(result, hex, range);
+		return result;
+	}
+	
 }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java	2008-08-12 04:20:33 UTC (rev 4035)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java	2008-08-12 12:46:10 UTC (rev 4036)
@@ -21,11 +21,14 @@
 	private final String MODE_NORMAL = "MODE_NORMAL";
 	private final String MODE_SEA = "MODE_SEA";
 	
+	private String[] supplyParams;
 	private HashSet<HexRef> respawnHexes = new HashSet<HexRef>();
 	private HashSet<HexRef> partisanHexes = new HashSet<HexRef>();
 	private Set<HexRef> occupiedByFriend;
 	private Set<HexRef> occupiedByEnemy;
 	private Set<HexRef> inEnemyZOC;
+	private boolean isAttritionCheck;
+	private double rangeMod;
 	
 	public RsrMapShaderDepotSupply() {
 		super();
@@ -34,10 +37,21 @@
 	@Override
 	public void reset(TerrainMapShader mapShader, Map map, TerrainHexGrid grid, TerrainMap terrainMap, String params, GamePiece piece) {
 		super.reset(mapShader, map, grid, terrainMap, params, piece);
+		supplyParams = params.split(";");
+		try {
+			isAttritionCheck = supplyParams[0].equals("Attrition");
+		} catch (Exception e) {
+			isAttritionCheck = false;
+		}		
+		//+Attrition/Normal
+		rangeMod = isAttritionCheck ? 2.0 : 1.0;
 	}
 	
 	@Override
 	public void start(HashMap<HexRef, TerrainMapShaderCost> selectedHexes) {
+		if ((isAttritionCheck) && (piece == null)) {
+			return;
+		}		
 		//find hex control
 		filterFriendlyPieceGroups(SIDE_AXIS);
 		occupiedByFriend = getHexesOccupiedByFriend();
@@ -47,7 +61,7 @@
 		//find supply sources
 		for (HexRef hr : getPossibleSupplySources(SIDE_AXIS, null)) {
 			if (canEnter(hr)) {
-				selectedHexes.put(hr, create(null, true, 4.0, false, MODE_NORMAL));
+				selectedHexes.put(hr, create(null, true, rangeMod * 4.0, false, MODE_NORMAL));
 			}			
 		}
 		//find hexes for sea supply
@@ -57,7 +71,7 @@
 				if ((supplied.contains(getCityHexRef(TAG_CITY_ODESSA))) && (supplied.contains(getCityHexRef(TAG_CITY_SEVASTOPOL)))) {
 					for (HexRef hr : findHexesWithTag(TAG_PORT, TAG_PORT_BLACKSEA)) {
 						if (isHexAxisControlled(hr)) {
-							selectedHexes.put(hr, create(null, true, 2.0, false, MODE_SEA));
+							selectedHexes.put(hr, create(null, true, rangeMod * 2.0, false, MODE_SEA));
 						}
 					}
 				}
@@ -106,7 +120,7 @@
 			double left = currentCost.getPointsLeft() - cost;
 			if ((respawnHexes.contains(toHex)) && (left >= 0.0)) {
 				respawnHexes.remove(toHex);
-				return result(fromHex, true, 4.0, false, currentCost.getFlag());
+				return result(fromHex, true, rangeMod * 4.0, false, currentCost.getFlag());
 			} else {
 				return result(fromHex, true, left, false, currentCost.getFlag());
 			}			

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2008-08-12 04:20:33 UTC (rev 4035)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2008-08-12 12:46:10 UTC (rev 4036)
@@ -66,7 +66,7 @@
 		maxMovement = Double.parseDouble(piece.getProperty("Movement").toString());
 		String sl = (String)piece.getProperty("CurrentSupply");
 		if (sl != null) {
-			if (sl.length() > 0) {
+			if ((sl.indexOf("Out") >= 0) || (sl.indexOf("Lack") >= 0)) {
 				maxMovement = Math.round(maxMovement * 0.5);
 			}
 		}
@@ -84,9 +84,13 @@
 		}
 		isMountain = unitType.indexOf("Mountain") >= 0;
 		//find hex control
-		filterFriendlyPieceGroups(SIDE_AXIS);
+		filterFriendlyPieceGroups(side);
 		occupiedByFriend = getHexesOccupiedByFriendContesting();
-		filterHostilePieceGroups(SIDE_SOVIET);
+		if (side.equals(SIDE_AXIS)) {
+			filterHostilePieceGroups(SIDE_SOVIET);
+		} else {
+			filterHostilePieceGroups(SIDE_AXIS);
+		}
 		occupiedByEnemy = getHexesOccupiedByEnemy();
 		inEnemyZOC = getHexesInEnemyZOC();
 		//
@@ -113,6 +117,12 @@
 		boolean isArctic = isArctic(toHex);
 		boolean fromZOC = inEnemyZOC.contains(fromHex);
 		boolean toZOC = inEnemyZOC.contains(toHex);
+		if (lt.equals(LINE_CHONGARCAUSEWAY)) {
+			return result(fromHex, false, 0.0, false, null);
+		}
+		if ((movementMode == 2) && (lt.equals(LINE_RAILROAD) == false)) {
+			return result(fromHex, false, 0.0, false, null);
+		}
 		if ((fromZOC) && (toZOC)) {
 			if ((isAny(unitType, "AxisGermanTankCorps", "AxisGermanTankBattlegroup", "AxisGermanTankDivision") == false) && ((isWinter() == false) || (unitType.equals("SovietGuardsCavalryCorps") == false))) {
 				return result(fromHex, false, 0.0, false, null);
@@ -130,7 +140,9 @@
 			}
 		} else
 		if (et.equals(EDGE_MINORRIVER)) {
-			cost += EDGE_MINORRIVER_COST[movementMode];
+			if ((getTurnNumber() > 1) || (side.equals(SIDE_SOVIET))) {
+				cost += EDGE_MINORRIVER_COST[movementMode];
+			}
 		} else
 		if (et.equals(EDGE_MAJORRIVER)) {
 			cost += EDGE_MAJORRIVER_COST[movementMode];

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderSovietHQSupply.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderSovietHQSupply.java	2008-08-12 04:20:33 UTC (rev 4035)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderSovietHQSupply.java	2008-08-12 12:46:10 UTC (rev 4036)
@@ -20,9 +20,12 @@
 	private final String MODE_NORMAL = "MODE_NORMAL";
 	private final String MODE_SEA = "MODE_SEA";
 	
+	private String[] supplyParams;
 	private Set<HexRef> occupiedByFriend;
 	private Set<HexRef> occupiedByEnemy;
 	private Set<HexRef> inEnemyZOC;
+	private boolean isAttritionCheck;
+	private double rangeMod;
 	
 	public RsrMapShaderSovietHQSupply() {
 		super();	
@@ -31,10 +34,21 @@
 	@Override
 	public void reset(TerrainMapShader mapShader, Map map, TerrainHexGrid grid, TerrainMap terrainMap, String params, GamePiece piece) {
 		super.reset(mapShader, map, grid, terrainMap, params, piece);
+		supplyParams = params.split(";");
+		try {
+			isAttritionCheck = supplyParams[0].equals("Attrition");
+		} catch (Exception e) {
+			isAttritionCheck = false;
+		}		
+		//+Attrition/Normal
+		rangeMod = isAttritionCheck ? 2.0 : 1.0;
 	}
 	
 	@Override
 	public void start(HashMap<HexRef, TerrainMapShaderCost> selectedHexes) {
+		if ((isAttritionCheck) && (piece == null)) {
+			return;
+		}
 		//find hex control
 		filterFriendlyPieceGroups(SIDE_SOVIET);
 		occupiedByFriend = getHexesOccupiedByFriend();
@@ -44,7 +58,7 @@
 		//find supply sources
 		for (HexRef hr : getPossibleSupplySources(SIDE_SOVIET, null)) {
 			if (canEnter(hr)) {
-				selectedHexes.put(hr, create(null, true, 6.0, false, MODE_NORMAL));
+				selectedHexes.put(hr, create(null, true, rangeMod * 6.0, false, MODE_NORMAL));
 			}			
 		}
 		//find all hexes with railroad line of communication to supply sources
@@ -59,7 +73,7 @@
 				}
 				for (HexRef hr : ports) {
 					if (isHexAxisControlled(hr) == false) {
-						selectedHexes.put(hr, create(null, true, 2.0, false, MODE_SEA));
+						selectedHexes.put(hr, create(null, true, rangeMod * 2.0, false, MODE_SEA));
 					}
 				}
 			}
@@ -68,7 +82,7 @@
 		for (GamePiece gp : filterPieces("Type=Headquarters", "Nationality=Soviet")) {
 			HexRef hr = grid.getHexPos(gp.getPosition());
 			if ((withLOC.contains(hr)) && (canEnter(hr))) {
-				selectedHexes.put(hr, create(null, true, 6.0, false, MODE_NORMAL));
+				selectedHexes.put(hr, create(null, true, rangeMod * 6.0, false, MODE_NORMAL));
 			}
 		}
 	}

Added: VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2008-08-12 12:46:10 UTC (rev 4036)
@@ -0,0 +1,123 @@
+package rsr;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+import terrain.HexRef;
+import terrain.TerrainHexGrid;
+import terrain.TerrainMap;
+import terrain.TerrainMapShader;
+import terrain.TerrainMapShaderCost;
+import VASSAL.build.module.Map;
+import VASSAL.counters.GamePiece;
+
+/**
+ * 
+ * @author morvael
+ */
+public final class RsrMapShaderStrategic extends RsrMapShaderBase {
+
+	private String side;
+	private String type;
+	private int movementMode;
+	private double movement;
+	private double maxMovement;
+	private HexRef startHex;
+	private Set<HexRef> blockedByEnemy = new HashSet<HexRef>();
+	
+	public RsrMapShaderStrategic() {
+		super();
+	}
+		
+	@Override
+	public void reset(TerrainMapShader mapShader, Map map, TerrainHexGrid grid, TerrainMap terrainMap, String params, GamePiece piece) {
+		super.reset(mapShader, map, grid, terrainMap, params, piece);
+	}
+	
+	@Override
+	public void start(HashMap<HexRef, TerrainMapShaderCost> selectedHexes) {
+		if (piece == null) {
+			return;
+		}
+		side = piece.getProperty("Side").toString();
+		type = (String)piece.getProperty("Type");
+		if (type == null) {
+			type = "";
+		}
+		String mt = piece.getProperty("MovementType").toString();
+		if (mt.equals("Motorized")) {
+			movementMode = 1;
+		} else
+		if (mt.equals("Rail")) {
+			movementMode = 2;
+		} else {
+			movementMode = 0;
+		}
+		maxMovement = 25.0;
+		if (isAny(type, "Airbase", "Partisan", "Asset")) {
+			maxMovement = 0.0;
+		}
+		if ((type.equals("Depot")) && (isMud() == false)) {
+			maxMovement = 0.0;
+		}
+		String sl = (String)piece.getProperty("CurrentSupply");
+		if (sl != null) {
+			if (sl.length() > 0) {
+				maxMovement = 0.0;
+			}
+		}
+		movement = 25.0;
+		if (movement > maxMovement) {
+			movement = maxMovement;
+		}
+		//find blocked hexes
+		if (side.equals(SIDE_AXIS)) {
+			filterHostilePieceGroups(SIDE_SOVIET);
+		} else {
+			filterHostilePieceGroups(SIDE_AXIS);
+		}
+		blockedByEnemy.clear();
+		for (HexRef hr : hostilePieceGroups.keySet()) {
+			getHexesInRange(blockedByEnemy, hr, 4);
+		}
+		//
+		startHex = grid.getHexPos(piece.getPosition());
+		if (blockedByEnemy.contains(startHex) == false) {
+			selectedHexes.put(startHex, create(null, true, movement, false, null));
+		}
+	}
+	
+	@Override
+	public boolean getCrossCost(HexRef fromHex, HexRef toHex,
+			TerrainMapShaderCost currentCost) {
+		if (blockedByEnemy.contains(toHex)) {
+			return result(fromHex, false, 0.0, false, null);
+		}
+		String tt = getHexTerrainName(toHex);
+		String et = getEdgeTerrainName(fromHex, toHex);
+		String lt = getLineTerrainName(fromHex, toHex);
+		if (et.equals(EDGE_IMPASSABLE)) {
+			return result(fromHex, false, 0.0, false, null);
+		} else
+		if (et.equals(EDGE_LAKESEA)) {
+			if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != 0)) {
+				return result(fromHex, false, 0.0, false, null);
+			}
+		} else
+		if (tt.equals(HEX_WATER)) {
+			return result(fromHex, false, 0.0, false, null);
+		}
+		return result(fromHex, true, currentCost.getPointsLeft()-1.0, false, null);
+	}
+
+	@Override
+	public void stop() {
+	}
+
+	@Override
+	public HexRef getBestPathDestination() {
+		return null;
+	}
+	
+}


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

Revision: 4070
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4070&view=rev
Author:   morvael
Date:     2008-08-20 19:58:02 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
Fixed a bug in Mover where label wasn't displayed properly after save-load. Minor corrections in Supplier.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrMover.java
    VSQL-src/branches/morvael/rsr/RsrSupplier.java

Modified: VSQL-src/branches/morvael/rsr/RsrMover.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMover.java	2008-08-20 19:11:54 UTC (rev 4069)
+++ VSQL-src/branches/morvael/rsr/RsrMover.java	2008-08-20 19:58:02 UTC (rev 4070)
@@ -49,478 +49,445 @@
  * @author morvael
  */
 public final class RsrMover extends Decorator implements TranslatablePiece {
-	// static
-	public static final String ID = "RsrMover;";
-	public static final int[] TRANSLATION = new int[] { 5, 0, 4, 1, 3, 2 };
-	//configuration
-	private String terrainMapShaderName;
-	private TerrainMapShader shader;
-	private TerrainHexGrid grid;
-	private String description = "";
-	//counter information
-	private double movementLeft;
-	private String lastMovementReset;
-	private String lastMovementInfo;
-	//dynamic
-	private KeyCommand[] commandsMove;
-	private HexRef lastHex;
-	private double[] lastMPLeft;
-	private HexRef[] lastTargets;
-	private boolean isMovementAllowed;
-	private String movementLeftLabel;
+  // static
+  public static final String ID = "RsrMover;";
+  public static final int[] TRANSLATION = new int[]{5, 0, 4, 1, 3, 2};
+  //configuration
+  private String terrainMapShaderName;
+  private TerrainMapShader shader;
+  private TerrainHexGrid grid;
+  private String description = "";
+  //counter information
+  private double movementLeft;
+  private String lastMovementReset;
+  private String lastMovementInfo;
+  private boolean isMovementAllowed;
+  //dynamic
+  private KeyCommand[] commandsMove;
+  private HexRef lastHex;
+  private double[] lastMPLeft;
+  private HexRef[] lastTargets;
+  private String movementLeftLabel;
 
-	public RsrMover() {
-		this(ID, null);
-	}
+  public RsrMover() {
+    this(ID, null);
+  }
 
-	public RsrMover(String type, GamePiece inner) {
-		mySetType(type);
-		setInner(inner);
-		lastMPLeft = new double[7];
-		lastTargets = new HexRef[6];
-	}
+  public RsrMover(String type, GamePiece inner) {
+    mySetType(type);
+    setInner(inner);
+    lastMPLeft = new double[7];
+    lastTargets = new HexRef[6];
+  }
 
-	@Override
-	public Object getProperty(Object key) {
-		if ("MovementLeft".equals(key)) {
-			return movementLeft;
-		} else if ("MovementLeftLabel".equals(key)) {
-			return movementLeftLabel;
-		} else if ("LastMovementReset".equals(key)) {
-			return lastMovementReset;
-		} else if ("LastMovementInfo".equals(key)) {
-			return lastMovementInfo;
-		} else {
-			return super.getProperty(key);
-		}
-	}
+  @Override
+  public Object getProperty(Object key) {
+    if ("MovementLeft".equals(key)) {
+      return movementLeft;
+    } else if ("MovementLeftLabel".equals(key)) {
+      return movementLeftLabel;
+    } else if ("LastMovementReset".equals(key)) {
+      return lastMovementReset;
+    } else if ("LastMovementInfo".equals(key)) {
+      return lastMovementInfo;
+    } else {
+      return super.getProperty(key);
+    }
+  }
 
-	@Override
-	public Object getLocalizedProperty(Object key) {
-		if ("MovementLeft".equals(key)) {
-			return movementLeft;
-		} else if ("MovementLeftLabel".equals(key)) {
-			return movementLeftLabel;
-		} else if ("LastMovementReset".equals(key)) {
-			return lastMovementReset;
-		} else if ("LastMovementInfo".equals(key)) {
-			return lastMovementInfo;
-		} else {
-			return super.getLocalizedProperty(key);
-		}
-	}
+  @Override
+  public Object getLocalizedProperty(Object key) {
+    if ("MovementLeft".equals(key)) {
+      return movementLeft;
+    } else if ("MovementLeftLabel".equals(key)) {
+      return movementLeftLabel;
+    } else if ("LastMovementReset".equals(key)) {
+      return lastMovementReset;
+    } else if ("LastMovementInfo".equals(key)) {
+      return lastMovementInfo;
+    } else {
+      return super.getLocalizedProperty(key);
+    }
+  }
 
-	@Override
-	public void setProperty(Object key, Object val) {
-		if ("MovementLeft".equals(key)) {
-			try {
-				movementLeft = Double.parseDouble(val.toString());
-			} catch (Exception e) {
-				movementLeft = 0.0;
-			}
-			updateLabel();
-		} else if ("LastMovementReset".equals(key)) {
-			try {
-				lastMovementReset = val.toString();
-			} catch (Exception e) {
-				lastMovementReset = "";
-			}
-		} else if ("LastMovementInfo".equals(key)) {
-			try {
-				lastMovementInfo = val.toString();
-			} catch (Exception e) {
-				lastMovementInfo = "";
-			}
-		} else {
-			super.setProperty(key, val);
-		}
-	}
+  @Override
+  public void setProperty(Object key, Object val) {
+    if ("MovementLeft".equals(key)) {
+      try {
+        movementLeft = Double.parseDouble(val.toString());
+      } catch (Exception e) {
+        movementLeft = 0.0;
+      }
+      updateLabel();
+    } else if ("LastMovementReset".equals(key)) {
+      try {
+        lastMovementReset = val.toString();
+      } catch (Exception e) {
+        lastMovementReset = "";
+      }
+    } else if ("LastMovementInfo".equals(key)) {
+      try {
+        lastMovementInfo = val.toString();
+      } catch (Exception e) {
+        lastMovementInfo = "";
+      }
+    } else {
+      super.setProperty(key, val);
+    }
+  }
 
-	private void updateLabel() {
-		if ((movementLeft == 0.0) || (isMovementAllowed == false)) {
-			movementLeftLabel = "";
-		} else {
-			movementLeftLabel = String.valueOf(movementLeft);
-			if (movementLeftLabel.endsWith(".0")) {
-				movementLeftLabel = movementLeftLabel.substring(0,
-						movementLeftLabel.length() - 2);
-			}
-		}
-	}
+  private void updateLabel() {
+    if ((movementLeft == 0.0) || (isMovementAllowed == false)) {
+      movementLeftLabel = "";
+    } else {
+      movementLeftLabel = String.valueOf(movementLeft);
+      if (movementLeftLabel.endsWith(".0")) {
+        movementLeftLabel = movementLeftLabel.substring(0,
+                movementLeftLabel.length() - 2);
+      }
+    }
+  }
 
-	public String getDescription() {
-		String d = "Rsr Mover";
-		if (description.length() > 0) {
-			d += " - " + description;
-		}
-		return d;
-	}
+  public String getDescription() {
+    String d = "Rsr Mover";
+    if (description.length() > 0) {
+      d += " - " + description;
+    }
+    return d;
+  }
 
-	public String myGetType() {
-		SequenceEncoder se = new SequenceEncoder(';');
-		se.append(terrainMapShaderName == null ? "" : terrainMapShaderName);
-		se.append(description);
-		return ID + se.getValue();
-	}
+  public String myGetType() {
+    SequenceEncoder se = new SequenceEncoder(';');
+    se.append(terrainMapShaderName == null ? "" : terrainMapShaderName);
+    se.append(description);
+    return ID + se.getValue();
+  }
 
-	public void mySetType(String type) {
-		SequenceEncoder.Decoder st = new SequenceEncoder.Decoder(type, ';');
-		st.nextToken(); // Discard ID
-		terrainMapShaderName = st.nextToken("");
-		if (terrainMapShaderName.length() == 0) {
-			terrainMapShaderName = null;
-		}
-		description = st.nextToken("");
-		shader = null;
-		grid = null;
-		lastHex = null;
-		commandsMove = null;
-	}
+  public void mySetType(String type) {
+    SequenceEncoder.Decoder st = new SequenceEncoder.Decoder(type, ';');
+    st.nextToken(); // Discard ID
+    terrainMapShaderName = st.nextToken("");
+    if (terrainMapShaderName.length() == 0) {
+      terrainMapShaderName = null;
+    }
+    description = st.nextToken("");
+    shader = null;
+    grid = null;
+    lastHex = null;
+    commandsMove = null;
+  }
 
-	public String myGetState() {
-		SequenceEncoder se = new SequenceEncoder(';');
-		se.append(movementLeft);
-		se.append(lastMovementReset == null ? "" : lastMovementReset);
-		se.append(lastMovementInfo == null ? "" : lastMovementInfo);
-		return se.getValue();
-	}
+  public String myGetState() {
+    SequenceEncoder se = new SequenceEncoder(';');
+    se.append(movementLeft);
+    se.append(lastMovementReset == null ? "" : lastMovementReset);
+    se.append(lastMovementInfo == null ? "" : lastMovementInfo);
+    se.append(isMovementAllowed);
+    return se.getValue();
+  }
 
-	public void mySetState(String newState) {
-		SequenceEncoder.Decoder st = new SequenceEncoder.Decoder(newState, ';');
-		movementLeft = st.nextDouble(0.0);
-		lastMovementReset = st.nextToken("");
-		lastMovementInfo = st.nextToken("");
-		lastHex = null;
-		updateLabel();
-	}
+  public void mySetState(String newState) {
+    SequenceEncoder.Decoder st = new SequenceEncoder.Decoder(newState, ';');
+    movementLeft = st.nextDouble(0.0);
+    lastMovementReset = st.nextToken("");
+    lastMovementInfo = st.nextToken("");
+    isMovementAllowed = st.nextBoolean(false);
+    lastHex = null;
+    updateLabel();
+  }
 
-	public Rectangle boundingBox() {
-		return piece.boundingBox();
-	}
+  public Rectangle boundingBox() {
+    return piece.boundingBox();
+  }
 
-	public Shape getShape() {
-		return piece.getShape();
-	}
+  public Shape getShape() {
+    return piece.getShape();
+  }
 
-	public String getName() {
-		return piece.getName();
-	}
+  public String getName() {
+    return piece.getName();
+  }
 
-	public void draw(Graphics g, int x, int y, Component obs, double zoom) {
-		// Draw the GamePiece
-		piece.draw(g, x, y, obs, zoom);
-	}
+  public void draw(Graphics g, int x, int y, Component obs, double zoom) {
+    // Draw the GamePiece
+    piece.draw(g, x, y, obs, zoom);
+  }
 
-	private TerrainMapShader getShader() {
-		if (shader == null) {
-			// old Vassal (3.0.17)
-			Enumeration<TerrainMapShader> e = piece.getMap()
-					.getAllDescendantComponents(TerrainMapShader.class);
-			while (e.hasMoreElements()) {
-				TerrainMapShader sh = e.nextElement();
-				if (sh.getConfigureName().equals(terrainMapShaderName)) {
-					shader = sh;
-					grid = shader.getGrid();
-					return shader;
-				}
-			}
-			// new Vassal (3.1+)
+  private TerrainMapShader getShader() {
+    if (shader == null) {
+      // old Vassal (3.0.17)
+      Enumeration<TerrainMapShader> e = piece.getMap().getAllDescendantComponents(TerrainMapShader.class);
+      while (e.hasMoreElements()) {
+        TerrainMapShader sh = e.nextElement();
+        if (sh.getConfigureName().equals(terrainMapShaderName)) {
+          shader = sh;
+          grid = shader.getGrid();
+          return shader;
+        }
+      }
+      // new Vassal (3.1+)
 			/*
-			 * for (TerrainMapShader sh :
-			 * piece.getMap().getAllDescendantComponentsOf
-			 * (TerrainMapShader.class)) { if
-			 * (sh.getConfigureName().equals(terrainMapShaderName)) { shader =
-			 * sh; return shader; } }
-			 */
-			grid = null;
-			return null;
-		} else {
-			return shader;
-		}
-	}
+       * for (TerrainMapShader sh :
+       * piece.getMap().getAllDescendantComponentsOf
+       * (TerrainMapShader.class)) { if
+       * (sh.getConfigureName().equals(terrainMapShaderName)) { shader =
+       * sh; return shader; } }
+       */
+      grid = null;
+      return null;
+    } else {
+      return shader;
+    }
+  }
 
-	private void initCommands() {
-		if (commandsMove == null) {
-			commandsMove = new KeyCommand[9];
-			commandsMove[0] = new KeyCommand("Reset MP", KeyStroke
-					.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_DOWN_MASK), Decorator
-					.getOutermost(this), this);
-			commandsMove[1] = new KeyCommand("Move to NE", KeyStroke
-					.getKeyStroke(KeyEvent.VK_NUMPAD9, 0), Decorator
-					.getOutermost(this), this);
-			commandsMove[2] = new KeyCommand("Move to E", KeyStroke
-					.getKeyStroke(KeyEvent.VK_NUMPAD6, 0), Decorator
-					.getOutermost(this), this);
-			commandsMove[3] = new KeyCommand("Move to SE", KeyStroke
-					.getKeyStroke(KeyEvent.VK_NUMPAD3, 0), Decorator
-					.getOutermost(this), this);
-			commandsMove[4] = new KeyCommand("Move to SW", KeyStroke
-					.getKeyStroke(KeyEvent.VK_NUMPAD1, 0), Decorator
-					.getOutermost(this), this);
-			commandsMove[5] = new KeyCommand("Move to W", KeyStroke
-					.getKeyStroke(KeyEvent.VK_NUMPAD4, 0), Decorator
-					.getOutermost(this), this);
-			commandsMove[6] = new KeyCommand("Move to NW", KeyStroke
-					.getKeyStroke(KeyEvent.VK_NUMPAD7, 0), Decorator
-					.getOutermost(this), this);
-			commandsMove[7] = new KeyCommand("Overrun", KeyStroke.getKeyStroke(
-					KeyEvent.VK_NUMPAD8, 0), Decorator.getOutermost(this), this);
-			commandsMove[8] = new KeyCommand("End movement", KeyStroke.getKeyStroke(
-					KeyEvent.VK_NUMPAD0, 0), Decorator.getOutermost(this), this);
-		}
-	}
+  private void initCommands() {
+    if (commandsMove == null) {
+      commandsMove = new KeyCommand[9];
+      commandsMove[0] = new KeyCommand("Reset MP", KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_DOWN_MASK), Decorator.getOutermost(this), this);
+      commandsMove[1] = new KeyCommand("Move to NE", KeyStroke.getKeyStroke(KeyEvent.VK_NUMPAD9, 0), Decorator.getOutermost(this), this);
+      commandsMove[2] = new KeyCommand("Move to E", KeyStroke.getKeyStroke(KeyEvent.VK_NUMPAD6, 0), Decorator.getOutermost(this), this);
+      commandsMove[3] = new KeyCommand("Move to SE", KeyStroke.getKeyStroke(KeyEvent.VK_NUMPAD3, 0), Decorator.getOutermost(this), this);
+      commandsMove[4] = new KeyCommand("Move to SW", KeyStroke.getKeyStroke(KeyEvent.VK_NUMPAD1, 0), Decorator.getOutermost(this), this);
+      commandsMove[5] = new KeyCommand("Move to W", KeyStroke.getKeyStroke(KeyEvent.VK_NUMPAD4, 0), Decorator.getOutermost(this), this);
+      commandsMove[6] = new KeyCommand("Move to NW", KeyStroke.getKeyStroke(KeyEvent.VK_NUMPAD7, 0), Decorator.getOutermost(this), this);
+      commandsMove[7] = new KeyCommand("Overrun", KeyStroke.getKeyStroke(KeyEvent.VK_NUMPAD8, 0), Decorator.getOutermost(this), this);
+      commandsMove[8] = new KeyCommand("End movement", KeyStroke.getKeyStroke(KeyEvent.VK_NUMPAD0, 0), Decorator.getOutermost(this), this);
+    }
+  }
 
-	private void prepareCommands(RsrCounter counter) {
-		// board check
-		boolean boardOk = (shader != null)
-				&& (counter.getPiece().getMap() == shader.getBoard().getMap());
-		if (boardOk == false) {
-			isMovementAllowed = false;
-			for (int i = 0; i < commandsMove.length; i++) {
-				commandsMove[i].setEnabled(false);
-			}
-		} else {
-			RsrMapShaderBase rules = (RsrMapShaderBase) shader.getRules();
-			// phase check
-			isMovementAllowed = ((rules.getPhaseName().equals("Axis Movement")) && (counter
-					.getSide().equals(RsrMapShaderBase.SIDE_AXIS)))
-					|| ((rules.getPhaseName().equals("Soviet Movement")) && (counter
-							.getSide().equals(RsrMapShaderBase.SIDE_SOVIET)))
-					|| ((rules.getPhaseName().equals("German Tank Movement")) && (TerrainMapShaderRule
-							.isAny(counter.getUnitType(), "AxisGermanTankCorps",
-									"AxisGermanTankBattlegroup",
-									"AxisGermanTankDivision")));
-			// reset
-			String thisTP = rules.getTurnNumber() + "_" + rules.getPhaseName();
-			commandsMove[0].setEnabled((isMovementAllowed)
-					&& (thisTP.equals(lastMovementReset) == false));
-			// movement
-			double thisMovement = movementLeft;
-			HexRef thisHex = grid.getHexPos(counter.getPiece().getPosition());
-			//if (((thisHex.equals(lastHex) == false) || (thisMovement != lastMovement))) {
-				lastHex = thisHex;
-			//	lastMovement = thisMovement;
-				HexRef[] neighbours = grid.getAdjacentHexesWithNulls(thisHex);
-				HashMap<HexRef, TerrainMapShaderCost> costs = shader.getHexes(shader.getRules(), counter.getPiece());
-				for (int i = 0; i < 6; i++) {
-					if (costs.containsKey(neighbours[i])) {
-						lastMPLeft[TRANSLATION[i]] = costs.get(neighbours[i])
-								.getPointsLeft();
-						lastTargets[TRANSLATION[i]] = neighbours[i];
-					} else {
-						lastMPLeft[TRANSLATION[i]] = Double.MAX_VALUE;
-						lastTargets[TRANSLATION[i]] = null;
-					}
-				}
-			//}
-			for (int i = 0; i < 6; i++) {
-				commandsMove[1 + i].setEnabled((isMovementAllowed)
-						&& (lastMPLeft[i] != Double.MAX_VALUE));
-			}
-			//overrun
-			lastMPLeft[6] = thisMovement - rules.getOverrunCost(counter);
-			commandsMove[7].setEnabled((isMovementAllowed)
-					&& (lastMPLeft[6] != Double.MAX_VALUE));
-			//end movement
-			commandsMove[8].setEnabled((isMovementAllowed)
-					&& (thisMovement > 0.0));
-		}
-	}
+  private void prepareCommands(RsrCounter counter) {
+    // board check
+    boolean boardOk = (shader != null) && (counter.getPiece().getMap() == shader.getBoard().getMap());
+    if (boardOk == false) {
+      isMovementAllowed = false;
+      for (int i = 0; i < commandsMove.length; i++) {
+        commandsMove[i].setEnabled(false);
+      }
+    } else {
+      RsrMapShaderBase rules = (RsrMapShaderBase) shader.getRules();
+      // phase check
+      isMovementAllowed = ((rules.getPhaseName().equals("Axis Movement")) && (counter.getSide().equals(RsrMapShaderBase.SIDE_AXIS))) || ((rules.getPhaseName().equals("Soviet Movement")) && (counter.getSide().equals(RsrMapShaderBase.SIDE_SOVIET))) || ((rules.getPhaseName().equals("German Tank Movement")) && (TerrainMapShaderRule.isAny(counter.getUnitType(), "AxisGermanTankCorps",
+              "AxisGermanTankBattlegroup",
+              "AxisGermanTankDivision")));
+      // reset
+      String thisTP = rules.getTurnNumber() + "_" + rules.getPhaseName();
+      commandsMove[0].setEnabled((isMovementAllowed) && (thisTP.equals(lastMovementReset) == false));
+      // movement
+      double thisMovement = movementLeft;
+      HexRef thisHex = grid.getHexPos(counter.getPiece().getPosition());
+      //if (((thisHex.equals(lastHex) == false) || (thisMovement != lastMovement))) {
+      lastHex = thisHex;
+      //	lastMovement = thisMovement;
+      HexRef[] neighbours = grid.getAdjacentHexesWithNulls(thisHex);
+      HashMap<HexRef, TerrainMapShaderCost> costs = shader.getHexes(shader.getRules(), counter.getPiece());
+      for (int i = 0; i < 6; i++) {
+        if (costs.containsKey(neighbours[i])) {
+          lastMPLeft[TRANSLATION[i]] = costs.get(neighbours[i]).getPointsLeft();
+          lastTargets[TRANSLATION[i]] = neighbours[i];
+        } else {
+          lastMPLeft[TRANSLATION[i]] = Double.MAX_VALUE;
+          lastTargets[TRANSLATION[i]] = null;
+        }
+      }
+      //}
+      for (int i = 0; i < 6; i++) {
+        commandsMove[1 + i].setEnabled((isMovementAllowed) && (lastMPLeft[i] != Double.MAX_VALUE));
+      }
+      //overrun
+      double cost = rules.getOverrunCost(counter);
+      lastMPLeft[6] = thisMovement - cost;
+      commandsMove[7].setEnabled((isMovementAllowed) && (cost != Double.MAX_VALUE));
+      //end movement
+      commandsMove[8].setEnabled((isMovementAllowed) && (thisMovement > 0.0));
+    }
+  }
 
-	@Override
-	protected KeyCommand[] myGetKeyCommands() {
-		initCommands();
-		getShader();
-		GamePiece gp = Decorator.getOutermost(this);
-		prepareCommands(new RsrCounter(gp));
-		return commandsMove;
-	}
+  @Override
+  protected KeyCommand[] myGetKeyCommands() {
+    initCommands();
+    getShader();
+    GamePiece gp = Decorator.getOutermost(this);
+    prepareCommands(new RsrCounter(gp));
+    return commandsMove;
+  }
 
-	// No hot-keys
-	public Command myKeyEvent(KeyStroke stroke) {
-		myGetKeyCommands();
-		int match = -1;
-		for (int i = 0; i < commandsMove.length; i++) {
-			if (commandsMove[i].getKeyStroke().equals(stroke)) {
-				match = i;
-				break;
-			}
-		}
-		if (match == -1)
-			return null;
-		ChangeTracker tracker = new ChangeTracker(this);
-		GamePiece gp = Decorator.getOutermost(this);
-		RsrCounter counter = new RsrCounter(gp);
-		if ((shader == null) || (commandsMove[match].isEnabled() == false)) {
-			if (match == 0) {
-				updateLabel();
-			}
-			lastMovementInfo = "";
-			return tracker.getChangeCommand();
-		}
-		Command c = null;
-		RsrMapShaderBase rules = (RsrMapShaderBase) shader.getRules();
-		if (match == 0) {
-			// reset
-			double mp = rules.getMovementAllowance(counter);
-			movementLeft = mp;
-			lastMovementReset = rules.getTurnNumber() + "_"
-					+ rules.getPhaseName();
-			lastMovementInfo = GlobalOptions.getInstance().getPlayerId() + ": "
-					+ gp.getName() + "'s MP reset to " + mp + ".";
-			updateLabel();
-			c = tracker.getChangeCommand();
-		} else if (match == 7) {
-			// overrun
-			movementLeft = lastMPLeft[6];
-			lastMovementInfo = GlobalOptions.getInstance().getPlayerId() + ": "
-					+ gp.getName() + " will perform an overrun.";
-			updateLabel();
-			c = tracker.getChangeCommand();
-		} else if (match == 8) {
-			movementLeft = 0.0d;
-			lastMovementInfo = GlobalOptions.getInstance().getPlayerId() + ": "
-					+ gp.getName() + " has finished moving.";
-			updateLabel();
-			c = tracker.getChangeCommand();
-		} else {
-			// move
-			match--;
-			VASSAL.build.module.Map map = shader.getBoard().getMap();
-			Stack parent = gp.getParent();
-			HexRef hr = lastTargets[match];
-			movementLeft = lastMPLeft[match];
-			lastMovementInfo = GlobalOptions.getInstance().getPlayerId()
-					+ ": "
-					+ gp.getName()
-					+ " moved from "
-					+ grid.locationName(grid.getHexCenter(lastHex.getColumn(),
-							lastHex.getRow()))
-					+ " to "
-					+ grid.locationName(grid.getHexCenter(hr.getColumn(), hr
-							.getRow())) + ".";
-			Point dest = grid.getHexCenter(hr.getColumn(), hr.getRow());
-			updateLabel();
-			c = tracker.getChangeCommand();
-			RsrCounter strengthCounter = RsrMover.getStrengthCounter(counter, c);
-			c.append(map.placeOrMerge(gp, dest));
-			if (parent != null) {
-				c.append(parent.pieceRemoved(gp));
-			}
-			if (strengthCounter != null) {
-				c.append(map.placeOrMerge(strengthCounter.getPiece(), dest));
-				if (parent != null) {
-					c.append(parent.pieceRemoved(strengthCounter.getPiece()));
-				}
-			}
-		}
-		return c;
-	}
+  // No hot-keys
+  public Command myKeyEvent(KeyStroke stroke) {
+    myGetKeyCommands();
+    int match = -1;
+    for (int i = 0; i < commandsMove.length; i++) {
+      if (commandsMove[i].getKeyStroke().equals(stroke)) {
+        match = i;
+        break;
+      }
+    }
+    if (match == -1) {
+      return null;
+    }
+    ChangeTracker tracker = new ChangeTracker(this);
+    GamePiece gp = Decorator.getOutermost(this);
+    RsrCounter counter = new RsrCounter(gp);
+    if ((shader == null) || (commandsMove[match].isEnabled() == false)) {
+      if (match == 0) {
+        updateLabel();
+      }
+      lastMovementInfo = "";
+      return tracker.getChangeCommand();
+    }
+    Command c = null;
+    RsrMapShaderBase rules = (RsrMapShaderBase) shader.getRules();
+    if (match == 0) {
+      // reset
+      double mp = rules.getMovementAllowance(counter);
+      movementLeft = mp;
+      lastMovementReset = rules.getTurnNumber() + "_" + rules.getPhaseName();
+      lastMovementInfo = GlobalOptions.getInstance().getPlayerId() + ": " + gp.getName() + "'s MP reset to " + mp + ".";
+      updateLabel();
+      c = tracker.getChangeCommand();
+    } else if (match == 7) {
+      // overrun
+      movementLeft = lastMPLeft[6];
+      lastMovementInfo = GlobalOptions.getInstance().getPlayerId() + ": " + gp.getName() + " will perform an overrun.";
+      updateLabel();
+      c = tracker.getChangeCommand();
+    } else if (match == 8) {
+      movementLeft = 0.0d;
+      lastMovementInfo = GlobalOptions.getInstance().getPlayerId() + ": " + gp.getName() + " has finished moving.";
+      updateLabel();
+      c = tracker.getChangeCommand();
+    } else {
+      // move
+      match--;
+      VASSAL.build.module.Map map = shader.getBoard().getMap();
+      Stack parent = gp.getParent();
+      HexRef hr = lastTargets[match];
+      movementLeft = lastMPLeft[match];
+      lastMovementInfo = GlobalOptions.getInstance().getPlayerId() + ": " + gp.getName() + " moved from " + grid.locationName(grid.getHexCenter(lastHex.getColumn(),
+              lastHex.getRow())) + " to " + grid.locationName(grid.getHexCenter(hr.getColumn(), hr.getRow())) + ".";
+      Point dest = grid.getHexCenter(hr.getColumn(), hr.getRow());
+      updateLabel();
+      c = tracker.getChangeCommand();
+      RsrCounter strengthCounter = RsrMover.getStrengthCounter(counter, c);
+      c.append(map.placeOrMerge(gp, dest));
+      if (parent != null) {
+        c.append(parent.pieceRemoved(gp));
+      }
+      if (strengthCounter != null) {
+        c.append(map.placeOrMerge(strengthCounter.getPiece(), dest));
+        if (parent != null) {
+          c.append(parent.pieceRemoved(strengthCounter.getPiece()));
+        }
+      }
+    }
+    return c;
+  }
 
-	public HelpFile getHelpFile() {
-		return HelpFile.getReferenceManualPage("RsrMover.htm");
-	}
+  public HelpFile getHelpFile() {
+    return HelpFile.getReferenceManualPage("RsrMover.htm");
+  }
 
-	public PieceEditor getEditor() {
-		return new TraitEditor(this);
-	}
+  @Override
+  public PieceEditor getEditor() {
+    return new TraitEditor(this);
+  }
 
-	protected static class TraitEditor implements PieceEditor {
-		protected JPanel panel;
-		protected StringConfigurer descriptionConfigurer;
-		protected Box selectShader;
-		protected String mapShaderId;
+  protected static class TraitEditor implements PieceEditor {
 
-		protected TraitEditor(RsrMover trait) {
-			panel = new JPanel();
-			panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
+    protected JPanel panel;
+    protected StringConfigurer descriptionConfigurer;
+    protected Box selectShader;
+    protected String mapShaderId;
 
-			panel.add(new JLabel("Contributed by morvael", JLabel.CENTER));
-			panel.add(new JSeparator());
-			panel.add(new JLabel(" "));
+    protected TraitEditor(RsrMover trait) {
+      panel = new JPanel();
+      panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
 
-			descriptionConfigurer = new StringConfigurer(null,
-					"Description:  ", trait.description);
-			panel.add(descriptionConfigurer.getControls());
+      panel.add(new JLabel("Contributed by morvael", JLabel.CENTER));
+      panel.add(new JSeparator());
+      panel.add(new JLabel(" "));
 
-			mapShaderId = trait.terrainMapShaderName;
-			selectShader = Box.createHorizontalBox();
+      descriptionConfigurer = new StringConfigurer(null,
+              "Description:  ", trait.description);
+      panel.add(descriptionConfigurer.getControls());
 
-			panel.add(selectShader);
-			JLabel l = new JLabel("Map Shading:  ");
-			selectShader.add(l);
-			final JTextField tf = new JTextField(12);
-			tf.setEditable(false);
-			selectShader.add(tf);
-			tf.setText(trait.terrainMapShaderName);
-			JButton b = new JButton("Select");
-			selectShader.add(b);
-			b.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					ChooseComponentDialog d = new ChooseComponentDialog(
-							(Frame) SwingUtilities.getAncestorOfClass(
-									Frame.class, panel), TerrainMapShader.class);
-					d.setVisible(true);
-					if (d.getTarget() != null) {
-						mapShaderId = d.getTarget().getConfigureName();
-						tf.setText(mapShaderId);
-					} else {
-						mapShaderId = null;
-						tf.setText("");
-					}
-				}
-			});
-		}
+      mapShaderId = trait.terrainMapShaderName;
+      selectShader = Box.createHorizontalBox();
 
-		public Component getControls() {
-			return panel;
-		}
+      panel.add(selectShader);
+      JLabel l = new JLabel("Map Shading:  ");
+      selectShader.add(l);
+      final JTextField tf = new JTextField(12);
+      tf.setEditable(false);
+      selectShader.add(tf);
+      tf.setText(trait.terrainMapShaderName);
+      JButton b = new JButton("Select");
+      selectShader.add(b);
+      b.addActionListener(new ActionListener() {
 
-		public String getState() {
-			return "false";
-		}
+        public void actionPerformed(ActionEvent e) {
+          ChooseComponentDialog d = new ChooseComponentDialog(
+                  (Frame) SwingUtilities.getAncestorOfClass(
+                  Frame.class, panel), TerrainMapShader.class);
+          d.setVisible(true);
+          if (d.getTarget() != null) {
+            mapShaderId = d.getTarget().getConfigureName();
+            tf.setText(mapShaderId);
+          } else {
+            mapShaderId = null;
+            tf.setText("");
+          }
+        }
+      });
+    }
 
-		public String getType() {
-			SequenceEncoder se = new SequenceEncoder(';');
-			se.append(mapShaderId != null ? mapShaderId : "");
-			se.append(descriptionConfigurer.getValueString());
-			return RsrMover.ID + se.getValue();
-		}
-	}
-	
-	public static RsrCounter getStrengthCounter(RsrCounter counter, Command c) {
-		if ((counter.getUnitType().equals("SovietInfantryArmy")) || (counter.getUnitType().equals("SovietShockArmy")) || (counter.getUnitType().equals("SovietGuardsArmy")) || (counter.getUnitType().equals("SovietTankArmy"))) {
-			//
-			GamePiece gp = counter.getPiece();
-			Map map = gp.getMap();
-			String location = gp.getProperty("LocationName").toString();
-			//
-			HashSet<String> unitNames = new HashSet<String>();
-			for (GamePiece gpa : TerrainMapShaderRule.filterPieces(map, "Type=Unit&&LocationName=" + location)) {
-				unitNames.add(gpa.getName());
-			}
-			RsrCounter result = null;
-			for (GamePiece gps : TerrainMapShaderRule.filterPieces(map, "Type=Strength&&LocationName=" + location + "&&AttachedArmy=" + gp.getName())) {
-				result = new RsrCounter(gps);
-			}
-			if (result == null) {
-				for (GamePiece gps : TerrainMapShaderRule.filterPieces(map, "Type=Strength&&LocationName=" + location + "&&StrengthClass=" + counter.getCombatClass())) {
-					result = new RsrCounter(gps);
-					if ((result.getAttachedArmy().equals("")) || (unitNames.contains(result.getAttachedArmy()) == false)) {
-						if (c != null) {
-							ChangeTracker tracker = new ChangeTracker(gps);
-							result.setAttachedArmy(gp.getName());
-							c.append(tracker.getChangeCommand());
-						} else {
-							result.setAttachedArmy(gp.getName());
-						}
-					}
-				}
-			}
-			return result;
-		} else {
-			return null;
-		}
-	}
+    public Component getControls() {
+      return panel;
+    }
 
+    public String getState() {
+      return "0;;false;";
+    }
+
+    public String getType() {
+      SequenceEncoder se = new SequenceEncoder(';');
+      se.append(mapShaderId != null ? mapShaderId : "");
+      se.append(descriptionConfigurer.getValueString());
+      return RsrMover.ID + se.getValue();
+    }
+  }
+
+  public static RsrCounter getStrengthCounter(RsrCounter counter, Command c) {
+    if ((counter.getUnitType().equals("SovietInfantryArmy")) || (counter.getUnitType().equals("SovietShockArmy")) || (counter.getUnitType().equals("SovietGuardsArmy")) || (counter.getUnitType().equals("SovietTankArmy"))) {
+      //
+      GamePiece gp = counter.getPiece();
+      Map map = gp.getMap();
+      String location = gp.getProperty("LocationName").toString();
+      //
+      HashSet<String> unitNames = new HashSet<String>();
+      for (GamePiece gpa : TerrainMapShaderRule.filterPieces(map, "Type=Unit&&LocationName=" + location)) {
+        unitNames.add(gpa.getName());
+      }
+      RsrCounter result = null;
+      for (GamePiece gps : TerrainMapShaderRule.filterPieces(map, "Type=Strength&&LocationName=" + location + "&&AttachedArmy=" + gp.getName())) {
+        result = new RsrCounter(gps);
+      }
+      if (result == null) {
+        for (GamePiece gps : TerrainMapShaderRule.filterPieces(map, "Type=Strength&&LocationName=" + location + "&&StrengthClass=" + counter.getCombatClass())) {
+          result = new RsrCounter(gps);
+          if ((result.getAttachedArmy().equals("")) || (unitNames.contains(result.getAttachedArmy()) == false)) {
+            if (c != null) {
+              ChangeTracker tracker = new ChangeTracker(gps);
+              result.setAttachedArmy(gp.getName());
+              c.append(tracker.getChangeCommand());
+            } else {
+              result.setAttachedArmy(gp.getName());
+            }
+          }
+        }
+      }
+      return result;
+    } else {
+      return null;
+    }
+  }
 }

Modified: VSQL-src/branches/morvael/rsr/RsrSupplier.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrSupplier.java	2008-08-20 19:11:54 UTC (rev 4069)
+++ VSQL-src/branches/morvael/rsr/RsrSupplier.java	2008-08-20 19:58:02 UTC (rev 4070)
@@ -47,493 +47,485 @@
  */
 public final class RsrSupplier extends Decorator implements TranslatablePiece {
 
-	private final class RsrSupplierInfo {
+  private final class RsrSupplierInfo {
 
-		public String lastReset;
-		public HashMap<HexRef, TerrainMapShaderCost> lastCost;
-		
-		public void reload(String tp, TerrainMapShader shader) {
-			if (tp.equals(lastReset) == false) {
-				lastReset = tp;
-				lastCost = shader.getHexes(shader.getRules(), null);
-			}
-		}
+    public String lastReset;
+    public HashMap<HexRef, TerrainMapShaderCost> lastCost;
 
-	}
+    public void reload(String tp, TerrainMapShader shader) {
+      if (tp.equals(lastReset) == false) {
+        lastReset = tp;
+        lastCost = shader.getHexes(shader.getRules(), null);
+      }
+    }
+  }
 
-	// static
-	public static final String ID = "RsrSupplier;";
-	public static final int[] TRANSLATION = new int[] { 5, 0, 4, 1, 3, 2 };
-	// configuration
-	private String terrainMapShaderNameN;
-	private TerrainMapShader shaderN;
-	private String terrainMapShaderNameA;
-	private TerrainMapShader shaderA;
-	private TerrainHexGrid grid;
-	private String description = "";
-	// counter information
-	private int supplyLevel;
-	private int isolated;
-	private String lastSupplyReset;
-	private String lastSupplyInfo;
-	// dynamic
-	private KeyCommand[] commandsSupply;
-	private boolean isSupplyAllowed;
-	private String supplyLevelLabel;
-	private String supplyLevelInfoLabel;
+  // static
+  public static final String ID = "RsrSupplier;";
+  public static final int[] TRANSLATION = new int[]{5, 0, 4, 1, 3, 2};
+  // configuration
+  private String terrainMapShaderNameN;
+  private TerrainMapShader shaderN;
+  private String terrainMapShaderNameA;
+  private TerrainMapShader shaderA;
+  private TerrainHexGrid grid;
+  private String description = "";
+  // counter information
+  private int supplyLevel;
+  private int isolated;
+  private String lastSupplyReset;
+  private String lastSupplyInfo;
+  // dynamic
+  private KeyCommand[] commandsSupply;
+  private boolean isSupplyAllowed;
+  private String supplyLevelLabel;
+  private String supplyLevelInfoLabel;
+  private static HashMap<String, RsrSupplierInfo> cache = new HashMap<String, RsrSupplierInfo>();
+  private static String lastSupplyGlobalReset;
+  private static HashSet<HexRef> inAirRange = new HashSet<HexRef>();
+  private static HashSet<HexRef> inFactory = new HashSet<HexRef>();
 
-	private static HashMap<String, RsrSupplierInfo> cache = new HashMap<String, RsrSupplierInfo>();
-	private static String lastSupplyGlobalReset;
-	private static HashSet<HexRef> inAirRange = new HashSet<HexRef>();
-	private static HashSet<HexRef> inFactory = new HashSet<HexRef>();
+  public RsrSupplier() {
+    this(ID, null);
+  }
 
-	public RsrSupplier() {
-		this(ID, null);
-	}
+  public RsrSupplier(String type, GamePiece inner) {
+    mySetType(type);
+    setInner(inner);
+  }
 
-	public RsrSupplier(String type, GamePiece inner) {
-		mySetType(type);
-		setInner(inner);
-	}
+  @Override
+  public Object getProperty(Object key) {
+    if ("SupplyLevel".equals(key)) {
+      return supplyLevel;
+    } else if ("Isolated".equals(key)) {
+      return isolated;
+    } else if ("SupplyLevelLabel".equals(key)) {
+      return supplyLevelLabel;
+    } else if ("LastSupplyReset".equals(key)) {
+      return lastSupplyReset;
+    } else if ("LastSupplyInfo".equals(key)) {
+      return lastSupplyInfo;
+    } else {
+      return super.getProperty(key);
+    }
+  }
 
-	@Override
-	public Object getProperty(Object key) {
-		if ("SupplyLevel".equals(key)) {
-			return supplyLevel;
-		} else if ("Isolated".equals(key)) {
-			return isolated;
-		} else if ("SupplyLevelLabel".equals(key)) {
-			return supplyLevelLabel;
-		} else if ("LastSupplyReset".equals(key)) {
-			return lastSupplyReset;
-		} else if ("LastSupplyInfo".equals(key)) {
-			return lastSupplyInfo;
-		} else {
-			return super.getProperty(key);
-		}
-	}
+  @Override
+  public Object getLocalizedProperty(Object key) {
+    if ("SupplyLevel".equals(key)) {
+      return supplyLevel;
+    } else if ("Isolated".equals(key)) {
+      return isolated;
+    } else if ("SupplyLevelLabel".equals(key)) {
+      return supplyLevelLabel;
+    } else if ("LastSupplyReset".equals(key)) {
+      return lastSupplyReset;
+    } else if ("LastSupplyInfo".equals(key)) {
+      return lastSupplyInfo;
+    } else {
+      return super.getLocalizedProperty(key);
+    }
+  }
 
-	@Override
-	public Object getLocalizedProperty(Object key) {
-		if ("SupplyLevel".equals(key)) {
-			return supplyLevel;
-		} else if ("Isolated".equals(key)) {
-			return isolated;
-		} else if ("SupplyLevelLabel".equals(key)) {
-			return supplyLevelLabel;
-		} else if ("LastSupplyReset".equals(key)) {
-			return lastSupplyReset;
-		} else if ("LastSupplyInfo".equals(key)) {
-			return lastSupplyInfo;
-		} else {
-			return super.getLocalizedProperty(key);
-		}
-	}
+  @Override
+  public void setProperty(Object key, Object val) {
+    if ("SupplyLevel".equals(key)) {
+      try {
+        supplyLevel = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        supplyLevel = 0;
+      }
+      updateLabel();
+    } else if ("Isolated".equals(key)) {
+      try {
+        isolated = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        isolated = 0;
+      }
+      updateLabel();
+    } else if ("LastSupplyReset".equals(key)) {
+      try {
+        lastSupplyReset = val.toString();
+      } catch (Exception e) {
+        lastSupplyReset = "";
+      }
+    } else if ("LastSupplyInfo".equals(key)) {
+      try {
+        lastSupplyInfo = val.toString();
+      } catch (Exception e) {
+        lastSupplyInfo = "";
+      }
+    } else {
+      super.setProperty(key, val);
+    }
+  }
 
-	@Override
-	public void setProperty(Object key, Object val) {
-		if ("SupplyLevel".equals(key)) {
-			try {
-				supplyLevel = Integer.parseInt(val.toString());
-			} catch (Exception e) {
-				supplyLevel = 0;
-			}
-			updateLabel();
-		} else if ("Isolated".equals(key)) {
-			try {
-				isolated = Integer.parseInt(val.toString());
-			} catch (Exception e) {
-				isolated = 0;
-			}
-			updateLabel();
-		} else if ("LastSupplyReset".equals(key)) {
-			try {
-				lastSupplyReset = val.toString();
-			} catch (Exception e) {
-				lastSupplyReset = "";
-			}
-		} else if ("LastSupplyInfo".equals(key)) {
-			try {
-				lastSupplyInfo = val.toString();
-			} catch (Exception e) {
-				lastSupplyInfo = "";
-			}
-		} else {
-			super.setProperty(key, val);
-		}
-	}
+  private void updateLabel() {
+    if (supplyLevel == 0) {
+      supplyLevelLabel = "";
+      supplyLevelInfoLabel = "normal supply";
+    } else {
+      switch (supplyLevel) {
+        case 1:
+          supplyLevelLabel = "Emergency";
+          supplyLevelInfoLabel = "emergency supply";
+          break;
+        case 2:
+          supplyLevelLabel = "Lack";
+          supplyLevelInfoLabel = "lack of supply";
+          break;
+        case 3:
+          supplyLevelLabel = "Out";
+          supplyLevelInfoLabel = "out of supply";
+          break;
+        default:
+          supplyLevelLabel = "";
+          break;
+      }
+      if ((supplyLevel == 3) && (isolated == 1)) {
+        supplyLevelLabel = "!" + supplyLevelLabel + "!";
+        supplyLevelInfoLabel = supplyLevelInfoLabel + " and isolated";
+      }
+      supplyLevelLabel = " " + supplyLevelLabel + " ";
+    }
+  }
 
-	private void updateLabel() {
-		if (supplyLevel == 0) {
-			supplyLevelLabel = "";
-			supplyLevelInfoLabel = "normal supply";
-		} else {
-			switch (supplyLevel) {
-			case 1:
-				supplyLevelLabel = "Emergency";
-				supplyLevelInfoLabel = "emergency supply";
-				break;
-			case 2:
-				supplyLevelLabel = "Lack";
-				supplyLevelInfoLabel = "lack of supply";
-				break;
-			case 3:
-				supplyLevelLabel = "Out";
-				supplyLevelInfoLabel = "out of supply";
-				break;
-			default:
-				supplyLevelLabel = "";
-				break;
-			}
-			if ((supplyLevel == 3) && (isolated == 1)) {
-				supplyLevelLabel = "!" + supplyLevelLabel + "!";
-				supplyLevelInfoLabel = supplyLevelInfoLabel + " and isolated";
-			}
-			supplyLevelLabel = " " + supplyLevelLabel + " ";
-		}
-	}
+  public String getDescription() {
+    String d = "Rsr Supplier";
+    if (description.length() > 0) {
+      d += " - " + description;
+    }
+    return d;
+  }
 
-	public String getDescription() {
-		String d = "Rsr Supplier";
-		if (description.length() > 0) {
-			d += " - " + description;
-		}
-		return d;
-	}
+  public String myGetType() {
+    SequenceEncoder se = new SequenceEncoder(';');
+    se.append(terrainMapShaderNameN == null ? "" : terrainMapShaderNameN);
+    se.append(terrainMapShaderNameA == null ? "" : terrainMapShaderNameA);
+    se.append(description);
+    return ID + se.getValue();
+  }
 
-	public String myGetType() {
-		SequenceEncoder se = new SequenceEncoder(';');
-		se.append(terrainMapShaderNameN == null ? "" : terrainMapShaderNameN);
-		se.append(terrainMapShaderNameA == null ? "" : terrainMapShaderNameA);
-		se.append(description);
-		return ID + se.getValue();
-	}
+  public void mySetType(String type) {
+    SequenceEncoder.Decoder st = new SequenceEncoder.Decoder(type, ';');
+    st.nextToken(); // Discard ID
+    terrainMapShaderNameN = st.nextToken("");
+    if (terrainMapShaderNameN.length() == 0) {
+      terrainMapShaderNameN = null;
+    }
+    terrainMapShaderNameA = st.nextToken("");
+    if (terrainMapShaderNameA.length() == 0) {
+      terrainMapShaderNameA = null;
+    }
+    description = st.nextToken("");
+    shaderN = null;
+    shaderA = null;
+    grid = null;
+    commandsSupply = null;
+  }
 
-	public void mySetType(String type) {
-		SequenceEncoder.Decoder st = new SequenceEncoder.Decoder(type, ';');
-		st.nextToken(); // Discard ID
-		terrainMapShaderNameN = st.nextToken("");
-		if (terrainMapShaderNameN.length() == 0) {
-			terrainMapShaderNameN = null;
-		}
-		terrainMapShaderNameA = st.nextToken("");
-		if (terrainMapShaderNameA.length() == 0) {
-			terrainMapShaderNameA = null;
-		}
-		description = st.nextToken("");
-		shaderN = null;
-		shaderA = null;
-		grid = null;
-		commandsSupply = null;
-	}
+  public String myGetState() {
+    SequenceEncoder se = new SequenceEncoder(';');
+    se.append(supplyLevel);
+    se.append(isolated);
+    se.append(lastSupplyReset == null ? "" : lastSupplyReset);
+    se.append(lastSupplyInfo == null ? "" : lastSupplyInfo);
+    return se.getValue();
+  }
 
-	public String myGetState() {
-		SequenceEncoder se = new SequenceEncoder(';');
-		se.append(supplyLevel);
-		se.append(isolated);
-		se.append(lastSupplyReset == null ? "" : lastSupplyReset);
-		se.append(lastSupplyInfo == null ? "" : lastSupplyInfo);
-		return se.getValue();
-	}
+  public void mySetState(String newState) {
+    SequenceEncoder.Decoder st = new SequenceEncoder.Decoder(newState, ';');
+    supplyLevel = st.nextInt(0);
+    isolated = st.nextInt(0);
+    lastSupplyReset = st.nextToken("");
+    lastSupplyInfo = st.nextToken("");
+    updateLabel();
+  }
 
-	public void mySetState(String newState) {
-		SequenceEncoder.Decoder st = new SequenceEncoder.Decoder(newState, ';');
-		supplyLevel = st.nextInt(0);
-		isolated = st.nextInt(0);
-		lastSupplyReset = st.nextToken("");
-		lastSupplyInfo = st.nextToken("");
-		updateLabel();
-	}
+  public Rectangle boundingBox() {
+    return piece.boundingBox();
+  }
 
-	public Rectangle boundingBox() {
-		return piece.boundingBox();
-	}
+  public Shape getShape() {
+    return piece.getShape();
+  }
 
-	public Shape getShape() {
-		return piece.getShape();
-	}
+  public String getName() {
+    return piece.getName();
+  }
 
-	public String getName() {
-		return piece.getName();
-	}
+  public void draw(Graphics g, int x, int y, Component obs, double zoom) {
+    piece.draw(g, x, y, obs, zoom);
+  }
 
-	public void draw(Graphics g, int x, int y, Component obs, double zoom) {
-		piece.draw(g, x, y, obs, zoom);
-	}
+  private void getShaders() {
+    shaderN = getShader(terrainMapShaderNameN, shaderN);
+    shaderA = getShader(terrainMapShaderNameA, shaderA);
+  }
 
-	private void getShaders() {
-		shaderN = getShader(terrainMapShaderNameN, shaderN);
-		shaderA = getShader(terrainMapShaderNameA, shaderA);
-	}
-
-	private TerrainMapShader getShader(String name, TerrainMapShader shader) {
-		if (shader == null) {
-			// old Vassal (3.0.17)
-			Enumeration<TerrainMapShader> e = piece.getMap()
-					.getAllDescendantComponents(TerrainMapShader.class);
-			while (e.hasMoreElements()) {
-				TerrainMapShader sh = e.nextElement();
-				if (sh.getConfigureName().equals(name)) {
-					grid = sh.getGrid();
-					return sh;
-				}
-			}
-			// new Vassal (3.1+)
+  private TerrainMapShader getShader(String name, TerrainMapShader shader) {
+    if (shader == null) {
+      // old Vassal (3.0.17)
+      Enumeration<TerrainMapShader> e = piece.getMap().getAllDescendantComponents(TerrainMapShader.class);
+      while (e.hasMoreElements()) {
+        TerrainMapShader sh = e.nextElement();
+        if (sh.getConfigureName().equals(name)) {
+          grid = sh.getGrid();
+          return sh;
+        }
+      }
+      // new Vassal (3.1+)
 			/*
-			 * for (TerrainMapShader sh :
-			 * piece.getMap().getAllDescendantComponentsOf
-			 * (TerrainMapShader.class)) { if
-			 * (sh.getConfigureName().equals(name)) { return sh; } }
-			 */
-			grid = null;
-			return null;
-		} else {
-			return shader;
-		}
-	}
+       * for (TerrainMapShader sh :
+       * piece.getMap().getAllDescendantComponentsOf
+       * (TerrainMapShader.class)) { if
+       * (sh.getConfigureName().equals(name)) { return sh; } }
+       */
+      grid = null;
+      return null;
+    } else {
+      return shader;
+    }
+  }
 
-	private void initCommands() {
-		if (commandsSupply == null) {
-			commandsSupply = new KeyCommand[1];
-			commandsSupply[0] = new KeyCommand("Check supply", KeyStroke
-					.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK),
-					Decorator.getOutermost(this), this);
-		}
-	}
+  private void initCommands() {
+    if (commandsSupply == null) {
+      commandsSupply = new KeyCommand[1];
+      commandsSupply[0] = new KeyCommand("Check supply", KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK),
+              Decorator.getOutermost(this), this);
+    }
+  }
 
-	private void prepareCommands(RsrCounter counter) {
-		// phase check
-		isSupplyAllowed = true;// rulesN.getPhaseName().equals("Supply");
-		// board check
-		boolean boardOk = (shaderN != null) && (shaderA != null)
-				&& (counter.getPiece().getMap() == shaderN.getBoard().getMap())
-				&& (counter.getPiece().getMap() == shaderA.getBoard().getMap());
-		if (boardOk == false) {
-			for (int i = 0; i < commandsSupply.length; i++) {
-				commandsSupply[i].setEnabled(false);
-			}
-		} else {
-			RsrMapShaderBase rulesN = (RsrMapShaderBase) shaderN.getRules();
-			// supply
-			String thisTP = rulesN.getTurnNumber() + "_Supply";
-			commandsSupply[0].setEnabled((isSupplyAllowed)
-					&& (thisTP.equals(lastSupplyReset) == false));
-		}
-	}
+  private void prepareCommands(RsrCounter counter) {
+    // phase check
+    isSupplyAllowed = true;// rulesN.getPhaseName().equals("Supply");
+    // board check
+    boolean boardOk = (shaderN != null) && (shaderA != null) && (counter.getPiece().getMap() == shaderN.getBoard().getMap()) && (counter.getPiece().getMap() == shaderA.getBoard().getMap());
+    if (boardOk == false) {
+      for (int i = 0; i < commandsSupply.length; i++) {
+        commandsSupply[i].setEnabled(false);
+      }
+    } else {
+      RsrMapShaderBase rulesN = (RsrMapShaderBase) shaderN.getRules();
+      // supply
+      String thisTP = rulesN.getTurnNumber() + "_Supply";
+      commandsSupply[0].setEnabled((isSupplyAllowed) && (thisTP.equals(lastSupplyReset) == false));
+    }
+  }
 
-	@Override
-	protected KeyCommand[] myGetKeyCommands() {
-		initCommands();
-		getShaders();
-		GamePiece gp = Decorator.getOutermost(this);
-		prepareCommands(new RsrCounter(gp));
-		return commandsSupply;
-	}
+  @Override
+  protected KeyCommand[] myGetKeyCommands() {
+    initCommands();
+    getShaders();
+    GamePiece gp = Decorator.getOutermost(this);
+    prepareCommands(new RsrCounter(gp));
+    return commandsSupply;
+  }
 
-	private RsrSupplierInfo getInfo(String key) {
-		if (cache.containsKey(key) == false) {
-			RsrSupplierInfo rsi = new RsrSupplierInfo();
-			cache.put(key, rsi);
-			return rsi;
-		} else {
-			return cache.get(key);
-		}
-	}
+  private RsrSupplierInfo getInfo(String key) {
+    if (cache.containsKey(key) == false) {
+      RsrSupplierInfo rsi = new RsrSupplierInfo();
+      cache.put(key, rsi);
+      return rsi;
+    } else {
+      return cache.get(key);
+    }
+  }
 
-	private void reloadSupply(String tp, RsrMapShaderBase rulesN) {
-		getInfo(terrainMapShaderNameN).reload(tp, shaderN);
-		getInfo(terrainMapShaderNameA).reload(tp, shaderA);
-		if (tp.equals(lastSupplyGlobalReset) == false) {
-			lastSupplyGlobalReset = tp;
-			inAirRange.clear();
-			for (GamePiece gp : TerrainMapShaderRule.filterPieces(rulesN.getMap(), "CurrentMap=Main Map&&CurrentBoard=Main Board&&Type=AirFleet")) {
-				inAirRange.addAll(rulesN.getHexesInRange(grid.getHexPos(gp.getPosition()), new RsrCounter(gp).getRange()));
-			}
-			inFactory.clear();
-			for (GamePiece gp : TerrainMapShaderRule.filterPieces(rulesN.getMap(), "CurrentMap=Main Map&&CurrentBoard=Main Board&&AssetType=Factory")) {
-				inFactory.add(grid.getHexPos(gp.getPosition()));
-			}
-		}
-	}
+  private void reloadSupply(String tp, RsrMapShaderBase rulesN) {
+    getInfo(terrainMapShaderNameN).reload(tp, shaderN);
+    getInfo(terrainMapShaderNameA).reload(tp, shaderA);
+    if (tp.equals(lastSupplyGlobalReset) == false) {
+      lastSupplyGlobalReset = tp;
+      inAirRange.clear();
+      for (GamePiece gp : TerrainMapShaderRule.filterPieces(rulesN.getMap(), "CurrentMap=Main Map&&CurrentBoard=Main Board&&Type=AirFleet")) {
+        inAirRange.addAll(rulesN.getHexesInRange(grid.getHexPos(gp.getPosition()), new RsrCounter(gp).getRange()));
+      }
+      inFactory.clear();
+      for (GamePiece gp : TerrainMapShaderRule.filterPieces(rulesN.getMap(), "CurrentMap=Main Map&&CurrentBoard=Main Board&&AssetType=Factory")) {
+        inFactory.add(grid.getHexPos(gp.getPosition()));
+      }
+    }
+  }
 
-	// No hot-keys
-	public Command myKeyEvent(KeyStroke stroke) {
-		myGetKeyCommands();
-		int match = -1;
-		for (int i = 0; i < commandsSupply.length; i++) {
-			if (commandsSupply[i].getKeyStroke().equals(stroke)) {
-				match = i;
-				break;
-			}
-		}
-		if (match == -1)
-			return null;
-		ChangeTracker tracker = new ChangeTracker(this);
-		GamePiece gp = Decorator.getOutermost(this);
-		RsrCounter counter = new RsrCounter(gp);
-		if ((shaderN == null) || (shaderA == null) || (commandsSupply[match].isEnabled() == false)) {
-			if (match == 0) {
-				supplyLevel = 0;
-				updateLabel();
-			}
-			lastSupplyInfo = "";
-			return tracker.getChangeCommand();
-		}
-		Command c = null;
-		RsrMapShaderBase rulesN = (RsrMapShaderBase) shaderN.getRules();
-		//if (match == 0) {
-			// supply
-			lastSupplyReset = rulesN.getTurnNumber() + "_Supply";
-			reloadSupply(lastSupplyReset, rulesN);
-			supplyLevel = -1;
-			isolated = 0;
-			String type = counter.getType();
-			if (TerrainMapShaderRule.isAny(type, "Depot")) {
-				supplyLevel = 0;
-			} else {
-				HexRef thisHex = grid.getHexPos(counter.getPiece().getPosition());
-				TerrainMapShaderCost costN = getInfo(terrainMapShaderNameN).lastCost.get(thisHex);
-				if (costN != null) {
-					if ((costN.getFlag() == null) || (RsrMapShaderBase.MODE_NORMAL.equals(costN.getFlag()))) {
-						supplyLevel = 0;
-					} else
-					if (RsrMapShaderBase.MODE_EMERGENCY.equals(costN.getFlag())) {
-						if (TerrainMapShaderRule.isAny(type, "Airbase") == false) {
-							supplyLevel = 1;
-						}
-					} else
-					if (RsrMapShaderBase.MODE_SEA.equals(costN.getFlag())) {
-						if ((counter.getSide().equals(RsrMapShaderBase.SIDE_SOVIET)) && (TerrainMapShaderRule.isAny(type, "Headquarters", "Leader") == false)) {
-							supplyLevel = 0;
-						} else
-						if ((counter.getSide().equals(RsrMapShaderBase.SIDE_AXIS)) && (TerrainMapShaderRule.isAny(type, "Airbase") == false)) {
-							supplyLevel = 0;
-						}
-					}
-				}
-				if (supplyLevel == -1) {
-					if ((counter.getSide().equals(RsrMapShaderBase.SIDE_SOVIET)) && (inFactory.contains(thisHex))) {
-						supplyLevel = 2;
-					} else
-					if ((counter.getNationality().equals(RsrMapShaderBase.NATIONALITY_GERMAN)) && (inAirRange.contains(thisHex))) {
-						supplyLevel = 2;
-					} else {				
-						supplyLevel = 3;
-						TerrainMapShaderCost costA = getInfo(terrainMapShaderNameA).lastCost.get(thisHex);
-						if ((costA == null) && (rulesN.getTurnNumber() > 1) && (TerrainMapShaderRule.isAny(type, "Headquarters") == false)) {
-							isolated = 1;
-						}
-					}
-				}
-			}
-			updateLabel();
-			lastSupplyInfo = GlobalOptions.getInstance().getPlayerId() + ": "
-					+ gp.getName() + "'s supply to " + supplyLevelInfoLabel + ".";
-			c = tracker.getChangeCommand();
-		//} else {...}
-		return c;
-	}
+  // No hot-keys
+  public Command myKeyEvent(KeyStroke stroke) {
+    myGetKeyCommands();
+    int match = -1;
+    for (int i = 0; i < commandsSupply.length; i++) {
+      if (commandsSupply[i].getKeyStroke().equals(stroke)) {
+        match = i;
+        break;
+      }
+    }
+    if (match == -1) {
+      return null;
+    }
+    ChangeTracker tracker = new ChangeTracker(this);
+    GamePiece gp = Decorator.getOutermost(this);
+    RsrCounter counter = new RsrCounter(gp);
+    if ((shaderN == null) || (shaderA == null) || (commandsSupply[match].isEnabled() == false)) {
+      if (match == 0) {
+        supplyLevel = 0;
+        updateLabel();
+      }
+      lastSupplyInfo = "";
+      return tracker.getChangeCommand();
+    }
+    Command c = null;
+    RsrMapShaderBase rulesN = (RsrMapShaderBase) shaderN.getRules();
+    //if (match == 0) {
+    // supply
+    lastSupplyReset = rulesN.getTurnNumber() + "_Supply";
+    reloadSupply(lastSupplyReset, rulesN);
+    supplyLevel = -1;
+    isolated = 0;
+    String type = counter.getType();
+    if (TerrainMapShaderRule.isAny(type, "Depot")) {
+      supplyLevel = 0;
+    } else {
+      HexRef thisHex = grid.getHexPos(counter.getPiece().getPosition());
+      TerrainMapShaderCost costN = getInfo(terrainMapShaderNameN).lastCost.get(thisHex);
+      if (costN != null) {
+        if ((costN.getFlag() == null) || (RsrMapShaderBase.MODE_NORMAL.equals(costN.getFlag()))) {
+          supplyLevel = 0;
+        } else if (RsrMapShaderBase.MODE_EMERGENCY.equals(costN.getFlag())) {
+          if (TerrainMapShaderRule.isAny(type, "Airbase") == false) {
+            supplyLevel = 1;
+          }
+        } else if (RsrMapShaderBase.MODE_SEA.equals(costN.getFlag())) {
+          if ((counter.getSide().equals(RsrMapShaderBase.SIDE_SOVIET)) && (TerrainMapShaderRule.isAny(type, "Headquarters", "Leader") == false)) {
+            supplyLevel = 0;
+          } else if ((counter.getSide().equals(RsrMapShaderBase.SIDE_AXIS)) && (TerrainMapShaderRule.isAny(type, "Airbase") == false)) {
+            supplyLevel = 0;
+          }
+        }
+      }
+      if (supplyLevel == -1) {
+        if ((counter.getSide().equals(RsrMapShaderBase.SIDE_SOVIET)) && (inFactory.contains(thisHex))) {
+          supplyLevel = 2;
+        } else if ((counter.getNationality().equals(RsrMapShaderBase.NATIONALITY_GERMAN)) && (inAirRange.contains(thisHex))) {
+          supplyLevel = 2;
+        } else {
+          supplyLevel = 3;
+          TerrainMapShaderCost costA = getInfo(terrainMapShaderNameA).lastCost.get(thisHex);
+          if ((costA == null) && (rulesN.getTurnNumber() > 1) && (TerrainMapShaderRule.isAny(type, "Headquarters") == false)) {
+            isolated = 1;
+          }
+        }
+      }
+    }
+    updateLabel();
+    lastSupplyInfo = GlobalOptions.getInstance().getPlayerId() + ": " + gp.getName() + "'s supply to " + supplyLevelInfoLabel + ".";
+    c = tracker.getChangeCommand();
+    //} else {...}
+    return c;
+  }
 
-	public HelpFile getHelpFile() {
-		return HelpFile.getReferenceManualPage("RsrSupplier.htm");
-	}
+  public HelpFile getHelpFile() {
+    return HelpFile.getReferenceManualPage("RsrSupplier.htm");
+  }
 
-	public PieceEditor getEditor() {
-		return new TraitEditor(this);
-	}
+  @Override
+  public PieceEditor getEditor() {
+    return new TraitEditor(this);
+  }
 
-	protected static class TraitEditor implements PieceEditor {
-		protected JPanel panel;
-		protected StringConfigurer descriptionConfigurer;
-		protected Box selectShaderN;
-		protected String mapShaderIdN;
-		protected Box selectShaderA;
-		protected String mapShaderIdA;
+  protected static class TraitEditor implements PieceEditor {
 
-		protected TraitEditor(RsrSupplier trait) {
-			panel = new JPanel();
-			panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
+    protected JPanel panel;
+    protected StringConfigurer descriptionConfigurer;
+    protected Box selectShaderN;
+    protected String mapShaderIdN;
+    protected Box selectShaderA;
+    protected String mapShaderIdA;
 
-			panel.add(new JLabel("Contributed by morvael", JLabel.CENTER));
-			panel.add(new JSeparator());
-			panel.add(new JLabel(" "));
+    protected TraitEditor(RsrSupplier trait) {
+      panel = new JPanel();
+      panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
 
-			descriptionConfigurer = new StringConfigurer(null,
-					"Description:  ", trait.description);
-			panel.add(descriptionConfigurer.getControls());
+      panel.add(new JLabel("Contributed by morvael", JLabel.CENTER));
+      panel.add(new JSeparator());
+      panel.add(new JLabel(" "));
 
-			mapShaderIdN = trait.terrainMapShaderNameN;
-			selectShaderN = Box.createHorizontalBox();
+      descriptionConfigurer = new StringConfigurer(null,
+              "Description:  ", trait.description);
+      panel.add(descriptionConfigurer.getControls());
 
-			panel.add(selectShaderN);
-			JLabel lN = new JLabel("Map Shading:  ");
-			selectShaderN.add(lN);
-			final JTextField tfN = new JTextField(12);
-			tfN.setEditable(false);
-			selectShaderN.add(tfN);
-			tfN.setText(trait.terrainMapShaderNameN);
-			JButton bN = new JButton("Select");
-			selectShaderN.add(bN);
-			bN.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					ChooseComponentDialog d = new ChooseComponentDialog(
-							(Frame) SwingUtilities.getAncestorOfClass(
-									Frame.class, panel), TerrainMapShader.class);
-					d.setVisible(true);
-					if (d.getTarget() != null) {
-						mapShaderIdN = d.getTarget().getConfigureName();
-						tfN.setText(mapShaderIdN);
-					} else {
-						mapShaderIdN = null;
-						tfN.setText("");
-					}
-				}
-			});
+      mapShaderIdN = trait.terrainMapShaderNameN;
+      selectShaderN = Box.createHorizontalBox();
 
-			mapShaderIdA = trait.terrainMapShaderNameA;
-			selectShaderA = Box.createHorizontalBox();
+      panel.add(selectShaderN);
+      JLabel lN = new JLabel("Map Shading:  ");
+      selectShaderN.add(lN);
+      final JTextField tfN = new JTextField(12);
+      tfN.setEditable(false);
+      selectShaderN.add(tfN);
+      tfN.setText(trait.terrainMapShaderNameN);
+      JButton bN = new JButton("Select");
+      selectShaderN.add(bN);
+      bN.addActionListener(new ActionListener() {
 
-			panel.add(selectShaderA);
-			JLabel lA = new JLabel("Map Shading A:  ");
-			selectShaderA.add(lA);
-			final JTextField tfA = new JTextField(12);
-			tfA.setEditable(false);
-			selectShaderA.add(tfA);
-			tfA.setText(trait.terrainMapShaderNameA);
-			JButton bA = new JButton("Select");
-			selectShaderA.add(bA);
-			bA.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					ChooseComponentDialog d = new ChooseComponentDialog(
-							(Frame) SwingUtilities.getAncestorOfClass(
-									Frame.class, panel), TerrainMapShader.class);
-					d.setVisible(true);
-					if (d.getTarget() != null) {
-						mapShaderIdA = d.getTarget().getConfigureName();
-						tfA.setText(mapShaderIdA);
-					} else {
-						mapShaderIdA = null;
-						tfA.setText("");
-					}
-				}
-			});
-		}
+        public void actionPerformed(ActionEvent e) {
+          ChooseComponentDialog d = new ChooseComponentDialog(
+                  (Frame) SwingUtilities.getAncestorOfClass(
+                  Frame.class, panel), TerrainMapShader.class);
+          d.setVisible(true);
+          if (d.getTarget() != null) {
+            mapShaderIdN = d.getTarget().getConfigureName();
+            tfN.setText(mapShaderIdN);
+          } else {
+            mapShaderIdN = null;
+            tfN.setText("");
+          }
+        }
+      });
 
-		public Component getControls() {
-			return panel;
-		}
+      mapShaderIdA = trait.terrainMapShaderNameA;
+      selectShaderA = Box.createHorizontalBox();
 
-		public String getState() {
-			return "0;0;;;";
-		}
+      panel.add(selectShaderA);
+      JLabel lA = new JLabel("Map Shading A:  ");
+      selectShaderA.add(lA);
+      final JTextField tfA = new JTextField(12);
+      tfA.setEditable(false);
+      selectShaderA.add(tfA);
+      tfA.setText(trait.terrainMapShaderNameA);
+      JButton bA = new JButton("Select");
+      selectShaderA.add(bA);
+      bA.addActionListener(new ActionListener() {
 
-		public String getType() {
-			SequenceEncoder se = new SequenceEncoder(';');
-			se.append(mapShaderIdN != null ? mapShaderIdN : "");
-			se.append(mapShaderIdA != null ? mapShaderIdA : "");
-			se.append(descriptionConfigurer.getValueString());
-			return RsrMover.ID + se.getValue();
-		}
-	}
+        public void actionPerformed(ActionEvent e) {
+          ChooseComponentDialog d = new ChooseComponentDialog(
+                  (Frame) SwingUtilities.getAncestorOfClass(
+                  Frame.class, panel), TerrainMapShader.class);
+          d.setVisible(true);
+          if (d.getTarget() != null) {
+            mapShaderIdA = d.getTarget().getConfigureName();
+            tfA.setText(mapShaderIdA);
+          } else {
+            mapShaderIdA = null;
+            tfA.setText("");
+          }
+        }
+      });
+    }
 
+    public Component getControls() {
+      return panel;
+    }
+
+    public String getState() {
+      return "0;0;;;";
+    }
+
+    public String getType() {
+      SequenceEncoder se = new SequenceEncoder(';');
+      se.append(mapShaderIdN != null ? mapShaderIdN : "");
+      se.append(mapShaderIdA != null ? mapShaderIdA : "");
+      se.append(descriptionConfigurer.getValueString());
+      return RsrMover.ID + se.getValue();
+    }
+  }
 }


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

Revision: 4073
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4073&view=rev
Author:   morvael
Date:     2008-08-21 15:23:47 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
More bug fixes for RSR.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrKiller.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java
    VSQL-src/branches/morvael/rsr/RsrSupplier.java

Property Changed:
----------------
    VSQL-src/branches/morvael/rsr/RsrSupplier.java

Modified: VSQL-src/branches/morvael/rsr/RsrKiller.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrKiller.java	2008-08-21 11:59:53 UTC (rev 4072)
+++ VSQL-src/branches/morvael/rsr/RsrKiller.java	2008-08-21 15:23:47 UTC (rev 4073)
@@ -436,7 +436,7 @@
 				if ((unitType.equals("AxisGermanTankCorps")) || (unitType.equals("AxisGermanInfantryCorps")) || (unitType.equals("AxisGermanMountainCorps")) || (unitType.equals("AxisGermanTankBattlegroup")) || (unitType.equals("AxisGermanInfantryBattlegroup")) || (unitType.equals("AxisGermanMountainBattlegroup"))) {
 					appendCommands(c, counter, "German Breakdown & Buildup Box", sb);
 				} else				
-				if ((unitType.equals("AxisGermanTankDivision")) || (unitType.equals("AxisItalianArmy")) || (unitType.equals("AxisHungarianArmy")) || (unitType.equals("FinnishInfantryCorps")) || (unitType.equals("AxisRomanianInfantryCorps")) || (unitType.equals("AxisRomanianMountainCorps"))) {
+				if ((unitType.equals("AxisGermanTankDivision")) || (unitType.equals("AxisItalianArmy")) || (unitType.equals("AxisHungarianArmy")) || (unitType.equals("AxisFinnishInfantryCorps")) || (unitType.equals("AxisRomanianInfantryCorps")) || (unitType.equals("AxisRomanianMountainCorps"))) {
 					appendCommands(c, counter, "Axis Permanently Eliminated Units Box", sb);
 				}
 			} else

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2008-08-21 11:59:53 UTC (rev 4072)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2008-08-21 15:23:47 UTC (rev 4073)
@@ -9,6 +9,7 @@
 import terrain.TerrainMapShaderRule;
 import VASSAL.build.module.Map;
 import VASSAL.build.module.map.boardPicker.Board;
+import VASSAL.counters.Decorator;
 import VASSAL.counters.GamePiece;
 
 /**
@@ -88,15 +89,18 @@
 	protected RsrMapShaderBase() {
 		super();
 		Map turnMap = Map.getMapById("Turn");
-		for (GamePiece gp : turnMap.getPieces()) {
-			if (gp.getName().equals("Game Turn")) {
-				turnPiece = gp;
+		for (Board b : turnMap.getBoards()) {
+			if (b.getLocalizedName().equals("Turn")) {
+				turnBoard = b;
+				break;
 			}
-			if (gp.getName().equals("Turn Phase")) {
-				phasePiece = gp;
-			}
 		}
-		turnBoard = turnMap.getBoardByName("Turn");	
+		for (GamePiece gp : filterPieces(turnMap, "BasicName=Game Turn")) {
+			turnPiece = gp;
+		}
+		for (GamePiece gp : filterPieces(turnMap, "BasicName=Turn Phase")) {
+			phasePiece = gp;
+		}
 	}
 	
 	protected void filterFriendlyPieceGroups(String side) {

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2008-08-21 11:59:53 UTC (rev 4072)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2008-08-21 15:23:47 UTC (rev 4073)
@@ -97,7 +97,7 @@
 							vpHex.add(hr);
 							vpu += c.getCurrentStep();
 						} else
-						if (ut.equals("FinnishInfantryCorps")) {
+						if (ut.equals("AxisFinnishInfantryCorps")) {
 							vpHex.add(hr);
 							vpu += c.getCurrentStep();
 						} else

Modified: VSQL-src/branches/morvael/rsr/RsrSupplier.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrSupplier.java	2008-08-21 11:59:53 UTC (rev 4072)
+++ VSQL-src/branches/morvael/rsr/RsrSupplier.java	2008-08-21 15:23:47 UTC (rev 4073)
@@ -1,3 +1,6 @@
+/**
+ * $Id$
+ */
 package rsr;
 
 import java.awt.Component;
@@ -339,8 +342,10 @@
     if (tp.equals(lastSupplyGlobalReset) == false) {
       lastSupplyGlobalReset = tp;
       inAirRange.clear();
-      for (GamePiece gp : TerrainMapShaderRule.filterPieces(rulesN.getMap(), "CurrentMap=Main Map&&CurrentBoard=Main Board&&Type=AirFleet")) {
-        inAirRange.addAll(rulesN.getHexesInRange(grid.getHexPos(gp.getPosition()), new RsrCounter(gp).getRange()));
+      if (rulesN.isMud() == false) {
+	      for (GamePiece gp : TerrainMapShaderRule.filterPieces(rulesN.getMap(), "CurrentMap=Main Map&&CurrentBoard=Main Board&&Type=AirFleet")) {
+	        inAirRange.addAll(rulesN.getHexesInRange(grid.getHexPos(gp.getPosition()), new RsrCounter(gp).getRange()));
+	      }
       }
       inFactory.clear();
       for (GamePiece gp : TerrainMapShaderRule.filterPieces(rulesN.getMap(), "CurrentMap=Main Map&&CurrentBoard=Main Board&&AssetType=Factory")) {


Property changes on: VSQL-src/branches/morvael/rsr/RsrSupplier.java
___________________________________________________________________
Added: svn:keywords
   + Id


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

Revision: 4095
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4095&view=rev
Author:   morvael
Date:     2008-08-30 07:45:08 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
According to rulebook, Murmansk is Axis permanent supply source when controlled by them. This wasn't implemented until now.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2008-08-29 22:06:11 UTC (rev 4094)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2008-08-30 07:45:08 UTC (rev 4095)
@@ -79,6 +79,7 @@
 	protected static final String TAG_CITY_ODESSA = "Odessa";
 	protected static final String TAG_CITY_NOVOROSSIISK = "Novorossiisk";
 	protected static final String TAG_CITY_TUAPSE = "Tuapse";
+        protected static final String TAG_CITY_MURMANSK = "Murmansk";
 	
 	private Board turnBoard;
 	private GamePiece turnPiece;

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java	2008-08-29 22:06:11 UTC (rev 4094)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java	2008-08-30 07:45:08 UTC (rev 4095)
@@ -58,6 +58,10 @@
 				mapShader.addHex(selectedHexes, hr, create(null, true, rangeMod * 4.0, false, MODE_NORMAL));
 			}			
 		}
+                //Murmansk is Axis permanent supply source (if controlled)
+                if (isCityAxisControlled(TAG_CITY_MURMANSK)) {
+                  mapShader.addHex(selectedHexes, getCityHexRef(TAG_CITY_MURMANSK), create(null, true, rangeMod * 4.0, false, MODE_NORMAL));
+                }
 		//find hexes for sea supply
 		if ((piece == null) || ((getMarkerValue(piece, "Nationality").equals("German")) && (getMarkerValue(piece, "Type").equals("Airbase") == false))) {
 			if ((isCityAxisControlled(TAG_CITY_ODESSA)) && (isCityAxisControlled(TAG_CITY_SEVASTOPOL))) {


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

Revision: 5382
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5382&view=rev
Author:   morvael
Date:     2009-03-24 15:52:08 +0000 (Tue, 24 Mar 2009)

Log Message:
-----------
Improved the code to deal with scenarios (using only part of the map, variant victory conditions) and added the Finland/Romania no movement special rule on turn 1.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-03-23 17:09:51 UTC (rev 5381)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-03-24 15:52:08 UTC (rev 5382)
@@ -9,7 +9,6 @@
 import terrain.TerrainMapShaderRule;
 import VASSAL.build.module.Map;
 import VASSAL.build.module.map.boardPicker.Board;
-import VASSAL.counters.Decorator;
 import VASSAL.counters.GamePiece;
 
 /**
@@ -43,6 +42,15 @@
 	protected static final String EDGE_MINORRIVER = "MinorRiver";
 	protected static final String EDGE_MAJORRIVER = "MajorRiver";
 	protected static final String EDGE_LAKESEA = "LakeSea";
+	protected static final String EDGE_IMPASSABLEN = "Impassable N";
+	protected static final String EDGE_IMPASSABLENLAKESEA = "Impassable N LakeSea";
+	protected static final String EDGE_IMPASSABLESW = "Impassable SW";
+	protected static final String EDGE_IMPASSABLESWLAKESEA = "Impassable SW";
+	protected static final String EDGE_IMPASSABLESWMINORRIVER = "Impassable SW MinorRiver";
+	protected static final String EDGE_IMPASSABLETP = "Impassable TP";
+	protected static final String EDGE_IMPASSABLETPLAKESEA = "Impassable TP";
+	protected static final String EDGE_IMPASSABLETPMINORRIVER = "Impassable TP MinorRiver";
+	protected static final String EDGE_IMPASSABLETPMAJORRIVER = "Impassable TP MajorRiver";
 	protected static final String LINE_RAILROAD = "Railroad";
 	protected static final String LINE_CHONGARCAUSEWAY = "ChongarCauseway";
 	protected static final String LINE_FROZENSURFACE = "FrozenSurface";
@@ -80,6 +88,12 @@
 	protected static final String TAG_CITY_NOVOROSSIISK = "Novorossiisk";
 	protected static final String TAG_CITY_TUAPSE = "Tuapse";
         protected static final String TAG_CITY_MURMANSK = "Murmansk";
+	protected static final String TAG_MAPPART = "MapPart";
+	protected static final String TAG_MAPPART_NONE = "None";
+	protected static final String TAG_MAPPART_NORTH = "North";
+	protected static final String TAG_MAPPART_SOUTHWEST = "Southwest";
+	protected static final String TAG_MAPPART_TP = "TP";
+	protected static final String TAG_MAPPART_TPNSW = "TPnSW";
 	
 	private Board turnBoard;
 	private GamePiece turnPiece;
@@ -170,10 +184,10 @@
 	protected boolean canContestNeighbourSpace2(ArrayList<GamePiece> list, HexRef fromHex, HexRef toHex) {
 		String et = getEdgeTerrainName(fromHex, toHex);
 		String lt = getLineTerrainName(fromHex, toHex);
-		if (et.equals(EDGE_IMPASSABLE)) {
+		if ((et.equals(EDGE_IMPASSABLE)) || ((et.startsWith(EDGE_IMPASSABLESW)) && (isSouthwestMapUsed() == false)) || ((et.startsWith(EDGE_IMPASSABLEN) && (isNorthMapUsed() == false))) || ((et.startsWith(EDGE_IMPASSABLETP)) && (isSubMapUsed() == true))) {
 			return false;
 		} else
-		if (et.equals(EDGE_LAKESEA)) {
+		if ((et.equals(EDGE_LAKESEA)) || ((et.equals(EDGE_IMPASSABLESWLAKESEA)) && (isSouthwestMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLENLAKESEA)) && (isNorthMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLETPLAKESEA)) && (isSubMapUsed() == false))) {
 			if (lt.equals(LINE_FROZENSURFACE)) {
 				if (isWinter()) {
 					for (GamePiece gp : list) {
@@ -284,11 +298,30 @@
 	
 	protected Set<HexRef> getPossibleSupplySources(String side, String capital) {
 		Set<HexRef> result = new HashSet<HexRef>();
+                Set<HexRef> northHexes = findHexesWithTag(TAG_MAPPART, TAG_MAPPART_NORTH);
+                Set<HexRef> southwestHexes = findHexesWithTag(TAG_MAPPART, TAG_MAPPART_SOUTHWEST);
+                Set<HexRef> tpHexes = findHexesWithTag(TAG_MAPPART, TAG_MAPPART_TP);
+                Set<HexRef> tpnswHexes = findHexesWithTag(TAG_MAPPART, TAG_MAPPART_TPNSW);
 		if (side.equals(SIDE_AXIS)) {
 			for (HexRef hr : findHexesWithTag(TAG_SUPPLY, TAG_SUPPLY_AXIS)) {
-				result.add(hr);
+                          if ((isNorthMapUsed() == false) && (northHexes.contains(hr))) {
+                            continue;
+                          }
+                          if ((isSouthwestMapUsed() == false) && (southwestHexes.contains(hr))) {
+                            continue;
+                          }
+                          if ((isSouthwestMapUsed() == true) && (tpnswHexes.contains(hr))) {
+                            continue;
+                          }
+                          if ((isSubMapUsed() == false) && ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr)))) {
+                            continue;
+                          }
+                          if ((isSubMapUsed() == true) && (tpHexes.contains(hr) == false) && (tpnswHexes.contains(hr) == false)) {
+                            continue;
+                          }
+                          result.add(hr);
 			}
-			if (capital != null) {
+			if ((isSubMapUsed() == false) && (capital != null)) {
 				if (isCityAxisControlled(capital)) {
 					for (HexRef hr : findHexesWithTag(TAG_CITY, capital)) {
 						result.add(hr);
@@ -300,15 +333,30 @@
 			}
 		} else {
 			for (HexRef hr : findHexesWithTag(TAG_SUPPLY, TAG_SUPPLY_SOVIET)) {
+                            if ((isNorthMapUsed() == false) && (northHexes.contains(hr))) {
+                              continue;
+                            }
+                            if ((isSouthwestMapUsed() == false) && (southwestHexes.contains(hr))) {
+                              continue;
+                            }
+                            if ((isSouthwestMapUsed() == true) && (tpnswHexes.contains(hr))) {
+                              continue;
+                            }
+                            if ((isSubMapUsed() == false) && ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr)))) {
+                              continue;
+                            }
+                            if ((isSubMapUsed() == true) && (tpHexes.contains(hr) == false) && (tpnswHexes.contains(hr) == false)) {
+                              continue;
+                            }
 				result.add(hr);
 			}
-			if ((isCityDestroyed(TAG_CITY_MOSCOW) == false) && (isCityAxisControlled(TAG_CITY_MOSCOW) == false)) {
+			if ((isSubMapUsed() == false) && (isCityDestroyed(TAG_CITY_MOSCOW) == false) && (isCityAxisControlled(TAG_CITY_MOSCOW) == false)) {
 				for (HexRef hr : findHexesWithTag(TAG_CITY, TAG_CITY_MOSCOW)) {
 					result.add(hr);
 					break;
 				}
 			}
-			if ((isCityDestroyed(TAG_CITY_BAKU) == false) && (isCityAxisControlled(TAG_CITY_BAKU) == false)) {
+			if ((isSouthwestMapUsed() == true) && (isCityDestroyed(TAG_CITY_BAKU) == false) && (isCityAxisControlled(TAG_CITY_BAKU) == false)) {
 				for (HexRef hr : findHexesWithTag(TAG_CITY, TAG_CITY_BAKU)) {
 					result.add(hr);
 					break;
@@ -330,15 +378,15 @@
 		boolean isRailroad = isAny(lt, LINE_RAILROAD, LINE_CHONGARCAUSEWAY);
 		boolean isWinter = isWinter();
 		boolean isAxis = side.equals(SIDE_AXIS);
-		if (et.equals(EDGE_IMPASSABLE)) {
+		if ((et.equals(EDGE_IMPASSABLE)) || ((et.startsWith(EDGE_IMPASSABLESW)) && (isSouthwestMapUsed() == false)) || ((et.startsWith(EDGE_IMPASSABLEN) && (isNorthMapUsed() == false))) || ((et.startsWith(EDGE_IMPASSABLETP)) && (isSubMapUsed() == true))) {
 			return Double.MAX_VALUE;
 		} else
-		if (et.equals(EDGE_LAKESEA)) {
+		if ((et.equals(EDGE_LAKESEA)) || ((et.equals(EDGE_IMPASSABLESWLAKESEA)) && (isSouthwestMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLENLAKESEA)) && (isNorthMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLETPLAKESEA)) && (isSubMapUsed() == false))) {
 			if ((isAxis) || (isWinter == false) || (lt.equals(LINE_FROZENSURFACE) == false)) {
 				return Double.MAX_VALUE;
 			}
 		} else
-		if (et.equals(EDGE_MAJORRIVER)) {
+		if ((et.equals(EDGE_MAJORRIVER)) || ((et.equals(EDGE_IMPASSABLETPMAJORRIVER)) && (isSubMapUsed() == false))) {
 			if (isRailroad == false) {
 				return Double.MAX_VALUE;
 			}
@@ -448,6 +496,12 @@
 	
 	public double getMovementAllowance(RsrCounter c) {
 		double result = c.getMovement();
+                if (getTurnNumber() == 1) {
+                  HexRef hr = grid.getHexPos(c.getPiece().getPosition());
+                  if ((getAttributeTerrainValue(hr, TAG_COUNTRY).equals(TAG_COUNTRY_FINLAND)) || (getAttributeTerrainValue(hr, TAG_COUNTRY).equals(TAG_COUNTRY_ROMANIA))) {
+                    result = 0.0d;
+                  }
+                }
 		if (c.isSupply(RsrCounter.SUPPLY_LACK, RsrCounter.SUPPLY_OUT)) {
 			result = Math.ceil(result * 0.5d);
 		}
@@ -470,5 +524,43 @@
 		}
 		return 25.0d;
 	}
-	
+        
+        public boolean isNorthMapUsed() {
+          if (phasePiece != null) {
+            return "1".equals(String.valueOf(phasePiece.getProperty("use_map_north")));
+          } else {
+            return true;
+          }
+        }
+
+        public boolean isSouthwestMapUsed() {
+          if (phasePiece != null) {
+            return "1".equals(String.valueOf(phasePiece.getProperty("use_map_southwest")));
+          } else {
+            return true;
+          }
+        }
+
+        public boolean isSubMapUsed() {
+          if (phasePiece != null) {
+            return "1".equals(String.valueOf(phasePiece.getProperty("use_map_tp")));
+          } else {
+            return false;
+          }
+        }
+        
+        public int getScenarioUsed() {
+          if (phasePiece != null) {
+            int result;
+            try {
+              result = Integer.parseInt(String.valueOf(phasePiece.getProperty("use_scenario_rules")));
+            } catch (Exception e) {
+              result = 6;
+            }
+            return result;
+          } else {
+            return 6;
+          }
+        }
+        
 }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-03-23 17:09:51 UTC (rev 5381)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-03-24 15:52:08 UTC (rev 5382)
@@ -110,22 +110,22 @@
 			}
 		}
 		double cost = 0.0d;
-		if (et.equals(EDGE_IMPASSABLE)) {
+		if ((et.equals(EDGE_IMPASSABLE)) || ((et.startsWith(EDGE_IMPASSABLESW)) && (isSouthwestMapUsed() == false)) || ((et.startsWith(EDGE_IMPASSABLEN) && (isNorthMapUsed() == false))) || ((et.startsWith(EDGE_IMPASSABLETP)) && (isSubMapUsed() == true))) {
 			return result(fromHex, false, 0.0, false, null);
 		} else
-		if (et.equals(EDGE_LAKESEA)) {
+		if ((et.equals(EDGE_LAKESEA)) || ((et.equals(EDGE_IMPASSABLESWLAKESEA)) && (isSouthwestMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLENLAKESEA)) && (isNorthMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLETPLAKESEA)) && (isSubMapUsed() == false))) {
 			if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != 0)) {
 				return result(fromHex, false, 0.0, false, null);
 			} else {
 				cost += EDGE_MINORRIVER_COST[movementMode];
 			}
 		} else
-		if (et.equals(EDGE_MINORRIVER)) {
+		if ((et.equals(EDGE_MINORRIVER)) || ((et.equals(EDGE_IMPASSABLESWMINORRIVER)) && (isSouthwestMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLETPMINORRIVER)) && (isSubMapUsed() == false))) {
 			if ((getTurnNumber() > 1) || (side.equals(SIDE_SOVIET))) {
 				cost += EDGE_MINORRIVER_COST[movementMode];
 			}
 		} else
-		if (et.equals(EDGE_MAJORRIVER)) {
+		if ((et.equals(EDGE_MAJORRIVER)) || ((et.equals(EDGE_IMPASSABLETPMAJORRIVER)) && (isSubMapUsed() == false))) {
 			cost += EDGE_MAJORRIVER_COST[movementMode];
 		}
 		if (tt.equals(HEX_WATER)) {

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-03-23 17:09:51 UTC (rev 5381)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-03-24 15:52:08 UTC (rev 5382)
@@ -68,10 +68,10 @@
 		String tt = getHexTerrainName(toHex);
 		String et = getEdgeTerrainName(fromHex, toHex);
 		String lt = getLineTerrainName(fromHex, toHex);
-		if (et.equals(EDGE_IMPASSABLE)) {
+		if ((et.equals(EDGE_IMPASSABLE)) || ((et.startsWith(EDGE_IMPASSABLESW)) && (isSouthwestMapUsed() == false)) || ((et.startsWith(EDGE_IMPASSABLEN) && (isNorthMapUsed() == false))) || ((et.startsWith(EDGE_IMPASSABLETP)) && (isSubMapUsed() == true))) {
 			return result(fromHex, false, 0.0, false, null);
 		} else
-		if (et.equals(EDGE_LAKESEA)) {
+		if ((et.equals(EDGE_LAKESEA)) || ((et.equals(EDGE_IMPASSABLESWLAKESEA)) && (isSouthwestMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLENLAKESEA)) && (isNorthMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLETPLAKESEA)) && (isSubMapUsed() == false))) {
 			if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != 0)) {
 				return result(fromHex, false, 0.0, false, null);
 			}

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2009-03-23 17:09:51 UTC (rev 5381)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2009-03-24 15:52:08 UTC (rev 5382)
@@ -12,8 +12,10 @@
 import VASSAL.build.GameModule;
 import VASSAL.build.module.Chatter;
 import VASSAL.build.module.Map;
+import VASSAL.build.module.map.boardPicker.board.mapgrid.Zone;
 import VASSAL.command.Command;
 import VASSAL.counters.GamePiece;
+import terrain.TerrainMapShaderRule;
 
 /**
  * 
@@ -39,6 +41,8 @@
 		HashSet<HexRef> vpHex = new HashSet<HexRef>();
 		int vpc = 0;
 		int vpu = 0;
+                int vpa = 0;
+                int scenario = getScenarioUsed();
 		filterFriendlyPieceGroups(SIDE_AXIS);
 		occupiedByFriend = getHexesOccupiedByFriend();
 		filterHostilePieceGroups(SIDE_SOVIET);
@@ -129,32 +133,102 @@
 				}
 			}
 		}
+                if (scenario == 3) {
+                  for (GamePiece gp : TerrainMapShaderRule.filterPieces(Map.getMapById("Offboard"), "CurrentZone=Eliminated Economic Assets")) {
+                    c = new RsrCounter(gp);
+                    t = c.getType();
+                    ut = c.getAssetType();
+                    if (t.equals("Asset")) {
+                      if (ut.equals("Oil")) {
+                        vpa += 10;
+                      } else
+                      if (ut.equals("OilPipeline")) {
+                        vpa += 8;
+                      } else {
+                        vpa += 5;
+                      }
+                    }
+                  }
+                }
 		for (HexRef hr : vpHex) {
 			mapShader.addHex(selectedHexes, hr, create(null, true, 0.0, false, null));			
 		}
-		int vpt = vpc + vpu;
+		int vpt = vpc + vpu + vpa;
 		String level;
-		if (vpt <= 450) {
-			level = "Really Big Soviet Win";
-		} else
-		if (vpt <= 480) {
-			level = "Big Soviet Win";
-		} else
-		if (vpt <= 510) {
-			level = "Little Soviet Win";
-		} else
-		if (vpt <= 530) {
-			level = "Nobody Wins";
-		} else
-		if (vpt <= 560) {
-			level = "Little German Win";
-		} else
-		if (vpt <= 590) {
-			level = "Big German Win";
-		} else {
-			level = "Really Big German Win";
-		}
-		String msg = "Total VP: " + vpt + " (control: " + vpc + ", units: " + vpu + ") - " + level;		
+                if (scenario == 1) {
+                  if (vpt <= 50) {
+                    level = "Soviet Win";
+                  } else
+                  if (vpt <= 57) {
+                    level = "Nobody Wins";
+                  } else {
+                    level = "German Win";
+                  }
+                } else
+                if (scenario == 2) {
+                  if (vpt <= 289) {
+                          level = "Really Big Soviet Win";
+                  } else
+                  if (vpt <= 309) {
+                          level = "Big Soviet Win";
+                  } else
+                  if (vpt <= 324) {
+                          level = "Little Soviet Win";
+                  } else
+                  if (vpt <= 335) {
+                          level = "Little German Win";
+                  } else
+                  if (vpt <= 350) {
+                          level = "Big German Win";
+                  } else {
+                          level = "Really Big German Win";
+                  }                  
+                } else
+                if (scenario == 3) {
+                  if (vpt <= 220) {
+                          level = "Really Big Soviet Win";
+                  } else
+                  if (vpt <= 240) {
+                          level = "Big Soviet Win";
+                  } else
+                  if (vpt <= 260) {
+                          level = "Little Soviet Win";
+                  } else
+                  if (vpt <= 280) {
+                          level = "Nobody Wins";
+                  } else
+                  if (vpt <= 300) {
+                          level = "Little German Win";
+                  } else
+                  if (vpt <= 320) {
+                          level = "Big German Win";
+                  } else {
+                          level = "Really Big German Win";
+                  }                  
+                } else {
+                  //scenarios 4, 5 and 6
+                  if (vpt <= 450) {
+                          level = "Really Big Soviet Win";
+                  } else
+                  if (vpt <= 480) {
+                          level = "Big Soviet Win";
+                  } else
+                  if (vpt <= 510) {
+                          level = "Little Soviet Win";
+                  } else
+                  if (vpt <= 530) {
+                          level = "Nobody Wins";
+                  } else
+                  if (vpt <= 560) {
+                          level = "Little German Win";
+                  } else
+                  if (vpt <= 590) {
+                          level = "Big German Win";
+                  } else {
+                          level = "Really Big German Win";
+                  }
+                }
+		String msg = "Total VP: " + vpt + " (control: " + vpc + ", units: " + vpu + ", assets: " + vpa + ") - " + level;		
 	    Command cmd = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), msg);
 	    cmd.execute();
 	    //GameModule.getGameModule().sendAndLog(cmd);		


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

Revision: 5563
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5563&view=rev
Author:   morvael
Date:     2009-05-05 15:29:14 +0000 (Tue, 05 May 2009)

Log Message:
-----------
Fixed bug with movement being not properly shown.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrCounter.java
    VSQL-src/branches/morvael/rsr/RsrKiller.java
    VSQL-src/branches/morvael/rsr/RsrMover.java

Modified: VSQL-src/branches/morvael/rsr/RsrCounter.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrCounter.java	2009-05-05 13:23:33 UTC (rev 5562)
+++ VSQL-src/branches/morvael/rsr/RsrCounter.java	2009-05-05 15:29:14 UTC (rev 5563)
@@ -70,6 +70,20 @@
 		outer.setProperty(name, String.valueOf(value));
 	}	
 	
+	private boolean getBooleanProperty(String name) {
+		boolean result;
+		try {
+			result = Boolean.parseBoolean(outer.getProperty(name).toString());
+		} catch (Exception e) {
+			result = false;
+		}
+		return result;
+	}
+
+	private void setBooleanProperty(String name, boolean value) {
+		outer.setProperty(name, String.valueOf(value));
+	}
+
 	public String getSide() {
 		return getStringProperty("Side");
 	}
@@ -162,6 +176,14 @@
 		setStringProperty("LastMovementInfo", value);
 	}
 
+	public boolean getIsMovementAllowed() {
+		return getBooleanProperty("IsMovementAllowed");
+	}
+
+	public void setIsMovementAllowed(boolean value) {
+		setBooleanProperty("IsMovementAllowed", value);
+	}
+
 	public int getSupplyLevel() {
 		return getIntProperty("SupplyLevel");
 	}
@@ -170,6 +192,22 @@
 		setIntProperty("SupplyLevel", value);
 	}
 	
+	public String getLastSupplyReset() {
+		return getStringProperty("LastSupplyReset");
+	}
+
+	public void setLastSupplyReset(String value) {
+		setStringProperty("LastSupplyReset", value);
+	}
+
+	public String getLastSupplyInfo() {
+		return getStringProperty("LastSupplyInfo");
+	}
+
+	public void setLastSupplyInfo(String value) {
+		setStringProperty("LastSupplyInfo", value);
+	}
+
 	public int getIsolated() {
 		return getIntProperty("Isolated");
 	}

Modified: VSQL-src/branches/morvael/rsr/RsrKiller.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrKiller.java	2009-05-05 13:23:33 UTC (rev 5562)
+++ VSQL-src/branches/morvael/rsr/RsrKiller.java	2009-05-05 15:29:14 UTC (rev 5563)
@@ -206,12 +206,13 @@
     ChangeTracker tracker = new ChangeTracker(Decorator.getOutermost(gp));
     counter.setMovementLeft(0);
     counter.setLastMovementReset("");
+    counter.setIsMovementAllowed(false);
     counter.setSupplyLevel(0);
     counter.setIsolated(0);
+    counter.setLastSupplyReset("");
     counter.setCurrentStep(counter.getSteps());
     counter.setAttachedArmy("");
     c.append(tracker.getChangeCommand());
-    //
     sb.append(gp.getName() + " was sent to " + deck.getConfigureName() + ", ");
   }
 
@@ -254,12 +255,13 @@
     ChangeTracker tracker = new ChangeTracker(Decorator.getOutermost(gp));
     counter.setMovementLeft(0);
     counter.setLastMovementReset("");
+    counter.setIsMovementAllowed(false);
     counter.setSupplyLevel(0);
     counter.setIsolated(0);
+    counter.setLastSupplyReset("");
     counter.setCurrentStep(counter.getSteps());
     counter.setAttachedArmy("");
     c.append(tracker.getChangeCommand());
-    //
     sb.append(gp.getName() + " was sent to " + offboardZone + ", ");
   }
 
@@ -314,12 +316,13 @@
     ChangeTracker tracker = new ChangeTracker(Decorator.getOutermost(gp));
     counter.setMovementLeft(0);
     counter.setLastMovementReset("");
+    counter.setIsMovementAllowed(false);
     counter.setSupplyLevel(0);
     counter.setIsolated(0);
+    counter.setLastSupplyReset("");
     counter.setCurrentStep(counter.getSteps());
     counter.setAttachedArmy("");
     c.append(tracker.getChangeCommand());
-    //
     sb.append(gp.getName() + " will return as reinforcement on turn " + regionName.substring(1) + ", ");
   }
 
@@ -346,11 +349,13 @@
     //
     ChangeTracker tracker = new ChangeTracker(Decorator.getOutermost(rgp));
     double dif = rcounter.getMovement() - counter.getMovement();
-    rcounter.setMovementLeft(counter.getMovementLeft() + dif);
+    rcounter.setMovementLeft(Math.max(0, counter.getMovementLeft() + dif));
     rcounter.setLastMovementReset(counter.getLastMovementReset());
+    rcounter.setIsMovementAllowed(counter.getIsMovementAllowed());
     //rcounter.setLastMovementInfo(counter.getLastMovementInfo());
     rcounter.setSupplyLevel(counter.getSupplyLevel());
     rcounter.setIsolated(counter.getIsolated());
+    rcounter.setLastSupplyReset(counter.getLastSupplyReset());
     c.append(tracker.getChangeCommand());
     sb.append(rgp.getName() + " was sent to " + gp.getName() + "'s location, ");
   }

Modified: VSQL-src/branches/morvael/rsr/RsrMover.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMover.java	2009-05-05 13:23:33 UTC (rev 5562)
+++ VSQL-src/branches/morvael/rsr/RsrMover.java	2009-05-05 15:29:14 UTC (rev 5563)
@@ -91,6 +91,8 @@
       return lastMovementReset;
     } else if ("LastMovementInfo".equals(key)) {
       return lastMovementInfo;
+    } else if ("IsMovementAllowed".equals(key)) {
+      return isMovementAllowed;
     } else {
       return super.getProperty(key);
     }
@@ -106,6 +108,8 @@
       return lastMovementReset;
     } else if ("LastMovementInfo".equals(key)) {
       return lastMovementInfo;
+    } else if ("IsMovementAllowed".equals(key)) {
+      return isMovementAllowed;
     } else {
       return super.getLocalizedProperty(key);
     }
@@ -132,6 +136,13 @@
       } catch (Exception e) {
         lastMovementInfo = "";
       }
+    } else if ("IsMovementAllowed".equals(key)) {
+      try {
+        isMovementAllowed = Boolean.parseBoolean(val.toString());
+      } catch (Exception e) {
+        isMovementAllowed = false;
+      }
+      updateLabel();
     } else {
       super.setProperty(key, val);
     }
@@ -212,7 +223,7 @@
   public void draw(Graphics g, int x, int y, Component obs, double zoom) {
     piece.draw(g, x, y, obs, zoom);
     if ((movementLeftLabel.length() > 0) && (zoom == 1.0d)) {
-      Labeler.drawLabel(g, movementLeftLabel, x+63, y, Labeler.LEFT, Labeler.TOP, Color.WHITE, Color.BLACK);
+      Labeler.drawLabel(g, movementLeftLabel, x+38, y+25, Labeler.CENTER, Labeler.CENTER, Color.WHITE, Color.BLACK);
     }
   }
 


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

Revision: 5564
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5564&view=rev
Author:   morvael
Date:     2009-05-05 20:48:08 +0000 (Tue, 05 May 2009)

Log Message:
-----------
Supply check in other phases will not hide label, finally fixed bug with Turning Point map blocking supply in full game.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrCounter.java
    VSQL-src/branches/morvael/rsr/RsrKiller.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
    VSQL-src/branches/morvael/rsr/RsrMover.java
    VSQL-src/branches/morvael/rsr/RsrSupplier.java

Modified: VSQL-src/branches/morvael/rsr/RsrCounter.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrCounter.java	2009-05-05 15:29:14 UTC (rev 5563)
+++ VSQL-src/branches/morvael/rsr/RsrCounter.java	2009-05-05 20:48:08 UTC (rev 5564)
@@ -208,6 +208,14 @@
 		setStringProperty("LastSupplyInfo", value);
 	}
 
+	public boolean getIsSupplyAllowed() {
+		return getBooleanProperty("IsSupplyAllowed");
+	}
+
+	public void setIsSupplyAllowed(boolean value) {
+		setBooleanProperty("IsSupplyAllowed", value);
+	}
+
 	public int getIsolated() {
 		return getIntProperty("Isolated");
 	}

Modified: VSQL-src/branches/morvael/rsr/RsrKiller.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrKiller.java	2009-05-05 15:29:14 UTC (rev 5563)
+++ VSQL-src/branches/morvael/rsr/RsrKiller.java	2009-05-05 20:48:08 UTC (rev 5564)
@@ -210,6 +210,7 @@
     counter.setSupplyLevel(0);
     counter.setIsolated(0);
     counter.setLastSupplyReset("");
+    counter.setIsSupplyAllowed(false);
     counter.setCurrentStep(counter.getSteps());
     counter.setAttachedArmy("");
     c.append(tracker.getChangeCommand());
@@ -259,6 +260,7 @@
     counter.setSupplyLevel(0);
     counter.setIsolated(0);
     counter.setLastSupplyReset("");
+    counter.setIsSupplyAllowed(false);
     counter.setCurrentStep(counter.getSteps());
     counter.setAttachedArmy("");
     c.append(tracker.getChangeCommand());
@@ -320,6 +322,7 @@
     counter.setSupplyLevel(0);
     counter.setIsolated(0);
     counter.setLastSupplyReset("");
+    counter.setIsSupplyAllowed(false);
     counter.setCurrentStep(counter.getSteps());
     counter.setAttachedArmy("");
     c.append(tracker.getChangeCommand());
@@ -356,6 +359,7 @@
     rcounter.setSupplyLevel(counter.getSupplyLevel());
     rcounter.setIsolated(counter.getIsolated());
     rcounter.setLastSupplyReset(counter.getLastSupplyReset());
+    rcounter.setIsSupplyAllowed(counter.getIsSupplyAllowed());
     c.append(tracker.getChangeCommand());
     sb.append(rgp.getName() + " was sent to " + gp.getName() + "'s location, ");
   }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-05 15:29:14 UTC (rev 5563)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-05 20:48:08 UTC (rev 5564)
@@ -10,6 +10,7 @@
 import VASSAL.build.module.Map;
 import VASSAL.build.module.map.boardPicker.Board;
 import VASSAL.counters.GamePiece;
+import terrain.EdgeTerrain;
 
 /**
  * 
@@ -42,10 +43,10 @@
   protected static final String EDGE_IMPASSABLEN = "Impassable N";
   protected static final String EDGE_IMPASSABLENLAKESEA = "Impassable N LakeSea";
   protected static final String EDGE_IMPASSABLESW = "Impassable SW";
-  protected static final String EDGE_IMPASSABLESWLAKESEA = "Impassable SW";
+  protected static final String EDGE_IMPASSABLESWLAKESEA = "Impassable SW LakeSea";
   protected static final String EDGE_IMPASSABLESWMINORRIVER = "Impassable SW MinorRiver";
   protected static final String EDGE_IMPASSABLETP = "Impassable TP";
-  protected static final String EDGE_IMPASSABLETPLAKESEA = "Impassable TP";
+  protected static final String EDGE_IMPASSABLETPLAKESEA = "Impassable TP LakeSea";
   protected static final String EDGE_IMPASSABLETPMINORRIVER = "Impassable TP MinorRiver";
   protected static final String EDGE_IMPASSABLETPMAJORRIVER = "Impassable TP MajorRiver";
   protected static final String LINE_RAILROAD = "Railroad";
@@ -181,9 +182,10 @@
   protected boolean canContestNeighbourSpace2(ArrayList<GamePiece> list, HexRef fromHex, HexRef toHex) {
     String et = getEdgeTerrainName(fromHex, toHex);
     String lt = getLineTerrainName(fromHex, toHex);
-    if ((et.equals(EDGE_IMPASSABLE)) || ((et.startsWith(EDGE_IMPASSABLESW)) && (isSouthwestMapUsed() == false)) || ((et.startsWith(EDGE_IMPASSABLEN) && (isNorthMapUsed() == false))) || ((et.startsWith(EDGE_IMPASSABLETP)) && (isSubMapUsed() == true))) {
+    if (isImpassable(et)) {
       return false;
-    } else if ((et.equals(EDGE_LAKESEA)) || ((et.equals(EDGE_IMPASSABLESWLAKESEA)) && (isSouthwestMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLENLAKESEA)) && (isNorthMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLETPLAKESEA)) && (isSubMapUsed() == false))) {
+    } else
+    if (isLakeSea(et)) {
       if (lt.equals(LINE_FROZENSURFACE)) {
         if (isWinter()) {
           for (GamePiece gp : list) {
@@ -378,13 +380,15 @@
     boolean isRailroad = isAny(lt, LINE_RAILROAD, LINE_CHONGARCAUSEWAY);
     boolean isWinter = isWinter();
     boolean isAxis = side.equals(SIDE_AXIS);
-    if ((et.equals(EDGE_IMPASSABLE)) || ((et.startsWith(EDGE_IMPASSABLESW)) && (isSouthwestMapUsed() == false)) || ((et.startsWith(EDGE_IMPASSABLEN) && (isNorthMapUsed() == false))) || ((et.startsWith(EDGE_IMPASSABLETP)) && (isSubMapUsed() == true))) {
+    if (isImpassable(et)) {
       return Double.MAX_VALUE;
-    } else if ((et.equals(EDGE_LAKESEA)) || ((et.equals(EDGE_IMPASSABLESWLAKESEA)) && (isSouthwestMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLENLAKESEA)) && (isNorthMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLETPLAKESEA)) && (isSubMapUsed() == false))) {
+    } else
+    if (isLakeSea(et)) {
       if ((isAxis) || (isWinter == false) || (lt.equals(LINE_FROZENSURFACE) == false)) {
         return Double.MAX_VALUE;
       }
-    } else if ((et.equals(EDGE_MAJORRIVER)) || ((et.equals(EDGE_IMPASSABLETPMAJORRIVER)) && (isSubMapUsed() == false))) {
+    } else
+    if (isMajorRiver(et)) {
       if (isRailroad == false) {
         return Double.MAX_VALUE;
       }
@@ -562,4 +566,64 @@
       return 6;
     }
   }
+
+  public boolean isImpassable(String et) {
+    if (et.equals(EDGE_IMPASSABLE)) {
+      return true;
+    } else
+    if ((isSouthwestMapUsed() == false) && ((et.equals(EDGE_IMPASSABLESW)) || (et.equals(EDGE_IMPASSABLESWLAKESEA)) || (et.equals(EDGE_IMPASSABLESWMINORRIVER)))) {
+      return true;
+    } else
+    if ((isNorthMapUsed() == false) && ((et.equals(EDGE_IMPASSABLEN)) || (et.equals(EDGE_IMPASSABLENLAKESEA)))) {
+      return true;
+    } else
+    if ((isSubMapUsed() == true) && ((et.equals(EDGE_IMPASSABLETP)) || (et.equals(EDGE_IMPASSABLETPLAKESEA)) || (et.equals(EDGE_IMPASSABLETPMAJORRIVER)) || (et.equals(EDGE_IMPASSABLETPMINORRIVER)))) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  public boolean isLakeSea(String et) {
+    if (et.equals(EDGE_LAKESEA)) {
+      return true;
+    } else
+    if ((isSouthwestMapUsed() == true) && (et.equals(EDGE_IMPASSABLESWLAKESEA))) {
+      return true;
+    } else
+    if ((isNorthMapUsed() == true) && (et.equals(EDGE_IMPASSABLENLAKESEA))) {
+      return true;
+    } else
+    if ((isSubMapUsed() == false) && (et.equals(EDGE_IMPASSABLETPLAKESEA))) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  public boolean isMinorRiver(String et) {
+    if (et.equals(EDGE_MINORRIVER)) {
+      return true;
+    } else
+    if ((isSouthwestMapUsed() == true) && (et.equals(EDGE_IMPASSABLESWMINORRIVER))) {
+      return true;
+    } else
+    if ((isSubMapUsed() == false) && (et.equals(EDGE_IMPASSABLETPMINORRIVER))) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  public boolean isMajorRiver(String et) {
+    if (et.equals(EDGE_MAJORRIVER)) {
+      return true;
+    } else
+    if ((isSubMapUsed() == false) && (et.equals(EDGE_IMPASSABLETPMAJORRIVER))) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
 }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-05-05 15:29:14 UTC (rev 5563)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-05-05 20:48:08 UTC (rev 5564)
@@ -110,22 +110,22 @@
 			}
 		}
 		double cost = 0.0d;
-		if ((et.equals(EDGE_IMPASSABLE)) || ((et.startsWith(EDGE_IMPASSABLESW)) && (isSouthwestMapUsed() == false)) || ((et.startsWith(EDGE_IMPASSABLEN) && (isNorthMapUsed() == false))) || ((et.startsWith(EDGE_IMPASSABLETP)) && (isSubMapUsed() == true))) {
+		if (isImpassable(et)) {
 			return result(fromHex, false, 0.0, false, null);
 		} else
-		if ((et.equals(EDGE_LAKESEA)) || ((et.equals(EDGE_IMPASSABLESWLAKESEA)) && (isSouthwestMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLENLAKESEA)) && (isNorthMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLETPLAKESEA)) && (isSubMapUsed() == false))) {
+		if (isLakeSea(et)) {
 			if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != 0)) {
 				return result(fromHex, false, 0.0, false, null);
 			} else {
 				cost += EDGE_MINORRIVER_COST[movementMode];
 			}
 		} else
-		if ((et.equals(EDGE_MINORRIVER)) || ((et.equals(EDGE_IMPASSABLESWMINORRIVER)) && (isSouthwestMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLETPMINORRIVER)) && (isSubMapUsed() == false))) {
+		if (isMinorRiver(et)) {
 			if ((getTurnNumber() > 1) || (side.equals(SIDE_SOVIET))) {
 				cost += EDGE_MINORRIVER_COST[movementMode];
 			}
 		} else
-		if ((et.equals(EDGE_MAJORRIVER)) || ((et.equals(EDGE_IMPASSABLETPMAJORRIVER)) && (isSubMapUsed() == false))) {
+		if (isMajorRiver(et)) {
 			cost += EDGE_MAJORRIVER_COST[movementMode];
 		}
 		if (tt.equals(HEX_WATER)) {

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-05-05 15:29:14 UTC (rev 5563)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-05-05 20:48:08 UTC (rev 5564)
@@ -87,10 +87,10 @@
 		String tt = getHexTerrainName(toHex);
 		String et = getEdgeTerrainName(fromHex, toHex);
 		String lt = getLineTerrainName(fromHex, toHex);
-		if ((et.equals(EDGE_IMPASSABLE)) || ((et.startsWith(EDGE_IMPASSABLESW)) && (isSouthwestMapUsed() == false)) || ((et.startsWith(EDGE_IMPASSABLEN) && (isNorthMapUsed() == false))) || ((et.startsWith(EDGE_IMPASSABLETP)) && (isSubMapUsed() == true))) {
+		if (isImpassable(et)) {
 			return result(fromHex, false, 0.0, false, null);
 		} else
-		if ((et.equals(EDGE_LAKESEA)) || ((et.equals(EDGE_IMPASSABLESWLAKESEA)) && (isSouthwestMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLENLAKESEA)) && (isNorthMapUsed() == true)) || ((et.equals(EDGE_IMPASSABLETPLAKESEA)) && (isSubMapUsed() == false))) {
+		if (isLakeSea(et)) {
 			if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != 0)) {
 				return result(fromHex, false, 0.0, false, null);
 			}

Modified: VSQL-src/branches/morvael/rsr/RsrMover.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMover.java	2009-05-05 15:29:14 UTC (rev 5563)
+++ VSQL-src/branches/morvael/rsr/RsrMover.java	2009-05-05 20:48:08 UTC (rev 5564)
@@ -222,9 +222,9 @@
 
   public void draw(Graphics g, int x, int y, Component obs, double zoom) {
     piece.draw(g, x, y, obs, zoom);
-    if ((movementLeftLabel.length() > 0) && (zoom == 1.0d)) {
-      Labeler.drawLabel(g, movementLeftLabel, x+38, y+25, Labeler.CENTER, Labeler.CENTER, Color.WHITE, Color.BLACK);
-    }
+    //if ((movementLeftLabel.length() > 0) && (zoom == 1.0d)) {
+    //  Labeler.drawLabel(g, movementLeftLabel, x+38, y+25, Labeler.CENTER, Labeler.CENTER, Color.WHITE, Color.BLACK);
+    //}
   }
 
   private TerrainMapShader getShader() {

Modified: VSQL-src/branches/morvael/rsr/RsrSupplier.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrSupplier.java	2009-05-05 15:29:14 UTC (rev 5563)
+++ VSQL-src/branches/morvael/rsr/RsrSupplier.java	2009-05-05 20:48:08 UTC (rev 5564)
@@ -79,9 +79,9 @@
   private int isolated;
   private String lastSupplyReset;
   private String lastSupplyInfo;
+  private boolean isSupplyAllowed;
   // dynamic
   private KeyCommand[] commandsSupply;
-  private boolean isSupplyAllowed;
   private String supplyLevelLabel;
   private String supplyLevelInfoLabel;
   private static HashMap<String, RsrSupplierInfo> cache = new HashMap<String, RsrSupplierInfo>();
@@ -110,6 +110,8 @@
       return lastSupplyReset;
     } else if ("LastSupplyInfo".equals(key)) {
       return lastSupplyInfo;
+    } else if ("IsSupplyAllowed".equals(key)) {
+      return isSupplyAllowed;
     } else {
       return super.getProperty(key);
     }
@@ -127,6 +129,8 @@
       return lastSupplyReset;
     } else if ("LastSupplyInfo".equals(key)) {
       return lastSupplyInfo;
+    } else if ("IsSupplyAllowed".equals(key)) {
+      return isSupplyAllowed;
     } else {
       return super.getLocalizedProperty(key);
     }
@@ -160,6 +164,13 @@
       } catch (Exception e) {
         lastSupplyInfo = "";
       }
+    } else if ("IsSupplyAllowed".equals(key)) {
+      try {
+        isSupplyAllowed = Boolean.parseBoolean(val.toString());
+      } catch (Exception e) {
+        isSupplyAllowed = false;
+      }
+      updateLabel();
     } else {
       super.setProperty(key, val);
     }
@@ -235,6 +246,7 @@
     se.append(isolated);
     se.append(lastSupplyReset == null ? "" : lastSupplyReset);
     se.append(lastSupplyInfo == null ? "" : lastSupplyInfo);
+    se.append(isSupplyAllowed);
     return se.getValue();
   }
 
@@ -244,6 +256,7 @@
     isolated = st.nextInt(0);
     lastSupplyReset = st.nextToken("");
     lastSupplyInfo = st.nextToken("");
+    isSupplyAllowed = st.nextBoolean(false);
     updateLabel();
   }
 
@@ -261,9 +274,9 @@
 
   public void draw(Graphics g, int x, int y, Component obs, double zoom) {
     piece.draw(g, x, y, obs, zoom);
-    if ((supplyLevelLabel.length() > 0) && (zoom == 1.0d)) {
-      Labeler.drawLabel(g, supplyLevelLabel, x, y-38, Labeler.CENTER, Labeler.CENTER, Color.RED, Color.BLACK);
-    }
+    //if ((supplyLevelLabel.length() > 0) && (zoom == 1.0d)) {
+    //  Labeler.drawLabel(g, supplyLevelLabel, x, y-38, Labeler.CENTER, Labeler.CENTER, Color.RED, Color.BLACK);
+    //}
   }
 
   private void getShaders() {
@@ -296,16 +309,17 @@
   }
 
   private void prepareCommands(RsrCounter counter) {
-    // phase check
-    isSupplyAllowed = true;// rulesN.getPhaseName().equals("Supply");
     // board check
     boolean boardOk = (shaderN != null) && (shaderA != null) && (counter.getPiece().getMap() == shaderN.getBoard().getMap()) && (counter.getPiece().getMap() == shaderA.getBoard().getMap());
     if (boardOk == false) {
+      isSupplyAllowed = false;
       for (int i = 0; i < commandsSupply.length; i++) {
         commandsSupply[i].setEnabled(false);
       }
     } else {
       RsrMapShaderBase rulesN = (RsrMapShaderBase) shaderN.getRules();
+      //phase check
+      isSupplyAllowed = rulesN.getPhaseName().equals("Supply");
       // supply
       String thisTP = rulesN.getTurnNumber() + "_Supply";
       commandsSupply[0].setEnabled((isSupplyAllowed) && (thisTP.equals(lastSupplyReset) == false));
@@ -367,7 +381,6 @@
     RsrCounter counter = new RsrCounter(gp);
     if ((shaderN == null) || (shaderA == null) || (commandsSupply[match].isEnabled() == false)) {
       if (match == 0) {
-        supplyLevel = 0;
         updateLabel();
       }
       lastSupplyInfo = "";
@@ -375,51 +388,51 @@
     }
     Command c = null;
     RsrMapShaderBase rulesN = (RsrMapShaderBase) shaderN.getRules();
-    //if (match == 0) {
-    // supply
-    lastSupplyReset = rulesN.getTurnNumber() + "_Supply";
-    reloadSupply(lastSupplyReset, rulesN);
-    supplyLevel = -1;
-    isolated = 0;
-    String type = counter.getType();
-    if (TerrainMapShaderRule.isAny(type, "Depot")) {
-      supplyLevel = 0;
-    } else {
-      HexRef thisHex = grid.getHexPos(counter.getPiece().getPosition());
-      TerrainMapShaderCost costN = getInfo(terrainMapShaderNameN).lastCost.get(thisHex);
-      if (costN != null) {
-        if ((costN.getFlag() == null) || (RsrMapShaderBase.MODE_NORMAL.equals(costN.getFlag()))) {
-          supplyLevel = 0;
-        } else if (RsrMapShaderBase.MODE_EMERGENCY.equals(costN.getFlag())) {
-          if (TerrainMapShaderRule.isAny(type, "Airbase") == false) {
-            supplyLevel = 1;
-          }
-        } else if (RsrMapShaderBase.MODE_SEA.equals(costN.getFlag())) {
-          if ((counter.getSide().equals(RsrMapShaderBase.SIDE_SOVIET)) && (TerrainMapShaderRule.isAny(type, "Headquarters", "Leader") == false)) {
+    if (match == 0) {
+      // check supply
+      lastSupplyReset = rulesN.getTurnNumber() + "_Supply";
+      reloadSupply(lastSupplyReset, rulesN);
+      supplyLevel = -1;
+      isolated = 0;
+      String type = counter.getType();
+      if (TerrainMapShaderRule.isAny(type, "Depot")) {
+        supplyLevel = 0;
+      } else {
+        HexRef thisHex = grid.getHexPos(counter.getPiece().getPosition());
+        TerrainMapShaderCost costN = getInfo(terrainMapShaderNameN).lastCost.get(thisHex);
+        if (costN != null) {
+          if ((costN.getFlag() == null) || (RsrMapShaderBase.MODE_NORMAL.equals(costN.getFlag()))) {
             supplyLevel = 0;
-          } else if ((counter.getSide().equals(RsrMapShaderBase.SIDE_AXIS)) && (TerrainMapShaderRule.isAny(type, "Airbase") == false)) {
-            supplyLevel = 0;
+          } else if (RsrMapShaderBase.MODE_EMERGENCY.equals(costN.getFlag())) {
+            if (TerrainMapShaderRule.isAny(type, "Airbase") == false) {
+              supplyLevel = 1;
+            }
+          } else if (RsrMapShaderBase.MODE_SEA.equals(costN.getFlag())) {
+            if ((counter.getSide().equals(RsrMapShaderBase.SIDE_SOVIET)) && (TerrainMapShaderRule.isAny(type, "Headquarters", "Leader") == false)) {
+              supplyLevel = 0;
+            } else if ((counter.getSide().equals(RsrMapShaderBase.SIDE_AXIS)) && (TerrainMapShaderRule.isAny(type, "Airbase") == false)) {
+              supplyLevel = 0;
+            }
           }
         }
-      }
-      if (supplyLevel == -1) {
-        if ((counter.getSide().equals(RsrMapShaderBase.SIDE_SOVIET)) && (inFactory.contains(thisHex))) {
-          supplyLevel = 2;
-        } else if ((counter.getNationality().equals(RsrMapShaderBase.NATIONALITY_GERMAN)) && (inAirRange.contains(thisHex))) {
-          supplyLevel = 2;
-        } else {
-          supplyLevel = 3;
-          TerrainMapShaderCost costA = getInfo(terrainMapShaderNameA).lastCost.get(thisHex);
-          if ((costA == null) && (rulesN.getTurnNumber() > 1) && (TerrainMapShaderRule.isAny(type, "Headquarters") == false)) {
-            isolated = 1;
+        if (supplyLevel == -1) {
+          if ((counter.getSide().equals(RsrMapShaderBase.SIDE_SOVIET)) && (inFactory.contains(thisHex))) {
+            supplyLevel = 2;
+          } else if ((counter.getNationality().equals(RsrMapShaderBase.NATIONALITY_GERMAN)) && (inAirRange.contains(thisHex))) {
+            supplyLevel = 2;
+          } else {
+            supplyLevel = 3;
+            TerrainMapShaderCost costA = getInfo(terrainMapShaderNameA).lastCost.get(thisHex);
+            if ((costA == null) && (rulesN.getTurnNumber() > 1) && (TerrainMapShaderRule.isAny(type, "Headquarters") == false)) {
+              isolated = 1;
+            }
           }
         }
       }
-    }
-    updateLabel();
-    lastSupplyInfo = GlobalOptions.getInstance().getPlayerId() + ": " + gp.getName() + "'s supply to " + supplyLevelInfoLabel + ".";
-    c = tracker.getChangeCommand();
-    //} else {...}
+      updateLabel();
+      lastSupplyInfo = GlobalOptions.getInstance().getPlayerId() + ": " + gp.getName() + "'s supply to " + supplyLevelInfoLabel + ".";
+      c = tracker.getChangeCommand();
+    }// else {...}
     return c;
   }
 


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

Revision: 5585
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5585&view=rev
Author:   morvael
Date:     2009-05-08 13:04:03 +0000 (Fri, 08 May 2009)

Log Message:
-----------
Big changes for the new version of module - where every function that can be automated is done by Vassal. Current version of the code is not working yet.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrCommandEncoder.java
    VSQL-src/branches/morvael/rsr/RsrKiller.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java
    VSQL-src/branches/morvael/rsr/RsrMover.java

Added Paths:
-----------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrButton.java
    VSQL-src/branches/morvael/rsr/RsrButtonCommand.java
    VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java
    VSQL-src/branches/morvael/rsr/RsrImmobilized.java
    VSQL-src/branches/morvael/rsr/RsrPieceMover.java

Added: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -0,0 +1,255 @@
+package rsr;
+
+import VASSAL.build.GameModule;
+import VASSAL.command.Command;
+import java.awt.Point;
+import terrain.TerrainMapShaderRule;
+import VASSAL.counters.GamePiece;
+import java.util.HashMap;
+import terrain.HexRef;
+import terrain.TerrainHexGrid;
+import terrain.TerrainMapShaderCost;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-05-08
+ */
+public final class RsrAdvance extends RsrButtonCommandBase {
+
+  public static final String PHASE_SUPPLY = "Supply";
+  public static final String PHASE_AXIS_REINFORCEMENT = "Axis Reinforcement";
+  public static final String PHASE_AXIS_MOVEMENT = "Axis Movement";
+  public static final String PHASE_AXIS_COMBAT = "Axis Combat";
+  public static final String PHASE_SOVIET_COMBAT = "Soviet Combat";
+  public static final String PHASE_SOVIET_REINFORCEMENT = "Soviet Reinforcement";
+  public static final String PHASE_SOVIET_MOVEMENT = "Soviet Movement";
+  public static final String PHASE_GERMAN_TANK_MOVEMENT = "German Tank Movement";
+  public static final String PHASE_ADMINISTRATIVE = "Administrative";
+
+  private static RsrAdvance instance;
+
+  public static RsrAdvance getInstance() {
+    if (instance == null) {
+      new RsrAdvance();
+    }
+    return instance;
+  }
+
+  public RsrAdvance() {
+    instance = this;
+  }
+
+  public RsrButtonCommand getDesiredInstance() {
+    return RsrAdvance.getInstance();
+  }
+
+  protected void onInitialize(String param) {
+    //
+  }
+
+  protected void onExecute(String param) {
+    Command c = null;
+
+    int firstExecute = getIntProperty("first_execute", 1);
+    int phaseParts = getIntProperty("phase_parts", 1);
+    int phasePart = getIntProperty("phase_part", 1);
+
+    if (firstExecute == 0) {
+      if (phasePart > phaseParts) {
+        c = executeLeavePhase(c);
+        Point p = phasePiece.getPosition();
+        if (p.y == 701) {
+          Point p2 = turnPiece.getPosition();
+          if (p2.y < 3599) {
+            p2.translate(0, 91);
+            c = commandMove(c, turnMap, turnPiece, p2, false);
+          }
+          p.y = 45;
+        } else {
+          p.translate(0, 82);
+        }
+        c = commandMove(c, turnMap, phasePiece, p, true);
+        c = executeEnterPhase(c);
+      } else {
+        c = executePart(c, phasePart);
+      }
+    } else {
+      c = executeFirst(c);
+    }
+
+    GameModule.getGameModule().sendAndLog(c);
+  }
+
+  private Command executeSetPhaseParts(Command c) {
+    c = commandSetProperty(c, dataPiece, "phase_part", "1");
+    String phaseName = rules.getPhaseName();
+    if (phaseName.equals(PHASE_SUPPLY)) {
+      //check supply of airbases - AUTO - on enter
+      //place air fleets on the map - MANUAL
+      //check supply of all units - AUTO - on leave
+      //check attrition of all units - AUTO - on leave
+      //put Combat Strength Markers into Cups - AUTO - on leave
+      c = commandSetProperty(c, dataPiece, "phase_parts", "1");
+    } else if (phaseName.equals(PHASE_AXIS_REINFORCEMENT)) {
+      //put reinforcements on map - MANUAL
+      c = commandSetProperty(c, dataPiece, "phase_parts", "1");
+    } else if (phaseName.equals(PHASE_AXIS_MOVEMENT)) {
+      //reset movement - AUTO - on enter
+      //sea movement - MANUAL
+      //strategic movement - MANUAL
+      //movement except airbase - MANUAL
+      //movement airbase - MANUAL
+      //clear movement - AUTO - on leave
+      c = commandSetProperty(c, dataPiece, "phase_parts", "4");
+    } else if (phaseName.equals(PHASE_AXIS_COMBAT)) {
+      //combat - MANUAL
+      c = commandSetProperty(c, dataPiece, "phase_parts", "1");
+    } else if (phaseName.equals(PHASE_SOVIET_COMBAT)) {
+      //combat - MANUAL
+      c = commandSetProperty(c, dataPiece, "phase_parts", "1");
+    } else if (phaseName.equals(PHASE_SOVIET_REINFORCEMENT)) {
+      //put other reinforcements to offboard - AUTO - on enter
+      //put reinforcements on map - MANUAL
+      c = commandSetProperty(c, dataPiece, "phase_parts", "1");
+    } else if (phaseName.equals(PHASE_SOVIET_MOVEMENT)) {
+      //sea movement - MANUAL
+      //strategic movement - MANUAL
+      //movement except leader - MANUAL
+      //movement leader - MANUAL
+      c = commandSetProperty(c, dataPiece, "phase_parts", "4");
+    } else if (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) {
+      //movement - MANUAL
+      //strategic movement - MANUAL
+      //remove airfleets - AUTO - on leave
+      c = commandSetProperty(c, dataPiece, "phase_parts", "2");
+    } else if (phaseName.equals(PHASE_ADMINISTRATIVE)) {
+      //port asset elimination in production turn - AUTO - on enter
+      //leader check in production turn - AUTO - on enter
+      //leader placement in production turn - MANUAL
+      //axis breakdowns and buildups - MANUAL
+      //soviet army conversion - MANUAL
+      //soviet breakdowns and buildups in production turn - MANUAL
+      //factory evacuation in production turn - MANUAL
+      //partisan placement - MANUAL
+      //fetch combat markers - AUTO - on leave
+      //release combat markers - AUTO - on leave
+      c = commandSetProperty(c, dataPiece, "phase_parts", "1");
+    } else {
+      c = commandSetProperty(c, dataPiece, "phase_parts", "1");
+    }
+    return c;
+  }
+
+  private Command executeFirst(Command c) {
+    c = commandSetProperty(c, dataPiece, "first_execute", "0");
+    c = executeEnterPhase(c);
+    return c;
+  }
+
+  private Command executeLeavePhase(Command c) {
+    //c = commandLog(c, "Leave " + rules.getPhaseName());
+    c = executePartPhase(c, getIntProperty("phase_part", 1));
+    return c;
+  }
+
+  private Command executeEnterPhase(Command c) {
+    //c = commandLog(c, "Enter " + rules.getPhaseName());
+    c = executeSetPhaseParts(c);
+    c = executePartPhase(c, 0);
+    c = executePart(c, 1);
+    return c;
+  }
+
+  private Command executePart(Command c, int part) {
+    //c = commandLog(c, "Part " + part + " of " + rules.getPhaseName());
+    c = executePartPhase(c, part);
+    c = commandSetProperty(c, dataPiece, "phase_part", String.valueOf(part+1));
+    return c;
+  }
+
+  private Command executePartPhase(Command c, int part) {
+    //0 - enter
+    //1..x - parts
+    //x+1 - leave
+    c = commandLog(c, "Part " + part + " of " + rules.getPhaseName());
+
+    String phaseName = rules.getPhaseName();
+    if (phaseName.equals(PHASE_SUPPLY)) {
+      switch (part) {
+        case 0 : c = executeSupply0(c); break;
+        case 1 : c = executeSupply1(c); break;
+        case 2 : c = executeSupply2(c); break;
+      }
+    } else if (phaseName.equals(PHASE_AXIS_REINFORCEMENT)) {
+      //TODO: fill in
+    } else if (phaseName.equals(PHASE_AXIS_MOVEMENT)) {
+      //TODO: fill in
+    } else if (phaseName.equals(PHASE_AXIS_COMBAT)) {
+      //TODO: fill in
+    } else if (phaseName.equals(PHASE_SOVIET_COMBAT)) {
+      //TODO: fill in
+    } else if (phaseName.equals(PHASE_SOVIET_REINFORCEMENT)) {
+      //TODO: fill in
+    } else if (phaseName.equals(PHASE_SOVIET_MOVEMENT)) {
+      //TODO: fill in
+    } else if (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) {
+      //TODO: fill in
+    } else if (phaseName.equals(PHASE_ADMINISTRATIVE)) {
+      //TODO: fill in
+    }
+    return c;
+  }
+
+  /*
+   * Check supply of airbases. (AUTO)
+   * Remove out of supply airbases from the map. (AUTO)
+   */
+  private Command executeSupply0(Command c) {
+    c = commandLog(c, "Checking supply of airbases and removing any out of supply.");
+    HashMap<HexRef, TerrainMapShaderCost> inSupply = shaderAxisDepotSupply.getHexes(shaderAxisDepotSupply.getRules(), null);
+    TerrainHexGrid grid = shaderAxisDepotSupply.getGrid();
+    HexRef hr;
+    for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=Airbase")) {
+      hr = grid.getHexPos(gp.getPosition());
+      if ((inSupply.containsKey(hr) == false) || (inSupply.get(hr).getFlag().equals(RsrMapShaderDepotSupply.MODE_NORMAL) == false)) {
+        c = commandSetProperty(c, gp, "SupplyLevel", 3, "Isolated", 0, "IsSupplyAllowed", true);
+        //remove the airbase rather than
+      } else {
+        c = commandSetProperty(c, gp, "SupplyLevel", 0, "Isolated", 0, "IsSupplyAllowed", true);
+      }
+    }
+    return c;
+  }
+
+  /*
+   * Place air fleets on the map. (MANUAL)
+   * Convert supply depots into emergency supply sources. (MANUAL)
+   */
+  private Command executeSupply1(Command c) {
+    if (rules.isMud() == false) {
+      c = commandLog(c, "* Place air fleets on the map.");
+    }
+    c = commandLog(c, "* Convert supply depots into emergency supply sources.");
+    return c;
+  }
+
+  /*
+   * Check supply of all units (except airbases). (AUTO)
+   * Check attrition of all isolated units. (AUTO)
+   * Remove supply depots converted into emergency supply sources. (AUTO)
+   * Move Soviet Combat Strength Markers received as reinforcements into the proper draw cups. (AUTO)
+   */
+  private Command executeSupply2(Command c) {
+    c = commandLog(c, "Checking supply of all units (except airbases).");
+    if (rules.getTurnNumber() != 1) { //filter to see...
+      c = commandLog(c, "Checking attrition of all isolated units.");
+    }
+    //filter to see if there are depots to remove and log only if >0
+    c = commandLog(c, "Removing supply depots converted into emergency supply sources.");
+    //filter to see
+    c = commandLog(c, "Moving Soviet Combat Strength Markers received as reinforcements into the proper draw cups.");
+    return c;
+  }
+
+}

Added: VSQL-src/branches/morvael/rsr/RsrButton.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButton.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrButton.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -0,0 +1,189 @@
+package rsr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import VASSAL.build.AbstractConfigurable;
+import VASSAL.build.AutoConfigurable;
+import VASSAL.build.Buildable;
+import VASSAL.build.GameModule;
+import VASSAL.build.module.documentation.HelpFile;
+import VASSAL.configure.Configurer;
+import VASSAL.configure.ConfigurerFactory;
+import VASSAL.configure.IconConfigurer;
+import VASSAL.configure.VisibilityCondition;
+import VASSAL.i18n.Resources;
+import VASSAL.tools.ErrorDialog;
+import VASSAL.tools.LaunchButton;
+import VASSAL.tools.RecursionLimitException;
+import VASSAL.tools.RecursionLimiter;
+import java.awt.Component;
+import javax.swing.KeyStroke;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-05-08
+ */
+public class RsrButton extends AbstractConfigurable implements RecursionLimiter.Loopable {
+
+  public static final String DESCRIPTION = "Rsr Button"; //$NON-NLS-1$
+  public static final String BUTTON_TEXT = "text"; //$NON-NLS-1$
+  public static final String TOOLTIP = "tooltip"; //$NON-NLS-1$
+  public static final String NAME = "name"; //$NON-NLS-1$
+  public static final String HOTKEY = "hotkey"; //$NON-NLS-1$
+  public static final String ICON = "icon"; //$NON-NLS-1$
+  public static final String BUTTON_CLASS = "button_class"; //$NON-NLS-1$
+  public static final String BUTTON_PARAM = "button_param"; //$NON-NLS-1$
+  protected LaunchButton launch;
+  protected String buttonClass = "";
+  protected String buttonParam = "";
+  protected RsrButtonCommand cmd;
+
+  public RsrButton() {
+    ActionListener action = new ActionListener() {
+
+      public void actionPerformed(ActionEvent e) {
+        try {
+          execute();
+        } catch (RecursionLimitException ex) {
+          ErrorDialog.infiniteLoop(ex);
+        }
+      }
+    };
+
+    launch = new LaunchButton(DESCRIPTION, TOOLTIP, BUTTON_TEXT, HOTKEY, ICON, action);
+    setAttribute(NAME, DESCRIPTION);
+    setAttribute(TOOLTIP, DESCRIPTION);
+    launch.setAttribute(BUTTON_TEXT, DESCRIPTION);
+  }
+
+  public static String getConfigureTypeName() {
+    return DESCRIPTION;
+  }
+
+  public String[] getAttributeNames() {
+    return new String[]{
+              NAME,
+              BUTTON_TEXT,
+              TOOLTIP,
+              ICON,
+              HOTKEY,
+              BUTTON_CLASS,
+              BUTTON_PARAM
+            };
+  }
+
+  public String[] getAttributeDescriptions() {
+    return new String[]{
+              DESCRIPTION,
+              Resources.getString(Resources.BUTTON_TEXT),
+              Resources.getString(Resources.TOOLTIP_TEXT),
+              Resources.getString(Resources.BUTTON_ICON),
+              Resources.getString(Resources.HOTKEY_LABEL),
+              "Button Class", //$NON-NLS-1$
+              "Button Param" //$NON-NLS-1$
+            };
+  }
+
+  public static class IconConfig implements ConfigurerFactory {
+
+    public Configurer getConfigurer(AutoConfigurable c, String key, String name) {
+      return new IconConfigurer(key, name, null);
+    }
+  }
+
+  public Class<?>[] getAttributeTypes() {
+    return new Class<?>[]{
+              String.class,
+              String.class,
+              String.class,
+              IconConfig.class,
+              KeyStroke.class,
+              String.class,
+              String.class
+            };
+  }
+
+  public void addTo(Buildable parent) {
+    GameModule.getGameModule().getToolBar().add(getComponent());
+  }
+
+  /**
+   * The component to be added to the control window toolbar
+   */
+  protected Component getComponent() {
+    return launch;
+  }
+
+  @SuppressWarnings("unchecked")
+  public void setAttribute(String key, Object o) {
+    if (NAME.equals(key)) {
+      setConfigureName((String) o);
+    } else if (BUTTON_CLASS.equals(key)) {
+      buttonClass = (String) o;
+    } else if (BUTTON_PARAM.equals(key)) {
+      buttonParam = (String) o;
+    } else {
+      launch.setAttribute(key, o);
+    }
+  }
+
+  public String getAttributeValueString(String key) {
+    if (NAME.equals(key)) {
+      return getConfigureName();
+    } else if (BUTTON_CLASS.equals(key)) {
+      return buttonClass;
+    } else if (BUTTON_PARAM.equals(key)) {
+      return buttonParam;
+    } else {
+      return launch.getAttributeValueString(key);
+    }
+  }
+
+  @Override
+  public VisibilityCondition getAttributeVisibility(String name) {
+    return null;
+  }
+
+  public Class<?>[] getAllowableConfigureComponents() {
+    return new Class<?>[0];
+  }
+
+  public void removeFrom(Buildable b) {
+    GameModule.getGameModule().getToolBar().remove(getComponent());
+    GameModule.getGameModule().getToolBar().revalidate();
+  }
+
+  public HelpFile getHelpFile() {
+    return HelpFile.getReferenceManualPage("RsrButton.htm"); //$NON-NLS-1$
+  }
+
+  protected void execute() throws RecursionLimitException {
+    try {
+      RecursionLimiter.startExecution(this);
+      if (buttonClass.length() > 0) {
+        try {
+          if (cmd == null) {
+            Class c = Class.forName(buttonClass);
+            cmd = (RsrButtonCommand)c.newInstance();
+            cmd = cmd.getDesiredInstance();
+          }
+          cmd.execute(buttonParam);
+        } catch (Exception ex) {
+
+        }
+      }
+    } finally {
+      RecursionLimiter.endExecution();
+    }
+  }
+
+  public String getComponentTypeName() {
+    return getConfigureTypeName();
+  }
+
+  public String getComponentName() {
+    return getConfigureName();
+  }
+}

Added: VSQL-src/branches/morvael/rsr/RsrButtonCommand.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButtonCommand.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrButtonCommand.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -0,0 +1,13 @@
+package rsr;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-05-08
+ */
+public interface RsrButtonCommand {
+
+  RsrButtonCommand getDesiredInstance();
+  void execute(String param);
+  
+}

Added: VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -0,0 +1,252 @@
+package rsr;
+
+import VASSAL.build.GameModule;
+import VASSAL.build.module.Chatter;
+import VASSAL.build.module.GlobalOptions;
+import VASSAL.build.module.Map;
+import VASSAL.build.module.map.MovementReporter;
+import VASSAL.build.module.map.boardPicker.Board;
+import VASSAL.build.module.map.boardPicker.board.Region;
+import VASSAL.command.ChangeTracker;
+import VASSAL.command.Command;
+import terrain.TerrainMapShader;
+import terrain.TerrainMapShaderRule;
+import VASSAL.counters.GamePiece;
+import java.awt.Point;
+import VASSAL.build.module.map.boardPicker.board.mapgrid.Zone;
+import VASSAL.counters.Stack;
+import java.awt.Rectangle;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-05-08
+ */
+public abstract class RsrButtonCommandBase implements RsrButtonCommand {
+
+  private boolean initialized;
+  protected Map mainMap;
+  protected Board mainBoard;
+  protected Map turnMap;
+  protected Board turnBoard;
+  protected Map offboardMap;
+  protected Board offboardBoard;
+  protected TerrainMapShader shaderAxisDepotSupply;
+  protected TerrainMapShader shaderAxisFinlandSupply;
+  protected TerrainMapShader shaderAxisRomaniaSupply;
+  protected TerrainMapShader shaderSovietSupply;
+  protected TerrainMapShader shaderAxisDepotAttritionSupply;
+  protected TerrainMapShader shaderAxisFinlandAttritionSupply;
+  protected TerrainMapShader shaderAxisRomaniaAttritionSupply;
+  protected TerrainMapShader shaderSovietAttritionSupply;
+  protected TerrainMapShader shaderHexControlLOC;
+  protected TerrainMapShader shaderAssetLOC;
+  protected TerrainMapShader shaderMovementShading;
+  protected TerrainMapShader shaderStrategicShading;
+  protected TerrainMapShader shaderVP;
+  protected RsrMapShaderBase rules;
+  protected GamePiece turnPiece;
+  protected GamePiece phasePiece;
+  protected GamePiece dataPiece;
+
+  protected Board findBoard(Map map, String name) {
+    if (map != null) {
+      for (Board b : map.getBoards()) {
+        if (b.getLocalizedName().equals(name)) {
+          return b;
+        }
+      }
+    }
+    return null;
+  }
+
+  protected TerrainMapShader getShader(String name) {
+    for (TerrainMapShader shader : mainMap.getAllDescendantComponentsOf(TerrainMapShader.class)) {
+      if (shader.getConfigureName().equals(name)) {
+        return shader;
+      }
+    }
+    return null;
+  }
+
+  protected GamePiece getSinglePiece(Map map, String filter) {
+    for (GamePiece gp : TerrainMapShaderRule.filterPieces(map, filter)) {
+      return gp;
+    }
+    return null;
+  }
+
+  private boolean initialize(String param) {
+    if (initialized == false) {
+      try {
+        mainMap = Map.getMapById("Main Map");
+        mainBoard = findBoard(mainMap, "Main Board");
+        turnMap = Map.getMapById("Turn");
+        turnBoard = findBoard(turnMap, "Turn");
+        offboardMap = Map.getMapById("Offboard");
+        offboardBoard = findBoard(offboardMap, "Offboard");
+        shaderAxisDepotSupply = getShader("AxisDepotSupply");
+        shaderAxisFinlandSupply = getShader("AxisFinlandSupply");
+        shaderAxisRomaniaSupply = getShader("AxisRomaniaSupply");
+        shaderSovietSupply = getShader("SovietSupply");
+        shaderAxisDepotAttritionSupply = getShader("AxisDepotAttritionSupply");
+        shaderAxisFinlandAttritionSupply = getShader("AxisFinlandAttritionSupply");
+        shaderAxisRomaniaAttritionSupply = getShader("AxisRomaniaAttritionSupply");
+        shaderSovietAttritionSupply = getShader("SovietAttritionSupply");
+        shaderHexControlLOC = getShader("HexControlLOC");
+        shaderAssetLOC = getShader("AssetLOC");
+        shaderMovementShading = getShader("MovementShading");
+        shaderStrategicShading = getShader("StrategicShading");
+        shaderVP = getShader("VP");
+        rules = (RsrMapShaderBase)shaderVP.getRules();
+        turnPiece = getSinglePiece(turnMap, "BasicName=Game Turn");
+        phasePiece = getSinglePiece(turnMap, "BasicName=Turn Phase");
+        dataPiece = getSinglePiece(turnMap, "BasicName=Data");
+        initialized = true;
+        onInitialize(param);
+      } catch (Exception ex) {
+
+      }
+    }
+    return initialized;
+  }
+
+  public final void execute(String param) {
+    if (initialize(param)) {
+      onExecute(param);
+    }    
+  }
+
+  protected abstract void onInitialize(String param);
+  protected abstract void onExecute(String param);
+
+  protected Command commandLog(Command c, String message) {
+    Command cmd = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), message);
+    cmd.execute();
+    if (c != null) {
+      c.append(cmd);
+      return c;
+    } else {
+      return cmd;
+    }
+  }
+
+  protected Command commandSetProperty(Command c, GamePiece gp, Object key, Object val) {
+    ChangeTracker tracker = new ChangeTracker(gp);
+    gp.setProperty(key, val);
+    if (c != null) {
+      c.append(tracker.getChangeCommand());
+    } else {
+      c = tracker.getChangeCommand();
+    }
+    return c;
+  }
+
+  protected Command commandSetProperty(Command c, GamePiece gp, Object ... key_val) {
+    ChangeTracker tracker = new ChangeTracker(gp);
+    for (int i=0; i<key_val.length; i+=2) {
+      gp.setProperty(key_val[i], key_val[i+1]);
+    }
+    if (c != null) {
+      c.append(tracker.getChangeCommand());
+    } else {
+      c = tracker.getChangeCommand();
+    }
+    return c;
+  }
+
+  protected Command commandMove(Command c, Map map, GamePiece gp, Point p, boolean reportMoves) {
+    if (c != null) {
+      c.append(map.placeOrMerge(gp, p));
+    } else {
+      c = map.placeOrMerge(gp, p);
+    }
+    map.repaint();
+    if (reportMoves) {
+      MovementReporter r = new MovementReporter(c);
+      if (GlobalOptions.getInstance().autoReportEnabled()) {
+        Command reportCommand = r.getReportCommand();
+        if (reportCommand != null) {
+          reportCommand.execute();
+        }
+        c.append(reportCommand);
+      }
+      c.append(r.markMovedPieces());
+    }
+    return c;
+  }
+
+  protected int getIntProperty(String name, int def) {
+    try {
+      return Integer.parseInt(String.valueOf(dataPiece.getProperty(name)));
+    } catch (Exception ex) {
+      return def;
+    }
+  }
+
+  protected Command commandReleaseCounter(Command c, RsrCounter counter) {
+    return c;
+  }
+
+  //move counter to offboard zone
+  protected Command commandSendToOffboardZone(Command c, RsrCounter counter, String offboardZone) {
+    //
+    Zone z = offboardMap.findZone(offboardZone);
+    if (z == null) {
+      return c;
+    }
+    //
+    GamePiece gp = counter.getPiece();
+    //
+    if (counter.getType().equals("Strength") == false) {
+      c = commandReleaseCounter(c, counter);
+    }
+    //
+    Stack parent = gp.getParent();
+    //
+    Rectangle r1 = z.getBounds();
+    Rectangle r2 = z.getBoard().bounds();
+    Point dest = offboardMap.snapTo(new Point(r2.x + r1.x + r1.width / 2, r2.y + r1.y + r1.height / 2));
+
+    c = commandMove(c, offboardMap, gp, dest, true);
+    c = commandSetProperty(c, gp, "MovementLeft", 0d, "IsMovementAllowed", false, "SupplyLevel", 0, "Isolated", 0, "IsSupplyAllowed", false, "CurrentStep", counter.getSteps());
+    return c;
+  }
+
+  //move counter to proper reinforcement zone
+  protected Command commandSendToReinforcementZone(Command c, RsrCounter counter, int turnNumberMod, String offboardZone) {
+    //
+    int turnNumber = rules.getTurnNumber() + turnNumberMod;
+    if ((turnNumber < 1) || (turnNumber > 40)) {
+      if (offboardZone != null) {
+        c = commandSendToOffboardZone(c, counter, offboardZone);
+      }
+      return c;
+    }
+    //
+    Zone z = turnMap.findZone(counter.getSide() + " Track");
+    if (z == null) {
+      return c;
+    }
+    //
+    GamePiece gp = counter.getPiece();
+    //
+    Rectangle r2 = z.getBoard().bounds();
+    Point dest = turnMap.snapTo(new Point(r2.x + (counter.getSide().equals(RsrMapShaderBase.SIDE_AXIS) ? 272 : 166), r2.y + 50 + (turnNumber - 1) * 91));
+    Region r = turnMap.findRegion(z.locationName(dest));
+    if (r == null) {
+      return c;
+    }
+    //
+    if (counter.getType().equals("Strength") == false) {
+      c = commandReleaseCounter(c, counter);
+    }
+    //
+    Stack parent = gp.getParent();
+    //
+    c = commandMove(c, turnMap, gp, dest, true);
+    c = commandSetProperty(c, gp, "MovementLeft", 0d, "IsMovementAllowed", false, "SupplyLevel", 0, "Isolated", 0, "IsSupplyAllowed", false, "CurrentStep", counter.getSteps());
+    return c;
+  }
+
+}

Modified: VSQL-src/branches/morvael/rsr/RsrCommandEncoder.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrCommandEncoder.java	2009-05-08 11:22:28 UTC (rev 5584)
+++ VSQL-src/branches/morvael/rsr/RsrCommandEncoder.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -8,7 +8,11 @@
 
 public class RsrCommandEncoder extends BasicCommandEncoder {
 
+  @Override
 	public Decorator createDecorator(String type, GamePiece inner) {
+		if (type.startsWith(RsrImmobilized.ID)) {
+			return new RsrImmobilized(type, inner);
+		} else
 		if (type.startsWith(RsrMover.ID)) {
 			return new RsrMover(type, inner);
 		} else

Added: VSQL-src/branches/morvael/rsr/RsrImmobilized.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrImmobilized.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrImmobilized.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -0,0 +1,134 @@
+package rsr;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.event.InputEvent;
+import javax.swing.Box;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.KeyStroke;
+import VASSAL.build.module.documentation.HelpFile;
+import VASSAL.command.Command;
+import VASSAL.counters.Decorator;
+import VASSAL.counters.EditablePiece;
+import VASSAL.counters.GamePiece;
+import VASSAL.counters.EventFilter;
+import VASSAL.counters.KeyCommand;
+import VASSAL.counters.PieceEditor;
+import VASSAL.counters.Properties;
+import VASSAL.tools.SequenceEncoder;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-05-08
+ */
+public class RsrImmobilized extends Decorator implements EditablePiece {
+
+  public static final String ID = "rsr_immob;";
+
+  public RsrImmobilized() {
+    this(RsrImmobilized.ID, null);
+  }
+
+  public RsrImmobilized(String type, GamePiece inner) {
+    setInner(inner);
+    mySetType(type);
+  }
+
+  public void mySetType(String type) {
+    SequenceEncoder.Decoder st = new SequenceEncoder.Decoder(type, ';');
+    st.nextToken();
+  }
+
+  public String getName() {
+    return piece.getName();
+  }
+
+  public KeyCommand[] myGetKeyCommands() {
+    return new KeyCommand[0];
+  }
+
+  public Command myKeyEvent(KeyStroke e) {
+    return null;
+  }
+
+  @Override
+  public Object getLocalizedProperty(Object key) {
+    if (Properties.NON_MOVABLE.equals(key)) {
+      return true;
+    } else {
+      return super.getLocalizedProperty(key);
+    }
+  }
+
+  @Override
+  public Object getProperty(Object key) {
+    if (Properties.NON_MOVABLE.equals(key)) {
+        return true;
+    } else {
+      return super.getProperty(key);
+    }
+  }
+
+  public void draw(Graphics g, int x, int y, Component obs, double zoom) {
+    piece.draw(g, x, y, obs, zoom);
+  }
+
+  public Rectangle boundingBox() {
+    return piece.boundingBox();
+  }
+
+  public Shape getShape() {
+    return piece.getShape();
+  }
+
+  public String myGetType() {
+    final StringBuilder buffer = new StringBuilder(ID);
+    return buffer.toString();
+  }
+
+  public String myGetState() {
+    return "";
+  }
+
+  public void mySetState(String s) {
+  }
+
+  public String getDescription() {
+    return "Rsr Immobilized";
+  }
+
+  public HelpFile getHelpFile() {
+    return HelpFile.getReferenceManualPage("RsrImmobilized.htm");
+  }
+
+  @Override
+  public PieceEditor getEditor() {
+    return new Ed(this);
+  }
+
+  private static class Ed implements PieceEditor {
+    private Box controls;
+
+    public Ed(RsrImmobilized p) {
+      controls = Box.createVerticalBox();
+    }
+
+    public String getState() {
+      return "";
+    }
+
+    public String getType() {
+      return ID;
+    }
+
+    public Component getControls() {
+      return controls;
+    }
+  }
+}
+

Modified: VSQL-src/branches/morvael/rsr/RsrKiller.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrKiller.java	2009-05-08 11:22:28 UTC (rev 5584)
+++ VSQL-src/branches/morvael/rsr/RsrKiller.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -88,7 +88,15 @@
 
   @Override
   public void setProperty(Object key, Object val) {
-    super.setProperty(key, val);
+    if ("StrengthID".equals(key)) {
+      try {
+        strengthID = val.toString();
+      } catch (Exception e) {
+        strengthID = "";
+      }
+    } else {
+      super.setProperty(key, val);
+    }
   }
 
   private void updateLabel(RsrCounter counter, RsrCounter scounter) {

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-08 11:22:28 UTC (rev 5584)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -446,7 +446,7 @@
     }
   }
 
-  protected void getHexesInRange(Set<HexRef> result, HexRef hex, int range) {
+  public void getHexesInRange(Set<HexRef> result, HexRef hex, int range) {
     result.add(hex);
     Set<HexRef> helper1 = new HashSet<HexRef>();
     helper1.add(hex);
@@ -471,7 +471,7 @@
 
   }
 
-  protected Set<HexRef> getHexesInRange(HexRef hex, int range) {
+  public Set<HexRef> getHexesInRange(HexRef hex, int range) {
     Set<HexRef> result = new HashSet<HexRef>();
     getHexesInRange(result, hex, range);
     return result;

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2009-05-08 11:22:28 UTC (rev 5584)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -142,7 +142,7 @@
                       if (ut.equals("Oil")) {
                         vpa += 10;
                       } else
-                      if (ut.equals("OilPipeline")) {
+                      if (ut.equals("Oil Pipeline")) {
                         vpa += 8;
                       } else {
                         vpa += 5;

Modified: VSQL-src/branches/morvael/rsr/RsrMover.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMover.java	2009-05-08 11:22:28 UTC (rev 5584)
+++ VSQL-src/branches/morvael/rsr/RsrMover.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -218,9 +218,6 @@
 
   public void draw(Graphics g, int x, int y, Component obs, double zoom) {
     piece.draw(g, x, y, obs, zoom);
-    //if ((movementLeftLabel.length() > 0) && (zoom == 1.0d)) {
-    //  Labeler.drawLabel(g, movementLeftLabel, x+38, y+25, Labeler.CENTER, Labeler.CENTER, Color.WHITE, Color.BLACK);
-    //}
   }
 
   private TerrainMapShader getShader() {

Added: VSQL-src/branches/morvael/rsr/RsrPieceMover.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrPieceMover.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-05-08 13:04:03 UTC (rev 5585)
@@ -0,0 +1,99 @@
+package rsr;
+
+import VASSAL.build.GameModule;
+import VASSAL.build.module.Map;
+import VASSAL.build.module.map.PieceMover;
+import VASSAL.counters.Deck;
+import VASSAL.counters.DeckVisitor;
+import VASSAL.counters.DeckVisitorDispatcher;
+import VASSAL.counters.GamePiece;
+import VASSAL.counters.PieceIterator;
+import VASSAL.counters.PieceVisitorDispatcher;
+import VASSAL.counters.Properties;
+import VASSAL.counters.Stack;
+import VASSAL.counters.DragBuffer;
+import VASSAL.counters.KeyBuffer;
+import java.util.Iterator;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-05-08
+ */
+public class RsrPieceMover extends PieceMover {
+
+  @Override
+  protected PieceVisitorDispatcher createSelectionProcessor() {
+    return new DeckVisitorDispatcher(new DeckVisitor() {
+      public Object visitDeck(Deck d) {
+        DragBuffer.getBuffer().clear();
+        for (PieceIterator it = d.drawCards(); it.hasMoreElements();) {
+          DragBuffer.getBuffer().add(it.nextPiece());
+        }
+        return null;
+      }
+
+      public Object visitStack(Stack s) {
+        DragBuffer.getBuffer().clear();
+        // RFE 1629255 - Only add selected pieces within the stack to the DragBuffer
+        // Add whole stack if all pieces are selected - better drag cursor
+        int selectedCount = 0;
+        int noMoveableCount = 0;
+        for (int i = 0; i < s.getPieceCount(); i++) {
+          if (Boolean.TRUE.equals(s.getPieceAt(i).getProperty(Properties.NON_MOVABLE))) {
+            noMoveableCount++;
+          } else
+          if (Boolean.TRUE.equals(s.getPieceAt(i).getProperty(Properties.SELECTED))) {
+            selectedCount++;
+          }
+        }
+
+        if ((noMoveableCount == 0) && (((Boolean) GameModule.getGameModule().getPrefs().getValue(Map.MOVING_STACKS_PICKUP_UNITS)).booleanValue() || s.getPieceCount() == 1 || s.getPieceCount() == selectedCount)) {
+          DragBuffer.getBuffer().add(s);
+        }
+        else {
+          for (int i = 0; i < s.getPieceCount(); i++) {
+            final GamePiece p = s.getPieceAt(i);
+            if ((Boolean.TRUE.equals(p.getProperty(Properties.SELECTED))) && (Boolean.TRUE.equals(s.getPieceAt(i).getProperty(Properties.NON_MOVABLE)) == false)) {
+              DragBuffer.getBuffer().add(p);
+            }
+          }
+        }
+        // End RFE 1629255
+        if (KeyBuffer.getBuffer().containsChild(s)) {
+          // If clicking on a stack with a selected piece, put all selected
+          // pieces in other stacks into the drag buffer
+          KeyBuffer.getBuffer().sort(RsrPieceMover.this);
+          for (Iterator<GamePiece> i =
+                KeyBuffer.getBuffer().getPiecesIterator(); i.hasNext();) {
+            final GamePiece piece = i.next();
+            if (piece.getParent() != s) {
+              DragBuffer.getBuffer().add(piece);
+            }
+          }
+        }
+        return null;
+      }
+
+      public Object visitDefault(GamePiece selected) {
+        DragBuffer.getBuffer().clear();
+        if (KeyBuffer.getBuffer().contains(selected)) {
+          // If clicking on a selected piece, put all selected pieces into the
+          // drag buffer
+          KeyBuffer.getBuffer().sort(RsrPieceMover.this);
+          for (Iterator<GamePiece> i =
+                KeyBuffer.getBuffer().getPiecesIterator(); i.hasNext();) {
+            DragBuffer.getBuffer().add(i.next());
+          }
+        }
+        else {
+          DragBuffer.getBuffer().clear();
+          DragBuffer.getBuffer().add(selected);
+        }
+        return null;
+      }
+
+    });
+  }
+
+}


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

Revision: 5603
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5603&view=rev
Author:   morvael
Date:     2009-05-10 20:52:15 +0000 (Sun, 10 May 2009)

Log Message:
-----------
Some work done on movement source and target validation plus shading. Not complete yet.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java
    VSQL-src/branches/morvael/rsr/RsrPieceMover.java

Added Paths:
-----------
    VSQL-src/branches/morvael/rsr/ClearCacheCommand.java
    VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java
    VSQL-src/branches/morvael/rsr/RsrMapShader.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderAllowed.java

Added: VSQL-src/branches/morvael/rsr/ClearCacheCommand.java
===================================================================
--- VSQL-src/branches/morvael/rsr/ClearCacheCommand.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/ClearCacheCommand.java	2009-05-10 20:52:15 UTC (rev 5603)
@@ -0,0 +1,32 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package rsr;
+
+import VASSAL.command.Command;
+
+/**
+ *
+ * @author Dominik
+ */
+public class ClearCacheCommand extends Command {
+
+  private RsrAdvance base;
+
+  public ClearCacheCommand(RsrAdvance base) {
+    this.base = base;
+  }
+
+  @Override
+  protected void executeCommand() {
+    base.clearAllowedMovementCache();
+  }
+
+  @Override
+  protected Command myUndoCommand() {
+    return this;
+  }
+
+}

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-10 17:00:26 UTC (rev 5602)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-10 20:52:15 UTC (rev 5603)
@@ -1,15 +1,19 @@
 package rsr;
 
-import VASSAL.counters.Decorator;
+import VASSAL.build.module.Map;
+import VASSAL.build.module.map.boardPicker.Board;
+import VASSAL.build.module.map.boardPicker.board.MapGrid;
 import java.awt.Point;
 import terrain.TerrainMapShaderRule;
 import VASSAL.counters.GamePiece;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import terrain.HexRef;
 import terrain.TerrainHexGrid;
 import terrain.TerrainMapShaderCost;
+import terrain.TerrainMapShader;
 
 /**
  *
@@ -31,20 +35,22 @@
   public static final String GLOBAL_FIRST_EXECUTE = "first_execute";
   public static final String GLOBAL_PHASE_PARTS = "phase_parts";
   public static final String GLOBAL_PHASE_PART = "phase_part";
-  public static final String GLOBAL_PHASE_NUMBER = "phase_number";
-  public static final String GLOBAL_TURN_NUMBER = "turn_number";
 
   private static RsrAdvance instance;
 
   public static RsrAdvance getInstance() {
     if (instance == null) {
       new RsrAdvance();
+      instance.initialize("");
     }
     return instance;
   }
 
   private boolean autoAdvance;
+  private HashMap<GamePiece, RsrAllowedMovement> allowedMovement = new HashMap<GamePiece, RsrAllowedMovement>();
+  private HashSet<GamePiece> disallowedMovement = new HashSet<GamePiece>();
 
+
   public RsrAdvance() {
     if (instance == null) {
       instance = this;
@@ -183,6 +189,8 @@
     //x+1 - leave
     commandLog("Part " + part + " of " + rules.getPhaseName());
 
+    appendCommand(new ClearCacheCommand(this));
+
     String phaseName = rules.getPhaseName();
     if (phaseName.equals(PHASE_SUPPLY)) {
       switch (part) {
@@ -244,6 +252,7 @@
         GamePiece fgp = getSinglePiece(offboardMap, "Type=AirFleet&&CurrentZone=Airfleet pool&&FleetNumber=" + getStringProperty(gp, "FleetNumber", "1"));
         if (fgp != null) {
           commandSendToPiece(new RsrCounter(gp), new RsrCounter(fgp), false);
+          //commandSetProperty(fgp, "highlight_blue", "1");
           count++;
         }
       }
@@ -454,4 +463,84 @@
     }
   }
 
+  public boolean isValidSource(Map m, ArrayList<GamePiece> pieces) {
+    int size = pieces.size();
+    Iterator<GamePiece> it = pieces.iterator();
+    while (it.hasNext()) {
+      if (isMovementAllowedFor(m, it.next()) == false) {
+        it.remove();
+      }
+    }
+    HashSet<HexRef> all = new HashSet<HexRef>();
+    RsrAllowedMovement am;
+    boolean first = true;
+    for (GamePiece gp : pieces) {
+      am = allowedMovement.get(gp);
+      if (first) {
+        all.addAll(am.getHexes());
+        first = false;
+      } else {
+        all.retainAll(am.getHexes());
+      }
+    }
+    if (all.size() > 0) {
+      shaderAny.setShadedHexes(all);
+    }
+    return size == pieces.size();
+  }
+
+  public boolean isValidTarget(Map m, Point p, ArrayList<GamePiece> pieces) {
+    Board b = m.findBoard(p);
+    if (b == null) {
+      return false;
+    }
+    MapGrid mg = b.getGrid();
+    if (mg instanceof TerrainHexGrid) {
+      HexRef hr = ((TerrainHexGrid)mg).getHexPos(p);
+      int size = pieces.size();
+      Iterator<GamePiece> it = pieces.iterator();
+      while (it.hasNext()) {
+        if (isTargetAllowedFor(m, hr, it.next()) == false) {
+          it.remove();
+        }
+      }
+      return size == pieces.size();
+    } else {
+      return false;
+    }
+  }
+
+  public void clearAllowedMovementCache() {
+    allowedMovement.clear();
+    disallowedMovement.clear();
+  }
+
+  private boolean isMovementAllowedFor(Map map, GamePiece gp) {
+    if (disallowedMovement.contains(gp)) {
+      return false;
+    } else if (allowedMovement.containsKey(gp)) {
+      return true;
+    } else {
+      String phaseName = rules.getPhaseName();
+      int phasePart = getGlobalIntProperty(GLOBAL_PHASE_PART, 1);
+      RsrCounter counter = new RsrCounter(gp);
+      if (phaseName.equals(PHASE_SUPPLY)) {
+        if ((map == mainMap) && (counter.getType().equals("AirFleet"))) {
+          GamePiece bgp = getSinglePiece(mainMap, "Type=Airbase&&FleetNumber=" + getIntProperty(gp, "FleetNumber", 1));
+          if (bgp != null) {
+            allowedMovement.put(gp, new RsrAllowedMovement(counter, rules.getHexesInRange(((TerrainHexGrid)mainBoard.getGrid()).getHexPos(bgp.getPosition()), getIntProperty(bgp, "Range", 3))));
+            return true;
+          }
+        }
+      }
+      disallowedMovement.add(gp);
+      return false;
+    }
+  }
+
+  private boolean isTargetAllowedFor(Map map, HexRef hr, GamePiece gp) {
+    RsrAllowedMovement am = allowedMovement.get(gp);
+    return (am != null) && (am.isAllowed(hr));
+  }
+
 }

Added: VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java	2009-05-10 20:52:15 UTC (rev 5603)
@@ -0,0 +1,57 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package rsr;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import terrain.HexRef;
+import terrain.TerrainMapShader;
+import terrain.TerrainMapShaderCost;
+
+/**
+ *
+ * @author Dominik
+ */
+public class RsrAllowedMovement {
+
+  private RsrCounter counter;
+  private TerrainMapShader shader;
+  private HashMap<HexRef, TerrainMapShaderCost> area;
+  private HashSet<HexRef> area2;
+
+  public RsrAllowedMovement(RsrCounter counter, TerrainMapShader shader) {
+    this.counter = counter;
+    this.shader = shader;
+    area = shader.getHexes(shader.getRules(), counter.getPiece());
+  }
+
+  public RsrAllowedMovement(RsrCounter counter, HashMap<HexRef, TerrainMapShaderCost> area) {
+    this.counter = counter;
+    this.shader = null;
+    this.area = area;
+  }
+
+  public RsrAllowedMovement(RsrCounter counter, HashSet<HexRef> area) {
+    this.counter = counter;
+    this.shader = null;
+    this.area = null;
+    this.area2 = area;
+  }
+
+  public TerrainMapShaderCost getCost(HexRef hr) {
+    return area != null ? area.get(hr) : null;
+  }
+
+  public boolean isAllowed(HexRef hr) {
+    return area != null ? area.get(hr) != null : area2.contains(hr);
+  }
+
+  public Set<HexRef> getHexes() {
+    return area != null ? area.keySet() : area2;
+  }
+
+}

Modified: VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java	2009-05-10 17:00:26 UTC (rev 5602)
+++ VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java	2009-05-10 20:52:15 UTC (rev 5603)
@@ -16,7 +16,6 @@
 import VASSAL.build.module.map.boardPicker.board.mapgrid.Zone;
 import VASSAL.build.module.properties.MutablePropertiesContainer;
 import VASSAL.build.module.properties.MutableProperty;
-import VASSAL.counters.Stack;
 import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.Random;
@@ -50,6 +49,7 @@
   protected TerrainMapShader shaderMovementShading;
   protected TerrainMapShader shaderStrategicShading;
   protected TerrainMapShader shaderVP;
+  protected RsrMapShader shaderAny;
   protected RsrMapShaderBase rules;
   protected GamePiece turnPiece;
   protected GamePiece phasePiece;
@@ -76,6 +76,15 @@
     return null;
   }
 
+  protected RsrMapShader getShaderRsr(String name) {
+    for (RsrMapShader shader : mainMap.getAllDescendantComponentsOf(RsrMapShader.class)) {
+      if (shader.getConfigureName().equals(name)) {
+        return shader;
+      }
+    }
+    return null;
+  }
+
   protected GamePiece getSinglePiece(Map map, String filter) {
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(map, filter)) {
       return gp;
@@ -83,7 +92,7 @@
     return null;
   }
 
-  private boolean initialize(String param) {
+  protected boolean initialize(String param) {
     if (initialized == false) {
       try {
         propertyContainers = new ArrayList<MutablePropertiesContainer>();
@@ -108,6 +117,7 @@
         shaderMovementShading = getShader("MovementShading");
         shaderStrategicShading = getShader("StrategicShading");
         shaderVP = getShader("VP");
+        shaderAny = getShaderRsr("AllowedShading");
         rules = (RsrMapShaderBase)shaderVP.getRules();
         turnPiece = getSinglePiece(turnMap, "BasicName=Game Turn");
         phasePiece = getSinglePiece(turnMap, "BasicName=Turn Phase");

Added: VSQL-src/branches/morvael/rsr/RsrMapShader.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShader.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrMapShader.java	2009-05-10 20:52:15 UTC (rev 5603)
@@ -0,0 +1,158 @@
+package rsr;
+
+import java.awt.Color;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+import java.util.HashSet;
+
+import javax.swing.KeyStroke;
+
+import VASSAL.build.module.Map;
+import VASSAL.build.module.map.MapShader;
+import VASSAL.build.module.map.boardPicker.Board;
+import VASSAL.build.module.map.boardPicker.board.ZonedGrid;
+import java.util.List;
+import terrain.HexRef;
+import terrain.TerrainHexGrid;
+
+/**
+ *
+ * @author morvael
+ */
+public class RsrMapShader extends MapShader {
+
+  private Area lastArea = null;
+  private Board gridBoard;
+  private TerrainHexGrid grid;
+  private HashSet<HexRef> shadedHexes;
+
+  public RsrMapShader() {
+    super();
+  }
+
+  @Override
+  public String[] getAttributeNames() {
+    return new String[]{NAME, ALWAYS_ON, STARTS_ON, BUTTON_TEXT, TOOLTIP,
+      ICON, HOT_KEY, BOARDS, BOARD_LIST, TYPE, DRAW_OVER, PATTERN,
+      COLOR, IMAGE, OPACITY, BORDER, BORDER_COLOR, BORDER_WIDTH,
+      BORDER_OPACITY
+    };
+  }
+
+  @Override
+  public Class<?>[] getAttributeTypes() {
+    return new Class<?>[]{String.class, Boolean.class, Boolean.class,
+      String.class, String.class, IconConfig.class, KeyStroke.class,
+      BoardPrompt.class, String[].class, TypePrompt.class,
+      Boolean.class, PatternPrompt.class, Color.class, Image.class,
+      Integer.class, Boolean.class, Color.class, Integer.class,
+      Integer.class
+    };
+  }
+
+  @Override
+  public String[] getAttributeDescriptions() {
+    return new String[]{"Name:  ", "Shading Always On?  ",
+      "Shading Starts turned on?  ", "Button text:  ",
+      "Tooltip Text:  ", "Button Icon:  ", "Hotkey:  ",
+      "All boards in map get Shaded?  ", "Board List:  ", "Type:  ",
+      "Draw Shade on top of Counters?  ", "Shade Pattern:  ",
+      "Color:  ", "Image:  ", "Opacity(%)", "Border?  ",
+      "Border Color:  ", "Border Width:  ", "Border opacity(%)"
+    };
+  }
+
+  public static String getConfigureTypeName() {
+    return "Rsr Map Shading";
+  }
+
+  @Override
+  protected void toggleShading() {
+    super.toggleShading();
+    lastArea = null;
+  }
+
+  @Override
+  protected Area getShadeShape(Map map) {
+    if (lastArea == null) {
+      if (type.equals(FG_TYPE)) {
+        lastArea = new Area();
+      } else {
+        lastArea = new Area(getBoardClip());
+      }
+      lastArea.add(getArea());
+    }
+    return lastArea;
+  }
+
+  private Board getBoard() {
+    if (gridBoard == null) {
+      findGrid();
+    }
+    return gridBoard;
+  }
+
+  private TerrainHexGrid getGrid() {
+    if (grid == null) {
+      findGrid();
+    }
+    return grid;
+  }
+
+  private void findGrid() {
+    gridBoard = null;
+    grid = null;
+    for (Board b : map.getBoards()) {
+      if (b.getGrid() instanceof TerrainHexGrid) {
+        gridBoard = b;
+        grid = (TerrainHexGrid) b.getGrid();
+        break;
+      } else if (b.getGrid() instanceof ZonedGrid) {
+        ZonedGrid zg = (ZonedGrid) b.getGrid();
+        List<TerrainHexGrid> l = zg.getComponentsOf(TerrainHexGrid.class);
+        if (l.size() > 0) {
+          gridBoard = b;
+          grid = l.get(0);
+          break;
+        }
+
+      }
+    }
+  }
+
+  public Area getArea() {
+    getGrid();
+    Area result = new Area();
+    for (HexRef hr : shadedHexes) {
+      final Point c = grid.getHexCenter(hr.getColumn(), hr.getRow());
+      result.add(grid.getSingleHex(c.x, c.y));
+    }
+    if (gridBoard != null) {
+      Rectangle r = gridBoard.bounds();
+      result = new Area(AffineTransform.getTranslateInstance(r.x, r.y).createTransformedShape(result));
+    }
+    return result;
+  }
+
+  public void setShadedHexes(HashSet<HexRef> shadedHexes) {
+    if (this.shadedHexes != shadedHexes) {
+      this.shadedHexes = shadedHexes;
+      lastArea = null;
+      shadingVisible = shadedHexes != null;
+      map.repaint();
+    }
+  }
+
+  public HashSet<HexRef> getShadedHexes() {
+    return shadedHexes;
+  }
+
+  @Override
+  public void setLaunchButtonVisibility() {
+    launch.setVisible(false);
+  }
+
+}

Added: VSQL-src/branches/morvael/rsr/RsrMapShaderAllowed.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderAllowed.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderAllowed.java	2009-05-10 20:52:15 UTC (rev 5603)
@@ -0,0 +1,187 @@
+package rsr;
+
+import java.util.HashMap;
+import java.util.Set;
+
+import terrain.HexRef;
+import terrain.TerrainHexGrid;
+import terrain.TerrainMap;
+import terrain.TerrainMapShader;
+import terrain.TerrainMapShaderCost;
+import VASSAL.build.module.Map;
+import VASSAL.counters.GamePiece;
+
+/**
+ *
+ * @author Dominik
+ */
+public final class RsrMapShaderAllowed extends RsrMapShaderBase {
+
+	private static final int[] EDGE_MINORRIVER_COST = new int[]{1, 2, 0};
+	private static final int[] EDGE_MAJORRIVER_COST = new int[]{2, 4, 0};
+	private static final int[] HEX_CLEAR_COST = new int[]{1, 1, 0};
+	private static final int[] HEX_WOODS_COST = new int[]{1, 2, 0};
+	private static final int[] HEX_SWAMP_COST = new int[]{2, 4, 0};
+	private static final int[] HEX_MOUNTAIN_COST = new int[]{2, 3, 0};
+	private static final int[] HEX_MINORCITY_COST = new int[]{1, 1, 0};
+	private static final int[] HEX_MAJORCITY_COST = new int[]{1, 1, 0};
+	private static final int[] HEX_SEVASTOPOL_COST = new int[]{2, 4, 0};
+
+	private String side;
+	private HexRef startHex;
+	private int movementMode;
+	private double movement;
+	private double maxMovement;
+	private String type;
+	private String unitType;
+	private boolean isMountain;
+	private Set<HexRef> occupiedByFriend;
+	private Set<HexRef> occupiedByEnemy;
+	private Set<HexRef> inEnemyZOC;
+
+	public RsrMapShaderAllowed() {
+		super();
+	}
+
+	@Override
+	public void reset(TerrainMapShader mapShader, Map map, TerrainHexGrid grid, TerrainMap terrainMap, String params, GamePiece piece) {
+		super.reset(mapShader, map, grid, terrainMap, params, piece);
+	}
+
+	@Override
+	public void start(HashMap<HexRef, HashMap<String, TerrainMapShaderCost>> selectedHexes) {
+		if (piece == null) {
+			return;
+		}
+		RsrCounter counter = new RsrCounter(piece);
+		side = counter.getSide();
+		movementMode = counter.getMovementTypeAsInt();
+		maxMovement = getMovementAllowance(counter);
+		movement = counter.getMovementLeft();
+		if (movement > maxMovement) {
+			movement = maxMovement;
+		}
+		type = counter.getType();
+		unitType = counter.getUnitType();
+		isMountain = unitType.indexOf("Mountain") >= 0;
+		//find hex control
+		filterFriendlyPieceGroups(side);
+		occupiedByFriend = getHexesOccupiedByFriendContesting();
+		if (side.equals(SIDE_AXIS)) {
+			filterHostilePieceGroups(SIDE_SOVIET);
+		} else {
+			filterHostilePieceGroups(SIDE_AXIS);
+		}
+		occupiedByEnemy = getHexesOccupiedByEnemy();
+		inEnemyZOC = getHexesInEnemyZOC();
+		//
+		startHex = grid.getHexPos(piece.getPosition());
+		mapShader.addHex(selectedHexes, startHex, create(null, true, movement, false, null));
+	}
+
+	@Override
+	public boolean getCrossCost(HexRef fromHex, HexRef toHex, TerrainMapShaderCost currentCost) {
+		if (occupiedByEnemy.contains(toHex)) {
+			return result(fromHex, false, 0.0, false, null);
+		}
+		if (isAny(type, "Airbase", "Headquarters", "Leader", "SiegeArtillery", "Depot")) {
+			if (inEnemyZOC.contains(toHex)) {
+				if (occupiedByFriend.contains(toHex) == false) {
+					return result(fromHex, false, 0.0, false, null);
+				}
+			}
+		}
+		String tt = getHexTerrainName(toHex);
+		String et = getEdgeTerrainName(fromHex, toHex);
+		String lt = getLineTerrainName(fromHex, toHex);
+		boolean isArctic = isArctic(toHex);
+		boolean fromZOC = inEnemyZOC.contains(fromHex);
+		boolean toZOC = inEnemyZOC.contains(toHex);
+		if (lt.equals(LINE_CHONGARCAUSEWAY)) {
+			return result(fromHex, false, 0.0, false, null);
+		}
+		if ((movementMode == 2) && (lt.equals(LINE_RAILROAD) == false)) {
+			return result(fromHex, false, 0.0, false, null);
+		}
+		if ((fromZOC) && (toZOC)) {
+			if ((isAny(unitType, "AxisGermanTankCorps", "AxisGermanTankBattlegroup", "AxisGermanTankDivision") == false) && ((isWinter() == false) || (unitType.equals("SovietGuardsCavalryCorps") == false))) {
+				return result(fromHex, false, 0.0, false, null);
+			}
+		}
+		double cost = 0.0d;
+		if (isImpassable(et)) {
+			return result(fromHex, false, 0.0, false, null);
+		} else
+		if (isLakeSea(et)) {
+			if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != 0)) {
+				return result(fromHex, false, 0.0, false, null);
+			} else {
+				cost += EDGE_MINORRIVER_COST[movementMode];
+			}
+		} else
+		if (isMinorRiver(et)) {
+			if ((getTurnNumber() > 1) || (side.equals(SIDE_SOVIET))) {
+				cost += EDGE_MINORRIVER_COST[movementMode];
+			}
+		} else
+		if (isMajorRiver(et)) {
+			cost += EDGE_MAJORRIVER_COST[movementMode];
+		}
+		if (tt.equals(HEX_WATER)) {
+			return result(fromHex, false, 0.0, false, null);
+		} else
+		if (tt.equals(HEX_WOODS)) {
+			cost += HEX_WOODS_COST[movementMode] * (isArctic ? 2 : 1);
+		} else
+		if (tt.equals(HEX_SWAMP)) {
+			if (isWinter()) {
+				cost += HEX_WOODS_COST[movementMode];
+			} else {
+				cost += HEX_SWAMP_COST[movementMode];
+			}
+		} else
+		if (tt.equals(HEX_MOUNTAIN)) {
+			cost += HEX_MOUNTAIN_COST[movementMode] - (isMountain ? 1 : 0);
+		} else
+		if (tt.equals(HEX_SEVASTOPOL)) {
+			if (isCityDestroyed(TAG_CITY_SEVASTOPOL) == false) {
+				cost += HEX_SEVASTOPOL_COST[movementMode];
+			} else {
+				cost += HEX_MINORCITY_COST[movementMode];
+			}
+		} else
+		if (tt.equals(HEX_MINORCITY)) {
+			cost += HEX_MINORCITY_COST[movementMode] * (isArctic ? 2 : 1);
+		} else
+		if (tt.equals(HEX_MAJORCITY)) {
+			cost += HEX_MAJORCITY_COST[movementMode] * (isArctic ? 2 : 1);
+		} else {
+			cost += HEX_CLEAR_COST[movementMode] * (isArctic ? 2 : 1);
+		}
+		if (movementMode == 2) {
+			cost = 1.0;
+		}
+		if (fromZOC) {
+			cost += 3.0;
+		}
+		if ((fromHex.equals(startHex)) && (cost > currentCost.getPointsLeft()) && (movement == maxMovement) && (inEnemyZOC.contains(startHex) == false) && (getPhaseName().equals("German Tank Movement") == false)) {
+			cost = currentCost.getPointsLeft();
+		}
+		return result(fromHex, true, currentCost.getPointsLeft()-cost, false, null);
+	}
+
+	@Override
+	public void stop() {
+	}
+
+	@Override
+	public HexRef getBestPathDestination() {
+		return null;
+	}
+
+	@Override
+	public TerrainMapShaderCost getBestCost(HashMap<String, TerrainMapShaderCost> costs) {
+		return costs.get(null);
+	}
+
+}

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-10 17:00:26 UTC (rev 5602)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-10 20:52:15 UTC (rev 5603)
@@ -471,8 +471,8 @@
 
   }
 
-  public Set<HexRef> getHexesInRange(HexRef hex, int range) {
-    Set<HexRef> result = new HashSet<HexRef>();
+  public HashSet<HexRef> getHexesInRange(HexRef hex, int range) {
+    HashSet<HexRef> result = new HashSet<HexRef>();
     getHexesInRange(result, hex, range);
     return result;
   }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2009-05-10 17:00:26 UTC (rev 5602)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2009-05-10 20:52:15 UTC (rev 5603)
@@ -12,7 +12,6 @@
 import VASSAL.build.GameModule;
 import VASSAL.build.module.Chatter;
 import VASSAL.build.module.Map;
-import VASSAL.build.module.map.boardPicker.board.mapgrid.Zone;
 import VASSAL.command.Command;
 import VASSAL.counters.GamePiece;
 import terrain.TerrainMapShaderRule;

Modified: VSQL-src/branches/morvael/rsr/RsrPieceMover.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-05-10 17:00:26 UTC (rev 5602)
+++ VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-05-10 20:52:15 UTC (rev 5603)
@@ -13,6 +13,9 @@
 import VASSAL.counters.Stack;
 import VASSAL.counters.DragBuffer;
 import VASSAL.counters.KeyBuffer;
+import java.awt.Point;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 import java.util.Iterator;
 
 /**
@@ -25,75 +28,103 @@
   @Override
   protected PieceVisitorDispatcher createSelectionProcessor() {
     return new DeckVisitorDispatcher(new DeckVisitor() {
+
       public Object visitDeck(Deck d) {
         DragBuffer.getBuffer().clear();
-        for (PieceIterator it = d.drawCards(); it.hasMoreElements();) {
-          DragBuffer.getBuffer().add(it.nextPiece());
+        ArrayList<GamePiece> pieces = new ArrayList<GamePiece>();
+        PieceIterator it = d.drawCards();
+        while (it.hasMoreElements()) {
+          pieces.add(it.nextPiece());
         }
+        RsrAdvance.getInstance().isValidSource(map, pieces);
+        for (GamePiece gp : pieces) {
+          DragBuffer.getBuffer().add(gp);
+        }
         return null;
       }
 
       public Object visitStack(Stack s) {
         DragBuffer.getBuffer().clear();
-        // RFE 1629255 - Only add selected pieces within the stack to the DragBuffer
-        // Add whole stack if all pieces are selected - better drag cursor
-        int selectedCount = 0;
-        int noMoveableCount = 0;
+        ArrayList<GamePiece> pieces = new ArrayList<GamePiece>();
         for (int i = 0; i < s.getPieceCount(); i++) {
-          if (Boolean.TRUE.equals(s.getPieceAt(i).getProperty(Properties.NON_MOVABLE))) {
-            noMoveableCount++;
-          } else
-          if (Boolean.TRUE.equals(s.getPieceAt(i).getProperty(Properties.SELECTED))) {
-            selectedCount++;
+          if ((Boolean.TRUE.equals(s.getPieceAt(i).getProperty(Properties.SELECTED))) && (Boolean.TRUE.equals(s.getPieceAt(i).getProperty(Properties.NON_MOVABLE)) == false)) {
+            pieces.add(s.getPieceAt(i));
           }
         }
-
-        if ((noMoveableCount == 0) && (((Boolean) GameModule.getGameModule().getPrefs().getValue(Map.MOVING_STACKS_PICKUP_UNITS)).booleanValue() || s.getPieceCount() == 1 || s.getPieceCount() == selectedCount)) {
+        int size = pieces.size();
+        RsrAdvance.getInstance().isValidSource(map, pieces);
+        if ((size == pieces.size()) && (((Boolean) GameModule.getGameModule().getPrefs().getValue(Map.MOVING_STACKS_PICKUP_UNITS)).booleanValue() || s.getPieceCount() == 1 || s.getPieceCount() == size)) {
           DragBuffer.getBuffer().add(s);
-        }
-        else {
-          for (int i = 0; i < s.getPieceCount(); i++) {
-            final GamePiece p = s.getPieceAt(i);
-            if ((Boolean.TRUE.equals(p.getProperty(Properties.SELECTED))) && (Boolean.TRUE.equals(s.getPieceAt(i).getProperty(Properties.NON_MOVABLE)) == false)) {
-              DragBuffer.getBuffer().add(p);
-            }
+        } else {
+          for (GamePiece gp : pieces) {
+            DragBuffer.getBuffer().add(gp);
           }
         }
-        // End RFE 1629255
         if (KeyBuffer.getBuffer().containsChild(s)) {
-          // If clicking on a stack with a selected piece, put all selected
-          // pieces in other stacks into the drag buffer
+          pieces.clear();
           KeyBuffer.getBuffer().sort(RsrPieceMover.this);
-          for (Iterator<GamePiece> i =
-                KeyBuffer.getBuffer().getPiecesIterator(); i.hasNext();) {
-            final GamePiece piece = i.next();
-            if (piece.getParent() != s) {
-              DragBuffer.getBuffer().add(piece);
+          Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
+          GamePiece gpi;
+          while (i.hasNext()) {
+            gpi = i.next();
+            if (gpi.getParent() != s) {
+              pieces.add(gpi);
             }
           }
+          RsrAdvance.getInstance().isValidSource(map, pieces);
+          for (GamePiece gp : pieces) {
+            DragBuffer.getBuffer().add(gp);
+          }
         }
         return null;
       }
 
       public Object visitDefault(GamePiece selected) {
         DragBuffer.getBuffer().clear();
+        ArrayList<GamePiece> pieces = new ArrayList<GamePiece>();
         if (KeyBuffer.getBuffer().contains(selected)) {
-          // If clicking on a selected piece, put all selected pieces into the
-          // drag buffer
-          KeyBuffer.getBuffer().sort(RsrPieceMover.this);
-          for (Iterator<GamePiece> i =
-                KeyBuffer.getBuffer().getPiecesIterator(); i.hasNext();) {
-            DragBuffer.getBuffer().add(i.next());
+          Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
+          while (i.hasNext()) {
+            pieces.add(i.next());
           }
+        } else {
+          pieces.add(selected);
         }
-        else {
-          DragBuffer.getBuffer().clear();
-          DragBuffer.getBuffer().add(selected);
+        RsrAdvance.getInstance().isValidSource(map, pieces);
+        for (GamePiece gp : pieces) {
+          DragBuffer.getBuffer().add(gp);
         }
         return null;
       }
-
     });
   }
 
+  @Override
+  public void mouseReleased(MouseEvent e) {
+    if (canHandleEvent(e)) {
+      if ((isClick(e.getPoint()) == false) && (isValidTarget(e.getPoint()) == true)) {
+        performDrop(e.getPoint());
+      }
+    }
+    dragBegin = null;
+    map.getView().setCursor(null);
+  }
+
+  protected boolean isValidTarget(Point p) {
+    ArrayList<GamePiece> pieces = new ArrayList<GamePiece>();
+    PieceIterator it = DragBuffer.getBuffer().getIterator();
+    GamePiece gp;
+    while (it.hasMoreElements()) {
+      gp = it.nextPiece();
+      if (gp instanceof Stack) {
+        Stack s = (Stack) gp;
+        for (int i = 0; i < s.getPieceCount(); i++) {
+          pieces.add(s.getPieceAt(i));
+        }
+      } else {
+        pieces.add(gp);
+      }
+    }
+    return RsrAdvance.getInstance().isValidTarget(map, map.snapTo(p), pieces);
+  }
 }


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

Revision: 5620
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5620&view=rev
Author:   morvael
Date:     2009-05-13 20:56:58 +0000 (Wed, 13 May 2009)

Log Message:
-----------
Cleanup and preparations for combat code.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/ClearHighlightInfo.java
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java
    VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java
    VSQL-src/branches/morvael/rsr/RsrCounter.java
    VSQL-src/branches/morvael/rsr/RsrGlobal.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java
    VSQL-src/branches/morvael/rsr/RsrPieceMover.java
    VSQL-src/branches/morvael/rsr/RsrTrait.java

Added Paths:
-----------
    VSQL-src/branches/morvael/rsr/CombatHexList.java

Modified: VSQL-src/branches/morvael/rsr/ClearHighlightInfo.java
===================================================================
--- VSQL-src/branches/morvael/rsr/ClearHighlightInfo.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/ClearHighlightInfo.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -17,6 +17,7 @@
   private HashSet<GamePiece> redPieces;
   private HashSet<GamePiece> greenPieces;
   private HashSet<GamePiece> bluePieces;
+  private HashSet<GamePiece> yellowPieces;
 
   public ClearHighlightInfo(Map mainMap) {
     this.mainMap = mainMap;
@@ -45,6 +46,7 @@
     redPieces = adjustPieces(mainMap, bounds, redPieces, RsrTrait.PROPERTY_HIGHLIGHT_RED);
     greenPieces = adjustPieces(mainMap, bounds, greenPieces, RsrTrait.PROPERTY_HIGHLIGHT_GREEN);
     bluePieces = adjustPieces(mainMap, bounds, bluePieces, RsrTrait.PROPERTY_HIGHLIGHT_BLUE);
+    yellowPieces = adjustPieces(mainMap, bounds, yellowPieces, RsrTrait.PROPERTY_HIGHLIGHT_YELLOW);
     bounds.repaint();
   }
 

Added: VSQL-src/branches/morvael/rsr/CombatHexList.java
===================================================================
--- VSQL-src/branches/morvael/rsr/CombatHexList.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/CombatHexList.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -0,0 +1,44 @@
+package rsr;
+
+import java.util.LinkedHashSet;
+
+/**
+ *
+ * @author Dominik
+ */
+public class CombatHexList {
+
+  protected LinkedHashSet<String> hexes = new LinkedHashSet<String>();
+
+  public CombatHexList(String list) {
+    for (String s : list.split(",")) {
+      hexes.add(s);
+    }
+  }
+
+  public int size() {
+    return hexes.size();
+  }
+
+  public boolean contains(String hex) {
+    return hexes.contains(hex);
+  }
+
+  public boolean add(String hex) {
+    return hexes.add(hex);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    for (String s : hexes) {
+      sb.append(s);
+      sb.append(",");
+    }
+    if (sb.length() > 0) {
+      sb.setLength(sb.length()-1);
+    }
+    return sb.toString();
+  }
+
+}

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -15,7 +15,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Set;
 import javax.swing.KeyStroke;
 import terrain.HexRef;
 import terrain.TerrainHexGrid;
@@ -98,9 +97,9 @@
     autoAdvance = true;
     while (autoAdvance) {
       autoAdvance = false;
-      int phaseParts = RsrCounter.getIntProperty(dataPiece, RsrGlobal.PROPERTY_PHASE_PARTS, 0);
+      int phaseParts = RsrGlobal.getPhaseParts(dataPiece);
       if (phaseParts > 0) {
-        int phasePart = RsrCounter.getIntProperty(dataPiece, RsrGlobal.PROPERTY_PHASE_PART, 0);
+        int phasePart = RsrGlobal.getPhasePart(dataPiece);
         if (phasePart > phaseParts) {
           executeLeavePhase();
           Point p = phasePiece.getPosition();
@@ -194,7 +193,7 @@
 
   private void executeLeavePhase() {
     //commandLog("Leave " + rules.getPhaseName());
-    executePartPhase(RsrCounter.getIntProperty(dataPiece, RsrGlobal.PROPERTY_PHASE_PARTS, 1));
+    executePartPhase(RsrGlobal.getPhaseParts(dataPiece));
   }
 
   private void executeEnterPhase() {
@@ -268,7 +267,7 @@
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=Airbase")) {
       hr = mainGrid.getHexPos(gp.getPosition());
       if ((inSupply.containsKey(hr) == false) || (inSupply.get(hr).getFlag().equals(RsrMapShaderDepotSupply.MODE_NORMAL) == false)) {
-        commandSendToReinforcementZone(new RsrCounter(gp), 4, "Axis Permanently Eliminated Units Box");
+        commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");
       } else {
         commandSetProperty(gp, RsrTrait.PROPERTY_SUPPLY_LEVEL, 0, RsrTrait.PROPERTY_SUPPLY_ISOLATED, 0);
       }
@@ -285,9 +284,9 @@
     if (rules.isMud() == false) {
       count = 0;
       for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=Airbase")) {
-        GamePiece fgp = getSinglePiece(offboardMap, "Type=AirFleet&&CurrentZone=Airfleet pool&&FleetNumber=" + RsrCounter.getIntProperty(gp, "FleetNumber", 1));
+        GamePiece fgp = getSinglePiece(offboardMap, "Type=AirFleet&&CurrentZone=Airfleet pool&&FleetNumber=" + RsrTrait.getFleetNumber(gp));
         if (fgp != null) {
-          commandSendToPiece(new RsrCounter(gp), new RsrCounter(fgp), false);
+          commandSendToPiece(gp, fgp, false);
           commandAllowMovement(fgp, 0.0d);
           count++;
         }
@@ -299,7 +298,7 @@
     }
     count = 0;
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=Depot")) {
-      commandSetProperty(gp, RsrTrait.PROPERTY_HIGHLIGHT_GREEN, "1");
+      commandSetProperty(gp, RsrTrait.PROPERTY_HIGHLIGHT_GREEN, 1);
       count++;
     }
     if (count > 0) {
@@ -326,22 +325,20 @@
     HashMap<HexRef, TerrainMapShaderCost> inSovietAttritionSupply = shaderSovietAttritionSupply.getHexes(shaderSovietAttritionSupply.getRules(), "Attrition", null);
     HashSet<HexRef> inAirRange = new HashSet<HexRef>();
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=AirFleet")) {
-      inAirRange.addAll(rules.getHexesInRange(mainGrid.getHexPos(gp.getPosition()), new RsrCounter(gp).getRange()));
+      inAirRange.addAll(rules.getHexesInRange(mainGrid.getHexPos(gp.getPosition()), RsrTrait.getRange(gp)));
     }
     HashSet<HexRef> inFactory = new HashSet<HexRef>();
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "AssetType=Factory")) {
       inFactory.add(mainGrid.getHexPos(gp.getPosition()));
     }
-    RsrCounter counter;
     HexRef hr;
     HashMap<HexRef, TerrainMapShaderCost> infoN, infoA;
     TerrainMapShaderCost costN, costA;
     String side, nationality, type;
     int supplyLevel, isolated;
-    ArrayList<RsrCounter> isolatedUnits = new ArrayList<RsrCounter>();
+    ArrayList<GamePiece> isolatedUnits = new ArrayList<GamePiece>();
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type!=Airbase&&Type!=AirFleet&&Type!=Asset&&Type!=Depot&&Type!=Marker")) {
-      counter = new RsrCounter(gp);
-      nationality = counter.getNationality();
+      nationality = RsrTrait.getNationality(gp);
       if ((nationality.equals(RsrMapShaderBase.NATIONALITY_GERMAN)) || (nationality.equals(RsrMapShaderBase.NATIONALITY_HUNGARIAN)) || (nationality.equals(RsrMapShaderBase.NATIONALITY_ITALIAN))) {
         infoN = inAxisDepotSupply;
         infoA = inAxisDepotAttritionSupply;
@@ -359,8 +356,8 @@
       }
       supplyLevel = -1;
       isolated = 0;
-      side = counter.getSide();
-      type = counter.getType();
+      side = RsrTrait.getSide(gp);
+      type = RsrTrait.getType(gp);
       hr = mainGrid.getHexPos(gp.getPosition());
       costN = infoN.get(hr);
       if (costN != null) {
@@ -386,7 +383,7 @@
           costA = infoA.get(hr);
           if ((costA == null) && (rules.getTurnNumber() > 1) && (TerrainMapShaderRule.isAny(type, "Headquarters") == false)) {
             isolated = 1;
-            isolatedUnits.add(counter);
+            isolatedUnits.add(gp);
           }
         }
       }
@@ -398,9 +395,9 @@
       int d6;
       String tt;
       int stepsLost = 0;
-      for (RsrCounter rc : isolatedUnits) {
+      for (GamePiece gp : isolatedUnits) {
         d6 = ran.nextInt(6) + 1;
-        hr = mainGrid.getHexPos(rc.getPiece().getPosition());
+        hr = mainGrid.getHexPos(gp.getPosition());
         tt = rules.getHexTerrainName(hr);
         if (tt.equals(RsrMapShaderBase.HEX_MINORCITY)) {
           d6++;
@@ -410,13 +407,13 @@
           d6 += 2;
         }
         if (rules.isWinter()) {
-          side = rc.getSide();
+          side = RsrTrait.getSide(gp);
           if (side.equals(RsrMapShaderBase.SIDE_SOVIET)) {
             if (d6 <= 3) {
               stepsLost = 1;
             }
           } else {
-            nationality = rc.getNationality();
+            nationality = RsrTrait.getNationality(gp);
             if (nationality.equals(RsrMapShaderBase.NATIONALITY_FINNISH)) {
               if (d6 <= 2) {
                 stepsLost = 1;
@@ -430,7 +427,7 @@
             }
           }
         } else if (rules.isMud()) {
-          side = rc.getSide();
+          side = RsrTrait.getSide(gp);
           if (side.equals(RsrMapShaderBase.SIDE_SOVIET)) {
             if (d6 <= 2) {
               stepsLost = 1;
@@ -446,7 +443,7 @@
           }
         }
         for (int i = 1; i <= stepsLost; i++) {
-          commandStepLoss(rc);
+          commandStepLoss(gp);
         }
       }
     }
@@ -455,17 +452,15 @@
     if (emergencyDepots.size() > 0) {
       commandLog("Game: Removing supply depots converted into emergency supply sources.");
       for (GamePiece gp : emergencyDepots) {
-        commandSendToReinforcementZone(new RsrCounter(gp), 4, "Axis Permanently Eliminated Units Box");
+        commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");
       }
     }
 
     ArrayList<GamePiece> receivedCombatStrengthMarkers = TerrainMapShaderRule.filterPieces(turnMap, "Type=Strength&&LocationName=S" + rules.getTurnName());
     if (receivedCombatStrengthMarkers.size() > 0) {
       commandLog("Game: Moving Soviet Combat Strength Markers received as reinforcements into the proper draw cups.");
-      RsrCounter rc;
       for (GamePiece gp : receivedCombatStrengthMarkers) {
-        rc = new RsrCounter(gp);
-        commandSendToOffboardZone(rc, rc.getStrengthClass() + "-strength pool");
+        commandSendToOffboardZone(gp, RsrTrait.getStrengthClass(gp) + "-strength pool");
       }
     }
   }
@@ -488,7 +483,7 @@
       rules.getHexesInRange(blockedByEnemy, hr, 4);
     }
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Side=Axis")) {
-      if ((rules.getStrategicMovementAllowance(new RsrCounter(gp)) > 0) && (blockedByEnemy.contains(mainGrid.getHexPos(gp.getPosition())) == false)) {
+      if ((rules.getStrategicMovementAllowance(gp) > 0) && (blockedByEnemy.contains(mainGrid.getHexPos(gp.getPosition())) == false)) {
         commandAllowMovement(gp, 0.0d);
         count++;
       }
@@ -509,7 +504,7 @@
     int count = 0;
     double mp = 0;
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Side=Axis&&Movement>0&&Type!=Airbase")) {
-      mp = rules.getMovementAllowance(new RsrCounter(gp));
+      mp = rules.getMovementAllowance(gp);
       if (mp > 0) {
         commandAllowMovement(gp, mp);
         count++;
@@ -534,7 +529,7 @@
     int count = 0;
     double mp = 0;
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=Airbase")) {
-      mp = rules.getMovementAllowance(new RsrCounter(gp));
+      mp = rules.getMovementAllowance(gp);
       if (mp > 0) {
         commandAllowMovement(gp, mp);
         count++;
@@ -574,7 +569,7 @@
     if (airfleets.size() > 0) {
       commandLog("Game: Removing air fleets from the map.");
       for (GamePiece gp : airfleets) {
-        commandSendToOffboardZone(new RsrCounter(gp), "Airfleet pool");
+        commandSendToOffboardZone(gp, "Airfleet pool");
       }
     }
     if ((rules.getTurnNumber() == 11) || (rules.getTurnNumber() == 31)) {
@@ -679,28 +674,27 @@
   }
 
   private boolean isMovementAllowedFor(Map map, GamePiece gp) {
-    RsrCounter counter = new RsrCounter(gp);
-    if (counter.getHighlightBlue().equals("0")) {
+    if (RsrTrait.getHighlightBlue(gp) == 0) {
       return false;
     } else if (allowedMovement.containsKey(gp)) {
       return true;
     } else {
       String phaseName = rules.getPhaseName();
-      int phasePart = RsrCounter.getIntProperty(dataPiece, RsrGlobal.PROPERTY_PHASE_PART, 1) - 1;
+      int phasePart = RsrGlobal.getPhasePart(dataPiece) - 1;
       if (phaseName.equals(PHASE_SUPPLY)) {
         if (phasePart == 1) {
-          GamePiece bgp = getSinglePiece(mainMap, "Type=Airbase&&FleetNumber=" + RsrCounter.getIntProperty(gp, "FleetNumber", 1));
-          if ((bgp != null) && (allowMovement(gp, counter, RsrCounter.getIntProperty(bgp, "Range", 3)))) {
+          GamePiece bgp = getSinglePiece(mainMap, "Type=Airbase&&FleetNumber=" + RsrTrait.getFleetNumber(gp));
+          if ((bgp != null) && (allowMovement(gp, RsrTrait.getRange(bgp)))) {
             return true;
           }
         }
       } else if (phaseName.equals(PHASE_AXIS_MOVEMENT)) {
         if (phasePart == 2) {
-          if (allowMovement(gp, counter, shaderStrategicShading, false)) {
+          if (allowMovement(gp, shaderStrategicShading, false)) {
             return true;
           }
         } else if ((phasePart == 3) || (phasePart == 4)) {
-          if (allowMovement(gp, counter, shaderMovementShading, true)) {
+          if (allowMovement(gp, shaderMovementShading, true)) {
             return true;
           }
         }
@@ -717,7 +711,7 @@
    * @param range
    * @return
    */
-  private boolean allowMovement(GamePiece gp, RsrCounter counter, int range) {
+  private boolean allowMovement(GamePiece gp, int range) {
     moveMode = MOVE_FREE;
     HexRef startHex = getStartHex(gp);
     if ((startHex == null) || (range < 1)) {
@@ -725,7 +719,7 @@
     }
     HashSet<HexRef> area = rules.getHexesInRange(getStartHex(gp), range);
     if (area.size() > 0) {
-      allowedMovement.put(gp, new RsrAllowedMovement(counter, area));
+      allowedMovement.put(gp, new RsrAllowedMovement(gp, area));
       return true;
     } else {
       return false;
@@ -740,17 +734,17 @@
    * @param substractCost
    * @return
    */
-  private boolean allowMovement(GamePiece gp, RsrCounter counter, TerrainMapShader shader, boolean substractCost) {
+  private boolean allowMovement(GamePiece gp, TerrainMapShader shader, boolean substractCost) {
     moveMode = MOVE_UNTIL_NEXT;
     HexRef startHex = getStartHex(gp);
     if (startHex == null) {
       return false;
     }
     shader.setStartHexOverride(getStartHex(gp));
-    shader.setStartRangeOverride(counter.getStartMovementLeft());
+    shader.setStartRangeOverride(RsrTrait.getStartMovementLeft(gp));
     HashMap<HexRef, TerrainMapShaderCost> area = shader.getHexes(shader.getRules(), gp);
     if (area.size() > 0) {
-      allowedMovement.put(gp, new RsrAllowedMovement(counter, area, substractCost));
+      allowedMovement.put(gp, new RsrAllowedMovement(gp, area, substractCost));
       return true;
     } else {
       return false;
@@ -772,48 +766,37 @@
           String firstMovementType = "";
           for (GamePiece gp : pieces) {
             if (first) {
-              firstHex = String.valueOf(gp.getProperty(RsrTrait.PROPERTY_START_HEX));
-              firstMovementType = String.valueOf(gp.getProperty(RsrTrait.PROPERTY_MOVEMENT_TYPE));
+              firstHex = RsrTrait.getStartHex(gp);
+              firstMovementType = RsrTrait.getMovementType(gp);
               first = false;
             } else {
-              if (firstHex.equals(String.valueOf(gp.getProperty(RsrTrait.PROPERTY_START_HEX))) == false) {
+              if (firstHex.equals(RsrTrait.getStartHex(gp)) == false) {
                 return false;
               }
-              if (firstMovementType.equals(String.valueOf(gp.getProperty(RsrTrait.PROPERTY_MOVEMENT_TYPE))) == false) {
+              if (firstMovementType.equals(RsrTrait.getMovementType(gp)) == false) {
                 return false;
               }
             }
           }
           commandLogMy("Overrun in space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + ".");
-          if (performCombat(true, pieces, hr) == false) {
-            //TODO: reset movement of all attacking units to 0
-            HexRef from = cost.getFrom();
-            overrideDropPoint = mainGrid.getHexCenter(from.getColumn(), from.getRow());
-          }
-          return true;
+          commandAddToCombat(pieces, hr, true);
+          return false;
         }
       }
     }
     return true;
   }
 
-  /*
-   * Returns true if attacker was victorious
-   */
-  private boolean performCombat(boolean overrun, ArrayList<GamePiece> attackers, HexRef... targets) {
-    return false;
-  }
-
-  public KeyCommand[] getCommands(RsrTrait trait, GamePiece gp, RsrCounter counter) {
+  public KeyCommand[] getCommands(RsrTrait trait, GamePiece gp) {
     commands.clear();
     if (rules != null) {
       if (isDebug()) {
         commands.add(new KeyCommand("Delete", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), gp, trait));
       }
       String phaseName = rules.getPhaseName();
-      int phasePart = RsrCounter.getIntProperty(dataPiece, RsrGlobal.PROPERTY_PHASE_PART, 1) - 1;
+      int phasePart = RsrGlobal.getPhasePart(dataPiece) - 1;
       if (phaseName.equals(PHASE_SUPPLY)) {
-        if ((phasePart == 1) && (gp.getMap() == mainMap) && (counter.getType().equals("Depot"))) {
+        if ((phasePart == 1) && (gp.getMap() == mainMap) && (RsrTrait.getType(gp).equals("Depot"))) {
           commands.add(new KeyCommand("Remove Depot", KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_DOWN_MASK), gp, trait));
           commands.add(new KeyCommand("Convert Depot", KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK), gp, trait));
         }
@@ -824,15 +807,15 @@
     }
   }
 
-  public Command getCommand(RsrTrait trait, GamePiece gp, RsrCounter counter, KeyCommand kc) {
+  public Command getCommand(RsrTrait trait, GamePiece gp, KeyCommand kc) {
     String name = kc.getName();
     if (name.equals("Delete")) {
       commandDelete(gp);
     } else if (name.equals("Remove Depot")) {
       commandLogMy("Voluntarily removed supply depot in " + mainGrid.locationName(gp.getPosition()) + ".");
-      commandSendToReinforcementZone(counter, 4, "Axis Permanently Eliminated Units Box");
+      commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");
     } else if (name.equals("Convert Depot")) {
-      if (counter.getSupplyMode() == 1) {
+      if (RsrTrait.getSupplyMode(gp) == 1) {
         commandSetProperty(gp, RsrTrait.PROPERTY_SUPPLY_MODE, 2);
         commandLogMy("Converted supply depot in " + mainGrid.locationName(gp.getPosition()) + " into emergency supply source.");
       } else {
@@ -852,11 +835,11 @@
   }
 
   public int getScenarioNumber() {
-    return RsrCounter.getIntProperty(dataPiece, RsrGlobal.PROPERTY_SCENARIO, 6);
+    return RsrGlobal.getScenario(dataPiece);
   }
 
   public boolean isDebug() {
-    return RsrCounter.getIntProperty(dataPiece, RsrGlobal.PROPERTY_DEBUG, 0) == 1;
+    return RsrGlobal.getDebug(dataPiece) == 1;
   }
 
 }

Modified: VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -1,15 +1,9 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package rsr;
 
+import VASSAL.counters.GamePiece;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Set;
 import terrain.HexRef;
-import terrain.TerrainMapShader;
 import terrain.TerrainMapShaderCost;
 
 /**
@@ -18,20 +12,20 @@
  */
 public class RsrAllowedMovement {
 
-  private RsrCounter counter;
+  private GamePiece gp;
   private HashMap<HexRef, TerrainMapShaderCost> area;
   private Set<HexRef> area2;
   private boolean substractCost;
 
-  public RsrAllowedMovement(RsrCounter counter, HashMap<HexRef, TerrainMapShaderCost> area, boolean substractCost) {
-    this.counter = counter;
+  public RsrAllowedMovement(GamePiece gp, HashMap<HexRef, TerrainMapShaderCost> area, boolean substractCost) {
+    this.gp = gp;
     this.area = area;
     this.area2 = area.keySet();
     this.substractCost = substractCost;
   }
 
-  public RsrAllowedMovement(RsrCounter counter, Set<HexRef> area) {
-    this.counter = counter;
+  public RsrAllowedMovement(GamePiece gp, Set<HexRef> area) {
+    this.gp = gp;
     this.area = null;
     this.area2 = area;
     this.substractCost = false;
@@ -53,7 +47,7 @@
     if (substractCost) {
       TerrainMapShaderCost cost = getCost(hr);
       if (cost != null) {
-        RsrAdvance.getInstance().commandSetProperty(counter.getPiece(), RsrTrait.PROPERTY_MOVEMENT_LEFT, Math.max(0.0d, cost.getPointsLeft()));
+        RsrAdvance.getInstance().commandSetProperty(gp, RsrTrait.PROPERTY_MOVEMENT_LEFT, Math.max(0.0d, cost.getPointsLeft()));
       }
     }
   }

Modified: VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -219,10 +219,10 @@
     appendCommand(cmd);
   }
 
-  public RsrCounter findRandomStrength(String strengthClass) {
-    ArrayList<RsrCounter> result = new ArrayList<RsrCounter>();
+  public GamePiece findRandomStrength(String strengthClass) {
+    ArrayList<GamePiece> result = new ArrayList<GamePiece>();
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(offboardMap, "CurrentZone=" + strengthClass + "-strength pool&&Type=Strength&&StrengthClass=" + strengthClass)) {
-      result.add(new RsrCounter(gp));
+      result.add(gp);
     }
     int size = result.size();
     if (size == 0) {
@@ -234,13 +234,13 @@
     }
   }
 
-  public RsrCounter findStrength(String strengthClass, String id) {
+  public GamePiece findStrength(String strengthClass, String id) {
     if ((id == null) || (id.length() == 0)) {
       return null;
     }
-    ArrayList<RsrCounter> result = new ArrayList<RsrCounter>();
+    ArrayList<GamePiece> result = new ArrayList<GamePiece>();
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(offboardMap, "CurrentZone=" + strengthClass + "-used strength pool&&Type=Strength&&StrengthClass=" + strengthClass + "&&BasicName=" + id)) {
-      result.add(new RsrCounter(gp));
+      result.add(gp);
     }
     int size = result.size();
     if (size == 0) {
@@ -252,11 +252,11 @@
     }
   }
 
-  public ArrayList<RsrCounter> findInOffboardZone(String offboardZone, String type, String unitType, int count) {
-    ArrayList<RsrCounter> result = new ArrayList<RsrCounter>();
-    for (GamePiece gpf : TerrainMapShaderRule.filterPieces(offboardMap, "CurrentZone=" + offboardZone + "&&Type=" + type + (unitType != null ? "&&UnitType=" + unitType : ""))) {
+  public ArrayList<GamePiece> findInOffboardZone(String offboardZone, String type, String unitType, int count) {
+    ArrayList<GamePiece> result = new ArrayList<GamePiece>();
+    for (GamePiece gp : TerrainMapShaderRule.filterPieces(offboardMap, "CurrentZone=" + offboardZone + "&&Type=" + type + (unitType != null ? "&&UnitType=" + unitType : ""))) {
       if (result.size() < count) {
-        result.add(new RsrCounter(gpf));
+        result.add(gp);
       } else {
         break;
       }
@@ -264,48 +264,45 @@
     return result;
   }
 
-  private void commandUpdateStrength(RsrCounter counter, RsrCounter scounter) {
-    if (scounter == null) {
-      commandSetProperty(counter.getPiece(), RsrTrait.PROPERTY_STRENGTH_ID, "");
+  private void commandUpdateStrength(GamePiece gp, GamePiece sgp) {
+    if (sgp == null) {
+      commandSetProperty(gp, RsrTrait.PROPERTY_STRENGTH_ID, "");
     } else {
-      commandSetProperty(counter.getPiece(), RsrTrait.PROPERTY_STRENGTH_ID, scounter.getPiece().getProperty("BasicName"));
+      commandSetProperty(gp, RsrTrait.PROPERTY_STRENGTH_ID, sgp.getProperty("BasicName"));
     }
   }
 
-  public void commandFetchCounter(RsrCounter counter) {
-    RsrCounter scounter = findRandomStrength(counter.getCombatClass());
-    if (scounter != null) {
-      commandUpdateStrength(counter, scounter);
-      commandLog("Game: " + counter.getPiece() + " fetched a Combat Strength Marker.");
-      commandSendToOffboardZone(scounter, counter.getCombatClass() + "-used strength pool");
+  public void commandFetchCounter(GamePiece gp) {
+    GamePiece sgp = findRandomStrength(RsrTrait.getCombatClass(gp));
+    if (sgp != null) {
+      commandUpdateStrength(gp, sgp);
+      commandLog("Game: " + gp + " fetched a Combat Strength Marker.");
+      commandSendToOffboardZone(sgp, RsrTrait.getCombatClass(gp) + "-used strength pool");
     }
   }
 
-  public void commandReleaseCounter(RsrCounter counter) {
-    RsrCounter scounter = findStrength(counter.getCombatClass(), counter.getStrengthID());
-    if (scounter != null) {
-      GamePiece gp = counter.getPiece();
+  public void commandReleaseCounter(GamePiece gp) {
+    GamePiece sgp = findStrength(RsrTrait.getCombatClass(gp), RsrTrait.getStrengthID(gp));
+    if (sgp != null) {
       commandSetProperty(gp, RsrTrait.PROPERTY_CURRENT_STEP, 2, RsrTrait.PROPERTY_STRENGTH_ID, "");
-      if (scounter.getStrengthType().equals("Normal")) {
-        commandSendToOffboardZone(scounter, counter.getCombatClass() + "-strength pool");
+      if (RsrTrait.getStrengthType(sgp).equals("Normal")) {
+        commandSendToOffboardZone(sgp, RsrTrait.getCombatClass(gp) + "-strength pool");
       } else {
-        commandSendToOffboardZone(scounter, "At-Start Strength Marker Box");
+        commandSendToOffboardZone(sgp, "At-Start Strength Marker Box");
       }
       commandLog("Game: " + gp.getName() + " released a Combat Strength Marker.");
     }
   }
 
-  public void commandSendToOffboardZone(RsrCounter counter, String offboardZone) {
+  public void commandSendToOffboardZone(GamePiece gp, String offboardZone) {
     //
     Zone z = offboardMap.findZone(offboardZone);
     if (z == null) {
       return;
     }
     //
-    GamePiece gp = counter.getPiece();
-    //
-    if (counter.getType().equals("Strength") == false) {
-      commandReleaseCounter(counter);
+    if (RsrTrait.getType(gp).equals("Strength") == false) {
+      commandReleaseCounter(gp);
     }
     //
     Rectangle r1 = z.getBounds();
@@ -313,208 +310,171 @@
     Point dest = offboardMap.snapTo(new Point(r2.x + r1.x + r1.width / 2, r2.y + r1.y + r1.height / 2));
     //
     commandMove(offboardMap, gp, dest);
-    commandSetProperty(gp, RsrTrait.PROPERTY_MOVEMENT_LEFT, 0.0d, RsrTrait.PROPERTY_SUPPLY_LEVEL, 0, RsrTrait.PROPERTY_SUPPLY_ISOLATED, 0, RsrTrait.PROPERTY_CURRENT_STEP, counter.getSteps(), RsrTrait.PROPERTY_SUPPLY_MODE, 1, RsrTrait.PROPERTY_HIGHLIGHT_RED, "0", RsrTrait.PROPERTY_HIGHLIGHT_GREEN, "0", RsrTrait.PROPERTY_HIGHLIGHT_BLUE, "0", RsrTrait.PROPERTY_START_HEX, "", RsrTrait.PROPERTY_START_MOVEMENT_LEFT, 0.0d, RsrTrait.PROPERTY_MOVE_INDEX, 0);
+    RsrTrait.commandClearAttributes(gp);
     commandLog("Game: " + gp.getName() + " was sent to " + offboardZone + ".");
   }
 
-  public void commandSendToReinforcementZone(RsrCounter counter, int turnNumberMod, String offboardZone) {
+  public void commandSendToReinforcementZone(GamePiece gp, int turnNumberMod, String offboardZone) {
     //
     int turnNumber = rules.getTurnNumber() + turnNumberMod;
     if ((turnNumber < 1) || (turnNumber > 40)) {
       if (offboardZone != null) {
-        commandSendToOffboardZone(counter, offboardZone);
+        commandSendToOffboardZone(gp, offboardZone);
       }
       return;
     }
     //
-    Zone z = turnMap.findZone(counter.getSide() + " Track");
+    Zone z = turnMap.findZone(RsrTrait.getSide(gp) + " Track");
     if (z == null) {
       return;
     }
     //
-    GamePiece gp = counter.getPiece();
-    //
     Rectangle r2 = z.getBoard().bounds();
-    Point dest = turnMap.snapTo(new Point(r2.x + (counter.getSide().equals(RsrMapShaderBase.SIDE_AXIS) ? 272 : 166), r2.y + 50 + (turnNumber - 1) * 91));
+    Point dest = turnMap.snapTo(new Point(r2.x + (RsrTrait.getSide(gp).equals(RsrMapShaderBase.SIDE_AXIS) ? 272 : 166), r2.y + 50 + (turnNumber - 1) * 91));
     String regionName = z.locationName(dest);
     Region r = turnMap.findRegion(regionName);
     if (r == null) {
       return;
     }
     //
-    if (counter.getType().equals("Strength") == false) {
-      commandReleaseCounter(counter);
+    if (RsrTrait.getType(gp).equals("Strength") == false) {
+      commandReleaseCounter(gp);
     }
     //
     commandMove(turnMap, gp, dest);
-    commandSetProperty(gp, RsrTrait.PROPERTY_MOVEMENT_LEFT, 0.0d, RsrTrait.PROPERTY_SUPPLY_LEVEL, 0, RsrTrait.PROPERTY_SUPPLY_ISOLATED, 0, RsrTrait.PROPERTY_CURRENT_STEP, counter.getSteps(), RsrTrait.PROPERTY_SUPPLY_MODE, 1, RsrTrait.PROPERTY_HIGHLIGHT_RED, "0", RsrTrait.PROPERTY_HIGHLIGHT_GREEN, "0", RsrTrait.PROPERTY_HIGHLIGHT_BLUE, "0", RsrTrait.PROPERTY_START_HEX, "", RsrTrait.PROPERTY_START_MOVEMENT_LEFT, 0.0d, RsrTrait.PROPERTY_MOVE_INDEX, 0);
+    RsrTrait.commandClearAttributes(gp);
     commandLog("Game: " + gp.getName() + " will return as reinforcement on turn " + regionName.substring(1) + ".");
   }
 
-  public void commandSendToPiece(RsrCounter counter, RsrCounter rcounter, boolean copyProperties) {
-    GamePiece gp = counter.getPiece();
-    GamePiece rgp = rcounter.getPiece();
+  public void commandSendToPiece(GamePiece gp, GamePiece rgp, boolean copyProperties) {
     commandMove(gp.getMap(), rgp, gp.getPosition());
     if (copyProperties) {
-      double dif = rcounter.getMovement() - counter.getMovement();
-      double mov = Math.max(0, counter.getMovementLeft() + dif);
-      double smov = Math.max(0, counter.getStartMovementLeft() + dif);
-      commandSetProperty(rgp, RsrTrait.PROPERTY_MOVEMENT_LEFT, mov,
-              RsrTrait.PROPERTY_SUPPLY_LEVEL, counter.getSupplyLevel(),
-              RsrTrait.PROPERTY_SUPPLY_ISOLATED, counter.getIsolated(),
-              RsrTrait.PROPERTY_HIGHLIGHT_RED, counter.getHighlightRed(),
-              RsrTrait.PROPERTY_HIGHLIGHT_GREEN, counter.getHighlightGreen(),
-              RsrTrait.PROPERTY_HIGHLIGHT_BLUE, (mov > 0 ? counter.getHighlightBlue() : "0"),
-              RsrTrait.PROPERTY_START_HEX, counter.getStartHex(),
-              RsrTrait.PROPERTY_START_MOVEMENT_LEFT, smov,
-              RsrTrait.PROPERTY_MOVE_INDEX, counter.getMoveIndex());
+      RsrTrait.commandCopyAttributes(gp, rgp);
     }
     commandLog("Game: " + rgp.getName() + " was sent to " + gp.getName() + "'s location.");
   }
 
-  /*
-  public int getGlobalIntProperty(String name, int def) {
-  MutableProperty p = MutableProperty.Util.findMutableProperty(name, propertyContainers);
-  if (p != null) {
-  try {
-  return Integer.parseInt(p.getPropertyValue());
-  } catch (Exception e) {
-  return def;
-  }
-  } else {
-  return def;
-  }
-  }
-
-  public void commandSetGlobalProperty(String name, Object value) {
-  MutableProperty p = MutableProperty.Util.findMutableProperty(name, propertyContainers);
-  if (p != null) {
-  appendCommand(p.setPropertyValue(String.valueOf(value)));
-  }
-  }
-   */
-  public void commandEliminate(RsrCounter counter) {
-    String type = counter.getType();
+  public void commandEliminate(GamePiece gp) {
+    String type = RsrTrait.getType(gp);
     if (type.equals("Unit")) {
-      String unitType = counter.getUnitType();
-      int supply = counter.getSupplyLevel();
+      String unitType = RsrTrait.getUnitType(gp);
+      int supply = RsrTrait.getSupplyLevel(gp);
       if (unitType.equals("SovietTankArmy")) {
         int roll = ran.nextInt(6) + 1;
         if (roll <= (supply == 0 ? 1 : 2)) {
-          commandSendToOffboardZone(counter, "Soviet Permanently Eliminated Units Box");
-          for (RsrCounter rcounter : findInOffboardZone("Force Pool Box", "Unit", "SovietMechanizedCorps", 1)) {
-            commandSendToReinforcementZone(rcounter, 2, null);
+          commandSendToOffboardZone(gp, "Soviet Permanently Eliminated Units Box");
+          for (GamePiece fgp : findInOffboardZone("Force Pool Box", "Unit", "SovietMechanizedCorps", 1)) {
+            commandSendToReinforcementZone(fgp, 2, null);
           }
         } else {
-          commandSendToReinforcementZone(counter, 2 * roll, "Soviet Permanently Eliminated Units Box");
+          commandSendToReinforcementZone(gp, 2 * roll, "Soviet Permanently Eliminated Units Box");
         }
       } else if ((unitType.equals("SovietGuardsArmy")) || (unitType.equals("SovietShockArmy"))) {
         int roll = ran.nextInt(6) + 1;
         if (roll <= (supply == 0 ? 1 : 2)) {
-          ArrayList<RsrCounter> promoted = findInOffboardZone("Promoted Army Box", "Unit", "SovietInfantryArmy", 1);
+          ArrayList<GamePiece> promoted = findInOffboardZone("Promoted Army Box", "Unit", "SovietInfantryArmy", 1);
           if (promoted.size() == 0) {
-            commandSendToOffboardZone(counter, "Soviet Permanently Eliminated Units Box");
+            commandSendToOffboardZone(gp, "Soviet Permanently Eliminated Units Box");
           } else {
-            commandSendToOffboardZone(counter, "Awaiting Promotion Box");
+            commandSendToOffboardZone(gp, "Awaiting Promotion Box");
             commandSendToOffboardZone(promoted.get(0), "Soviet Permanently Eliminated Units Box");
           }
         } else {
-          commandSendToOffboardZone(counter, "Awaiting Promotion Box");
-          for (RsrCounter rcounter : findInOffboardZone("Promoted Army Box", "Unit", "SovietInfantryArmy", 1)) {
+          commandSendToOffboardZone(gp, "Awaiting Promotion Box");
+          for (GamePiece fgp : findInOffboardZone("Promoted Army Box", "Unit", "SovietInfantryArmy", 1)) {
             roll = ran.nextInt(6) + 1;
-            commandSendToReinforcementZone(rcounter, 2 * roll, null);
+            commandSendToReinforcementZone(fgp, 2 * roll, null);
           }
         }
       } else if (unitType.equals("SovietInfantryArmy")) {
         int roll = ran.nextInt(6) + 1;
         if (roll <= (supply == 0 ? 1 : 2)) {
-          commandSendToOffboardZone(counter, "Soviet Permanently Eliminated Units Box");
-          for (RsrCounter rcounter : findInOffboardZone("Force Pool Box", "Unit", "SovietInfantryCorps", 1)) {
-            commandSendToReinforcementZone(rcounter, 2, null);
+          commandSendToOffboardZone(gp, "Soviet Permanently Eliminated Units Box");
+          for (GamePiece fgp : findInOffboardZone("Force Pool Box", "Unit", "SovietInfantryCorps", 1)) {
+            commandSendToReinforcementZone(fgp, 2, null);
           }
         } else {
-          commandSendToReinforcementZone(counter, 2 * roll, "Soviet Permanently Eliminated Units Box");
+          commandSendToReinforcementZone(gp, 2 * roll, "Soviet Permanently Eliminated Units Box");
         }
       } else if ((unitType.equals("SovietInfantryCorps")) || (unitType.equals("SovietMarineCorps")) || (unitType.equals("SovietMechanizedCorps"))) {
-        commandSendToOffboardZone(counter, "Force Pool Box");
+        commandSendToOffboardZone(gp, "Force Pool Box");
       } else if ((unitType.equals("SovietAirborneCorps")) || (unitType.equals("SovietGuardsCavalryCorps"))) {
-        commandSendToOffboardZone(counter, "Soviet Permanently Eliminated Units Box");
+        commandSendToOffboardZone(gp, "Soviet Permanently Eliminated Units Box");
       } else if ((unitType.equals("AxisGermanTankCorps")) || (unitType.equals("AxisGermanInfantryCorps")) || (unitType.equals("AxisGermanMountainCorps")) || (unitType.equals("AxisGermanTankBattlegroup")) || (unitType.equals("AxisGermanInfantryBattlegroup")) || (unitType.equals("AxisGermanMountainBattlegroup"))) {
-        commandSendToOffboardZone(counter, "German Breakdown & Buildup Box");
+        commandSendToOffboardZone(gp, "German Breakdown & Buildup Box");
       } else if ((unitType.equals("AxisGermanTankDivision")) || (unitType.equals("AxisItalianArmy")) || (unitType.equals("AxisHungarianArmy")) || (unitType.equals("AxisFinnishInfantryCorps")) || (unitType.equals("AxisRomanianInfantryCorps")) || (unitType.equals("AxisRomanianMountainCorps"))) {
-        commandSendToOffboardZone(counter, "Axis Permanently Eliminated Units Box");
+        commandSendToOffboardZone(gp, "Axis Permanently Eliminated Units Box");
       }
     } else if (type.equals("Headquarters")) {
       int roll = ran.nextInt(6) + 1;
       if (roll <= 3) {
-        commandSendToReinforcementZone(counter, 1, counter.getSide() + " Permanently Eliminated Units Box");
+        commandSendToReinforcementZone(gp, 1, RsrTrait.getSide(gp) + " Permanently Eliminated Units Box");
       } else {
-        commandSendToReinforcementZone(counter, 2, counter.getSide() + " Permanently Eliminated Units Box");
+        commandSendToReinforcementZone(gp, 2, RsrTrait.getSide(gp) + " Permanently Eliminated Units Box");
       }
     } else if ((type.equals("Depot")) || (type.equals("Airbase")) || (type.equals("AirFleet"))) {
-      commandSendToReinforcementZone(counter, 4, "Axis Permanently Eliminated Units Box");
+      commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");
     } else if ((type.equals("SiegeArtillery")) || (type.equals("SecurityDivision"))) {
-      commandSendToOffboardZone(counter, "Axis Permanently Eliminated Units Box");
+      commandSendToOffboardZone(gp, "Axis Permanently Eliminated Units Box");
     } else if (type.equals("Partisans")) {
-      commandSendToOffboardZone(counter, "Soviet Permanently Eliminated Units Box");
+      commandSendToOffboardZone(gp, "Soviet Permanently Eliminated Units Box");
     } else if (type.equals("Asset")) {
-      commandSendToOffboardZone(counter, "Eliminated Economic Assets");
+      commandSendToOffboardZone(gp, "Eliminated Economic Assets");
     }
   }
 
-  public void commandStepLoss(RsrCounter counter) {
-    int currentStep = counter.getCurrentStep();
-    String type = counter.getType();
-    String unitType = counter.getUnitType();
+  public void commandStepLoss(GamePiece gp) {
+    int currentStep = RsrTrait.getCurrentStep(gp);
+    String type = RsrTrait.getType(gp);
+    String unitType = RsrTrait.getUnitType(gp);
     boolean isAxisGermanCorps = TerrainMapShaderRule.isAny(unitType, "AxisGermanTankCorps", "AxisGermanInfantryCorps", "AxisGermanMountainCorps");
     if ((currentStep == 1) && ((type.equals("Unit") == false) || (isAxisGermanCorps == false))) {
-      commandEliminate(counter);
+      commandEliminate(gp);
     } else {
-      GamePiece gp = counter.getPiece();
       if (currentStep == 2) {
         commandSetProperty(gp, RsrTrait.PROPERTY_CURRENT_STEP, 1);
-        commandUpdateStrength(counter, findStrength(counter.getCombatClass(), counter.getStrengthID()));
+        commandUpdateStrength(gp, findStrength(RsrTrait.getCombatClass(gp), RsrTrait.getStrengthID(gp)));
         commandLog("Game: " + gp.getName() + " lost a step.");
       } else if ((currentStep == 1) && (isAxisGermanCorps)) {
         if (unitType.equals("AxisGermanTankCorps")) {
-          for (RsrCounter rcounter : findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanTankBattlegroup", 1)) {
-            commandSendToPiece(counter, rcounter, true);
+          for (GamePiece fgp : findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanTankBattlegroup", 1)) {
+            commandSendToPiece(gp, fgp, true);
           }
         } else if (unitType.equals("AxisGermanInfantryCorps")) {
-          for (RsrCounter rcounter : findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanInfantryBattlegroup", 1)) {
-            commandSendToPiece(counter, rcounter, true);
+          for (GamePiece fgp : findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanInfantryBattlegroup", 1)) {
+            commandSendToPiece(gp, fgp, true);
           }
         } else {
-          ArrayList<RsrCounter> weak = findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanMountainBattlegroup&&Steps=1", 1);
+          ArrayList<GamePiece> weak = findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanMountainBattlegroup&&Steps=1", 1);
           if (weak.size() == 0) {
-            for (RsrCounter rcounter : findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanMountainBattlegroup&&Steps=2", 1)) {
-              commandSendToPiece(counter, rcounter, true);
+            for (GamePiece fgp : findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanMountainBattlegroup&&Steps=2", 1)) {
+              commandSendToPiece(gp, fgp, true);
             }
           } else {
-            commandSendToPiece(counter, weak.get(0), true);
+            commandSendToPiece(gp, weak.get(0), true);
           }
         }
-        commandSendToOffboardZone(counter, "German Breakdown & Buildup Box");
+        commandSendToOffboardZone(gp, "German Breakdown & Buildup Box");
       }
     }
   }
 
   public void commandAllowMovement(GamePiece gp, double mp) {
-    commandSetProperty(gp, RsrTrait.PROPERTY_MOVEMENT_LEFT, mp, RsrTrait.PROPERTY_HIGHLIGHT_BLUE, "1", RsrTrait.PROPERTY_START_HEX, mainGrid.locationName(gp.getPosition()), RsrTrait.PROPERTY_START_MOVEMENT_LEFT, mp, RsrTrait.PROPERTY_MOVE_INDEX, 0);
+    commandSetProperty(gp, RsrTrait.PROPERTY_MOVEMENT_LEFT, mp, RsrTrait.PROPERTY_HIGHLIGHT_BLUE, 1, RsrTrait.PROPERTY_START_HEX, mainGrid.locationName(gp.getPosition()), RsrTrait.PROPERTY_START_MOVEMENT_LEFT, mp, RsrTrait.PROPERTY_MOVE_INDEX, 0);
   }
 
   public void commandDisallowMovement(GamePiece gp) {
-    commandSetProperty(gp, RsrTrait.PROPERTY_MOVEMENT_LEFT, 0.0d, RsrTrait.PROPERTY_HIGHLIGHT_BLUE, "0", RsrTrait.PROPERTY_START_HEX, "", RsrTrait.PROPERTY_START_MOVEMENT_LEFT, 0.0d, RsrTrait.PROPERTY_MOVE_INDEX, 0);
+    commandSetProperty(gp, RsrTrait.PROPERTY_MOVEMENT_LEFT, 0.0d, RsrTrait.PROPERTY_HIGHLIGHT_BLUE, 0, RsrTrait.PROPERTY_START_HEX, "", RsrTrait.PROPERTY_START_MOVEMENT_LEFT, 0.0d, RsrTrait.PROPERTY_MOVE_INDEX, 0);
   }
 
   public void commandSetMovementIndex(ArrayList<GamePiece> pieces) {
-    int moveIndex = RsrCounter.getIntProperty(dataPiece, RsrGlobal.PROPERTY_LAST_MOVED_INDEX, 0) + 1;
+    int moveIndex = RsrGlobal.getLastMovedIndex(dataPiece) + 1;
     for (GamePiece gp : pieces) {
       commandSetProperty(gp, RsrTrait.PROPERTY_MOVE_INDEX, moveIndex);
     }
     commandSetProperty(dataPiece, RsrGlobal.PROPERTY_LAST_MOVED_INDEX, moveIndex);
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, RsrTrait.PROPERTY_MOVE_INDEX + ">0&&" + RsrTrait.PROPERTY_MOVE_INDEX + "<" + moveIndex)) {
-      if (RsrCounter.getDoubleProperty(gp, RsrTrait.PROPERTY_MOVEMENT_LEFT, 0.0d) < RsrCounter.getDoubleProperty(gp, RsrTrait.PROPERTY_START_MOVEMENT_LEFT, 0.0d)) {
+      if (RsrTrait.getMovementLeft(gp) < RsrTrait.getStartMovementLeft(gp)) {
         commandDisallowMovement(gp);
       }
     }
@@ -526,7 +486,7 @@
 
   public HexRef getStartHex(GamePiece gp) {
     if (gp.getMap() == mainMap) {
-      String startHex = RsrCounter.getStringProperty(gp, RsrTrait.PROPERTY_START_HEX, "");
+      String startHex = RsrTrait.getStartHex(gp);
       if (startHex.length() > 0) {
         try {
           return mainGrid.getHexPos(mainGrid.getLocation(startHex));
@@ -537,5 +497,49 @@
     }
     return null;
   }
+
+  /**
+   *
+   * @param pieces List of moving pieces (stack) that must come from one hex
+   * @param target Target hex
+   * @param overrun Is this an overrun combat?
+   */
+  public void commandAddToCombat(ArrayList<GamePiece> pieces, HexRef target, boolean overrun) {
+    if (pieces.size() == 0) {
+      return;
+    }
+    GamePiece firstAttacker = pieces.get(0);
+    String attackerSide = RsrTrait.getSide(firstAttacker);
+    String defenderSide = attackerSide.equals(RsrMapShaderBase.SIDE_AXIS) ? RsrMapShaderBase.SIDE_SOVIET : RsrMapShaderBase.SIDE_AXIS;
+    HexRef source = mainGrid.getHexPos(firstAttacker.getPosition());
+    String attackerHex = mainGrid.locationName(mainGrid.getHexCenter(source.getColumn(), source.getRow()));
+    String defenderHex = mainGrid.locationName(mainGrid.getHexCenter(target.getColumn(), target.getRow()));
+    
+    CombatHexList attackerHexes = new CombatHexList(RsrGlobal.getAttackerHexes(dataPiece));
+    CombatHexList defenderHexes = new CombatHexList(RsrGlobal.getDefenderHexes(dataPiece));
+    
+    attackerHexes.add(attackerHex);
+    defenderHexes.add(defenderHex);
+    
+    if ((attackerHexes.size() > 1) && (defenderHexes.size() > 1)) {
+      return;
+    }
+
+    if (RsrGlobal.getCombatStage(dataPiece) == 0) {
+      for (GamePiece gp : pieces) {
+        commandSetProperty(gp, RsrTrait.ATTACKER, 1);
+      }
+      for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Side=" + defenderSide + "&&LocationName=" + defenderHex)) {
+        commandSetProperty(gp, RsrTrait.DEFENDER, 1);
+      }
+    } else {
+
+    }
+
+    commandSetProperty(dataPiece, RsrGlobal.COMBAT_STAGE, 1,
+                                  RsrGlobal.COMBAT_MODE, overrun ? 1 : 0,
+                                  RsrGlobal.ATTACKER_HEXES, attackerHexes.toString(),
+                                  RsrGlobal.DEFENDER_HEXES, defenderHexes.toString());
+  }
   
 }

Modified: VSQL-src/branches/morvael/rsr/RsrCounter.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrCounter.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrCounter.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -1,25 +1,13 @@
 package rsr;
 
-import VASSAL.counters.Decorator;
 import VASSAL.counters.GamePiece;
 
 public final class RsrCounter {
 
-	public static final int SUPPLY_NORMAL = 0;
-	public static final int SUPPLY_EMERGENCY = 1;
-	public static final int SUPPLY_LACK = 2;
-	public static final int SUPPLY_OUT = 3;
+  private RsrCounter() {
+
+  }
 	
-	private GamePiece gp;
-	
-	public RsrCounter(GamePiece gp) {
-		this.gp = Decorator.getOutermost(gp);
-	}
-	
-	public GamePiece getPiece() {
-		return gp;
-	}
-	
 	public static String getStringProperty(GamePiece gp, String name, String def) {
 		String result;
 		try {
@@ -60,142 +48,4 @@
 		return result;
 	}
 
-	public String getSide() {
-		return getStringProperty(gp, "Side", "");
-	}
-	
-	public String getNationality() {
-		return getStringProperty(gp, "Nationality", "");
-	}
-	
-	public String getType() {
-		return getStringProperty(gp, "Type", "");
-	}
-	
-	public String getAssetType() {
-		return getStringProperty(gp, "AssetType", "");
-	}
-	
-	public int getRange() {
-		return getIntProperty(gp, "Range", 0);
-	}
-	
-	public String getUnitType() {
-		return getStringProperty(gp, "UnitType", "");
-	}
-	
-	public String getCombatClass() {
-		return getStringProperty(gp, "CombatClass", "");
-	}	
-	
-	public String getStrengthClass() {
-		return getStringProperty(gp, "StrengthClass", "");
-	}
-	
-	public String getStrengthType() {
-		return getStringProperty(gp, "StrengthType", "");
-	}		
-	
-	public int getSteps() {
-		return getIntProperty(gp, "Steps", 0);
-	}
-	
-	public int getCurrentStep() {
-		return getIntProperty(gp, RsrTrait.PROPERTY_CURRENT_STEP, 0);
-	}
-	
-	public String getMovementType() {
-		return getStringProperty(gp, RsrTrait.PROPERTY_MOVEMENT_TYPE, "");
-	}
-	
-	public int getMovementTypeAsInt() {
-		String s = getMovementType();
-		if (s.equals("Motorized")) {
-			return 1;
-		} else
-		if (s.equals("Rail")) {
-			return 2;
-		} else {
-			return 0;
-		}		
-	}
-	
-	public double getMovement() {
-		return getDoubleProperty(gp, "Movement", 0.0d);
-	}
-	
-	public double getMovementLeft() {
-		return getDoubleProperty(gp, RsrTrait.PROPERTY_MOVEMENT_LEFT, 0.0);
-	}
-	
-	public int getSupplyLevel() {
-		return getIntProperty(gp, RsrTrait.PROPERTY_SUPPLY_LEVEL, 0);
-	}
-	
-	public int getIsolated() {
-		return getIntProperty(gp, RsrTrait.PROPERTY_SUPPLY_ISOLATED, 0);
-	}
-	
-	public boolean isSupply(int ... types) {
-		int t = getSupplyLevel();
-		for (int i=0; i<types.length; i++) {
-			if (t == types[i]) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public int getVP() {
-		return getIntProperty(gp, "VP", 0);
-	}
-	
-  public int getAttack1() {
-    return getIntProperty(gp, "Attack_1", 0);
-  }
-
-  public int getAttack2() {
-    return getIntProperty(gp, "Attack_2", 0);
-  }
-
-  public int getDefend1() {
-    return getIntProperty(gp, "Defend_1", 0);
-  }
-
-  public int getDefend2() {
-    return getIntProperty(gp, "Defend_2", 0);
-  }
-
-	public int getSupplyMode() {
-		return getIntProperty(gp, RsrTrait.PROPERTY_SUPPLY_MODE, 0);
-	}
-
-	public String getHighlightRed() {
-		return getStringProperty(gp, RsrTrait.PROPERTY_HIGHLIGHT_RED, "0");
-	}
-
-	public String getHighlightGreen() {
-		return getStringProperty(gp, RsrTrait.PROPERTY_HIGHLIGHT_GREEN, "0");
-	}
-
-	public String getHighlightBlue() {
-		return getStringProperty(gp, RsrTrait.PROPERTY_HIGHLIGHT_BLUE, "0");
-	}
-
-  public String getStartHex() {
-    return getStringProperty(gp, RsrTrait.PROPERTY_START_HEX, "");
-  }
-
-	public double getStartMovementLeft() {
-		return getDoubleProperty(gp, RsrTrait.PROPERTY_START_MOVEMENT_LEFT, 0.0);
-	}
-
-  public int getMoveIndex() {
-    return getIntProperty(gp, RsrTrait.PROPERTY_MOVE_INDEX, 0);
-  }
-
-  public String getStrengthID() {
-    return getStringProperty(gp, RsrTrait.PROPERTY_STRENGTH_ID, "");
-  }
-
 }

Modified: VSQL-src/branches/morvael/rsr/RsrGlobal.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -38,7 +38,18 @@
   public static final String PROPERTY_PHASE_PARTS = "phase_parts";
   public static final String PROPERTY_PHASE_PART = "phase_part";
   public static final String PROPERTY_LAST_MOVED_INDEX = "last_moved_index";
+  public static final String COMBAT_STAGE = "combat_stage";
+  public static final String COMBAT_MODE = "combat_mode"; //normal, overrun
+  public static final String ATTACKER_HEXES = "attacker_hexes";
+  public static final String DEFENDER_HEXES = "defender_hexes";
+  public static final String ATTACKER_LOSS = "attacker_loss";
+  public static final String ATTACKER_RETREAT = "attacker_retreat";
+  public static final String DEFENDER_LOSS = "attacker_loss";
+  public static final String DEFENDER_RETREAT = "attacker_retreat";
+  public static final String ATTACKER_LOST = "attacker_lost";
+  public static final String DEFENDER_LOST = "defender_lost";
 
+
   // static
   public static final String ID = "RsrGlobal;";
   // configuration
@@ -49,6 +60,16 @@
   private int phaseParts = 0;
   private int phasePart = 0;
   private int lastMovedIndex = 0;
+  private int combatStage = 0;
+  private int combatMode = 0;
+  private String attackerHexes = "";
+  private String defenderHexes = "";
+  private int attackerLoss = 0;
+  private int attackerRetreat = 0;
+  private int defenderLoss = 0;
+  private int defenderRetreat = 0;
+  private int attackerLost = 0;
+  private int defenderLost = 0;
   // dynamic
   private GamePiece gp;
   private KeyCommand[] commands0;
@@ -75,6 +96,26 @@
       return phasePart;
     } else if (PROPERTY_LAST_MOVED_INDEX.equals(key)) {
       return lastMovedIndex;
+    } else if (COMBAT_STAGE.equals(key)) {
+      return combatStage;
+    } else if (COMBAT_MODE.equals(key)) {
+      return combatMode;
+    } else if (ATTACKER_HEXES.equals(key)) {
+      return attackerHexes;
+    } else if (DEFENDER_HEXES.equals(key)) {
+      return defenderHexes;
+    } else if (ATTACKER_LOSS.equals(key)) {
+      return attackerLoss;
+    } else if (ATTACKER_RETREAT.equals(key)) {
+      return attackerRetreat;
+    } else if (DEFENDER_LOSS.equals(key)) {
+      return defenderLoss;
+    } else if (DEFENDER_RETREAT.equals(key)) {
+      return defenderRetreat;
+    } else if (ATTACKER_LOST.equals(key)) {
+      return attackerLost;
+    } else if (DEFENDER_LOST.equals(key)) {
+      return defenderLost;
     } else {
       return super.getProperty(key);
     }
@@ -92,6 +133,26 @@
       return phasePart;
     } else if (PROPERTY_LAST_MOVED_INDEX.equals(key)) {
       return lastMovedIndex;
+    } else if (COMBAT_STAGE.equals(key)) {
+      return combatStage;
+    } else if (COMBAT_MODE.equals(key)) {
+      return combatMode;
+    } else if (ATTACKER_HEXES.equals(key)) {
+      return attackerHexes;
+    } else if (DEFENDER_HEXES.equals(key)) {
+      return defenderHexes;
+    } else if (ATTACKER_LOSS.equals(key)) {
+      return attackerLoss;
+    } else if (ATTACKER_RETREAT.equals(key)) {
+      return attackerRetreat;
+    } else if (DEFENDER_LOSS.equals(key)) {
+      return defenderLoss;
+    } else if (DEFENDER_RETREAT.equals(key)) {
+      return defenderRetreat;
+    } else if (ATTACKER_LOST.equals(key)) {
+      return attackerLost;
+    } else if (DEFENDER_LOST.equals(key)) {
+      return defenderLost;
     } else {
       return super.getLocalizedProperty(key);
     }
@@ -129,6 +190,66 @@
       } catch (Exception e) {
         lastMovedIndex = 0;
       }
+    } else if (COMBAT_STAGE.equals(key)) {
+      try {
+        combatStage = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        combatStage = 0;
+      }
+    } else if (COMBAT_MODE.equals(key)) {
+      try {
+        combatMode = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        combatMode = 0;
+      }
+    } else if (ATTACKER_HEXES.equals(key)) {
+      try {
+        attackerHexes = val.toString();
+      } catch (Exception e) {
+        attackerHexes = "";
+      }
+    } else if (DEFENDER_HEXES.equals(key)) {
+      try {
+        defenderHexes = val.toString();
+      } catch (Exception e) {
+        defenderHexes = "";
+      }
+    } else if (ATTACKER_LOSS.equals(key)) {
+      try {
+        attackerLoss = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        attackerLoss = 0;
+      }
+    } else if (ATTACKER_RETREAT.equals(key)) {
+      try {
+        attackerRetreat = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        attackerRetreat = 0;
+      }
+    } else if (DEFENDER_LOSS.equals(key)) {
+      try {
+        defenderLoss = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        defenderLoss = 0;
+      }
+    } else if (DEFENDER_RETREAT.equals(key)) {
+      try {
+        defenderRetreat = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        defenderRetreat = 0;
+      }
+    } else if (ATTACKER_LOST.equals(key)) {
+      try {
+        attackerLost = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        attackerLost = 0;
+      }
+    } else if (DEFENDER_LOST.equals(key)) {
+      try {
+        defenderLost = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        defenderLost = 0;
+      }
     } else {
       super.setProperty(key, val);
     }
@@ -168,6 +289,16 @@
     se.append(phaseParts);
     se.append(phasePart);
     se.append(lastMovedIndex);
+    se.append(combatStage);
+    se.append(combatMode);
+    se.append(attackerHexes);
+    se.append(defenderHexes);
+    se.append(attackerLoss);
+    se.append(attackerRetreat);
+    se.append(defenderLoss);
+    se.append(defenderRetreat);
+    se.append(attackerLost);
+    se.append(defenderLost);
     return se.getValue();
   }
 
@@ -178,6 +309,16 @@
     phaseParts = st.nextInt(0);
     phasePart = st.nextInt(0);
     lastMovedIndex = st.nextInt(0);
+    combatStage = st.nextInt(0);
+    combatMode = st.nextInt(0);
+    attackerHexes = st.nextToken("");
+    defenderHexes = st.nextToken("");
+    attackerLoss = st.nextInt(0);
+    attackerRetreat = st.nextInt(0);
+    defenderLoss = st.nextInt(0);
+    defenderRetreat = st.nextInt(0);
+    attackerLost = st.nextInt(0);
+    defenderLost = st.nextInt(0);
   }
 
   public Rectangle boundingBox() {
@@ -280,7 +421,7 @@
     }
 
     public String getState() {
-      return "0;6;0;0;0";
+      return "0;6;0;0;0;0;0;;;0;0;0;0;0;0";
     }
 
     public String getType() {
@@ -289,4 +430,65 @@
       return RsrGlobal.ID + se.getValue();
     }
   }
+
+  public static final int getDebug(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, PROPERTY_DEBUG, 0);
+  }
+
+  public static final int getScenario(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, PROPERTY_SCENARIO, 6);
+  }
+
+  public static final int getPhaseParts(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, PROPERTY_PHASE_PARTS, 0);
+  }
+
+  public static final int getPhasePart(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, PROPERTY_PHASE_PART, 0);
+  }
+
+  public static final int getLastMovedIndex(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, PROPERTY_LAST_MOVED_INDEX, 0);
+  }
+
+  public static final int getCombatStage(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, COMBAT_STAGE, 0);
+  }
+
+  public static final int getCombatMode(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, COMBAT_MODE, 0);
+  }
+
+  public static final String getAttackerHexes(GamePiece gp) {
+    return RsrCounter.getStringProperty(gp, ATTACKER_HEXES, "");
+  }
+
+  public static final String getDefenderHexes(GamePiece gp) {
+    return RsrCounter.getStringProperty(gp, DEFENDER_HEXES, "");
+  }
+
+  public static final int getAttackerLoss(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, ATTACKER_LOSS, 0);
+  }
+
+  public static final int getAttackerRetreat(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, ATTACKER_RETREAT, 0);
+  }
+
+  public static final int getDefenderLoss(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, DEFENDER_LOSS, 0);
+  }
+
+  public static final int getDefenderRetreat(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, DEFENDER_RETREAT, 0);
+  }
+
+  public static final int getAttackerLost(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, ATTACKER_LOST, 0);
+  }
+
+  public static final int getDefenderLost(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, DEFENDER_LOST, 0);
+  }
+  
 }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -481,53 +481,53 @@
     return result;
   }
 
-  public double getOverrunCost(RsrCounter c) {
-    if (c.getType().equals("Unit") == false) {
+  public double getOverrunCost(GamePiece gp) {
+    if (RsrTrait.getType(gp).equals("Unit") == false) {
       return Double.MAX_VALUE;
     }
-    if (c.isSupply(RsrCounter.SUPPLY_LACK, RsrCounter.SUPPLY_OUT)) {
+    if (RsrTrait.isSupplyLevel(gp, RsrTrait.SUPPLY_LACK, RsrTrait.SUPPLY_OUT)) {
       return Double.MAX_VALUE;
     }
     double cost;
-    if ((isWinter()) && (c.getSide().equals(SIDE_SOVIET))) {
+    if ((isWinter()) && (RsrTrait.getSide(gp).equals(SIDE_SOVIET))) {
       cost = 2.0d;
     } else {
       cost = 3.0d;
     }
-    if (cost <= c.getMovementLeft()) {
+    if (cost <= RsrTrait.getMovementLeft(gp)) {
       return cost;
     } else {
       return Double.MAX_VALUE;
     }
   }
 
-  public double getMovementAllowance(RsrCounter c) {
-    double result = c.getMovement();
+  public double getMovementAllowance(GamePiece gp) {
+    double result = RsrTrait.getMovement(gp);
     if (getTurnNumber() == 1) {
-      HexRef hr = grid.getHexPos(c.getPiece().getPosition());
+      HexRef hr = grid.getHexPos(gp.getPosition());
       if ((getAttributeTerrainValue(hr, TAG_COUNTRY).equals(TAG_COUNTRY_FINLAND)) || (getAttributeTerrainValue(hr, TAG_COUNTRY).equals(TAG_COUNTRY_ROMANIA))) {
         result = 0.0d;
       }
     }
-    if (c.isSupply(RsrCounter.SUPPLY_LACK, RsrCounter.SUPPLY_OUT)) {
+    if (RsrTrait.isSupplyLevel(gp, RsrTrait.SUPPLY_LACK, RsrTrait.SUPPLY_OUT)) {
       result = Math.ceil(result * 0.5d);
     }
     return result;
   }
 
-  public double getStrategicMovementAllowance(RsrCounter c) {
-    String type = c.getType();
+  public double getStrategicMovementAllowance(GamePiece gp) {
+    String type = RsrTrait.getType(gp);
     if (isAny(type, "Airbase", "Partisan", "Asset", "AirFleet")) {
       return 0.0d;
     }
     if ((type.equals("Depot")) && (isMud() == false)) {
       return 0.0d;
     }
-    if (c.isSupply(RsrCounter.SUPPLY_LACK, RsrCounter.SUPPLY_OUT, RsrCounter.SUPPLY_EMERGENCY)) {
+    if (RsrTrait.isSupplyLevel(gp, RsrTrait.SUPPLY_EMERGENCY, RsrTrait.SUPPLY_LACK, RsrTrait.SUPPLY_OUT)) {
       return 0.0d;
     }
     if (getTurnNumber() == 1) {
-      HexRef hr = grid.getHexPos(c.getPiece().getPosition());
+      HexRef hr = grid.getHexPos(gp.getPosition());
       if ((getAttributeTerrainValue(hr, TAG_COUNTRY).equals(TAG_COUNTRY_FINLAND)) || (getAttributeTerrainValue(hr, TAG_COUNTRY).equals(TAG_COUNTRY_ROMANIA))) {
         return 0.0d;
       }
@@ -619,7 +619,7 @@
     double result = 0;
     double stackSize;
     for (GamePiece gp : filterPieces(map, "StackPoints!=0&&LocationName=" + grid.locationName(grid.getHexCenter(hr.getColumn(), hr.getRow())))) {
-      stackSize = RsrCounter.getDoubleProperty(gp, "StackPoints", 0.0d);
+      stackSize = RsrTrait.getStackPoints(gp);
       if (stackSize == -1.0d) {
         stackSize = 0.5d;
       }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -55,21 +55,20 @@
     if (piece == null) {
       return;
     }
-    RsrCounter counter = new RsrCounter(piece);
-    side = counter.getSide();
-    nationality = counter.getNationality();
-    movementMode = counter.getMovementTypeAsInt();
-    maxMovement = getMovementAllowance(counter);
+    side = RsrTrait.getSide(piece);
+    nationality = RsrTrait.getNationality(piece);
+    movementMode = RsrTrait.getMovementTypeAsInt(piece);
+    maxMovement = getMovementAllowance(piece);
     movement = mapShader.getStartRangeOverride();
     if (movement == 0.0d) {
-      movement = counter.getMovementLeft();
+      movement = RsrTrait.getMovementLeft(piece);
     }
     if (movement > maxMovement) {
       movement = maxMovement;
     }
-    overrunCost = getOverrunCost(counter);
-    type = counter.getType();
-    unitType = counter.getUnitType();
+    overrunCost = getOverrunCost(piece);
+    type = RsrTrait.getType(piece);
+    unitType = RsrTrait.getUnitType(piece);
     isMountain = unitType.indexOf("Mountain") >= 0;
     //find hex control
     filterFriendlyPieceGroups(side);
@@ -109,7 +108,7 @@
       if ((tt.equals(HEX_WATER)) || (tt.equals(HEX_SWAMP)) || (tt.equals(HEX_MOUNTAIN)) || (tt.equals(HEX_MAJORCITY)) || ((tt.equals(HEX_SEVASTOPOL)) && (isCityDestroyed(TAG_CITY_SEVASTOPOL) == false))) {
         return result(fromHex, false, 0.0d, false, MODE_MOVEMENT);
       }
-      if ((isMajorRiver(et)) || ((isMinorRiver(et)) && ((getTurnNumber() > 1) || (side.equals(SIDE_SOVIET)))) || ((isLakeSea(et)) && ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != 0)))) {
+      if ((isMajorRiver(et)) || ((isMinorRiver(et)) && ((getTurnNumber() > 1) || (side.equals(SIDE_SOVIET)))) || ((isLakeSea(et)) && ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)))) {
         return result(fromHex, false, 0.0d, false, MODE_MOVEMENT);
       }
       if (overrunCost <= currentCost.getPointsLeft()) {
@@ -134,7 +133,7 @@
     if (lt.equals(LINE_CHONGARCAUSEWAY)) {
       return result(fromHex, false, 0.0, false, MODE_MOVEMENT);
     }
-    if ((movementMode == 2) && (lt.equals(LINE_RAILROAD) == false)) {
+    if ((movementMode == RsrTrait.MOVEMENT_RAIL) && (lt.equals(LINE_RAILROAD) == false)) {
       return result(fromHex, false, 0.0, false, MODE_MOVEMENT);
     }
     if ((fromZOC) && (toZOC)) {
@@ -146,7 +145,7 @@
     if (isImpassable(et)) {
       return result(fromHex, false, 0.0, false, MODE_MOVEMENT);
     } else if (isLakeSea(et)) {
-      if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != 0)) {
+      if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)) {
         return result(fromHex, false, 0.0, false, MODE_MOVEMENT);
       } else {
         cost += EDGE_MINORRIVER_COST[movementMode];
@@ -183,7 +182,7 @@
     } else {
       cost += HEX_CLEAR_COST[movementMode] * (isArctic ? 2 : 1);
     }
-    if (movementMode == 2) {
+    if (movementMode == RsrTrait.MOVEMENT_RAIL) {
       cost = 1.0;
     }
     if (fromZOC) {

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -39,10 +39,9 @@
 		if (piece == null) {
 			return;
 		}
-		RsrCounter counter = new RsrCounter(piece);
-		side = counter.getSide();
-    nationality = counter.getNationality();
-		movementMode = counter.getMovementTypeAsInt(); 
+		side = RsrTrait.getSide(piece);
+    nationality = RsrTrait.getNationality(piece);
+		movementMode = RsrTrait.getMovementTypeAsInt(piece);
 		//find blocked hexes
 		if (side.equals(SIDE_AXIS)) {
 			filterHostilePieceGroups(SIDE_SOVIET);
@@ -72,7 +71,7 @@
     //
     double mp = mapShader.getStartRangeOverride();
     if (mp == 0.0d) {
-      mp = getStrategicMovementAllowance(counter);
+      mp = getStrategicMovementAllowance(piece);
     }
     startHex = mapShader.getStartHexOverride();
     if (startHex == null) {
@@ -98,7 +97,7 @@
 			return result(fromHex, false, 0.0, false, null);
 		} else
 		if (isLakeSea(et)) {
-			if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != 0)) {
+			if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)) {
 				return result(fromHex, false, 0.0, false, null);
 			}
 		} else

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -52,65 +52,63 @@
 			HexRef hr = grid.getHexPos(gp.getPosition());
 			if ((canEnter(hr)) && (withLOC.contains(hr))) {
 				vpHex.add(hr);
-				vpc += new RsrCounter(gp).getVP();
+				vpc += RsrTrait.getVP(gp);
 			}
 		}
-		RsrCounter c;
 		String t, ut;
 		for (HexRef hr : friendlyPieceGroups.keySet()) {
 			for (GamePiece gp : friendlyPieceGroups.get(hr)) {
-				c = new RsrCounter(gp);
-				if (c.getSupplyLevel() == 0) {
-					t = c.getType();
-					ut = c.getUnitType();
+				if (RsrTrait.getSupplyLevel(gp) == 0) {
+					t = RsrTrait.getType(gp);
+					ut = RsrTrait.getUnitType(gp);
 					if (t.equals("Unit")) {
 						if (ut.equals("AxisGermanTankCorps")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep() == 2 ? 8 : 6;
+							vpu += RsrTrait.getCurrentStep(gp) == 2 ? 8 : 6;
 						} else
 						if (ut.equals("AxisGermanInfantryCorps")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep() == 2 ? 4 : 3;
+							vpu += RsrTrait.getCurrentStep(gp) == 2 ? 4 : 3;
 						} else
 						if (ut.equals("AxisGermanMountainCorps")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep() == 2 ? 3 : 2;
+							vpu += RsrTrait.getCurrentStep(gp) == 2 ? 3 : 2;
 						} else
 						if (ut.equals("AxisGermanTankBattlegroup")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep() == 2 ? 4 : 2;
+							vpu += RsrTrait.getCurrentStep(gp) == 2 ? 4 : 2;
 						} else
 						if (ut.equals("AxisGermanInfantryBattlegroup")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep();
+							vpu += RsrTrait.getCurrentStep(gp);
 						} else
 						if (ut.equals("AxisGermanMountainBattlegroup")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep();
+							vpu += RsrTrait.getCurrentStep(gp);
 						} else
 						if (ut.equals("AxisGermanTankDivision")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep() == 2 ? 4 : 2;
+							vpu += RsrTrait.getCurrentStep(gp) == 2 ? 4 : 2;
 						} else
 						if (ut.equals("AxisItalianArmy")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep();
+							vpu += RsrTrait.getCurrentStep(gp);
 						} else
 						if (ut.equals("AxisHungarianArmy")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep();
+							vpu += RsrTrait.getCurrentStep(gp);
 						} else
 						if (ut.equals("AxisFinnishInfantryCorps")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep();
+							vpu += RsrTrait.getCurrentStep(gp);
 						} else
 						if (ut.equals("AxisRomanianInfantryCorps")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep();
+							vpu += RsrTrait.getCurrentStep(gp);
 						} else
 						if (ut.equals("AxisRomanianMountainCorps")) {
 							vpHex.add(hr);
-							vpu += c.getCurrentStep();
+							vpu += RsrTrait.getCurrentStep(gp);
 						}
 					} else
 					if (t.equals("Depot")) {
@@ -134,9 +132,8 @@
 		}
                 if (scenario == 3) {
                   for (GamePiece gp : TerrainMapShaderRule.filterPieces(Map.getMapById("Offboard"), "CurrentZone=Eliminated Economic Assets")) {
-                    c = new RsrCounter(gp);
-                    t = c.getType();
-                    ut = c.getAssetType();
+                    t = RsrTrait.getType(gp);
+                    ut = RsrTrait.getAssetType(gp);
                     if (t.equals("Asset")) {
                       if (ut.equals("Oil")) {
                         vpa += 10;

Modified: VSQL-src/branches/morvael/rsr/RsrPieceMover.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -52,6 +52,7 @@
             pieces.add(s.getPieceAt(i));
           }
         }
+        /*
         if (KeyBuffer.getBuffer().containsChild(s)) {
           KeyBuffer.getBuffer().sort(RsrPieceMover.this);
           Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
@@ -63,6 +64,7 @@
             }
           }
         }
+        */
         RsrAdvance.getInstance().isValidSource(map, pieces);
         for (GamePiece gp : pieces) {
           DragBuffer.getBuffer().add(gp);
@@ -73,6 +75,7 @@
       public Object visitDefault(GamePiece selected) {
         DragBuffer.getBuffer().clear();
         ArrayList<GamePiece> pieces = new ArrayList<GamePiece>();
+        /*
         if (KeyBuffer.getBuffer().contains(selected)) {
           Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
           GamePiece gpi;
@@ -83,10 +86,13 @@
             }
           }
         } else {
+        */
           if (Boolean.TRUE.equals(selected.getProperty(Properties.NON_MOVABLE)) == false) {
             pieces.add(selected);
           }
+        /*
         }
+        */
         RsrAdvance.getInstance().isValidSource(map, pieces);
         for (GamePiece gp : pieces) {
           DragBuffer.getBuffer().add(gp);
@@ -105,6 +111,8 @@
           p = e.getPoint();
         }
         performDrop(p);
+      } else {
+        RsrAdvance.getInstance().sendAndLog();
       }
     }
     RsrAdvance.getInstance().clearShadedHexes();

Modified: VSQL-src/branches/morvael/rsr/RsrTrait.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-05-12 21:06:56 UTC (rev 5619)
+++ VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-05-13 20:56:58 UTC (rev 5620)
@@ -31,6 +31,10 @@
   public static final String PROPERTY_HIGHLIGHT_RED = "highlight_red";
   public static final String PROPERTY_HIGHLIGHT_GREEN = "highlight_green";
   public static final String PROPERTY_HIGHLIGHT_BLUE = "highlight_blue";
+  public static final String PROPERTY_HIGHLIGHT_YELLOW = "highlight_yellow";
+  public static final String STEPS = "Steps";
+  public static final String MOVEMENT = "Movement";
+  public static final String VP = "VP";
   public static final String PROPERTY_CURRENT_STEP = "CurrentStep";
   public static final String PROPERTY_SUPPLY_MODE = "SupplyMode"; //for Supply Depots
   public static final String PROPERTY_MOVEMENT_TYPE = "MovementType";
@@ -45,7 +49,25 @@
   public static final String PROPERTY_START_HEX = "StartHex"; //hex on which piece starts certain phases
   public static final String PROPERTY_START_MOVEMENT_LEFT = "StartMovementLeft"; //movement points with which piece starts certain phases
   public static final String PROPERTY_MOVE_INDEX = "MoveIndex"; //move index in which piece was moved (used for 3.2.g restriction)
+  public static final String ATTACKER = "CombatAttacker";
+  public static final String DEFENDER = "CombatDefender";
+  public static final String VICTORIOUS = "CombatVictorious";
+  public static final String DEFEATED = "CombatDefeated";
 
+	public static final int SUPPLY_NORMAL = 0;
+	public static final int SUPPLY_EMERGENCY = 1;
+	public static final int SUPPLY_LACK = 2;
+	public static final int SUPPLY_OUT = 3;
+
+  public static final int MOVEMENT_NONMOTORIZED = 0;
+  public static final int MOVEMENT_MOTORIZED = 1;
+  public static final int MOVEMENT_RAIL = 2;
+
+  public static final String MOVEMENT_NONMOTORIZED_STRING = "NonMotorized";
+  public static final String MOVEMENT_MOTORIZED_STRING = "Motorized";
+  public static final String MOVEMENT_RAIL_STRING = "Rail";
+
+
   // static
   public static final String ID = "RsrTrait;";
   // configuration
@@ -61,9 +83,16 @@
   private String startHex = "";
   private double startMovementLeft = 0.0d;
   private int moveIndex = 0;
+  private int highlightRed = 0;
+  private int highlightGreen = 0;
+  private int highlightBlue = 0;
+  private int highlightYellow = 0;
+  private int attacker = 0;
+  private int defender = 0;
+  private int victorious = 0;
+  private int defeated = 0;
   // dynamic
   private GamePiece gp;
-  private RsrCounter counter;
   private KeyCommand[] commands;
 
   public RsrTrait() {
@@ -97,6 +126,22 @@
       return startMovementLeft;
     } else if (PROPERTY_MOVE_INDEX.equals(key)) {
       return moveIndex;
+    } else if (PROPERTY_HIGHLIGHT_RED.equals(key)) {
+      return String.valueOf(highlightRed); //workaround for Embelishment to work
+    } else if (PROPERTY_HIGHLIGHT_GREEN.equals(key)) {
+      return String.valueOf(highlightGreen);
+    } else if (PROPERTY_HIGHLIGHT_BLUE.equals(key)) {
+      return String.valueOf(highlightBlue);
+    } else if (PROPERTY_HIGHLIGHT_YELLOW.equals(key)) {
+      return String.valueOf(highlightYellow);
+    } else if (ATTACKER.equals(key)) {
+      return attacker;
+    } else if (DEFENDER.equals(key)) {
+      return defender;
+    } else if (VICTORIOUS.equals(key)) {
+      return victorious;
+    } else if (DEFEATED.equals(key)) {
+      return defeated;
     } else {
       return super.getProperty(key);
     }
@@ -124,6 +169,22 @@
       return startMovementLeft;
     } else if (PROPERTY_MOVE_INDEX.equals(key)) {
       return moveIndex;
+    } else if (PROPERTY_HIGHLIGHT_RED.equals(key)) {
+      return String.valueOf(highlightRed);
+    } else if (PROPERTY_HIGHLIGHT_GREEN.equals(key)) {
+      return String.valueOf(highlightGreen);
+    } else if (PROPERTY_HIGHLIGHT_BLUE.equals(key)) {
+      return String.valueOf(highlightBlue);
+    } else if (PROPERTY_HIGHLIGHT_YELLOW.equals(key)) {
+      return String.valueOf(highlightYellow);
+    } else if (ATTACKER.equals(key)) {
+      return attacker;
+    } else if (DEFENDER.equals(key)) {
+      return defender;
+    } else if (VICTORIOUS.equals(key)) {
+      return victorious;
+    } else if (DEFEATED.equals(key)) {
+      return defeated;
     } else {
       return super.getLocalizedProperty(key);
     }
@@ -195,6 +256,57 @@
       } catch (Exception e) {
         moveIndex = 0;
       }
+    } else if (PROPERTY_HIGHLIGHT_RED.equals(key)) {
+      try {
+        highlightRed = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        highlightRed = 0;
+      }
+    } else if (PROPERTY_HIGHLIGHT_GREEN.equals(key)) {
+      try {
+        highlightGreen = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        highlightGreen = 0;
+      }
+    } else if (PROPERTY_HIGHLIGHT_BLUE.equals(key)) {
+      try {
+        highlightBlue = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        highlightBlue = 0;
+      }
+    } else if (PROPERTY_HIGHLIGHT_YELLOW.equals(key)) {
+      try {
+        highlightYellow = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        highlightYellow = 0;
+      }
+    } else if (ATTACKER.equals(key)) {
+      try {
+        attacker = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        attacker = 0;
+      }
+      updateCombatLabel();
+    } else if (DEFENDER.equals(key)) {
+      try {
+        defender = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        defender = 0;
+      }
+      updateCombatLabel();
+    } else if (VICTORIOUS.equals(key)) {
+      try {
+        victorious = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        victorious = 0;
+      }
+      updateCombatLabel();
+    } else if (DEFEATED.equals(key)) {
+      try {
+        defeated = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        defeated = 0;
+      }
     } else {
       super.setProperty(key, val);
     }
@@ -225,17 +337,17 @@
   }
 
   private void updateStrengthLabel() {
-    getCounter();
-    RsrCounter scounter = RsrAdvance.getInstance().findStrength(counter.getCombatClass(), strengthID);
-    if (scounter == null) {
+    getGamePiece();
+    GamePiece sgp = RsrAdvance.getInstance().findStrength(getCombatClass(gp), strengthID);
+    if (sgp == null) {
       strengthID = "";
       strengthLabel = "";
     } else {
-      strengthID = String.valueOf(scounter.getPiece().getProperty("BasicName"));
-      if (counter.getCurrentStep() == 2) {
-        strengthLabel = scounter.getAttack2() + " " + scounter.getDefend2();
+      strengthID = String.valueOf(sgp.getProperty("BasicName"));
+      if (getCurrentStep(gp) == 2) {
+        strengthLabel = getAttack2(sgp) + " " + getDefend2(sgp);
       } else {
-        strengthLabel = scounter.getAttack1() + " " + scounter.getDefend1();
+        strengthLabel = getAttack1(sgp) + " " + getDefend1(sgp);
       }
     }
   }
@@ -251,6 +363,14 @@
     }
   }
 
+  private void updateCombatLabel() {
+    if ((attacker > 0) || (defender > 0) || (victorious > 0)) {
+      highlightYellow = 1;
+    } else {
+      highlightYellow = 0;
+    }
+  }
+
   private GamePiece getGamePiece() {
     if (gp == null) {
       gp = Decorator.getOutermost(this);
@@ -258,13 +378,6 @@
     return gp;
   }
 
-  private RsrCounter getCounter() {
-    if (counter == null) {
-      counter = new RsrCounter(getGamePiece());
-    }
-    return counter;
-  }
-
   public String getDescription() {
     String d = "Rsr Trait";
     if (description.length() > 0) {
@@ -297,6 +410,14 @@
     se.append(startHex == null ? "" : startHex);
     se.append(startMovementLeft);
     se.append(moveIndex);
+    se.append(highlightRed);
+    se.append(highlightGreen);
+    se.append(highlightBlue);
+    se.append(highlightYellow);
+    se.append(attacker);
+    se.append(defender);
+    se.append(victorious);
+    se.append(defeated);
     return se.getValue();
   }
 
@@ -312,9 +433,18 @@
     startHex = st.nextToken("");
     startMovementLeft = st.nextDouble(0.0d);
     moveIndex = st.nextInt(0);
+    highlightRed = st.nextInt(0);
+    highlightGreen = st.nextInt(0);
+    highlightBlue = st.nextInt(0);
+    highlightYellow = st.nextInt(0);
+    attacker = st.nextInt(0);
+    defender = st.nextInt(0);
+    victorious = st.nextInt(0);
+    defeated = st.nextInt(0);
     //updateSupplyLabel();
     //updateStrengthLabel();
-    //updateSupplyLabel();
+    //updateMovementLabel();
+    //updateCombatLabel();
   }
 
   public Rectangle boundingBox() {
@@ -335,7 +465,7 @@
 
   @Override
   protected KeyCommand[] myGetKeyCommands() {
-    commands = RsrAdvance.getInstance().getCommands(this, getGamePiece(), getCounter());
+    commands = RsrAdvance.getInstance().getCommands(this, getGamePiece());
     return commands;
   }
 
@@ -352,7 +482,7 @@
     if (match == -1) {
       return null;
     } else {
-      return RsrAdvance.getInstance().getCommand(this, gp, counter, commands[match]);
+      return RsrAdvance.getInstance().getCommand(this, gp, commands[match]);
     }
   }
 
@@ -388,7 +518,7 @@
     }
 
     public String getState() {
-      return "0;0;;;;0;;;0;0";
+      return "0;0;;;;0;;;0;0;0;0;0;0";
     }
 
     public String getType() {
@@ -397,4 +527,220 @@
       return RsrTrait.ID + se.getValue();
     }
   }
+
+  public static void commandClearAttributes(GamePiece gp) {
+    //PROPERTY_STRENGTH_ID is set in commandReleaseCounter
+    //PROPERTY_SUPPLY_LABEL is set automatically
+    //PROPERTY_STRENGTH_LABEL is set automatically
+    //PROPERTY_MOVEMENT_LABEL is set automatically
+    RsrAdvance.getInstance().commandSetProperty(gp,
+      //external elements (Markers)
+      PROPERTY_CURRENT_STEP, getSteps(gp),
+      PROPERTY_SUPPLY_MODE, 1,
+      PROPERTY_HIGHLIGHT_RED, 0,
+      PROPERTY_HIGHLIGHT_GREEN, 0,
+      PROPERTY_HIGHLIGHT_BLUE, 0,
+      PROPERTY_HIGHLIGHT_YELLOW, 0,
+      //RsrTrait elements
+      PROPERTY_SUPPLY_LEVEL, 0,
+      PROPERTY_SUPPLY_ISOLATED, 0,
+      PROPERTY_MOVEMENT_LEFT, 0.0d,
+      PROPERTY_START_HEX, "",
+      PROPERTY_START_MOVEMENT_LEFT, 0.0d,
+      PROPERTY_MOVE_INDEX, 0,
+      ATTACKER, 0,
+      DEFENDER, 0,
+      VICTORIOUS, 0,
+      DEFEATED, 0);
+  }
+
+  public static void commandCopyAttributes(GamePiece from, GamePiece to) {
+    double dif = getMovement(to) - getMovement(from);
+    double mov = Math.max(0, getMovementLeft(from) + dif);
+    double smov = Math.max(0, getStartMovementLeft(from) + dif);
+    RsrAdvance.getInstance().commandSetProperty(to,
+      //external elements (Markers)
+      PROPERTY_HIGHLIGHT_RED, getHighlightRed(from),
+      PROPERTY_HIGHLIGHT_GREEN, getHighlightGreen(from),
+      PROPERTY_HIGHLIGHT_BLUE, (mov > 0 ? getHighlightBlue(from) : 0),
+      PROPERTY_HIGHLIGHT_YELLOW, getHighlightYellow(from),
+      //RsrTrait elements
+      PROPERTY_SUPPLY_LEVEL, getSupplyLevel(from),
+      PROPERTY_SUPPLY_ISOLATED, getSupplyIsolated(from),
+      PROPERTY_MOVEMENT_LEFT, mov,
+      PROPERTY_START_HEX, getStartHex(from),
+      PROPERTY_START_MOVEMENT_LEFT, smov,
+      PROPERTY_MOVE_INDEX, getMoveIndex(from),
+      ATTACKER, getAttacker(from),
+      DEFENDER, getDefender(from),
+      VICTORIOUS, getVictorious(from),
+      DEFEATED, getDefeated(from));
+  }
+
+	public static String getSide(GamePiece gp) {
+		return RsrCounter.getStringProperty(gp, "Side", "");
+	}
+
+	public static String getNationality(GamePiece gp) {
+		return RsrCounter.getStringProperty(gp, "Nationality", "");
+	}
+
+	public static String getType(GamePiece gp) {
+		return RsrCounter.getStringProperty(gp, "Type", "");
+	}
+
+	public static String getAssetType(GamePiece gp) {
+		return RsrCounter.getStringProperty(gp, "AssetType", "");
+	}
+
+	public static int getRange(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, "Range", 0);
+	}
+
+  public static int getFleetNumber(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, "FleetNumber", 0);
+  }
+
+	public static String getUnitType(GamePiece gp) {
+		return RsrCounter.getStringProperty(gp, "UnitType", "");
+	}
+
+	public static String getCombatClass(GamePiece gp) {
+		return RsrCounter.getStringProperty(gp, "CombatClass", "");
+	}
+
+	public static String getStrengthClass(GamePiece gp) {
+		return RsrCounter.getStringProperty(gp, "StrengthClass", "");
+	}
+
+	public static String getStrengthType(GamePiece gp) {
+		return RsrCounter.getStringProperty(gp, "StrengthType", "");
+	}
+
+  public static double getStackPoints(GamePiece gp) {
+    return RsrCounter.getDoubleProperty(gp, "StackPoints", 0.0d);
+  }
+
+  public static int getSteps(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, STEPS, 0);
+	}
+
+	public static int getCurrentStep(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, PROPERTY_CURRENT_STEP, 0);
+	}
+
+  public static int getSupplyLevel(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, PROPERTY_SUPPLY_LEVEL, 0);
+	}
+
+	public static int getSupplyIsolated(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, PROPERTY_SUPPLY_ISOLATED, 0);
+	}
+
+	public static boolean isSupplyLevel(GamePiece gp, int ... types) {
+		int t = getSupplyLevel(gp);
+		for (int i=0; i<types.length; i++) {
+			if (t == types[i]) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static double getMovement(GamePiece gp) {
+		return RsrCounter.getDoubleProperty(gp, MOVEMENT, 0.0d);
+	}
+
+	public static double getMovementLeft(GamePiece gp) {
+		return RsrCounter.getDoubleProperty(gp, PROPERTY_MOVEMENT_LEFT, 0.0d);
+	}
+
+	public static String getMovementType(GamePiece gp) {
+		return RsrCounter.getStringProperty(gp, PROPERTY_MOVEMENT_TYPE, MOVEMENT_NONMOTORIZED_STRING);
+	}
+
+	public static int getMovementTypeAsInt(GamePiece gp) {
+		String s = getMovementType(gp);
+		if (s.equals(MOVEMENT_MOTORIZED_STRING)) {
+			return MOVEMENT_MOTORIZED;
+		} else
+		if (s.equals(MOVEMENT_RAIL_STRING)) {
+			return MOVEMENT_RAIL;
+		} else {
+			return MOVEMENT_NONMOTORIZED;
+		}
+	}
+
+  public static int getVP(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, VP, 0);
+  }
+
+  public static int getAttack1(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, "Attack_1", 0);
+  }
+
+  public static int getAttack2(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, "Attack_2", 0);
+  }
+
+  public static int getDefend1(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, "Defend_1", 0);
+  }
+
+  public static int getDefend2(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, "Defend_2", 0);
+  }
+
+	public static int getSupplyMode(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, PROPERTY_SUPPLY_MODE, 0);
+	}
+
+	public static int getHighlightRed(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, PROPERTY_HIGHLIGHT_RED, 0);
+	}
+
+	public static int getHighlightGreen(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, PROPERTY_HIGHLIGHT_GREEN, 0);
+	}
+
+	public static int getHighlightBlue(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, PROPERTY_HIGHLIGHT_BLUE, 0);
+	}
+
+	public static int getHighlightYellow(GamePiece gp) {
+		return RsrCounter.getIntProperty(gp, PROPERTY_HIGHLIGHT_YELLOW, 0);
+	}
+
+  public static String getStrengthID(GamePiece gp) {
+    return RsrCounter.getStringProperty(gp, PROPERTY_STRENGTH_ID, "");
+  }
+
+  public static String getStartHex(GamePiece gp) {
+    return RsrCounter.getStringProperty(gp, PROPERTY_START_HEX, "");
+  }
+
+  public static double getStartMovementLeft(GamePiece gp) {
+		return RsrCounter.getDoubleProperty(gp, PROPERTY_START_MOVEMENT_LEFT, 0.0d);
+	}
+
+  public static int getMoveIndex(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, PROPERTY_MOVE_INDEX, 0);
+  }
+
+  public static int getAttacker(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, ATTACKER, 0);
+  }
+
+  public static int getDefender(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, DEFENDER, 0);
+  }
+
+  public static int getVictorious(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, VICTORIOUS, 0);
+  }
+
+  public static int getDefeated(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, DEFEATED, 0);
+  }
+
 }


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

Revision: 5624
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5624&view=rev
Author:   morvael
Date:     2009-05-14 15:13:43 +0000 (Thu, 14 May 2009)

Log Message:
-----------
Movement improved, some initial code to deal with combat (a lot of it is not completed yet).

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/CombatHexList.java
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java
    VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
    VSQL-src/branches/morvael/rsr/RsrPieceMover.java
    VSQL-src/branches/morvael/rsr/RsrTrait.java

Added Paths:
-----------
    VSQL-src/branches/morvael/rsr/RsrAdvanceCombat.java

Modified: VSQL-src/branches/morvael/rsr/CombatHexList.java
===================================================================
--- VSQL-src/branches/morvael/rsr/CombatHexList.java	2009-05-13 22:07:00 UTC (rev 5623)
+++ VSQL-src/branches/morvael/rsr/CombatHexList.java	2009-05-14 15:13:43 UTC (rev 5624)
@@ -1,18 +1,25 @@
 package rsr;
 
+import VASSAL.build.module.map.boardPicker.board.MapGrid.BadCoords;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
+import terrain.HexRef;
+import terrain.TerrainHexGrid;
 
 /**
  *
  * @author Dominik
  */
-public class CombatHexList {
+public class CombatHexList implements Iterable<String> {
 
   protected LinkedHashSet<String> hexes = new LinkedHashSet<String>();
 
   public CombatHexList(String list) {
-    for (String s : list.split(",")) {
-      hexes.add(s);
+    if (list.length() > 0) {
+      for (String s : list.split(",")) {
+        hexes.add(s);
+      }
     }
   }
 
@@ -41,4 +48,21 @@
     return sb.toString();
   }
 
+  public HashSet<HexRef> getHexes() {
+    TerrainHexGrid grid = RsrAdvance.getInstance().getMainGrid();
+    HashSet<HexRef> result = new HashSet<HexRef>();
+    for (String s : hexes) {
+      try {
+        result.add(grid.getHexPos(grid.getLocation(s)));
+      } catch (BadCoords e) {
+
+      }
+    }
+    return result;
+  }
+
+  public Iterator<String> iterator() {
+    return hexes.iterator();
+  }
+
 }

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-13 22:07:00 UTC (rev 5623)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-14 15:13:43 UTC (rev 5624)
@@ -2,8 +2,6 @@
 
 import VASSAL.build.GameModule;
 import VASSAL.build.module.Map;
-import VASSAL.build.module.map.boardPicker.Board;
-import VASSAL.build.module.map.boardPicker.board.MapGrid;
 import VASSAL.command.Command;
 import java.awt.Point;
 import terrain.TerrainMapShaderRule;
@@ -17,7 +15,6 @@
 import java.util.Iterator;
 import javax.swing.KeyStroke;
 import terrain.HexRef;
-import terrain.TerrainHexGrid;
 import terrain.TerrainMapShader;
 import terrain.TerrainMapShaderCost;
 
@@ -193,7 +190,7 @@
 
   private void executeLeavePhase() {
     //commandLog("Leave " + rules.getPhaseName());
-    executePartPhase(RsrGlobal.getPhaseParts(dataPiece));
+    executePartPhase(RsrGlobal.getPhaseParts(dataPiece) + 1);
   }
 
   private void executeEnterPhase() {
@@ -298,7 +295,7 @@
     }
     count = 0;
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=Depot")) {
-      commandSetProperty(gp, RsrTrait.PROPERTY_HIGHLIGHT_GREEN, 1);
+      commandAllowAction(gp);
       count++;
     }
     if (count > 0) {
@@ -399,12 +396,10 @@
         d6 = ran.nextInt(6) + 1;
         hr = mainGrid.getHexPos(gp.getPosition());
         tt = rules.getHexTerrainName(hr);
-        if (tt.equals(RsrMapShaderBase.HEX_MINORCITY)) {
+        if (rules.isMinorCity(tt)) {
           d6++;
-        } else if (tt.equals(RsrMapShaderBase.HEX_MAJORCITY)) {
+        } else if (rules.isMajorCity(tt)) {
           d6 += 2;
-        } else if ((tt.equals(RsrMapShaderBase.HEX_SEVASTOPOL)) && (rules.isCityDestroyed(RsrMapShaderBase.TAG_CITY_SEVASTOPOL) == false)) {
-          d6 += 2;
         }
         if (rules.isWinter()) {
           side = RsrTrait.getSide(gp);
@@ -579,129 +574,203 @@
     }
   }
 
+  @Override
+  public void sendAndLog() {
+    if (c != null) {
+      allowedMovement.clear();
+      //TODO: add commands cache
+      GameModule.getGameModule().sendAndLog(c);
+      c = null;
+    }
+  }
+
   /**
-   * Checks if given list of pieces can be moved together.
-   * @param m
-   * @param pieces
-   * @return
+   * Leaves on list only those pieces that can move, then if they are on the
+   * main map, selects the intersection of their individual movement zones.
+   * If the zone is not empty, displays it on the map, otherwise clears the
+   * list of pieces to prevent any movement. In debug mode, every piece can
+   * be moved anywhere (no check). Used by RsrPieceMover.
+   * @param map Map on which the movement is occuring.
+   * @param pieces List of pieces that want to be moved together.
+   * @see rsr.RsrPieceMover
    */
-  public boolean isValidSource(Map m, ArrayList<GamePiece> pieces) {
+  public void selectPiecesToMove(Map map, ArrayList<GamePiece> pieces) {
     if (isDebug()) {
-      return true;
+      return;
     }
-    int size = pieces.size();
     Iterator<GamePiece> it = pieces.iterator();
     while (it.hasNext()) {
-      if (isMovementAllowedFor(m, it.next()) == false) {
+      if (isPieceMoveable(map, it.next()) == false) {
         it.remove();
       }
     }
-    HashSet<HexRef> all = new HashSet<HexRef>();
-    RsrAllowedMovement am;
-    boolean first = true;
-    for (GamePiece gp : pieces) {
-      am = allowedMovement.get(gp);
-      if (first) {
-        all.addAll(am.getAllowedHexes());
-        first = false;
-      } else {
-        all.retainAll(am.getAllowedHexes());
-      }
+    if ((pieces.size() == 0) || (map != mainMap)) {
+      return;
     }
+    HashSet<HexRef> targets = new HashSet<HexRef>();
+    targets.addAll(allowedMovement.get(pieces.get(0)).getAllowedHexes());
     if (pieces.size() > 1) {
-      Iterator<HexRef> ita = all.iterator();
-      while (ita.hasNext()) {
-        if (isTargetAllowedForStack(m, ita.next(), pieces) == false) {
-          ita.remove();
+      for (int i=1; i<pieces.size(); i++) {
+        targets.retainAll(allowedMovement.get(pieces.get(i)).getAllowedHexes());
+      }
+      Iterator<HexRef> itt = targets.iterator();
+      while (itt.hasNext()) {
+        if (testTargetForStack(itt.next(), pieces, true) == false) {
+          itt.remove();
         }
       }
     }
-    if (all.size() > 0) {
-      shaderAny.setShadedHexes(all);
+    if (targets.size() > 0) {
+      shaderAny.setShadedHexes(targets);
+    } else {
+      pieces.clear();
     }
-    return size == pieces.size();
   }
 
-  public boolean isValidTarget(Map m, Point p, ArrayList<GamePiece> pieces) {
-    if (isDebug()) {
+  public void clearMovementHighlight() {
+    shaderAny.setShadedHexes(null);
+  }
+  
+  /**
+   * Checks if a piece can be moved, and calculates it's movement zone if it
+   * has not been done yet. The cache is cleared after each logged command.
+   * Used by selectPiecesToMove. Pieces that want to be moved at all must first
+   * be marked by commandAllowMovement.
+   * @param map Map on which the movement is occuring.
+   * @param gp Piece that wants to be moved.
+   * @return true if the gp can be moved, false otherwise.
+   */
+  private boolean isPieceMoveable(Map map, GamePiece gp) {
+    boolean normalMoveAllowed = RsrTrait.getHighlightBlue(gp) > 0;
+    boolean retreatMoveAllowed = (RsrGlobal.getCombatStage(dataPiece) == 4) && (RsrTrait.getRetreating(gp) > 0);
+    boolean advanceMoveAllowed = (RsrGlobal.getCombatStage(dataPiece) == 6) && (RsrTrait.getAdvancing(gp) > 0);
+    if ((normalMoveAllowed == false) && (retreatMoveAllowed == false) && (advanceMoveAllowed == false)) {
+      return false;
+    } else if (allowedMovement.containsKey(gp)) {
       return true;
-    }
-    Board b = m.findBoard(p);
-    if (b == null) {
-      return false;
-    }
-    MapGrid mg = b.getGrid();
-    if (mg instanceof TerrainHexGrid) {
-      HexRef hr = ((TerrainHexGrid) mg).getHexPos(p);
-      int size = pieces.size();
-      Iterator<GamePiece> it = pieces.iterator();
-      while (it.hasNext()) {
-        RsrAllowedMovement am = allowedMovement.get(it.next());
-        if ((am == null) || (am.isAllowed(hr) == false)) {
-          it.remove();
+    } else {
+      if (retreatMoveAllowed) {
+        //TODO: change this to real retreat shader
+        if (allowMovement(gp, getCombatHex(gp), RsrTrait.getRetreating(gp))) {
+          moveMode = MOVE_ONCE;
+          return true;
         }
-      }
-      boolean result = (size == pieces.size()) && (isTargetAllowedForStack(m, hr, pieces));
-      if (result) {
-        if (moveMode == MOVE_UNTIL_NEXT) {
-          commandSetMovementIndex(pieces);
+      } else
+      if (advanceMoveAllowed) {
+        //TODO: change this to real advance shader
+        if (allowMovement(gp, getCombatHex(gp), RsrTrait.getAdvancing(gp))) {
+          moveMode = MOVE_ONCE;
+          return true;
         }
-        for (GamePiece gp : pieces) {
-          allowedMovement.get(gp).movementDone(hr);
-          if (moveMode == MOVE_ONCE) {
-            commandDisallowMovement(gp);
+      } else {
+        String phaseName = rules.getPhaseName();
+        int phasePart = RsrGlobal.getPhasePart(dataPiece) - 1;
+        if (phaseName.equals(PHASE_SUPPLY)) {
+          if (phasePart == 1) {
+            GamePiece bgp = getSinglePiece(mainMap, "Type=Airbase&&FleetNumber=" + RsrTrait.getFleetNumber(gp));
+            if ((bgp != null) && (allowMovement(gp, getStartHex(gp), RsrTrait.getRange(bgp)))) {
+              return true;
+            }
           }
+        } else if (phaseName.equals(PHASE_AXIS_MOVEMENT)) {
+          if (phasePart == 2) {
+            if (allowMovement(gp, shaderStrategicShading, false)) {
+              return true;
+            }
+          } else if ((phasePart == 3) || (phasePart == 4)) {
+            if (allowMovement(gp, shaderMovementShading, true)) {
+              return true;
+            }
+          }
         }
       }
-      return result;
-    } else {
+      commandDisallowMovement(gp);
       return false;
     }
   }
 
-  public void clearShadedHexes() {
-    shaderAny.setShadedHexes(null);
-  }
-
-  @Override
-  public void sendAndLog() {
-    if (c != null) {
-      allowedMovement.clear();
-      //TODO: add commands cache
-      GameModule.getGameModule().sendAndLog(c);
-      c = null;
+  /**
+   * Checks if all pieces can be dropped together at given point on the main
+   * map. If yes, then adds commands that are required for movement completion.
+   * In debug mode, every piece can be dropped anywhere (no check). Used by
+   * RsrPieceMover.
+   * @param map Map on which the movement is occuring.
+   * @param p Drop point.
+   * @param pieces List of pieces that want to be dropped together.
+   * @return true if pieces can be dropped, false otherwise.
+   */
+  public boolean isValidTarget(Map map, Point p, ArrayList<GamePiece> pieces) {
+    if (isDebug()) {
+      return true;
     }
-  }
-
-  private boolean isMovementAllowedFor(Map map, GamePiece gp) {
-    if (RsrTrait.getHighlightBlue(gp) == 0) {
+    if (map != mainMap) {
       return false;
-    } else if (allowedMovement.containsKey(gp)) {
-      return true;
-    } else {
-      String phaseName = rules.getPhaseName();
-      int phasePart = RsrGlobal.getPhasePart(dataPiece) - 1;
-      if (phaseName.equals(PHASE_SUPPLY)) {
-        if (phasePart == 1) {
-          GamePiece bgp = getSinglePiece(mainMap, "Type=Airbase&&FleetNumber=" + RsrTrait.getFleetNumber(gp));
-          if ((bgp != null) && (allowMovement(gp, RsrTrait.getRange(bgp)))) {
-            return true;
+    }
+    HexRef hr = mainGrid.getHexPos(p);    
+    RsrAllowedMovement am;
+    for (GamePiece gp : pieces) {
+      am = allowedMovement.get(gp);
+      if ((am == null) || (am.isAllowed(hr) == false)) {
+        return false;
+      }
+    }
+    boolean result = testTargetForStack(hr, pieces, false);
+    if (result) {
+      if (moveMode == MOVE_UNTIL_NEXT) {
+        commandSetMovementIndex(pieces);
+      }
+      for (GamePiece gp : pieces) {
+        allowedMovement.get(gp).movementDone(hr);
+        if (moveMode == MOVE_ONCE) {
+          int combatStage = RsrGlobal.getCombatStage(dataPiece);
+          if (combatStage == 4) {
+            commandSetProperty(gp, RsrTrait.RETREATING, 0);
+          } else if (combatStage == 6) {
+            commandSetProperty(gp, RsrTrait.ADVANCING, 0);
+          } else {
+            commandDisallowMovement(gp);
           }
         }
-      } else if (phaseName.equals(PHASE_AXIS_MOVEMENT)) {
-        if (phasePart == 2) {
-          if (allowMovement(gp, shaderStrategicShading, false)) {
-            return true;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * 
+   * @param hr
+   * @param pieces
+   * @param test
+   * @return
+   */
+  private boolean testTargetForStack(HexRef hr, ArrayList<GamePiece> pieces, boolean test) {
+    GamePiece fgp = pieces.get(0);
+    RsrAllowedMovement am = allowedMovement.get(fgp);
+    TerrainMapShaderCost cost = am.getCost(hr);
+    if (cost != null) {
+      String flag = cost.getFlag();
+      if (flag != null) {
+        if (flag.equals(RsrMapShaderBase.MODE_OVERRUN)) {
+          String firstHex = RsrTrait.getStartHex(fgp);
+          String firstMovementType = RsrTrait.getMovementType(fgp);
+          for (int i=1; i<pieces.size(); i++) {
+            if (firstHex.equals(RsrTrait.getStartHex(pieces.get(i))) == false) {
+              return false;
+            }
+            if (firstMovementType.equals(RsrTrait.getMovementType(pieces.get(i))) == false) {
+              return false;
+            }
           }
-        } else if ((phasePart == 3) || (phasePart == 4)) {
-          if (allowMovement(gp, shaderMovementShading, true)) {
+          if (test == false) {
+            commandAddToCombat(pieces, hr, true);
+            return false;
+          } else {
             return true;
           }
         }
       }
-      commandDisallowMovement(gp);
-      return false;
     }
+    return true;
   }
 
   /**
@@ -711,9 +780,8 @@
    * @param range
    * @return
    */
-  private boolean allowMovement(GamePiece gp, int range) {
+  private boolean allowMovement(GamePiece gp, HexRef startHex, int range) {
     moveMode = MOVE_FREE;
-    HexRef startHex = getStartHex(gp);
     if ((startHex == null) || (range < 1)) {
       return false;
     }
@@ -751,42 +819,6 @@
     }
   }
 
-  private boolean isTargetAllowedForStack(Map map, HexRef hr, ArrayList<GamePiece> pieces) {
-    if (pieces.size() == 0) {
-      return false;
-    }
-    RsrAllowedMovement am = allowedMovement.get(pieces.get(0));
-    TerrainMapShaderCost cost = am.getCost(hr);
-    if (cost != null) {
-      String flag = cost.getFlag();
-      if (flag != null) {
-        if (flag.equals(RsrMapShaderBase.MODE_OVERRUN)) {
-          boolean first = true;
-          String firstHex = "";
-          String firstMovementType = "";
-          for (GamePiece gp : pieces) {
-            if (first) {
-              firstHex = RsrTrait.getStartHex(gp);
-              firstMovementType = RsrTrait.getMovementType(gp);
-              first = false;
-            } else {
-              if (firstHex.equals(RsrTrait.getStartHex(gp)) == false) {
-                return false;
-              }
-              if (firstMovementType.equals(RsrTrait.getMovementType(gp)) == false) {
-                return false;
-              }
-            }
-          }
-          commandLogMy("Overrun in space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + ".");
-          commandAddToCombat(pieces, hr, true);
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-
   public KeyCommand[] getCommands(RsrTrait trait, GamePiece gp) {
     commands.clear();
     if (rules != null) {
@@ -801,6 +833,12 @@
           commands.add(new KeyCommand("Convert Depot", KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK), gp, trait));
         }
       }
+      if ((RsrGlobal.getCombatStage(dataPiece) == 2) && (RsrTrait.getDefender(gp) > 0) && ((RsrGlobal.getDefenderLoss(dataPiece) > 0) || (RsrGlobal.getDefenderRetreat(dataPiece) > 0))) {
+        commands.add(new KeyCommand("Step loss", KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_DOWN_MASK), gp, trait));
+      }
+      if ((RsrGlobal.getCombatStage(dataPiece) == 3) && (RsrTrait.getAttacker(gp) > 0) && ((RsrGlobal.getAttackerLoss(dataPiece) > 0) || (RsrGlobal.getAttackerRetreat(dataPiece) > 0))) {
+        commands.add(new KeyCommand("Step loss", KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_DOWN_MASK), gp, trait));
+      }
       return commands.toArray(commandsArray);
     } else {
       return commandsArray;
@@ -811,6 +849,12 @@
     String name = kc.getName();
     if (name.equals("Delete")) {
       commandDelete(gp);
+    } else if (name.equals("Step loss")) {
+      int combatStage = RsrGlobal.getCombatStage(dataPiece);
+      if ((combatStage == 2) || (combatStage == 3)) {
+        commandCombatStepLoss(gp);
+      }
+      commandStepLoss(gp);
     } else if (name.equals("Remove Depot")) {
       commandLogMy("Voluntarily removed supply depot in " + mainGrid.locationName(gp.getPosition()) + ".");
       commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");

Added: VSQL-src/branches/morvael/rsr/RsrAdvanceCombat.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceCombat.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceCombat.java	2009-05-14 15:13:43 UTC (rev 5624)
@@ -0,0 +1,39 @@
+package rsr;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-05-14
+ */
+public class RsrAdvanceCombat implements RsrButtonCommand {
+
+  private static RsrAdvanceCombat instance;
+
+  public static RsrAdvanceCombat getInstance() {
+    if (instance == null) {
+      new RsrAdvanceCombat();
+    }
+    return instance;
+  }
+
+  public RsrAdvanceCombat() {
+    if (instance == null) {
+      instance = this;
+    }
+  }
+
+  public RsrButtonCommand getDesiredInstance() {
+    return RsrAdvanceCombat.getInstance();
+  }
+
+  public void execute(String param) {
+    if (param.equals("clear")) {
+      RsrAdvance.getInstance().commandClearCombat();
+      RsrAdvance.getInstance().sendAndLog();
+    } else if (param.equals("advance")) {
+      RsrAdvance.getInstance().commandResolveCombat();
+      RsrAdvance.getInstance().sendAndLog();
+    }
+  }
+
+}

Modified: VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java	2009-05-13 22:07:00 UTC (rev 5623)
+++ VSQL-src/branches/morvael/rsr/RsrAllowedMovement.java	2009-05-14 15:13:43 UTC (rev 5624)
@@ -2,6 +2,7 @@
 
 import VASSAL.counters.GamePiece;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Set;
 import terrain.HexRef;
 import terrain.TerrainMapShaderCost;
@@ -20,7 +21,14 @@
   public RsrAllowedMovement(GamePiece gp, HashMap<HexRef, TerrainMapShaderCost> area, boolean substractCost) {
     this.gp = gp;
     this.area = area;
-    this.area2 = area.keySet();
+    this.area2 = new HashSet<HexRef>();
+    TerrainMapShaderCost cost;
+    for (HexRef hr : area.keySet()) {
+      cost = area.get(hr);
+      if (cost.isTraceOnly() == false) {
+        area2.add(hr);
+      }
+    }
     this.substractCost = substractCost;
   }
 

Modified: VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java	2009-05-13 22:07:00 UTC (rev 5623)
+++ VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java	2009-05-14 15:13:43 UTC (rev 5624)
@@ -18,6 +18,7 @@
 import VASSAL.build.module.map.boardPicker.board.mapgrid.Zone;
 import java.awt.Rectangle;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.Random;
 import terrain.HexRef;
 import terrain.TerrainHexGrid;
@@ -459,6 +460,14 @@
     }
   }
 
+  public void commandAllowAction(GamePiece gp) {
+    commandSetProperty(gp, RsrTrait.PROPERTY_HIGHLIGHT_GREEN, 1);
+  }
+
+  public void commandDisallowAction(GamePiece gp) {
+    commandSetProperty(gp, RsrTrait.PROPERTY_HIGHLIGHT_GREEN, 0);
+  }
+
   public void commandAllowMovement(GamePiece gp, double mp) {
     commandSetProperty(gp, RsrTrait.PROPERTY_MOVEMENT_LEFT, mp, RsrTrait.PROPERTY_HIGHLIGHT_BLUE, 1, RsrTrait.PROPERTY_START_HEX, mainGrid.locationName(gp.getPosition()), RsrTrait.PROPERTY_START_MOVEMENT_LEFT, mp, RsrTrait.PROPERTY_MOVE_INDEX, 0);
   }
@@ -498,6 +507,44 @@
     return null;
   }
 
+  public HexRef getCombatHex(GamePiece gp) {
+    if (gp.getMap() == mainMap) {
+      String startHex = RsrTrait.getCombatHex(gp);
+      if (startHex.length() > 0) {
+        try {
+          return mainGrid.getHexPos(mainGrid.getLocation(startHex));
+        } catch (MapGrid.BadCoords e) {
+          return null;
+        }
+      }
+    }
+    return null;
+  }
+
+  public void commandClearCombat() {
+    int combatStage = RsrGlobal.getCombatStage(dataPiece);
+    if ((combatStage == 1) || (combatStage == 6)) {
+      commandLogMy("Combat " + (combatStage == 1 ? "cancelled" : "ended") + ".");
+      for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, RsrTrait.ATTACKER + ">0||" + RsrTrait.DEFENDER + ">0||" + RsrTrait.RETREATING + ">0||" + RsrTrait.ADVANCING + ">0")) {
+        commandSetProperty(gp, RsrTrait.ATTACKER, 0,
+                               RsrTrait.DEFENDER, 0,
+                               RsrTrait.RETREATING, 0,
+                               RsrTrait.ADVANCING, 0);
+      }
+      //set combat parameters
+      commandSetProperty(dataPiece, RsrGlobal.COMBAT_STAGE, 0,
+                                    RsrGlobal.COMBAT_MODE, 0,
+                                    RsrGlobal.ATTACKER_HEXES, "",
+                                    RsrGlobal.DEFENDER_HEXES, "",
+                                    RsrGlobal.ATTACKER_LOSS, 0,
+                                    RsrGlobal.ATTACKER_RETREAT, 0,
+                                    RsrGlobal.DEFENDER_LOSS, 0,
+                                    RsrGlobal.DEFENDER_RETREAT, 0,
+                                    RsrGlobal.ATTACKER_LOST, 0,
+                                    RsrGlobal.DEFENDER_LOST, 0);
+    }
+  }
+
   /**
    *
    * @param pieces List of moving pieces (stack) that must come from one hex
@@ -505,41 +552,306 @@
    * @param overrun Is this an overrun combat?
    */
   public void commandAddToCombat(ArrayList<GamePiece> pieces, HexRef target, boolean overrun) {
-    if (pieces.size() == 0) {
+    int combatStage = RsrGlobal.getCombatStage(dataPiece);
+    //do not add more units to combat if overrun combat already set-up or combat is on further stages
+    if ((RsrGlobal.getCombatMode(dataPiece) == 1) || (combatStage > 1)) {
       return;
     }
     GamePiece firstAttacker = pieces.get(0);
+
     String attackerSide = RsrTrait.getSide(firstAttacker);
     String defenderSide = attackerSide.equals(RsrMapShaderBase.SIDE_AXIS) ? RsrMapShaderBase.SIDE_SOVIET : RsrMapShaderBase.SIDE_AXIS;
+
     HexRef source = mainGrid.getHexPos(firstAttacker.getPosition());
+
     String attackerHex = mainGrid.locationName(mainGrid.getHexCenter(source.getColumn(), source.getRow()));
     String defenderHex = mainGrid.locationName(mainGrid.getHexCenter(target.getColumn(), target.getRow()));
-    
+
     CombatHexList attackerHexes = new CombatHexList(RsrGlobal.getAttackerHexes(dataPiece));
     CombatHexList defenderHexes = new CombatHexList(RsrGlobal.getDefenderHexes(dataPiece));
     
     attackerHexes.add(attackerHex);
     defenderHexes.add(defenderHex);
-    
+
+    //do not add more units to combat if it would cause more than 1 hex involved per side (only one-to-many and many-to-one allowed)
     if ((attackerHexes.size() > 1) && (defenderHexes.size() > 1)) {
       return;
     }
 
-    if (RsrGlobal.getCombatStage(dataPiece) == 0) {
-      for (GamePiece gp : pieces) {
-        commandSetProperty(gp, RsrTrait.ATTACKER, 1);
+    int strength;
+    LinkedHashMap<GamePiece, Integer> strengthA = new LinkedHashMap<GamePiece, Integer>();
+    LinkedHashMap<GamePiece, Integer> strengthD = new LinkedHashMap<GamePiece, Integer>();
+    for (GamePiece gp : pieces) {
+      if (RsrTrait.getAttacker(gp) == 0) {
+        strength = rules.getAttackStrength(gp, true);
+        if (strength != 0) {
+          strengthA.put(gp, strength);
+        }
       }
-      for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Side=" + defenderSide + "&&LocationName=" + defenderHex)) {
-        commandSetProperty(gp, RsrTrait.DEFENDER, 1);
+    }
+    if (strengthA.size() == 0) {
+      return;
+    }
+    for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Side=" + defenderSide + "&&LocationName=" + defenderHex)) {
+      if (RsrTrait.getDefender(gp) == 0) {
+        strength = rules.getDefendStrength(gp, true);
+        if (strength != 0) {
+          strengthD.put(gp, strength);
+        }
       }
-    } else {
-
     }
-
+    if (strengthD.size() == 0) {
+      return;
+    }
+    if (combatStage == 0) {
+      commandLogMy((overrun ? "Overrun combat" : "Combat") + " initiated in space " + defenderHex + ".");
+    }
+    for (GamePiece gp : strengthA.keySet()) {
+      commandSetProperty(gp, RsrTrait.ATTACKER, 1, RsrTrait.COMBAT_HEX, attackerHex);
+      strength = strengthA.get(gp).intValue();
+      if (strength > 0) {
+        commandLogMy(gp.getName() + " will attack with strength " + strength + ".");
+      } else {
+        commandLogMy(gp.getName() + " will attack with unknown strength.");
+      }
+    }
+    for (GamePiece gp : strengthD.keySet()) {
+      commandSetProperty(gp, RsrTrait.DEFENDER, 1, RsrTrait.COMBAT_HEX, defenderHex);
+      strength = strengthD.get(gp).intValue();
+      if (strength > 0) {
+        commandLogMy(gp.getName() + " will defend with strength " + strength + ".");
+      } else {
+        commandLogMy(gp.getName() + " will defend with unknown strength.");
+      }
+    }
     commandSetProperty(dataPiece, RsrGlobal.COMBAT_STAGE, 1,
                                   RsrGlobal.COMBAT_MODE, overrun ? 1 : 0,
                                   RsrGlobal.ATTACKER_HEXES, attackerHexes.toString(),
                                   RsrGlobal.DEFENDER_HEXES, defenderHexes.toString());
   }
+
+  public void commandResolveCombat() {
+    int combatStage = RsrGlobal.getCombatStage(dataPiece);
+    int combatMode = RsrGlobal.getCombatMode(dataPiece);
+    ArrayList<GamePiece> attackers = TerrainMapShaderRule.filterPieces(mainMap, RsrTrait.ATTACKER + ">0");
+    ArrayList<GamePiece> defenders = TerrainMapShaderRule.filterPieces(mainMap, RsrTrait.DEFENDER + ">0");
+    CombatHexList attackerHexes = new CombatHexList(RsrGlobal.getAttackerHexes(dataPiece));
+    CombatHexList defenderHexes = new CombatHexList(RsrGlobal.getDefenderHexes(dataPiece));
+    if (combatStage == 1) {
+      //combatMode += 2 if urban mech loss is to be applied
+      commandLogMy("Combat resolution");
+      String result = rules.getCombatResult(attackers, defenders, attackerHexes, defenderHexes);
+      int al = 0;
+      int ar = 0;
+      int dl = 0;
+      int dr = 0;
+      if (result.equals("NE")) {
+        //NO EFFECT
+      } else if (result.equals("DE")) {
+        //DEFENDER ELIMINATED
+        for (GamePiece gp : defenders) {
+          commandEliminate(gp);
+        }
+        defenders.clear();
+      } else if (result.equals("AE")) {
+        //ATTACKER ELIMINATED
+        for (GamePiece gp : attackers) {
+          commandEliminate(gp);
+        }
+        attackers.clear();
+      } else if ((result.equals("D1")) || (result.equals("D2")) || (result.equals("D3"))) {
+        //DEFENDER RETREAT
+        if (result.equals("D1")) {
+          dr = 1;
+        } else if (result.equals("D2")) {
+          dr = 2;
+        } else {
+          dr = 3;
+        }
+      } else if ((result.equals("A1")) || (result.equals("A2"))) {
+        //ATTACKER RETREAT
+        if (result.equals("A1")) {
+          ar = 1;
+        } else {
+          ar = 2;
+        }
+      } else {
+        //MANDATORY STEP LOSS
+        if (result.equals("2/1")) {
+          al = 2;
+          dl = 1;
+        } else if (result.equals("1/-")) {
+          al = 1;
+        } else if (result.equals("1/1")) {
+          al = 1;
+          dl = 1;
+        } else if (result.equals("1/2")) {
+          al = 1;
+          dl = 2;
+        } else {
+          al = 1;
+          dl = 3;
+        }
+      }
+      commandSetProperty(dataPiece, RsrGlobal.COMBAT_STAGE, ++combatStage,
+                                    RsrGlobal.ATTACKER_LOSS, al,
+                                    RsrGlobal.ATTACKER_RETREAT, ar,
+                                    RsrGlobal.DEFENDER_LOSS, dl,
+                                    RsrGlobal.DEFENDER_RETREAT, dr);
+    }
+    if (combatStage == 2) {
+      //defender step loss
+      if ((RsrGlobal.getDefenderLoss(dataPiece) == 0) || (defenders.size() == 0)) {
+        commandSetProperty(dataPiece, RsrGlobal.COMBAT_STAGE, ++combatStage);
+      } else {
+        commandLog("Game: Defender is required to lose " + RsrGlobal.getDefenderLoss(dataPiece) + " step(s) and optionally " + RsrGlobal.getDefenderRetreat(dataPiece) + " more.");
+        return;
+      }
+    }
+    if (combatStage == 3) {
+      //attacker step loss
+      if ((RsrGlobal.getAttackerLoss(dataPiece) == 0) || (attackers.size() == 0)) {
+        commandSetProperty(dataPiece, RsrGlobal.COMBAT_STAGE, ++combatStage);
+      } else {
+        commandLog("Game: Attacker is required to lose " + RsrGlobal.getAttackerLoss(dataPiece) + " step(s) and optionally " + RsrGlobal.getAttackerRetreat(dataPiece) + " more.");
+        return;
+      }
+    }
+    if (combatStage == 4) {
+      //retreats
+      int dr = RsrGlobal.getDefenderRetreat(dataPiece);
+      int ar = RsrGlobal.getAttackerRetreat(dataPiece);
+      //setup parameters if it has not yet been done
+      if (dr > 0) {
+        for (GamePiece gp : defenders) {
+          //TODO: add more checks if units can retreat or not, eliminate those that can't
+          commandSetProperty(gp, RsrTrait.RETREATING, dr);
+        }
+        commandSetProperty(dataPiece, RsrGlobal.DEFENDER_RETREAT, 0);
+      }
+      if (ar > 0) {
+        for (GamePiece gp : attackers) {
+          //TODO: add more checks if units can retreat or not, eliminate those that can't
+          commandSetProperty(gp, RsrTrait.RETREATING, ar);
+        }
+        commandSetProperty(dataPiece, RsrGlobal.ATTACKER_RETREAT, 0);
+      }
+      if (TerrainMapShaderRule.filterPieces(mainMap, RsrTrait.RETREATING + ">0").size() == 0) {
+        commandSetProperty(dataPiece, RsrGlobal.COMBAT_STAGE, ++combatStage);
+      } else {
+        commandLog("Game: There are units that have to retreat.");
+        return;
+      }
+    }
+    if (combatStage == 5) {
+      //TODO: apply urban test for motorized units
+      //find victorious units
+      int victorious = 0;
+      boolean defenderVacated = false;
+      Point p = null;
+      for (String hr : defenderHexes) {
+        if (p == null) {
+          try {
+            p = mainGrid.getLocation(hr);
+          } catch (MapGrid.BadCoords e) {
+            p = null;
+          }
+        }
+        if (TerrainMapShaderRule.filterPieces(mainMap, RsrTrait.DEFENDER + ">0&&LocationName=" + hr).size() == 0) {
+          defenderVacated = true;
+          break;
+        }
+      }
+      if (defenderVacated) {
+        for (GamePiece gp : attackers) {
+          if (combatMode == 0) {
+            //TODO: add more checks if units can advance
+            if (RsrTrait.getRetreating(gp) == 0) {
+              commandSetProperty(gp, RsrTrait.ADVANCING, 1);
+              victorious++;
+            }
+          } else {
+            //in overrun, place attackers in defender hex and remove movement points for overrun
+            commandMove(mainMap, gp, p);
+            double mp = RsrTrait.getMovementLeft(gp) - rules.getOverrunCost(gp);
+            if (mp > 0.0d) {
+              commandAllowMovement(gp, mp);
+            } else {
+              commandDisallowMovement(gp);
+            }
+          }
+        }
+      } else {
+        if (combatMode == 1) {
+          //in overrun, end movement for attackers
+          for (GamePiece gp : attackers) {
+            commandDisallowMovement(gp);
+          }
+        }
+      }
+      boolean attackerVacated = false;
+      for (String hr : attackerHexes) {
+        if (TerrainMapShaderRule.filterPieces(mainMap, RsrTrait.ATTACKER + ">0&&LocationName=" + hr).size() == 0) {
+          attackerVacated = true;
+          if (combatMode == 0) {
+            //TODO: in normal combat remove all non-attacking units of attackers side on this hex
+          }
+        }
+      }
+      if (attackerVacated) {
+        for (GamePiece gp : defenders) {
+          //TODO: add more checks if units can advance
+          if (RsrTrait.getRetreating(gp) == 0) {
+            commandSetProperty(gp, RsrTrait.ADVANCING, 1);
+            victorious++;
+          }
+        }
+      }
+      //advance automatically to next step
+      commandSetProperty(dataPiece, RsrGlobal.COMBAT_STAGE, ++combatStage);
+      //if there are no units that can advance, end combat immediately
+      if (victorious == 0) {
+        commandClearCombat();
+      }
+    }
+    if (combatStage == 6) {
+      //advance
+      commandLog("Game: Advance victorious units or end combat.");
+      return;
+    }
+  }
+
+  public void commandCombatStepLoss(GamePiece gp) {
+    String property1, property2;
+    int newValue1, newValue2;
+    if (RsrTrait.getAttacker(gp) == 1) {
+      int left = RsrGlobal.getAttackerLoss(dataPiece);
+      if (left == 0) {
+        property1 = RsrGlobal.ATTACKER_RETREAT;
+        newValue1 = RsrGlobal.getAttackerRetreat(dataPiece)-1;
+      } else {
+        property1 = RsrGlobal.ATTACKER_LOSS;
+        newValue1 = left-1;
+      }
+      property2 = RsrGlobal.ATTACKER_LOST;
+      newValue2 = RsrGlobal.getAttackerLost(dataPiece)+1;
+    } else {
+      int left = RsrGlobal.getDefenderLoss(dataPiece);
+      if (left == 0) {
+        property1 = RsrGlobal.DEFENDER_RETREAT;
+        newValue1 = RsrGlobal.getDefenderRetreat(dataPiece)-1;
+      } else {
+        property1 = RsrGlobal.DEFENDER_LOSS;
+        newValue1 = left-1;
+      }
+      property2 = RsrGlobal.DEFENDER_LOST;
+      newValue2 = RsrGlobal.getDefenderLost(dataPiece)+1;
+    }
+    commandSetProperty(gp, property1, newValue1, property2, newValue2);
+  }
+
+  public TerrainHexGrid getMainGrid() {
+    return mainGrid;
+  }
   
 }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-13 22:07:00 UTC (rev 5623)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-14 15:13:43 UTC (rev 5624)
@@ -590,6 +590,14 @@
     }
   }
 
+  public boolean isMajorCity(String tt) {
+    return (tt.equals(HEX_MAJORCITY)) || ((tt.equals(HEX_SEVASTOPOL)) && (isCityDestroyed(TAG_CITY_SEVASTOPOL) == false));
+  }
+
+  public boolean isMinorCity(String tt) {
+    return (tt.equals(HEX_MINORCITY)) || ((tt.equals(HEX_SEVASTOPOL)) && (isCityDestroyed(TAG_CITY_SEVASTOPOL) == true));
+  }
+
   public boolean isMinorRiver(String et) {
     if (et.equals(EDGE_MINORRIVER)) {
       return true;
@@ -632,4 +640,114 @@
     return filterPieces(map, "Nationality!=" + NATIONALITY_GERMAN + "&&Nationality!=" + nationality + "&&LocationName=" + grid.locationName(grid.getHexCenter(hr.getColumn(), hr.getRow()))).size() == 0;
   }
 
+  public int getAttackStrength(GamePiece gp, boolean test) {
+    String type = RsrTrait.getType(gp);
+    if (isAny(type, "Airbase", "AirFleet", "Depot", "SiegeArtillery", "SecurityDivision", "Headquarters", "Partisans", "Leader", "Asset")) {
+      return 0;
+    }
+    String unitType = RsrTrait.getUnitType(gp);
+    GamePiece strengthPiece;
+    if ((unitType.startsWith("Soviet")) && (unitType.endsWith("Army"))) {
+      if (test) {
+        return -1;
+      } else {
+        String strengthID = RsrTrait.getStrengthID(gp);
+        if (strengthID.equals("")) {
+          RsrAdvance.getInstance().commandFetchCounter(gp);
+        }
+        strengthPiece = RsrAdvance.getInstance().findStrength(RsrTrait.getCombatClass(gp), RsrTrait.getStrengthID(gp));
+      }
+    } else {
+      strengthPiece = gp;
+    }
+    double strength = RsrTrait.getCurrentStep(gp) == 2 ? RsrTrait.getAttack2(strengthPiece) : RsrTrait.getAttack1(strengthPiece);
+    if (RsrTrait.isSupplyLevel(gp, RsrTrait.SUPPLY_LACK, RsrTrait.SUPPLY_OUT)) {
+      return (int)Math.ceil(strength / 2.0d);
+    } else {
+      return (int)strength;
+    }
+  }
+
+  public int getDefendStrength(GamePiece gp, boolean test) {
+    String type = RsrTrait.getType(gp);
+    if (isAny(type, "AirFleet", "Partisans")) {
+      return 0;
+    }
+    if (isAny(type, "Airbase", "Depot", "SiegeArtillery", "SecurityDivision", "Headquarters", "Leader", "Asset")) {
+      return 1;
+    }
+    String unitType = RsrTrait.getUnitType(gp);
+    GamePiece strengthPiece;
+    if ((unitType.startsWith("Soviet")) && (unitType.endsWith("Army"))) {
+      if (test) {
+        return -1;
+      } else {
+        String strengthID = RsrTrait.getStrengthID(gp);
+        if (strengthID.equals("")) {
+          RsrAdvance.getInstance().commandFetchCounter(gp);
+        }
+        strengthPiece = RsrAdvance.getInstance().findStrength(RsrTrait.getCombatClass(gp), RsrTrait.getStrengthID(gp));
+      }
+    } else {
+      strengthPiece = gp;
+    }
+    double strength = RsrTrait.getCurrentStep(gp) == 2 ? RsrTrait.getDefend2(strengthPiece) : RsrTrait.getDefend1(strengthPiece);
+    if (RsrTrait.isSupplyLevel(gp, RsrTrait.SUPPLY_OUT)) {
+      return (int)Math.ceil(strength / 2.0d);
+    } else {
+      return (int)strength;
+    }
+  }
+
+  public String getCombatResult(ArrayList<GamePiece> attackers, ArrayList<GamePiece> defenders, CombatHexList attackerHexes, CombatHexList defenderHexes) {
+    RsrAdvance core = RsrAdvance.getInstance();
+
+    int totalStrengthA = 0;
+    for (GamePiece gp : attackers) {
+      totalStrengthA += getAttackStrength(gp, false);
+    }
+    core.commandLog("Game: Total strength of attacking units is " + totalStrengthA + ".");
+
+    int totalStrengthD = 0;
+    for (GamePiece gp : defenders) {
+      totalStrengthD += getDefendStrength(gp, false);
+    }
+    core.commandLog("Game: Total strength of defending units is " + totalStrengthD + ".");
+
+    HashSet<HexRef> aH = attackerHexes.getHexes();
+    HashSet<HexRef> dH = defenderHexes.getHexes();
+
+    int totalEdges = 0;
+    int minorRiverEdges = 0;
+    int majorRiverEdges = 0;
+    String et;
+    for (HexRef ahr : aH) {
+      for (HexRef dhr : dH) {
+        et = getEdgeTerrainName(ahr, dhr);
+        if ((isMinorRiver(et)) || (isLakeSea(et))) {
+          minorRiverEdges++;
+        } else
+        if (isMajorRiver(et)) {
+          majorRiverEdges++;
+        }
+        totalEdges++;
+      }
+    }
+    if (minorRiverEdges + majorRiverEdges == totalEdges) {
+      totalStrengthD *= 2;
+      core.commandLog("Game: Major river bonus doubles defending units' strength to " + totalStrengthD + ".");
+    } else if (minorRiverEdges == totalEdges) {
+      if (totalStrengthD == 1) {
+        totalStrengthD += 1;
+      } else {
+        totalStrengthD += 2;
+      }
+      core.commandLog("Game: Minor river bonus increases defending units' strength to " + totalStrengthD + ".");
+    }
+    String result = "NE";
+    //TODO: add modifiers, calculate combat result
+    core.commandLog("Game: Combat result is " + result + ".");
+    return result;
+  }
+
 }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-05-13 22:07:00 UTC (rev 5623)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-05-14 15:13:43 UTC (rev 5624)
@@ -105,7 +105,7 @@
       if (((side.equals(SIDE_AXIS)) && (stackSize > 14.0d)) || ((side.equals(SIDE_SOVIET)) && (stackSize > 2.5d))) {
         return result(fromHex, false, 0.0d, false, MODE_MOVEMENT);
       }
-      if ((tt.equals(HEX_WATER)) || (tt.equals(HEX_SWAMP)) || (tt.equals(HEX_MOUNTAIN)) || (tt.equals(HEX_MAJORCITY)) || ((tt.equals(HEX_SEVASTOPOL)) && (isCityDestroyed(TAG_CITY_SEVASTOPOL) == false))) {
+      if ((tt.equals(HEX_WATER)) || (tt.equals(HEX_SWAMP)) || (tt.equals(HEX_MOUNTAIN)) || (isMajorCity(tt))) {
         return result(fromHex, false, 0.0d, false, MODE_MOVEMENT);
       }
       if ((isMajorRiver(et)) || ((isMinorRiver(et)) && ((getTurnNumber() > 1) || (side.equals(SIDE_SOVIET)))) || ((isLakeSea(et)) && ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)))) {

Modified: VSQL-src/branches/morvael/rsr/RsrPieceMover.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-05-13 22:07:00 UTC (rev 5623)
+++ VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-05-14 15:13:43 UTC (rev 5624)
@@ -32,15 +32,17 @@
 
       public Object visitDeck(Deck d) {
         DragBuffer.getBuffer().clear();
+        /*
         ArrayList<GamePiece> pieces = new ArrayList<GamePiece>();
         PieceIterator it = d.drawCards();
         while (it.hasMoreElements()) {
           pieces.add(it.nextPiece());
         }
-        RsrAdvance.getInstance().isValidSource(map, pieces);
+        RsrAdvance.getInstance().selectPiecesToMove(map, pieces);
         for (GamePiece gp : pieces) {
           DragBuffer.getBuffer().add(gp);
         }
+        */
         return null;
       }
 
@@ -52,6 +54,17 @@
             pieces.add(s.getPieceAt(i));
           }
         }
+        if (KeyBuffer.getBuffer().containsChild(s)) {
+          KeyBuffer.getBuffer().sort(RsrPieceMover.this);
+          Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
+          GamePiece gpi;
+          while (i.hasNext()) {
+            gpi = i.next();
+            if (gpi.getParent() != s) {
+              i.remove();
+            }
+          }
+        }
         /*
         if (KeyBuffer.getBuffer().containsChild(s)) {
           KeyBuffer.getBuffer().sort(RsrPieceMover.this);
@@ -65,7 +78,7 @@
           }
         }
         */
-        RsrAdvance.getInstance().isValidSource(map, pieces);
+        RsrAdvance.getInstance().selectPiecesToMove(map, pieces);
         for (GamePiece gp : pieces) {
           DragBuffer.getBuffer().add(gp);
         }
@@ -75,12 +88,21 @@
       public Object visitDefault(GamePiece selected) {
         DragBuffer.getBuffer().clear();
         ArrayList<GamePiece> pieces = new ArrayList<GamePiece>();
-        /*
         if (KeyBuffer.getBuffer().contains(selected)) {
           Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
           GamePiece gpi;
           while (i.hasNext()) {
             gpi = i.next();
+            if (gpi != selected) {
+              i.remove();
+            }
+          }
+        }        /*
+        if (KeyBuffer.getBuffer().contains(selected)) {
+          Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
+          GamePiece gpi;
+          while (i.hasNext()) {
+            gpi = i.next();
             if (Boolean.TRUE.equals(gpi.getProperty(Properties.NON_MOVABLE)) == false) {
               pieces.add(gpi);
             }
@@ -93,7 +115,7 @@
         /*
         }
         */
-        RsrAdvance.getInstance().isValidSource(map, pieces);
+        RsrAdvance.getInstance().selectPiecesToMove(map, pieces);
         for (GamePiece gp : pieces) {
           DragBuffer.getBuffer().add(gp);
         }
@@ -105,35 +127,29 @@
   @Override
   public void mouseReleased(MouseEvent e) {
     if (canHandleEvent(e)) {
-      if ((isClick(e.getPoint()) == false) && (isValidTarget(e.getPoint()) == true)) {
-        Point p = RsrAdvance.getInstance().getOverrideDropPoint();
-        if (p == null) {
-          p = e.getPoint();
+      Point p = e.getPoint();
+      if ((isClick(p) == false) && (DragBuffer.getBuffer().isEmpty() == false)) {
+        if (isValidTarget(p)) {
+          p = RsrAdvance.getInstance().getOverrideDropPoint();
+          performDrop(p == null ? e.getPoint() : p);
         }
-        performDrop(p);
-      } else {
         RsrAdvance.getInstance().sendAndLog();
       }
     }
-    RsrAdvance.getInstance().clearShadedHexes();
+    RsrAdvance.getInstance().clearMovementHighlight();
     dragBegin = null;
     map.getView().setCursor(null);
   }
 
   @Override
   protected void performDrop(Point p) {
-    if (DragBuffer.getBuffer().isEmpty() == false) {
-      p = map.snapTo(p);
-      PieceIterator it = DragBuffer.getBuffer().getIterator();
-      while (it.hasMoreElements()) {
-        RsrAdvance.getInstance().commandMove(map, it.nextPiece(), p);
-      }
-      RsrAdvance.getInstance().commandReportMoves();
-      RsrAdvance.getInstance().sendAndLog();
-      DragBuffer.getBuffer().clear();
-    } else {
-      RsrAdvance.getInstance().clearCommand();
+    p = map.snapTo(p);
+    PieceIterator it = DragBuffer.getBuffer().getIterator();
+    while (it.hasMoreElements()) {
+      RsrAdvance.getInstance().commandMove(map, it.nextPiece(), p);
     }
+    RsrAdvance.getInstance().commandReportMoves();
+    DragBuffer.getBuffer().clear();
   }
 
   protected boolean isValidTarget(Point p) {

Modified: VSQL-src/branches/morvael/rsr/RsrTrait.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-05-13 22:07:00 UTC (rev 5623)
+++ VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-05-14 15:13:43 UTC (rev 5624)
@@ -51,7 +51,9 @@
   public static final String PROPERTY_MOVE_INDEX = "MoveIndex"; //move index in which piece was moved (used for 3.2.g restriction)
   public static final String ATTACKER = "CombatAttacker";
   public static final String DEFENDER = "CombatDefender";
-  public static final String VICTORIOUS = "CombatVictorious";
+  public static final String COMBAT_HEX = "CombatHex";
+  public static final String RETREATING = "CombatRetreating";
+  public static final String ADVANCING = "CombatAdvancing";
   public static final String DEFEATED = "CombatDefeated";
 
 	public static final int SUPPLY_NORMAL = 0;
@@ -89,7 +91,9 @@
   private int highlightYellow = 0;
   private int attacker = 0;
   private int defender = 0;
-  private int victorious = 0;
+  private String combatHex = "";
+  private int retreating = 0;
+  private int advancing = 0;
   private int defeated = 0;
   // dynamic
   private GamePiece gp;
@@ -138,8 +142,12 @@
       return attacker;
     } else if (DEFENDER.equals(key)) {
       return defender;
-    } else if (VICTORIOUS.equals(key)) {
-      return victorious;
+    } else if (COMBAT_HEX.equals(key)) {
+      return combatHex;
+    } else if (RETREATING.equals(key)) {
+      return retreating;
+    } else if (ADVANCING.equals(key)) {
+      return advancing;
     } else if (DEFEATED.equals(key)) {
       return defeated;
     } else {
@@ -181,8 +189,12 @@
       return attacker;
     } else if (DEFENDER.equals(key)) {
       return defender;
-    } else if (VICTORIOUS.equals(key)) {
-      return victorious;
+    } else if (COMBAT_HEX.equals(key)) {
+      return combatHex;
+    } else if (RETREATING.equals(key)) {
+      return retreating;
+    } else if (ADVANCING.equals(key)) {
+      return advancing;
     } else if (DEFEATED.equals(key)) {
       return defeated;
     } else {
@@ -294,13 +306,26 @@
         defender = 0;
       }
       updateCombatLabel();
-    } else if (VICTORIOUS.equals(key)) {
+    } else if (COMBAT_HEX.equals(key)) {
       try {
-        victorious = Integer.parseInt(val.toString());
+        combatHex = val.toString();
       } catch (Exception e) {
-        victorious = 0;
+        combatHex = "";
       }
+    } else if (RETREATING.equals(key)) {
+      try {
+        retreating = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        retreating = 0;
+      }
       updateCombatLabel();
+    } else if (ADVANCING.equals(key)) {
+      try {
+        advancing = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        advancing = 0;
+      }
+      updateCombatLabel();
     } else if (DEFEATED.equals(key)) {
       try {
         defeated = Integer.parseInt(val.toString());
@@ -364,7 +389,7 @@
   }
 
   private void updateCombatLabel() {
-    if ((attacker > 0) || (defender > 0) || (victorious > 0)) {
+    if ((attacker > 0) || (defender > 0) || (retreating > 0) || (advancing > 0)) {
       highlightYellow = 1;
     } else {
       highlightYellow = 0;
@@ -416,7 +441,9 @@
     se.append(highlightYellow);
     se.append(attacker);
     se.append(defender);
-    se.append(victorious);
+    se.append(combatHex);
+    se.append(retreating);
+    se.append(advancing);
     se.append(defeated);
     return se.getValue();
   }
@@ -439,7 +466,9 @@
     highlightYellow = st.nextInt(0);
     attacker = st.nextInt(0);
     defender = st.nextInt(0);
-    victorious = st.nextInt(0);
+    combatHex = st.nextToken("");
+    retreating = st.nextInt(0);
+    advancing = st.nextInt(0);
     defeated = st.nextInt(0);
     //updateSupplyLabel();
     //updateStrengthLabel();
@@ -518,7 +547,7 @@
     }
 
     public String getState() {
-      return "0;0;;;;0;;;0;0;0;0;0;0";
+      return "0;0;;;;0;;;0;0;0;0;;0;0;0";
     }
 
     public String getType() {
@@ -550,7 +579,9 @@
       PROPERTY_MOVE_INDEX, 0,
       ATTACKER, 0,
       DEFENDER, 0,
-      VICTORIOUS, 0,
+      COMBAT_HEX, "",
+      RETREATING, 0,
+      ADVANCING, 0,
       DEFEATED, 0);
   }
 
@@ -573,7 +604,9 @@
       PROPERTY_MOVE_INDEX, getMoveIndex(from),
       ATTACKER, getAttacker(from),
       DEFENDER, getDefender(from),
-      VICTORIOUS, getVictorious(from),
+      COMBAT_HEX, getCombatHex(from),
+      RETREATING, getRetreating(from),
+      ADVANCING, getAdvancing(from),
       DEFEATED, getDefeated(from));
   }
 
@@ -735,10 +768,18 @@
     return RsrCounter.getIntProperty(gp, DEFENDER, 0);
   }
 
-  public static int getVictorious(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, VICTORIOUS, 0);
+  public static String getCombatHex(GamePiece gp) {
+    return RsrCounter.getStringProperty(gp, COMBAT_HEX, "");
   }
 
+  public static int getRetreating(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, RETREATING, 0);
+  }
+
+  public static int getAdvancing(GamePiece gp) {
+    return RsrCounter.getIntProperty(gp, ADVANCING, 0);
+  }
+
   public static int getDefeated(GamePiece gp) {
     return RsrCounter.getIntProperty(gp, DEFEATED, 0);
   }


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

Revision: 5645
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5645&view=rev
Author:   morvael
Date:     2009-05-20 15:22:45 +0000 (Wed, 20 May 2009)

Log Message:
-----------
Casualties on retreat should be substracted now. Trying to improve speed due to slow access to properties (on-going), also some refactoring done (some methods really shouldn't be in RsrMapShaderBase).

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java
    VSQL-src/branches/morvael/rsr/RsrCounter.java
    VSQL-src/branches/morvael/rsr/RsrGlobal.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
    VSQL-src/branches/morvael/rsr/RsrTrait.java

Added Paths:
-----------
    VSQL-src/branches/morvael/rsr/AirFleetCache.java
    VSQL-src/branches/morvael/rsr/Cache.java
    VSQL-src/branches/morvael/rsr/SupplyCache.java

Added: VSQL-src/branches/morvael/rsr/AirFleetCache.java
===================================================================
--- VSQL-src/branches/morvael/rsr/AirFleetCache.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/AirFleetCache.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -0,0 +1,40 @@
+package rsr;
+
+import VASSAL.build.module.Map;
+import VASSAL.counters.GamePiece;
+import java.util.HashSet;
+import terrain.HexRef;
+import terrain.TerrainHexGrid;
+import terrain.TerrainMapShaderRule;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-05-20
+ */
+public final class AirFleetCache extends Cache {
+
+  private RsrMapShaderBase rules;
+  private Map mainMap;
+  private TerrainHexGrid mainGrid;
+
+  public AirFleetCache(RsrMapShaderBase rules, Map mainMap, TerrainHexGrid mainGrid) {
+    this.rules = rules;
+    this.mainMap = mainMap;
+    this.mainGrid = mainGrid;
+  }
+
+  @Override
+  protected HashSet<HexRef> calculate1(String id) {
+    HashSet<HexRef> result = new HashSet<HexRef>();
+    for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=AirFleet")) {
+      result.addAll(rules.getHexesInRange(mainGrid.getHexPos(gp.getPosition()), RsrTrait.getRange(gp)));
+    }
+    return result;
+  }
+
+  public HashSet<HexRef> getAirFleetSupportZone() {
+    return get1();
+  }
+
+}

Added: VSQL-src/branches/morvael/rsr/Cache.java
===================================================================
--- VSQL-src/branches/morvael/rsr/Cache.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/Cache.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -0,0 +1,134 @@
+package rsr;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import terrain.HexRef;
+import terrain.TerrainMapShaderCost;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-05-20
+ */
+public abstract class Cache {
+
+  private HashMap<String, HashSet<HexRef>> map1;
+  private HashMap<String, HashMap<HexRef, TerrainMapShaderCost>> map2;
+  private HashMap<String, RsrAllowedMovement> map3;
+
+  public Cache() {
+
+  }
+
+  public void clear() {
+    if (map1 != null) {
+      map1.clear();
+    }
+    if (map2 != null) {
+      map2.clear();
+    }
+    if (map3 != null) {
+      map3.clear();
+    }
+  }
+
+  /*
+  public void invalidate() {
+    invalidate(null);
+  }
+  
+  public void invalidate(String id) {
+    if (map1 != null) {
+      map1.remove(id);
+    }
+    if (map2 != null) {
+      map2.remove(id);
+    }
+    if (map3 != null) {
+      map3.remove(id);
+    }
+  }
+  */
+
+  private void update1(String id, HashSet<HexRef> data) {
+    if (map1 == null) {
+      map1 = new HashMap<String, HashSet<HexRef>>();
+    }
+    map1.put(id, data);
+  }
+
+  private void update2(String id, HashMap<HexRef, TerrainMapShaderCost> data) {
+    if (map2 == null) {
+      map2 = new HashMap<String, HashMap<HexRef, TerrainMapShaderCost>>();
+    }
+    map2.put(id, data);
+  }
+
+  private void update3(String id, RsrAllowedMovement data) {
+    if (map3 == null) {
+      map3 = new HashMap<String, RsrAllowedMovement>();
+    }
+    map3.put(id, data);
+  }
+
+  protected HashSet<HexRef> get1() {
+    return get1(null);
+  }
+
+  protected HashSet<HexRef> get1(String id) {
+    HashSet<HexRef> result = null;
+    if (map1 != null) {
+      result = map1.get(id);
+    }
+    if ((result == null) && ((map1 == null) || (map1.containsKey(id) == false))) {
+      result = calculate1(id);
+      update1(id, result);
+    }
+    return result;
+  }
+
+  protected HashMap<HexRef, TerrainMapShaderCost> get2() {
+    return get2(null);
+  }
+
+  protected HashMap<HexRef, TerrainMapShaderCost> get2(String id) {
+    HashMap<HexRef, TerrainMapShaderCost> result = null;
+    if (map2 != null) {
+      result = map2.get(id);
+    }
+    if ((result == null) && ((map2 == null) || (map2.containsKey(id) == false))) {
+      result = calculate2(id);
+      update2(id, result);
+    }
+    return result;
+  }
+
+  protected RsrAllowedMovement get3() {
+    return get3(null);
+  }
+
+  protected RsrAllowedMovement get3(String id) {
+    RsrAllowedMovement result = null;
+    if (map3 != null) {
+      result = map3.get(id);
+    }
+    if ((result == null) && ((map3 == null) || (map3.containsKey(id) == false))) {
+      result = calculate3(id);
+      update3(id, result);
+    }
+    return result;
+  }
+
+  protected HashSet<HexRef> calculate1(String id) {
+    return null;
+  }
+
+  protected HashMap<HexRef, TerrainMapShaderCost> calculate2(String id) {
+    return null;
+  }
+
+  protected RsrAllowedMovement calculate3(String id) {
+    return null;
+  }
+
+}

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-19 15:19:51 UTC (rev 5644)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -103,7 +103,7 @@
 
   private void executeSetPhaseParts() {
     commandSetProperty(dataPiece, RsrGlobal.PROPERTY_PHASE_PART, 1);
-    String phaseName = rules.getPhaseName();
+    String phaseName = RsrGlobal.getPhaseName();
     if (phaseName.equals(PHASE_SUPPLY)) {
       //check supply of airbases - AUTO - on enter
       //place air fleets on the map - MANUAL
@@ -187,11 +187,11 @@
     //0 - enter
     //1..x - parts
     //x+1 - leave
-    commandLog("Part " + part + " of " + rules.getPhaseName());
+    commandLog("Part " + part + " of " + RsrGlobal.getPhaseName());
 
     commandClearHighlight();
 
-    String phaseName = rules.getPhaseName();
+    String phaseName = RsrGlobal.getPhaseName();
     if (phaseName.equals(PHASE_SUPPLY)) {
       switch (part) {
         case 0: executeSupply0(); break;
@@ -245,7 +245,8 @@
    */
   private void executeSupply0() {
     commandLog("Game: Checking supply of airbases and removing any out of supply.");
-    HashMap<HexRef, TerrainMapShaderCost> inSupply = shaderAxisDepotSupply.getHexes(shaderAxisDepotSupply.getRules(), "Normal", null);
+    supplyCache.clear();
+    HashMap<HexRef, TerrainMapShaderCost> inSupply = supplyCache.getSupply(RsrMapShaderBase.NATIONALITY_GERMAN, false);
     HexRef hr;
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=Airbase")) {
       hr = mainGrid.getHexPos(gp.getPosition());
@@ -264,7 +265,7 @@
    */
   private void executeSupply1() {
     int count;
-    if (rules.isMud() == false) {
+    if (RsrGlobal.isMud() == false) {
       count = 0;
       for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=Airbase")) {
         GamePiece fgp = getSinglePiece(offboardMap, "Type=AirFleet&&CurrentZone=Airfleet pool&&FleetNumber=" + RsrTrait.getFleetNumber(gp));
@@ -298,18 +299,12 @@
   private void executeSupply2() {
     //Check supply of all units (except airbases).
     commandLog("Game: Checking supply of all units (except airbases).");
-    HashMap<HexRef, TerrainMapShaderCost> inAxisDepotSupply = shaderAxisDepotSupply.getHexes(shaderAxisDepotSupply.getRules(), "Normal", null);
-    HashMap<HexRef, TerrainMapShaderCost> inAxisDepotAttritionSupply = shaderAxisDepotAttritionSupply.getHexes(shaderAxisDepotAttritionSupply.getRules(), "Attrition", null);
-    HashMap<HexRef, TerrainMapShaderCost> inAxisFinlandSupply = shaderAxisFinlandSupply.getHexes(shaderAxisFinlandSupply.getRules(), "Helsinki;Finnish;Normal", null);
-    HashMap<HexRef, TerrainMapShaderCost> inAxisFinlandAttritionSupply = shaderAxisFinlandAttritionSupply.getHexes(shaderAxisFinlandAttritionSupply.getRules(), "Helsinki;Finnish;Attrition", null);
-    HashMap<HexRef, TerrainMapShaderCost> inAxisRomaniaSupply = shaderAxisRomaniaSupply.getHexes(shaderAxisRomaniaSupply.getRules(), "Bucharest;Romanian;Normal", null);
-    HashMap<HexRef, TerrainMapShaderCost> inAxisRomaniaAttritionSupply = shaderAxisRomaniaAttritionSupply.getHexes(shaderAxisRomaniaAttritionSupply.getRules(), "Bucharest;Romanian;Attrition", null);
-    HashMap<HexRef, TerrainMapShaderCost> inSovietSupply = shaderSovietSupply.getHexes(shaderSovietSupply.getRules(), "Normal", null);
-    HashMap<HexRef, TerrainMapShaderCost> inSovietAttritionSupply = shaderSovietAttritionSupply.getHexes(shaderSovietAttritionSupply.getRules(), "Attrition", null);
-    HashSet<HexRef> inAirRange = new HashSet<HexRef>();
-    for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=AirFleet")) {
-      inAirRange.addAll(rules.getHexesInRange(mainGrid.getHexPos(gp.getPosition()), RsrTrait.getRange(gp)));
-    }
+    //
+    supplyCache.clear();
+    //clear and recalculate AirFleet support zone for this turn (it will not change during the turn)
+    airFleetCache.clear();
+    HashSet<HexRef> inAirRange = airFleetCache.getAirFleetSupportZone();
+    //
     HashSet<HexRef> inFactory = new HashSet<HexRef>();
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "AssetType=Factory")) {
       inFactory.add(mainGrid.getHexPos(gp.getPosition()));
@@ -320,21 +315,11 @@
     String side, nationality, type;
     int supplyLevel, isolated;
     ArrayList<GamePiece> isolatedUnits = new ArrayList<GamePiece>();
-    for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type!=Airbase&&Type!=AirFleet&&Type!=Asset&&Type!=Depot&&Type!=Marker")) {
+    for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type!=Airbase&&Type!=AirFleet&&Type!=Partisan&&Type!=Asset&&Type!=Depot&&Type!=Marker")) {
       nationality = RsrTrait.getNationality(gp);
-      if ((nationality.equals(RsrMapShaderBase.NATIONALITY_GERMAN)) || (nationality.equals(RsrMapShaderBase.NATIONALITY_HUNGARIAN)) || (nationality.equals(RsrMapShaderBase.NATIONALITY_ITALIAN))) {
-        infoN = inAxisDepotSupply;
-        infoA = inAxisDepotAttritionSupply;
-      } else if (nationality.equals(RsrMapShaderBase.NATIONALITY_SOVIET)) {
-        infoN = inSovietSupply;
-        infoA = inSovietAttritionSupply;
-      } else if (nationality.equals(RsrMapShaderBase.NATIONALITY_ROMANIAN)) {
-        infoN = inAxisRomaniaSupply;
-        infoA = inAxisRomaniaAttritionSupply;
-      } else if (nationality.equals(RsrMapShaderBase.NATIONALITY_FINNISH)) {
-        infoN = inAxisFinlandSupply;
-        infoA = inAxisFinlandAttritionSupply;
-      } else {
+      infoN = supplyCache.getSupply(nationality, false);
+      infoA = supplyCache.getSupply(nationality, true);
+      if ((infoN == null) || (infoA == null)) {
         continue;
       }
       supplyLevel = -1;
@@ -364,7 +349,7 @@
         } else {
           supplyLevel = 3;
           costA = infoA.get(hr);
-          if ((costA == null) && (rules.getTurnNumber() > 1) && (TerrainMapShaderRule.isAny(type, "Headquarters", "Leader") == false)) {
+          if ((costA == null) && (RsrGlobal.getTurnNumber() > 1) && (TerrainMapShaderRule.isAny(type, "Headquarters", "Leader") == false)) {
             isolated = 1;
             isolatedUnits.add(gp);
           }
@@ -391,7 +376,7 @@
         } else if (rules.isMajorCity(tt)) {
           d6 += 2;
         }
-        if (rules.isWinter()) {
+        if (RsrGlobal.isWinter()) {
           side = RsrTrait.getSide(gp);
           if (side.equals(RsrMapShaderBase.SIDE_SOVIET)) {
             if (d6 <= 3) {
@@ -411,7 +396,7 @@
               }
             }
           }
-        } else if (rules.isMud()) {
+        } else if (RsrGlobal.isMud()) {
           side = RsrTrait.getSide(gp);
           if (side.equals(RsrMapShaderBase.SIDE_SOVIET)) {
             if (d6 <= 2) {
@@ -441,7 +426,7 @@
       }
     }
 
-    ArrayList<GamePiece> receivedCombatStrengthMarkers = TerrainMapShaderRule.filterPieces(turnMap, "Type=Strength&&LocationName=S" + rules.getTurnName());
+    ArrayList<GamePiece> receivedCombatStrengthMarkers = TerrainMapShaderRule.filterPieces(turnMap, "Type=Strength&&LocationName=S" + RsrGlobal.getTurnName());
     if (receivedCombatStrengthMarkers.size() > 0) {
       commandLog("Game: Moving Soviet Combat Strength Markers received as reinforcements into the proper draw cups.");
       for (GamePiece gp : receivedCombatStrengthMarkers) {
@@ -462,6 +447,7 @@
    * Ask Axis player to strategically move units. (MANUAL)
    */
   private void executeAxisMovement2() {
+    supplyCache.clear();
     int count = 0;
     HashMap<HexRef, ArrayList<GamePiece>> hostilePieceGroups = new HashMap<HexRef, ArrayList<GamePiece>>();
     TerrainMapShaderRule.filterPieceGroups(mainMap, mainGrid, hostilePieceGroups, "Side=Soviet");
@@ -470,7 +456,7 @@
       rules.getHexesInRange(blockedByEnemy, hr, 4);
     }
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Side=Axis")) {
-      if ((rules.getStrategicMovementAllowance(gp) > 0) && (blockedByEnemy.contains(mainGrid.getHexPos(gp.getPosition())) == false)) {
+      if ((RsrTrait.getStrategicMovementAllowance(gp) > 0) && (blockedByEnemy.contains(mainGrid.getHexPos(gp.getPosition())) == false)) {
         commandAllowMovement(gp, 0.0d, true);
         count++;
       }
@@ -491,7 +477,7 @@
     int count = 0;
     double mp = 0;
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Side=Axis&&Movement>0&&Type!=Airbase")) {
-      mp = rules.getMovementAllowance(gp);
+      mp = RsrTrait.getMovementAllowance(gp);
       if (mp > 0) {
         commandAllowMovement(gp, mp, true);
         count++;
@@ -514,7 +500,7 @@
     int count = 0;
     double mp = 0;
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=Airbase")) {
-      mp = rules.getMovementAllowance(gp);
+      mp = RsrTrait.getMovementAllowance(gp);
       if (mp > 0) {
         commandAllowMovement(gp, mp, true);
         count++;
@@ -595,6 +581,7 @@
    * Ask Soviet player to strategically move units. (MANUAL)
    */
   private void executeSovietMovement2() {
+    supplyCache.clear();
     int count = 0;
     HashMap<HexRef, ArrayList<GamePiece>> hostilePieceGroups = new HashMap<HexRef, ArrayList<GamePiece>>();
     TerrainMapShaderRule.filterPieceGroups(mainMap, mainGrid, hostilePieceGroups, "Side=Axis");
@@ -603,7 +590,7 @@
       rules.getHexesInRange(blockedByEnemy, hr, 4);
     }
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Side=Soviet")) {
-      if ((rules.getStrategicMovementAllowance(gp) > 0) && (blockedByEnemy.contains(mainGrid.getHexPos(gp.getPosition())) == false)) {
+      if ((RsrTrait.getStrategicMovementAllowance(gp) > 0) && (blockedByEnemy.contains(mainGrid.getHexPos(gp.getPosition())) == false)) {
         commandAllowMovement(gp, 0.0d, true);
         count++;
       }
@@ -624,7 +611,7 @@
     int count = 0;
     double mp = 0;
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Side=Soviet&&Movement>0&&Type!=Leader")) {
-      mp = rules.getMovementAllowance(gp);
+      mp = RsrTrait.getMovementAllowance(gp);
       if (mp > 0) {
         commandAllowMovement(gp, mp, true);
         count++;
@@ -647,7 +634,7 @@
     int count = 0;
     double mp = 0;
     for (GamePiece gp : TerrainMapShaderRule.filterPieces(mainMap, "Type=Leader")) {
-      mp = rules.getMovementAllowance(gp);
+      mp = RsrTrait.getMovementAllowance(gp);
       if (mp > 0) {
         commandAllowMovement(gp, mp, true);
         count++;
@@ -688,7 +675,7 @@
         commandSendToOffboardZone(gp, "Airfleet pool");
       }
     }
-    if ((rules.getTurnNumber() == 11) || (rules.getTurnNumber() == 31)) {
+    if ((RsrGlobal.getTurnNumber() == 11) || (RsrGlobal.getTurnNumber() == 31)) {
       commandLog("Axis Player: Remove any one Airbase.");
       //TODO: finish this, also add check for italian army
     } else {
@@ -764,7 +751,7 @@
           return true;
         }
       } else {
-        String phaseName = rules.getPhaseName();
+        String phaseName = RsrGlobal.getPhaseName();
         int phasePart = RsrGlobal.getPhasePart() - 1;
         if (phaseName.equals(PHASE_SUPPLY)) {
           if (phasePart == 1) {
@@ -852,21 +839,20 @@
     //apply motorized loss & contested loss
     //TODO: apply the loss automatically if lossVal>=steps available
     if (lossVal > 0) {
-      int lv = lossVal;
-      if (lv % 2 == 1) {
-        lv--;
-        commandSetProperty(dataPiece, RsrGlobal.MOTORIZED_LOSS_REQUIRED, 1);
-        commandLog("Due to retreat across a major river, the stack must lose 1 motorized step.");
+      int motLossVal = lossVal % 10;
+      if (motLossVal > 0) {
+        commandSetProperty(dataPiece, RsrGlobal.MOTORIZED_LOSS_REQUIRED, motLossVal);
+        commandLog("Due to retreat(s) across major river(s), the stack must lose " + motLossVal + " motorized step(s).");
         for (GamePiece gp : pieces) {
           if (RsrTrait.getMovementTypeAsInt(gp) == RsrTrait.MOVEMENT_MOTORIZED) {
             commandAllowCombatAction(gp);
           }
         }
       }
-      if (lv > 0) {
-        lv /= 2;
-        commandSetProperty(dataPiece, RsrGlobal.CONTESTED_LOSS_REQUIRED, lv);
-        commandLog("Due to retreat through enemy contested, unoccupied space(s) the stack must lose " + lv + " step(s).");
+      int conLossVal = lossVal / 10;
+      if (conLossVal > 0) {
+        commandSetProperty(dataPiece, RsrGlobal.CONTESTED_LOSS_REQUIRED, conLossVal);
+        commandLog("Due to retreat through enemy contested, unoccupied space(s) the stack must lose " + conLossVal + " step(s).");
         for (GamePiece gp : pieces) {
           commandAllowCombatAction(gp);
         }
@@ -935,7 +921,7 @@
         }
       }
     }
-    String phaseName = rules.getPhaseName();
+    String phaseName = RsrGlobal.getPhaseName();
     if ((phaseName.equals(PHASE_SUPPLY)) || (phaseName.equals(PHASE_AXIS_REINFORCEMENT)) || (phaseName.equals(PHASE_SOVIET_REINFORCEMENT))) {
       return true;
     } else {
@@ -953,7 +939,7 @@
       if (isDebug()) {
         commands.add(new KeyCommand("Delete", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), gp, trait));
       }
-      String phaseName = rules.getPhaseName();
+      String phaseName = RsrGlobal.getPhaseName();
       int phasePart = RsrGlobal.getPhasePart() - 1;
       if (phaseName.equals(PHASE_SUPPLY)) {
         if ((phasePart == 1) && (gp.getMap() == mainMap) && (RsrTrait.getType(gp).equals("Depot"))) {
@@ -984,16 +970,18 @@
           commandResolveCombat();
         }
       } else if (combatStage == 4) {
-        if ((RsrGlobal.getMotorizedLossRequired() > 0) && (RsrTrait.getMovementTypeAsInt(gp) == RsrTrait.MOVEMENT_MOTORIZED)) {
+        if (RsrGlobal.getMotorizedLossRequired() > 0) {
+          if (RsrTrait.getMovementTypeAsInt(gp) == RsrTrait.MOVEMENT_MOTORIZED) {
+            commandStepLoss(gp);
+            commandSetProperty(dataPiece, RsrGlobal.MOTORIZED_LOSS_REQUIRED, RsrGlobal.getMotorizedLossRequired() - 1);
+          }
+        } else if (RsrGlobal.getContestedLossRequired() > 0) {
           commandStepLoss(gp);
-          commandSetProperty(dataPiece, RsrGlobal.MOTORIZED_LOSS_REQUIRED, 0);
-        } else
-        if (RsrGlobal.getContestedLossRequired() > 0) {
-          commandStepLoss(gp);
-          commandSetProperty(dataPiece, RsrGlobal.MOTORIZED_LOSS_REQUIRED, RsrGlobal.getContestedLossRequired()-1);
+          commandSetProperty(dataPiece, RsrGlobal.CONTESTED_LOSS_REQUIRED, RsrGlobal.getContestedLossRequired() - 1);
         }
-        //TODO: this is not working yet!
-        //TODO: force used to remove motorized step loss first (in order to prevent him from taking one step loss less
+        if ((RsrGlobal.getMotorizedLossRequired() == 0) && (RsrGlobal.getContestedLossRequired() == 0)) {
+          commandResolveCombat();
+        }
       } else {
 
       }

Modified: VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java	2009-05-19 15:19:51 UTC (rev 5644)
+++ VSQL-src/branches/morvael/rsr/RsrButtonCommandBase.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -23,7 +23,11 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Random;
+import terrain.EdgeTerrain;
 import terrain.HexRef;
+import terrain.HexTerrain;
+import terrain.LineTerrain;
+import terrain.TerrainAttribute;
 import terrain.TerrainHexGrid;
 import terrain.TerrainMapShaderCost;
 
@@ -93,6 +97,9 @@
   protected HashMap<HexRef, GamePiece> destroyedMarkers = new HashMap<HexRef, GamePiece>();
   private HashSet<HexRef> variants = new HashSet<HexRef>();
 
+  protected SupplyCache supplyCache;
+  protected AirFleetCache airFleetCache;
+
   protected Board findBoard(Map map, String name) {
     if (map != null) {
       for (Board b : map.getBoards()) {
@@ -162,6 +169,8 @@
         turnPiece = getSinglePiece(turnMap, "BasicName=Game Turn");
         phasePiece = getSinglePiece(turnMap, "BasicName=Turn Phase");
         dataPiece = getSinglePiece(turnMap, "BasicName=Data");
+        supplyCache = new SupplyCache(shaderVP);
+        airFleetCache = new AirFleetCache(rules, mainMap, mainGrid);
         initialized = true;
         onInitialize(param);
       } catch (Exception ex) {
@@ -324,7 +333,7 @@
       GamePiece gpc = controlMarkers.get(hr);
       if (gpc != null) {
         int desiredControl = side.equals(RsrMapShaderBase.SIDE_SOVIET) ? 1 : 2;
-        if (RsrCounter.getIntProperty(gpc, "Control", 1) != desiredControl) {
+        if (RsrCounter.getIntProperty(gpc, "Control", 1, false) != desiredControl) {
           commandSetProperty(gpc, "Control", String.valueOf(desiredControl));
           commandLog("Game: Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now under " + side + " control.");
           //TODO: apply Moscow/Baku surrender rule on first axis enter
@@ -332,7 +341,7 @@
         if (desiredControl == 2) {
           GamePiece gpd = destroyedMarkers.get(hr);
           if (gpd != null) {
-            if (RsrCounter.getIntProperty(gpc, "Destruction", 1) != desiredControl) {
+            if (RsrCounter.getIntProperty(gpc, "Destruction", 1, false) != desiredControl) {
               commandSetProperty(gpc, "Destruction", String.valueOf(desiredControl));
               commandLog("Game: Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now destroyed.");
             }
@@ -473,7 +482,7 @@
 
   public void commandSendToReinforcementZone(GamePiece gp, int turnNumberMod, String offboardZone) {
     //
-    int turnNumber = rules.getTurnNumber() + turnNumberMod;
+    int turnNumber = RsrGlobal.getTurnNumber() + turnNumberMod;
     if ((turnNumber < 1) || (turnNumber > 40)) {
       if (offboardZone != null) {
         commandSendToOffboardZone(gp, offboardZone);
@@ -728,7 +737,7 @@
                                     RsrGlobal.DEFENDER_LOST, 0,
                                     RsrGlobal.URBAN_LOSS_REQUIRED, 0,
                                     RsrGlobal.MOTORIZED_LOSS_REQUIRED, 0,
-                                    RsrGlobal.CONTESTED_LOSS_REQUIRED);
+                                    RsrGlobal.CONTESTED_LOSS_REQUIRED, 0);
     }
   }
 
@@ -953,6 +962,10 @@
         }
         commandSetProperty(dataPiece, RsrGlobal.ATTACKER_RETREAT, 0);
       }
+      if ((RsrGlobal.getMotorizedLossRequired() > 0) || (RsrGlobal.getContestedLossRequired() > 0)) {
+        commandLog("Game: There are units that have to take mandatory step loss(es).");
+        return;
+      } else
       if (TerrainMapShaderRule.filterPieces(mainMap, RsrTrait.RETREATING + ">0").size() == 0) {
         commandSetProperty(dataPiece, RsrGlobal.COMBAT_STAGE, ++combatStage);
       } else {
@@ -1043,7 +1056,7 @@
             } else {
               //in overrun combat place attackers in defender hex and remove movement points for overrun
               commandMove(mainMap, gp, p);
-              double mp = RsrTrait.getMovementLeft(gp) - rules.getOverrunCost(gp);
+              double mp = RsrTrait.getMovementLeft(gp) - RsrTrait.getOverrunCost(gp);
               if (mp > 0.0d) {
                 commandAllowMovement(gp, mp, false);
               } else {
@@ -1179,6 +1192,14 @@
     }
   }
 
+  public GamePiece getTurnPiece() {
+    return turnPiece;
+  }
+
+  public GamePiece getPhasePiece() {
+    return phasePiece;
+  }
+
   public GamePiece getDataPiece() {
     return dataPiece;
   }
@@ -1191,6 +1212,10 @@
     return mainGrid;
   }
 
+  public Board getTurnBoard() {
+    return turnBoard;
+  }
+
   public Random getRandom() {
     return ran;
   }
@@ -1328,5 +1353,37 @@
       return false;
     }
   }
+
+  public SupplyCache getSupplyCache() {
+    return supplyCache;
+  }
+
+  public AirFleetCache getAirFleetCache() {
+    return airFleetCache;
+  }
+
+  public HexRef getHexRef(Point p) {
+    return mainGrid.getHexPos(p);
+  }
   
+  public String getLocationName(HexRef hr) {
+    return mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow()));
+  }
+
+	public String getHexTerrainName(HexRef hex) {
+    return rules.getHexTerrainName(hex);
+	}
+
+	public String getEdgeTerrainName(HexRef fromHex, HexRef toHex) {
+    return rules.getEdgeTerrainName(fromHex, toHex);
+	}
+
+	public String getLineTerrainName(HexRef fromHex, HexRef toHex) {
+    return rules.getLineTerrainName(fromHex, toHex);
+	}
+
+	public String getAttributeTerrainValue(HexRef hex, String name) {
+    return rules.getAttributeTerrainValue(hex, name);
+	}
+  
 }

Modified: VSQL-src/branches/morvael/rsr/RsrCounter.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrCounter.java	2009-05-19 15:19:51 UTC (rev 5644)
+++ VSQL-src/branches/morvael/rsr/RsrCounter.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -1,50 +1,93 @@
 package rsr;
 
 import VASSAL.counters.GamePiece;
+import java.util.HashMap;
 
 public final class RsrCounter {
 
+  private String vs;
+  private double vd;
+  private int vi;
+  private boolean vb;
+
   private RsrCounter() {
 
   }
-	
-	public static String getStringProperty(GamePiece gp, String name, String def) {
+
+  private static HashMap<String, String> mapString = new HashMap<String, String>();
+  private static HashMap<String, Double> mapDouble = new HashMap<String, Double>();
+  private static HashMap<String, Integer> mapInteger = new HashMap<String, Integer>();
+  private static HashMap<String, Boolean> mapBoolean = new HashMap<String, Boolean>();
+
+	public static String getStringProperty(GamePiece gp, String name, String def, boolean constant) {
+    String key = gp.getId() + "_" + name;
 		String result;
-		try {
-			result = gp.getProperty(name).toString();
-		} catch (Exception e) {
-			result = def;
-		}
+    if ((constant == false) || (mapString.containsKey(key) == false)) {
+      try {
+        result = gp.getProperty(name).toString();
+      } catch (Exception e) {
+        result = def;
+      }
+      if (constant) {
+        mapString.put(key, result);
+      }
+    } else {
+      result = mapString.get(key);
+    }
 		return result;
 	}
 	
-	public static double getDoubleProperty(GamePiece gp, String name, double def) {
+	public static double getDoubleProperty(GamePiece gp, String name, double def, boolean constant) {
+    String key = gp.getId() + "_" + name;
 		double result;
-		try {
-			result = Double.parseDouble(gp.getProperty(name).toString());
-		} catch (Exception e) {
-			result = def;
-		}
+    if ((constant == false) || (mapDouble.containsKey(key) == false)) {
+      try {
+        result = Double.parseDouble(gp.getProperty(name).toString());
+      } catch (Exception e) {
+        result = def;
+      }
+      if (constant) {
+        mapDouble.put(key, result);
+      }
+    } else {
+      result = mapDouble.get(key);
+    }
 		return result;
 	}
 	
-	public static int getIntProperty(GamePiece gp, String name, int def) {
+	public static int getIntProperty(GamePiece gp, String name, int def, boolean constant) {
+    String key = gp.getId() + "_" + name;
 		int result;
-		try {
-			result = Integer.parseInt(gp.getProperty(name).toString());
-		} catch (Exception e) {
-			result = def;
-		}
+    if ((constant == false) || (mapInteger.containsKey(key) == false)) {
+      try {
+        result = Integer.parseInt(gp.getProperty(name).toString());
+      } catch (Exception e) {
+        result = def;
+      }
+      if (constant) {
+        mapInteger.put(key, result);
+      }
+    } else {
+      result = mapInteger.get(key);
+    }
 		return result;
 	}
 	
-	public static boolean getBooleanProperty(GamePiece gp, String name, boolean def) {
+	public static boolean getBooleanProperty(GamePiece gp, String name, boolean def, boolean constant) {
+    String key = gp.getId() + "_" + name;
 		boolean result;
-		try {
-			result = Boolean.parseBoolean(gp.getProperty(name).toString());
-		} catch (Exception e) {
-			result = def;
-		}
+    if ((constant == false) || (mapBoolean.containsKey(key) == false)) {
+      try {
+        result = Boolean.parseBoolean(gp.getProperty(name).toString());
+      } catch (Exception e) {
+        result = def;
+      }
+      if (constant) {
+        mapBoolean.put(key, result);
+      }
+    } else {
+      result = mapBoolean.get(key);
+    }
 		return result;
 	}
 

Modified: VSQL-src/branches/morvael/rsr/RsrGlobal.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-05-19 15:19:51 UTC (rev 5644)
+++ VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -15,6 +15,7 @@
 import javax.swing.KeyStroke;
 
 import VASSAL.build.module.documentation.HelpFile;
+import VASSAL.build.module.map.boardPicker.Board;
 import VASSAL.command.ChangeTracker;
 import VASSAL.command.Command;
 import VASSAL.configure.StringConfigurer;
@@ -25,6 +26,7 @@
 import VASSAL.i18n.TranslatablePiece;
 import VASSAL.tools.SequenceEncoder;
 import java.awt.event.InputEvent;
+import java.util.HashMap;
 
 /**
  *
@@ -474,84 +476,174 @@
   }
 
   private static GamePiece dataPiece;
+  private static Board turnBoard;
+  private static GamePiece turnPiece;
+  private static GamePiece phasePiece;
 
-  private static GamePiece getDataPiece() {
+  private static final GamePiece getDataPiece() {
     if (dataPiece == null) {
       dataPiece = RsrAdvance.getInstance().getDataPiece();
     }
     return dataPiece;
   }
 
+  private static final Board getTurnBoard() {
+    if (turnBoard == null) {
+      turnBoard = RsrAdvance.getInstance().getTurnBoard();
+    }
+    return turnBoard;
+  }
+
+  private static final GamePiece getTurnPiece() {
+    if (turnPiece == null) {
+      turnPiece = RsrAdvance.getInstance().getTurnPiece();
+    }
+    return turnPiece;
+  }
+
+  private static final GamePiece getPhasePiece() {
+    if (phasePiece == null) {
+      phasePiece = RsrAdvance.getInstance().getPhasePiece();
+    }
+    return phasePiece;
+  }
+
   public static final int getDebug() {
-    return RsrCounter.getIntProperty(getDataPiece(), PROPERTY_DEBUG, 0);
+    return getTrait(getDataPiece()).debug;
   }
 
   public static final int getScenario() {
-    return RsrCounter.getIntProperty(getDataPiece(), PROPERTY_SCENARIO, 6);
+    return getTrait(getDataPiece()).scenario;
   }
 
+  public static final int getTurnNumber() {
+    return Integer.parseInt(getTurnBoard().locationName(getTurnPiece().getPosition()).split(":")[0]);
+  }
+
+  public static final String getTurnName() {
+    return getTurnBoard().locationName(getTurnPiece().getPosition());
+  }
+
+  public static final String getPhaseName() {
+    return getTurnBoard().locationName(getPhasePiece().getPosition());
+  }
+
   public static final int getPhaseParts() {
-    return RsrCounter.getIntProperty(getDataPiece(), PROPERTY_PHASE_PARTS, 0);
+    return getTrait(getDataPiece()).phaseParts;
   }
 
   public static final int getPhasePart() {
-    return RsrCounter.getIntProperty(getDataPiece(), PROPERTY_PHASE_PART, 0);
+    return getTrait(getDataPiece()).phasePart;
   }
 
   public static final int getLastMovedIndex() {
-    return RsrCounter.getIntProperty(getDataPiece(), PROPERTY_LAST_MOVED_INDEX, 0);
+    return getTrait(getDataPiece()).lastMovedIndex;
   }
 
   public static final int getCombatStage() {
-    return RsrCounter.getIntProperty(getDataPiece(), COMBAT_STAGE, 0);
+    return getTrait(getDataPiece()).combatStage;
   }
 
   public static final int getCombatMode() {
-    return RsrCounter.getIntProperty(getDataPiece(), COMBAT_MODE, 0);
+    return getTrait(getDataPiece()).combatMode;
   }
 
   public static final String getAttackerHexes() {
-    return RsrCounter.getStringProperty(getDataPiece(), ATTACKER_HEXES, "");
+    return getTrait(getDataPiece()).attackerHexes;
   }
 
   public static final String getDefenderHexes() {
-    return RsrCounter.getStringProperty(getDataPiece(), DEFENDER_HEXES, "");
+    return getTrait(getDataPiece()).defenderHexes;
   }
 
   public static final int getAttackerLoss() {
-    return RsrCounter.getIntProperty(getDataPiece(), ATTACKER_LOSS, 0);
+    return getTrait(getDataPiece()).attackerLoss;
   }
 
   public static final int getAttackerRetreat() {
-    return RsrCounter.getIntProperty(getDataPiece(), ATTACKER_RETREAT, 0);
+    return getTrait(getDataPiece()).attackerRetreat;
   }
 
   public static final int getDefenderLoss() {
-    return RsrCounter.getIntProperty(getDataPiece(), DEFENDER_LOSS, 0);
+    return getTrait(getDataPiece()).defenderLoss;
   }
 
   public static final int getDefenderRetreat() {
-    return RsrCounter.getIntProperty(getDataPiece(), DEFENDER_RETREAT, 0);
+    return getTrait(getDataPiece()).defenderRetreat;
   }
 
   public static final int getAttackerLost() {
-    return RsrCounter.getIntProperty(getDataPiece(), ATTACKER_LOST, 0);
+    return getTrait(getDataPiece()).attackerLost;
   }
 
   public static final int getDefenderLost() {
-    return RsrCounter.getIntProperty(getDataPiece(), DEFENDER_LOST, 0);
+    return getTrait(getDataPiece()).defenderLost;
   }
 
   public static final int getUrbanLossRequired() {
-    return RsrCounter.getIntProperty(getDataPiece(), URBAN_LOSS_REQUIRED, 0);
+    return getTrait(getDataPiece()).urbanLossRequired;
   }
 
   public static final int getMotorizedLossRequired() {
-    return RsrCounter.getIntProperty(getDataPiece(), MOTORIZED_LOSS_REQUIRED, 0);
+    return getTrait(getDataPiece()).motorizedLossRequired;
   }
 
   public static final int getContestedLossRequired() {
-    return RsrCounter.getIntProperty(getDataPiece(), CONTESTED_LOSS_REQUIRED, 0);
+    return getTrait(getDataPiece()).contestedLossRequired;
   }
+
+  private static HashMap<GamePiece, RsrGlobal> map = new HashMap<GamePiece, RsrGlobal>();
+
+  private static RsrGlobal getTrait(GamePiece gp) {
+    RsrGlobal result = map.get(gp);
+    if (result == null) {
+      result = (RsrGlobal)Decorator.getDecorator(gp, RsrGlobal.class);
+      map.put(gp, result);
+    }
+    return result;
+  }
+
+  public static boolean isWinter() {
+    return isWinter(getTurnNumber());
+  }
+
+  public static boolean isWinter(int turnNumber) {
+    return ((turnNumber >= 8) && (turnNumber <= 11)) ||
+            ((turnNumber >= 22) && (turnNumber <= 25)) ||
+            ((turnNumber >= 36) && (turnNumber <= 39));
+  }
+
+  public static boolean isFirstWinter() {
+    return isFirstWinter(getTurnNumber());
+  }
+
+  public static boolean isFirstWinter(int turnNumber) {
+    return (turnNumber >= 8) && (turnNumber <= 11);
+  }
+
+  public static boolean isMud() {
+    return isMud(getTurnNumber());
+  }
+  public static boolean isMud(int turnNumber) {
+    return (turnNumber == 7) || (turnNumber == 12) ||
+            (turnNumber == 21) || (turnNumber == 26) ||
+            (turnNumber == 35) || (turnNumber == 40);
+  }
+
+  public static boolean isProductionTurn() {
+    return isProductionTurn(getTurnNumber());
+  }
+
+  public static boolean isProductionTurn(int turnNumber) {
+    return (turnNumber == 5) || (turnNumber == 7) ||
+            (turnNumber == 9) || (turnNumber == 11) ||
+            (turnNumber == 12) || (turnNumber == 14) ||
+            (turnNumber == 19) || (turnNumber == 21) ||
+            (turnNumber == 23) || (turnNumber == 25) ||
+            (turnNumber == 26) || (turnNumber == 28) ||
+            (turnNumber == 33) || (turnNumber == 35) ||
+            (turnNumber == 37) || (turnNumber == 39) ||
+            (turnNumber == 40);
+  }
   
 }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-19 15:19:51 UTC (rev 5644)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -8,11 +8,12 @@
 import terrain.HexRef;
 import terrain.TerrainMapShaderRule;
 import VASSAL.build.module.Map;
-import VASSAL.build.module.map.boardPicker.Board;
 import VASSAL.counters.GamePiece;
 import java.util.Iterator;
 import terrain.TerrainHexGrid;
 import terrain.TerrainMapShaderCost;
+import terrain.TerrainMapShader;
+import terrain.TerrainMap;
 
 /**
  * 
@@ -23,6 +24,7 @@
   public static final String MODE_NORMAL = "MODE_NORMAL";
   public static final String MODE_SEA = "MODE_SEA";
   public static final String MODE_EMERGENCY = "MODE_EMERGENCY";
+  public static final String MODE_STRATEGIC = "MODE_STRATEGIC";
   public static final String MODE_MOVEMENT = "MODE_MOVEMENT";
   public static final String MODE_OVERRUN = "MODE_OVERRUN";
   public static final String MODE_ATTACK = "MODE_ATTACK";
@@ -99,29 +101,24 @@
   protected static final String TAG_MAPPART_SOUTHWEST = "Southwest";
   protected static final String TAG_MAPPART_TP = "TP";
   protected static final String TAG_MAPPART_TPNSW = "TPnSW";
-  private Board turnBoard;
-  private GamePiece turnPiece;
-  private GamePiece phasePiece;
+  protected int scenarioNumber;
+  protected int turnNumber;
+  protected String phaseName;
   protected HashMap<HexRef, ArrayList<GamePiece>> friendlyPieceGroups;
   protected HashMap<HexRef, ArrayList<GamePiece>> hostilePieceGroups;
 
   protected RsrMapShaderBase() {
     super();
-    Map turnMap = Map.getMapById("Turn");
-    for (Board b : turnMap.getBoards()) {
-      if (b.getLocalizedName().equals("Turn")) {
-        turnBoard = b;
-        break;
-      }
-    }
-    for (GamePiece gp : filterPieces(turnMap, "BasicName=Game Turn")) {
-      turnPiece = gp;
-    }
-    for (GamePiece gp : filterPieces(turnMap, "BasicName=Turn Phase")) {
-      phasePiece = gp;
-    }
   }
 
+  @Override
+  public void reset(TerrainMapShader mapShader, Map map, TerrainHexGrid grid, TerrainMap terrainMap, String params, GamePiece piece) {
+    super.reset(mapShader, map, grid, terrainMap, params, piece);
+    scenarioNumber = RsrGlobal.getScenario();
+    turnNumber = RsrGlobal.getTurnNumber();
+    phaseName = RsrGlobal.getPhaseName();
+  }
+
   protected void filterFriendlyPieceGroups(String side) {
     if (friendlyPieceGroups == null) {
       friendlyPieceGroups = new HashMap<HexRef, ArrayList<GamePiece>>();
@@ -194,7 +191,7 @@
     } else
     if (isLakeSea(et)) {
       if (lt.equals(LINE_FROZENSURFACE)) {
-        if (isWinter()) {
+        if (RsrGlobal.isWinter()) {
           for (GamePiece gp : list) {
             if ((RsrTrait.getType(gp).equals("Unit")) && (RsrTrait.getMovementTypeAsInt(gp) == RsrTrait.MOVEMENT_NONMOTORIZED) && (RsrTrait.getUnitType(gp).equals("SovietGuardsCavalryCorps") == false)) {
               //soviet non-motorized, non-soviet guards cavalry corps can contest neighbour space across frozen surface in winter
@@ -257,26 +254,7 @@
     }
     return result;
   }
-
-  protected boolean isWinter() {
-    int turn = getTurnNumber();
-    return ((turn >= 8) && (turn <= 11)) ||
-            ((turn >= 22) && (turn <= 25)) ||
-            ((turn >= 36) && (turn <= 39));
-  }
-
-  protected boolean isFirstWinter() {
-    int turn = getTurnNumber();
-    return (turn >= 8) && (turn <= 11);
-  }
-
-  protected boolean isMud() {
-    int turn = getTurnNumber();
-    return (turn == 7) || (turn == 12) ||
-            (turn == 21) || (turn == 26) ||
-            (turn == 35) || (turn == 40);
-  }
-
+  
   protected HexRef getCityHexRef(String city) {
     for (HexRef hr : findHexesWithTag(TAG_CITY, city)) {
       return hr;
@@ -390,7 +368,7 @@
     String lt = getLineTerrainName(fromHex, toHex);
     boolean isArctic = isArctic(toHex);
     boolean isRailroad = isAny(lt, LINE_RAILROAD, LINE_CHONGARCAUSEWAY);
-    boolean isWinter = isWinter();
+    boolean isWinter = RsrGlobal.isWinter(turnNumber);
     boolean isAxis = side.equals(SIDE_AXIS);
     if (isImpassable(et)) {
       return Double.MAX_VALUE;
@@ -422,43 +400,6 @@
     return cost;
   }
 
-  public int getTurnNumber() {
-    if ((turnBoard != null) && (turnPiece != null)) {
-      return Integer.parseInt(turnBoard.locationName(turnPiece.getPosition()).split(":")[0]);
-    } else {
-      return 0;
-    }
-  }
-
-  public boolean isProductionTurn() {
-    int turn = getTurnNumber();
-    return (turn == 5) || (turn == 7) ||
-            (turn == 9) || (turn == 11) ||
-            (turn == 12) || (turn == 14) ||
-            (turn == 19) || (turn == 21) ||
-            (turn == 23) || (turn == 25) ||
-            (turn == 26) || (turn == 28) ||
-            (turn == 33) || (turn == 35) ||
-            (turn == 37) || (turn == 39) ||
-            (turn == 40);
-  }
-
-  public String getTurnName() {
-    if ((turnBoard != null) && (turnPiece != null)) {
-      return turnBoard.locationName(turnPiece.getPosition());
-    } else {
-      return "";
-    }
-  }
-
-  public String getPhaseName() {
-    if ((turnBoard != null) && (phasePiece != null)) {
-      return turnBoard.locationName(phasePiece.getPosition());
-    } else {
-      return "";
-    }
-  }
-
   public void getHexesInRange(Set<HexRef> result, HexRef hex, int range) {
     if (hex == null) {
       return;
@@ -492,79 +433,20 @@
     return result;
   }
 
-  public double getOverrunCost(GamePiece gp) {
-    if (RsrTrait.getType(gp).equals("Unit") == false) {
-      return Double.MAX_VALUE;
-    }
-    if (RsrTrait.isSupplyLevel(gp, RsrTrait.SUPPLY_LACK, RsrTrait.SUPPLY_OUT)) {
-      return Double.MAX_VALUE;
-    }
-    double cost;
-    if ((isWinter()) && (RsrTrait.getSide(gp).equals(SIDE_SOVIET))) {
-      cost = 2.0d;
-    } else {
-      cost = 3.0d;
-    }
-    if (cost <= RsrTrait.getMovementLeft(gp)) {
-      return cost;
-    } else {
-      return Double.MAX_VALUE;
-    }
+  protected boolean isNorthMapUsed() {
+    return scenarioNumber == 6;
   }
 
-  public double getMovementAllowance(GamePiece gp) {
-    double result = RsrTrait.getMovement(gp);
-    if (getTurnNumber() == 1) {
-      HexRef hr = grid.getHexPos(gp.getPosition());
-      if ((getAttributeTerrainValue(hr, TAG_COUNTRY).equals(TAG_COUNTRY_FINLAND)) || (getAttributeTerrainValue(hr, TAG_COUNTRY).equals(TAG_COUNTRY_ROMANIA))) {
-        result = 0.0d;
-      }
-    }
-    if (RsrTrait.isSupplyLevel(gp, RsrTrait.SUPPLY_LACK, RsrTrait.SUPPLY_OUT)) {
-      result = Math.ceil(result * 0.5d);
-    }
-    return result;
-  }
-
-  public double getStrategicMovementAllowance(GamePiece gp) {
-    String type = RsrTrait.getType(gp);
-    if (isAny(type, "Airbase", "Partisan", "Asset", "AirFleet")) {
-      return 0.0d;
-    }
-    if ((type.equals("Depot")) && (isMud() == false)) {
-      return 0.0d;
-    }
-    if (RsrTrait.isSupplyLevel(gp, RsrTrait.SUPPLY_EMERGENCY, RsrTrait.SUPPLY_LACK, RsrTrait.SUPPLY_OUT)) {
-      return 0.0d;
-    }
-    if (getTurnNumber() == 1) {
-      HexRef hr = grid.getHexPos(gp.getPosition());
-      if ((getAttributeTerrainValue(hr, TAG_COUNTRY).equals(TAG_COUNTRY_FINLAND)) || (getAttributeTerrainValue(hr, TAG_COUNTRY).equals(TAG_COUNTRY_ROMANIA))) {
-        return 0.0d;
-      }
-    }
-    return 25.0d;
-  }
-
-  //TODO: switch to RsrAdvance
-  public boolean isNorthMapUsed() {
-    return RsrAdvance.getInstance().getScenarioNumber() == 6;
-  }
-
-  //TODO: switch to RsrAdvance
-  public boolean isSouthwestMapUsed() {
-    int scenarioNumber = RsrAdvance.getInstance().getScenarioNumber();
+  protected boolean isSouthwestMapUsed() {
     return (scenarioNumber == 3) || (scenarioNumber == 6);
   }
 
-  //TODO: switch to RsrAdvance
-  public boolean isSubMapUsed() {
-    return RsrAdvance.getInstance().getScenarioNumber() == 1;
+  protected boolean isSubMapUsed() {
+    return scenarioNumber == 1;
   }
 
-  //TODO: switch to RsrAdvance
-  public int getScenarioUsed() {
-    return RsrAdvance.getInstance().getScenarioNumber();
+  protected int getScenarioUsed() {
+    return scenarioNumber;
   }
 
   public boolean isImpassable(String et) {
@@ -771,7 +653,7 @@
         if (isMajorCity(tt)) {
           class3++;
         } else if ((tt.equals(HEX_SWAMP))) {
-          if (isWinter()) { //swam as wood in winter
+          if (RsrGlobal.isWinter()) { //swam as wood in winter
             class2++;
           } else {
             class3++;
@@ -784,7 +666,7 @@
       }
     }
     //ignore minor rivers on turn 1 overruns
-    if ((minorRiverEdges > 0) && (getTurnNumber() == 1) && (RsrGlobal.getCombatMode() == 1) && (attackerSide.equals(SIDE_AXIS))) {
+    if ((minorRiverEdges > 0) && (RsrGlobal.getTurnNumber() == 1) && (RsrGlobal.getCombatMode() == 1) && (attackerSide.equals(SIDE_AXIS))) {
       minorRiverEdges = 0;
     }
     //try to apply minor river bonus first
@@ -849,9 +731,17 @@
       column -= 1;
       sb.append(", terrain shift -1");
     }
-    //TODO:apply air fleet modifier
-    if ((isMud() == false) && (isWinter() == false)) {
-      //
+    //apply air fleet modifier
+    if ((RsrGlobal.isMud() == false) && (RsrGlobal.isWinter() == false)) {
+      if (core.getAirFleetCache().getAirFleetSupportZone().containsAll(dH)) {
+        if (attackerSide.equals(SIDE_AXIS)) {
+          column += 1;
+          sb.append(", air fleet shift +1");
+        } else {
+          column -= 1;
+          sb.append(", air fleet shift -1");
+        }
+      }
     }
     //ensure column is between 0 and 9
     column = Math.max(0, Math.min(9, column));
@@ -862,9 +752,9 @@
       modifier += 1;
     }
     //winter combat modifier
-    if (isFirstWinter()) {
+    if (RsrGlobal.isFirstWinter()) {
       modifier += 3;
-    } else if (isWinter()) {
+    } else if (RsrGlobal.isWinter()) {
       modifier += 1;
     }
     //TODO: add siege artillery combat modifier, leader combat modifier
@@ -899,7 +789,7 @@
     //
     String attackerSide = RsrTrait.getSide(gp);
     //no attack if this is an Axis unit in Finland or Romania on turn 1
-    if ((attackerSide.equals(SIDE_AXIS)) && (getTurnNumber() == 1)) {
+    if ((attackerSide.equals(SIDE_AXIS)) && (RsrGlobal.getTurnNumber() == 1)) {
       String country = getAttributeTerrainValue(grid.getHexPos(gp.getPosition()), TAG_COUNTRY);
       if ((country.equals(TAG_COUNTRY_FINLAND)) || (country.equals(TAG_COUNTRY_ROMANIA))) {
         return result;
@@ -921,7 +811,7 @@
         continue;
       }
       if (isLakeSea(et)) {
-        if ((attackerSide.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)) {
+        if ((attackerSide.equals(SIDE_AXIS)) || (RsrGlobal.isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)) {
           continue;
         }
       }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-05-19 15:19:51 UTC (rev 5644)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -59,7 +59,7 @@
     side = RsrTrait.getSide(piece);
     nationality = RsrTrait.getNationality(piece);
     movementMode = RsrTrait.getMovementTypeAsInt(piece);
-    maxMovement = getMovementAllowance(piece);
+    maxMovement = RsrTrait.getMovementAllowance(piece);
     movement = mapShader.getStartRangeOverride();
     if (movement == 0.0d) {
       movement = RsrTrait.getMovementLeft(piece);
@@ -67,7 +67,7 @@
     if (movement > maxMovement) {
       movement = maxMovement;
     }
-    overrunCost = getOverrunCost(piece);
+    overrunCost = RsrTrait.getOverrunCost(piece);
     mySize = RsrTrait.getStackPoints(piece);
     type = RsrTrait.getType(piece);
     unitType = RsrTrait.getUnitType(piece);
@@ -109,7 +109,7 @@
       if ((tt.equals(HEX_WATER)) || (tt.equals(HEX_SWAMP)) || (tt.equals(HEX_MOUNTAIN)) || (isMajorCity(tt))) {
         return result(fromHex, false, 0.0d, false, MODE_MOVEMENT, 0);
       }
-      if ((isMajorRiver(et)) || ((isMinorRiver(et)) && ((getTurnNumber() > 1) || (side.equals(SIDE_SOVIET)))) || ((isLakeSea(et)) && ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)))) {
+      if ((isMajorRiver(et)) || ((isMinorRiver(et)) && ((turnNumber > 1) || (side.equals(SIDE_SOVIET)))) || ((isLakeSea(et)) && ((side.equals(SIDE_AXIS)) || (RsrGlobal.isWinter(turnNumber) == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)))) {
         return result(fromHex, false, 0.0d, false, MODE_MOVEMENT, 0);
       }
       if (overrunCost <= currentCost.getPointsLeft()) {
@@ -138,7 +138,7 @@
       return result(fromHex, false, 0.0, false, MODE_MOVEMENT, 0);
     }
     if ((fromZOC) && (toZOC)) {
-      if ((isAny(unitType, "AxisGermanTankCorps", "AxisGermanTankBattlegroup", "AxisGermanTankDivision") == false) && ((isWinter() == false) || (unitType.equals("SovietGuardsCavalryCorps") == false))) {
+      if ((isAny(unitType, "AxisGermanTankCorps", "AxisGermanTankBattlegroup", "AxisGermanTankDivision") == false) && ((RsrGlobal.isWinter(turnNumber) == false) || (unitType.equals("SovietGuardsCavalryCorps") == false))) {
         return result(fromHex, false, 0.0, false, MODE_MOVEMENT, 0);
       }
     }
@@ -146,13 +146,13 @@
     if (isImpassable(et)) {
       return result(fromHex, false, 0.0, false, MODE_MOVEMENT, 0);
     } else if (isLakeSea(et)) {
-      if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)) {
+      if ((side.equals(SIDE_AXIS)) || (RsrGlobal.isWinter(turnNumber) == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)) {
         return result(fromHex, false, 0.0, false, MODE_MOVEMENT, 0);
       } else {
         cost += EDGE_MINORRIVER_COST[movementMode];
       }
     } else if (isMinorRiver(et)) {
-      if ((getTurnNumber() > 1) || (side.equals(SIDE_SOVIET))) {
+      if ((turnNumber > 1) || (side.equals(SIDE_SOVIET))) {
         cost += EDGE_MINORRIVER_COST[movementMode];
       }
     } else if (isMajorRiver(et)) {
@@ -163,7 +163,7 @@
     } else if (tt.equals(HEX_WOODS)) {
       cost += HEX_WOODS_COST[movementMode] * (isArctic ? 2 : 1);
     } else if (tt.equals(HEX_SWAMP)) {
-      if (isWinter()) {
+      if (RsrGlobal.isWinter(turnNumber)) {
         cost += HEX_WOODS_COST[movementMode];
       } else {
         cost += HEX_SWAMP_COST[movementMode];
@@ -187,13 +187,13 @@
       cost = 1.0;
     }
     if (fromZOC) {
-      if ((side.equals(SIDE_AXIS)) || (isWinter() == false)) {
+      if ((side.equals(SIDE_AXIS)) || (RsrGlobal.isWinter(turnNumber) == false)) {
         cost += 3.0;
       } else {
         cost += 2.0;
       }
     }
-    if ((fromHex.equals(startHex)) && (cost > currentCost.getPointsLeft()) && (movement == maxMovement) && (inEnemyZOC.contains(startHex) == false) && (getPhaseName().equals("German Tank Movement") == false)) {
+    if ((fromHex.equals(startHex)) && (cost > currentCost.getPointsLeft()) && (movement == maxMovement) && (inEnemyZOC.contains(startHex) == false) && (phaseName.equals("German Tank Movement") == false)) {
       cost = currentCost.getPointsLeft();
     }
     boolean trace = false;

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java	2009-05-19 15:19:51 UTC (rev 5644)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -82,14 +82,14 @@
     if (occupiedByEnemy.contains(toHex)) {
       return result(fromHex, false, 0.0d, false, MODE_RETREAT, 0);
     }
-    if ((isMajorRiver(et)) && (movementMode == RsrTrait.MOVEMENT_MOTORIZED)) {
-      val |= 1;
+    if (isMajorRiver(et)) {
+      val += 1;
     }
     if ((inEnemyZOC.contains(toHex)) && (occupiedByFriend.contains(toHex) == false)) {
       if ((supplyLevel == RsrTrait.SUPPLY_LACK) || (supplyLevel == RsrTrait.SUPPLY_OUT)) {
         return result(fromHex, false, 0.0d, false, MODE_RETREAT, 0);
       } else {
-        val += 2;
+        val += 10;
       }
     }
     return result(fromHex, true, currentCost.getPointsLeft() - 1, tooClose.contains(toHex), MODE_RETREAT, val);

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-05-19 15:19:51 UTC (rev 5644)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -56,24 +56,15 @@
 		}
 		//
     //find hexes in supply
-    if ((nationality.equals(NATIONALITY_GERMAN)) || (nationality.equals(NATIONALITY_HUNGARIAN)) || (nationality.equals(NATIONALITY_ITALIAN))) {
-      inSupply = mapShader.getHexes(new RsrMapShaderDepotSupply(), "Normal", null).keySet();
-    } else
-    if (nationality.equals(NATIONALITY_FINNISH)) {
-      inSupply = mapShader.getHexes(new RsrMapShaderAxisHQSupply(), "Helsinki;Finnish;Normal", null).keySet();
-    } else
-    if (nationality.equals(NATIONALITY_ROMANIAN)) {
-      inSupply = mapShader.getHexes(new RsrMapShaderAxisHQSupply(), "Bucharest;Romanian;Normal", null).keySet();
-    } else
-    if (nationality.equals(NATIONALITY_SOVIET)) {
-      inSupply = mapShader.getHexes(new RsrMapShaderSovietHQSupply(), "Normal", null).keySet();
-    } else {
+    //TODO: check if flags are not needed to block for eg. movement of leaders through sea supply zone
+    inSupply = RsrAdvance.getInstance().getSupplyCache().getSupply(nationality, false).keySet();
+    if (inSupply == null) {
       inSupply = new HashSet<HexRef>();
     }
     //
     double mp = mapShader.getStartRangeOverride();
     if (mp == 0.0d) {
-      mp = getStrategicMovementAllowance(piece);
+      mp = RsrTrait.getStrategicMovementAllowance(piece);
     }
     startHex = mapShader.getStartHexOverride();
     if (startHex == null) {
@@ -82,7 +73,7 @@
 		if ((blockedByEnemy.contains(startHex)) || (inSupply.contains(startHex) == false)) {
 			mp = 0.0d;
 		} else {
-      mapShader.addHex(selectedHexes, startHex, create(null, true, mp, true, null, 0));
+      mapShader.addHex(selectedHexes, startHex, create(null, true, mp, true, MODE_STRATEGIC, 0));
     }
 	}
 	
@@ -90,23 +81,23 @@
 	public boolean getCrossCost(HexRef fromHex, HexRef toHex,
 			TerrainMapShaderCost currentCost) {
 		if ((blockedByEnemy.contains(toHex)) || (inSupply.contains(toHex) == false)) {
-			return result(fromHex, false, 0.0, false, null, 0);
+			return result(fromHex, false, 0.0, false, MODE_STRATEGIC, 0);
 		}
 		String tt = getHexTerrainName(toHex);
 		String et = getEdgeTerrainName(fromHex, toHex);
 		String lt = getLineTerrainName(fromHex, toHex);
 		if (isImpassable(et)) {
-			return result(fromHex, false, 0.0, false, null, 0);
+			return result(fromHex, false, 0.0, false, MODE_STRATEGIC, 0);
 		} else
 		if (isLakeSea(et)) {
-			if ((side.equals(SIDE_AXIS)) || (isWinter() == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)) {
-				return result(fromHex, false, 0.0, false, null, 0);
+			if ((side.equals(SIDE_AXIS)) || (RsrGlobal.isWinter(turnNumber) == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)) {
+				return result(fromHex, false, 0.0, false, MODE_STRATEGIC, 0);
 			}
 		} else
 		if (tt.equals(HEX_WATER)) {
-			return result(fromHex, false, 0.0, false, null, 0);
+			return result(fromHex, false, 0.0, false, MODE_STRATEGIC, 0);
 		}
-		return result(fromHex, true, currentCost.getPointsLeft()-1.0, isStackSizeOK(toHex, side, mySize) == false, null, 0);
+		return result(fromHex, true, currentCost.getPointsLeft()-1.0, isStackSizeOK(toHex, side, mySize) == false, MODE_STRATEGIC, 0);
 	}
 
 	@Override
@@ -119,9 +110,8 @@
 	}
 
 	@Override
-	public TerrainMapShaderCost getBestCost(
-			HashMap<String, TerrainMapShaderCost> costs) {
-		return costs.get(null);
+	public TerrainMapShaderCost getBestCost(HashMap<String, TerrainMapShaderCost> costs) {
+		return costs.get(MODE_STRATEGIC);
 	}
 	
 }

Modified: VSQL-src/branches/morvael/rsr/RsrTrait.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-05-19 15:19:51 UTC (rev 5644)
+++ VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -20,6 +20,9 @@
 import VASSAL.counters.PieceEditor;
 import VASSAL.i18n.TranslatablePiece;
 import VASSAL.tools.SequenceEncoder;
+import java.util.HashMap;
+import terrain.HexRef;
+import terrain.TerrainMapShaderRule;
 
 /**
  *
@@ -660,47 +663,47 @@
   }
 
 	public static String getSide(GamePiece gp) {
-		return RsrCounter.getStringProperty(gp, "Side", "");
+		return RsrCounter.getStringProperty(gp, "Side", "", true);
 	}
 
 	public static String getNationality(GamePiece gp) {
-		return RsrCounter.getStringProperty(gp, "Nationality", "");
+		return RsrCounter.getStringProperty(gp, "Nationality", "", true);
 	}
 
 	public static String getType(GamePiece gp) {
-		return RsrCounter.getStringProperty(gp, "Type", "");
+		return RsrCounter.getStringProperty(gp, "Type", "", true);
 	}
 
 	public static String getAssetType(GamePiece gp) {
-		return RsrCounter.getStringProperty(gp, "AssetType", "");
+		return RsrCounter.getStringProperty(gp, "AssetType", "", true);
 	}
 
 	public static int getRange(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, "Range", 0);
+		return RsrCounter.getIntProperty(gp, "Range", 0, true);
 	}
 
   public static int getFleetNumber(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, "FleetNumber", 0);
+    return RsrCounter.getIntProperty(gp, "FleetNumber", 0, true);
   }
 
 	public static String getUnitType(GamePiece gp) {
-		return RsrCounter.getStringProperty(gp, "UnitType", "");
+		return RsrCounter.getStringProperty(gp, "UnitType", "", true);
 	}
 
 	public static String getCombatClass(GamePiece gp) {
-		return RsrCounter.getStringProperty(gp, "CombatClass", "");
+		return RsrCounter.getStringProperty(gp, "CombatClass", "", true);
 	}
 
 	public static String getStrengthClass(GamePiece gp) {
-		return RsrCounter.getStringProperty(gp, "StrengthClass", "");
+		return RsrCounter.getStringProperty(gp, "StrengthClass", "", true);
 	}
 
 	public static String getStrengthType(GamePiece gp) {
-		return RsrCounter.getStringProperty(gp, "StrengthType", "");
+		return RsrCounter.getStringProperty(gp, "StrengthType", "", true);
 	}
 
   public static double getStackPoints(GamePiece gp) {
-    double result = RsrCounter.getDoubleProperty(gp, "StackPoints", 0.0d);
+    double result = RsrCounter.getDoubleProperty(gp, "StackPoints", 0.0d, true);
     if (result == -1.0d) {
       return 0.5d;
     } else {
@@ -709,19 +712,19 @@
   }
 
   public static int getSteps(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, STEPS, 0);
+		return RsrCounter.getIntProperty(gp, STEPS, 0, true);
 	}
 
 	public static int getCurrentStep(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, PROPERTY_CURRENT_STEP, 0);
+		return RsrCounter.getIntProperty(gp, PROPERTY_CURRENT_STEP, 0, false);
 	}
 
   public static int getSupplyLevel(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, PROPERTY_SUPPLY_LEVEL, 0);
+		return getTrait(gp).supplyLevel;
 	}
 
 	public static int getSupplyIsolated(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, PROPERTY_SUPPLY_ISOLATED, 0);
+		return getTrait(gp).supplyIsolated;
 	}
 
 	public static boolean isSupplyLevel(GamePiece gp, int ... types) {
@@ -735,15 +738,15 @@
 	}
 
 	public static double getMovement(GamePiece gp) {
-		return RsrCounter.getDoubleProperty(gp, MOVEMENT, 0.0d);
+		return RsrCounter.getDoubleProperty(gp, MOVEMENT, 0.0d, true);
 	}
 
 	public static double getMovementLeft(GamePiece gp) {
-		return RsrCounter.getDoubleProperty(gp, PROPERTY_MOVEMENT_LEFT, 0.0d);
+		return getTrait(gp).movementLeft;
 	}
 
 	public static String getMovementType(GamePiece gp) {
-		return RsrCounter.getStringProperty(gp, PROPERTY_MOVEMENT_TYPE, MOVEMENT_NONMOTORIZED_STRING);
+		return RsrCounter.getStringProperty(gp, PROPERTY_MOVEMENT_TYPE, MOVEMENT_NONMOTORIZED_STRING, true);
 	}
 
 	public static int getMovementTypeAsInt(GamePiece gp) {
@@ -759,91 +762,156 @@
 	}
 
   public static int getVP(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, VP, 0);
+		return RsrCounter.getIntProperty(gp, VP, 0, true);
   }
 
   public static int getAttack1(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, "Attack_1", 0);
+    return RsrCounter.getIntProperty(gp, "Attack_1", 0, true);
   }
 
   public static int getAttack2(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, "Attack_2", 0);
+    return RsrCounter.getIntProperty(gp, "Attack_2", 0, true);
   }
 
   public static int getDefend1(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, "Defend_1", 0);
+    return RsrCounter.getIntProperty(gp, "Defend_1", 0, true);
   }
 
   public static int getDefend2(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, "Defend_2", 0);
+    return RsrCounter.getIntProperty(gp, "Defend_2", 0, true);
   }
 
 	public static int getSupplyMode(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, PROPERTY_SUPPLY_MODE, 0);
+		return RsrCounter.getIntProperty(gp, PROPERTY_SUPPLY_MODE, 0, false);
 	}
 
 	public static int getHighlightRed(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, PROPERTY_HIGHLIGHT_RED, 0);
+		return getTrait(gp).highlightRed;
 	}
 
 	public static int getHighlightGreen(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, PROPERTY_HIGHLIGHT_GREEN, 0);
+		return getTrait(gp).highlightGreen;
 	}
 
 	public static int getHighlightBlue(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, PROPERTY_HIGHLIGHT_BLUE, 0);
+		return getTrait(gp).highlightBlue;
 	}
 
 	public static int getHighlightYellow(GamePiece gp) {
-		return RsrCounter.getIntProperty(gp, PROPERTY_HIGHLIGHT_YELLOW, 0);
+		return getTrait(gp).highlightYellow;
 	}
 
   public static String getStrengthID(GamePiece gp) {
-    return RsrCounter.getStringProperty(gp, PROPERTY_STRENGTH_ID, "");
+    return getTrait(gp).strengthID;
   }
 
   public static String getStartHex(GamePiece gp) {
-    return RsrCounter.getStringProperty(gp, PROPERTY_START_HEX, "");
+    return getTrait(gp).startHex;
   }
 
   public static double getStartMovementLeft(GamePiece gp) {
-		return RsrCounter.getDoubleProperty(gp, PROPERTY_START_MOVEMENT_LEFT, 0.0d);
+		return getTrait(gp).startMovementLeft;
 	}
 
   public static int getMoveIndex(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, PROPERTY_MOVE_INDEX, 0);
+    return getTrait(gp).moveIndex;
   }
 
   public static int getAttacker(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, ATTACKER, 0);
+    return getTrait(gp).attacker;
   }
 
   public static int getDefender(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, DEFENDER, 0);
+    return getTrait(gp).defender;
   }
 
   public static String getCombatHex(GamePiece gp) {
-    return RsrCounter.getStringProperty(gp, COMBAT_HEX, "");
+    return getTrait(gp).combatHex;
   }
 
   public static int getLost(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, LOST, 0);
+    return getTrait(gp).lost;
   }
 
   public static int getRetreating(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, RETREATING, 0);
+    return getTrait(gp).retreating;
   }
 
   public static int getAdvancing(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, ADVANCING, 0);
+    return getTrait(gp).advancing;
   }
 
   public static int getDefeated(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, DEFEATED, 0);
+    return getTrait(gp).defeated;
   }
 
   public static int getAttacked(GamePiece gp) {
-    return RsrCounter.getIntProperty(gp, ATTACKED, 0);
+    return getTrait(gp).attacked;
   }
 
+  private static HashMap<GamePiece, RsrTrait> map = new HashMap<GamePiece, RsrTrait>();
+
+  private static RsrTrait getTrait(GamePiece gp) {
+    RsrTrait result = map.get(gp);
+    if (result == null) {
+      result = (RsrTrait)Decorator.getDecorator(gp, RsrTrait.class);
+      map.put(gp, result);
+    }
+    return result;
+  }
+
+  public static final double getMovementAllowance(GamePiece gp) {
+    double result = getMovement(gp);
+    if (RsrGlobal.getTurnNumber() == 1) {
+      String country = RsrAdvance.getInstance().getAttributeTerrainValue(RsrAdvance.getInstance().getHexRef(gp.getPosition()), RsrMapShaderBase.TAG_COUNTRY);
+      if ((country.equals(RsrMapShaderBase.TAG_COUNTRY_FINLAND)) || (country.equals(RsrMapShaderBase.TAG_COUNTRY_ROMANIA))) {
+        result = 0.0d;
+      }
+    }
+    if (isSupplyLevel(gp, SUPPLY_LACK, SUPPLY_OUT)) {
+      result = Math.ceil(result * 0.5d);
+    }
+    return result;
+  }
+
+  public static final double getStrategicMovementAllowance(GamePiece gp) {
+    String type = getType(gp);
+    if (TerrainMapShaderRule.isAny(type, "Airbase", "Partisan", "Asset", "AirFleet")) {
+      return 0.0d;
+    }
+    if ((type.equals("Depot")) && (RsrGlobal.isMud() == false)) {
+      return 0.0d;
+    }
+    if (isSupplyLevel(gp, SUPPLY_EMERGENCY, SUPPLY_LACK, SUPPLY_OUT)) {
+      return 0.0d;
+    }
+    if (RsrGlobal.getTurnNumber() == 1) {
+      String country = RsrAdvance.getInstance().getAttributeTerrainValue(RsrAdvance.getInstance().getHexRef(gp.getPosition()), RsrMapShaderBase.TAG_COUNTRY);
+      if ((country.equals(RsrMapShaderBase.TAG_COUNTRY_FINLAND)) || (country.equals(RsrMapShaderBase.TAG_COUNTRY_ROMANIA))) {
+        return 0.0d;
+      }
+    }
+    return 25.0d;
+  }
+
+  public static final double getOverrunCost(GamePiece gp) {
+    if (getType(gp).equals("Unit") == false) {
+      return Double.MAX_VALUE;
+    }
+    if (isSupplyLevel(gp, SUPPLY_LACK, SUPPLY_OUT)) {
+      return Double.MAX_VALUE;
+    }
+    double cost;
+    if ((RsrGlobal.isWinter()) && (getSide(gp).equals(RsrMapShaderBase.SIDE_SOVIET))) {
+      cost = 2.0d;
+    } else {
+      cost = 3.0d;
+    }
+    if (cost <= getMovementLeft(gp)) {
+      return cost;
+    } else {
+      return Double.MAX_VALUE;
+    }
+  }
+
 }

Added: VSQL-src/branches/morvael/rsr/SupplyCache.java
===================================================================
--- VSQL-src/branches/morvael/rsr/SupplyCache.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/SupplyCache.java	2009-05-20 15:22:45 UTC (rev 5645)
@@ -0,0 +1,48 @@
+package rsr;
+
+import java.util.HashMap;
+import terrain.HexRef;
+import terrain.TerrainMapShader;
+import terrain.TerrainMapShaderCost;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-05-20
+ */
+public final class SupplyCache extends Cache {
+
+  private TerrainMapShader shader;
+  private RsrMapShaderDepotSupply rulesAxisDepot = new RsrMapShaderDepotSupply();
+  private RsrMapShaderAxisHQSupply rulesAxisHQ = new RsrMapShaderAxisHQSupply();
+  private RsrMapShaderSovietHQSupply rulesSovietHQ = new RsrMapShaderSovietHQSupply();
+
+  public SupplyCache(TerrainMapShader shader) {
+    this.shader = shader;
+  }
+
+  @Override
+  protected HashMap<HexRef, TerrainMapShaderCost> calculate2(String id) {
+    String nationality = id.substring(1);
+    String attrition = id.charAt(0) == 'A' ? "Attrition" : "Normal";
+    if ((nationality.equals(RsrMapShaderBase.NATIONALITY_GERMAN)) || (nationality.equals(RsrMapShaderBase.NATIONALITY_HUNGARIAN)) || (nationality.equals(RsrMapShaderBase.NATIONALITY_ITALIAN))) {
+      return shader.getHexes(rulesAxisDepot, attrition, null);
+    } else
+    if (nationality.equals(RsrMapShaderBase.NATIONALITY_SOVIET)) {
+      return shader.getHexes(rulesSovietHQ, attrition, null);
+    } else
+    if (nationality.equals(RsrMapShaderBase.NATIONALITY_ROMANIAN)) {
+      return shader.getHexes(rulesAxisHQ, "Bucharest;Romanian;" + attrition, null);
+    } else
+    if (nationality.equals(RsrMapShaderBase.NATIONALITY_FINNISH)) {
+      return shader.getHexes(rulesAxisHQ, "Helsinki;Finnish;" + attrition, null);
+    } else {
+      return null;
+    }
+  }
+
+  public HashMap<HexRef, TerrainMapShaderCost> getSupply(String nationality, boolean attrition) {
+    return get2((attrition ? "A" : "N") + nationality);
+  }
+
+}


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

Revision: 5646
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5646&view=rev
Author:   morvael
Date:     2009-05-20 21:08:44 +0000 (Wed, 20 May 2009)

Log Message:
-----------
Little cleanup. Got to reduce RsrTrait.getProperty overhead by hiding properties that need not be accessed via those methods.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-20 15:22:45 UTC (rev 5645)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-20 21:08:44 UTC (rev 5646)
@@ -104,6 +104,9 @@
   protected int scenarioNumber;
   protected int turnNumber;
   protected String phaseName;
+  protected boolean isNorthMapUsed;
+  protected boolean isSouthwestMapUsed;
+  protected boolean isSubMapUsed;
   protected HashMap<HexRef, ArrayList<GamePiece>> friendlyPieceGroups;
   protected HashMap<HexRef, ArrayList<GamePiece>> hostilePieceGroups;
 
@@ -117,6 +120,9 @@
     scenarioNumber = RsrGlobal.getScenario();
     turnNumber = RsrGlobal.getTurnNumber();
     phaseName = RsrGlobal.getPhaseName();
+    isNorthMapUsed = scenarioNumber == 6;
+    isSouthwestMapUsed =(scenarioNumber == 3) || (scenarioNumber == 6);
+    isSubMapUsed = scenarioNumber == 1;
   }
 
   protected void filterFriendlyPieceGroups(String side) {
@@ -294,24 +300,24 @@
     Set<HexRef> tpnswHexes = findHexesWithTag(TAG_MAPPART, TAG_MAPPART_TPNSW);
     if (side.equals(SIDE_AXIS)) {
       for (HexRef hr : findHexesWithTag(TAG_SUPPLY, TAG_SUPPLY_AXIS)) {
-        if ((isNorthMapUsed() == false) && (northHexes.contains(hr))) {
+        if ((isNorthMapUsed == false) && (northHexes.contains(hr))) {
           continue;
         }
-        if ((isSouthwestMapUsed() == false) && (southwestHexes.contains(hr))) {
+        if ((isSouthwestMapUsed == false) && (southwestHexes.contains(hr))) {
           continue;
         }
-        if ((isSouthwestMapUsed() == true) && (tpnswHexes.contains(hr))) {
+        if ((isSouthwestMapUsed == true) && (tpnswHexes.contains(hr))) {
           continue;
         }
-        if ((isSubMapUsed() == false) && ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr)))) {
+        if ((isSubMapUsed == false) && ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr)))) {
           continue;
         }
-        if ((isSubMapUsed() == true) && (tpHexes.contains(hr) == false) && (tpnswHexes.contains(hr) == false)) {
+        if ((isSubMapUsed == true) && (tpHexes.contains(hr) == false) && (tpnswHexes.contains(hr) == false)) {
           continue;
         }
         result.add(hr);
       }
-      if ((isSubMapUsed() == false) && (capital != null)) {
+      if ((isSubMapUsed == false) && (capital != null)) {
         if (isCityAxisControlled(capital)) {
           for (HexRef hr : findHexesWithTag(TAG_CITY, capital)) {
             result.add(hr);
@@ -322,7 +328,7 @@
         }
       }
     } else {
-      if (isSubMapUsed()) {
+      if (isSubMapUsed) {
         for (HexRef hr : findHexesWithTag(TAG_SUPPLY, TAG_SUPPLY_SOVIET)) {
           if ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr))) {
             result.add(hr);
@@ -330,13 +336,13 @@
         }
       } else {
         for (HexRef hr : findHexesWithTag(TAG_SUPPLY, TAG_SUPPLY_SOVIET)) {
-          if ((isNorthMapUsed() == false) && (northHexes.contains(hr))) {
+          if ((isNorthMapUsed == false) && (northHexes.contains(hr))) {
             continue;
           }          
-          if ((isSouthwestMapUsed() == false) && (southwestHexes.contains(hr))) {
+          if ((isSouthwestMapUsed == false) && (southwestHexes.contains(hr))) {
             continue;
           }
-          if ((isSouthwestMapUsed() == true) && (tpnswHexes.contains(hr))) {
+          if ((isSouthwestMapUsed == true) && (tpnswHexes.contains(hr))) {
             continue;
           }
           result.add(hr);
@@ -347,7 +353,7 @@
             break;
           }
         }
-        if ((isSouthwestMapUsed() == true) && (isCityDestroyed(TAG_CITY_BAKU) == false) && (isCityAxisControlled(TAG_CITY_BAKU) == false)) {
+        if ((isSouthwestMapUsed == true) && (isCityDestroyed(TAG_CITY_BAKU) == false) && (isCityAxisControlled(TAG_CITY_BAKU) == false)) {
           for (HexRef hr : findHexesWithTag(TAG_CITY, TAG_CITY_BAKU)) {
             result.add(hr);
             break;
@@ -433,33 +439,17 @@
     return result;
   }
 
-  protected boolean isNorthMapUsed() {
-    return scenarioNumber == 6;
-  }
-
-  protected boolean isSouthwestMapUsed() {
-    return (scenarioNumber == 3) || (scenarioNumber == 6);
-  }
-
-  protected boolean isSubMapUsed() {
-    return scenarioNumber == 1;
-  }
-
-  protected int getScenarioUsed() {
-    return scenarioNumber;
-  }
-
   public boolean isImpassable(String et) {
     if (et.equals(EDGE_IMPASSABLE)) {
       return true;
     } else
-    if ((isSouthwestMapUsed() == false) && ((et.equals(EDGE_IMPASSABLESW)) || (et.equals(EDGE_IMPASSABLESWLAKESEA)) || (et.equals(EDGE_IMPASSABLESWMINORRIVER)))) {
+    if ((isSouthwestMapUsed == false) && ((et.equals(EDGE_IMPASSABLESW)) || (et.equals(EDGE_IMPASSABLESWLAKESEA)) || (et.equals(EDGE_IMPASSABLESWMINORRIVER)))) {
       return true;
     } else
-    if ((isNorthMapUsed() == false) && ((et.equals(EDGE_IMPASSABLEN)) || (et.equals(EDGE_IMPASSABLENLAKESEA)))) {
+    if ((isNorthMapUsed == false) && ((et.equals(EDGE_IMPASSABLEN)) || (et.equals(EDGE_IMPASSABLENLAKESEA)))) {
       return true;
     } else
-    if ((isSubMapUsed() == true) && ((et.equals(EDGE_IMPASSABLETP)) || (et.equals(EDGE_IMPASSABLETPLAKESEA)) || (et.equals(EDGE_IMPASSABLETPMAJORRIVER)) || (et.equals(EDGE_IMPASSABLETPMINORRIVER)))) {
+    if ((isSubMapUsed == true) && ((et.equals(EDGE_IMPASSABLETP)) || (et.equals(EDGE_IMPASSABLETPLAKESEA)) || (et.equals(EDGE_IMPASSABLETPMAJORRIVER)) || (et.equals(EDGE_IMPASSABLETPMINORRIVER)))) {
       return true;
     } else {
       return false;
@@ -470,13 +460,13 @@
     if (et.equals(EDGE_LAKESEA)) {
       return true;
     } else
-    if ((isSouthwestMapUsed() == true) && (et.equals(EDGE_IMPASSABLESWLAKESEA))) {
+    if ((isSouthwestMapUsed == true) && (et.equals(EDGE_IMPASSABLESWLAKESEA))) {
       return true;
     } else
-    if ((isNorthMapUsed() == true) && (et.equals(EDGE_IMPASSABLENLAKESEA))) {
+    if ((isNorthMapUsed == true) && (et.equals(EDGE_IMPASSABLENLAKESEA))) {
       return true;
     } else
-    if ((isSubMapUsed() == false) && (et.equals(EDGE_IMPASSABLETPLAKESEA))) {
+    if ((isSubMapUsed == false) && (et.equals(EDGE_IMPASSABLETPLAKESEA))) {
       return true;
     } else {
       return false;
@@ -495,10 +485,10 @@
     if (et.equals(EDGE_MINORRIVER)) {
       return true;
     } else
-    if ((isSouthwestMapUsed() == true) && (et.equals(EDGE_IMPASSABLESWMINORRIVER))) {
+    if ((isSouthwestMapUsed == true) && (et.equals(EDGE_IMPASSABLESWMINORRIVER))) {
       return true;
     } else
-    if ((isSubMapUsed() == false) && (et.equals(EDGE_IMPASSABLETPMINORRIVER))) {
+    if ((isSubMapUsed == false) && (et.equals(EDGE_IMPASSABLETPMINORRIVER))) {
       return true;
     } else {
       return false;
@@ -509,7 +499,7 @@
     if (et.equals(EDGE_MAJORRIVER)) {
       return true;
     } else
-    if ((isSubMapUsed() == false) && (et.equals(EDGE_IMPASSABLETPMAJORRIVER))) {
+    if ((isSubMapUsed == false) && (et.equals(EDGE_IMPASSABLETPMAJORRIVER))) {
       return true;
     } else {
       return false;

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2009-05-20 15:22:45 UTC (rev 5645)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderVictory.java	2009-05-20 21:08:44 UTC (rev 5646)
@@ -41,7 +41,7 @@
     int vpc = 0;
     int vpu = 0;
     int vpa = 0;
-    int scenario = getScenarioUsed();
+    int scenario = scenarioNumber;
     filterFriendlyPieceGroups(SIDE_AXIS);
     occupiedByFriend = getHexesOccupiedByFriend();
     filterHostilePieceGroups(SIDE_SOVIET);


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

Revision: 5670
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5670&view=rev
Author:   morvael
Date:     2009-05-27 15:10:23 +0000 (Wed, 27 May 2009)

Log Message:
-----------
Fixed Guards Cavalry special rules, swamp consistently treated as wood in winter, option to turn off supply shading, part of administrative phase coded (untested).

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrConstants.java
    VSQL-src/branches/morvael/rsr/RsrGlobal.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderAdvance.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
    VSQL-src/branches/morvael/rsr/RsrTrait.java
    VSQL-src/branches/morvael/rsr/StackInfo.java
    VSQL-src/branches/morvael/rsr/SupplyCache.java
    VSQL-src/branches/morvael/rsr/ZOCCache.java

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -98,57 +98,23 @@
     commandSetProperty(dataPiece, PROPERTY_PHASE_PART, 1);
     String phaseName = getPhaseName();
     if (phaseName.equals(PHASE_SUPPLY)) {
-      //check supply of airbases - AUTO - on enter
-      //place air fleets on the map - MANUAL
-      //check supply of all units - AUTO - on leave
-      //check attrition of all units - AUTO - on leave
-      //put Combat Strength Markers into Cups - AUTO - on leave
       commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     } else if (phaseName.equals(PHASE_AXIS_REINFORCEMENT)) {
-      //put reinforcements on map - MANUAL
       commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     } else if (phaseName.equals(PHASE_AXIS_MOVEMENT)) {
-      //reset movement - AUTO - on enter
-      //sea movement - MANUAL
-      //strategic movement - MANUAL
-      //movement except airbase - MANUAL
-      //movement airbase - MANUAL
-      //clear movement - AUTO - on leave
       commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 4);
     } else if (phaseName.equals(PHASE_AXIS_COMBAT)) {
-      //combat - MANUAL
       commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     } else if (phaseName.equals(PHASE_SOVIET_COMBAT)) {
-      //combat - MANUAL
       commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     } else if (phaseName.equals(PHASE_SOVIET_REINFORCEMENT)) {
-      //put other reinforcements to offboard - AUTO - on enter
-      //put reinforcements on map - MANUAL
       commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     } else if (phaseName.equals(PHASE_SOVIET_MOVEMENT)) {
-      //sea movement - MANUAL
-      //strategic movement - MANUAL
-      //movement except leader - MANUAL
-      //movement leader - MANUAL
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 4);
+      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 5);
     } else if (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) {
-      //movement - MANUAL
-      //strategic movement - MANUAL
-      //remove airfleets - AUTO
-      //remove airbase in given turns - MANUAL
       commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 3);
     } else if (phaseName.equals(PHASE_ADMINISTRATIVE)) {
-      //port asset elimination in production turn - AUTO - on enter
-      //leader check in production turn - AUTO - on enter
-      //leader placement in production turn - MANUAL
-      //axis breakdowns and buildups - MANUAL
-      //soviet army conversion - MANUAL
-      //soviet breakdowns and buildups in production turn - MANUAL
-      //factory evacuation in production turn - MANUAL
-      //partisan placement - MANUAL
-      //fetch combat markers - AUTO - on leave
-      //release combat markers - AUTO - on leave
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
+      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 6);
     } else {
       commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     }
@@ -159,19 +125,16 @@
   }
 
   private void executeLeavePhase() {
-    //commandLog("Leave " + rules.getPhaseName());
     executePartPhase(RsrGlobal.getPhaseParts() + 1);
   }
 
   private void executeEnterPhase() {
-    //commandLog("Enter " + rules.getPhaseName());
     executeSetPhaseParts();
     executePartPhase(0);
     executePart(1);
   }
 
   private void executePart(int part) {
-    //commandLog("Part " + part + " of " + rules.getPhaseName());
     executePartPhase(part);
     commandSetProperty(dataPiece, PROPERTY_PHASE_PART, part + 1);
   }
@@ -180,7 +143,6 @@
     //0 - enter
     //1..x - parts
     //x+1 - leave
-    commandLog("Part " + part + " of " + getPhaseName());
 
     commandClearHighlight();
     commandDisallowMovementAll();
@@ -188,7 +150,6 @@
     String phaseName = getPhaseName();
     if (phaseName.equals(PHASE_SUPPLY)) {
       switch (part) {
-        case 0: executeSupply0(); break;
         case 1: executeSupply1(); break;
         case 2: executeSupply2(); break;
       }
@@ -203,6 +164,7 @@
         case 2: executeAxisMovement2(); break;
         case 3: executeAxisMovement3(); break;
         case 4: executeAxisMovement4(); break;
+        case 5: executeAxisMovement5(); break;
       }
     } else if (phaseName.equals(PHASE_AXIS_COMBAT)) {
       switch (part) {
@@ -225,6 +187,8 @@
         case 2: executeSovietMovement2(); break;
         case 3: executeSovietMovement3(); break;
         case 4: executeSovietMovement4(); break;
+        case 5: executeSovietMovement5(); break;
+        case 6: executeSovietMovement6(); break;
       }
     } else if (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) {
       switch (part) {
@@ -233,16 +197,27 @@
         case 3: executeGermanTankMovement3(); break;
       }
     } else if (phaseName.equals(PHASE_ADMINISTRATIVE)) {
-      //TODO: fill in
+      switch (part) {
+        case 1: executeAdministrative1(); break;
+        case 2: executeAdministrative2(); break;
+        case 3: executeAdministrative3(); break;
+        case 4: executeAdministrative4(); break;
+        case 5: executeAdministrative5(); break;
+        case 6: executeAdministrative6(); break;
+        case 7: executeAdministrative7(); break;
+      }
     }
   }
 
   /*
    * Check supply of airbases. (AUTO)
    * Remove out of supply airbases from the map. (AUTO)
+   * If not mud turn, place air fleets on airbases. (AUTO)
+   * If there are air fleets on airbases, ask Axis player to move them to desired location in range. (MANUAL)
+   * Ask Axis player to voluntarily remove supply depots and/or convert supply depots into emergency supply sources. (MANUAL)
    */
-  private void executeSupply0() {
-    commandLog("Game: Checking supply of airbases and removing any out of supply.");
+  private void executeSupply1() {
+    commandLog("Game: Checking supply of airbases.");
     supplyCache.clear();
     HashMap<HexRef, TerrainMapShaderCost> inSupply = supplyCache.getSupply(NATIONALITY_GERMAN, false);
     HexRef hr;
@@ -250,18 +225,9 @@
       hr = mainGrid.getHexPos(gp.getPosition());
       if ((inSupply.containsKey(hr) == false) || (inSupply.get(hr).getFlag().equals(MODE_NORMAL) == false)) {
         commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");
-      } else {
-        commandSetProperty(gp, T_SUPPLY_LEVEL, 0, T_SUPPLY_ISOLATED, 0);
       }
     }
-  }
-
-  /*
-   * If not mud turn, place air fleets on airbases. (AUTO)
-   * If there are air fleets on airbases, ask Axis player to move them to desired location in range. (MANUAL)
-   * Ask Axis player to voluntarily remove supply depots and/or convert supply depots into emergency supply sources. (MANUAL)
-   */
-  private void executeSupply1() {
+    //
     int count;
     if (isMud() == false) {
       count = 0;
@@ -274,7 +240,6 @@
         }
       }
       if (count > 0) {
-        commandResetMovementIndex();
         commandLog("Axis Player: Move air fleets to desired location in range.");
       }
     }
@@ -361,7 +326,7 @@
     }
     //Check attrition of all isolated units.
     if (isolatedUnits.size() > 0) {
-      commandLog("Game: Checking attrition of all isolated units.");
+      commandLog("Game: Checking attrition of isolated units.");
       int d6;
       String tt;
       int stepsLost = 0;
@@ -418,7 +383,7 @@
     //Remove supply depots converted into emergency supply sources.
     ArrayList<GamePiece> emergencyDepots = filter.filterPieces(mainMap, "Type=='Depot'&&SupplyMode==2");
     if (emergencyDepots.size() > 0) {
-      commandLog("Game: Removing supply depots converted into emergency supply sources.");
+      commandLog("Game: Removing " + emergencyDepots.size() + " supply depot(s) converted into emergency supply source(s).");
       for (GamePiece gp : emergencyDepots) {
         commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");
       }
@@ -426,7 +391,7 @@
     //
     ArrayList<GamePiece> receivedCombatStrengthMarkers = filter.filterPieces(turnMap, "Type=='Strength'&&LocationName=='S" + getTurnName() + "'");
     if (receivedCombatStrengthMarkers.size() > 0) {
-      commandLog("Game: Moving Soviet Combat Strength Markers received as reinforcements into the proper draw cups.");
+      commandLog("Game: Moving " + receivedCombatStrengthMarkers.size() + " Soviet Combat Strength Marker(s) received as reinforcement(s) into the proper draw cups.");
       for (GamePiece gp : receivedCombatStrengthMarkers) {
         commandSendToOffboardZone(gp, RsrTrait.getStrengthClass(gp) + "-strength pool");
       }
@@ -434,7 +399,7 @@
   }
 
   /**
-   * 
+   * Ask Axis player to put received reinforcements on map. (MANUAL)
    */
   private void executeAxisReinforcement1() {
     supplyCache.clear();
@@ -473,7 +438,7 @@
     supplyCache.clear();
     int count = 0;
     HashSet<HexRef> blockedByEnemy = zocCache.getHexesInRangeEnemy(SIDE_AXIS, 4);
-    for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Axis'")) {
+    for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Axis'&&" + T_MOVED + "==0")) {
       if ((getStrategicMovementAllowance(gp) > 0) && (blockedByEnemy.contains(mainGrid.getHexPos(gp.getPosition())) == false)) {
         commandAllowMovement(gp, 0.0d, true);
         count++;
@@ -494,7 +459,7 @@
   private void executeAxisMovement3() {
     int count = 0;
     double mp = 0;
-    for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Axis'&&Movement>0&&Type!='Airbase'")) {
+    for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Axis'&&Movement>0&&Type!='Airbase'&&" + T_MOVED + "==0")) {
       mp = getMovementAllowance(gp);
       if (mp > 0) {
         commandAllowMovement(gp, mp, true);
@@ -516,7 +481,7 @@
   private void executeAxisMovement4() {
     int count = 0;
     double mp = 0;
-    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Airbase'")) {
+    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Airbase'&&" + T_MOVED + "==0")) {
       mp = getMovementAllowance(gp);
       if (mp > 0) {
         commandAllowMovement(gp, mp, true);
@@ -532,8 +497,18 @@
   }
 
   /**
+   * Reset status of moved units. (AUTO)
    */
+  private void executeAxisMovement5() {
+    commandMarkAsUnmovedAll();
+  }
+
+  /**
+   * Allow attack for all Axis units that can. (AUTO)
+   * Ask Axis player to attack. (MANUAL)
+   */
   private void executeAxisCombat1() {
+    //TODO: allow SiegeArtillery to participate in attacks, add this in AttackHexes too.
     int count = 0;
     for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Axis'&&Type=='Unit'")) {
       if (getAttackHexes(gp).size() > 0) {
@@ -557,6 +532,10 @@
     }
   }
 
+  /**
+   * Allow attack for all Soviet units that can. (AUTO)
+   * Ask Soviet player to attack. (MANUAL)
+   */
   private void executeSovietCombat1() {
     int count = 0;
     for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Soviet'&&Type=='Unit'")) {
@@ -582,7 +561,9 @@
   }
 
   /**
-   *
+   * Move received Guards and Shock armies to Awaiting Promotion Box. (AUTO)
+   * Move received Airborne corps to Paradrop Waiting Box. (AUTO)
+   * Ask Soviet player to put received reinforcements on map. (MANUAL)
    */
   private void executeSovietReinforcement1() {
     supplyCache.clear();
@@ -633,8 +614,19 @@
     }
   }
 
-  //sea movement - MANUAL
+  /**
+   * Airborne assault. (MANUAL)
+   */
   private void executeSovietMovement1() {
+    //commandLog("Soviet Player: Airborne assault.");
+    //TODO: finish this
+    autoAdvance = true;
+  }
+
+  /**
+   * Sea movement. (MANUAL)
+   */
+  private void executeSovietMovement2() {
     //commandLog("Soviet Player: Sea movement.");
     //TODO: finish this
     autoAdvance = true;
@@ -644,11 +636,11 @@
    * Set strategic movement for all Soviet units. (AUTO)
    * Ask Soviet player to strategically move units. (MANUAL)
    */
-  private void executeSovietMovement2() {
+  private void executeSovietMovement3() {
     supplyCache.clear();
     int count = 0;
     HashSet<HexRef> blockedByEnemy = zocCache.getHexesInRangeEnemy(SIDE_SOVIET, 4);
-    for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Soviet'")) {
+    for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Soviet'&&" + T_MOVED + "==0")) {
       if ((getStrategicMovementAllowance(gp) > 0) && (blockedByEnemy.contains(mainGrid.getHexPos(gp.getPosition())) == false)) {
         commandAllowMovement(gp, 0.0d, true);
         count++;
@@ -666,10 +658,10 @@
    * Set movement for all moveable Soviet units (except leaders). (AUTO)
    * Ask Soviet player to move units (except leaders). (MANUAL)
    */
-  private void executeSovietMovement3() {
+  private void executeSovietMovement4() {
     int count = 0;
     double mp = 0;
-    for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Soviet'&&Movement>0&&Type!='Leader'")) {
+    for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Soviet'&&Movement>0&&Type!='Leader'&&" + T_MOVED + "==0")) {
       mp = getMovementAllowance(gp);
       if (mp > 0) {
         commandAllowMovement(gp, mp, true);
@@ -688,10 +680,10 @@
    * Set movement for all moveable Soviet leaders. (AUTO)
    * Ask Soviet player to move leaders. (MANUAL)
    */
-  private void executeSovietMovement4() {
+  private void executeSovietMovement5() {
     int count = 0;
     double mp = 0;
-    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Leader'")) {
+    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Leader'&&" + T_MOVED + "==0")) {
       mp = getMovementAllowance(gp);
       if (mp > 0) {
         commandAllowMovement(gp, mp, true);
@@ -706,6 +698,13 @@
     }
   }
 
+  /**
+   * Reset status of moved units. (AUTO)
+   */
+  private void executeSovietMovement6() {
+    commandMarkAsUnmovedAll();
+  }
+
   /*
    * Set movement for all moveable German tank units. (AUTO)
    * Ask Axis player to move German tank units. (MANUAL)
@@ -728,7 +727,10 @@
     }
   }
 
-  //strategic movement - MANUAL
+  /**
+   * Set strategic movement for all German tank units. (AUTO)
+   * Ask Axis player to strategically move German tank units. (MANUAL)
+   */
   private void executeGermanTankMovement2() {
     supplyCache.clear();
     int count = 0;
@@ -747,9 +749,15 @@
     }
   }
 
-  //remove airfleets - AUTO
-  //remove airbase in given turns - MANUAL
+  /**
+   * Reset status of moved units. (AUTO)
+   * Remove Air Fleets from map. (AUTO)
+   * Remove Airbase on given turn. (MANUAL)
+   */
   private void executeGermanTankMovement3() {
+    //
+    commandMarkAsUnmovedAll();
+    //
     ArrayList<GamePiece> airfleets = filter.filterPieces(mainMap, "Type=='AirFleet'");
     if (airfleets.size() > 0) {
       commandLog("Game: Removing air fleets from the map.");
@@ -757,15 +765,159 @@
         commandSendToOffboardZone(gp, "Airfleet pool");
       }
     }
-    if ((getTurnNumber() == 11) || (getTurnNumber() == 31)) {
-      commandLog("Axis Player: Remove any one Airbase.");
-      //TODO: finish this, also add check for italian army
+    //
+    int turnNumber = getTurnNumber();
+    if ((turnNumber == 11) || (turnNumber == 31)) {
+      ArrayList<GamePiece> airbases = filter.filterPieces(mainMap, "Type=='Airbase'");
+      airbases.addAll(filter.filterPieces(turnMap, "Type=='Airbase'"));
+      int desiredCount = turnNumber == 11 ? 2 : 1;
+      if (airbases.size() > desiredCount) {
+        commandLog("Axis Player: Remove any one Airbase.");
+        for (GamePiece gp : airbases) {
+          commandAllowCombatAction(gp);
+        }
+      } else {
+        for (GamePiece gp : airbases) {
+          commandDisallowCombatAction(gp);
+        }
+        autoAdvance = true;
+      }
     } else {
       autoAdvance = true;
     }
   }
 
   /**
+   * Remove the Italian 8th Army from the game on turn 34. (AUTO)
+   * Ask Axis player to perform breakdowns and buildups. (MANUAL)
+   */
+  private void executeAdministrative1() {
+    if (getTurnNumber() == 34) {
+      for (GamePiece gp : filter.filterPieces(mainMap, "UnitType=='AxisItalianArmy'")) {
+        commandEliminate(gp);
+      }
+    }
+    //TODO: finish this
+    autoAdvance = true;
+  }
+
+  /**
+   * Ask Soviet player to promote infantry armies into Guards and Shock armies. (MANUAL)
+   */
+  private void executeAdministrative2() {
+    ArrayList<GamePiece> convertible = filter.filterPieces(mainMap, "UnitType=='SovietInfantryArmy'&&" + T_SUPPLY_LEVEL + "==0");
+    HashSet<HexRef> inZOC = isMud() ? new HashSet<HexRef>() : zocCache.getHexesInZOCEnemy(SIDE_SOVIET);
+    Iterator<GamePiece> it = convertible.iterator();
+    while (it.hasNext()) {
+      if (inZOC.contains(getHexRef(it.next().getPosition()))) {
+        it.remove();
+      }
+    }
+    if (convertible.size() > 0) {
+      ArrayList<GamePiece> converts = findInOffboardZone("Awaiting Promotion Box", "Unit", null, Integer.MAX_VALUE);
+      if (converts.size() > 0) {
+        for (GamePiece gp : convertible) {
+          commandAllowAction(gp);
+        }
+        commandLog("Soviet Player: Promote infantry armies into Guards and Shock armies.");
+        return;
+      }
+    }
+    autoAdvance = true;
+  }
+
+  /**
+   * If this is a production turn...
+   * ...ask Soviet player to perform breakdowns and buildups. (MANUAL)
+   */
+  private void executeAdministrative3() {
+    if (isProductionTurn()) {
+      //TODO: finish this
+    }
+    autoAdvance = true;
+  }
+
+  /**
+   * If this is a production turn...
+   * ...check to see if strategic port economic assets have a railroad line of communication. (AUTO)
+   * ...check to see if a Leader is "produced". (AUTO)
+   * ......and ask Soviet player to put "produced" leader on map. (MANUAL)
+   */
+  private void executeAdministrative4() {
+    if (isProductionTurn()) {
+      supplyCache.clear();
+      ArrayList<GamePiece> ports = filter.filterPieces(mainMap, "AssetType=='Strategic Port'");
+      if (ports.size() > 0) {
+        commandLog("Game: Checking railroad line of communication of strategic port assets.");
+        HashSet<HexRef> withLOC = supplyCache.getSovietLine();
+        for (GamePiece gp : ports) {
+          if (withLOC.contains(getHexRef(gp.getPosition())) == false) {
+            commandEliminate(gp);
+          }
+        }
+      }
+      int eliminatedAssets = findInOffboardZone("Eliminated Economic Assets", "Asset", null, Integer.MAX_VALUE).size();
+      if (eliminatedAssets < getProductionNumber()) {
+        ArrayList<GamePiece> leadersOnMap = filter.filterPieces(mainMap, "Type=='Leader'");
+        ArrayList<GamePiece> leadersInPool = findInOffboardZone("Leader pool", "Leader", null, Integer.MAX_VALUE);
+        if ((leadersOnMap.size() < 10) && (leadersInPool.size() > 0)) {
+          GamePiece gp = leadersInPool.get(ran.nextInt(leadersInPool.size()));
+          commandSendToReinforcementZone(gp, 0, "Leader pool");
+          commandAllowMovement(gp, 0.0d, true);
+          commandLog("Soviet Player: Put " + gp.getName() + " on map.");
+          return;
+        }
+      }
+    }
+    autoAdvance = true;
+  }
+
+  /**
+   * If this is a production turn...
+   * ...ask Soviet player to evacuate factory economic assets. (MANUAL)
+   */
+  private void executeAdministrative5() {
+    if (isProductionTurn()) {
+      //TODO: finish this
+    }
+    autoAdvance = true;
+  }
+
+  /**
+   * Ask Soviet player to put received Partisan units on map. (MANUAL)
+   */
+  private void executeAdministrative6() {
+    //TODO: finish this
+    autoAdvance = true;
+  }
+
+  /**
+   * Draw a combat strength marker for each Soviet army that i) does not already have a combat strength marker, and ii) is next to an Axis unit. (AUTO)
+   * Remove a combat strength marker from each in supply or lack of supply Soviet army that is not next to an Axis unit. (AUTO)
+   */
+  private void executeAdministrative7() {
+    HashSet<HexRef> inZOC = zocCache.getHexesInZOCEnemy(SIDE_SOVIET);
+    ArrayList<GamePiece> armies = filter.filterPieces(mainMap, "Side=='Soviet'&&Type=='Unit'&&Size=='Army'");
+    Iterator<GamePiece> it = armies.iterator();
+    GamePiece gp;
+    while (it.hasNext()) {
+      gp = it.next();
+      if ((RsrTrait.getStrengthID(gp).length() == 0) && (inZOC.contains(getHexRef(gp.getPosition())))) {
+        commandFetchCounter(gp);
+        it.remove();
+      }
+    }
+    it = armies.iterator();
+    while (it.hasNext()) {
+      gp = it.next();
+      if ((RsrTrait.getStrengthID(gp).length() > 0) && (RsrTrait.isSupplyLevel(gp, SUPPLY_NORMAL, SUPPLY_LACK)) && (inZOC.contains(getHexRef(gp.getPosition())) == false)) {
+        commandReleaseCounter(gp);
+        it.remove();
+      }
+    }
+  }
+
+  /**
    * Leaves on list only those pieces that can move, then if they are on the
    * main map, selects the intersection of their individual movement zones.
    * If the zone is not empty, displays it on the map, otherwise clears the
@@ -842,7 +994,7 @@
               return true;
             }
           }
-        } else if ((phaseName.equals(PHASE_AXIS_REINFORCEMENT)) || (phaseName.equals(PHASE_SOVIET_REINFORCEMENT))) {
+        } else if ((phaseName.equals(PHASE_AXIS_REINFORCEMENT)) || (phaseName.equals(PHASE_SOVIET_REINFORCEMENT)) || ((phaseName.equals(PHASE_ADMINISTRATIVE)) && (phasePart == 4))) {
           if (allowMovement(gp, getReinforcementHexes(gp))) {
             return true;
           }
@@ -1042,10 +1194,18 @@
     String phaseName = getPhaseName();
     int phasePart = RsrGlobal.getPhasePart() - 1;
     if (phaseName.equals(PHASE_SUPPLY)) {
-      if ((phasePart == 1) && (gp.getMap() == mainMap) && (RsrTrait.getType(gp).equals("Depot"))) {
+      if ((phasePart == 1) && (RsrTrait.getHlAction(gp) > 0)) {
         commands.add(new KeyCommand("Remove Depot", KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_DOWN_MASK), gp, trait));
         commands.add(new KeyCommand("Convert Depot", KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK), gp, trait));
       }
+    } else if (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) {
+      if ((phasePart == 3) && (RsrTrait.getHlLoss(gp) > 0)) {
+        commands.add(new KeyCommand("Eliminate", KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK), gp, trait));
+      }
+    } else if (phaseName.equals(PHASE_ADMINISTRATIVE)) {
+      if ((phasePart == 2) && (RsrTrait.getHlAction(gp) > 0)) {
+        commands.add(new KeyCommand("Promote", KeyStroke.getKeyStroke(KeyEvent.VK_P, InputEvent.CTRL_DOWN_MASK), gp, trait));
+      }
     }
     int combatStage = RsrGlobal.getCombatStage();
     if (((combatStage == 2) || (combatStage == 3) || (combatStage == 4)) && (RsrTrait.getHlLoss(gp) > 0)) {
@@ -1082,6 +1242,11 @@
       } else {
 
       }
+    } else if (name.equals("Eliminate")) {
+      commandEliminate(gp);
+      //TODO: push Advance button automatically
+    } else if (name.equals("Promote")) {
+      commandPromote(gp);
     } else if (name.equals("Remove Depot")) {
       commandLogMy("Voluntarily removed supply depot in " + mainGrid.locationName(gp.getPosition()) + ".");
       commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -79,13 +79,14 @@
   protected HashMap<HexRef, GamePiece> destroyedMarkers = new HashMap<HexRef, GamePiece>();
   private HashSet<HexRef> variants = new HashSet<HexRef>();
 
-  protected SupplyCache supplyCache;
   protected AirFleetCache airFleetCache;
   protected ZOCCache zocCache;
+  protected SupplyCache supplyCache;
 
   protected boolean isNorthMapUsed = true;
   protected boolean isSouthwestMapUsed = true;
   protected boolean isSubMapUsed = false;
+  protected int lastSupplyDisplayed = -1;
 
   protected Board findBoard(Map map, String name) {
     if (map != null) {
@@ -144,9 +145,9 @@
         turnPiece = getSinglePiece(turnMap, "BasicName=='Game Turn'");
         phasePiece = getSinglePiece(turnMap, "BasicName=='Turn Phase'");
         dataPiece = getSinglePiece(turnMap, "BasicName=='Data'");
-        supplyCache = new SupplyCache(mainMap, mainGrid, mainTerrain);
         airFleetCache = new AirFleetCache(mainMap, mainGrid, filter);
         zocCache = new ZOCCache(this, mainMap, mainGrid, filter);
+        supplyCache = new SupplyCache(this, mainMap, mainGrid, mainTerrain, zocCache);
         initialized = true;
         onInitialize(param);
       } catch (Exception ex) {
@@ -181,7 +182,6 @@
       destroyedMarkers.clear();
       moveMode = MOVE_FREE;
       allowedMovement.clear();
-      //TODO: add commands cache
       GameModule.getGameModule().sendAndLog(c);
       c = null;
       mainMap.repaint();
@@ -205,14 +205,14 @@
   }
 
   public void commandSetProperty(GamePiece gp, Object key, Object val) {
-    zocCache.clear();
+    zocCache.clear(); //step down may cause loss of zoc
     ChangeTracker tracker = new ChangeTracker(gp);
     gp.setProperty(key.toString(), String.valueOf(val));
     appendCommand(tracker.getChangeCommand());
   }
 
   public void commandSetProperty(GamePiece gp, Object... key_val) {
-    zocCache.clear();
+    zocCache.clear(); //step down may cause loss of zoc
     ChangeTracker tracker = new ChangeTracker(gp);
     for (int i = 0; i < key_val.length; i += 2) {
       gp.setProperty(key_val[i].toString(), String.valueOf(key_val[i + 1]));
@@ -221,7 +221,7 @@
   }
 
   public void commandMove(Map map, GamePiece gp, Point p) {
-    zocCache.clear();
+    zocCache.clear(); //moving units may cause change of zoc
     appendCommand(map.placeOrMerge(gp, p));
   }
 
@@ -341,7 +341,7 @@
   }
 
   public void commandClearHighlight() {
-    zocCache.clear();
+    zocCache.clear(); //TODO: is this needed here?
     ClearHighlightCommand cmd = new ClearHighlightCommand(mainMap, filter);
     cmd.execute();
     appendCommand(cmd);
@@ -349,18 +349,15 @@
 
   public void commandReportMoves() {
     MovementReporter r = new MovementReporter(c);
-    if (GlobalOptions.getInstance().autoReportEnabled()) {
-      Command reportCommand = r.getReportCommand();
-      if (reportCommand != null) {
-        reportCommand.execute();
-      }
+    Command reportCommand = r.getReportCommand();
+    if (reportCommand != null) {
+      reportCommand.execute();
       appendCommand(reportCommand);
     }
-    //appendCommand(r.markMovedPieces());
   }
 
   public void commandDelete(GamePiece gp) {
-    zocCache.clear();
+    zocCache.clear(); //deleting units may cause change of zoc
     Command cmd = new RemovePiece(gp);
     cmd.execute();
     appendCommand(cmd);
@@ -502,6 +499,22 @@
     commandLog("Game: " + rgp.getName() + " was sent to " + gp.getName() + "'s location.");
   }
 
+  public void commandPromote(GamePiece gp) {
+    ArrayList<GamePiece> converts = findInOffboardZone("Awaiting Promotion Box", "Unit", null, 1);
+    if (converts.size() > 0) {
+      GamePiece pgp = converts.get(0);
+      String strengthID = RsrTrait.getStrengthID(gp);
+      commandSendToPiece(gp, pgp, false);
+      if (strengthID.length() > 0) {
+        commandReleaseCounter(gp);
+      }
+      commandSendToOffboardZone(gp, "Promoted Army Box");
+      if (strengthID.length() > 0) {
+        commandFetchCounter(pgp);
+      }
+    }
+  }
+
   public void commandEliminate(GamePiece gp) {
     String type = RsrTrait.getType(gp);
     if (type.equals("Unit")) {
@@ -653,6 +666,16 @@
     commandSetProperty(gp, T_MOVEMENT_LEFT, 0.0d, T_HL_MOVEMENT, 0, T_START_HEX, "", T_MOVE_INDEX, 0);
   }
 
+  public void commandMarkAsMoved(GamePiece gp) {
+    commandSetProperty(gp, T_MOVED, 1);
+  }
+
+  public void commandMarkAsUnmovedAll() {
+    for (GamePiece gp : filter.filterPieces(mainMap, T_MOVED + ">0")) {
+      commandSetProperty(gp, T_MOVED, 0);
+    }
+  }
+
   public void commandSetMovementIndex(ArrayList<GamePiece> pieces) {
     int moveIndex = RsrGlobal.getLastMovedIndex() + 1;
     for (GamePiece gp : pieces) {
@@ -661,6 +684,7 @@
     commandSetProperty(dataPiece, PROPERTY_LAST_MOVED_INDEX, moveIndex);
     for (GamePiece gp : filter.filterPieces(mainMap, T_MOVE_INDEX + ">0&&" + T_MOVE_INDEX + "<" + moveIndex)) {
       commandDisallowMovement(gp);
+      commandMarkAsMoved(gp);
     }
   }
 
@@ -820,8 +844,35 @@
     CombatHexList defenderHexes = new CombatHexList(RsrGlobal.getDefenderHexes());
     boolean ignoreOptional = true;
     if (combatStage == 1) {
+      commandLogMy("Combat resolution");
+      //check if urban loss will apply
+      if (combatMode == 0) {
+        boolean urbanLoss = false;
+        for (HexRef hr : defenderHexes.getHexes()) {
+          if (isMajorCity(mainTerrain.getHexTerrainName(hr))) {
+            urbanLoss = true;
+            break;
+          }
+        }
+        if (urbanLoss) {
+          int steps;
+          int totalSteps = 0;
+          int motorizedSteps = 0;
+          for (GamePiece gp : attackers) {
+            steps = RsrTrait.getCurrentNominalSteps(gp);
+            totalSteps += steps;
+            if (RsrTrait.getMovementTypeAsInt(gp) == MOVEMENT_MOTORIZED) {
+              motorizedSteps += steps;
+            }
+          }
+          urbanLoss = 2*motorizedSteps > totalSteps;
+          if (urbanLoss) {
+            commandLog("Game: Additional losses will apply to motorized forces attacking urban area (" + motorizedSteps + " step(s) out of " + totalSteps + " step(s) are motorized).");
+            commandSetProperty(dataPiece, URBAN_LOSS_REQUIRED, 1);
+          }
+        }
+      }
       //combatMode += 2 if urban mech loss is to be applied
-      commandLogMy("Combat resolution");
       String result = getCombatResult(attackers, defenders, attackerHexes, defenderHexes);
       int al = 0;
       int ar = 0;
@@ -961,10 +1012,31 @@
       }
     }
     if (combatStage == 5) {
-      //TODO: apply urban test for motorized units
+      //apply urban test for motorized units
+      if (RsrGlobal.getUrbanLossRequired() == 1) {
+        commandLog("Game: Applying additional losses to motorized forces that attacked urban area.");
+        //refresh in case any units were removed
+        attackers = filter.filterPieces(mainMap, T_ATTACKER + ">0");
+        int chance;
+        for (GamePiece gp : attackers) {
+          if (RsrTrait.getMovementTypeAsInt(gp) == MOVEMENT_MOTORIZED) {
+            if ((RsrTrait.getLost(gp) > 0) || (RsrTrait.getCombatHex(gp).equals(getLocationName(getHexRef(gp.getPosition()))) == false)) {
+              chance = 3;
+            } else {
+              chance = 1;
+            }
+            if ((ran.nextInt(6) + 1) <= chance) {
+              commandStepLoss(gp);
+            }
+          }
+        }
+        commandSetProperty(dataPiece, URBAN_LOSS_REQUIRED, 0);
+      }
       //find victorious units
       int victorious = 0;
       int advanceRange;
+      //refresh in case any units were removed
+      defenders = filter.filterPieces(mainMap, T_DEFENDER + ">0");
       //check if there are any victorious defenders
       if (defenders.size() > 0) {
         //check for attacker vacated hexes
@@ -984,8 +1056,6 @@
         }
         //setup advancing defenders
         if (attackerVacated) {
-          //refresh in case any units were removed
-          defenders = filter.filterPieces(mainMap, T_DEFENDER + ">0");
           //
           for (GamePiece gp : defenders) {
             advanceRange = getMaximumAdvance(gp);
@@ -1001,6 +1071,8 @@
           }
         }
       }
+      //refresh in case any units were removed
+      attackers = filter.filterPieces(mainMap, T_ATTACKER + ">0");
       //check if there are any victorious attackers
       if (attackers.size() > 0) {
         ArrayList<GamePiece> piecesIn;
@@ -1024,8 +1096,6 @@
         }
         //setup advancing attackers, or end movement for units that failed to overrun
         if (defenderVacated) {
-          //refresh in case any units were removed
-          attackers = filter.filterPieces(mainMap, T_ATTACKER + ">0");
           //
           for (GamePiece gp : attackers) {
             //in normal combat let them advance
@@ -1587,6 +1657,33 @@
             (turnNumber == 40);
   }
 
+  public int getProductionNumber() {
+    return getProductionNumber(getTurnNumber());
+  }
+
+  public int getProductionNumber(int turnNumber) {
+    switch (turnNumber) {
+      case 5 : return 1;
+      case 7 : return 3;
+      case 9 : return 5;
+      case 11 : return 8;
+      case 12 : return 2;
+      case 14 : return 12;
+      case 19 : return 10;
+      case 21 : return 4;
+      case 23 : return 18;
+      case 25 : return 6;
+      case 26 : return 20;
+      case 28 : return 7;
+      case 33 : return 24;
+      case 35 : return 14;
+      case 37 : return 22;
+      case 39 : return 16;
+      case 40 : return 20;
+      default : return 0;
+    }
+  }
+
   public boolean isImpassable(String et) {
     if (et.equals(EDGE_IMPASSABLE)) {
       return true;
@@ -2163,9 +2260,9 @@
 
   public boolean isStackSizeOK(HexRef hr, String side, double mySize) {
     if (side.equals(SIDE_AXIS)) {
-      return zocCache.getStackSizeIn(hr) + mySize < 14.0d;
+      return zocCache.getStackInfo(hr).stackSize + mySize < 14.0d;
     } else {
-      return zocCache.getStackSizeIn(hr) + mySize < 2.5d;
+      return zocCache.getStackInfo(hr).stackSize + mySize < 2.5d;
     }
   }
 
@@ -2181,14 +2278,16 @@
     }
   }
 
-  public boolean isStackFriendly(HexRef hr, String side, String nationality) {
+  public boolean isStackFriendly(HexRef hr, String side, String nationality, String unitType) {
     if ((side.equals(SIDE_AXIS)) && (nationality.equals(NATIONALITY_GERMAN) == false)) {
-      for (String n : zocCache.getNationalitiesIn(hr)) {
+      for (String n : zocCache.getStackInfo(hr).nationalities) {
         if ((n.equals(NATIONALITY_GERMAN) == false) && (n.equals(nationality) == false)) {
           return false;
         }
       }
       return true;
+    } else if ((side.equals(SIDE_SOVIET)) && (unitType.equals("SovietGuardsCavalryCorps"))) {
+      return zocCache.getStackInfo(hr).hasGuardsCavalryCorps == false;
     } else {
       return true;
     }
@@ -2196,7 +2295,7 @@
 
   public boolean isStackFriendly(HexRef hr, ArrayList<GamePiece> pieces) {
     for (GamePiece gp : pieces) {
-      if (isStackFriendly(hr, RsrTrait.getSide(gp), RsrTrait.getNationality(gp)) == false) {
+      if (isStackFriendly(hr, RsrTrait.getSide(gp), RsrTrait.getNationality(gp), RsrTrait.getUnitType(gp)) == false) {
         return false;
       }
     }
@@ -2210,11 +2309,17 @@
   }
 
   public void showSupplyShading(int mode) {
-    switch (mode) {
-      case 1 : shaderSupply.setShadedHexes(TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesDepotSupply, "Normal", null).keySet()); break;
-      case 2 : shaderSupply.setShadedHexes(TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesAxisHQSupply, "Bucharest;Romanian;Normal", null).keySet()); break;
-      case 3 : shaderSupply.setShadedHexes(TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesAxisHQSupply, "Helsinki;Finnish;Normal", null).keySet()); break;
-      default : shaderSupply.setShadedHexes(TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesSovietSupply, "Normal", null).keySet()); break;
+    if (mode == lastSupplyDisplayed) {
+      shaderSupply.setShadedHexes(null);
+      lastSupplyDisplayed = -1;
+    } else {
+      switch (mode) {
+        case 1 : shaderSupply.setShadedHexes(TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesDepotSupply, "Normal", null).keySet()); break;
+        case 2 : shaderSupply.setShadedHexes(TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesAxisHQSupply, "Bucharest;Romanian;Normal", null).keySet()); break;
+        case 3 : shaderSupply.setShadedHexes(TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesAxisHQSupply, "Helsinki;Finnish;Normal", null).keySet()); break;
+        default : shaderSupply.setShadedHexes(TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesSovietSupply, "Normal", null).keySet()); break;
+      }
+      lastSupplyDisplayed = mode;
     }
   }
   

Modified: VSQL-src/branches/morvael/rsr/RsrConstants.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrConstants.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/RsrConstants.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -137,6 +137,7 @@
   public static final String T_ADVANCING = "CombatAdvancing"; //>0 number of spaces unit can advance
   public static final String T_ATTACKED = "CombatAttacked"; //unit already took part in combat (as defender) in this combat phase (not used in overruns)
   public static final String T_PLACED = "Placed"; //to ignore units that have been just placed as reinforcements (for supply)
+  public static final String T_MOVED = ""; //to mark units that have moved this turn and cannot more (for example strat move/normal move limit)
 
 	public static final int SUPPLY_NORMAL = 0;
 	public static final int SUPPLY_EMERGENCY = 1;

Modified: VSQL-src/branches/morvael/rsr/RsrGlobal.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -26,7 +26,6 @@
 import VASSAL.i18n.TranslatablePiece;
 import VASSAL.tools.SequenceEncoder;
 import java.awt.event.InputEvent;
-import java.util.HashMap;
 
 /**
  *

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderAdvance.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderAdvance.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -20,6 +20,7 @@
 
   private String side;
   private String nationality;
+  private String unitType;
   private HexRef startHex;
   private int advanceDistance;
   private Set<HexRef> occupiedByEnemy;
@@ -42,6 +43,7 @@
     }
     side = RsrTrait.getSide(piece);
     nationality = RsrTrait.getNationality(piece);
+    unitType = RsrTrait.getUnitType(piece);
     advanceDistance = RsrTrait.getAdvancing(piece);
     mySize = RsrTrait.getStackPoints(piece);
     occupiedByEnemy = zocCache.getHexesOccupiedByEnemy(side);
@@ -84,7 +86,7 @@
     if (tt.equals(HEX_WATER)) {
       return result(fromHex, false, 0.0d, false, MODE_ADVANCE, 0);
     }
-    if ((tt.equals(HEX_SWAMP)) && (firstSpace == false)) {
+    if ((tt.equals(HEX_SWAMP)) && (isWinter == false) && (firstSpace == false)) {
       return result(fromHex, false, 0.0d, false, MODE_ADVANCE, 0);
     }
     if (occupiedByEnemy.contains(toHex)) {
@@ -93,7 +95,7 @@
     if ((inEnemyZOC.contains(toHex)) && (firstSpace == false)) {
       return result(fromHex, true, 0.0d, false, MODE_ADVANCE, 0);
     }
-    return result(fromHex, true, currentCost.getPointsLeft() - 1, (core.isStackSizeOK(toHex, side, mySize) == false) || (core.isStackFriendly(toHex, side, nationality) == false), MODE_ADVANCE, 0);
+    return result(fromHex, true, currentCost.getPointsLeft() - 1, (core.isStackSizeOK(toHex, side, mySize) == false) || (core.isStackFriendly(toHex, side, nationality, unitType) == false), MODE_ADVANCE, 0);
   }
 
   @Override

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -23,6 +23,7 @@
   protected ZOCCache zocCache;
   protected RsrAdvance core;
   protected Filter filter;
+  protected boolean isWinter;
 
   protected RsrMapShaderBase() {
     super();
@@ -37,6 +38,7 @@
     phaseName = core.getPhaseName();
     zocCache = core.getZOCCache();
     filter = core.getFilter();
+    isWinter = core.isWinter(turnNumber);
   }
 
   protected boolean isRailroadSpace(HexRef hex) {
@@ -62,7 +64,6 @@
     String lt = terrainMap.getLineTerrainName(fromHex, toHex);
     boolean isArctic = isArctic(toHex);
     boolean isRailroad = Filter.isAny(lt, LINE_RAILROAD, LINE_CHONGARCAUSEWAY);
-    boolean isWinter = core.isWinter(turnNumber);
     boolean isAxis = side.equals(SIDE_AXIS);
     if (core.isImpassable(et)) {
       return Double.MAX_VALUE;

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -90,10 +90,10 @@
       if (core.isStackSizeOK(fromHex, side, 0.0d) == false) {
         return result(fromHex, false, 0.0d, false, MODE_MOVEMENT, 0);
       }
-      if ((tt.equals(HEX_WATER)) || (tt.equals(HEX_SWAMP)) || (tt.equals(HEX_MOUNTAIN)) || (core.isMajorCity(tt))) {
+      if ((tt.equals(HEX_WATER)) || ((tt.equals(HEX_SWAMP)) && (isWinter == false)) || (tt.equals(HEX_MOUNTAIN)) || (core.isMajorCity(tt))) {
         return result(fromHex, false, 0.0d, false, MODE_MOVEMENT, 0);
       }
-      if ((core.isMajorRiver(et)) || ((core.isMinorRiver(et)) && ((turnNumber > 1) || (side.equals(SIDE_SOVIET)))) || ((core.isLakeSea(et)) && ((side.equals(SIDE_AXIS)) || (core.isWinter(turnNumber) == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)))) {
+      if ((core.isMajorRiver(et)) || ((core.isMinorRiver(et)) && ((turnNumber > 1) || (side.equals(SIDE_SOVIET)))) || ((core.isLakeSea(et)) && ((side.equals(SIDE_AXIS)) || (isWinter == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)))) {
         return result(fromHex, false, 0.0d, false, MODE_MOVEMENT, 0);
       }
       if (overrunCost <= currentCost.getPointsLeft()) {
@@ -119,7 +119,7 @@
       return result(fromHex, false, 0.0, false, MODE_MOVEMENT, 0);
     }
     if ((fromZOC) && (toZOC)) {
-      if ((Filter.isAny(unitType, "AxisGermanTankCorps", "AxisGermanTankBattlegroup", "AxisGermanTankDivision") == false) && ((core.isWinter(turnNumber) == false) || (unitType.equals("SovietGuardsCavalryCorps") == false))) {
+      if ((Filter.isAny(unitType, "AxisGermanTankCorps", "AxisGermanTankBattlegroup", "AxisGermanTankDivision") == false) && ((isWinter == false) || (unitType.equals("SovietGuardsCavalryCorps") == false))) {
         return result(fromHex, false, 0.0, false, MODE_MOVEMENT, 0);
       }
     }
@@ -127,7 +127,7 @@
     if (core.isImpassable(et)) {
       return result(fromHex, false, 0.0, false, MODE_MOVEMENT, 0);
     } else if (core.isLakeSea(et)) {
-      if ((side.equals(SIDE_AXIS)) || (core.isWinter(turnNumber) == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)) {
+      if ((side.equals(SIDE_AXIS)) || (isWinter == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != RsrTrait.MOVEMENT_NONMOTORIZED)) {
         return result(fromHex, false, 0.0, false, MODE_MOVEMENT, 0);
       } else {
         cost += EDGE_MINORRIVER_COST[movementMode];
@@ -144,7 +144,7 @@
     } else if (tt.equals(HEX_WOODS)) {
       cost += HEX_WOODS_COST[movementMode] * (isArctic ? 2 : 1);
     } else if (tt.equals(HEX_SWAMP)) {
-      if (core.isWinter(turnNumber)) {
+      if (isWinter) {
         cost += HEX_WOODS_COST[movementMode];
       } else {
         cost += HEX_SWAMP_COST[movementMode];
@@ -168,7 +168,7 @@
       cost = 1.0;
     }
     if (fromZOC) {
-      if ((side.equals(SIDE_AXIS)) || (core.isWinter(turnNumber) == false)) {
+      if ((side.equals(SIDE_AXIS)) || (isWinter == false)) {
         cost += 3.0;
       } else {
         cost += 2.0;
@@ -177,7 +177,7 @@
     if ((fromHex.equals(startHex)) && (cost > currentCost.getPointsLeft()) && (movement == maxMovement) && (inEnemyZOC.contains(startHex) == false) && (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT) == false)) {
       cost = currentCost.getPointsLeft();
     }
-    return result(fromHex, true, currentCost.getPointsLeft() - cost, (core.isStackSizeOK(toHex, side, mySize) == false) || (core.isStackFriendly(toHex, side, nationality) == false), MODE_MOVEMENT, 0);
+    return result(fromHex, true, currentCost.getPointsLeft() - cost, (core.isStackSizeOK(toHex, side, mySize) == false) || (core.isStackFriendly(toHex, side, nationality, unitType) == false), MODE_MOVEMENT, 0);
   }
 
   @Override

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -20,6 +20,7 @@
 
   private String side;
   private String nationality;
+  private String unitType;
   private HexRef startHex;
   private int movementMode;
   private int supplyLevel;
@@ -45,6 +46,7 @@
     }
     side = RsrTrait.getSide(piece);
     nationality = RsrTrait.getNationality(piece);
+    unitType = RsrTrait.getUnitType(piece);
     movementMode = RsrTrait.getMovementTypeAsInt(piece);
     supplyLevel = RsrTrait.getSupplyLevel(piece);
     retreatDistance = RsrTrait.getRetreating(piece);
@@ -91,7 +93,7 @@
         val += 10;
       }
     }
-    return result(fromHex, true, currentCost.getPointsLeft() - 1, (tooClose.contains(toHex)) || (core.isStackFriendly(toHex, side, nationality) == false), MODE_RETREAT, val);
+    return result(fromHex, true, currentCost.getPointsLeft() - 1, (tooClose.contains(toHex)) || (core.isStackFriendly(toHex, side, nationality, unitType) == false), MODE_RETREAT, val);
   }
 
   @Override

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -19,6 +19,7 @@
 
 	private String side;
   private String nationality;
+  private String unitType;
 	private int movementMode;
   private double mySize;
 	private HexRef startHex;
@@ -41,6 +42,7 @@
 		}
 		side = RsrTrait.getSide(piece);
     nationality = RsrTrait.getNationality(piece);
+    unitType = RsrTrait.getUnitType(piece);
 		movementMode = RsrTrait.getMovementTypeAsInt(piece);
     mySize = RsrTrait.getStackPoints(piece);
 		//find blocked hexes
@@ -78,14 +80,14 @@
 			return result(fromHex, false, 0.0, false, MODE_STRATEGIC, 0);
 		} else
 		if (core.isLakeSea(et)) {
-			if ((side.equals(SIDE_AXIS)) || (core.isWinter(turnNumber) == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != MOVEMENT_NONMOTORIZED)) {
+			if ((side.equals(SIDE_AXIS)) || (isWinter == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != MOVEMENT_NONMOTORIZED)) {
 				return result(fromHex, false, 0.0, false, MODE_STRATEGIC, 0);
 			}
 		} else
 		if (tt.equals(HEX_WATER)) {
 			return result(fromHex, false, 0.0, false, MODE_STRATEGIC, 0);
 		}
-		return result(fromHex, true, currentCost.getPointsLeft()-1.0, (core.isStackSizeOK(toHex, side, mySize) == false) || (core.isStackFriendly(toHex, side, nationality) == false), MODE_STRATEGIC, 0);
+		return result(fromHex, true, currentCost.getPointsLeft()-1.0, (core.isStackSizeOK(toHex, side, mySize) == false) || (core.isStackFriendly(toHex, side, nationality, unitType) == false), MODE_STRATEGIC, 0);
 	}
 
 	@Override

Modified: VSQL-src/branches/morvael/rsr/RsrTrait.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -56,6 +56,7 @@
   private int advancing = 0;
   private int attacked = 0;
   private int placed = 0;
+  private int moved = 0;
   // dynamic counter information (volatile)
   private GamePiece gp;
   private KeyCommand[] commands;
@@ -167,6 +168,8 @@
       return attacked;
     } else if (T_PLACED.equals(key)) {
       return placed;
+    } else if (T_MOVED.equals(key)) {
+      return moved;
     } else {
       return super.getProperty(key);
     }
@@ -212,6 +215,8 @@
       return attacked;
     } else if (T_PLACED.equals(key)) {
       return placed;
+    } else if (T_MOVED.equals(key)) {
+      return moved;
     } else {
       return super.getLocalizedProperty(key);
     }
@@ -330,6 +335,12 @@
       } catch (Exception e) {
         placed = 0;
       }
+    } else if (T_MOVED.equals(key)) {
+      try {
+        moved = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        moved = 0;
+      }
     } else {
       super.setProperty(key, val);
     }
@@ -418,6 +429,7 @@
     se.append(advancing);
     se.append(attacked);
     se.append(placed);
+    se.append(moved);
     return se.getValue();
   }
 
@@ -442,6 +454,7 @@
     advancing = st.nextInt(0);
     attacked = st.nextInt(0);
     placed = st.nextInt(0);
+    moved = st.nextInt(0);
     //updateSupplyLabel();
     //updateStrengthLabel();
     //updateMovementLabel();
@@ -484,7 +497,7 @@
     if (advancing > 0) {
       imagePainter[8].draw(g, px, py, zoom, obs);
     } else
-    if ((attacked > 0) || (placed > 0)) {
+    if ((attacked > 0) || (placed > 0) || (moved > 0)) {
       imagePainter[9].draw(g, px, py, zoom, obs);
     } else
     if ((attacker > 0) || (defender > 0)) {
@@ -632,7 +645,8 @@
       T_RETREATING, 0,
       T_ADVANCING, 0,
       T_ATTACKED, 0,
-      T_PLACED, 0);
+      T_PLACED, 0,
+      T_MOVED, 0);
   }
 
   public static void commandClearCombatAttributes(GamePiece gp, boolean attacked) {
@@ -667,7 +681,8 @@
       T_RETREATING, getRetreating(from),
       T_ADVANCING, getAdvancing(from),
       T_ATTACKED, getAttacked(from),
-      T_PLACED, getPlaced(from));
+      T_PLACED, getPlaced(from),
+      T_MOVED, getMoved(from));
   }
 
 
@@ -885,6 +900,43 @@
     return t != null ? t.placed : 0;
   }
 
+  public static int getMoved(GamePiece gp) {
+    RsrTrait t = getTrait(gp);
+    return t != null ? t.moved : 0;
+  }
+
+  public static int getCurrentNominalSteps(GamePiece gp) {
+    RsrTrait t = getTrait(gp);
+    if (t != null) {
+      int result = t.currentStep;
+      String unitType = getUnitType(gp);
+      if ((unitType.equals("AxisGermanTankCorps")) || (unitType.equals("AxisGermanInfantryCorps"))) {
+        result += 2;
+      } else if (unitType.equals("AxisGermanMountainCorps")) {
+        result += 1;
+      }
+      return result;
+    } else {
+      return 1;
+    }
+  }
+
+  public static int getNominalSteps(GamePiece gp) {
+    RsrTrait t = getTrait(gp);
+    if (t != null) {
+      int result = t.steps;
+      String unitType = getUnitType(gp);
+      if ((unitType.equals("AxisGermanTankCorps")) || (unitType.equals("AxisGermanInfantryCorps"))) {
+        result += 2;
+      } else if (unitType.equals("AxisGermanMountainCorps")) {
+        result += 1;
+      }
+      return result;
+    } else {
+      return 1;
+    }
+  }
+
   private static HashMap<GamePiece, RsrTrait> map = new HashMap<GamePiece, RsrTrait>();
 
   private static RsrTrait getTrait(GamePiece gp) {

Modified: VSQL-src/branches/morvael/rsr/StackInfo.java
===================================================================
--- VSQL-src/branches/morvael/rsr/StackInfo.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/StackInfo.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -12,6 +12,7 @@
 
   public double stackSize;
   public HashSet<String> nationalities = new HashSet<String>();
+  public boolean hasGuardsCavalryCorps = false;
 
   public StackInfo(RsrAdvanceBase core, ArrayList<GamePiece> pieces) {
     if (pieces != null) {
@@ -19,6 +20,9 @@
         if (RsrTrait.getType(gp).equals("Marker") == false) {
           stackSize += RsrTrait.getStackPoints(gp);
           nationalities.add(RsrTrait.getNationality(gp));
+          if (RsrTrait.getUnitType(gp).equals("SovietGuardsCavalryCorps")) {
+            hasGuardsCavalryCorps = true;
+          }
         }
       }
     }

Modified: VSQL-src/branches/morvael/rsr/SupplyCache.java
===================================================================
--- VSQL-src/branches/morvael/rsr/SupplyCache.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/SupplyCache.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -1,7 +1,10 @@
 package rsr;
 
 import VASSAL.build.module.Map;
+import VASSAL.counters.GamePiece;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 import terrain.HexRef;
 import terrain.TerrainHexGrid;
 import terrain.TerrainMap;
@@ -13,22 +16,46 @@
  * @author derwido
  * @since 2009-05-20
  */
-public final class SupplyCache extends Cache {
+public final class SupplyCache extends Cache implements HexControlInfo {
 
+  private RsrAdvanceBase core;
   private Map mainMap;
   private TerrainHexGrid mainGrid;
   private TerrainMap mainTerrain;
+  private ZOCCache zocCache;
   private RsrMapShaderDepotSupply rulesAxisDepot = new RsrMapShaderDepotSupply();
   private RsrMapShaderAxisHQSupply rulesAxisHQ = new RsrMapShaderAxisHQSupply();
   private RsrMapShaderSovietHQSupply rulesSovietHQ = new RsrMapShaderSovietHQSupply();
+  private TerrainMapShaderRule rules;
+  private String side;
+  private Set<HexRef> occupiedByFriend;
+  private Set<HexRef> occupiedByEnemy;
+  private Set<HexRef> inEnemyZOC;
 
-  public SupplyCache(Map mainMap, TerrainHexGrid mainGrid, TerrainMap mainTerrain) {
+  public SupplyCache(RsrAdvanceBase core, Map mainMap, TerrainHexGrid mainGrid, TerrainMap mainTerrain, ZOCCache zocCache) {
+    this.core = core;
     this.mainMap = mainMap;
     this.mainGrid = mainGrid;
     this.mainTerrain = mainTerrain;
+    this.zocCache = zocCache;
   }
 
   @Override
+  protected HashSet<HexRef> calculate1(String id) {
+    if (id.charAt(0) == 'S') {
+      side = SIDE_SOVIET;
+      rules = new RsrHelperRailroadLine(this, core.getPossibleSupplySources(side, null));
+    } else {
+      side = SIDE_AXIS;
+      rules = new RsrHelperAnyLine(this, core.getPossibleSupplySources(side, null));
+    }
+    occupiedByFriend = zocCache.getHexesOccupiedBy(side);
+    occupiedByEnemy = zocCache.getHexesOccupiedByEnemy(side);
+    inEnemyZOC = zocCache.getHexesInZOCEnemy(side);
+    return new HashSet<HexRef>(TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rules, "", null).keySet());
+  }
+
+  @Override
   protected HashMap<HexRef, TerrainMapShaderCost> calculate2(String id) {
     String nationality = id.substring(1);
     String attrition = id.charAt(0) == 'A' ? "Attrition" : "Normal";
@@ -52,4 +79,26 @@
     return get2((attrition ? "A" : "N") + nationality);
   }
 
+  public HashSet<HexRef> getSovietLine() {
+    return get1("S");
+  }
+
+  public HashSet<HexRef> getAxisLine() {
+    return get1("A");
+  }
+
+  public String getSide() {
+    return side;
+  }
+
+  public boolean canEnter(HexRef hex) {
+    if (occupiedByEnemy.contains(hex)) {
+      return false;
+    } else if (inEnemyZOC.contains(hex)) {
+      return occupiedByFriend.contains(hex);
+    } else {
+      return true;
+    }
+  }
+
 }

Modified: VSQL-src/branches/morvael/rsr/ZOCCache.java
===================================================================
--- VSQL-src/branches/morvael/rsr/ZOCCache.java	2009-05-26 21:58:35 UTC (rev 5669)
+++ VSQL-src/branches/morvael/rsr/ZOCCache.java	2009-05-27 15:10:23 UTC (rev 5670)
@@ -141,26 +141,15 @@
     return allPieces.get(hr);
   }
 
-  public double getStackSizeIn(HexRef hr) {
+  public StackInfo getStackInfo(HexRef hr) {
     validate();
     if (stackInfo.containsKey(hr)) {
-      return stackInfo.get(hr).stackSize;
+      return stackInfo.get(hr);
     } else {
       StackInfo si = new StackInfo(core, getPiecesIn(hr));
       stackInfo.put(hr, si);
-      return si.stackSize;
+      return si;
     }
   }
 
-  public HashSet<String> getNationalitiesIn(HexRef hr) {
-    validate();
-    if (stackInfo.containsKey(hr)) {
-      return stackInfo.get(hr).nationalities;
-    } else {
-      StackInfo si = new StackInfo(core, getPiecesIn(hr));
-      stackInfo.put(hr, si);
-      return si.nationalities;
-    }
-  }
-
 }


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

Revision: 5699
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5699&view=rev
Author:   morvael
Date:     2009-06-02 13:21:35 +0000 (Tue, 02 Jun 2009)

Log Message:
-----------
Fixed max stacking bug, leader as reinforcement bug, clear attributes bug, select pieces for administrative bug, airbase elimination bug and factory evacuation bug.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/GameMisc.java
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrTrait.java

Modified: VSQL-src/branches/morvael/rsr/GameMisc.java
===================================================================
--- VSQL-src/branches/morvael/rsr/GameMisc.java	2009-06-02 06:10:38 UTC (rev 5698)
+++ VSQL-src/branches/morvael/rsr/GameMisc.java	2009-06-02 13:21:35 UTC (rev 5699)
@@ -38,7 +38,7 @@
     while (it.hasNext()) {
       gp = it.next();
       if (gp.getMap() == RsrAdvance.getInstance().getMainMap()) {
-        result.add(it.next());
+        result.add(gp);
       }
     }
     return result;

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-02 06:10:38 UTC (rev 5698)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-02 13:21:35 UTC (rev 5699)
@@ -529,6 +529,10 @@
         if (type.equals("Headquarters")) {
           commandAllowMovement(gp, 0.0d, true);
           count++;
+        } else
+        if (type.equals("Leader")) {
+          commandAllowMovement(gp, 0.0d, true);
+          count++;
         }
       }
       if (count > 0) {
@@ -848,6 +852,9 @@
    * Ask Soviet player to put received Partisan units on map. (MANUAL)
    */
   private void executeAdministrative6() {
+    //
+    commandSetProperty(dataPiece, G_EVACUATED, 0);
+    //
     int count = 0;
     for (GamePiece gp : filter.filterPieces(turnMap, "LocationName=='S" + getTurnName() + "'&&Type=='Partisan'")) {
       commandAllowMovement(gp, 0.0d, true);
@@ -1083,7 +1090,6 @@
       int motLossVal = lossVal % 10;
       if (motLossVal > 0) {
         int availableStepsMot = 0;
-        commandSetProperty(dataPiece, MOTORIZED_LOSS_REQUIRED, motLossVal);
         commandLog("Due to retreat(s) across major river(s), the stack must lose " + motLossVal + " motorized step(s).");
         for (GamePiece gp : pieces) {
           if (RsrTrait.getMovementTypeAsInt(gp) == MOVEMENT_MOTORIZED) {
@@ -1102,6 +1108,7 @@
           }
           lossVal -= motLossVal;
         } else {
+          commandSetProperty(dataPiece, MOTORIZED_LOSS_REQUIRED, motLossVal);
           for (GamePiece gp : pieces) {
             if (RsrTrait.getMovementTypeAsInt(gp) == MOVEMENT_MOTORIZED) {
               commandAllowCombatAction(gp);
@@ -1112,7 +1119,6 @@
       int conLossVal = lossVal / 10;
       if (conLossVal > 0) {
         int availableStepsCon = 0;
-        commandSetProperty(dataPiece, CONTESTED_LOSS_REQUIRED, conLossVal);
         commandLog("Due to retreat through enemy contested, unoccupied space(s) the stack must lose " + conLossVal + " step(s).");
         for (GamePiece gp : pieces) {
           availableStepsCon += RsrTrait.getCurrentNominalSteps(gp);
@@ -1125,6 +1131,7 @@
           }
           lossVal -= conLossVal * 10;
         } else {
+          commandSetProperty(dataPiece, CONTESTED_LOSS_REQUIRED, conLossVal);
           for (GamePiece gp : pieces) {
             commandAllowCombatAction(gp);
           }
@@ -1167,7 +1174,7 @@
         }
         pieces.clear();
       }
-      commandAdvance();
+      commandAdvance(false);
     }
   }
 
@@ -1310,8 +1317,8 @@
 
       }
     } else if (name.equals("Eliminate")) { //airbase elimination
-      commandEliminate(gp);
-      commandAdvance();
+      commandSendToOffboardZone(gp, "Axis Permanently Eliminated Units Box");
+      commandAdvance(false);
     } else if (name.equals("Promote")) {
       commandPromote(gp);
     } else if (name.equals("Evacuate")) {

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-02 06:10:38 UTC (rev 5698)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-02 13:21:35 UTC (rev 5699)
@@ -158,7 +158,7 @@
   }
 
   public final void execute(String param) {
-    commandAdvance();
+    commandAdvance(true);
   }
 
   protected abstract void onInitialize(String param);
@@ -640,20 +640,24 @@
     int newValue = RsrGlobal.getEvacuated()+1;
     commandSetProperty(dataPiece, G_EVACUATED, newValue);
     if (newValue >= 3) {
-      commandAdvance();
+      commandAdvance(false);
     }
   }
 
-  public void commandAdvance() {
+  public void commandAdvance(boolean fromButton) {
     //TODO: block advance if there are things to do, also block advance for player that is not the owner of current phase part
     if (RsrGlobal.getRepositioningRequired() > 0) {
       commandLog("Game: Reposition partisan unit(s) before advancing.");
-      sendAndLog();
+      if (fromButton) {
+        sendAndLog();
+      }
       return;
     }
     if (RsrGlobal.getCombatStage() > 0) {
       commandLog("Game: Resolve or cancel combat before advancing.");
-      sendAndLog();
+      if (fromButton) {
+        sendAndLog();
+      }
       return;
     }
     autoAdvance = true;
@@ -686,7 +690,9 @@
         executeFirst();
       }
     }
-    sendAndLog();
+    if (fromButton) {
+      sendAndLog();
+    }
   }
 
   private void executeFirst() {
@@ -2461,9 +2467,9 @@
 
   public boolean isStackSizeOK(HexRef hr, String side, double mySize) {
     if (side.equals(SIDE_AXIS)) {
-      return pieceCache.getStackInfo(hr).stackSize + mySize < 14.0d;
+      return pieceCache.getStackInfo(hr).stackSize + mySize <= 14.0d;
     } else {
-      return pieceCache.getStackInfo(hr).stackSize + mySize < 2.5d;
+      return pieceCache.getStackInfo(hr).stackSize + mySize <= 2.5d;
     }
   }
 

Modified: VSQL-src/branches/morvael/rsr/RsrTrait.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-06-02 06:10:38 UTC (rev 5698)
+++ VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-06-02 13:21:35 UTC (rev 5699)
@@ -692,7 +692,7 @@
       //external elements (Markers)
       PROPERTY_SUPPLY_MODE, 1,
       //RsrTrait elements
-      T_CURRENT_STEP, getCurrentStep(gp),
+      T_CURRENT_STEP, getSteps(gp),
       T_HL_LOSS, 0,
       T_HL_ACTION, 0,
       T_HL_MOVEMENT, 0,


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

Revision: 5700
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5700&view=rev
Author:   morvael
Date:     2009-06-02 15:17:50 +0000 (Tue, 02 Jun 2009)

Log Message:
-----------
Own KeyCommand for better integration, some refactoring done on command method names.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/PieceCache.java
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrGlobal.java
    VSQL-src/branches/morvael/rsr/RsrImmobilized.java
    VSQL-src/branches/morvael/rsr/RsrPieceMover.java
    VSQL-src/branches/morvael/rsr/RsrTrait.java

Added Paths:
-----------
    VSQL-src/branches/morvael/rsr/RsrKeyCommand.java

Modified: VSQL-src/branches/morvael/rsr/PieceCache.java
===================================================================
--- VSQL-src/branches/morvael/rsr/PieceCache.java	2009-06-02 13:21:35 UTC (rev 5699)
+++ VSQL-src/branches/morvael/rsr/PieceCache.java	2009-06-02 15:17:50 UTC (rev 5700)
@@ -217,7 +217,7 @@
       hr = mainGrid.getHexPos(gp.getPosition());
       if ((RsrTrait.getFired(gp) == 0) && (mainGrid.getHexesInRange(hr, RsrTrait.getRange(gp)).containsAll(dH))) {
         if ((getHexesInZOCEnemy(SIDE_AXIS).contains(hr) == false) || (filter.filterPieces(axisPieceGroups.get(hr), T_ATTACKER + ">0").size() > 0)) {
-          core.commandSetProperty(gp, T_HL_ACTION, 0, T_FIRED, 1);
+          core.commandBaseSetProperty(gp, T_HL_ACTION, 0, T_FIRED, 1);
           return 4;
         }
       }

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-02 13:21:35 UTC (rev 5699)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-02 15:17:50 UTC (rev 5700)
@@ -4,7 +4,6 @@
 import VASSAL.command.Command;
 import java.awt.Point;
 import VASSAL.counters.GamePiece;
-import VASSAL.counters.KeyCommand;
 import filter.Filter;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
@@ -34,8 +33,8 @@
     return instance;
   }
   //
-  private KeyCommand[] commandsArray = new KeyCommand[0];
-  private ArrayList<KeyCommand> commands = new ArrayList<KeyCommand>();
+  private RsrKeyCommand[] commandsArray = new RsrKeyCommand[0];
+  private ArrayList<RsrKeyCommand> commands = new ArrayList<RsrKeyCommand>();
 
   public RsrAdvance() {
     super();
@@ -54,28 +53,28 @@
   }
 
   protected void executeSetPhaseParts() {
-    commandSetProperty(dataPiece, PROPERTY_PHASE_PART, 1);
+    commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PART, 1);
     String phaseName = getPhaseName();
     if (phaseName.equals(PHASE_SUPPLY)) {
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
+      commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     } else if (phaseName.equals(PHASE_AXIS_REINFORCEMENT)) {
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
+      commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     } else if (phaseName.equals(PHASE_AXIS_MOVEMENT)) {
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 4);
+      commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 4);
     } else if (phaseName.equals(PHASE_AXIS_COMBAT)) {
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
+      commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     } else if (phaseName.equals(PHASE_SOVIET_COMBAT)) {
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
+      commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     } else if (phaseName.equals(PHASE_SOVIET_REINFORCEMENT)) {
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
+      commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     } else if (phaseName.equals(PHASE_SOVIET_MOVEMENT)) {
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 5);
+      commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 5);
     } else if (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) {
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 3);
+      commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 3);
     } else if (phaseName.equals(PHASE_ADMINISTRATIVE)) {
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 6);
+      commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 6);
     } else {
-      commandSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
+      commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PARTS, 1);
     }
   }
 
@@ -84,7 +83,8 @@
     //1..x - parts
     //x+1 - leave
 
-    commandClearHighlight();
+    //commandBaseClearHighlight();
+    commandDisallowActionAll();
     commandDisallowMovementAll();
 
     String phaseName = getPhaseName();
@@ -157,7 +157,7 @@
    * Ask Axis player to voluntarily remove supply depots and/or convert supply depots into emergency supply sources. (MANUAL)
    */
   private void executeSupply1() {
-    commandLog("Game: Checking supply of airbases.");
+    commandBaseLog("Game: Checking supply of airbases.");
     HashMap<HexRef, TerrainMapShaderCost> inSupply = supplyCache.getSupply(NATIONALITY_GERMAN, false);
     HexRef hr;
     for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Airbase'")) {
@@ -179,7 +179,7 @@
         }
       }
       if (count > 0) {
-        commandLog("Axis Player: Move air fleets to desired location in range.");
+        commandBaseLog("Axis Player: Move air fleets to desired location in range.");
       }
     }
     count = 0;
@@ -188,7 +188,7 @@
       count++;
     }
     if (count > 0) {
-      commandLog("Axis Player: Voluntarily remove supply depots and/or convert supply depots into emergency supply sources.");
+      commandBaseLog("Axis Player: Voluntarily remove supply depots and/or convert supply depots into emergency supply sources.");
     }
   }
 
@@ -200,7 +200,7 @@
    */
   private void executeSupply2() {
     //Check supply of all units (except airbases).
-    commandLog("Game: Checking supply of all units (except airbases).");
+    commandBaseLog("Game: Checking supply of all units (except airbases).");
     //clear and recalculate AirFleet support zone for this turn (it will not change during the turn)
     airFleetCache.clear();
     HashSet<HexRef> inAirRange = airFleetCache.getAirFleetSupportZone();
@@ -258,12 +258,12 @@
       if ((supplyLevel == 3) && (Filter.isAny(type, "Headquarters", "Leader"))) {
         commandEliminate(gp);
       } else {
-        commandSetProperty(gp, T_SUPPLY_LEVEL, supplyLevel, T_SUPPLY_ISOLATED, isolated);
+        commandBaseSetProperty(gp, T_SUPPLY_LEVEL, supplyLevel, T_SUPPLY_ISOLATED, isolated);
       }
     }
     //Check attrition of all isolated units.
     if (isolatedUnits.size() > 0) {
-      commandLog("Game: Checking attrition of isolated units.");
+      commandBaseLog("Game: Checking attrition of isolated units.");
       int d6;
       String tt;
       int stepsLost = 0;
@@ -320,7 +320,7 @@
     //Remove supply depots converted into emergency supply sources.
     ArrayList<GamePiece> emergencyDepots = filter.filterPieces(mainMap, "Type=='Depot'&&SupplyMode==2");
     if (emergencyDepots.size() > 0) {
-      commandLog("Game: Removing " + emergencyDepots.size() + " supply depot(s) converted into emergency supply source(s).");
+      commandBaseLog("Game: Removing " + emergencyDepots.size() + " supply depot(s) converted into emergency supply source(s).");
       for (GamePiece gp : emergencyDepots) {
         commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");
       }
@@ -328,7 +328,7 @@
     //
     ArrayList<GamePiece> receivedCombatStrengthMarkers = filter.filterPieces(turnMap, "Type=='Strength'&&LocationName=='S" + getTurnName() + "'");
     if (receivedCombatStrengthMarkers.size() > 0) {
-      commandLog("Game: Moving " + receivedCombatStrengthMarkers.size() + " Soviet Combat Strength Marker(s) received as reinforcement(s) into the proper draw cups.");
+      commandBaseLog("Game: Moving " + receivedCombatStrengthMarkers.size() + " Soviet Combat Strength Marker(s) received as reinforcement(s) into the proper draw cups.");
       for (GamePiece gp : receivedCombatStrengthMarkers) {
         commandSendToOffboardZone(gp, RsrTrait.getStrengthClass(gp) + "-strength pool");
       }
@@ -344,7 +344,7 @@
       for (GamePiece gp : reinforcements) {
         commandAllowMovement(gp, 0.0d, true);
       }
-      commandLog("Axis Player: Put reinforcements on map.");
+      commandBaseLog("Axis Player: Put reinforcements on map.");
     } else {
       autoAdvance = true;
     }
@@ -355,13 +355,13 @@
    */
   private void executeAxisReinforcement2() {
     for (GamePiece gp : filter.filterPieces(mainMap, T_PLACED + ">0")) {
-      commandSetProperty(gp, T_PLACED, 0);
+      commandBaseSetProperty(gp, T_PLACED, 0);
     }
   }
 
   //sea movement - MANUAL
   private void executeAxisMovement1() {
-    //commandLog("Axis Player: Sea movement.");
+    //commandBaseLog("Axis Player: Sea movement.");
     //TODO: finish this
     autoAdvance = true;
   }
@@ -381,7 +381,7 @@
     }
     if (count > 0) {
       commandResetMovementIndex();
-      commandLog("Axis Player: Move units (strategic movement).");
+      commandBaseLog("Axis Player: Move units (strategic movement).");
     } else {
       autoAdvance = true;
     }
@@ -403,7 +403,7 @@
     }
     if (count > 0) {
       commandResetMovementIndex();
-      commandLog("Axis Player: Move units (except airbases).");
+      commandBaseLog("Axis Player: Move units (except airbases).");
     } else {
       autoAdvance = true;
     }
@@ -425,7 +425,7 @@
     }
     if (count > 0) {
       commandResetMovementIndex();
-      commandLog("Axis Player: Move airbases.");
+      commandBaseLog("Axis Player: Move airbases.");
     } else {
       autoAdvance = true;
     }
@@ -454,7 +454,7 @@
       for (GamePiece gp : filter.filterPieces(mainMap, "Type=='SiegeArtillery'")) {
         commandAllowAction(gp);
       }
-      commandLog("Axis Player: Attack with your units.");
+      commandBaseLog("Axis Player: Attack with your units.");
     } else {
       autoAdvance = true;
     }
@@ -465,7 +465,7 @@
    */
   private void executeAxisCombat2() {
     for (GamePiece gp : filter.filterPieces(mainMap, T_ATTACKED + ">0||" + T_FIRED + ">0")) {
-      commandSetProperty(gp, T_ATTACKED, 0, T_FIRED, 0);
+      commandBaseSetProperty(gp, T_ATTACKED, 0, T_FIRED, 0);
     }
   }
 
@@ -482,7 +482,7 @@
       }
     }
     if (count > 0) {
-      commandLog("Soviet Player: Attack with your units.");
+      commandBaseLog("Soviet Player: Attack with your units.");
     } else {
       autoAdvance = true;
     }
@@ -493,7 +493,7 @@
    */
   private void executeSovietCombat2() {
     for (GamePiece gp : filter.filterPieces(mainMap, T_ATTACKED + ">0")) {
-      commandSetProperty(gp, T_ATTACKED, 0);
+      commandBaseSetProperty(gp, T_ATTACKED, 0);
     }
   }
 
@@ -536,7 +536,7 @@
         }
       }
       if (count > 0) {
-        commandLog("Soviet Player: Put reinforcements on map.");
+        commandBaseLog("Soviet Player: Put reinforcements on map.");
       } else {
         autoAdvance = true;
       }
@@ -550,7 +550,7 @@
    */
   private void executeSovietReinforcement2() {
     for (GamePiece gp : filter.filterPieces(mainMap, T_PLACED + ">0")) {
-      commandSetProperty(gp, T_PLACED, 0);
+      commandBaseSetProperty(gp, T_PLACED, 0);
     }
   }
 
@@ -564,7 +564,7 @@
       count++;
     }
     if (count > 0) {
-      commandLog("Soviet Player: Put airborne corps on map.");
+      commandBaseLog("Soviet Player: Put airborne corps on map.");
     } else {
       autoAdvance = true;
     }
@@ -574,7 +574,7 @@
    * Sea movement. (MANUAL)
    */
   private void executeSovietMovement2() {
-    //commandLog("Soviet Player: Sea movement.");
+    //commandBaseLog("Soviet Player: Sea movement.");
     //TODO: finish this
     autoAdvance = true;
   }
@@ -594,7 +594,7 @@
     }
     if (count > 0) {
       commandResetMovementIndex();
-      commandLog("Soviet Player: Move units (strategic movement).");
+      commandBaseLog("Soviet Player: Move units (strategic movement).");
     } else {
       autoAdvance = true;
     }
@@ -616,7 +616,7 @@
     }
     if (count > 0) {
       commandResetMovementIndex();
-      commandLog("Soviet Player: Move units (except leaders).");
+      commandBaseLog("Soviet Player: Move units (except leaders).");
     } else {
       autoAdvance = true;
     }
@@ -638,7 +638,7 @@
     }
     if (count > 0) {
       commandResetMovementIndex();
-      commandLog("Soviet Player: Move leaders.");
+      commandBaseLog("Soviet Player: Move leaders.");
     } else {
       autoAdvance = true;
     }
@@ -667,7 +667,7 @@
     }
     if (count > 0) {
       commandResetMovementIndex();
-      commandLog("Axis Player: Move German tank units.");
+      commandBaseLog("Axis Player: Move German tank units.");
     } else {
       autoAdvance = true;
     }
@@ -688,7 +688,7 @@
     }
     if (count > 0) {
       commandResetMovementIndex();
-      commandLog("Axis Player: Move German tank units (strategic movement).");
+      commandBaseLog("Axis Player: Move German tank units (strategic movement).");
     } else {
       autoAdvance = true;
     }
@@ -705,7 +705,7 @@
     //
     ArrayList<GamePiece> airfleets = filter.filterPieces(mainMap, "Type=='AirFleet'");
     if (airfleets.size() > 0) {
-      commandLog("Game: Removing air fleets from the map.");
+      commandBaseLog("Game: Removing air fleets from the map.");
       for (GamePiece gp : airfleets) {
         commandSendToOffboardZone(gp, "Airfleet pool");
       }
@@ -717,7 +717,7 @@
       airbases.addAll(filter.filterPieces(turnMap, "Type=='Airbase'"));
       int desiredCount = turnNumber == 11 ? 2 : 1;
       if (airbases.size() > desiredCount) {
-        commandLog("Axis Player: Remove any one airbase.");
+        commandBaseLog("Axis Player: Remove any one airbase.");
         for (GamePiece gp : airbases) {
           commandAllowCombatAction(gp);
         }
@@ -742,7 +742,7 @@
         commandEliminate(gp);
       }
     }
-    commandLog("Axis Player: Perform breakdowns and buildups.");
+    commandBaseLog("Axis Player: Perform breakdowns and buildups.");
   }
 
   /**
@@ -766,7 +766,7 @@
         for (GamePiece gp : convertible) {
           commandAllowAction(gp);
         }
-        commandLog("Soviet Player: Promote infantry armies into Guards and Shock armies.");
+        commandBaseLog("Soviet Player: Promote infantry armies into Guards and Shock armies.");
         return;
       }
     }
@@ -780,9 +780,9 @@
    */
   private void executeAdministrative3() {
     if (isProductionTurn()) {
-      commandLog("Soviet Player: Perform breakdowns, buildups and incorporations.");
+      commandBaseLog("Soviet Player: Perform breakdowns, buildups and incorporations.");
     } else {
-      commandLog("Soviet Player: Perform incorporations.");
+      commandBaseLog("Soviet Player: Perform incorporations.");
     }
   }
 
@@ -799,7 +799,7 @@
     if (isProductionTurn()) {
       ArrayList<GamePiece> ports = filter.filterPieces(mainMap, "AssetType=='Strategic Port'");
       if (ports.size() > 0) {
-        commandLog("Game: Checking railroad line of communication of strategic port assets.");
+        commandBaseLog("Game: Checking railroad line of communication of strategic port assets.");
         HashSet<HexRef> withLOC = supplyCache.getSovietLine();
         for (GamePiece gp : ports) {
           if (withLOC.contains(getHexRef(gp.getPosition())) == false) {
@@ -815,7 +815,7 @@
           GamePiece gp = leadersInPool.get(ran.nextInt(leadersInPool.size()));
           commandSendToReinforcementZone(gp, 0, "Leader pool");
           commandAllowMovement(gp, 0.0d, true);
-          commandLog("Soviet Player: Put leader on map.");
+          commandBaseLog("Soviet Player: Put leader on map.");
           return;
         }
       }
@@ -841,7 +841,7 @@
         }
       }
       if (count > 0) {
-        commandLog("Soviet Player: Evacuate factory economic assets.");
+        commandBaseLog("Soviet Player: Evacuate factory economic assets.");
         return;
       }
     }
@@ -853,7 +853,7 @@
    */
   private void executeAdministrative6() {
     //
-    commandSetProperty(dataPiece, G_EVACUATED, 0);
+    commandBaseSetProperty(dataPiece, G_EVACUATED, 0);
     //
     int count = 0;
     for (GamePiece gp : filter.filterPieces(turnMap, "LocationName=='S" + getTurnName() + "'&&Type=='Partisan'")) {
@@ -861,7 +861,7 @@
       count++;
     }
     if (count > 0) {
-      commandLog("Soviet Player: Put partisan on map.");
+      commandBaseLog("Soviet Player: Put partisan on map.");
     } else {
       autoAdvance = true;
     }
@@ -1069,14 +1069,14 @@
       allowedMovement.get(gp).movementDone(hr);
       if (moveMode == MOVE_ONCE) {
         if (RsrTrait.getRepositioning(gp) > 0) {
-          commandSetProperty(gp, T_REPOSITIONING, 0);
-          commandSetProperty(dataPiece, G_REPOSITIONING_REQUIRED, RsrGlobal.getRepositioningRequired()-1);
+          commandBaseSetProperty(gp, T_REPOSITIONING, 0);
+          commandBaseSetProperty(dataPiece, G_REPOSITIONING_REQUIRED, RsrGlobal.getRepositioningRequired()-1);
         } else
         if (combatStage == 4) {
           lossVal = Math.max(lossVal, allowedMovement.get(gp).getCost(hr).getValue());
-          commandSetProperty(gp, T_RETREATING, -1);
+          commandBaseSetProperty(gp, T_RETREATING, -1);
         } else if (combatStage == 6) {
-          commandSetProperty(gp, T_ADVANCING, 0);
+          commandBaseSetProperty(gp, T_ADVANCING, 0);
           if (combatMode == 0) {
             commandDisallowMovement(gp);
           }
@@ -1090,7 +1090,7 @@
       int motLossVal = lossVal % 10;
       if (motLossVal > 0) {
         int availableStepsMot = 0;
-        commandLog("Due to retreat(s) across major river(s), the stack must lose " + motLossVal + " motorized step(s).");
+        commandBaseLog("Due to retreat(s) across major river(s), the stack must lose " + motLossVal + " motorized step(s).");
         for (GamePiece gp : pieces) {
           if (RsrTrait.getMovementTypeAsInt(gp) == MOVEMENT_MOTORIZED) {
             availableStepsMot += RsrTrait.getCurrentNominalSteps(gp);
@@ -1108,7 +1108,7 @@
           }
           lossVal -= motLossVal;
         } else {
-          commandSetProperty(dataPiece, MOTORIZED_LOSS_REQUIRED, motLossVal);
+          commandBaseSetProperty(dataPiece, MOTORIZED_LOSS_REQUIRED, motLossVal);
           for (GamePiece gp : pieces) {
             if (RsrTrait.getMovementTypeAsInt(gp) == MOVEMENT_MOTORIZED) {
               commandAllowCombatAction(gp);
@@ -1119,7 +1119,7 @@
       int conLossVal = lossVal / 10;
       if (conLossVal > 0) {
         int availableStepsCon = 0;
-        commandLog("Due to retreat through enemy contested, unoccupied space(s) the stack must lose " + conLossVal + " step(s).");
+        commandBaseLog("Due to retreat through enemy contested, unoccupied space(s) the stack must lose " + conLossVal + " step(s).");
         for (GamePiece gp : pieces) {
           availableStepsCon += RsrTrait.getCurrentNominalSteps(gp);
         }
@@ -1131,7 +1131,7 @@
           }
           lossVal -= conLossVal * 10;
         } else {
-          commandSetProperty(dataPiece, CONTESTED_LOSS_REQUIRED, conLossVal);
+          commandBaseSetProperty(dataPiece, CONTESTED_LOSS_REQUIRED, conLossVal);
           for (GamePiece gp : pieces) {
             commandAllowCombatAction(gp);
           }
@@ -1174,7 +1174,7 @@
         }
         pieces.clear();
       }
-      commandAdvance(false);
+      commandAdvance();
     }
   }
 
@@ -1232,7 +1232,7 @@
             //supply will have to be recalculated after a unit is placed
             supplyCache.clear();
             for (GamePiece gp : pieces) {
-              commandSetProperty(gp, T_PLACED, 1);
+              commandBaseSetProperty(gp, T_PLACED, 1);
             }
           }
           return true;
@@ -1245,53 +1245,53 @@
     }
   }
 
-  public KeyCommand[] getCommands(RsrTrait trait, GamePiece gp) {
+  public RsrKeyCommand[] getCommands(RsrTrait trait, GamePiece gp) {
     commands.clear();
     if (RsrGlobal.getDebug() == 1) {
-      commands.add(new KeyCommand("Delete", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), gp, trait));
+      commands.add(new RsrKeyCommand("Delete", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), gp, trait));
     }
     String phaseName = getPhaseName();
     int phasePart = RsrGlobal.getPhasePart() - 1;
     if (phaseName.equals(PHASE_SUPPLY)) {
       if ((phasePart == 1) && (RsrTrait.getHlAction(gp) > 0)) {
-        commands.add(new KeyCommand("Remove Depot", KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_DOWN_MASK), gp, trait));
-        commands.add(new KeyCommand("Convert Depot", KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK), gp, trait));
+        commands.add(new RsrKeyCommand("Remove Depot", KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_DOWN_MASK), gp, trait));
+        commands.add(new RsrKeyCommand("Convert Depot", KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK), gp, trait));
       }
     } else if (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) {
       if ((phasePart == 3) && (RsrTrait.getHlLoss(gp) > 0)) {
-        commands.add(new KeyCommand("Eliminate", KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK), gp, trait));
+        commands.add(new RsrKeyCommand("Eliminate", KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK), gp, trait));
       }
     } else if (phaseName.equals(PHASE_ADMINISTRATIVE)) {
       if (RsrTrait.getHlAction(gp) > 0) {
         switch (phasePart) {
           case 2 :
-            commands.add(new KeyCommand("Promote", KeyStroke.getKeyStroke(KeyEvent.VK_P, InputEvent.CTRL_DOWN_MASK), gp, trait));
+            commands.add(new RsrKeyCommand("Promote", KeyStroke.getKeyStroke(KeyEvent.VK_P, InputEvent.CTRL_DOWN_MASK), gp, trait));
             break;
           case 5 :
-            commands.add(new KeyCommand("Evacuate", KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK), gp, trait));
+            commands.add(new RsrKeyCommand("Evacuate", KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK), gp, trait));
             break;
         }
       }
     } else if (phaseName.equals(PHASE_AXIS_COMBAT)) {
       if ((RsrTrait.getType(gp).equals("SiegeArtillery")) && (RsrTrait.getHlAction(gp) > 0)) {
         if (RsrTrait.getFired(gp) > 0) {
-          commands.add(new KeyCommand("Enable support", KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK), gp, trait));
+          commands.add(new RsrKeyCommand("Enable support", KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK), gp, trait));
         } else {
-          commands.add(new KeyCommand("Disable support", KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK), gp, trait));
+          commands.add(new RsrKeyCommand("Disable support", KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK), gp, trait));
         }
       }
     }
     int combatStage = RsrGlobal.getCombatStage();
     if (((combatStage == 2) || (combatStage == 3) || (combatStage == 4)) && (RsrTrait.getHlLoss(gp) > 0)) {
-      commands.add(new KeyCommand("Step loss", KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_DOWN_MASK), gp, trait));
+      commands.add(new RsrKeyCommand("Step loss", KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_DOWN_MASK), gp, trait));
     }
     return commands.toArray(commandsArray);
   }
 
-  public Command getCommand(RsrTrait trait, GamePiece gp, KeyCommand kc) {
+  public Command getCommand(RsrTrait trait, GamePiece gp, RsrKeyCommand kc) {
     String name = kc.getName();
     if (name.equals("Delete")) {
-      commandDelete(gp);
+      commandBaseDelete(gp);
     } else if (name.equals("Step loss")) {
       int combatStage = RsrGlobal.getCombatStage();
       if ((combatStage == 2) || (combatStage == 3)) {
@@ -1304,11 +1304,11 @@
         if (RsrGlobal.getMotorizedLossRequired() > 0) {
           if (RsrTrait.getMovementTypeAsInt(gp) == MOVEMENT_MOTORIZED) {
             commandStepLoss(gp);
-            commandSetProperty(dataPiece, MOTORIZED_LOSS_REQUIRED, RsrGlobal.getMotorizedLossRequired() - 1);
+            commandBaseSetProperty(dataPiece, MOTORIZED_LOSS_REQUIRED, RsrGlobal.getMotorizedLossRequired() - 1);
           }
         } else if (RsrGlobal.getContestedLossRequired() > 0) {
           commandStepLoss(gp);
-          commandSetProperty(dataPiece, CONTESTED_LOSS_REQUIRED, RsrGlobal.getContestedLossRequired() - 1);
+          commandBaseSetProperty(dataPiece, CONTESTED_LOSS_REQUIRED, RsrGlobal.getContestedLossRequired() - 1);
         }
         if ((RsrGlobal.getMotorizedLossRequired() == 0) && (RsrGlobal.getContestedLossRequired() == 0)) {
           commandResolveCombat();
@@ -1318,30 +1318,28 @@
       }
     } else if (name.equals("Eliminate")) { //airbase elimination
       commandSendToOffboardZone(gp, "Axis Permanently Eliminated Units Box");
-      commandAdvance(false);
+      commandAdvance();
     } else if (name.equals("Promote")) {
       commandPromote(gp);
     } else if (name.equals("Evacuate")) {
       commandEvacuate(gp);
     } else if (name.equals("Enable support")) {
-      commandSetProperty(gp, T_FIRED, 0);
+      commandBaseSetProperty(gp, T_FIRED, 0);
     } else if (name.equals("Disable support")) {
-      commandSetProperty(gp, T_FIRED, 1);
+      commandBaseSetProperty(gp, T_FIRED, 1);
     } else if (name.equals("Remove Depot")) {
       commandLogMy("Voluntarily removed supply depot in " + mainGrid.locationName(gp.getPosition()) + ".");
       commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");
     } else if (name.equals("Convert Depot")) {
       if (RsrTrait.getSupplyMode(gp) == 1) {
-        commandSetProperty(gp, PROPERTY_SUPPLY_MODE, 2);
+        commandBaseSetProperty(gp, PROPERTY_SUPPLY_MODE, 2);
         commandLogMy("Converted supply depot in " + mainGrid.locationName(gp.getPosition()) + " into emergency supply source.");
       } else {
-        commandSetProperty(gp, PROPERTY_SUPPLY_MODE, 1);
+        commandBaseSetProperty(gp, PROPERTY_SUPPLY_MODE, 1);
         commandLogMy("Converted emergency supply source in " + mainGrid.locationName(gp.getPosition()) + " back into supply depot.");
       }
     }
-    Command result = c;
-    c = null;
-    return result;
+    return c;
   }
 
 

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-02 13:21:35 UTC (rev 5699)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-02 15:17:50 UTC (rev 5700)
@@ -158,7 +158,8 @@
   }
 
   public final void execute(String param) {
-    commandAdvance(true);
+    commandAdvance();
+    sendAndLog();
   }
 
   protected abstract void onInitialize(String param);
@@ -191,24 +192,24 @@
     c = null;
   }
 
-  public void commandLog(String message) {
+  public void commandBaseLog(String message) {
     Command cmd = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), message);
     cmd.execute();
     appendCommand(cmd);
   }
 
   public void commandLogMy(String message) {
-    commandLog("* " + GlobalOptions.getInstance().getPlayerId() + ": " + message);
+    commandBaseLog("* " + GlobalOptions.getInstance().getPlayerId() + ": " + message);
   }
 
-  public void commandSetProperty(GamePiece gp, Object key, Object val) {
+  public void commandBaseSetProperty(GamePiece gp, Object key, Object val) {
     pieceCache.clear(); //step down may cause loss of zoc
     ChangeTracker tracker = new ChangeTracker(gp);
     gp.setProperty(key.toString(), String.valueOf(val));
     appendCommand(tracker.getChangeCommand());
   }
 
-  public void commandSetProperty(GamePiece gp, Object... key_val) {
+  public void commandBaseSetProperty(GamePiece gp, Object... key_val) {
     pieceCache.clear(); //step down may cause loss of zoc
     ChangeTracker tracker = new ChangeTracker(gp);
     for (int i = 0; i < key_val.length; i += 2) {
@@ -217,7 +218,7 @@
     appendCommand(tracker.getChangeCommand());
   }
 
-  public void commandMove(Map map, GamePiece gp, Point p) {
+  public void commandBaseMove(Map map, GamePiece gp, Point p) {
     pieceCache.clear(); //moving units may cause change of zoc
     appendCommand(map.placeOrMerge(gp, p));
   }
@@ -310,16 +311,16 @@
       if (gpc != null) {
         int desiredControl = side.equals(SIDE_SOVIET) ? 1 : 2;
         if (RsrCounter.getIntProperty(gpc, "Control", 1, false) != desiredControl) {
-          commandSetProperty(gpc, "Control", String.valueOf(desiredControl));
-          commandLog("Game: Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now under " + side + " control.");
+          commandBaseSetProperty(gpc, "Control", String.valueOf(desiredControl));
+          commandBaseLog("Game: Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now under " + side + " control.");
           //TODO: apply Moscow/Baku surrender rule on first axis enter
         }
         if (desiredControl == 2) {
           GamePiece gpd = destroyedMarkers.get(hr);
           if (gpd != null) {
             if (RsrCounter.getIntProperty(gpc, "Destruction", 1, false) != desiredControl) {
-              commandSetProperty(gpc, "Destruction", String.valueOf(desiredControl));
-              commandLog("Game: Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now destroyed.");
+              commandBaseSetProperty(gpc, "Destruction", String.valueOf(desiredControl));
+              commandBaseLog("Game: Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now destroyed.");
             }
           }
         }
@@ -343,7 +344,7 @@
               if (getPartisanRepositionHexes(gp).size() == 0) {
                 commandEliminate(gp);
               } else {
-                commandSetProperty(gp, T_REPOSITIONING, 1);
+                commandBaseSetProperty(gp, T_REPOSITIONING, 1);
                 count++;
               }
             }
@@ -351,13 +352,13 @@
         }
       }
       if (count > 0) {
-        commandSetProperty(dataPiece, G_REPOSITIONING_REQUIRED, count);
-        commandLog("Game: There are " + count + " partisan unit(s) to reposition.");
+        commandBaseSetProperty(dataPiece, G_REPOSITIONING_REQUIRED, count);
+        commandBaseLog("Game: There are " + count + " partisan unit(s) to reposition.");
       }
     }
   }
 
-  public void commandClearHighlight() {
+  public void commandBaseClearHighlight() {
     supplyCache.clear();
     pieceCache.clear();
     ClearHighlightCommand cmd = new ClearHighlightCommand(mainMap, filter);
@@ -365,16 +366,16 @@
     appendCommand(cmd);
   }
 
-  public void commandReportMoves() {
+  public void commandBaseReportMoves() {
     MovementReporter r = new MovementReporter(c);
-    Command reportCommand = r.getReportCommand();
-    if (reportCommand != null) {
-      reportCommand.execute();
-      appendCommand(reportCommand);
+    Command cmd = r.getReportCommand();
+    if (cmd != null) {
+      cmd.execute();
     }
+    appendCommand(cmd);
   }
 
-  public void commandDelete(GamePiece gp) {
+  public void commandBaseDelete(GamePiece gp) {
     pieceCache.clear(); //deleting units may cause change of zoc
     Command cmd = new RemovePiece(gp);
     cmd.execute();
@@ -428,9 +429,9 @@
 
   private void commandUpdateStrength(GamePiece gp, GamePiece sgp) {
     if (sgp == null) {
-      commandSetProperty(gp, T_STRENGTH_ID, "");
+      commandBaseSetProperty(gp, T_STRENGTH_ID, "");
     } else {
-      commandSetProperty(gp, T_STRENGTH_ID, sgp.getProperty("BasicName"));
+      commandBaseSetProperty(gp, T_STRENGTH_ID, sgp.getProperty("BasicName"));
     }
   }
 
@@ -439,20 +440,20 @@
     if (sgp != null) {
       commandSendToOffboardZone(sgp, RsrTrait.getCombatClass(gp) + "-used strength pool");
       commandUpdateStrength(gp, sgp);
-      commandLog("Game: " + gp.getName() + " fetched a Combat Strength Marker.");
+      commandBaseLog("Game: " + gp.getName() + " fetched a Combat Strength Marker.");
     }
   }
 
   public void commandReleaseCounter(GamePiece gp) {
     GamePiece sgp = findStrength(RsrTrait.getCombatClass(gp), RsrTrait.getStrengthID(gp));
     if (sgp != null) {
-      commandSetProperty(gp, T_CURRENT_STEP, 2, T_STRENGTH_ID, "");
+      commandBaseSetProperty(gp, T_CURRENT_STEP, 2, T_STRENGTH_ID, "");
       if (RsrTrait.getStrengthType(sgp).equals("Normal")) {
         commandSendToOffboardZone(sgp, RsrTrait.getCombatClass(gp) + "-strength pool");
       } else {
         commandSendToOffboardZone(sgp, "At-Start Strength Marker Box");
       }
-      commandLog("Game: " + gp.getName() + " released a Combat Strength Marker.");
+      commandBaseLog("Game: " + gp.getName() + " released a Combat Strength Marker.");
     }
   }
 
@@ -471,9 +472,9 @@
     Rectangle r2 = z.getBoard().bounds();
     Point dest = offboardMap.snapTo(new Point(r2.x + r1.x + r1.width / 2, r2.y + r1.y + r1.height / 2));
     //
-    commandMove(offboardMap, gp, dest);
+    commandBaseMove(offboardMap, gp, dest);
     RsrTrait.commandClearAttributes(gp);
-    commandLog("Game: " + gp.getName() + " was sent to " + offboardZone + ".");
+    commandBaseLog("Game: " + gp.getName() + " was sent to " + offboardZone + ".");
   }
 
   public void commandSendToReinforcementZone(GamePiece gp, int turnNumberMod, String offboardZone) {
@@ -503,17 +504,17 @@
       commandReleaseCounter(gp);
     }
     //
-    commandMove(turnMap, gp, dest);
+    commandBaseMove(turnMap, gp, dest);
     RsrTrait.commandClearAttributes(gp);
-    commandLog("Game: " + gp.getName() + " will return as reinforcement on turn " + regionName.substring(1) + ".");
+    commandBaseLog("Game: " + gp.getName() + " will return as reinforcement on turn " + regionName.substring(1) + ".");
   }
 
   public void commandSendToPiece(GamePiece gp, GamePiece rgp, boolean copyProperties) {
-    commandMove(gp.getMap(), rgp, gp.getPosition());
+    commandBaseMove(gp.getMap(), rgp, gp.getPosition());
     if (copyProperties) {
       RsrTrait.commandCopyAttributes(gp, rgp);
     }
-    commandLog("Game: " + rgp.getName() + " was sent to " + gp.getName() + "'s location.");
+    commandBaseLog("Game: " + rgp.getName() + " was sent to " + gp.getName() + "'s location.");
   }
 
   public void commandPromote(GamePiece gp) {
@@ -612,9 +613,9 @@
       commandEliminate(gp);
     } else {
       if (currentStep == 2) {
-        commandSetProperty(gp, T_CURRENT_STEP, 1);
+        commandBaseSetProperty(gp, T_CURRENT_STEP, 1);
         commandUpdateStrength(gp, findStrength(RsrTrait.getCombatClass(gp), RsrTrait.getStrengthID(gp)));
-        commandLog("Game: " + gp.getName() + " lost a step.");
+        commandBaseLog("Game: " + gp.getName() + " lost a step.");
       } else if ((currentStep == 1) && (isAxisGermanCorps)) {
         if (unitType.equals("AxisGermanTankCorps")) {
           for (GamePiece fgp : findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanTankBattlegroup", 1)) {
@@ -627,7 +628,7 @@
         } else {
           for (GamePiece fgp : findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanMountainBattlegroup", 1)) {
             commandSendToPiece(gp, fgp, true);
-            commandSetProperty(fgp, T_CURRENT_STEP, 1);
+            commandBaseSetProperty(fgp, T_CURRENT_STEP, 1);
           }
         }
         commandSendToOffboardZone(gp, "German Breakdown & Buildup Box");
@@ -638,26 +639,20 @@
   public void commandEvacuate(GamePiece gp) {
     commandSendToOffboardZone(gp, "Evacuated Factories Box");
     int newValue = RsrGlobal.getEvacuated()+1;
-    commandSetProperty(dataPiece, G_EVACUATED, newValue);
+    commandBaseSetProperty(dataPiece, G_EVACUATED, newValue);
     if (newValue >= 3) {
-      commandAdvance(false);
+      commandAdvance();
     }
   }
 
-  public void commandAdvance(boolean fromButton) {
+  public void commandAdvance() {
     //TODO: block advance if there are things to do, also block advance for player that is not the owner of current phase part
     if (RsrGlobal.getRepositioningRequired() > 0) {
-      commandLog("Game: Reposition partisan unit(s) before advancing.");
-      if (fromButton) {
-        sendAndLog();
-      }
+      commandBaseLog("Game: Reposition partisan unit(s) before advancing.");
       return;
     }
     if (RsrGlobal.getCombatStage() > 0) {
-      commandLog("Game: Resolve or cancel combat before advancing.");
-      if (fromButton) {
-        sendAndLog();
-      }
+      commandBaseLog("Game: Resolve or cancel combat before advancing.");
       return;
     }
     autoAdvance = true;
@@ -673,15 +668,15 @@
             Point p2 = turnPiece.getPosition();
             if (p2.y < 3599) {
               p2.translate(0, 91);
-              commandMove(turnMap, turnPiece, p2);
-              commandLog("Game: Turn changes to " + turnGrid.locationName(p2) + ".");
+              commandBaseMove(turnMap, turnPiece, p2);
+              commandBaseLog("Game: Turn changes to " + turnGrid.locationName(p2) + ".");
             }
             p.y = 45;
           } else {
             p.translate(0, 82);
           }
-          commandMove(turnMap, phasePiece, p);
-          commandLog("Game: Phase changes to " + turnGrid.locationName(p) + ".");
+          commandBaseMove(turnMap, phasePiece, p);
+          commandBaseLog("Game: Phase changes to " + turnGrid.locationName(p) + ".");
           executeEnterPhase();
         } else {
           executePart(phasePart);
@@ -690,9 +685,6 @@
         executeFirst();
       }
     }
-    if (fromButton) {
-      sendAndLog();
-    }
   }
 
   private void executeFirst() {
@@ -711,22 +703,22 @@
 
   private void executePart(int part) {
     executePartPhase(part);
-    commandSetProperty(dataPiece, PROPERTY_PHASE_PART, part + 1);
+    commandBaseSetProperty(dataPiece, PROPERTY_PHASE_PART, part + 1);
   }
 
   protected abstract void executeSetPhaseParts();
   protected abstract void executePartPhase(int part);
 
   public void commandAllowCombatAction(GamePiece gp) {
-    commandSetProperty(gp, T_HL_LOSS, 1);
+    commandBaseSetProperty(gp, T_HL_LOSS, 1);
   }
 
   public void commandDisallowCombatAction(GamePiece gp) {
-    commandSetProperty(gp, T_HL_LOSS, 0);
+    commandBaseSetProperty(gp, T_HL_LOSS, 0);
   }
 
   public void commandAllowAction(GamePiece gp) {
-    commandSetProperty(gp, T_HL_ACTION, 1);
+    commandBaseSetProperty(gp, T_HL_ACTION, 1);
   }
 
   public void commandDisallowActionAll() {
@@ -736,25 +728,25 @@
   }
 
   public void commandDisallowAction(GamePiece gp) {
-    commandSetProperty(gp, T_HL_ACTION, 0);
+    commandBaseSetProperty(gp, T_HL_ACTION, 0);
   }
 
   public void commandAllowMovement(GamePiece gp, double mp, boolean newMove) {
     if (newMove) {
       if (gp.getMap() == mainMap) {
-        commandSetProperty(gp, T_MOVEMENT_LEFT, mp, T_HL_MOVEMENT, 1, T_START_HEX, mainGrid.locationName(gp.getPosition()), T_MOVE_INDEX, 0);
+        commandBaseSetProperty(gp, T_MOVEMENT_LEFT, mp, T_HL_MOVEMENT, 1, T_START_HEX, mainGrid.locationName(gp.getPosition()), T_MOVE_INDEX, 0);
       } else {
-        commandSetProperty(gp, T_MOVEMENT_LEFT, mp, T_HL_MOVEMENT, 1, T_START_HEX, "", T_MOVE_INDEX, 0);
+        commandBaseSetProperty(gp, T_MOVEMENT_LEFT, mp, T_HL_MOVEMENT, 1, T_START_HEX, "", T_MOVE_INDEX, 0);
       }
     } else {
-      commandSetProperty(gp, T_MOVEMENT_LEFT, mp, T_HL_MOVEMENT, 1);
+      commandBaseSetProperty(gp, T_MOVEMENT_LEFT, mp, T_HL_MOVEMENT, 1);
     }
   }
 
   public void commandDisallowMovementAll() {
     int moveIndex = RsrGlobal.getLastMovedIndex() + 1;
     if (moveIndex > 1) {
-      commandSetProperty(dataPiece, PROPERTY_LAST_MOVED_INDEX, moveIndex);
+      commandBaseSetProperty(dataPiece, PROPERTY_LAST_MOVED_INDEX, moveIndex);
       for (GamePiece gp : filter.filterPieces(mainMap, T_MOVE_INDEX + ">0&&" + T_MOVE_INDEX + "<" + moveIndex)) {
         commandDisallowMovement(gp);
         commandMarkAsMoved(gp);
@@ -766,35 +758,35 @@
   }
 
   public void commandDisallowMovement(GamePiece gp) {
-    commandSetProperty(gp, T_MOVEMENT_LEFT, 0.0d, T_HL_MOVEMENT, 0, T_START_HEX, "", T_MOVE_INDEX, 0);
+    commandBaseSetProperty(gp, T_MOVEMENT_LEFT, 0.0d, T_HL_MOVEMENT, 0, T_START_HEX, "", T_MOVE_INDEX, 0);
   }
 
   public void commandMarkAsMoved(GamePiece gp) {
-    commandSetProperty(gp, T_MOVED, 1);
+    commandBaseSetProperty(gp, T_MOVED, 1);
   }
 
   public void commandMarkAsUnmovedAll() {
     for (GamePiece gp : filter.filterPieces(mainMap, T_MOVED + ">0")) {
-      commandSetProperty(gp, T_MOVED, 0);
+      commandBaseSetProperty(gp, T_MOVED, 0);
     }
   }
 
   public void commandMarkAsReorganized(GamePiece gp) {
-    commandSetProperty(gp, T_REORGANIZED, 1);
+    commandBaseSetProperty(gp, T_REORGANIZED, 1);
   }
 
   public void commandMarkAsUnreorganizedAll() {
     for (GamePiece gp : filter.filterPieces(mainMap, T_REORGANIZED + ">0")) {
-      commandSetProperty(gp, T_REORGANIZED, 0);
+      commandBaseSetProperty(gp, T_REORGANIZED, 0);
     }
   }
 
   public void commandSetMovementIndex(ArrayList<GamePiece> pieces) {
     int moveIndex = RsrGlobal.getLastMovedIndex() + 1;
     for (GamePiece gp : pieces) {
-      commandSetProperty(gp, T_MOVE_INDEX, moveIndex);
+      commandBaseSetProperty(gp, T_MOVE_INDEX, moveIndex);
     }
-    commandSetProperty(dataPiece, PROPERTY_LAST_MOVED_INDEX, moveIndex);
+    commandBaseSetProperty(dataPiece, PROPERTY_LAST_MOVED_INDEX, moveIndex);
     for (GamePiece gp : filter.filterPieces(mainMap, T_MOVE_INDEX + ">0&&" + T_MOVE_INDEX + "<" + moveIndex)) {
       commandDisallowMovement(gp);
       commandMarkAsMoved(gp);
@@ -802,7 +794,7 @@
   }
 
   public void commandResetMovementIndex() {
-    commandSetProperty(dataPiece, PROPERTY_LAST_MOVED_INDEX, 0);
+    commandBaseSetProperty(dataPiece, PROPERTY_LAST_MOVED_INDEX, 0);
   }
 
   public HexRef getStartHex(GamePiece gp) {
@@ -845,7 +837,7 @@
         RsrTrait.commandClearCombatAttributes(gp, (RsrTrait.getDefender(gp) > 0) && (combatStage == 6) && (overrun == false));
       }
       //set combat parameters
-      commandSetProperty(dataPiece, COMBAT_STAGE, 0,
+      commandBaseSetProperty(dataPiece, COMBAT_STAGE, 0,
                                     COMBAT_MODE, 0,
                                     ATTACKER_HEXES, "",
                                     DEFENDER_HEXES, "",
@@ -925,7 +917,7 @@
       commandLogMy((overrun ? "Overrun combat" : "Combat") + " initiated in space " + defenderHex + ".");
     }
     for (GamePiece gp : strengthA.keySet()) {
-      commandSetProperty(gp, T_ATTACKER, 1, T_COMBAT_HEX, attackerHex);
+      commandBaseSetProperty(gp, T_ATTACKER, 1, T_COMBAT_HEX, attackerHex);
       strength = strengthA.get(gp).intValue();
       if (strength > 0) {
         commandLogMy(gp.getName() + " will attack with strength " + strength + ".");
@@ -934,7 +926,7 @@
       }
     }
     for (GamePiece gp : strengthD.keySet()) {
-      commandSetProperty(gp, T_DEFENDER, 1, T_COMBAT_HEX, defenderHex);
+      commandBaseSetProperty(gp, T_DEFENDER, 1, T_COMBAT_HEX, defenderHex);
       strength = strengthD.get(gp).intValue();
       if (strength > 0) {
         commandLogMy(gp.getName() + " will defend with strength " + strength + ".");
@@ -942,7 +934,7 @@
         commandLogMy(gp.getName() + " will defend with unknown strength.");
       }
     }
-    commandSetProperty(dataPiece, COMBAT_STAGE, 1,
+    commandBaseSetProperty(dataPiece, COMBAT_STAGE, 1,
                                   COMBAT_MODE, overrun ? 1 : 0,
                                   ATTACKER_HEXES, attackerHexes.toString(),
                                   DEFENDER_HEXES, defenderHexes.toString());
@@ -980,8 +972,8 @@
           }
           urbanLoss = 2*motorizedSteps > totalSteps;
           if (urbanLoss) {
-            commandLog("Game: Additional losses will apply to motorized forces attacking urban area (" + motorizedSteps + " step(s) out of " + totalSteps + " step(s) are motorized).");
-            commandSetProperty(dataPiece, URBAN_LOSS_REQUIRED, 1);
+            commandBaseLog("Game: Additional losses will apply to motorized forces attacking urban area (" + motorizedSteps + " step(s) out of " + totalSteps + " step(s) are motorized).");
+            commandBaseSetProperty(dataPiece, URBAN_LOSS_REQUIRED, 1);
           }
         }
       }
@@ -1049,7 +1041,7 @@
           }
         }
       }
-      commandSetProperty(dataPiece, COMBAT_STAGE, ++combatStage,
+      commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage,
                                     ATTACKER_LOSS, al,
                                     ATTACKER_RETREAT, ar,
                                     DEFENDER_LOSS, dl,
@@ -1059,20 +1051,20 @@
     if (combatStage == 2) {
       //defender step loss
       if (commandRefreshCombatLossList(ignoreOptional)) {
-        commandSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
+        commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
         ignoreOptional = false;
       } else {
-        commandLog("Game: Defender is required to lose " + RsrGlobal.getDefenderLoss() + " step(s) and optionally " + RsrGlobal.getDefenderRetreat() + " more.");
+        commandBaseLog("Game: Defender is required to lose " + RsrGlobal.getDefenderLoss() + " step(s) and optionally " + RsrGlobal.getDefenderRetreat() + " more.");
         return;
       }
     }
     if (combatStage == 3) {
       //attacker step loss
       if (commandRefreshCombatLossList(ignoreOptional)) {
-        commandSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
+        commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
         ignoreOptional = false;
       } else {
-        commandLog("Game: Attacker is required to lose " + RsrGlobal.getAttackerLoss() + " step(s) and optionally " + RsrGlobal.getAttackerRetreat() + " more.");
+        commandBaseLog("Game: Attacker is required to lose " + RsrGlobal.getAttackerLoss() + " step(s) and optionally " + RsrGlobal.getAttackerRetreat() + " more.");
         return;
       }
     }
@@ -1086,48 +1078,48 @@
         defenders = filter.filterPieces(mainMap, T_DEFENDER + ">0");
         //
         for (GamePiece gp : defenders) {
-          commandSetProperty(gp, T_RETREATING, dr);
+          commandBaseSetProperty(gp, T_RETREATING, dr);
           if (TerrainMapShaderRule.hasNonTraceHexes(getRetreatHexes(gp))) {
-            commandLog("Game: " + gp.getName() + " must retreat " + dr + " space(s).");
+            commandBaseLog("Game: " + gp.getName() + " must retreat " + dr + " space(s).");
           } else {
             commandEliminate(gp);
           }
         }
-        commandSetProperty(dataPiece, DEFENDER_RETREAT, 0);
+        commandBaseSetProperty(dataPiece, DEFENDER_RETREAT, 0);
       }
       if (ar > 0) {
         //refresh in case any units were removed
         attackers = filter.filterPieces(mainMap, T_ATTACKER + ">0");
         //
         for (GamePiece gp : attackers) {
-          commandSetProperty(gp, T_RETREATING, ar);
+          commandBaseSetProperty(gp, T_RETREATING, ar);
           if (TerrainMapShaderRule.hasNonTraceHexes(getRetreatHexes(gp))) {
-            commandLog("Game: " + gp.getName() + " must retreat " + ar + " space(s).");
+            commandBaseLog("Game: " + gp.getName() + " must retreat " + ar + " space(s).");
           } else {
             commandEliminate(gp);
           }
         }
-        commandSetProperty(dataPiece, ATTACKER_RETREAT, 0);
+        commandBaseSetProperty(dataPiece, ATTACKER_RETREAT, 0);
       }
       if ((RsrGlobal.getMotorizedLossRequired() > 0) || (RsrGlobal.getContestedLossRequired() > 0)) {
-        commandLog("Game: There are units that have to take mandatory step loss(es).");
+        commandBaseLog("Game: There are units that have to take mandatory step loss(es).");
         return;
       } else
       if (filter.filterPieces(mainMap, T_RETREATING + ">0").size() == 0) {
         //clear just reatreated units
         for (GamePiece gp : filter.filterPieces(mainMap, T_RETREATING + "<0")) {
-          commandSetProperty(gp, T_RETREATING, 0);
+          commandBaseSetProperty(gp, T_RETREATING, 0);
         }
-        commandSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
+        commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
       } else {
-        commandLog("Game: There are units that have to retreat.");
+        commandBaseLog("Game: There are units that have to retreat.");
         return;
       }
     }
     if (combatStage == 5) {
       //apply urban test for motorized units
       if (RsrGlobal.getUrbanLossRequired() == 1) {
-        commandLog("Game: Applying additional losses to motorized forces that attacked urban area.");
+        commandBaseLog("Game: Applying additional losses to motorized forces that attacked urban area.");
         //refresh in case any units were removed
         attackers = filter.filterPieces(mainMap, T_ATTACKER + ">0");
         int chance;
@@ -1143,7 +1135,7 @@
             }
           }
         }
-        commandSetProperty(dataPiece, URBAN_LOSS_REQUIRED, 0);
+        commandBaseSetProperty(dataPiece, URBAN_LOSS_REQUIRED, 0);
       }
       //find victorious units
       int victorious = 0;
@@ -1173,12 +1165,12 @@
           for (GamePiece gp : defenders) {
             advanceRange = getMaximumAdvance(gp);
             if (advanceRange > 0) {
-              commandSetProperty(gp, T_ADVANCING, advanceRange);
+              commandBaseSetProperty(gp, T_ADVANCING, advanceRange);
               if (TerrainMapShaderRule.hasNonTraceHexes(getAdvanceHexes(gp))) {
-                commandLog("Game: " + gp.getName() + " may advance up to " + advanceRange + " space(s).");
+                commandBaseLog("Game: " + gp.getName() + " may advance up to " + advanceRange + " space(s).");
                 victorious++;
               } else {
-                commandSetProperty(gp, T_ADVANCING, 0);
+                commandBaseSetProperty(gp, T_ADVANCING, 0);
               }
             }
           }
@@ -1215,17 +1207,17 @@
             if (combatMode == 0) {
               advanceRange = getMaximumAdvance(gp);
               if (advanceRange > 0) {
-                commandSetProperty(gp, T_ADVANCING, advanceRange);
+                commandBaseSetProperty(gp, T_ADVANCING, advanceRange);
                 if (TerrainMapShaderRule.hasNonTraceHexes(getAdvanceHexes(gp))) {
-                  commandLog("Game: " + gp.getName() + " may advance up to " + advanceRange + " space(s).");
+                  commandBaseLog("Game: " + gp.getName() + " may advance up to " + advanceRange + " space(s).");
                   victorious++;
                 } else {
-                  commandSetProperty(gp, T_ADVANCING, 0);
+                  commandBaseSetProperty(gp, T_ADVANCING, 0);
                 }
               }
             } else {
               //in overrun combat place attackers in defender hex and remove movement points for overrun
-              commandMove(mainMap, gp, p);
+              commandBaseMove(mainMap, gp, p);
               double mp = RsrTrait.getMovementLeft(gp) - getOverrunCost(gp);
               if (mp > 0.0d) {
                 commandAllowMovement(gp, mp, false);
@@ -1250,13 +1242,13 @@
           }
         }
       }
-      commandSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
+      commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
       //if there are no advances possible, end combat immediately, otherwise let the player decide
       if (victorious == 0) {
         commandClearCombat();
         return;
       } else {
-        commandLog("Game: Advance victorious units or end combat.");
+        commandBaseLog("Game: Advance victorious units or end combat.");
         return;
       }
     }
@@ -1291,8 +1283,8 @@
       property2 = DEFENDER_LOST;
       newValue2 = RsrGlobal.getDefenderLost()+1;
     }
-    commandSetProperty(gp, T_LOST, RsrTrait.getLost(gp) + 1);
-    commandSetProperty(dataPiece, property1, newValue1, property2, newValue2);
+    commandBaseSetProperty(gp, T_LOST, RsrTrait.getLost(gp) + 1);
+    commandBaseSetProperty(dataPiece, property1, newValue1, property2, newValue2);
   }
 
   public boolean commandRefreshCombatLossList(boolean ignoreOptional) {
@@ -2185,7 +2177,7 @@
     }
     if (column < 0) {
       sb.append(". Attack is impossible due to low odds. Final result is NE.");
-      commandLog(sb.toString());
+      commandBaseLog(sb.toString());
       return "NE";
     } else {
       //ensure column is not greater than 9
@@ -2216,7 +2208,7 @@
       int moddie = Math.max(0, Math.min(9, modifier + die));
       String result = COMBAT_TABLE[column][moddie];
       sb.append((modifier > 0 ? ". Die roll modifier is +" + modifier : "") + ". Die roll is " + (die+1) + ". Final result is " + result + ".");
-      commandLog(sb.toString());
+      commandBaseLog(sb.toString());
       return result;
     }
   }
@@ -2532,12 +2524,12 @@
 
   public void commandBreakdown(ArrayList<GamePiece> pieces) {
     if (pieces.size() != 1) {
-      commandLog("Game: Select a single unit for breakdown.");
+      commandBaseLog("Game: Select a single unit for breakdown.");
       return;
     }
     GamePiece gp = pieces.get(0);
     if (RsrTrait.getReorganized(gp) > 0) {
-      commandLog("Game: No breakdown allowed.");
+      commandBaseLog("Game: No breakdown allowed.");
       return;
     }
     String unitType = RsrTrait.getUnitType(gp);
@@ -2574,27 +2566,27 @@
       }
     }
     if (bb == null) {
-      commandLog("Game: No breakdown allowed.");
+      commandBaseLog("Game: No breakdown allowed.");
       return;
     }
     if (bb.size() < req) {
-      commandLog("Game: No breakdown if not enough replacement units.");
+      commandBaseLog("Game: No breakdown if not enough replacement units.");
       return;
     }
     if (RsrTrait.getSupplyLevel(gp) != SUPPLY_NORMAL) {
-      commandLog("Game: No breakdown if not in supply.");
+      commandBaseLog("Game: No breakdown if not in supply.");
       return;
     }
     HashSet<HexRef> inZOC = isMud() ? new HashSet<HexRef>() : pieceCache.getHexesInZOCEnemy(RsrTrait.getSide(gp));
     if (inZOC.contains(getHexRef(gp.getPosition()))) {
-      commandLog("Game: No breakdown if in contested space (unless it is a mud turn).");
+      commandBaseLog("Game: No breakdown if in contested space (unless it is a mud turn).");
       return;
     }
     if (Filter.isAny(unitType, "AxisGermanTankCorps", "AxisGermanInfantryCorps")) {
       commandSendToPiece(gp, bb.get(0), false);
       commandSendToPiece(gp, bb.get(1), false);
       if (currentStep == 1) {
-        commandSetProperty(bb.get(1), T_CURRENT_STEP, 1);
+        commandBaseSetProperty(bb.get(1), T_CURRENT_STEP, 1);
       }
       commandSendToOffboardZone(gp, "German Breakdown & Buildup Box");
       commandMarkAsReorganized(bb.get(0));
@@ -2602,17 +2594,17 @@
     } else if (unitType.equals("AxisGermanMountainCorps")) {
       commandSendToPiece(gp, bb.get(0), false);
       if (currentStep == 1) {
-        commandSetProperty(bb.get(0), T_CURRENT_STEP, 1);
+        commandBaseSetProperty(bb.get(0), T_CURRENT_STEP, 1);
       }
       commandSendToPiece(gp, bb.get(1), false);
-      commandSetProperty(bb.get(1), T_CURRENT_STEP, 1);
+      commandBaseSetProperty(bb.get(1), T_CURRENT_STEP, 1);
       commandSendToOffboardZone(gp, "German Breakdown & Buildup Box");
       commandMarkAsReorganized(bb.get(0));
       commandMarkAsReorganized(bb.get(1));
     } else if (Filter.isAny(unitType, "AxisGermanTankBattlegroup", "AxisGermanInfantryBattlegroup", "AxisGermanMountainBattlegroup")) {
-      commandSetProperty(gp, T_CURRENT_STEP, 1);
+      commandBaseSetProperty(gp, T_CURRENT_STEP, 1);
       commandSendToPiece(gp, bb.get(0), false);
-      commandSetProperty(bb.get(0), T_CURRENT_STEP, 1);
+      commandBaseSetProperty(bb.get(0), T_CURRENT_STEP, 1);
       commandMarkAsReorganized(gp);
       commandMarkAsReorganized(bb.get(0));
     } else if (Filter.isAny(unitType, "SovietTankArmy", "SovietInfantryArmy")) {
@@ -2626,7 +2618,7 @@
 
   public void commandBuildup(ArrayList<GamePiece> pieces) {
     if (pieces.size() != 2) {
-      commandLog("Game: Select two units for buildup.");
+      commandBaseLog("Game: Select two units for buildup.");
       return;
     }
     GamePiece gp1 = pieces.get(0);
@@ -2637,7 +2629,7 @@
       gp2 = gpr;
     }
     if ((RsrTrait.getReorganized(gp1) > 0) && (RsrTrait.getReorganized(gp2) > 0)) { //&& to allow buildup if one unit was part of earlier breakdown
-      commandLog("Game: No buildup allowed.");
+      commandBaseLog("Game: No buildup allowed.");
       return;
     }
     String unitType1 = RsrTrait.getUnitType(gp1);
@@ -2671,37 +2663,37 @@
       ignoreZOC = true;
     }
     if (allowed == false) {
-      commandLog("Game: No buildup allowed.");
+      commandBaseLog("Game: No buildup allowed.");
       return;
     }
     HexRef hr1 = getHexRef(gp1.getPosition());
     HexRef hr2 = getHexRef(gp2.getPosition());
     if (hr1.equals(hr2) == false) {
-      commandLog("Game: No buildup if not in the same space.");
+      commandBaseLog("Game: No buildup if not in the same space.");
       return;
     }
     if ((RsrTrait.getSupplyLevel(gp1) != SUPPLY_NORMAL) || (RsrTrait.getSupplyLevel(gp2) != SUPPLY_NORMAL)) {
-      commandLog("Game: No buildup if not in supply.");
+      commandBaseLog("Game: No buildup if not in supply.");
       return;
     }
     HashSet<HexRef> inZOC = isMud() ? new HashSet<HexRef>() : pieceCache.getHexesInZOCEnemy(RsrTrait.getSide(gp1));
     if ((ignoreZOC == false) && (inZOC.contains(hr1))) {
-      commandLog("Game: No buildup if in contested space (unless it is a mud turn).");
+      commandBaseLog("Game: No buildup if in contested space (unless it is a mud turn).");
       return;
     }
     if (Filter.isAny(unitType1, "AxisGermanTankCorps", "AxisGermanInfantryCorps", "AxisGermanMountainCorps")) {
-      commandSetProperty(gp1, T_CURRENT_STEP, 2);
+      commandBaseSetProperty(gp1, T_CURRENT_STEP, 2);
       commandSendToOffboardZone(gp2, "German Breakdown & Buildup Box");
       commandMarkAsReorganized(gp1);
     } else if (Filter.isAny(unitType1, "AxisGermanTankBattlegroup", "AxisGermanInfantryBattlegroup", "AxisGermanMountainBattlegroup")) {
       if ((currentStep1 == 1) && (currentStep2 == 1)) {
-        commandSetProperty(gp1, T_CURRENT_STEP, 2);
+        commandBaseSetProperty(gp1, T_CURRENT_STEP, 2);
         commandSendToOffboardZone(gp2, "German Breakdown & Buildup Box");
         commandMarkAsReorganized(gp1);
       } else {
         commandSendToPiece(gp1, bb.get(0), false);
         if (currentStep1 + currentStep2 == size) {
-          commandSetProperty(bb.get(0), T_CURRENT_STEP, 1);
+          commandBaseSetProperty(bb.get(0), T_CURRENT_STEP, 1);
         }
         commandSendToOffboardZone(gp1, "German Breakdown & Buildup Box");
         commandSendToOffboardZone(gp2, "German Breakdown & Buildup Box");
@@ -2717,7 +2709,7 @@
 
   public void commandIncorporate(ArrayList<GamePiece> pieces) {
     if (pieces.size() != 2) {
-      commandLog("Game: Select two units for incorporation.");
+      commandBaseLog("Game: Select two units for incorporation.");
       return;
     }
     GamePiece gp1 = pieces.get(0);
@@ -2728,7 +2720,7 @@
       gp2 = gpr;
     }
     if ((RsrTrait.getReorganized(gp1) > 0) || (RsrTrait.getReorganized(gp2) > 0)) {
-      commandLog("Game: No incorporation allowed.");
+      commandBaseLog("Game: No incorporation allowed.");
       return;
     }
     String unitType1 = RsrTrait.getUnitType(gp1);
@@ -2741,20 +2733,20 @@
       allowed = (currentStep1 == 1) && (Filter.isAny(unitType2, "SovietMechanizedCorps", "SovietInfantryCorps", "SovietMarineCorps"));
     }
     if (allowed == false) {
-      commandLog("Game: No incorporation allowed.");
+      commandBaseLog("Game: No incorporation allowed.");
       return;
     }
     HexRef hr1 = getHexRef(gp1.getPosition());
     HexRef hr2 = getHexRef(gp2.getPosition());
     if (mainGrid.getHexesInRange(hr1, 1).contains(hr2) == false) {
-      commandLog("Game: No incorporation if not in adjacent spaces.");
+      commandBaseLog("Game: No incorporation if not in adjacent spaces.");
       return;
     }
     if ((RsrTrait.getSupplyLevel(gp1) != SUPPLY_NORMAL) || (RsrTrait.getSupplyLevel(gp2) != SUPPLY_NORMAL)) {
-      commandLog("Game: No incorporation if not in supply.");
+      commandBaseLog("Game: No incorporation if not in supply.");
       return;
     }
-    commandSetProperty(gp1, T_CURRENT_STEP, 2);
+    commandBaseSetProperty(gp1, T_CURRENT_STEP, 2);
     commandSendToOffboardZone(gp2, "Force Pool Box");
     commandMarkAsReorganized(gp1);
   }

Modified: VSQL-src/branches/morvael/rsr/RsrGlobal.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-06-02 13:21:35 UTC (rev 5699)
+++ VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-06-02 15:17:50 UTC (rev 5700)
@@ -21,7 +21,6 @@
 import VASSAL.configure.StringConfigurer;
 import VASSAL.counters.Decorator;
 import VASSAL.counters.GamePiece;
-import VASSAL.counters.KeyCommand;
 import VASSAL.counters.PieceEditor;
 import VASSAL.i18n.TranslatablePiece;
 import VASSAL.tools.SequenceEncoder;
@@ -63,8 +62,8 @@
   private int repositioningRequired = 0;
   // dynamic
   private GamePiece gp;
-  private KeyCommand[] commands0;
-  private KeyCommand[] commands1;
+  private RsrKeyCommand[] commands0;
+  private RsrKeyCommand[] commands1;
 
   private static RsrGlobal instance;
 
@@ -393,25 +392,25 @@
   }
 
   @Override
-  protected KeyCommand[] myGetKeyCommands() {
+  protected RsrKeyCommand[] myGetKeyCommands() {
     if ((commands0 == null) || (commands1 == null)) {
       getGamePiece();
-      commands0 = new KeyCommand[1];
-      commands0[0] = new KeyCommand("Switch to Debug mode", KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK), gp, this);
-      commands1 = new KeyCommand[7];
-      commands1[0] = new KeyCommand("Switch to Normal mode", KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK), gp, this);
-      commands1[1] = new KeyCommand("Use scenario 1", KeyStroke.getKeyStroke(KeyEvent.VK_1, InputEvent.CTRL_DOWN_MASK), gp, this);
-      commands1[2] = new KeyCommand("Use scenario 2", KeyStroke.getKeyStroke(KeyEvent.VK_2, InputEvent.CTRL_DOWN_MASK), gp, this);
-      commands1[3] = new KeyCommand("Use scenario 3", KeyStroke.getKeyStroke(KeyEvent.VK_3, InputEvent.CTRL_DOWN_MASK), gp, this);
-      commands1[4] = new KeyCommand("Use scenario 4", KeyStroke.getKeyStroke(KeyEvent.VK_4, InputEvent.CTRL_DOWN_MASK), gp, this);
-      commands1[5] = new KeyCommand("Use scenario 5", KeyStroke.getKeyStroke(KeyEvent.VK_5, InputEvent.CTRL_DOWN_MASK), gp, this);
-      commands1[6] = new KeyCommand("Use scenario 6", KeyStroke.getKeyStroke(KeyEvent.VK_6, InputEvent.CTRL_DOWN_MASK), gp, this);
+      commands0 = new RsrKeyCommand[1];
+      commands0[0] = new RsrKeyCommand("Switch to Debug mode", KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK), gp, this);
+      commands1 = new RsrKeyCommand[7];
+      commands1[0] = new RsrKeyCommand("Switch to Normal mode", KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK), gp, this);
+      commands1[1] = new RsrKeyCommand("Use scenario 1", KeyStroke.getKeyStroke(KeyEvent.VK_1, InputEvent.CTRL_DOWN_MASK), gp, this);
+      commands1[2] = new RsrKeyCommand("Use scenario 2", KeyStroke.getKeyStroke(KeyEvent.VK_2, InputEvent.CTRL_DOWN_MASK), gp, this);
+      commands1[3] = new RsrKeyCommand("Use scenario 3", KeyStroke.getKeyStroke(KeyEvent.VK_3, InputEvent.CTRL_DOWN_MASK), gp, this);
+      commands1[4] = new RsrKeyCommand("Use scenario 4", KeyStroke.getKeyStroke(KeyEvent.VK_4, InputEvent.CTRL_DOWN_MASK), gp, this);
+      commands1[5] = new RsrKeyCommand("Use scenario 5", KeyStroke.getKeyStroke(KeyEvent.VK_5, InputEvent.CTRL_DOWN_MASK), gp, this);
+      commands1[6] = new RsrKeyCommand("Use scenario 6", KeyStroke.getKeyStroke(KeyEvent.VK_6, InputEvent.CTRL_DOWN_MASK), gp, this);
     }
     return debug == 0 ? commands0 : commands1;
   }
 
   public Command myKeyEvent(KeyStroke stroke) {
-    KeyCommand[] commands = myGetKeyCommands();
+    RsrKeyCommand[] commands = myGetKeyCommands();
     int match = -1;
     for (int i = 0; i < commands.length; i++) {
       if (commands[i].getKeyStroke().equals(stroke)) {

Modified: VSQL-src/branches/morvael/rsr/RsrImmobilized.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrImmobilized.java	2009-06-02 13:21:35 UTC (rev 5699)
+++ VSQL-src/branches/morvael/rsr/RsrImmobilized.java	2009-06-02 15:17:50 UTC (rev 5700)
@@ -11,7 +11,6 @@
 import VASSAL.counters.Decorator;
 import VASSAL.counters.EditablePiece;
 import VASSAL.counters.GamePiece;
-import VASSAL.counters.KeyCommand;
 import VASSAL.counters.PieceEditor;
 import VASSAL.counters.Properties;
 import VASSAL.tools.SequenceEncoder;
@@ -43,8 +42,8 @@
     return piece.getName();
   }
 
-  public KeyCommand[] myGetKeyCommands() {
-    return new KeyCommand[0];
+  public RsrKeyCommand[] myGetKeyCommands() {
+    return new RsrKeyCommand[0];
   }
 
   public Command myKeyEvent(KeyStroke e) {

Added: VSQL-src/branches/morvael/rsr/RsrKeyCommand.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrKeyCommand.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/RsrKeyCommand.java	2009-06-02 15:17:50 UTC (rev 5700)
@@ -0,0 +1,54 @@
+package rsr;
+
+import VASSAL.counters.Decorator;
+import VASSAL.counters.GamePiece;
+import VASSAL.counters.KeyCommand;
+import VASSAL.i18n.TranslatablePiece;
+import VASSAL.tools.NamedKeyStroke;
+import java.awt.event.ActionEvent;
+import javax.swing.KeyStroke;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-06-02
+ */
+public class RsrKeyCommand extends KeyCommand {
+
+  public RsrKeyCommand(String name, KeyStroke key, GamePiece target) {
+    super(name, key, target);
+  }
+
+  public RsrKeyCommand(String name, NamedKeyStroke key, GamePiece target) {
+    super(name, key, target);
+  }
+
+  public RsrKeyCommand(String name, KeyStroke key, GamePiece target, TranslatablePiece i18nPiece) {
+    super(name, key, target, i18nPiece);
+  }
+
+  public RsrKeyCommand(String name, NamedKeyStroke key, GamePiece target, TranslatablePiece i18nPiece) {
+    super(name, key, target, i18nPiece);
+  }
+
+  public RsrKeyCommand(String name, NamedKeyStroke key, GamePiece target, boolean enabled) {
+    super(name, key, target, enabled);
+  }
+
+  public RsrKeyCommand(String name, KeyStroke key, GamePiece target, boolean enabled) {
+    super(name, key, target, enabled);
+  }
+
+  public RsrKeyCommand(RsrKeyCommand command) {
+    super(command);
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent evt) {
+    if (getKeyStroke() != null) {
+      Decorator.getOutermost(getTarget()).keyEvent(getKeyStroke());
+      RsrAdvance.getInstance().sendAndLog();
+    }
+  }
+
+}

Modified: VSQL-src/branches/morvael/rsr/RsrPieceMover.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-06-02 13:21:35 UTC (rev 5699)
+++ VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-06-02 15:17:50 UTC (rev 5700)
@@ -144,9 +144,9 @@
   protected void performDrop(Point p) {
     PieceIterator it = DragBuffer.getBuffer().getIterator();
     while (it.hasMoreElements()) {
-      RsrAdvance.getInstance().commandMove(map, it.nextPiece(), p);
+      RsrAdvance.getInstance().commandBaseMove(map, it.nextPiece(), p);
     }
-    RsrAdvance.getInstance().commandReportMoves();
+    RsrAdvance.getInstance().commandBaseReportMoves();
     DragBuffer.getBuffer().clear();
   }
 

Modified: VSQL-src/branches/morvael/rsr/RsrTrait.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-06-02 13:21:35 UTC (rev 5699)
+++ VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-06-02 15:17:50 UTC (rev 5700)
@@ -17,7 +17,6 @@
 import VASSAL.configure.StringConfigurer;
 import VASSAL.counters.Decorator;
 import VASSAL.counters.GamePiece;
-import VASSAL.counters.KeyCommand;
 import VASSAL.counters.PieceEditor;
 import VASSAL.i18n.TranslatablePiece;
 import VASSAL.tools.SequenceEncoder;
@@ -65,7 +64,7 @@
   private int repositioning = 0;
   // dynamic counter information (volatile)
   private GamePiece gp;
-  private KeyCommand[] commands;
+  private RsrKeyCommand[] commands;
 
   //common to all traits
   private static RsrAdvance core;
@@ -585,7 +584,7 @@
   }
 
   @Override
-  protected KeyCommand[] myGetKeyCommands() {
+  protected RsrKeyCommand[] myGetKeyCommands() {
     commands = getCore().getCommands(this, getGamePiece());
     return commands;
   }
@@ -688,7 +687,7 @@
     //T_DISPLAY_STRENGTH is set due to T_CURRENT_STEP and T_SUPPLY_LEVEL
     //T_DISPLAYED_ATTACK is set due to T_CURRENT_STEP and T_SUPPLY_LEVEL
     //T_DISPLAYED_DEFENCE is set due to T_CURRENT_STEP and T_SUPPLY_LEVEL
-    getCore().commandSetProperty(gp,
+    getCore().commandBaseSetProperty(gp,
       //external elements (Markers)
       PROPERTY_SUPPLY_MODE, 1,
       //RsrTrait elements
@@ -716,7 +715,7 @@
   }
 
   public static void commandClearCombatAttributes(GamePiece gp, boolean attacked) {
-    getCore().commandSetProperty(gp,
+    getCore().commandBaseSetProperty(gp,
       T_HL_LOSS, 0,
       T_ATTACKER, 0,
       T_DEFENDER, 0,
@@ -730,7 +729,7 @@
   public static void commandCopyAttributes(GamePiece from, GamePiece to) {
     double dif = getMovement(to) - getMovement(from);
     double mov = Math.max(0, getMovementLeft(from) + dif);
-    getCore().commandSetProperty(to,
+    getCore().commandBaseSetProperty(to,
       //RsrTrait elements
       T_HL_LOSS, getHlLoss(from),
       T_HL_ACTION, getHlAction(from),


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

Revision: 5704
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5704&view=rev
Author:   morvael
Date:     2009-06-03 15:23:05 +0000 (Wed, 03 Jun 2009)

Log Message:
-----------
Refactoring, overstack handling after retreat, piece protection.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/GameMisc.java
    VSQL-src/branches/morvael/rsr/PieceCache.java
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrConstants.java
    VSQL-src/branches/morvael/rsr/RsrGlobal.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java
    VSQL-src/branches/morvael/rsr/RsrTrait.java

Removed Paths:
-------------
    VSQL-src/branches/morvael/rsr/ClearHighlightCommand.java
    VSQL-src/branches/morvael/rsr/ClearHighlightInfo.java

Deleted: VSQL-src/branches/morvael/rsr/ClearHighlightCommand.java
===================================================================
--- VSQL-src/branches/morvael/rsr/ClearHighlightCommand.java	2009-06-02 22:33:00 UTC (rev 5703)
+++ VSQL-src/branches/morvael/rsr/ClearHighlightCommand.java	2009-06-03 15:23:05 UTC (rev 5704)
@@ -1,34 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package rsr;
-
-import VASSAL.build.module.Map;
-import VASSAL.command.Command;
-import filter.Filter;
-
-/**
- *
- * @author Dominik
- */
-public class ClearHighlightCommand extends Command {
-
-  protected ClearHighlightInfo info;
-
-  public ClearHighlightCommand(Map mainMap, Filter filter) {
-    info = new ClearHighlightInfo(mainMap, filter);
-  }
-
-  @Override
-  protected void executeCommand() {
-    info.adjustPieces();
-  }
-
-  @Override
-  protected Command myUndoCommand() {
-    return this;
-  }
-
-}

Deleted: VSQL-src/branches/morvael/rsr/ClearHighlightInfo.java
===================================================================
--- VSQL-src/branches/morvael/rsr/ClearHighlightInfo.java	2009-06-02 22:33:00 UTC (rev 5703)
+++ VSQL-src/branches/morvael/rsr/ClearHighlightInfo.java	2009-06-03 15:23:05 UTC (rev 5704)
@@ -1,51 +0,0 @@
-package rsr;
-
-import VASSAL.build.module.Map;
-import VASSAL.counters.BoundsTracker;
-import java.util.HashSet;
-import VASSAL.counters.GamePiece;
-import filter.Filter;
-
-/**
- *
- * @author derwido
- * @since 2009-05-11
- */
-public final class ClearHighlightInfo {
-
-  private Map mainMap;
-  private Filter filter;
-  private HashSet<GamePiece> redPieces;
-  private HashSet<GamePiece> greenPieces;
-
-  public ClearHighlightInfo(Map mainMap, Filter filter) {
-    this.mainMap = mainMap;
-    this.filter = filter;
-  }
-
-  private HashSet<GamePiece> adjustPieces(Map mainMap, BoundsTracker bounds, HashSet<GamePiece> pieces, String property) {
-    if (pieces == null) {
-      pieces = new HashSet<GamePiece>();
-      for (GamePiece gp : filter.filterPieces(mainMap, property + "==1")) {
-        pieces.add(gp);
-        gp.setProperty(property, "0");
-        bounds.addPiece(gp);
-      }
-    } else {
-      for (GamePiece gp : pieces) {
-        gp.setProperty(property, "1");
-        bounds.addPiece(gp);
-      }
-      pieces = null;
-    }
-    return pieces;
-  }
-
-  public void adjustPieces() {
-    BoundsTracker bounds = new BoundsTracker();
-    redPieces = adjustPieces(mainMap, bounds, redPieces, RsrConstants.T_HL_LOSS);
-    greenPieces = adjustPieces(mainMap, bounds, greenPieces, RsrConstants.T_HL_ACTION);
-    bounds.repaint();
-  }
-
-}

Modified: VSQL-src/branches/morvael/rsr/GameMisc.java
===================================================================
--- VSQL-src/branches/morvael/rsr/GameMisc.java	2009-06-02 22:33:00 UTC (rev 5703)
+++ VSQL-src/branches/morvael/rsr/GameMisc.java	2009-06-03 15:23:05 UTC (rev 5704)
@@ -47,12 +47,12 @@
   public void execute(String param) {
     if (param.equals("clear")) {
       if (RsrGlobal.getCombatStage() > 0) {
-        RsrAdvance.getInstance().commandClearCombat();
+        RsrAdvance.getInstance().commandClearCombat(false);
         RsrAdvance.getInstance().sendAndLog();
       }
     } else if (param.equals("advance")) {
       if (RsrGlobal.getCombatStage() > 0) {
-        RsrAdvance.getInstance().commandResolveCombat();
+        RsrAdvance.getInstance().commandResolveCombat(false);
         RsrAdvance.getInstance().sendAndLog();
       }
     } else if (param.equals("breakdown")) {

Modified: VSQL-src/branches/morvael/rsr/PieceCache.java
===================================================================
--- VSQL-src/branches/morvael/rsr/PieceCache.java	2009-06-02 22:33:00 UTC (rev 5703)
+++ VSQL-src/branches/morvael/rsr/PieceCache.java	2009-06-03 15:23:05 UTC (rev 5704)
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Set;
 import terrain.HexRef;
 import terrain.TerrainHexGrid;
 
@@ -237,4 +238,8 @@
     return get4("P");
   }
 
+  public Set<HexRef> getOccupiedHexes() {
+    return allPieces.keySet();
+  }
+
 }

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-02 22:33:00 UTC (rev 5703)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-03 15:23:05 UTC (rev 5704)
@@ -83,7 +83,7 @@
     //1..x - parts
     //x+1 - leave
 
-    //commandBaseClearHighlight();
+    supplyCache.clear();
     commandDisallowActionAll();
     commandDisallowMovementAll();
 
@@ -157,7 +157,8 @@
    * Ask Axis player to voluntarily remove supply depots and/or convert supply depots into emergency supply sources. (MANUAL)
    */
   private void executeSupply1() {
-    commandBaseLog("Game: Checking supply of airbases.");
+    commandSetPhaseOwner(SIDE_AXIS);
+    commandBaseLog("Checking supply of airbases.");
     HashMap<HexRef, TerrainMapShaderCost> inSupply = supplyCache.getSupply(NATIONALITY_GERMAN, false);
     HexRef hr;
     for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Airbase'")) {
@@ -200,7 +201,7 @@
    */
   private void executeSupply2() {
     //Check supply of all units (except airbases).
-    commandBaseLog("Game: Checking supply of all units (except airbases).");
+    commandBaseLog("Checking supply of all units (except airbases).");
     //clear and recalculate AirFleet support zone for this turn (it will not change during the turn)
     airFleetCache.clear();
     HashSet<HexRef> inAirRange = airFleetCache.getAirFleetSupportZone();
@@ -263,7 +264,7 @@
     }
     //Check attrition of all isolated units.
     if (isolatedUnits.size() > 0) {
-      commandBaseLog("Game: Checking attrition of isolated units.");
+      commandBaseLog("Checking attrition of isolated units.");
       int d6;
       String tt;
       int stepsLost = 0;
@@ -320,7 +321,7 @@
     //Remove supply depots converted into emergency supply sources.
     ArrayList<GamePiece> emergencyDepots = filter.filterPieces(mainMap, "Type=='Depot'&&SupplyMode==2");
     if (emergencyDepots.size() > 0) {
-      commandBaseLog("Game: Removing " + emergencyDepots.size() + " supply depot(s) converted into emergency supply source(s).");
+      commandBaseLog("Removing " + emergencyDepots.size() + " supply depot(s) converted into emergency supply source(s).");
       for (GamePiece gp : emergencyDepots) {
         commandSendToReinforcementZone(gp, 4, "Axis Permanently Eliminated Units Box");
       }
@@ -328,7 +329,7 @@
     //
     ArrayList<GamePiece> receivedCombatStrengthMarkers = filter.filterPieces(turnMap, "Type=='Strength'&&LocationName=='S" + getTurnName() + "'");
     if (receivedCombatStrengthMarkers.size() > 0) {
-      commandBaseLog("Game: Moving " + receivedCombatStrengthMarkers.size() + " Soviet Combat Strength Marker(s) received as reinforcement(s) into the proper draw cups.");
+      commandBaseLog("Moving " + receivedCombatStrengthMarkers.size() + " Soviet Combat Strength Marker(s) received as reinforcement(s) into the proper draw cups.");
       for (GamePiece gp : receivedCombatStrengthMarkers) {
         commandSendToOffboardZone(gp, RsrTrait.getStrengthClass(gp) + "-strength pool");
       }
@@ -474,6 +475,7 @@
    * Ask Soviet player to attack. (MANUAL)
    */
   private void executeSovietCombat1() {
+    commandSetPhaseOwner(SIDE_SOVIET);
     int count = 0;
     for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Soviet'&&Type=='Unit'")) {
       if (getAttackHexes(gp).size() > 0) {
@@ -656,6 +658,7 @@
    * Ask Axis player to move German tank units. (MANUAL)
    */
   private void executeGermanTankMovement1() {
+    commandSetPhaseOwner(SIDE_AXIS);
     int count = 0;
     double mp = 0;
     for (GamePiece gp : filter.filterPieces(mainMap, "UnitType=='AxisGermanTankCorps','AxisGermanTankBattlegroup','AxisGermanTankDivision'")) {
@@ -705,7 +708,7 @@
     //
     ArrayList<GamePiece> airfleets = filter.filterPieces(mainMap, "Type=='AirFleet'");
     if (airfleets.size() > 0) {
-      commandBaseLog("Game: Removing air fleets from the map.");
+      commandBaseLog("Removing air fleets from the map.");
       for (GamePiece gp : airfleets) {
         commandSendToOffboardZone(gp, "Airfleet pool");
       }
@@ -749,6 +752,7 @@
    * Ask Soviet player to promote infantry armies into Guards and Shock armies. (MANUAL)
    */
   private void executeAdministrative2() {
+    commandSetPhaseOwner(SIDE_SOVIET);
     //
     commandMarkAsUnreorganizedAll();
     //
@@ -799,7 +803,7 @@
     if (isProductionTurn()) {
       ArrayList<GamePiece> ports = filter.filterPieces(mainMap, "AssetType=='Strategic Port'");
       if (ports.size() > 0) {
-        commandBaseLog("Game: Checking railroad line of communication of strategic port assets.");
+        commandBaseLog("Checking railroad line of communication of strategic port assets.");
         HashSet<HexRef> withLOC = supplyCache.getSovietLine();
         for (GamePiece gp : ports) {
           if (withLOC.contains(getHexRef(gp.getPosition())) == false) {
@@ -932,15 +936,17 @@
    * @return true if the gp can be moved, false otherwise.
    */
   private boolean isPieceMoveable(Map map, GamePiece gp) {
+    if (canCommand(gp) == false) {
+      return false;
+    }
     int combatStage = RsrGlobal.getCombatStage();
     int combatMode = RsrGlobal.getCombatMode();
-    //TODO: block movement when there are overstacks to reduce?
     //normal move is allowed for blue units when there is no combat, or normal combat has not yet been resolved
     boolean anyMoveBlocked = (RsrGlobal.getUrbanLossRequired() > 0) || (RsrGlobal.getMotorizedLossRequired() > 0) || (RsrGlobal.getContestedLossRequired() > 0);
     boolean repositionMoveRequired = RsrGlobal.getRepositioningRequired() > 0;
     boolean normalMoveAllowed = (repositionMoveRequired == false) && (RsrTrait.getHlMovement(gp) > 0) && ((combatStage == 0) || ((combatStage == 1) && (combatMode == 0)));
     boolean repositionMoveAllowed = RsrTrait.getRepositioning(gp) > 0;
-    boolean retreatMoveAllowed = (repositionMoveRequired == false) && (combatStage == 4) && (RsrTrait.getRetreating(gp) > 0);
+    boolean retreatMoveAllowed = (repositionMoveRequired == false) && (combatStage == 4) && ((RsrTrait.getRetreating(gp) > 0) || (RsrTrait.getOverstackRetreating(gp) > 0));
     boolean advanceMoveAllowed = (repositionMoveRequired == false) && (combatStage == 6) && (RsrTrait.getAdvancing(gp) > 0);
     if ((anyMoveBlocked) || ((normalMoveAllowed == false) && (repositionMoveAllowed == false) && (retreatMoveAllowed == false) && (advanceMoveAllowed == false))) {
       return false;
@@ -1019,7 +1025,7 @@
           }
         }
       }
-      commandDisallowMovement(gp);
+      //commandDisallowMovement(gp);
       return false;
     }
   }
@@ -1074,7 +1080,11 @@
         } else
         if (combatStage == 4) {
           lossVal = Math.max(lossVal, allowedMovement.get(gp).getCost(hr).getValue());
-          commandBaseSetProperty(gp, T_RETREATING, -1);
+          if (RsrTrait.getRetreating(gp) > 0) {
+            commandBaseSetProperty(gp, T_RETREATING, -1);
+          } else {
+            commandBaseSetProperty(gp, T_OVERSTACK_RETREATING, -1);
+          }
         } else if (combatStage == 6) {
           commandBaseSetProperty(gp, T_ADVANCING, 0);
           if (combatMode == 0) {
@@ -1146,35 +1156,39 @@
     if (combatStage != 4) {
       commandAdjustControlAndPartisans(mainMap, pieces, p);
     }
-    //auto-advance combat if there are no more retreating/advancing units (and no actions to execute before combat may proceed)
-    if ((moveMode == MOVE_ONCE) && (lossVal == 0)) {
-      if (combatStage == 4) {
-        if (filter.filterPieces(mainMap, T_RETREATING + ">0").size() == 0) {
-          commandResolveCombat();
+    //auto-advance combat if there are no more losses to take and no more retreating units,
+    //except when there are secondary retreating units which didn't retreat yet and they are overstacked
+    if ((combatStage == 4) && (lossVal == 0) && (filter.filterPieces(mainMap, T_RETREATING + ">0").size() == 0)) {
+      boolean resolve = true;
+      HashSet<HexRef> ignore = new HashSet<HexRef>();
+      HexRef hex;
+      for (GamePiece gp : filter.filterPieces(mainMap, T_OVERSTACK_RETREATING + ">0")) {
+        hex = getHexRef(gp.getPosition());
+        //never check the same hex more than once
+        if (ignore.contains(hex) == false) {
+          ignore.add(hex);
+          if (isStackSizeOK(hex, RsrTrait.getSide(gp), 0.0d) == false) {
+            //stack is not ok yet, the combat will not advance automatically
+            resolve = false;
+          } else {
+            //since this stack is now ok, disable secondary retreat from it
+            for (GamePiece gp2 : pieceCache.getPiecesIn(hex)) {
+              commandBaseSetProperty(gp2, T_OVERSTACK_RETREATING, 0);
+            }
+          }
         }
-      } else if (combatStage == 6) {
-        if (filter.filterPieces(mainMap, T_ADVANCING + ">0").size() == 0) {
-          commandResolveCombat();
-        }
       }
+      if (resolve) {
+        commandResolveCombat(true);
+      }
     }
-    //deal with finished paradrop
+    //auto-advance combat if there are no more losses to take and no more advancing units
+    if ((combatStage == 6) && (lossVal == 0) && (filter.filterPieces(mainMap, T_ADVANCING + ">0").size() == 0)) {
+      commandResolveCombat(true);
+    }
+    //perform paradrop elimination test and auto-advance game
     if ((phaseName.equals(PHASE_SOVIET_MOVEMENT)) && (phasePart == 1)) {
-      int modifier = 0;
-      if ((isMud()) || (isWinter())) {
-        modifier -= 3;
-      }
-      if (pieceCache.getHexesInZOCEnemy(SIDE_SOVIET).contains(hr)) {
-        modifier += 1;
-      }
-      int die = ran.nextInt(6) + 1 + modifier;
-      if (die >= 3) {
-        for (GamePiece gp : pieces) {
-          commandEliminate(gp);
-        }
-        pieces.clear();
-      }
-      commandAdvance();
+      commandParadrop(hr, pieces);
     }
   }
 
@@ -1237,7 +1251,8 @@
           }
           return true;
         } else {
-          return isStackSizeOK(hr, pieces);
+          //during retreats overstacks are allowed
+          return (RsrGlobal.getCombatStage() == 4) || (isStackSizeOK(hr, pieces));
         }
       } else {
         return false;
@@ -1250,6 +1265,9 @@
     if (RsrGlobal.getDebug() == 1) {
       commands.add(new RsrKeyCommand("Delete", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), gp, trait));
     }
+    if (canCommand(gp) == false) {
+      return commands.toArray(commandsArray);
+    }
     String phaseName = getPhaseName();
     int phasePart = RsrGlobal.getPhasePart() - 1;
     if (phaseName.equals(PHASE_SUPPLY)) {
@@ -1289,6 +1307,9 @@
   }
 
   public Command getCommand(RsrTrait trait, GamePiece gp, RsrKeyCommand kc) {
+    if (canCommand(gp) == false) {
+      return c;
+    }
     String name = kc.getName();
     if (name.equals("Delete")) {
       commandBaseDelete(gp);
@@ -1298,7 +1319,7 @@
         commandCombatStepLoss(gp);
         commandStepLoss(gp);
         if (commandRefreshCombatLossList(false)) {
-          commandResolveCombat();
+          commandResolveCombat(true);
         }
       } else if (combatStage == 4) {
         if (RsrGlobal.getMotorizedLossRequired() > 0) {
@@ -1311,14 +1332,14 @@
           commandBaseSetProperty(dataPiece, CONTESTED_LOSS_REQUIRED, RsrGlobal.getContestedLossRequired() - 1);
         }
         if ((RsrGlobal.getMotorizedLossRequired() == 0) && (RsrGlobal.getContestedLossRequired() == 0)) {
-          commandResolveCombat();
+          commandResolveCombat(true);
         }
       } else {
 
       }
     } else if (name.equals("Eliminate")) { //airbase elimination
       commandSendToOffboardZone(gp, "Axis Permanently Eliminated Units Box");
-      commandAdvance();
+      commandAdvance(true);
     } else if (name.equals("Promote")) {
       commandPromote(gp);
     } else if (name.equals("Evacuate")) {

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-02 22:33:00 UTC (rev 5703)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-03 15:23:05 UTC (rev 5704)
@@ -4,6 +4,7 @@
 import VASSAL.build.module.Chatter;
 import VASSAL.build.module.GlobalOptions;
 import VASSAL.build.module.Map;
+import VASSAL.build.module.PlayerRoster;
 import VASSAL.build.module.map.MovementReporter;
 import VASSAL.build.module.map.boardPicker.Board;
 import VASSAL.build.module.map.boardPicker.board.MapGrid;
@@ -158,7 +159,7 @@
   }
 
   public final void execute(String param) {
-    commandAdvance();
+    commandAdvance(false);
     sendAndLog();
   }
 
@@ -169,7 +170,7 @@
       if (c == null) {
         c = cmd;
       } else {
-        c.append(cmd);
+        c = c.append(cmd);
       }
     }
   }
@@ -312,7 +313,7 @@
         int desiredControl = side.equals(SIDE_SOVIET) ? 1 : 2;
         if (RsrCounter.getIntProperty(gpc, "Control", 1, false) != desiredControl) {
           commandBaseSetProperty(gpc, "Control", String.valueOf(desiredControl));
-          commandBaseLog("Game: Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now under " + side + " control.");
+          commandBaseLog("Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now under " + side + " control.");
           //TODO: apply Moscow/Baku surrender rule on first axis enter
         }
         if (desiredControl == 2) {
@@ -320,7 +321,7 @@
           if (gpd != null) {
             if (RsrCounter.getIntProperty(gpc, "Destruction", 1, false) != desiredControl) {
               commandBaseSetProperty(gpc, "Destruction", String.valueOf(desiredControl));
-              commandBaseLog("Game: Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now destroyed.");
+              commandBaseLog("Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now destroyed.");
             }
           }
         }
@@ -353,19 +354,11 @@
       }
       if (count > 0) {
         commandBaseSetProperty(dataPiece, G_REPOSITIONING_REQUIRED, count);
-        commandBaseLog("Game: There are " + count + " partisan unit(s) to reposition.");
+        commandBaseLog("There are " + count + " partisan unit(s) to reposition.");
       }
     }
   }
 
-  public void commandBaseClearHighlight() {
-    supplyCache.clear();
-    pieceCache.clear();
-    ClearHighlightCommand cmd = new ClearHighlightCommand(mainMap, filter);
-    cmd.execute();
-    appendCommand(cmd);
-  }
-
   public void commandBaseReportMoves() {
     MovementReporter r = new MovementReporter(c);
     Command cmd = r.getReportCommand();
@@ -440,7 +433,7 @@
     if (sgp != null) {
       commandSendToOffboardZone(sgp, RsrTrait.getCombatClass(gp) + "-used strength pool");
       commandUpdateStrength(gp, sgp);
-      commandBaseLog("Game: " + gp.getName() + " fetched a Combat Strength Marker.");
+      commandBaseLog(gp.getName() + " fetched a Combat Strength Marker.");
     }
   }
 
@@ -453,7 +446,7 @@
       } else {
         commandSendToOffboardZone(sgp, "At-Start Strength Marker Box");
       }
-      commandBaseLog("Game: " + gp.getName() + " released a Combat Strength Marker.");
+      commandBaseLog(gp.getName() + " released a Combat Strength Marker.");
     }
   }
 
@@ -474,7 +467,7 @@
     //
     commandBaseMove(offboardMap, gp, dest);
     RsrTrait.commandClearAttributes(gp);
-    commandBaseLog("Game: " + gp.getName() + " was sent to " + offboardZone + ".");
+    commandBaseLog(gp.getName() + " was sent to " + offboardZone + ".");
   }
 
   public void commandSendToReinforcementZone(GamePiece gp, int turnNumberMod, String offboardZone) {
@@ -506,7 +499,7 @@
     //
     commandBaseMove(turnMap, gp, dest);
     RsrTrait.commandClearAttributes(gp);
-    commandBaseLog("Game: " + gp.getName() + " will return as reinforcement on turn " + regionName.substring(1) + ".");
+    commandBaseLog(gp.getName() + " will return as reinforcement on turn " + regionName.substring(1) + ".");
   }
 
   public void commandSendToPiece(GamePiece gp, GamePiece rgp, boolean copyProperties) {
@@ -514,9 +507,27 @@
     if (copyProperties) {
       RsrTrait.commandCopyAttributes(gp, rgp);
     }
-    commandBaseLog("Game: " + rgp.getName() + " was sent to " + gp.getName() + "'s location.");
+    commandBaseLog(rgp.getName() + " was sent to " + gp.getName() + "'s location.");
   }
 
+  public void commandParadrop(HexRef hr, ArrayList<GamePiece> pieces) {
+    int modifier = 0;
+    if ((isMud()) || (isWinter())) {
+      modifier -= 3;
+    }
+    if (pieceCache.getHexesInZOCEnemy(SIDE_SOVIET).contains(hr)) {
+      modifier += 1;
+    }
+    int die = ran.nextInt(6) + 1 + modifier;
+    if (die >= 3) {
+      for (GamePiece gp : pieces) {
+        commandEliminate(gp);
+      }
+      pieces.clear();
+    }
+    commandAdvance(true);
+  }
+
   public void commandPromote(GamePiece gp) {
     ArrayList<GamePiece> converts = findInOffboardZone("Awaiting Promotion Box", "Unit", null, 1);
     if (converts.size() > 0) {
@@ -615,7 +626,7 @@
       if (currentStep == 2) {
         commandBaseSetProperty(gp, T_CURRENT_STEP, 1);
         commandUpdateStrength(gp, findStrength(RsrTrait.getCombatClass(gp), RsrTrait.getStrengthID(gp)));
-        commandBaseLog("Game: " + gp.getName() + " lost a step.");
+        commandBaseLog(gp.getName() + " lost a step.");
       } else if ((currentStep == 1) && (isAxisGermanCorps)) {
         if (unitType.equals("AxisGermanTankCorps")) {
           for (GamePiece fgp : findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanTankBattlegroup", 1)) {
@@ -641,20 +652,14 @@
     int newValue = RsrGlobal.getEvacuated()+1;
     commandBaseSetProperty(dataPiece, G_EVACUATED, newValue);
     if (newValue >= 3) {
-      commandAdvance();
+      commandAdvance(true);
     }
   }
 
-  public void commandAdvance() {
-    //TODO: block advance if there are things to do, also block advance for player that is not the owner of current phase part
-    if (RsrGlobal.getRepositioningRequired() > 0) {
-      commandBaseLog("Game: Reposition partisan unit(s) before advancing.");
+  public void commandAdvance(boolean auto) {
+    if (canAdvance(auto) == false) {
       return;
     }
-    if (RsrGlobal.getCombatStage() > 0) {
-      commandBaseLog("Game: Resolve or cancel combat before advancing.");
-      return;
-    }
     autoAdvance = true;
     while (autoAdvance) {
       autoAdvance = false;
@@ -669,14 +674,14 @@
             if (p2.y < 3599) {
               p2.translate(0, 91);
               commandBaseMove(turnMap, turnPiece, p2);
-              commandBaseLog("Game: Turn changes to " + turnGrid.locationName(p2) + ".");
+              commandBaseLog("Turn changes to " + turnGrid.locationName(p2) + ".");
             }
             p.y = 45;
           } else {
             p.translate(0, 82);
           }
           commandBaseMove(turnMap, phasePiece, p);
-          commandBaseLog("Game: Phase changes to " + turnGrid.locationName(p) + ".");
+          commandBaseLog("Phase changes to " + turnGrid.locationName(p) + ".");
           executeEnterPhase();
         } else {
           executePart(phasePart);
@@ -825,7 +830,72 @@
     return null;
   }
 
-  public void commandClearCombat() {
+  public boolean canAdvance(boolean auto) {
+    if ((auto == false) && (checkSide(RsrGlobal.getPhaseOwner()) == false)) {
+      return false;
+    }
+    if (RsrGlobal.getRepositioningRequired() > 0) {
+      commandBaseLog("Reposition partisan unit(s) first.");
+      return false;
+    }
+    if (RsrGlobal.getCombatStage() > 0) {
+      commandBaseLog("Resolve or cancel combat first.");
+      return false;
+    }
+    //TODO: finish this
+    return true;
+  }
+
+  public boolean canResolve(boolean auto) {
+    if ((auto == false) && (checkSide(RsrGlobal.getPhaseOwner()) == false)) {
+      return false;
+    }
+    if (RsrGlobal.getRepositioningRequired() > 0) {
+      commandBaseLog("Reposition partisan unit(s) first.");
+      return false;
+    }
+    //TODO: finish this
+    return true;
+  }
+
+  public boolean canCommand(GamePiece gp) {
+    if (checkSide(RsrTrait.getSide(gp)) == false) {
+      return false;
+    }
+    if ((RsrTrait.getRepositioning(gp) == 0) && (RsrGlobal.getRepositioningRequired() > 0)) {
+      commandBaseLog("Reposition partisan unit(s) first.");
+      return false;
+    }
+    //TODO: finish this
+    return true;
+  }
+
+  private boolean checkSide(String side) {
+    String mySide = PlayerRoster.getMySide();
+    if (mySide == null) {
+      return false;
+    } else {
+      return mySide.equals("Solo") || mySide.equals(side) || (side.equals(""));
+    }
+  }
+
+  public void commandSetPhaseOwner(String side) {
+    commandBaseSetProperty(dataPiece, G_PHASE_OWNER, side);
+  }
+
+  public void commandTogglePhaseOwner() {
+    String side = RsrGlobal.getPhaseOwner();
+    if (side.equals(SIDE_AXIS)) {
+      commandSetPhaseOwner(SIDE_SOVIET);
+    } else if (side.equals(SIDE_SOVIET)) {
+      commandSetPhaseOwner(SIDE_AXIS);
+    }
+  }
+
+  public void commandClearCombat(boolean auto) {
+    if (canResolve(auto) == false) {
+      return;
+    }
     int combatStage = RsrGlobal.getCombatStage();
     if ((combatStage == 1) || (combatStage == 6)) {
       boolean overrun = RsrGlobal.getCombatMode() == 1;
@@ -849,7 +919,9 @@
                                     DEFENDER_LOST, 0,
                                     URBAN_LOSS_REQUIRED, 0,
                                     MOTORIZED_LOSS_REQUIRED, 0,
-                                    CONTESTED_LOSS_REQUIRED, 0);
+                                    CONTESTED_LOSS_REQUIRED, 0,
+                                    G_ATTACKER_SIDE, "",
+                                    G_DEFENDER_SIDE, "");
     }
   }
 
@@ -937,10 +1009,15 @@
     commandBaseSetProperty(dataPiece, COMBAT_STAGE, 1,
                                   COMBAT_MODE, overrun ? 1 : 0,
                                   ATTACKER_HEXES, attackerHexes.toString(),
-                                  DEFENDER_HEXES, defenderHexes.toString());
+                                  DEFENDER_HEXES, defenderHexes.toString(),
+                                  G_ATTACKER_SIDE, attackerSide,
+                                  G_DEFENDER_SIDE, defenderSide);
   }
 
-  public void commandResolveCombat() {
+  public void commandResolveCombat(boolean auto) {
+    if (canResolve(auto) == false) {
+      return;
+    }
     int combatStage = RsrGlobal.getCombatStage();
     int combatMode = RsrGlobal.getCombatMode();
     ArrayList<GamePiece> attackers = filter.filterPieces(mainMap, T_ATTACKER + ">0");
@@ -972,7 +1049,7 @@
           }
           urbanLoss = 2*motorizedSteps > totalSteps;
           if (urbanLoss) {
-            commandBaseLog("Game: Additional losses will apply to motorized forces attacking urban area (" + motorizedSteps + " step(s) out of " + totalSteps + " step(s) are motorized).");
+            commandBaseLog("Additional losses will apply to motorized forces attacking urban area (" + motorizedSteps + " step(s) out of " + totalSteps + " step(s) are motorized).");
             commandBaseSetProperty(dataPiece, URBAN_LOSS_REQUIRED, 1);
           }
         }
@@ -1049,22 +1126,24 @@
       ignoreOptional = false;
     }
     if (combatStage == 2) {
+      commandSetPhaseOwner(RsrGlobal.getDefenderSide());
       //defender step loss
       if (commandRefreshCombatLossList(ignoreOptional)) {
         commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
         ignoreOptional = false;
       } else {
-        commandBaseLog("Game: Defender is required to lose " + RsrGlobal.getDefenderLoss() + " step(s) and optionally " + RsrGlobal.getDefenderRetreat() + " more.");
+        commandBaseLog("Defender is required to lose " + RsrGlobal.getDefenderLoss() + " step(s) and optionally " + RsrGlobal.getDefenderRetreat() + " more.");
         return;
       }
     }
     if (combatStage == 3) {
+      commandSetPhaseOwner(RsrGlobal.getAttackerSide());
       //attacker step loss
       if (commandRefreshCombatLossList(ignoreOptional)) {
         commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
         ignoreOptional = false;
       } else {
-        commandBaseLog("Game: Attacker is required to lose " + RsrGlobal.getAttackerLoss() + " step(s) and optionally " + RsrGlobal.getAttackerRetreat() + " more.");
+        commandBaseLog("Attacker is required to lose " + RsrGlobal.getAttackerLoss() + " step(s) and optionally " + RsrGlobal.getAttackerRetreat() + " more.");
         return;
       }
     }
@@ -1074,13 +1153,14 @@
       int ar = RsrGlobal.getAttackerRetreat();
       //setup parameters if it has not yet been done
       if (dr > 0) {
+        commandSetPhaseOwner(RsrGlobal.getDefenderSide());
         //refresh in case any units were removed
         defenders = filter.filterPieces(mainMap, T_DEFENDER + ">0");
         //
         for (GamePiece gp : defenders) {
           commandBaseSetProperty(gp, T_RETREATING, dr);
           if (TerrainMapShaderRule.hasNonTraceHexes(getRetreatHexes(gp))) {
-            commandBaseLog("Game: " + gp.getName() + " must retreat " + dr + " space(s).");
+            commandBaseLog(gp.getName() + " must retreat " + dr + " space(s).");
           } else {
             commandEliminate(gp);
           }
@@ -1088,13 +1168,14 @@
         commandBaseSetProperty(dataPiece, DEFENDER_RETREAT, 0);
       }
       if (ar > 0) {
+        commandSetPhaseOwner(RsrGlobal.getAttackerSide());
         //refresh in case any units were removed
         attackers = filter.filterPieces(mainMap, T_ATTACKER + ">0");
         //
         for (GamePiece gp : attackers) {
           commandBaseSetProperty(gp, T_RETREATING, ar);
           if (TerrainMapShaderRule.hasNonTraceHexes(getRetreatHexes(gp))) {
-            commandBaseLog("Game: " + gp.getName() + " must retreat " + ar + " space(s).");
+            commandBaseLog(gp.getName() + " must retreat " + ar + " space(s).");
           } else {
             commandEliminate(gp);
           }
@@ -1102,24 +1183,59 @@
         commandBaseSetProperty(dataPiece, ATTACKER_RETREAT, 0);
       }
       if ((RsrGlobal.getMotorizedLossRequired() > 0) || (RsrGlobal.getContestedLossRequired() > 0)) {
-        commandBaseLog("Game: There are units that have to take mandatory step loss(es).");
+        commandBaseLog("There are units that have to take mandatory step loss(es).");
         return;
-      } else
-      if (filter.filterPieces(mainMap, T_RETREATING + ">0").size() == 0) {
-        //clear just reatreated units
+      } else if (filter.filterPieces(mainMap, T_RETREATING + ">0").size() > 0) {
+        commandBaseLog("There are units that have to retreat.");
+        return;
+      } else {
+        //there are currently no losses required and no T_RETREATING units
+        //an attempt to advance combat will be made
+        HashSet<HexRef> overstackHexes = new HashSet<HexRef>();
+        HexRef hex;
+        //if the player has completed normal retreats, check for overstacks
+        //where the retreated units are, if yes then mark all units in that
+        //stack for secondary retreat and exit
         for (GamePiece gp : filter.filterPieces(mainMap, T_RETREATING + "<0")) {
+          hex = getHexRef(gp.getPosition());
+          if (isStackSizeOK(hex, RsrTrait.getSide(gp), 0.0d) == false) {
+            overstackHexes.add(hex);
+          }
           commandBaseSetProperty(gp, T_RETREATING, 0);
         }
-        commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
-      } else {
-        commandBaseLog("Game: There are units that have to retreat.");
-        return;
+        if (overstackHexes.size() > 0) {
+          for (HexRef hr : overstackHexes) {
+            for (GamePiece gp : pieceCache.getPiecesIn(hr)) {
+              commandBaseSetProperty(gp, T_OVERSTACK_RETREATING, 1);
+              commandBaseLog(gp.getName() + " may retreat 1 space due to overstack.");
+            }
+          }
+          return;
+        } else {
+          //since there is either no retreating units or no overstacks, check
+          //for overstacks where the secondary retreating units are (either
+          //moved or not moved), if yes then "fix" those stacks
+          for (GamePiece gp : filter.filterPieces(mainMap, T_OVERSTACK_RETREATING + "!=0")) {
+            hex = getHexRef(gp.getPosition());
+            if (isStackSizeOK(hex, RsrTrait.getSide(gp), 0.0d) == false) {
+              overstackHexes.add(hex);
+            }
+            commandBaseSetProperty(gp, T_OVERSTACK_RETREATING, 0);
+          }
+          if (overstackHexes.size() > 0) {
+            for (HexRef hr : overstackHexes) {
+              commandFixOverstack(hr);
+            }
+          }
+          //finally, advance the combat
+          commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
+        }
       }
     }
     if (combatStage == 5) {
       //apply urban test for motorized units
       if (RsrGlobal.getUrbanLossRequired() == 1) {
-        commandBaseLog("Game: Applying additional losses to motorized forces that attacked urban area.");
+        commandBaseLog("Applying additional losses to motorized forces that attacked urban area.");
         //refresh in case any units were removed
         attackers = filter.filterPieces(mainMap, T_ATTACKER + ">0");
         int chance;
@@ -1161,13 +1277,14 @@
         }
         //setup advancing defenders
         if (attackerVacated) {
+          commandSetPhaseOwner(RsrGlobal.getDefenderSide());
           //
           for (GamePiece gp : defenders) {
             advanceRange = getMaximumAdvance(gp);
             if (advanceRange > 0) {
               commandBaseSetProperty(gp, T_ADVANCING, advanceRange);
               if (TerrainMapShaderRule.hasNonTraceHexes(getAdvanceHexes(gp))) {
-                commandBaseLog("Game: " + gp.getName() + " may advance up to " + advanceRange + " space(s).");
+                commandBaseLog(gp.getName() + " may advance up to " + advanceRange + " space(s).");
                 victorious++;
               } else {
                 commandBaseSetProperty(gp, T_ADVANCING, 0);
@@ -1201,6 +1318,7 @@
         }
         //setup advancing attackers, or end movement for units that failed to overrun
         if (defenderVacated) {
+          commandSetPhaseOwner(RsrGlobal.getAttackerSide());
           //
           for (GamePiece gp : attackers) {
             //in normal combat let them advance
@@ -1209,7 +1327,7 @@
               if (advanceRange > 0) {
                 commandBaseSetProperty(gp, T_ADVANCING, advanceRange);
                 if (TerrainMapShaderRule.hasNonTraceHexes(getAdvanceHexes(gp))) {
-                  commandBaseLog("Game: " + gp.getName() + " may advance up to " + advanceRange + " space(s).");
+                  commandBaseLog(gp.getName() + " may advance up to " + advanceRange + " space(s).");
                   victorious++;
                 } else {
                   commandBaseSetProperty(gp, T_ADVANCING, 0);
@@ -1245,18 +1363,85 @@
       commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
       //if there are no advances possible, end combat immediately, otherwise let the player decide
       if (victorious == 0) {
-        commandClearCombat();
+        commandClearCombat(true);
         return;
       } else {
-        commandBaseLog("Game: Advance victorious units or end combat.");
+        commandBaseLog("Advance victorious units or end combat.");
         return;
       }
     }
     if (combatStage == 6) {
-      commandClearCombat();
+      commandSetPhaseOwner(RsrGlobal.getAttackerSide());
+      commandClearCombat(true);
     }
   }
 
+  public void commandFixOverstack(HexRef hr) {
+    commandBaseLog("Stack size violation in " + getLocationName(hr) + " will be cured.");
+    ArrayList<GamePiece> pieces = pieceCache.getPiecesIn(hr);
+    ArrayList<GamePiece> possiblePieces = new ArrayList<GamePiece>();
+    double stackSize = 0.0d;
+    double stackPoints;
+    String side = null;
+    for (GamePiece gp : pieces) {
+      stackPoints = RsrTrait.getStackPoints(gp);
+      if (stackPoints > 0.0d) {
+        stackSize += stackPoints;
+        side = RsrTrait.getSide(gp);
+        possiblePieces.add(gp);
+      }
+    }
+    double diff = 0.0d;
+    if (side != null) {
+      if (side.equals(SIDE_AXIS)) {
+        diff = stackSize - 14.0d;
+      } else {
+        diff = stackSize - 2.5d;
+      }
+    }
+    GamePiece gp;
+    while ((diff > 0.0d) && (possiblePieces.size() > 0)) {
+      gp = selectBestEliminationCandidate(possiblePieces);
+      possiblePieces.remove(gp);
+      diff -= RsrTrait.getStackPoints(gp);
+      commandEliminate(gp);
+    }
+  }
+
+  public GamePiece selectBestEliminationCandidate(ArrayList<GamePiece> pieces) {
+    double max = Double.MIN_VALUE;
+    double val, mv;
+    int as, ds;
+    GamePiece result = null;
+    for (GamePiece gp : pieces) {
+      as = getAttackStrength(gp, true);
+      ds = getDefendStrength(gp, true);
+      if ((as < 0) || (ds < 0)) {
+        switch (RsrTrait.getCombatClass(gp).charAt(0)) {
+          case 'A' : as = 8; ds = 8; break;
+          case 'B' : as = 6; ds = 6; break;
+          default  : as = 4; ds = 4; break;
+        }
+        if (RsrTrait.isSupplyLevel(gp, SUPPLY_LACK, SUPPLY_OUT)) {
+          as *= 0.5d;
+        }
+        if (RsrTrait.isSupplyLevel(gp, SUPPLY_OUT)) {
+          ds *= 0.5d;
+        }
+      }
+      mv = RsrTrait.getMovement(gp);
+      if (RsrTrait.isSupplyLevel(gp, SUPPLY_LACK, SUPPLY_OUT)) {
+        mv *= 0.5d;
+      }
+      val = RsrTrait.getStackPoints(gp) * RsrTrait.getCurrentStep(gp) * (as + 2 * ds + mv);
+      if (val > max) {
+        max = val;
+        result = gp;
+      }
+    }
+    return result;
+  }
+
   public void commandCombatStepLoss(GamePiece gp) {
     String property1, property2;
     int newValue1, newValue2;
@@ -1340,16 +1525,19 @@
         break;
       }
     }
-    for (GamePiece gp : pieces) {
-      if (candidates.contains(gp)) {
-        commandAllowCombatAction(gp);
-      } else {
+    if ((ignoreOptional) && (lossMandatory == 0)) {
+      for (GamePiece gp : pieces) {
         commandDisallowCombatAction(gp);
       }
-    }
-    if ((ignoreOptional) && (lossMandatory == 0)) {
       return true;
     } else {
+      for (GamePiece gp : pieces) {
+        if (candidates.contains(gp)) {
+          commandAllowCombatAction(gp);
+        } else {
+          commandDisallowCombatAction(gp);
+        }
+      }
       return false;
     }
   }
@@ -1795,6 +1983,12 @@
         return String.valueOf(RsrTrait.getRepositioning(gp));
       }
     });
+
+    propertyReaderSource.addReader(T_OVERSTACK_RETREATING, new PropertyReader() {
+      public String getProperty(GamePiece gp) {
+        return String.valueOf(RsrTrait.getOverstackRetreating(gp));
+      }
+    });
   }
 
   public boolean isWinter() {
@@ -2032,7 +2226,7 @@
   public String getCombatResult(ArrayList<GamePiece> attackers, ArrayList<GamePiece> defenders, CombatHexList attackerHexes, CombatHexList defenderHexes) {
 
     int totalStrengthA = 0;
-    String attackerSide = RsrTrait.getSide(attackers.get(0));
+    String attackerSide = RsrGlobal.getAttackerSide();
 
     for (GamePiece gp : attackers) {
       totalStrengthA += getAttackStrength(gp, false);
@@ -2113,7 +2307,7 @@
       totalStrengthD *= 2;
     }
     StringBuilder sb = new StringBuilder();
-    sb.append("Game: Total attack strength is " + totalStrengthA + ", total defense strength is " + totalStrengthD + ". Simple ratio is ");
+    sb.append("Total attack strength is " + totalStrengthA + ", total defense strength is " + totalStrengthD + ". Simple ratio is ");
     //calculate ratio
     double ratio = (double)totalStrengthA / (double)totalStrengthD;
     int column;
@@ -2338,7 +2532,7 @@
 
   public boolean canContestOwnSpace(ArrayList<GamePiece> list) {
     for (GamePiece gp : list) {
-      if ((Filter.isAny(RsrTrait.getType(gp), "AirFleet", "Partisans") == false) && (RsrTrait.getRetreating(gp) == 0)) {
+      if ((Filter.isAny(RsrTrait.getType(gp), "AirFleet", "Partisans") == false) && (RsrTrait.getRetreating(gp) == 0) && (RsrTrait.getOverstackRetreating(gp) == 0)) {
         return true;
       }
     }
@@ -2349,7 +2543,7 @@
     String unitType;
     int battlegroups = 0;
     for (GamePiece gp : list) {
-      if ((RsrTrait.getType(gp).equals("Unit")) && (RsrTrait.getRetreating(gp) == 0)) {
+      if ((RsrTrait.getType(gp).equals("Unit")) && (RsrTrait.getRetreating(gp) == 0) && (RsrTrait.getOverstackRetreating(gp) == 0)) {
         unitType = RsrTrait.getUnitType(gp);
         if (unitType.equals("SovietGuardsCavalryCorps")) {
         //soviet guards cavalry corps can't contest neighbour space
@@ -2524,12 +2718,12 @@
 
   public void commandBreakdown(ArrayList<GamePiece> pieces) {
     if (pieces.size() != 1) {
-      commandBaseLog("Game: Select a single unit for breakdown.");
+      commandBaseLog("Select a single unit for breakdown.");
       return;
     }
     GamePiece gp = pieces.get(0);
     if (RsrTrait.getReorganized(gp) > 0) {
-      commandBaseLog("Game: No breakdown allowed.");
+      commandBaseLog("No breakdown allowed.");
       return;
     }
     String unitType = RsrTrait.getUnitType(gp);
@@ -2566,20 +2760,20 @@
       }
     }
     if (bb == null) {
-      commandBaseLog("Game: No breakdown allowed.");
+      commandBaseLog("No breakdown allowed.");
       return;
     }
     if (bb.size() < req) {
-      commandBaseLog("Game: No breakdown if not enough replacement units.");
+      commandBaseLog("No breakdown if not enough replacement units.");
       return;
     }
     if (RsrTrait.getSupplyLevel(gp) != SUPPLY_NORMAL) {
-      commandBaseLog("Game: No breakdown if not in supply.");
+      commandBaseLog("No breakdown if not in supply.");
       return;
     }
     HashSet<HexRef> inZOC = isMud() ? new HashSet<HexRef>() : pieceCache.getHexesInZOCEnemy(RsrTrait.getSide(gp));
     if (inZOC.contains(getHexRef(gp.getPosition()))) {
-      commandBaseLog("Game: No breakdown if in contested space (unless it is a mud turn).");
+      commandBaseLog("No breakdown if in contested space (unless it is a mud turn).");
       return;
     }
     if (Filter.isAny(unitType, "AxisGermanTankCorps", "AxisGermanInfantryCorps")) {
@@ -2618,7 +2812,7 @@
 
   public void commandBuildup(ArrayList<GamePiece> pieces) {
     if (pieces.size() != 2) {
-      commandBaseLog("Game: Select two units for buildup.");
+      commandBaseLog("Select two units for buildup.");
       return;
     }
     GamePiece gp1 = pieces.get(0);
@@ -2629,7 +2823,7 @@
       gp2 = gpr;
     }
     if ((RsrTrait.getReorganized(gp1) > 0) && (RsrTrait.getReorganized(gp2) > 0)) { //&& to allow buildup if one unit was part of earlier breakdown
-      commandBaseLog("Game: No buildup allowed.");
+      commandBaseLog("No buildup allowed.");
       return;
     }
     String unitType1 = RsrTrait.getUnitType(gp1);
@@ -2663,22 +2857,22 @@
       ignoreZOC = true;
     }
     if (allowed == false) {
-      commandBaseLog("Game: No buildup allowed.");
+      commandBaseLog("No buildup allowed.");
       return;
     }
     HexRef hr1 = getHexRef(gp1.getPosition());
     HexRef hr2 = getHexRef(gp2.getPosition());
     if (hr1.equals(hr2) == false) {
-      commandBaseLog("Game: No buildup if not in the same space.");
+      commandBaseLog("No buildup if not in the same space.");
       return;
     }
     if ((RsrTrait.getSupplyLevel(gp1) != SUPPLY_NORMAL) || (RsrTrait.getSupplyLevel(gp2) != SUPPLY_NORMAL)) {
-      commandBaseLog("Game: No buildup if not in supply.");
+      commandBaseLog("No buildup if not in supply.");
       return;
     }
     HashSet<HexRef> inZOC = isMud() ? new HashSet<HexRef>() : pieceCache.getHexesInZOCEnemy(RsrTrait.getSide(gp1));
     if ((ignoreZOC == false) && (inZOC.contains(hr1))) {
-      commandBaseLog("Game: No buildup if in contested space (unless it is a mud turn).");
+      commandBaseLog("No buildup if in contested space (unless it is a mud turn).");
       return;
     }
     if (Filter.isAny(unitType1, "AxisGermanTankCorps", "AxisGermanInfantryCorps", "AxisGermanMountainCorps")) {
@@ -2709,7 +2903,7 @@
 
   public void commandIncorporate(ArrayList<GamePiece> pieces) {
     if (pieces.size() != 2) {
-      commandBaseLog("Game: Select two units for incorporation.");
+      commandBaseLog("Select two units for incorporation.");
       return;
     }
     GamePiece gp1 = pieces.get(0);
@@ -2720,7 +2914,7 @@
       gp2 = gpr;
     }
     if ((RsrTrait.getReorganized(gp1) > 0) || (RsrTrait.getReorganized(gp2) > 0)) {
-      commandBaseLog("Game: No incorporation allowed.");
+      commandBaseLog("No incorporation allowed.");
       return;
     }
     String unitType1 = RsrTrait.getUnitType(gp1);
@@ -2733,17 +2927,17 @@
       allowed = (currentStep1 == 1) && (Filter.isAny(unitType2, "SovietMechanizedCorps", "SovietInfantryCorps", "SovietMarineCorps"));
     }
     if (allowed == false) {
-      commandBaseLog("Game: No incorporation allowed.");
+      commandBaseLog("No incorporation allowed.");
       return;
     }
     HexRef hr1 = getHexRef(gp1.getPosition());
     HexRef hr2 = getHexRef(gp2.getPosition());
     if (mainGrid.getHexesInRange(hr1, 1).contains(hr2) == false) {
-      commandBaseLog("Game: No incorporation if not in adjacent spaces.");
+      commandBaseLog("No incorporation if not in adjacent spaces.");
       return;
     }
     if ((RsrTrait.getSupplyLevel(gp1) != SUPPLY_NORMAL) || (RsrTrait.getSupplyLevel(gp2) != SUPPLY_NORMAL)) {
-      commandBaseLog("Game: No incorporation if not in supply.");
+      commandBaseLog("No incorporation if not in supply.");
       return;
     }
     commandBaseSetProperty(gp1, T_CURRENT_STEP, 2);

Modified: VSQL-src/branches/morvael/rsr/RsrConstants.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrConstants.java	2009-06-02 22:33:00 UTC (rev 5703)
+++ VSQL-src/branches/morvael/rsr/RsrConstants.java	2009-06-03 15:23:05 UTC (rev 5704)
@@ -144,6 +144,7 @@
   public static final String T_REORGANIZED = "Reorganized"; //to mark units that took part in breakdown or buildup or incorporation this turn
   public static final String T_FIRED = "CombatFired"; //siege artillery already took part in combat support in this combat phase (not used in overruns)
   public static final String T_REPOSITIONING = "Repositioning"; //partisan unit that has to be repositioned
+  public static final String T_OVERSTACK_RETREATING = "CombatOverstackRetreating"; //number (1) of spaces unit must retreat if primary retreat caused overstack
 
 	public static final int SUPPLY_NORMAL = 0;
 	public static final int SUPPLY_EMERGENCY = 1;
@@ -180,5 +181,8 @@
   public static final String CONTESTED_LOSS_REQUIRED = "contested_loss_required";
   public static final String G_EVACUATED = "evacuated";
   public static final String G_REPOSITIONING_REQUIRED = "repositioning_required";
+  public static final String G_PHASE_OWNER = "phase_owner";
+  public static final String G_ATTACKER_SIDE = "attacker_side";
+  public static final String G_DEFENDER_SIDE = "defender_side";
 
 }

Modified: VSQL-src/branches/morvael/rsr/RsrGlobal.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-06-02 22:33:00 UTC (rev 5703)
+++ VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-06-03 15:23:05 UTC (rev 5704)
@@ -60,6 +60,9 @@
   private int contestedLossRequired = 0;
   private int evacuated = 0;
   private int repositioningRequired = 0;
+  private String phaseOwner = "";
+  private String attackerSide = "";
+  private String defenderSide = "";
   // dynamic
   private GamePiece gp;
   private RsrKeyCommand[] commands0;
@@ -119,6 +122,12 @@
       return evacuated;
     } else if (G_REPOSITIONING_REQUIRED.equals(key)) {
       return repositioningRequired;
+    } else if (G_PHASE_OWNER.equals(key)) {
+      return phaseOwner;
+    } else if (G_ATTACKER_SIDE.equals(key)) {
+      return attackerSide;
+    } else if (G_DEFENDER_SIDE.equals(key)) {
+      return defenderSide;
     } else {
       return super.getProperty(key);
     }
@@ -166,6 +175,12 @@
       return evacuated;
     } else if (G_REPOSITIONING_REQUIRED.equals(key)) {
       return repositioningRequired;
+    } else if (G_PHASE_OWNER.equals(key)) {
+      return phaseOwner;
+    } else if (G_ATTACKER_SIDE.equals(key)) {
+      return attackerSide;
+    } else if (G_DEFENDER_SIDE.equals(key)) {
+      return defenderSide;
     } else {
       return super.getLocalizedProperty(key);
     }
@@ -294,6 +309,24 @@
       } catch (Exception e) {
         repositioningRequired = 0;
       }
+    } else if (G_PHASE_OWNER.equals(key)) {
+      try {
+        phaseOwner = val.toString();
+      } catch (Exception e) {
+        phaseOwner = "";
+      }
+    } else if (G_ATTACKER_SIDE.equals(key)) {
+      try {
+        attackerSide = val.toString();
+      } catch (Exception e) {
+        attackerSide = "";
+      }
+    } else if (G_DEFENDER_SIDE.equals(key)) {
+      try {
+        defenderSide = val.toString();
+      } catch (Exception e) {
+        defenderSide = "";
+      }
     } else {
       super.setProperty(key, val);
     }
@@ -348,6 +381,9 @@
     se.append(contestedLossRequired);
     se.append(evacuated);
     se.append(repositioningRequired);
+    se.append(phaseOwner);
+    se.append(attackerSide);
+    se.append(defenderSide);
     return se.getValue();
   }
 
@@ -373,6 +409,9 @@
     contestedLossRequired = st.nextInt(0);
     evacuated = st.nextInt(0);
     repositioningRequired = st.nextInt(0);
+    phaseOwner = st.nextToken("");
+    attackerSide = st.nextToken("");
+    defenderSide = st.nextToken("");
   }
 
   public Rectangle boundingBox() {
@@ -436,7 +475,7 @@
         }
       }
       Command c = tracker.getChangeCommand();
-      Command cmd = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), "Game: Debug " + debug + ", scenario " + scenario);
+      Command cmd = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), "Debug " + debug + ", scenario " + scenario);
       cmd.execute();
       c.append(cmd);
       return c;
@@ -475,7 +514,7 @@
     }
 
     public String getState() {
-      return "0;6;0;0;0;0;0;;;0;0;0;0;0;0;0;0;0;0;0";
+      return "0;6;0;0;0;0;0;;;0;0;0;0;0;0;0;0;0;0;0;;;";
     }
 
     public String getType() {
@@ -607,4 +646,16 @@
     return instance.repositioningRequired;
   }
 
+  public static final String getPhaseOwner() {
+    return instance.phaseOwner;
+  }
+
+  public static final String getAttackerSide() {
+    return instance.attackerSide;
+  }
+
+  public static final String getDefenderSide() {
+    return instance.defenderSide;
+  }
+
 }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java	2009-06-02 22:33:00 UTC (rev 5703)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java	2009-06-03 15:23:05 UTC (rev 5704)
@@ -50,14 +50,19 @@
     movementMode = RsrTrait.getMovementTypeAsInt(piece);
     supplyLevel = RsrTrait.getSupplyLevel(piece);
     retreatDistance = RsrTrait.getRetreating(piece);
+    if (retreatDistance <= 0) {
+      retreatDistance = RsrTrait.getOverstackRetreating(piece);
+      startHex = grid.getHexPos(piece.getPosition());
+    } else {
+      try {
+        startHex = grid.getHexPos(grid.getLocation(RsrTrait.getCombatHex(piece)));
+      } catch (BadCoords ex) {
+        startHex = grid.getHexPos(piece.getPosition());
+      }
+    }
     occupiedByFriend = pieceCache.getHexesOccupiedBy(side);
     occupiedByEnemy = pieceCache.getHexesOccupiedByEnemy(side);
     inEnemyZOC = pieceCache.getHexesInZOCEnemy(side);
-    try {
-      startHex = grid.getHexPos(grid.getLocation(RsrTrait.getCombatHex(piece)));
-    } catch (BadCoords ex) {
-      startHex = grid.getHexPos(piece.getPosition());
-    }
     tooClose = grid.getHexesInRange(startHex, retreatDistance-1);
     addHex(selectedHexes, startHex, create(null, true, retreatDistance, true, MODE_RETREAT, 0));
   }
@@ -83,7 +88,7 @@
     if (occupiedByEnemy.contains(toHex)) {
       return result(fromHex, false, 0.0d, false, MODE_RETREAT, 0);
     }
-    if (core.isMajorRiver(et)) {
+    if ((movementMode == MOVEMENT_MOTORIZED) && (core.isMajorRiver(et))) {
       val += 1;
     }
     if ((inEnemyZOC.contains(toHex)) && (occupiedByFriend.contains(toHex) == false)) {

Modified: VSQL-src/branches/morvael/rsr/RsrTrait.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-06-02 22:33:00 UTC (rev 5703)
+++ VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-06-03 15:23:05 UTC (rev 5704)
@@ -62,6 +62,7 @@
   private int reorganized = 0;
   private int fired = 0;
   private int repositioning = 0;
+  private int overstackRetreating = 0;
   // dynamic counter information (volatile)
   private GamePiece gp;
   private RsrKeyCommand[] commands;
@@ -184,6 +185,8 @@
       return fired;
     } else if (T_REPOSITIONING.equals(key)) {
       return repositioning;
+    } else if (T_OVERSTACK_RETREATING.equals(key)) {
+      return overstackRetreating;
     } else {
       return super.getProperty(key);
     }
@@ -243,6 +246,8 @@
       return fired;
     } else if (T_REPOSITIONING.equals(key)) {
       return repositioning;
+    } else if (T_OVERSTACK_RETREATING.equals(key)) {
+      return overstackRetreating;
     } else {
       return super.getLocalizedProperty(key);
     }
@@ -403,6 +408,12 @@
       } catch (Exception e) {
         repositioning = 0;
       }
+    } else if (T_OVERSTACK_RETREATING.equals(key)) {
+      try {
+        overstackRetreating = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        overstackRetreating = 0;
+      }
     } else {
       super.setProperty(key, val);
     }
@@ -485,6 +496,7 @@
     se.append(reorganized);
     se.append(fired);
     se.append(repositioning);
+    se.append(overstackRetreating);
     return se.getValue();
   }
 
@@ -516,6 +528,7 @@
     reorganized = st.nextInt(0);
     fired = st.nextInt(0);
     repositioning = st.nextInt(0);
+    overstackRetreating = st.nextInt(0);
   }
 
   public Rectangle boundingBox() {
@@ -547,7 +560,7 @@
         drawNumber(g, px + 53, py + 50, zoom, obs, (int)movementLeft);
       }
     }
-    if ((retreating > 0) || (repositioning > 0)) {
+    if ((retreating > 0) || (repositioning > 0) || (overstackRetreating > 0)) {
       imagePainter[7].draw(g, px, py, zoom, obs);
     } else
     if (advancing > 0) {
@@ -670,6 +683,7 @@
           .append(0)
           .append(0)
           .append(0)
+          .append(0)
           .append(0);
       return se.getValue();
     }
@@ -711,7 +725,8 @@
       T_MOVED, 0,
       T_REORGANIZED, 0,
       T_FIRED, 0,
-      T_REPOSITIONING, 0);
+      T_REPOSITIONING, 0,
+      T_OVERSTACK_RETREATING, 0);
   }
 
   public static void commandClearCombatAttributes(GamePiece gp, boolean attacked) {
@@ -750,7 +765,8 @@
       T_MOVED, getMoved(from),
       T_REORGANIZED, getReorganized(from),
       T_FIRED, getFired(from),
-      T_REPOSITIONING, getRepositioning(from));
+      T_REPOSITIONING, getRepositioning(from),
+      T_OVERSTACK_RETREATING, getOverstackRetreating(from));
   }
 
 
@@ -992,6 +1008,11 @@
     return t != null ? t.repositioning : 0;
   }
 
+  public static int getOverstackRetreating(GamePiece gp) {
+    RsrTrait t = getTrait(gp);
+    return t != null ? t.overstackRetreating : 0;
+  }
+
   public static int getCurrentNominalSteps(GamePiece gp) {
     RsrTrait t = getTrait(gp);
     if (t != null) {


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

Revision: 5708
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5708&view=rev
Author:   morvael
Date:     2009-06-04 14:58:06 +0000 (Thu, 04 Jun 2009)

Log Message:
-----------
Partisan bug fixed, destruction marker bug fixed.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/PieceCache.java
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrConstants.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java

Modified: VSQL-src/branches/morvael/rsr/PieceCache.java
===================================================================
--- VSQL-src/branches/morvael/rsr/PieceCache.java	2009-06-04 02:21:12 UTC (rev 5707)
+++ VSQL-src/branches/morvael/rsr/PieceCache.java	2009-06-04 14:58:06 UTC (rev 5708)
@@ -129,7 +129,7 @@
       case 'S' : result.addAll(filter.filterPieces(mainMap, "Type=='SiegeArtillery'")); break;
       case 'H' : result.addAll(filter.filterPieces(mainMap, "Type=='Headquarters'&&Nationality=='" + id.substring(1) + "'")); break;
       case 'D' : result.addAll(filter.filterPieces(mainMap, "Type=='SecurityDivision'")); break;
-      case 'P' : result.addAll(filter.filterPieces(mainMap, "Type=='Partisan'")); break;
+      case 'P' : result.addAll(filter.filterPieces(mainMap, "Type=='Partisans'")); break;
     }
     return result;
   }

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-04 02:21:12 UTC (rev 5707)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-04 14:58:06 UTC (rev 5708)
@@ -84,6 +84,7 @@
     //x+1 - leave
 
     supplyCache.clear();
+    commandDisallowCombatActionAll();
     commandDisallowActionAll();
     commandDisallowMovementAll();
 
@@ -216,7 +217,7 @@
     String side, nationality, type;
     int supplyLevel, isolated;
     ArrayList<GamePiece> isolatedUnits = new ArrayList<GamePiece>();
-    for (GamePiece gp : filter.filterPieces(mainMap, "Type!='Airbase'&&Type!='AirFleet'&&Type!='Partisan'&&Type!='Asset'&&Type!='Depot'&&Type!='Marker'")) {
+    for (GamePiece gp : filter.filterPieces(mainMap, "Type!='Airbase'&&Type!='AirFleet'&&Type!='Partisans'&&Type!='Asset'&&Type!='Depot'&&Type!='Marker'")) {
       nationality = RsrTrait.getNationality(gp);
       infoN = supplyCache.getSupply(nationality, false);
       infoA = supplyCache.getSupply(nationality, true);
@@ -725,9 +726,6 @@
           commandAllowCombatAction(gp);
         }
       } else {
-        for (GamePiece gp : airbases) {
-          commandDisallowCombatAction(gp);
-        }
         autoAdvance = true;
       }
     } else {
@@ -853,19 +851,19 @@
   }
 
   /**
-   * Ask Soviet player to put received Partisan units on map. (MANUAL)
+   * Ask Soviet player to put received Partisans units on map. (MANUAL)
    */
   private void executeAdministrative6() {
     //
     commandBaseSetProperty(dataPiece, G_EVACUATED, 0);
     //
     int count = 0;
-    for (GamePiece gp : filter.filterPieces(turnMap, "LocationName=='S" + getTurnName() + "'&&Type=='Partisan'")) {
+    for (GamePiece gp : filter.filterPieces(turnMap, "LocationName=='S" + getTurnName() + "'&&Type=='Partisans'")) {
       commandAllowMovement(gp, 0.0d, true);
       count++;
     }
     if (count > 0) {
-      commandBaseLog("Soviet Player: Put partisan on map.");
+      commandBaseLog("Soviet Player: Put partisans on map.");
     } else {
       autoAdvance = true;
     }
@@ -985,7 +983,7 @@
           if (allowMovement(gp, getAirborneAssaultHexes())) {
             return true;
           }
-        } else if ((phaseName.equals(PHASE_SOVIET_REINFORCEMENT)) && (phasePart == 6)) {
+        } else if ((phaseName.equals(PHASE_ADMINISTRATIVE)) && (phasePart == 6)) {
           if (allowMovement(gp, getPartisanEntryHexes())) {
             return true;
           }

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-04 02:21:12 UTC (rev 5707)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-04 14:58:06 UTC (rev 5708)
@@ -313,15 +313,15 @@
         int desiredControl = side.equals(SIDE_SOVIET) ? 1 : 2;
         if (RsrCounter.getIntProperty(gpc, "Control", 1, false) != desiredControl) {
           commandBaseSetProperty(gpc, "Control", String.valueOf(desiredControl));
-          commandBaseLog("Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now under " + side + " control.");
+          commandBaseLog("Space " + getLocationName(hr) + " is now under " + side + " control.");
           //TODO: apply Moscow/Baku surrender rule on first axis enter
         }
         if (desiredControl == 2) {
           GamePiece gpd = destroyedMarkers.get(hr);
           if (gpd != null) {
-            if (RsrCounter.getIntProperty(gpc, "Destruction", 1, false) != desiredControl) {
-              commandBaseSetProperty(gpc, "Destruction", String.valueOf(desiredControl));
-              commandBaseLog("Space " + mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())) + " is now destroyed.");
+            if (RsrCounter.getIntProperty(gpd, "Destruction", 1, false) != desiredControl) {
+              commandBaseSetProperty(gpd, "Destruction", String.valueOf(desiredControl));
+              commandBaseLog("Space " + getLocationName(hr) + " is now destroyed.");
             }
           }
         }
@@ -341,7 +341,7 @@
         list = pieceCache.getPiecesIn(hrf);
         if (list != null) {
           for (GamePiece gp : list) {
-            if (RsrTrait.getType(gp).equals("Partisan")) {
+            if (RsrTrait.getType(gp).equals("Partisans")) {
               if (getPartisanRepositionHexes(gp).size() == 0) {
                 commandEliminate(gp);
               } else {
@@ -354,7 +354,7 @@
       }
       if (count > 0) {
         commandBaseSetProperty(dataPiece, G_REPOSITIONING_REQUIRED, count);
-        commandBaseLog("There are " + count + " partisan unit(s) to reposition.");
+        commandBaseLog("There are partisans units to reposition.");
       }
     }
   }
@@ -718,6 +718,12 @@
     commandBaseSetProperty(gp, T_HL_LOSS, 1);
   }
 
+  public void commandDisallowCombatActionAll() {
+    for (GamePiece gp : filter.filterPieces(mainMap, T_HL_LOSS + ">0")) {
+      commandDisallowCombatAction(gp);
+    }
+  }
+
   public void commandDisallowCombatAction(GamePiece gp) {
     commandBaseSetProperty(gp, T_HL_LOSS, 0);
   }
@@ -835,14 +841,17 @@
       return false;
     }
     if (RsrGlobal.getRepositioningRequired() > 0) {
-      commandBaseLog("Reposition partisan unit(s) first.");
+      commandBaseLog("Reposition partisans unit(s) first.");
       return false;
     }
     if (RsrGlobal.getCombatStage() > 0) {
       commandBaseLog("Resolve or cancel combat first.");
       return false;
     }
-    //TODO: finish this
+    if (filter.filterPieces(turnMap, T_HL_MOVEMENT + ">0").size() > 0) {
+      commandBaseLog("Put reinforcements on map first.");
+      return false;
+    }
     return true;
   }
 
@@ -851,10 +860,9 @@
       return false;
     }
     if (RsrGlobal.getRepositioningRequired() > 0) {
-      commandBaseLog("Reposition partisan unit(s) first.");
+      commandBaseLog("Reposition partisans unit(s) first.");
       return false;
     }
-    //TODO: finish this
     return true;
   }
 
@@ -863,10 +871,9 @@
       return false;
     }
     if ((RsrTrait.getRepositioning(gp) == 0) && (RsrGlobal.getRepositioningRequired() > 0)) {
-      commandBaseLog("Reposition partisan unit(s) first.");
+      commandBaseLog("Reposition partisans unit(s) first.");
       return false;
     }
-    //TODO: finish this
     return true;
   }
 
@@ -974,7 +981,7 @@
     if ((totalInvolved == 0) || ((totalInvolved > 1) && (defenderHexes.size() > 1))) {
       return;
     }
-    for (GamePiece gp : filter.filterPieces(pieceCache.getPiecesIn(target), "Side=='" + defenderSide + "'&&Type!='AirFleet','Partisan'")) {
+    for (GamePiece gp : filter.filterPieces(pieceCache.getPiecesIn(target), "Side=='" + defenderSide + "'&&Type!='AirFleet','Partisans'")) {
       if (RsrTrait.getDefender(gp) == 0) {
         strength = getDefendStrength(gp, true);
         if (strength != 0) {
@@ -1269,7 +1276,7 @@
             attackerVacated = true;
             //in normal combat, eliminate any non-attacking units on vacated hex
             if (combatMode == 0) {
-              for (GamePiece gp : filter.filterPieces(piecesIn, "Type!='Marker','AirFleet','Partisan'")) {
+              for (GamePiece gp : filter.filterPieces(piecesIn, "Type!='Marker','AirFleet','Partisans'")) {
                 commandEliminate(gp);
               }
             }
@@ -1310,7 +1317,7 @@
             defenderVacated = true;
             //in normal combat, eliminate any non-defending units on vacated hex (this happens when a unit attacked earlier retreated to this hex)
             if (combatMode == 0) {
-              for (GamePiece gp : filter.filterPieces(piecesIn, "Type!='Marker','AirFleet','Partisan'")) {
+              for (GamePiece gp : filter.filterPieces(piecesIn, "Type!='Marker','AirFleet','Partisans'")) {
                 commandEliminate(gp);
               }
             }
@@ -1612,7 +1619,7 @@
       if (tt.equals(HEX_WATER)) {
         continue;
       }
-      if (filter.filterPieces(pieceCache.getPiecesIn(toHex), "Side=='" + defenderSide + "'&&Type!='AirFleet','Partisan'&&" + T_ATTACKED + "==0").size() == 0) {
+      if (filter.filterPieces(pieceCache.getPiecesIn(toHex), "Side=='" + defenderSide + "'&&Type!='AirFleet','Partisans'&&" + T_ATTACKED + "==0").size() == 0) {
         continue;
       }
       result.put(toHex, new TerrainMapShaderCost(fromHex, true, 0.0d, false, MODE_ATTACK, 0));
@@ -2492,7 +2499,7 @@
 
   public double getStrategicMovementAllowance(GamePiece gp) {
     String type = RsrTrait.getType(gp);
-    if (Filter.isAny(type, "Airbase", "Partisan", "Asset", "AirFleet")) {
+    if (Filter.isAny(type, "Airbase", "Partisans", "Asset", "AirFleet")) {
       return 0.0d;
     }
     if ((type.equals("Depot")) && (isMud() == false)) {
@@ -2574,13 +2581,11 @@
       return false;
     } else
     if (isLakeSea(et)) {
-      if (lt.equals(LINE_FROZENSURFACE)) {
-        if (isWinter()) {
-          for (GamePiece gp : list) {
-            if ((RsrTrait.getType(gp).equals("Unit")) && (RsrTrait.getMovementTypeAsInt(gp) == MOVEMENT_NONMOTORIZED) && (RsrTrait.getUnitType(gp).equals("SovietGuardsCavalryCorps") == false)) {
-              //soviet non-motorized, non-soviet guards cavalry corps can contest neighbour space across frozen surface in winter
-              return true;
-            }
+      if ((lt.equals(LINE_FROZENSURFACE)) && (isWinter())) {
+        for (GamePiece gp : list) {
+          if ((RsrTrait.getType(gp).equals("Unit")) && (RsrTrait.getMovementTypeAsInt(gp) == MOVEMENT_NONMOTORIZED) && (RsrTrait.getUnitType(gp).equals("SovietGuardsCavalryCorps") == false)) {
+            //soviet non-motorized, non-soviet guards cavalry corps can contest neighbour space across frozen surface in winter
+            return true;
           }
         }
       }

Modified: VSQL-src/branches/morvael/rsr/RsrConstants.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrConstants.java	2009-06-04 02:21:12 UTC (rev 5707)
+++ VSQL-src/branches/morvael/rsr/RsrConstants.java	2009-06-04 14:58:06 UTC (rev 5708)
@@ -143,7 +143,7 @@
   public static final String T_DISPLAYED_DEFENCE = "DisplayedDefence"; //current defence strength
   public static final String T_REORGANIZED = "Reorganized"; //to mark units that took part in breakdown or buildup or incorporation this turn
   public static final String T_FIRED = "CombatFired"; //siege artillery already took part in combat support in this combat phase (not used in overruns)
-  public static final String T_REPOSITIONING = "Repositioning"; //partisan unit that has to be repositioned
+  public static final String T_REPOSITIONING = "Repositioning"; //partisans unit that has to be repositioned
   public static final String T_OVERSTACK_RETREATING = "CombatOverstackRetreating"; //number (1) of spaces unit must retreat if primary retreat caused overstack
 
 	public static final int SUPPLY_NORMAL = 0;

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-06-04 02:21:12 UTC (rev 5707)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderBase.java	2009-06-04 14:58:06 UTC (rev 5708)
@@ -69,7 +69,7 @@
       return Double.MAX_VALUE;
     } else
     if (core.isLakeSea(et)) {
-      if ((isAxis) || (isWinter == false) || (lt.equals(LINE_FROZENSURFACE) == false)) {
+      if ((isRailroad == false) && ((isAxis) || (isWinter == false) || (lt.equals(LINE_FROZENSURFACE) == false))) {
         return Double.MAX_VALUE;
       }
     } else

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-06-04 02:21:12 UTC (rev 5707)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2009-06-04 14:58:06 UTC (rev 5708)
@@ -80,7 +80,7 @@
 			return result(fromHex, false, 0.0, false, MODE_STRATEGIC, 0);
 		} else
 		if (core.isLakeSea(et)) {
-			if ((side.equals(SIDE_AXIS)) || (isWinter == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != MOVEMENT_NONMOTORIZED)) {
+			if ((lt.equals(LINE_CHONGARCAUSEWAY) == false) && ((side.equals(SIDE_AXIS)) || (isWinter == false) || (lt.equals(LINE_FROZENSURFACE) == false) || (movementMode != MOVEMENT_NONMOTORIZED))) {
 				return result(fromHex, false, 0.0, false, MODE_STRATEGIC, 0);
 			}
 		} else


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

Revision: 5733
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5733&view=rev
Author:   morvael
Date:     2009-06-16 15:06:05 +0000 (Tue, 16 Jun 2009)

Log Message:
-----------
Implemented Moscow & Baku surrender rule; game can now really end (untested yet). The only item on TODO list is now sea movement.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/GameMisc.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrConstants.java
    VSQL-src/branches/morvael/rsr/RsrGlobal.java

Modified: VSQL-src/branches/morvael/rsr/GameMisc.java
===================================================================
--- VSQL-src/branches/morvael/rsr/GameMisc.java	2009-06-16 05:28:08 UTC (rev 5732)
+++ VSQL-src/branches/morvael/rsr/GameMisc.java	2009-06-16 15:06:05 UTC (rev 5733)
@@ -88,7 +88,7 @@
     } else if (param.equals("finnishSupply")) {
       RsrAdvance.getInstance().showSupplyShading(3);
     } else if (param.equals("vp")) {
-      RsrAdvance.getInstance().calculateVP();
+      RsrAdvance.getInstance().calculateVP(true);
     }
   }
 

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-16 05:28:08 UTC (rev 5732)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-16 15:06:05 UTC (rev 5733)
@@ -322,6 +322,56 @@
             if (RsrCounter.getIntProperty(gpd, "Destruction", 1, false) != desiredControl) {
               commandBaseSetProperty(gpd, "Destruction", String.valueOf(desiredControl));
               commandBaseLog("Space " + getLocationName(hr) + " is now destroyed.");
+              String message = "";
+              if (hr.equals(getCityHexRef(TAG_CITY_MOSCOW))) {
+                int mod = 0;
+                if (isCityAxisControlled(TAG_CITY_LENINGRAD)) {
+                  mod--;
+                }
+                if (isCityAxisControlled(TAG_CITY_BAKU)) {
+                  mod--;
+                }
+                if ((isCityAxisControlled(TAG_CITY_STALINGRAD)) && (isCityAxisControlled(TAG_CITY_SEVASTOPOL))) {
+                  mod--;
+                }
+                int die = ran.nextInt(6) + 1;
+                int result = Math.max(1, die + mod);
+                if (result == 1) {
+                  message = "Soviets surrender!";
+                } else
+                if ((result == 2) || (result == 3)) {
+                  message = "Soviet morale weakened!";
+                } else {
+                  message = "Soviets fight on!";
+                }
+                commandBaseLog("Moscow surrender die roll is " + die + (mod < 0 ? " with " + mod + " modifier" : "") + ": " + message);
+              } else if (hr.equals(getCityHexRef(TAG_CITY_BAKU))) {
+                int mod = 0;
+                if (isCityAxisControlled(TAG_CITY_LENINGRAD)) {
+                  mod--;
+                }
+                if (isCityAxisControlled(TAG_CITY_MOSCOW)) {
+                  mod--;
+                }
+                if ((isCityAxisControlled(TAG_CITY_STALINGRAD)) && (isCityAxisControlled(TAG_CITY_SEVASTOPOL))) {
+                  mod--;
+                }
+                int die = ran.nextInt(6) + 1;
+                int result = Math.max(1, die + mod);
+                if (result == 1) {
+                  message = "Soviets surrender!";
+                } else {
+                  message = "Soviets fight on!";
+                }
+                commandBaseLog("Baku surrender die roll is " + die + (mod < 0 ? " with " + mod + " modifier" : "") + ": " + message);
+              }
+              if (message.equals("Soviets surrender!")) {
+                commandBaseSetProperty(dataPiece, G_GAME_STATUS, 2);
+              } else if (message.equals("Soviet morale weakened!")) {
+                for (GamePiece fgp : findInOffboardZone("At-Start Strength Marker Box", "Strength", null, Integer.MAX_VALUE)) {
+                  commandSendToOffboardZone(fgp, RsrTrait.getCombatClass(fgp) + "-strength pool");
+                }
+              }
             }
           }
         }
@@ -670,19 +720,34 @@
           executeLeavePhase();
           Point p = phasePiece.getPosition();
           if (p.y == 701) {
-            Point p2 = turnPiece.getPosition();
-            if (p2.y < 3599) {
-              p2.translate(0, 91);
-              commandBaseMove(turnMap, turnPiece, p2);
-              commandBaseLog("Turn changes to " + turnGrid.locationName(p2) + ".");
+            //
+            int length = 40;
+            switch (RsrGlobal.getScenario()) {
+              case 1 :
+              case 3 : length = 24; break;
+              case 2 : length = 12; break;
             }
-            p.y = 45;
+            if (getTurnNumber() == length) {
+              commandBaseSetProperty(dataPiece, G_GAME_STATUS, 1);
+              commandGameOverMessage();
+              p.y = 0;
+            } else {
+              Point p2 = turnPiece.getPosition();
+              if (p2.y < 3599) {
+                p2.translate(0, 91);
+                commandBaseMove(turnMap, turnPiece, p2);
+                commandBaseLog("Turn changes to " + turnGrid.locationName(p2) + ".");
+              }
+              p.y = 45;
+            }
           } else {
             p.translate(0, 82);
           }
-          commandBaseMove(turnMap, phasePiece, p);
-          commandBaseLog("Phase changes to " + turnGrid.locationName(p) + ".");
-          executeEnterPhase();
+          if (p.y > 0) {
+            commandBaseMove(turnMap, phasePiece, p);
+            commandBaseLog("Phase changes to " + turnGrid.locationName(p) + ".");
+            executeEnterPhase();
+          }
         } else {
           executePart(phasePart);
         }
@@ -836,10 +901,23 @@
     return null;
   }
 
+  public void commandGameOverMessage() {
+    int status = RsrGlobal.getGameStatus();
+    if (status == 2) {
+      commandBaseLog("Game is over (Really, Really Big German Win).");
+    } else {
+      commandBaseLog("Game is over (" + calculateVP(false) + ").");
+    }
+  }
+
   public boolean canAdvance(boolean auto) {
     if ((auto == false) && (checkSide(RsrGlobal.getPhaseOwner()) == false)) {
       return false;
     }
+    if (RsrGlobal.getGameStatus() > 0) {
+      commandGameOverMessage();
+      return false;
+    }
     if (RsrGlobal.getRepositioningRequired() > 0) {
       commandBaseLog("Reposition partisans unit(s) first.");
       return false;
@@ -859,6 +937,10 @@
     if ((auto == false) && (checkSide(RsrGlobal.getPhaseOwner()) == false)) {
       return false;
     }
+    if (RsrGlobal.getGameStatus() > 0) {
+      commandGameOverMessage();
+      return false;
+    }
     if (RsrGlobal.getRepositioningRequired() > 0) {
       commandBaseLog("Reposition partisans unit(s) first.");
       return false;
@@ -870,6 +952,10 @@
     if (checkSide(RsrTrait.getSide(gp)) == false) {
       return false;
     }
+    if (RsrGlobal.getGameStatus() > 0) {
+      commandGameOverMessage();
+      return false;
+    }
     if ((RsrTrait.getRepositioning(gp) == 0) && (RsrGlobal.getRepositioningRequired() > 0)) {
       commandBaseLog("Reposition partisans unit(s) first.");
       return false;
@@ -1643,7 +1729,7 @@
     while (it.hasNext()) {
       hr = it.next();
       s = mainTerrain.getHexTerrainName(hr);
-      if (s.equals(HEX_WATER)) { //TODO: make sure off-map hexes won't be here
+      if (s.equals(HEX_WATER)) {
         it.remove();
       } else {
         s = mainTerrain.getAttributeTerrainValue(hr, TAG_COUNTRY);
@@ -2950,7 +3036,7 @@
     commandMarkAsReorganized(gp1);
   }
 
-  public void calculateVP() {
+  public String calculateVP(boolean log) {
     int vpc = 0;
     int vpu = 0;
     int vpa = 0;
@@ -3078,8 +3164,11 @@
         level = "Really Big German Win";
       }
     }
-    Command cmd = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), "Total VP: " + vpt + " (control: " + vpc + ", units: " + vpu + ", assets: " + vpa + ") - " + level);
-    cmd.execute();
+    if (log) {
+      Command cmd = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), "Total VP: " + vpt + " (control: " + vpc + ", units: " + vpu + ", assets: " + vpa + ") - " + level);
+      cmd.execute();
+    }
+    return level;
   }
   
 }

Modified: VSQL-src/branches/morvael/rsr/RsrConstants.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrConstants.java	2009-06-16 05:28:08 UTC (rev 5732)
+++ VSQL-src/branches/morvael/rsr/RsrConstants.java	2009-06-16 15:06:05 UTC (rev 5733)
@@ -106,6 +106,8 @@
   public static final String TAG_CITY_NOVOROSSIISK = "Novorossiisk";
   public static final String TAG_CITY_TUAPSE = "Tuapse";
   public static final String TAG_CITY_MURMANSK = "Murmansk";
+  public static final String TAG_CITY_LENINGRAD = "Leningrad";
+  public static final String TAG_CITY_STALINGRAD = "Stalingrad";
   public static final String TAG_MAPPART = "MapPart";
   public static final String TAG_MAPPART_NONE = "None";
   public static final String TAG_MAPPART_NORTH = "North";
@@ -184,5 +186,6 @@
   public static final String G_PHASE_OWNER = "phase_owner";
   public static final String G_ATTACKER_SIDE = "attacker_side";
   public static final String G_DEFENDER_SIDE = "defender_side";
+  public static final String G_GAME_STATUS = "game_status";
 
 }

Modified: VSQL-src/branches/morvael/rsr/RsrGlobal.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-06-16 05:28:08 UTC (rev 5732)
+++ VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-06-16 15:06:05 UTC (rev 5733)
@@ -63,6 +63,7 @@
   private String phaseOwner = "";
   private String attackerSide = "";
   private String defenderSide = "";
+  private int gameStatus = 0;
   // dynamic
   private GamePiece gp;
   private RsrKeyCommand[] commands0;
@@ -128,6 +129,8 @@
       return attackerSide;
     } else if (G_DEFENDER_SIDE.equals(key)) {
       return defenderSide;
+    } else if (G_GAME_STATUS.equals(key)) {
+      return gameStatus;
     } else {
       return super.getProperty(key);
     }
@@ -181,6 +184,8 @@
       return attackerSide;
     } else if (G_DEFENDER_SIDE.equals(key)) {
       return defenderSide;
+    } else if (G_GAME_STATUS.equals(key)) {
+      return gameStatus;
     } else {
       return super.getLocalizedProperty(key);
     }
@@ -327,6 +332,12 @@
       } catch (Exception e) {
         defenderSide = "";
       }
+    } else if (G_GAME_STATUS.equals(key)) {
+      try {
+        gameStatus = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        gameStatus = 0;
+      }
     } else {
       super.setProperty(key, val);
     }
@@ -384,6 +395,7 @@
     se.append(phaseOwner);
     se.append(attackerSide);
     se.append(defenderSide);
+    se.append(gameStatus);
     return se.getValue();
   }
 
@@ -412,6 +424,7 @@
     phaseOwner = st.nextToken("");
     attackerSide = st.nextToken("");
     defenderSide = st.nextToken("");
+    gameStatus = st.nextInt(0);
   }
 
   public Rectangle boundingBox() {
@@ -514,7 +527,7 @@
     }
 
     public String getState() {
-      return "0;6;0;0;0;0;0;;;0;0;0;0;0;0;0;0;0;0;0;;;";
+      return "0;6;0;0;0;0;0;;;0;0;0;0;0;0;0;0;0;0;0;;;;0";
     }
 
     public String getType() {
@@ -658,4 +671,8 @@
     return instance.defenderSide;
   }
 
+  public static final int getGameStatus() {
+    return instance.gameStatus;
+  }
+
 }


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

Revision: 5739
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5739&view=rev
Author:   morvael
Date:     2009-06-18 15:20:12 +0000 (Thu, 18 Jun 2009)

Log Message:
-----------
Preparing to implement sea movement.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-17 22:53:13 UTC (rev 5738)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-18 15:20:12 UTC (rev 5739)
@@ -363,9 +363,11 @@
 
   //sea movement - MANUAL
   private void executeAxisMovement1() {
-    //commandBaseLog("Axis Player: Sea movement.");
-    //TODO: finish this
-    autoAdvance = true;
+    if (allowSeaMovement(SIDE_AXIS) > 0) {
+      commandBaseLog("Axis Player: Move units (sea movement).");
+    } else {
+      autoAdvance = true;
+    }
   }
 
   /**
@@ -577,9 +579,11 @@
    * Sea movement. (MANUAL)
    */
   private void executeSovietMovement2() {
-    //commandBaseLog("Soviet Player: Sea movement.");
-    //TODO: finish this
-    autoAdvance = true;
+    if (allowSeaMovement(SIDE_SOVIET) > 0) {
+      commandBaseLog("Soviet Player: Move units (sea movement).");
+    } else {
+      autoAdvance = true;
+    }
   }
 
   /**

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-17 22:53:13 UTC (rev 5738)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-18 15:20:12 UTC (rev 5739)
@@ -314,7 +314,6 @@
         if (RsrCounter.getIntProperty(gpc, "Control", 1, false) != desiredControl) {
           commandBaseSetProperty(gpc, "Control", String.valueOf(desiredControl));
           commandBaseLog("Space " + getLocationName(hr) + " is now under " + side + " control.");
-          //TODO: apply Moscow/Baku surrender rule on first axis enter
         }
         if (desiredControl == 2) {
           GamePiece gpd = destroyedMarkers.get(hr);
@@ -2569,6 +2568,58 @@
     return result;
   }
 
+  public HashSet<HexRef> getAvailablePorts(String side, String tag) {
+    HashSet<HexRef> result = mainTerrain.findHexesWithTag(TAG_PORT, tag);
+    if ((Filter.isAny(tag, TAG_PORT_ARCTIC, TAG_PORT_BALTIC)) && (isWinter())) {
+      result.clear();
+    } else {
+      Iterator<HexRef> it = result.iterator();
+      if (side.equals(SIDE_AXIS)) {
+        while (it.hasNext()) {
+          if (isHexAxisControlled(it.next()) == false) {
+            it.remove();
+          }
+        }
+      } else {
+        while (it.hasNext()) {
+          if (isHexAxisControlled(it.next())) {
+            it.remove();
+          }
+        }
+      }
+    }
+    return result;
+  }
+
+  public int allowSeaMovement(String side) {
+    int result = 0;
+    result += allowSeaMovement(side, getAvailablePorts(side, TAG_PORT_ARCTIC));
+    result += allowSeaMovement(side, getAvailablePorts(side, TAG_PORT_BALTIC));
+    result += allowSeaMovement(side, getAvailablePorts(side, TAG_PORT_BLACKSEA));
+    return result;
+  }
+
+  private int allowSeaMovement(String side, HashSet<HexRef> ports) {
+    //TODO: finish this
+    return 0;
+  }
+
+  public double getSeaMovementWeight(GamePiece gp) {
+    String type = RsrTrait.getType(gp);
+    if (type.equals("Unit")) {
+      String unitType = RsrTrait.getUnitType(gp);
+      if (Filter.isAny(unitType, "AxisGermanInfantryBattlegroup", "AxisGermanMountainBattlegroup", "SovietInfantryCorps", "SovietMarineCorps", "SovietAirborneCorps")) {
+        return 0.5d;
+      } else
+      if (Filter.isAny(unitType, "AxisGermanInfantryCorps", "AxisGermanMountainCorps", "AxisFinnishInfantryCorps", "AxisRomanianInfantryCorps", "AxisRomanianMountainCorps", "SovietGuardsArmy", "SovietShockArmy", "SovietInfantryArmy")) {
+        return 1.0d;
+      }
+    } else if (type.equals("Depot")) {
+      return 1.0d;
+    }
+    return 0.0d;
+  }
+
   public double getMovementAllowance(GamePiece gp) {
     double result = RsrTrait.getMovement(gp);
     if (getTurnNumber() == 1) {


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

Revision: 5745
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5745&view=rev
Author:   morvael
Date:     2009-06-19 10:40:42 +0000 (Fri, 19 Jun 2009)

Log Message:
-----------
Sea movement implemented. Selection of pieces for movement in expanded stack fixed. NPE bug fixed in piece cache.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/PieceCache.java
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrPieceMover.java

Modified: VSQL-src/branches/morvael/rsr/PieceCache.java
===================================================================
--- VSQL-src/branches/morvael/rsr/PieceCache.java	2009-06-19 04:47:15 UTC (rev 5744)
+++ VSQL-src/branches/morvael/rsr/PieceCache.java	2009-06-19 10:40:42 UTC (rev 5745)
@@ -239,6 +239,7 @@
   }
 
   public Set<HexRef> getOccupiedHexes() {
+    validate();
     return allPieces.keySet();
   }
 

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-19 04:47:15 UTC (rev 5744)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-19 10:40:42 UTC (rev 5745)
@@ -437,9 +437,11 @@
 
   /**
    * Reset status of moved units. (AUTO)
+   * Fix overstacks. (AUTO)
    */
   private void executeAxisMovement5() {
     commandMarkAsUnmovedAll();
+    commandFixAllOverstacks();
   }
 
   /**
@@ -653,9 +655,11 @@
 
   /**
    * Reset status of moved units. (AUTO)
+   * Fix overstacks. (AUTO)
    */
   private void executeSovietMovement6() {
     commandMarkAsUnmovedAll();
+    commandFixAllOverstacks();
   }
 
   /*
@@ -704,12 +708,14 @@
 
   /**
    * Reset status of moved units. (AUTO)
+   * Fix overstacks. (AUTO)
    * Remove Air Fleets from map. (AUTO)
    * Remove Airbase on given turn. (MANUAL)
    */
   private void executeGermanTankMovement3() {
     //
     commandMarkAsUnmovedAll();
+    commandFixAllOverstacks();
     //
     ArrayList<GamePiece> airfleets = filter.filterPieces(mainMap, "Type=='AirFleet'");
     if (airfleets.size() > 0) {
@@ -918,7 +924,22 @@
     }
     Set<HexRef> targets = RsrAllowedMovement.getCommonAllowedHexes(pieces, allowedMovement);
     if (targets.size() > 0) {
-      shader.setShadedHexes(targets);
+      //block movement of too many pieces via sea movement
+      String phaseName = getPhaseName();
+      int phasePart = RsrGlobal.getPhasePart() - 1;
+      if (((phaseName.equals(PHASE_AXIS_MOVEMENT)) && (phasePart == 1)) || ((phaseName.equals(PHASE_SOVIET_MOVEMENT)) && (phasePart == 2))) {
+        double totalWeight = 0.0d;
+        for (GamePiece gp : pieces) {
+          totalWeight += getSeaMovementWeight(gp);
+        }
+        if (totalWeight <= 1.0d) {
+          shader.setShadedHexes(targets);
+        } else {
+          pieces.clear();
+        }
+      } else {
+        shader.setShadedHexes(targets);
+      }
     } else {
       pieces.clear();
     }
@@ -992,7 +1013,11 @@
             return true;
           }
         } else if (phaseName.equals(PHASE_AXIS_MOVEMENT)) {
-          if (phasePart == 2) {
+          if (phasePart == 1) {
+            if (allowMovement(gp, getSeaMovementHexes(gp))) {
+              return true;
+            }
+          } else if (phasePart == 2) {
             if (allowMovement(gp, rulesStrategic, false)) {
               return true;
             }
@@ -1002,7 +1027,11 @@
             }
           }
         } else if (phaseName.equals(PHASE_SOVIET_MOVEMENT)) {
-          if (phasePart == 3) {
+          if (phasePart == 2) {
+            if (allowMovement(gp, getSeaMovementHexes(gp))) {
+              return true;
+            }
+          } else if (phasePart == 3) {
             if (allowMovement(gp, rulesStrategic, false)) {
               return true;
             }
@@ -1192,6 +1221,10 @@
     if ((phaseName.equals(PHASE_SOVIET_MOVEMENT)) && (phasePart == 1)) {
       commandParadrop(hr, pieces);
     }
+    //auto-advance game on sea movement
+    if (((phaseName.equals(PHASE_AXIS_MOVEMENT)) && (phasePart == 1)) || ((phaseName.equals(PHASE_SOVIET_MOVEMENT)) && (phasePart == 2))) {
+      commandAdvance(true);
+    }
   }
 
   /**
@@ -1253,8 +1286,9 @@
           }
           return true;
         } else {
-          //during retreats overstacks are allowed
-          return (RsrGlobal.getCombatStage() == 4) || (isStackSizeOK(hr, pieces));
+          //during retreats & sea movement overstacks are allowed
+          int phasePart = RsrGlobal.getPhasePart() - 1;
+          return ((phaseName.equals(PHASE_AXIS_MOVEMENT)) && (phasePart == 1)) || ((phaseName.equals(PHASE_SOVIET_MOVEMENT)) && (phasePart == 2)) || (RsrGlobal.getCombatStage() == 4) || (isStackSizeOK(hr, pieces));
         }
       } else {
         return false;

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-19 04:47:15 UTC (rev 5744)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-19 10:40:42 UTC (rev 5745)
@@ -1468,6 +1468,14 @@
     }
   }
 
+  public void commandFixAllOverstacks() {
+    for (HexRef hr : pieceCache.getOccupiedHexes()) {
+      if (isStackSizeOK(hr) == false) {
+        commandFixOverstack(hr);
+      }
+    }
+  }
+
   public void commandFixOverstack(HexRef hr) {
     commandBaseLog("Stack size violation in " + getLocationName(hr) + " will be cured.");
     ArrayList<GamePiece> pieces = pieceCache.getPiecesIn(hr);
@@ -2593,15 +2601,28 @@
 
   public int allowSeaMovement(String side) {
     int result = 0;
-    result += allowSeaMovement(side, getAvailablePorts(side, TAG_PORT_ARCTIC));
-    result += allowSeaMovement(side, getAvailablePorts(side, TAG_PORT_BALTIC));
-    result += allowSeaMovement(side, getAvailablePorts(side, TAG_PORT_BLACKSEA));
+    result += allowSeaMovement(side, TAG_PORT_ARCTIC);
+    result += allowSeaMovement(side, TAG_PORT_BALTIC);
+    result += allowSeaMovement(side, TAG_PORT_BLACKSEA);
     return result;
   }
 
-  private int allowSeaMovement(String side, HashSet<HexRef> ports) {
-    //TODO: finish this
-    return 0;
+  private int allowSeaMovement(String side, String port) {
+    HashSet<HexRef> ports = getAvailablePorts(side, port);
+    if (ports.size() < 2) {
+      return 0;
+    } else {
+      int count = 0;
+      for (HexRef hr : ports) {
+        for (GamePiece gp : pieceCache.getPiecesIn(hr)) {
+          if (getSeaMovementWeight(gp) > 0.0d) {
+            commandAllowMovement(gp, 0.0d, true);
+            count++;
+          }
+        }
+      }
+      return count;
+    }
   }
 
   public double getSeaMovementWeight(GamePiece gp) {
@@ -2620,6 +2641,23 @@
     return 0.0d;
   }
 
+  public HashSet<HexRef> getSeaMovementHexes(GamePiece gp) {
+    String side = RsrTrait.getSide(gp);
+    HexRef fromPort = getHexRef(gp.getPosition());
+    HashSet<HexRef> ports = getAvailablePorts(side, TAG_PORT_ARCTIC);
+    if (ports.contains(fromPort) == false) {
+      ports = getAvailablePorts(side, TAG_PORT_BALTIC);
+      if (ports.contains(fromPort) == false) {
+        ports = getAvailablePorts(side, TAG_PORT_BLACKSEA);
+        if (ports.contains(fromPort) == false) {
+          ports.clear();
+        }
+      }
+    }
+    ports.remove(fromPort);
+    return ports;
+  }
+
   public double getMovementAllowance(GamePiece gp) {
     double result = RsrTrait.getMovement(gp);
     if (getTurnNumber() == 1) {
@@ -2793,6 +2831,19 @@
     }
   }
 
+  public boolean isStackSizeOK(HexRef hr) {
+    ArrayList<GamePiece> pieces = pieceCache.getPiecesIn(hr);
+    if ((pieces == null) || (pieces.size() == 0)) {
+      return true;
+    } else {
+      if (filter.filterPieces(pieces, "Side=='" + SIDE_AXIS + "'").size() > 0) {
+        return isStackSizeOK(hr, SIDE_AXIS, 0.0d);
+      } else {
+        return isStackSizeOK(hr, SIDE_SOVIET, 0.0d);
+      }
+    }
+  }
+
   public boolean isStackSizeOK(HexRef hr, String side, double mySize) {
     if (side.equals(SIDE_AXIS)) {
       return pieceCache.getStackInfo(hr).stackSize + mySize <= 14.0d;

Modified: VSQL-src/branches/morvael/rsr/RsrPieceMover.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-06-19 04:47:15 UTC (rev 5744)
+++ VSQL-src/branches/morvael/rsr/RsrPieceMover.java	2009-06-19 10:40:42 UTC (rev 5745)
@@ -51,30 +51,12 @@
             pieces.add(s.getPieceAt(i));
           }
         }
-        if (KeyBuffer.getBuffer().containsChild(s)) {
-          KeyBuffer.getBuffer().sort(RsrPieceMover.this);
-          Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
-          GamePiece gpi;
-          while (i.hasNext()) {
-            gpi = i.next();
-            if (gpi.getParent() != s) {
-              i.remove();
-            }
+        Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
+        while (i.hasNext()) {
+          if (i.next().getParent() != s) {
+            i.remove();
           }
         }
-        /*
-        if (KeyBuffer.getBuffer().containsChild(s)) {
-          KeyBuffer.getBuffer().sort(RsrPieceMover.this);
-          Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
-          GamePiece gpi;
-          while (i.hasNext()) {
-            gpi = i.next();
-            if (gpi.getParent() != s) {
-              pieces.add(gpi);
-            }
-          }
-        }
-        */
         RsrAdvance.getInstance().selectPiecesToMove(map, pieces);
         for (GamePiece gp : pieces) {
           DragBuffer.getBuffer().add(gp);
@@ -83,35 +65,20 @@
       }
 
       public Object visitDefault(GamePiece selected) {
+        if (selected.getParent() != null) {
+          return visitStack(selected.getParent());
+        }
         DragBuffer.getBuffer().clear();
         ArrayList<GamePiece> pieces = new ArrayList<GamePiece>();
-        if (KeyBuffer.getBuffer().contains(selected)) {
-          Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
-          GamePiece gpi;
-          while (i.hasNext()) {
-            gpi = i.next();
-            if (gpi != selected) {
-              i.remove();
-            }
+        if (Boolean.TRUE.equals(selected.getProperty(Properties.NON_MOVABLE)) == false) {
+          pieces.add(selected);
+        }
+        Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
+        while (i.hasNext()) {
+          if (i.next() != selected) {
+            i.remove();
           }
-        }        /*
-        if (KeyBuffer.getBuffer().contains(selected)) {
-          Iterator<GamePiece> i = KeyBuffer.getBuffer().getPiecesIterator();
-          GamePiece gpi;
-          while (i.hasNext()) {
-            gpi = i.next();
-            if (Boolean.TRUE.equals(gpi.getProperty(Properties.NON_MOVABLE)) == false) {
-              pieces.add(gpi);
-            }
-          }
-        } else {
-        */
-          if (Boolean.TRUE.equals(selected.getProperty(Properties.NON_MOVABLE)) == false) {
-            pieces.add(selected);
-          }
-        /*
         }
-        */
         RsrAdvance.getInstance().selectPiecesToMove(map, pieces);
         for (GamePiece gp : pieces) {
           DragBuffer.getBuffer().add(gp);


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

Revision: 5746
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5746&view=rev
Author:   morvael
Date:     2009-06-19 11:47:36 +0000 (Fri, 19 Jun 2009)

Log Message:
-----------
Several bugs concerning supply and scenario fixed. Added option to delete and toggle markers (to create scenarios).

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrButton.java
    VSQL-src/branches/morvael/rsr/RsrGlobal.java
    VSQL-src/branches/morvael/rsr/RsrImmobilized.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-19 10:40:42 UTC (rev 5745)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-19 11:47:36 UTC (rev 5746)
@@ -1296,6 +1296,17 @@
     }
   }
 
+  public RsrKeyCommand[] getCommands(RsrImmobilized trait, GamePiece gp) {
+    commands.clear();
+    if (RsrGlobal.getDebug() == 1) {
+      commands.add(new RsrKeyCommand("Delete", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), gp, trait));
+      if (Filter.isAny(RsrTrait.getMarkerType(gp), "Destruction", "Control")) {
+        commands.add(new RsrKeyCommand("Toggle", KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_DOWN_MASK), gp, trait));
+      }
+    }
+    return commands.toArray(commandsArray);
+  }
+
   public RsrKeyCommand[] getCommands(RsrTrait trait, GamePiece gp) {
     commands.clear();
     if (RsrGlobal.getDebug() == 1) {
@@ -1342,6 +1353,24 @@
     return commands.toArray(commandsArray);
   }
 
+  public Command getCommand(RsrImmobilized trait, GamePiece gp, RsrKeyCommand kc) {
+    String name = kc.getName();
+    if (name.equals("Delete")) {
+      commandBaseDelete(gp);
+    } else
+    if (name.equals("Toggle")) {
+      String property = RsrTrait.getMarkerType(gp);
+      int v = RsrCounter.getIntProperty(gp, property, 1, false);
+      if (v == 1) {
+        v = 2;
+      } else {
+        v = 1;
+      }
+      commandBaseSetProperty(gp, property, String.valueOf(v));
+    }
+    return c;
+  }
+
   public Command getCommand(RsrTrait trait, GamePiece gp, RsrKeyCommand kc) {
     if (canCommand(gp) == false) {
       return c;

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-19 10:40:42 UTC (rev 5745)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-19 11:47:36 UTC (rev 5746)
@@ -150,6 +150,7 @@
         airFleetCache = new AirFleetCache(mainMap, mainGrid, filter);
         pieceCache = new PieceCache(this, mainMap, mainGrid, filter);
         supplyCache = new SupplyCache(this, mainMap, mainGrid, mainTerrain, pieceCache);
+        scenarioChanged(RsrGlobal.getScenario());
         initialized = true;
         onInitialize(param);
       } catch (Exception ex) {
@@ -2258,33 +2259,41 @@
     HashSet<HexRef> tpHexes = mainTerrain.findHexesWithTag(TAG_MAPPART, TAG_MAPPART_TP);
     HashSet<HexRef> tpnswHexes = mainTerrain.findHexesWithTag(TAG_MAPPART, TAG_MAPPART_TPNSW);
     if (side.equals(SIDE_AXIS)) {
-      for (HexRef hr : mainTerrain.findHexesWithTag(TAG_SUPPLY, TAG_SUPPLY_AXIS)) {
-        if ((isNorthMapUsed == false) && (northHexes.contains(hr))) {
-          continue;
+      if (isSubMapUsed) {
+        for (HexRef hr : mainTerrain.findHexesWithTag(TAG_SUPPLY, TAG_SUPPLY_AXIS)) {
+          if ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr))) {
+            result.add(hr);
+          }
         }
-        if ((isSouthwestMapUsed == false) && (southwestHexes.contains(hr))) {
-          continue;
+      } else {
+        for (HexRef hr : mainTerrain.findHexesWithTag(TAG_SUPPLY, TAG_SUPPLY_AXIS)) {
+          if ((isNorthMapUsed == false) && (northHexes.contains(hr))) {
+            continue;
+          }
+          if ((isSouthwestMapUsed == false) && (southwestHexes.contains(hr))) {
+            continue;
+          }
+          if ((isSouthwestMapUsed == true) && (tpnswHexes.contains(hr))) {
+            continue;
+          }
+          result.add(hr);
         }
-        if ((isSouthwestMapUsed == true) && (tpnswHexes.contains(hr))) {
-          continue;
-        }
-        if ((isSubMapUsed == false) && ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr)))) {
-          continue;
-        }
-        if ((isSubMapUsed == true) && (tpHexes.contains(hr) == false) && (tpnswHexes.contains(hr) == false)) {
-          continue;
-        }
-        result.add(hr);
-      }
-      if ((isSubMapUsed == false) && (capital != null)) {
-        if (isCityAxisControlled(capital)) {
-          for (HexRef hr : mainTerrain.findHexesWithTag(TAG_CITY, capital)) {
+        if ((isNorthMapUsed) && (isCityAxisControlled(TAG_CITY_MURMANSK))) {
+          for (HexRef hr : mainTerrain.findHexesWithTag(TAG_CITY, TAG_CITY_MURMANSK)) {
             result.add(hr);
             break;
           }
-        } else {
-          result.clear();
         }
+        if (capital != null) {
+          if (isCityAxisControlled(capital)) {
+            for (HexRef hr : mainTerrain.findHexesWithTag(TAG_CITY, capital)) {
+              result.add(hr);
+              break;
+            }
+          } else {
+            result.clear();
+          }
+        }
       }
     } else {
       if (isSubMapUsed) {

Modified: VSQL-src/branches/morvael/rsr/RsrButton.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButton.java	2009-06-19 10:40:42 UTC (rev 5745)
+++ VSQL-src/branches/morvael/rsr/RsrButton.java	2009-06-19 11:47:36 UTC (rev 5746)
@@ -44,11 +44,7 @@
     ActionListener action = new ActionListener() {
 
       public void actionPerformed(ActionEvent e) {
-        try {
-          execute();
-        } catch (RecursionLimitException ex) {
-          ErrorDialog.infiniteLoop(ex);
-        }
+        execute();
       }
     };
 
@@ -159,7 +155,7 @@
     return HelpFile.getReferenceManualPage("RsrButton.htm"); //$NON-NLS-1$
   }
 
-  protected void execute() throws RecursionLimitException {
+  protected void execute() {
     try {
       RecursionLimiter.startExecution(this);
       if (buttonClass.length() > 0) {
@@ -174,6 +170,8 @@
           ErrorDialog.bug(ex);
         }
       }
+    } catch (RecursionLimitException ex) {
+      RecursionLimiter.infiniteLoop(ex);
     } finally {
       RecursionLimiter.endExecution();
     }

Modified: VSQL-src/branches/morvael/rsr/RsrGlobal.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-06-19 10:40:42 UTC (rev 5745)
+++ VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-06-19 11:47:36 UTC (rev 5746)
@@ -487,6 +487,7 @@
           case 6 : scenario = 6; break;
         }
       }
+      getCore().scenarioChanged(scenario);
       Command c = tracker.getChangeCommand();
       Command cmd = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), "Debug " + debug + ", scenario " + scenario);
       cmd.execute();

Modified: VSQL-src/branches/morvael/rsr/RsrImmobilized.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrImmobilized.java	2009-06-19 10:40:42 UTC (rev 5745)
+++ VSQL-src/branches/morvael/rsr/RsrImmobilized.java	2009-06-19 11:47:36 UTC (rev 5746)
@@ -9,10 +9,10 @@
 import VASSAL.build.module.documentation.HelpFile;
 import VASSAL.command.Command;
 import VASSAL.counters.Decorator;
-import VASSAL.counters.EditablePiece;
 import VASSAL.counters.GamePiece;
 import VASSAL.counters.PieceEditor;
 import VASSAL.counters.Properties;
+import VASSAL.i18n.TranslatablePiece;
 import VASSAL.tools.SequenceEncoder;
 
 /**
@@ -20,10 +20,25 @@
  * @author derwido
  * @since 2009-05-08
  */
-public class RsrImmobilized extends Decorator implements EditablePiece {
+public class RsrImmobilized extends Decorator implements TranslatablePiece, RsrConstants {
 
+  // trait id
   public static final String ID = "rsr_immob;";
 
+  // dynamic counter information (volatile)
+  private GamePiece gp;
+  private RsrKeyCommand[] commands;
+
+  //common to all traits
+  private static RsrAdvance core;
+
+  private static RsrAdvance getCore() {
+    if (core == null) {
+      core = RsrAdvance.getInstance();
+    }
+    return core;
+  }
+  
   public RsrImmobilized() {
     this(RsrImmobilized.ID, null);
   }
@@ -42,12 +57,27 @@
     return piece.getName();
   }
 
-  public RsrKeyCommand[] myGetKeyCommands() {
-    return new RsrKeyCommand[0];
+  @Override
+  protected RsrKeyCommand[] myGetKeyCommands() {
+    commands = getCore().getCommands(this, getGamePiece());
+    return commands;
   }
 
-  public Command myKeyEvent(KeyStroke e) {
-    return null;
+  // No hot-keys
+  public Command myKeyEvent(KeyStroke stroke) {
+    myGetKeyCommands();
+    int match = -1;
+    for (int i = 0; i < commands.length; i++) {
+      if (commands[i].getKeyStroke().equals(stroke)) {
+        match = i;
+        break;
+      }
+    }
+    if (match == -1) {
+      return null;
+    } else {
+      return getCore().getCommand(this, gp, commands[match]);
+    }
   }
 
   @Override
@@ -92,6 +122,13 @@
   public void mySetState(String s) {
   }
 
+  private GamePiece getGamePiece() {
+    if (gp == null) {
+      gp = Decorator.getOutermost(this);
+    }
+    return gp;
+  }
+  
   public String getDescription() {
     return "Rsr Immobilized";
   }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java	2009-06-19 10:40:42 UTC (rev 5745)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java	2009-06-19 11:47:36 UTC (rev 5746)
@@ -55,10 +55,6 @@
 				addHex(selectedHexes, hr, create(null, true, rangeMod * 4.0, false, MODE_NORMAL, 0));
 			}			
 		}
-    //Murmansk is Axis permanent supply source (if controlled)
-    if (core.isCityAxisControlled(TAG_CITY_MURMANSK)) {
-      addHex(selectedHexes, core.getCityHexRef(TAG_CITY_MURMANSK), create(null, true, rangeMod * 4.0, false, MODE_NORMAL, 0));
-    }
 		//find hexes for sea supply
 		if ((piece == null) || ((RsrTrait.getNationality(piece).equals(NATIONALITY_GERMAN)) && (RsrTrait.getType(piece).equals("Airbase") == false))) {
 			if ((core.isCityAxisControlled(TAG_CITY_ODESSA)) && (core.isCityAxisControlled(TAG_CITY_SEVASTOPOL))) {


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

Revision: 5747
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5747&view=rev
Author:   morvael
Date:     2009-06-19 13:50:53 +0000 (Fri, 19 Jun 2009)

Log Message:
-----------
Several bugs concerning supply and scenario fixed. Added option to fetch combat strength marker in debug mode.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrConstants.java

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-19 11:47:36 UTC (rev 5746)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-19 13:50:53 UTC (rev 5747)
@@ -1303,6 +1303,10 @@
       if (Filter.isAny(RsrTrait.getMarkerType(gp), "Destruction", "Control")) {
         commands.add(new RsrKeyCommand("Toggle", KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_DOWN_MASK), gp, trait));
       }
+      if ((RsrTrait.getType(gp).equals("Strength")) && (gp.getMap() == mainMap)) {
+        commands.add(new RsrKeyCommand("Fetch to army here", KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_DOWN_MASK), gp, trait));
+        commands.add(new RsrKeyCommand("Fetch to army here (reduced)", KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK), gp, trait));
+      }
     }
     return commands.toArray(commandsArray);
   }
@@ -1357,8 +1361,7 @@
     String name = kc.getName();
     if (name.equals("Delete")) {
       commandBaseDelete(gp);
-    } else
-    if (name.equals("Toggle")) {
+    } else if (name.equals("Toggle")) {
       String property = RsrTrait.getMarkerType(gp);
       int v = RsrCounter.getIntProperty(gp, property, 1, false);
       if (v == 1) {
@@ -1367,6 +1370,21 @@
         v = 1;
       }
       commandBaseSetProperty(gp, property, String.valueOf(v));
+    } else if (name.startsWith("Fetch to army here")) {
+      HexRef hr = getHexRef(gp.getPosition());
+      String unitType;
+      for (GamePiece fgp : pieceCache.getPiecesIn(hr)) {
+        unitType = RsrTrait.getUnitType(fgp);
+        if ((unitType.startsWith("Soviet")) && (unitType.endsWith("Army")) && (RsrTrait.getStrengthClass(gp).equals(RsrTrait.getCombatClass(fgp)))) {
+          commandSendToOffboardZone(gp, RsrTrait.getCombatClass(fgp) + "-used strength pool");
+          commandUpdateStrength(fgp, gp);
+          if (name.endsWith(" (reduced)")) {
+            commandBaseSetProperty(fgp, T_CURRENT_STEP, 1);
+            commandUpdateStrength(fgp, gp);
+          }
+          break;
+        }
+      }
     }
     return c;
   }

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-19 11:47:36 UTC (rev 5746)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-19 13:50:53 UTC (rev 5747)
@@ -470,7 +470,7 @@
     return result;
   }
 
-  private void commandUpdateStrength(GamePiece gp, GamePiece sgp) {
+  public void commandUpdateStrength(GamePiece gp, GamePiece sgp) {
     if (sgp == null) {
       commandBaseSetProperty(gp, T_STRENGTH_ID, "");
     } else {
@@ -2124,7 +2124,7 @@
   }
 
   public boolean isProductionTurn(int turnNumber) {
-    return (turnNumber == 5) || (turnNumber == 7) ||
+    return (RsrGlobal.getScenario() != 1) && ((turnNumber == 5) || (turnNumber == 7) ||
             (turnNumber == 9) || (turnNumber == 11) ||
             (turnNumber == 12) || (turnNumber == 14) ||
             (turnNumber == 19) || (turnNumber == 21) ||
@@ -2132,7 +2132,7 @@
             (turnNumber == 26) || (turnNumber == 28) ||
             (turnNumber == 33) || (turnNumber == 35) ||
             (turnNumber == 37) || (turnNumber == 39) ||
-            (turnNumber == 40);
+            (turnNumber == 40));
   }
 
   public int getProductionNumber() {
@@ -2258,10 +2258,11 @@
     HashSet<HexRef> southwestHexes = mainTerrain.findHexesWithTag(TAG_MAPPART, TAG_MAPPART_SOUTHWEST);
     HashSet<HexRef> tpHexes = mainTerrain.findHexesWithTag(TAG_MAPPART, TAG_MAPPART_TP);
     HashSet<HexRef> tpnswHexes = mainTerrain.findHexesWithTag(TAG_MAPPART, TAG_MAPPART_TPNSW);
+    HashSet<HexRef> tpnormalHexes = mainTerrain.findHexesWithTag(TAG_MAPPART, TAG_MAPPART_TPNORMAL);
     if (side.equals(SIDE_AXIS)) {
       if (isSubMapUsed) {
         for (HexRef hr : mainTerrain.findHexesWithTag(TAG_SUPPLY, TAG_SUPPLY_AXIS)) {
-          if ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr))) {
+          if ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr)) || (tpnormalHexes.contains(hr))) {
             result.add(hr);
           }
         }
@@ -2276,6 +2277,9 @@
           if ((isSouthwestMapUsed == true) && (tpnswHexes.contains(hr))) {
             continue;
           }
+          if (tpHexes.contains(hr)) {
+            continue;
+          }
           result.add(hr);
         }
         if ((isNorthMapUsed) && (isCityAxisControlled(TAG_CITY_MURMANSK))) {
@@ -2298,7 +2302,7 @@
     } else {
       if (isSubMapUsed) {
         for (HexRef hr : mainTerrain.findHexesWithTag(TAG_SUPPLY, TAG_SUPPLY_SOVIET)) {
-          if ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr))) {
+          if ((tpHexes.contains(hr)) || (tpnswHexes.contains(hr)) || (tpnormalHexes.contains(hr))) {
             result.add(hr);
           }
         }
@@ -2313,6 +2317,9 @@
           if ((isSouthwestMapUsed == true) && (tpnswHexes.contains(hr))) {
             continue;
           }
+          if (tpHexes.contains(hr)) {
+            continue;
+          }
           result.add(hr);
         }
         if ((isCityDestroyed(TAG_CITY_MOSCOW) == false) && (isCityAxisControlled(TAG_CITY_MOSCOW) == false)) {
@@ -2610,9 +2617,11 @@
 
   public int allowSeaMovement(String side) {
     int result = 0;
-    result += allowSeaMovement(side, TAG_PORT_ARCTIC);
-    result += allowSeaMovement(side, TAG_PORT_BALTIC);
-    result += allowSeaMovement(side, TAG_PORT_BLACKSEA);
+    if (RsrGlobal.getScenario() != 1) {
+      result += allowSeaMovement(side, TAG_PORT_ARCTIC);
+      result += allowSeaMovement(side, TAG_PORT_BALTIC);
+      result += allowSeaMovement(side, TAG_PORT_BLACKSEA);
+    }
     return result;
   }
 

Modified: VSQL-src/branches/morvael/rsr/RsrConstants.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrConstants.java	2009-06-19 11:47:36 UTC (rev 5746)
+++ VSQL-src/branches/morvael/rsr/RsrConstants.java	2009-06-19 13:50:53 UTC (rev 5747)
@@ -114,6 +114,7 @@
   public static final String TAG_MAPPART_SOUTHWEST = "Southwest";
   public static final String TAG_MAPPART_TP = "TP";
   public static final String TAG_MAPPART_TPNSW = "TPnSW";
+  public static final String TAG_MAPPART_TPNORMAL = "TPNormal";
 
   public static final String MOVEMENT = "Movement";
   public static final String VP = "VP";


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

Revision: 5748
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5748&view=rev
Author:   morvael
Date:     2009-06-19 21:07:07 +0000 (Fri, 19 Jun 2009)

Log Message:
-----------
Added command for step loss in debug mode. Fixed problem with starting second game (recreation of RsrAdvance).

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrButton.java

Removed Paths:
-------------
    VSQL-src/branches/morvael/rsr/GameMisc.java

Deleted: VSQL-src/branches/morvael/rsr/GameMisc.java
===================================================================
--- VSQL-src/branches/morvael/rsr/GameMisc.java	2009-06-19 13:50:53 UTC (rev 5747)
+++ VSQL-src/branches/morvael/rsr/GameMisc.java	2009-06-19 21:07:07 UTC (rev 5748)
@@ -1,95 +0,0 @@
-package rsr;
-
-import VASSAL.counters.GamePiece;
-import VASSAL.counters.KeyBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- *
- * @author derwido
- * @since 2009-05-14
- */
-public class GameMisc implements RsrButtonCommand, RsrConstants {
-
-  private static GameMisc instance;
-
-  public static GameMisc getInstance() {
-    if (instance == null) {
-      new GameMisc();
-    }
-    return instance;
-  }
-
-  public GameMisc() {
-    if (instance == null) {
-      instance = this;
-    }
-  }
-
-  public RsrButtonCommand getDesiredInstance() {
-    return GameMisc.getInstance();
-  }
-
-  private ArrayList<GamePiece> getSelectedPieces() {
-    ArrayList<GamePiece> result = new ArrayList<GamePiece>();
-    Iterator<GamePiece> it = KeyBuffer.getBuffer().getPiecesIterator();
-    GamePiece gp;
-    while (it.hasNext()) {
-      gp = it.next();
-      if (gp.getMap() == RsrAdvance.getInstance().getMainMap()) {
-        result.add(gp);
-      }
-    }
-    return result;
-  }
-
-  public void execute(String param) {
-    if (param.equals("clear")) {
-      if (RsrGlobal.getCombatStage() > 0) {
-        RsrAdvance.getInstance().commandClearCombat(false);
-        RsrAdvance.getInstance().sendAndLog();
-      }
-    } else if (param.equals("advance")) {
-      if (RsrGlobal.getCombatStage() > 0) {
-        RsrAdvance.getInstance().commandResolveCombat(false);
-        RsrAdvance.getInstance().sendAndLog();
-      }
-    } else if (param.equals("breakdown")) {
-      if (RsrAdvance.getInstance().getPhaseName().equals(PHASE_ADMINISTRATIVE)) {
-        int phasePart = RsrGlobal.getPhasePart() - 1;
-        if ((phasePart == 1) || (phasePart == 3)) {
-          RsrAdvance.getInstance().commandBreakdown(getSelectedPieces());
-          RsrAdvance.getInstance().sendAndLog();
-        }
-      }
-    } else if (param.equals("buildup")) {
-      if (RsrAdvance.getInstance().getPhaseName().equals(PHASE_ADMINISTRATIVE)) {
-        int phasePart = RsrGlobal.getPhasePart() - 1;
-        if ((phasePart == 1) || (phasePart == 3)) {
-          RsrAdvance.getInstance().commandBuildup(getSelectedPieces());
-          RsrAdvance.getInstance().sendAndLog();
-        }
-      }
-    } else if (param.equals("incorporate")) {
-      if (RsrAdvance.getInstance().getPhaseName().equals(PHASE_ADMINISTRATIVE)) {
-        int phasePart = RsrGlobal.getPhasePart() - 1;
-        if (phasePart == 3) {
-          RsrAdvance.getInstance().commandIncorporate(getSelectedPieces());
-          RsrAdvance.getInstance().sendAndLog();
-        }
-      }
-    } else if (param.equals("germanSupply")) {
-      RsrAdvance.getInstance().showSupplyShading(1);
-    } else if (param.equals("sovietSupply")) {
-      RsrAdvance.getInstance().showSupplyShading(4);
-    } else if (param.equals("romanianSupply")) {
-      RsrAdvance.getInstance().showSupplyShading(2);
-    } else if (param.equals("finnishSupply")) {
-      RsrAdvance.getInstance().showSupplyShading(3);
-    } else if (param.equals("vp")) {
-      RsrAdvance.getInstance().calculateVP(true);
-    }
-  }
-
-}

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-19 13:50:53 UTC (rev 5747)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-19 21:07:07 UTC (rev 5748)
@@ -1,5 +1,7 @@
 package rsr;
 
+import VASSAL.build.GameModule;
+import VASSAL.build.module.GameComponent;
 import VASSAL.build.module.Map;
 import VASSAL.command.Command;
 import java.awt.Point;
@@ -23,7 +25,6 @@
  */
 public final class RsrAdvance extends RsrAdvanceBase {
 
-
   private static RsrAdvance instance;
 
   public static RsrAdvance getInstance() {
@@ -40,6 +41,19 @@
     super();
     if (instance == null) {
       instance = this;
+      ArrayList<GameComponent> toRemove = new ArrayList<GameComponent>();
+      Iterator<GameComponent> it = GameModule.getGameModule().getGameState().getGameComponents().iterator();
+      GameComponent gc;
+      while (it.hasNext()) {
+        gc = it.next();
+        if (gc instanceof RsrAdvance) {
+          toRemove.add(gc);
+        }
+      }
+      for (GameComponent fgc : toRemove) {
+        GameModule.getGameModule().getGameState().removeGameComponent(fgc);
+      }
+      GameModule.getGameModule().getGameState().addGameComponent(this);
       initialize("");
     }
   }
@@ -1315,6 +1329,9 @@
     commands.clear();
     if (RsrGlobal.getDebug() == 1) {
       commands.add(new RsrKeyCommand("Delete", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), gp, trait));
+      if ((RsrTrait.getCurrentStep(gp) == 2) && (gp.getMap() == mainMap)) {
+        commands.add(new RsrKeyCommand("Reduce strength", KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK), gp, trait));
+      }
     }
     if (canCommand(gp) == false) {
       return commands.toArray(commandsArray);
@@ -1377,11 +1394,10 @@
         unitType = RsrTrait.getUnitType(fgp);
         if ((unitType.startsWith("Soviet")) && (unitType.endsWith("Army")) && (RsrTrait.getStrengthClass(gp).equals(RsrTrait.getCombatClass(fgp)))) {
           commandSendToOffboardZone(gp, RsrTrait.getCombatClass(fgp) + "-used strength pool");
-          commandUpdateStrength(fgp, gp);
           if (name.endsWith(" (reduced)")) {
             commandBaseSetProperty(fgp, T_CURRENT_STEP, 1);
-            commandUpdateStrength(fgp, gp);
           }
+          commandUpdateStrength(fgp, gp);
           break;
         }
       }
@@ -1396,6 +1412,9 @@
     String name = kc.getName();
     if (name.equals("Delete")) {
       commandBaseDelete(gp);
+    } else if (name.equals("Reduce strength")) {
+      commandBaseSetProperty(gp, T_CURRENT_STEP, 1);
+      commandUpdateStrength(gp, findStrength(RsrTrait.getCombatClass(gp), RsrTrait.getStrengthID(gp)));
     } else if (name.equals("Step loss")) {
       int combatStage = RsrGlobal.getCombatStage();
       if ((combatStage == 2) || (combatStage == 3)) {
@@ -1446,6 +1465,10 @@
     return c;
   }
 
+  public void setup(boolean gameStarting) {
+    if (instance == this) {
+      instance = null;
+    }
+  }
 
-
 }

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-19 13:50:53 UTC (rev 5747)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-19 21:07:07 UTC (rev 5748)
@@ -2,6 +2,7 @@
 
 import VASSAL.build.GameModule;
 import VASSAL.build.module.Chatter;
+import VASSAL.build.module.GameComponent;
 import VASSAL.build.module.GlobalOptions;
 import VASSAL.build.module.Map;
 import VASSAL.build.module.PlayerRoster;
@@ -16,6 +17,7 @@
 import VASSAL.counters.GamePiece;
 import java.awt.Point;
 import VASSAL.build.module.map.boardPicker.board.mapgrid.Zone;
+import VASSAL.counters.KeyBuffer;
 import filter.DefaultPropertyReaderSource;
 import java.awt.Rectangle;
 import java.util.ArrayList;
@@ -38,7 +40,7 @@
  * @author derwido
  * @since 2009-05-08
  */
-public abstract class RsrAdvanceBase implements RsrButtonCommand, RsrConstants {
+public abstract class RsrAdvanceBase implements RsrButtonCommand, RsrConstants, GameComponent {
 
   private boolean initialized;
   protected DefaultPropertyReaderSource propertyReaderSource;
@@ -159,9 +161,68 @@
     return initialized;
   }
 
+  private ArrayList<GamePiece> getSelectedPieces() {
+    ArrayList<GamePiece> result = new ArrayList<GamePiece>();
+    Iterator<GamePiece> it = KeyBuffer.getBuffer().getPiecesIterator();
+    GamePiece gp;
+    while (it.hasNext()) {
+      gp = it.next();
+      if (gp.getMap() == RsrAdvance.getInstance().getMainMap()) {
+        result.add(gp);
+      }
+    }
+    return result;
+  }
+  
   public final void execute(String param) {
-    commandAdvance(false);
-    sendAndLog();
+    if (param.equals("")) {
+      commandAdvance(false);
+      sendAndLog();
+    } else if (param.equals("clear")) {
+      if (RsrGlobal.getCombatStage() > 0) {
+        commandClearCombat(false);
+        sendAndLog();
+      }
+    } else if (param.equals("advance")) {
+      if (RsrGlobal.getCombatStage() > 0) {
+        commandResolveCombat(false);
+        sendAndLog();
+      }
+    } else if (param.equals("breakdown")) {
+      if (getPhaseName().equals(PHASE_ADMINISTRATIVE)) {
+        int phasePart = RsrGlobal.getPhasePart() - 1;
+        if ((phasePart == 1) || (phasePart == 3)) {
+          commandBreakdown(getSelectedPieces());
+          sendAndLog();
+        }
+      }
+    } else if (param.equals("buildup")) {
+      if (getPhaseName().equals(PHASE_ADMINISTRATIVE)) {
+        int phasePart = RsrGlobal.getPhasePart() - 1;
+        if ((phasePart == 1) || (phasePart == 3)) {
+          commandBuildup(getSelectedPieces());
+          sendAndLog();
+        }
+      }
+    } else if (param.equals("incorporate")) {
+      if (getPhaseName().equals(PHASE_ADMINISTRATIVE)) {
+        int phasePart = RsrGlobal.getPhasePart() - 1;
+        if (phasePart == 3) {
+          commandIncorporate(getSelectedPieces());
+          sendAndLog();
+        }
+      }
+    } else if (param.equals("germanSupply")) {
+      showSupplyShading(1);
+    } else if (param.equals("sovietSupply")) {
+      showSupplyShading(4);
+    } else if (param.equals("romanianSupply")) {
+      showSupplyShading(2);
+    } else if (param.equals("finnishSupply")) {
+      showSupplyShading(3);
+    } else if (param.equals("vp")) {
+      calculateVP(true);
+    }
   }
 
   protected abstract void onInitialize(String param);
@@ -3290,5 +3351,9 @@
     }
     return level;
   }
+
+  public Command getRestoreCommand() {
+    return null;
+  }
   
 }

Modified: VSQL-src/branches/morvael/rsr/RsrButton.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButton.java	2009-06-19 13:50:53 UTC (rev 5747)
+++ VSQL-src/branches/morvael/rsr/RsrButton.java	2009-06-19 21:07:07 UTC (rev 5748)
@@ -163,9 +163,8 @@
           if (cmd == null) {
             Class c = Class.forName(buttonClass);
             cmd = (RsrButtonCommand)c.newInstance();
-            cmd = cmd.getDesiredInstance();
           }
-          cmd.execute(buttonParam);
+          cmd.getDesiredInstance().execute(buttonParam);
         } catch (Exception ex) {
           ErrorDialog.bug(ex);
         }


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

Revision: 5751
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5751&view=rev
Author:   morvael
Date:     2009-06-20 07:19:44 +0000 (Sat, 20 Jun 2009)

Log Message:
-----------
Restart bug fixed (proper reset of objects dependant on RsrAdvance).

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrGlobal.java
    VSQL-src/branches/morvael/rsr/RsrImmobilized.java
    VSQL-src/branches/morvael/rsr/RsrTrait.java

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-20 00:51:29 UTC (rev 5750)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-06-20 07:19:44 UTC (rev 5751)
@@ -1468,6 +1468,9 @@
   public void setup(boolean gameStarting) {
     if (instance == this) {
       instance = null;
+      RsrGlobal.invalidate();
+      RsrImmobilized.invalidate();
+      RsrTrait.invalidate();
     }
   }
 

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-20 00:51:29 UTC (rev 5750)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-20 07:19:44 UTC (rev 5751)
@@ -167,7 +167,7 @@
     GamePiece gp;
     while (it.hasNext()) {
       gp = it.next();
-      if (gp.getMap() == RsrAdvance.getInstance().getMainMap()) {
+      if (gp.getMap() == mainMap) {
         result.add(gp);
       }
     }
@@ -2861,7 +2861,7 @@
         if (test) {
           return -1;
         } else {
-          RsrAdvance.getInstance().commandFetchCounter(gp);
+          commandFetchCounter(gp);
         }
       }
       strengthPiece = findStrength(RsrTrait.getCombatClass(gp), RsrTrait.getStrengthID(gp));
@@ -2895,7 +2895,7 @@
         if (test) {
           return -1;
         } else {
-          RsrAdvance.getInstance().commandFetchCounter(gp);
+          commandFetchCounter(gp);
         }
       }
       strengthPiece = findStrength(RsrTrait.getCombatClass(gp), RsrTrait.getStrengthID(gp));

Modified: VSQL-src/branches/morvael/rsr/RsrGlobal.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-06-20 00:51:29 UTC (rev 5750)
+++ VSQL-src/branches/morvael/rsr/RsrGlobal.java	2009-06-20 07:19:44 UTC (rev 5751)
@@ -15,7 +15,6 @@
 import javax.swing.KeyStroke;
 
 import VASSAL.build.module.documentation.HelpFile;
-import VASSAL.build.module.map.boardPicker.Board;
 import VASSAL.command.ChangeTracker;
 import VASSAL.command.Command;
 import VASSAL.configure.StringConfigurer;
@@ -70,6 +69,7 @@
   private RsrKeyCommand[] commands1;
 
   private static RsrGlobal instance;
+  private static RsrAdvance core;
 
   public RsrGlobal() {
     this(ID, null);
@@ -538,13 +538,6 @@
     }
   }
 
-  private static RsrAdvance core;
-  private static GamePiece dataPiece;
-  private static Board turnBoard;
-  private static GamePiece turnPiece;
-  private static GamePiece phasePiece;
-
-
   private static final RsrAdvance getCore() {
     if (core == null) {
       core = RsrAdvance.getInstance();
@@ -552,34 +545,11 @@
     return core;
   }
 
-  private static final GamePiece getDataPiece() {
-    if (dataPiece == null) {
-      dataPiece = getCore().getDataPiece();
-    }
-    return dataPiece;
+  public static void invalidate() {
+    core = null;
+    instance = null;
   }
 
-  private static final Board getTurnBoard() {
-    if (turnBoard == null) {
-      turnBoard = getCore().getTurnBoard();
-    }
-    return turnBoard;
-  }
-
-  private static final GamePiece getTurnPiece() {
-    if (turnPiece == null) {
-      turnPiece = getCore().getTurnPiece();
-    }
-    return turnPiece;
-  }
-
-  private static final GamePiece getPhasePiece() {
-    if (phasePiece == null) {
-      phasePiece = getCore().getPhasePiece();
-    }
-    return phasePiece;
-  }
-
   public static final int getDebug() {
     return instance.debug;
   }

Modified: VSQL-src/branches/morvael/rsr/RsrImmobilized.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrImmobilized.java	2009-06-20 00:51:29 UTC (rev 5750)
+++ VSQL-src/branches/morvael/rsr/RsrImmobilized.java	2009-06-20 07:19:44 UTC (rev 5751)
@@ -38,6 +38,10 @@
     }
     return core;
   }
+
+  public static void invalidate() {
+    core = null;
+  }
   
   public RsrImmobilized() {
     this(RsrImmobilized.ID, null);

Modified: VSQL-src/branches/morvael/rsr/RsrTrait.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-06-20 00:51:29 UTC (rev 5750)
+++ VSQL-src/branches/morvael/rsr/RsrTrait.java	2009-06-20 07:19:44 UTC (rev 5751)
@@ -122,6 +122,10 @@
     return core;
   }
 
+  public static void invalidate() {
+    core = null;
+  }
+
   public RsrTrait() {
     this(ID, null);
   }


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

Revision: 5800
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5800&view=rev
Author:   morvael
Date:     2009-07-01 12:19:40 +0000 (Wed, 01 Jul 2009)

Log Message:
-----------
Fixes for 4.0.2.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java

Added Paths:
-----------
    VSQL-src/branches/morvael/rsr/ClearCacheCommand.java

Added: VSQL-src/branches/morvael/rsr/ClearCacheCommand.java
===================================================================
--- VSQL-src/branches/morvael/rsr/ClearCacheCommand.java	                        (rev 0)
+++ VSQL-src/branches/morvael/rsr/ClearCacheCommand.java	2009-07-01 12:19:40 UTC (rev 5800)
@@ -0,0 +1,26 @@
+package rsr;
+
+import VASSAL.command.Command;
+
+/**
+ *
+ * @author derwido
+ * @since 2009-07-01
+ */
+public class ClearCacheCommand extends Command {
+
+  public ClearCacheCommand() {
+
+  }
+
+  @Override
+  protected void executeCommand() {
+    RsrAdvance.getInstance().clearAll();
+  }
+
+  @Override
+  protected Command myUndoCommand() {
+    return this;
+  }
+
+}

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-06-30 22:26:08 UTC (rev 5799)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2009-07-01 12:19:40 UTC (rev 5800)
@@ -239,6 +239,7 @@
 
   public void sendAndLog() {
     if (c != null) {
+      commandBaseClearAll();
       controlMarkers.clear();
       destroyedMarkers.clear();
       moveMode = MOVE_FREE;
@@ -251,10 +252,24 @@
     }
   }
 
+  public void clearAll() {
+    airFleetCache.clear();
+    supplyCache.clear();
+    pieceCache.clear();
+    controlMarkers.clear();
+    destroyedMarkers.clear();
+    moveMode = MOVE_FREE;
+    allowedMovement.clear();
+  }
+
   public void clearCommand() {
     c = null;
   }
 
+  public void commandBaseClearAll() {
+    appendCommand(new ClearCacheCommand());
+  }
+
   public void commandBaseLog(String message) {
     Command cmd = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), message);
     cmd.execute();
@@ -1759,18 +1774,24 @@
     return turnBoard.locationName(phasePiece.getPosition());
   }
 
-  public HashMap<HexRef, TerrainMapShaderCost> getAttackHexes(GamePiece gp) {
-    HashMap<HexRef, TerrainMapShaderCost> result = new HashMap<HexRef, TerrainMapShaderCost>();
-    //
-    String attackerSide = RsrTrait.getSide(gp);
-    //no attack if this is an Axis unit in Finland or Romania on turn 1
-    if ((attackerSide.equals(SIDE_AXIS)) && (getTurnNumber() == 1)) {
+  public boolean isLockedInFinlandOrRomania(GamePiece gp) {
+    if ((RsrTrait.getSide(gp).equals(SIDE_AXIS)) && (getTurnNumber() == 1)) {
       String country = mainTerrain.getAttributeTerrainValue(mainGrid.getHexPos(gp.getPosition()), TAG_COUNTRY);
       if ((country.equals(TAG_COUNTRY_FINLAND)) || (country.equals(TAG_COUNTRY_ROMANIA))) {
-        return result;
+        return true;
       }
     }
+    return false;
+  }
+
+  public HashMap<HexRef, TerrainMapShaderCost> getAttackHexes(GamePiece gp) {
+    HashMap<HexRef, TerrainMapShaderCost> result = new HashMap<HexRef, TerrainMapShaderCost>();
+    //no attack if this is an Axis unit in Finland or Romania on turn 1
+    if (isLockedInFinlandOrRomania(gp)) {
+      return result;
+    }
     //
+    String attackerSide = RsrTrait.getSide(gp);
     String defenderSide = attackerSide.equals(SIDE_AXIS) ? SIDE_SOVIET : SIDE_AXIS;
     HexRef fromHex = mainGrid.getHexPos(gp.getPosition());
     int movementMode = RsrTrait.getMovementTypeAsInt(gp);
@@ -2792,11 +2813,8 @@
 
   public double getMovementAllowance(GamePiece gp) {
     double result = RsrTrait.getMovement(gp);
-    if (getTurnNumber() == 1) {
-      String country = mainTerrain.getAttributeTerrainValue(getHexRef(gp.getPosition()), TAG_COUNTRY);
-      if ((country.equals(TAG_COUNTRY_FINLAND)) || (country.equals(TAG_COUNTRY_ROMANIA))) {
-        result = 0.0d;
-      }
+    if (isLockedInFinlandOrRomania(gp)) {
+      result = 0.0d;
     }
     if (RsrTrait.isSupplyLevel(gp, SUPPLY_LACK, SUPPLY_OUT)) {
       result = Math.ceil(result * 0.5d);
@@ -2815,11 +2833,8 @@
     if (RsrTrait.isSupplyLevel(gp, SUPPLY_EMERGENCY, SUPPLY_LACK, SUPPLY_OUT)) {
       return 0.0d;
     }
-    if (getTurnNumber() == 1) {
-      String country = mainTerrain.getAttributeTerrainValue(getHexRef(gp.getPosition()), TAG_COUNTRY);
-      if ((country.equals(TAG_COUNTRY_FINLAND)) || (country.equals(TAG_COUNTRY_ROMANIA))) {
-        return 0.0d;
-      }
+    if (isLockedInFinlandOrRomania(gp)) {
+      return 0.0d;
     }
     return 25.0d;
   }
@@ -3047,6 +3062,10 @@
       return;
     }
     GamePiece gp = pieces.get(0);
+    if (isLockedInFinlandOrRomania(gp)) {
+      commandBaseLog("No breakdown allowed in Finland or Romania on turn 1.");
+      return;
+    }
     if (RsrTrait.getReorganized(gp) > 0) {
       commandBaseLog("No breakdown allowed.");
       return;
@@ -3147,6 +3166,10 @@
       gp1 = gp2;
       gp2 = gpr;
     }
+    if ((isLockedInFinlandOrRomania(gp1)) || (isLockedInFinlandOrRomania(gp2))) {
+      commandBaseLog("No buildup allowed in Finland or Romania on turn 1.");
+      return;
+    }
     if ((RsrTrait.getReorganized(gp1) > 0) && (RsrTrait.getReorganized(gp2) > 0)) { //&& to allow buildup if one unit was part of earlier breakdown
       commandBaseLog("No buildup allowed.");
       return;


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

Revision: 6245
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6245&view=rev
Author:   morvael
Date:     2009-11-16 16:42:27 +0000 (Mon, 16 Nov 2009)

Log Message:
-----------
Fixed problems in RSR module when reinforcements could not be deployed as well as added the option to delay reinforcements allowed by the rules.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderHQReinforcement.java

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-11-16 13:04:15 UTC (rev 6244)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2009-11-16 16:42:27 UTC (rev 6245)
@@ -357,10 +357,21 @@
   private void executeAxisReinforcement1() {
     ArrayList<GamePiece> reinforcements = filter.filterPieces(turnMap, "LocationName=='A" + getTurnName() + "'");
     if (reinforcements.size() > 0) {
+      int count = 0;
       for (GamePiece gp : reinforcements) {
-        commandAllowMovement(gp, 0.0d, true);
+        if (getReinforcementHexes(gp).isEmpty()) {
+          commandSendToReinforcementZone(gp, 1, "Axis Permanently Eliminated Units Box");
+        } else {
+          commandAllowMovement(gp, 0.0d, true);
+          commandAllowAction(gp);
+          count++;
+        }
       }
-      commandBaseLog("Axis Player: Put reinforcements on map.");
+      if (count > 0) {
+        commandBaseLog("Axis Player: Put reinforcements on map.");
+      } else {
+        autoAdvance = true;
+      }
     } else {
       autoAdvance = true;
     }
@@ -534,8 +545,13 @@
           unitType = RsrTrait.getUnitType(gp);
           if ((unitType.equals("SovietGuardsArmy")) || (unitType.equals("SovietShockArmy"))) {
             if (RsrGlobal.getScenario() == 1) {
-              commandAllowMovement(gp, 0.0d, true);
-              count++;
+              if (getReinforcementHexes(gp).isEmpty()) {
+                commandSendToReinforcementZone(gp, 1, "Soviet Permanently Eliminated Units Box");
+              } else {
+                commandAllowMovement(gp, 0.0d, true);
+                commandAllowAction(gp);
+                count++;
+              }
             } else {
               commandSendToOffboardZone(gp, "Awaiting Promotion Box");
             }
@@ -543,17 +559,32 @@
           if (unitType.equals("SovietAirborneCorps")) {
             commandSendToOffboardZone(gp, "Paradrop Waiting Box");
           } else {
+            if (getReinforcementHexes(gp).isEmpty()) {
+              commandSendToReinforcementZone(gp, 1, "Soviet Permanently Eliminated Units Box");
+            } else {
+              commandAllowMovement(gp, 0.0d, true);
+              commandAllowAction(gp);
+              count++;
+            }
+          }
+        } else
+        if (type.equals("Headquarters")) {
+          if (getReinforcementHexes(gp).isEmpty()) {
+            commandSendToReinforcementZone(gp, 1, "Soviet Permanently Eliminated Units Box");
+          } else {
             commandAllowMovement(gp, 0.0d, true);
+            commandAllowAction(gp);
             count++;
           }
         } else
-        if (type.equals("Headquarters")) {
-          commandAllowMovement(gp, 0.0d, true);
-          count++;
-        } else
         if (type.equals("Leader")) {
-          commandAllowMovement(gp, 0.0d, true);
-          count++;
+          if (getReinforcementHexes(gp).isEmpty()) {
+            commandSendToReinforcementZone(gp, 1, "Soviet Permanently Eliminated Units Box");
+          } else {
+            commandAllowMovement(gp, 0.0d, true);
+            commandAllowAction(gp);
+            count++;
+          }
         }
       }
       if (count > 0) {
@@ -1346,6 +1377,10 @@
         commands.add(new RsrKeyCommand("Remove Depot", KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_DOWN_MASK), gp, trait));
         commands.add(new RsrKeyCommand("Convert Depot", KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK), gp, trait));
       }
+    } else if ((phaseName.equals(PHASE_AXIS_REINFORCEMENT)) || (phaseName.equals(PHASE_SOVIET_REINFORCEMENT))) {
+      if ((phasePart == 1) && (RsrTrait.getHlAction(gp) > 0)) {
+        commands.add(new RsrKeyCommand("Delay", KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK), gp, trait));
+      }
     } else if (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) {
       if ((phasePart == 3) && (RsrTrait.getHlLoss(gp) > 0)) {
         commands.add(new RsrKeyCommand("Eliminate", KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK), gp, trait));
@@ -1464,6 +1499,9 @@
         commandBaseSetProperty(gp, PROPERTY_SUPPLY_MODE, 1);
         commandLogMy("Converted emergency supply source in " + mainGrid.locationName(gp.getPosition()) + " back into supply depot.");
       }
+    } else if (name.equals("Delay")) {
+      commandLogMy("Voluntarily delayed entry of " + gp.getName() + ".");
+      commandSendToReinforcementZone(gp, 1, RsrTrait.getSide(gp).equals(SIDE_AXIS) ? "Axis Permanently Eliminated Units Box" : "Soviet Permanently Eliminated Units Box");
     }
     return c;
   }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderHQReinforcement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderHQReinforcement.java	2009-11-16 13:04:15 UTC (rev 6244)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderHQReinforcement.java	2009-11-16 16:42:27 UTC (rev 6245)
@@ -53,7 +53,7 @@
       }
     } else {
       HexRef hr = core.getCityHexRef(capital);
-      if (canEnter(hr)) {
+      if ((canEnter(hr)) && (core.isCityAxisControlled(capital))) {
         addHex(selectedHexes, hr, create(null, true, 4.0, false, null, 0));
       }
     }


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

Revision: 6965
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6965&view=rev
Author:   morvael
Date:     2010-06-29 10:19:13 +0000 (Tue, 29 Jun 2010)

Log Message:
-----------
4.0.6 changes: stack limit enforced at end of phase, drawing counter info on zoom out.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
    VSQL-src/branches/morvael/rsr/RsrTrait.java

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2010-06-20 18:30:10 UTC (rev 6964)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2010-06-29 10:19:13 UTC (rev 6965)
@@ -160,7 +160,7 @@
     }
   }
 
-  /*
+  /**
    * Check supply of airbases. (AUTO)
    * Remove out of supply airbases from the map. (AUTO)
    * If not mud turn, place air fleets on airbases. (AUTO)
@@ -204,7 +204,7 @@
     }
   }
 
-  /*
+  /**
    * Check supply of all units (except airbases). (AUTO)
    * Check attrition of all isolated units. (AUTO)
    * Remove supply depots converted into emergency supply sources. (AUTO)
@@ -382,7 +382,9 @@
     }
   }
 
-  //sea movement - MANUAL
+  /**
+   * Sea movement. (MANUAL)
+   */
   private void executeAxisMovement1() {
     if (allowSeaMovement(SIDE_AXIS) > 0) {
       commandBaseLog("Axis Player: Move units (sea movement).");
@@ -412,8 +414,8 @@
     }
   }
 
-  /*
-   * Set movement for all moveable Axis units (except airbases). (AUTO)
+  /**
+   * Set movement for all movable Axis units (except airbases). (AUTO)
    * Ask Axis player to move units (except airbases). (MANUAL)
    */
   private void executeAxisMovement3() {
@@ -435,7 +437,7 @@
   }
 
   /**
-   * Set movement for all moveable airbases. (AUTO)
+   * Set movement for all movable airbases. (AUTO)
    * Ask Axis player to move airbases. (MANUAL)
    */
   private void executeAxisMovement4() {
@@ -651,7 +653,7 @@
   }
 
   /*
-   * Set movement for all moveable Soviet units (except leaders). (AUTO)
+   * Set movement for all movable Soviet units (except leaders). (AUTO)
    * Ask Soviet player to move units (except leaders). (MANUAL)
    */
   private void executeSovietMovement4() {
@@ -673,7 +675,7 @@
   }
 
   /**
-   * Set movement for all moveable Soviet leaders. (AUTO)
+   * Set movement for all movable Soviet leaders. (AUTO)
    * Ask Soviet player to move leaders. (MANUAL)
    */
   private void executeSovietMovement5() {
@@ -703,8 +705,8 @@
     commandFixAllOverstacks();
   }
 
-  /*
-   * Set movement for all moveable German tank units. (AUTO)
+  /**
+   * Set movement for all movable German tank units. (AUTO)
    * Ask Axis player to move German tank units. (MANUAL)
    */
   private void executeGermanTankMovement1() {
@@ -1333,9 +1335,9 @@
           }
           return true;
         } else {
-          //during retreats & sea movement overstacks are allowed
+          //during retreats & and all movement overstacks are allowed
           int phasePart = RsrGlobal.getPhasePart() - 1;
-          return ((phaseName.equals(PHASE_AXIS_MOVEMENT)) && (phasePart == 1)) || ((phaseName.equals(PHASE_SOVIET_MOVEMENT)) && (phasePart == 2)) || (RsrGlobal.getCombatStage() == 4) || (isStackSizeOK(hr, pieces));
+          return ((phaseName.equals(PHASE_AXIS_MOVEMENT)) && (phasePart >= 1) && (phasePart <= 4)) || ((phaseName.equals(PHASE_SOVIET_MOVEMENT)) && (phasePart >= 1) && (phasePart <= 5)) || ((phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) && (phasePart >= 1) && (phasePart <= 2)) || (RsrGlobal.getCombatStage() == 4) || (isStackSizeOK(hr, pieces));
         }
       } else {
         return false;

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2010-06-20 18:30:10 UTC (rev 6964)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2010-06-29 10:19:13 UTC (rev 6965)
@@ -31,7 +31,7 @@
   private double movement;
   private double maxMovement;
   private double overrunCost;
-  private double mySize;
+  //private double mySize;
   private String nationality;
   private String type;
   private String unitType;
@@ -64,7 +64,7 @@
       movement = maxMovement;
     }
     overrunCost = core.getOverrunCost(piece);
-    mySize = RsrTrait.getStackPoints(piece);
+    //mySize = RsrTrait.getStackPoints(piece);
     type = RsrTrait.getType(piece);
     unitType = RsrTrait.getUnitType(piece);
     isMountain = unitType.indexOf("Mountain") >= 0;
@@ -183,7 +183,7 @@
     if ((fromHex.equals(startHex)) && (cost > currentCost.getPointsLeft()) && (movement == maxMovement) && (inEnemyZOC.contains(startHex) == false) && (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT) == false)) {
       cost = currentCost.getPointsLeft();
     }
-    return result(fromHex, true, currentCost.getPointsLeft() - cost, (core.isStackSizeOK(toHex, side, mySize) == false) || (core.isStackFriendly(toHex, side, nationality, unitType) == false) || (blockedByEnemy.contains(toHex)), MODE_MOVEMENT, 0);
+    return result(fromHex, true, currentCost.getPointsLeft() - cost, /*(core.isStackSizeOK(toHex, side, mySize) == false) || */(core.isStackFriendly(toHex, side, nationality, unitType) == false) || (blockedByEnemy.contains(toHex)), MODE_MOVEMENT, 0);
   }
 
   @Override

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2010-06-20 18:30:10 UTC (rev 6964)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2010-06-29 10:19:13 UTC (rev 6965)
@@ -23,7 +23,7 @@
   private String type;
   private String unitType;
 	private int movementMode;
-  private double mySize;
+  //private double mySize;
 	private HexRef startHex;
 	private Set<HexRef> blockedByEnemy;
   private HashMap<HexRef, TerrainMapShaderCost> inSupply;
@@ -47,7 +47,7 @@
     type = RsrTrait.getType(piece);
     unitType = RsrTrait.getUnitType(piece);
 		movementMode = RsrTrait.getMovementTypeAsInt(piece);
-    mySize = RsrTrait.getStackPoints(piece);
+    //mySize = RsrTrait.getStackPoints(piece);
 		//find blocked hexes
     blockedByEnemy = pieceCache.getHexesInRangeAnyEnemy(side, 4);
     if (blockedByEnemy == null) {
@@ -92,7 +92,7 @@
 		} else if ((movementMode == MOVEMENT_RAIL) && (Filter.isAny(lt, LINE_RAILROAD, LINE_CHONGARCAUSEWAY) == false)) {
       return result(fromHex, false, 0.0, false, MODE_MOVEMENT, 0);
     }
-		return result(fromHex, true, currentCost.getPointsLeft()-1.0, (core.isStackSizeOK(toHex, side, mySize) == false) || (core.isStackFriendly(toHex, side, nationality, unitType) == false), MODE_STRATEGIC, 0);
+		return result(fromHex, true, currentCost.getPointsLeft()-1.0, /*(core.isStackSizeOK(toHex, side, mySize) == false) || */(core.isStackFriendly(toHex, side, nationality, unitType) == false), MODE_STRATEGIC, 0);
 	}
 
 	@Override

Modified: VSQL-src/branches/morvael/rsr/RsrTrait.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrTrait.java	2010-06-20 18:30:10 UTC (rev 6964)
+++ VSQL-src/branches/morvael/rsr/RsrTrait.java	2010-06-29 10:19:13 UTC (rev 6965)
@@ -547,23 +547,32 @@
     return piece.getName();
   }
 
+  private static final int[] DRAW_SUPPLY_X = new int[]{53, 26};
+  private static final int[] DRAW_SUPPLY_Y = new int[]{4, 0};
+
+  private static final int[] DRAW_STRENGTH_X_1 = new int[]{4, 0};
+  private static final int[] DRAW_STRENGTH_X_2 = new int[]{2, 1};
+  private static final int[] DRAW_STRENGTH_Y = new int[]{50, 23};
+
+  private static final int[] DRAW_MOVEMENT_X = new int[]{53, 26};
+  private static final int[] DRAW_MOVEMENT_Y = new int[]{50, 23};
+  
   public void draw(Graphics g, int x, int y, Component obs, double zoom) {
     piece.draw(g, x, y, obs, zoom);
+    int zoomindex = zoom == 1.0d ? 0 : 1;
     int mod = (((int)(zoom*63))/2);
     int px = x - mod;
     int py = y - mod;
-    if (zoom == 1.0d) {
-      if (supplyLevel > 0) {
-        imagePainter[3 + supplyLevel].draw(g, px + 53, py + 4, zoom, obs);
-      }
-      if (displayStrength) {
-        int w = drawNumber(g, px + 4, py + 50, zoom, obs, displayedAttack);
-        drawNumber(g, px + 4 + w + 2, py + 50, zoom, obs, displayedDefense);
-      }
-      if (movementLeft >= 1.0d) {
-        drawNumber(g, px + 53, py + 50, zoom, obs, (int)movementLeft);
-      }
+    if (supplyLevel > 0) {
+      imagePainter[3 + supplyLevel].draw(g, px + DRAW_SUPPLY_X[zoomindex], py + DRAW_SUPPLY_Y[zoomindex], 1.0d, obs);
     }
+    if (displayStrength) {
+      int w = drawNumber(g, px + DRAW_STRENGTH_X_1[zoomindex], py + DRAW_STRENGTH_Y[zoomindex], 1.0d, obs, displayedAttack);
+      drawNumber(g, px + DRAW_STRENGTH_X_1[zoomindex] + w + DRAW_STRENGTH_X_2[zoomindex], py + DRAW_STRENGTH_Y[zoomindex], 1.0d, obs, displayedDefense);
+    }
+    if (movementLeft >= 1.0d) {
+      drawNumber(g, px + DRAW_MOVEMENT_X[zoomindex], py + DRAW_MOVEMENT_Y[zoomindex], 1.0d, obs, (int)movementLeft);
+    }
     if ((retreating > 0) || (repositioning > 0) || (overstackRetreating > 0)) {
       imagePainter[7].draw(g, px, py, zoom, obs);
     } else


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

Revision: 6989
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6989&view=rev
Author:   morvael
Date:     2010-07-15 12:19:31 +0000 (Thu, 15 Jul 2010)

Log Message:
-----------
Further improvements for 4.0.6:
1) Violation of Axis minor stacking and Soviet cavalry stacking will now be counted as overstacking and allowed in certain situations, as per rule 4.0.7.
2) Soviet Infantry armies are able to breakdown and buildup using Mechanized corps in addition to Infantry and Marine corps, finally following rules 17.3 and 17.4.
3) Soviet Tank armies are no longer be able to breakdown into Mechanized corps, as they can't build up again.
4) Fixed Soviet army breakdown to prevent it from happening, when next to an Axis unit.
5) Fixed overstack-on-retreat procedure to allow more than one unit retreat from given stack if necessary (partial).
6) Unit info will be painted on counter while zoomed out to exactly 50% or 100% only.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrButton.java
    VSQL-src/branches/morvael/rsr/RsrButtonCommand.java
    VSQL-src/branches/morvael/rsr/RsrConstants.java
    VSQL-src/branches/morvael/rsr/RsrGlobal.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
    VSQL-src/branches/morvael/rsr/RsrTrait.java
    VSQL-src/branches/morvael/rsr/StackInfo.java

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -460,11 +460,11 @@
 
   /**
    * Reset status of moved units. (AUTO)
-   * Fix overstacks. (AUTO)
+   * Fix stacks. (AUTO)
    */
   private void executeAxisMovement5() {
     commandMarkAsUnmovedAll();
-    commandFixAllOverstacks();
+    commandFixAllStacks();
   }
 
   /**
@@ -698,11 +698,11 @@
 
   /**
    * Reset status of moved units. (AUTO)
-   * Fix overstacks. (AUTO)
+   * Fix stacks. (AUTO)
    */
   private void executeSovietMovement6() {
     commandMarkAsUnmovedAll();
-    commandFixAllOverstacks();
+    commandFixAllStacks();
   }
 
   /**
@@ -751,14 +751,14 @@
 
   /**
    * Reset status of moved units. (AUTO)
-   * Fix overstacks. (AUTO)
+   * Fix stacks. (AUTO)
    * Remove Air Fleets from map. (AUTO)
    * Remove Airbase on given turn. (MANUAL)
    */
   private void executeGermanTankMovement3() {
     //
     commandMarkAsUnmovedAll();
-    commandFixAllOverstacks();
+    commandFixAllStacks();
     //
     ArrayList<GamePiece> airfleets = filter.filterPieces(mainMap, "Type=='AirFleet'");
     if (airfleets.size() > 0) {
@@ -1323,7 +1323,7 @@
       return true;
     } else {
       //in all other phases axis minor may not mix
-      if (isStackFriendly(hr, pieces)) {
+      //if (isStackFriendly(hr, pieces)) {
         if ((phaseName.equals(PHASE_AXIS_REINFORCEMENT)) || (phaseName.equals(PHASE_SOVIET_REINFORCEMENT))) {
           //reinforcements must be marked as fresh units to ignore them for supply recalculation
           if (test == false) {
@@ -1337,11 +1337,11 @@
         } else {
           //during retreats & and all movement overstacks are allowed
           int phasePart = RsrGlobal.getPhasePart() - 1;
-          return ((phaseName.equals(PHASE_AXIS_MOVEMENT)) && (phasePart >= 1) && (phasePart <= 4)) || ((phaseName.equals(PHASE_SOVIET_MOVEMENT)) && (phasePart >= 1) && (phasePart <= 5)) || ((phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) && (phasePart >= 1) && (phasePart <= 2)) || (RsrGlobal.getCombatStage() == 4) || (isStackSizeOK(hr, pieces));
+          return ((phaseName.equals(PHASE_AXIS_MOVEMENT)) && (phasePart >= 1) && (phasePart <= 4)) || ((phaseName.equals(PHASE_SOVIET_MOVEMENT)) && (phasePart >= 1) && (phasePart <= 5)) || ((phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT)) && (phasePart >= 1) && (phasePart <= 2)) || (RsrGlobal.getCombatStage() == 4) || ((isStackSizeOK(hr, pieces)) && (isStackFriendly(hr, pieces)));
         }
-      } else {
-        return false;
-      }
+      //} else {
+      //  return false;
+      //}
     }
   }
 

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -161,19 +161,23 @@
   }
 
   private ArrayList<GamePiece> getSelectedPieces() {
+    return getSelectedPieces(mainMap);
+  }
+  
+  private ArrayList<GamePiece> getSelectedPieces(Map selectedMap) {
     ArrayList<GamePiece> result = new ArrayList<GamePiece>();
     Iterator<GamePiece> it = KeyBuffer.getBuffer().getPiecesIterator();
     GamePiece gp;
     while (it.hasNext()) {
       gp = it.next();
-      if (gp.getMap() == mainMap) {
+      if (gp.getMap() == selectedMap) {
         result.add(gp);
       }
     }
-    return result;
+    return result;    
   }
   
-  public final void execute(String param) {
+  public final void execute(String param, boolean alternate) {
     if (param.equals("")) {
       commandAdvance(false);
       sendAndLog();
@@ -190,9 +194,16 @@
     } else if (param.equals("breakdown")) {
       if (getPhaseName().equals(PHASE_ADMINISTRATIVE)) {
         int phasePart = RsrGlobal.getPhasePart() - 1;
-        if ((phasePart == 1) || (phasePart == 3)) {
-          commandBreakdown(getSelectedPieces());
-          sendAndLog();
+        if (alternate) {
+          if (phasePart == 3) {
+            commandSwitchBreakdownMethod();
+            sendAndLog();
+          }
+        } else {
+          if ((phasePart == 1) || (phasePart == 3)) {
+            commandBreakdown(getSelectedPieces());
+            sendAndLog();
+          }
         }
       }
     } else if (param.equals("buildup")) {
@@ -1375,6 +1386,7 @@
         //there are currently no losses required and no T_RETREATING units
         //an attempt to advance combat will be made
         HashSet<HexRef> overstackHexes = new HashSet<HexRef>();
+        HashSet<HexRef> stackHexes = new HashSet<HexRef>();
         HexRef hex;
         //if the player has completed normal retreats, check for overstacks
         //where the retreated units are, if yes then mark all units in that
@@ -1384,13 +1396,18 @@
           if (isStackSizeOK(hex, RsrTrait.getSide(gp), 0.0d) == false) {
             overstackHexes.add(hex);
           }
-          commandBaseSetProperty(gp, T_RETREATING, 0);
+          if (isStackFriendly(hex) == false) {
+            overstackHexes.add(hex);
+          }
+          commandBaseSetProperty(gp, T_RETREATING, -2);
         }
         if (overstackHexes.size() > 0) {
           for (HexRef hr : overstackHexes) {
             for (GamePiece gp : pieceCache.getPiecesIn(hr)) {
-              commandBaseSetProperty(gp, T_OVERSTACK_RETREATING, 1);
-              commandBaseLog(gp.getName() + " may retreat 1 space due to overstack.");
+              if (RsrTrait.getType(gp).equals("Unit")) {
+                commandBaseSetProperty(gp, T_OVERSTACK_RETREATING, 1);
+                commandBaseLog(gp.getName() + " may retreat 1 space due to stack rules violation.");
+              }
             }
           }
           return;
@@ -1398,18 +1415,27 @@
           //since there is either no retreating units or no overstacks, check
           //for overstacks where the secondary retreating units are (either
           //moved or not moved), if yes then "fix" those stacks
-          for (GamePiece gp : filter.filterPieces(mainMap, T_OVERSTACK_RETREATING + "!=0")) {
+          for (GamePiece gp : filter.filterPieces(mainMap, T_OVERSTACK_RETREATING + "!=0||" + T_RETREATING + "!=0")) {
             hex = getHexRef(gp.getPosition());
             if (isStackSizeOK(hex, RsrTrait.getSide(gp), 0.0d) == false) {
               overstackHexes.add(hex);
             }
+            if (isStackFriendly(hex) == false) {
+              stackHexes.add(hex);
+            }
             commandBaseSetProperty(gp, T_OVERSTACK_RETREATING, 0);
+            commandBaseSetProperty(gp, T_RETREATING, 0);
           }
           if (overstackHexes.size() > 0) {
             for (HexRef hr : overstackHexes) {
               commandFixOverstack(hr);
             }
           }
+          if (stackHexes.size() > 0) {
+            for (HexRef hr : stackHexes) {
+              commandFixStack(hr);
+            }
+          }
           //finally, advance the combat
           commandBaseSetProperty(dataPiece, COMBAT_STAGE, ++combatStage);
         }
@@ -1561,11 +1587,14 @@
     }
   }
 
-  public void commandFixAllOverstacks() {
+  public void commandFixAllStacks() {
     for (HexRef hr : pieceCache.getOccupiedHexes()) {
       if (isStackSizeOK(hr) == false) {
         commandFixOverstack(hr);
       }
+      if (isStackFriendly(hr) == false) {
+        commandFixStack(hr);
+      }
     }
   }
 
@@ -1589,26 +1618,71 @@
       if (side.equals(SIDE_AXIS)) {
         diff = stackSize - 14.0d;
       } else {
-        diff = stackSize - 2.5d;
+        diff = stackSize - 2.0d;
       }
     }
     GamePiece gp;
     while ((diff > 0.0d) && (possiblePieces.size() > 0)) {
-      gp = selectBestEliminationCandidate(possiblePieces);
+      gp = selectBestEliminationCandidate(possiblePieces, 0);
       possiblePieces.remove(gp);
       diff -= RsrTrait.getStackPoints(gp);
       commandEliminate(gp, false, false);
     }
   }
+  
+  public void commandFixStack(HexRef hr) {
+    ArrayList<GamePiece> pieces = pieceCache.getPiecesIn(hr);
+    if ((pieces == null) || (pieces.size() == 0)) {
+      return;
+    }
+    ArrayList<GamePiece> possiblePieces = new ArrayList<GamePiece>();
+    String side = RsrTrait.getSide(pieces.get(0));
+    if (side.equals(SIDE_AXIS)) {
+      commandBaseLog("Stack rules (Axis ally) violation in " + getLocationName(hr) + " will be cured.");
+      HashSet<String> possibleNationalities = new HashSet<String>();
+      String nationality;
+      for (GamePiece gp : pieces) {
+        nationality = RsrTrait.getNationality(gp);
+        if (Filter.isAny(nationality, NATIONALITY_FINNISH, NATIONALITY_HUNGARIAN, NATIONALITY_ITALIAN, NATIONALITY_ROMANIAN)) {
+          possiblePieces.add(gp);
+          possibleNationalities.add(nationality);
+        }
+      }
+      HashSet<GamePiece> toRemove = new HashSet<GamePiece>();
+      while (possibleNationalities.size() > 1) {
+        nationality = selectBestEliminationNationalityCandidate(possiblePieces);
+        toRemove.clear();
+        for (GamePiece gp : possiblePieces) {
+          if (RsrTrait.getNationality(gp).equals(nationality)) {
+            toRemove.add(gp);
+          }
+        }
+        for (GamePiece gp : toRemove) {
+          possiblePieces.remove(gp);
+          commandEliminate(gp, false, false);
+        }
+        possibleNationalities.remove(nationality);        
+      }
+    } else {
+      commandBaseLog("Stack rules (Guards cavalry) violation in " + getLocationName(hr) + " will be cured.");
+      for (GamePiece gp : pieces) {
+        if (RsrTrait.getUnitType(gp).equals("SovietGuardsCavalryCorps")) {
+          possiblePieces.add(gp);
+        }
+      }
+      GamePiece gp;
+      while (possiblePieces.size() > 1) {
+        gp = selectBestEliminationCandidate(possiblePieces, 2);
+        possiblePieces.remove(gp);
+        commandEliminate(gp, false, false);
+      }
+    }    
+  }
 
-  public GamePiece selectBestEliminationCandidate(ArrayList<GamePiece> pieces) {
-    double max = Double.MIN_VALUE;
-    double val, mv;
-    int as, ds;
-    GamePiece result = null;
-    for (GamePiece gp : pieces) {
-      as = getAttackStrength(gp, true);
-      ds = getDefendStrength(gp, true);
+  private double getEliminationScore(GamePiece gp, int flag) {
+    int as = getAttackStrength(gp, true);
+    int ds = getDefendStrength(gp, true);
+    if (flag == 0) {
       if ((as < 0) || (ds < 0)) {
         switch (RsrTrait.getCombatClass(gp).charAt(0)) {
           case 'A' : as = 8; ds = 8; break;
@@ -1622,11 +1696,29 @@
           ds *= 0.5d;
         }
       }
-      mv = RsrTrait.getMovement(gp);
-      if (RsrTrait.isSupplyLevel(gp, SUPPLY_LACK, SUPPLY_OUT)) {
-        mv *= 0.5d;
-      }
-      val = RsrTrait.getStackPoints(gp) * RsrTrait.getCurrentStep(gp) * (as + 2 * ds + mv);
+    }
+    double mv = RsrTrait.getMovement(gp);
+    if (RsrTrait.isSupplyLevel(gp, SUPPLY_LACK, SUPPLY_OUT)) {
+      mv *= 0.5d;
+    }
+    switch (flag) {
+      case 1  :
+        if (RsrTrait.getType(gp).equals("Headquarters")) {
+          return 1000.0d;
+        } else {
+          return RsrTrait.getStackPoints(gp) * RsrTrait.getCurrentStep(gp) * (as + 2 * ds + mv);
+        }
+      case 2  : return as + 2 * ds + mv;
+      default : return RsrTrait.getStackPoints(gp) * RsrTrait.getCurrentStep(gp) * (as + 2 * ds + mv);
+    }    
+  }
+  
+  public GamePiece selectBestEliminationCandidate(ArrayList<GamePiece> pieces, int flag) {
+    double max = Double.MIN_VALUE;
+    double val;
+    GamePiece result = null;
+    for (GamePiece gp : pieces) {
+      val = getEliminationScore(gp, flag);
       if (val > max) {
         max = val;
         result = gp;
@@ -1634,6 +1726,32 @@
     }
     return result;
   }
+  
+  public String selectBestEliminationNationalityCandidate(ArrayList<GamePiece> pieces) {
+    HashMap<String, Double> totalScore = new HashMap<String, Double>();
+    String nationality;
+    double total;
+    for (GamePiece gp : pieces) {
+      nationality = RsrTrait.getNationality(gp);
+      if (totalScore.containsKey(nationality)) {
+        total = totalScore.get(nationality);
+      } else {
+        total = 0.0d;
+      }
+      total += getEliminationScore(gp, 1);
+      totalScore.put(nationality, total);
+    }
+    double max = Double.MIN_VALUE;
+    nationality = null;
+    for (String n : totalScore.keySet()) {
+      total = totalScore.get(n);
+      if (total > max) {
+        max = total;
+        nationality = n;
+      }
+    }
+    return nationality;
+  }
 
   public void commandCombatStepLoss(GamePiece gp) {
     String property1, property2;
@@ -1923,13 +2041,13 @@
         result.retainAll(aroundHQ);
       }
     }
-    Iterator<HexRef> it = result.iterator();
-    String unitType = RsrTrait.getUnitType(gp);
-    while (it.hasNext()) {
-      if (isStackFriendly(it.next(), side, nationality, unitType) == false) {
-        it.remove();
-      }
-    }
+    //Iterator<HexRef> it = result.iterator();
+    //String unitType = RsrTrait.getUnitType(gp);
+    //while (it.hasNext()) {
+    //  if (isStackFriendly(it.next(), side, nationality, unitType) == false) {
+    //    it.remove();
+    //  }
+    //}
     return result;
   }
 
@@ -2992,7 +3110,7 @@
     if (side.equals(SIDE_AXIS)) {
       return pieceCache.getStackInfo(hr).stackSize + mySize <= 14.0d;
     } else {
-      return pieceCache.getStackInfo(hr).stackSize + mySize <= 2.5d;
+      return pieceCache.getStackInfo(hr).stackSize + mySize <= 2.0d;
     }
   }
 
@@ -3008,6 +3126,29 @@
     }
   }
 
+  public boolean isStackFriendly(HexRef hr) {
+    ArrayList<GamePiece> pieces = pieceCache.getPiecesIn(hr);
+    if ((pieces == null) || (pieces.size() == 0)) {
+      return true;
+    } else {
+      StackInfo si = pieceCache.getStackInfo(hr);
+      if (RsrTrait.getSide(pieces.get(0)).equals(SIDE_AXIS)) {
+        return si.nationalities.contains(NATIONALITY_GERMAN) ? si.nationalities.size() <= 2 : si.nationalities.size() <= 1;
+      } else {
+        return si.guardsCavalryCorps <= 1;
+      }
+    }
+  }
+
+  public boolean isStackFriendly(HexRef hr, ArrayList<GamePiece> pieces) {
+    for (GamePiece gp : pieces) {
+      if (isStackFriendly(hr, RsrTrait.getSide(gp), RsrTrait.getNationality(gp), RsrTrait.getUnitType(gp)) == false) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
   public boolean isStackFriendly(HexRef hr, String side, String nationality, String unitType) {
     if ((side.equals(SIDE_AXIS)) && (nationality.equals(NATIONALITY_GERMAN) == false)) {
       for (String n : pieceCache.getStackInfo(hr).nationalities) {
@@ -3017,21 +3158,12 @@
       }
       return true;
     } else if ((side.equals(SIDE_SOVIET)) && (unitType.equals("SovietGuardsCavalryCorps"))) {
-      return pieceCache.getStackInfo(hr).hasGuardsCavalryCorps == false;
+      return pieceCache.getStackInfo(hr).guardsCavalryCorps == 0;
     } else {
       return true;
     }
   }
 
-  public boolean isStackFriendly(HexRef hr, ArrayList<GamePiece> pieces) {
-    for (GamePiece gp : pieces) {
-      if (isStackFriendly(hr, RsrTrait.getSide(gp), RsrTrait.getNationality(gp), RsrTrait.getUnitType(gp)) == false) {
-        return false;
-      }
-    }
-    return true;
-  }
-
   public void scenarioChanged(int scenario) {
     isNorthMapUsed = scenario == 6;
     isSouthwestMapUsed =(scenario == 3) || (scenario == 4) || (scenario == 6);
@@ -3053,6 +3185,20 @@
     }
   }
 
+  public void commandSwitchBreakdownMethod() {
+    int breakdownMode = RsrGlobal.getBreakdownMode();
+    breakdownMode++;
+    if (breakdownMode == 3) {
+      breakdownMode = 0;
+    }
+    commandBaseSetProperty(dataPiece, G_BREAKDOWN_MODE, breakdownMode);
+    switch (breakdownMode) {
+      case 1  : commandBaseLog("Desired Soviet army breakdown set to infantry and mechanized corps."); break;
+      case 2  : commandBaseLog("Desired Soviet army breakdown set to 2 mechanized corps."); break;
+      default : commandBaseLog("Desired Soviet army breakdown set to 2 infantry corps."); break;
+    }
+  }
+  
   public void commandBreakdown(ArrayList<GamePiece> pieces) {
     if (pieces.size() != 1) {
       commandBaseLog("Select a single unit for breakdown.");
@@ -3071,6 +3217,7 @@
     int currentStep = RsrTrait.getCurrentStep(gp);
     ArrayList<GamePiece> bb = null;
     int req = Integer.MAX_VALUE;
+    boolean sovietCheck = false;
     if (unitType.equals("AxisGermanTankCorps")) {
       req = 2;
       bb = findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanTankBattlegroup", req);
@@ -3089,15 +3236,18 @@
     } else if ((unitType.equals("AxisGermanMountainBattlegroup")) && (currentStep == 2)) {
       req = 1;
       bb = findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanMountainBattlegroup", req);
-    } else if (unitType.equals("SovietTankArmy")) {
-      if (isProductionTurn()) {
-        req = 2;
-        bb = findInOffboardZone("Force Pool Box", "Unit", "SovietMechanizedCorps", req);
-      }
     } else if (unitType.equals("SovietInfantryArmy")) {
       if (isProductionTurn()) {
+        sovietCheck = true;
         req = 2;
-        bb = findInOffboardZone("Force Pool Box", "Unit", "SovietInfantryCorps','SovietMarineCorps", req);
+        switch (RsrGlobal.getBreakdownMode()) {
+          case 1  :
+            bb = findInOffboardZone("Force Pool Box", "Unit", "SovietInfantryCorps','SovietMarineCorps", 1);
+            bb.addAll(findInOffboardZone("Force Pool Box", "Unit", "SovietMechanizedCorps", 1));
+            break;
+          case 2  : bb = findInOffboardZone("Force Pool Box", "Unit", "SovietMechanizedCorps", req); break;
+          default : bb = findInOffboardZone("Force Pool Box", "Unit", "SovietInfantryCorps','SovietMarineCorps", req); break;
+        }
       }
     }
     if (bb == null) {
@@ -3112,8 +3262,16 @@
       commandBaseLog("No breakdown if not in supply.");
       return;
     }
+    HexRef hr = getHexRef(gp.getPosition());
+    if (sovietCheck) {
+      HashSet<HexRef> nextToAxis = pieceCache.getHexesInRangeAnyEnemy(SIDE_SOVIET, 1); 
+      if (nextToAxis.contains(hr)) {
+        commandBaseLog("No breakdown if next to an Axis unit.");
+        return;
+      }
+    }  
     HashSet<HexRef> inZOC = isMud() ? new HashSet<HexRef>() : pieceCache.getHexesInZOCEnemy(RsrTrait.getSide(gp));
-    if (inZOC.contains(getHexRef(gp.getPosition()))) {
+    if (inZOC.contains(hr)) {
       commandBaseLog("No breakdown if in contested space (unless it is a mud turn).");
       return;
     }
@@ -3142,7 +3300,7 @@
       commandBaseSetProperty(bb.get(0), T_CURRENT_STEP, 1);
       commandMarkAsReorganized(gp);
       commandMarkAsReorganized(bb.get(0));
-    } else if (Filter.isAny(unitType, "SovietTankArmy", "SovietInfantryArmy")) {
+    } else if (Filter.isAny(unitType, "SovietInfantryArmy")) {
       commandSendToPiece(gp, bb.get(0), false);
       commandSendToPiece(gp, bb.get(1), false);
       commandSendToOffboardZone(gp, "Force Pool Box");
@@ -3194,12 +3352,9 @@
     } else if (unitType1.equals("AxisGermanMountainBattlegroup")) {
       size = 2;
       allowed = (unitType2.equals("AxisGermanMountainBattlegroup")) && (((currentStep1 == 1) && (currentStep2 == 1)) || ((currentStep1 + currentStep2 < 4) && ((bb = findInOffboardZone("German Breakdown & Buildup Box", "Unit", "AxisGermanMountainCorps", 1)).size() == 1)));
-    } else if (unitType1.equals("SovietMechanizedCorps")) {
-      allowed = (isProductionTurn()) && (unitType2.equals("SovietMechanizedCorps")) && ((bb = findInOffboardZone("Force Pool Box", "Unit", "SovietTankArmy", 1)).size() == 1);
+    } else if (Filter.isAny(unitType1, "SovietInfantryCorps", "SovietMechanizedCorps", "SovietMarineCorps")) {
+      allowed = (isProductionTurn()) && (Filter.isAny(unitType2, "SovietInfantryCorps", "SovietMechanizedCorps", "SovietMarineCorps")) && ((bb = findInOffboardZone("Force Pool Box", "Unit", "SovietInfantryArmy", 1)).size() == 1);
       ignoreZOC = true;
-    } else if (Filter.isAny(unitType1, "SovietInfantryCorps", "SovietMarineCorps")) {
-      allowed = (isProductionTurn()) && (Filter.isAny(unitType2, "SovietInfantryCorps", "SovietMarineCorps")) && ((bb = findInOffboardZone("Force Pool Box", "Unit", "SovietInfantryArmy", 1)).size() == 1);
-      ignoreZOC = true;
     }
     if (allowed == false) {
       commandBaseLog("No buildup allowed.");
@@ -3238,7 +3393,7 @@
         commandSendToOffboardZone(gp2, "German Breakdown & Buildup Box");
         commandMarkAsReorganized(bb.get(0));
       }
-    } else if (Filter.isAny(unitType1, "SovietMechanizedCorps", "SovietInfantryCorps", "SovietMarineCorps")) {
+    } else if (Filter.isAny(unitType1, "SovietInfantryCorps", "SovietMechanizedCorps", "SovietMarineCorps")) {
       commandSendToPiece(gp1, bb.get(0), false);
       commandSendToOffboardZone(gp1, "Force Pool Box");
       commandSendToOffboardZone(gp2, "Force Pool Box");

Modified: VSQL-src/branches/morvael/rsr/RsrButton.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButton.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/RsrButton.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -44,7 +44,7 @@
     ActionListener action = new ActionListener() {
 
       public void actionPerformed(ActionEvent e) {
-        execute();
+        execute(e);
       }
     };
 
@@ -154,7 +154,7 @@
     return HelpFile.getReferenceManualPage("RsrButton.htm"); //$NON-NLS-1$
   }
 
-  protected void execute() {
+  protected void execute(ActionEvent e) {
     try {
       RecursionLimiter.startExecution(this);
       if (buttonClass.length() > 0) {
@@ -162,8 +162,8 @@
           if (cmd == null) {
             Class<?> c = Class.forName(buttonClass);
             cmd = (RsrButtonCommand)c.newInstance();
-          }
-          cmd.getDesiredInstance().execute(buttonParam);
+          }          
+          cmd.getDesiredInstance().execute(buttonParam, (e.getModifiers() & ActionEvent.ALT_MASK) == ActionEvent.ALT_MASK);
         } catch (Exception ex) {
           ErrorDialog.bug(ex);
         }

Modified: VSQL-src/branches/morvael/rsr/RsrButtonCommand.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrButtonCommand.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/RsrButtonCommand.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -8,6 +8,6 @@
 public interface RsrButtonCommand {
 
   RsrButtonCommand getDesiredInstance();
-  void execute(String param);
+  void execute(String param, boolean alternate);
   
 }

Modified: VSQL-src/branches/morvael/rsr/RsrConstants.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrConstants.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/RsrConstants.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -188,5 +188,6 @@
   public static final String G_ATTACKER_SIDE = "attacker_side";
   public static final String G_DEFENDER_SIDE = "defender_side";
   public static final String G_GAME_STATUS = "game_status";
+  public static final String G_BREAKDOWN_MODE = "breakdown_mode";
 
 }

Modified: VSQL-src/branches/morvael/rsr/RsrGlobal.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrGlobal.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/RsrGlobal.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -63,6 +63,7 @@
   private String attackerSide = "";
   private String defenderSide = "";
   private int gameStatus = 0;
+  private int breakdownMode = 0;
   // dynamic
   private GamePiece gp;
   private RsrKeyCommand[] commands0;
@@ -131,6 +132,8 @@
       return defenderSide;
     } else if (G_GAME_STATUS.equals(key)) {
       return gameStatus;
+    } else if (G_BREAKDOWN_MODE.equals(key)) {
+      return breakdownMode;
     } else {
       return super.getProperty(key);
     }
@@ -186,6 +189,8 @@
       return defenderSide;
     } else if (G_GAME_STATUS.equals(key)) {
       return gameStatus;
+    } else if (G_BREAKDOWN_MODE.equals(key)) {
+      return breakdownMode;
     } else {
       return super.getLocalizedProperty(key);
     }
@@ -338,6 +343,12 @@
       } catch (Exception e) {
         gameStatus = 0;
       }
+    } else if (G_BREAKDOWN_MODE.equals(key)) {
+      try {
+        breakdownMode = Integer.parseInt(val.toString());
+      } catch (Exception e) {
+        breakdownMode = 0;
+      }
     } else {
       super.setProperty(key, val);
     }
@@ -646,4 +657,8 @@
     return instance.gameStatus;
   }
 
+  public static final int getBreakdownMode() {
+    return instance.breakdownMode;
+  }
+  
 }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderMovement.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -32,7 +32,7 @@
   private double maxMovement;
   private double overrunCost;
   //private double mySize;
-  private String nationality;
+  //private String nationality;
   private String type;
   private String unitType;
   private boolean isMountain;
@@ -56,7 +56,7 @@
       return;
     }
     side = RsrTrait.getSide(piece);
-    nationality = RsrTrait.getNationality(piece);
+    //nationality = RsrTrait.getNationality(piece);
     movementMode = RsrTrait.getMovementTypeAsInt(piece);
     maxMovement = core.getMovementAllowance(piece);
     movement = RsrTrait.getMovementLeft(piece);
@@ -183,7 +183,7 @@
     if ((fromHex.equals(startHex)) && (cost > currentCost.getPointsLeft()) && (movement == maxMovement) && (inEnemyZOC.contains(startHex) == false) && (phaseName.equals(PHASE_GERMAN_TANK_MOVEMENT) == false)) {
       cost = currentCost.getPointsLeft();
     }
-    return result(fromHex, true, currentCost.getPointsLeft() - cost, /*(core.isStackSizeOK(toHex, side, mySize) == false) || */(core.isStackFriendly(toHex, side, nationality, unitType) == false) || (blockedByEnemy.contains(toHex)), MODE_MOVEMENT, 0);
+    return result(fromHex, true, currentCost.getPointsLeft() - cost, /*(core.isStackSizeOK(toHex, side, mySize) == false) || (core.isStackFriendly(toHex, side, nationality, unitType) == false) ||  */(blockedByEnemy.contains(toHex)), MODE_MOVEMENT, 0);
   }
 
   @Override

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderRetreat.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -19,8 +19,8 @@
 public final class RsrMapShaderRetreat extends RsrMapShaderBase {
 
   private String side;
-  private String nationality;
-  private String unitType;
+  //private String nationality;
+  //private String unitType;
   private HexRef startHex;
   private int movementMode;
   private int supplyLevel;
@@ -45,8 +45,8 @@
       return;
     }
     side = RsrTrait.getSide(piece);
-    nationality = RsrTrait.getNationality(piece);
-    unitType = RsrTrait.getUnitType(piece);
+    //nationality = RsrTrait.getNationality(piece);
+    //unitType = RsrTrait.getUnitType(piece);
     movementMode = RsrTrait.getMovementTypeAsInt(piece);
     supplyLevel = RsrTrait.getSupplyLevel(piece);
     retreatDistance = RsrTrait.getRetreating(piece);
@@ -98,7 +98,7 @@
         val += 10;
       }
     }
-    return result(fromHex, true, currentCost.getPointsLeft() - 1, (tooClose.contains(toHex)) || (core.isStackFriendly(toHex, side, nationality, unitType) == false), MODE_RETREAT, val);
+    return result(fromHex, true, currentCost.getPointsLeft() - 1, (tooClose.contains(toHex))/* || (core.isStackFriendly(toHex, side, nationality, unitType) == false)*/, MODE_RETREAT, val);
   }
 
   @Override

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -22,7 +22,7 @@
 	private String side;
   private String nationality;
   private String type;
-  private String unitType;
+  //private String unitType;
 	private int movementMode;
   //private double mySize;
 	private HexRef startHex;
@@ -46,7 +46,7 @@
 		side = RsrTrait.getSide(piece);
     nationality = RsrTrait.getNationality(piece);
     type = RsrTrait.getType(piece);
-    unitType = RsrTrait.getUnitType(piece);
+    //unitType = RsrTrait.getUnitType(piece);
 		movementMode = RsrTrait.getMovementTypeAsInt(piece);
     //mySize = RsrTrait.getStackPoints(piece);
 		//find blocked hexes
@@ -97,7 +97,7 @@
 		} else if ((movementMode == MOVEMENT_RAIL) && (Filter.isAny(lt, LINE_RAILROAD, LINE_CHONGARCAUSEWAY) == false)) {
       return result(fromHex, false, 0.0, false, MODE_MOVEMENT, 0);
     }
-		return result(fromHex, true, currentCost.getPointsLeft()-1.0, /*(core.isStackSizeOK(toHex, side, mySize) == false) || */(core.isStackFriendly(toHex, side, nationality, unitType) == false), MODE_STRATEGIC, 0);
+		return result(fromHex, true, currentCost.getPointsLeft()-1.0, false/*(core.isStackSizeOK(toHex, side, mySize) == false) || (core.isStackFriendly(toHex, side, nationality, unitType) == false) */, MODE_STRATEGIC, 0);
 	}
 
 	@Override

Modified: VSQL-src/branches/morvael/rsr/RsrTrait.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrTrait.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/RsrTrait.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -559,20 +559,22 @@
   
   public void draw(Graphics g, int x, int y, Component obs, double zoom) {
     piece.draw(g, x, y, obs, zoom);
-    int zoomindex = zoom == 1.0d ? 0 : 1;
     int mod = (((int)(zoom*63))/2);
     int px = x - mod;
     int py = y - mod;
-    if (supplyLevel > 0) {
-      imagePainter[3 + supplyLevel].draw(g, px + DRAW_SUPPLY_X[zoomindex], py + DRAW_SUPPLY_Y[zoomindex], 1.0d, obs);
+    if ((zoom == 1.0d) || (zoom == 0.5d)) {
+      int zoomindex = zoom == 1.0d ? 0 : 1;
+      if (supplyLevel > 0) {
+        imagePainter[3 + supplyLevel].draw(g, px + DRAW_SUPPLY_X[zoomindex], py + DRAW_SUPPLY_Y[zoomindex], 1.0d, obs);
+      }
+      if (displayStrength) {
+        int w = drawNumber(g, px + DRAW_STRENGTH_X_1[zoomindex], py + DRAW_STRENGTH_Y[zoomindex], 1.0d, obs, displayedAttack);
+        drawNumber(g, px + DRAW_STRENGTH_X_1[zoomindex] + w + DRAW_STRENGTH_X_2[zoomindex], py + DRAW_STRENGTH_Y[zoomindex], 1.0d, obs, displayedDefense);
+      }
+      if (movementLeft >= 1.0d) {
+        drawNumber(g, px + DRAW_MOVEMENT_X[zoomindex], py + DRAW_MOVEMENT_Y[zoomindex], 1.0d, obs, (int)movementLeft);
+      }
     }
-    if (displayStrength) {
-      int w = drawNumber(g, px + DRAW_STRENGTH_X_1[zoomindex], py + DRAW_STRENGTH_Y[zoomindex], 1.0d, obs, displayedAttack);
-      drawNumber(g, px + DRAW_STRENGTH_X_1[zoomindex] + w + DRAW_STRENGTH_X_2[zoomindex], py + DRAW_STRENGTH_Y[zoomindex], 1.0d, obs, displayedDefense);
-    }
-    if (movementLeft >= 1.0d) {
-      drawNumber(g, px + DRAW_MOVEMENT_X[zoomindex], py + DRAW_MOVEMENT_Y[zoomindex], 1.0d, obs, (int)movementLeft);
-    }
     if ((retreating > 0) || (repositioning > 0) || (overstackRetreating > 0)) {
       imagePainter[7].draw(g, px, py, zoom, obs);
     } else
@@ -846,7 +848,7 @@
   public static double getStackPoints(GamePiece gp) {
     double result = RsrCounter.getDoubleProperty(gp, "StackPoints", 0.0d, true);
     if (result == -1.0d) {
-      return 0.5d;
+      return 0.0d;
     } else {
       return result;
     }

Modified: VSQL-src/branches/morvael/rsr/StackInfo.java
===================================================================
--- VSQL-src/branches/morvael/rsr/StackInfo.java	2010-07-15 12:16:33 UTC (rev 6988)
+++ VSQL-src/branches/morvael/rsr/StackInfo.java	2010-07-15 12:19:31 UTC (rev 6989)
@@ -12,7 +12,7 @@
 
   public double stackSize;
   public HashSet<String> nationalities = new HashSet<String>();
-  public boolean hasGuardsCavalryCorps = false;
+  public int guardsCavalryCorps = 0;
 
   public StackInfo(RsrAdvanceBase core, ArrayList<GamePiece> pieces) {
     if (pieces != null) {
@@ -21,7 +21,7 @@
           stackSize += RsrTrait.getStackPoints(gp);
           nationalities.add(RsrTrait.getNationality(gp));
           if (RsrTrait.getUnitType(gp).equals("SovietGuardsCavalryCorps")) {
-            hasGuardsCavalryCorps = true;
+            guardsCavalryCorps++;
           }
         }
       }


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

Revision: 7092
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7092&view=rev
Author:   morvael
Date:     2010-08-03 09:03:59 +0000 (Tue, 03 Aug 2010)

Log Message:
-----------
Fixed problem with secondary overstack retreating and added caching of HQ and depot positions for strategic movement phase.

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
    VSQL-src/branches/morvael/rsr/RsrConstants.java
    VSQL-src/branches/morvael/rsr/RsrGlobal.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderAxisHQSupply.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderSovietHQSupply.java
    VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
    VSQL-src/branches/morvael/rsr/SupplyCache.java

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2010-08-02 16:04:43 UTC (rev 7091)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2010-08-03 09:03:59 UTC (rev 7092)
@@ -170,7 +170,7 @@
   private void executeSupply1() {
     commandSetPhaseOwner(SIDE_AXIS);
     commandBaseLog("Checking supply of airbases.");
-    HashMap<HexRef, TerrainMapShaderCost> inSupply = supplyCache.getSupply(NATIONALITY_GERMAN, false);
+    HashMap<HexRef, TerrainMapShaderCost> inSupply = supplyCache.getSupply(NATIONALITY_GERMAN, false, false);
     HexRef hr;
     for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Airbase'")) {
       hr = mainGrid.getHexPos(gp.getPosition());
@@ -229,8 +229,8 @@
     ArrayList<GamePiece> isolatedUnits = new ArrayList<GamePiece>();
     for (GamePiece gp : filter.filterPieces(mainMap, "Type!='Airbase'&&Type!='AirFleet'&&Type!='Partisans'&&Type!='Asset'&&Type!='Depot'&&Type!='Marker'")) {
       nationality = RsrTrait.getNationality(gp);
-      infoN = supplyCache.getSupply(nationality, false);
-      infoA = supplyCache.getSupply(nationality, true);
+      infoN = supplyCache.getSupply(nationality, false, false);
+      infoA = supplyCache.getSupply(nationality, true, false);
       if ((infoN == null) || (infoA == null)) {
         continue;
       }
@@ -394,10 +394,33 @@
   }
 
   /**
+   * Set Axis strategic supply cache. (AUTO)
    * Set strategic movement for all Axis units. (AUTO)
    * Ask Axis player to strategically move units. (MANUAL)
    */
   private void executeAxisMovement2() {
+    HexRef hr;
+    CombatHexList chln = new CombatHexList("");
+    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Depot'&&SupplyMode==1&&" + T_PLACED + "==0")) {
+      hr = mainGrid.getHexPos(gp.getPosition());
+      chln.add(mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())));
+    }
+    CombatHexList chle = new CombatHexList("");
+    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Depot'&&SupplyMode==2&&" + T_PLACED + "==0")) {
+      hr = mainGrid.getHexPos(gp.getPosition());
+      chle.add(mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())));
+    }    
+    CombatHexList chlf = new CombatHexList("");
+    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Headquarters'&&Nationality=='" + NATIONALITY_FINNISH + "'")) {
+      hr = mainGrid.getHexPos(gp.getPosition());
+      chlf.add(mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())));
+    }      
+    CombatHexList chlr = new CombatHexList("");
+    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Headquarters'&&Nationality=='" + NATIONALITY_ROMANIAN + "'")) {
+      hr = mainGrid.getHexPos(gp.getPosition());
+      chlr.add(mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())));
+    }      
+    commandBaseSetProperty(dataPiece, G_AXIS_NORMAL_STRAT_HEXES, chln.toString(), G_AXIS_EMERGENCY_STRAT_HEXES, chle.toString(), G_FINNISH_STRAT_HEXES, chlf.toString(), G_ROMANIAN_STRAT_HEXES, chlr.toString());    
     int count = 0;
     HashSet<HexRef> blockedByEnemy = pieceCache.getHexesInRangeAnyEnemy(SIDE_AXIS, 4);
     for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Axis'&&" + T_MOVED + "==0")) {
@@ -415,10 +438,12 @@
   }
 
   /**
+   * Reset Axis strategic supply cache. (AUTO)
    * Set movement for all movable Axis units (except airbases). (AUTO)
    * Ask Axis player to move units (except airbases). (MANUAL)
    */
   private void executeAxisMovement3() {
+    commandBaseSetProperty(dataPiece, G_AXIS_NORMAL_STRAT_HEXES, "", G_AXIS_EMERGENCY_STRAT_HEXES, "", G_FINNISH_STRAT_HEXES, "", G_ROMANIAN_STRAT_HEXES, "");
     int count = 0;
     double mp = 0;
     for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Axis'&&Movement>0&&Type!='Airbase'&&" + T_MOVED + "==0")) {
@@ -632,10 +657,18 @@
   }
 
   /**
+   * Set Soviet strategic supply cache. (AUTO)
    * Set strategic movement for all Soviet units. (AUTO)
    * Ask Soviet player to strategically move units. (MANUAL)
    */
   private void executeSovietMovement3() {
+    HexRef hr;
+    CombatHexList chl = new CombatHexList("");
+    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Headquarters'&&Nationality=='Soviet'")) {
+      hr = mainGrid.getHexPos(gp.getPosition());
+      chl.add(mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())));
+    }
+    commandBaseSetProperty(dataPiece, G_SOVIET_STRAT_HEXES, chl.toString());
     int count = 0;
     HashSet<HexRef> blockedByEnemy = pieceCache.getHexesInRangeAnyEnemy(SIDE_SOVIET, 4);
     for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Soviet'&&" + T_MOVED + "==0")) {
@@ -652,11 +685,13 @@
     }
   }
 
-  /*
+  /**
+   * Reset Soviet strategic supply cache. (AUTO)
    * Set movement for all movable Soviet units (except leaders). (AUTO)
    * Ask Soviet player to move units (except leaders). (MANUAL)
    */
   private void executeSovietMovement4() {
+    commandBaseSetProperty(dataPiece, G_SOVIET_STRAT_HEXES, "");
     int count = 0;
     double mp = 0;
     for (GamePiece gp : filter.filterPieces(mainMap, "Side=='Soviet'&&Movement>0&&Type!='Leader'&&" + T_MOVED + "==0")) {
@@ -729,10 +764,23 @@
   }
 
   /**
+   * Set Axis strategic supply cache. (AUTO)
    * Set strategic movement for all German tank units. (AUTO)
    * Ask Axis player to strategically move German tank units. (MANUAL)
    */
   private void executeGermanTankMovement2() {
+    HexRef hr;
+    CombatHexList chln = new CombatHexList("");
+    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Depot'&&SupplyMode==1&&" + T_PLACED + "==0")) {
+      hr = mainGrid.getHexPos(gp.getPosition());
+      chln.add(mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())));
+    }
+    CombatHexList chle = new CombatHexList("");
+    for (GamePiece gp : filter.filterPieces(mainMap, "Type=='Depot'&&SupplyMode==2&&" + T_PLACED + "==0")) {
+      hr = mainGrid.getHexPos(gp.getPosition());
+      chle.add(mainGrid.locationName(mainGrid.getHexCenter(hr.getColumn(), hr.getRow())));
+    }    
+    commandBaseSetProperty(dataPiece, G_AXIS_NORMAL_STRAT_HEXES, chln.toString(), G_AXIS_EMERGENCY_STRAT_HEXES, chle.toString());
     int count = 0;
     HashSet<HexRef> blockedByEnemy = pieceCache.getHexesInRangeAnyEnemy(SIDE_AXIS, 4);
     for (GamePiece gp : filter.filterPieces(mainMap, "UnitType=='AxisGermanTankCorps','AxisGermanTankBattlegroup','AxisGermanTankDivision'&&" + T_MOVED + "==0")) {
@@ -750,12 +798,14 @@
   }
 
   /**
+   * Reset Axis strategic supply cache. (AUTO)
    * Reset status of moved units. (AUTO)
    * Fix stacks. (AUTO)
    * Remove Air Fleets from map. (AUTO)
    * Remove Airbase on given turn. (MANUAL)
    */
   private void executeGermanTankMovement3() {
+    commandBaseSetProperty(dataPiece, G_AXIS_NORMAL_STRAT_HEXES, "", G_AXIS_EMERGENCY_STRAT_HEXES, "");
     //
     commandMarkAsUnmovedAll();
     commandFixAllStacks();
@@ -1244,8 +1294,8 @@
         //never check the same hex more than once
         if (ignore.contains(hex) == false) {
           ignore.add(hex);
-          if (isStackSizeOK(hex, RsrTrait.getSide(gp), 0.0d) == false) {
-            //stack is not ok yet, the combat will not advance automatically
+          if ((isStackSizeOK(hex, RsrTrait.getSide(gp), 0.0d) == false) || (isStackFriendly(hex) == false)) {
+            //stack is not OK yet, the combat will not advance automatically
             resolve = false;
           } else {
             //since this stack is now ok, disable secondary retreat from it

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2010-08-02 16:04:43 UTC (rev 7091)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2010-08-03 09:03:59 UTC (rev 7092)
@@ -1391,7 +1391,7 @@
         //if the player has completed normal retreats, check for overstacks
         //where the retreated units are, if yes then mark all units in that
         //stack for secondary retreat and exit
-        for (GamePiece gp : filter.filterPieces(mainMap, T_RETREATING + "<0")) {
+        for (GamePiece gp : filter.filterPieces(mainMap, T_RETREATING + "==-1")) {
           hex = getHexRef(gp.getPosition());
           if (isStackSizeOK(hex, RsrTrait.getSide(gp), 0.0d) == false) {
             overstackHexes.add(hex);
@@ -1415,7 +1415,7 @@
           //since there is either no retreating units or no overstacks, check
           //for overstacks where the secondary retreating units are (either
           //moved or not moved), if yes then "fix" those stacks
-          for (GamePiece gp : filter.filterPieces(mainMap, T_OVERSTACK_RETREATING + "!=0||" + T_RETREATING + "!=0")) {
+          for (GamePiece gp : filter.filterPieces(mainMap, T_OVERSTACK_RETREATING + "<0||" + T_RETREATING + "<0")) {
             hex = getHexRef(gp.getPosition());
             if (isStackSizeOK(hex, RsrTrait.getSide(gp), 0.0d) == false) {
               overstackHexes.add(hex);
@@ -1989,7 +1989,7 @@
   public HashSet<HexRef> getAirborneAssaultHexes() {
     HashSet<HexRef> result = new HashSet<HexRef>();
     //add hexes around in-supply soviet headquarters (radius 6)
-    HashMap<HexRef, TerrainMapShaderCost> inSupply = supplyCache.getSupply(NATIONALITY_SOVIET, false);
+    HashMap<HexRef, TerrainMapShaderCost> inSupply = supplyCache.getSupply(NATIONALITY_SOVIET, false, false);
     HexRef hr;
     for (GamePiece gp : pieceCache.getHeadquarters(NATIONALITY_SOVIET)) {
       hr = getHexRef(gp.getPosition());
@@ -2018,7 +2018,7 @@
       }
       result.removeAll(pieceCache.getHexesInRangeOccupiedEnemy(side, 4));
     } else {
-      result.addAll(supplyCache.getSupply(nationality, false).keySet());
+      result.addAll(supplyCache.getSupply(nationality, false, false).keySet());
       if (side.equals(SIDE_AXIS)) {
         if (RsrTrait.getType(gp).equals("SecurityDivision")) {
           result.removeAll(pieceCache.getHexesInRangeOccupiedEnemy(side, 4));
@@ -2034,9 +2034,14 @@
       } else {
         result.removeAll(pieceCache.getHexesOccupiedByEnemy(side));
         result.removeAll(pieceCache.getHexesInZOCEnemy(side));
+        HashSet<HexRef> withLOC = supplyCache.getSovietLine();
         HashSet<HexRef> aroundHQ = new HashSet<HexRef>();
+        HexRef hr;
         for (GamePiece gpf : filter.filterPieces(mainMap, "Side=='Soviet'&&Type=='Headquarters'")) {
-          mainGrid.getHexesInRange(aroundHQ, getHexRef(gpf.getPosition()), 1);
+          hr = getHexRef(gpf.getPosition());
+          if (withLOC.contains(hr)) { //check if current HQ is "in supply" - depart from original rules
+            mainGrid.getHexesInRange(aroundHQ, hr, 1);
+          }
         }
         result.retainAll(aroundHQ);
       }

Modified: VSQL-src/branches/morvael/rsr/RsrConstants.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrConstants.java	2010-08-02 16:04:43 UTC (rev 7091)
+++ VSQL-src/branches/morvael/rsr/RsrConstants.java	2010-08-03 09:03:59 UTC (rev 7092)
@@ -188,6 +188,11 @@
   public static final String G_ATTACKER_SIDE = "attacker_side";
   public static final String G_DEFENDER_SIDE = "defender_side";
   public static final String G_GAME_STATUS = "game_status";
-  public static final String G_BREAKDOWN_MODE = "breakdown_mode";
+  public static final String G_AXIS_NORMAL_STRAT_HEXES = "axis_normal_strat_hexes";
+  public static final String G_AXIS_EMERGENCY_STRAT_HEXES = "axis_emergency_strat_hexes";
+  public static final String G_FINNISH_STRAT_HEXES = "finnish_strat_hexes";
+  public static final String G_ROMANIAN_STRAT_HEXES = "romanian_strat_hexes";
+  public static final String G_SOVIET_STRAT_HEXES = "soviet_strat_hexes";
+  public static final String G_BREAKDOWN_MODE = "breakdown_mode";  
 
 }

Modified: VSQL-src/branches/morvael/rsr/RsrGlobal.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrGlobal.java	2010-08-02 16:04:43 UTC (rev 7091)
+++ VSQL-src/branches/morvael/rsr/RsrGlobal.java	2010-08-03 09:03:59 UTC (rev 7092)
@@ -63,6 +63,11 @@
   private String attackerSide = "";
   private String defenderSide = "";
   private int gameStatus = 0;
+  private String axisNormalStratHexes = "";
+  private String axisEmergencyStratHexes = "";
+  private String finnishStratHexes = "";
+  private String romanianStratHexes = "";
+  private String sovietStratHexes = "";  
   private int breakdownMode = 0;
   // dynamic
   private GamePiece gp;
@@ -132,6 +137,16 @@
       return defenderSide;
     } else if (G_GAME_STATUS.equals(key)) {
       return gameStatus;
+    } else if (G_AXIS_NORMAL_STRAT_HEXES.equals(key)) {
+      return axisNormalStratHexes;
+    } else if (G_AXIS_EMERGENCY_STRAT_HEXES.equals(key)) {
+      return axisEmergencyStratHexes;
+    } else if (G_FINNISH_STRAT_HEXES.equals(key)) {
+      return finnishStratHexes;
+    } else if (G_ROMANIAN_STRAT_HEXES.equals(key)) {
+      return romanianStratHexes;
+    } else if (G_SOVIET_STRAT_HEXES.equals(key)) {
+      return sovietStratHexes;
     } else if (G_BREAKDOWN_MODE.equals(key)) {
       return breakdownMode;
     } else {
@@ -189,6 +204,16 @@
       return defenderSide;
     } else if (G_GAME_STATUS.equals(key)) {
       return gameStatus;
+    } else if (G_AXIS_NORMAL_STRAT_HEXES.equals(key)) {
+      return axisNormalStratHexes;
+    } else if (G_AXIS_EMERGENCY_STRAT_HEXES.equals(key)) {
+      return axisEmergencyStratHexes;
+    } else if (G_FINNISH_STRAT_HEXES.equals(key)) {
+      return finnishStratHexes;
+    } else if (G_ROMANIAN_STRAT_HEXES.equals(key)) {
+      return romanianStratHexes;
+    } else if (G_SOVIET_STRAT_HEXES.equals(key)) {
+      return sovietStratHexes;
     } else if (G_BREAKDOWN_MODE.equals(key)) {
       return breakdownMode;
     } else {
@@ -343,6 +368,36 @@
       } catch (Exception e) {
         gameStatus = 0;
       }
+    } else if (G_AXIS_NORMAL_STRAT_HEXES.equals(key)) {
+      try {
+        axisNormalStratHexes = val.toString();
+      } catch (Exception e) {
+        axisNormalStratHexes = "";
+      }
+    } else if (G_AXIS_EMERGENCY_STRAT_HEXES.equals(key)) {
+      try {
+        axisEmergencyStratHexes = val.toString();
+      } catch (Exception e) {
+        axisEmergencyStratHexes = "";
+      }
+    } else if (G_FINNISH_STRAT_HEXES.equals(key)) {
+      try {
+        finnishStratHexes = val.toString();
+      } catch (Exception e) {
+        finnishStratHexes = "";
+      }
+    } else if (G_ROMANIAN_STRAT_HEXES.equals(key)) {
+      try {
+        romanianStratHexes = val.toString();
+      } catch (Exception e) {
+        romanianStratHexes = "";
+      }
+    } else if (G_SOVIET_STRAT_HEXES.equals(key)) {
+      try {
+        sovietStratHexes = val.toString();
+      } catch (Exception e) {
+        sovietStratHexes = "";
+      }
     } else if (G_BREAKDOWN_MODE.equals(key)) {
       try {
         breakdownMode = Integer.parseInt(val.toString());
@@ -407,6 +462,11 @@
     se.append(attackerSide);
     se.append(defenderSide);
     se.append(gameStatus);
+    se.append(axisNormalStratHexes);
+    se.append(axisEmergencyStratHexes);
+    se.append(finnishStratHexes);
+    se.append(romanianStratHexes);
+    se.append(sovietStratHexes);
     return se.getValue();
   }
 
@@ -436,6 +496,11 @@
     attackerSide = st.nextToken("");
     defenderSide = st.nextToken("");
     gameStatus = st.nextInt(0);
+    axisNormalStratHexes = st.nextToken("");
+    axisEmergencyStratHexes = st.nextToken("");
+    finnishStratHexes = st.nextToken("");
+    romanianStratHexes = st.nextToken("");
+    sovietStratHexes = st.nextToken("");
   }
 
   public Rectangle boundingBox() {
@@ -539,7 +604,7 @@
     }
 
     public String getState() {
-      return "0;6;0;0;0;0;0;;;0;0;0;0;0;0;0;0;0;0;0;;;;0";
+      return "0;6;0;0;0;0;0;;;0;0;0;0;0;0;0;0;0;0;0;;;;0;;;;;;;";
     }
 
     public String getType() {
@@ -657,8 +722,29 @@
     return instance.gameStatus;
   }
 
+  public static final String getAxisNormalStratHexes() {
+    return instance.axisNormalStratHexes;
+  }
+
+  public static final String getAxisEmergencyStratHexes() {
+    return instance.axisEmergencyStratHexes;
+  }
+
+  public static final String getFinnishStratHexes() {
+    return instance.finnishStratHexes;
+  }
+
+  public static final String getRomanianStratHexes() {
+    return instance.romanianStratHexes;
+  }
+
+  public static final String getSovietStratHexes() {
+    return instance.sovietStratHexes;
+  }
+  
   public static final int getBreakdownMode() {
     return instance.breakdownMode;
   }
+
   
 }

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderAxisHQSupply.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderAxisHQSupply.java	2010-08-02 16:04:43 UTC (rev 7091)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderAxisHQSupply.java	2010-08-03 09:03:59 UTC (rev 7092)
@@ -23,6 +23,7 @@
 	private Set<HexRef> occupiedByEnemy;
 	private Set<HexRef> inEnemyZOC;
 	private boolean isAttritionCheck;
+	private boolean useStoredPoints;
 	private double rangeMod;
 	
 	public RsrMapShaderAxisHQSupply() {
@@ -38,9 +39,15 @@
 		} catch (Exception e) {
 			isAttritionCheck = false;
 		}
+    try {
+      useStoredPoints = supplyParams[3].equals("1");
+    } catch (Exception e) {
+      useStoredPoints = false;
+    } 		
 		//Helsinki;Finnish
 		//Bucharest;Romanian
 		//+Attrition/Normal
+		//+1/0 useStoredPoints
 		rangeMod = isAttritionCheck ? 2.0 : 1.0;
 	}
 	
@@ -58,12 +65,27 @@
 		}
 		//find all hexes with railroad line of communication to supply sources
 		Set<HexRef> withLOC = getHexes(map, grid, terrainMap, new RsrHelperRailroadLine(this, selectedHexes.keySet()), "", null).keySet();
-		//find hexes with HQs that have railroad line of communication to supply sources
-		for (GamePiece gp : filter.filterPieces(map, "Type=='Headquarters'&&Nationality=='" + supplyParams[1] + "'")) {
-			HexRef hr = grid.getHexPos(gp.getPosition());
-			if ((withLOC.contains(hr)) && (canEnter(hr))) {
-				addHex(selectedHexes, hr, create(null, true, rangeMod * 4.0, false, null, 0));
-			}
+		if (useStoredPoints) {
+      //find hexes with HQs that have railroad line of communication to supply sources, using stored locations
+		  CombatHexList chl;
+		  if (supplyParams[1].equals(NATIONALITY_FINNISH)) {
+		    chl = new CombatHexList(RsrGlobal.getFinnishStratHexes());
+		  } else {
+		    chl = new CombatHexList(RsrGlobal.getRomanianStratHexes());
+		  }
+		  for (HexRef hr : chl.getHexes()) {
+        if ((withLOC.contains(hr)) && (canEnter(hr))) {
+          addHex(selectedHexes, hr, create(null, true, rangeMod * 4.0, false, null, 0));
+        }		    
+		  }
+		} else {
+	    //find hexes with HQs that have railroad line of communication to supply sources
+  		for (GamePiece gp : filter.filterPieces(map, "Type=='Headquarters'&&Nationality=='" + supplyParams[1] + "'")) {
+  			HexRef hr = grid.getHexPos(gp.getPosition());
+  			if ((withLOC.contains(hr)) && (canEnter(hr))) {
+  				addHex(selectedHexes, hr, create(null, true, rangeMod * 4.0, false, null, 0));
+  			}
+  		}
 		}
 		//find hexes with partisans
 		partisanHexes.clear();

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java	2010-08-02 16:04:43 UTC (rev 7091)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderDepotSupply.java	2010-08-03 09:03:59 UTC (rev 7092)
@@ -24,6 +24,7 @@
 	private Set<HexRef> occupiedByEnemy;
 	private Set<HexRef> inEnemyZOC;
 	private boolean isAttritionCheck;
+	private boolean useStoredPoints;
 	private double rangeMod;
 	
 	public RsrMapShaderDepotSupply() {
@@ -39,7 +40,13 @@
 		} catch (Exception e) {
 			isAttritionCheck = false;
 		}		
+    try {
+      useStoredPoints = supplyParams[1].equals("1");
+    } catch (Exception e) {
+      useStoredPoints = false;
+    } 		
 		//+Attrition/Normal
+    //+1/0 useStoredPoints		
 		rangeMod = isAttritionCheck ? 2.0 : 1.0;
 	}
 	
@@ -68,21 +75,39 @@
 				}
 			}
 		}
-		//find hexes with emergency depots
-		for (GamePiece gp : filter.filterPieces(map, "Type=='Depot'&&SupplyMode==2&&" + T_PLACED + "==0")) {
-			HexRef hr = grid.getHexPos(gp.getPosition());
-			if (canEnter(hr)) {
-				addHex(selectedHexes, hr, create(null, true, rangeMod * 4.0, false, MODE_EMERGENCY, 0));
-			}
-		}		
-		//find hexes with normal depots
-		respawnHexes.clear();
-		for (GamePiece gp : filter.filterPieces(map, "Type=='Depot'&&SupplyMode==1&&" + T_PLACED + "==0")) {
-			HexRef hr = grid.getHexPos(gp.getPosition());
-			if (canEnter(hr)) {
-				respawnHexes.add(hr);
-			}
-		}
+    if (useStoredPoints) {
+      CombatHexList chl;
+      //find hexes with emergency depots, using stored locations
+      chl = new CombatHexList(RsrGlobal.getAxisEmergencyStratHexes());
+      for (HexRef hr : chl.getHexes()) {
+        if (canEnter(hr)) {
+          addHex(selectedHexes, hr, create(null, true, rangeMod * 4.0, false, MODE_EMERGENCY, 0));
+        }        
+      }
+      //find hexes with normal depots, usin stored locations
+      chl = new CombatHexList(RsrGlobal.getAxisNormalStratHexes());
+      for (HexRef hr : chl.getHexes()) {
+        if (canEnter(hr)) {
+          respawnHexes.add(hr);
+        }       
+      }
+    } else {		
+  		//find hexes with emergency depots
+  		for (GamePiece gp : filter.filterPieces(map, "Type=='Depot'&&SupplyMode==2&&" + T_PLACED + "==0")) {
+  			HexRef hr = grid.getHexPos(gp.getPosition());
+  			if (canEnter(hr)) {
+  				addHex(selectedHexes, hr, create(null, true, rangeMod * 4.0, false, MODE_EMERGENCY, 0));
+  			}
+  		}		
+  		//find hexes with normal depots
+  		respawnHexes.clear();
+  		for (GamePiece gp : filter.filterPieces(map, "Type=='Depot'&&SupplyMode==1&&" + T_PLACED + "==0")) {
+  			HexRef hr = grid.getHexPos(gp.getPosition());
+  			if (canEnter(hr)) {
+  				respawnHexes.add(hr);
+  			}
+  		}
+    }
 		//find hexes with partisans
 		partisanHexes.clear();
 		for (GamePiece gp : pieceCache.getPartisans()) {

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderSovietHQSupply.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderSovietHQSupply.java	2010-08-02 16:04:43 UTC (rev 7091)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderSovietHQSupply.java	2010-08-03 09:03:59 UTC (rev 7092)
@@ -22,6 +22,7 @@
 	private Set<HexRef> occupiedByEnemy;
 	private Set<HexRef> inEnemyZOC;
 	private boolean isAttritionCheck;
+	private boolean useStoredPoints;
 	private double rangeMod;
 	
 	public RsrMapShaderSovietHQSupply() {
@@ -37,7 +38,13 @@
 		} catch (Exception e) {
 			isAttritionCheck = false;
 		}		
+    try {
+      useStoredPoints = supplyParams[1].equals("1");
+    } catch (Exception e) {
+      useStoredPoints = false;
+    } 		
 		//+Attrition/Normal
+    //+1/0 useStoredPoints		
 		rangeMod = isAttritionCheck ? 2.0 : 1.0;
 	}
 	
@@ -70,13 +77,23 @@
 				}
 			}
 		}
-		//find hexes with HQs that have railroad line of communication to supply sources
-		for (GamePiece gp : filter.filterPieces(map, "Type=='Headquarters'&&Nationality=='Soviet'")) {
-			HexRef hr = grid.getHexPos(gp.getPosition());
-			if ((withLOC.contains(hr)) && (canEnter(hr))) {
-				addHex(selectedHexes, hr, create(null, true, rangeMod * 6.0, false, MODE_NORMAL, 0));
-			}
-		}
+    if (useStoredPoints) {
+      //find hexes with HQs that have railroad line of communication to supply sources, using stored locations
+      CombatHexList chl = new CombatHexList(RsrGlobal.getSovietStratHexes());
+      for (HexRef hr : chl.getHexes()) {
+        if ((withLOC.contains(hr)) && (canEnter(hr))) {
+          addHex(selectedHexes, hr, create(null, true, rangeMod * 6.0, false, MODE_NORMAL, 0));
+        }       
+      }
+    } else {		
+      //find hexes with HQs that have railroad line of communication to supply sources
+  		for (GamePiece gp : filter.filterPieces(map, "Type=='Headquarters'&&Nationality=='Soviet'")) {
+  			HexRef hr = grid.getHexPos(gp.getPosition());
+  			if ((withLOC.contains(hr)) && (canEnter(hr))) {
+  				addHex(selectedHexes, hr, create(null, true, rangeMod * 6.0, false, MODE_NORMAL, 0));
+  			}
+  		}
+    }
 	}
 		
 	public String getSide() {

Modified: VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2010-08-02 16:04:43 UTC (rev 7091)
+++ VSQL-src/branches/morvael/rsr/RsrMapShaderStrategic.java	2010-08-03 09:03:59 UTC (rev 7092)
@@ -56,8 +56,7 @@
     }
 		//
     //find hexes in supply
-    //TODO: check if flags are not needed to block for eg. movement of leaders through sea supply zone
-    inSupply = RsrAdvance.getInstance().getSupplyCache().getSupply(nationality, false);
+    inSupply = RsrAdvance.getInstance().getSupplyCache().getSupply(nationality, false, true);
     if (inSupply == null) {
       inSupply = new HashMap<HexRef, TerrainMapShaderCost>();
     }

Modified: VSQL-src/branches/morvael/rsr/SupplyCache.java
===================================================================
--- VSQL-src/branches/morvael/rsr/SupplyCache.java	2010-08-02 16:04:43 UTC (rev 7091)
+++ VSQL-src/branches/morvael/rsr/SupplyCache.java	2010-08-03 09:03:59 UTC (rev 7092)
@@ -56,26 +56,27 @@
 
   @Override
   protected HashMap<HexRef, TerrainMapShaderCost> calculate2(String id) {
-    String nationality = id.substring(1);
+    String nationality = id.substring(2);
     String attrition = id.charAt(0) == 'A' ? "Attrition" : "Normal";
+    String useStoredPoints = id.charAt(1) == '1' ? "1" : "0";
     if ((nationality.equals(NATIONALITY_GERMAN)) || (nationality.equals(NATIONALITY_HUNGARIAN)) || (nationality.equals(NATIONALITY_ITALIAN))) {
-      return TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesAxisDepot, attrition, null);
+      return TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesAxisDepot, attrition + ";" + useStoredPoints, null);
     } else
     if (nationality.equals(NATIONALITY_SOVIET)) {
-      return TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesSovietHQ, attrition, null);
+      return TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesSovietHQ, attrition + ";" + useStoredPoints, null);
     } else
     if (nationality.equals(NATIONALITY_ROMANIAN)) {
-      return TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesAxisHQ, "Bucharest;Romanian;" + attrition, null);
+      return TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesAxisHQ, "Bucharest;Romanian;" + attrition + ";" + useStoredPoints, null);
     } else
     if (nationality.equals(NATIONALITY_FINNISH)) {
-      return TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesAxisHQ, "Helsinki;Finnish;" + attrition, null);
+      return TerrainMapShaderRule.getHexes(mainMap, mainGrid, mainTerrain, rulesAxisHQ, "Helsinki;Finnish;" + attrition + ";" + useStoredPoints, null);
     } else {
       return null;
     }
   }
 
-  public HashMap<HexRef, TerrainMapShaderCost> getSupply(String nationality, boolean attrition) {
-    return get2((attrition ? "A" : "N") + nationality);
+  public HashMap<HexRef, TerrainMapShaderCost> getSupply(String nationality, boolean attrition, boolean useStoredPoints) {
+    return get2((attrition ? "A" : "N") + (useStoredPoints ? "1" : "0") + nationality);
   }
 
   public HashSet<HexRef> getSovietLine() {


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

Revision: 7105
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7105&view=rev
Author:   morvael
Date:     2010-08-11 12:05:46 +0000 (Wed, 11 Aug 2010)

Log Message:
-----------
4.0.6 final, added warnings to overstack and motorized loss

Modified Paths:
--------------
    VSQL-src/branches/morvael/rsr/RsrAdvance.java
    VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java

Modified: VSQL-src/branches/morvael/rsr/RsrAdvance.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvance.java	2010-08-05 19:06:02 UTC (rev 7104)
+++ VSQL-src/branches/morvael/rsr/RsrAdvance.java	2010-08-11 12:05:46 UTC (rev 7105)
@@ -1324,6 +1324,10 @@
       }
       commandAdvance(true);
     }
+    //warning about possible overstacks
+    if ((isStackSizeOK(hr) == false) || (isStackFriendly(hr) == false)) {
+      commandBaseLog("Warning! Stack rules violation in " + getLocationName(hr) + ".");
+    }
   }
 
   /**

Modified: VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java
===================================================================
--- VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2010-08-05 19:06:02 UTC (rev 7104)
+++ VSQL-src/branches/morvael/rsr/RsrAdvanceBase.java	2010-08-11 12:05:46 UTC (rev 7105)
@@ -1206,6 +1206,32 @@
                                   DEFENDER_HEXES, defenderHexes.toString(),
                                   G_ATTACKER_SIDE, attackerSide,
                                   G_DEFENDER_SIDE, defenderSide);
+    //warning about possible losses to motorized forces attacking urban area
+    if (overrun == false) {
+      boolean urbanLoss = false;
+      for (HexRef hr : defenderHexes.getHexes()) {
+        if (isMajorCity(mainTerrain.getHexTerrainName(hr))) {
+          urbanLoss = true;
+          break;
+        }
+      }
+      if (urbanLoss) {
+        int steps;
+        int totalSteps = 0;
+        int motorizedSteps = 0;
+        for (GamePiece gp : filter.filterPieces(mainMap, T_ATTACKER + ">0")) {
+          steps = RsrTrait.getCurrentNominalSteps(gp);
+          totalSteps += steps;
+          if (RsrTrait.getMovementTypeAsInt(gp) == MOVEMENT_MOTORIZED) {
+            motorizedSteps += steps;
+          }
+        }
+        urbanLoss = 2*motorizedSteps > totalSteps;
+        if (urbanLoss) {
+          commandBaseLog("Warning! Additional losses may apply to motorized forces attacking urban area (" + motorizedSteps + " step(s) out of " + totalSteps + " step(s) are motorized).");
+        }
+      }      
+    }
   }
 
   public void commandResolveCombat(boolean auto) {


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