gamefic-sdk 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd21c94408ecfc19f905b8344363c15a3164c4a2
-  data.tar.gz: 662d9daeb9161d2622aa8361d816c91fdc16eae9
+  metadata.gz: 6cc2343107a5dea13bfcba8360aedc82ddb160c0
+  data.tar.gz: c05803ac75db4669c5ad9bca1be55c25fe18cf2b
 SHA512:
-  metadata.gz: 860ff80c0a31476a00a96b7bd8b7c5722cb3ff417e0e2d230b6de621d03d3fbde197eb370b22abeafe11cad82b97a6b9342ac7d9962b6998aaf71cdeeceff643
-  data.tar.gz: 3f4132cc5907ee65e5e3c9ac0ccd57da00c5a7885a640002722354d44020a7c84d82769e79fa63ea02c5116921a370f8bdf8c415fcc2b34c385a7df44ecd647d
+  metadata.gz: a79a03c3289a33bc3265003397b907dfb4a490e1f507ba8ab280250cc64523117b570f86801645935633c38c66a26ec735f11617c2310ed6c4592a4a4b8510b2
+  data.tar.gz: 88592b51eacef05cdf084fb60a3d67b12a4af437ed7611cb1b3333676b255be580e53e9a9acff9bb983eed904d4d334f26aaac80d28ebff32f2aa3dda71d766c

data/html/core/engine.js

@@ -7,11 +7,11 @@ var Gamefic = (function() {
 	var lastPrompt = null;
 	var getResponse = function(withOutput) {
 		var r = {
-			output: (withOutput ? Opal.GameficOpal.$static_player().$state().$output() : null),
-			state: Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_player().$character().$scene()).$state(),
+			output: (withOutput ? Opal.GameficOpal.$static_user().$flush() : null),
+			state: Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_character().$scene()).$type(),
 			prompt: lastPrompt,
 			input: lastInput,
-			testing: (Opal.GameficOpal.$static_player().$test_queue().$length() > 0)
+			testing: (Opal.GameficOpal.$static_character().$queue().$length() > 0)
 		}
 		return r;
 	}
@@ -26,9 +26,9 @@ var Gamefic = (function() {
 	}
 	return {
 		start: function() {
-			Opal.GameficOpal.$load_scripts();			
-			Opal.GameficOpal.$static_plot().$introduce(Opal.GameficOpal.$static_player().$character());
-			lastPrompt = Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_player().$character().$scene()).$prompt();
+			Opal.GameficOpal.$load_scripts();
+			Opal.GameficOpal.$static_plot().$introduce(Opal.GameficOpal.$static_character());
+			lastPrompt = Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_character().$scene()).$prompt_for(Opal.GameficOpal.$static_character());
 			var response = getResponse(true);
 			doReady(response);
 			handle(response);
@@ -38,7 +38,7 @@ var Gamefic = (function() {
 		},
 		update: function(input) {
 			if (input != null) {
-				Opal.GameficOpal.$static_player().$character().$queue().$push(input);
+				Opal.GameficOpal.$static_character().$queue().$push(input);
 			}
 			lastInput = input;
 			var response = getResponse(false);
@@ -47,20 +47,23 @@ var Gamefic = (function() {
 			});
 			Opal.GameficOpal.$static_plot().$update();
 			Opal.GameficOpal.$static_plot().$ready();
-			lastPrompt = Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_player().$character().$scene()).$prompt();
+			lastPrompt = Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_character().$scene()).$prompt_for(Opal.GameficOpal.$static_character());
 			response = getResponse(true);
 			var updateResponse = response;
 			doReady(response);
-			lastPrompt = Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_player().$character().$scene()).$prompt();
+			lastPrompt = Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_character().$scene()).$prompt_for(Opal.GameficOpal.$static_character());
 			response = getResponse(true);
 			response.output = updateResponse.output + response.output;
 			handle(response);
 			finishCallbacks.forEach(function(callback) {
 				callback(response);
 			});
