From e91128393320f0f18fae3586b56c11f44eeb5998 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Wed, 10 Jun 2009 14:16:15 +0000 Subject: Apply r9934/5: Update entry vaults and documentation in 0.5. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9943 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/README.pdf | Bin 53801 -> 53861 bytes crawl-ref/README.txt | 7 +- crawl-ref/source/dat/entry.des | 194 +++++++++++++++++++++------------- crawl-ref/source/util/docs/README.tex | 18 ++-- 4 files changed, 135 insertions(+), 84 deletions(-) diff --git a/crawl-ref/README.pdf b/crawl-ref/README.pdf index e33ba5f4cc..29accd52fe 100644 Binary files a/crawl-ref/README.pdf and b/crawl-ref/README.pdf differ diff --git a/crawl-ref/README.txt b/crawl-ref/README.txt index 60cc344a13..9215b6854e 100644 --- a/crawl-ref/README.txt +++ b/crawl-ref/README.txt @@ -105,7 +105,6 @@ Crawl gladly and gratuitously uses the following open source packages: * The PCRE library for regular expressions, see docs/pcre_license.txt. * The Mersenne Twister for random number generation, docs/mt19937.txt. * The SQLite library as database engine; it is properly public domain. -* The ReST light markup language for the documentation. 5. How you can help @@ -115,9 +114,9 @@ of ways to do so: * Playtesting. At any time, there will be bugs -- playing and reporting these is a great help. -There is a beta server around hosting the most recent version of the current -code; http://crawl.akrasiac.org/ links to it. Besides finding bugs, ideas on -how to improve interface or gameplay are welcome as well. +There is a beta server at http://crawl.develz.org. Besides pointing out bugs, +new ideas on how to improve interface or gameplay are welcome. You can mention +them at the homepage, http://crawl-ref.sourceforge.net. * Vault making. Crawl uses many hand-drawn (but often randomised) maps. Making them is fun and diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des index 48aaaf8f86..e3cddb148f 100644 --- a/crawl-ref/source/dat/entry.des +++ b/crawl-ref/source/dat/entry.des @@ -180,61 +180,61 @@ ENDMAP # Players can safely watch at the clouds. Autoexplore will not run into # the chambers, players have to search for the secret door. Likewise, # all exits are secret except for the safe one. -# This vault is great. If need be, we may delegate it to another branch, -# where we less caution measures are demanded (dp). -NAME: elemental_entry -TAGS: entry no_monster_gen -ORIENT: float -MARKER: A = lua:fog_machine { \ - pow_max = 20, delay_min = 50, delay_max = 300, \ - size = 12, start_clouds = 1, \ - cloud_type = "noxious fumes" } -SUBST: A=a , a=aaam -FTILE: a=floor_slime -COLOUR: a=lightgreen -SUBST: a=. -MARKER: W = lua:fog_machine{\ - pow_max = 20, delay_min = 50, delay_max = 300, \ - size = 12, start_clouds = 1, \ - cloud_type = "freezing vapour"} -SUBST: W=w -MARKER: F= lua:fog_machine {\ - pow_max = 20, delay_min = 50, delay_max = 300, \ - size = 12, start_clouds = 1, \ - cloud_type = "flame"} -SUBST: F=f -FTILE: f=floor_rough_red -COLOUR: f=red -SUBST: f=lll. -MARKER: E= lua:fog_machine{\ - pow_max = 20, delay_min = 50, delay_max = 300, \ - size = 12, start_clouds = 1, \ - cloud_type = "black smoke"} -SUBST: E=e , e=cxbveeee -FTILE: e=floor_orc -COLOUR: e= brown -SUBST: e=. -MONS: butterfly +# This vault is great. I've seen players marvel at it. If need be, we +# may delegate it to another branch, where less caution measures are +# demanded. But I'd like to keep it on D:1 (dp). +NAME: elemental_entry +TAGS: entry no_monster_gen +ORIENT: float +MARKER: A = lua:fog_machine { \ + pow_max = 20, delay_min = 50, delay_max = 300, \ + size = 12, start_clouds = 1, \ + cloud_type = "noxious fumes" } +SUBST: A=a , a=aaam +FTILE: a=floor_slime +COLOUR: a=lightgreen +SUBST: a=. +MARKER: W = lua:fog_machine{\ + pow_max = 20, delay_min = 50, delay_max = 300, \ + size = 12, start_clouds = 1, \ + cloud_type = "freezing vapour"} +SUBST: W=w +MARKER: F= lua:fog_machine {\ + pow_max = 20, delay_min = 50, delay_max = 300, \ + size = 12, start_clouds = 1, \ + cloud_type = "flame"} +SUBST: F=f +FTILE: f=floor_rough_red +COLOUR: f=red +SUBST: f=lll. +MARKER: E= lua:fog_machine{\ + pow_max = 20, delay_min = 50, delay_max = 300, \ + size = 12, start_clouds = 1, \ + cloud_type = "black smoke"} +SUBST: E=e , e=cxbveeee +FTILE: e=floor_orc +COLOUR: e= brown +SUBST: e=. SHUFFLE: XZ NSUBST: Z= ) / ] -NSUBST: X= ( / [ +NSUBST: X= ( / [ MAP ccc===ccc cc..aaa..cc c.aaaAaaa.c c..aaaaa..c cc...a...cc - ccccccccn=ncccccccc -cc..ccccc1.1ccccc..cc + cccccccnn=nnccccccc +cc..ccccc...ccccc..cc c.w..ccccc+ccccc..f.c -c.ww.cccX...Zccc.ff.c +c.ww.nccX...Zccn.ff.c =www.nwc.....cln.fff= =wWww=.+..{..+.=ffFf= =www.nwc.....cln.fff= -c.ww.cccZ...Xccc.ff.c +c.ww.nccZ...Xccn.ff.c c.w..ccccc+ccccc..f.c cc..cccccG.Gccccc..cc - ccccccccn=ncccccccc + cccccccnn+nnccccccc cc...e...cc c..eeeee..c c.eeeEeee.c @@ -513,7 +513,10 @@ NAME: lemuel_entry_005_a TAGS: entry no_monster_gen ORIENT: float SHUFFLE: {} -WEIGHT: 2 +COLOUR: ' : brown / white +FTILE: ' = floor_dirt +SUBST: ' = . +WEIGHT: 4 MAP xxxxxxxxxxxxxxxxxxx xxxxx{.......}xxxxx @@ -523,10 +526,10 @@ xwwxx.........xxxxx xwwwx.........xxxxx xxwwx.........xxxxx xxwwww........xxxxx -xxxwwwwww.w...xxxxx -xxxxwwwww.wwwwxxxxx -xxxxxwwww.wwwwwwxxx -xxxxx...w.wwwwwwwxx +xxxwwwwww'w...xxxxx +xxxxwwwww'wwwwxxxxx +xxxxxwwww'wwwwwwxxx +xxxxx...w'wwwwwwwxx xxxxx........wwwwxx xxxxx.........xwwwx xxxxx.........xxwwx @@ -538,7 +541,7 @@ ENDMAP NAME: lemuel_entry_005_b TAGS: entry no_monster_gen ORIENT: float -WEIGHT: 7 +WEIGHT: 3 SHUFFLE: {}, XYZ SUBST: X=W, Y=w, Z=w MAP @@ -569,7 +572,7 @@ TAGS: entry no_monster_gen ORIENT: float SHUFFLE: {}, ABC SUBST: A:=, B:x, C:x -WEIGHT: 1 +WEIGHT: 3 MAP xxxxxxxxxxxxxxxxxxx xxxWA{.......}xxxxx @@ -1045,7 +1048,7 @@ cccccccccccccccccccccccccccccc ENDMAP ############################################################################## -# Three leaves mockup +# Three leaves temple mockup NAME: david_entry_008_temple TAGS: entry no_monster_gen no_rotate ORIENT: float @@ -1799,7 +1802,7 @@ ENDMAP NAME: david_021_tetris TAGS: entry ORIENT: float -SHUFFLE: ba +SHUFFLE: bbba MAP x.@.x xx...xx @@ -1864,6 +1867,8 @@ ENDMAP NAME: david_023_snail TAGS: entry no_monster_gen no_rotate ORIENT: float +NSUBST: . = 1:d / *:. +ITEM: stone / dart MAP xxxxxxxxxxxxxxxxx xxxxxxxx.......xxxxxxx @@ -1947,7 +1952,7 @@ ITEM: nothing / ring of hunger / \ ITEM: nothing / choko / pear / apple / sausage / banana / any scroll SHUFFLE: dD1AB/yyyyy, eE2FG/yyyyy, AB, FG SUBST: y=x, A==, B=x, D=., F==, G=x, E=. -SUBST: ' : cxxxv, " : cxxxv +SUBST: ' : Wlncxxxv, " : Wlncxxxv MAP ......................... .......xxxxx+xxxxx....... @@ -2139,7 +2144,7 @@ xxxxxxxxxxxxxxxxx..@....''' ENDMAP ############################################################################## -# Arbitrary entries +# Arbitrary 3 # NAME: david_entry_033_a TAGS: entry @@ -2470,21 +2475,24 @@ ENDMAP NAME: david_entry_040 TAGS: entry ORIENT: float -SHUFFLE: {[( MONS: plant +SHUFFLE: 1x +SUBST: x = ' FTILE: ' = floor_grass, 1 = floor_grass, { = floor_grass FTILE: . = floor_grass / floor_normal -SUBST: . = .:140 d +COLOUR: ' = green +COLOUR: . = green / none +SUBST: ' = .:140 d KITEM: d : apple / apricot / pear / apricot / orange / banana / \ strawberry / lemon KFEAT: d = . MAP ..... - .'...'. + .x...x. '1'''1' ..''{''.. '1'''1' - .'...'. + .x...x. ..... ENDMAP @@ -2749,7 +2757,7 @@ TAGS: entry no_monster_gen ORIENT: float SHUFFLE: C{! / B(' / V[" SUBST: C=., !=@ -SHUFFLE: B('/ zzz, V[" / yyy +SHUFFLE: B(' / zzz, V[" / yyy SUBST: z=x, y=x, B=., '==, V=., "== NSUBST: . = 1:d / *:. ITEM: stone / dart @@ -3363,7 +3371,7 @@ MAP ENDMAP ############################################################################## -# Prison with walls (not Napalm Death) +# Prison NAME: david_entry_068 TAGS: entry no_monster_gen ORIENT: float @@ -3714,8 +3722,57 @@ ENDMAP ############################################################################## # Triangle -NAME: erik_entry_002 +NAME: erik_entry_002_a +TAGS: entry +WEIGHT: 4 +ORIENT: float +MAP + xxx + x(x + xxx[xxx + x.+{+.x + xxx.xxx.xxx + x.+x+.+x+.x + x@xxx@xxx@x +ENDMAP + +NAME: erik_entry_002_b +WEIGHT: 3 +TAGS: entry +ORIENT: float +MAP + xxx + x(x + xxx[xxx + x.+{+.x + xxx.xxx.xxx + x.+x+.+x+.x + xxx.xxx.xxx.xxx + x.+x+.+x+.+x+.x + x@xxx@xxx@xxx@x +ENDMAP + +NAME: erik_entry_002_c +TAGS: entry +WEIGHT: 2 +ORIENT: float +MAP + xxx + x(x + xxx[xxx + x.+{+.x + xxx.xxx.xxx + x.+x+.+x+.x + xxx.xxx.xxx.xxx + x.+x+.+x+.+x+.x + xxx.xxx.xxx.xxx.xxx + x.+x+.+x+.+x+.+x+.x + x@xxx@xxx@xxx@xxx@x +ENDMAP + +NAME: erik_entry_002_d TAGS: entry +WEIGHT: 1 ORIENT: float MAP xxx @@ -3730,9 +3787,7 @@ MAP x.+x+.+x+.+x+.+x+.x xxx.xxx.xxx.xxx.xxx.xxx x.+x+.+x+.+x+.+x+.+x+.x -xxx.xxx.xxx.xxx.xxx.xxx.xxx -x.+x+.+x+.+x+.+x+.+x+.+x+.x -x@xxx@xxx@xxx@xxx@xxx@xxx@x + x@xxx@xxx@xxx@xxx@xxx@x ENDMAP ############################################################################## @@ -3992,7 +4047,6 @@ ENDMAP ############################################################################## # Tucked-away holy place -# NAME: matt_entry_007_a TAGS: entry no_monster_gen ORIENT: float @@ -4050,6 +4104,7 @@ x.........x xxx@xxx@xxx ENDMAP + ############################################################################## # Elethiomel's entry vaults ############################################################################## @@ -4061,7 +4116,7 @@ TAGS: entry no_rotate ORIENT: northwest SHUFFLE: [{ SUBST: ' : . x ':40, '=x. -SUBST: c : cxxx, [ = [ T +SUBST: c : cxxx, [ = [T MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx....xxxxxxxxxxxxxxx....xx..xxx.''xxxxxx @@ -4174,7 +4229,6 @@ ENDMAP ############################################################## # It's quiet. Too quiet.... -# NAME: entry_elethiomel_005_a TAGS: entry no_monster_gen ORIENT: float @@ -4227,7 +4281,6 @@ ENDMAP ############################################################## # Shortcut - NAME: entry_elethiomel_006 TAGS: entry ORIENT: float @@ -4249,7 +4302,6 @@ ENDMAP ############################################################## # Indiana Jones and the Raiders of the Lost Ark - NAME: entry_elethiomel_007 TAGS: entry ORIENT: float @@ -4311,7 +4363,7 @@ ENDMAP NAME: onia_ninara_002_pyramid TAGS: entry no_rotate ORIENT: float -SHUFFLE: ({[ +SHUFFLE: xxxcvlw MAP ......... .....x..... @@ -4399,7 +4451,9 @@ ENDMAP ############################################################## # The zoo -# +# With low chance (10%), the monsters spell Crawl or crawl. +# This is considered harmless and not ASCII art. Don't hand +# in other vaults where monsters spell other words, though :) NAME: onia_ninara_005_the_zoo_common WEIGHT: 9 ORIENT: float @@ -4505,7 +4559,6 @@ ENDMAP ############################################################## # It's all downhill from here # A few cavern-like entry vaults, nothing fancy.. -# NAME: entry_eino_001_a TAGS: entry no_monster_gen no_rotate ORIENT: northwest @@ -4560,7 +4613,6 @@ ENDMAP ############################################################## # It just gets worse - caverns 2 -# NAME: entry_eino_002_a TAGS: entry no_monster_gen no_rotate ORIENT: northwest diff --git a/crawl-ref/source/util/docs/README.tex b/crawl-ref/source/util/docs/README.tex index 6cef83fe62..417c262565 100644 --- a/crawl-ref/source/util/docs/README.tex +++ b/crawl-ref/source/util/docs/README.tex @@ -1,7 +1,7 @@ \documentclass[a4paper,10pt]{article} \usepackage{palatino} -\usepackage{mathpazo} % optional [sc] fuer real small caps +\usepackage{mathpazo} % optional [sc] for small caps \usepackage[left=3cm,top=3cm,right=3cm,bottom=2cm,nohead,nofoot]{geometry} \usepackage{graphicx} @@ -63,9 +63,8 @@ If you'd like to dive in immediately, your best bets are to either start up a game and choose one of the tutorials (press \key{Ctrl-T} when asked for species), or print \key{quickstart.pdf} (in the \key{docs} directory). Studious readers might want to browse the -manual (see below). Note that you can read both the quickstart -text and the manual in-game; pressing \key{?} brings up a menu for -that. +manual (see below). Note that you can read both the quickstart text +and the manual in-game; pressing \key{?} brings up a menu for that. \para @@ -90,7 +89,7 @@ Unfortunately, it is not yet possible to combine tiles and Internet play. \subsection*{The most important files} \begin{minipage}[t]{7cm} -The file \key{crawl.exe} (just \key{crawl} if on Unix) in \crawl's main +The file \key{crawl.exe} (just \key{./crawl} if on Unix) in \crawl's main folder starts the game. \\ \\ The \key{settings} directory contains \key{init.txt}, the options file for @@ -165,7 +164,7 @@ The \textbf{PCRE} library for regular expressions, see The \textbf{Mersenne Twister} for random number generation, \key{docs/mt19937.txt}.\\ The \textbf{SQLite} library as database engine; it is properly public domain.\\ -The \textbf{ReST} light markup language for the documentation. +% The \textbf{ReST} light markup language for the documentation. \subsection*{How you can help} @@ -176,9 +175,10 @@ of ways to do so: \textbf{Playtesting:} At any time, there will be bugs --- playing and reporting these is a great -help. There is a beta server around hosting the most recent version of the -current code; \key{http://crawl.akrasiac.org} links to it. Besides finding bugs, ideas on -how to improve interface or gameplay are welcome as well. +help. There is a beta server at \key{http://crawl.develz.org} hosting the most +recent version of the code. Besides pointing out bugs, you are also welcome to +bring up ideas on how to improve interface or gameplay. Bugs and new ideas can +be added and discussed on the homepage, \key{http://crawl-ref.sourceforge.net}. \para -- cgit v1.2.3-54-g00ecf