diff --git a/conf/config.yaml b/conf/config.yaml index 1a2e9e7b601a3884c9a6de2cc4cad7e0f204917a..bee736e1b4f711a9aa30f2ec5532656482cde21d 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -9,7 +9,7 @@ :restart_delay: 10 :address: 0.0.0.0 :intro_file: intro.txt -:start_room: 3caa4fca-1896-0472-08e4-46fd764a4ce3 +:start_room: 70da778a-6436-45a7-ebbb-69ffff0fea10 :restart_limit: 15 :mccp: false :mssp: false diff --git a/lib/aethyr/core/commands/issue.rb b/lib/aethyr/core/commands/issue.rb index 7ddfcd3615a3dd41e0245d644453b8ccc07cd798..01122e07bd7cc8fa69e90cb5b96b64d4320b3012 100644 --- a/lib/aethyr/core/commands/issue.rb +++ b/lib/aethyr/core/commands/issue.rb @@ -9,7 +9,7 @@ module Aethyr def initialize(player) super(player, ["bug", "typo", "idea"]) end - + def self.object_added(data) return unless data[:game_object].is_a? Player data[:game_object].subscribe(IssueHandler.new(data[:game_object])) @@ -32,7 +32,7 @@ module Aethyr action_help({}) end end - + private def action_help(event) player.output <<'EOF' @@ -49,7 +49,7 @@ These commands allow players and administrators to report and manipulate feedbac Note that players can only see and edit their own feedback, while adminsitrators will see them all. -BUG <issue> is used to make the initial report. +BUG [issue] is used to make the initial report. BUG LIST will list all reports. BUG ADD can be used to append comments to a report. BUG STATUS can be used to change the status of a report to a different value (administrators only). @@ -61,7 +61,7 @@ bug 1 bug add 1 Actually, this only happens with battleaxes, not all axes. EOF end - + def action(event) case event[:option] when "new" diff --git a/lib/aethyr/core/help/bug.help b/lib/aethyr/core/help/bug.help index f4f7cae273dc959ee696a84b3de0a0e29c6c02de..2b807760ce053c13cf6d6a2e485e523c8403e346 100644 --- a/lib/aethyr/core/help/bug.help +++ b/lib/aethyr/core/help/bug.help @@ -1,11 +1,11 @@ Command: Bug Command: Idea Command: Typo -Syntax: [BUG|IDEA|TYPO] <issue> -Syntax: [BUG|IDEA|TYPO] <id number> +Syntax: [BUG|IDEA|TYPO] [issue] +Syntax: [BUG|IDEA|TYPO] [id number] Syntax: [BUG|IDEA|TYPO] LIST -Syntax: [BUG|IDEA|TYPO] STATUS <id_number> <status> -Syntax: [BUG|IDEA|TYPO] [SHOW|ADD|DEL] <id_number> +Syntax: [BUG|IDEA|TYPO] STATUS [id_number] [status] +Syntax: [BUG|IDEA|TYPO] [SHOW|ADD|DEL] [id_number] These commands allow players and administrators to report and manipulate feedback about the game. The commands are essentially identical, but should be used to report different things. For the rest of this description, BUG is used. diff --git a/lib/aethyr/core/help/idea.help b/lib/aethyr/core/help/idea.help index f4f7cae273dc959ee696a84b3de0a0e29c6c02de..2b807760ce053c13cf6d6a2e485e523c8403e346 100644 --- a/lib/aethyr/core/help/idea.help +++ b/lib/aethyr/core/help/idea.help @@ -1,11 +1,11 @@ Command: Bug Command: Idea Command: Typo -Syntax: [BUG|IDEA|TYPO] <issue> -Syntax: [BUG|IDEA|TYPO] <id number> +Syntax: [BUG|IDEA|TYPO] [issue] +Syntax: [BUG|IDEA|TYPO] [id number] Syntax: [BUG|IDEA|TYPO] LIST -Syntax: [BUG|IDEA|TYPO] STATUS <id_number> <status> -Syntax: [BUG|IDEA|TYPO] [SHOW|ADD|DEL] <id_number> +Syntax: [BUG|IDEA|TYPO] STATUS [id_number] [status] +Syntax: [BUG|IDEA|TYPO] [SHOW|ADD|DEL] [id_number] These commands allow players and administrators to report and manipulate feedback about the game. The commands are essentially identical, but should be used to report different things. For the rest of this description, BUG is used. diff --git a/lib/aethyr/core/help/syntax.rb b/lib/aethyr/core/help/syntax.rb index 2034f2c71ff6aa6b3f4c4a9c6e9d1a721042b65a..bbf0ce1a77544cc7dbe135c87fc71e1e0abd6332 100644 --- a/lib/aethyr/core/help/syntax.rb +++ b/lib/aethyr/core/help/syntax.rb @@ -67,23 +67,23 @@ AREACT [RELOAD|CLEAR] [OBJECT]", TERRAIN HERE TYPE [TYPE] TERRAIN HERE (INDOORS|WATER|UNDERWATER) (YES|NO)", "bug" => -"BUG <issue> +"BUG [issue] BUG <id number> BUG LIST BUG STATUS <id_number> <status> BUG [SHOW|ADD|DEL] <id_number>", "idea" => -"IDEA <issue> +"IDEA [issue] IDEA <id number> IDEA LIST IDEA STATUS <id_number> <status> IDEA [SHOW|ADD|DEL] <id_number>", "typo" => -"TYPO <issue> -TYPO <id number> +"TYPO [issue] +TYPO [id number] TYPO LIST -TYPO STATUS <id_number> <status> -TYPO [SHOW|ADD|DEL] <id_number>", +TYPO STATUS [id_number] [status] +TYPO [SHOW|ADD|DEL] [id_number]", "climb" => "What would you like to climb?", "close" => diff --git a/lib/aethyr/core/render/display.rb b/lib/aethyr/core/render/display.rb index 7a22990959172339f3049570277af9a7f1ca5b56..369db2bef7fd470979249a09603c45e2c00b9201 100644 --- a/lib/aethyr/core/render/display.rb +++ b/lib/aethyr/core/render/display.rb @@ -362,6 +362,7 @@ class Display def color_encode(window, code) parent = @color_stack[-1] code = code.downcase + code = "regular" if code.nil? || code.empty? || @color_settings[code].nil? unless code.start_with? "raw " result = FormatState.new(@color_settings[code], self.method(:activate_color), parent) else