scottkit 1.4.0 → 1.5.0

data/data/tutorial/t7.sck

@@ -55,15 +55,19 @@ room throne "gorgeously decorated throne room"
 
 item sign "Sign says: leave treasure here, then say SCORE"
 
-item lamp "old-fashioned brass lamp" called "lamp"
-item empty_lamp "empty lamp" called "lamp" nowhere
+item lamp "old-fashioned brass lamp"
+	called "lamp"
+
+item empty_lamp "empty lamp"
+	called "lamp" nowhere
+
 lightsource lamp
 
 occur 100% when flag 16
 	clear_flag 16
 	swap lamp empty_lamp
 	look
-	comment "The engine set flag 16 when the lamp runs out"
+	comment "The engine sets flag 16 when the lamp runs out"
 
 room chamber "square chamber"
 	exit east dungeon
@@ -71,7 +75,7 @@ room chamber "square chamber"
 	exit west cave
 
 # Flag 15 is on when and only when it is dark
-occur when "at" chamber and flag 15
+occur when at chamber and flag 15
 	clear_dark
 	look
 
@@ -82,11 +86,11 @@ room dungeon "gloomy dungeon"
 	exit west chamber
 	exit north crypt
 
-occur when "at" dungeon and !flag 15
+occur when at dungeon and !flag 15
 	set_dark
 	look
 
-occur 25% when "at" dungeon
+occur 25% when at dungeon
 	print "I smell something rotting to the north."
 
 item door "Locked door"
@@ -98,7 +102,7 @@ item key "Brass key"
 item door2 "Open door leads south"
 	nowhere
 
-action open door when here door and !carried key
+action open door when here door and !present key
 	print "It's locked."
 
 action open door when here door
@@ -121,13 +125,19 @@ room crypt "damp, dismal crypt"
 
 item vampire "Vampire"
 
+occur when here vampire and carried cross
+	print "Vampire cowers away from the cross!"
+
 occur when here vampire and !carried cross
+	print "Vampire looks hungrily at me."
+
+occur 25% when here vampire and !carried cross
 	print "Vampire bites me!  I'm dead!"
 	game_over
-	comment "vampire attacks unless cross is carried"
+	comment "vampire can attack unless cross is carried"
 
-occur when here vampire and "carried" cross
-	print "Vampire cowers away from the cross!"
+action get key when here vampire and !carried cross
+	print "I'm not going anywhere near that vampire!"
 
 verbgroup take get
 verbgroup leave drop

data/data/tutorial/tutorial.md

@@ -203,6 +203,9 @@ room dungeon "gloomy dungeon"
 	exit west chamber
 	exit north crypt
 
+occur 25% when at dungeon
+	print "I smell something rotting to the north."
+
 item door "Locked door"
 
 item key "Brass key"
@@ -235,13 +238,19 @@ room crypt "damp, dismal crypt"
 
 item vampire "Vampire"
 
+occur when here vampire and carried cross
+	print "Vampire cowers away from the cross!"
+
 occur when here vampire and !carried cross
+	print "Vampire looks hungrily at me."
+
+occur 25% when here vampire and !carried cross
 	print "Vampire bites me!  I'm dead!"
 	game_over
-	comment "vampire attacks unless cross is carried"
+	comment "vampire can attack unless cross is carried"
 
