Moved magic.conf to magic.conf.template. Magic.conf should be

generated using build-magic.sh, which will first build a spells-build.sh
file (which should then be edited by hand to set spell invocations) and,
on subsequent calls, apply the spells-build.sh file.

2 files changed, 27 insertions, 6 deletions

diff --git a/conf/build-magic.sh b/conf/build-magic.sh
new file mode 100755
index 00000000..94d1a01f
--- /dev/null
+++ b/conf/build-magic.sh
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+RSCRIPT="spells-build.sh"
+
+if [ -a $RSCRIPT ]; then printf ""; else
+    echo '#! /bin/sh' > $RSCRIPT;
+    echo 'cat \' >> $RSCRIPT;
+    chmod a+x $RSCRIPT
+fi
+
+for n in `grep -o '"#..."' magic.conf.template`; do
+    if grep $n $RSCRIPT; then printf ""; else
+        CHANGES=1
+        echo "|sed 's/${n}/${n}/' \\" >> $RSCRIPT;
+    fi
+done
+
+if [ x$CHANGES == x1 ]
+then echo "spells-build.sh has been updated; please provide invocations for spells and/or teleport anchors.";
+else cat magic.conf.template | ./$RSCRIPT > magic.conf;
+fi
\ No newline at end of file
diff --git a/conf/magic.conf b/conf/magic.conf.template
index b56fc1d1..0a994eab 100644
--- a/conf/magic.conf
+++ b/conf/magic.conf.template
@@ -972,9 +972,9 @@ NONMAGIC SPELL hug5 (target : STRING) : "*hugs" = REQUIRE ((rdistance(location(c
 TELEPORT-ANCHOR tulimshar : "tulimshar" = @("001-1.gat", 43, 66) @+ (3, 3);
 TELEPORT-ANCHOR hurnscald : "hurnscald" = @("009-1.gat", 55, 37) @+ (3, 3);
 TELEPORT-ANCHOR nivalis : "nivalis" = @("020-1.gat", 75, 63) @+ (19, 12);
-TELEPORT-ANCHOR wizardhut : "##0" = @("013-1.gat", 41, 92) @+ (3, 3);
-TELEPORT-ANCHOR pachua : "##1" = @("006-1.gat", 22, 101) @+ (3, 3);
-TELEPORT-ANCHOR desert : "##2" = @("005-1.gat", 160, 64) @+ (5, 5);
-TELEPORT-ANCHOR forest : "##3" = @("015-1.gat", 35, 35) @+ (40, 40);
-TELEPORT-ANCHOR snakecave : "##4" = @("011-4.gat", 50, 75) @+ (3, 3);
-TELEPORT-ANCHOR dimondscove : "##5" = @("010-2.gat", 23, 79) @+ (3, 3);
+TELEPORT-ANCHOR wizardhut : "##00" = @("013-1.gat", 41, 92) @+ (3, 3);
+TELEPORT-ANCHOR pachua : "##01" = @("006-1.gat", 22, 101) @+ (3, 3);
+TELEPORT-ANCHOR desert : "##02" = @("005-1.gat", 160, 64) @+ (5, 5);
+TELEPORT-ANCHOR forest : "##03" = @("015-1.gat", 35, 35) @+ (40, 40);
+TELEPORT-ANCHOR snakecave : "##04" = @("011-4.gat", 50, 75) @+ (3, 3);
+TELEPORT-ANCHOR dimondscove : "##05" = @("010-2.gat", 23, 79) @+ (3, 3);