Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some tweaks and fixes #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Some tweaks and fixes #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e4a2ae
Berserk against enemies that are considered extremely dangerous by th…
Pipeliner Nov 12, 2021
a8c10b6
Try to get out of the crowd even if cleaving
Pipeliner Nov 12, 2021
2e420af
Depths is 4 levels deep now
Pipeliner Nov 12, 2021
231a074
Fix can_teleport() always returning false
Pipeliner Nov 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions qw.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,6 +1476,12 @@ function in_desc(lev,str)
end
end

function is_red_threat()
return function (m)
return m:threat() >= 3
end
end

function pan_lord(lev)
return function (m)
return (you.xl() < lev and m:type() == ENUM_MONS_PANDEMONIUM_LORD)
Expand Down Expand Up @@ -1533,6 +1539,7 @@ end
-- berserk these
local scary_monsters = {
["*"] = {
is_red_threat(),
in_desc(15,"hydra"),
hydra_check_flaming(20),
in_desc(100,"berserk[^e]"),
Expand Down Expand Up @@ -1706,6 +1713,7 @@ local scary_monsters = {
-- BiA these even at low piety
local bia_necessary_monsters = {
["*"] = {
is_red_threat(),
hydra_check_flaming(15),
in_desc(100,"statue"),
},
Expand Down Expand Up @@ -2363,8 +2371,8 @@ function can_teleport()
return can_read()
and not (you.teleporting()
or you.anchored()
or you.transform() ~= "tree"
or you.race() ~= "Formicid")
or you.transform() == "tree"
or you.race() == "Formicid")
end

function player_speed_num()
Expand Down Expand Up @@ -3971,8 +3979,6 @@ function step_reason(a1,a2)
elseif have_reaching() and a1.slow_adjacent > 0 and a2.adjacent == 0
and a2.ranged == 0 then
return "reaching"
elseif cleaving() then
return false
elseif a1.adjacent == 1 then
return false
elseif a2.adjacent + a2.ranged <= a1.adjacent + a1.ranged - 2 then
Expand Down Expand Up @@ -4038,7 +4044,7 @@ function choose_tactical_step()
local a0 = assess_square(0,0)
if a0.cloud_safe and not (a0.fumble and sense_danger(3))
and (not have_reaching() or a0.slow_adjacent == 0)
and (a0.adjacent <= 1 or cleaving())
and (a0.adjacent <= 1)
and (a0.near_ally or a0.enemy_distance == 10) then
return
end
Expand Down Expand Up @@ -6236,7 +6242,7 @@ function plan_new_travel()
travel_destination = "L"
end
end
if where == "Depths:5" then
if where == "Depths:4" then
if game_status == "zot" then
travel_destination = "Z"
elseif game_status == "hells" then
Expand Down Expand Up @@ -6981,7 +6987,7 @@ function plan_dig_grate()
local grate_count_needed = 3
if where:find("Zot") then
grate_mon_list = {"draconian stormcaller", "draconian scorcher"}
elseif where == "Depths:5" then
elseif where == "Depths:4" then
grate_mon_list = {"draconian stormcaller", "draconian scorcher",
"angel", "daeva", "lich", "eye"}
elseif where:find("Depths") then
Expand Down