fiddlerwoaroof/crawl - Change OEZE4RQJAPTNNPB3IRHBP2CTLKASHHDADGJIQGP6WJ2ERSEHGNUAC

Volcano tweaks, you.where_are_you()

you.where_are_you dlua binding, further Volcano tweaks.

Signed-off-by: Matthew Cline <zelgadis@sourceforge.net>

Created by Jude Brown on October 31, 2009

OEZE4RQJAPTNNPB3IRHBP2CTLKASHHDADGJIQGP6WJ2ERSEHGNUAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/l_you.cc at line 277 [5.2866]
[2.3065]
[5.3959]
```
LUARET1(you_where_are_you, number, you.where_are_you)
```

Replacement in crawl-ref/source/l_you.cc at line 293 [5.2866]

B:BD[6.4024] → [2.3066:3101]

{ "die",               _you_die },

[6.4024]

{ "die",                _you_die },
{ "where_are_you",      you_where_are_you },

Deletion in crawl-ref/source/dat/volcano.des at line 240 [7.2965]

B:BD[7.12387] → [7.12387:13099]


function make_fiery_mons (e, monster, weapons, armours)
    -- Converts a "normal" monster to a fire-themed one through ego weapons and armour.
    -- syntax: make_fiery_mons(_G, "monster", {"weapon chance 1", "weapon chance 2"}, {"armour chance 1", "armour chance 2"}) etc.
    local monstring = "" .. monster
    if weapons ~= False then
        monstring = monstring .. " ; "
        for _, weapon in ipairs(weapons) do
            monstring = monstring .. weapon .. " ego:flaming |"
        end
    end
    if armours ~= False then
        monstring = monstring .. " . "
        for _, armour in ipairs(armours) do
            monstring = monstring .. armour .. " ego:fire_resistance |"
        end
    end

Deletion in crawl-ref/source/dat/volcano.des at line 241 [7.2965]
B:BD[7.13100] → [4.3437:3485]
∅:D[4.3485] → [7.13148:13153]
B:BD[7.13148] → [7.13148:13153]
```
    return string.gsub(monstring, "%s*\|$", "")
end
```

Replacement in crawl-ref/source/dat/volcano.des at line 248 [7.2965]

B:BD[7.13482] → [7.13482:13569]

--  orc, orc, orc, Urug; orc, orc, orc, Blork the orc; orc, orc, orc,
--  orc warrior.

[7.13482]

[7.13569]

--  orc warrior, orc warrior, orc warrior, Urug; orc warrior, orc warrior,
--  orc warrior, Blork the orc; orc warrior, orc warrior, orc warrior,
--  orc warrior/orc knight.

Replacement in crawl-ref/source/dat/volcano.des at line 253 [7.2965]

B:BD[7.13664] → [7.13664:13804]

--  kobold, kobold, kobold, Sonja; kobold, kobold, kobold, big kobold.
--  goblin, goblin, goblin, Ijyb; goblin, goblin, goblin, hobgoblin.

[7.13664]

[7.13804]

--  big kobold, big kobold, big kobold, Sonja; big kobold, big kobold, 
--  big kobold, big kobold.

Replacement in crawl-ref/source/dat/volcano.des at line 259 [7.2965]

B:BD[7.14009] → [7.14009:14089]

--  deep elf soldier, deep elf soldier, deep elf soldier, deep elf
--  fighter;

[7.14009]

[7.14089]

--  deep elf fighter, deep elf fighter, deep elf fighter, deep elf
--  knight;

Deletion in crawl-ref/source/dat/volcano.des at line 280 [7.2965]

B:BD[7.15103] → [7.15103:15155]

B:BD[7.15155] → [3.3051:3155]

local sonja = "Sonja" -- We don't touch her equips.
local ijyb = "Ijyb ; club ego:flaming | dagger ego:flaming . ring mail ego:fire_resistance race:orcish"

Deletion in crawl-ref/source/dat/volcano.des at line 281 [7.2965]
∅:D[3.3210] → [8.3039:3078]
B:BD[8.3039] → [8.3039:3078]
```
local menkaure = "Menkaure" -- Or his.
```

Replacement in crawl-ref/source/dat/volcano.des at line 284 [7.2965]

B:BD[7.15471] → [7.15471:15628]

    local human = "human ; short sword ego:flaming | long sword ego:flaming . ring mail ego:fire_resistance"
    e.mons("hog / " .. human)
    e.mons(human)

[7.15471]

[7.15628]

    -- This is for the village! Wargs and orcs if you came from orc
    if you.where_are_you() == 2 then
        local orc = "orc warrior ; ring mail ego:fire_resistance race:orcish | leather armour ego:fire_resistance \
                     race:orcish"
        e.mons("warg / " .. orc)
        e.mons(orc)
    -- But hogs and humans if you came from anywhere else.
    else
        local human = "human ; short sword ego:flaming | long sword ego:flaming . ring mail ego:fire_resistance"
        e.mons("hog / " .. human)
        e.mons(human)
    end

Replacement in crawl-ref/source/dat/volcano.des at line 298 [7.2965]
B:BD[7.15633] → [7.15633:15698]
```
function fiery_guardians (e, tomb)
    local found_guard = false
```
[7.15633]
[7.15698]
```
function fiery_guardians (e)
```

Replacement in crawl-ref/source/dat/volcano.des at line 301 [7.2965]

B:BD[7.15750] → [7.15750:15785]

    if crawl.one_chance_in(9) then

[7.15750]

