Merge branch 'json-comm' of dreamhost:~/repositories/git/tacticians-client into json-comm

6 files changed, 15 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 76cae03..1e9d569 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,12 @@ clean:
 		$(MAKE) -C $$module clean ; \
 	done
 
+reset:
+	for module in $(MODULES_SRC) ; do \
+		$(MAKE) -C $$module clean; \
+		$(MAKE) -C $$module reset; \
+	done
+
 $(MODULES_WWW): %:
 	ln -s $(SRC_DIR)/$(patsubst $(WWW_DIR)/%,%,$@)/www/ $@
 
diff --git a/src/asset/Makefile b/src/asset/Makefile
index 73216f7..d05793b 100644
--- a/src/asset/Makefile
+++ b/src/asset/Makefile
@@ -2,3 +2,5 @@ build:
 
 clean:
 
+reset:
+
diff --git a/src/asset/template/character_icon_entry.css b/src/asset/template/character_icon_entry.css
new file mode 100644
index 0000000..5eeba27
--- /dev/null
+++ b/src/asset/template/character_icon_entry.css
@@ -0,0 +1 @@
+.asset-character-icon-$ID${background-color:$COLOR$;}
diff --git a/src/asset/template/tile_entry.css b/src/asset/template/tile_entry.css
new file mode 100644
index 0000000..170d034
--- /dev/null
+++ b/src/asset/template/tile_entry.css
@@ -0,0 +1 @@
+.asset-tile-$ID${background-color:$COLOR$;}
diff --git a/src/battlemap/Makefile b/src/battlemap/Makefile
index 02cae24..d5372f1 100644
--- a/src/battlemap/Makefile
+++ b/src/battlemap/Makefile
@@ -14,3 +14,6 @@ build: $(WWW_SCRIPT_DIR)/main.js
 
 clean:
 	rm -f $(WWW_SCRIPT_DIR)/main.js
+
+reset:
+	rm -rf elm-stuff
diff --git a/src/global/Makefile b/src/global/Makefile
index 73216f7..d05793b 100644
--- a/src/global/Makefile
+++ b/src/global/Makefile
@@ -2,3 +2,5 @@ build:
 
 clean:
 
+reset:
+