Revert "Make Gozag trunk-only"

Not needed now that we've branched 0.15.

This reverts commit 8064468542592958c6ace5dc27aa0fd88cce04a9.
This reverts commit 0f053f10eb5bf6e8df296044933b8f82496ce8d3.

11 files changed, 13 insertions, 39 deletions

diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index 5cf8be8ffc..425a590826 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -774,7 +774,6 @@ 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
@@ -802,7 +801,6 @@ 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
@@ -825,7 +823,6 @@ 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
@@ -841,7 +838,6 @@ 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
@@ -864,7 +860,6 @@ 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.
@@ -882,7 +877,6 @@ 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
@@ -2815,7 +2809,6 @@ 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
@@ -2842,7 +2835,6 @@ 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 194cac482a..655719473b 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: ABCDEFHIJKLMNOPQS
+SHUFFLE: ABCDEFHIJKLMNOPQRS
 KFEAT:   A = altar_makhleb
 KFEAT:   B = altar_xom
 KFEAT:   C = altar_zin
@@ -220,16 +220,15 @@ 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.
-''''+"R"I"J"K"L"M"c..
+''''+"H"I"J"K"L"M"c..
 ''G'c"""""""""""""c..
-''''c"N"O"P"Q"H"S"c.t
+''''c"N"O"P"Q"R"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 9232314b80..b18f74fbe4 100644
--- a/crawl-ref/source/dat/des/branches/temple.des
+++ b/crawl-ref/source/dat/des/branches/temple.des
@@ -1156,13 +1156,12 @@ 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...C...B..........ccc
+    ccc..........B...B...B..........ccc
    cc........B...............B........cc
   cc...................................cc
  cc.......B.....................B.......cc
@@ -1196,10 +1195,6 @@ 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
@@ -1215,7 +1210,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.........''''+"C"B"B"B"B"B"ctt..t...tt
+ttttttttt..1.....2...t.........''''+"B"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
@@ -2881,7 +2876,6 @@ 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
@@ -2900,7 +2894,7 @@ bb........B....B...B....B........bb
            bb.........bb
           bb...........bb
          bb....B...B....bb
-        bb.......C.......bb
+        bb.......B.......bb
          bbb...........bbb
            bbbb.....bbbb
               bbbbbbb
@@ -3080,7 +3074,6 @@ 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
@@ -3100,7 +3093,7 @@ bbbbb.B.bb.bb.T.bb.bb.T.bb.bb.B.bbbbb
         b...................b
         bbbbb.B.bb.bb.B.bbbbb
             b...........b
-            bbbbb.C.bbbbb
+            bbbbb.B.bbbbb
                 b...b
                 bbbbb
 ENDMAP
@@ -3111,9 +3104,7 @@ 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 423905c24a..beba81f5bf 100644
--- a/crawl-ref/source/dat/des/sprint/arena_sprint.des
+++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des
@@ -1009,7 +1009,6 @@ 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 908948c4c2..f227587104 100644
--- a/crawl-ref/source/dat/des/sprint/fedhas.des
+++ b/crawl-ref/source/dat/des/sprint/fedhas.des
@@ -103,9 +103,8 @@ KFEAT:  N = altar_vehumet
 KFEAT:  O = altar_sif_muna
 KFEAT:  P = altar_makhleb
 KFEAT:  Q = altar_dithmenos
-KFEAT:  R = altar_qazlal
-KFEAT:  S = altar_gozag
-: if crawl.unavailable_god("Gozag") then _G.subst("S = .") end
+KFEAT:  R = altar_gozag
+KFEAT:  S = altar_qazlal
 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 7ecb0e5891..2f665e60ad 100644
--- a/crawl-ref/source/dat/des/sprint/linesprint.des
+++ b/crawl-ref/source/dat/des/sprint/linesprint.des
@@ -196,7 +196,6 @@ 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 7598d9ff86..8a7ec93629 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: abdfghijklmnopqrstu
+SHUFFLE: abdefghijklmnopqrstu
 KFEAT:  a = altar_zin
 KFEAT:  b = altar_the_shining_one
 KFEAT:  d = altar_kikubaaqudgha
-KFEAT:  e = altar_gozag
+KFEAT:  e = altar_yredelemnul
 KFEAT:  f = altar_xom
 KFEAT:  g = altar_vehumet
 KFEAT:  h = altar_okawaru
@@ -230,9 +230,8 @@ KFEAT:  p = altar_jiyva
 KFEAT:  q = altar_fedhas
 KFEAT:  r = altar_cheibriados
 KFEAT:  s = altar_dithmenos
-KFEAT:  t = altar_yredelemnul
+KFEAT:  t = altar_gozag
 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 f5cda44561..9d234b989a 100644
--- a/crawl-ref/source/dat/des/sprint/pitsprint.des
+++ b/crawl-ref/source/dat/des/sprint/pitsprint.des
@@ -997,7 +997,6 @@ 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 4a4873b9c5..56226e13e9 100644
--- a/crawl-ref/source/dat/des/sprint/red_sonja.des
+++ b/crawl-ref/source/dat/des/sprint/red_sonja.des
@@ -115,7 +115,6 @@ 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 afa0f784f1..97683cc8dd 100644
--- a/crawl-ref/source/dat/des/sprint/sprint_mu.des
+++ b/crawl-ref/source/dat/des/sprint/sprint_mu.des
@@ -263,7 +263,6 @@ 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 853d588e41..9937526f93 100644
--- a/crawl-ref/source/dat/des/sprint/zigsprint.des
+++ b/crawl-ref/source/dat/des/sprint/zigsprint.des
@@ -713,7 +713,6 @@ 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, \
@@ -815,7 +814,7 @@ c......L..O...n
 ^...C..K..N...^
 b...B.........o
 ^.............^
-a^r^u^{^t^s^q^p
+a^r^t^{^u^s^q^p
 ENDMAP
 
 NAME:  room_1