diff --git a/lib/aethyr/core/commands/help_handler.rb b/lib/aethyr/core/commands/help_handler.rb index a37f385e8f302c46830016792bac352fa42f1b5a..4e1a1139a7dae791ae6b559d81d8a5309c43444a 100644 --- a/lib/aethyr/core/commands/help_handler.rb +++ b/lib/aethyr/core/commands/help_handler.rb @@ -4,25 +4,23 @@ module Aethyr module Extend module HandleHelp attr_reader :commands - + def initialize(player, commands, *args) super(player, *args) - + @commands = commands end - + def player_input(data) super(data) case data[:input] when /^(help|help topics)$/i if self.can_help? - self.commands.each do |command| - self.player.output command - end + self.player.output( commands.join(" ") + " ", true) end end end - + def can_help? true end @@ -30,10 +28,10 @@ module Aethyr class HelpHandler include Aethyr::Extend::HandleHelp - + def initialize(player, commands, *args) super end end end -end \ No newline at end of file +end diff --git a/lib/aethyr/core/objects/player.rb b/lib/aethyr/core/objects/player.rb index bb4d27043a43e81e7c16e1f9f73b5baf187dd59b..3c5aa377837e05437c4977d7203107634afe0205 100644 --- a/lib/aethyr/core/objects/player.rb +++ b/lib/aethyr/core/objects/player.rb @@ -181,9 +181,10 @@ class Player < LivingObject end clean_input = input.downcase.strip - self.output('Help topics available:') if (clean_input.eql? "help") or (clean_input.eql? "help topics") + self.output("Help topics available: ", false) if (clean_input.eql? "help") or (clean_input.eql? "help topics") broadcast(:player_input, {:publisher => self, :input => input}) event = CommandParser.parse(self, input) + self.output(" ", false) if (clean_input.eql? "help") or (clean_input.eql? "help topics") if event.nil? if input diff --git a/lib/aethyr/core/render/display.rb b/lib/aethyr/core/render/display.rb index 25edde3f1236a990a2c1f146fa4b3bfeb8b92b21..7a22990959172339f3049570277af9a7f1ca5b56 100644 --- a/lib/aethyr/core/render/display.rb +++ b/lib/aethyr/core/render/display.rb @@ -266,7 +266,7 @@ class Display message << "\r\n" end end - send( message, message_type: message_type) + send( message, message_type: message_type, add_newline: newline) end def paginate message