From 656057f639323555cecd5e41e6736486c31c7c94 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Sun, 8 Aug 2021 17:39:56 -0400
Subject: [PATCH] Regex replaced bad constructors
---
lib/aethyr/core/actions/action.rb | 8 +++-----
.../core/actions/commands/command_action.rb | 3 +--
lib/aethyr/core/input_handlers/admin/acarea.rb | 2 +-
lib/aethyr/core/input_handlers/admin/acdoor.rb | 4 ++--
lib/aethyr/core/input_handlers/admin/acexit.rb | 2 +-
lib/aethyr/core/input_handlers/admin/acomm.rb | 2 +-
lib/aethyr/core/input_handlers/admin/acomment.rb | 2 +-
lib/aethyr/core/input_handlers/admin/aconfig.rb | 4 ++--
lib/aethyr/core/input_handlers/admin/acportal.rb | 2 +-
lib/aethyr/core/input_handlers/admin/acprop.rb | 2 +-
lib/aethyr/core/input_handlers/admin/acreate.rb | 2 +-
lib/aethyr/core/input_handlers/admin/acroom.rb | 2 +-
lib/aethyr/core/input_handlers/admin/adelete.rb | 2 +-
lib/aethyr/core/input_handlers/admin/adesc.rb | 4 ++--
lib/aethyr/core/input_handlers/admin/aforce.rb | 2 +-
lib/aethyr/core/input_handlers/admin/ahelp.rb | 2 +-
lib/aethyr/core/input_handlers/admin/ahide.rb | 2 +-
lib/aethyr/core/input_handlers/admin/ainfo.rb | 6 +++---
lib/aethyr/core/input_handlers/admin/alearn.rb | 2 +-
lib/aethyr/core/input_handlers/admin/alist.rb | 4 ++--
lib/aethyr/core/input_handlers/admin/alog.rb | 2 +-
lib/aethyr/core/input_handlers/admin/alook.rb | 4 ++--
lib/aethyr/core/input_handlers/admin/aput.rb | 4 ++--
lib/aethyr/core/input_handlers/admin/areact.rb | 6 +++---
lib/aethyr/core/input_handlers/admin/areas.rb | 2 +-
lib/aethyr/core/input_handlers/admin/areload.rb | 2 +-
lib/aethyr/core/input_handlers/admin/asave.rb | 2 +-
lib/aethyr/core/input_handlers/admin/aset.rb | 6 +++---
lib/aethyr/core/input_handlers/admin/ashow.rb | 2 +-
lib/aethyr/core/input_handlers/admin/astatus.rb | 2 +-
lib/aethyr/core/input_handlers/admin/ateach.rb | 2 +-
lib/aethyr/core/input_handlers/admin/awatch.rb | 2 +-
lib/aethyr/core/input_handlers/admin/awho.rb | 2 +-
.../core/input_handlers/admin/deleteplayer.rb | 2 +-
lib/aethyr/core/input_handlers/admin/restart.rb | 2 +-
lib/aethyr/core/input_handlers/admin/terrain.rb | 4 ++--
lib/aethyr/core/input_handlers/block.rb | 2 +-
lib/aethyr/core/input_handlers/date.rb | 2 +-
lib/aethyr/core/input_handlers/deleteme.rb | 2 +-
lib/aethyr/core/input_handlers/dodge.rb | 2 +-
lib/aethyr/core/input_handlers/drop.rb | 8 ++++----
lib/aethyr/core/input_handlers/emotes/agree.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/back.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/blush.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/bow.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/brb.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/bye.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/cheer.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/cry.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/curtsey.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/eh.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/emote.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/er.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/ew.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/frown.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/grin.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/hi.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/hm.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/hug.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/huh.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/laugh.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/no.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/nod.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/pet.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/poke.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/ponder.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/shrug.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/sigh.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/skip.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/smile.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/snicker.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/uh.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/wave.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/yawn.rb | 2 +-
lib/aethyr/core/input_handlers/emotes/yes.rb | 2 +-
lib/aethyr/core/input_handlers/feel.rb | 2 +-
lib/aethyr/core/input_handlers/fill.rb | 2 +-
lib/aethyr/core/input_handlers/gait.rb | 2 +-
lib/aethyr/core/input_handlers/get.rb | 4 ++--
lib/aethyr/core/input_handlers/give.rb | 10 +++++-----
lib/aethyr/core/input_handlers/health.rb | 2 +-
lib/aethyr/core/input_handlers/inventory.rb | 10 +++++-----
lib/aethyr/core/input_handlers/issue.rb | 10 +++++-----
lib/aethyr/core/input_handlers/kick.rb | 4 ++--
lib/aethyr/core/input_handlers/listen.rb | 2 +-
lib/aethyr/core/input_handlers/locking.rb | 8 ++++----
lib/aethyr/core/input_handlers/look.rb | 6 +++---
lib/aethyr/core/input_handlers/map.rb | 2 +-
lib/aethyr/core/input_handlers/more.rb | 6 +++---
lib/aethyr/core/input_handlers/move.rb | 4 ++--
lib/aethyr/core/input_handlers/news.rb | 16 ++++++++--------
lib/aethyr/core/input_handlers/open.rb | 2 +-
lib/aethyr/core/input_handlers/portal.rb | 2 +-
lib/aethyr/core/input_handlers/pose.rb | 2 +-
lib/aethyr/core/input_handlers/punch.rb | 4 ++--
lib/aethyr/core/input_handlers/put.rb | 2 +-
lib/aethyr/core/input_handlers/quit.rb | 10 +++++-----
lib/aethyr/core/input_handlers/remove.rb | 2 +-
lib/aethyr/core/input_handlers/satiety.rb | 2 +-
lib/aethyr/core/input_handlers/say.rb | 4 ++--
lib/aethyr/core/input_handlers/set.rb | 10 +++++-----
lib/aethyr/core/input_handlers/sit.rb | 2 +-
lib/aethyr/core/input_handlers/skills.rb | 2 +-
lib/aethyr/core/input_handlers/slash.rb | 4 ++--
lib/aethyr/core/input_handlers/smell.rb | 2 +-
lib/aethyr/core/input_handlers/stand.rb | 2 +-
lib/aethyr/core/input_handlers/status.rb | 2 +-
lib/aethyr/core/input_handlers/taste.rb | 2 +-
lib/aethyr/core/input_handlers/tell.rb | 4 ++--
lib/aethyr/core/input_handlers/time.rb | 2 +-
lib/aethyr/core/input_handlers/unwield.rb | 2 +-
lib/aethyr/core/input_handlers/wear.rb | 2 +-
lib/aethyr/core/input_handlers/whereis.rb | 2 +-
lib/aethyr/core/input_handlers/whisper.rb | 2 +-
lib/aethyr/core/input_handlers/who.rb | 2 +-
lib/aethyr/core/input_handlers/wield.rb | 2 +-
lib/aethyr/core/input_handlers/write.rb | 2 +-
117 files changed, 176 insertions(+), 179 deletions(-)
diff --git a/lib/aethyr/core/actions/action.rb b/lib/aethyr/core/actions/action.rb
index df067fa..16acab1 100644
--- a/lib/aethyr/core/actions/action.rb
+++ b/lib/aethyr/core/actions/action.rb
@@ -3,11 +3,9 @@ require 'aethyr/core/event'
module Aethyr
module Extend
class Action < Event
- def initialize(**data)
- super(**data)
-
- self.agent = data[:agent]
- self.target = data[:target]
+ def initialize(agent, **data)
+ data[:agent] = agent
+ super(:action, **data)
end
def action
diff --git a/lib/aethyr/core/actions/commands/command_action.rb b/lib/aethyr/core/actions/commands/command_action.rb
index 789a7b0..47f1b80 100644
--- a/lib/aethyr/core/actions/commands/command_action.rb
+++ b/lib/aethyr/core/actions/commands/command_action.rb
@@ -5,8 +5,7 @@ module Aethyr
class CommandAction < Action
def initialize(actor, **data)
new_data = data.dup
- new_data[:actor] = actor
- super(**new_data)
+ super(actor, **new_data)
@player = actor
end
diff --git a/lib/aethyr/core/input_handlers/admin/acarea.rb b/lib/aethyr/core/input_handlers/admin/acarea.rb
index 4c81d82..d9dd6d7 100644
--- a/lib/aethyr/core/input_handlers/admin/acarea.rb
+++ b/lib/aethyr/core/input_handlers/admin/acarea.rb
@@ -37,7 +37,7 @@ EOF
case data[:input]
when /^acarea\s+(.*)$/i
name = $1.strip
- $manager.submit_action(Aethyr::Core::Actions::Acarea::AcareaCommand.new(@player, {:name => name}))
+ $manager.submit_action(Aethyr::Core::Actions::Acarea::AcareaCommand.new(@player, :name => name))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/acdoor.rb b/lib/aethyr/core/input_handlers/admin/acdoor.rb
index 014fd6f..b6ae0ba 100644
--- a/lib/aethyr/core/input_handlers/admin/acdoor.rb
+++ b/lib/aethyr/core/input_handlers/admin/acdoor.rb
@@ -37,11 +37,11 @@ EOF
case data[:input]
when /^acdoor\s+(\w+)$/i
direction = $1
- $manager.submit_action(Aethyr::Core::Actions::Acdoor::AcdoorCommand.new(@player, {:direction => direction}))
+ $manager.submit_action(Aethyr::Core::Actions::Acdoor::AcdoorCommand.new(@player, :direction => direction))
when /^acdoor\s+(\w+)\s+(.*)$/i
direction = $1.strip
exit_room = $2.strip
- $manager.submit_action(Aethyr::Core::Actions::Acdoor::AcdoorCommand.new(@player, {:direction => direction, :exit_room => exit_room}))
+ $manager.submit_action(Aethyr::Core::Actions::Acdoor::AcdoorCommand.new(@player, :direction => direction, :exit_room => exit_room))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/acexit.rb b/lib/aethyr/core/input_handlers/admin/acexit.rb
index 86c9437..41a9994 100644
--- a/lib/aethyr/core/input_handlers/admin/acexit.rb
+++ b/lib/aethyr/core/input_handlers/admin/acexit.rb
@@ -39,7 +39,7 @@ EOF
object = "exit"
alt_names = [$1.strip]
args = [$2.strip]
- $manager.submit_action(Aethyr::Core::Actions::Acreate::AcreateCommand.new(@player, {:object => object, :alt_names => alt_names, :args => args}))
+ $manager.submit_action(Aethyr::Core::Actions::Acreate::AcreateCommand.new(@player, :object => object, :alt_names => alt_names, :args => args))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/acomm.rb b/lib/aethyr/core/input_handlers/admin/acomm.rb
index 7760253..41a5304 100644
--- a/lib/aethyr/core/input_handlers/admin/acomm.rb
+++ b/lib/aethyr/core/input_handlers/admin/acomm.rb
@@ -38,7 +38,7 @@ EOF
when /^(acomm|acomment)\s+(.*?)\s+(.*)$/i
target = $2
comment = $3
- $manager.submit_action(Aethyr::Core::Actions::Acomment::AcommentCommand.new(@player, {:target => target, :comment => comment}))
+ $manager.submit_action(Aethyr::Core::Actions::Acomment::AcommentCommand.new(@player, :target => target, :comment => comment))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/acomment.rb b/lib/aethyr/core/input_handlers/admin/acomment.rb
index a4caa01..72b405c 100644
--- a/lib/aethyr/core/input_handlers/admin/acomment.rb
+++ b/lib/aethyr/core/input_handlers/admin/acomment.rb
@@ -38,7 +38,7 @@ EOF
when /^(acomm|acomment)\s+(.*?)\s+(.*)$/i
target = $2
comment = $3
- $manager.submit_action(Aethyr::Core::Actions::Acomment::AcommentCommand.new(@player, {:target => target, :comment => comment}))
+ $manager.submit_action(Aethyr::Core::Actions::Acomment::AcommentCommand.new(@player, :target => target, :comment => comment))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/aconfig.rb b/lib/aethyr/core/input_handlers/admin/aconfig.rb
index 530aa19..1af214c 100644
--- a/lib/aethyr/core/input_handlers/admin/aconfig.rb
+++ b/lib/aethyr/core/input_handlers/admin/aconfig.rb
@@ -37,11 +37,11 @@ EOF
case data[:input]
when /^aconfig(\s+reload)?$/i
setting = "reload" if $1
- $manager.submit_action(Aethyr::Core::Actions::Aconfig::AconfigCommand.new(@player, {:setting => setting}))
+ $manager.submit_action(Aethyr::Core::Actions::Aconfig::AconfigCommand.new(@player, :setting => setting))
when /^aconfig\s+(\w+)\s+(.*)$/i
setting = $1
value = $2
- $manager.submit_action(Aethyr::Core::Actions::Aconfig::AconfigCommand.new(@player, {:setting => setting, :value => value}))
+ $manager.submit_action(Aethyr::Core::Actions::Aconfig::AconfigCommand.new(@player, :setting => setting, :value => value))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/acportal.rb b/lib/aethyr/core/input_handlers/admin/acportal.rb
index 1387502..7cb99a2 100644
--- a/lib/aethyr/core/input_handlers/admin/acportal.rb
+++ b/lib/aethyr/core/input_handlers/admin/acportal.rb
@@ -40,7 +40,7 @@ EOF
alt_names = []
portal_action = $2
args = [$4]
- $manager.submit_action(Aethyr::Core::Actions::Acportal::AcportalCommand.new(@player, {:object => object, :alt_names => alt_names, :portal_action => portal_action, :args => args}))
+ $manager.submit_action(Aethyr::Core::Actions::Acportal::AcportalCommand.new(@player, :object => object, :alt_names => alt_names, :portal_action => portal_action, :args => args))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/acprop.rb b/lib/aethyr/core/input_handlers/admin/acprop.rb
index f94bab9..5922a8e 100644
--- a/lib/aethyr/core/input_handlers/admin/acprop.rb
+++ b/lib/aethyr/core/input_handlers/admin/acprop.rb
@@ -38,7 +38,7 @@ EOF
when /^acprop\s+(.*)$/i
object = "prop"
generic = $1
- $manager.submit_action(Aethyr::Core::Actions::Acreate::AcreateCommand.new(@player, {:object => object, :generic => generic}))
+ $manager.submit_action(Aethyr::Core::Actions::Acreate::AcreateCommand.new(@player, :object => object, :generic => generic))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/acreate.rb b/lib/aethyr/core/input_handlers/admin/acreate.rb
index 99781b6..95555bf 100644
--- a/lib/aethyr/core/input_handlers/admin/acreate.rb
+++ b/lib/aethyr/core/input_handlers/admin/acreate.rb
@@ -38,7 +38,7 @@ EOF
when /^(ac|acreate)\s+(\w+)\s*(.*)$/i
object = $2
name = $3.strip
- $manager.submit_action(Aethyr::Core::Actions::Acreate::AcreateCommand.new(@player, {:object => object, :name => name}))
+ $manager.submit_action(Aethyr::Core::Actions::Acreate::AcreateCommand.new(@player, :object => object, :name => name))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/acroom.rb b/lib/aethyr/core/input_handlers/admin/acroom.rb
index 40eb1a2..ab897db 100644
--- a/lib/aethyr/core/input_handlers/admin/acroom.rb
+++ b/lib/aethyr/core/input_handlers/admin/acroom.rb
@@ -39,7 +39,7 @@ EOF
out_dir = $1
in_dir = opposite_dir($1)
name = $2
- $manager.submit_action(Aethyr::Core::Actions::Acroom::AcroomCommand.new(@player, {:out_dir => out_dir, :in_dir => in_dir, :name => name}))
+ $manager.submit_action(Aethyr::Core::Actions::Acroom::AcroomCommand.new(@player, :out_dir => out_dir, :in_dir => in_dir, :name => name))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/adelete.rb b/lib/aethyr/core/input_handlers/admin/adelete.rb
index 0220da6..335eeab 100644
--- a/lib/aethyr/core/input_handlers/admin/adelete.rb
+++ b/lib/aethyr/core/input_handlers/admin/adelete.rb
@@ -37,7 +37,7 @@ EOF
case data[:input]
when /^adelete\s+(.*)$/i
object = $1
- $manager.submit_action(Aethyr::Core::Actions::Adelete::AdeleteCommand.new(@player, {:object => object}))
+ $manager.submit_action(Aethyr::Core::Actions::Adelete::AdeleteCommand.new(@player, :object => object))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/adesc.rb b/lib/aethyr/core/input_handlers/admin/adesc.rb
index 4e73fab..1c3b476 100644
--- a/lib/aethyr/core/input_handlers/admin/adesc.rb
+++ b/lib/aethyr/core/input_handlers/admin/adesc.rb
@@ -39,11 +39,11 @@ EOF
object = $1
inroom = true
desc = $2
- $manager.submit_action(Aethyr::Core::Actions::Adesc::AdescCommand.new(@player, {:object => object, :inroom => inroom, :desc => desc}))
+ $manager.submit_action(Aethyr::Core::Actions::Adesc::AdescCommand.new(@player, :object => object, :inroom => inroom, :desc => desc))
when /^adesc\s+(.*?)\s+(.*)$/i
object = $1
desc = $2
- $manager.submit_action(Aethyr::Core::Actions::Adesc::AdescCommand.new(@player, {:object => object, :desc => desc}))
+ $manager.submit_action(Aethyr::Core::Actions::Adesc::AdescCommand.new(@player, :object => object, :desc => desc))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/aforce.rb b/lib/aethyr/core/input_handlers/admin/aforce.rb
index a5ad5da..8b8a003 100644
--- a/lib/aethyr/core/input_handlers/admin/aforce.rb
+++ b/lib/aethyr/core/input_handlers/admin/aforce.rb
@@ -38,7 +38,7 @@ EOF
when /^aforce\s+(.*?)\s+(.*)$/i
target = $1
command = $2
- $manager.submit_action(Aethyr::Core::Actions::Aforce::AforceCommand.new(@player, {:target => target, :command => command}))
+ $manager.submit_action(Aethyr::Core::Actions::Aforce::AforceCommand.new(@player, :target => target, :command => command))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/ahelp.rb b/lib/aethyr/core/input_handlers/admin/ahelp.rb
index 2be3040..ab11d89 100644
--- a/lib/aethyr/core/input_handlers/admin/ahelp.rb
+++ b/lib/aethyr/core/input_handlers/admin/ahelp.rb
@@ -37,7 +37,7 @@ EOF
case data[:input]
when /^ahelp(.*)$/i
object = $1
- $manager.submit_action(Aethyr::Core::Actions::Ahelp::AhelpCommand.new(@player, {:object => object}))
+ $manager.submit_action(Aethyr::Core::Actions::Ahelp::AhelpCommand.new(@player, :object => object))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/ahide.rb b/lib/aethyr/core/input_handlers/admin/ahide.rb
index 1a2831c..141246e 100644
--- a/lib/aethyr/core/input_handlers/admin/ahide.rb
+++ b/lib/aethyr/core/input_handlers/admin/ahide.rb
@@ -38,7 +38,7 @@ EOF
when /^ahide\s+(.*)$/i
object = $1
hide = true
- $manager.submit_action(Aethyr::Core::Actions::Ahide::AhideCommand.new(@player, {:object => object, :hide => hide}))
+ $manager.submit_action(Aethyr::Core::Actions::Ahide::AhideCommand.new(@player, :object => object, :hide => hide))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/ainfo.rb b/lib/aethyr/core/input_handlers/admin/ainfo.rb
index 6214170..d8669e4 100644
--- a/lib/aethyr/core/input_handlers/admin/ainfo.rb
+++ b/lib/aethyr/core/input_handlers/admin/ainfo.rb
@@ -40,16 +40,16 @@ EOF
object = $1
attrib = $2
value = $4
- $manager.submit_action(Aethyr::Core::Actions::Ainfo::AinfoCommand.new(@player, {:command => command, :object => object, :attrib => attrib, :value => value}))
+ $manager.submit_action(Aethyr::Core::Actions::Ainfo::AinfoCommand.new(@player, :command => command, :object => object, :attrib => attrib, :value => value))
when /^ainfo\s+(show|clear)\s+(.*)$/i
object = $2
command = $1
- $manager.submit_action(Aethyr::Core::Actions::Ainfo::AinfoCommand.new(@player, {:object => object, :command => command}))
+ $manager.submit_action(Aethyr::Core::Actions::Ainfo::AinfoCommand.new(@player, :object => object, :command => command))
when /^ainfo\s+(del|delete)\s+(.+)\s+@((\w|\.|\_)+)$/i
command = "delete"
object = $2
attrib = $3
- $manager.submit_action(Aethyr::Core::Actions::Ainfo::AinfoCommand.new(@player, {:command => command, :object => object, :attrib => attrib}))
+ $manager.submit_action(Aethyr::Core::Actions::Ainfo::AinfoCommand.new(@player, :command => command, :object => object, :attrib => attrib))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/alearn.rb b/lib/aethyr/core/input_handlers/admin/alearn.rb
index f1b03d2..ea9e99b 100644
--- a/lib/aethyr/core/input_handlers/admin/alearn.rb
+++ b/lib/aethyr/core/input_handlers/admin/alearn.rb
@@ -37,7 +37,7 @@ EOF
case data[:input]
when /^alearn\s+(\w+)$/i
skill = $1
- $manager.submit_action(Aethyr::Core::Actions::Alearn::AlearnCommand.new(@player, {:skill => skill}))
+ $manager.submit_action(Aethyr::Core::Actions::Alearn::AlearnCommand.new(@player, :skill => skill))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/alist.rb b/lib/aethyr/core/input_handlers/admin/alist.rb
index cfbd20d..c000e04 100644
--- a/lib/aethyr/core/input_handlers/admin/alist.rb
+++ b/lib/aethyr/core/input_handlers/admin/alist.rb
@@ -36,11 +36,11 @@ EOF
super(data)
case data[:input]
when /^alist$/i
- $manager.submit_action(Aethyr::Core::Actions::Alist::AlistCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Alist::AlistCommand.new(@player, ))
when /^alist\s+(@\w+|class)\s+(.*)/i
attrib = $2
match = $1
- $manager.submit_action(Aethyr::Core::Actions::Alist::AlistCommand.new(@player, {:attrib => attrib, :match => match}))
+ $manager.submit_action(Aethyr::Core::Actions::Alist::AlistCommand.new(@player, :attrib => attrib, :match => match))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/alog.rb b/lib/aethyr/core/input_handlers/admin/alog.rb
index 5ac6900..372fcb3 100644
--- a/lib/aethyr/core/input_handlers/admin/alog.rb
+++ b/lib/aethyr/core/input_handlers/admin/alog.rb
@@ -38,7 +38,7 @@ EOF
when /^alog\s+(\w+)(\s+(\d+))?$/i
command = $1
value = $3.downcase if $3
- $manager.submit_action(Aethyr::Core::Actions::Alog::AlogCommand.new(@player, {:command => command, :value => value}))
+ $manager.submit_action(Aethyr::Core::Actions::Alog::AlogCommand.new(@player, :command => command, :value => value))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/alook.rb b/lib/aethyr/core/input_handlers/admin/alook.rb
index 3877f71..13116ad 100644
--- a/lib/aethyr/core/input_handlers/admin/alook.rb
+++ b/lib/aethyr/core/input_handlers/admin/alook.rb
@@ -36,10 +36,10 @@ EOF
super(data)
case data[:input]
when /^alook$/i
- $manager.submit_action(Aethyr::Core::Actions::Alook::AlookCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Alook::AlookCommand.new(@player, ))
when /^alook\s+(.*)$/i
at = $1
- $manager.submit_action(Aethyr::Core::Actions::Alook::AlookCommand.new(@player, {:at => at}))
+ $manager.submit_action(Aethyr::Core::Actions::Alook::AlookCommand.new(@player, :at => at))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/aput.rb b/lib/aethyr/core/input_handlers/admin/aput.rb
index db726fc..c54697c 100644
--- a/lib/aethyr/core/input_handlers/admin/aput.rb
+++ b/lib/aethyr/core/input_handlers/admin/aput.rb
@@ -39,11 +39,11 @@ EOF
object = $1
in_var = $2
at = $3
- $manager.submit_action(Aethyr::Core::Actions::Aput::AputCommand.new(@player, {:object => object, :in => in_var, :at => at}))
+ $manager.submit_action(Aethyr::Core::Actions::Aput::AputCommand.new(@player, :object => object, :in => in_var, :at => at))
when /^aput\s+(.*?)\s+in\s+(.*?)$/i
object = $1
in_var = $2
- $manager.submit_action(Aethyr::Core::Actions::Aput::AputCommand.new(@player, {:object => object, :in => in_var}))
+ $manager.submit_action(Aethyr::Core::Actions::Aput::AputCommand.new(@player, :object => object, :in => in_var))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/areact.rb b/lib/aethyr/core/input_handlers/admin/areact.rb
index 1a8b57d..4095f4d 100644
--- a/lib/aethyr/core/input_handlers/admin/areact.rb
+++ b/lib/aethyr/core/input_handlers/admin/areact.rb
@@ -39,16 +39,16 @@ EOF
object = $1
command = "load"
file = $2
- $manager.submit_action(Aethyr::Core::Actions::Areaction::AreactionCommand.new(@player, {:object => object, :command => command, :file => file}))
+ $manager.submit_action(Aethyr::Core::Actions::Areaction::AreactionCommand.new(@player, :object => object, :command => command, :file => file))
when /^areact\s+(reload|clear|show)\s+(.*?)$/i
object = $2
command = $1
- $manager.submit_action(Aethyr::Core::Actions::Areaction::AreactionCommand.new(@player, {:object => object, :command => command}))
+ $manager.submit_action(Aethyr::Core::Actions::Areaction::AreactionCommand.new(@player, :object => object, :command => command))
when /^areact\s+(add|delete)\s+(.*?)\s+(\w+)$/i
object = $2
command = $1
action_name = $3
- $manager.submit_action(Aethyr::Core::Actions::Areaction::AreactionCommand.new(@player, {:object => object, :command => command, :action_name => action_name}))
+ $manager.submit_action(Aethyr::Core::Actions::Areaction::AreactionCommand.new(@player, :object => object, :command => command, :action_name => action_name))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/areas.rb b/lib/aethyr/core/input_handlers/admin/areas.rb
index b320ed3..a742f58 100644
--- a/lib/aethyr/core/input_handlers/admin/areas.rb
+++ b/lib/aethyr/core/input_handlers/admin/areas.rb
@@ -36,7 +36,7 @@ EOF
super(data)
case data[:input]
when /^areas$/i
- $manager.submit_action(Aethyr::Core::Actions::Areas::AreasCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Areas::AreasCommand.new(@player, ))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/areload.rb b/lib/aethyr/core/input_handlers/admin/areload.rb
index b394916..a91a4dc 100644
--- a/lib/aethyr/core/input_handlers/admin/areload.rb
+++ b/lib/aethyr/core/input_handlers/admin/areload.rb
@@ -37,7 +37,7 @@ EOF
case data[:input]
when /^areload\s+(.*)$/i
object = $1
- $manager.submit_action(Aethyr::Core::Actions::Areload::AreloadCommand.new(@player, {:object => object}))
+ $manager.submit_action(Aethyr::Core::Actions::Areload::AreloadCommand.new(@player, :object => object))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/asave.rb b/lib/aethyr/core/input_handlers/admin/asave.rb
index 5fe068e..6470c2d 100644
--- a/lib/aethyr/core/input_handlers/admin/asave.rb
+++ b/lib/aethyr/core/input_handlers/admin/asave.rb
@@ -36,7 +36,7 @@ EOF
super(data)
case data[:input]
when /^asave$/i
- $manager.submit_action(Aethyr::Core::Actions::Asave::AsaveCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Asave::AsaveCommand.new(@player, ))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/aset.rb b/lib/aethyr/core/input_handlers/admin/aset.rb
index bdc3e8f..5be03b3 100644
--- a/lib/aethyr/core/input_handlers/admin/aset.rb
+++ b/lib/aethyr/core/input_handlers/admin/aset.rb
@@ -39,19 +39,19 @@ EOF
object = $1
attribute = $2
value = $3
- $manager.submit_action(Aethyr::Core::Actions::Aset::AsetCommand.new(@player, {:object => object, :attribute => attribute, :value => value}))
+ $manager.submit_action(Aethyr::Core::Actions::Aset::AsetCommand.new(@player, :object => object, :attribute => attribute, :value => value))
when /^aset!\s+(.+?)\s+(@\w+|smell|feel|texture|taste|sound|listen)\s+(.*)$/i
object = $1
attribute = $2
value = $3
force = true
- $manager.submit_action(Aethyr::Core::Actions::Aset::AsetCommand.new(@player, {:object => object, :attribute => attribute, :value => value, :force => force}))
+ $manager.submit_action(Aethyr::Core::Actions::Aset::AsetCommand.new(@player, :object => object, :attribute => attribute, :value => value, :force => force))
when /^aset!\s+(.+?)\s+(@\w+|smell|feel|texture|taste|sound|listen)\s+(.*)$/i
object = $1
attribute = $2
value = $3
force = true
- $manager.submit_action(Aethyr::Core::Actions::Aset::AsetCommand.new(@player, {:object => object, :attribute => attribute, :value => value, :force => force}))
+ $manager.submit_action(Aethyr::Core::Actions::Aset::AsetCommand.new(@player, :object => object, :attribute => attribute, :value => value, :force => force))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/ashow.rb b/lib/aethyr/core/input_handlers/admin/ashow.rb
index a02b6b8..8f9528c 100644
--- a/lib/aethyr/core/input_handlers/admin/ashow.rb
+++ b/lib/aethyr/core/input_handlers/admin/ashow.rb
@@ -38,7 +38,7 @@ EOF
when /^ashow\s+(.*)$/i
object = $1
hide = false
- $manager.submit_action(Aethyr::Core::Actions::Ahide::AhideCommand.new(@player, {:object => object, :hide => hide}))
+ $manager.submit_action(Aethyr::Core::Actions::Ahide::AhideCommand.new(@player, :object => object, :hide => hide))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/astatus.rb b/lib/aethyr/core/input_handlers/admin/astatus.rb
index 2464bd1..679350f 100644
--- a/lib/aethyr/core/input_handlers/admin/astatus.rb
+++ b/lib/aethyr/core/input_handlers/admin/astatus.rb
@@ -36,7 +36,7 @@ EOF
super(data)
case data[:input]
when /^astatus/i
- $manager.submit_action(Aethyr::Core::Actions::Astatus::AstatusCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Astatus::AstatusCommand.new(@player, ))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/ateach.rb b/lib/aethyr/core/input_handlers/admin/ateach.rb
index 08c0693..a4e795e 100644
--- a/lib/aethyr/core/input_handlers/admin/ateach.rb
+++ b/lib/aethyr/core/input_handlers/admin/ateach.rb
@@ -38,7 +38,7 @@ EOF
when /^ateach\s+(\w+)\s+(\w+)$/i
target = $1
skill = $2
- $manager.submit_action(Aethyr::Core::Actions::Ateach::AteachCommand.new(@player, {:target => target, :skill => skill}))
+ $manager.submit_action(Aethyr::Core::Actions::Ateach::AteachCommand.new(@player, :target => target, :skill => skill))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/awatch.rb b/lib/aethyr/core/input_handlers/admin/awatch.rb
index 705fb7e..3bf4186 100644
--- a/lib/aethyr/core/input_handlers/admin/awatch.rb
+++ b/lib/aethyr/core/input_handlers/admin/awatch.rb
@@ -38,7 +38,7 @@ EOF
when /^awatch\s+((start|stop)\s+)?(.*)$/i
target = $3.downcase if $3
command = $2.downcase if $2
- $manager.submit_action(Aethyr::Core::Actions::Awatch::AwatchCommand.new(@player, {:target => target, :command => command}))
+ $manager.submit_action(Aethyr::Core::Actions::Awatch::AwatchCommand.new(@player, :target => target, :command => command))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/awho.rb b/lib/aethyr/core/input_handlers/admin/awho.rb
index 3c7578f..d9f850b 100644
--- a/lib/aethyr/core/input_handlers/admin/awho.rb
+++ b/lib/aethyr/core/input_handlers/admin/awho.rb
@@ -36,7 +36,7 @@ EOF
super(data)
case data[:input]
when /^awho/i
- $manager.submit_action(Aethyr::Core::Actions::Awho::AwhoCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Awho::AwhoCommand.new(@player, ))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/deleteplayer.rb b/lib/aethyr/core/input_handlers/admin/deleteplayer.rb
index c9592a0..a9c4e13 100644
--- a/lib/aethyr/core/input_handlers/admin/deleteplayer.rb
+++ b/lib/aethyr/core/input_handlers/admin/deleteplayer.rb
@@ -37,7 +37,7 @@ EOF
case data[:input]
when /^deleteplayer\s+(\w+)$/i
object = $1.downcase
- $manager.submit_action(Aethyr::Core::Actions::DeletePlayer::DeletePlayerCommand.new(@player, {:object => object}))
+ $manager.submit_action(Aethyr::Core::Actions::DeletePlayer::DeletePlayerCommand.new(@player, :object => object))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/restart.rb b/lib/aethyr/core/input_handlers/admin/restart.rb
index 3a944fa..2e2e50d 100644
--- a/lib/aethyr/core/input_handlers/admin/restart.rb
+++ b/lib/aethyr/core/input_handlers/admin/restart.rb
@@ -36,7 +36,7 @@ EOF
super(data)
case data[:input]
when /^restart$/i
- $manager.submit_action(Aethyr::Core::Actions::Restart::RestartCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Restart::RestartCommand.new(@player, ))
end
end
diff --git a/lib/aethyr/core/input_handlers/admin/terrain.rb b/lib/aethyr/core/input_handlers/admin/terrain.rb
index 07656ae..24b5342 100644
--- a/lib/aethyr/core/input_handlers/admin/terrain.rb
+++ b/lib/aethyr/core/input_handlers/admin/terrain.rb
@@ -38,12 +38,12 @@ EOF
when /^terrain\s+area\s+(.*)$/i
target = "area"
value = $1
- $manager.submit_action(Aethyr::Core::Actions::Terrain::TerrainCommand.new(@player, {:target => target, :value => value}))
+ $manager.submit_action(Aethyr::Core::Actions::Terrain::TerrainCommand.new(@player, :target => target, :value => value))
when /^terrain\s+(room|here)\s+(type|indoors|underwater|water)\s+(.*)$/
target = "room"
setting = $2.downcase
value = $3
- $manager.submit_action(Aethyr::Core::Actions::Terrain::TerrainCommand.new(@player, {:target => target, :setting => setting, :value => value}))
+ $manager.submit_action(Aethyr::Core::Actions::Terrain::TerrainCommand.new(@player, :target => target, :setting => setting, :value => value))
end
end
diff --git a/lib/aethyr/core/input_handlers/block.rb b/lib/aethyr/core/input_handlers/block.rb
index 8f36778..6cb2e23 100644
--- a/lib/aethyr/core/input_handlers/block.rb
+++ b/lib/aethyr/core/input_handlers/block.rb
@@ -38,7 +38,7 @@ EOF
case data[:input]
when /^block(\s+(.*))?$/i
target = $2
- $manager.submit_action(Aethyr::Core::Actions::SimpleBlock::SimpleBlockCommand.new(@player, {:target => target}))
+ $manager.submit_action(Aethyr::Core::Actions::SimpleBlock::SimpleBlockCommand.new(@player, :target => target))
end
end
diff --git a/lib/aethyr/core/input_handlers/date.rb b/lib/aethyr/core/input_handlers/date.rb
index 5656b57..ff248d8 100644
--- a/lib/aethyr/core/input_handlers/date.rb
+++ b/lib/aethyr/core/input_handlers/date.rb
@@ -39,7 +39,7 @@ EOF
super(data)
case data[:input]
when /^date$/i
- $manager.submit_action(Aethyr::Core::Actions::Date::DateCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Date::DateCommand.new(@player, ))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/deleteme.rb b/lib/aethyr/core/input_handlers/deleteme.rb
index 2e8507f..8626f4d 100644
--- a/lib/aethyr/core/input_handlers/deleteme.rb
+++ b/lib/aethyr/core/input_handlers/deleteme.rb
@@ -40,7 +40,7 @@ EOF
super(data)
case data[:input]
when /^delete me please$/i
- $manager.submit_action(Aethyr::Core::Actions::Deleteme::DeletemeCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Deleteme::DeletemeCommand.new(@player, ))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/dodge.rb b/lib/aethyr/core/input_handlers/dodge.rb
index 6e18a7b..fd268d5 100644
--- a/lib/aethyr/core/input_handlers/dodge.rb
+++ b/lib/aethyr/core/input_handlers/dodge.rb
@@ -37,7 +37,7 @@ EOF
case data[:input]
when /^dodge(\s+(.*))?$/i
target = $2 if $2
- $manager.submit_action(Aethyr::Core::Actions::SimpleDodge::SimpleDodgeCommand.new(@player, {:target => target}))
+ $manager.submit_action(Aethyr::Core::Actions::SimpleDodge::SimpleDodgeCommand.new(@player, :target => target))
end
end
diff --git a/lib/aethyr/core/input_handlers/drop.rb b/lib/aethyr/core/input_handlers/drop.rb
index 702b412..f1ffad0 100644
--- a/lib/aethyr/core/input_handlers/drop.rb
+++ b/lib/aethyr/core/input_handlers/drop.rb
@@ -28,7 +28,7 @@ EOF
def initialize(player)
super(player, ["drop"], help_entries: DropHandler.create_help_entries)
end
-
+
def self.object_added(data)
super(data, self)
end
@@ -37,10 +37,10 @@ EOF
super(data)
case data[:input]
when /^drop\s+((\w+\s*)*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Drop::DropCommand.new(@player, { :object => $1.strip }))
+ $manager.submit_action(Aethyr::Core::Actions::Drop::DropCommand.new(@player, :object => $1.strip ))
end
end
-
+
private
#Drops an item from the player's inventory into the room.
@@ -50,4 +50,4 @@ EOF
end
end
end
-end
\ No newline at end of file
+end
diff --git a/lib/aethyr/core/input_handlers/emotes/agree.rb b/lib/aethyr/core/input_handlers/emotes/agree.rb
index 00e82b1..217e370 100644
--- a/lib/aethyr/core/input_handlers/emotes/agree.rb
+++ b/lib/aethyr/core/input_handlers/emotes/agree.rb
@@ -38,7 +38,7 @@ EOF
when /^(agree)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Agree::AgreeCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Agree::AgreeCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/back.rb b/lib/aethyr/core/input_handlers/emotes/back.rb
index 3686787..9818a91 100644
--- a/lib/aethyr/core/input_handlers/emotes/back.rb
+++ b/lib/aethyr/core/input_handlers/emotes/back.rb
@@ -38,7 +38,7 @@ EOF
when /^(back)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Back::BackCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Back::BackCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/blush.rb b/lib/aethyr/core/input_handlers/emotes/blush.rb
index 83cc9ff..b661251 100644
--- a/lib/aethyr/core/input_handlers/emotes/blush.rb
+++ b/lib/aethyr/core/input_handlers/emotes/blush.rb
@@ -38,7 +38,7 @@ EOF
when /^(blush)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Blush::BlushCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Blush::BlushCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/bow.rb b/lib/aethyr/core/input_handlers/emotes/bow.rb
index 8da2217..2757c61 100644
--- a/lib/aethyr/core/input_handlers/emotes/bow.rb
+++ b/lib/aethyr/core/input_handlers/emotes/bow.rb
@@ -38,7 +38,7 @@ EOF
when /^(bow)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Bow::BowCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Bow::BowCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/brb.rb b/lib/aethyr/core/input_handlers/emotes/brb.rb
index fc52245..98e0bd5 100644
--- a/lib/aethyr/core/input_handlers/emotes/brb.rb
+++ b/lib/aethyr/core/input_handlers/emotes/brb.rb
@@ -38,7 +38,7 @@ EOF
when /^(brb)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Brb::BrbCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Brb::BrbCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/bye.rb b/lib/aethyr/core/input_handlers/emotes/bye.rb
index bb32281..6a875fe 100644
--- a/lib/aethyr/core/input_handlers/emotes/bye.rb
+++ b/lib/aethyr/core/input_handlers/emotes/bye.rb
@@ -38,7 +38,7 @@ EOF
when /^(bye)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Bye::ByeCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Bye::ByeCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/cheer.rb b/lib/aethyr/core/input_handlers/emotes/cheer.rb
index d3641a4..2a5cb2a 100644
--- a/lib/aethyr/core/input_handlers/emotes/cheer.rb
+++ b/lib/aethyr/core/input_handlers/emotes/cheer.rb
@@ -38,7 +38,7 @@ EOF
when /^(cheer)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Cheer::CheerCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Cheer::CheerCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/cry.rb b/lib/aethyr/core/input_handlers/emotes/cry.rb
index a115bb0..53de2ac 100644
--- a/lib/aethyr/core/input_handlers/emotes/cry.rb
+++ b/lib/aethyr/core/input_handlers/emotes/cry.rb
@@ -38,7 +38,7 @@ EOF
when /^(cry)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Cry::CryCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Cry::CryCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/curtsey.rb b/lib/aethyr/core/input_handlers/emotes/curtsey.rb
index fd968c6..71c8cd2 100644
--- a/lib/aethyr/core/input_handlers/emotes/curtsey.rb
+++ b/lib/aethyr/core/input_handlers/emotes/curtsey.rb
@@ -38,7 +38,7 @@ EOF
when /^(curtsey)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Curtsey::CurtseyCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Curtsey::CurtseyCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/eh.rb b/lib/aethyr/core/input_handlers/emotes/eh.rb
index 1538d60..6718d36 100644
--- a/lib/aethyr/core/input_handlers/emotes/eh.rb
+++ b/lib/aethyr/core/input_handlers/emotes/eh.rb
@@ -38,7 +38,7 @@ EOF
when /^(eh)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Eh::EhCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Eh::EhCommand.new(@player, :object => object, :post => post))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/emote.rb b/lib/aethyr/core/input_handlers/emotes/emote.rb
index 7c421a1..ead9807 100644
--- a/lib/aethyr/core/input_handlers/emotes/emote.rb
+++ b/lib/aethyr/core/input_handlers/emotes/emote.rb
@@ -66,7 +66,7 @@ EOF
case data[:input]
when /^emote\s+(.*)/i
show = $1
- $manager.submit_action(Aethyr::Core::Actions::Emote::EmoteCommand.new(@player, {:show => show}))
+ $manager.submit_action(Aethyr::Core::Actions::Emote::EmoteCommand.new(@player, :show => show))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/er.rb b/lib/aethyr/core/input_handlers/emotes/er.rb
index e300061..6a9530b 100644
--- a/lib/aethyr/core/input_handlers/emotes/er.rb
+++ b/lib/aethyr/core/input_handlers/emotes/er.rb
@@ -38,7 +38,7 @@ EOF
when /^(er)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Er::ErCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Er::ErCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/ew.rb b/lib/aethyr/core/input_handlers/emotes/ew.rb
index 01d8680..7259c58 100644
--- a/lib/aethyr/core/input_handlers/emotes/ew.rb
+++ b/lib/aethyr/core/input_handlers/emotes/ew.rb
@@ -37,7 +37,7 @@ EOF
when /^(ew)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Ew::EwCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Ew::EwCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/frown.rb b/lib/aethyr/core/input_handlers/emotes/frown.rb
index b13a688..eebc648 100644
--- a/lib/aethyr/core/input_handlers/emotes/frown.rb
+++ b/lib/aethyr/core/input_handlers/emotes/frown.rb
@@ -38,7 +38,7 @@ EOF
when /^(frown)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Frown::FrownCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Frown::FrownCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/grin.rb b/lib/aethyr/core/input_handlers/emotes/grin.rb
index eb75817..9e5aadb 100644
--- a/lib/aethyr/core/input_handlers/emotes/grin.rb
+++ b/lib/aethyr/core/input_handlers/emotes/grin.rb
@@ -38,7 +38,7 @@ EOF
when /^(grin)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Grin::GrinCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Grin::GrinCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/hi.rb b/lib/aethyr/core/input_handlers/emotes/hi.rb
index 76c0433..42cd6d4 100644
--- a/lib/aethyr/core/input_handlers/emotes/hi.rb
+++ b/lib/aethyr/core/input_handlers/emotes/hi.rb
@@ -38,7 +38,7 @@ EOF
when /^(hi)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Hi::HiCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Hi::HiCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/hm.rb b/lib/aethyr/core/input_handlers/emotes/hm.rb
index 87c5084..7ffec65 100644
--- a/lib/aethyr/core/input_handlers/emotes/hm.rb
+++ b/lib/aethyr/core/input_handlers/emotes/hm.rb
@@ -38,7 +38,7 @@ EOF
when /^(hm)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Hm::HmCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Hm::HmCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/hug.rb b/lib/aethyr/core/input_handlers/emotes/hug.rb
index 7e12df8..1c0ee96 100644
--- a/lib/aethyr/core/input_handlers/emotes/hug.rb
+++ b/lib/aethyr/core/input_handlers/emotes/hug.rb
@@ -38,7 +38,7 @@ EOF
when /^(hug)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Hug::HugCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Hug::HugCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/huh.rb b/lib/aethyr/core/input_handlers/emotes/huh.rb
index 7a63aa4..67227e2 100644
--- a/lib/aethyr/core/input_handlers/emotes/huh.rb
+++ b/lib/aethyr/core/input_handlers/emotes/huh.rb
@@ -38,7 +38,7 @@ EOF
when /^(huh)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Huh::HuhCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Huh::HuhCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/laugh.rb b/lib/aethyr/core/input_handlers/emotes/laugh.rb
index 6558c1a..2290ca3 100644
--- a/lib/aethyr/core/input_handlers/emotes/laugh.rb
+++ b/lib/aethyr/core/input_handlers/emotes/laugh.rb
@@ -38,7 +38,7 @@ EOF
when /^(laugh)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Laugh::LaughCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Laugh::LaughCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/no.rb b/lib/aethyr/core/input_handlers/emotes/no.rb
index ef4e790..d628ee7 100644
--- a/lib/aethyr/core/input_handlers/emotes/no.rb
+++ b/lib/aethyr/core/input_handlers/emotes/no.rb
@@ -38,7 +38,7 @@ EOF
when /^(no)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::No::NoCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::No::NoCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/nod.rb b/lib/aethyr/core/input_handlers/emotes/nod.rb
index 3afc61e..c534c81 100644
--- a/lib/aethyr/core/input_handlers/emotes/nod.rb
+++ b/lib/aethyr/core/input_handlers/emotes/nod.rb
@@ -38,7 +38,7 @@ EOF
when /^(nod)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Nod::NodCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Nod::NodCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/pet.rb b/lib/aethyr/core/input_handlers/emotes/pet.rb
index 073f392..a25be17 100644
--- a/lib/aethyr/core/input_handlers/emotes/pet.rb
+++ b/lib/aethyr/core/input_handlers/emotes/pet.rb
@@ -38,7 +38,7 @@ EOF
when /^(pet)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Pet::PetCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Pet::PetCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/poke.rb b/lib/aethyr/core/input_handlers/emotes/poke.rb
index 40f6b8c..f144ae6 100644
--- a/lib/aethyr/core/input_handlers/emotes/poke.rb
+++ b/lib/aethyr/core/input_handlers/emotes/poke.rb
@@ -38,7 +38,7 @@ EOF
when /^(poke)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Poke::PokeCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Poke::PokeCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/ponder.rb b/lib/aethyr/core/input_handlers/emotes/ponder.rb
index cf44b9b..e1ad9b6 100644
--- a/lib/aethyr/core/input_handlers/emotes/ponder.rb
+++ b/lib/aethyr/core/input_handlers/emotes/ponder.rb
@@ -38,7 +38,7 @@ EOF
when /^(ponder)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Ponder::PonderCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Ponder::PonderCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/shrug.rb b/lib/aethyr/core/input_handlers/emotes/shrug.rb
index 27ac7f1..7a43c4d 100644
--- a/lib/aethyr/core/input_handlers/emotes/shrug.rb
+++ b/lib/aethyr/core/input_handlers/emotes/shrug.rb
@@ -38,7 +38,7 @@ EOF
when /^(shrug)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Shrug::ShrugCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Shrug::ShrugCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/sigh.rb b/lib/aethyr/core/input_handlers/emotes/sigh.rb
index d59d689..7901d04 100644
--- a/lib/aethyr/core/input_handlers/emotes/sigh.rb
+++ b/lib/aethyr/core/input_handlers/emotes/sigh.rb
@@ -38,7 +38,7 @@ EOF
when /^(sigh)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Sigh::SighCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Sigh::SighCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/skip.rb b/lib/aethyr/core/input_handlers/emotes/skip.rb
index 8ddaf2d..9a2326c 100644
--- a/lib/aethyr/core/input_handlers/emotes/skip.rb
+++ b/lib/aethyr/core/input_handlers/emotes/skip.rb
@@ -38,7 +38,7 @@ EOF
when /^(skip)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Skip::SkipCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Skip::SkipCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/smile.rb b/lib/aethyr/core/input_handlers/emotes/smile.rb
index f833063..60aea06 100644
--- a/lib/aethyr/core/input_handlers/emotes/smile.rb
+++ b/lib/aethyr/core/input_handlers/emotes/smile.rb
@@ -38,7 +38,7 @@ EOF
when /^(smile)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Smile::SmileCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Smile::SmileCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/snicker.rb b/lib/aethyr/core/input_handlers/emotes/snicker.rb
index 773aeae..208a971 100644
--- a/lib/aethyr/core/input_handlers/emotes/snicker.rb
+++ b/lib/aethyr/core/input_handlers/emotes/snicker.rb
@@ -38,7 +38,7 @@ EOF
when /^(snicker)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Snicker::SnickerCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Snicker::SnickerCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/uh.rb b/lib/aethyr/core/input_handlers/emotes/uh.rb
index 67e9651..ddcd18a 100644
--- a/lib/aethyr/core/input_handlers/emotes/uh.rb
+++ b/lib/aethyr/core/input_handlers/emotes/uh.rb
@@ -38,7 +38,7 @@ EOF
when /^(uh)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Uh::UhCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Uh::UhCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/wave.rb b/lib/aethyr/core/input_handlers/emotes/wave.rb
index d6e6208..001381a 100644
--- a/lib/aethyr/core/input_handlers/emotes/wave.rb
+++ b/lib/aethyr/core/input_handlers/emotes/wave.rb
@@ -38,7 +38,7 @@ EOF
when /^(wave)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Wave::WaveCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Wave::WaveCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/yawn.rb b/lib/aethyr/core/input_handlers/emotes/yawn.rb
index 937e481..b25fea9 100644
--- a/lib/aethyr/core/input_handlers/emotes/yawn.rb
+++ b/lib/aethyr/core/input_handlers/emotes/yawn.rb
@@ -38,7 +38,7 @@ EOF
when /^(yawn)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Yawn::YawnCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Yawn::YawnCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/emotes/yes.rb b/lib/aethyr/core/input_handlers/emotes/yes.rb
index cbc4fd4..ca1dd55 100644
--- a/lib/aethyr/core/input_handlers/emotes/yes.rb
+++ b/lib/aethyr/core/input_handlers/emotes/yes.rb
@@ -38,7 +38,7 @@ EOF
when /^(yes)( +([^()]*))?( +((.*)))?$/i
object = $3
post = $5
- $manager.submit_action(Aethyr::Core::Actions::Yes::YesCommand.new(@player, {:object => object, :post => post}))
+ $manager.submit_action(Aethyr::Core::Actions::Yes::YesCommand.new(@player, :object => object, :post => post))
end
end
diff --git a/lib/aethyr/core/input_handlers/feel.rb b/lib/aethyr/core/input_handlers/feel.rb
index 848220a..67d20b8 100644
--- a/lib/aethyr/core/input_handlers/feel.rb
+++ b/lib/aethyr/core/input_handlers/feel.rb
@@ -37,7 +37,7 @@ EOF
super(data)
case data[:input]
when /^(feel)(\s+(.+))?$/i
- $manager.submit_action(Aethyr::Core::Actions::Feel::FeelCommand.new(@player, { :target => $3}))
+ $manager.submit_action(Aethyr::Core::Actions::Feel::FeelCommand.new(@player, :target => $3))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/fill.rb b/lib/aethyr/core/input_handlers/fill.rb
index c160125..6a2ca02 100644
--- a/lib/aethyr/core/input_handlers/fill.rb
+++ b/lib/aethyr/core/input_handlers/fill.rb
@@ -37,7 +37,7 @@ EOF
super(data)
case data[:input]
when /^fill\s+(\w+)\s+from\s+(\w+)$/i
- $manager.submit_action(Aethyr::Core::Actions::Fill::FillCommand.new(@player, { :object => $1, :from => $2}))
+ $manager.submit_action(Aethyr::Core::Actions::Fill::FillCommand.new(@player, :object => $1, :from => $2))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/gait.rb b/lib/aethyr/core/input_handlers/gait.rb
index 76ba348..9115aa8 100644
--- a/lib/aethyr/core/input_handlers/gait.rb
+++ b/lib/aethyr/core/input_handlers/gait.rb
@@ -37,7 +37,7 @@ EOF
case data[:input]
when /^gait(\s+(.*))?$/i
phrase = $2 if $2
- $manager.submit_action(Aethyr::Core::Actions::Gait::GaitCommand.new(@player, {:phrase => phrase}))
+ $manager.submit_action(Aethyr::Core::Actions::Gait::GaitCommand.new(@player, :phrase => phrase))
end
end
diff --git a/lib/aethyr/core/input_handlers/get.rb b/lib/aethyr/core/input_handlers/get.rb
index 27bea9f..418d6da 100644
--- a/lib/aethyr/core/input_handlers/get.rb
+++ b/lib/aethyr/core/input_handlers/get.rb
@@ -37,9 +37,9 @@ EOF
super(data)
case data[:input]
when /^(get|grab|take)\s+((\w+|\s)*)(\s+from\s+(\w+))/i
- $manager.submit_action(Aethyr::Core::Actions::Get::GetCommand.new(@player, { :object => $2.strip, :from => $5 }))
+ $manager.submit_action(Aethyr::Core::Actions::Get::GetCommand.new(@player, :object => $2.strip, :from => $5 ))
when /^(get|grab|take)\s+(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Get::GetCommand.new(@player, { :object => $2.strip }))
+ $manager.submit_action(Aethyr::Core::Actions::Get::GetCommand.new(@player, :object => $2.strip ))
end
end
diff --git a/lib/aethyr/core/input_handlers/give.rb b/lib/aethyr/core/input_handlers/give.rb
index e1c964a..c5574f4 100644
--- a/lib/aethyr/core/input_handlers/give.rb
+++ b/lib/aethyr/core/input_handlers/give.rb
@@ -30,7 +30,7 @@ EOF
def initialize(player)
super(player, ["give"], help_entries: GiveHandler.create_help_entries)
end
-
+
def self.object_added(data)
super(data, self)
end
@@ -39,12 +39,12 @@ EOF
super(data)
case data[:input]
when /^give\s+((\w+\s*)*)\s+to\s+(\w+)/i
- $manager.submit_action(Aethyr::Core::Actions::Give::GiveCommand.new(@player, { :item => $2.strip, :to => $3 }))
+ $manager.submit_action(Aethyr::Core::Actions::Give::GiveCommand.new(@player, :item => $2.strip, :to => $3 ))
end
end
-
+
private
-
+
#Gives an item to someone else.
end
@@ -53,4 +53,4 @@ EOF
end
end
end
-end
\ No newline at end of file
+end
diff --git a/lib/aethyr/core/input_handlers/health.rb b/lib/aethyr/core/input_handlers/health.rb
index fc34dd1..bd322a0 100644
--- a/lib/aethyr/core/input_handlers/health.rb
+++ b/lib/aethyr/core/input_handlers/health.rb
@@ -50,7 +50,7 @@ EOF
super(data)
case data[:input]
when /^(health)$/i
- $manager.submit_action(Aethyr::Core::Actions::Health::HealthCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Health::HealthCommand.new(@player, ))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/inventory.rb b/lib/aethyr/core/input_handlers/inventory.rb
index 739379e..2825589 100644
--- a/lib/aethyr/core/input_handlers/inventory.rb
+++ b/lib/aethyr/core/input_handlers/inventory.rb
@@ -30,7 +30,7 @@ EOF
def initialize(player)
super(player, ["i", "inv", "inventory"], help_entries: InventoryHandler.create_help_entries)
end
-
+
def self.object_added(data)
super(data, self)
end
@@ -39,12 +39,12 @@ EOF
super(data)
case data[:input]
when /^(i|inv|inventory)$/i
- $manager.submit_action(Aethyr::Core::Actions::Inventory::InventoryCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Inventory::InventoryCommand.new(@player, ))
end
end
-
+
private
-
+
#Shows the inventory of the player.
end
@@ -53,4 +53,4 @@ EOF
end
end
end
-end
\ No newline at end of file
+end
diff --git a/lib/aethyr/core/input_handlers/issue.rb b/lib/aethyr/core/input_handlers/issue.rb
index c329065..73c5c9d 100644
--- a/lib/aethyr/core/input_handlers/issue.rb
+++ b/lib/aethyr/core/input_handlers/issue.rb
@@ -49,15 +49,15 @@ EOF
super(data)
case data[:input]
when /^(bug|typo|idea)\s+(\d+)\s+(show|del|add|status)(\s+(.+))?$/i
- $manager.submit_action(Aethyr::Core::Actions::Issue::IssueCommand.new(@player, { :itype => $1.downcase.to_sym, :issue_id => $2, :option => $3.downcase, :value => $5 }))
+ $manager.submit_action(Aethyr::Core::Actions::Issue::IssueCommand.new(@player, :itype => $1.downcase.to_sym, :issue_id => $2, :option => $3.downcase, :value => $5 ))
when /^(bug|typo|idea)\s+(\d+)/i
- $manager.submit_action(Aethyr::Core::Actions::Issue::IssueCommand.new(@player, { :itype => $1.downcase.to_sym, :option => "show", :issue_id => $2 }))
+ $manager.submit_action(Aethyr::Core::Actions::Issue::IssueCommand.new(@player, :itype => $1.downcase.to_sym, :option => "show", :issue_id => $2 ))
when /^(bug|typo|idea)\s+(del|add|show|status)\s+(\d+)(\s+(.+))?/i
- $manager.submit_action(Aethyr::Core::Actions::Issue::IssueCommand.new(@player, { :itype => $1.downcase.to_sym, :option => $2.downcase, :issue_id => $3, :value => $5 }))
+ $manager.submit_action(Aethyr::Core::Actions::Issue::IssueCommand.new(@player, :itype => $1.downcase.to_sym, :option => $2.downcase, :issue_id => $3, :value => $5 ))
when /^(bug|typo|idea)\s+(new|show|del|add|status|list)(\s+(.+))?$/i
- $manager.submit_action(Aethyr::Core::Actions::Issue::IssueCommand.new(@player, { :itype => $1.downcase.to_sym, :option => $2.downcase, :value => $4 }))
+ $manager.submit_action(Aethyr::Core::Actions::Issue::IssueCommand.new(@player, :itype => $1.downcase.to_sym, :option => $2.downcase, :value => $4 ))
when /^(bug|typo|idea)\s+(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Issue::IssueCommand.new(@player, { :itype => $1.downcase.to_sym, :option => "new", :value => $2 }))
+ $manager.submit_action(Aethyr::Core::Actions::Issue::IssueCommand.new(@player, :itype => $1.downcase.to_sym, :option => "new", :value => $2 ))
end
end
diff --git a/lib/aethyr/core/input_handlers/kick.rb b/lib/aethyr/core/input_handlers/kick.rb
index 8efb03c..600310e 100644
--- a/lib/aethyr/core/input_handlers/kick.rb
+++ b/lib/aethyr/core/input_handlers/kick.rb
@@ -36,10 +36,10 @@ EOF
super(data)
case data[:input]
when /^kick$/i
- $manager.submit_action(Aethyr::Core::Actions::Kick::KickCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Kick::KickCommand.new(@player, ))
when /^kick\s+(.*)$/i
target = $1
- $manager.submit_action(Aethyr::Core::Actions::Kick::KickCommand.new(@player, {:target => target}))
+ $manager.submit_action(Aethyr::Core::Actions::Kick::KickCommand.new(@player, :target => target))
end
end
diff --git a/lib/aethyr/core/input_handlers/listen.rb b/lib/aethyr/core/input_handlers/listen.rb
index cc204ec..4ff228a 100644
--- a/lib/aethyr/core/input_handlers/listen.rb
+++ b/lib/aethyr/core/input_handlers/listen.rb
@@ -37,7 +37,7 @@ EOF
super(data)
case data[:input]
when /^(listen)(\s+(.+))?$/i
- $manager.submit_action(Aethyr::Core::Actions::Listen::ListenCommand.new(@player, { :target => $3}))
+ $manager.submit_action(Aethyr::Core::Actions::Listen::ListenCommand.new(@player, :target => $3))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/locking.rb b/lib/aethyr/core/input_handlers/locking.rb
index 0f2a992..3a27390 100644
--- a/lib/aethyr/core/input_handlers/locking.rb
+++ b/lib/aethyr/core/input_handlers/locking.rb
@@ -40,9 +40,9 @@ EOF
super(data)
case data[:input]
when /^lock\s+(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Lock::LockCommand.new(@player, { :object => $1 }))
+ $manager.submit_action(Aethyr::Core::Actions::Lock::LockCommand.new(@player, :object => $1 ))
when /^unlock\s+(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Unlock::UnlockCommand.new(@player, { :object => $1 }))
+ $manager.submit_action(Aethyr::Core::Actions::Unlock::UnlockCommand.new(@player, :object => $1 ))
end
end
@@ -50,9 +50,9 @@ EOF
end
-
+
Aethyr::Extend::HandlerRegistry.register_handler(LockingHandler)
end
end
end
-end
\ No newline at end of file
+end
diff --git a/lib/aethyr/core/input_handlers/look.rb b/lib/aethyr/core/input_handlers/look.rb
index d6bc9db..2e5feec 100644
--- a/lib/aethyr/core/input_handlers/look.rb
+++ b/lib/aethyr/core/input_handlers/look.rb
@@ -42,11 +42,11 @@ EOF
super(data)
case data[:input]
when /^(l|look)$/i
- $manager.submit_action(Aethyr::Core::Actions::Look::LookCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Look::LookCommand.new(@player, ))
when /^(l|look)\s+(in|inside)\s+(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Look::LookCommand.new(@player, { :in => $3 }))
+ $manager.submit_action(Aethyr::Core::Actions::Look::LookCommand.new(@player, :in => $3 ))
when /^(l|look)\s+(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Look::LookCommand.new(@player, { :at => $2 }))
+ $manager.submit_action(Aethyr::Core::Actions::Look::LookCommand.new(@player, :at => $2 ))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/map.rb b/lib/aethyr/core/input_handlers/map.rb
index daf9d54..0d0b61f 100644
--- a/lib/aethyr/core/input_handlers/map.rb
+++ b/lib/aethyr/core/input_handlers/map.rb
@@ -36,7 +36,7 @@ EOF
super(data)
case data[:input]
when /^(m|map)$/i
- $manager.submit_action(Aethyr::Core::Actions::Map::MapCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Map::MapCommand.new(@player, ))
end
end
diff --git a/lib/aethyr/core/input_handlers/more.rb b/lib/aethyr/core/input_handlers/more.rb
index 73bec9e..9cccf99 100644
--- a/lib/aethyr/core/input_handlers/more.rb
+++ b/lib/aethyr/core/input_handlers/more.rb
@@ -34,15 +34,15 @@ EOF
def self.object_added(data)
super(data, self)
end
-
+
def player_input(data)
super(data)
case data[:input]
when /^more/i
- $manager.submit_action(Aethyr::Core::Actions::More::MoreCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::More::MoreCommand.new(@player, ))
end
end
-
+
private
end
diff --git a/lib/aethyr/core/input_handlers/move.rb b/lib/aethyr/core/input_handlers/move.rb
index bcf66dd..a7b6622 100644
--- a/lib/aethyr/core/input_handlers/move.rb
+++ b/lib/aethyr/core/input_handlers/move.rb
@@ -47,9 +47,9 @@ EOF
super(data)
case data[:input]
when /^go\s+(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Move::MoveCommand.new(@player, {:direction => $1.downcase}))
+ $manager.submit_action(Aethyr::Core::Actions::Move::MoveCommand.new(@player, :direction => $1.downcase))
when /^(east|west|northeast|northwest|north|southeast|southwest|south|e|w|nw|ne|sw|se|n|s|up|down|u|d|in|out)(\s+\((.*)\))?$/i
- $manager.submit_action(Aethyr::Core::Actions::Move::MoveCommand.new(@player, {:direction => expand_direction($1), :pre => $3}))
+ $manager.submit_action(Aethyr::Core::Actions::Move::MoveCommand.new(@player, :direction => expand_direction($1), :pre => $3))
end
end
diff --git a/lib/aethyr/core/input_handlers/news.rb b/lib/aethyr/core/input_handlers/news.rb
index e350a14..76928c9 100644
--- a/lib/aethyr/core/input_handlers/news.rb
+++ b/lib/aethyr/core/input_handlers/news.rb
@@ -68,25 +68,25 @@ EOF
super(data)
case data[:input]
when "news"
- $manager.submit_action(Aethyr::Core::Actions::LatestNews::LatestNewsCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::LatestNews::LatestNewsCommand.new(@player, ))
when /^news\s+(read\s+)?(\d+)$/i
post_id = $2
- $manager.submit_action(Aethyr::Core::Actions::ReadPost::ReadPostCommand.new(@player, {:post_id => post_id}))
+ $manager.submit_action(Aethyr::Core::Actions::ReadPost::ReadPostCommand.new(@player, :post_id => post_id))
when /^news\s+reply(\s+to\s+)?\s+(\d+)$/i
reply_to = $2
- $manager.submit_action(Aethyr::Core::Actions::WritePost::WritePostCommand.new(@player, {:reply_to => reply_to}))
+ $manager.submit_action(Aethyr::Core::Actions::WritePost::WritePostCommand.new(@player, :reply_to => reply_to))
when /^news\s+unread/i
- $manager.submit_action(Aethyr::Core::Actions::ListUnread::ListUnreadCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::ListUnread::ListUnreadCommand.new(@player, ))
when /^news\s+last\s+(\d+)/i
limit = $1.to_i
- $manager.submit_action(Aethyr::Core::Actions::LatestNews::LatestNewsCommand.new(@player, {:limit => limit}))
+ $manager.submit_action(Aethyr::Core::Actions::LatestNews::LatestNewsCommand.new(@player, :limit => limit))
when /^news\s+delete\s+(\d+)/i
post_id = $1
- $manager.submit_action(Aethyr::Core::Actions::DeletePost::DeletePostCommand.new(@player, {:post_id => post_id}))
+ $manager.submit_action(Aethyr::Core::Actions::DeletePost::DeletePostCommand.new(@player, :post_id => post_id))
when /^news\s+write$/i
- $manager.submit_action(Aethyr::Core::Actions::WritePost::WritePostCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::WritePost::WritePostCommand.new(@player, ))
when /^news\s+all/i
- $manager.submit_action(Aethyr::Core::Actions::All::AllCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::All::AllCommand.new(@player, ))
end
end
diff --git a/lib/aethyr/core/input_handlers/open.rb b/lib/aethyr/core/input_handlers/open.rb
index db71a41..7fb6ca6 100644
--- a/lib/aethyr/core/input_handlers/open.rb
+++ b/lib/aethyr/core/input_handlers/open.rb
@@ -46,7 +46,7 @@ EOF
super(data)
case data[:input]
when /^open\s+(\w+)$/i
- $manager.submit_action(Aethyr::Core::Actions::Open::OpenCommand.new(@player, { :object => $1 }))
+ $manager.submit_action(Aethyr::Core::Actions::Open::OpenCommand.new(@player, :object => $1 ))
end
end
diff --git a/lib/aethyr/core/input_handlers/portal.rb b/lib/aethyr/core/input_handlers/portal.rb
index a935b9a..d942a7e 100644
--- a/lib/aethyr/core/input_handlers/portal.rb
+++ b/lib/aethyr/core/input_handlers/portal.rb
@@ -39,7 +39,7 @@ EOF
object = $1
setting = $2.downcase
value = $3.strip
- $manager.submit_action(Aethyr::Core::Actions::Portal::PortalCommand.new(@player, {:object => object, :setting => setting, :value => value}))
+ $manager.submit_action(Aethyr::Core::Actions::Portal::PortalCommand.new(@player, :object => object, :setting => setting, :value => value))
end
end
diff --git a/lib/aethyr/core/input_handlers/pose.rb b/lib/aethyr/core/input_handlers/pose.rb
index de0e113..19aa5e5 100644
--- a/lib/aethyr/core/input_handlers/pose.rb
+++ b/lib/aethyr/core/input_handlers/pose.rb
@@ -37,7 +37,7 @@ EOF
case data[:input]
when /^pose\s+(.*)$/i
pose = $1.strip
- $manager.submit_action(Aethyr::Core::Actions::Pose::PoseCommand.new(@player, {:pose => pose}))
+ $manager.submit_action(Aethyr::Core::Actions::Pose::PoseCommand.new(@player, :pose => pose))
end
end
diff --git a/lib/aethyr/core/input_handlers/punch.rb b/lib/aethyr/core/input_handlers/punch.rb
index b9f4d99..e047b64 100644
--- a/lib/aethyr/core/input_handlers/punch.rb
+++ b/lib/aethyr/core/input_handlers/punch.rb
@@ -36,10 +36,10 @@ EOF
super(data)
case data[:input]
when /^punch$/i
- $manager.submit_action(Aethyr::Core::Actions::Punch::PunchCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Punch::PunchCommand.new(@player, ))
when /^punch\s+(.*)$/i
target = $1
- $manager.submit_action(Aethyr::Core::Actions::Punch::PunchCommand.new(@player, {:target => target}))
+ $manager.submit_action(Aethyr::Core::Actions::Punch::PunchCommand.new(@player, :target => target))
end
end
diff --git a/lib/aethyr/core/input_handlers/put.rb b/lib/aethyr/core/input_handlers/put.rb
index f58fb04..29c8a7b 100644
--- a/lib/aethyr/core/input_handlers/put.rb
+++ b/lib/aethyr/core/input_handlers/put.rb
@@ -37,7 +37,7 @@ EOF
super(data)
case data[:input]
when /^put((\s+(\d+)\s+)|\s+)(\w+)\s+in\s+(\w+)$/i
- $manager.submit_action(Aethyr::Core::Actions::Put::PutCommand.new(@player, { :item => $4, :count => $3.to_i, :container => $5 }))
+ $manager.submit_action(Aethyr::Core::Actions::Put::PutCommand.new(@player, :item => $4, :count => $3.to_i, :container => $5 ))
end
end
diff --git a/lib/aethyr/core/input_handlers/quit.rb b/lib/aethyr/core/input_handlers/quit.rb
index cf2e25f..f483be6 100644
--- a/lib/aethyr/core/input_handlers/quit.rb
+++ b/lib/aethyr/core/input_handlers/quit.rb
@@ -30,7 +30,7 @@ EOF
def initialize(player)
super(player, ["quit"], help_entries: QuitHandler.create_help_entries)
end
-
+
def self.object_added(data)
super(data, self)
end
@@ -38,12 +38,12 @@ EOF
def player_input(data)
case data[:input]
when /^quit$/i
- $manager.submit_action(Aethyr::Core::Actions::Quit::QuitCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Quit::QuitCommand.new(@player, ))
end
end
-
+
private
-
+
end
@@ -51,4 +51,4 @@ EOF
end
end
end
-end
\ No newline at end of file
+end
diff --git a/lib/aethyr/core/input_handlers/remove.rb b/lib/aethyr/core/input_handlers/remove.rb
index 3a65d45..cb778c2 100644
--- a/lib/aethyr/core/input_handlers/remove.rb
+++ b/lib/aethyr/core/input_handlers/remove.rb
@@ -39,7 +39,7 @@ EOF
when /^remove\s+(\w+)(\s+from\s+(.*))?$/i
object = $1
position = $3
- $manager.submit_action(Aethyr::Core::Actions::Remove::RemoveCommand.new(@player, {:object => object, :position => position}))
+ $manager.submit_action(Aethyr::Core::Actions::Remove::RemoveCommand.new(@player, :object => object, :position => position))
end
end
diff --git a/lib/aethyr/core/input_handlers/satiety.rb b/lib/aethyr/core/input_handlers/satiety.rb
index d65b2c9..bcf4dac 100644
--- a/lib/aethyr/core/input_handlers/satiety.rb
+++ b/lib/aethyr/core/input_handlers/satiety.rb
@@ -53,7 +53,7 @@ EOF
super(data)
case data[:input]
when /^(satiety|hunger)$/i
- $manager.submit_action(Aethyr::Core::Actions::Satiety::SatietyCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Satiety::SatietyCommand.new(@player, ))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/say.rb b/lib/aethyr/core/input_handlers/say.rb
index e65ba73..2193723 100644
--- a/lib/aethyr/core/input_handlers/say.rb
+++ b/lib/aethyr/core/input_handlers/say.rb
@@ -71,9 +71,9 @@ EOF
super(data)
case data[:input]
when /^say\s+(\((.*?)\)\s*)?(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Say::SayCommand.new(@player, { :phrase => $3, :pre => $2 }))
+ $manager.submit_action(Aethyr::Core::Actions::Say::SayCommand.new(@player, :phrase => $3, :pre => $2 ))
when /^sayto\s+(\w+)\s+(\((.*?)\)\s*)?(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Say::SayCommand.new(@player, {:target => $1, :phrase => $4, :pre => $3 }))
+ $manager.submit_action(Aethyr::Core::Actions::Say::SayCommand.new(@player, :target => $1, :phrase => $4, :pre => $3 ))
end
end
diff --git a/lib/aethyr/core/input_handlers/set.rb b/lib/aethyr/core/input_handlers/set.rb
index d1095ea..9d3f531 100644
--- a/lib/aethyr/core/input_handlers/set.rb
+++ b/lib/aethyr/core/input_handlers/set.rb
@@ -52,19 +52,19 @@ EOF
case data[:input]
when /^set\s+colors?\s+(on|off|default)$/i
option = $1
- $manager.submit_action(Aethyr::Core::Actions::Setcolor::SetcolorCommand.new(@player, {:option => option}))
+ $manager.submit_action(Aethyr::Core::Actions::Setcolor::SetcolorCommand.new(@player, :option => option))
when /^set\s+colors?.*/i
- $manager.submit_action(Aethyr::Core::Actions::Showcolors::ShowcolorsCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Showcolors::ShowcolorsCommand.new(@player, ))
when /^set\s+colors?\s+(\w+)\s+(.+)$/i
option = $1
color = $2
- $manager.submit_action(Aethyr::Core::Actions::Setcolor::SetcolorCommand.new(@player, {:option => option, :color => color}))
+ $manager.submit_action(Aethyr::Core::Actions::Setcolor::SetcolorCommand.new(@player, :option => option, :color => color))
when /^set\s+password$/i
- $manager.submit_action(Aethyr::Core::Actions::Setpassword::SetpasswordCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Setpassword::SetpasswordCommand.new(@player, ))
when /^set\s+(\w+)\s*(.*)$/i
setting = $1.strip
value = $2.strip if $2
- $manager.submit_action(Aethyr::Core::Actions::Set::SetCommand.new(@player, {:setting => setting, :value => value}))
+ $manager.submit_action(Aethyr::Core::Actions::Set::SetCommand.new(@player, :setting => setting, :value => value))
end
end
diff --git a/lib/aethyr/core/input_handlers/sit.rb b/lib/aethyr/core/input_handlers/sit.rb
index f8912e7..23296fa 100644
--- a/lib/aethyr/core/input_handlers/sit.rb
+++ b/lib/aethyr/core/input_handlers/sit.rb
@@ -44,7 +44,7 @@ EOF
case data[:input]
when /^sit\s+on\s+(.*)$/i, /^sit\s+(.*)$/i, /^sit$/i
object = $1.strip if $1
- $manager.submit_action(Aethyr::Core::Actions::Sit::SitCommand.new(@player, {:object => object}))
+ $manager.submit_action(Aethyr::Core::Actions::Sit::SitCommand.new(@player, :object => object))
end
end
diff --git a/lib/aethyr/core/input_handlers/skills.rb b/lib/aethyr/core/input_handlers/skills.rb
index a6a23e8..3b073f6 100644
--- a/lib/aethyr/core/input_handlers/skills.rb
+++ b/lib/aethyr/core/input_handlers/skills.rb
@@ -38,7 +38,7 @@ EOF
super(data)
case data[:input]
when /^skills$/i
- $manager.submit_action(Aethyr::Core::Actions::Skills::SkillsCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Skills::SkillsCommand.new(@player, ))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/slash.rb b/lib/aethyr/core/input_handlers/slash.rb
index df0862a..3493f8a 100644
--- a/lib/aethyr/core/input_handlers/slash.rb
+++ b/lib/aethyr/core/input_handlers/slash.rb
@@ -36,10 +36,10 @@ EOF
super(data)
case data[:input]
when /^slash$/i
- $manager.submit_action(Aethyr::Core::Actions::Slash::SlashCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Slash::SlashCommand.new(@player, ))
when /^slash\s+(.*)$/i
target = $1
- $manager.submit_action(Aethyr::Core::Actions::Slash::SlashCommand.new(@player, {:target => target}))
+ $manager.submit_action(Aethyr::Core::Actions::Slash::SlashCommand.new(@player, :target => target))
end
end
diff --git a/lib/aethyr/core/input_handlers/smell.rb b/lib/aethyr/core/input_handlers/smell.rb
index 029961d..881a796 100644
--- a/lib/aethyr/core/input_handlers/smell.rb
+++ b/lib/aethyr/core/input_handlers/smell.rb
@@ -37,7 +37,7 @@ EOF
super(data)
case data[:input]
when /^(smell|sniff)(\s+(.+))?$/i
- $manager.submit_action(Aethyr::Core::Actions::Smell::SmellCommand.new(@player, { :target => $3}))
+ $manager.submit_action(Aethyr::Core::Actions::Smell::SmellCommand.new(@player, :target => $3))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/stand.rb b/lib/aethyr/core/input_handlers/stand.rb
index 963178d..effd463 100644
--- a/lib/aethyr/core/input_handlers/stand.rb
+++ b/lib/aethyr/core/input_handlers/stand.rb
@@ -37,7 +37,7 @@ EOF
super(data)
case data[:input]
when /^stand$/i
- $manager.submit_action(Aethyr::Core::Actions::Stand::StandCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Stand::StandCommand.new(@player, ))
end
end
diff --git a/lib/aethyr/core/input_handlers/status.rb b/lib/aethyr/core/input_handlers/status.rb
index 5ec4ba5..9bced72 100644
--- a/lib/aethyr/core/input_handlers/status.rb
+++ b/lib/aethyr/core/input_handlers/status.rb
@@ -37,7 +37,7 @@ EOF
super(data)
case data[:input]
when /^(st|stat|status)$/i
- $manager.submit_action(Aethyr::Core::Actions::Status::StatusCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Status::StatusCommand.new(@player, ))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/taste.rb b/lib/aethyr/core/input_handlers/taste.rb
index f02037c..b4ba347 100644
--- a/lib/aethyr/core/input_handlers/taste.rb
+++ b/lib/aethyr/core/input_handlers/taste.rb
@@ -37,7 +37,7 @@ EOF
super(data)
case data[:input]
when /^(taste|lick)(\s+(.+))?$/i
- $manager.submit_action(Aethyr::Core::Actions::Taste::TasteCommand.new(@player, { :target => $3}))
+ $manager.submit_action(Aethyr::Core::Actions::Taste::TasteCommand.new(@player, :target => $3))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/tell.rb b/lib/aethyr/core/input_handlers/tell.rb
index 807c901..ce7e16c 100644
--- a/lib/aethyr/core/input_handlers/tell.rb
+++ b/lib/aethyr/core/input_handlers/tell.rb
@@ -53,9 +53,9 @@ EOF
super(data)
case data[:input]
when /^tell\s+(\w+)\s+(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Tell::TellCommand.new(@player, {:target => $1, :message => $2 }))
+ $manager.submit_action(Aethyr::Core::Actions::Tell::TellCommand.new(@player, :target => $1, :message => $2 ))
when /^reply\s+(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Reply::ReplyCommand.new(@player, {:message => $1 }))
+ $manager.submit_action(Aethyr::Core::Actions::Reply::ReplyCommand.new(@player, :message => $1 ))
end
end
diff --git a/lib/aethyr/core/input_handlers/time.rb b/lib/aethyr/core/input_handlers/time.rb
index a64ef74..93161b7 100644
--- a/lib/aethyr/core/input_handlers/time.rb
+++ b/lib/aethyr/core/input_handlers/time.rb
@@ -39,7 +39,7 @@ EOF
super(data)
case data[:input]
when /^time$/i
- $manager.submit_action(Aethyr::Core::Actions::Time::TimeCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Time::TimeCommand.new(@player, ))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/unwield.rb b/lib/aethyr/core/input_handlers/unwield.rb
index 334e635..ed8d5d4 100644
--- a/lib/aethyr/core/input_handlers/unwield.rb
+++ b/lib/aethyr/core/input_handlers/unwield.rb
@@ -43,7 +43,7 @@ EOF
case data[:input]
when /^unwield(\s+(.*))?$/i
weapon = $2
- $manager.submit_action(Aethyr::Core::Actions::Unwield::UnwieldCommand.new(@player, {:weapon => weapon}))
+ $manager.submit_action(Aethyr::Core::Actions::Unwield::UnwieldCommand.new(@player, :weapon => weapon))
end
end
diff --git a/lib/aethyr/core/input_handlers/wear.rb b/lib/aethyr/core/input_handlers/wear.rb
index 7bec97e..ec5892f 100644
--- a/lib/aethyr/core/input_handlers/wear.rb
+++ b/lib/aethyr/core/input_handlers/wear.rb
@@ -41,7 +41,7 @@ EOF
when /^wear\s+(\w+)(\s+on\s+(.*))?$/i
object = $1
position = $3
- $manager.submit_action(Aethyr::Core::Actions::Wear::WearCommand.new(@player, {:object => object, :position => position}))
+ $manager.submit_action(Aethyr::Core::Actions::Wear::WearCommand.new(@player, :object => object, :position => position))
end
end
diff --git a/lib/aethyr/core/input_handlers/whereis.rb b/lib/aethyr/core/input_handlers/whereis.rb
index fb783be..99b3218 100644
--- a/lib/aethyr/core/input_handlers/whereis.rb
+++ b/lib/aethyr/core/input_handlers/whereis.rb
@@ -37,7 +37,7 @@ EOF
case data[:input]
when /^whereis\s(.*)$/
object = $1
- $manager.submit_action(Aethyr::Core::Actions::Whereis::WhereisCommand.new(@player, {:object => object}))
+ $manager.submit_action(Aethyr::Core::Actions::Whereis::WhereisCommand.new(@player, :object => object))
end
end
diff --git a/lib/aethyr/core/input_handlers/whisper.rb b/lib/aethyr/core/input_handlers/whisper.rb
index 063e17e..123f822 100644
--- a/lib/aethyr/core/input_handlers/whisper.rb
+++ b/lib/aethyr/core/input_handlers/whisper.rb
@@ -45,7 +45,7 @@ EOF
super(data)
case data[:input]
when /^whisper\s+(\w+)\s+(\((.*?)\)\s*)?(.*)$/i
- $manager.submit_action(Aethyr::Core::Actions::Whisper::WhisperCommand.new(@player, { :to => $1, :phrase => $4, :pre => $3 }))
+ $manager.submit_action(Aethyr::Core::Actions::Whisper::WhisperCommand.new(@player, :to => $1, :phrase => $4, :pre => $3 ))
end
end
diff --git a/lib/aethyr/core/input_handlers/who.rb b/lib/aethyr/core/input_handlers/who.rb
index e7e028f..7b3c198 100644
--- a/lib/aethyr/core/input_handlers/who.rb
+++ b/lib/aethyr/core/input_handlers/who.rb
@@ -37,7 +37,7 @@ EOF
super(data)
case data[:input]
when /^who$/i
- $manager.submit_action(Aethyr::Core::Actions::Who::WhoCommand.new(@player, {}))
+ $manager.submit_action(Aethyr::Core::Actions::Who::WhoCommand.new(@player, ))
end
end
end
diff --git a/lib/aethyr/core/input_handlers/wield.rb b/lib/aethyr/core/input_handlers/wield.rb
index 78f370e..93901d4 100644
--- a/lib/aethyr/core/input_handlers/wield.rb
+++ b/lib/aethyr/core/input_handlers/wield.rb
@@ -45,7 +45,7 @@ EOF
when /^wield\s+(.*?)(\s+(\w+))?$/i
weapon = $1
side = $3
- $manager.submit_action(Aethyr::Core::Actions::Wield::WieldCommand.new(@player, {:weapon => weapon, :side => side}))
+ $manager.submit_action(Aethyr::Core::Actions::Wield::WieldCommand.new(@player, :weapon => weapon, :side => side))
end
end
diff --git a/lib/aethyr/core/input_handlers/write.rb b/lib/aethyr/core/input_handlers/write.rb
index afde91d..9c65d3d 100644
--- a/lib/aethyr/core/input_handlers/write.rb
+++ b/lib/aethyr/core/input_handlers/write.rb
@@ -36,7 +36,7 @@ EOF
super(data)
case data[:input]
when /^write\s+(.*)/i
- $manager.submit_action(Aethyr::Core::Actions::Write::WriteCommand.new(@player, { :target => $1.strip}))
+ $manager.submit_action(Aethyr::Core::Actions::Write::WriteCommand.new(@player, :target => $1.strip))
end
end
end
--
GitLab