Merge pull request #34 from AresMUSH/dev

Beta 34

bin/create_test_user

@@ -2,7 +2,7 @@ export ARES_INSTALL_TEXT="<\033[0;32mINSTALL\033[0m>"
 
 echo -e "${ARES_INSTALL_TEXT} Create an ares test user"
 
-export ARES_USERNAME="arestest”
+export ARES_USERNAME="arestest"
 
 sudo adduser --disabled-password --gecos "" ${ARES_USERNAME}
 

engine/aresmush/commands/dispatcher.rb

@@ -85,7 +85,7 @@ def on_command(client, cmd)
           end # with error handling
         end # each
         if (!@handled)
-          trimmed_cmd = (cmd.raw || "")[0,20]
+          trimmed_cmd = (cmd.raw || "")[0,25]
           client.emit_ooc t('dispatcher.huh', :command => trimmed_cmd)
         end
       end # with error handling

engine/aresmush/connection.rb

@@ -145,6 +145,7 @@ def telnet_debug(part)
         1 => "REQ",
         42 => "CHARSET",
         31 => "NAWS",
+        24 => "TTYPE",
         '\r'.ord => "CR",
         '\n'.ord => "LF",
         20 => "_"

engine/aresmush/telnet_negotiation.rb

@@ -17,6 +17,8 @@ def initialize(connection)
 
     CHARSET = 42  # x2A
     NAWS = 31     # x1f
+    TTYPE = 24    # x18
+    SGA = 3       # x3  Suppress Go Ahead
 
     def handle_input(data)
       chars = data.split("")
@@ -51,6 +53,9 @@ def handle_input(data)
       elsif (chars[0].ord == WONT)
         chars.shift # Ditch the won't code
         op = chars.shift.ord
+      elsif (chars[0].ord == DO)
+        chars.shift # Ditch the do code
+        op = chars.shift.ord
       elsif (chars[0].ord == NOP)
         # Do nothing
         chars.shift

install/game.distr/config/chargen.yml

@@ -34,6 +34,12 @@ chargen:
     hooks: hook
     hook/delete: hook/remove
     hook/add: hook/set
+  app_review_commands: 
+    - "app %{name}"
+    - "profile %{name}"
+    - "bg %{name}"
+    - "hooks %{name}"
+    - "sheet %{name}"
   stages:
     start:
       tutorial: chargen.md

install/migrations/0019_beta34_update.rb

@@ -0,0 +1,18 @@
+module AresMUSH  
+  module Migrations
+    class MigrationBeta34Update
+      def require_restart
+        false
+      end
+
+      def migrate
+        Global.logger.debug "Adding app review commandst."
+        default_config = DatabaseMigrator.read_distr_config_file("chargen.yml")
+        config = DatabaseMigrator.read_config_file("chargen.yml")
+        config['chargen']['app_review_commands'] = default_config['chargen']['app_review_commands']
+        DatabaseMigrator.write_config_file("chargen.yml", config)    
+
+      end
+    end
+  end
+end

plugins/chargen/commands/app_review_cmd.rb

@@ -32,10 +32,11 @@ def handle
             return
           end
 
-          Global.dispatcher.queue_command(client, Command.new("app #{model.name}"))
-          Global.dispatcher.queue_command(client, Command.new("profile #{model.name}"))
-          Global.dispatcher.queue_command(client, Command.new("bg #{model.name}"))
-          Global.dispatcher.queue_command(client, Command.new("sheet #{model.name}"))
+          commands = Global.read_config("chargen", "app_review_commands") || []
+          commands.each do |command|
+            command_text = command % { name: model.name }
+            Global.dispatcher.queue_command(client, Command.new(command_text))
+          end
 
           desc = Describe.desc_template(model, enactor)
           client.emit desc.render

plugins/chargen/locales/locale_en.yml

@@ -17,6 +17,8 @@ en:
 
         review_summary: "%xrRed%xn issues will probably hold up your app.%R%xyYellow%xn may be OK if it suits your character."
 
+        background_title: "Background for %{name}"
+
         not_started: "You haven't starget chargen yet.  Use chargen/start first."
         cant_go_back: "You are already on the first stage of Chargen."
         chargen_complete: "You have completed Chargen!"

plugins/chargen/templates/bg.erb

@@ -1,5 +1,5 @@
 <%= header %>
-<%= char.name %> -- <%= approval_status %>
+<%= t('chargen.background_title', :name => char.name) %> -- <%= approval_status %>
 <%= divider %>
 <%= background %>
 <%= footer %>

plugins/forum/commands/forum_scan_cmd.rb

@@ -15,7 +15,7 @@ def handle
           return
         end
 
-        list = unread.map { |u| "#{u.reference_str} #{u.bbs_category.name} - #{u.subject}"}
+        list = unread.map { |u| "#{u.reference_str} #{u.bbs_board.name} - #{u.subject}"}
 
 
         template = BorderedListTemplate.new list, t('forum.scan_title')

plugins/login/help/en/notices.md

@@ -3,8 +3,8 @@ toc: Miscellaneous
 summary: Notices and commands on login.
 aliases:
 - aconnect
-- onstartup
 - motd
+- onconnect
 ---
 
 You always see the notices screen when you connect, which shows you a summary of important messages and what's new to read on the game (like mail or forum posts).

version.txt

@@ -1 +1 @@
-0.33
+0.34