game_machine 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99584a580fcb46287f1510e15f5eeb6c31a0a02d
-  data.tar.gz: 3969eb2639475bdcd43849b159eb3725a708f862
+  metadata.gz: ffff1acfb6c6991f5ec1bf5c1c6e4ad06ef0b588
+  data.tar.gz: 32e1d7c2016cd8fe2f1b348b1ef9a01595da26d3
 SHA512:
-  metadata.gz: f37531bd3d9207336ecaa0685523ce0be204f3a573b99edb6d1f7e708c7bd269b505f2759f30d0e8a08334757449c6059e14fae7ada16954ea9cb4990776f3cf
-  data.tar.gz: 5339212baf3d33ecad28a39063359748b5ba94121801330846294e065b83841ffa6803f2e9aa6a2d5e5d4b82931c46575407ec4e146fd9bba7cbb6155e13c5e0
+  metadata.gz: e2fa98eec04da15ebd1c057675ca5032878d4959b6eef3b2d1f9dc60fc70d5e05df3b185805c695931d63ea963e982197c8a41983350f457344d18b699d4e5f2
+  data.tar.gz: ced35f7f4bc12fae21af3e2ef05dcca6d20692a44ae51133341a5196eb04fd6874e05d523659593df3480ea94e401ecbd9d2d1f56c94a504f5e0df79ba7afc61

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    game_machine (0.0.5)
+    game_machine (0.0.10)
       consistent-hashing
       ffi
       haml
@@ -37,14 +37,18 @@ GEM
     rjack-logback (1.7.0-java)
       rjack-slf4j (>= 1.6.5, < 1.8)
     rjack-slf4j (1.7.6.0-java)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
     settingslogic (2.0.9)
     sinatra (1.4.5)
       rack (~> 1.4)

data/config/config.example.yml

@@ -3,6 +3,9 @@ development:
   servers:
     default:
       environment: development
+      # Handles requests for matchmaking and custom filtering for teams.
+      # If no team handler is defined defaults are used
+      team_handler: Plugins::TeamHandler
       # Authorization handler.  Public allows any authtoken to be used and
       # does not check username/password
       auth_handler: Example::AuthenticationHandler
@@ -35,9 +38,10 @@ development:
         aoe: 4000, 5, 1
         local_chat: 4000, 10, 10
       # Couchbase config
+      couchbase_bucket: default
+      couchbase_password:
       couchbase_servers:
         - http://127.0.0.1:8091/pools
-      #auth_handler: Example::AuthenticationHandler
       http_enabled: true
       http_host: 0.0.0.0
       http_port: 3000
@@ -58,6 +62,7 @@ development:
       mono_gateway_port: 8800
     seed01:
       environment: development
+      team_handler: Plugins::TeamHandler
       auth_handler: Example::AuthenticationHandler
       player_register_handler: Example::PlayerRegister
       player_manager: Example::PlayerManager
@@ -73,6 +78,8 @@ development:
         default: 4000, 50, 1
         aoe: 4000, 5, 1
         local_chat: 4000, 10, 10
+      couchbase_bucket: default
+      couchbase_password:
       couchbase_servers:
         - http://127.0.0.1:8091/pools
       http_enabled: false

data/config/game_messages.proto

