oreolek/inform6_examination
1
0
Fork 0
Code Releases Activity

Upgrade Inform6 (en) library to 6.12.3

Browse source
This commit is contained in:
Alexander Yakovlev 2019-08-16 22:45:42 +07:00
parent 5886c70ecf
commit f80a07c5e6
Signed by: oreolek
GPG key ID: 1CDC4B7820C93BD3
9 changed files with 10098 additions and 10303 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
library_en/English.h
View file

@ -1,14 +1,13 @@
! ==============================================================================
! ENGLISH: Language Definition File
!
! Supplied for use with Inform 6 -- Release 6.12.1 -- Serial number 160605
! Supplied for use with Inform 6 -- Release 6.12.3 -- Serial number 190320
!
! Copyright Graham Nelson 1993-2004 and David Griffith 2012-2016
! Copyright Graham Nelson 1993-2004 and David Griffith 2012-2019
!
! This code is licensed under either the traditional Inform license as
! described by the DM4 or the Artistic License version 2.0. See the
! file COPYING in the distribution archive or at
! https://github.com/DavidGriffith/inform6lib/
! file COPYING in the distribution archive.
!
! This file is automatically Included in your game file by "parserm".
! Strictly, "parserm" includes the file named in the "language__" variable,
@ -351,6 +350,9 @@ Constant QKEY2__KY = 'q';
Constant SCORE__TX = "Score: ";
Constant MOVES__TX = "Moves: ";
Constant TIME__TX = "Time: ";
Constant SCORE_S__TX = "S: ";
Constant MOVES_S__TX = "M: ";
Constant TIME_S__TX = "T: ";
Constant CANTGO__TX = "You can't go that way.";
Constant FORMER__TX = "your former self";
Constant MYFORMER__TX = "my former self";
@ -440,18 +442,18 @@ Constant COLON__TX = ": ";
[ CTheyreorThats obj;
if (obj == player) {
if (player provides narrative_voice) {
if (player.narrative_voice == 1) { print "I'm"; return; }
if (player.narrative_voice == 3) { CDefart(player); print "'s"; return; }
if (player.narrative_voice == 1) { Tense("I'm", "I was"); return; }
if (player.narrative_voice == 3) { CDefart(player); Tense("'s", " was"); return; }
}
print "You're";
Tense("You're", "You were");
return;
}
if (obj has pluralname) { print "They're"; return; }
if (obj has female) { print "She's"; return; }
if (obj has pluralname) { Tense("They're", "They were"); return; }
if (obj has female) { Tense("She's", "She was"); return; }
if (obj has male or animate) {
if (obj hasnt neuter) { print "He's"; return; }
if (obj hasnt neuter) { Tense("He's", "He was"); return; }
}
print "That's";
Tense("That's", "That was");
];
[ IsOrAre obj;
@ -583,10 +585,10 @@ Constant COLON__TX = ": ";
[ CSubjectWill obj reportage nocaps;
if (obj == player) {
if (player provides narrative_voice) switch (player.narrative_voice) {
1: Tense("I'll", "I would've"); return;
1: Tense("I'll", "I would"); return;
2: ! Do nothing.
3: CDefart(player);
Tense(" will", " would've"); return;
Tense(" will", " would"); return;
default: RunTimeError(16, player.narrative_voice);
}
if (nocaps) Tense("you'll", "you'd");
@ -638,10 +640,22 @@ Constant COLON__TX = ": ";
if (caps) print "Y"; else print "y";
print "our"; return;
}
if (caps) print "H"; else print "h";
if (obj has male) { print "is"; return; }
if (obj has female) { print "er"; return; }
if (caps) print "I"; else { print "i"; print "ts"; return; }
if (obj has pluralname) {
if (caps) print "T"; else print "t";
print "heir"; return;
}
if (obj has female) {
if (caps) print "H"; else print "h";
print "er"; return;
}
if (obj has male or animate) {
if (obj hasnt neuter) {
if (caps) print "H"; else print "h";
print "is"; return;
}
}
if (caps) print "I"; else { print "i"; }
print "ts"; return;
];
[ PossessiveCaps obj;
@ -893,9 +907,9 @@ Constant COLON__TX = ": ";
1: print "There ";
Tense("isn't", "wasn't");
" anything obvious with which to fill ", (the) x1, ".";
2: print "Filling ", (the) x1, " from ", (the) x2;
Tense(" doesn't", " didn't");
" make sense.";
2: print "Filling ", (the) x1, " from ", (the) x2, " wouldn't ";
Tense("make", "have made");
" sense.";
}
FullScore: switch (n) {
1: if (deadflag) print "The score was "; else print "The score is ";
@ -918,7 +932,7 @@ Constant COLON__TX = ": ";
}
Go: switch (n) {
1: CSubjectWill(actor,true);
Tense(" have", " had");
Tense(" have", " have had");
" to get ", (nop) SupportObj(x1,"off","out of"), " ", (the) x1, " first.";
2: CSubjectCant(actor,true); " go that way.";
3: CSubjectIs (actor,true); " unable to climb ", (the) x1, ".";
@ -935,11 +949,11 @@ Constant COLON__TX = ": ";
2: CSubjectCant(x1,true); " contain things.";
3: CSubjectIs (x1,true); " closed.";
4: CSubjectWill(actor,true);
Tense(" need", " needed");
Tense(" need", " have needed");
" to take ", (ItOrThem) x1, " off first.";
5: CSubjectCant(actor,true); " put something inside itself.";
6: "(first taking ", (ItOrThem) x1, " off)";
7: print "There ";
7: print "There";
Tense(" is", " was");
" no more room in ", (the) x1, ".";
8: "Done.";
@ -952,16 +966,22 @@ Constant COLON__TX = ": ";
4: ".";
}
Jump: CSubjectVerb(actor,false,false,"jump",0,"jumps","jumped"); " on the spot, fruitlessly.";
JumpIn:
print "Jumping in ", (the) x1, " ";
Tense("would achieve", "would have achieved");
" nothing here.";
JumpOn:
print "Jumping upon ", (the) x1, " ";
Tense("would achieve", "would have achieved");
" nothing here.";
JumpIn: switch (n) {
1: print "Jumping in ", (the) x1, " ";
Tense("would achieve", "would have achieved");
" nothing here.";
2: DecideAgainst();
}
JumpOn: switch (n) {
1: print "Jumping upon ", (the) x1, " ";
Tense("would achieve", "would have achieved");
" nothing here.";
2: DecideAgainst();
}
JumpOver: switch (n) {
1: CSubjectVerb(actor,true,false,"achieve",0,"achieve","achieved"); " nothing by this.";
1: print "Jumping over ", (the) x1, " ";
Tense("would achieve", "would have achieved");
" nothing here.";
2: DecideAgainst();
}
Kiss: "Keep your mind on the game.";
@ -990,15 +1010,15 @@ Constant COLON__TX = ": ";
21: print " (in ";
22: print ", inside ";
}
LMode1: print " is now in its ";
LMode1: print (string) Story, " is now in its ";
if (initial_lookmode == 1) print "normal ";
"~brief~ printing mode, which gives long descriptions
of places never before visited and short descriptions otherwise.";
LMode2: print " is now in its ";
LMode2: print (string) Story, " is now in its ";
if (initial_lookmode ~= 1 or 3) print "normal ";
"~verbose~ mode, which always gives long descriptions
of locations (even if you've been there before).";
LMode3: print " is now in its ";
LMode3: print (string) Story, " is now in its ";
if (initial_lookmode == 3) print "normal ";
"~superbrief~ mode, which always gives short descriptions
of locations (even if you haven't been there before).";
@ -1216,9 +1236,9 @@ Constant COLON__TX = ": ";
}
! Push: see Pull
PushDir: switch (n) {
1: print "That really ";
Tense("wouldn't", "didn't");
" serve any purpose.";
1: print "That really wouldn't ";
Tense("serve", "have served");
" any purpose.";
2: print "That's ";
Tense("not", "wasn't");
" a direction.";
@ -1284,7 +1304,7 @@ Constant COLON__TX = ": ";
}
ScriptOn: switch (n) {
1: "Transcripting is already on.";
2: "Start of a transcript of";
2: print "Start of a transcript of"; VersionSub();
3: "Attempt to begin transcript failed.";
}
Search: switch (n) {
@ -1403,9 +1423,9 @@ Constant COLON__TX = ": ";
Touch: switch (n) {
1: DecideAgainst();
2: CSubjectVerb(actor,true,false,"feel",0,"feels","felt"); " nothing unexpected.";
3: print "That really ";
Tense("wouldn't", "didn't");
" serve any purpose.";
3: print "That really wouldn't ";
Tense("serve", "have served");
" any purpose.";
}
! Turn: see Pull.
Unlock: switch (n) {

7
library_en/grammar.h
View file

@ -1,13 +1,13 @@
! ==============================================================================
! GRAMMAR: Grammar table entries for the standard verbs library.
!
! Supplied for use with Inform 6 -- Release 6.12.1 -- Serial number 160605
! Supplied for use with Inform 6 -- Release 6.12.3 -- Serial number 190320
!
! Copyright Graham Nelson 1993-2004 and David Griffith 2012-2016
! Copyright Graham Nelson 1993-2004 and David Griffith 2012-2019
! This code is licensed under either the traditional Inform license as
! described by the DM4 or the Artistic License version 2.0. See the
! file COPYING in the distribution archive or at
! https://github.com/DavidGriffith/inform6lib/
! https://gitlab.com/DavidGriffith/inform6lib/
!
! In your game file, Include three library files in this order:
! Include "Parser";
@ -242,6 +242,7 @@ Verb 'drop' 'discard'
* multiexcept 'on'/'onto' noun -> PutOn;
Verb 'throw'
* noun -> ThrowAt
* held 'at'/'against'/'on'/'onto' noun -> ThrowAt;
Verb 'eat'

9
library_en/infix.h
View file

@ -1,14 +1,13 @@
! ==============================================================================
! INFIX: Support for the optional library debugger extension "Infix".
!
! Supplied for use with Inform 6 -- Release 6.12.1 -- Serial number 160605
! Supplied for use with Inform 6 -- Release 6.12.3 -- Serial number 190320
!
! Copyright Graham Nelson 1993-2004 and David Griffith 2012-2016
! Copyright Graham Nelson 1993-2004 and David Griffith 2012-2019
!
! This code is licensed under either the traditional Inform license as
! described by the DM4 or the Artistic License version 2.0. See the
! file COPYING in the distribution archive or at
! https://github.com/DavidGriffith/inform6lib/
! file COPYING in the distribution archive.
!
! This file is automatically Included in your game file by "Grammar" if you
! supply the -X compiler switch.
@ -968,7 +967,7 @@ Array InfixRV_commas --> 32;
for (b=0 : b < #dictionary_table-->0 : b++) {
w = #dictionary_table + WORDSIZE + b*(DICT_WORD_SIZE + 7);
if ((w->#dict_par1) & 1) {
a = (#grammar_table)-->($100-(w->#dict_par2));
a = (#grammar_table)-->(DictionaryWordToVerbNum(w) + 1);
lines = a->0; a++;
for (: lines>0 : lines--) {
a = UnpackGrammarLine(a);

7
library_en/linklpa.h
View file

@ -1,14 +1,13 @@
! ==============================================================================
! LINKLPA: Link declarations of common properties and attributes.
!
! Supplied for use with Inform 6 -- Release 6.12.1 -- Serial number 160605
! Supplied for use with Inform 6 -- Release 6.12.3 -- Serial number 190320
!
! Copyright Graham Nelson 1993-2004 and David Griffith 2012-2016
! Copyright Graham Nelson 1993-2004 and David Griffith 2012-2019
!
! This code is licensed under either the traditional Inform license as
! described by the DM4 or the Artistic License version 2.0. See the
! file COPYING in the distribution archive or at
! https://github.com/DavidGriffith/inform6lib/
! file COPYING in the distribution archive.
!
! This file is automatically Included in your game file by "Parser".
! ==============================================================================

198
library_en/linklv.h
View file

@ -1,198 +0,0 @@
! ==============================================================================
! LINKLV: Link declarations of library variables.
!
! Supplied for use with Inform 6 -- Release 6.12.1 -- Serial number 160429
!
! Copyright Graham Nelson 1993-2004 and David Griffith 2012-2015
!
! This code is licensed under either the traditional Inform license as
! described by the DM4 or the Artistic License version 2.0. See the
! file COPYING in the distribution archive or at
! https://github.com/DavidGriffith/inform6lib/
!
! This file is automatically Included in your game file by "verblibm" only if
! you supply the -U compiler switch to use pre-compiled Modules.
! ==============================================================================
System_file;
! ------------------------------------------------------------------------------
Import global location;
Import global sline1;
Import global sline2;
Import global top_object;
Import global standard_interpreter;
Import global undo_flag;
Import global just_undone;
Import global transcript_mode;
Import global xcommsdir;
Import global sys_statusline_flag;
Import global turns;
Import global the_time;
Import global time_rate;
Import global time_step;
Import global active_timers;
Import global score;
Import global last_score;
Import global notify_mode;
Import global places_score;
Import global things_score;
Import global player;
Import global deadflag;
Import global lightflag;
Import global real_location;
Import global prev_location;
Import global visibility_ceiling;
Import global lookmode;
Import global print_player_flag;
Import global lastdesc;
Import global c_style;
Import global lt_value;
Import global listing_together;
Import global listing_size;
Import global wlf_indent;
Import global inventory_stage;
Import global inventory_style;
Import global pretty_flag;
Import global menu_nesting;
Import global menu_item;
Import global item_width;
Import global item_name;
Import global lm_n;
Import global lm_o;
Import global lm_s;
#Ifdef COLOUR;
Import global clr_fg;
Import global clr_bg;
Import global clr_fgstatus;
Import global clr_bgstatus;
#Endif; ! COLOUR
Import global statuswin_current;
#Ifdef DEBUG;
Import global debug_flag;
Import global x_scope_count;
#Endif; ! DEBUG
Import global action;
Import global inp1;
Import global inp2;
Import global noun;
Import global second;
Import global keep_silent;
Import global reason_code;
Import global receive_action;
Import global parser_trace;
Import global parser_action;
Import global parser_one;
Import global parser_two;
Import global parser_inflection;
Import global actor;
Import global actors_location;
Import global meta;
Import global multiflag;
Import global toomany_flag;
Import global special_word;
Import global special_number;
Import global parsed_number;
Import global consult_from;
Import global consult_words;
Import global asking_player;
Import global notheld_mode;
Import global onotheld_mode;
Import global not_holding;
Import global etype;
Import global best_etype;
Import global nextbest_etype;
Import global pcount;
Import global pcount2;
Import global parameters;
Import global nsns;
Import global special_number1;
Import global special_number2;
Import global params_wanted;
Import global inferfrom;
Import global inferword;
Import global dont_infer;
Import global action_to_be;
Import global action_reversed;
Import global advance_warning;
Import global found_ttype;
Import global found_tdata;
Import global token_filter;
Import global length_of_noun;
Import global lookahead;
Import global multi_mode;
Import global multi_wanted;
Import global multi_had;
Import global multi_context;
Import global indef_mode;
Import global indef_type;
Import global indef_wanted;
Import global indef_guess_p;
Import global indef_owner;
Import global indef_cases;
Import global indef_possambig;
Import global indef_nspec_at;
Import global allow_plurals;
Import global take_all_rule;
Import global dict_flags_of_noun;
Import global pronoun_word;
Import global pronoun_obj;
Import global pronoun__word;
Import global pronoun__obj;
Import global scope_reason;
Import global scope_token;
Import global scope_error;
Import global scope_stage;
Import global ats_flag;
Import global ats_hls;
Import global placed_in_flag;
Import global number_matched;
Import global number_of_classes;
Import global match_length;
Import global match_from;
Import global bestguess_score;
Import global wn;
Import global num_words;
Import global verb_word;
Import global verb_wordnum;
Import global usual_grammar_after;
Import global oops_from;
Import global saved_oops;
Import global held_back_mode;
Import global hb_wn;
Import global caps_mode;
Import global print_anything_result;
Import global initial_lookmode;
Import global before_first_turn;
Import global short_name_case;
Import global dict_start;
Import global dict_entry_size;
Import global dict_end;
#Ifdef EnglishNaturalLanguage;
Import global itobj;
Import global himobj;
Import global herobj;
Import global old_itobj;
Import global old_himobj;
Import global old_herobj;
#Endif; ! EnglishNaturalLanguage
! ==============================================================================

7142
library_en/parser.h
View file

File diff suppressed because it is too large Load diff

7123
library_en/parserm.h
View file

File diff suppressed because it is too large Load diff

2902
library_en/verblib.h
View file

File diff suppressed because it is too large Load diff

2909
library_en/verblibm.h
View file

File diff suppressed because it is too large Load diff