Merge pull request #143 from AresMUSH/dev

Beta 107

install/migrations/0079_beta105_update.rb

@@ -24,7 +24,7 @@ def migrate
         end
 
         Global.logger.debug "Default unified play."
-        Character.all.each { |c| c.update(unified_play: true) }
+        Character.all.each { |c| c.update(unified_play_screen: true) }
 
       end
     end

install/migrations/0080_beta106_update.rb

@@ -9,7 +9,7 @@ def require_restart
       def migrate
 
         Global.logger.debug "Default unified play - again."
-        Character.all.each { |c| c.update(unified_play: true) }
+        Character.all.each { |c| c.update(unified_play_screen: true) }
 
       end
     end

install/migrations/0081_beta107_update.rb

@@ -0,0 +1,17 @@
+module AresMUSH  
+
+  module Migrations
+    class MigrationBeta107Update
+      def require_restart
+        false
+      end
+
+      def migrate
+
+        Global.logger.debug "Default unified play - third time's the charm?"
+        Character.all.each { |c| c.update(unified_play_screen: true) }
+
+      end
+    end
+  end    
+end

plugins/fs3skills/fs3skills_web_char_data.rb

@@ -25,7 +25,7 @@ def build(char, viewer)
             languages: get_xp_list(char, char.fs3_languages),
             advantages: get_xp_list(char, char.fs3_advantages),
             xp_points: char.fs3_xp,
-            can_learn: is_owner,
+            can_learn: AresCentral.is_alt?(char, viewer),
             allow_advantages_xp: Global.read_config("fs3skills", "allow_advantages_xp")
           }
         else

plugins/fs3skills/web/learn_ability_request_handler.rb

@@ -4,13 +4,18 @@ class LearnAbilityRequestHandler
       def handle(request)
         ability = request.args[:ability]
         enactor = request.enactor
+        char = Character.named(request.args[:char]) || enactor
 
         error = Website.check_login(request)
         return error if error
 
         request.log_request
 
-        error = FS3Skills.learn_ability(enactor, ability)
+        if (!AresCentral.is_alt?(enactor, char))
+          return { error: t('dispatcher.not_allowed') }
+        end
+
+        error = FS3Skills.learn_ability(char, ability)
         if (error)
           return { error: error }
         end

version.txt

@@ -1 +1 @@
-0.106
+0.107