diff --git a/lib/aethyr/core/commands/say.rb b/lib/aethyr/core/commands/say.rb index 798cbde7b6e96302c71bcfb229f4242de0dd6871..1626c753674e6e67b60dba9f508be173a8c238e9 100644 --- a/lib/aethyr/core/commands/say.rb +++ b/lib/aethyr/core/commands/say.rb @@ -143,6 +143,7 @@ EOF phrase = "<say>\"#{phrase}#{ender}\"</say>" + event[:message_type] = :chat event[:target] = target if target and pvoice == "ask" event[:to_target] = prefix + "#{@player.name} #{rvoice} you, #{phrase}" diff --git a/lib/aethyr/core/objects/player.rb b/lib/aethyr/core/objects/player.rb index 3d9db09293ddb0aef061db01077f1ddad95189a0..41bd411314c6e7e10341523d2103d3396416eb69 100644 --- a/lib/aethyr/core/objects/player.rb +++ b/lib/aethyr/core/objects/player.rb @@ -129,27 +129,29 @@ class Player < LivingObject #Sends an event to the player. def out_event(event) + message_type = :main + message_type = event[:message_type] unless event[:message_type].nil? if event[:target] == self and event[:player] != self if self.blind? and not self.deaf? - self.output event[:to_blind_target] + self.output(event[:to_blind_target], message_type: message_type) elsif self.deaf? and not self.blind? - self.output event[:to_deaf_target] + self.output(event[:to_deaf_target], message_type: message_type) elsif self.deaf? and self.blind? - self.output event[:to_deafandblind_target] + self.output(event[:to_deafandblind_target], message_type: message_type) else - self.output event[:to_target] + self.output(event[:to_target], message_type: message_type) end elsif event[:player] == self - self.output event[:to_player] + self.output(event[:to_player], message_type: message_type) else if self.blind? and not self.deaf? - self.output event[:to_blind_other] + self.output(event[:to_blind_other], message_type: message_type) elsif self.deaf? and not self.blind? - self.output event[:to_deaf_other] + self.output(event[:to_deaf_other], message_type: message_type) elsif self.deaf? and self.blind? - self.output event[:to_deafandblind_other] + self.output(event[:to_deafandblind_other], message_type: message_type) else - self.output event[:to_other] + self.output(event[:to_other], message_type: message_type) end end end diff --git a/lib/aethyr/core/render/display.rb b/lib/aethyr/core/render/display.rb index 36219b4820825952cab86444c912fdb330325d5e..d26d74f658acc246f8bdc4a03c561aa36c791792 100644 --- a/lib/aethyr/core/render/display.rb +++ b/lib/aethyr/core/render/display.rb @@ -296,10 +296,6 @@ CONF send("this is the quick bar", message_type: :quick_bar, internal_clear: true, add_newline: false) end - if @windows[:chat].exists? - send("This is the chat window", message_type: :chat, internal_clear: false, add_newline: true) - end - if @windows[:status].exists? send("This is the status window", message_type: :status, internal_clear: true, add_newline: false) end