Skip to content

Commit

Permalink
Fix for Mantis bug 1750
Browse files Browse the repository at this point in the history
  • Loading branch information
ganelson committed Apr 14, 2022
1 parent dad80cb commit 0f3fb2e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -125,7 +125,7 @@ The inform7 subtree further contains these primary resources:
* inform7/Internal/Extensions/Emily Short/Glulx Image Centering.i7x - __4__
* inform7/Internal/Extensions/Emily Short/Glulx Text Effects.i7x - __5/140516__
* inform7/Internal/Extensions/Emily Short/Inanimate Listeners.i7x - ____
* inform7/Internal/Extensions/Emily Short/Locksmith.i7x - __12__
* inform7/Internal/Extensions/Emily Short/Locksmith.i7x - __13__
* inform7/Internal/Extensions/Emily Short/Menus.i7x - __3__
* inform7/Internal/Extensions/Emily Short/Punctuation Removal.i7x - __5__
* inform7/Internal/Extensions/Emily Short/Skeleton Keys.i7x - ____
Expand Down
14 changes: 7 additions & 7 deletions inform7/Internal/Extensions/Emily Short/Locksmith.i7x
@@ -1,4 +1,4 @@
Version 12 of Locksmith by Emily Short begins here.
Version 13 of Locksmith by Emily Short begins here.

"Implicit handling of doors and containers so that lock manipulation is automatic if the player has the necessary keys."

Expand Down Expand Up @@ -65,10 +65,10 @@ Part 1 - The matching key rule
This is the need a matching key rule:
if the person asked encloses something (called item) which unlocks the noun:
now the second noun is the item;
abide by the must have accessible the second noun rule;
abide by the second noun must be accessible rule;
otherwise if a visible passkey (called item) unbolts the noun:
now the second noun is the item;
abide by the must have accessible the second noun rule;
abide by the second noun must be accessible rule;
otherwise:
if the player is the person asked, say "[key-refusal for noun]";
stop the action.
Expand Down Expand Up @@ -103,7 +103,7 @@ unlocking it with. Understand "open [a lockable thing] with [something]" as
unlocking it with.

Check unlocking it with (this is the must be able to reach the key rule):
abide by the must have accessible the second noun rule.
abide by the second noun must be accessible rule.

The right second rule is listed instead of the can't unlock without the
correct key rule in the check unlocking it with rulebook.
Expand Down Expand Up @@ -146,7 +146,7 @@ thing] with [something]" as locking it with. Understand "lock [a lockable
thing] with [something]" as locking it with.

Check locking it with:
abide by the must have accessible the second noun rule.
abide by the second noun must be accessible rule.

The right second rule is listed instead of the can't lock without the correct
key rule in the check locking it with rulebook.
Expand Down Expand Up @@ -262,7 +262,7 @@ This is the must hold the second noun rule:
if the person asked does not have the second noun, stop the action;
make no decision.

This is the must have accessible the noun rule:
This is the noun must be accessible rule:
if the noun is not key-accessible:
if the noun is on a keychain (called the containing keychain), now the noun is the containing keychain;
follow the noun autotaking rule;
Expand All @@ -272,7 +272,7 @@ This is the must have accessible the noun rule:
stop the action;
make no decision.

This is the must have accessible the second noun rule:
This is the second noun must be accessible rule:
if the second noun is not key-accessible:
let the held second noun be the second noun;
if the second noun is on a keychain (called the containing keychain),
Expand Down
2 changes: 1 addition & 1 deletion inter/pipeline-module/Chapter 5/Responses.w
Expand Up @@ -111,7 +111,7 @@ code is less limited.
for (int i=0; i<InterNodeList::array_len(inv->response_nodes); i++) {
inter_package *pack = PackageInstruction::at_this_head(inv->response_nodes->list[i].node);
inter_ti m = Metadata::read_numeric(pack, I"^marker");
inter_symbol *rule_s = Metadata::required_symbol(pack, I"^value");
inter_symbol *rule_s = Metadata::required_symbol(pack, I"^rule");
Produce::inv_primitive(I, IF_BIP);
Produce::down(I);
Produce::inv_primitive(I, EQ_BIP);
Expand Down

0 comments on commit 0f3fb2e

Please sign in to comment.