--- deliantra/Deliantra-Client/DC/Macro.pm 2007/08/28 01:23:47 1.9 +++ deliantra/Deliantra-Client/DC/Macro.pm 2007/09/02 09:48:41 1.12 @@ -8,7 +8,7 @@ our $REFRESH_MACRO_LIST; our %DEFAULT_KEYMAP = ( - (map +($_ => "!completer $_"), "a" .. "z"), + (map +("($_)" => "!completer $_"), "a" .. "z"), "(!)" => "!completer shout ", "(\")" => "!completer say ", "(')" => "!completer", @@ -29,8 +29,12 @@ "," => "take", "space" => "apply", + "enter" => "examine", "[+]" => "rotateshoottype +", "[-]" => "rotateshoottype -", + "LAlt-s" => "ready_skill find traps", + "LAlt-d" => "ready_skill disarm traps", + "LAlt-p" => "ready_skill praying", ); # allowed modifiers @@ -242,10 +246,6 @@ sub find_default($) { my ($ev) = @_; - if (my $cmd = $DEFAULT_KEYMAP->{U}{$ev->{unicode}}) { - return $cmd; - } - for my $m (reverse grep $_, @{ $DEFAULT_KEYMAP->{K} }) { for (keys %$m) { if ($_ == ($ev->{mod} & $_)) { @@ -256,6 +256,10 @@ } } + if (my $cmd = $DEFAULT_KEYMAP->{U}{$ev->{unicode}}) { + return $cmd; + } + () }