diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des index 693ac2683ba..a501ccfa5a4 100644 --- a/crawl-ref/source/dat/des/altar/overflow.des +++ b/crawl-ref/source/dat/des/altar/overflow.des @@ -1594,181 +1594,6 @@ MAP vvvvvvv ENDMAP -### Pakellas overflow altars ################################################### -NAME: grunt_pakellas_salt -DEPTH: D:2- -TAGS: transparent no_monster_gen no_item_gen no_trap_gen temple_overflow_1 -TAGS: temple_overflow_pakellas uniq_altar_pakellas no_rotate no_hmirror -TAGS: no_vmirror -KFEAT: _ = altar_pakellas -SUBST: c : cvb -: interest_check(_G) -MAP - ..... - ..ccc.. -..c...c.. -.ccc_ccc. -..c...c.. - ..ccc.. - ..... -ENDMAP - -NAME: grunt_pakellas_sulfur -DEPTH: D:2- -TAGS: transparent no_monster_gen no_item_gen no_trap_gen temple_overflow_1 -TAGS: temple_overflow_pakellas uniq_altar_pakellas no_rotate no_hmirror -TAGS: no_vmirror -KFEAT: _ = altar_pakellas -SUBST: c : cvb -: interest_check(_G) -MAP - ... - ..c.. - ..c.c.. - ..c...c.. - ..c.._..c.. -..c.......c.. -.ccccccccccc. -......l...... - ...l... - .lllll. - ...l... - .l. - ... -ENDMAP - -NAME: grunt_pakellas_mercury -DEPTH: D:2- -TAGS: transparent no_monster_gen no_item_gen no_trap_gen temple_overflow_1 -TAGS: temple_overflow_pakellas uniq_altar_pakellas no_rotate no_hmirror -TAGS: no_vmirror -KFEAT: _ = altar_pakellas -SUBST: c : cvb -: interest_check(_G) -MAP - ..... -.c...c. -.c...c. -..ccc.. -.c...c. -.c._.c. -.c...c. -..ccc.. - ..c.. - .ccc. - ..c.. - ... -ENDMAP - -NAME: grunt_pakellas_basics -DEPTH: D:2- -WEIGHT: 20 -TAGS: transparent no_monster_gen no_item_gen no_trap_gen temple_overflow_1 -TAGS: no_rotate no_hmirror temple_overflow_pakellas uniq_altar_pakellas -KFEAT: _ = altar_pakellas -SUBST: d : c. -SUBST: c : cvb -: interest_check(_G) -MAP - ... - ..c.. - ....c.c.... -..ddcdddcdd.. - ..c.._..c.. -..c.......c.. -.ccccccccccc. -............. -ENDMAP - -# high evo !apt band takes down filthy low evo !apt brute -# 25% chance of live kobold with wand; otherwise empty wand -# 12.5% chance of troll corpse (early troll hide) -NAME: johnstein_pakellas_death_squad -DEPTH: D:3- -TAGS: temple_overflow_1 temple_overflow_pakellas uniq_altar_pakellas -KFEAT: _ = altar_pakellas -KPROP: cvb' = bloody / nothing w:80 -NSUBST: ' = 2:g / 1:G / 1:h / *:. -SHUFFLE: cvb -: interest_check(_G) -{{ - local mon = crawl.random_element({ - ['kobold'] = 1, - ['spriggan'] = 1, - }) - local corpse = mon .. ' corpse' - local wands = 'wand of flame charges:0 ident:pluses / ' .. - 'wand of confusion charges:0 ident:pluses / ' .. - 'wand of slowing charges:0 ident:pluses ' - - if (mon == 'kobold' and crawl.coinflip()) then - kmons("G = kobold; wand of flame | wand of confusion | wand of slowing") - dgn.delayed_decay_extra(_G, 'h', 'troll corpse / ogre corpse' ) - else - dgn.delayed_decay_extra(_G, 'G', corpse, wands ) - dgn.delayed_decay_extra(_G, 'h', 'ogre corpse' ) - end - - dgn.delayed_decay_extra(_G, 'g', corpse ) -}} -: interest_check(_G) -MAP -......... -.ccc+ccc. -.c'''''c. -.c'''''c. -.+''_''+. -.c'''''c. -.c'''''c. -.ccc+ccc. -......... -ENDMAP - -# dig wand with a single charge that could be used to get to P's altar -NAME: johnstein_pakellas_dig -DEPTH: D:2- -TAGS: temple_overflow_1 temple_overflow_pakellas uniq_altar_pakellas -KFEAT: _ = altar_pakellas -KPROP: _ = no_tele_into -KITEM: ' = wand of digging ident:all charges:1 / \ - wand of disintegration ident:all charges:1 w:2 -: interest_check(_G) -MAP -....... -.xxxxx. -.xcccx. -.xc_cx. -.xcmcx. -.x.'.x. -.x...x. -.xx+xx. -....... -ENDMAP - -# P altar with gadget shop -# 90% basic wands (frost, confusion, slowing). ~150 to 250 gold -# 10% any wand and will be expensive -NAME: johnstein_pakellas_shop -DEPTH: D:2- -TAGS: temple_overflow_1 temple_overflow_pakellas uniq_altar_pakellas -KFEAT: _ = altar_pakellas -KFEAT: S = gadget shop name:Pakellas type:Prime suffix:Provisions \ - greed:30 count:3 ;\ - wand of flame charges:15 w:30 |\ - wand of confusion charges:15 w:30 |\ - wand of slowing charges:15 w:30 |\ - any wand -: interest_check(_G) -MAP - ....... -.mxxxxxm. -.xx.S.xx. -.x.._..x. -.xx...xx. - .xx+xx. - ....... -ENDMAP - ### Qazlal overflow altars #################################################### # There's always a safe path to the altar. diff --git a/crawl-ref/source/dat/des/altar/pakellas_experiments.des b/crawl-ref/source/dat/des/altar/pakellas_experiments.des index cd9499293b0..bbc1f2534c6 100644 --- a/crawl-ref/source/dat/des/altar/pakellas_experiments.des +++ b/crawl-ref/source/dat/des/altar/pakellas_experiments.des @@ -253,6 +253,7 @@ NAME: gammafunk_pakellas_cloud_experiment TAGS: temple_overflow_1 temple_overflow_pakellas uniq_altar_pakellas TAGS: generate_awake no_monster_gen no_trap_gen no_item_gen no_pool_fixup DEPTH: D:2- +WEIGHT: 0 KFEAT: _ = altar_pakellas MONS: hungry ghost / ugly thing / hydra / rakshasa spells:none ; nothing \ / fire dragon / wolf spider / ice dragon @@ -284,6 +285,7 @@ NAME: gammafunk_pakellas_statue_experiment TAGS: temple_overflow_1 temple_overflow_pakellas uniq_altar_pakellas TAGS: generate_awake no_item_gen no_monster_gen no_trap_gen no_pool_fixup DEPTH: D:2- +WEIGHT: 0 KFEAT: g = iron_grate KFEAT: _ = altar_pakellas : if you.depth() <= 7 then @@ -318,6 +320,7 @@ NAME: gammafunk_pakellas_spire_experiment TAGS: temple_overflow_1 temple_overflow_pakellas uniq_altar_pakellas TAGS: generate_awake no_monster_gen no_item_gen no_trap_gen no_pool_fixup DEPTH: D:2- +WEIGHT: 0 KFEAT: g = iron_grate KFEAT: _ = altar_pakellas MONS: gargoyle ; nothing / deep elf knight ; nothing / manticore / cyclops \ @@ -352,6 +355,7 @@ NAME: gammafunk_pakellas_its_alive TAGS: temple_overflow_1 temple_overflow_pakellas uniq_altar_pakellas TAGS: generate_awake no_monster_gen no_item_gen no_trap_gen no_pool_fixup DEPTH: D:2- +WEIGHT: 0 KFEAT: g = iron_grate KFEAT: h = iron_grate KFEAT: _ = altar_pakellas diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des index 0ae4364aa9a..1b6d2843945 100644 --- a/crawl-ref/source/dat/des/branches/abyss.des +++ b/crawl-ref/source/dat/des/branches/abyss.des @@ -244,10 +244,10 @@ TAGS: no_rotate NSUBST: . = 3:1 / 2:2 / *:. SUBST: ' = . COLOUR: " : white w:5 / none -FTILE: "ABCDEFGHIJKLMNOPRQSTUV : floor_limestone w:5 / floor_nerves +FTILE: "ABCDEFGHIJKLMNOPRQSTU : floor_limestone w:5 / floor_nerves SUBST: " = . MONS: plant, bush -SHUFFLE: ABCDEFHIJKLMNOPQRSTUV +SHUFFLE: ABCDEFHIJKLMNOPQRSTU KFEAT: A = altar_makhleb KFEAT: B = altar_xom KFEAT: C = altar_zin @@ -266,18 +266,17 @@ KFEAT: P = altar_ashenzari KFEAT: Q = altar_dithmenos KFEAT: R = altar_gozag KFEAT: S = altar_qazlal -KFEAT: T = altar_pakellas -KFEAT: U = altar_uskayaw -KFEAT: V = altar_hepliaklqana +KFEAT: T = altar_uskayaw +KFEAT: U = altar_hepliaklqana MAP ''''''............... ''ccccccccccccccccc.. ''G'c"""D"""""P"""c.. -''''c"A"""I"L"""T"c.. +''''c"A"""I"L"""S"c.. ''G'c"""E"""""Q"""ct. -''''+"B"""J"N"""U"c.. +''''+"B"""J"N"""T"c.. ''G'c"""F"""""R"""c.. -''''c"C"""K"O"""V"c.t +''''c"C"""K"O"""U"c.t ''G'c"""H"""""S"""c.. ''ccccccccccccccccc.. .......t......ttt.... diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des index d7f6dc711df..32f738a37da 100644 --- a/crawl-ref/source/dat/des/portals/trove.des +++ b/crawl-ref/source/dat/des/portals/trove.des @@ -919,8 +919,7 @@ veto {{ return crawl.game_started() COLOUR: x = blue COLOUR: ' = yellow SUBST: d = dde -KFEAT: _ = altar_pakellas -FTILE: 'T_ : floor_limestone +FTILE: ' : floor_limestone ORIENT: encompass TAGS: no_item_gen no_monster_gen allow_dup ITEM: any misc / any rod w:4 @@ -931,7 +930,7 @@ MAP xxxxx xfffx xxx+xxx - xdT_Tdx + xd'''dx xd'''dx xd'''dx xd'''dx diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des index a7c8143f5be..22b853c412e 100644 --- a/crawl-ref/source/dat/des/sprint/arena_sprint.des +++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des @@ -986,7 +986,7 @@ LROCKTILE: wall_hall # Positions are random, and you don't have enough time to reach an altar before # the game starts. NSUBST: B = 0 / 1 / 2 / 3 / 4 / 5 / 6 / 7 / 8 / 9 / h / k / l / n / \ - o / p / q / r / s / t / *:. + o / p / q / r / s / *:. KFEAT: 0 = altar_zin KFEAT: 1 = altar_the_shining_one KFEAT: 2 = altar_lugonu @@ -1005,8 +1005,7 @@ KFEAT: o = altar_dithmenos KFEAT: p = altar_gozag KFEAT: q = altar_qazlal KFEAT: r = altar_ru -KFEAT: s = altar_pakellas -KFEAT: t = altar_uskayaw +KFEAT: s = altar_uskayaw KITEM: { = scroll of blinking q:3, scroll of fog q:3 ident:all, \ potion of heal wounds q:3, potion of haste q:3, \ wand of iceblast charges:5 ident:all, \ diff --git a/crawl-ref/source/dat/des/sprint/fedhas.des b/crawl-ref/source/dat/des/sprint/fedhas.des index 348fc9acd38..32c12f50d24 100644 --- a/crawl-ref/source/dat/des/sprint/fedhas.des +++ b/crawl-ref/source/dat/des/sprint/fedhas.des @@ -118,16 +118,15 @@ KFEAT: Q = altar_dithmenos KFEAT: R = altar_gozag KFEAT: S = altar_qazlal KFEAT: U = altar_ru -KFEAT: V = altar_pakellas -KFEAT: W = altar_uskayaw +KFEAT: V = altar_uskayaw KMONS: X = oklob sapling name:priest n_suf \ spells:spit_acid.50.natural;cantrip.36.priest;smiting.18.priest KFEAT: Y = altar_hepliaklqana MAP -.T..Y.V....T. +.T...S.U...T. .A.B.C.D.E.F. -M.N.OXP.QWR.S +.M.N.OXP.Q.R. .G.H.I.J.K.L. -.T....U....T. +.T...V.Y...T. ENDMAP diff --git a/crawl-ref/source/dat/des/sprint/linesprint.des b/crawl-ref/source/dat/des/sprint/linesprint.des index 7561843a151..643c04689ac 100644 --- a/crawl-ref/source/dat/des/sprint/linesprint.des +++ b/crawl-ref/source/dat/des/sprint/linesprint.des @@ -199,16 +199,15 @@ KFEAT: r = altar_dithmenos KFEAT: s = altar_qazlal KFEAT: t = altar_gozag KFEAT: u = altar_ru -KFEAT: v = altar_pakellas -KFEAT: w = altar_uskayaw -KFEAT: y = altar_hepliaklqana +KFEAT: v = altar_uskayaw +KFEAT: w = altar_hepliaklqana : line_setup(_G) : lua_marker('~', props_marker { : door_description_suffix=" to the Temple", : }) MAP xxxxxxxxxxxxxxxxxxxxxxxxx -~abcdefghijklmnopqrstuvwy +~abcdefghijklmnopqrstuvw. xxxxxxxxxxxxxxxxxxxxxxxxx ENDMAP diff --git a/crawl-ref/source/dat/des/sprint/menkaure.des b/crawl-ref/source/dat/des/sprint/menkaure.des index 26c83603d0d..3991b8ef992 100644 --- a/crawl-ref/source/dat/des/sprint/menkaure.des +++ b/crawl-ref/source/dat/des/sprint/menkaure.des @@ -211,7 +211,7 @@ ENDMAP NAME: sprint2_temple TAGS: sprint2_temple no_item_gen no_trap_gen no_monster_gen no_pool_fixup -SHUFFLE: abdefghijklmnopqrstuvw +SHUFFLE: abdefghijklmnopqrstuvwx KFEAT: a = altar_zin KFEAT: b = altar_the_shining_one KFEAT: d = altar_kikubaaqudgha @@ -233,9 +233,8 @@ KFEAT: s = altar_dithmenos KFEAT: t = altar_gozag KFEAT: u = altar_qazlal KFEAT: v = altar_ru -KFEAT: w = altar_pakellas -KFEAT: x = altar_uskayaw -KFEAT: y = altar_hepliaklqana +KFEAT: w = altar_uskayaw +KFEAT: x = altar_hepliaklqana MAP ..u.d... .t.g.h.. @@ -243,7 +242,7 @@ x.k.l.s. .w.o.p.v ..a.i.m. ...r.q.j -..y.n.f. +....n.f. .....b.e ENDMAP diff --git a/crawl-ref/source/dat/des/sprint/pitsprint.des b/crawl-ref/source/dat/des/sprint/pitsprint.des index 0497caf1d94..ed8f8560601 100644 --- a/crawl-ref/source/dat/des/sprint/pitsprint.des +++ b/crawl-ref/source/dat/des/sprint/pitsprint.des @@ -696,10 +696,10 @@ MAP vvvvvvvvvvvv vTTTTTTTTTTv vTTTTTTTTTTv -vTvvvvv~vvvv -vTvUUU+@+adv -vTvUUUv.vbcv -vvvvvvv+vvvv +vTTTTvvvvv~v +vvvvvvUUUv@v +vabcd+UUU+.v +vvvvvvvvvv.v v.........G@ v+vvvvv&vvvv v.vZZZZZZZZv @@ -998,17 +998,15 @@ KFEAT: s = altar_dithmenos KFEAT: t = altar_gozag KFEAT: u = altar_qazlal KFEAT: v = altar_ru -KFEAT: w = altar_pakellas -KFEAT: x = altar_uskayaw +KFEAT: w = altar_uskayaw +KFEAT: x = altar_hepliaklqana : general_setup(_G) : general_item_setup(_G) : base_monster_setup(_G) MAP -hopnlfjida -gqrmksvebc -wx -u -t +abcdefghij +klmnopqrst +uvwx ENDMAP diff --git a/crawl-ref/source/dat/des/sprint/red_sonja.des b/crawl-ref/source/dat/des/sprint/red_sonja.des index 51d44b6b435..2bda13e7d04 100644 --- a/crawl-ref/source/dat/des/sprint/red_sonja.des +++ b/crawl-ref/source/dat/des/sprint/red_sonja.des @@ -116,9 +116,8 @@ KFEAT: L = altar_sif_muna KFEAT: M = altar_gozag KFEAT: N = altar_qazlal KFEAT: O = altar_ru -KFEAT: P = altar_pakellas -KFEAT: Q = altar_uskayaw -KFEAT: R = altar_hepliaklqana +KFEAT: P = altar_uskayaw +KFEAT: Q = altar_hepliaklqana KFEAT: Y = any shop MAP xxxxx+xxxxx+x @@ -126,7 +125,7 @@ xxxx$$c$$$c*c xAMxxxc$$cc*c xBQPOJcc+c..+ xC.Y..2+...Lc -xD.R.NccK1x+x +xD...NccK1x+x cEFGHIccx+x*x ccccccccx.xxx ENDMAP diff --git a/crawl-ref/source/dat/des/sprint/sprint_mu.des b/crawl-ref/source/dat/des/sprint/sprint_mu.des index f1b9973c0e2..4822d984432 100644 --- a/crawl-ref/source/dat/des/sprint/sprint_mu.des +++ b/crawl-ref/source/dat/des/sprint/sprint_mu.des @@ -262,7 +262,6 @@ KFEAT: X = altar_xom KFEAT: M = altar_makhleb KFEAT: D = altar_dithmenos KFEAT: G = altar_gozag -KFEAT: P = altar_pakellas KFEAT: Q = altar_qazlal KFEAT: R = altar_ru KFEAT: U = altar_uskayaw @@ -291,9 +290,9 @@ x.......... x...xxxxxx+ x.f.xGlxm.. x...xNDx... -x+xxxXJx... +x+xxxX.x... xUs5xMRx..* -xVSKxQP+..j +xVSKxQJ+..j ENDMAP ############################################################################## diff --git a/crawl-ref/source/dat/des/sprint/zigsprint.des b/crawl-ref/source/dat/des/sprint/zigsprint.des index fb694194320..0423369f9ab 100644 --- a/crawl-ref/source/dat/des/sprint/zigsprint.des +++ b/crawl-ref/source/dat/des/sprint/zigsprint.des @@ -712,9 +712,8 @@ KFEAT: s = altar_dithmenos KFEAT: t = altar_gozag KFEAT: u = altar_qazlal KFEAT: v = altar_ru -KFEAT: w = altar_pakellas -KFEAT: x = altar_uskayaw -KFEAT: y = altar_hepliaklqana +KFEAT: w = altar_uskayaw +KFEAT: x = altar_hepliaklqana KITEM: B = plate armour mundane not_cursed ident:all plus:5, \ fire dragon armour mundane not_cursed ident:all plus:5, \ ice dragon armour mundane not_cursed ident:all plus:5, \ @@ -817,7 +816,7 @@ c......L..O...p b...B.{.......q ^.............^ a.............r -^y^x^w^v^u^t^s^ +^^x^w^v^u^t^s^^ ENDMAP NAME: room_1 diff --git a/crawl-ref/source/lookup_help.cc b/crawl-ref/source/lookup_help.cc index 40b8b0777a8..50ba9ed27cb 100644 --- a/crawl-ref/source/lookup_help.cc +++ b/crawl-ref/source/lookup_help.cc @@ -342,7 +342,9 @@ static vector _get_god_keys() for (int i = GOD_NO_GOD + 1; i < NUM_GODS; i++) { god_type which_god = static_cast(i); - names.push_back(god_name(which_god)); + // XXX: currently disabled. + if (which_god != GOD_PAKELLAS) + names.push_back(god_name(which_god)); } return names; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index d21578eba90..24c4b358c23 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -396,7 +396,14 @@ bool is_unknown_god(god_type god) bool is_unavailable_god(god_type god) { - return god == GOD_JIYVA && jiyva_is_dead(); + if (god == GOD_JIYVA && jiyva_is_dead()) + return true; + + // Disabled, pending a rework. + if (god == GOD_PAKELLAS) + return true; + + return false; } bool god_has_name(god_type god) @@ -4569,6 +4576,10 @@ static bool _is_temple_god(god_type god) case GOD_JIYVA: return false; + // Disabled, pending a rework. + case GOD_PAKELLAS: + return false; + default: return true; }