From 7a470efd62d25d14444d9680cb32089de7c4c134 Mon Sep 17 00:00:00 2001
From: Graham Nelson
-Size of lexicon: 3109 excerpt meanings
- Stored among 840 words out of total vocabulary of 10548
- 710 words have a start list: longest belongs to report (with 293 meanings)
+Size of lexicon: 3112 excerpt meanings
+ Stored among 842 words out of total vocabulary of 10550
+ 712 words have a start list: longest belongs to report (with 293 meanings)
15 words have an end list: longest belongs to case (with 6 meanings)
29 words have a middle list: longest belongs to to (with 4 meanings)
108 words have a subset list: longest belongs to street (with 4 meanings)
-Number of attempts to retrieve: 106506
- of which unsuccessful: 88855
- of which successful: 17651
+Number of attempts to retrieve: 106512
+ of which unsuccessful: 88858
+ of which successful: 17654
-Total attempts to match against excerpt meanings: 262902
- of which, total with incorrect hash codes: 240830
- of which, total with correct hash codes: 22072
- of which, total which matched: 19333
+Total attempts to match against excerpt meanings: 262906
+ of which, total with incorrect hash codes: 240831
+ of which, total with correct hash codes: 22075
+ of which, total which matched: 19336
-A first turn sequence rule (this is the every turn stage rule): follow the every turn rules. th. -A first turn sequence rule: follow the scene changing rules. th. +A first turn sequence rule (this is the every turn stage rule): + follow the every turn rules. th. +A first turn sequence rule (this is the early scene changing stage rule): + follow the scene changing rules. th. The generate action rule is listed first in the turn sequence rulebook. rd. The declare everything initially unmentioned rule is listed first in the turn sequence rulebook. nd. The parse command rule is listed first in the turn sequence rulebook. st. @@ -763,7 +765,8 @@ of an out-of-world action, it would be notified a turn late, but of course out-of-world actions are not supposed to do that sort of thing.)-A last turn sequence rule: follow the scene changing rules. rd from last. +A last turn sequence rule (this is the late scene changing stage rule): + follow the scene changing rules. rd from last. The adjust light rule is listed last in the turn sequence rulebook. nd from last. The note object acquisitions rule is listed last in the turn sequence rulebook. enultimate. The notify score changes rule is listed last in the turn sequence rulebook. ast. @@ -1032,7 +1035,8 @@ the names aren't so visible). if within the player's sight is true and action keeping silent is false, follow the specific report rulebook; -The last specific action-processing rule: rule succeeds. +The last specific action-processing rule (this is the default action success rule): + rule succeeds.§38. The unusual use of "anonymously abide by" above is a form of "abide by" which may be worth explaining. Suppose rule \(X\) consists of an diff --git a/inform7/Downloads/excerpts-diagnostics.txt b/inform7/Downloads/excerpts-diagnostics.txt index a2b6d279c..011d63691 100644 --- a/inform7/Downloads/excerpts-diagnostics.txt +++ b/inform7/Downloads/excerpts-diagnostics.txt @@ -1,15 +1,15 @@ -Size of lexicon: 3109 excerpt meanings - Stored among 840 words out of total vocabulary of 10548 - 710 words have a start list: longest belongs to report (with 293 meanings) +Size of lexicon: 3112 excerpt meanings + Stored among 842 words out of total vocabulary of 10550 + 712 words have a start list: longest belongs to report (with 293 meanings) 15 words have an end list: longest belongs to case (with 6 meanings) 29 words have a middle list: longest belongs to to (with 4 meanings) 108 words have a subset list: longest belongs to street (with 4 meanings) -Number of attempts to retrieve: 106506 - of which unsuccessful: 88855 - of which successful: 17651 +Number of attempts to retrieve: 106512 + of which unsuccessful: 88858 + of which successful: 17654 -Total attempts to match against excerpt meanings: 262902 - of which, total with incorrect hash codes: 240830 - of which, total with correct hash codes: 22072 - of which, total which matched: 19333 +Total attempts to match against excerpt meanings: 262906 + of which, total with incorrect hash codes: 240831 + of which, total with correct hash codes: 22075 + of which, total which matched: 19336 diff --git a/inform7/Downloads/preform-diagnostics.txt b/inform7/Downloads/preform-diagnostics.txt index 269c165a7..da6909703 100644 --- a/inform7/Downloads/preform-diagnostics.txt +++ b/inform7/Downloads/preform-diagnostics.txt @@ -16,7 +16,7 @@
internal nti 19 constraint (none) extremes [1, 1] - internal hits 2901/25368 nti 20 constraint (none) extremes [1, 1] + internal hits 2901/25424 nti 20 constraint (none) extremes [1, 1] internal nti 21 constraint (none) extremes [1, 1] @@ -4758,12 +4758,12 @@ internal hits 0/258 nti 14 constraint (none) extremes [1, infinity) - hits 36373/72746 nti 11 constraint (none) extremes [1, infinity) + hits 36382/72764 nti 11 constraint (none) extremes [1, infinity) English: {...} - (hits 7878/36373) (matched long text) constraint (none) extremes [2, infinity) + (hits 7877/36382) (matched long text) constraint (none) extremes [2, infinity) {...} - (hits 28495/28495) (matched long text) constraint (none) extremes [1, infinity) + (hits 28505/28505) (matched long text) constraint (none) extremes [1, infinity) nti 12 constraint (none) extremes [1, infinity) English: @@ -4772,21 +4772,21 @@ {...} constraint (none) extremes [1, infinity) - hits 83045/166090 nti 13 constraint (none) extremes [1, infinity) + hits 83051/166102 nti 13 constraint (none) extremes [1, infinity) English: {...} - (hits 16076/47454) (matched long text) constraint (none) extremes [2, infinity) + (hits 16076/47460) (matched long text) constraint (none) extremes [2, infinity) {...} - (hits 66969/66969) (matched long text) constraint (none) extremes [1, infinity) + (hits 66975/66975) (matched long text) constraint (none) extremes [1, infinity) nti 14 constraint (none) extremes [2, infinity) English: {...} constraint (none) extremes [2, infinity) - internal hits 16530/98966 nti r2 constraint (none) extremes [1, 1] + internal hits 16530/98978 nti r2 constraint (none) extremes [1, 1] - internal hits 20373/236440 nti r2 constraint (none) extremes [1, 1] + internal hits 20372/236458 nti r2 constraint (none) extremes [1, 1] internal hits 2283/41534 nti r2 constraint (none) extremes [1, 1] @@ -6759,14 +6759,14 @@ {...} ( called {...} ) {***} (hits 18/476) (matched long text) constraint DS = {27} extremes [5, infinity) - hits 0/2020 nti 28 constraint (none) extremes [1, infinity) + hits 0/2032 nti 28 constraint (none) extremes [1, infinity) English: (hits 0/156) constraint (none) extremes [1, 1] {***} (/)/{/}/,/./(- {***} (hits 0/343) constraint DS = {28} extremes [1, infinity) {***} {***} - (hits 0/940) constraint (none) extremes [1, infinity) + (hits 0/946) constraint (none) extremes [1, infinity) hits 0/1614 nti 29 constraint (none) extremes [1, infinity) English: @@ -6842,13 +6842,13 @@ {to} constraint CS = {13} extremes [1, 1] to {...} ( called {...} ) - (hits 0/804) constraint DS = {13} extremes [6, infinity) + (hits 0/807) constraint DS = {13} extremes [6, infinity) {to ...} ( this is the {### function} inverse to {###} ) - (hits 16/677) (matched long text) constraint DS = {13} extremes [12, infinity) + (hits 16/680) (matched long text) constraint DS = {13} extremes [12, infinity) {to ...} ( this is the {### function} ) - (hits 4/719) (matched long text) constraint DS = {13} extremes [9, infinity) + (hits 4/722) (matched long text) constraint DS = {13} extremes [9, infinity) {to ...} ( this is {...} ) - (hits 0/763) constraint DS = {13} extremes [7, infinity) + (hits 0/766) constraint DS = {13} extremes [7, infinity) {to ...} (hits 477/862) (matched long text) constraint DS = {13} extremes [2, infinity) @@ -7077,7 +7077,7 @@ this is {...} rules (hits 0/346) constraint DS = {25} extremes [4, infinity) {...} ( this is the {... rule} ) - (hits 283/305) (matched long text) constraint DS = {25} extremes [8, infinity) + (hits 286/308) (matched long text) constraint DS = {25} extremes [8, infinity) {...} ( this is the rule ) (hits 0/31) constraint DS = {25} extremes [7, infinity) {...} ( this is {...} rule ) @@ -7085,7 +7085,7 @@ {...} ( this is {...} rules ) (hits 0/31) constraint DS = {25} extremes [7, infinity) {...} - (hits 89/89) (matched long text) constraint (none) extremes [1, infinity) + (hits 86/86) (matched long text) constraint (none) extremes [1, infinity) hits 372/744 nti 28 constraint (none) extremes [1, infinity) English: @@ -7232,10 +7232,10 @@ internal hits 76/152 nti 27 constraint (none) extremes [0, 0] - hits 1197/2394 nti 15 constraint DS = {15} extremes [2, infinity) + hits 1206/2412 nti 15 constraint DS = {15} extremes [2, infinity) English: {...} rule - (hits 1197/1197) (matched long text) constraint DS = {15} extremes [2, infinity) + (hits 1206/1206) (matched long text) constraint DS = {15} extremes [2, infinity) internal hits 123/246 nti 28 constraint (none) extremes [1, infinity) diff --git a/inform7/Figures/memory-diagnostics.txt b/inform7/Figures/memory-diagnostics.txt index a338db763..0bc24b6fc 100644 --- a/inform7/Figures/memory-diagnostics.txt +++ b/inform7/Figures/memory-diagnostics.txt @@ -1,13 +1,13 @@ Total memory consumption was 120953K = 118 MB - ---- was used for 2048043 objects, in 364580 frames in 0 x 800K = 0K = 0 MB: + ---- was used for 2048079 objects, in 364616 frames in 0 x 800K = 0K = 0 MB: 33.7% inter_tree_node_array 58 x 8192 = 475136 objects, 41813824 bytes 20.9% text_stream_array 4616 x 100 = 461600 objects, 25997312 bytes - 19.8% linked_list 43888 objects, 24577280 bytes + 19.8% linked_list 43894 objects, 24580640 bytes 11.3% inter_symbol_array 132 x 1024 = 135168 objects, 14061696 bytes 10.6% inter_error_stash_array 101 x 1024 = 103424 objects, 13241504 bytes - 8.3% parse_node 129712 objects, 10376960 bytes + 8.3% parse_node 129721 objects, 10377680 bytes 5.9% verb_conjugation 160 objects, 7425280 bytes 4.4% parse_node_annotation_array 346 x 500 = 173000 objects, 5547072 bytes 2.7% pcalc_prop_array 25 x 1000 = 25000 objects, 3400800 bytes @@ -26,11 +26,11 @@ Total memory consumption was 120953K = 118 MB 0.9% map_data 671 objects, 1127280 bytes 0.8% id_body 942 objects, 1077648 bytes 0.8% adjective_meaning 202 objects, 1000304 bytes - 0.7% excerpt_meaning 3109 objects, 970008 bytes + 0.7% excerpt_meaning 3112 objects, 970944 bytes 0.7% production 3880 objects, 900160 bytes 0.7% ptoken 8411 objects, 874744 bytes - 0.7% grammatical_usage 3613 objects, 867120 bytes - 0.6% individual_form 2563 objects, 861168 bytes + 0.7% grammatical_usage 3616 objects, 867840 bytes + 0.6% individual_form 2566 objects, 862176 bytes 0.6% inter_schema_node 8917 objects, 856032 bytes 0.5% unary_predicate_array 16 x 1000 = 16000 objects, 640512 bytes 0.3% local_variable_array 47 x 100 = 4700 objects, 452704 bytes @@ -38,25 +38,25 @@ Total memory consumption was 120953K = 118 MB 0.2% rule 470 objects, 368480 bytes 0.2% dictionary 7590 objects, 364320 bytes 0.2% verb_form 386 objects, 348944 bytes - 0.2% noun 2382 objects, 285840 bytes + 0.2% noun 2385 objects, 286200 bytes 0.2% compilation_subtask 3355 objects, 268400 bytes 0.2% inter_annotation_array 2 x 8192 = 16384 objects, 262208 bytes 0.2% inference_subject 666 objects, 261072 bytes 0.1% vanilla_function 3684 objects, 235776 bytes 0.1% binary_predicate 322 objects, 170016 bytes 0.1% hierarchy_location 1124 objects, 161856 bytes - 0.1% linguistic_stock_item 3318 objects, 159264 bytes + 0.1% linguistic_stock_item 3321 objects, 159408 bytes 0.1% rule_family_data 401 objects, 147568 bytes 0.1% nonterminal 759 objects, 139656 bytes 0.1% nascent_array 2127 objects, 136128 bytes ---- inference 1703 objects, 122616 bytes ---- documentation_ref 1273 objects, 112024 bytes ---- imperative_defn 1379 objects, 99288 bytes - ---- noun_usage 2404 objects, 96160 bytes + ---- noun_usage 2407 objects, 96280 bytes ---- anl_entry_array 2 x 1000 = 2000 objects, 96064 bytes ---- preposition 273 objects, 87360 bytes ---- inter_schema 1511 objects, 84616 bytes - ---- lexical_cluster 2519 objects, 80608 bytes + ---- lexical_cluster 2522 objects, 80704 bytes ---- pcalc_term_array 2 x 1000 = 2000 objects, 80064 bytes ---- kind_variable_declaration 1655 objects, 79440 bytes ---- inter_tree 6 objects, 79344 bytes @@ -247,7 +247,7 @@ Total memory consumption was 120953K = 118 MB 100.0% was used for memory not allocated for objects: - 56.8% text stream storage 70350608 bytes in 478781 claims + 56.8% text stream storage 70350880 bytes in 478771 claims 4.2% dictionary storage 5297152 bytes in 7590 claims ---- sorting 1520 bytes in 159 claims 5.8% source text 7200000 bytes in 3 claims @@ -256,7 +256,7 @@ Total memory consumption was 120953K = 118 MB ---- linguistic stock array 81920 bytes in 2 claims ---- small word set array 105600 bytes in 22 claims 3.6% inter symbols storage 4553136 bytes in 27953 claims - 13.5% inter bytecode storage 16767568 bytes in 14 claims + 13.5% inter bytecode storage 16767664 bytes in 14 claims 5.0% inter links storage 6222976 bytes in 11 claims 0.1% inter tree location list storage 191232 bytes in 32 claims 1.3% instance-of-kind counting 1700416 bytes in 1 claim @@ -265,5 +265,5 @@ Total memory consumption was 120953K = 118 MB ---- code generation workspace for objects 3480 bytes in 19 claims 0.2% emitter array storage 280288 bytes in 1999 claims --150.0% was overhead - -185887904 bytes = -181531K = -177 MB +-150.0% was overhead - -185895368 bytes = -181538K = -177 MB diff --git a/inform7/Figures/timings-diagnostics.txt b/inform7/Figures/timings-diagnostics.txt index 2ddd379bd..9ff8357b7 100644 --- a/inform7/Figures/timings-diagnostics.txt +++ b/inform7/Figures/timings-diagnostics.txt @@ -1,33 +1,32 @@ 100.0% in inform7 run - 71.0% in compilation to Inter - 50.4% in //Sequence::undertake_queued_tasks// - 4.9% in //MajorNodes::pre_pass// - 3.5% in //MajorNodes::pass_1// + 70.4% in compilation to Inter + 50.6% in //Sequence::undertake_queued_tasks// + 4.4% in //MajorNodes::pre_pass// + 3.4% in //MajorNodes::pass_1// 1.8% in //ImperativeDefinitions::assess_all// 1.4% in //RTKindConstructors::compile// 1.4% in //RTPhrasebook::compile_entries// 1.0% in //Sequence::lint_inter// 0.6% in //MajorNodes::pass_2// + 0.6% in //Sequence::undertake_queued_tasks// 0.6% in //World::stage_V// 0.4% in //ImperativeDefinitions::compile_first_block// 0.4% in //Sequence::undertake_queued_tasks// - 0.4% in //Sequence::undertake_queued_tasks// 0.2% in //CompletionModule::compile// 0.2% in //InferenceSubjects::emit_all// 0.2% in //RTKindConstructors::compile_permissions// 0.2% in //Task::make_built_in_kind_constructors// - 0.2% in //World::stages_II_and_III// - 2.9% not specifically accounted for - 25.8% in running Inter pipeline - 10.1% in step 14/15: generate inform6 -> auto.inf - 5.7% in step 5/15: load-binary-kits - 5.3% in step 6/15: make-synoptic-module + 3.0% not specifically accounted for + 26.4% in running Inter pipeline + 10.6% in step 14/15: generate inform6 -> auto.inf + 5.8% in step 5/15: load-binary-kits + 5.4% in step 6/15: make-synoptic-module 1.4% in step 9/15: make-identifiers-unique 0.4% in step 12/15: eliminate-redundant-operations 0.4% in step 4/15: compile-splats 0.4% in step 7/15: shorten-wiring + 0.4% in step 8/15: detect-indirect-calls 0.2% in step 11/15: eliminate-redundant-labels - 0.2% in step 8/15: detect-indirect-calls - 1.5% not specifically accounted for + 1.4% not specifically accounted for 2.6% in supervisor - 0.5% not specifically accounted for + 0.6% not specifically accounted for diff --git a/inform7/Tests/Test Cases/_Results_Ideal/ManyActions-G.txt b/inform7/Tests/Test Cases/_Results_Ideal/ManyActions-G.txt index 9e33c2a08..fe9f2402f 100644 --- a/inform7/Tests/Test Cases/_Results_Ideal/ManyActions-G.txt +++ b/inform7/Tests/Test Cases/_Results_Ideal/ManyActions-G.txt @@ -4,7 +4,7 @@ Welcome An Interactive Fiction -Release 1 / Serial number 160428 / Inform 7 v10.1.0 / D +Release 1 / Serial number 160428 / Inform 7 v10.2.0 / D Atom Furnace @@ -52,16 +52,16 @@ Rules tracing now switched on. Type "rules off" to switch it off again, or "rule [Rule "after stage rule" applies.] [Rule "investigate player's awareness after action rule" applies.] [Rule "report stage rule" applies.] -[Rule "last specific action-processing rule" applies.] +[Rule "default action success rule" applies.] [action20ing - succeeded] -[Rule "A first turn sequence rule" applies.] +[Rule "early scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "every turn stage rule" applies.] [Rule "timed events rule" applies.] [Rule "advance time rule" applies.] [Rule "update chronological records rule" applies.] -[Rule "A last turn sequence rule" applies.] +[Rule "late scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "adjust light rule" applies.] [Rule "note object acquisitions rule" applies.] @@ -96,16 +96,16 @@ Rules tracing now switched on. Type "rules off" to switch it off again, or "rule [Rule "after stage rule" applies.] [Rule "investigate player's awareness after action rule" applies.] [Rule "report stage rule" applies.] -[Rule "last specific action-processing rule" applies.] +[Rule "default action success rule" applies.] [action110ing - succeeded] -[Rule "A first turn sequence rule" applies.] +[Rule "early scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "every turn stage rule" applies.] [Rule "timed events rule" applies.] [Rule "advance time rule" applies.] [Rule "update chronological records rule" applies.] -[Rule "A last turn sequence rule" applies.] +[Rule "late scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "adjust light rule" applies.] [Rule "note object acquisitions rule" applies.] @@ -140,16 +140,16 @@ Rules tracing now switched on. Type "rules off" to switch it off again, or "rule [Rule "after stage rule" applies.] [Rule "investigate player's awareness after action rule" applies.] [Rule "report stage rule" applies.] -[Rule "last specific action-processing rule" applies.] +[Rule "default action success rule" applies.] [action220ing - succeeded] -[Rule "A first turn sequence rule" applies.] +[Rule "early scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "every turn stage rule" applies.] [Rule "timed events rule" applies.] [Rule "advance time rule" applies.] [Rule "update chronological records rule" applies.] -[Rule "A last turn sequence rule" applies.] +[Rule "late scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "adjust light rule" applies.] [Rule "note object acquisitions rule" applies.] @@ -184,16 +184,16 @@ Rules tracing now switched on. Type "rules off" to switch it off again, or "rule [Rule "after stage rule" applies.] [Rule "investigate player's awareness after action rule" applies.] [Rule "report stage rule" applies.] -[Rule "last specific action-processing rule" applies.] +[Rule "default action success rule" applies.] [action230ing - succeeded] -[Rule "A first turn sequence rule" applies.] +[Rule "early scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "every turn stage rule" applies.] [Rule "timed events rule" applies.] [Rule "advance time rule" applies.] [Rule "update chronological records rule" applies.] -[Rule "A last turn sequence rule" applies.] +[Rule "late scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "adjust light rule" applies.] [Rule "note object acquisitions rule" applies.] @@ -228,16 +228,16 @@ Rules tracing now switched on. Type "rules off" to switch it off again, or "rule [Rule "after stage rule" applies.] [Rule "investigate player's awareness after action rule" applies.] [Rule "report stage rule" applies.] -[Rule "last specific action-processing rule" applies.] +[Rule "default action success rule" applies.] [action240ing - succeeded] -[Rule "A first turn sequence rule" applies.] +[Rule "early scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "every turn stage rule" applies.] [Rule "timed events rule" applies.] [Rule "advance time rule" applies.] [Rule "update chronological records rule" applies.] -[Rule "A last turn sequence rule" applies.] +[Rule "late scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "adjust light rule" applies.] [Rule "note object acquisitions rule" applies.] diff --git a/inform7/Tests/Test Cases/_Results_Ideal/OverlappingActionNames.txt b/inform7/Tests/Test Cases/_Results_Ideal/OverlappingActionNames.txt index 2f1251ace..b04c49f06 100644 --- a/inform7/Tests/Test Cases/_Results_Ideal/OverlappingActionNames.txt +++ b/inform7/Tests/Test Cases/_Results_Ideal/OverlappingActionNames.txt @@ -1,7 +1,7 @@ Parlor Welcome An Interactive Fiction - Release 1 / Serial number 160428 / Inform 7 v10.1.0 / D + Release 1 / Serial number 160428 / Inform 7 v10.2.0 / D Parlor A sparsely furnished room. @@ -44,13 +44,13 @@ You have pointed gloriously at the center coconut half. [pointing at the center coconut half - ended without result] - [Rule "A first turn sequence rule" applies.] + [Rule "early scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "every turn stage rule" applies.] [Rule "timed events rule" applies.] [Rule "advance time rule" applies.] [Rule "update chronological records rule" applies.] - [Rule "A last turn sequence rule" applies.] + [Rule "late scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "adjust light rule" applies.] [Rule "note object acquisitions rule" applies.] diff --git a/inform7/Tests/Test Cases/_Results_Ideal/SecondAsValue.txt b/inform7/Tests/Test Cases/_Results_Ideal/SecondAsValue.txt index 248a2d0dc..29d268cd0 100644 --- a/inform7/Tests/Test Cases/_Results_Ideal/SecondAsValue.txt +++ b/inform7/Tests/Test Cases/_Results_Ideal/SecondAsValue.txt @@ -1,7 +1,7 @@ Shoe Store Welcome An Interactive Fiction - Release 1 / Serial number 160428 / Inform 7 v10.1.0 / D + Release 1 / Serial number 160428 / Inform 7 v10.2.0 / D Shoe Store @@ -40,13 +40,13 @@ You have dyes, but not bleach. [dyeing the satin shoe to white - failed the Check dyeing something to the color understood when the color understood is white] - [Rule "A first turn sequence rule" applies.] + [Rule "early scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "every turn stage rule" applies.] [Rule "timed events rule" applies.] [Rule "advance time rule" applies.] [Rule "update chronological records rule" applies.] - [Rule "A last turn sequence rule" applies.] + [Rule "late scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "adjust light rule" applies.] [Rule "note object acquisitions rule" applies.] @@ -78,13 +78,13 @@ The dress is already dyed white. [dyeing the dress to lilac - failed the Check dyeing something to the color understood] - [Rule "A first turn sequence rule" applies.] + [Rule "early scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "every turn stage rule" applies.] [Rule "timed events rule" applies.] [Rule "advance time rule" applies.] [Rule "update chronological records rule" applies.] - [Rule "A last turn sequence rule" applies.] + [Rule "late scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "adjust light rule" applies.] [Rule "note object acquisitions rule" applies.] @@ -116,13 +116,13 @@ The satin shoe is already dyed white. [dyeing the satin shoe to light purple - failed the Check dyeing something to the color understood] - [Rule "A first turn sequence rule" applies.] + [Rule "early scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "every turn stage rule" applies.] [Rule "timed events rule" applies.] [Rule "advance time rule" applies.] [Rule "update chronological records rule" applies.] - [Rule "A last turn sequence rule" applies.] + [Rule "late scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "adjust light rule" applies.] [Rule "note object acquisitions rule" applies.] @@ -154,13 +154,13 @@ The satin shoe is already dyed white. [dyeing the satin shoe to light purple - failed the Check dyeing something to the color understood] - [Rule "A first turn sequence rule" applies.] + [Rule "early scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "every turn stage rule" applies.] [Rule "timed events rule" applies.] [Rule "advance time rule" applies.] [Rule "update chronological records rule" applies.] - [Rule "A last turn sequence rule" applies.] + [Rule "late scene changing stage rule" applies.] [Rule "scene change machinery rule" applies.] [Rule "adjust light rule" applies.] [Rule "note object acquisitions rule" applies.] diff --git a/inform7/extensions/standard_rules/Sections/Variables and Rulebooks.w b/inform7/extensions/standard_rules/Sections/Variables and Rulebooks.w index c247609c1..9ca1f73b8 100644 --- a/inform7/extensions/standard_rules/Sections/Variables and Rulebooks.w +++ b/inform7/extensions/standard_rules/Sections/Variables and Rulebooks.w @@ -618,8 +618,10 @@ the time of day, timed events, and so on -- except that no commands are read and no consequent actions generated. = -A first turn sequence rule (this is the every turn stage rule): follow the every turn rules. [5th.] -A first turn sequence rule: follow the scene changing rules. [4th.] +A first turn sequence rule (this is the every turn stage rule): + follow the every turn rules. [5th.] +A first turn sequence rule (this is the early scene changing stage rule): + follow the scene changing rules. [4th.] The generate action rule is listed first in the turn sequence rulebook. [3rd.] The declare everything initially unmentioned rule is listed first in the turn sequence rulebook. [2nd.] The parse command rule is listed first in the turn sequence rulebook. [1st.] @@ -678,7 +680,8 @@ of an out-of-world action, it would be notified a turn late, but of course out-of-world actions are not supposed to do that sort of thing.) = -A last turn sequence rule: follow the scene changing rules. [3rd from last.] +A last turn sequence rule (this is the late scene changing stage rule): + follow the scene changing rules. [3rd from last.] The adjust light rule is listed last in the turn sequence rulebook. [2nd from last.] The note object acquisitions rule is listed last in the turn sequence rulebook. [Penultimate.] The notify score changes rule is listed last in the turn sequence rulebook. [Last.] @@ -948,7 +951,8 @@ A specific action-processing rule (this is the report stage rule): if within the player's sight is true and action keeping silent is false, follow the specific report rulebook; -The last specific action-processing rule: rule succeeds. +The last specific action-processing rule (this is the default action success rule): + rule succeeds. @ The unusual use of "anonymously abide by" above is a form of "abide by" which may be worth explaining. Suppose rule $X$ consists of an diff --git a/notes/release/pending.md b/notes/release/pending.md index 6b2d6bf7c..e9cb3f51f 100644 --- a/notes/release/pending.md +++ b/notes/release/pending.md @@ -2,6 +2,20 @@ These will be added to release notes when the release is made. +## Features + +- This was reported as Jira bug [I7-2087](https://inform7.atlassian.net/browse/I7-2087) + "three anonymous standard rules", but is arguably a feature request: that three + rules in the Standard Rules should have names. All three are simple rules, two + of them occurring early and late in the turn cycle to consider whether a scene + change has happened, and one as the fallback rule making an action succeed if + no rules have intervened in the process. + ``` + early scene changing stage + late scene changing stage + default action success rule + ``` + ## Bug fixes - Fix for Jira bug [I7-2139](https://inform7.atlassian.net/browse/I7-2139) diff --git a/services/lexicon-module/Figures/excerpts-diagnostics.txt b/services/lexicon-module/Figures/excerpts-diagnostics.txt index a2b6d279c..011d63691 100644 --- a/services/lexicon-module/Figures/excerpts-diagnostics.txt +++ b/services/lexicon-module/Figures/excerpts-diagnostics.txt @@ -1,15 +1,15 @@ -Size of lexicon: 3109 excerpt meanings - Stored among 840 words out of total vocabulary of 10548 - 710 words have a start list: longest belongs to report (with 293 meanings) +Size of lexicon: 3112 excerpt meanings + Stored among 842 words out of total vocabulary of 10550 + 712 words have a start list: longest belongs to report (with 293 meanings) 15 words have an end list: longest belongs to case (with 6 meanings) 29 words have a middle list: longest belongs to to (with 4 meanings) 108 words have a subset list: longest belongs to street (with 4 meanings) -Number of attempts to retrieve: 106506 - of which unsuccessful: 88855 - of which successful: 17651 +Number of attempts to retrieve: 106512 + of which unsuccessful: 88858 + of which successful: 17654 -Total attempts to match against excerpt meanings: 262902 - of which, total with incorrect hash codes: 240830 - of which, total with correct hash codes: 22072 - of which, total which matched: 19333 +Total attempts to match against excerpt meanings: 262906 + of which, total with incorrect hash codes: 240831 + of which, total with correct hash codes: 22075 + of which, total which matched: 19336 diff --git a/services/linguistics-module/Figures/stock-diagnostics.txt b/services/linguistics-module/Figures/stock-diagnostics.txt index b8d78514f..01d094be6 100644 --- a/services/linguistics-module/Figures/stock-diagnostics.txt +++ b/services/linguistics-module/Figures/stock-diagnostics.txt @@ -1,12 +1,12 @@ adjective: 137 items article: 2 items -noun: 2382 items +noun: 2385 items pronoun: 8 items preposition: 273 items determiner: 22 items verb: 108 items verb_form: 386 items -total in all categories: 3318 +total in all categories: 3321 adjective: 'even' adjective: 'odd' @@ -282,6 +282,8 @@ noun: proper: 'fix baseline scoring rule' noun: proper: 'display banner rule' noun: proper: 'initial room description rule' noun: proper: 'every turn stage rule' +noun: proper: 'early scene changing stage rule' +noun: proper: 'late scene changing stage rule' noun: proper: 'notify score changes rule' noun: proper: 'when play ends stage rule' noun: proper: 'print player's obituary rule' @@ -296,6 +298,7 @@ noun: proper: 'carry out stage rule' noun: proper: 'after stage rule' noun: proper: 'investigate player's awareness after action rule' noun: proper: 'report stage rule' +noun: proper: 'default action success rule' noun: proper: 'player aware of his own actions rule' noun: proper: 'player aware of actions by visible actors rule' noun: proper: 'player aware of actions on visible nouns rule'