Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git c/Files i/Files
- index f9309dfcd..c3397ba0f 100644
- --- c/Files
- +++ i/Files
- @@ -35,7 +35,8 @@ Arc-fila.lua Arc-filb.lua Arc-goal.lua Arc-loca.lua Arc-strt.lua
- Bar-fila.lua Bar-filb.lua Bar-goal.lua Bar-loca.lua Bar-strt.lua
- Cav-fila.lua Cav-filb.lua Cav-goal.lua Cav-loca.lua Cav-strt.lua
- GENFILES Hea-fila.lua Hea-filb.lua Hea-goal.lua Hea-loca.lua
- -Hea-strt.lua Kni-fila.lua Kni-filb.lua Kni-goal.lua Kni-loca.lua
- +Hea-strt.lua Inf-fila.lua Inf-filb.lua Inf-goal.lua Inf-loca.lua
- +Inf-strt.lua Kni-fila.lua Kni-filb.lua Kni-goal.lua Kni-loca.lua
- Kni-strt.lua Mon-fila.lua Mon-filb.lua Mon-goal.lua Mon-loca.lua
- Mon-strt.lua Pri-fila.lua Pri-filb.lua Pri-goal.lua Pri-loca.lua
- Pri-strt.lua Ran-fila.lua Ran-filb.lua Ran-goal.lua Ran-loca.lua
- diff --git c/dat/Inf-fila.lua i/dat/Inf-fila.lua
- new file mode 100644
- index 000000000..d032ba107
- --- /dev/null
- +++ i/dat/Inf-fila.lua
- @@ -0,0 +1,58 @@
- +-- The upper filler is the underground complex that leads to the Forest.
- +-- It's a standard room-and-corridor dungeon populated with hkO.
- +
- +des.level_flags("hardfloor", "noflip")
- +
- +des.room({contents = function()
- + des.stair("up")
- + des.object()
- + des.monster("k")
- +end})
- +
- +des.room({contents = function()
- + des.stair("down")
- + des.object()
- + des.trap()
- + des.monster("h")
- + des.monster("k")
- +end})
- +
- +-- Quest dungeons always seem so empty, so here's a fountain.
- +des.room({contents = function()
- + des.feature("fountain", -1, -1)
- + des.object()
- + des.monster("h")
- +end})
- +
- +-- Throne monsters roughly suit the hkO theme.
- +des.room({type = "throne", chance = 25, contents = function()
- + des.object()
- + des.trap()
- +end})
- +
- +des.room({contents = function()
- + des.object()
- + des.trap()
- + des.monster("k")
- + des.monster("k")
- +end})
- +
- +des.room({contents = function()
- + des.object()
- + des.object()
- + des.trap()
- + des.trap()
- + des.monster("O")
- + des.monster("h")
- +end})
- +
- +des.room({contents = function()
- + des.object()
- + des.object()
- + des.trap()
- + des.trap()
- + des.monster("O")
- + des.monster("k")
- +end})
- +
- +des.random_corridors()
- diff --git c/dat/Inf-filb.lua i/dat/Inf-filb.lua
- new file mode 100644
- index 000000000..c576f1fa5
- --- /dev/null
- +++ i/dat/Inf-filb.lua
- @@ -0,0 +1,36 @@
- +-- The lower fillers are some nondescript areas of the Howling Forest.
- +-- There's a lot of werewolves and other d and perhaps a woodchuck.
- +
- +des.level_flags("mazelevel", "hardfloor", "noflip")
- +des.level_init({style = "mines", fg = ".", bg = "T",
- + smoothed = true, joined = true, lit = 0})
- +
- +des.levregion({type = "stair-up", region = {45, 00, 79, 20}})
- +des.levregion({type = "stair-down", region = {00, 00, 39, 20}})
- +
- +for _ = 1, 5 do
- + des.monster("werewolf")
- +end
- +for _ = 1, d(6, 4) do
- + des.monster("d")
- +end
- +for _ = 1, 4 do
- + des.monster("u")
- +end
- +des.monster("forest centaur")
- +if percent(60) then
- + des.monster("woodchuck")
- +end
- +
- +for _ = 1, 4 do
- + des.object()
- +end
- +for _ = 1, 8 do
- + des.trap()
- +end
- +
- +-- With so many trees, having every single one bear fruit seems excessive.
- +selection.negate():filter_mapchar("T"):iterate(function(x, y)
- + des.feature({type = "tree", coord = {x, y},
- + looted = percent(90), swarm = percent(80)})
- +end)
- diff --git c/dat/Inf-goal.lua i/dat/Inf-goal.lua
- new file mode 100644
- index 000000000..4b26b2a4b
- --- /dev/null
- +++ i/dat/Inf-goal.lua
- @@ -0,0 +1,103 @@
- +-- The "goal" level for the quest.
- +
- +-- In this part of the Howling Forest the Paladin awaits you for a duel
- +-- amidst some ancient ruins. Kill her to claim the Idol of Moloch!
- +
- +-- Note: some may find the Paladin a tough opponent. It's intentional!
- +-- You come here to duel her at HER behest, on HER conditions.
- +-- She expects to defeat you and came prepared. To win, you need to
- +-- outwit her.
- +
- +des.level_flags("mazelevel", "hardfloor", "noflipx")
- +des.level_init({style = "mines", fg = ".", bg = "T",
- + smoothed = true, joined = true, lit = 0})
- +des.map({halign = "half-left", valign = "center", map =
- +-- 1 2
- +--123456789012345678901234567
- +[[
- +0xxxxxxxxxx........xxxxxxxxxx
- +1xxxxxxx..............xxxxxxx
- +2xxxx....................xxxx
- +3xx........--..-...........xx
- +4x.........|.....|..........x
- +5.............--.|...........
- +6x........--................x
- +7xx........|..|...--.......xx
- +8xxxx.........|..........xxxx
- +9xxxxxxx..............xxxxxxx
- +0xxxxxxxxxx........xxxxxxxxxx
- +]]})
- +
- +-- The Paladin and her entourage.
- +des.monster("Paladin", 13, 06)
- +des.object({id = "figurine", name = "The Idol of Moloch",
- + buc = "cursed", coord = {13, 06}})
- +for _, coord in pairs({{13, 03}, {15, 04}, {17, 06},
- + {13, 09}, {10, 08}, {09, 05}}) do
- + des.monster({id = "templar", coord = coord, asleep = 1})
- +end
- +for _, coord in pairs({{16, 08}, {11, 04}}) do
- + des.monster({id = "aligned priest", coord = coord,
- + align = "law", peaceful = 0, asleep = 1})
- +end
- +
- +-- Just pretend they're tripwires.
- +local around = selection.ellipse(13, 05, 9, 5, 1)
- + ~ selection.ellipse(13, 05, 4, 3, 1)
- +around = around:filter_mapchar(".")
- +for _ = 1, 4 do
- + des.trap("board", around:rndcoord(1))
- +end
- +
- +-- There's still some treasure buried in the ruins.
- +local ruins = selection.circle(13, 06, 4, 1)
- +for _ = 1, 2 do
- + des.object({id = "gold piece", quantity = d(10, 100),
- + buried = true, coord = {ruins:rndcoord(1)}})
- +end
- +for _ = 1, 3 do
- + des.object({class = "*", buried = true, coord = {ruins:rndcoord(1)}})
- +end
- +if percent(60) then
- + des.object({class = "=", buried = true, coord = {ruins:rndcoord(1)}})
- +end
- +if percent(50) then
- + des.object({class = "=", buried = true, coord = {ruins:rndcoord(1)}})
- +end
- +if percent(40) then
- + des.object({class = '"', buried = true, coord = {ruins:rndcoord()}})
- +end
- +
- +des.map("x") -- hack to switch to global coords
- +
- +-- The surrounding woods.
- +des.levregion({type = "stair-up", region = {45, 00, 79, 20}})
- +for _ = 1, 4 do
- + des.monster("werewolf")
- +end
- +for _ = 1, d(5, 4) do
- + des.monster("d")
- +end
- +for _ = 1, 3 do
- + des.monster("u")
- +end
- +if percent(80) then
- + des.monster("forest centaur")
- +end
- +if percent(50) then
- + des.monster("woodchuck")
- +end
- +
- +-- And a bit of random junk.
- +for _ = 1, 3 do
- + des.object()
- +end
- +for _ = 1, 7 do
- + des.trap()
- +end
- +
- +-- With so many trees, having every single one bear fruit seems excessive.
- +selection.negate():filter_mapchar("T"):iterate(function(x, y)
- + des.feature({type = "tree", coord = {x, y},
- + looted = percent(90), swarm = percent(80)})
- +end)
- diff --git c/dat/Inf-loca.lua i/dat/Inf-loca.lua
- new file mode 100644
- index 000000000..5ad6457bd
- --- /dev/null
- +++ i/dat/Inf-loca.lua
- @@ -0,0 +1,101 @@
- +-- The "locate" level for the quest.
- +
- +-- This is the edge of the Howling Forest.
- +-- Somewhere in here the Paladin awaits you.
- +
- +des.level_flags("mazelevel", "hardfloor", "noflipx")
- +des.level_init({style = "mines", fg = ".", bg = "T",
- + smoothed = true, joined = true, lit = 0})
- +des.map({coord = {50, 00}, map =
- +-- 1 2
- +--2345678901234567890123456789
- +[[
- +xxxx.| ---- 0
- +xxx..-- |..| 1
- +x.....--- |..| 2
- +...}}...| -+-- 3
- +...}}}..-- # 4
- +..}}}....| # 5
- +...}}....| --S- 6
- +.........-- |..| 7
- +..........-- |..| 8
- +...........| |..+#### 9
- +...........+#####+..| # 0
- +...........| |..| # 1
- +...........| ---- # 2
- +..........-- # 3
- +.........-- # 4
- +.........| # 5
- +........-| --+-- 6
- +.........| |...| 7
- +x......--- |...| 8
- +xxx.---- ----- 9
- +xxxx| 0
- +]]})
- +des.non_diggable(selection.area(05, 00, 29, 20))
- +
- +-- Upstairs to (rest of) the underground complex.
- +des.region({region = {23, 17, 25, 18}, prefilled = true, contents = function()
- + des.monster("k")
- +end});
- +des.stair("up", 24, 18)
- +des.door("random", 24, 16)
- +
- +-- The last room before the Forest!
- +des.door("random", 20, 09)
- +des.region({region = {18, 07, 19, 11}, prefilled = true, contents = function()
- + des.monster("h")
- +end});
- +des.door("random", 17, 10)
- +des.door("random", 11, 10)
- +
- +-- An ogre guards some treasure.
- +des.door("locked", 19, 03)
- +des.region({region = {19, 01, 20, 02}});
- +des.monster("O", 19, 02)
- +des.object("chest", 19, 01)
- +des.object("chest", 20, 01)
- +
- +-- The lake.
- +des.monster("piranha", 03, 03)
- +des.monster("piranha", 04, 04)
- +des.monster("piranha", 04, 05)
- +
- +-- The forest is spreading.
- +des.replace_terrain({region = {00, 00, 10, 20}, fromterrain = ".",
- + toterrain = "T", chance = 5});
- +
- +des.map("x") -- hack to switch to global coords
- +
- +-- The forest's edge.
- +des.levregion({type = "stair-down", region = {00, 00, 39, 20}})
- +local forest = selection.area(00, 00, 60, 20):filter_mapchar(".")
- +for _ = 1, 3 do
- + des.monster("werewolf", forest:rndcoord(1))
- +end
- +for _ = 1, d(4, 4) do
- + des.monster("d", forest:rndcoord(1))
- +end
- +for _ = 1, 2 do
- + des.monster("u", forest:rndcoord(1))
- +end
- +if percent(65) then
- + des.monster("forest centaur", forest:rndcoord(1))
- +end
- +if percent(40) then
- + des.monster("woodchuck", forest:rndcoord())
- +end
- +
- +-- Some traps and a little loot.
- +for _ = 1, 4 do
- + des.object()
- +end
- +for _ = 1, 6 do
- + des.trap()
- +end
- +
- +-- With so many trees, having every single one bear fruit seems excessive.
- +selection.area(00, 00, 60, 20):filter_mapchar("T"):iterate(function(x, y)
- + des.feature({type = "tree", coord = {x, y},
- + looted = percent(90), swarm = percent(80)})
- +end)
- diff --git c/dat/Inf-strt.lua i/dat/Inf-strt.lua
- new file mode 100644
- index 000000000..d0f834163
- --- /dev/null
- +++ i/dat/Inf-strt.lua
- @@ -0,0 +1,107 @@
- +-- The "start" level for the quest.
- +
- +-- Here you meet your class leader, the preacher of Moloch,
- +-- and receive an invitation to a duel with the Paladin.
- +
- +des.level_flags("mazelevel", "noteleport", "hardfloor", "noflipx")
- +des.level_init({style = "solidfill", fg = " "});
- +
- +des.map({halign = "right", valign = "center", map =
- +-- 1 2 3 4 5 6
- +--1234567890123456789012345678901234567890123456789012345678901
- +[[
- +0 |.........................
- +1 |.........................
- +2 ----- --........................
- +3 ---- ---...----- --........................
- +4 |..| --.........| |.........................
- +5 |..| |..........| --.........................
- +6 -+-- ---..........---- |..........................
- +7 # ---...............| --.........................
- +8 # |.................--- |.........................
- +9 ---S- ---...................| |-........................
- +0 |...| |.....................+####S.........................
- +1 |...+###+.....................| |.........................
- +2 |...| |....................-- |.........................
- +3 ----- ----.................| --.........................
- +4 |.................| |..........................
- +5 ---- ##S...............--- --..........................
- +6 |..| # ---............-- |...........................
- +7 |..+## |........----- --..........................
- +8 |..| ---------- |..........................
- +9 |..| |-.........................
- +0 ---- |..........................
- +]]})
- +des.non_diggable(selection.area(00, 00, 37, 20))
- +
- +-- You arrive at a sparsely wooded cliffside.
- +des.replace_terrain({region = {35, 00, 61, 20}, fromterrain = ".",
- + toterrain = "T", chance = 1});
- +des.levregion({type = "branch", region = {38, 00, 61, 20}})
- +local outside = selection.area(35, 00, 61, 20):filter_mapchar(".")
- +outside:set(37, 10, 0) -- see dart trap below
- +for _ = 1, d(3, 4) do
- + des.monster("d", outside:rndcoord(1))
- +end
- +if percent(20) then
- + des.monster("black unicorn", outside:rndcoord(1))
- +end
- +for _ = 1, 3 do
- + des.trap({coord = {outside:rndcoord(1)}})
- +end
- +
- +-- The Hidden Temple is behind a secret door.
- +-- The altar is coaligned, but haunted,
- +-- presumably having been forcibly converted in the past.
- +des.trap("dart", 37, 10)
- +des.door("locked", 31, 10)
- +des.region({x1 = 20, y1 = 10, irregular = true,
- + lit = 1, type = "temple"})
- +des.altar({coord = {20, 10}, align="coaligned", type="altar"})
- +des.monster("preacher of Moloch", 20, 10)
- +for _, coord in pairs({{20, 07}, {23, 08}, {24, 10}, {23, 12},
- + {20, 13}, {17, 12}, {16, 10}, {17, 08}}) do
- + des.monster("cultist", coord)
- +end
- +
- +-- Some "decorations".
- +local around_altar = selection.ellipse(20, 10, 4, 3, 1)
- +for _ = 1, 3 do
- + des.object({id = "corpse", montype = "elf",
- + coord = {around_altar:rndcoord(1)}})
- +end
- +for _ = 1, 2 do
- + des.object({id = "corpse", montype = "human",
- + coord = {around_altar:rndcoord(1)}})
- +end
- +local statues = {{20, 04}, {24, 05}, {27, 08}, {28, 13},
- + {25, 15}, {19, 16}, {14, 14}, {13, 09}}
- +shuffle(statues)
- +for idx, mon in ipairs({"horned devil", "barbed devil", "marilith",
- + "vrock", "hezrou", "bone devil", "ice devil",
- + "pit fiend"}) do
- + des.object({id = "statue", montype = mon,
- + coord = statues[idx], contents = false})
- +end
- +
- +-- Entrance to the underground complex leading to the Howling Forest.
- +des.door("closed", 09, 11)
- +des.door("closed", 05, 11)
- +des.region(selection.area(02, 10, 04, 12), "lit")
- +des.stair("down", 03, 11)
- +
- +-- Unholy water supply.
- +des.door("locked", 04, 06)
- +des.region(selection.area(04, 04, 05, 05), "lit")
- +for x = 04, 05 do
- + des.object({class = "!", id = "water", buc = "cursed",
- + quantity = d(2), coord = {x, 04}})
- +end
- +
- +-- A small cache of valuables.
- +des.door("locked", 08, 17)
- +des.region(selection.area(06, 16, 07, 19), "lit")
- +des.object({coord = {06, 16}})
- +des.object({coord = {06, 17}})
- +des.object("axe", 06, 18)
- +des.object({coord = {06, 19}})
- diff --git c/dat/astral.lua i/dat/astral.lua
- index 5a3a70286..0952eebfa 100644
- --- c/dat/astral.lua
- +++ i/dat/astral.lua
- @@ -8,7 +8,12 @@ des.level_init({ style = "solidfill", fg = " " });
- des.level_flags("mazelevel", "noteleport", "hardfloor", "nommap", "shortsighted", "solidify")
- des.message("You arrive on the Astral Plane!")
- -des.message("Here the High Temple of %d is located.")
- +if u.role == "Infidel" then
- + -- the temple of Moloch isn't here!
- + des.message("Here the High Temples of the heaven are located.")
- +else
- + des.message("Here the High Temple of %d is located.")
- +end
- des.message("You sense alarm, hostility, and excitement in the air!")
- des.map([[
- ---------------
- @@ -33,6 +38,15 @@ des.map([[
- -----------------
- ]]);
- +-- For Infidels, the minions of Moloch are replaced by minions
- +-- of a random aligned god; otherwise this level would be too easy
- +local enemy
- +if u.role == "Infidel" then
- + enemy = "noncoaligned"
- +else
- + enemy = "noalign"
- +end
- +
- -- chance to alter above map and turn the wings of the bottom-center into
- -- a pair of big (5x15) rooms
- for i=1,2 do
- @@ -59,7 +73,7 @@ for i=1,2 do
- end
- -- extra monsters; was [6 + 3d4] when both wings were opened up at once
- for i=1,3 + math.random(2 - 1,2*3) do
- - des.monster({ id="Angel", coord = { hall:rndcoord(1) }, align="noalign", peaceful=0 })
- + des.monster({ id="Angel", coord = { hall:rndcoord(1) }, align=enemy, peaceful=0 })
- if percent(50) then
- des.monster({ coord = { hall:rndcoord(1) }, peaceful=0 })
- end
- @@ -104,28 +118,28 @@ des.non_diggable(selection.area(00,00,74,19))
- des.non_passwall(selection.area(00,00,74,19))
- -- Moloch's horde
- -- West round room
- -des.monster({ id = "aligned priest",x=18,y=09,align="noalign", peaceful=0 })
- -des.monster({ id = "aligned priest",x=19,y=08,align="noalign", peaceful=0 })
- -des.monster({ id = "aligned priest",x=19,y=09,align="noalign", peaceful=0 })
- -des.monster({ id = "aligned priest",x=19,y=10,align="noalign", peaceful=0 })
- -des.monster({ id = "Angel",x=20,y=09,align="noalign", peaceful=0 })
- -des.monster({ id = "Angel",x=20,y=10,align="noalign", peaceful=0 })
- +des.monster({ id = "aligned priest",x=18,y=09,align=enemy, peaceful=0 })
- +des.monster({ id = "aligned priest",x=19,y=08,align=enemy, peaceful=0 })
- +des.monster({ id = "aligned priest",x=19,y=09,align=enemy, peaceful=0 })
- +des.monster({ id = "aligned priest",x=19,y=10,align=enemy, peaceful=0 })
- +des.monster({ id = "Angel",x=20,y=09,align=enemy, peaceful=0 })
- +des.monster({ id = "Angel",x=20,y=10,align=enemy, peaceful=0 })
- des.monster({ id = "Pestilence", coord = { place:rndcoord(1) }, peaceful=0 })
- -- South-central round room
- -des.monster({ id = "aligned priest",x=36,y=12,align="noalign", peaceful=0 })
- -des.monster({ id = "aligned priest",x=37,y=12,align="noalign", peaceful=0 })
- -des.monster({ id = "aligned priest",x=38,y=12,align="noalign", peaceful=0 })
- -des.monster({ id = "aligned priest",x=36,y=13,align="noalign", peaceful=0 })
- -des.monster({ id = "Angel",x=38,y=13,align="noalign", peaceful=0 })
- -des.monster({ id = "Angel",x=37,y=13,align="noalign", peaceful=0 })
- +des.monster({ id = "aligned priest",x=36,y=12,align=enemy, peaceful=0 })
- +des.monster({ id = "aligned priest",x=37,y=12,align=enemy, peaceful=0 })
- +des.monster({ id = "aligned priest",x=38,y=12,align=enemy, peaceful=0 })
- +des.monster({ id = "aligned priest",x=36,y=13,align=enemy, peaceful=0 })
- +des.monster({ id = "Angel",x=38,y=13,align=enemy, peaceful=0 })
- +des.monster({ id = "Angel",x=37,y=13,align=enemy, peaceful=0 })
- des.monster({ id = "Death", coord = { place:rndcoord(1) }, peaceful=0 })
- -- East round room
- -des.monster({ id = "aligned priest",x=56,y=09,align="noalign", peaceful=0 })
- -des.monster({ id = "aligned priest",x=55,y=08,align="noalign", peaceful=0 })
- -des.monster({ id = "aligned priest",x=55,y=09,align="noalign", peaceful=0 })
- -des.monster({ id = "aligned priest",x=55,y=10,align="noalign", peaceful=0 })
- -des.monster({ id = "Angel",x=54,y=09,align="noalign", peaceful=0 })
- -des.monster({ id = "Angel",x=54,y=10,align="noalign", peaceful=0 })
- +des.monster({ id = "aligned priest",x=56,y=09,align=enemy, peaceful=0 })
- +des.monster({ id = "aligned priest",x=55,y=08,align=enemy, peaceful=0 })
- +des.monster({ id = "aligned priest",x=55,y=09,align=enemy, peaceful=0 })
- +des.monster({ id = "aligned priest",x=55,y=10,align=enemy, peaceful=0 })
- +des.monster({ id = "Angel",x=54,y=09,align=enemy, peaceful=0 })
- +des.monster({ id = "Angel",x=54,y=10,align=enemy, peaceful=0 })
- des.monster({ id = "Famine", coord = { place:rndcoord(1) }, peaceful=0 })
- --
- -- The aligned horde
- diff --git c/dat/data.base i/dat/data.base
- index b4ada5b50..39f883f71 100644
- --- c/dat/data.base
- +++ i/dat/data.base
- @@ -71,6 +71,16 @@ agate*
- solution is slowly deposited into cavities and veins in older
- rock.
- [ The Columbia Encyclopedia, Sixth Edition ]
- +agent
- +agent of *
- + It was part of his profession to kill people. He had never liked
- + doing it and when he had to kill he did it as well as he knew how
- + and forgot about it. As a secret agent who held the rare double-O
- + prefix -- the licence to kill in the Secret Service -- it was his
- + duty to be as cool about death as a surgeon. If it happened,
- + it happened. Regret was unprofessional -- worse, it was
- + death-watch beetle in the soul.
- + [ Goldfinger, by Ian Fleming ]
- aleax
- Said to be a doppelganger sent to inflict divine punishment
- for alignment violations.
- @@ -412,6 +422,8 @@ banshee
- [ Brewer's Concise Dictionary of Phrase and Fable ]
- barbarian
- * barbarian
- +champion
- +champion of *
- They dressed alike -- in buckskin boots, leathern breeks and
- deerskin shirts, with broad girdles that held axes and short
- swords; and they were all gaunt and scarred and hard-eyed;
- @@ -2455,6 +2467,11 @@ idefix
- strong views on the environment (he howls whenever he sees an
- uprooted tree).
- [ Wikipedia, the free encyclopedia ]
- +*idol of moloch
- + One of the rare few artifacts able to exert Moloch's influence
- + aboveground. By drawing on Moloch's power, the faithful are able
- + to summon demons, defile shrines, and replenish their magical
- + energy. The Idol also protects its holder from hostile magics.
- # takes "imp or minor demon" when specifying 'i'
- imp
- imp or minor demon
- @@ -2477,6 +2494,23 @@ succubus
- same demon, one who lies with a human for its own purposes,
- usually to the detriment of the mortals who are unwise in
- their dealings with them.
- +infidel
- +* infidel
- +cultist
- +malefic*
- + We must especially observe that this heresy, witchcraft, not only
- + differs from all other heresy in this, that not merely by a tacit
- + compact, but by a compact which is exactly defined and expressed
- + it blasphemes the Creator and endeavours to the utmost to profane Him
- + and to harm His creatures, for all other simple heresies have made
- + no open compact with the devil, no compact, that is, either tacit
- + or exactly expressed, although their errors and misbelief are directly
- + to be attributed to the Father of errors and lies. Moreover,
- + maleficium (witchcraft) differs from all other harmful and mysterious
- + arts in this point, that of all superstition it is essentially
- + the vilest, the most evil and the worst, wherefore it derives its name
- + from doing evil, and from blaspheming the true faith.
- + [ The Malleus Maleficarum, translated by Montague Summers ]
- *insect
- *insects
- A minute invertebrate animal; one of the class _Insecta_.
- @@ -3870,6 +3904,17 @@ page
- of gentle parentage attending a royal or princely personage.
- [ Webster's Comprehensive International Dictionary
- of the English Language ]
- +*paladin
- +*paladin of *
- + The paladin is a noble and heroic warrior, the symbol of all
- + that is right and true in the world. As such, he has high ideals
- + that he must maintain at all times. Throughout legend and history
- + there are many heroes who could be called paladins: Roland and
- + the 12 Peers of Charlemagne, Sir Lancelot, Sir Gawain, and Sir Galahad
- + are all examples of the class. However, many brave and
- + heroic soldiers have tried and failed to live up to the ideals of
- + the paladin. It is not an easy task!
- + [ AD&D Player's Handbook, 2nd Edition ]
- *pall
- _Pallium._ The Roman name for a square woollen cloak worn
- by men in ancient Greece, especially by philosophers and
- @@ -4607,6 +4652,14 @@ scroll *
- I read these words, and read again, and tried
- My eyes against the heavens, and read again.
- [ Endymion, by John Keats ]
- +secespita
- + The secespita is a long iron sacrificial knife, made of brass
- + and copper from Cyprus, with a solid and rounded ivory handle,
- + which is secured to the hilt by a ring of silver or gold.
- + The flamens and their wives, the flaminicae, who were priests
- + and priestesses of the Ancient Rome, the virgins and the pontiffs
- + made use of it for sacrifices.
- + [ Wikipedia, the free encyclopedia ]
- set
- seth
- The ancient Egyptian god of chaos (Set), the embodiment of
- @@ -4856,6 +4909,12 @@ javelin
- don't I?"
- "Why, yes, of course," said Wilbur.
- [ Charlotte's Web, by E.B. White ]
- +splanchomanc*
- +anthropomanc*
- + Anthropomancy is a method of divination by the entrails of dead
- + or dying men or women, often virgin female children, through
- + sacrifice. This practice was sometimes also called splanchomancy.
- + [ Wikipedia, the free encyclopedia ]
- *spore
- *sphere
- The attack by those who want to die -- this is the attack
- @@ -5000,6 +5059,20 @@ susano*o
- [ Encyclopedia of Gods, by Michael Jordan ]
- tanko
- Samurai plate armor of the Yamato period (AD 300 - 710).
- +templar
- +templar of *
- + Above all things, whosoever would be a knight of Christ,
- + choosing such holy orders, you in your profession of faith
- + must unite pure diligence and firm perseverence, which is so worthy
- + and so holy, and is known to be so noble, that if it is preserved
- + untainted for ever, you will deserve to keep company with the martyrs
- + who gave their souls for Jesus Christ. In this religious order
- + has flourished and is revitalised the order of knighthood. [...]
- + God works well with us and our saviour Jesus Christ; He has sent
- + his friends from the Holy City of Jerusalem to the marches of France
- + and Burgundy, who for our salvation and the spread of the true faith
- + do not cease to offer their souls to God, a welcome sacrifice.
- + [ Rule of the Knights Templar, translated by J. M. Upton-Ward ]
- tengu
- The tengu was the most troublesome creature of Japanese
- legend. Part bird and part man, with red beak for a nose
- diff --git c/dat/quest.lua i/dat/quest.lua
- index d23208b36..54a8e06f8 100644
- --- c/dat/quest.lua
- +++ i/dat/quest.lua
- @@ -1073,6 +1073,382 @@ to be %Ra to know that %n is on the verge of victory.]],
- absence, yes? How fare you upon your quest for the Amulet?"]],
- },
- },
- + Inf = {
- + legacy = {
- + -- Note: %lh is just to randomize the pronoun,
- + -- the unlucky hero was not actually your leader
- + output = "menu",
- + text = [[
- +It is written in the Book of %d:
- +
- + After the Creation, the mighty %G %d rebelled
- + against the tyranny of Marduk the Creator. %d
- + defeated Marduk and obtained from him the most powerful
- + of all the artifacts of the gods, the Amulet of Yendor,
- + and %dH hid it in %dJ dark domain of Gehennom, the
- + Under World, where %dH now gathers power and prepares for
- + the final confrontation.
- +
- +Many fools were sent by the gods of the heaven after the Amulet,
- +only to die in the underground mazes. By pure luck, one of them
- +has succeeded; thankfully, %lh was ambushed on the way back
- +and the Amulet was recovered by %ds Cult.
- +
- +You, a newly trained %r, have been heralded
- +from birth as the instrument of %d. You are destined
- +to return the Amulet to its rightful owner, or die in the
- +attempt. Your hour of destiny has come. For the sake
- +of us all: Go bravely with %d!]],
- + synopsis = "%dC has chosen you "
- + .. "to return the Amulet of Yendor to %dI."
- + },
- + firsttime = {
- + output = "text",
- + text = [[
- +You arrive at the mouth of a cave that hosts %H. This is
- +the place where %l taught you the glory of %d,
- +where you studied black arts with your fellow %gp,
- +and where you were chosen for your unholy mission.
- +
- +You did not expect to be back so soon.
- +Why has %l called you?
- +
- +It is nighttime, and the moonlight is scattered by clouds. You make sure
- +to stay in the shadows, for even here you are likely to be ambushed
- +for your precious cargo. The surface is never safe for you now.]],
- + synopsis = "You arrive near %H. "
- + .. "Talk to %l to find out why %lh called you."
- + },
- + nexttime = {
- + text = "Once again, you near %H."
- + },
- + othertime = {
- + text = "Again you face %H. "
- + .. "%dS presence feels fainter than usual. "
- + .. "You wonder if you'll be allowed to return here yet again."
- + },
- + guardtalk_before = {
- + '"Agents of the false gods are everywhere! '
- + .. 'I got my purse stolen!"',
- + '"I was once biten by a werewolf in %i. '
- + .. 'It\'s not nearly as glamorous as the books make it sound."',
- + '"I just noticed a pile of skulls in that corner. '
- + .. '%pC... are we the baddies?"',
- + -- Note: this will obviously need to be rewritten
- + -- if the Paladin's gender changes
- + '"%nC of %D acts all high and mighty, '
- + .. 'but %nh\'s still just a woman."',
- + '"We were THIS close to recovering %o by ourselves! '
- + .. 'The church of %D just got lucky... and a better funding."'
- + },
- + leader_first = {
- + output = "text",
- + text = [[
- +"My %S, welcome back. You must be wondering why I have interrupted
- +your mission! As it happens, another quest has arisen that
- +only you can undertake. Let me see if you're up to the challenge."]],
- + synopsis = "I have another important mission for you, "
- + .. "if you're ready."
- + },
- + leader_next = {
- + text = '"Welcome again, %p. I hope you\'re ready this time."'
- + },
- + leader_other = {
- + text = '"Again you return, %p. %nC won\'t wait forever! '
- + .. 'Are you ready now?"'
- + },
- + leader_last = {
- + output = "text",
- + text = [[
- +"I am most disappointed, %p. The fire of %d no longer
- +burns in your breast! How could you abandon your faith so easily?
- +You're no longer our %s. Begone and never return! We will
- +find someone else to finish your quest."]],
- + synopsis = "You're exiled from the Cult for your lack of faith."
- + },
- + badlevel = {
- + output = "text",
- + text = [[
- +"Alas, %p, you're still weak. I cannot in good faith send you
- +against %n of %D now; %nh'll squash you
- +like an insect! You must train and attain more skill;
- +come back when you're a proper %R."]],
- + synopsis = "%rA has no chance against %n. "
- + .. "Come back when you are %Ra."
- + },
- + badalign = {
- + output = "text",
- + text = [[
- +"No, that will not do. The fire of %d within you is too weak.
- +Only with the support of our faith can you hope to prevail!
- +Go back to %Z and perform more sacrifices to
- +honor %d. When your devotion is strong again, you may return."]],
- + synopsis = "Your faith is too weak. "
- + .. "Return when you're sufficently %a."
- + },
- + assignquest = {
- + output = "text",
- + text = [[
- +"Yes, my %S. You are now as ready as you'll ever be. Listen
- +carefully as I explain the current situation and your new quest.
- +
- +"As you must know, we have long searched for the lost %ot,
- +for it is vitally important both to our faith and the ultimate plan
- +of our %GC %d. But the church of %D
- +has learned of our efforts and sponsored a team of professional
- +archeologists to find %O first. Unfortunately, it seems
- +they were succesful.
- +
- +"A week ago, the Cult has received a message from a prominent %nt
- +of %D. %nH claims that %O is in
- +%nj posession, and challenges you to a `honorable duel' for the artifact.
- +%nC was adamant in dueling you specifically, so it's
- +clearly a ploy to obtain the Amulet of Yendor that was entrusted to you.
- +
- +"We have no choice but to accept, as without %O %ds plan
- +cannot be completed. %nC of %D
- +waits for you in the ancient ruins amidst %i, which
- +can be reached through the underground complex below our temple.
- +You must travel there and retrieve %o by any means.
- +
- +"%dC be your strength, %p. Go with %dJ blessing."]],
- + synopsis = "%nC of %D found %o and challenged you to a duel. "
- + .. "Kill %ni by any means."
- + },
- + encourage = {
- + '"As long as the fire of %d burns within your chest, '
- + .. 'you will prevail."',
- + '"%nC of %D is a capable spellcaster as well as a powerful '
- + .. 'warrior. Approach %ni with care and think before acting."',
- + -- This was supposed to hint to her being immune to scare monster.
- + -- Probably no longer relevant for 3.7?
- + '"%nC of %Ds faith is very strong, '
- + .. 'and as such %nh knows no fear."',
- + '"%iC is plagued by werewolves. '
- + .. 'If you can wield silver weapons, do so."',
- + '"If you know how to evoke fireballs, '
- + .. 'it will be your greatest aid. %nC may be well-armored, '
- + .. 'but that won\'t protect %ni from burning alive!"',
- + '"%oC protects %oi holder from many harmful magics. '
- + .. 'Unfortunately, %oi current holder is %n. '
- + .. 'If you can somehow steal %oh, it will aid you greatly."',
- + '"When you obtain %o, you may call for %ds aid at any time. '
- + .. 'Even at the surface, you will be answered."',
- + '"Watch where you aim your wands: '
- + .. '%n of %D has a magical reflective shield."',
- + '"The church of %D wouldn\'t risk %O if they weren\'t sure '
- + .. '%n can defeat you in a fair fight. So don\'t fight fair!"',
- + '"%nC of %D is immune to mundane poisons, '
- + .. 'but a paralyzing venom will work wonders on %ni."'
- + },
- + locate_first = {
- + output = "text",
- + text = [[
- +The gloom and stillness of the underground caves gives way to moonlight,
- +hooting of owls, and an occasional blood-chilling howl.
- +
- +%iC lies ahead. Somewhere in these woods
- +%n of %D awaits you.]],
- + synopsis = "You have reached %i. %nC is somewhere ahead."
- + },
- + locate_next = {
- + text = "Again, you stand at the edge of %i."
- + },
- + goal_first = {
- + output = "text",
- + text = [[
- +You've reached a clearing in the forest. In the distance, you can %x
- +the ancient ruins where %n of %D
- +has challenged you to the duel.
- +
- +It's still nighttime. Hopefully you can sneak up unnoticed, but what then?]],
- + synopsis = "You have found the dueling field. "
- + .. "You must proceed carefully."
- + },
- + goal_next = {
- + text = "Once again, you approach the ancient ruins."
- + },
- + nemesis_first = {
- + output = "text",
- + text = [[
- +"Ah, %p. You've answered my challenge, after all.
- +It seems that your vile cult has at least some recognition of honor.
- +
- +"But no matter. Your malignant existence is an affront to
- +%D, and it is by my hand that it will end today.
- +
- +"And after I defeat you and take the Amulet from your undeserving grasp,
- +I will destroy %o once and for all, and your cult
- +shall soon follow!
- +
- +"Prepare yourself, villian, for your final judgement!"]],
- + synopsis = "I shall defeat you and then destroy %o and your cult."
- + },
- + nemesis_next = {
- + text = '"Again you return, %p. '
- + .. 'Did you think running away could help you somehow?"'
- + },
- + nemesis_other = {
- + text = '"Surely by now you understand that you '
- + .. 'haven\'t got a chance. Accept your fate and die, coward!"'
- + },
- + nemesis_wantsit = {
- + text = '"Wha-- how? Get back here, thief! We\'re not done yet!"'
- + },
- + discourage = {
- + '"%dC is a coward who can but hide underground. '
- + .. 'Aren\'t you ashamed to be %dj slave?"',
- + '"You\'re a disgrace both as a combatant and as %ra. '
- + .. 'Why do I even bother?"',
- + '"I hope you like fire, because that\'s '
- + .. 'how you\'re going to spend the rest of eternity."',
- + '"Ready to give up, %p? You know your %G can\'t help you here."',
- + '"The judgement of %D is upon you now!"',
- + '"When I claim the Amulet of Yendor for %D, '
- + .. '%d will become but a footnote in a history book."',
- + '"Did %l really think %ra could even reach the bottom '
- + .. 'of Gehennom? The Amulet will be much safer with me."',
- + '"None of your fellow %gp will survive my wrath. '
- + .. 'This I promise."',
- + '"For your sins, you will die today!"',
- + '"You will never have %o, and soon, you will lose your life."'
- + },
- + gotit = {
- + output = "text",
- + text = [[
- +As you pick up %o, you feel the presence of %d clearer
- +than ever. The power of %d encompasses your soul, and you instantly
- +understand why your Cult was searching for %O, and why
- +%n of %D wanted to destroy %oi.
- +
- +You must return to %l at once. With %O,
- +the Cult will be more powerful than ever!]],
- + synopsis = "You feel the power of %d as you touch %O; "
- + .. "return to %l with %oi."
- + },
- + killed_nemesis = {
- + output = "text",
- + text = [[
- +%nC falls to %ni knees. With %ni last breath, %nh whispers:
- +
- + "Don't... think you've won just yet. I am but one servant of
- + %D out of many, and other gods are...
- + after you as well. You will... never reach %d alive.
- + The justice will..."
- +
- +A ray of bright light pierces the dawning sky, and %ns body is gone.]],
- + synopsis = "%nC of %D dies, but others are after the Amulet."
- + },
- + offeredit = {
- + output = "text",
- + text = [[
- +"%pC, you are victorous! Well done. %dC is pleased
- +by your success. All of us are proud of you as well.
- +
- +"You must now continue on your original mission. But along with
- +the Amulet, you must also deliver %O to %ds Sanctum.
- +Such is %dJ will, and such is %dJ plan.
- +
- +"When you reach the high altar, the final phase of the plan will be
- +revealed to you. Remember to keep %o on you
- +at all times! If %oh's lost, all our preparations will be ruined."]],
- + synopsis = "You must bring %O to %d along with the Amulet."
- + },
- + quest_complete_no_bell = {
- + text = '"The silver bell which was carried by %n of %D '
- + .. 'will be essential for entering %ds Sanctum."',
- + },
- + offeredit2 = {
- + output = "text",
- + text = [[
- +"You're %Os keeper now, but %d alone is %oj owner.
- +You must bring %oh to %dI along with the Amulet of Yendor.
- +%Z await your return through
- +the magic portal that brought you here."]],
- + synopsis = "%OC is your responsibility now. "
- + .. "Bring it to %d along with the Amulet."
- + },
- + guardtalk_after = {
- + '"Agents of the false gods are everywhere! '
- + .. 'I got my purse stolen!"',
- + '"Glory to %d, %s! Let\'s drink elf blood together!"',
- + '"I just noticed a pile of skulls in that corner. '
- + .. '%pC... are we the baddies?"',
- + '"Have you made sure to properly desecrate %ns corpse? '
- + .. 'Appearances are important!"',
- + '"%oC is ours! Take that, professional archeology!"'
- + },
- + posthanks = {
- + text = '"Welcome back, my %S. '
- + .. 'Have you found your way to Sanctum yet?"'
- + },
- + moloch_missing = {
- + output = "text",
- + text = [[
- +Very good, My pawn. Thou hast finally reached here. But where is
- +Mine %Ot that was entrusted to thee? Thou wast told to bring %oi here.
- +For thy sake, I hope thou hast not lost it!
- +
- +Return with %O and invoke My name here, and do not falter.]],
- + synopsis = "Fetch %o and invoke %oi on My high altar."
- + },
- + moloch = {
- + output = "text",
- + text = [[
- +"My pawn, thou hast done well. Now listen carefully, for the time
- +for thy final test has come.
- +
- +"A deity who wields the Amulet of Yendor can claim dominion over
- +the gods of the heaven, the position that is Mine by right. But I am
- +no longer welcome among them, so I must take My place by force.
- +
- +"%OC that thou carriest is a vessel for My power, and now I shall
- +make %oi the vessel for the Amulet's true power as well. Carrying %oi
- +will allow thee to journey to the Astral Plane in the heaven. There,
- +the false gods reside.
- +
- +"Find the weakest among them and invoke Mine %Ot in their temple.
- +I will take their place, and all will bow to My rule, as they should.
- +
- +"Which deity is the weakest, thou must find out thyself. Perhaps My
- +servants can advise you."]],
- + synopsis = "Travel to Astral Plane "
- + .. "and convert one of the high altars."
- + },
- + -- Note: in the next two messages, %a and %d refer
- + -- to one of the aligned gods at random.
- + -- Consequently, "Moloch" is typed directly,
- + -- which may break hypothetical aligned Infidels.
- + high_priest = {
- + output = "text",
- + text = [[
- +"My %S, we all pray for thy success on thy quest. The false gods
- +posess power beyond any mere mortal, and even with Moloch's help
- +overthrowing one of them will be a challenge. Chose thine opponent wisely.
- +
- +"I shall offer thee an advice. Last night, I had a vision. There was
- +a great battle in the heaven; the forces of our Lord Moloch were besieging
- +a fortress of %d. But %dj %a minions held their
- +ground for thirty days and nights and, sadly, the fortress was not taken.
- +
- +"The meaning here is clear: when in thy mission thou reachest the heaven,
- +challenging %d will likely be futile. Keep this in mind."]],
- + synopsis = "You should avoid invoking %o on the %a high altar."
- + },
- + delivered_amulet = {
- + output = "text",
- + text = [[
- +"Congratulations, %p! We are closer than ever to the ultimate victory.
- +
- +"As Moloch has told you, you must now bring %O to one of the high altars
- +on the Astral Plane. It's hard to say which deity will be more susceptible
- +to Moloch's power, but in all my years fending off non-believers,
- +I have noticed that %ap are unusually resistant to my clerical magic.
- +
- +"Perhaps that extends to %d %diself, as well."]],
- + synopsis = "You should avoid invoking %o on the %a high altar."
- + }
- + },
- Kni = {
- assignquest = {
- synopsis = "[Pass through %i to reach %n. Destroy %ni and return with %o.]",
- diff --git c/dat/sanctum.lua i/dat/sanctum.lua
- index 45aa0b361..e8b704889 100644
- --- c/dat/sanctum.lua
- +++ i/dat/sanctum.lua
- @@ -105,22 +105,29 @@ des.object("?")
- des.object("?")
- des.object("?")
- des.object("?")
- +-- Make Sanctum monsters more friendly to Infidels
- +local to_infidels
- +if u.role == "Infidel" then
- + to_infidels = 1
- +else
- + to_infidels = 0
- +end
- -- Some monsters.
- -des.monster({ id = "horned devil", x=14,y=12,peaceful=0 })
- -des.monster({ id = "barbed devil", x=18,y=08,peaceful=0 })
- -des.monster({ id = "erinys", x=10,y=04,peaceful=0 })
- -des.monster({ id = "marilith", x=07,y=09,peaceful=0 })
- -des.monster({ id = "nalfeshnee", x=27,y=08,peaceful=0 })
- +des.monster({ id = "horned devil", x=14,y=12,peaceful=to_infidels })
- +des.monster({ id = "barbed devil", x=18,y=08,peaceful=to_infidels })
- +des.monster({ id = "erinys", x=10,y=04,peaceful=to_infidels })
- +des.monster({ id = "marilith", x=07,y=09,peaceful=to_infidels })
- +des.monster({ id = "nalfeshnee", x=27,y=08,peaceful=to_infidels })
- -- Moloch's horde
- -des.monster({ id = "aligned priest", x=20,y=03,align="noalign",peaceful=0 })
- -des.monster({ id = "aligned priest", x=15,y=04,align="noalign",peaceful=0 })
- -des.monster({ id = "aligned priest", x=11,y=05,align="noalign",peaceful=0 })
- -des.monster({ id = "aligned priest", x=11,y=07,align="noalign",peaceful=0 })
- -des.monster({ id = "aligned priest", x=11,y=09,align="noalign",peaceful=0 })
- -des.monster({ id = "aligned priest", x=11,y=12,align="noalign",peaceful=0 })
- -des.monster({ id = "aligned priest", x=15,y=13,align="noalign",peaceful=0 })
- -des.monster({ id = "aligned priest", x=17,y=13,align="noalign",peaceful=0 })
- -des.monster({ id = "aligned priest", x=21,y=13,align="noalign",peaceful=0 })
- +des.monster({ id = "aligned priest", x=20,y=03,align="noalign",peaceful=to_infidels })
- +des.monster({ id = "aligned priest", x=15,y=04,align="noalign",peaceful=to_infidels })
- +des.monster({ id = "aligned priest", x=11,y=05,align="noalign",peaceful=to_infidels })
- +des.monster({ id = "aligned priest", x=11,y=07,align="noalign",peaceful=to_infidels })
- +des.monster({ id = "aligned priest", x=11,y=09,align="noalign",peaceful=to_infidels })
- +des.monster({ id = "aligned priest", x=11,y=12,align="noalign",peaceful=to_infidels })
- +des.monster({ id = "aligned priest", x=15,y=13,align="noalign",peaceful=to_infidels })
- +des.monster({ id = "aligned priest", x=17,y=13,align="noalign",peaceful=to_infidels })
- +des.monster({ id = "aligned priest", x=21,y=13,align="noalign",peaceful=to_infidels })
- -- A few nasties
- des.monster("L")
- des.monster("L")
- diff --git c/dat/valley.lua i/dat/valley.lua
- index adcd4e80f..1741fb3e4 100644
- --- c/dat/valley.lua
- +++ i/dat/valley.lua
- @@ -77,6 +77,7 @@ des.non_diggable(selection.area(00,00,75,19))
- -- **LOTS** of dead bodies (all human).
- -- note: no priest(esse)s or monks - maybe Moloch has a *special*
- -- fate reserved for members of *those* classes.
- +-- Obviously, no Infidel corpses as well.
- --
- des.object({ id="corpse",montype="archeologist" })
- des.object({ id="corpse",montype="archeologist" })
- diff --git c/doc/Guidebook.mn i/doc/Guidebook.mn
- index b10e8ca25..9766bd92d 100644
- --- c/doc/Guidebook.mn
- +++ i/doc/Guidebook.mn
- @@ -132,6 +132,11 @@ and neutralize poisons; and with their instruments, they can divine a
- being's state of health or sickness. Their medical practice earns them
- quite reasonable amounts of money, with which they enter the dungeon.
- .pg
- +\fIInfidels\fP are cultists of the evil god Moloch. They are quite
- +proficient in black magics, but less so in the physical combat. As an
- +Infidel, your goal is not to retrieve the Amulet, but to return it to its
- +hiding place within Gehennom.
- +.pg
- \fIKnights\fP are distinguished from the common skirmisher by their
- devotion to the ideals of chivalry and by the surpassing excellence of
- their armor.
- diff --git c/doc/Guidebook.tex i/doc/Guidebook.tex
- index 937000f8f..7c1ad7777 100644
- --- c/doc/Guidebook.tex
- +++ i/doc/Guidebook.tex
- @@ -139,6 +139,12 @@ of health or sickness. Their medical practice earns them quite reasonable
- amounts of money, with which they enter the dungeon.
- %.pg
- %
- +\item[\bb{Infidels}]%
- +are cultists of the evil god Moloch. They are quite proficient in black
- +magics, but less so in the physical combat. As an Infidel, your goal is not
- +to retrieve the Amulet, but to return it to its hiding place within Gehennom.
- +%.pg
- +%
- \item[\bb{Knights}]%
- are distinguished from the common skirmisher by their
- devotion to the ideals of chivalry and by the surpassing excellence of
- diff --git c/include/artifact.h i/include/artifact.h
- index 4e5193f55..49fddb636 100644
- --- c/include/artifact.h
- +++ i/include/artifact.h
- @@ -66,7 +66,8 @@ enum invoke_prop_types {
- LEV_TELE,
- CREATE_PORTAL,
- ENLIGHTENING,
- - CREATE_AMMO
- + CREATE_AMMO,
- + CHANNEL
- };
- #endif /* ARTIFACT_H */
- diff --git c/include/artilist.h i/include/artilist.h
- index d7b8f250c..cac08f352 100644
- --- c/include/artilist.h
- +++ i/include/artilist.h
- @@ -29,6 +29,7 @@ static const char *artifact_names[] = {
- #define FIRE(a,b) {0,AD_FIRE,a,b}
- #define ELEC(a,b) {0,AD_ELEC,a,b} /* electrical shock */
- #define STUN(a,b) {0,AD_STUN,a,b} /* magical attack */
- +#define DREN(a,b) {0,AD_DREN,a,b} /* drains energy */
- /* clang-format on */
- static NEARDATA struct artifact artilist[] = {
- @@ -163,6 +164,12 @@ static NEARDATA struct artifact artilist[] = {
- PHYS(5, 0), DFNS(AD_BLND), NO_CARY, 0, A_LAWFUL, NON_PM, NON_PM, 1500L,
- NO_COLOR),
- + /* The energy drain only works if the artifact kills its victim.
- + * Also increases sacrifice value while wielded. */
- + A("Secespita", KNIFE, (SPFX_RESTR | SPFX_ATTK), 0, 0,
- + DREN(5, 1), NO_DFNS, NO_CARY, 0, A_CHAOTIC, PM_INFIDEL, NON_PM,
- + 1000L, NO_COLOR),
- +
- /*
- * The artifacts for the quest dungeon, all self-willed.
- */
- @@ -197,6 +204,13 @@ A("The Palantir of Westernesse", CRYSTAL_BALL,
- 0, 0, DRLI(0, 0), DRLI(0, 0), NO_CARY, HEALING, A_NEUTRAL, PM_HEALER,
- NON_PM, 5000L, NO_COLOR),
- + /* Also confers energy regeneration,
- + * but only to those in good standing with Moloch. */
- + A("The Idol of Moloch", FIGURINE,
- + (SPFX_NOGEN | SPFX_RESTR | SPFX_INTEL), SPFX_HSPDAM, 0,
- + NO_ATTK, NO_DFNS, CARY(AD_MAGM), CHANNEL, A_CHAOTIC, PM_INFIDEL, NON_PM,
- + 4000L, NO_COLOR),
- +
- A("The Magic Mirror of Merlin", MIRROR,
- (SPFX_NOGEN | SPFX_RESTR | SPFX_INTEL | SPFX_SPEAK), SPFX_ESP, 0,
- NO_ATTK, NO_DFNS, CARY(AD_MAGM), 0, A_LAWFUL, PM_KNIGHT, NON_PM, 1500L,
- diff --git c/include/context.h i/include/context.h
- index e2bd9b49f..7be6e65e9 100644
- --- c/include/context.h
- +++ i/include/context.h
- @@ -127,6 +127,9 @@ struct context_info {
- long seer_turn; /* when random clairvoyance will next kick in */
- long stethoscope_move; /* when a stethoscope was last used */
- short stethoscope_movement; /* to track multiple moves on same turn */
- + long next_moloch_offering; /* Moloch demands regular sacrifices */
- + char inf_aligns; /* random alignment permutation number for Infidels */
- + boolean coward; /* restrict Infidel Elbereth penalty to once per move */
- boolean travel; /* find way automatically to u.tx,u.ty */
- boolean travel1; /* first travel step */
- boolean forcefight;
- diff --git c/include/decl.h i/include/decl.h
- index c131b3735..f560c936b 100644
- --- c/include/decl.h
- +++ i/include/decl.h
- @@ -622,7 +622,7 @@ struct repo { /* repossession context */
- #define BP_ROLE 3
- #define NUM_BP 4
- -#define NUM_ROLES (13)
- +#define NUM_ROLES (14)
- struct role_filter {
- boolean roles[NUM_ROLES+1];
- short mask;
- @@ -842,6 +842,7 @@ struct instance_globals {
- /* starting equipment gets auto-worn at beginning of new game,
- and we don't want stealth or displacement feedback then */
- boolean initial_don; /* manipulated in set_wear() */
- + struct obj *last_worn_armor; /* hides some messages in check_wings() */
- /* dog.c */
- int petname_used; /* user preferred pet name has been used */
- @@ -1064,7 +1065,7 @@ struct instance_globals {
- /* values calculated when prayer starts, and used when completed */
- aligntyp p_aligntyp;
- int p_trouble;
- - int p_type; /* (-1)-3: (-1)=really naughty, 3=really good */
- + int p_type; /* (-3)-3: (-1)=really naughty, 3=really good */
- /* quest.c */
- struct q_score quest_status;
- diff --git c/include/extern.h i/include/extern.h
- index 3a7cdcf52..64a0a42a3 100644
- --- c/include/extern.h
- +++ i/include/extern.h
- @@ -49,6 +49,7 @@ E boolean FDECL(snuff_candle, (struct obj *));
- E boolean FDECL(snuff_lit, (struct obj *));
- E boolean FDECL(catch_lit, (struct obj *));
- E void FDECL(use_unicorn_horn, (struct obj **));
- +E void FDECL(use_figurine, (struct obj **));
- E boolean FDECL(tinnable, (struct obj *));
- E void NDECL(reset_trapset);
- E void FDECL(fig_transform, (ANY_P *, long));
- @@ -71,6 +72,7 @@ E boolean FDECL(confers_luck, (struct obj *));
- E boolean FDECL(arti_reflects, (struct obj *));
- E boolean FDECL(shade_glare, (struct obj *));
- E boolean FDECL(restrict_name, (struct obj *, const char *));
- +E boolean FDECL(attacks, (int, struct obj *));
- E boolean FDECL(defends, (int, struct obj *));
- E boolean FDECL(defends_when_carried, (int, struct obj *));
- E boolean FDECL(protects, (struct obj *, BOOLEAN_P));
- @@ -500,6 +502,7 @@ E void NDECL(cancel_don);
- E int FDECL(stop_donning, (struct obj *));
- E int NDECL(Armor_off);
- E int NDECL(Armor_gone);
- +E void FDECL(check_wings, (BOOLEAN_P));
- E int NDECL(Helmet_off);
- E int NDECL(Gloves_off);
- E int NDECL(Boots_on);
- @@ -515,7 +518,7 @@ E void FDECL(Blindf_on, (struct obj *));
- E void FDECL(Blindf_off, (struct obj *));
- E int NDECL(dotakeoff);
- E int NDECL(doremring);
- -E int FDECL(cursed, (struct obj *));
- +E int FDECL(cursed, (struct obj *, BOOLEAN_P));
- E int FDECL(armoroff, (struct obj *));
- E int FDECL(canwearobj, (struct obj *, long *, BOOLEAN_P));
- E int NDECL(dowear);
- @@ -1566,7 +1569,7 @@ E boolean FDECL(big_little_match, (int, int));
- E const char *FDECL(locomotion, (const struct permonst *, const char *));
- E const char *FDECL(stagger, (const struct permonst *, const char *));
- E const char *FDECL(on_fire, (struct permonst *, struct attack *));
- -E const struct permonst *FDECL(raceptr, (struct monst *));
- +E struct permonst *FDECL(raceptr, (struct monst *));
- E boolean FDECL(olfaction, (struct permonst *));
- /* ### monmove.c ### */
- @@ -2091,6 +2094,8 @@ E boolean NDECL(stuck_in_wall);
- #ifdef USE_TRAMPOLI
- E int NDECL(prayer_done);
- #endif
- +E void FDECL(god_zaps_you, (ALIGNTYP_P));
- +E void FDECL(godvoice, (ALIGNTYP_P, const char *));
- E int NDECL(dosacrifice);
- E boolean FDECL(can_pray, (BOOLEAN_P));
- E int NDECL(dopray);
- @@ -2102,6 +2107,7 @@ E const char *FDECL(a_gname_at, (XCHAR_P x, XCHAR_P y));
- E const char *FDECL(align_gname, (ALIGNTYP_P));
- E const char *FDECL(halu_gname, (ALIGNTYP_P));
- E const char *FDECL(align_gtitle, (ALIGNTYP_P));
- +E aligntyp FDECL(inf_align, (int));
- E void FDECL(altar_wrath, (int, int));
- /* ### priest.c ### */
- @@ -2250,6 +2256,7 @@ E int FDECL(rnz, (int));
- /* ### role.c ### */
- +E int FDECL(special_alignment, (int, int));
- E boolean FDECL(validrole, (int));
- E boolean FDECL(validrace, (int, int));
- E boolean FDECL(validgend, (int, int, int));
- diff --git c/include/mondata.h i/include/mondata.h
- index abff12a2c..b8e96026a 100644
- --- c/include/mondata.h
- +++ i/include/mondata.h
- @@ -32,6 +32,9 @@
- #define is_lminion(mon) \
- (is_minion((mon)->data) && mon_aligntyp(mon) == A_LAWFUL)
- #define is_flyer(ptr) (((ptr)->mflags1 & M1_FLY) != 0L)
- +/* flight blocked by most body armor */
- +#define big_wings(ptr) ((ptr) == &mons[PM_WINGED_GARGOYLE] \
- + || (ptr) == &mons[PM_DEMON])
- #define is_floater(ptr) ((ptr)->mlet == S_EYE || (ptr)->mlet == S_LIGHT)
- /* clinger: piercers, mimics, wumpus -- generally don't fall down holes */
- #define is_clinger(ptr) (((ptr)->mflags1 & M1_CLING) != 0L)
- @@ -99,6 +102,8 @@
- #define carnivorous(ptr) (((ptr)->mflags1 & M1_CARNIVORE) != 0L)
- #define herbivorous(ptr) (((ptr)->mflags1 & M1_HERBIVORE) != 0L)
- #define metallivorous(ptr) (((ptr)->mflags1 & M1_METALLIVORE) != 0L)
- +#define inediate(ptr) (((ptr)->mflags1 & (M1_CARNIVORE | M1_HERBIVORE \
- + | M1_METALLIVORE)) == 0L)
- #define polyok(ptr) (((ptr)->mflags2 & M2_NOPOLY) == 0L)
- #define is_shapeshifter(ptr) (((ptr)->mflags2 & M2_SHAPESHIFTER) != 0L)
- #define is_undead(ptr) (((ptr)->mflags2 & M2_UNDEAD) != 0L)
- diff --git c/include/monflag.h i/include/monflag.h
- index b343791b0..f979aa4df 100644
- --- c/include/monflag.h
- +++ i/include/monflag.h
- @@ -183,6 +183,7 @@ enum ms_sounds {
- #define MH_DWARF M2_DWARF
- #define MH_GNOME M2_GNOME
- #define MH_ORC M2_ORC
- +#define MH_DEMON M2_DEMON
- /* for mons[].geno (constant during game) */
- #define G_UNIQ 0x1000 /* generated only once */
- diff --git c/include/patchlevel.h i/include/patchlevel.h
- index 24b92cf36..d332859bd 100644
- --- c/include/patchlevel.h
- +++ i/include/patchlevel.h
- @@ -14,7 +14,7 @@
- * Incrementing EDITLEVEL can be used to force invalidation of old bones
- * and save files.
- */
- -#define EDITLEVEL 20
- +#define EDITLEVEL 21
- #define COPYRIGHT_BANNER_A "NetHack, Copyright 1985-2020"
- #define COPYRIGHT_BANNER_B \
- diff --git c/include/you.h i/include/you.h
- index 437500d9c..772d45899 100644
- --- c/include/you.h
- +++ i/include/you.h
- @@ -48,9 +48,8 @@ struct u_event {
- Bitfield(uopened_dbridge, 1); /* opened the drawbridge */
- Bitfield(invoked, 1); /* invoked Gate to the Sanctum level */
- Bitfield(gehennom_entered, 1); /* entered Gehennom via Valley */
- - Bitfield(uhand_of_elbereth, 2); /* became Hand of Elbereth */
- + Bitfield(uhand_of_elbereth, 3); /* became Hand of Elbereth */
- Bitfield(udemigod, 1); /* killed the wiz */
- - Bitfield(uvibrated, 1); /* stepped on "vibrating square" */
- Bitfield(ascended, 1); /* has offered the Amulet */
- };
- @@ -74,7 +73,7 @@ enum achivements {
- ACH_CNDL = 3, /* acquired Candelabrum of Invocation */
- ACH_BOOK = 4, /* acquired Book of the Dead */
- ACH_INVK = 5, /* performed invocation to gain access to Sanctum */
- - ACH_AMUL = 6, /* acquired The Amulet */
- + ACH_AMUL = 6, /* acquired (for Infidels: offered) The Amulet */
- ACH_ENDG = 7, /* entered end game */
- ACH_ASTR = 8, /* entered Astral Plane */
- ACH_UWIN = 9, /* ascended */
- @@ -276,6 +275,7 @@ struct Race {
- };
- extern const struct Race races[]; /* Table of available races */
- +extern struct Race race_demon; /* used in pray.c */
- #define Race_if(X) (g.urace.malenum == (X))
- #define Race_switch (g.urace.malenum)
- diff --git c/include/youprop.h i/include/youprop.h
- index c7bce068c..cc878bffb 100644
- --- c/include/youprop.h
- +++ i/include/youprop.h
- @@ -228,11 +228,13 @@
- #define HFlying u.uprops[FLYING].intrinsic
- #define EFlying u.uprops[FLYING].extrinsic
- /* BFlying has I_SPECIAL set if levitating or trapped in the floor or both,
- - FROMOUTSIDE set if inside solid rock (or in water on Plane of Water) */
- + FROMOUTSIDE set if inside solid rock (or in water on Plane of Water)
- + W_ARM set if in big_wings() form and wearing blocking body armor
- + (the last one obviously won't block the steed from flying) */
- #define BFlying u.uprops[FLYING].blocked
- -#define Flying \
- - ((HFlying || EFlying || (u.usteed && is_flyer(u.usteed->data))) \
- - && !BFlying)
- +#define Flying \
- + (((HFlying || EFlying) && !BFlying \
- + || u.usteed && is_flyer(u.usteed->data)) && !(BFlying & ~W_ARMOR))
- /* May touch surface; does not override any others */
- #define EWwalking u.uprops[WWALKING].extrinsic
- @@ -373,7 +375,7 @@
- redundant but allows the function calls to be skipped most of the time */
- #define Unaware (g.multi < 0 && (unconscious() || is_fainted()))
- -#define Hate_silver (u.ulycn >= LOW_PM || hates_silver(g.youmonst.data))
- +#define Hate_silver (u.ulycn >= LOW_PM || hates_silver(raceptr(&g.youmonst)))
- /* _Hitchhikers_Guide_to_the_Galaxy_ on uses for 'towel': "wrap it round
- your head to ward off noxious fumes" [we require it to be damp or wet] */
- diff --git c/src/allmain.c i/src/allmain.c
- index a609b4244..dc76d0bb1 100644
- --- c/src/allmain.c
- +++ i/src/allmain.c
- @@ -233,7 +233,13 @@ boolean resuming;
- && ((wtcap < MOD_ENCUMBER
- && (!(g.moves % ((MAXULEV + 8 - u.ulevel)
- * (Role_if(PM_WIZARD) ? 3 : 4)
- - / 6)))) || Energy_regeneration)) {
- + / 6)))) || Energy_regeneration
- + /* the Idol grants energy regen to piously unaligned;
- + * it really shouldn't be restricted to Infidels,
- + * but so far we have no other unaligned roles */
- + || Role_if(PM_INFIDEL) && u.uhave.questart
- + && u.ualign.type == A_NONE
- + && u.ualign.record > rn2(20))) {
- u.uen += rn1(
- (int) (ACURR(A_WIS) + ACURR(A_INT)) / 15 + 1, 1);
- if (u.uen > u.uenmax)
- @@ -243,6 +249,48 @@ boolean resuming;
- interrupt_multi("You feel full of energy.");
- }
- + /* Moloch demands regular sacrifices! */
- + if (g.context.next_moloch_offering <= g.moves) {
- + if (g.context.next_moloch_offering == g.moves
- + && (u.ualign.type == A_NONE
- + || u.ualignbase[A_CURRENT] == A_NONE)) {
- + You_feel("%s urge to perform a sacrifice.",
- + u.ualign.type == A_NONE ? "an"
- + : "a faint");
- + stop_occupation();
- + }
- + if (u.ualign.type == A_NONE && !rn2(10)
- + && rn2(g.moves - g.context.next_moloch_offering
- + + 1000) >= 1000) {
- + if (u.ualign.record > -99)
- + adjalign(-1);
- + if (u.ualign.record < -10 && !rn2(u.ugangr + 1)
- + && rn2(-u.ualign.record + 90) >= 100) {
- + char *angry = (char *) 0;
- + u.ugangr++;
- + /* avoid repetitive messages */
- + switch (u.ugangr) {
- + /* same values as in cmd.c */
- + case 1:
- + angry = "";
- + break;
- + case 4:
- + angry = "very ";
- + break;
- + case 7:
- + angry = "extremely ";
- + break;
- + }
- + if (angry) {
- + You_feel("that %s is %sangry at your "
- + "lack of offerings.", u_gname(),
- + angry);
- + stop_occupation();
- + }
- + }
- + }
- + }
- +
- if (!u.uinvulnerable) {
- if (Teleportation && !rn2(85)) {
- xchar old_ux = u.ux, old_uy = u.uy;
- @@ -358,6 +406,7 @@ boolean resuming;
- /* when/if hero escapes from lava, he can't just stay there */
- else if (!u.umoved)
- (void) pooleffects(FALSE);
- + g.context.coward = FALSE;
- } /* actual time passed */
- @@ -608,6 +657,9 @@ newgame()
- g.context.next_attrib_check = 600L; /* arbitrary first setting */
- g.context.tribute.enabled = TRUE; /* turn on 3.6 tributes */
- g.context.tribute.tributesz = sizeof(struct tribute_info);
- + g.context.inf_aligns = rn2(6); /* randomness for the Infidel role */
- + g.context.next_moloch_offering = 6000; /* give a grace period before
- + * the first sacrifice */
- for (i = LOW_PM; i < NUMMONS; i++)
- g.mvitals[i].mvflags = mons[i].geno & G_NOCORPSE;
- @@ -648,7 +700,7 @@ newgame()
- if (flags.legacy) {
- flush_screen(1);
- - com_pager("legacy");
- + qt_pager("legacy");
- }
- urealtime.realtime = 0L;
- diff --git c/src/apply.c i/src/apply.c
- index 856b54ee5..4b81fa7ee 100644
- --- c/src/apply.c
- +++ i/src/apply.c
- @@ -20,7 +20,6 @@ static void FDECL(use_lamp, (struct obj *));
- static void FDECL(light_cocktail, (struct obj **));
- static void FDECL(display_jump_positions, (int));
- static void FDECL(use_tinning_kit, (struct obj *));
- -static void FDECL(use_figurine, (struct obj **));
- static void FDECL(use_grease, (struct obj *));
- static void FDECL(use_trap, (struct obj *));
- static void FDECL(use_stone, (struct obj *));
- @@ -2089,6 +2088,7 @@ long timeout;
- boolean cansee_spot, silent, okay_spot;
- boolean redraw = FALSE;
- boolean suppress_see = FALSE;
- + boolean idol = figurine && figurine->oartifact == ART_IDOL_OF_MOLOCH;
- char monnambuf[BUFSZ], carriedby[BUFSZ];
- if (!figurine) {
- @@ -2099,7 +2099,8 @@ long timeout;
- okay_spot = get_obj_location(figurine, &cc.x, &cc.y, 0);
- if (figurine->where == OBJ_INVENT || figurine->where == OBJ_MINVENT)
- okay_spot = enexto(&cc, cc.x, cc.y, &mons[figurine->corpsenm]);
- - if (!okay_spot || !figurine_location_checks(figurine, &cc, TRUE)) {
- + if (idol && figurine->age > timeout || !okay_spot
- + || !figurine_location_checks(figurine, &cc, TRUE)) {
- /* reset the timer to try again later */
- (void) start_timer((long) rnd(5000), TIMER_OBJECT, FIG_TRANSFORM,
- obj_to_any(figurine));
- @@ -2143,9 +2144,14 @@ long timeout;
- case OBJ_FLOOR:
- if (cansee_spot && !silent) {
- - if (suppress_see)
- + if (idol) {
- + if (!suppress_see)
- + You_see("a cloud of %s mist coagulate "
- + "into the shape of %s%s!",
- + hcolor("crimson"), monnambuf, and_vanish);
- + } else if (suppress_see) {
- pline("%s suddenly vanishes!", an(xname(figurine)));
- - else
- + } else
- You_see("a figurine transform into %s%s!", monnambuf,
- and_vanish);
- redraw = TRUE; /* update figurine's map location */
- @@ -2181,12 +2187,20 @@ long timeout;
- break;
- }
- }
- - /* free figurine now */
- - if (carried(figurine)) {
- - useup(figurine);
- + if (idol) {
- + long cooldown = rnz(100);
- + figurine->age = timeout + cooldown;
- + /* still cursed */
- + (void) start_timer((long) rnd(9000) + cooldown, TIMER_OBJECT,
- + FIG_TRANSFORM, obj_to_any(figurine));
- } else {
- - obj_extract_self(figurine);
- - obfree(figurine, (struct obj *) 0);
- + /* free figurine now */
- + if (carried(figurine)) {
- + useup(figurine);
- + } else {
- + obj_extract_self(figurine);
- + obfree(figurine, (struct obj *) 0);
- + }
- }
- if (redraw)
- newsym(cc.x, cc.y);
- @@ -2228,14 +2242,25 @@ boolean quietly;
- return TRUE;
- }
- -static void
- +void
- use_figurine(optr)
- struct obj **optr;
- {
- register struct obj *obj = *optr;
- + boolean idol = obj->oartifact == ART_IDOL_OF_MOLOCH;
- xchar x, y;
- coord cc;
- + char *release_figurine;
- + if (idol) {
- + /* copied from artifact.c */
- + if (obj->age > g.monstermoves) {
- + You_feel("that %s %s ignoring you.", the(xname(obj)),
- + otense(obj, "are"));
- + obj->age += (long) d(3, 10);
- + return;
- + }
- + }
- if (u.uswallow) {
- /* can't activate a figurine while swallowed */
- if (!figurine_location_checks(obj, (coord *) 0, FALSE))
- @@ -2252,17 +2277,34 @@ struct obj **optr;
- /* Passing FALSE arg here will result in messages displayed */
- if (!figurine_location_checks(obj, &cc, FALSE))
- return;
- - You("%s and it %stransforms.",
- - (u.dx || u.dy) ? "set the figurine beside you"
- - : (Is_airlevel(&u.uz) || Is_waterlevel(&u.uz)
- - || is_pool(cc.x, cc.y))
- - ? "release the figurine"
- - : (u.dz < 0 ? "toss the figurine into the air"
- - : "set the figurine on the ground"),
- - Blind ? "supposedly " : "");
- + if (u.dx || u.dy)
- + release_figurine = "set the figurine beside you";
- + else if (Is_airlevel(&u.uz) || Is_waterlevel(&u.uz)
- + || is_pool(cc.x, cc.y))
- + release_figurine = "release the figurine";
- + else if (u.dz < 0)
- + release_figurine = "toss the figurine into the air";
- + else
- + release_figurine = "set the figurine on the ground";
- + if (idol) {
- + if (Blind)
- + You("%s and feel an unholy aura emanate from it.",
- + release_figurine);
- + else
- + You("%s and a cloud of %s mist arises from it.",
- + release_figurine, hcolor("crimson"));
- + } else
- + You("%s and it %stransforms.", release_figurine,
- + Blind ? "supposedly " : "");
- (void) make_familiar(obj, cc.x, cc.y, FALSE);
- - (void) stop_timer(FIG_TRANSFORM, obj_to_any(obj));
- - useup(obj);
- + if (idol) {
- + obj->age = g.monstermoves + rnz(100);
- + freeinv(obj);
- + place_object(obj, cc.x, cc.y);
- + } else {
- + (void) stop_timer(FIG_TRANSFORM, obj_to_any(obj));
- + useup(obj);
- + }
- if (Blind)
- map_invisible(cc.x, cc.y);
- *optr = 0;
- @@ -3649,7 +3691,7 @@ doapply()
- case BLINDFOLD:
- case LENSES:
- if (obj == ublindf) {
- - if (!cursed(obj))
- + if (!cursed(obj, FALSE))
- Blindf_off(obj);
- } else if (!ublindf) {
- Blindf_on(obj);
- diff --git c/src/artifact.c i/src/artifact.c
- index 77eced018..52d83aa58 100644
- --- c/src/artifact.c
- +++ i/src/artifact.c
- @@ -40,7 +40,7 @@ static int FDECL(count_surround_traps, (int, int));
- #define FATAL_DAMAGE_MODIFIER 200
- static void NDECL(hack_artifacts);
- -static boolean FDECL(attacks, (int, struct obj *));
- +static void FDECL(fix_artifact, (struct obj *));
- /* handle some special cases; must be called after u_init() */
- static void
- @@ -96,6 +96,19 @@ NHFILE *nhfp;
- hack_artifacts(); /* redo non-saved special cases */
- }
- +/* Some artifacts may need additional tweaking when created.
- + * Called when the artifact is christened.
- + */
- +static void
- +fix_artifact(otmp)
- +struct obj *otmp;
- +{
- + if (otmp->oartifact == ART_IDOL_OF_MOLOCH) {
- + set_corpsenm(otmp, PM_HORNED_DEVIL);
- + otmp->spe = 0;
- + }
- +}
- +
- const char *
- artiname(artinum)
- int artinum;
- @@ -123,8 +136,8 @@ aligntyp alignment; /* target alignment, or A_NONE */
- {
- const struct artifact *a;
- int m, n, altn;
- - boolean by_align = (alignment != A_NONE);
- - short o_typ = (by_align || !otmp) ? 0 : otmp->otyp;
- + boolean by_align = alignment != A_NONE || !otmp;
- + short o_typ = by_align ? 0 : otmp->otyp;
- boolean unique = !by_align && otmp && objects[o_typ].oc_unique;
- short eligible[NROFARTIFACTS];
- @@ -193,6 +206,7 @@ aligntyp alignment; /* target alignment, or A_NONE */
- otmp = oname(otmp, a->name);
- otmp->oartifact = m;
- g.artiexist[m] = TRUE;
- + fix_artifact(otmp);
- }
- } else {
- /* nothing appropriate could be found; return original object */
- @@ -265,6 +279,8 @@ boolean mod;
- if (otmp->otyp == RIN_INCREASE_DAMAGE)
- otmp->spe = 0;
- g.artiexist[m] = mod;
- + if (mod)
- + fix_artifact(otmp);
- break;
- }
- return;
- @@ -398,7 +414,7 @@ const char *name;
- return FALSE;
- }
- -static boolean
- +boolean
- attacks(adtyp, otmp)
- int adtyp;
- struct obj *otmp;
- @@ -793,6 +809,8 @@ struct monst *mtmp;
- return !(yours ? Poison_resistance : resists_poison(mtmp));
- case AD_DRLI:
- return !(yours ? Drain_resistance : resists_drli(mtmp));
- + case AD_DREN:
- + return !nonliving(ptr);
- case AD_STON:
- return !(yours ? Stone_resistance : resists_ston(mtmp));
- default:
- @@ -1605,6 +1623,88 @@ struct obj *obj;
- nhUse(otmp);
- break;
- }
- + case CHANNEL:
- + /* Should this break atheist conduct? Currently it doesn't,
- + * under the excuse of being necessary to ascend.
- + * But still, we're channeling a god's power here... */
- + if (IS_ALTAR(levl[u.ux][u.uy].typ)) {
- + aligntyp altar_align = Amask2align(levl[u.ux][u.uy].altarmask
- + & AM_MASK);
- + boolean high_altar = (Is_astralevel(&u.uz)
- + || Is_sanctum(&u.uz))
- + && (levl[u.ux][u.uy].altarmask
- + & AM_SHRINE);
- + if (!Blind)
- + pline("Tendrils of %s mist seep out of %s "
- + "and into the altar below...",
- + hcolor("crimson"), the(xname(obj)));
- + else
- + You_feel("something flow from %s.", the(xname(obj)));
- + if (altar_align == A_NONE) {
- + if (high_altar && Role_if(PM_INFIDEL)
- + && u.uevent.ascended && !obj->spe) {
- + godvoice(A_NONE, (char *) 0);
- + qt_pager("moloch");
- + You_feel("strange energies envelop %s.",
- + the(xname(obj)));
- + obj->spe = 1;
- + u.uhave.amulet = 1;
- + break;
- + }
- + if (!Blind)
- + pline_The("altar glows for a moment.");
- + /* nothing happens */
- + break;
- + }
- + if (high_altar) {
- + /* messages yoinked from pray.c */
- + You("sense a conflict between %s and %s.",
- + align_gname(A_NONE), a_gname());
- + if (obj->spe && altar_align == inf_align(1)) {
- + You_feel("the power of %s increase.",
- + align_gname(A_NONE));
- + } else {
- + pline("%s feel the power of %s decrease.",
- + u.ualign.type == A_NONE ? "Unluckily, you"
- + : "You",
- + align_gname(A_NONE));
- + godvoice(altar_align, "So, mortal! You dare "
- + "desecrate my High Temple!");
- + god_zaps_you(altar_align);
- + break;
- + }
- + }
- + levl[u.ux][u.uy].altarmask &= AM_SHRINE;
- + levl[u.ux][u.uy].altarmask |= AM_NONE;
- + if (!Blind)
- + pline_The("altar glows %s.", hcolor(NH_RED));
- + if (!high_altar) {
- + /* the Idol does all the work for you,
- + * so you don't get a luck increase;
- + * but you don't get a hostile minion, either */
- + struct monst *pri = findpriest(temple_occupied(u.urooms));
- + if (pri && mon_aligntyp(pri) != A_NONE)
- + angry_priest();
- + } else {
- + /* At this point, the player must be an Infidel.
- + * Should we still check for opposite alignment?
- + * Currently, Moloch doesn't care. */
- + adjalign(10);
- + pline1("A sinister laughter echoes through the temple, "
- + "and you're bathed in darkness...");
- + godvoice(A_NONE, "My pawn, thou hast done well!");
- + display_nhwindow(WIN_MESSAGE, FALSE);
- + verbalize("In return for thy service, "
- + "I grant thee a part of My domain!");
- + You("ascend to the status of Demon %s...",
- + flags.female ? "Lady" : "Lord");
- + done(ASCENDED);
- + }
- + } else {
- + obj->age = 0; /* will be set below */
- + use_figurine(&obj);
- + }
- + break;
- }
- } else {
- long eprop = (u.uprops[oart->inv_prop].extrinsic ^= W_ARTI),
- diff --git c/src/attrib.c i/src/attrib.c
- index eb069a1f0..984492db9 100644
- --- c/src/attrib.c
- +++ i/src/attrib.c
- @@ -41,6 +41,11 @@ static const struct innate {
- { 15, &(HWarning), "sensitive", "" },
- { 0, 0, 0, 0 } },
- + inf_abil[] = { { 1, &(HFire_resistance), "", "" },
- + { 15, &(HWarning), "sensitive", "" },
- + { 20, &(HShock_resistance), "inured", "softened" },
- + { 0, 0, 0, 0 } },
- +
- kni_abil[] = { { 7, &(HFast), "quick", "slow" }, { 0, 0, 0, 0 } },
- mon_abil[] = { { 1, &(HFast), "", "" },
- @@ -101,6 +106,15 @@ static const struct innate {
- { 1, &HPoison_resistance, "", "" },
- { 0, 0, 0, 0 } },
- + dem_abil[] = { { 1, &HInfravision, "", "" },
- + { 1, &HFire_resistance, "", "" },
- + { 1, &HPoison_resistance, "", "" },
- + { 1, &HDrain_resistance, "", "" },
- + { 1, &HSee_invisible, "", "" },
- + { 1, &HFlying, "", "" },
- + /* also inediate */
- + { 0, 0, 0, 0 } },
- +
- hum_abil[] = { { 0, 0, 0, 0 } };
- static void NDECL(exerper);
- @@ -711,6 +725,7 @@ int r;
- { PM_BARBARIAN, bar_abil },
- { PM_CAVEMAN, cav_abil },
- { PM_HEALER, hea_abil },
- + { PM_INFIDEL, inf_abil },
- { PM_KNIGHT, kni_abil },
- { PM_MONK, mon_abil },
- { PM_PRIEST, pri_abil },
- @@ -752,6 +767,9 @@ long frommask;
- case PM_ORC:
- abil = orc_abil;
- break;
- + case PM_DEMON:
- + abil = dem_abil;
- + break;
- case PM_HUMAN:
- abil = hum_abil;
- break;
- @@ -805,6 +823,8 @@ int propidx;
- return FROM_LYCN;
- if (propidx == FAST && Very_fast)
- return FROM_NONE; /* can't become very fast innately */
- + if (propidx == FLYING && (BFlying & W_ARMOR))
- + return FROM_NONE; /* not from form, as that is blocked */
- if ((innateness = innately(&u.uprops[propidx].intrinsic)) != FROM_NONE)
- return innateness;
- if (propidx == JUMPING && Role_if(PM_KNIGHT)
- diff --git c/src/botl.c i/src/botl.c
- index 2dfaa11b9..cc0cdd448 100644
- --- c/src/botl.c
- +++ i/src/botl.c
- @@ -89,9 +89,10 @@ do_statusline1()
- ACURR(A_DEX), ACURR(A_CON), ACURR(A_INT), ACURR(A_WIS),
- ACURR(A_CHA));
- Sprintf(nb = eos(nb),
- - (u.ualign.type == A_CHAOTIC)
- - ? " Chaotic"
- - : (u.ualign.type == A_NEUTRAL) ? " Neutral" : " Lawful");
- + (u.ualign.type == A_NONE) ? " Unaligned"
- + : (u.ualign.type == A_CHAOTIC) ? " Chaotic"
- + : (u.ualign.type == A_NEUTRAL) ? " Neutral"
- + : " Lawful");
- #ifdef SCORE_ON_BOTL
- if (flags.showscore)
- Sprintf(nb = eos(nb), " S:%ld", botl_score());
- @@ -748,11 +749,13 @@ bot_via_windowport()
- g.blstats[idx][BL_CH].a.a_int = ACURR(A_CHA);
- /* Alignment */
- - Strcpy(g.blstats[idx][BL_ALIGN].val, (u.ualign.type == A_CHAOTIC)
- - ? "Chaotic"
- - : (u.ualign.type == A_NEUTRAL)
- - ? "Neutral"
- - : "Lawful");
- + Strcpy(g.blstats[idx][BL_ALIGN].val, (u.ualign.type == A_NONE)
- + ? "Unaligned"
- + : (u.ualign.type == A_CHAOTIC)
- + ? "Chaotic"
- + : (u.ualign.type == A_LAWFUL)
- + ? "Lawful"
- + : "Neutral");
- /* Score */
- g.blstats[idx][BL_SCORE].a.a_long =
- diff --git c/src/decl.c i/src/decl.c
- index 3264d7282..7e7a18801 100644
- --- c/src/decl.c
- +++ i/src/decl.c
- @@ -383,6 +383,7 @@ const struct instance_globals g_init = {
- /* do_wear.c */
- FALSE, /* initial_don */
- + NULL, /* last_worn_armor */
- /* dog.c */
- 0, /* petname_used */
- diff --git c/src/do.c i/src/do.c
- index 9bbf997f2..569c72c8c 100644
- --- c/src/do.c
- +++ i/src/do.c
- @@ -570,7 +570,7 @@ const char *word;
- Norep("You cannot %s %s you are wearing.", word, something);
- return FALSE;
- }
- - if (obj->otyp == LOADSTONE && obj->cursed) {
- + if (obj->otyp == LOADSTONE && cursed(obj, TRUE)) {
- /* getobj() kludge sets corpsenm to user's specified count
- when refusing to split a stack of cursed loadstones */
- if (*word) {
- @@ -925,7 +925,8 @@ int retry;
- if (cnt < otmp->quan) {
- if (welded(otmp)) {
- ; /* don't split */
- - } else if (otmp->otyp == LOADSTONE && otmp->cursed) {
- + } else if (otmp->otyp == LOADSTONE
- + && cursed(otmp, TRUE)) {
- /* same kludge as getobj(), for canletgo()'s use */
- otmp->corpsenm = (int) cnt; /* don't split */
- } else {
- @@ -1312,6 +1313,8 @@ boolean at_stairs, falling, portal;
- * -2 5.21 4.17 0.0
- * -3 2.08 0.0 0.0
- *
- + * Infidels (unaligned) are spared from the mysterious force.
- + *
- * 3.7.0: the chance for the "mysterious force" to kick in goes down
- * as it kicks in, starting at 25% per climb attempt and dropping off
- * gradually but substantially. The drop off is greater when hero is
- @@ -1319,7 +1322,7 @@ boolean at_stairs, falling, portal;
- */
- if (Inhell && up && u.uhave.amulet && !newdungeon && !portal
- && (dunlev(&u.uz) < dunlevs_in_dungeon(&u.uz) - 3)) {
- - if (!rn2(4 + g.context.mysteryforce)) {
- + if (u.ualign.type != A_NONE && !rn2(4 + g.context.mysteryforce)) {
- int odds = 3 + (int) u.ualign.type, /* 2..4 */
- diff = (odds <= 1) ? 0 : rn2(odds); /* paranoia */
- @@ -1791,7 +1794,8 @@ final_level()
- create_mplayers(rn1(4, 3), TRUE);
- /* create a guardian angel next to player, if worthy */
- - gain_guardian_angel();
- + if (u.ualign.type != A_NONE)
- + gain_guardian_angel();
- }
- /* change levels at the end of this turn, after monsters finish moving */
- diff --git c/src/do_wear.c i/src/do_wear.c
- index 0aebf7ffb..95647786a 100644
- --- c/src/do_wear.c
- +++ i/src/do_wear.c
- @@ -411,7 +411,7 @@ Helmet_on(VOID_ARGS)
- by hero falling onto a polymorph trap or into water (emergency
- disrobe) or maybe lava (probably not, helm isn't 'organic') */
- uchangealign((u.ualign.type != A_NEUTRAL)
- - ? -u.ualign.type
- + ? -sgn(u.ualign.type)
- : (uarmh->o_id % 2) ? A_CHAOTIC : A_LAWFUL,
- 1);
- /* makeknown(HELM_OF_OPPOSITE_ALIGNMENT); -- below, after Tobjnam() */
- @@ -695,6 +695,7 @@ Armor_on(VOID_ARGS)
- */
- if (uarm) /* no known instances of !uarm here but play it safe */
- uarm->known = 1; /* suit's +/- evident because of status line AC */
- + check_wings(FALSE);
- return 0;
- }
- @@ -704,6 +705,7 @@ Armor_off(VOID_ARGS)
- g.context.takeoff.mask &= ~W_ARM;
- setworn((struct obj *) 0, W_ARM);
- g.context.takeoff.cancelled_don = FALSE;
- + check_wings(FALSE);
- return 0;
- }
- @@ -719,9 +721,43 @@ Armor_gone()
- g.context.takeoff.mask &= ~W_ARM;
- setnotworn(uarm);
- g.context.takeoff.cancelled_don = FALSE;
- + check_wings(FALSE);
- return 0;
- }
- +/* Some monster forms' flight is blocked by most body armor. */
- +void
- +check_wings(silent)
- +boolean silent; /* we assume a wardrobe change if false */
- +{
- + boolean old_flying = Flying;
- +
- + BFlying &= ~W_ARM;
- + if (!big_wings(raceptr(&g.youmonst)))
- + return;
- +
- + if (!uarm) {
- + if (!silent && Flying && !old_flying)
- + You("spread your wings and take flight.");
- + } else if (Is_dragon_scales(uarm)) {
- + if (!silent && uarm != g.last_worn_armor)
- + You("arrange the scales around your wings.");
- + } else if (uarm->otyp == LEATHER_JACKET) {
- + if (!silent && uarm != g.last_worn_armor)
- + pline1("This jacket seems to have holes for wings.");
- + } else {
- + BFlying |= W_ARM;
- + if (!silent)
- + You("fold your wings under your suit.");
- + }
- +
- + if (uarm)
- + g.last_worn_armor = uarm;
- +
- + if (Flying != old_flying)
- + g.context.botl = TRUE;
- +}
- +
- static void
- Amulet_on()
- {
- @@ -1593,31 +1629,35 @@ doremring()
- /* Check if something worn is cursed _and_ unremovable. */
- int
- -cursed(otmp)
- +cursed(otmp, silent)
- struct obj *otmp;
- +boolean silent;
- {
- if (!otmp) {
- impossible("cursed without otmp");
- return 0;
- }
- - /* Curses, like chickens, come home to roost. */
- - if ((otmp == uwep) ? welded(otmp) : (int) otmp->cursed) {
- - boolean use_plural = (is_boots(otmp) || is_gloves(otmp)
- - || otmp->otyp == LENSES || otmp->quan > 1L);
- -
- - /* might be trying again after applying grease to hands */
- - if (Glib && otmp->bknown
- - /* for weapon, we'll only get here via 'A )' */
- - && (uarmg ? (otmp == uwep)
- - : ((otmp->owornmask & (W_WEP | W_RING)) != 0)))
- - pline("Despite your slippery %s, you can't.",
- - fingers_or_gloves(TRUE));
- - else
- - You("can't. %s cursed.", use_plural ? "They are" : "It is");
- - set_bknown(otmp, 1);
- + /* Inf are immune to curses. */
- + if (Role_if(PM_INFIDEL) || !otmp->cursed || otmp == uwep && !welded(otmp))
- + return 0;
- + if (silent)
- return 1;
- - }
- - return 0;
- +
- + /* Curses, like chickens, come home to roost. */
- + boolean use_plural = (is_boots(otmp) || is_gloves(otmp)
- + || otmp->otyp == LENSES || otmp->quan > 1L);
- +
- + /* might be trying again after applying grease to hands */
- + if (Glib && otmp->bknown
- + /* for weapon, we'll only get here via 'A )' */
- + && (uarmg ? (otmp == uwep)
- + : ((otmp->owornmask & (W_WEP | W_RING)) != 0)))
- + pline("Despite your slippery %s, you can't.",
- + fingers_or_gloves(TRUE));
- + else
- + You("can't. %s cursed.", use_plural ? "They are" : "It is");
- + set_bknown(otmp, 1);
- + return 1;
- }
- int
- @@ -1628,7 +1668,7 @@ struct obj *otmp;
- int delay = -objects[otmp->otyp].oc_delay;
- const char *what = 0;
- - if (cursed(otmp))
- + if (cursed(otmp, FALSE))
- return 0;
- /* this used to make assumptions about which types of armor had
- delays and which didn't; now both are handled for all types */
- @@ -2349,13 +2389,13 @@ int otyp;
- /* reasons ring can't be removed match those checked by select_off();
- limbless case has extra checks because ordinarily it's temporary */
- if (nolimbs(g.youmonst.data) && uamul
- - && uamul->otyp == AMULET_OF_UNCHANGING && uamul->cursed)
- + && uamul->otyp == AMULET_OF_UNCHANGING && cursed(uamul, TRUE))
- return uamul;
- if (welded(uwep) && (ring == uright || bimanual(uwep)))
- return uwep;
- - if (uarmg && uarmg->cursed)
- + if (uarmg && cursed(uarmg, TRUE))
- return uarmg;
- - if (ring->cursed)
- + if (cursed(ring, TRUE))
- return ring;
- /* normally outermost layer is processed first, but slippery gloves
- wears off quickly so uncurse ring itself before handling those */
- @@ -2464,7 +2504,7 @@ register struct obj *otmp;
- ; /* some items can be removed even when cursed */
- } else {
- /* otherwise, this is fundamental */
- - if (cursed(otmp))
- + if (cursed(otmp, FALSE))
- return 0;
- }
- @@ -2512,7 +2552,7 @@ do_takeoff()
- g.context.takeoff.mask |= I_SPECIAL; /* set flag for cancel_doff() */
- if (doff->what == W_WEP) {
- - if (!cursed(uwep)) {
- + if (!cursed(uwep, FALSE)) {
- setuwep((struct obj *) 0);
- if (was_twoweap)
- You("are no longer wielding either weapon.");
- @@ -2529,46 +2569,46 @@ do_takeoff()
- You("no longer have ammunition readied.");
- } else if (doff->what == WORN_ARMOR) {
- otmp = uarm;
- - if (!cursed(otmp))
- + if (!cursed(otmp, FALSE))
- (void) Armor_off();
- } else if (doff->what == WORN_CLOAK) {
- otmp = uarmc;
- - if (!cursed(otmp))
- + if (!cursed(otmp, FALSE))
- (void) Cloak_off();
- } else if (doff->what == WORN_BOOTS) {
- otmp = uarmf;
- - if (!cursed(otmp))
- + if (!cursed(otmp, FALSE))
- (void) Boots_off();
- } else if (doff->what == WORN_GLOVES) {
- otmp = uarmg;
- - if (!cursed(otmp))
- + if (!cursed(otmp, FALSE))
- (void) Gloves_off();
- } else if (doff->what == WORN_HELMET) {
- otmp = uarmh;
- - if (!cursed(otmp))
- + if (!cursed(otmp, FALSE))
- (void) Helmet_off();
- } else if (doff->what == WORN_SHIELD) {
- otmp = uarms;
- - if (!cursed(otmp))
- + if (!cursed(otmp, FALSE))
- (void) Shield_off();
- } else if (doff->what == WORN_SHIRT) {
- otmp = uarmu;
- - if (!cursed(otmp))
- + if (!cursed(otmp, FALSE))
- (void) Shirt_off();
- } else if (doff->what == WORN_AMUL) {
- otmp = uamul;
- - if (!cursed(otmp))
- + if (!cursed(otmp, FALSE))
- Amulet_off();
- } else if (doff->what == LEFT_RING) {
- otmp = uleft;
- - if (!cursed(otmp))
- + if (!cursed(otmp, FALSE))
- Ring_off(uleft);
- } else if (doff->what == RIGHT_RING) {
- otmp = uright;
- - if (!cursed(otmp))
- + if (!cursed(otmp, FALSE))
- Ring_off(uright);
- } else if (doff->what == WORN_BLINDF) {
- - if (!cursed(ublindf))
- + if (!cursed(ublindf, FALSE))
- Blindf_off(ublindf);
- } else {
- impossible("do_takeoff: taking off %lx", doff->what);
- diff --git c/src/dog.c i/src/dog.c
- index a19167794..aef390467 100644
- --- c/src/dog.c
- +++ i/src/dog.c
- @@ -75,10 +75,16 @@ boolean quietly;
- struct permonst *pm;
- struct monst *mtmp = 0;
- int chance, trycnt = 100;
- + boolean idol = otmp && otmp->oartifact == ART_IDOL_OF_MOLOCH;
- do {
- if (otmp) { /* figurine; otherwise spell */
- int mndx = otmp->corpsenm;
- + if (idol) {
- + mndx = ndemon(A_NONE);
- + if (mndx == NON_PM) /* just in case */
- + continue;
- + }
- pm = &mons[mndx];
- /* activating a figurine provides one way to exceed the
- @@ -86,10 +92,14 @@ boolean quietly;
- it has a special limit (erinys, Nazgul) */
- if ((g.mvitals[mndx].mvflags & G_EXTINCT)
- && mbirth_limit(mndx) != MAXMONNO) {
- - if (!quietly)
- + if (!quietly) {
- /* have just been given "You <do something with>
- the figurine and it transforms." message */
- - pline("... into a pile of dust.");
- + if (!idol)
- + pline("... into a pile of dust.");
- + else if (!Blind)
- + pline_The("cloud disperses.");
- + }
- break; /* mtmp is null */
- }
- } else if (!rn2(3)) {
- @@ -103,10 +113,16 @@ boolean quietly;
- }
- }
- - mtmp = makemon(pm, x, y, MM_EDOG | MM_IGNOREWATER | NO_MINVENT);
- + mtmp = makemon(pm, x, y, MM_EDOG | MM_IGNOREWATER
- + | (!idol * NO_MINVENT));
- if (otmp && !mtmp) { /* monster was genocided or square occupied */
- - if (!quietly)
- - pline_The("figurine writhes and then shatters into pieces!");
- + if (!quietly) {
- + if (!idol)
- + pline_The("figurine writhes and then shatters "
- + "into pieces!");
- + else if (!Blind)
- + pline_The("cloud disperses.");
- + }
- break;
- }
- } while (!mtmp && --trycnt > 0);
- @@ -114,6 +130,14 @@ boolean quietly;
- if (!mtmp)
- return (struct monst *) 0;
- + if (idol && !quietly && !Blind) {
- + pline_The("mist coagulates into the shape of %s%s.",
- + x_monnam(mtmp, ARTICLE_A, (char *) 0, SUPPRESS_IT
- + | SUPPRESS_INVISIBLE | SUPPRESS_SADDLE
- + | SUPPRESS_NAME, FALSE),
- + canspotmon(mtmp) ? "" : " and vanishes");
- + }
- +
- if (is_pool(mtmp->mx, mtmp->my) && minliquid(mtmp))
- return (struct monst *) 0;
- @@ -134,7 +158,7 @@ boolean quietly;
- }
- }
- /* if figurine has been named, give same name to the monster */
- - if (has_oname(otmp))
- + if (has_oname(otmp) && !idol)
- mtmp = christen_monst(mtmp, ONAME(otmp));
- }
- set_malign(mtmp); /* more alignment changes */
- @@ -551,6 +575,19 @@ long nmv; /* number of moves */
- m_unleash(mtmp, FALSE);
- }
- + /* maybe pick up the abandoned Amulet */
- + if (mtmp->data == &mons[PM_AGENT] && !mtmp->mpeaceful
- + && !mon_has_amulet(mtmp) && rn2(imv + 1) > 300) {
- + struct obj *otmp;
- + for (otmp = g.level.objlist; otmp; otmp = otmp->nobj)
- + if (otmp->otyp == AMULET_OF_YENDOR
- + || otmp->otyp == FAKE_AMULET_OF_YENDOR) {
- + obj_extract_self(otmp);
- + (void) mpickobj(mtmp, otmp);
- + break;
- + }
- + }
- +
- /* recover lost hit points */
- if (!regenerates(mtmp->data))
- imv /= 20;
- @@ -941,7 +978,7 @@ register struct obj *obj;
- /* monsters with conflicting structures cannot be tamed */
- || mtmp->isshk || mtmp->isgd || mtmp->ispriest || mtmp->isminion
- || is_covetous(mtmp->data) || is_human(mtmp->data)
- - || (is_demon(mtmp->data) && !is_demon(g.youmonst.data))
- + || (is_demon(mtmp->data) && !is_demon(raceptr(&g.youmonst)))
- || (obj && dogfood(mtmp, obj) >= MANFOOD))
- return FALSE;
- diff --git c/src/dothrow.c i/src/dothrow.c
- index 1e6930c8e..caa8c1dd1 100644
- --- c/src/dothrow.c
- +++ i/src/dothrow.c
- @@ -159,6 +159,7 @@ int shotlimit;
- /* some roles don't get a volley bonus until becoming expert */
- weakmultishot = (Role_if(PM_WIZARD) || Role_if(PM_PRIEST)
- || (Role_if(PM_HEALER) && skill != P_KNIFE)
- + || (Role_if(PM_INFIDEL) && skill != P_DAGGER)
- || (Role_if(PM_TOURIST) && skill != -P_DART)
- /* poor dexterity also inhibits multishot */
- || Fumbling || ACURR(A_DEX) <= 6);
- @@ -1824,7 +1825,7 @@ register struct monst *mon;
- register struct obj *obj;
- {
- char buf[BUFSZ];
- - boolean is_buddy = sgn(mon->data->maligntyp) == sgn(u.ualign.type);
- + boolean is_buddy = sgn(mon->data->maligntyp) == u.ualign.type;
- boolean is_gem = objects[obj->otyp].oc_material == GEMSTONE;
- int ret = 0;
- static NEARDATA const char nogood[] = " is not interested in your junk.";
- diff --git c/src/dungeon.c i/src/dungeon.c
- index f376e5237..333aec237 100644
- --- c/src/dungeon.c
- +++ i/src/dungeon.c
- @@ -1420,7 +1420,8 @@ boolean at_stairs;
- /* Taking an up dungeon branch. */
- /* KMH -- Upwards branches are okay if not level 1 */
- /* (Just make sure it doesn't go above depth 1) */
- - if (!u.uz.dnum && u.uz.dlevel == 1 && !u.uhave.amulet)
- + if (!u.uz.dnum && u.uz.dlevel == 1
- + && (!u.uhave.amulet || Role_if(PM_INFIDEL) && !u.uevent.ascended))
- done(ESCAPED);
- else
- goto_level(&g.sstairs.tolev, at_stairs, FALSE, FALSE);
- @@ -3303,8 +3304,11 @@ boolean printdun;
- else
- ADDNTOBUF("temple", mptr->feat.ntemple);
- - /* only print out altar's god if they are all to your god */
- - if (Amask2align(Msa2amask(mptr->feat.msalign)) == u.ualign.type)
- + /* only print out altar's god if they are all to your god
- + * For Infidels, only print Moloch if there's exactly one altar;
- + * this is a technical resriction (i.e. I'm too lazy to fix it) */
- + if (Amask2align(Msa2amask(mptr->feat.msalign)) == u.ualign.type
- + && (u.ualign.type != A_NONE || mptr->feat.naltar == 1))
- Sprintf(eos(buf), " to %s", align_gname(u.ualign.type));
- }
- ADDNTOBUF("throne", mptr->feat.nthrone);
- diff --git c/src/eat.c i/src/eat.c
- index de5e698b6..e51a41c86 100644
- --- c/src/eat.c
- +++ i/src/eat.c
- @@ -2819,10 +2819,7 @@ gethungry()
- will need to wear an Amulet of Unchanging so still burn a small
- amount of nutrition in the 'moves % 20' ring/amulet check below */
- if ((!Unaware || !rn2(10)) /* slow metabolic rate while asleep */
- - && (carnivorous(g.youmonst.data)
- - || herbivorous(g.youmonst.data)
- - || metallivorous(g.youmonst.data))
- - && !Slow_digestion)
- + && !inediate(raceptr(&g.youmonst)) && !Slow_digestion)
- u.uhunger--; /* ordinary food consumption */
- if (g.moves % 2) { /* odd turns */
- diff --git c/src/end.c i/src/end.c
- index a33e9ef07..82a81c520 100644
- --- c/src/end.c
- +++ i/src/end.c
- @@ -906,6 +906,8 @@ struct obj *list; /* inventory or container contents */
- } else if (obj->oartifact) {
- continue;
- } else if (obj->oclass == AMULET_CLASS) {
- + if (Role_if(PM_INFIDEL) && obj->otyp == AMULET_OF_YENDOR)
- + continue; /* starting inventory */
- i = obj->otyp - FIRST_AMULET;
- if (!g.amulets[i].count) {
- g.amulets[i].count = obj->quan;
- @@ -1471,7 +1473,9 @@ int how;
- ? (const char *) ((flags.female && g.urole.name.f)
- ? g.urole.name.f
- : g.urole.name.m)
- - : (const char *) (flags.female ? "Demigoddess" : "Demigod"));
- + : Role_if(PM_INFIDEL) /* can only ascend via Moloch */
- + ? (const char *) (flags.female ? "Demon Lady" : "Demon Lord")
- + : (const char *) (flags.female ? "Demigoddess" : "Demigod"));
- dump_forward_putstr(endwin, 0, pbuf, done_stopprint);
- dump_forward_putstr(endwin, 0, "", done_stopprint);
- diff --git c/src/engrave.c i/src/engrave.c
- index f78545329..e1f967c20 100644
- --- c/src/engrave.c
- +++ i/src/engrave.c
- @@ -429,7 +429,7 @@ int
- freehand()
- {
- return (!uwep || !welded(uwep)
- - || (!bimanual(uwep) && (!uarms || !uarms->cursed)));
- + || (!bimanual(uwep) && (!uarms || !cursed(uarms, TRUE))));
- }
- static NEARDATA const char styluses[] = { ALL_CLASSES, ALLOW_NONE,
- @@ -502,7 +502,7 @@ doengrave()
- maxelen = BUFSZ - 1;
- if (oep)
- oetype = oep->engr_type;
- - if (is_demon(g.youmonst.data) || is_vampire(g.youmonst.data))
- + if (is_demon(raceptr(&g.youmonst)) || is_vampire(g.youmonst.data))
- type = ENGR_BLOOD;
- /* Can the adventurer engrave at all? */
- diff --git c/src/exper.c i/src/exper.c
- index f7e426db4..c69186bdd 100644
- --- c/src/exper.c
- +++ i/src/exper.c
- @@ -32,6 +32,7 @@ int en;
- case PM_WIZARD:
- return (2 * en);
- case PM_HEALER:
- + case PM_INFIDEL:
- case PM_KNIGHT:
- return ((3 * en) / 2);
- case PM_BARBARIAN:
- diff --git c/src/explode.c i/src/explode.c
- index c44baa261..c43671c42 100644
- --- c/src/explode.c
- +++ i/src/explode.c
- @@ -184,8 +184,8 @@ int expltype;
- break;
- case AD_DISN:
- explmask[i][j] = (olet == WAND_CLASS)
- - ? !!(nonliving(g.youmonst.data)
- - || is_demon(g.youmonst.data))
- + ? (nonliving(g.youmonst.data)
- + || is_demon(raceptr(&g.youmonst)))
- : !!Disint_resistance;
- break;
- case AD_ELEC:
- diff --git c/src/hack.c i/src/hack.c
- index 81ed3c38e..386d55aee 100644
- --- c/src/hack.c
- +++ i/src/hack.c
- @@ -2078,7 +2078,6 @@ invocation_message()
- Sprintf(buf, "under your %s", makeplural(body_part(FOOT)));
- You_feel("a strange vibration %s.", buf);
- - u.uevent.uvibrated = 1;
- if (otmp && otmp->spe == 7 && otmp->lamplit)
- pline("%s %s!", The(xname(otmp)),
- Blind ? "throbs palpably" : "glows with a strange light");
- @@ -2119,7 +2118,7 @@ switch_terrain()
- /* [minor bug: we don't know whether this is beginning flight or
- resuming it; that could be tracked so that this message could
- be adjusted to "resume flying", but isn't worth the effort...] */
- - if (Flying)
- + if (Flying && !was_flying)
- You("start flying.");
- }
- if ((!!Levitation ^ was_levitating) || (!!Flying ^ was_flying))
- diff --git c/src/insight.c i/src/insight.c
- index 6e300241b..8267664c6 100644
- --- c/src/insight.c
- +++ i/src/insight.c
- @@ -293,7 +293,7 @@ int unused_mode UNUSED;
- int final;
- {
- const char *role_titl, *rank_titl;
- - int innategend, difgend, difalgn;
- + int innategend, difgend, difalgn, difrace;
- char buf[BUFSZ], tmpbuf[BUFSZ];
- /* note that if poly'd, we need to use u.mfemale instead of flags.female
- @@ -377,12 +377,14 @@ int final;
- trailing "and" on all three aligned entries but looks too verbose] */
- Sprintf(buf, " who %s opposed by", !final ? "is" : "was");
- if (u.ualign.type != A_LAWFUL)
- - Sprintf(eos(buf), " %s (%s) and", align_gname(A_LAWFUL),
- - align_str(A_LAWFUL));
- + Sprintf(eos(buf), " %s (%s)%s", align_gname(A_LAWFUL),
- + align_str(A_LAWFUL),
- + (u.ualign.type != A_NONE) ? " and" : ",");
- if (u.ualign.type != A_NEUTRAL)
- Sprintf(eos(buf), " %s (%s)%s", align_gname(A_NEUTRAL),
- align_str(A_NEUTRAL),
- - (u.ualign.type != A_CHAOTIC) ? " and" : "");
- + (u.ualign.type == A_NONE) ? ", and" /* oxford comma */
- + : (u.ualign.type != A_CHAOTIC) ? " and" : "");
- if (u.ualign.type != A_CHAOTIC)
- Sprintf(eos(buf), " %s (%s)", align_gname(A_CHAOTIC),
- align_str(A_CHAOTIC));
- @@ -397,12 +399,26 @@ int final;
- difalgn = (((u.ualign.type != u.ualignbase[A_CURRENT]) ? 1 : 0)
- + ((u.ualignbase[A_CURRENT] != u.ualignbase[A_ORIGINAL])
- ? 2 : 0));
- + difrace = g.urace.malenum != races[flags.initrace].malenum;
- if (difalgn & 1) { /* have temporary alignment so report permanent one */
- Sprintf(buf, "actually %s", align_str(u.ualignbase[A_CURRENT]));
- you_are(buf, "");
- difalgn &= ~1; /* suppress helm from "started out <foo>" message */
- }
- - if (difgend || difalgn) { /* sex change or perm align change or both */
- + if (difrace) { /* permanent race change (Inf crowning) */
- + buf[0] = '\0';
- + if (difalgn) {
- + Strcat(buf, align_str(u.ualignbase[A_ORIGINAL]));
- + Strcat(buf, " ");
- + }
- + if (difgend) {
- + Strcat(buf, genders[flags.initgend].adj);
- + Strcat(buf, " ");
- + }
- + Strcat(buf, races[flags.initrace].noun);
- + Sprintf(buf, " You started out as %s.", an(buf));
- + enlght_out(buf);
- + } else if (difgend || difalgn) { /* sex change or perm align change */
- Sprintf(buf, " You started out %s%s%s.",
- difgend ? genders[flags.initgend].adj : "",
- (difgend && difalgn) ? " and " : "",
- @@ -968,6 +984,25 @@ int final;
- enl_msg("You ", "fall", "fell", " asleep uncontrollably", buf);
- }
- }
- + /* In case the player missed the "urge to perform a sacrifice",
- + * put a reminder here. */
- + if (u.ualign.type == A_NONE) {
- + long due = g.moves - g.context.next_moloch_offering;
- + if (due < 0) {
- + if (wizard) {
- + Sprintf(buf, "%ld turns until your next "
- + "mandatory sacrifice to ", -due);
- + you_have(buf, u_gname());
- + }
- + } else {
- + if (wizard && due > 0)
- + Sprintf(buf, "%ld turns late for your "
- + "next sacrifice to ", due);
- + else
- + Strcpy(buf, "due for a sacrifice to ");
- + you_are(buf, u_gname());
- + }
- + }
- /* hunger/nutrition */
- if (Hunger) {
- if (magic || cause_known(HUNGER))
- @@ -1251,9 +1286,10 @@ int final;
- enlght_out(final ? "Final Attributes:" : "Current Attributes:");
- if (u.uevent.uhand_of_elbereth) {
- - static const char *const hofe_titles[3] = { "the Hand of Elbereth",
- + static const char *const hofe_titles[4] = { "the Hand of Elbereth",
- "the Envoy of Balance",
- - "the Glory of Arioch" };
- + "the Glory of Arioch",
- + "a demon of Moloch" };
- you_are(hofe_titles[u.uevent.uhand_of_elbereth - 1], "");
- }
- @@ -1422,7 +1458,7 @@ int final;
- BLevitation = save_BLev;
- }
- /* actively flying handled earlier as a status condition */
- - if (BFlying) { /* flight is blocked */
- + if (BFlying && !Flying) { /* flight is blocked */
- long save_BFly = BFlying;
- BFlying = 0L;
- @@ -1444,7 +1480,9 @@ int final;
- ? if_surroundings_permitted
- /* two or more of levitation, surroundings,
- and being trapped in the floor */
- - : " if circumstances permitted",
- + : (save_BFly == W_ARM)
- + ? " if your wings weren't confined"
- + : " if circumstances permitted",
- "");
- }
- BFlying = save_BFly;
- @@ -1916,7 +1954,9 @@ int final; /* used "behind the curtain" by enl_foo() macros */
- if (remove_achievement(ACH_UWIN)) { /* UWIN == Ascended! */
- /* for ascension, force it to be last and Amulet next to last
- by taking them out and then adding them back */
- - if (remove_achievement(ACH_AMUL)) /* should always be True here */
- + /* Inf are an exception, as the Amulet offering
- + * is not endgame to them */
- + if (!Role_if(PM_INFIDEL) && remove_achievement(ACH_AMUL))
- record_achievement(ACH_AMUL);
- record_achievement(ACH_UWIN);
- }
- @@ -1994,9 +2034,11 @@ int final; /* used "behind the curtain" by enl_foo() macros */
- case ACH_AMUL:
- /* alternate wording for ascended (always past tense) since
- hero had it until #offer forced it to be relinquished */
- + /* always means "delivered" for Infidels */
- enl_msg(You_,
- - u.uhave.amulet ? "have" : "have obtained",
- - u.uevent.ascended ? "delivered"
- + Role_if(PM_INFIDEL) ? "have delivered"
- + : u.uhave.amulet ? "have" : "have obtained",
- + Role_if(PM_INFIDEL) || u.uevent.ascended ? "delivered"
- : u.uhave.amulet ? "had" : "had obtained",
- " the Amulet of Yendor", "");
- break;
- diff --git c/src/invent.c i/src/invent.c
- index 0e0ccec8f..8df7b49f3 100644
- --- c/src/invent.c
- +++ i/src/invent.c
- @@ -812,7 +812,8 @@ struct obj *obj;
- if (u.uhave.amulet)
- impossible("already have amulet?");
- u.uhave.amulet = 1;
- - record_achievement(ACH_AMUL);
- + if (!Role_if(PM_INFIDEL))
- + record_achievement(ACH_AMUL);
- } else if (obj->otyp == CANDELABRUM_OF_INVOCATION) {
- if (u.uhave.menorah)
- impossible("already have candelabrum?");
- @@ -833,6 +834,8 @@ struct obj *obj;
- if (u.uhave.questart)
- impossible("already have quest artifact?");
- u.uhave.questart = 1;
- + if (Role_if(PM_INFIDEL) && obj->spe)
- + u.uhave.amulet = 1;
- artitouch(obj);
- }
- set_artifact_intrinsic(obj, 1, W_ART);
- @@ -1057,7 +1060,8 @@ const char *drop_fmt, *drop_arg, *hold_msg;
- drop_arg = strcpy(buf, drop_arg);
- obj = addinv_core0(obj, (struct obj *) 0, FALSE);
- - if (inv_cnt(FALSE) > 52 || ((obj->otyp != LOADSTONE || !obj->cursed)
- + if (inv_cnt(FALSE) > 52 || ((obj->otyp != LOADSTONE
- + || !cursed(obj, TRUE))
- && near_capacity() > prev_encumbr)) {
- /* undo any merge which took place */
- if (obj->quan > oquan)
- @@ -1164,6 +1168,8 @@ struct obj *obj;
- if (!u.uhave.questart)
- impossible("don't have quest artifact?");
- u.uhave.questart = 0;
- + if (Role_if(PM_INFIDEL) && obj->spe)
- + u.uhave.amulet = 0;
- }
- set_artifact_intrinsic(obj, 0, W_ART);
- }
- @@ -1213,6 +1219,7 @@ register struct obj *obj;
- boolean update_map;
- if (obj->otyp == AMULET_OF_YENDOR
- + || Role_if(PM_INFIDEL) && is_quest_artifact(obj) && obj->spe
- || obj->otyp == CANDELABRUM_OF_INVOCATION
- || obj->otyp == BELL_OF_OPENING
- || obj->otyp == SPE_BOOK_OF_THE_DEAD) {
- @@ -1442,7 +1449,7 @@ boolean
- splittable(obj)
- struct obj *obj;
- {
- - return !((obj->otyp == LOADSTONE && obj->cursed)
- + return !((obj->otyp == LOADSTONE && cursed(obj, TRUE))
- || (obj == uwep && welded(uwep)));
- }
- @@ -1654,10 +1661,11 @@ register const char *let, *word;
- || (!strncmp(word, "rub on the stone", 16)
- && *let == GEM_CLASS && otmp->dknown
- && objects[otyp].oc_name_known)
- - /* suppress corpses on astral, amulets elsewhere */
- + /* suppress corpses on astral (or sanctum), amulets elsewhere */
- || (!strcmp(word, "sacrifice")
- /* (!astral && amulet) || (astral && !amulet) */
- - && (!Is_astralevel(&u.uz) ^ (otmp->oclass != AMULET_CLASS)))
- + && ((!Is_astralevel(&u.uz) && !Is_sanctum(&u.uz))
- + ^ (otmp->oclass != AMULET_CLASS)))
- /* suppress container being stashed into */
- || (!strcmp(word, "stash") && !ck_bag(otmp))
- /* worn armor (shirt, suit) covered by worn armor (suit, cloak)
- @@ -1873,7 +1881,7 @@ register const char *let, *word;
- /* don't split a stack of cursed loadstones */
- if (splittable(otmp))
- otmp = splitobj(otmp, cnt);
- - else if (otmp->otyp == LOADSTONE && otmp->cursed)
- + else if (otmp->otyp == LOADSTONE && cursed(otmp, TRUE))
- /* kludge for canletgo()'s can't-drop-this message */
- otmp->corpsenm = (int) cnt;
- }
- diff --git c/src/makemon.c i/src/makemon.c
- index b325c64a7..59bd9fcd9 100644
- --- c/src/makemon.c
- +++ i/src/makemon.c
- @@ -182,7 +182,7 @@ register struct monst *mtmp;
- (void) mongets(mtmp, (mm != PM_ETTIN) ? BOULDER : CLUB);
- break;
- case S_HUMAN:
- - if (is_mercenary(ptr)) {
- + if (is_mercenary(ptr) || mm == PM_TEMPLAR) {
- w1 = w2 = 0;
- switch (mm) {
- case PM_WATCHMAN:
- @@ -201,6 +201,7 @@ register struct monst *mtmp;
- break;
- case PM_CAPTAIN:
- case PM_WATCH_CAPTAIN:
- + case PM_TEMPLAR:
- w1 = rn2(2) ? LONG_SWORD : SILVER_SABER;
- break;
- default:
- @@ -263,11 +264,20 @@ register struct monst *mtmp;
- } else if (mm == PM_NINJA) { /* extra quest villains */
- (void) mongets(mtmp, rn2(4) ? SHURIKEN : DART);
- (void) mongets(mtmp, rn2(4) ? SHORT_SWORD : AXE);
- + } else if (mm == PM_CHAMPION) {
- + (void) mongets(mtmp, rn2(2) ? TWO_HANDED_SWORD : BATTLE_AXE);
- + (void) mongets(mtmp, rn2(3) ? RING_MAIL : CHAIN_MAIL);
- + } else if (mm == PM_AGENT) {
- + (void) mongets(mtmp, rn2(4) ? SHORT_SWORD : DAGGER);
- + if (!rn2(3))
- + (void) mongets(mtmp, LEATHER_ARMOR);
- + (void) mongets(mtmp, POT_INVISIBILITY);
- } else if (ptr->msound == MS_GUARDIAN) {
- /* quest "guardians" */
- switch (mm) {
- case PM_STUDENT:
- case PM_ATTENDANT:
- + case PM_CULTIST:
- case PM_ABBOT:
- case PM_ACOLYTE:
- case PM_GUIDE:
- @@ -584,7 +594,7 @@ register struct monst *mtmp;
- */
- switch (ptr->mlet) {
- case S_HUMAN:
- - if (is_mercenary(ptr)) {
- + if (is_mercenary(ptr) || monsndx(ptr) == PM_TEMPLAR) {
- register int mac;
- switch (monsndx(ptr)) {
- @@ -609,6 +619,9 @@ register struct monst *mtmp;
- case PM_WATCH_CAPTAIN:
- mac = -2;
- break;
- + case PM_TEMPLAR:
- + mac = -3;
- + break;
- default:
- impossible("odd mercenary %d?", monsndx(ptr));
- mac = 0;
- @@ -668,6 +681,10 @@ register struct monst *mtmp;
- } else if (ptr == &mons[PM_WATCHMAN]) {
- if (rn2(3)) /* most watchmen carry a whistle */
- (void) mongets(mtmp, TIN_WHISTLE);
- + } else if (ptr == &mons[PM_TEMPLAR]) {
- + if (rn2(3)) /* being in a holy order has its benefits */
- + (void) mongets(mtmp, rn2(4) ? POT_HEALING
- + : POT_EXTRA_HEALING);
- } else if (ptr == &mons[PM_GUARD]) {
- /* if hero teleports out of a vault while being confronted
- by the vault's guard, there is a shrill whistling sound,
- @@ -708,6 +725,22 @@ register struct monst *mtmp;
- mkmonmoney(mtmp, (long) rn1(10, 20));
- } else if (quest_mon_represents_role(ptr, PM_MONK)) {
- (void) mongets(mtmp, rn2(11) ? ROBE : CLOAK_OF_MAGIC_RESISTANCE);
- + } else if (ptr == &mons[PM_PREACHER_OF_MOLOCH]) {
- + (void) mongets(mtmp, QUARTERSTAFF);
- + (void) mongets(mtmp, rn2(3) ? ROBE : CLOAK_OF_PROTECTION);
- + } else if (ptr == &mons[PM_PALADIN]) {
- + otmp = mksobj(MORNING_STAR, FALSE, FALSE);
- + otmp->blessed = otmp->oerodeproof = 1;
- + otmp->spe = rn1(3, 3);
- + (void) mpickobj(mtmp, otmp);
- + /* the Paladin wears no helmet
- + * because she looks cooler without a helmet */
- + (void) mongets(mtmp, LEATHER_GLOVES);
- + (void) mongets(mtmp, SHIELD_OF_REFLECTION);
- + (void) mongets(mtmp, LEATHER_CLOAK);
- + (void) mongets(mtmp, CRYSTAL_PLATE_MAIL);
- + (void) mongets(mtmp, HIGH_BOOTS);
- + (void) mongets(mtmp, POT_SPEED);
- }
- break;
- case S_NYMPH:
- @@ -1284,7 +1317,7 @@ long mmflags;
- mtmp->mpeaceful = FALSE;
- break;
- case S_UNICORN:
- - if (is_unicorn(ptr) && sgn(u.ualign.type) == sgn(ptr->maligntyp))
- + if (is_unicorn(ptr) && u.ualign.type == sgn(ptr->maligntyp))
- mtmp->mpeaceful = TRUE;
- break;
- case S_BAT:
- @@ -1372,6 +1405,13 @@ long mmflags;
- ? !eminp->renegade
- : eminp->renegade;
- }
- + /* these monsters are normally affiliated with a deity */
- + if ((mndx == PM_PALADIN || mndx == PM_TEMPLAR || mndx == PM_CHAMPION
- + || mndx == PM_AGENT) && !(mmflags & MM_EMIN)) {
- + newemin(mtmp);
- + mtmp->isminion = 1;
- + EMIN(mtmp)->min_align = sgn(ptr->maligntyp);
- + }
- set_malign(mtmp); /* having finished peaceful changes */
- if (anymon && !(mmflags & MM_NOGRP)) {
- if ((ptr->geno & G_SGROUP) && rn2(2)) {
- @@ -2042,7 +2082,11 @@ register struct permonst *ptr;
- if (always_peaceful(ptr))
- return TRUE;
- - if (always_hostile(ptr))
- + /* Major demons will sometimes be peaceful to unaligned Infidels.
- + * They must pass this 50% check, then the 50% check for chaotics
- + * being non-hostile to unaligned, then the usual check for coaligned.
- + * For crowned Infidels, the last two checks are bypassed. */
- + if (always_hostile(ptr) && (ual != A_NONE || !is_demon(ptr) || rn2(2)))
- return FALSE;
- if (ptr->msound == MS_LEADER || ptr->msound == MS_GUARDIAN)
- return TRUE;
- @@ -2059,8 +2103,12 @@ register struct permonst *ptr;
- if (sgn(mal) != sgn(ual))
- return FALSE;
- - /* Negative monster hostile to player with Amulet. */
- - if (mal < A_NEUTRAL && u.uhave.amulet)
- + /* Not all chaotics support Moloch. This goes especially for elves. */
- + if (ual == A_NONE && (is_elf(ptr) || rn2(2)))
- + return FALSE;
- +
- + /* Chaotic monsters hostile to players with Amulet, except Infidels. */
- + if (mal < A_NEUTRAL && u.uhave.amulet && ual != A_NONE)
- return FALSE;
- /* minions are hostile to players that have strayed at all */
- @@ -2105,7 +2153,7 @@ struct monst *mtmp;
- mal *= 5;
- }
- - coaligned = (sgn(mal) == sgn(u.ualign.type));
- + coaligned = (sgn(mal) == u.ualign.type);
- if (mtmp->data->msound == MS_LEADER) {
- mtmp->malign = -20;
- } else if (mal == A_NONE) {
- @@ -2113,6 +2161,8 @@ struct monst *mtmp;
- mtmp->malign = 0;
- else
- mtmp->malign = 20; /* really hostile */
- + if (u.ualign.type == A_NONE)
- + mtmp->malign -= 20; /* reverse */
- } else if (always_peaceful(mtmp->data)) {
- int absmal = abs(mal);
- if (mtmp->mpeaceful)
- diff --git c/src/mcastu.c i/src/mcastu.c
- index bc1000fbe..02d8c5116 100644
- --- c/src/mcastu.c
- +++ i/src/mcastu.c
- @@ -375,7 +375,7 @@ int spellnum;
- switch (spellnum) {
- case MGC_DEATH_TOUCH:
- pline("Oh no, %s's using the touch of death!", mhe(mtmp));
- - if (nonliving(g.youmonst.data) || is_demon(g.youmonst.data)) {
- + if (nonliving(g.youmonst.data) || is_demon(raceptr(&g.youmonst))) {
- You("seem no deader than before.");
- } else if (!Antimagic && rn2(mtmp->m_lev) > 12) {
- if (Hallucination) {
- diff --git c/src/mhitu.c i/src/mhitu.c
- index 29d257294..e5193cc68 100644
- --- c/src/mhitu.c
- +++ i/src/mhitu.c
- @@ -792,7 +792,7 @@ boolean youseeit;
- */
- if (is_demon(mdat)) {
- - if (mdat != &mons[PM_BALROG]
- + if (mdat != &mons[PM_BALROG] && mdat != &mons[PM_DEMON]
- && mdat != &mons[PM_SUCCUBUS] && mdat != &mons[PM_INCUBUS]) {
- if (!rn2(13))
- (void) msummon(mtmp);
- diff --git c/src/minion.c i/src/minion.c
- index 03706027a..c8d3a87db 100644
- --- c/src/minion.c
- +++ i/src/minion.c
- @@ -260,7 +260,7 @@ register struct monst *mtmp;
- }
- newsym(mtmp->mx, mtmp->my);
- }
- - if (g.youmonst.data->mlet == S_DEMON) { /* Won't blackmail their own. */
- + if (is_demon(raceptr(&g.youmonst))) { /* Won't blackmail their own. */
- pline("%s says, \"Good hunting, %s.\"", Amonnam(mtmp),
- flags.female ? "Sister" : "Brother");
- if (!tele_restrict(mtmp))
- diff --git c/src/mon.c i/src/mon.c
- index f9b5fd6d4..21b1efad2 100644
- --- c/src/mon.c
- +++ i/src/mon.c
- @@ -2640,7 +2640,7 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
- }
- if ((mtmp->mpeaceful && !rn2(2)) || mtmp->mtame)
- change_luck(-1);
- - if (is_unicorn(mdat) && sgn(u.ualign.type) == sgn(mdat->maligntyp)) {
- + if (is_unicorn(mdat) && u.ualign.type == sgn(mdat->maligntyp)) {
- change_luck(-5);
- You_feel("guilty...");
- }
- @@ -2668,7 +2668,7 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
- /* cancel divine protection for killing your priest */
- if (p_coaligned(mtmp))
- u.ublessed = 0;
- - if (mdat->maligntyp == A_NONE)
- + else if (mdat->maligntyp == A_NONE)
- adjalign((int) (ALIGNLIM / 4)); /* BIG bonus */
- } else if (mtmp->mtame) {
- adjalign(-15); /* bad!! */
- @@ -3068,7 +3068,6 @@ boolean via_attack;
- /* only hypocritical if monster is vulnerable to Elbereth (or
- peaceful--not vulnerable but attacking it is hypocritical) */
- && (onscary(u.ux, u.uy, mtmp) || mtmp->mpeaceful)) {
- - You_feel("like a hypocrite.");
- /* AIS: Yes, I know alignment penalties and bonuses aren't balanced
- at the moment. This is about correct relative to other "small"
- penalties; it should be fairly large, as attacking while standing
- @@ -3077,7 +3076,11 @@ boolean via_attack;
- it's intentionally larger than the 1s and 2s that are normally
- given for this sort of thing. */
- /* reduce to 3 (average) when alignment is already very low */
- - adjalign((u.ualign.record > 5) ? -5 : -rnd(5));
- + if (u.ualign.type != A_NONE) {
- + You_feel("like a hypocrite.");
- + adjalign((u.ualign.record > 5) ? -5 : -rnd(5));
- + } else
- + You_feel("wily."); /* no alignment penalty */
- if (!Blind)
- pline("The engraving beneath you fades.");
- diff --git c/src/mondata.c i/src/mondata.c
- index 4e0ba2d0a..4e13ae429 100644
- --- c/src/mondata.c
- +++ i/src/mondata.c
- @@ -97,7 +97,7 @@ boolean
- resists_drli(mon)
- struct monst *mon;
- {
- - struct permonst *ptr = mon->data;
- + struct permonst *ptr = raceptr(mon); /* handle demonic race */
- struct obj *wep;
- if (is_undead(ptr) || is_demon(ptr) || is_were(ptr)
- @@ -430,8 +430,7 @@ register struct permonst *ptr;
- return (boolean) (bigmonst(ptr)
- || (ptr->msize > MZ_SMALL && !humanoid(ptr))
- /* special cases of humanoids that cannot wear suits */
- - || ptr == &mons[PM_MARILITH]
- - || ptr == &mons[PM_WINGED_GARGOYLE]);
- + || ptr == &mons[PM_MARILITH]);
- }
- /* creature sticks other creatures it hits */
- @@ -1130,7 +1129,7 @@ int montyp1, montyp2;
- * Returns correct pointer for non-polymorphed and polymorphed
- * player. It does not return a pointer to player role character.
- */
- -const struct permonst *
- +struct permonst *
- raceptr(mtmp)
- struct monst *mtmp;
- {
- diff --git c/src/monmove.c i/src/monmove.c
- index 7c03b2236..f5a720c3c 100644
- --- c/src/monmove.c
- +++ i/src/monmove.c
- @@ -396,6 +396,14 @@ int *inrange, *nearby, *scared;
- || (!mtmp->mpeaceful && in_your_sanctuary(mtmp, 0, 0)))) {
- *scared = 1;
- monflee(mtmp, rnd(rn2(7) ? 10 : 100), TRUE, TRUE);
- + if (u.ualign.type == A_NONE && !g.context.coward
- + && sengr_at("Elbereth", seescaryx, seescaryy, TRUE)) {
- + /* Followers of Moloch aren't supposed
- + * to hide behind other gods. */
- + You_feel("like a coward.");
- + g.context.coward = TRUE; /* once per move */
- + adjalign(-5);
- + }
- } else
- *scared = 0;
- }
- @@ -999,6 +1007,9 @@ register int after;
- > ((ygold = findgold(g.invent)) ? ygold->quan : 0L))))
- appr = -1;
- + if (monsndx(ptr) == PM_AGENT && mon_has_amulet(mtmp))
- + appr = -1; /* objective secured, retreat */
- +
- /* hostile monsters with ranged thrown weapons try to stay away */
- if (!mtmp->mpeaceful
- && (dist2(mtmp->mx, mtmp->my, mtmp->mux, mtmp->muy) < 5*5)
- diff --git c/src/monst.c i/src/monst.c
- index 9b8961636..5a0364c33 100644
- --- c/src/monst.c
- +++ i/src/monst.c
- @@ -2159,6 +2159,27 @@ struct permonst _mons2[] = {
- M1_HUMANOID | M1_POIS | M1_REGEN | M1_OMNIVORE,
- M2_NOPOLY | M2_WERE | M2_HOSTILE | M2_HUMAN | M2_COLLECT,
- M3_INFRAVISIBLE, 6, CLR_ORANGE),
- + /* Only generated when playing as Infidel.
- + * Has emin, so always appears as a "champion of [deity]".
- + * Note: the difficulty is purposefully lowered. */
- + MON("champion", S_HUMAN, LVL(12, 12, 6, 10, 0), (G_NOGEN | G_NOHELL | 2),
- + A(ATTK(AT_WEAP, AD_PHYS, 2, 6), ATTK(AT_WEAP, AD_PHYS, 2, 6), NO_ATTK,
- + NO_ATTK, NO_ATTK, NO_ATTK),
- + SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), MR_POISON, 0,
- + M1_HUMANOID | M1_OMNIVORE,
- + M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_NASTY | M2_STRONG | M2_COLLECT,
- + M3_INFRAVISIBLE, 6, CLR_GRAY),
- + /* Only generated when playing as Infidel.
- + * Has emin, so always appears as an "agent of [deity]".
- + * Note: the difficulty is purposefully lowered. */
- + MON("agent", S_HUMAN, LVL(6, 18, 10, 10, -7), (G_NOGEN | G_NOHELL | 3),
- + A(ATTK(AT_WEAP, AD_SAMU, 1, 4), ATTK(AT_CLAW, AD_SAMU, 1, 1),
- + ATTK(AT_CLAW, AD_SAMU, 1, 1), ATTK(AT_CLAW, AD_SAMU, 1, 1),
- + NO_ATTK, NO_ATTK),
- + SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), 0, 0,
- + M1_HUMANOID | M1_OMNIVORE | M1_TPORT,
- + M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_STALK | M2_STRONG | M2_COLLECT,
- + M3_INFRAVISIBLE, 6, CLR_BLACK),
- MON("elf", S_HUMAN, LVL(0, 12, 10, 2, -3), G_NOGEN, /* for corpses */
- A(ATTK(AT_WEAP, AD_PHYS, 1, 8),
- NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
- @@ -2626,6 +2647,14 @@ struct permonst _mons2[] = {
- SIZ(1500, 400, MS_DJINNI, MZ_HUMAN), MR_POISON | MR_STONE, 0,
- M1_HUMANOID | M1_FLY | M1_POIS, M2_NOPOLY | M2_STALK | M2_COLLECT,
- M3_INFRAVISIBLE, 8, CLR_YELLOW),
- + /* racial monster for crowned Infidels */
- + MON("demon", S_DEMON, LVL(10, 12, 10, 10, A_NONE), (G_NOGEN | G_NOCORPSE),
- + A(ATTK(AT_WEAP, AD_PHYS, 1, 8), ATTK(AT_STNG, AD_DRST, 2, 4),
- + NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
- + SIZ(WT_HUMAN, 400, MS_GRUNT, MZ_HUMAN), MR_FIRE | MR_POISON, 0,
- + M1_HUMANOID | M1_FLY | M1_SEE_INVIS | M1_POIS,
- + M2_NOPOLY | M2_DEMON | M2_STALK | M2_HOSTILE | M2_COLLECT,
- + M3_INFRAVISIBLE | M3_INFRAVISION, 13, CLR_RED),
- /*
- * sea monsters
- */
- @@ -2776,6 +2805,13 @@ struct permonst _mons2[] = {
- M1_HUMANOID | M1_OMNIVORE,
- M2_NOPOLY | M2_HUMAN | M2_STRONG | M2_COLLECT, M3_INFRAVISIBLE,
- 12, HI_DOMESTIC),
- + MON("infidel", S_HUMAN, LVL(10, 12, 10, 2, A_NONE), G_NOGEN,
- + A(ATTK(AT_WEAP, AD_PHYS, 1, 6), NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK,
- + NO_ATTK),
- + SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), MR_FIRE, 0,
- + M1_HUMANOID | M1_OMNIVORE,
- + M2_NOPOLY | M2_HUMAN | M2_STRONG | M2_COLLECT, M3_INFRAVISIBLE,
- + 12, HI_DOMESTIC),
- MON("knight", S_HUMAN, LVL(10, 12, 10, 1, 3), G_NOGEN,
- A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_WEAP, AD_PHYS, 1, 6), NO_ATTK,
- NO_ATTK, NO_ATTK, NO_ATTK),
- @@ -2903,6 +2939,17 @@ struct permonst _mons2[] = {
- M2_NOPOLY | M2_HUMAN | M2_PNAME | M2_PEACEFUL | M2_STRONG | M2_MALE
- | M2_COLLECT | M2_MAGIC,
- M3_CLOSE | M3_INFRAVISIBLE, 22, HI_LORD),
- + /* apparently she should be a "preacheress" if female,
- + * but that word just sounds silly, imo */
- + MON("preacher of Moloch", S_HUMAN, LVL(20, 12, 0, 40, A_NONE),
- + (G_NOGEN | G_UNIQ),
- + A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_MAGC, AD_CLRC, 0, 0), NO_ATTK,
- + NO_ATTK, NO_ATTK, NO_ATTK),
- + SIZ(WT_HUMAN, 400, MS_LEADER, MZ_HUMAN), MR_FIRE | MR_ELEC, 0,
- + M1_HUMANOID | M1_OMNIVORE,
- + M2_NOPOLY | M2_HUMAN | M2_PEACEFUL | M2_STRONG | M2_COLLECT
- + | M2_MAGIC,
- + M3_CLOSE | M3_INFRAVISIBLE, 23, CLR_RED),
- MON("King Arthur", S_HUMAN, LVL(20, 12, 0, 40, 20), (G_NOGEN | G_UNIQ),
- A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_WEAP, AD_PHYS, 1, 6), NO_ATTK,
- NO_ATTK, NO_ATTK, NO_ATTK),
- @@ -3045,6 +3092,18 @@ struct permonst _mons2[] = {
- | M2_HOSTILE | M2_NASTY | M2_MALE | M2_JEWELS | M2_COLLECT,
- M3_WANTSARTI | M3_WAITFORU | M3_INFRAVISION | M3_INFRAVISIBLE,
- 23, CLR_GRAY),
- + /* Has emin, so always appears as the "Paladin of [deity]". */
- + MON("Paladin", S_HUMAN, LVL(24, 12, 0, 50, 20),
- + (G_NOGEN | G_UNIQ | G_NOCORPSE),
- + A(ATTK(AT_WEAP, AD_PHYS, 4, 4), ATTK(AT_WEAP, AD_STUN, 2, 6),
- + ATTK(AT_MAGC, AD_CLRC, 1, 8), ATTK(AT_CLAW, AD_SAMU, 1, 6),
- + NO_ATTK, NO_ATTK),
- + SIZ(WT_HUMAN, 400, MS_NEMESIS, MZ_HUMAN), MR_POISON | MR_STONE, 0,
- + M1_HUMANOID | M1_OMNIVORE | M1_SEE_INVIS,
- + M2_NOPOLY | M2_HUMAN | M2_MINION | M2_LORD | M2_STRONG | M2_FEMALE
- + | M2_STALK | M2_HOSTILE | M2_NASTY | M2_COLLECT | M2_MAGIC,
- + M3_WANTSARTI | M3_WANTSAMUL | M3_WAITFORU | M3_INFRAVISIBLE,
- + 29, HI_GOLD),
- MON("Ixoth", S_DRAGON, LVL(15, 12, -1, 20, -14), (G_NOGEN | G_UNIQ),
- A(ATTK(AT_BREA, AD_FIRE, 8, 6), ATTK(AT_BITE, AD_PHYS, 4, 8),
- ATTK(AT_MAGC, AD_SPEL, 0, 0), ATTK(AT_CLAW, AD_PHYS, 2, 4),
- @@ -3167,6 +3226,21 @@ struct permonst _mons2[] = {
- M1_HUMANOID | M1_OMNIVORE,
- M2_NOPOLY | M2_HUMAN | M2_PEACEFUL | M2_STRONG | M2_COLLECT,
- M3_INFRAVISIBLE, 7, HI_DOMESTIC),
- + /* Has emin, so always appears as a "templar of [deity]". */
- + MON("templar", S_HUMAN, LVL(12, 10, 10, 20, 10), G_NOGEN,
- + A(ATTK(AT_WEAP, AD_PHYS, 3, 4), ATTK(AT_WEAP, AD_PHYS, 3, 4), NO_ATTK,
- + NO_ATTK, NO_ATTK, NO_ATTK),
- + SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), 0, 0,
- + M1_HUMANOID | M1_OMNIVORE,
- + M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_STRONG | M2_COLLECT,
- + M3_INFRAVISIBLE, 14, CLR_BLUE),
- + MON("cultist", S_HUMAN, LVL(5, 12, 10, 10, A_NONE), G_NOGEN,
- + A(ATTK(AT_WEAP, AD_PHYS, 1, 6), NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK,
- + NO_ATTK),
- + SIZ(WT_HUMAN, 400, MS_GUARDIAN, MZ_HUMAN), MR_FIRE, 0,
- + M1_HUMANOID | M1_OMNIVORE,
- + M2_NOPOLY | M2_HUMAN | M2_PEACEFUL | M2_STRONG | M2_COLLECT,
- + M3_INFRAVISIBLE, 7, HI_DOMESTIC),
- MON("page", S_HUMAN, LVL(5, 12, 10, 10, 3), G_NOGEN,
- A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_WEAP, AD_PHYS, 1, 6), NO_ATTK,
- NO_ATTK, NO_ATTK, NO_ATTK),
- diff --git c/src/mplayer.c i/src/mplayer.c
- index 13a44ed35..6925b1d25 100644
- --- c/src/mplayer.c
- +++ i/src/mplayer.c
- @@ -195,6 +195,16 @@ register boolean special;
- if (rn2(2))
- shield = STRANGE_OBJECT;
- break;
- + case PM_INFIDEL:
- + if (!rn2(4))
- + weapon = CRYSKNIFE;
- + if (rn2(3))
- + cloak = CLOAK_OF_PROTECTION;
- + if (rn2(4))
- + helm = rn2(2) ? HELM_OF_BRILLIANCE : HELM_OF_TELEPATHY;
- + if (rn2(2))
- + shield = STRANGE_OBJECT;
- + break;
- case PM_KNIGHT:
- if (rn2(4))
- weapon = LONG_SWORD;
- diff --git c/src/muse.c i/src/muse.c
- index b0ff3427a..c80c244a5 100644
- --- c/src/muse.c
- +++ i/src/muse.c
- @@ -2332,6 +2332,9 @@ struct obj *obj;
- return (boolean) !(nonliving(mon->data) || is_vampshifter(mon));
- if (typ == AMULET_OF_REFLECTION || typ == AMULET_OF_GUARDING)
- return TRUE;
- + if (typ == AMULET_OF_YENDOR || typ == FAKE_AMULET_OF_YENDOR)
- + return (boolean) (mon->data == &mons[PM_AGENT]
- + && !mon_has_amulet(mon));
- break;
- case TOOL_CLASS:
- if (typ == PICK_AXE)
- diff --git c/src/pickup.c i/src/pickup.c
- index bd17ab0f9..e81f56778 100644
- --- c/src/pickup.c
- +++ i/src/pickup.c
- @@ -2278,11 +2278,12 @@ register struct obj *obj;
- Norep("You cannot %s %s you are wearing.",
- Icebox ? "refrigerate" : "stash", something);
- return 0;
- - } else if ((obj->otyp == LOADSTONE) && obj->cursed) {
- + } else if ((obj->otyp == LOADSTONE) && cursed(obj, TRUE)) {
- set_bknown(obj, 1);
- pline_The("stone%s won't leave your person.", plur(obj->quan));
- return 0;
- } else if (obj->otyp == AMULET_OF_YENDOR
- + || Role_if(PM_INFIDEL) && is_quest_artifact(obj) && obj->spe
- || obj->otyp == CANDELABRUM_OF_INVOCATION
- || obj->otyp == BELL_OF_OPENING
- || obj->otyp == SPE_BOOK_OF_THE_DEAD) {
- diff --git c/src/polyself.c i/src/polyself.c
- index b06f2287e..f45489007 100644
- --- c/src/polyself.c
- +++ i/src/polyself.c
- @@ -38,9 +38,11 @@ void
- set_uasmon()
- {
- struct permonst *mdat = &mons[u.umonnum];
- + struct permonst *racedat; /* for infravision, flying */
- boolean was_vampshifter = valid_vampshiftform(g.youmonst.cham, u.umonnum);
- set_mon_data(&g.youmonst, mdat);
- + racedat = raceptr(&g.youmonst);
- if (Protection_from_shape_changers)
- g.youmonst.cham = NON_PM;
- @@ -87,7 +89,7 @@ set_uasmon()
- PROPSET(SEE_INVIS, perceives(mdat));
- PROPSET(TELEPAT, telepathic(mdat));
- /* note that Infravision uses mons[race] rather than usual mons[role] */
- - PROPSET(INFRAVISION, infravision(Upolyd ? mdat : &mons[g.urace.malenum]));
- + PROPSET(INFRAVISION, infravision(racedat));
- PROPSET(INVIS, pm_invisible(mdat));
- PROPSET(TELEPORT, can_teleport(mdat));
- PROPSET(TELEPORT_CONTROL, control_teleport(mdat));
- @@ -95,7 +97,9 @@ set_uasmon()
- /* floating eye is the only 'floater'; it is also flagged as a 'flyer';
- suppress flying for it so that enlightenment doesn't confusingly
- show latent flight capability always blocked by levitation */
- - PROPSET(FLYING, (is_flyer(mdat) && !is_floater(mdat)));
- + /* this property also checks race instead of role */
- + PROPSET(FLYING, (is_flyer(racedat) && !is_floater(racedat)));
- + check_wings(TRUE);
- PROPSET(SWIMMING, is_swimmer(mdat));
- /* [don't touch MAGICAL_BREATHING here; both Amphibious and Breathless
- key off of it but include different monster forms...] */
- diff --git c/src/potion.c i/src/potion.c
- index c07d96cab..f7b2fe722 100644
- --- c/src/potion.c
- +++ i/src/potion.c
- @@ -657,8 +657,9 @@ register struct obj *otmp;
- break;
- }
- g.potion_unkn++;
- - if (is_undead(g.youmonst.data) || is_demon(g.youmonst.data)
- - || u.ualign.type == A_CHAOTIC) {
- + if (is_undead(g.youmonst.data) || is_demon(raceptr(&g.youmonst))
- + || u.ualign.type <= A_CHAOTIC) {
- + int dice = (u.ualign.type == A_NONE) ? 4 : 2;
- if (otmp->blessed) {
- pline("This burns like %s!", hliquid("acid"));
- exercise(A_CON, FALSE);
- @@ -669,11 +670,11 @@ register struct obj *otmp;
- you_unwere(FALSE);
- set_ulycn(NON_PM); /* cure lycanthropy */
- }
- - losehp(Maybe_Half_Phys(d(2, 6)), "potion of holy water",
- + losehp(Maybe_Half_Phys(d(dice, 6)), "potion of holy water",
- KILLED_BY_AN);
- } else if (otmp->cursed) {
- You_feel("quite proud of yourself.");
- - healup(d(2, 6), 0, 0, 0);
- + healup(d(dice, 6), 0, 0, 0);
- if (u.ulycn >= LOW_PM && !Upolyd)
- you_were();
- exercise(A_CON, TRUE);
- diff --git c/src/pray.c i/src/pray.c
- index e0f104601..220a194e4 100644
- --- c/src/pray.c
- +++ i/src/pray.c
- @@ -12,8 +12,6 @@ static void FDECL(angrygods, (ALIGNTYP_P));
- static void FDECL(at_your_feet, (const char *));
- static void NDECL(gcrownu);
- static void FDECL(pleased, (ALIGNTYP_P));
- -static void FDECL(godvoice, (ALIGNTYP_P, const char *));
- -static void FDECL(god_zaps_you, (ALIGNTYP_P));
- static void FDECL(fry_by_god, (ALIGNTYP_P, BOOLEAN_P));
- static void FDECL(gods_angry, (ALIGNTYP_P));
- static void FDECL(gods_upset, (ALIGNTYP_P));
- @@ -22,7 +20,8 @@ static boolean FDECL(water_prayer, (BOOLEAN_P));
- static boolean FDECL(blocked_boulder, (int, int));
- /* simplify a few tests */
- -#define Cursed_obj(obj, typ) ((obj) && (obj)->otyp == (typ) && (obj)->cursed)
- +#define Cursed_obj(obj, typ) ((obj) && (obj)->otyp == (typ) \
- + && cursed(obj, TRUE))
- /*
- * Logic behind deities and altars and such:
- @@ -216,10 +215,11 @@ in_trouble()
- if (welded(uwep))
- return TROUBLE_UNUSEABLE_HANDS;
- if (Upolyd && nohands(g.youmonst.data)
- - && (!Unchanging || ((otmp = unchanger()) != 0 && otmp->cursed)))
- + && (!Unchanging || ((otmp = unchanger()) != 0
- + && cursed(otmp, TRUE))))
- return TROUBLE_UNUSEABLE_HANDS;
- }
- - if (Blindfolded && ublindf->cursed)
- + if (Blindfolded && cursed(ublindf, TRUE))
- return TROUBLE_CURSED_BLINDFOLD;
- /*
- @@ -269,6 +269,14 @@ worst_cursed_item()
- {
- register struct obj *otmp;
- + /* Infidels are immune to curses, but a cursed luckstone is still bad */
- + if (Role_if(PM_INFIDEL)) {
- + for (otmp = g.invent; otmp; otmp = otmp->nobj)
- + if (confers_luck(otmp) && otmp->cursed)
- + return otmp;
- + return (struct obj *) 0;
- + }
- +
- /* if strained or worse, check for loadstone first */
- if (near_capacity() >= HVY_ENCUMBER) {
- for (otmp = g.invent; otmp; otmp = otmp->nobj)
- @@ -447,7 +455,7 @@ int trouble;
- if (!Unchanging) {
- Your("shape becomes uncertain.");
- rehumanize(); /* "You return to {normal} form." */
- - } else if ((otmp = unchanger()) != 0 && otmp->cursed) {
- + } else if ((otmp = unchanger()) != 0 && cursed(otmp, TRUE)) {
- /* otmp is an amulet of unchanging */
- goto decurse;
- }
- @@ -492,7 +500,7 @@ int trouble;
- if (otmp == uarmg && Glib) {
- make_glib(0);
- Your("%s are no longer slippery.", gloves_simple_name(uarmg));
- - if (!otmp->cursed)
- + if (!cursed(otmp, TRUE))
- break;
- }
- if (!Blind || (otmp == ublindf && Blindfolded_only)) {
- @@ -573,7 +581,7 @@ int trouble;
- * bathroom walls, but who is foiled by bathrobes." --Bertrand Russell, 1943
- * Divine wrath, dungeon walls, and armor follow the same principle.
- */
- -static void
- +void
- god_zaps_you(resp_god)
- aligntyp resp_god;
- {
- @@ -761,14 +769,18 @@ gcrownu()
- boolean already_exists, in_hand;
- short class_gift;
- int sp_no;
- + xchar maxint, maxwis;
- #define ok_wep(o) ((o) && ((o)->oclass == WEAPON_CLASS || is_weptool(o)))
- HSee_invisible |= FROMOUTSIDE;
- HFire_resistance |= FROMOUTSIDE;
- - HCold_resistance |= FROMOUTSIDE;
- - HShock_resistance |= FROMOUTSIDE;
- - HSleep_resistance |= FROMOUTSIDE;
- HPoison_resistance |= FROMOUTSIDE;
- + if (u.ualign.type != A_NONE) {
- + /* demons don't get all the intrinsics */
- + HCold_resistance |= FROMOUTSIDE;
- + HShock_resistance |= FROMOUTSIDE;
- + HSleep_resistance |= FROMOUTSIDE;
- + }
- godvoice(u.ualign.type, (char *) 0);
- class_gift = STRANGE_OBJECT;
- @@ -809,6 +821,22 @@ gcrownu()
- || class_gift != STRANGE_OBJECT) ? "take lives"
- : "steal souls");
- break;
- + case A_NONE:
- + u.uevent.uhand_of_elbereth = 4;
- + verbalize("I grant thee the gift of Demonhood!");
- + class_gift = SPE_FIREBALL; /* no special weapon */
- + if (Upolyd)
- + rehumanize(); /* return to human/orcish form -- not a demon yet */
- + pline1("Wings sprout from your back and you grow a barbed tail!");
- + maxint = g.urace.attrmax[A_INT];
- + maxwis = g.urace.attrmax[A_WIS];
- + g.urace = race_demon;
- + /* mental faculties are not changed by demonization */
- + g.urace.attrmax[A_INT] = maxint;
- + g.urace.attrmax[A_WIS] = maxwis;
- + set_uasmon();
- + retouch_equipment(2); /* silver */
- + break;
- }
- if (objects[class_gift].oc_class == SPBOOK_CLASS) {
- @@ -886,6 +914,9 @@ gcrownu()
- discover_artifact(ART_STORMBRINGER);
- break;
- }
- + case A_NONE:
- + /* nothing to do */
- + break;
- default:
- obj = 0; /* lint */
- break;
- @@ -1125,6 +1156,8 @@ aligntyp g_align;
- You("are surrounded by %s aura.", an(hcolor(NH_LIGHT_BLUE)));
- for (otmp = g.invent; otmp; otmp = otmp->nobj) {
- if (otmp->cursed
- + /* Inf benefit from wearing cursed armor */
- + && !(Role_if(PM_INFIDEL) && (otmp->owornmask & W_ARMOR))
- && (otmp != uarmh /* [see worst_cursed_item()] */
- || uarmh->otyp != HELM_OF_OPPOSITE_ALIGNMENT)) {
- if (!Blind) {
- @@ -1260,7 +1293,7 @@ boolean bless_water;
- return (boolean) (changed > 0L);
- }
- -static void
- +void
- godvoice(g_align, words)
- aligntyp g_align;
- const char *words;
- @@ -1362,6 +1395,9 @@ dosacrifice()
- if (otmp->otyp == CORPSE) {
- register struct permonst *ptr = &mons[otmp->corpsenm];
- struct monst *mtmp;
- + /* is this a conversion attempt? */
- + boolean to_other_god = ugod_is_angry() && !your_race(ptr)
- + && u.ualign.type != altaralign;
- /* KMH, conduct */
- u.uconduct.gnostic++;
- @@ -1372,31 +1408,54 @@ dosacrifice()
- if (rider_corpse_revival(otmp, FALSE))
- return 1;
- - if (otmp->corpsenm == PM_ACID_BLOB
- + if (otmp->corpsenm == PM_ACID_BLOB || your_race(ptr)
- || (g.monstermoves <= peek_at_iced_corpse_age(otmp) + 50)) {
- value = mons[otmp->corpsenm].difficulty + 1;
- + if (is_undead(ptr) /* Not demons--no demon corpses */
- + /* most undead that leave a corpse yield 'human' (or other race)
- + corpse so won't get here; the exception is wraith; give the
- + bonus for wraith to chaotics too because they are sacrificing
- + something valuable (unless hero refuses to eat such things) */
- + && (u.ualign.type > A_CHAOTIC
- + /* reaching this side of the 'or'
- + * means hero is chaotic (or unaligned) */
- + || (ptr == &mons[PM_WRAITH] && u.uconduct.unvegetarian)))
- + value += 1;
- + if (is_unicorn(ptr))
- + value += 3;
- + if (uwep && uwep->oartifact == ART_SECESPITA)
- + value += value / 2;
- if (otmp->oeaten)
- value = eaten_stat(value, otmp);
- + /* even cross-aligned sacrifices will count,
- + * as long as they're ultimately to Moloch */
- + if (u.ualign.type == A_NONE && !to_other_god) {
- + long new_timeout = g.moves + value * 500;
- + if (g.context.next_moloch_offering < new_timeout)
- + g.context.next_moloch_offering = new_timeout;
- + }
- }
- /* same race or former pet results apply even if the corpse is
- too old (value==0) */
- if (your_race(ptr)) {
- - if (is_demon(g.youmonst.data)) {
- + if (is_demon(raceptr(&g.youmonst))) {
- You("find the idea very satisfying.");
- exercise(A_WIS, TRUE);
- - } else if (u.ualign.type != A_CHAOTIC) {
- + } else if (u.ualign.type > A_CHAOTIC) {
- pline("You'll regret this infamous offense!");
- exercise(A_WIS, FALSE);
- }
- if (highaltar
- - && (altaralign != A_CHAOTIC || u.ualign.type != A_CHAOTIC)) {
- + && (altaralign != A_CHAOTIC || u.ualign.type != A_CHAOTIC)
- + && (altaralign != A_NONE || u.ualign.type != A_NONE)) {
- goto desecrate_high_altar;
- } else if (altaralign != A_CHAOTIC && altaralign != A_NONE) {
- /* curse the lawful/neutral altar */
- pline_The("altar is stained with %s blood.", g.urace.adj);
- - levl[u.ux][u.uy].altarmask = AM_CHAOTIC;
- + levl[u.ux][u.uy].altarmask = u.ualign.type == A_NONE
- + ? AM_NONE : AM_CHAOTIC;
- newsym(u.ux, u.uy); /* in case Invisible to self */
- angry_priest();
- } else {
- @@ -1417,7 +1476,7 @@ dosacrifice()
- } else {
- /* either you're chaotic or altar is Moloch's or both */
- pline_The("blood covers the altar!");
- - change_luck(altaralign == A_NONE ? -2 : 2);
- + change_luck(altaralign == u.ualign.type ? 2 : -2);
- demonless_msg = "blood coagulates";
- }
- if ((pm = dlord(altaralign)) != NON_PM
- @@ -1441,7 +1500,7 @@ dosacrifice()
- pline_The("%s.", demonless_msg);
- }
- - if (u.ualign.type != A_CHAOTIC) {
- + if (u.ualign.type > A_CHAOTIC) {
- adjalign(-5);
- u.ugangr += 3;
- (void) adjattrib(A_WIS, -1, TRUE);
- @@ -1457,7 +1516,10 @@ dosacrifice()
- return 1;
- } else if (has_omonst(otmp)
- && (mtmp = get_mtraits(otmp, FALSE)) != 0
- - && mtmp->mtame) {
- + && mtmp->mtame
- + /* Moloch is OK with sacrificing pets,
- + * but make sure we're offering to him */
- + && (u.ualign.type != A_NONE || to_other_god)) {
- /* mtmp is a temporary pointer to a tame monster's attributes,
- * not a real monster */
- pline("So this is how you repay loyalty?");
- @@ -1465,16 +1527,7 @@ dosacrifice()
- value = -1;
- HAggravate_monster |= FROMOUTSIDE;
- } else if (!value) {
- - ; /* too old; don't give undead or unicorn bonus or penalty */
- - } else if (is_undead(ptr)) { /* Not demons--no demon corpses */
- - /* most undead that leave a corpse yield 'human' (or other race)
- - corpse so won't get here; the exception is wraith; give the
- - bonus for wraith to chaotics too because they are sacrificing
- - something valuable (unless hero refuses to eat such things) */
- - if (u.ualign.type != A_CHAOTIC
- - /* reaching this side of the 'or' means hero is chaotic */
- - || (ptr == &mons[PM_WRAITH] && u.uconduct.unvegetarian))
- - value += 1;
- + ; /* too old; don't give unicorn bonus or penalty */
- } else if (is_unicorn(ptr)) {
- int unicalign = sgn(ptr->maligntyp);
- @@ -1495,7 +1548,7 @@ dosacrifice()
- else
- You_feel("you are thoroughly on the right path.");
- adjalign(5);
- - value += 3;
- + /* value += 3; -- now applied above */
- } else if (unicalign == u.ualign.type) {
- /* When sacrificing unicorn of your alignment to altar not of
- * your alignment, your god gets angry and it's a conversion.
- @@ -1507,7 +1560,7 @@ dosacrifice()
- * and different from the altar's. It's an ordinary (well,
- * with a bonus) sacrifice on a cross-aligned altar.
- */
- - value += 3;
- + /* value += 3; -- now applied above */
- }
- }
- } /* corpse */
- @@ -1515,7 +1568,7 @@ dosacrifice()
- if (otmp->otyp == AMULET_OF_YENDOR) {
- if (!highaltar) {
- too_soon:
- - if (altaralign == A_NONE && Inhell)
- + if (altaralign == A_NONE && u.ualign.type != A_NONE && Inhell)
- /* hero has left Moloch's Sanctum so is in the process
- of getting away with the Amulet (outside of Gehennom,
- fall through to the "ashamed" feedback) */
- @@ -1526,7 +1579,9 @@ dosacrifice()
- ? "homesick"
- /* if on track, give a big hint */
- : (altaralign == u.ualign.type)
- - ? "an urge to return to the surface"
- + ? (Role_if(PM_INFIDEL)
- + ? "an urge to descend deeper"
- + : "an urge to return to the surface")
- /* else headed towards celestial disgrace */
- : "ashamed");
- return 1;
- @@ -1541,6 +1596,33 @@ dosacrifice()
- You("offer the Amulet of Yendor to %s...", a_gname());
- if (altaralign == A_NONE) {
- /* Moloch's high altar */
- + if (Role_if(PM_INFIDEL)) {
- + /* Infidels still have an ascension run,
- + * they just carry a different McGuffin */
- + u.uevent.ascended = 1; /* a misnomer in this case */
- + record_achievement(ACH_AMUL);
- + otmp = find_quest_artifact(1 << OBJ_INVENT);
- + godvoice(A_NONE, (char *) 0);
- + if (!otmp)
- + qt_pager("moloch_missing");
- + else {
- + qt_pager("moloch");
- + if (otmp->where == OBJ_CONTAINED) {
- + /* the Idol cannot be contained now,
- + * so we have to remove it */
- + obj_extract_self(otmp);
- + (void) hold_another_object(otmp, "Oops!",
- + (const char *) 0,
- + (const char *) 0);
- + }
- + You_feel("strange energies envelop %s.",
- + the(xname(otmp)));
- + otmp->spe = 1;
- + if (otmp->where == OBJ_INVENT)
- + u.uhave.amulet = 1;
- + }
- + return 1;
- + }
- if (u.ualign.record > -99)
- u.ualign.record = -99;
- pline(
- @@ -1600,8 +1682,10 @@ dosacrifice()
- if (Deaf)
- pline("Oh, no."); /* didn't hear thunderclap */
- change_luck(-3);
- - adjalign(-1);
- - u.ugangr += 3;
- + if (u.ualign.type != A_NONE) {
- + adjalign(-1);
- + u.ugangr += 3;
- + }
- value = -3;
- }
- } /* fake Amulet */
- @@ -1634,9 +1718,10 @@ dosacrifice()
- if (u.ualign.type != altaralign) {
- /* Is this a conversion ? */
- /* An unaligned altar in Gehennom will always elicit rejection. */
- + /* Infidels will also never be accepted. */
- if (ugod_is_angry() || (altaralign == A_NONE && Inhell)) {
- if (u.ualignbase[A_CURRENT] == u.ualignbase[A_ORIGINAL]
- - && altaralign != A_NONE) {
- + && altaralign != A_NONE && !Role_if(PM_INFIDEL)) {
- You("have a strong feeling that %s is angry...",
- u_gname());
- consume_offering(otmp);
- @@ -1661,7 +1746,11 @@ dosacrifice()
- consume_offering(otmp);
- You("sense a conflict between %s and %s.", u_gname(),
- a_gname());
- - if (rn2(8 + u.ulevel) > 5) {
- + if (rn2(8 + u.ulevel) > 5
- + /* Infidels have difficulty converting altars. */
- + && !(u.ualign.type == A_NONE
- + && !(Role_if(PM_INFIDEL) && u.uhave.questart)
- + && depth(&u.uz) < depth(&valley_level) && rn2(5))) {
- struct monst *pri;
- boolean shrine;
- @@ -1677,9 +1766,11 @@ dosacrifice()
- pline_The("altar glows %s.",
- hcolor((u.ualign.type == A_LAWFUL)
- ? NH_WHITE
- - : u.ualign.type
- - ? NH_BLACK
- - : (const char *) "gray"));
- + : u.ualign.type == A_NONE
- + ? NH_RED
- + : u.ualign.type
- + ? NH_BLACK
- + : (const char *) "gray"));
- if (rnl(u.ulevel) > 6 && u.ualign.record > 0
- && rnd(u.ualign.record) > (3 * ALIGNLIM) / 4)
- @@ -1704,8 +1795,9 @@ dosacrifice()
- consume_offering(otmp);
- /* OK, you get brownie points. */
- if (u.ugangr) {
- - u.ugangr -= ((value * (u.ualign.type == A_CHAOTIC ? 2 : 3))
- - / MAXVALUE);
- + u.ugangr -= ((value * (u.ualign.type == A_NONE ? 3
- + : u.ualign.type == A_CHAOTIC ? 4 : 6))
- + / (MAXVALUE * 2));
- if (u.ugangr < 0)
- u.ugangr = 0;
- if (u.ugangr != saved_anger) {
- @@ -1737,7 +1829,7 @@ dosacrifice()
- adjalign(value);
- You_feel("partially absolved.");
- } else if (u.ublesscnt > 0) {
- - u.ublesscnt -= ((value * (u.ualign.type == A_CHAOTIC ? 500 : 300))
- + u.ublesscnt -= ((value * (u.ualign.type <= A_CHAOTIC ? 500 : 300))
- / MAXVALUE);
- if (u.ublesscnt < 0)
- u.ublesscnt = 0;
- @@ -1817,8 +1909,8 @@ boolean praying; /* false means no messages should be given */
- g.p_aligntyp = on_altar() ? a_align(u.ux, u.uy) : u.ualign.type;
- g.p_trouble = in_trouble();
- - if (is_demon(g.youmonst.data) /* ok if chaotic or none (Moloch) */
- - && (g.p_aligntyp == A_LAWFUL || g.p_aligntyp != A_NEUTRAL)) {
- + if (is_demon(raceptr(&g.youmonst)) /* ok if chaotic or none (Moloch) */
- + && (g.p_aligntyp == A_LAWFUL || g.p_aligntyp == A_NEUTRAL)) {
- if (praying)
- pline_The("very idea of praying to a %s god is repugnant to you.",
- g.p_aligntyp ? "lawful" : "neutral");
- @@ -1835,7 +1927,8 @@ boolean praying; /* false means no messages should be given */
- else
- alignment = u.ualign.record;
- - if (g.p_aligntyp == A_NONE) /* praying to Moloch */
- + if (g.p_aligntyp == A_NONE && u.ualign.type != A_NONE)
- + /* praying to Moloch */
- g.p_type = -2;
- else if ((g.p_trouble > 0) ? (u.ublesscnt > 200) /* big trouble */
- : (g.p_trouble < 0) ? (u.ublesscnt > 100) /* minor difficulties */
- @@ -1851,14 +1944,15 @@ boolean praying; /* false means no messages should be given */
- }
- if (is_undead(g.youmonst.data) && !Inhell
- - && (g.p_aligntyp == A_LAWFUL
- - || (g.p_aligntyp == A_NEUTRAL && !rn2(10))))
- + && (g.p_aligntyp == A_LAWFUL || (g.p_aligntyp == A_NEUTRAL && praying
- + && !rn2(10))))
- g.p_type = -1;
- - /* Note: when !praying, the random factor for neutrals makes the
- - return value a non-deterministic approximation for enlightenment.
- - This case should be uncommon enough to live with... */
- + if (g.p_aligntyp == A_NONE && !on_altar()
- + && depth(&u.uz) < depth(&valley_level)
- + && !(Role_if(PM_INFIDEL) && u.uhave.questart) && praying && rn2(5))
- + g.p_type = -3; /* Moloch can't hear you */
- - return !praying ? (boolean) (g.p_type == 3 && !Inhell) : TRUE;
- + return praying || g.p_type == 3 && (!Inhell || u.ualign.type == A_NONE);
- }
- /* #pray commmand */
- @@ -1892,7 +1986,7 @@ dopray()
- g.nomovemsg = "You finish your prayer.";
- g.afternmv = prayer_done;
- - if (g.p_type == 3 && !Inhell) {
- + if (g.p_type == 3 && (!Inhell || u.ualign.type == A_NONE)) {
- /* if you've been true to your god you can't die while you pray */
- if (!Blind)
- You("are surrounded by a shimmering light.");
- @@ -1934,7 +2028,13 @@ prayer_done() /* M. Stephenson (1.0.3b) */
- exercise(A_CON, FALSE);
- return 1;
- }
- - if (Inhell) {
- + if (g.p_type == -3) {
- + pline("Unfortunately, this close to the surface %s can't hear you.",
- + align_gname(alignment));
- + /* no further effects */
- + return 0;
- + }
- + if (Inhell && u.ualign.type != A_NONE) {
- pline("Since you are in Gehennom, %s can't help you.",
- align_gname(alignment));
- /* haltingly aligned is least likely to anger */
- @@ -2012,7 +2112,7 @@ doturn()
- return (u.uconduct.gnostic == 1);
- }
- if ((u.ualign.type != A_CHAOTIC
- - && (is_demon(g.youmonst.data)
- + && (is_demon(raceptr(&g.youmonst))
- || is_undead(g.youmonst.data) || is_vampshifter(&g.youmonst)))
- || u.ugangr > 6) { /* "Die, mortal!" */
- pline("For some reason, %s seems to ignore you.", Gname);
- @@ -2265,6 +2365,9 @@ aligntyp alignment;
- const char *gnam, *result = "god";
- switch (alignment) {
- + case A_NONE:
- + gnam = Moloch;
- + break;
- case A_LAWFUL:
- gnam = g.urole.lgod;
- break;
- @@ -2283,6 +2386,23 @@ aligntyp alignment;
- return result;
- }
- +/* return an alignment from a (lawful, neutral, chaotic) permutation
- + * randomly chosen at game start; only relevant to Infidels */
- +aligntyp
- +inf_align(num)
- +int num; /* 1..3 */
- +{
- + aligntyp first, other;
- + first = g.context.inf_aligns % 3 - 1;
- + if (num == 1)
- + return first;
- + other = (g.context.inf_aligns + num) % 2;
- + if (other <= first)
- + other--;
- + return other;
- +
- +}
- +
- void
- altar_wrath(x, y)
- register int x, y;
- diff --git c/src/priest.c i/src/priest.c
- index 1b5bd3824..5596c9073 100644
- --- c/src/priest.c
- +++ i/src/priest.c
- @@ -263,7 +263,7 @@ boolean sanctum; /* is it the seat of the high priest? */
- /* now his/her goodies... */
- if (sanctum && EPRI(priest)->shralign == A_NONE
- - && on_level(&sanctum_level, &u.uz)) {
- + && on_level(&sanctum_level, &u.uz) && !Role_if(PM_INFIDEL)) {
- (void) mongets(priest, AMULET_OF_YENDOR);
- }
- /* 2 to 4 spellbooks */
- @@ -401,7 +401,7 @@ int roomno;
- {
- struct monst *priest, *mtmp;
- struct epri *epri_p;
- - boolean shrined, sanctum, can_speak;
- + boolean shrined, sanctum, can_speak, call_guards;
- long *this_time, *other_time;
- const char *msg1, *msg2;
- char buf[BUFSZ];
- @@ -419,6 +419,7 @@ int roomno;
- sanctum = (priest->data == &mons[PM_HIGH_PRIEST]
- && (Is_sanctum(&u.uz) || In_endgame(&u.uz)));
- can_speak = (priest->mcanmove && !priest->msleeping);
- + call_guards = FALSE;
- if (can_speak && !Deaf && g.moves >= epri_p->intone_time) {
- unsigned save_priest = priest->ispriest;
- @@ -436,11 +437,20 @@ int roomno;
- epri_p->enter_time = 0L;
- }
- msg1 = msg2 = 0;
- - if (sanctum && Is_sanctum(&u.uz)) {
- + if ((sanctum && Is_sanctum(&u.uz) || u.ualign.type == A_NONE)
- + && !p_coaligned(priest)) {
- + /* either a non-Infidel in the Sanctum, or an Infidel in any
- + * non-Moloch temple; either way, the priest is not happy */
- if (priest->mpeaceful) {
- /* first time inside */
- - msg1 = "Infidel, you have entered Moloch's Sanctum!";
- - msg2 = "Be gone!";
- + if (u.ualign.type == A_NONE) {
- + msg1 = "Begone, infidel!";
- + msg2 = "This place is barred for your cult!";
- + call_guards = in_town(priest->mx, priest->my);
- + } else {
- + msg1 = "Infidel, you have entered Moloch's Sanctum!";
- + msg2 = "Be gone!";
- + }
- priest->mpeaceful = 0;
- /* became angry voluntarily; no penalty for attacking him */
- set_malign(priest);
- @@ -459,6 +469,11 @@ int roomno;
- verbalize1(msg2);
- epri_p->enter_time = g.moves + (long) d(10, 100); /* ~505 */
- }
- + /* for Infidels, visiting the Minetown temple is a very bad idea */
- + if (call_guards) {
- + pline("%s calls for guards!", Monnam(priest));
- + (void) angry_guards(FALSE);
- + }
- if (!sanctum) {
- if (!shrined || !p_coaligned(priest)
- || u.ualign.record <= ALGN_SINNED) {
- @@ -560,7 +575,8 @@ register struct monst *priest;
- /* priests don't chat unless peaceful and in their own temple */
- if (!inhistemple(priest) || !priest->mpeaceful
- - || !priest->mcanmove || priest->msleeping) {
- + || !priest->mcanmove || priest->msleeping
- + || u.ualign.type == A_NONE && !coaligned) {
- static const char *cranky_msg[3] = {
- "Thou wouldst have words, eh? I'll give thee a word or two!",
- "Talk? Here is what I have to say!",
- @@ -587,7 +603,19 @@ register struct monst *priest;
- return;
- }
- if (!money_cnt(g.invent)) {
- - if (coaligned && !strayed) {
- + if (Role_if(PM_INFIDEL) && u.uevent.ascended
- + && priest->data == &mons[PM_HIGH_PRIEST] && Is_sanctum(&u.uz)) {
- + /* give a hint about the correct high altar */
- + aligntyp saved_align = u.ualignbase[A_ORIGINAL];
- + uchar saved_godgend = g.quest_status.godgend;
- + /* a hack for displaying a different god's name in the message */
- + u.ualignbase[A_ORIGINAL] = inf_align(3);
- + /* "god"[3] == 0; "goddess"[3] != 0 */
- + g.quest_status.godgend = !!align_gtitle(inf_align(3))[3];
- + qt_pager("high_priest");
- + u.ualignbase[A_ORIGINAL] = saved_align;
- + g.quest_status.godgend = saved_godgend;
- + } else if (coaligned && !strayed) {
- long pmoney = money_cnt(priest->minvent);
- if (pmoney > 0L) {
- const char *bits;
- diff --git c/src/quest.c i/src/quest.c
- index a74cdf41b..7ae442b3c 100644
- --- c/src/quest.c
- +++ i/src/quest.c
- @@ -218,8 +218,21 @@ finish_quest(obj)
- struct obj *obj; /* quest artifact; possibly null if carrying Amulet */
- {
- struct obj *otmp;
- + aligntyp saved_align;
- + uchar saved_godgend;
- - if (u.uhave.amulet) { /* unlikely but not impossible */
- + if (Role_if(PM_INFIDEL) && u.uevent.ascended) {
- + saved_align = u.ualignbase[A_ORIGINAL];
- + saved_godgend = g.quest_status.godgend;
- + /* a hack for displaying a different god's name in the message */
- + u.ualignbase[A_ORIGINAL] = inf_align(2);
- + /* "god"[3] == 0; "goddess"[3] != 0 */
- + g.quest_status.godgend = !!align_gtitle(inf_align(2))[3];
- + qt_pager("delivered_amulet");
- + u.ualignbase[A_ORIGINAL] = saved_align;
- + g.quest_status.godgend = saved_godgend;
- + } else if (u.uhave.amulet && !Role_if(PM_INFIDEL)) {
- + /* unlikely but not impossible */
- qt_pager("hasamulet");
- /* leader IDs the real amulet but ignores any fakes */
- if ((otmp = carrying(AMULET_OF_YENDOR)) != 0)
- @@ -229,7 +242,7 @@ struct obj *obj; /* quest artifact; possibly null if carrying Amulet */
- /* should have obtained bell during quest;
- if not, suggest returning for it now */
- if ((otmp = carrying(BELL_OF_OPENING)) == 0)
- - com_pager("quest_complete_no_bell");
- + qt_pager("quest_complete_no_bell");
- }
- Qstat(got_thanks) = TRUE;
- @@ -254,7 +267,7 @@ chat_with_leader()
- */
- if (Qstat(got_thanks)) {
- /* Rule 1: You've gone back with/without the amulet. */
- - if (u.uhave.amulet)
- + if (Role_if(PM_INFIDEL) ? u.uevent.ascended : u.uhave.amulet)
- finish_quest((struct obj *) 0);
- /* Rule 2: You've gone back before going for the amulet. */
- diff --git c/src/read.c i/src/read.c
- index 353f9bac2..9f3505528 100644
- --- c/src/read.c
- +++ i/src/read.c
- @@ -950,6 +950,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
- uncurse(otmp);
- otmp->known = 1;
- setworn(otmp, W_ARM);
- + check_wings(TRUE);
- if (otmp->unpaid)
- alter_cost(otmp, 0L); /* shop bill */
- break;
- @@ -2015,7 +2016,9 @@ do_class_genocide()
- /* non-leader/nemesis/guardian role-specific monster
- */
- && (i != PM_NINJA /* nuisance */
- - || Role_if(PM_SAMURAI))) {
- + || Role_if(PM_SAMURAI))
- + && (i != PM_TEMPLAR && i != PM_CHAMPION
- + && i != PM_AGENT || Role_if(PM_INFIDEL))) {
- boolean named, uniq;
- named = type_is_pname(&mons[i]) ? TRUE : FALSE;
- diff --git c/src/restore.c i/src/restore.c
- index 2f9191255..789dbc147 100644
- --- c/src/restore.c
- +++ i/src/restore.c
- @@ -614,13 +614,13 @@ unsigned int *stuckid, *steedid;
- mread(nhfp->fd, (genericptr_t) &sysflags, sizeof(struct sysflag));
- #endif
- - role_init(); /* Reset the initial role, race, gender, and alignment */
- #ifdef AMII_GRAPHICS
- amii_setpens(amii_numcolors); /* use colors from save file */
- #endif
- if (nhfp->structlevel)
- mread(nhfp->fd, (genericptr_t) &u, sizeof(struct you));
- g.youmonst.cham = u.mcham;
- + role_init(); /* Reset the initial role, race, gender, and alignment */
- if (nhfp->structlevel)
- mread(nhfp->fd, (genericptr_t) timebuf, 14);
- diff --git c/src/role.c i/src/role.c
- index a31700369..0e6b32928 100644
- --- c/src/role.c
- +++ i/src/role.c
- @@ -192,6 +192,47 @@ const struct Role roles[NUM_ROLES+1] = {
- A_WIS,
- SPE_CURE_SICKNESS,
- -4 },
- + { { "Infidel", 0 },
- + { { "Apostate", 0 },
- + { "Heathen", 0 },
- + { "Heretic", 0 },
- + { "Idolater", "Idolatress" },
- + { "Cultist", 0 },
- + { "Splanchomancer", 0 },
- + { "Maleficus", "Malefica" },
- + { "Demonologist", 0 },
- + { "Heresiarch", 0 } },
- + 0, 0, 0, /* uses a random role's pantheon */
- + "Inf",
- + "the Hidden Temple",
- + "the Howling Forest",
- + PM_INFIDEL,
- + NON_PM,
- + PM_HOMUNCULUS,
- + PM_PREACHER_OF_MOLOCH,
- + PM_CULTIST,
- + PM_PALADIN,
- + PM_AGENT,
- + PM_CHAMPION,
- + S_DOG,
- + S_UNICORN,
- + ART_IDOL_OF_MOLOCH, /* actually unaligned */
- + MH_HUMAN | MH_ORC | ROLE_MALE | ROLE_FEMALE | ROLE_CHAOTIC,
- + /* Str Int Wis Dex Con Cha */
- + { 7, 7, 10, 7, 7, 7 },
- + { 20, 10, 25, 15, 20, 10 },
- + /* Init Lower Higher */
- + { 10, 0, 0, 8, 1, 0 }, /* Hit points */
- + { 4, 3, 0, 1, 0, 2 },
- + 10, /* Energy */
- + 10,
- + 3,
- + 1,
- + 2,
- + 10,
- + A_WIS,
- + SPE_FIREBALL,
- + -4 },
- { { "Knight", 0 },
- { { "Gallant", 0 },
- { "Esquire", 0 },
- @@ -697,6 +738,29 @@ const struct Race races[] = {
- { 0, 0, 0, 0 }
- };
- +/* Special race for crowned Infidels. */
- +struct Race race_demon = {
- + "demon",
- + "demonic",
- + "demonkind",
- + "Dem",
- + { 0, 0 },
- + PM_DEMON,
- + NON_PM,
- + NON_PM,
- + NON_PM,
- + MH_DEMON | ROLE_MALE | ROLE_FEMALE, /* not available at start */
- + MH_DEMON,
- + MH_DEMON,
- + MH_HUMAN | MH_ELF | MH_DWARF | MH_GNOME,
- + /* Str Int Wis Dex Con Cha */
- + { 3, 3, 3, 3, 3, 3 },
- + { STR18(100), 18, 18, 20, 20, 18 }, /* max Int & Wis are variable */
- + /* Init Lower Higher */
- + { 8, 0, 0, 8, 4, 0 }, /* Hit points */
- + { 4, 0, 6, 0, 6, 0 } /* Energy */
- +};
- +
- /* Table of all genders */
- const struct Gender genders[] = {
- { "male", "he", "him", "his", "Mal", ROLE_MALE },
- @@ -722,6 +786,16 @@ static int FDECL(race_alignmentcount, (int));
- /* used by str2XXX() */
- static char NEARDATA randomstr[] = "random";
- +/* Inf are listed as chaotic above, but actually are unaligned. */
- +int
- +special_alignment(rolenum, alignnum)
- +int rolenum, alignnum;
- +{
- + if (roles[rolenum].malenum == PM_INFIDEL)
- + return 3; /* aligns[unaligned] */
- + return alignnum;
- +}
- +
- boolean
- validrole(rolenum)
- int rolenum;
- @@ -1438,12 +1512,12 @@ int buflen, rolenum, racenum, gendnum, alignnum;
- if ((racenum >= 0) && (aligncount > 1)) {
- if (donefirst)
- Strcat(buf, " ");
- - Strcat(buf, aligns[alignnum].adj);
- + Strcat(buf, aligns[special_alignment(rolenum, alignnum)].adj);
- donefirst = TRUE;
- } else {
- if (donefirst)
- Strcat(buf, " ");
- - Strcat(buf, aligns[alignnum].adj);
- + Strcat(buf, aligns[special_alignment(rolenum, alignnum)].adj);
- donefirst = TRUE;
- }
- } else {
- @@ -1737,6 +1811,7 @@ winid where;
- a = 2; /* alings[chaotic] */
- /* [c never forces gender] */
- }
- + a = special_alignment(r, a); /* special case (Infidel) */
- /* [g and a don't constrain anything sufficiently
- to narrow something done to a single choice] */
- @@ -1873,6 +1948,7 @@ boolean preselect;
- a = 1; /* aligns[neutral] */
- else if (allowmask == AM_CHAOTIC)
- a = 2; /* aligns[chaotic] */
- + a = special_alignment(r, a); /* special case (Infidel) */
- if (a >= 0)
- constrainer = "role";
- }
- @@ -1952,7 +2028,7 @@ boolean preselect;
- void
- role_init()
- {
- - int alignmnt;
- + int alignmnt, malignmnt;
- struct permonst *pm;
- /* Strip the role letter out of the player name.
- @@ -1991,11 +2067,21 @@ role_init()
- if (!validalign(flags.initrole, flags.initrace, flags.initalign))
- /* Pick a random alignment */
- flags.initalign = randalign(flags.initrole, flags.initrace);
- - alignmnt = aligns[flags.initalign].value;
- + /* Infidels are actually unaligned */
- + flags.initalign = special_alignment(flags.initrole, flags.initalign);
- + alignmnt = malignmnt = aligns[flags.initalign].value;
- + if (alignmnt != A_NONE)
- + malignmnt *= 3;
- /* Initialize g.urole and g.urace */
- g.urole = roles[flags.initrole];
- - g.urace = races[flags.initrace];
- + if (u.uevent.uhand_of_elbereth == 4) { /* crowned as a demon */
- + g.urace = race_demon;
- + /* mental faculties are not changed by demonization */
- + g.urace.attrmax[A_INT] = races[flags.initrace].attrmax[A_INT];
- + g.urace.attrmax[A_WIS] = races[flags.initrace].attrmax[A_WIS];
- + } else
- + g.urace = races[flags.initrace];
- /* Fix up the quest leader */
- if (g.urole.ldrnum != NON_PM) {
- @@ -2003,7 +2089,7 @@ role_init()
- pm->msound = MS_LEADER;
- pm->mflags2 |= (M2_PEACEFUL);
- pm->mflags3 |= M3_CLOSE;
- - pm->maligntyp = alignmnt * 3;
- + pm->maligntyp = malignmnt;
- /* if gender is random, we choose it now instead of waiting
- until the leader monster is created */
- g.quest_status.ldrgend =
- @@ -2016,7 +2102,7 @@ role_init()
- if (g.urole.guardnum != NON_PM) {
- pm = &mons[g.urole.guardnum];
- pm->mflags2 |= (M2_PEACEFUL);
- - pm->maligntyp = alignmnt * 3;
- + pm->maligntyp = malignmnt;
- }
- /* Fix up the quest nemesis */
- @@ -2033,6 +2119,14 @@ role_init()
- : is_male(pm) ? 0 : (rn2(100) < 50);
- }
- + /* Enable special Inf enemies */
- + if (Role_if(PM_INFIDEL)) {
- + if (g.urole.enemy1num != NON_PM)
- + mons[g.urole.enemy1num].geno &= ~G_NOGEN;
- + if (g.urole.enemy2num != NON_PM)
- + mons[g.urole.enemy2num].geno &= ~G_NOGEN;
- + }
- +
- /* Fix up the god names */
- if (flags.pantheon == -1) { /* new game */
- int trycnt = 0;
- diff --git c/src/shk.c i/src/shk.c
- index bd91495d4..45abf9bc0 100644
- --- c/src/shk.c
- +++ i/src/shk.c
- @@ -4764,7 +4764,7 @@ boolean altusage; /* used as a verbalized exclamation: \"Cad! ...\" */
- {
- const char *res = 0;
- - switch (is_demon(g.youmonst.data) ? 3 : poly_gender()) {
- + switch (is_demon(raceptr(&g.youmonst)) ? 3 : poly_gender()) {
- case 0:
- res = "cad";
- break;
- diff --git c/src/sounds.c i/src/sounds.c
- index 28c3369fd..624513767 100644
- --- c/src/sounds.c
- +++ i/src/sounds.c
- @@ -1154,7 +1154,7 @@ tiphat()
- return 0;
- res = uarmh->bknown ? 0 : 1;
- - if (cursed(uarmh)) /* "You can't. It is cursed." */
- + if (cursed(uarmh, FALSE)) /* "You can't. It is cursed." */
- return res; /* if learned of curse, use a move */
- /* might choose a position, but dealing with direct lines is simpler */
- diff --git c/src/sp_lev.c i/src/sp_lev.c
- old mode 100755
- new mode 100644
- index b85c4ab75..494554b9c
- --- c/src/sp_lev.c
- +++ i/src/sp_lev.c
- @@ -1802,6 +1802,8 @@ aligntyp alignment;
- {
- int k;
- + if (alignment == A_NONE)
- + return rn1(3, -1);
- k = rn2(2);
- if (!alignment)
- return (k ? -1 : 1);
- diff --git c/src/spell.c i/src/spell.c
- index ebf2f5d7d..89fc6f3e1 100644
- --- c/src/spell.c
- +++ i/src/spell.c
- @@ -54,6 +54,7 @@ static boolean FDECL(spell_aim_step, (genericptr_t, int, int));
- * Bar abhor magic (Conan finds it "interferes with his animal instincts")
- * Cav are ignorant to magic
- * Hea are very aware of healing magic through medical research
- + * Inf learned a lot of black magic from their cult
- * Kni are moderately aware of healing from Paladin training
- * Mon use magic to attack and defend in lieu of weapons and armor
- * Pri are very aware of healing magic through theological research
- @@ -74,6 +75,7 @@ static boolean FDECL(spell_aim_step, (genericptr_t, int, int));
- * Bar fugue/berserker (SPE_HASTE_SELF)
- * Cav born to dig (SPE_DIG)
- * Hea to heal (SPE_CURE_SICKNESS)
- + * Inf to channel hellfire (SPE_FIREBALL)
- * Kni to turn back evil (SPE_TURN_UNDEAD)
- * Mon to preserve their abilities (SPE_RESTORE_ABILITY)
- * Pri to bless (SPE_REMOVE_CURSE)
- @@ -1740,6 +1742,25 @@ int spell;
- if (uarmf && is_metallic(uarmf))
- splcaster += uarmfbon;
- + /* Infidels have a special penalty for wearing blessed armor. */
- + if (Role_if(PM_INFIDEL)) {
- + static struct obj **const armor[] = { &uarm, &uarmc, &uarmh, &uarms,
- + &uarmg, &uarmf, &uarmu };
- + int penalty = 0;
- + int i;
- +
- + for (i = 0; i < SIZE(armor); i++) {
- + if (!*armor[i])
- + continue;
- + if ((*armor[i])->blessed)
- + penalty += 2;
- + else if ((*armor[i])->cursed)
- + penalty--;
- + }
- + if (penalty > 0)
- + splcaster += penalty;
- + }
- +
- if (spellid(spell) == g.urole.spelspec)
- splcaster += g.urole.spelsbon;
- diff --git c/src/teleport.c i/src/teleport.c
- index a29808b00..7a4109eba 100644
- --- c/src/teleport.c
- +++ i/src/teleport.c
- @@ -863,12 +863,25 @@ level_tele()
- newlevel.dnum = destdnum;
- newlevel.dlevel = destlev;
- - if (In_endgame(&newlevel) && !In_endgame(&u.uz)) {
- + if (In_endgame(&newlevel) && !In_endgame(&u.uz)
- + && !u.uhave.amulet) {
- struct obj *amu;
- - if (!u.uhave.amulet
- - && (amu = mksobj(AMULET_OF_YENDOR, TRUE, FALSE))
- - != 0) {
- + if (!Role_if(PM_INFIDEL)) {
- + amu = mksobj(AMULET_OF_YENDOR, TRUE, FALSE);
- + } else if (amu = find_quest_artifact(1 << OBJ_INVENT)) {
- + obj_extract_self(amu); /* may be contained */
- + amu->spe = 1;
- + } else {
- + const char *idol = artiname(ART_IDOL_OF_MOLOCH);
- + amu = mksobj(FIGURINE, TRUE, FALSE);
- + artifact_exists(amu, idol, TRUE);
- + new_oname(amu, strlen(idol) + 1);
- + Strcpy(ONAME(amu), idol);
- + amu->spe = 1;
- + }
- +
- + if (amu) {
- /* ordinarily we'd use hold_another_object()
- for something like this, but we don't want
- fumbling or already full pack to interfere */
- diff --git c/src/trap.c i/src/trap.c
- index b94f2c7cd..9625c090a 100644
- --- c/src/trap.c
- +++ i/src/trap.c
- @@ -3731,10 +3731,10 @@ boolean *lostsome;
- * in removing them + loadstone and other cursed stuff
- * for obvious reasons.
- */
- - if (!((obj->otyp == LOADSTONE && obj->cursed) || obj == uamul
- - || obj == uleft || obj == uright || obj == ublindf
- - || obj == uarm || obj == uarmc || obj == uarmg
- - || obj == uarmf || obj == uarmu
- + if (!((obj->otyp == LOADSTONE && cursed(obj, TRUE))
- + || obj == uamul || obj == uleft || obj == uright
- + || obj == ublindf || obj == uarm || obj == uarmc
- + || obj == uarmg || obj == uarmf || obj == uarmu
- || (obj->cursed && (obj == uarmh || obj == uarms))
- || welded(obj)))
- otmp = obj;
- diff --git c/src/u_init.c i/src/u_init.c
- index 4b0e9f74a..d6fbd8b45 100644
- --- c/src/u_init.c
- +++ i/src/u_init.c
- @@ -21,6 +21,7 @@ static boolean FDECL(restricted_spell_discipline, (int));
- #define UNDEF_TYP 0
- #define UNDEF_SPE '\177'
- #define UNDEF_BLESS 2
- +#define CURSED 3
- /*
- * Initial inventory for the various roles.
- @@ -70,6 +71,19 @@ static struct trobj Healer[] = {
- { APPLE, 0, FOOD_CLASS, 5, 0 },
- { 0, 0, 0, 0, 0 }
- };
- +static struct trobj Infidel[] = {
- + { AMULET_OF_YENDOR, 0, AMULET_CLASS, 1, 0 },
- + { DAGGER, 1, WEAPON_CLASS, 1, 0 },
- + { LEATHER_JACKET, 1, ARMOR_CLASS, 1, CURSED },
- + { CLOAK_OF_PROTECTION, 0, ARMOR_CLASS, 1, CURSED },
- + { POT_WATER, 0, POTION_CLASS, 3, CURSED },
- + { SPE_DRAIN_LIFE, 0, SPBOOK_CLASS, 1, 0 },
- + { UNDEF_TYP, UNDEF_SPE, SPBOOK_CLASS, 1, 0 },
- + { FIRE_HORN, UNDEF_SPE, TOOL_CLASS, 1, 0 },
- + { MAGIC_MARKER, UNDEF_SPE, TOOL_CLASS, 1, 0 },
- + { 0, 0, 0, 0, 0 }
- +
- +};
- static struct trobj Knight[] = {
- { LONG_SWORD, 1, WEAPON_CLASS, 1, UNDEF_BLESS },
- { LANCE, 1, WEAPON_CLASS, 1, UNDEF_BLESS },
- @@ -324,6 +338,30 @@ static const struct def_skill Skill_H[] = {
- { P_BARE_HANDED_COMBAT, P_BASIC },
- { P_NONE, 0 }
- };
- +static const struct def_skill Skill_Inf[] = {
- + { P_DAGGER, P_EXPERT },
- + { P_KNIFE, P_EXPERT },
- + { P_SHORT_SWORD, P_SKILLED },
- + { P_BROAD_SWORD, P_BASIC },
- + { P_SCIMITAR, P_SKILLED },
- + { P_SABER, P_BASIC },
- + { P_CLUB, P_BASIC },
- + { P_HAMMER, P_BASIC },
- + { P_QUARTERSTAFF, P_SKILLED },
- + { P_POLEARMS, P_SKILLED },
- + { P_SPEAR, P_BASIC },
- + { P_SLING, P_BASIC },
- + { P_CROSSBOW, P_SKILLED },
- + { P_DART, P_BASIC },
- + { P_WHIP, P_SKILLED },
- + { P_ATTACK_SPELL, P_EXPERT },
- + { P_DIVINATION_SPELL, P_SKILLED },
- + { P_ENCHANTMENT_SPELL, P_BASIC },
- + { P_CLERIC_SPELL, P_EXPERT },
- + { P_BARE_HANDED_COMBAT, P_SKILLED },
- + { P_RIDING, P_SKILLED },
- + { P_NONE, 0 }
- +};
- static const struct def_skill Skill_K[] = {
- { P_DAGGER, P_BASIC },
- { P_KNIFE, P_BASIC },
- @@ -701,6 +739,12 @@ u_init()
- knows_object(POT_FULL_HEALING);
- skill_init(Skill_H);
- break;
- + case PM_INFIDEL:
- + u.umoney0 = rn1(251, 250);
- + ini_inv(Infidel);
- + knows_object(SCR_CHARGING); /* that's what the marker is for */
- + skill_init(Skill_Inf);
- + break;
- case PM_KNIGHT:
- ini_inv(Knight);
- knows_class(WEAPON_CLASS);
- @@ -927,6 +971,9 @@ int otyp;
- case PM_HEALER:
- skills = Skill_H;
- break;
- + case PM_INFIDEL:
- + skills = Skill_Inf;
- + break;
- case PM_KNIGHT:
- skills = Skill_K;
- break;
- @@ -1011,6 +1058,8 @@ register struct trobj *trop;
- || (otyp == SCR_ENCHANT_WEAPON && Role_if(PM_MONK))
- /* wizard patch -- they already have one */
- || (otyp == SPE_FORCE_BOLT && Role_if(PM_WIZARD))
- + /* same for infidels */
- + || (otyp == SPE_DRAIN_LIFE && Role_if(PM_INFIDEL))
- /* powerful spells are either useless to
- low level players or unbalancing; also
- spells in restricted skill categories */
- @@ -1086,7 +1135,7 @@ register struct trobj *trop;
- obj->cknown = obj->lknown = 1;
- obj->otrapped = 0;
- }
- - obj->cursed = 0;
- + obj->cursed = (trop->trbless == CURSED);
- if (obj->opoisoned && u.ualign.type != A_CHAOTIC)
- obj->opoisoned = 0;
- if (obj->oclass == WEAPON_CLASS || obj->oclass == TOOL_CLASS) {
- @@ -1096,10 +1145,14 @@ register struct trobj *trop;
- && obj->otyp != FLINT) {
- obj->quan = 1L;
- }
- + if (Role_if(PM_INFIDEL) && obj->oclass == ARMOR_CLASS) {
- + /* Infidels are used to playing with fire */
- + obj->oerodeproof = 1;
- + }
- if (trop->trspe != UNDEF_SPE)
- obj->spe = trop->trspe;
- if (trop->trbless != UNDEF_BLESS)
- - obj->blessed = trop->trbless;
- + obj->blessed = (trop->trbless == 1);
- }
- /* defined after setting otyp+quan + blessedness */
- obj->owt = weight(obj);
- diff --git c/src/uhitm.c i/src/uhitm.c
- index 0f7f2eba8..9de49f6f7 100644
- --- c/src/uhitm.c
- +++ i/src/uhitm.c
- @@ -20,7 +20,7 @@ static int FDECL(explum, (struct monst *, struct attack *));
- static void FDECL(start_engulf, (struct monst *));
- static void NDECL(end_engulf);
- static int FDECL(gulpum, (struct monst *, struct attack *));
- -static boolean FDECL(hmonas, (struct monst *));
- +static boolean FDECL(hmonas, (struct monst *, int, boolean));
- static void FDECL(nohandglow, (struct monst *));
- static boolean FDECL(shade_aware, (struct obj *));
- @@ -431,7 +431,7 @@ register struct monst *mtmp;
- }
- if (Upolyd)
- - (void) hmonas(mtmp);
- + (void) hmonas(mtmp, NON_PM, TRUE);
- else
- (void) hitum(mtmp, g.youmonst.data->mattk);
- mtmp->mstrategy &= ~STRAT_WAITMASK;
- @@ -634,6 +634,20 @@ struct attack *uattk;
- if (mhit)
- (void) passive(mon, uswapwep, mhit, malive, AT_WEAP, !uswapwep);
- }
- +
- + /* your race may grant extra attacks */
- + if (!Upolyd && malive) {
- + int i;
- + int race = (flags.female && g.urace.femalenum != NON_PM)
- + ? g.urace.femalenum : g.urace.malenum;
- + struct attack *attacks = mons[race].mattk;
- + for (i = 0; i < NATTK; i++) {
- + if (attacks[i].aatyp != AT_WEAP && attacks[i].aatyp != AT_NONE) {
- + malive = hmonas(mon, race, FALSE);
- + break;
- + }
- + }
- + }
- return malive;
- }
- @@ -1323,6 +1337,16 @@ int dieroll;
- pline("%s appears confused.", Monnam(mon));
- }
- }
- + if (DEADMONSTER(mon) && attacks(AD_DREN, obj)
- + && !nonliving(mdat) && u.uen < u.uenmax) {
- + int energy = mon->m_lev + 1;
- + energy += rn2(energy);
- + pline_The("ritual knife captures the evanescent life force.");
- + u.uen += energy;
- + if (u.uen > u.uenmax)
- + u.uen = u.uenmax;
- + g.context.botl = TRUE;
- + }
- if (unpoisonmsg)
- Your("%s %s no longer poisoned.", saved_oname,
- vtense(saved_oname, "are"));
- @@ -1646,7 +1670,7 @@ int specialdmg; /* blessed and/or silver bonus against various things */
- if (is_demon(g.youmonst.data) && !rn2(13) && !uwep
- && u.umonnum != PM_SUCCUBUS && u.umonnum != PM_INCUBUS
- - && u.umonnum != PM_BALROG) {
- + && u.umonnum != PM_BALROG && u.umonnum != PM_DEMON) {
- demonpet();
- return 0;
- }
- @@ -2353,12 +2377,14 @@ boolean wouldhavehit;
- /* attack monster as a monster; returns True if mon survives */
- static boolean
- -hmonas(mon)
- +hmonas(mon, as, weapon_attacks)
- register struct monst *mon;
- +int as;
- +boolean weapon_attacks; /* skip weapon attacks if false */
- {
- struct attack *mattk, alt_attk;
- struct obj *weapon, **originalweapon;
- - boolean altwep = FALSE, weapon_used = FALSE, odd_claw = TRUE;
- + boolean altwep = FALSE, weapon_used = !weapon_attacks, odd_claw = TRUE;
- int i, tmp, armorpenalty, sum[NATTK], nsum = 0, dhit = 0, attknum = 0;
- int dieroll, multi_claw = 0;
- @@ -2367,8 +2393,11 @@ register struct monst *mon;
- whether silver ring causes successful hit */
- for (i = 0; i < NATTK; i++) {
- sum[i] = 0;
- - mattk = getmattk(&g.youmonst, mon, i, sum, &alt_attk);
- - if (mattk->aatyp == AT_WEAP
- + if (as != NON_PM)
- + mattk = &mons[as].mattk[i];
- + else
- + mattk = getmattk(&g.youmonst, mon, i, sum, &alt_attk);
- + if (mattk->aatyp == AT_WEAP && weapon_attacks
- || mattk->aatyp == AT_CLAW || mattk->aatyp == AT_TUCH)
- ++multi_claw;
- }
- @@ -2376,11 +2405,16 @@ register struct monst *mon;
- for (i = 0; i < NATTK; i++) {
- /* sum[i] = 0; -- now done above */
- - mattk = getmattk(&g.youmonst, mon, i, sum, &alt_attk);
- + if (as != NON_PM)
- + mattk = &mons[as].mattk[i];
- + else
- + mattk = getmattk(&g.youmonst, mon, i, sum, &alt_attk);
- weapon = 0;
- switch (mattk->aatyp) {
- case AT_WEAP:
- /* if (!uwep) goto weaponless; */
- + if (!weapon_attacks)
- + continue;
- use_weapon:
- odd_claw = !odd_claw; /* see case AT_CLAW,AT_TUCH below */
- /* if we've already hit with a two-handed weapon, we don't
- diff --git c/src/weapon.c i/src/weapon.c
- index faaadc0b9..af8068a0d 100644
- --- c/src/weapon.c
- +++ i/src/weapon.c
- @@ -1658,6 +1658,8 @@ const struct def_skill *class_skill;
- /* set skills for magic */
- if (Role_if(PM_HEALER) || Role_if(PM_MONK)) {
- P_SKILL(P_HEALING_SPELL) = P_BASIC;
- + } else if (Role_if(PM_INFIDEL)) {
- + P_SKILL(P_ATTACK_SPELL) = P_BASIC;
- } else if (Role_if(PM_PRIEST)) {
- P_SKILL(P_CLERIC_SPELL) = P_BASIC;
- } else if (Role_if(PM_WIZARD)) {
- diff --git c/src/wield.c i/src/wield.c
- index 2382a0e3c..7b98aee79 100644
- --- c/src/wield.c
- +++ i/src/wield.c
- @@ -64,6 +64,8 @@ static int FDECL(ready_weapon, (struct obj *));
- /* used by welded(), and also while wielding */
- #define will_weld(optr) \
- ((optr)->cursed && (erodeable_wep(optr) || (optr)->otyp == TIN_OPENER))
- +/* Infidels are immune to curses */
- +#define will_weld_to_you(optr) (will_weld(optr) && !Role_if(PM_INFIDEL))
- /* to dual-wield, 'obj' must be a weapon or a weapon-tool, and not a bow
- or arrow or missile (dart, shuriken, boomerang), so not matching the
- @@ -174,7 +176,7 @@ struct obj *wep;
- } else {
- /* Weapon WILL be wielded after this point */
- res++;
- - if (will_weld(wep)) {
- + if (will_weld_to_you(wep)) {
- const char *tmp = xname(wep), *thestr = "The ";
- if (strncmp(tmp, thestr, 4) && !strncmp(The(tmp), thestr, 4))
- @@ -659,7 +661,7 @@ const char *verb; /* "rub",&c */
- } else {
- struct obj *oldwep = uwep;
- - if (will_weld(obj)) {
- + if (will_weld_to_you(obj)) {
- /* hope none of ready_weapon()'s early returns apply here... */
- (void) ready_weapon(obj);
- } else {
- @@ -955,7 +957,7 @@ int
- welded(obj)
- register struct obj *obj;
- {
- - if (obj && obj == uwep && will_weld(obj)) {
- + if (obj && obj == uwep && will_weld_to_you(obj)) {
- set_bknown(obj, 1);
- return 1;
- }
- diff --git c/src/wizard.c i/src/wizard.c
- index a2b5d4f31..89b53ab37 100644
- --- c/src/wizard.c
- +++ i/src/wizard.c
- @@ -67,7 +67,9 @@ amulet()
- return;
- #endif
- if ((((amu = uamul) != 0 && amu->otyp == AMULET_OF_YENDOR)
- - || ((amu = uwep) != 0 && amu->otyp == AMULET_OF_YENDOR))
- + || ((amu = uwep) != 0 && (amu->otyp == AMULET_OF_YENDOR
- + || amu->oartifact == ART_IDOL_OF_MOLOCH
- + && amu->spe)))
- && !rn2(15)) {
- for (ttmp = g.ftrap; ttmp; ttmp = ttmp->ntrap) {
- if (ttmp->ttyp == MAGIC_PORTAL) {
- @@ -107,7 +109,8 @@ register struct monst *mtmp;
- register struct obj *otmp;
- for (otmp = mtmp->minvent; otmp; otmp = otmp->nobj)
- - if (otmp->otyp == AMULET_OF_YENDOR)
- + if (otmp->otyp == AMULET_OF_YENDOR
- + || otmp->oartifact == ART_IDOL_OF_MOLOCH && otmp->spe)
- return 1;
- return 0;
- }
- diff --git c/src/worn.c i/src/worn.c
- index 231df0961..af764acbf 100644
- --- c/src/worn.c
- +++ i/src/worn.c
- @@ -590,6 +590,10 @@ boolean racialexception;
- continue;
- if (racialexception && (racial_exception(mon, obj) < 1))
- continue;
- + /* monsters won't sacrifice flight for AC */
- + if (big_wings(mon->data) && !Is_dragon_scales(obj)
- + && obj->otyp != LEATHER_JACKET)
- + continue;
- break;
- }
- if (obj->owornmask)
- diff --git c/src/zap.c i/src/zap.c
- index 950949d35..7d9e4665e 100644
- --- c/src/zap.c
- +++ i/src/zap.c
- @@ -1229,6 +1229,7 @@ struct obj *obj;
- int ochance, achance; /* percent chance for ordinary objects, artifacts */
- {
- if (obj->otyp == AMULET_OF_YENDOR
- + || Role_if(PM_INFIDEL) && is_quest_artifact(obj)
- || obj->otyp == SPE_BOOK_OF_THE_DEAD
- || obj->otyp == CANDELABRUM_OF_INVOCATION
- || obj->otyp == BELL_OF_OPENING
- @@ -2517,7 +2518,7 @@ boolean ordinary;
- case WAN_DEATH:
- case SPE_FINGER_OF_DEATH:
- - if (nonliving(g.youmonst.data) || is_demon(g.youmonst.data)) {
- + if (nonliving(g.youmonst.data) || is_demon(raceptr(&g.youmonst))) {
- pline((obj->otyp == WAN_DEATH)
- ? "The wand shoots an apparently harmless beam at you."
- : "You seem no deader than before.");
- @@ -3890,7 +3891,8 @@ xchar sx, sy;
- (void) destroy_arm(uarmc);
- if (uarmu)
- (void) destroy_arm(uarmu);
- - } else if (nonliving(g.youmonst.data) || is_demon(g.youmonst.data)) {
- + } else if (nonliving(g.youmonst.data)
- + || is_demon(raceptr(&g.youmonst))) {
- shieldeff(sx, sy);
- You("seem unaffected.");
- break;
- diff --git c/sys/unix/NetHack.xcodeproj/project.pbxproj i/sys/unix/NetHack.xcodeproj/project.pbxproj
- index 692f2e998..26e93dbeb 100644
- --- c/sys/unix/NetHack.xcodeproj/project.pbxproj
- +++ i/sys/unix/NetHack.xcodeproj/project.pbxproj
- @@ -1138,6 +1138,11 @@
- "$(NH_DAT_DIR)/Hea-goal.lua",
- "$(NH_DAT_DIR)/Hea-loca.lua",
- "$(NH_DAT_DIR)/Hea-strt.lua",
- + "$(NH_DAT_DIR)/Inf-fila.lua",
- + "$(NH_DAT_DIR)/Inf-filb.lua",
- + "$(NH_DAT_DIR)/Inf-goal.lua",
- + "$(NH_DAT_DIR)/Inf-loca.lua",
- + "$(NH_DAT_DIR)/Inf-strt.lua",
- "$(NH_DAT_DIR)/Kni-fila.lua",
- "$(NH_DAT_DIR)/Kni-filb.lua",
- "$(NH_DAT_DIR)/Kni-goal.lua",
- diff --git c/win/tty/wintty.c i/win/tty/wintty.c
- index bb993aa54..27787ff55 100644
- --- c/win/tty/wintty.c
- +++ i/win/tty/wintty.c
- @@ -926,6 +926,7 @@ tty_player_selection()
- */
- getconfirmation = (picksomething && pick4u != 'a' && !flags.randomall);
- while (getconfirmation) {
- + int real_algn = special_alignment(ROLE, ALGN);
- tty_clear_nhwindow(BASE_WINDOW);
- role_selection_prolog(ROLE_NONE, BASE_WINDOW);
- win = create_nhwindow(NHW_MENU);
- @@ -938,8 +939,8 @@ tty_player_selection()
- Sprintf(plbuf, " %s", genders[GEND].adj);
- else
- *plbuf = '\0'; /* omit redundant gender */
- - Sprintf(pbuf, "%s, %s%s %s %s", g.plname, aligns[ALGN].adj, plbuf,
- - races[RACE].adj,
- + Sprintf(pbuf, "%s, %s%s %s %s", g.plname, aligns[real_algn].adj,
- + plbuf, races[RACE].adj,
- (GEND == 1 && roles[ROLE].name.f) ? roles[ROLE].name.f
- : roles[ROLE].name.m);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, pbuf,
- diff --git c/win/win32/vs2017/files.props i/win/win32/vs2017/files.props
- index c388b6898..ad3886d4f 100644
- --- c/win/win32/vs2017/files.props
- +++ i/win/win32/vs2017/files.props
- @@ -97,6 +97,11 @@
- <Luafiles Include = "hea-goal.lua"/>
- <Luafiles Include = "hea-loca.lua"/>
- <Luafiles Include = "hea-strt.lua"/>
- + <Luafiles Include = "inf-fila.lua"/>
- + <Luafiles Include = "inf-filb.lua"/>
- + <Luafiles Include = "inf-goal.lua"/>
- + <Luafiles Include = "inf-loca.lua"/>
- + <Luafiles Include = "inf-strt.lua"/>
- <Luafiles Include = "kni-fila.lua"/>
- <Luafiles Include = "kni-filb.lua"/>
- <Luafiles Include = "kni-goal.lua"/>
Add Comment
Please, Sign In to add comment
