diff --git a/README.md b/README.md index b5439b961..430146f03 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -[Version](notes/versioning.md): 10.2.0-beta+6X30 'Krypton' (3 January 2024) +[Version](notes/versioning.md): 10.2.0-beta+6X31 'Krypton' (8 January 2024) ## About Inform diff --git a/build.txt b/build.txt index cfaf7a3d7..22472dd74 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 3 January 2024 -Build Number: 6X30 +Build Date: 8 January 2024 +Build Number: 6X31 diff --git a/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json b/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json index 6fdb2ccc7..aaec09242 100644 --- a/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json +++ b/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "Architecture16Kit", - "version": "10.2.0-beta+6X30" + "version": "10.2.0-beta+6X31" }, "compatibility": "16-bit", "kit-details": { diff --git a/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json b/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json index 06e374dbf..db6b85614 100644 --- a/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json +++ b/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "Architecture32Kit", - "version": "10.2.0-beta+6X30" + "version": "10.2.0-beta+6X31" }, "compatibility": "32-bit", "kit-details": { diff --git a/inform7/Internal/Inter/BasicInformKit/kit_metadata.json b/inform7/Internal/Inter/BasicInformKit/kit_metadata.json index 56a88ad6d..a36170bfd 100644 --- a/inform7/Internal/Inter/BasicInformKit/kit_metadata.json +++ b/inform7/Internal/Inter/BasicInformKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "BasicInformKit", - "version": "10.2.0-beta+6X30" + "version": "10.2.0-beta+6X31" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/CommandParserKit/kit_metadata.json b/inform7/Internal/Inter/CommandParserKit/kit_metadata.json index 9a0d9a1a4..81ed2e494 100644 --- a/inform7/Internal/Inter/CommandParserKit/kit_metadata.json +++ b/inform7/Internal/Inter/CommandParserKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "CommandParserKit", - "version": "10.2.0-beta+6X30" + "version": "10.2.0-beta+6X31" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json b/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json index b27899661..7f5f07103 100644 --- a/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json +++ b/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "EnglishLanguageKit", - "version": "10.2.0-beta+6X30" + "version": "10.2.0-beta+6X31" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/WorldModelKit/kit_metadata.json b/inform7/Internal/Inter/WorldModelKit/kit_metadata.json index 729805280..fb37f1431 100644 --- a/inform7/Internal/Inter/WorldModelKit/kit_metadata.json +++ b/inform7/Internal/Inter/WorldModelKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "WorldModelKit", - "version": "10.2.0-beta+6X30" + "version": "10.2.0-beta+6X31" }, "needs": [ { "need": { diff --git a/inform7/Tests/Test Basic/BIP-ListOperations-G--I.txt b/inform7/Tests/Test Basic/BIP-ListOperations-G--I.txt index cf3cd8681..f00f4b2bc 100644 --- a/inform7/Tests/Test Basic/BIP-ListOperations-G--I.txt +++ b/inform7/Tests/Test Basic/BIP-ListOperations-G--I.txt @@ -4,7 +4,7 @@ L sorts to {-7, -7, 0, 2, 3, 5, 11, 16}. L then reverses to {16, 11, 5, 3, 2, 0, -7, -7}. L then rotates to {-7, 16, 11, 5, 3, 2, 0, -7}. L then rotates backwards to {16, 11, 5, 3, 2, 0, -7, -7}. -L sorts randomly to {3, 16, 2, 11, -7, -7, 0, 5}. +L sorts randomly to {-7, 11, 2, -7, 3, 16, 0, 5}. L sorts in reverse order to {16, 11, 5, 3, 2, 0, -7, -7}. "F" = list of fruits: {apple, pear, orange} F sorts in size order to {orange, pear, apple}. diff --git a/inform7/Tests/Test Basic/BIP-Randomness-G--I.txt b/inform7/Tests/Test Basic/BIP-Randomness-G--I.txt index 750a8fc47..31026eaf6 100644 --- a/inform7/Tests/Test Basic/BIP-Randomness-G--I.txt +++ b/inform7/Tests/Test Basic/BIP-Randomness-G--I.txt @@ -1,26 +1,26 @@ "a random fruit" = fruit: apple -"a random fruit" = fruit: yuzu -"a random fruit" = fruit: pear "a random fruit" = fruit: persimmon -"a random fruit between pear and yuzu" = fruit: persimmon +"a random fruit" = fruit: yuzu +"a random fruit" = fruit: persimmon "a random fruit between pear and yuzu" = fruit: pear +"a random fruit between pear and yuzu" = fruit: persimmon "a random fruit from pear to yuzu" = fruit: pear "a random fruit from pear to yuzu" = fruit: pear -"a random number between 10 and 19" = number: 17 -"a random number between 10 and 19" = number: 16 "a random number between 10 and 19" = number: 13 -"a random number from 10 to 19" = number: 13 -"a random number from 10 to 19" = number: 13 -"a random number from 10 to 19" = number: 12 +"a random number between 10 and 19" = number: 15 +"a random number between 10 and 19" = number: 19 +"a random number from 10 to 19" = number: 18 +"a random number from 10 to 19" = number: 19 +"a random number from 10 to 19" = number: 16 +"whether or not a random chance of 1 in 3 succeeds" = truth state: false +"whether or not a random chance of 1 in 3 succeeds" = truth state: false +"whether or not a random chance of 1 in 3 succeeds" = truth state: false "whether or not a random chance of 1 in 3 succeeds" = truth state: false "whether or not a random chance of 1 in 3 succeeds" = truth state: false "whether or not a random chance of 1 in 3 succeeds" = truth state: true -"whether or not a random chance of 1 in 3 succeeds" = truth state: false -"whether or not a random chance of 1 in 3 succeeds" = truth state: false -"whether or not a random chance of 1 in 3 succeeds" = truth state: true -"a random number between 1 and 100" = number: 26 -"a random number between 1 and 100" = number: 66 -"a random number between 1 and 100" = number: 75 -"a random number between 1 and 100" = number: 26 -"a random number between 1 and 100" = number: 66 -"a random number between 1 and 100" = number: 75 +"a random number between 1 and 100" = number: 92 +"a random number between 1 and 100" = number: 72 +"a random number between 1 and 100" = number: 76 +"a random number between 1 and 100" = number: 92 +"a random number between 1 and 100" = number: 72 +"a random number between 1 and 100" = number: 76 diff --git a/inform7/Tests/Test Basic/BIP-SayOneOf-G--I.txt b/inform7/Tests/Test Basic/BIP-SayOneOf-G--I.txt index a15db0a96..e5aca5ff9 100644 --- a/inform7/Tests/Test Basic/BIP-SayOneOf-G--I.txt +++ b/inform7/Tests/Test Basic/BIP-SayOneOf-G--I.txt @@ -11,68 +11,68 @@ This is Summer. This is Autumn. This is Winter. This is Spring. -This is a scorching hot day. -This is a cloudy day. -This is a cloudy day. -This is a cloudy day. -This is a cloudy day. -This is a cloudy day. -This is a cloudy day. -This is a cloudy day. -This is a cloudy day. -This is a cloudy day. -This is a rainy day. -This is a rainy day. -This is a rainy day. -This is a sunny day. This is a rainy day. This is a cloudy day. +This is a cloudy day. +This is a cloudy day. +This is a cloudy day. This is a rainy day. This is a scorching hot day. This is a sunny day. +This is a rainy day. +This is a rainy day. +This is a cloudy day. +This is a cloudy day. +This is a cloudy day. +This is a cloudy day. +This is a rainy day. +This is a cloudy day. +This is a sunny day. +This is a cloudy day. +This is a rainy day. +Clearly it's Starless. +Clearly it's Epitaph. +Clearly it's Lizard. +Clearly it's Epitaph. +Clearly it's Starless. +Clearly it's Lizard. +Clearly it's Epitaph. +Clearly it's Fracture. +Clearly it's Epitaph. +Clearly it's Lizard. Clearly it's Starless. Clearly it's Fracture. -Clearly it's Lizard. -Clearly it's Epitaph. -Clearly it's Lizard. -Clearly it's Nuages. -Clearly it's Lizard. -Clearly it's Epitaph. -Clearly it's Starless. -Clearly it's Epitaph. -Clearly it's Nuages. -Clearly it's Epitaph. -Clearly it's Starless. -Clearly it's Epitaph. -Clearly it's Lizard. +Clearly it's Level Five. Clearly it's Fracture. -Clearly it's Lizard. -Clearly it's Nuages. +Clearly it's Level Five. +Clearly it's Fracture. +Clearly it's Epitaph. +Clearly it's Level Five. +The digit is 4. The digit is 3. -The digit is 1. The digit is 5. The digit is 2. -The digit is 4. +The digit is 1. +The digit is 5. The digit is 4. The digit is 1. -The digit is 3. The digit is 2. -The digit is 5. -The letter is B. -The letter is B. -The letter is B. -The letter is B. -The light changes randomly again; now it's green. +The digit is 3. +The letter is C. +The letter is C. +The letter is C. +The letter is C. +The light changes randomly again; now it's red. The light changes randomly again; now it's amber. The light changes randomly again; now it's green. -The light changes randomly again; now it's amber. +The light changes randomly again; now it's red. The light changes randomly again; now it's green. The coin comes up tails. -The coin comes up tails. -The coin comes up tails. The coin comes up heads. The coin comes up tails. -The coin comes up heads. +The coin comes up tails. +The coin comes up tails. +The coin comes up tails. Maybe the murderer is Colonel Mustard. Maybe the murderer is Professor Plum. Maybe the murderer is Cardinal Cerise. @@ -81,22 +81,22 @@ Maybe the murderer is Professor Plum. Maybe the murderer is Colonel Mustard. Maybe the murderer is Cardinal Cerise. Maybe the murderer is Professor Plum. -Maybe the murderer is Colonel Mustard. +Maybe the murderer is Cardinal Cerise. +Maybe the murderer is Professor Plum. Maybe the murderer is Cardinal Cerise. Maybe the murderer is Colonel Mustard. -Maybe the murderer is Professor Plum. Maybe the victim is Colonel Mustard. Maybe the victim is Professor Plum. Maybe the victim is Cardinal Cerise. Maybe the victim is Professor Plum. -Maybe the victim is Professor Plum. -Maybe the victim is Cardinal Cerise. +Maybe the victim is Colonel Mustard. Maybe the victim is Colonel Mustard. Maybe the victim is Professor Plum. Maybe the victim is Cardinal Cerise. -Maybe the victim is Professor Plum. -Maybe the victim is Cardinal Cerise. Maybe the victim is Colonel Mustard. +Maybe the victim is Cardinal Cerise. +Maybe the victim is Cardinal Cerise. +Maybe the victim is Professor Plum. The screen door squeaks surprisingly loudly. The screen door squeaks loudly. The screen door squeaks loudly. diff --git a/inform7/Tests/Test Basic/BIP-TableSort-G--I.txt b/inform7/Tests/Test Basic/BIP-TableSort-G--I.txt index 3c7656307..ba456ba2b 100644 --- a/inform7/Tests/Test Basic/BIP-TableSort-G--I.txt +++ b/inform7/Tests/Test Basic/BIP-TableSort-G--I.txt @@ -490,11 +490,11 @@ Table of Zoggle (row 3) | 3.5 | (row 4) | 4.4 | Table of Selected Numbers -(row 1) | 9 | nine | -(row 2) | 27 | twenty-seven | +(row 1) | 154 | one hundred and fifty-four | +(row 2) | 3 | three | (row 3) | 4 | four | -(row 4) | 3 | three | -(row 5) | 154 | one hundred and fifty-four | +(row 4) | 27 | twenty-seven | +(row 5) | 9 | nine | (row 6) | -- -- (row 7) | -- -- (row 8) | -- -- diff --git a/inform7/Tests/Test Basic/BIP-Tables-G--I.txt b/inform7/Tests/Test Basic/BIP-Tables-G--I.txt index 4581cd725..40f3c763d 100644 --- a/inform7/Tests/Test Basic/BIP-Tables-G--I.txt +++ b/inform7/Tests/Test Basic/BIP-Tables-G--I.txt @@ -5,7 +5,7 @@ Table of Neptune's Moons (row 4) | -- -- The surface of Triton is cryovolcanic ridges. We seem to find (row 3) | Proteus | highly irregular and sooty |. -The surface of Proteus is highly irregular and sooty. +The surface of Nereid is utterly unknown. "whether or not the sought value is a surface listed in the Table of Neptune's Moons" = truth state: true "moon entry" = text: Nereid "surface entry" = text: utterly unknown diff --git a/inform7/Tests/Test Cases/MoreNotations-G--I.txt b/inform7/Tests/Test Cases/MoreNotations-G--I.txt index fd9f6c7ce..23f736acf 100644 --- a/inform7/Tests/Test Cases/MoreNotations-G--I.txt +++ b/inform7/Tests/Test Cases/MoreNotations-G--I.txt @@ -32,7 +32,7 @@ chessboard square: d7 a1 a2 a3 a4 a5 a6 a7 a8 b1 b2 b3 b4 b5 b6 b7 b8 c1 c2 c3 c4 c5 c6 c7 c8 d1 d2 d3 d4 d5 d6 d7 d8 e1 e2 e3 e4 e5 e6 e7 e8 f1 f2 f3 f4 f5 f6 f7 f8 g1 g2 g3 g4 g5 g6 g7 g8 h1 h2 h3 h4 h5 h6 h7 h8 ...and that's all. a1 a2 a3 a4 a5 a6 a7 a8 b1 b2 b3 b4 b5 b6 b7 b8 c1 c2 c3 c4 c5 c6 c7 c8 d1 d2 d3 d4 d5 d6 d7 d8 e1 e2 e3 e4 e5 e6 e7 e8 f1 f2 f3 f4 f5 f6 f7 f8 g1 g2 g3 g4 g5 g6 g7 g8 h1 h2 h3 h4 h5 h6 h7 h8 ...and that's also all. "list of white chessboard squares" = list of chessboard squares: {a2, a4, a6, a8, b1, b3, b5, b7, c2, c4, c6, c8, d1, d3, d5, d7, e2, e4, e6, e8, f1, f3, f5, f7, g2, g4, g6, g8, h1, h3, h5, h7} -"a random chessboard square" = chessboard square: f1 +"a random chessboard square" = chessboard square: h2 Stellar type test... stellar type: O00 @@ -45,16 +45,16 @@ stellar type: K9Iab Annie Jump Cannon classifies Beta Aquilae as G8IV. "Hm, yes - subgiant." Annie Jump Cannon classifies Herschel's Garnet as M2Ia. "Hm, yes - luminous supergiant." "number of stellar types" = number: 700 -"a random stellar type" = stellar type: M0VI -"a random stellar type" = stellar type: K7IV -"a random stellar type" = stellar type: A2V -"a random stellar type" = stellar type: O7VI -"a random stellar type" = stellar type: F1VII -"a random stellar type" = stellar type: B0VII -"a random stellar type" = stellar type: O6V -"a random stellar type" = stellar type: A4V -"a random stellar type" = stellar type: G9IV -"a random stellar type" = stellar type: K3Ib +"a random stellar type" = stellar type: B4V +"a random stellar type" = stellar type: O3VI +"a random stellar type" = stellar type: B0V +"a random stellar type" = stellar type: A6VII +"a random stellar type" = stellar type: M5II +"a random stellar type" = stellar type: K20 +"a random stellar type" = stellar type: F8Ia +"a random stellar type" = stellar type: K2Ib +"a random stellar type" = stellar type: M8III +"a random stellar type" = stellar type: K2VII Tomb wall test... "number of tomb wall patterns" = number: 256 diff --git a/resources/Documentation/Examples/MMelmothsDuel-G--I.txt b/resources/Documentation/Examples/MMelmothsDuel-G--I.txt index 56a1294bf..20f1ab99d 100644 --- a/resources/Documentation/Examples/MMelmothsDuel-G--I.txt +++ b/resources/Documentation/Examples/MMelmothsDuel-G--I.txt @@ -7,7 +7,7 @@ An Interactive Fiction Release 1 / Serial number 160428 / Inform 7 v10.2.0 / D Saint-Germain-des-Prés -Haunt of artists, of the coffee-drinking sort, and of cafés, of the artist-haunted sort, you once again find yourself outside M. Melmoth's hotel. Today crowds of vulgar children play chase around the lampposts, and you long to be indoors. +Haunt of artists, of the coffee-drinking sort, and of cafés, of the artist-haunted sort, you once again find yourself outside M. Melmoth's hotel. Today the recently-fallen rain runs down the gutters of the 6th, and you long to be indoors. >(Testing.) @@ -16,14 +16,14 @@ Haunt of artists, of the coffee-drinking sort, and of cafés, of the artist-haun Hôtel d'Alsace Typical. Oscar writes you a letter announcing his own imminent demise - "My wallpaper and I are fighting a duel to the death. One or other of us has got to go." - and then you get there and he's out, no doubt procuring paint the colour of absinthe, if he isn't procuring the painter. -In this light, the wallpaper has a distinctly darkish purple wash. You particularly dislike purple. +In this light, the wallpaper has a distinctly green wash. >[2] out You leave, shaking your head. But within twenty-four hours, you are back, as you always knew you would be. >[3] look Saint-Germain-des-Prés -Haunt of artists, of the coffee-drinking sort, and of cafés, of the artist-haunted sort, you once again find yourself outside M. Melmoth's hotel. Today the recently-fallen rain runs down the gutters of the 6th, and you long to be indoors. +Haunt of artists, of the coffee-drinking sort, and of cafés, of the artist-haunted sort, you once again find yourself outside M. Melmoth's hotel. Today crowds of vulgar children play chase around the lampposts, and you long to be indoors. >[4] in @@ -37,6 +37,6 @@ You leave, shaking your head. But within twenty-four hours, you are back, as you >[6] look Saint-Germain-des-Prés -Haunt of artists, of the coffee-drinking sort, and of cafés, of the artist-haunted sort, you once again find yourself outside M. Melmoth's hotel. Today crowds of vulgar children play chase around the lampposts, and you long to be indoors. +Haunt of artists, of the coffee-drinking sort, and of cafés, of the artist-haunted sort, you once again find yourself outside M. Melmoth's hotel. Today the recently-fallen rain runs down the gutters of the 6th, and you long to be indoors. >Are you sure you want to quit? \ No newline at end of file diff --git a/resources/Documentation/Examples/PatientZero-G--I.txt b/resources/Documentation/Examples/PatientZero-G--I.txt index 2bdc3861c..e63631d64 100644 --- a/resources/Documentation/Examples/PatientZero-G--I.txt +++ b/resources/Documentation/Examples/PatientZero-G--I.txt @@ -13,7 +13,7 @@ The town's most popular gathering-place, the pool hall is decorated in honor of An air conditioner sits in the corner, unhappily inert. -You can see Lewis and Linnea here. The latter looks as though dipped in french vanilla. +You can see Lewis and Linnea here. >(Testing.) @@ -41,7 +41,7 @@ You step into the mercifully air-conditioned surroundings of... Cold Comfort Ice Cream A poster fills one wall with the blazing promise of treats to come. -You can see Vanessa here. +You can see Vanessa here. She looks as though dipped in french vanilla. Vanessa watches serenely as the metal door slides automatically back in place, sealing Cold Comfort. @@ -55,10 +55,16 @@ The metal door opens from the other side. Antony comes through. Vanessa watches serenely as the metal door slides automatically back in place, sealing Cold Comfort. +Vanessa sneezes on you! + +You feel itchy. + >[6] ask vanessa for french vanilla "Do you have a coupon?" Vanessa demands. You admit you do not. "No french vanilla for you!" -Antony trades in the coupon and receives a blackberry sorbet ice cream cone from Vanessa. +Antony trades in the coupon and receives a dark chocolate ice cream cone from Vanessa. + +You feel itchy. >[7] ask vanessa for chocolate "Do you have a coupon?" Vanessa demands. You admit you do not. "No chocolate for you!" @@ -67,6 +73,8 @@ Antony opens the metal door. He goes through. Vanessa watches serenely as the metal door slides automatically back in place, sealing Cold Comfort. +You feel itchy. + >[8] ask vanessa about flavors "The flavors are french vanilla, whole-bean vanilla, mint, chocolate, dark chocolate, chocolate chip, chocolate fudge, mint chocolate chip, chocolate chocolate chip, triple chocolate, white chocolate, white chocolate chip, aztec cocoa-chili, raspberry ripple, neapolitan, rum raisin, dulce de leche, strawberry chunk, rocky road, blackberry sorbet, lemon sherbet, lime ice, caramel swirl, mango, saffron silk, and cookie dough cream," she responds promptly, without needing to draw breath. @@ -74,9 +82,13 @@ The metal door opens from the other side. Martin comes through. Vanessa watches serenely as the metal door slides automatically back in place, sealing Cold Comfort. +You feel itchy. + >[9] ask vanessa for chocolate chocolate chip "Do you have a coupon?" Vanessa demands. You admit you do not. "No chocolate chocolate chip for you!" -Martin trades in the coupon and receives a rocky road ice cream cone from Vanessa. +Martin trades in the coupon and receives a white chocolate chip ice cream cone from Vanessa. + +You feel itchy. >Are you sure you want to quit? \ No newline at end of file diff --git a/resources/Documentation/Examples/TheSpeedOfThought-G--I.txt b/resources/Documentation/Examples/TheSpeedOfThought-G--I.txt index 47d350665..162de6cbb 100644 --- a/resources/Documentation/Examples/TheSpeedOfThought-G--I.txt +++ b/resources/Documentation/Examples/TheSpeedOfThought-G--I.txt @@ -14,7 +14,7 @@ Currently you have to report on the International Space Station. Your story coul >(Testing.) >[1] report experiment module -You turn to the camera and speak: "The experiment module has a length of roughly 7.34211 bathtubs." +You turn to the camera and speak: "The experiment module has a length of about 7.34211 bathtubs." >[2] report logistics "The logistics module has a length of approximately 2.76974 bathtubs." Right now the station will be cutting over to a visual of that. @@ -26,7 +26,7 @@ Turning to another camera angle, you add: "The station orbits at heights between "The solar array has a length of approximately 1.16 Olympic swimming pools and an area of about 125.0 queen-sized mattresses." Pity the kids in audiovisual who have to scare that image together in a hurry. >[5] report solar cell - "The individual solar cell has an area of approximately 0.17391 credit cards." You smile brightly. + "The individual solar cell has an area of around 0.17391 credit cards." You smile brightly. And that's all! The channel cuts to weather.