From 6c1a1c18af25fad7334b8f4c925bdb6ab463709f Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Mon, 23 Jun 2014 22:53:52 -0500
Subject: [PATCH] Scripts assigned to the map are now visible.  Still needs
 some UX to be fully useful but it's sufficient for basic stuff.

---
 .../org/badvision/outlaweditor/MapEditor.java | 75 ++++++++++++-------
 .../badvision/outlaweditor/data/TileMap.java  |  6 +-
 2 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java
index e03d3d91..414569d9 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java
@@ -12,6 +12,7 @@ import javafx.scene.ImageCursor;
 import javafx.scene.Scene;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.effect.DropShadow;
 import javafx.scene.image.ImageView;
 import javafx.scene.image.WritableImage;
 import javafx.scene.input.Clipboard;
@@ -237,41 +238,57 @@ public class MapEditor extends Editor<Map, MapEditor.DrawMode> implements EventH
         }
     }
 
+    private static final int dashLength=3;
+    
     private void highlightScripts(int x, int y, List<Script> scripts) {
         if (scripts == null || scripts.isEmpty()) {
             return;
         }
         GraphicsContext gc = drawCanvas.getGraphicsContext2D();
         int idx = 0;
-        int xx = (int) (x * tileWidth);
-        int yy = (int) (y * tileHeight);
-        gc.setLineWidth(2.5);
-        gc.setStroke(currentMap.getScriptColor(scripts.get(0)));
-        gc.rect(xx, yy, tileWidth, tileHeight);
-//        gc.beginPath();
-//        gc.moveTo(xx,yy);
-//        for (int i = 0; i < tileWidth; i += 2, xx += 2) {
-//            idx = (idx + 1) % scripts.size();
-//            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
-//            gc.lineTo(xx, yy);
-//        }
-//        for (int i = 0; i < tileHeight; i += 2, yy += 2) {
-//            idx = (idx + 1) % scripts.size();
-//            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
-//            gc.lineTo(xx, yy);
-//        }
-//        for (int i = 0; i < tileWidth; i += 2, xx -= 2) {
-//            idx = (idx + 1) % scripts.size();
-//            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
-//            gc.lineTo(xx, yy);
-//        }
-//        for (int i = 0; i < tileHeight; i += 2, yy -= 2) {
-//            idx = (idx + 1) % scripts.size();
-//            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
-//            gc.lineTo(xx, yy);
-//        }
-//        gc.closePath();
-
+        double xx = x * tileWidth;
+        double yy = y * tileHeight;
+        gc.setLineWidth(4);
+        for (int i = 0; i < tileWidth-2; i += dashLength) {
+            idx = (idx + 1) % scripts.size();
+            gc.beginPath();
+            gc.moveTo(xx,yy);
+            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
+            xx += dashLength;
+            gc.lineTo(xx, yy);
+            gc.setEffect(new DropShadow(2, Color.BLACK));
+            gc.stroke();
+        }
+        for (int i = 0; i < tileHeight-2; i += dashLength) {
+            idx = (idx + 1) % scripts.size();
+            gc.beginPath();
+            gc.moveTo(xx,yy);
+            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
+            yy += dashLength;
+            gc.lineTo(xx, yy);
+            gc.setEffect(new DropShadow(2, Color.BLACK));
+            gc.stroke();
+        }
+        for (int i = 0; i < tileWidth-2; i += dashLength) {
+            idx = (idx + 1) % scripts.size();
+            gc.beginPath();
+            gc.moveTo(xx,yy);
+            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
+            xx -= dashLength;
+            gc.lineTo(xx, yy);
+            gc.setEffect(new DropShadow(2, Color.BLACK));
+            gc.stroke();
+        }
+        for (int i = 0; i < tileHeight-2; i += dashLength) {
+            idx = (idx + 1) % scripts.size();
+            gc.beginPath();
+            gc.moveTo(xx,yy);
+            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
+            yy -= dashLength;
+            gc.lineTo(xx, yy);
+            gc.setEffect(new DropShadow(2, Color.BLACK));
+            gc.stroke();
+        }
     }
 
     public void setupDragDrop(TransferHelper<Script> scriptHelper) {
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java
index 2c8d6bb7..12c3c39d 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java
@@ -40,9 +40,9 @@ public class TileMap extends ArrayList<ArrayList<Tile>> implements Serializable
         loadFromMap(m);
     }
 
-    public static final double SATURATION = 0.5;
+    public static final double SATURATION = 0.75;
     public static final double VALUE = 1.0;
-    public static double HUE = 0;
+    public static double HUE = 180;
     private final java.util.Map<Integer, List<Script>> locationScripts = new HashMap<>();
     private final java.util.Map<Script, Color> scriptColors = new HashMap<>();
     
@@ -70,7 +70,7 @@ public class TileMap extends ArrayList<ArrayList<Tile>> implements Serializable
     private void registerLocationScript(int x, int y, Script s) {
         if (!scriptColors.containsKey(s)) {
             scriptColors.put(s, Color.hsb(HUE, SATURATION, VALUE));
-            HUE = (HUE + 20) % 360;
+            HUE = (HUE + 35) % 360;
         }
         int loc = getMortonNumber(x, y);
         List<Script> list = locationScripts.get(loc);