fiddlerwoaroof/crawl - Change DUFJKFM5KBCM4272ZKLBPGKHLMDLK6RABUNTDEWRZULTKDTHHSBAC

Fix ziggurat dying when choosing random monster set, fixed pan lord odds.

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

Created by dshaligram on November 25, 2008

DUFJKFM5KBCM4272ZKLBPGKHLMDLK6RABUNTDEWRZULTKDTHHSBAC

Dependencies

In channels

main

Change contents

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

[3.3046]

end
local function set_floor_colour(colour)
  if not zig().level.floor_colour then
    zig().level.floor_colour = colour
    dgn.change_floor_colour(colour, false)
  end
end
local function set_random_floor_colour()
  set_floor_colour( random_floor_colour() )

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

[3.3051]

[5.10537]

local function monster_creator_fn(arg)
  local atyp = type(arg)
  if atyp == "string" then
    local _, _, branch = string.find(arg, "^place:(%w+):")
    return function (x, y, nth)
             if branch then
               set_floor_colour(dgn.br_floorcol(branch))
             end
             return dgn.create_monster(x, y, arg)
           end
  elseif atyp == "table" then
    if arg.cond() then
      return monster_creator_fn(arg.spec)
    end
  else
    return arg
  end
end

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 231 [4.11554]
B:BD[3.3447] → [3.3447:3505]
```
  depth_ge(6, "place:Pan w:100 / w:15 pandemonium lord"),
```
[3.3447]
[3.3505]
```
  depth_ge(6, "place:Pan w:400 / w:15 pandemonium lord"),
```

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

B:BD[5.10681] → [5.10681:10799]

B:BD[5.10799] → [2.3010:3053]

∅:D[2.3053] → [5.10835:10935]

B:BD[5.10835] → [5.10835:10935]


local function set_floor_colour(colour)
  if not zig().level.floor_colour then
    zig().level.floor_colour = colour
    dgn.change_floor_colour(colour, false)
  end
end
local function set_random_floor_colour()
  set_floor_colour( random_floor_colour() )
end

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

B:BD[5.11006] → [3.3533:3603]

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

[5.11006]

[5.11116]

  local mgen = nil
  while not mgen do
    mgen = monster_creator_fn(util.random_from(mons_populations))
  end
  return mgen(x, y, nth)

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

B:BD[4.13691] → [5.11547:11586]

B:BD[5.11586] → [3.3724:3835]

∅:D[3.3835] → [5.11671:11806]

B:BD[5.11671] → [5.11671:11806]

B:BD[5.11806] → [3.3836:3886]

∅:D[3.3886] → [5.11868:11883]

B:BD[5.11868] → [5.11868:11883]

B:BD[5.11883] → [3.3887:3990]

∅:D[3.3990] → [5.11883:11916]

B:BD[5.11883] → [5.11883:11916]

local function monster_creator_fn(arg)
  local atyp = type(arg)
  if atyp == "string" then
    local _, _, branch = string.find(arg, "^place:(%w+):")
    return function (x, y, nth)
             if branch then
               set_floor_colour(dgn.br_floorcol(branch))
             end
             return dgn.create_monster(x, y, arg)
           end
  elseif atyp == "table" then
    if arg.cond() then
      return monster_creator_fn(arg.spec)
    end
  else
    return arg
  end
end