summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/dat/des/altar/overflow.des8
-rw-r--r--crawl-ref/source/dat/des/branches/abyss.des7
-rw-r--r--crawl-ref/source/dat/des/branches/temple.des17
-rw-r--r--crawl-ref/source/dat/des/sprint/arena_sprint.des1
-rw-r--r--crawl-ref/source/dat/des/sprint/fedhas.des5
-rw-r--r--crawl-ref/source/dat/des/sprint/linesprint.des1
-rw-r--r--crawl-ref/source/dat/des/sprint/menkaure.des7
-rw-r--r--crawl-ref/source/dat/des/sprint/pitsprint.des1
-rw-r--r--crawl-ref/source/dat/des/sprint/red_sonja.des1
-rw-r--r--crawl-ref/source/dat/des/sprint/sprint_mu.des1
-rw-r--r--crawl-ref/source/dat/des/sprint/zigsprint.des3
-rw-r--r--crawl-ref/source/religion.cc7
12 files changed, 46 insertions, 13 deletions
diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index 425a590826..5cf8be8ffc 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -774,6 +774,7 @@ RTILE: x = wall_sandstone
COLOUR: xG = yellow
: set_feature_name("granite_statue", "golden statue")
: interest_check(_G)
+: if crawl.unavailable_god("Gozag") then _G.weight(0) end
MAP
@
xxx-xxx
@@ -801,6 +802,7 @@ RTILE: x = wall_sandstone
COLOUR: xG = yellow
: set_feature_name("granite_statue", "golden statue")
: interest_check(_G)
+: if crawl.unavailable_god("Gozag") then _G.weight(0) end
MAP
xxxxx
.@......x-eGx
@@ -823,6 +825,7 @@ RTILE: x = wall_sandstone
COLOUR: xG = yellow
: set_feature_name("granite_statue", "golden statue")
: interest_check(_G)
+: if crawl.unavailable_god("Gozag") then _G.weight(0) end
MAP
xxxxxxx
xx--_--xx
@@ -838,6 +841,7 @@ TAGS: temple_overflow_gozag temple_overflow_1 uniq_altar_gozag \
DEPTH: D:2-
KFEAT: _ = altar_gozag
: interest_check(_G)
+: if crawl.unavailable_god("Gozag") then _G.weight(0) end
MAP
bbb@bbb
b....$b
@@ -860,6 +864,7 @@ KFEAT: _ = altar_gozag
KFEAT: S = general shop name:Gozag type:Platinum suffix:Reserve count:4 \
greed:100 ; any weapon randart | any armour randart | any jewellery randart
: interest_check(_G)
+: if crawl.unavailable_god("Gozag") then _G.weight(0) end
MAP
wwwwwww....
w'''''wwww.
@@ -877,6 +882,7 @@ DEPTH: D:2-
ITEM: gold q:1 / gold q:2
KFEAT: _ = altar_gozag
: interest_check(_G)
+: if crawl.unavailable_god("Gozag") then _G.weight(0) end
MAP
ddd
d_d
@@ -2809,6 +2815,7 @@ FTILE: ._GOU+ = floor_limestone
RTILE: x = wall_sandstone
COLOUR: xG = yellow
: set_feature_name("granite_statue", "golden statue")
+: if crawl.unavailable_god("Gozag") then _G.weight(0) end
MAP
xxxxxxx
xx.....xx
@@ -2835,6 +2842,7 @@ COLOUR: v = white
FTILE: +._O$ = floor_limestone
: set_feature_name("granite_statue", "golden statue")
: set_feature_name("metal_wall", "silver wall")
+: if crawl.unavailable_god("Gozag") then _G.weight(0) end
MAP
vvvvvvvvv
v..$$$..v
diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des
index 655719473b..194cac482a 100644
--- a/crawl-ref/source/dat/des/branches/abyss.des
+++ b/crawl-ref/source/dat/des/branches/abyss.des
@@ -201,7 +201,7 @@ COLOUR: " : white w:5 / none
TILE: " : floor_limestone w:5 / floor_nerves
SUBST: " = .
MONS: plant, bush
-SHUFFLE: ABCDEFHIJKLMNOPQRS
+SHUFFLE: ABCDEFHIJKLMNOPQS
KFEAT: A = altar_makhleb
KFEAT: B = altar_xom
KFEAT: C = altar_zin
@@ -220,15 +220,16 @@ KFEAT: P = altar_ashenzari
KFEAT: Q = altar_dithmenos
KFEAT: R = altar_gozag
KFEAT: S = altar_qazlal
+: if crawl.unavailable_god("Gozag") then _G.subst('R = "') end
MAP
''''''...............
''ccccccccccccccccc..
''G'c"""""""""""""c..
''''c"A"B"C"D"E"F"c..
''G'c"""""""""""""ct.
-''''+"H"I"J"K"L"M"c..
+''''+"R"I"J"K"L"M"c..
''G'c"""""""""""""c..
-''''c"N"O"P"Q"R"S"c.t
+''''c"N"O"P"Q"H"S"c.t
''G'c"""""""""""""c..
''ccccccccccccccccc..
.......t......ttt....
diff --git a/crawl-ref/source/dat/des/branches/temple.des b/crawl-ref/source/dat/des/branches/temple.des
index b18f74fbe4..9232314b80 100644
--- a/crawl-ref/source/dat/des/branches/temple.des
+++ b/crawl-ref/source/dat/des/branches/temple.des
@@ -1156,12 +1156,13 @@ NAME: grunt_circular_temple_18
PLACE: Temple
TAGS: no_rotate
ORIENT: encompass
+: if not crawl.unavailable_god("Gozag") then _G.subst("C = B") end
MAP
ccccccccccccc
ccccc...........ccccc
cccc...................cccc
ccc.........................ccc
- ccc..........B...B...B..........ccc
+ ccc..........B...C...B..........ccc
cc........B...............B........cc
cc...................................cc
cc.......B.....................B.......cc
@@ -1195,6 +1196,10 @@ PLACE: Temple
WEIGHT: 10
TAGS: no_rotate
ORIENT: encompass
+{{ if crawl.unavailable_god("Gozag") then _G.subst('C = "')
+ else _G.subst("C = B")
+ end
+}}
NSUBST: . = 15:1 / 12:2 / 2:t / *:.
SUBST: ' = .
COLOUR: " : darkgrey w:3 / white w:1 / none
@@ -1210,7 +1215,7 @@ tt.....{..21...t...............''ccccccccccccccccc...22.tttt
ttt...........ttt.......t......''G'c"""""""""""""c..t..ttttt
tttt......2....................''''c"B"B"B"B"B"B"ctt....tttt
tttttt.....................t...''G'c"""""""""""""cttt...tttt
-ttttttttt..1.....2...t.........''''+"B"B"B"B"B"B"ctt..t...tt
+ttttttttt..1.....2...t.........''''+"C"B"B"B"B"B"ctt..t...tt
tttttttt.......................''G'c"""""""""""""c...tt..ttt
ttttttttt...................1..''''c"B"B"B"B"B"B"c..ttt.tttt
ttttttttttttttt....2....t......''G'c"""""""""""""c...t..tttt
@@ -2876,6 +2881,7 @@ PLACE: Temple
TAGS: no_rotate
ORIENT: encompass
WEIGHT: 1
+: if not crawl.unavailable_god("Gozag") then _G.subst("C = B") end
MAP
bbb bbb
bbb.bb bb.bbb
@@ -2894,7 +2900,7 @@ bb........B....B...B....B........bb
bb.........bb
bb...........bb
bb....B...B....bb
- bb.......B.......bb
+ bb.......C.......bb
bbb...........bbb
bbbb.....bbbb
bbbbbbb
@@ -3074,6 +3080,7 @@ PLACE: Temple
TAGS: no_rotate
ORIENT: encompass
WEIGHT: 1
+: if not crawl.unavailable_god("Gozag") then _G.subst("C = B") end
MAP
bbbbb
b...b
@@ -3093,7 +3100,7 @@ bbbbb.B.bb.bb.T.bb.bb.T.bb.bb.B.bbbbb
b...................b
bbbbb.B.bb.bb.B.bbbbb
b...........b
- bbbbb.B.bbbbb
+ bbbbb.C.bbbbb
b...b
bbbbb
ENDMAP
@@ -3104,7 +3111,9 @@ TAGS: no_rotate
PLACE: Temple
WEIGHT: 1
ORIENT: encompass
+: if crawl.unavailable_god("Gozag") then _G.nsubst("T = 1:t / *:T") end
NSUBST: T = 1:{ / 1:B / *:T
+SUBST: t = T
MAP
bbb bbb bbb
bb.bb bb.bb bb.bb
diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des
index beba81f5bf..423905c24a 100644
--- a/crawl-ref/source/dat/des/sprint/arena_sprint.des
+++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des
@@ -1009,6 +1009,7 @@ KFEAT: n = altar_fedhas
KFEAT: o = altar_dithmenos
KFEAT: p = altar_gozag
KFEAT: q = altar_qazlal
+: if crawl.unavailable_god("Gozag") then _G.subst("p = .") end
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 fire 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 f227587104..908948c4c2 100644
--- a/crawl-ref/source/dat/des/sprint/fedhas.des
+++ b/crawl-ref/source/dat/des/sprint/fedhas.des
@@ -103,8 +103,9 @@ KFEAT: N = altar_vehumet
KFEAT: O = altar_sif_muna
KFEAT: P = altar_makhleb
KFEAT: Q = altar_dithmenos
-KFEAT: R = altar_gozag
-KFEAT: S = altar_qazlal
+KFEAT: R = altar_qazlal
+KFEAT: S = altar_gozag
+: if crawl.unavailable_god("Gozag") then _G.subst("S = .") end
KMONS: X = oklob sapling name:priest n_suf spells:cantrip;.;cantrip;smiting priest_spells
MAP
diff --git a/crawl-ref/source/dat/des/sprint/linesprint.des b/crawl-ref/source/dat/des/sprint/linesprint.des
index 2f665e60ad..7ecb0e5891 100644
--- a/crawl-ref/source/dat/des/sprint/linesprint.des
+++ b/crawl-ref/source/dat/des/sprint/linesprint.des
@@ -196,6 +196,7 @@ KFEAT: q = altar_cheibriados
KFEAT: r = altar_dithmenos
KFEAT: s = altar_qazlal
KFEAT: t = altar_gozag
+: if crawl.unavailable_god("Gozag") then _G.subst("t = .") end
: line_setup(_G)
: lua_marker('~', props_marker {
: door_description_suffix=" to the Temple",
diff --git a/crawl-ref/source/dat/des/sprint/menkaure.des b/crawl-ref/source/dat/des/sprint/menkaure.des
index 8a7ec93629..7598d9ff86 100644
--- a/crawl-ref/source/dat/des/sprint/menkaure.des
+++ b/crawl-ref/source/dat/des/sprint/menkaure.des
@@ -211,11 +211,11 @@ ENDMAP
NAME: sprint2_temple
TAGS: sprint2_temple no_item_gen no_trap_gen no_monster_gen no_pool_fixup
-SHUFFLE: abdefghijklmnopqrstu
+SHUFFLE: abdfghijklmnopqrstu
KFEAT: a = altar_zin
KFEAT: b = altar_the_shining_one
KFEAT: d = altar_kikubaaqudgha
-KFEAT: e = altar_yredelemnul
+KFEAT: e = altar_gozag
KFEAT: f = altar_xom
KFEAT: g = altar_vehumet
KFEAT: h = altar_okawaru
@@ -230,8 +230,9 @@ KFEAT: p = altar_jiyva
KFEAT: q = altar_fedhas
KFEAT: r = altar_cheibriados
KFEAT: s = altar_dithmenos
-KFEAT: t = altar_gozag
+KFEAT: t = altar_yredelemnul
KFEAT: u = altar_qazlal
+: if crawl.unavailable_god("Gozag") then _G.subst("e = .") end
MAP
..u.d...
.t.g.h..
diff --git a/crawl-ref/source/dat/des/sprint/pitsprint.des b/crawl-ref/source/dat/des/sprint/pitsprint.des
index 9d234b989a..f5cda44561 100644
--- a/crawl-ref/source/dat/des/sprint/pitsprint.des
+++ b/crawl-ref/source/dat/des/sprint/pitsprint.des
@@ -997,6 +997,7 @@ KFEAT: r = altar_cheibriados
KFEAT: s = altar_dithmenos
KFEAT: t = altar_gozag
KFEAT: u = altar_qazlal
+: if crawl.unavailable_god("Gozag") then _G.subst("t = .") end
: general_setup(_G)
: general_item_setup(_G)
: base_monster_setup(_G)
diff --git a/crawl-ref/source/dat/des/sprint/red_sonja.des b/crawl-ref/source/dat/des/sprint/red_sonja.des
index 56226e13e9..4a4873b9c5 100644
--- a/crawl-ref/source/dat/des/sprint/red_sonja.des
+++ b/crawl-ref/source/dat/des/sprint/red_sonja.des
@@ -115,6 +115,7 @@ KFEAT: K = altar_vehumet
KFEAT: L = altar_sif_muna
KFEAT: M = altar_gozag
KFEAT: N = altar_qazlal
+: if crawl.unavailable_god("Gozag") then _G.subst("M = .") end
KFEAT: Y = any shop
MAP
xxxxx+xxxxx+x
diff --git a/crawl-ref/source/dat/des/sprint/sprint_mu.des b/crawl-ref/source/dat/des/sprint/sprint_mu.des
index 97683cc8dd..afa0f784f1 100644
--- a/crawl-ref/source/dat/des/sprint/sprint_mu.des
+++ b/crawl-ref/source/dat/des/sprint/sprint_mu.des
@@ -263,6 +263,7 @@ KFEAT: M = altar_makhleb
KFEAT: D = altar_dithmenos
KFEAT: G = altar_gozag
KFEAT: Q = altar_qazlal
+: if crawl.unavailable_god("Gozag") then _G.subst("G = .") end
KMONS: l = patrolling spatial vortex
KFEAT: l = altar_lugonu
KFEAT: J = altar_jiyva
diff --git a/crawl-ref/source/dat/des/sprint/zigsprint.des b/crawl-ref/source/dat/des/sprint/zigsprint.des
index 9937526f93..853d588e41 100644
--- a/crawl-ref/source/dat/des/sprint/zigsprint.des
+++ b/crawl-ref/source/dat/des/sprint/zigsprint.des
@@ -713,6 +713,7 @@ KFEAT: r = altar_cheibriados
KFEAT: s = altar_dithmenos
KFEAT: t = altar_gozag
KFEAT: u = altar_qazlal
+: if crawl.unavailable_god("Gozag") then _G.subst("t = {") end
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, \
@@ -814,7 +815,7 @@ c......L..O...n
^...C..K..N...^
b...B.........o
^.............^
-a^r^t^{^u^s^q^p
+a^r^u^{^t^s^q^p
ENDMAP
NAME: room_1
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 7bad2fc919..7a4fdd3abe 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -79,6 +79,7 @@
#include "terrain.h"
#include "transform.h"
#include "hints.h"
+#include "version.h"
#include "view.h"
#include "xom.h"
@@ -545,6 +546,9 @@ bool is_unavailable_god(god_type god)
if (god == GOD_JIYVA && jiyva_is_dead())
return true;
+ if (god == GOD_GOZAG && Version::ReleaseType != VER_ALPHA)
+ return true;
+
// Don't allow Fedhas in ZotDef, as his invocations are duplicated, and
// passives thoroughly overpowered. Protection for plants, speed-up of
// oklobs, etc...
@@ -4525,6 +4529,9 @@ static bool _is_temple_god(god_type god)
case GOD_JIYVA:
return false;
+ case GOD_GOZAG:
+ return Version::ReleaseType == VER_ALPHA;
+
default:
return true;
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-26 18:52:45 +0000