fiddlerwoaroof/crawl - Change 5DECJIOSMFWX7DMDTGVNPNV6QQP6O34F3XHFHRXGCTJUZMVIXT7QC

Set depth limits for ziggurat monster sets (pan lords and dracs) so that shallow ziggurat levels don't use those sets.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7618 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on November 25, 2008

5DECJIOSMFWX7DMDTGVNPNV6QQP6O34F3XHFHRXGCTJUZMVIXT7QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/dat/clua/ziggurat.lua at line 169 [4.11554]

[3.10532]

end
local function depth_if(spec, fn)
  return { spec = spec, cond = fn }
end
local function depth_ge(lev, spec)
  return depth_if(spec, function ()
                          return zig().depth >= lev
                        end)

Insertion in crawl-ref/source/dat/clua/ziggurat.lua at line 181 [4.11554]

[3.10537]

local function depth_lt(lev, spec)
  return depth_if(spec, function ()
                          return zig().depth < lev
                        end)
end

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 188 [4.11554]

B:BD[3.10564] → [3.10564:10679]

  "Elf:7", "Orc:4", "Vault:8", "Slime:6",
  "Snake:5", "Lair:10", "Tomb:3", "Crypt:5",
  "Abyss", "Shoal:5", "Pan"

[3.10564]

[3.10679]

  -- Dress up monster sets a bit.
  "place:Elf:7 w:300 / deep elf blademaster / deep elf master archer / " ..
    "deep elf annihilator / deep elf sorcerer / deep elf demonologist",
  "place:Orc:4 w:120 / orc warlord / orc knight / stone giant",
  "place:Vault:8",
  "place:Slime:6",
  "place:Snake:5",
  "place:Lair:10",
  "place:Tomb:3",
  "place:Crypt:5",
  "place:Abyss",
  "place:Shoal:5",
  depth_ge(6, "place:Pan w:100 / w:15 pandemonium lord"),
  depth_lt(6, "place:Pan")

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 217 [4.11554]

B:BD[3.11006] → [3.11006:11116]

  return dgn.create_monster(x, y, "place:" ..
                            util.random_from(mons_populations))

[3.11006]

[3.11116]

  return dgn.create_monster(x, y, util.random_from(mons_populations))

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 228 [4.11554]
B:BD[3.11338] → [3.11338:11399]
```
    return dgn.create_monster(x, y, "pandemonium lord band")
```
[3.11338]
[3.11399]
```
    return dgn.create_monster(x, y, "pandemonium lord")
```
Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 236 [4.11554]
B:BD[3.11508] → [3.11508:11544]
```
  mons_drac_gen,
  mons_panlord_gen
```
[3.11508]
[3.11544]
```
  depth_ge(6, mons_drac_gen),
  depth_ge(8, mons_panlord_gen)
```

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 241 [4.11554]

B:BD[3.11586] → [3.11586:11671]

  if type(arg) == "string" then
    local _, _, branch = string.find(arg, "^(%w+):")

[3.11586]

[3.11671]

  local atyp = type(arg)
  if atyp == "string" then
    local _, _, branch = string.find(arg, "^place:(%w+):")

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 249 [4.11554]

B:BD[3.11806] → [3.11806:11868]

             return dgn.create_monster(x, y, "place:" .. arg)

[3.11806]

[3.11868]

             return dgn.create_monster(x, y, arg)

Insertion in crawl-ref/source/dat/clua/ziggurat.lua at line 251 [4.11554]

[3.11883]

  elseif atyp == "table" then
    if arg.cond() then
      return monster_creator_fn(arg.spec)
    end

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 260 [4.11554]

B:BD[3.11916] → [3.11916:12021]

local monster_creators =
  util.map(monster_creator_fn, util.catlist(mons_populations, mons_generators))

[3.11916]

[3.12021]

function ziggurat_monster_creators()
  return util.map(monster_creator_fn,
                  util.catlist(mons_populations, mons_generators))
end

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 266 [4.11554]

B:BD[3.12062] → [3.12062:12117]

  return function (x, y, nth)
           while true do

[3.12062]

[3.12117]

  return function (x, y, nth, hdmax)
           for i = 1, 100 do

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 270 [4.11554]

B:BD[3.12183] → [3.12183:12227]

               if mons.experience == 0 then

[3.12183]

[3.12227]

               -- Discard zero-exp monsters, and monsters that explode
               -- the HD limit.
               if mons.experience == 0 or mons.hd > hdmax * 1.3 then

Insertion in crawl-ref/source/dat/clua/ziggurat.lua at line 280 [4.11554]
[3.12394]
[3.12394]
```
           -- Give up.
           return nil
```

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 286 [4.11554]

B:BD[3.12448] → [3.12448:12514]

  return ziggurat_vet_monster(util.random_from(monster_creators))

[3.12448]

[3.12514]

  return ziggurat_vet_monster(util.random_from(ziggurat_monster_creators()))

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 303 [4.11554]
B:BD[3.12869] → [3.12869:12913]
```
    local mons = mfn(place.x, place.y, nth)
```
[3.12869]
[3.12913]
```
    local mons = mfn(place.x, place.y, nth, hd_pool)
```
Insertion in crawl-ref/source/dat/clua/ziggurat.lua at line 308 [4.11554]
[3.12985]
[3.12985]
```
    else
      break
```
Insertion in crawl-ref/source/dat/clua/util.lua at line 15 [3.14919]
[2.3175]
[2.3175]
```
end
function util.identity(x)
  return x
```
Insertion in crawl-ref/source/dat/clua/util.lua at line 51 [3.14919]
[3.15645]
[3.15645]
```
-- Classic map, but discards nil values (table.insert doesn't like nil).
```

Replacement in crawl-ref/source/dat/clua/util.lua at line 59 [3.14919]

B:BD[3.15815] → [3.15815:15848]

      table.insert(res, fn(val))

[3.15815]

[3.15848]

      local nval = fn(val)
      if nval ~= nil then
        table.insert(res, nval)
      end

Replacement in crawl-ref/source/dat/clua/util.lua at line 76 [3.14919]

B:BD[3.16107] → [3.16107:16149]

      table.insert(res, fn(unpack(args)))

[3.16107]

[3.16149]

      local nval = fn(unpack(args))
      if nval ~= nil then
        table.insert(res, nval)
      end
    end
  end
  return res
end
function util.filter(fn, list)
  local res = { }
  for _, val in ipairs(list) do
    if fn(val) then
      table.insert(res, val)