changeset 255:be481e1dca9e

Updated and improved generation of image-format maps.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 31 May 2007 00:45:40 +0000
parents 0ca2ab58c1bb
children 91ced07bd97a
files maps/Makefile maps/deso.desc maps/furn.desc maps/luc.desc maps/luc.loc maps/roth.desc
diffstat 6 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/maps/Makefile	Thu May 31 00:45:19 2007 +0000
+++ b/maps/Makefile	Thu May 31 00:45:40 2007 +0000
@@ -20,16 +20,19 @@
 	$(COLORMAP_BIN) -t "`cat $(patsubst %.tmp,%.desc,$<)`" -vaC -f xhtml -o $@ $<
 
 %.script: %.map %.loc $(MKLOC_BIN)
-	$(MKLOC_BIN) -vS -m $< -l $(patsubst %.map,%.loc,$<) -i $(LOCSCALE) -s $(MAPSCALE) -o $@
+	$(MKLOC_BIN) -vS -m $< -l $(patsubst %.map,%.loc,$<) -i $(LOCSCALE) -s $(MAPSCALE) | \
+	sed -e "s/@OPTS_START@/-font MonospaceBold.ttf -pointsize 14 -type TruecolorMatte/g" \
+	-e "s/@OPTS_END@/\t-geometry +0+5 world-title.png -composite -compose screen \\\\\n\t-pointsize 20 -fill white -box none -draw \"text 10,35 \'@PAF@\n\n\n/g" | \
+	sed -e "/@PAF@/r $(patsubst %.map,%.desc,$<)" -e "s/@PAF@//g" > $@
 
 %.ppm: %.map $(MAP2PPM_BIN)
 	$(MAP2PPM_BIN) -v $< | pnmscale $(MAPSCALE) -nomix > $@
 
 %.png: %.ppm %.script %.desc
-	/bin/sh $(patsubst %.ppm,%.script,$<) $< "$(FONT)" "`cat $(patsubst %.ppm,%.desc,$<)`" $@
+	/bin/sh $(patsubst %.ppm,%.script,$<) $< $@
 
 %.jpg: %.ppm %.script %.desc
-	/bin/sh $(patsubst %.ppm,%.script,$<) $< "$(FONT)" "`cat $(patsubst %.ppm,%.desc,$<)`" $@
+	/bin/sh $(patsubst %.ppm,%.script,$<) $< $@
 
 world.map: $(MAPLIST) $(COMBINE_BIN)
 	$(COMBINE_BIN) -v -f "~" $(MAPLISTOFFS) -o $@
@@ -41,7 +44,10 @@
 	$(MAP2PPM_BIN) -v $< | pnmscale $(WORLDMAPSCALE) -verbose > $@
 
 world.script: world.map world.loc $(MKLOC_BIN)
-	$(MKLOC_BIN) -vnS -m world.map -l world.loc -i $(WORLDLOCSCALE) -s $(WORLDMAPSCALE) -o $@
+	$(MKLOC_BIN) -vnS -m $< -l $(patsubst %.map,%.loc,$<) -i $(WORLDLOCSCALE) -s $(WORLDMAPSCALE) | \
+	sed -e "s/@OPTS_START@/-font Bandal.ttf -pointsize 10 -type TruecolorMatte/g" \
+	-e "s/@OPTS_END@/\t-geometry +220+15 world-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
--- a/maps/deso.desc	Thu May 31 00:45:19 2007 +0000
+++ b/maps/deso.desc	Thu May 31 00:45:40 2007 +0000
@@ -1,1 +1,1 @@
-Continent of Desolathya @ BatMUD - mapdata by Ooga, locations and conversion by Ggr
+Continent of Desolathya @ BatMUD - mapdata by Ooga, locations and conversion by Ggr
\ No newline at end of file
--- a/maps/furn.desc	Thu May 31 00:45:19 2007 +0000
+++ b/maps/furn.desc	Thu May 31 00:45:40 2007 +0000
@@ -1,1 +1,1 @@
-Continent of Furnachia @ BatMUD - mapdata by Ooga, conversion by Ggr
+Continent of Furnachia @ BatMUD - mapdata by Ooga, conversion by Ggr
\ No newline at end of file
--- a/maps/luc.desc	Thu May 31 00:45:19 2007 +0000
+++ b/maps/luc.desc	Thu May 31 00:45:40 2007 +0000
@@ -1,1 +1,1 @@
-Continent of Lucentium @ BatMUD - mapdata by Ggr & Malacoda, locations by Ggr
+Continent of Lucentium @ BatMUD - mapdata by Ggr & Malacoda, locations by Ggr
\ No newline at end of file
--- a/maps/luc.loc	Thu May 31 00:45:19 2007 +0000
+++ b/maps/luc.loc	Thu May 31 00:45:40 2007 +0000
@@ -15,7 +15,7 @@
 112	97	0	Oasis
 383	98	1	Hobbit Farmhouse
 254	100	0	SHRINE Lizardman
-98	113	0	Nifty's
+98	113	0	Nifty's/Great Central Desert
 360	115	0	Stagira
 294	125	0	Astacia
 334	129	0	SHRINE Satyr
--- a/maps/roth.desc	Thu May 31 00:45:19 2007 +0000
+++ b/maps/roth.desc	Thu May 31 00:45:40 2007 +0000
@@ -1,1 +1,1 @@
-Continent of Rothikgen @ BatMUD - mapdata by Ooga, locations and conversion by Ggr
+Continent of Rothikgen @ BatMUD - mapdata by Ooga, locations and conversion by Ggr
\ No newline at end of file