Mercurial > hg > batmud > maputils

changeset 842:f5dda74e6e07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Print help if no target is given. Remove generation of worldmap.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 25 Sep 2009 09:02:00 +0000
parents e8f8c99a32e8
children d30b6b92f52b
files maps/Makefile maps/Makefile.inc maps/config.mak
diffstat 3 files changed, 14 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/maps/Makefile	Fri Sep 25 06:05:37 2009 +0000
+++ b/maps/Makefile	Fri Sep 25 09:02:00 2009 +0000
@@ -9,7 +9,19 @@
 	$(patsubst %.map,%.ansi,$(MAPLIST)) \
 	$(patsubst %.map,%.png,$(MAPLIST))
 
-all: $(patsubst %.map,%.ppm,$(MAPLIST)) $(TARGETS)
+all:
+	@echo "Usage: make <maps|fetch|diff|upload>"
+	@echo
+	@echo "maps  : Build HTML, HTML+JS, PNG image and ANSI format maps."
+	@echo "fetch : Fetch latest raw ASCII map data from bat.org."
+	@echo "diff  : Do special diff operation between new data (gotten via 'fetch')"
+	@echo "        and update .loc files for each continent with new locations."
+	@echo "        A diff -u of new and old location files is outputted."
+	@echo "upload: Uploads map and loc-files via SCP to server specified in"
+	@echo "        ../config.mak"
+
+
+maps: $(patsubst %.map,%.ppm,$(MAPLIST)) $(TARGETS)
 
 
 #laenor.map:
@@ -18,26 +30,10 @@
 
 include Makefile.inc
 
-world.map: $(MAPLIST)
-	$(COMBINE_BIN) -v -f "~" $(MAPLISTOFFS) -o $@
-
-world.loc: $(patsubst %.map,%.loc,$(MAPLIST))
-	for i in $(MAPLISTOFFS); do $(MKLOC_BIN) -v -L -l `echo "$$i"|sed "s/^\([^\.]*\).map:.*/\1.loc/"` -m `echo "$$i"|sed "s/^\([^:]*\):\([0-9]*\):\([0-9]*\)/\1 -x \2 -y \3/"`; done > $@
-
-world.ppm: world.map
-	$(MAP2PPM_BIN) $< | convert ppm:- -resize "50%" $@
-
-world.script: world.map world.loc
-	$(MKLOC_BIN) -vnS -m $< -l $(patsubst %.map,%.loc,$<) -u $(WORLDUNITSIZE) -s $(WORLDMAPSCALE) | \
-	sed -e "s/@OPTS_START@/-font $(WORLDFONT) -pointsize 10 -type TruecolorMatte/g" \
-	-e "s/@OPTS_END@/\t-geometry +220+15 title.png -composite -compose screen \\\\\n\t-pointsize 30 -fill white -box none -draw \"text 10,30 \'\n@PAF@\n\n/g" | \
-	sed -e "/@PAF@/r $(patsubst %.map,%.desc,$<)" -e "s/@PAF@//g" > $@
-
-
 #
 # Special targets
 #
-upload: $(TARGETS) renardy.map *.loc world.jpg util.js
+upload: $(TARGETS) renardy.map *.loc util.js
 	scp -C $? $(UPURL)
 	touch $@
 
--- a/maps/Makefile.inc	Fri Sep 25 06:05:37 2009 +0000
+++ b/maps/Makefile.inc	Fri Sep 25 09:02:00 2009 +0000
@@ -38,7 +38,3 @@
 
 %.png: %.ppm %.script %.desc
 	/bin/sh $(patsubst %.ppm,%.script,$<) $< $@
-
-%.jpg: %.ppm %.script %.desc
-	/bin/sh $(patsubst %.ppm,%.script,$<) $< $@
-
--- a/maps/config.mak	Fri Sep 25 06:05:37 2009 +0000
+++ b/maps/config.mak	Fri Sep 25 09:02:00 2009 +0000
@@ -8,24 +8,11 @@
 UNITSIZE=4.0
 MAPSCALE=4
 
-WORLDFONT=MonospaceBold.ttf
-WORLDUNITSIZE=3.0
-WORLDMAPSCALE=0.5
-
 BINPATH=../
 EXEEXT=
 
 COLORMAP_OPTS=-u "../www/urchin.inc.php"
 
-MAPLISTOFFS=			\
-	laenor.map:1313:1486	\
-	furn.map:2458:2615	\
-	roth.map:2786:15	\
-	luc.map:644:3811	\
-	deso.map:54:2285	\
-	renardy.map:3643:360
-
-
 MAPLIST=laenor.map roth.map luc.map furn.map deso.map renardy.map
 
 BATMAPURL=http://www.bat.org/maps/raw/