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

Autoexplore now avoids items on candle-lit altars outside of vaults #493

Merged
merged 1 commit into from
Sep 7, 2022
Merged

Autoexplore now avoids items on candle-lit altars outside of vaults #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Autoexplore now avoids items on candle-lit altars outside of vaults 
The "outsourced item" reward room generates items that, when picked up, can trigger the same sorts of traps that picking up keys can. Previously, autoexplore would pick these items up, triggering these traps without warning.

Fixes #462.
  • Loading branch information
@nstoddard
nstoddard committed Aug 1, 2022
commit 8a4f3d2b41f9a3b81eb5f997f6a8431a4613218c
1 change: 1 addition & 0 deletions changes/autoexplore-altar.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Autoexplore now avoids items on candle-lit altars outside of vaults
8 changes: 4 additions & 4 deletions src/brogue/Globals.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,10 +1176,10 @@ const blueprint blueprintCatalog[NUMBER_BLUEPRINTS] = {
{0, 0, 0, {1,1}, 1, 0, 0, 0, 2, 0, 0, (MF_BUILD_AT_ORIGIN | MF_PERMIT_BLOCKING | MF_BUILD_VESTIBULE)}}},
// Outsourced item -- same item possibilities as in the good permanent item reward room (plus charms), but directly adopted by 1-2 key machines.
{{5, 17}, {0, 0}, 20, 4, 0, (BP_REWARD | BP_NO_INTERIOR_FLAG), {
{0, 0, 0, {1,1}, 1, (WEAPON), -1, 0, 0, 0, ITEM_IDENTIFIED,(MF_GENERATE_ITEM | MF_ALTERNATIVE | MF_REQUIRE_GOOD_RUNIC | MF_NO_THROWING_WEAPONS | MF_OUTSOURCE_ITEM_TO_MACHINE | MF_BUILD_ANYWHERE_ON_LEVEL)},
{0, 0, 0, {1,1}, 1, (ARMOR), -1, 0, 0, 0, ITEM_IDENTIFIED,(MF_GENERATE_ITEM | MF_ALTERNATIVE | MF_REQUIRE_GOOD_RUNIC | MF_OUTSOURCE_ITEM_TO_MACHINE | MF_BUILD_ANYWHERE_ON_LEVEL)},
{0, 0, 0, {2,2}, 2, (STAFF), -1, 0, 0, 0, ITEM_KIND_AUTO_ID, (MF_GENERATE_ITEM | MF_ALTERNATIVE | MF_OUTSOURCE_ITEM_TO_MACHINE | MF_BUILD_ANYWHERE_ON_LEVEL)},
{0, 0, 0, {1,2}, 1, (CHARM), -1, 0, 0, 0, ITEM_KIND_AUTO_ID, (MF_GENERATE_ITEM | MF_ALTERNATIVE | MF_OUTSOURCE_ITEM_TO_MACHINE | MF_BUILD_ANYWHERE_ON_LEVEL)}}},
{0, 0, 0, {1,1}, 1, (WEAPON), -1, 0, 0, 0, (ITEM_IDENTIFIED | ITEM_PLAYER_AVOIDS),(MF_GENERATE_ITEM | MF_ALTERNATIVE | MF_REQUIRE_GOOD_RUNIC | MF_NO_THROWING_WEAPONS | MF_OUTSOURCE_ITEM_TO_MACHINE | MF_BUILD_ANYWHERE_ON_LEVEL)},
{0, 0, 0, {1,1}, 1, (ARMOR), -1, 0, 0, 0, (ITEM_IDENTIFIED | ITEM_PLAYER_AVOIDS),(MF_GENERATE_ITEM | MF_ALTERNATIVE | MF_REQUIRE_GOOD_RUNIC | MF_OUTSOURCE_ITEM_TO_MACHINE | MF_BUILD_ANYWHERE_ON_LEVEL)},
{0, 0, 0, {2,2}, 2, (STAFF), -1, 0, 0, 0, (ITEM_KIND_AUTO_ID | ITEM_PLAYER_AVOIDS), (MF_GENERATE_ITEM | MF_ALTERNATIVE | MF_OUTSOURCE_ITEM_TO_MACHINE | MF_BUILD_ANYWHERE_ON_LEVEL)},
{0, 0, 0, {1,2}, 1, (CHARM), -1, 0, 0, 0, (ITEM_KIND_AUTO_ID | ITEM_PLAYER_AVOIDS), (MF_GENERATE_ITEM | MF_ALTERNATIVE | MF_OUTSOURCE_ITEM_TO_MACHINE | MF_BUILD_ANYWHERE_ON_LEVEL)}}},
// Dungeon -- two allies chained up for the taking
{{5, AMULET_LEVEL}, {30, 80}, 12, 5, 0, (BP_ROOM | BP_REWARD), {
{0, VOMIT, SURFACE, {2,2}, 2, 0, -1, 0, 2, (HORDE_MACHINE_CAPTIVE | HORDE_LEADER_CAPTIVE), 0, (MF_GENERATE_HORDE | MF_TREAT_AS_BLOCKING)},
Expand Down