-occur when here vampire and "carried" cross
-	print "Vampire cowers away from the cross!"
+action get key when present vampire and !carried cross
+	print "I'm not going anywhere near that vampire!"
 ```
 
 
@@ -297,7 +306,7 @@ room chamber "square chamber"
 	exit west cave
 
 # Flag 15 is on when and only when it is dark
-occur when "at" chamber and flag 15
+occur when at chamber and flag 15
 	clear_dark
 	look
 
@@ -308,11 +317,11 @@ room dungeon "gloomy dungeon"
 	exit west chamber
 	exit north crypt
 
-occur when "at" dungeon and !flag 15
+occur when at dungeon and !flag 15
 	set_dark
 	look
 
-occur 25% when "at" dungeon
+occur 25% when at dungeon
 	print "I smell something rotting to the north."
 
 item door "Locked door"
@@ -347,14 +356,20 @@ room crypt "damp, dismal crypt"
 
 item vampire "Vampire"
 
-occur when here vampire and !carried cross
+occur 25% when here vampire and !carried cross
 	print "Vampire bites me!  I'm dead!"
 	game_over
-	comment "vampire attacks unless cross is carried"
+	comment "vampire can attack unless cross is carried"
 
-occur when here vampire and "carried" cross
+occur when here vampire and !carried cross
+	print "Vampire looks hungrily at me."
+
+occur when here vampire and carried cross
 	print "Vampire cowers away from the cross!"
 
+action get key when present vampire and !carried cross
+	print "I'm not going anywhere near that vampire!"
+
 verbgroup take get
 verbgroup leave drop
 noungroup lamp lantern

data/lib/scottkit/compile.rb

@@ -132,8 +132,8 @@ module ScottKit
 
       def parse_occur
         match :occur
-        if peek == :percent
-          chance = match :percent
+        if peek == :percentage
+          chance = match :percentage
           skip if peek == ":" # optional
         else
           chance = nil
@@ -214,6 +214,31 @@ module ScottKit
         rooms = tree.rooms
         items = tree.items
 
+        if (@game.options[:teleport])
+          rooms.each.with_index { |room, i|
+            next if i == 0
+            instructions = [
+              [ "print", "*** Fzing! ***" ],
+              [ "goto", room.name ],
+              [ "look" ]
+            ]
+            tree.actions.push CAction.new('teleport', room.name, [],
+                                          instructions, '')
+          }
+        end
+
+        if (@game.options[:superget])
+          items.each.with_index { |item, i|
+            next if i == 0
+            instructions = [
+              [ "print", "*** Fzapp! ***" ],
+              [ "superget", item.name ],
+            ]
+            tree.actions.push CAction.new('sg', item.name, [],
+                                          instructions, '')
+          }
+        end
+
         if tree.lightsource then
           # The light-source is always item #9, so swap as necessary
           lindex = items.index { |x| x.name == tree.lightsource } or
@@ -642,7 +667,7 @@ module ScottKit
             :symbol
           elsif match = @buffer.match(/^(\d+)%/)
             @lexeme, @buffer = match[1], match.post_match
-            :percent
+            :percentage
           elsif match = @buffer.match(/^([!a-z_0-9-]+)/i)
             @lexeme, @buffer = match[1], match.post_match
             TOKENMAP[@lexeme] || :symbol
@@ -683,7 +708,7 @@ module ScottKit
             lexeme
           elsif token == :symbol
             "\"#{lexeme}\""
-          elsif token == :percent
+          elsif token == :percentage
             "'#{lexeme}%'"
           else
             nil

data/lib/scottkit/game.rb

@@ -16,8 +16,8 @@ module ScottKit
         :maxload, :lamptime #:nodoc:
 
     # Variable during run (but mostly set only within this class)
-    attr_reader :flags, :counters, :saved_rooms, :noun, :lampleft #:nodoc:
-    attr_accessor :loc, :counter, :saved_room #:nodoc:
+    attr_reader :flags, :counters, :saved_rooms, :noun #:nodoc:
+    attr_accessor :loc, :counter, :saved_room, :lampleft #:nodoc:
 
     private
 

data/lib/scottkit/play.rb

@@ -191,9 +191,9 @@ module ScottKit
     def wizard_command(verb, noun)
       optnames = {
         "c" => :show_conditions,
-        "i"  => :show_instructions,
-        "r"  => :show_random,
-        "p"  => :show_parse,
+        "i" => :show_instructions,
+        "r" => :show_random,
+        "p" => :show_parse,
       }
 
       if verb.upcase == "#SG" # superget

data/manual/reference.md

@@ -495,9 +495,9 @@ may be nominated as "current" by the `select_counter` action.)
 --
 True if the current counter's value is _NUM_ or less.
 
-* `counter_ge` _NUM_
+* `counter_gt` _NUM_
 --
-True if the current counter's value is _NUM_ or more.
+True if the current counter's value is greater than _NUM_. Note the asymmetry here: you can check for less-than-or-equal, or strictly-greater-than; but not for strictly-less-than or greater-than-or-equal.
 
 
 The sense of the
@@ -532,7 +532,7 @@ The following opcodes are supported:
 
 * `print` _string_
 --
-Prints the specified string. Within that string, `\n` sequences are interpreted as newlines, and `\t` sequences as tabs.
+Prints the specified string. Within that string, `\n` sequences are interpreted as newlines, and `\t` sequences as tabs. Since double-quotes are used to enclose the string, they may not appear within it. So backquotes (`` ` ``) are replaced by double quotes when they are printed.
 
 * `goto` _room_
 --

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scottkit
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Mike Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies: []
 description: ScottKit is a toolkit for compiling, decompiling and playing adventure
   games in the Scott Adams format.
@@ -44,11 +44,12 @@ files:
 - data/nosferatu/.gitignore
 - data/nosferatu/Makefile
 - data/nosferatu/README
+- data/nosferatu/TODO
 - data/nosferatu/nosferatu.map
 - data/nosferatu/nosferatu.regression
 - data/nosferatu/nosferatu.sck
-- data/nosferatu/nosferatu.script
 - data/nosferatu/nosferatu.sol
+- data/nosferatu/nosferatu.transcript
 - data/test/Makefile
 - data/test/adams/Makefile
 - data/test/adams/adv01.solution