@@ -7,6 +7,7 @@ message TrackExtra {
   optional float speed = 1;
   optional float velocity = 2;
   optional Vector3 direction = 3;
+  optional string json = 4;
 }
 
 message Health {

data/config/messages.proto

@@ -91,6 +91,10 @@ message ChatMessage {
 message ChatStatus {
 }
 
+message ChatDestroy {
+  required string playerId = 1;
+}
+
 message ClientEvent {
   required string event = 1;
   required string clientId = 2;

data/games/example/lib/npc.rb

@@ -69,14 +69,9 @@ module Example
     end
 
     def get_players
+      @players = {}
       commands.grid.neighbors(position.x,position.y).each do |player|
-        if @players[player.id]
-          @players[player.id][:vector].x = player.x
-          @players[player.id][:vector].y = player.y
-          @players[player.id][:vector].z = player.z
-        else
-          @players[player.id] = {:id => player.id, :vector => GameMachine::Vector.from(player)}
-        end
+        @players[player.id] = {:id => player.id, :vector => GameMachine::Vector.from(player)}
       end
     end
 
@@ -91,6 +86,12 @@ module Example
     def pick_random_target
       @target.x = position.x + rand(-30..30)
       @target.y = position.y + rand(-30..30)
+      if @target.x < 2 || @target.x > 2045
+        @target.x = rand(5..2045)
+      end
+      if @target.y < 2 || @target.y > 2045
+        @target.x = rand(5..2045)
+      end
       movement.set_target(@target)
     end
 

data/games/models.rb

@@ -0,0 +1,3 @@
+require_relative 'models/clan_member'
+require_relative 'models/clan_profile'
+require_relative 'models/player'

data/games/models/clan_member.rb

@@ -0,0 +1,8 @@
+module Game
+  module Models
+    class ClanMember < GameMachine::Model
+      attribute :name, String
+      attribute :rating, String
+    end
+  end
+end

data/games/models/clan_profile.rb

@@ -0,0 +1,9 @@
+module Game
+  module Models
+    class ClanProfile < GameMachine::Model
+      attribute :name, String
+      attribute :rating, String
+      attribute :members, Array
+    end
+  end
+end

data/games/models/player.rb

@@ -0,0 +1,7 @@
+module Game
+  module Models
+    class Player < GameMachine::Model
+
+    end
+  end
+end

data/games/plugins.rb

@@ -0,0 +1 @@
+require_relative 'plugins/team_handler'

data/games/plugins/team_handler.rb

@@ -0,0 +1,49 @@
+
+module Plugins
+  class TeamHandler
+
+    attr_reader :teams
+    def initialize
+      update_teams
+    end
+
+    def update_teams
+      @teams = GameMachine::Models::Teams.find('teams')
+    end
+
+    # Should return a Match object if a match is found, otherwise nil
+    def match!(team_name)
+      GameMachine.logger.info "match! team_name:#{team_name} teams:#{teams}"
+      if team = teams.teams.select {|team| team.name != team_name}.first
+        return GameMachine::Models::StartMatch.new(:team_names => [team_name,team.name])
+      end
+      nil
+    end
+
+    # Called when Game Machine has started the match
+    def match_started(match)
+
+    end
+
+    # Filter you can apply to the teams list sent to clients
+    # You can add whatever extra fields you want to the TeamsRequest
+    # class on the client and they will show up here.
+    def teams_filter(teams,teams_request)
+      teams
+    end
+
+    # return true if member has rights to create team
+    def can_create_team?(team_name,member)
+      true
+    end
+
+    # return true if member has rights to join team
+    def can_add_member?(team_name,member)
+      true
+    end
+
+    def destroy_on_owner_leave?
+      true
+    end
+  end
+end

data/games/preload.rb

@@ -3,6 +3,11 @@
 # is the place to do it.  Examples might be specific handlers, or loading up
 # static data that needs to be there before the rest of the system starts up.
 
+# json models that are global accross all games/plugins
+require_relative 'models'
+
+# Plugins that extend or work with core Game Machine features
+require_relative 'plugins'
 
 # This needs to be loaded before the entity tracking system starts
 require_relative 'example/lib/tracking_handler'

data/java/build.gradle

@@ -45,7 +45,9 @@ dependencies {
   compile group: 'org.javassist', name: 'javassist', version:'3.17.1-GA'
   //compile(group: 'io.netty', name: 'netty-all', version:'4.0.11.Final')
   //compile 'org.apache.camel:camel-jetty:2.10.3'
-  compile(group: 'couchbase', name: 'couchbase-client', version:'1.1.7')
+  //compile(group: 'couchbase', name: 'couchbase-client', version:'1.4.2')
+  //compile 'com.basho.riak:riak-client:1.4.4'
+  compile 'com.couchbase.client:couchbase-client:1.4.2'
   compile 'redis.clients:jedis:2.2.1'
   compile 'org.mapdb:mapdb:1.0.3'
   compile 'io.netty:netty-testsuite:4.0.20.Final'

data/java/gradle.properties

@@ -2,5 +2,5 @@
 version=0.0.1
 
 scala_version=2.11
-akka_version=2.3.3
+akka_version=2.3.4
 

data/lib/game_machine/actor/base.rb

@@ -113,7 +113,11 @@ module GameMachine
             if message.send_to_player
               message
             else
-              message = Model.from_entity(message)
+              model = Model.from_entity(message)
+              if message.has_player
+                model.player_id = message.player.id
+              end
+              return model
             end
           end
           message

data/lib/game_machine/application.rb

@@ -49,8 +49,12 @@ module GameMachine
 
       def start
         create_grids
-        game_preload
-        GameMachine::Actor::Reloadable.update_paths(true)
+
+        unless GameMachine.env == 'test'
+          game_preload
+          GameMachine::Actor::Reloadable.update_paths(true)
+        end
+
         start_actor_system
         data_store
         start_endpoints
@@ -62,7 +66,11 @@ module GameMachine
         end
 
         start_game_systems
-        GameLoader.new.load_all
+
+        unless GameMachine.env == 'test'
+          GameLoader.new.load_all
+        end
+
         auth_handler
         start_mono
 
@@ -174,6 +182,8 @@ module GameMachine
         Actor::Builder.new(GameSystems::RemoteEcho).with_router(JavaLib::RoundRobinRouter,10).start
         Actor::Builder.new(GameSystems::StressTest).with_router(JavaLib::RoundRobinRouter,10).start
         Actor::Builder.new(GameSystems::ChatManager).start
+        Actor::Builder.new(GameSystems::TeamManager).start
+        Actor::Builder.new(GameSystems::JsonModelPersistence).start
       end
 
     end

data/lib/game_machine/commands/datastore_commands.rb

@@ -25,18 +25,14 @@ module GameMachine
       end
 
       def put!(entity)
-        store.set(entity.id,entity.to_byte_array)
+        store.set(entity.id,entity)
       end
 
       def get!(entity_id)
-        if bytes = store.get(entity_id)
-          MessageLib::Entity.parse_from(bytes)
-        else
-          nil
-        end
+        store.get(entity_id)
       end
 
-      def del!(entity_id)
+      def delete!(entity_id)
         store.delete(entity_id)
       end
 

data/lib/game_machine/commands/player_commands.rb

@@ -4,6 +4,9 @@ module GameMachine
       include MessageHelper
 
       def send_message(message,player_id)
+        if player_id.nil?
+          raise "player id cannot be nil"
+        end
         if is_entity?(message)
           entity = message
           unless entity.has_player

data/lib/game_machine/data_store.rb

@@ -9,7 +9,7 @@ module GameMachine
     include Singleton
     extend Forwardable
 
-    def_delegators :@store, :get, :set, :delete, :delete_all, :shutdown, :keys, :dump, :load
+    def_delegators :@store, :delete, :delete_all, :shutdown, :keys, :dump, :load
 
     attr_reader :store
     def initialize
@@ -23,6 +23,27 @@ module GameMachine
       connect
     end
 
+
+    def get(key)
+      value = @store.get(key)
+      return nil if value.nil?
+      if value.is_a?(String)
+        MessageLib::Entity.new.set_id(key).set_json_storage(
+          MessageLib::JsonStorage.new.set_json(value)
+        )
+      else
+        MessageLib::Entity.parse_from(value)
+      end
+    end
+
+    def set(key,value)
+      if value.has_json_storage
+        @store.set(key,value.json_storage.json)
+      else
+        @store.set(key,value.to_byte_array)
+      end
+    end
+
     private
 
     def connect

data/lib/game_machine/data_stores/couchbase.rb

@@ -7,7 +7,24 @@ module GameMachine
       def_delegators :@client, :get, :set, :delete, :shutdown
 
       def connect
-        @client ||= JavaLib::CouchbaseClient.new(servers, 'default'.to_java_string, ''.to_java_string)
+        @client ||= JavaLib::CouchbaseClient.new(builder)
+      end
+
+      def bucket
+       Application.config.couchbase_bucket || 'default'
+      end
+
+      def password
+       Application.config.couchbase_password || ''
+      end
+
+      def builder
+        @builder ||= JavaLib::CouchbaseConnectionFactoryBuilder.new.
+          buildCouchbaseConnection(
+            servers,
+            bucket.to_java_string,
+            password.to_java_string
+        )
       end
 
       def servers

data/lib/game_machine/endpoints/udp_incoming.rb

@@ -60,7 +60,6 @@ module GameMachine
                 :ctx => message.ctx,
                 :client_connection => client_connection
               }
-              GameMachine.logger.info "#{client.inspect}"
               self.class.clients[client_message.player.id] = client
               create_child(client_connection,client,@server,client_message.player.id)
             end

data/lib/game_machine/game_systems.rb

@@ -12,3 +12,5 @@ require_relative 'game_systems/objectdb_proxy'
 require_relative 'game_systems/agents/controller'
 require_relative 'game_systems/region_manager'
 require_relative 'game_systems/region_service'
+require_relative 'game_systems/team_manager'
+require_relative 'game_systems/json_model_persistence'

data/lib/game_machine/game_systems/chat.rb

@@ -1,3 +1,4 @@
+require 'digest'
 module GameMachine
   module GameSystems
     class Chat < Actor::Base
@@ -35,6 +36,11 @@ module GameMachine
       end
 
       def on_receive(entity)
+        if entity.is_a?(MessageLib::ChatDestroy)
+          leave_all_channels
+          return
+        end
+
         if entity.has_join_chat
           join_channels(entity.join_chat.get_chat_channel_list)
           send_status
@@ -73,6 +79,15 @@ module GameMachine
         end
       end
 
+      def leave_all_channels
+        channels = MessageLib::ChatChannels.new
+        @subscriptions.each do |name|
+          channel = MessageLib::ChatChannel.new.set_name(name)
+          leave_channel(channel)
+        end
+        get_sender.tell('complete',get_self)
+      end
+
       def message_queue
         MessageQueue.find
       end
@@ -84,7 +99,8 @@ module GameMachine
       def create_topic_handler(topic)
         name = "topic#{chat_id}#{topic}"
         builder = Actor::Builder.new(GameSystems::ChatTopic,chat_id,registered_as)
-        ref = builder.with_parent(context).with_name(name).start
+        actor_name = Digest::MD5.hexdigest(name)
+        ref = builder.with_parent(context).with_name(actor_name).start
         actor_ref = Actor::Ref.new(ref,GameSystems::ChatTopic.name)
         @topic_handlers[topic] = actor_ref
       end
@@ -205,18 +221,22 @@ module GameMachine
 
       def leave_channels(chat_channels)
         chat_channels.each do |channel|
-          if topic_handler = topic_handler_for(channel.name)
-            message = MessageLib::Unsubscribe.new.set_topic(channel.name)
-            message_queue.tell(message,topic_handler_for(channel.name).actor)
-            @subscriptions.delete_if {|sub| sub == channel.name}
-            save_subscriptions
-            remove_subscriber(chat_id,channel.name)
-            topic_handler.tell(JavaLib::PoisonPill.get_instance)
-            @topic_handlers.delete(channel.name)
-            delete_channel_flags(channel.name)
-          else
-            GameMachine.logger.info "leave_channel: no topic handler found for #{channel.name}"
-          end
+          leave_channel(channel)
+        end
+      end
+
+      def leave_channel(channel)
+        if topic_handler = topic_handler_for(channel.name)
+          message = MessageLib::Unsubscribe.new.set_topic(channel.name)
+          message_queue.tell(message,topic_handler_for(channel.name).actor)
+          @subscriptions.delete_if {|sub| sub == channel.name}
+          save_subscriptions
+          remove_subscriber(chat_id,channel.name)
+          topic_handler.tell(JavaLib::PoisonPill.get_instance)
+          @topic_handlers.delete(channel.name)
+          delete_channel_flags(channel.name)
+        else
+          GameMachine.logger.info "leave_channel: no topic handler found for #{channel.name}"
         end
       end