diff options
| -rw-r--r-- | crawl-ref/source/dat/float.des | 127 | ||||
| -rw-r--r-- | crawl-ref/source/dat/hive.des | 82 | ||||
| -rw-r--r-- | crawl-ref/source/dat/mini.des | 206 | ||||
| -rw-r--r-- | crawl-ref/source/luadgn.cc | 5 |
4 files changed, 274 insertions, 146 deletions
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des index a005f98e84..590dc7b84d 100644 --- a/crawl-ref/source/dat/float.des +++ b/crawl-ref/source/dat/float.des @@ -400,130 +400,3 @@ xxxxxxxxxxxxxXww1Xxxxxxbxxxx xxxxxxxxxxxXwwww111@...Xxxxx ENDMAP -############################################################################# -# Small statue alley (Eino) - -NAME: small_statue_alley_a -DEPTH: D:10-20 -CHANCE: 7 -ORIENT: float -MAP -xxxcccccx -...G...G@ -.G.F.G.G. -.G.G.F.G. -@G...G... -xcccccxxx -ENDMAP - -NAME: small_statue_alley_b -DEPTH: D:3-10 -CHANCE: 2 -ORIENT: float -MAP -xxxcccccx -...G...G@ -.G.G.G.G. -.G.G.G.G. -@G...G... -xcccccxxx -ENDMAP - -NAME: small_statue_alley_c -DEPTH: D:6-12 -CHANCE: 1 -ORIENT: float -MAP -xxxcccccx -...I...I@ -.I.I.I.I. -.I.I.I.I. -@I...I... -xcccccxxx -ENDMAP - -############################################################################# -# Circle pieces altar (Eino) -# two versions are in float.des, combined CHANCE is 10 - -NAME: circle_pieces_altar_v3 -DEPTH: 3-26 -CHANCE: 3 -ORIENT: float -MAP -xxxxxxxxxxxxxxxxxx -.bbbbbbbbbbbbbbbbx -...bbbbbbbbbbbbbbx -@....bbbbbbbbbb... -.......bbbbb.....@ -xbb............... -xbbb...........bbx -xbbbbb.......bbbbx -xbbbbbb.....bbbbbx -xbbbbbb.....bbbbbx -xbbbbbb..C..bbbbbx -xbbbbbb.....bbbbbx -xbbbbbb.....bbbbbx -xbbbbb.......bbbbx -xbbb...........bbx -@.....bbbb......bx -..bbbbbbbbbbb..... -xbbbbbbbbbbbbbb..@ -xxxxxxxxxxxxxxxx.. -ENDMAP - -############################################################################# -# Doghouse (Eino) -# one of the doghouses is in mini.des, combined CHANCE of all of them is 10 - -NAME: doghouse_v2 -DEPTH: 5-8 -SHUFFLE: ?1T -SUBST: T : T V:2 -SUBST: ? : 1:2 . -MONS: hound / w:1 nothing / w:2 jackal -CHANCE: 3 -ORIENT: float -MAP -xx+xx -xx+xx -x...x -x?1Tx -x...x -xx+xx -xx+xx -ENDMAP - -NAME: doghouse_v3 -DEPTH: 5-8 -SHUFFLE: ?1T -SUBST: T : T V:2 -SUBST: ? : 1:2 . -MONS: hound / w:1 nothing / w:2 jackal -CHANCE: 3 -ORIENT: float -MAP -xxx+xx -xxx+xx -xx...x -++..?x -xx.T1x -xxxxxx -ENDMAP - -NAME: doghouse_v4 -DEPTH: 6-8 -SHUFFLE: ?1T -SUBST: T : T V:2 -SUBST: ? : 1:2 . -MONS: hound / w:1 nothing / w:2 jackal -CHANCE: 2 -ORIENT: float -MAP -xxx+xxx -xxx+xxx -xx...xx -++.T.++ -xx?1?xx -xxxxxxx -ENDMAP diff --git a/crawl-ref/source/dat/hive.des b/crawl-ref/source/dat/hive.des index 3f833385e3..1dff89d94e 100644 --- a/crawl-ref/source/dat/hive.des +++ b/crawl-ref/source/dat/hive.des @@ -170,6 +170,88 @@ MAP .................. ENDMAP +############################################################################# +# Another hive entry (Eino) +# This one appeared to me in a dream. +# +NAME: eino_hive_1 +TAGS: hive_entry no_monster_gen +ORIENT: float +# i'm not sure water creatures would fit this one.. change if you strongly think otherwise +MONS: killer bee / killer bee larva w:2, queen bee / killer bee w:2, oklob plant / plant w:1, plant / nothing +KMONS: R = killer bee / killer bee larva w:2 +KFEAT: R = R +KMONS: M = plant +KMONS: N = plant +CHANCE: 50000 +KFEAT: M = * +KFEAT: N = | / * w:20 +KMONS: Z = plant / nothing +: if crawl.coinflip() then +SUBST: W : . +SUBST: w : . +KFEAT: Z = W +: else +KFEAT: Z = . +: end +SUBST: q=w +MAP + x x + xxx...xxx +xx4.a1a.4xx +x4.aRaRa.4x +x441aOa244x +x4.aRaRa.4x +xx4.a1a.4xx + x4.....4x + xxZ4.44xx + xZWW.4x + xxZWZxx + xxWxx + xWx +xxxxxWxxxxx +@....W....@ +xxxxxWxxxxx + xWx + xxWxx + xx4W4xx + x4.WW4x + xx4.WWZxx + xM4WWww4x +xxN3wwwwwxx +xM4wwwwwqqx +x4.wwwwqqqx +x4..wwqqqqx +xx...44qqxx + xxx..4xxx + x x +ENDMAP + +########################################## +# Bees in trees by the pond + +NAME: eino_hive_2 +TAGS: hive_entry +ORIENT: float +KFEAT: N = w / w:5 . +KFEAT: Z = w +KMONS: Z = plant / w:3 nothing +KFEAT: V = w +KMONS: V = killer bee w:20 / nothing w:6 / giant blowfly w:1 +MONS: plant / nothing w:3 +MONS: killer bee w:20 / nothing w:6 / giant blowfly w:1 +MAP + .... ...NNNZNN. + ....11.....NZZwwZZNN. + . 11.2111.1NZwwVwwwwwN +.1.1.11.22ZZw.wwwwVwwwZN +..1212211ZZOZwwwwwwwVZZ. +.1..111.21wV1.ZwVwwwZNN + ..1.2211.1Zw1.ZwwZNN. + ...11.1... 11.NN.. + .... +ENDMAP + ############################################################################## # Hive branch end maps diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des index 82d2b20fbc..8e6f7d9899 100644 --- a/crawl-ref/source/dat/mini.des +++ b/crawl-ref/source/dat/mini.des @@ -1247,30 +1247,46 @@ xxxx ENDMAP ############################################################################# -# Doghouse (Eino) -# put the rest of the doghouses in float.des, combined CHANCE of all of them is 10 +# Small statue alley (Eino) -NAME: doghouse_v1 -TAGS: mini_float -DEPTH: 4-8 -SHUFFLE: 1?T -SUBST: T : T V:2 -SUBST: ? : 1:2 . -MONS: hound / w:1 nothing / w:2 jackal +NAME: small_statue_alley_a +DEPTH: D:10-20 +CHANCE: 7 +MAP +xxxcccccx +...G...G@ +.G.F.G.G. +.G.G.F.G. +@G...G... +xcccccxxx +ENDMAP + +NAME: small_statue_alley_b +DEPTH: D:3-10 CHANCE: 2 MAP -xxx+xxx -xxx+xxx -xx...xx -xx?..xx -xx1.Txx -xxxxxxx -xxxxxxx +xxxcccccx +...G...G@ +.G.G.G.G. +.G.G.G.G. +@G...G... +xcccccxxx +ENDMAP + +NAME: small_statue_alley_c +DEPTH: D:6-12 +CHANCE: 1 +MAP +xxxcccccx +...I...I@ +.I.I.I.I. +.I.I.I.I. +@I...I... +xcccccxxx ENDMAP ############################################################################# # Circle pieces altar (Eino) -# put the third version in float.des, hence combined CHANCE < 10 NAME: circle_pieces_altar_v1 DEPTH: 3-26 @@ -1333,12 +1349,113 @@ MAP ...... ENDMAP +NAME: circle_pieces_altar_v3 +DEPTH: 3-26 +CHANCE: 3 +MAP +xxxxxxxxxxxxxxxxxx +.bbbbbbbbbbbbbbbbx +...bbbbbbbbbbbbbbx +@....bbbbbbbbbb... +.......bbbbb.....@ +xbb............... +xbbb...........bbx +xbbbbb.......bbbbx +xbbbbbb.....bbbbbx +xbbbbbb.....bbbbbx +xbbbbbb..C..bbbbbx +xbbbbbb.....bbbbbx +xbbbbbb.....bbbbbx +xbbbbb.......bbbbx +xbbb...........bbx +@.....bbbb......bx +..bbbbbbbbbbb..... +xbbbbbbbbbbbbbb..@ +xxxxxxxxxxxxxxxx.. +ENDMAP + +############################################################################# +# Doghouse (Eino) + +NAME: doghouse_v1 +DEPTH: 4-8 +SHUFFLE: 1?T +SUBST: T : T V:2 +SUBST: ? : 1:2 . +MONS: hound / w:1 nothing / w:2 jackal +CHANCE: 2 +MAP +......... +.xxx+xxx. +.xxx+xxx. +.xx...xx. +.xx?..xx. +.xx1.Txx. +.xxxxxxx. +.xxxxxxx. +......... +ENDMAP + +NAME: doghouse_v2 +TAGS: mini_float +DEPTH: 4-8 +SHUFFLE: ?1T +SUBST: T : T V:2 +SUBST: ? : 1:2 . +MONS: hound / w:1 nothing / w:2 jackal +CHANCE: 3 +MAP +xx+xx +xx+xx +x...x +x?1Tx +x...x +xx+xx +xx+xx +ENDMAP + +NAME: doghouse_v3 +TAGS: mini_float +DEPTH: 4-8 +SHUFFLE: ?1T +SUBST: T : T V:2 +SUBST: ? : 1:2 . +MONS: hound / w:1 nothing / w:2 jackal +CHANCE: 3 +MAP +xxx+xx +xxx+xx +xx...x +++..?x +xx.T1x +xxxxxx +ENDMAP + +NAME: doghouse_v4 + +TAGS: mini_float +DEPTH: 4-8 +SHUFFLE: ?1T +SUBST: T : T V:2 +SUBST: ? : 1:2 . +MONS: hound / w:1 nothing / w:2 jackal +CHANCE: 2 +MAP +xxx+xxx +xxx+xxx +xx...xx +++.T.++ +xx?1?xx +xxxxxxx +ENDMAP + ############################################################################# # Small room with statues (Eino) NAME: small_statue_room DEPTH: D:2-26 FLAGS: no_hmirror no_vmirror +TAGS: mini_float MAP xxx.xxx xG...Gx @@ -1346,3 +1463,58 @@ xG...Gx xG...Gx xxx.xxx ENDMAP + +############################################################################# +# Small chambers for nice items (Eino) +# not necessarily versions of the same vault + +NAME: small_chamber_a +TAGS: mini_float +DEPTH: 4-27 +MAP + xxxxxxx +xx.....xx +x...*...x +x.......x +xx.....xx + x.....x +ENDMAP + +NAME: small_chamber_b +TAGS: mini_float +DEPTH: 8-27, Elf, Snake, Vault, Crypt +MAP +xxxxxxxxx +xxG...Gxx +x...|...x +x...9...x +xx.....xx +xxT...Txx +xx.....xx +xxT...Txx +ENDMAP + +NAME: tiny_chamber_a +TAGS: mini_float +DEPTH: 2-27, Elf, Snake, Vault, Crypt +MAP +xxxxx +x...x +x.*.= +x...x +xxxxx +ENDMAP + +NAME: dig_this +TAGS: mini_float +DEPTH: 8-27, Elf, Snake, Vault, Crypt +NSUBST: Z = 1:| / 1:* / *:Z +KFEAT: Z = teleport trap +MAP +xxxxxxxxxxxxxxx +xvvvvvvvvvvvvvx +x.vxvZxZxZvvvvx +=.xvxxZxZxvvvvx +xvvvvvvvvvvvvvx +xxxxxxxxxxxxxxx +ENDMAP diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc index 65fa69648c..0b4682daa1 100644 --- a/crawl-ref/source/luadgn.cc +++ b/crawl-ref/source/luadgn.cc @@ -242,8 +242,9 @@ std::string dlua_chunk::rewrite_chunk_prefix(const std::string &line, { const std::string line_num = s.substr(lns, pe - lns); const int lnum = atoi(line_num.c_str()); - s = s.substr(0, lns) + make_stringf("%d", lnum + first - 1) - + s.substr(pe); + const std::string newlnum = make_stringf("%d", lnum + first - 1); + s = s.substr(0, lns) + newlnum + s.substr(pe); + pe = lns + newlnum.length(); } return s.substr(0, ps) + (file.empty()? context : file) + ":" |