From 5b6f50553bc4736b93f3a61dbf1997836f560904 Mon Sep 17 00:00:00 2001 From: Brendan Robert Date: Sun, 6 Jul 2014 16:49:13 -0500 Subject: [PATCH] Fixed issue with apostrophes in the script data and changed script color allocation a little bit. --- .../main/java/org/badvision/outlaweditor/MythosEditor.java | 1 + .../main/java/org/badvision/outlaweditor/data/TileMap.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java index 8d1688b9..5f32537c 100644 --- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java +++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java @@ -107,6 +107,7 @@ public class MythosEditor { JAXBElement root = new JAXBElement<>(qName, Block.class, script.getBlock()); context.createMarshaller().marshal(root, buffer); String xml = buffer.toString(); + xml = xml.replaceAll("'", "'"); xml = xml.replace("?>", "?>"); xml += ""; System.out.println("xml: " + xml); 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 26e615bd..a414e81a 100644 --- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java +++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java @@ -41,7 +41,7 @@ public class TileMap extends ArrayList> implements Serializable loadFromMap(m); } - public static final double SATURATION = 0.75; + public static final double SATURATION = 0.70; public static final double VALUE = 1.0; public static double HUE = 180; private final java.util.Map> locationScripts = new HashMap<>(); @@ -85,7 +85,7 @@ public class TileMap extends ArrayList> 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 + 35) % 360; + HUE = (HUE + 27) % 360; } int loc = getMortonNumber(x, y); List