Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2024-10-28 20:24:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/badvision/lawless-legends

Browse Source
This commit is contained in:
Martin Haye 2014-07-06 17:25:53 -07:00
commit 61e568f38d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
View File

@ -107,6 +107,7 @@ public class MythosEditor {
JAXBElement<Block> root = new JAXBElement<>(qName, Block.class, script.getBlock());
context.createMarshaller().marshal(root, buffer);
String xml = buffer.toString();
xml = xml.replaceAll("'", "&apos;");
xml = xml.replace("?>", "?><xml>");
xml += "</xml>";
System.out.println("xml: " + xml);

4
OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java
View File

@ -41,7 +41,7 @@ public class TileMap extends ArrayList<ArrayList<Tile>> 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<Integer, List<Script>> locationScripts = new HashMap<>();
@ -85,7 +85,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 + 35) % 360;
HUE = (HUE + 27) % 360;
}
int loc = getMortonNumber(x, y);
List<Script> list = locationScripts.get(loc);

2
OutlawEditor/src/main/resources/mythos/mythos-editor/js/mythos_uncompressed.js
View File

@ -233,7 +233,7 @@ if (typeof Mythos === "undefined") {
this.setColour(54);
this.appendDummyInput()
.appendField("Get Yes or No");
this.setOutput(true, "boolean");
this.setOutput(true, "Boolean");
this.setTooltip('');
}
};