[7.15785]

    -- If we came from orc, we expect to only see orcs.
    if you.where_are_you() == 2 then
        -- We did, and maybe we'll place a unique.
        if crawl.one_chance_in(9) then
            e.mons("orc warrior ; spear race:orcish ego:flaming . leather armour ego:fire_resistance")
            e.mons(urug .. " / " .. blork .. " / orc warrior ; trident race:orcish ego:flaming . ring mail ego:fire_resistance")
            return
        end
    -- We didn't, and maybe we'll place a unique.
    elseif crawl.one_chance_in(9) then

Replacement in crawl-ref/source/dat/volcano.des at line 312 [7.2965]

B:BD[7.15824] → [7.15824:15897]

        local unq_weight = crawl.random2(50)
        found_guard = true;

[7.15824]

[7.15897]

        local unq_weight = crawl.random2(40)

Replacement in crawl-ref/source/dat/volcano.des at line 314 [7.2965]

B:BD[7.15929] → [7.15929:16102]

            guard_type = "orc warrior"
            main_guard = urug .. " / " .. blork .. " / orc warrior ; trident race:orcish ego:flaming . ring mail ego:fire_resistance"

[7.15929]

[7.16102]

            e.mons("human ; scimitar ego:flaming . leather armour ego:fire_resistance")
            e.mons(edmund .. " / " .. michael .. " / human ; falchion ego:flaming . scale mail ego:fire_resistance")

Replacement in crawl-ref/source/dat/volcano.des at line 317 [7.2965]

B:BD[7.16138] → [7.16138:16614]

            guard_type = "human"
            main_guard = edmund .. " / " .. michael .. " / human ; falchion ego:flaming . leather armour ego:fire_resistance"
        elseif unq_weight < 30 then
            guard_type = "big kobold"
            main_guard = sonja .. " / big kobold ; long sword ego:flaming . ring mail ego:fire_resistance"
        elseif unq_weight <= 50 then
            guard_type = "gnoll"
            main_guard = grum .. " / gnoll ; halberd ego:flaming"

[7.16138]

[7.16614]

            e.mons("big kobold ; short sword ego:flaming . leather armour ego:fire_resistance")
            e.mons("Sonja / big kobold ; long sword ego:flaming . ring mail ego:fire_resistance")
        elseif unq_weight <= 40 then
            e.mons("gnoll ; halberd ego:flaming | w:2 scythe ego:flaming . scale mail ego:fire_resistance | \ 
                    banded mail ego:fire_resistance")
            e.mons(grum .. " / gnoll ; glaive ego:flaming . banded mail \
                            ego:fire_resistance | plate mail ego:fire_resistance")

Replacement in crawl-ref/source/dat/volcano.des at line 327 [7.2965]

B:BD[7.16635] → [7.16635:16922]

    if tomb then
        guard_type = "mummy"
        main_guard = menkaure .. " / guardian mummy"
        found_guard = true
    end
    -- If we've reached this stage, we've maybe already found a guardian.
    if found_guard then
        e.mons(guard_type)
        e.mons(main_guard)

[7.16635]

[7.16922]

    -- No unique, orcs!
    if you.where_are_you() == 2 then
        e.mons("orc warrior ; spear race:orcish ego:flaming . leather armour ego:fire_resistance")
        e.mons("orc warrior ; trident race:orcish ego:flaming . ring mail ego:fire_resistance / \
                orc knight ; scythe race:orcish ego:flaming . banded mail ego:fire_resistance")

Replacement in crawl-ref/source/dat/volcano.des at line 334 [7.2965]
B:BD[7.16945] → [7.16945:17010]
```
    -- If not, we still have to decide what we're going to use.
```
[7.16945]
[7.17010]
```
 
    -- No unique, minotaur!
```

Replacement in crawl-ref/source/dat/volcano.des at line 339 [7.2965]

B:BD[7.17122] → [7.17122:17203]

        e.mons("minotaur ; trident ego:flaming . ring mail ego:fire_resistance")

[7.17122]

[7.17203]

        e.mons("minotaur ; trident ego:flaming . banded mail ego:fire_resistance")

Replacement in crawl-ref/source/dat/volcano.des at line 344 [7.2965]

B:BD[7.17262] → [7.17262:17947]

        -- We're still going to use a pack of "intelligents".
        local pack_weight = crawl.random2(30)
        -- "Plain" flavour packs are orcs+orc warrior (maybe an orc knight)
        -- kobolds + big kobold (maybe a kobold demonologist), or deep elf
        -- soldiers + deep elf fighter.
        if pack_weight < 10 then
            e.mons("orc warrior")
            e.mons("orc warrior / orc knight w:1")
        elseif pack_weight < 20 then
            e.mons("big kobold")
            e.mons("big kobold / kobold demonologist w:2")
        elseif pack_weight <= 30 then
            e.mons("deep elf fighter" )
            e.mons("deep elf fighter / deep elf knight w:3")

[7.17262]

[7.17947]

        if crawl.coinflip() then
            e.mons("big kobold ; short sword ego:flaming . leather armour ego:fire_resistance")
            e.mons("big kobold ; long sword ego:flaming . ring mail ego:fire_resistance / kobold demonologist w:2")
        else
            e.mons("deep elf fighter ; sabre ego:flaming race:elven")
            e.mons("deep elf fighter ; sabre ego:flaming race:elven . chain mail ego:fire_resistance \ 
                    race:elven / deep elf knight w:3 ; sabre ego:flaming race:elven . chain mail \
                    ego:fire_resistance race:elven")

Insertion in crawl-ref/source/dat/volcano.des at line 356 [7.2965]
[7.17983]
[7.17983]
```
    -- Unintelligent map!
```
Replacement in crawl-ref/source/dat/volcano.des at line 675 [7.2965]
B:BD[7.29659] → [7.29659:29697]
```
:           fiery_guardians(_G, true)
```
[7.29659]
[7.29697]
```
MONS:       mummy
MONS:       menkaure / guardian mummy
```