-			var testCommand = Opal.GameficOpal.$static_player().$test_queue().$shift();
+			/*var testCommand = Opal.GameficOpal.$static_character().$queue().$shift();
 			if (typeof testCommand == 'string') {
 				setTimeout("Gamefic.update(" + JSON.stringify(testCommand) + ");", 1);
+			}*/
+			if (Opal.GameficOpal.$static_character().$queue().$length() > 0) {
+				setTimeout("Gamefic.update();", 1);
 			}
 		},
 		onStart: function(callback) {
@@ -78,14 +81,14 @@ var Gamefic = (function() {
 		save: function(filename, data) {
 			var json = Opal.JSON.$generate(data);
 			localStorage.setItem(filename, json);
-			Opal.GameficOpal.$static_player().$character().$tell('Game saved.');
+			Opal.GameficOpal.$static_character().$tell('Game saved.');
 		},
 		restore: function(filename) {
 			var data = Opal.JSON.$parse(localStorage.getItem(filename));
 			var metadata = data.$fetch('metadata');
 			// HACK Converting hashes to strings for JavaScript comparison
 			if (metadata.$to_s() != Opal.GameficOpal.$static_plot().$metadata().$to_s()) {
-				Opal.GameficOpal.$static_player().$character().$tell('The saved data is not compatible with this version of the game.');
+				Opal.GameficOpal.$static_character().$tell('The saved data is not compatible with this version of the game.');
 				return Opal.nil;
 			} else {
 				return data;

data/lib/gamefic-sdk/platform/web.rb

@@ -83,7 +83,7 @@ module Gamefic::Sdk
       Opal.use_gem 'gamefic'
       if !File.exist?(build_dir + "/core/gamefic.js")
         File.open(build_dir + "/core/gamefic.js", "w") do |file|
-         file << Opal::Builder.build('gamefic').to_s
+          file << Opal::Builder.build('gamefic').to_s
         end
       end
     end

data/lib/gamefic-sdk/platform/web/gamefic_opal.rb

@@ -2,7 +2,6 @@
 require 'gamefic/query/expression'
 require 'gamefic/query/matches'
 require 'gamefic/grammar/verb_set'
-require 'gamefic/scene/multiple_choice/input'
 
 # HACK Opal doesn't recognize classes and modules declared from scripts
 def Object.const_missing sym
@@ -13,19 +12,25 @@ module GameficOpal
   def self.static_plot
     @@static_plot ||= WebPlot.new(Gamefic::Source::Text.new)
   end
-  def self.static_player
-    @@static_player ||= WebUser.new(GameficOpal.static_plot)
+  def self.static_character
+    if @@static_character.nil?
+      @@static_character = static_plot.make Gamefic::Character, name: 'player', synonyms: 'me you myself yourself self'
+      @@static_character.connect static_user
+    end
+    @@static_character
+  end
+  def self.static_user
+    @@static_user ||= WebUser.new
   end
-
   class WebPlot < Gamefic::Plot
     def script path
       # Stub
     end
   end
 
-  class WebUser < Gamefic::User
+  class WebUser < Gamefic::User::Base
     def save filename, data
-      data[:metadata] = character.plot.metadata
+      data[:metadata] = GameficOpal.static_character.plot.metadata
       `Gamefic.save(filename, data);`
     end
     def restore filename
@@ -33,9 +38,7 @@ module GameficOpal
       return data
     end
     def test_queue
-      character[:test_queue] || []
+      GameficOpal.static_character[:test_queue] || []
     end
   end
 end
-
-GameficOpal.static_plot.script 'main'

data/lib/gamefic-sdk/shell/test.rb

@@ -16,7 +16,8 @@ module Gamefic
           plot = Gamefic::Sdk::Debug::Plot.new Source::File.new(*paths)
           plot.script 'main'
           plot.script 'debug'
-          engine = Tty::Engine.new plot
+          engine = Engine::Tty.new plot
+          engine.connect
           puts "\n"
           engine.run
         end

data/lib/gamefic-sdk/version.rb

@@ -1,5 +1,5 @@
 module Gamefic
   module Sdk
-    VERSION = '1.3.1'
+    VERSION = '1.4.0'
   end
 end

data/scripts/standard/actions/quit.plot.rb

@@ -1,5 +1,5 @@
-yes_or_no :confirm_quit, "Are you sure you want to quit?" do |actor, input|
-  if input == "yes"
+yes_or_no :confirm_quit, 'Are you sure you want to quit?' do |actor, data|
+  if data.yes?
     actor.cue :concluded
   else
     actor.cue :active

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic-sdk
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-01 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamefic