gamefic-sdk 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 642000755606d5f202c09b54f2a11c5fb238601e
-  data.tar.gz: 9040ce5b78583d05074cd808719ee60f0ddef910
+  metadata.gz: f20b6887b332594e4cde84b2d7f0d9025a166c0b
+  data.tar.gz: 05c6b161dd96f67108d10eb8feeeae723f118f82
 SHA512:
-  metadata.gz: 9b4aea3ba1aa82775669c862679de3cbf36b1aa1eb38fa63355ba49f0916d1972f25212f4626b3890fe66168aff5cbd422aea042970f7969abbbcca6c44a10c5
-  data.tar.gz: dcbc83828cdba3f965aa1256e42406a0e664b9bc50b3dc31f2e0bbededdfdf4e7af5640544cec5be389c33714cae3990a957a06621d47e2ed82197550c109ad8
+  metadata.gz: c12d01760d7f7867221d9dc2edc6b6a6d03466d1135f12d57e5adc780de09ea851f0b966b1e502163c2f6125ace483dc047d3e165d41bb7d8f20728acca45a58
+  data.tar.gz: 46b23e73019583f9ff5abb4943c6e401fc27b82bd9432386ed93005c9842797f05847193168f3aa57e8037ff4b804591342895af2506fa8b6ab5cf6ccbe82669

data/html/core/engine.js

@@ -8,7 +8,8 @@ var Gamefic = (function() {
 	var getResponse = function(withOutput) {
 		var r = {
 			output: (withOutput ? Opal.GameficOpal.$static_user().$flush() : null),
-			state: Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_character().$scene()).$type(),
+			//state: Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_character().$scene()).$type(),
+			state: Opal.GameficOpal.$static_character().$scene().$type(),
 			prompt: lastPrompt,
 			input: lastInput,
 			testing: (Opal.GameficOpal.$static_character().$queue().$length() > 0)
@@ -28,7 +29,7 @@ var Gamefic = (function() {
 		start: function() {
 			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());
+			lastPrompt = Opal.GameficOpal.$static_character().$prompt();
 			this.update('');
 		},
 		update: function(input) {
@@ -42,11 +43,11 @@ var Gamefic = (function() {
 			});
 			Opal.GameficOpal.$static_plot().$update();
 			Opal.GameficOpal.$static_plot().$ready();
-			lastPrompt = Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_character().$scene()).$prompt_for(Opal.GameficOpal.$static_character());
+			lastPrompt = Opal.GameficOpal.$static_character().$prompt();
 			response = getResponse(true);
 			var updateResponse = response;
 			doReady(response);
-			lastPrompt = Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_character().$scene()).$prompt_for(Opal.GameficOpal.$static_character());
+			lastPrompt = Opal.GameficOpal.$static_character().$prompt();
 			response = getResponse(true);
 			response.output = updateResponse.output + response.output;
 			handle(response);

data/lib/gamefic-sdk.rb

@@ -20,7 +20,7 @@ class Class
   end
 end
 
-class Entity
+class Gamefic::Entity
   def self.names
     result = []
     Entity.descendants.each { |e| result << e.to_s.split('::').last }

data/lib/gamefic-sdk/debug/plot.rb

@@ -16,7 +16,7 @@ module Gamefic::Sdk::Debug
     end
     def action(command, *queries, &proc)
       act = Gamefic::Sdk::Debug::Action.new(command, *queries, &proc)
-      add_action act
+      playbook.send :add_action, act
       act
     end
   end

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

@@ -2,6 +2,7 @@
 require 'gamefic/query/expression'
 require 'gamefic/query/matches'
 require 'gamefic/grammar/verb_set'
+require 'gamefic/plot/playbook'
 
 # HACK Opal doesn't recognize classes and modules declared from scripts
 def Object.const_missing sym
@@ -30,7 +31,7 @@ module GameficOpal
 
   class WebUser < Gamefic::User::Base
     def save filename, data
-      data[:metadata] = GameficOpal.static_character.plot.metadata
+      data[:metadata] = GameficOpal.static_plot.metadata
       `Gamefic.save(filename, data);`
     end
     def restore filename

data/lib/gamefic-sdk/version.rb

@@ -1,5 +1,5 @@
 module Gamefic
   module Sdk
-    VERSION = '1.4.1'
+    VERSION = '1.5.0'
   end
 end

data/scripts/edible.plot.rb

@@ -15,5 +15,5 @@ end
 
 respond :eat, Use.reachable(:edible?) do |actor, item|
   actor.tell "You eat #{the item}."
-  item.destroy
+  destroy item
 end

data/scripts/standard.plot.rb

@@ -5,8 +5,8 @@
 
 script 'standard/use'
 script 'standard/modules'
+script 'standard/direction'
 script 'standard/entities'
 script 'standard/queries'
 script 'standard/actions'
-script 'standard/rules'
 script 'standard/pathfinder'

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

@@ -1,6 +1,7 @@
 meta nil, Query::Text.new() do |actor, string|
   words = string.split_words
-  if commandwords.include?(words[0])
+  list = verbs(to_s: true)
+  if list.include?(words[0])
     if words.length > 1
       actor.tell "I recognize '#{words[0]}' as a verb but could not understand the rest of your sentence."
     else
@@ -8,7 +9,7 @@ meta nil, Query::Text.new() do |actor, string|
     end
   else
     found = []
-    commandwords.each { |c|
+    list.each { |c|
       next if c.include?('_')
       if c.length > words[0].length and c.start_with?(words[0])
         found.push c
@@ -27,7 +28,7 @@ end
 
 meta nil, Query::Text.new("it") do |actor, string|
   words = string.split_words
-  if commandwords.include?(words[0])
+  if verbs(to_s: true).include?(words[0])
     actor.tell "I'm not sure what you mean by \"it.\""
   else
     actor.proceed

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

@@ -1,11 +1,11 @@
-yes_or_no :confirm_quit, 'Are you sure you want to quit?' do |actor, data|
+confirm_quit = yes_or_no 'Are you sure you want to quit?' do |actor, data|
   if data.yes?
-    actor.cue :concluded
+    actor.cue default_conclusion
   else
-    actor.cue :active
+    actor.cue default_scene
   end
 end
 
 meta :quit do |actor|
-  actor.cue :confirm_quit
+  actor.cue confirm_quit
 end

data/scripts/standard/direction.plot.rb

@@ -0,0 +1,56 @@
+class ::Gamefic::Direction
+    attr_accessor :name, :adjective, :adverb, :reverse
+
+    def initialize args = {}
+      args.each { |key, value|
+        send "#{key}=", value
+      }
+      if !reverse.nil?
+        reverse.reverse = self
+      end
+    end
+
+    def adjective
+      @adjective || @name
+    end
+
+    def adverb
+      @adverb || @name
+    end
+
+    def reverse=(dir)
+      @reverse = dir
+    end
+
+    def synonyms
+      "#{adjective} #{adverb}"
+    end
+
+    def to_s
+      @name
+    end
+
+    class << self
+      def compass
+        if @compass.nil?
+          @compass = {}
+          @compass[:north] = Direction.new(:name => 'north', :adjective => 'northern')
+          @compass[:south] = Direction.new(:name => 'south', :adjective => 'southern', :reverse => @compass[:north])
+          @compass[:west] = Direction.new(:name => 'west', :adjective => 'western')
+          @compass[:east] = Direction.new(:name => 'east', :adjective => 'eastern', :reverse => @compass[:west])
+          @compass[:northwest] = Direction.new(:name => 'northwest', :adjective => 'northwestern')
+          @compass[:southeast] = Direction.new(:name => 'southeast', :adjective => 'southeastern', :reverse => @compass[:northwest])
+          @compass[:northeast] = Direction.new(:name => 'northeast', :adjective => 'northeastern')
+          @compass[:southwest] = Direction.new(:name => 'southwest', :adjective => 'southwestern', :reverse => @compass[:northeast])
+          @compass[:up] = Direction.new(:name => 'up', :adjective => 'upwards')
+          @compass[:down] = Direction.new(:name => 'down', :adjective => 'downwards', :reverse => @compass[:up])
+        end
+        @compass
+      end
+
+      def find(dir)
+        compass[dir.to_s.downcase.to_sym]
+      end
+    end
+
+end

data/scripts/standard/entities/portal.plot.rb

@@ -1,5 +1,5 @@
 class Gamefic::Portal < Gamefic::Entity
-  attr_accessor :destination, :direction
+  attr_accessor :destination
   serialize :destination, :direction
 
   # Find the portal in the destination that returns to this portal's parent
@@ -27,6 +27,10 @@ class Gamefic::Portal < Gamefic::Entity
     @direction
   end
   
+  def direction= d
+    @direction = Direction.find(d)
+  end
+
   def name
     @name || direction.name
   end

data/scripts/standard/entities/room.plot.rb

@@ -31,22 +31,22 @@ class Gamefic::Room < Gamefic::Entity
   private
   def connect2 destination, direction:nil, type:Portal, two_way:true
     if direction.nil?
-      portal = type.new self.plot, :parent => self, :destination => destination, :name => destination.definitely
+      portal = type.new :parent => self, :destination => destination, :name => destination.definitely
       if two_way == true
-        portal2 = type.new self.plot, :parent => destination, :destination => self, :name => self.definitely
+        portal2 = type.new :parent => destination, :destination => self, :name => self.definitely
       end
     else
       if direction.kind_of?(String)
         direction = Direction.find(direction)
       end
-      portal = type.new self.plot, :direction => direction, :parent => self, :destination => destination
+      portal = type.new :direction => direction, :parent => self, :destination => destination
       portal.proper_named = true if type == Portal
       if two_way == true
         reverse = direction.reverse
         if reverse == nil
           raise "#{direction.name.cap_first} does not have an opposite direction"
         end
-        portal2 = type.new(self.plot, {
+        portal2 = type.new({
           :direction => reverse,
           :parent => destination,
           :destination => self

data/scripts/standard/entities/supporter.plot.rb

@@ -1,7 +1,7 @@
 class Gamefic::Supporter < Gamefic::Entity
   include Enterable
   serialize :enterable?
-  def initialize(plot, args = {})
+  def initialize(args = {})
     self.enter_verb = "get on"
     self.leave_verb = "get off"
     self.inside_verb = "be on"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic-sdk
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamefic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ files:
 - scripts/standard/actions/unlock.plot.rb
 - scripts/standard/actions/use.plot.rb
 - scripts/standard/actions/wait.plot.rb
+- scripts/standard/direction.plot.rb
 - scripts/standard/entities.plot.rb
 - scripts/standard/entities/character.plot.rb
 - scripts/standard/entities/container.plot.rb
@@ -221,8 +222,6 @@ files:
 - scripts/standard/queries/reachable.plot.rb
 - scripts/standard/queries/room.plot.rb
 - scripts/standard/queries/visible.plot.rb
-- scripts/standard/rules.plot.rb
-- scripts/standard/rules/has-enough-light.plot.rb
 - scripts/standard/test.plot.rb
 - scripts/standard/use.plot.rb
 - scripts/suggestible.plot.rb

data/scripts/standard/rules.plot.rb

@@ -1 +0,0 @@
-script 'standard/rules/has-enough-light'

data/scripts/standard/rules/has-enough-light.plot.rb

@@ -1,12 +0,0 @@
-assert_action :has_enough_light do |actor, action|
-  if !actor.nil? or actor.room.is? :lighted
-    true
-  else
-    if action == :go
-      true
-    else
-      actor.tell "It's too dark in here."
-      false
-    end
-  end
-end