ifhub/inform7
1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-06-30 22:14:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116 from zedlopez/there_is_no_there_there

Browse source 
Standard Rules "here"->"[here]" patch
This commit is contained in:
Graham Nelson 2023-07-16 08:28:38 +01:00 committed by GitHub
parent 12793b65f9 e8272c7ee6
commit d6f55ac996
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
inform7/extensions/standard_rules/Sections/Actions.w
View file

@ -225,7 +225,7 @@ do this is to write a rule about taking, which covers all possibilities."
Check an actor removing something from (this is the can't remove what's not inside rule):
if the holder of the noun is not the second noun:
if the actor is the player:
say "But [regarding the noun][they] [aren't] there now." (A);
say "But [regarding the noun][they] [aren't] there [now]." (A);
stop the action.
Check an actor removing something from (this is the can't remove from people rule):
@ -277,7 +277,7 @@ Check an actor dropping something which is part of the actor (this is the
Check an actor dropping (this is the can't drop what's already dropped rule):
if the noun is in the holder of the actor:
if the actor is the player:
say "[The noun] [are] already here." (A);
say "[The noun] [are] already [here]." (A);
stop the action.
Check an actor dropping (this is the can't drop what's not held rule):
@ -2525,7 +2525,7 @@ Check an actor pushing something to (this is the can't push vertically rule):
Check an actor pushing something to (this is the can't push from within rule):
if the noun encloses the actor:
if the actor is the player:
say "[The noun] [cannot] be pushed from here." (A);
say "[The noun] [cannot] be pushed from [here]." (A);
stop the action.
Check an actor pushing something to (this is the standard pushing in directions rule):
@ -2828,7 +2828,7 @@ with some further check rules.)"
Check an actor drinking (this is the block drinking rule):
if the actor is the player:
now the prior named object is nothing;
say "[There's] nothing suitable to drink here." (A);
say "[There's] nothing suitable to drink [here]." (A);
stop the action.
@h Saying sorry.
@ -2874,7 +2874,7 @@ with some further check rules.)"
Check an actor swinging (this is the block swinging rule):
if the actor is the player:
now the prior named object is nothing;
say "[There's] nothing sensible to swing here." (A);
say "[There's] nothing sensible to swing [here]." (A);
stop the action.
@h Rubbing.

2
inform7/extensions/standard_rules/Sections/Activities.w
View file

@ -603,7 +603,7 @@ For printing the locale description (this is the you-can-also-see rule):
giving brief inventory information, tersely, not listing
concealed items, listing marked items only;
otherwise say "[a list of marked for listing things including contents]";
if the domain is the location, say " here" (F);
if the domain is the location, say " [here]" (F);
say ".[paragraph break]";
unfilter list recursion;
end the listing nondescript items activity with the domain;

3
inform7/extensions/standard_rules/Sections/Variables and Rulebooks.w
View file

@ -680,8 +680,7 @@ I6 primitives in the template layer.
=
The adjust light rule is defined by Inter as "ADJUST_LIGHT_R" with
"[It] [are] [if story tense is present tense]now [end if]pitch dark in
[if story tense is present tense]here[else]there[end if]!" (A).
"[It] [are] [if story tense is present tense]now [end if]pitch dark in [here]!" (A).
The advance time rule is defined by Inter as "ADVANCE_TIME_R".
The generate action rule is defined by Inter as "GENERATE_ACTION_R" with
"(considering the first sixteen objects only)[command clarification break]" (A),