diff --git a/lib/aethyr/core/actions/action.rb b/lib/aethyr/core/actions/action.rb
index df067fab4b3cde2c11cdb0693aab2afbaad815b8..16acab1fcdb75c55fb70d2e2963e651f8304fbeb 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 789a7b01dbddcc056819a6f33bbaa378db275202..47f1b80d2357a6dc4710b00745fca6267e3846ac 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 4c81d82dd538454ce10d9840f896f75c00bb47ab..d9dd6d7684c36a9e4162ce444eaaff96d8afa51a 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 014fd6f17bec3aac50474aedd18fb2312afd773a..b6ae0ba08a2d61285970509cd236a7f153f732b4 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 86c9437e75599c21d7ed8474aa4bafba8cd73244..41a999485c5cbf1569625fc371e18e047dda18eb 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 77602537dfbcddf87e0968c15791bd97bdd9a4bc..41a5304f88cb75d5902843540199b5a7cab077bc 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 a4caa0151a4afd0931914de6dc3d9f03ce59aed3..72b405cebf5aa5b42dff27438d1d59106cf2b53b 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 530aa196c66db31949e11a41c54d4bc7aaa0df74..1af214c8f7a062f73072549a3f3db8a042b13ff0 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 13875028595bc6a98921a0076c01d0014da6f2d1..7cb99a2310048f1922e0b1aa343f607c9937f036 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 f94bab925eeb393a6d3fb88c81f62eb93e6d02da..5922a8e5e7de43486f1676e46b7b5a339bcad64b 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 99781b6a573005811b1eb849eb2a28c1baa428db..95555bf2698d91fa62d918d50b696a7344a9dc3d 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 40eb1a20f0067b72b8c44125228ebe670475a208..ab897db619cd0afa8cfc76ecf7c7bbc91b1eeed9 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 0220da6abc780aab0f5358233d815a4378db66a2..335eeab4e6fe19b219b4ceb7e0d3e2548240ae6e 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 4e73fab5507d9eb1792b3f8e9b5e12e765dafbb2..1c3b4766bb4728cd6b742ec661b48084760f4e74 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 a5ad5da83ee063d544f1d754db6b903a444d3514..8b8a003c7ad1aeb208dbfa61862ec0acbd366386 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 2be30404068e9ef489e86d5f046e4d59f418a434..ab11d89087745f65899842a158e3979f18ec1187 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 1a2831ce45caffe1943a0060f8f0f12b6b2d3b5b..141246ebb1a2bb90d98d4bb2decf07d110c5bdb7 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 6214170702c7a3969cc7aa05cda3269dcb723f43..d8669e4cddc33de9e0e2bf6f14df453134fac69e 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 f1b03d224a310c225a8b95ece210c2c8cebd851a..ea9e99bad4e4dc90196ffed35073fb9f0af15fde 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 cfbd20d13017daa2d9731a6768b445364a5c8787..c000e04f0cb7337cf5c81dab94d9313e06da1312 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 5ac6900e0a0523995744870a1721cf0af187fd0f..372fcb39c5f4d8e67cbfc0d1135f5eb4f0bf551c 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 3877f7108ae395d1eb7ed3ab926cd4783251ad95..13116ad5c3eb19974067534931c7eaabd33f0ecc 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 db726fc1f1f792bb2cccd76d749cf0f05c74547d..c54697c73df75e88ae31aa7a09f992d2c102d675 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 1a8b57d56e5240513e3e0eba78c661a1834f06ff..4095f4d926df4717646598ba28bfe0526141678e 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 b320ed3b0e2974f59443ff1adc3c2fc4a97eeecf..a742f58e3fa8c3b42ffe5c0c62467484e961f448 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 b3949165ec9b0f3b696f4e9a907970b0fb86da89..a91a4dc964ddcb4ad88dd38ac80156cd4ed82b42 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 5fe068ed2ae629316744d142600f598e3bdd1148..6470c2df9a03557f4b5247763570d485e1efa4ea 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 bdc3e8f4d2b210b16ace9b12efc014e54de429e3..5be03b321910463b96bd6cf49ac1c4c40bc00e50 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 a02b6b88e482109737897351d6474ace40e0e4be..8f9528ca15327a27d50b1df65e9c75a481ec786e 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 2464bd1e9506cffbae00f7b3840c46b27b8a9cfe..679350f65c312e515ac402da74a90873b18eea0f 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 08c0693a710243d89736e3d607aa7b884d315705..a4e795e7498f593923ce8534660d1d7349c00793 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 705fb7e3d71b4a10ce4988032b2b08fedfa5951c..3bf4186b2c63743e0783b5983ceff877eeb4c602 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 3c7578f7479ce6ff6265554536d74b814249995c..d9f850b812df4b56b41473a011e87435dc0edf73 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 c9592a0f5db99de833df6709c57a04f6169cefae..a9c4e13e2214d5a6b693d516c3cdbbe509d7cc6d 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 3a944fa8d244a464c1a2d035aedb1d97f7a8bf42..2e2e50dcbf775defac7284e91e052548b5da8964 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 07656ae6a301af7859d74456cf95136514f85da8..24b534244f8cf2250a01e0447404200da96eb375 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 8f36778b44b810575258fcc261ad1dd4762976f0..6cb2e23f437480a2ac3147a51fe973a820241360 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 5656b572d845a723c0fc04422911a2e730ec0629..ff248d89c982c4d10fd969f6b826c405dd0c3e76 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 2e8507f6f808329da68883174872f1015955556f..8626f4ddee6893bdaf5a629bad1fba4e38ecca40 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 6e18a7bf66e8dff374ebd163e0c7b6284da55aff..fd268d571d22abab792f5dced573b076c27d326f 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 702b41233783c1bbfe2e28fdd2d59537e76dcf47..f1ffad0a838a8810f28f18f14cc7b745156b4e67 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 00e82b1ef0d011cd37c05334de2172ff066353b6..217e370cce89f49f829868c5d4e96fc71915866b 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 3686787a9db567d1f5d2fdcc96266c118c64f0e7..9818a91271626f8983a51ac46032f6231f1910c6 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 83cc9ff4b52f13ca43e8b9537661d6ef46a092a6..b661251b688f070106b6def9167656c5327efc1d 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 8da2217c8b3aae1d654d7264c65cd10a57fb832d..2757c61e93b65bc719c00914feb421fb392af492 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 fc5224525dbfb7a20c05ea304249c914cf089504..98e0bd5e18d621e58c6caa9a6a440473fa098440 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 bb32281c98ca9f6ed1d0726f4da7a52911c034e5..6a875fe522850fb16065c90427c4e46e3c579286 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 d3641a4b3984efb2bf7b291768b88b59295006e2..2a5cb2a682d23df4c156059d776f810bad324a38 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 a115bb08e19a027094feaaab81e8dbc57067ab62..53de2acd040de7ae8e15fbb2c888efcd790deb30 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 fd968c6abe4ac695eabbb1e09b2a81ffb3db35bb..71c8cd222e1f3c99da977dce90d578a49a007187 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 1538d607e99d581983e95f75fee952404f7e6974..6718d36c62cfe8678904648250e747119f11d7bb 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 7c421a1306b9f8d70337f17cc89f1840a9e219c9..ead9807d60a5ce8df4c74a532b20d0d11a1491cb 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 e300061f0c0ea434847c719fb097edfc5e5caab0..6a9530bf1f05743274ba447623283466406e0af0 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 01d86808766fe4c46ae94a30e9a789def6aaba51..7259c589a4f603ae8ccf83f623c84ec333dbae4b 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 b13a68806f6f8a13266d801f986607ba424f9f2b..eebc648461e970e94aa3955ceb22054869accf5a 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 eb75817c54e75eda75a6c8ae8cd19987c0b45c5b..9e5aadbec2bf0f30fff293e7f4f0e887d734ef39 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 76c0433bc317e77cf13c5d3f0d6918d499b95e23..42cd6d425a1bedad14e358c6e8547a74e6b3f9d6 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 87c508403beea4a11477d47bd1d498ee8927cfcb..7ffec65a36949cf4ab63ec97a6d3f735e9be3d70 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 7e12df8aa63935b0c589fc0eefe30b50b96fca06..1c0ee967dcbbf90cb0f6baf73c88c529f318fc87 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 7a63aa49fc3e8f6df40e58a84f502959b50bdf86..67227e24d0510654e3cdee2431acb2f8006d857b 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 6558c1ac54318e4dc89434600c3fae02dd3759d2..2290ca3224d3cf5f363c019d3f075b5c0ad366ab 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 ef4e7909fedec3abf1c11df9e8410ca5bd675baa..d628ee725d478872c98a4a5555b5746004246395 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 3afc61ee6bd32f9d4f887ed4290e32071c3ba183..c534c81b4220408a58187b463835e263efad13ea 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 073f3921ba475a57e83634901d688b8211a24ca2..a25be17498d8374e907295afd6a6125b20effd61 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 40f6b8c667bcf7589ad774249997282f4ad4a808..f144ae6285d8e8ee3feb0f494ac79b9b54bfe906 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 cf44b9b9c751eeb7a0b7401e991d4e1cae0f0347..e1ad9b64d5bd136c7fe68402b9430b3aa44c87bf 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 27ac7f191e600741a3305298e6791812d24c69dc..7a43c4dd401824c2a8ae271066a20d608a85c9b6 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 d59d68916fb43765a14a2b574dfb7740a721ca1f..7901d0403efb30fe746f024d1ba1058536e33c8b 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 8ddaf2d1c18f1a56e571d6f3445ae0c76382ef98..9a2326c2cc45580c55bb1420cd336f7dfe277663 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 f8330636945713b7c8e669d23b95c15629435193..60aea061df4bb00018eaeb778f6bc5da621a4ea8 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 773aeae5e47b1d05317605928ef135244decec79..208a971a820875bc9b7ef8146c0749dc900c6476 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 67e9651c9abb4c4eea6bd3570618cfb603c9d002..ddcd18adfd29e1751ed24b0e7efc6c25421756c1 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 d6e62083f9cbf6a3583e84bc01ad71eefd46d1d7..001381a15560e92440cc6acdc6ac850b8f8e9968 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 937e4816e4ed46106b87003d12aace75a38acc7e..b25fea9cce867e7167b0705225023e5f06e68da2 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 cbc4fd458f597b9398f3513aea1b0e02596f3612..ca1dd554aabe8d23aadd0d643de2bfa1c9ba153a 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 848220a65d9eb56943e65a9fc1dc6d16ca2a3af1..67d20b84cdb5f7a6f0449ffdff3b6fdbe4f25064 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 c160125c8ce13d0e2bce551bd6f1756b3c2b24b3..6a2ca02bf47c8dd1fc0e359d1b105db7144f36b0 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 76ba34801d4e753706f872299c15bd4443a8cefb..9115aa84f0cfa303b1a653eefdabf40294d73383 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 27bea9f44b5368dd39633442f270dc84b07b2ff1..418d6da834d2e5a775cd39db946d212f6497498c 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 e1c964a97550db1b90145f1a3d3f13fb819b0915..c5574f4534eb69db85f21e1a2049b44fd3b28e9f 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 fc34dd1848b1ad9ba2ef8a8d4bc9e985de181859..bd322a0380f1cbd90bf84b53a4ae7dcb65e9d710 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 739379e295466c20c5afe8e3a8e7368d4cb94ef3..282558936ecd586a4f3309adb3faa89aa9958320 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 c3290652a8a5a5dcc4d4d927c12b5759b2e72646..73c5c9d907fad1f347923c1542b278d3476da050 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 8efb03c9c5c125cef219d77d014106a70e515f9a..600310ee65f200e411bfede1fedebad80a9c64ec 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 cc204ec72a19e5fa881da7265d74274ac8d2d5ea..4ff228a711fbafc7d87df24bf3acbeb8ad7751f6 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 0f2a992ebcc87240a846dca0d9983075aad36577..3a27390f92f2065e4df3097089dd4f8314eac541 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 d6bc9db5a048440c7d582d6c934ffc39809f7c1d..2e5feecb4bb40a9e8363d83fa8badb379350d507 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 daf9d5431b930559832250023eaf22ac6fbd4c8c..0d0b61f0f9aaa63f6b7714669f78a668d61972c5 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 73bec9ebda6e99a3a8081cb1518d6abe695bd33c..9cccf99b639775b8deae8a02ded018f0d75417d9 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 bcf66dd2cc2cdd75302c527398fb5bef97af95f9..a7b6622bf1e6c596a7f39752f1f04136ecc75eb7 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 e350a14be2d6b309aa3cb7c8d812333f6694b032..76928c9fcb1e9788e595300fc9a914ae1ac5fba6 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 db71a41cafcf713874268941024fce285e9f4ca5..7fb6ca67708a7a89251b67ead5fcee6efcb5ea0a 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 a935b9aeca42e96d2e4efa3e48b0509cf8111644..d942a7e20652835d42e4dd305ad8ec08514a5deb 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 de0e113d2c072b0cacf3f1d4dab0e1821cf11cea..19aa5e58d5951e71b8c03aaae2ee0c7a3631a9a7 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 b9f4d99acd3f1ded701e416e2f0d25af98f410e6..e047b64e86784e79dc9e1279cd38331615d0252c 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 f58fb04759d253204d295a0d147ae94f4db27445..29c8a7b14b86c931133fc190c53fa21cd7370393 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 cf2e25f6dbfff35f51b71594292faf1b63a9bba2..f483be675a1ca76b3e035566175c9f844fc1d36c 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 3a65d45e8daae3de3cbccf2598ef46ac5fbc82c7..cb778c2f6d762e7c8ca14094a0126255640bfb0c 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 d65b2c9ed27306b7360754d6f30107b7170e1fad..bcf4dac72560557455d55f8de4a944083c69936e 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 e65ba73154c880edda3ba103b5078721252bd581..2193723f1239a6dda01116eb056e11531d9aeb05 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 d1095eab8834d4c61ed9edb8e47a82b7ced9d67f..9d3f5318ddacad62ac019e1d24428b18ba61de73 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 f8912e7eac5fa1838893b033e99e7d0fcd535133..23296fab5d3ca05081f1251833fe3a47c1423d74 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 a6a23e8bd6963713aa67a7736ad6d63b0163fb1d..3b073f693c5588c0b335bf2fc35a4ae2f6627539 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 df0862a9d812e559e92f4b302b65e3903b8fb706..3493f8a2d1e0d6792b1e4a8ca587699d81400f52 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 029961d286726a50db66f1bdc6132dd00adad77e..881a7965b6e23d69f89678c28751a8a4c0351ef9 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 963178da94b4556fb4f1635a6eb07a05d2a076f4..effd463257fae4242d76016b813b4ce1f3a4bb0f 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 5ec4ba541ade38f4b30f64bcfc435688fe47fda6..9bced722a4c3ef9dd2adefa7ab691a4377bf30dc 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 f02037cb2bc2a24456bf3363bfbbe7414b512cf6..b4ba34706701160fdb130d23b2870adc89724b92 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 807c901695907d2a8b4f423fd7160e871194e91d..ce7e16cc6b95013ee9b8b0eb98e8750f150864a3 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 a64ef741b886145a533c4e2e5c1c761c9546fbed..93161b742234595cf2ffd516f57d4452ab7163aa 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 334e635e2ed7e48d2a283aeb9f3604657d0a485b..ed8d5d478258143f84127b2244771c0d057a1aa0 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 7bec97e4bc35aefd1351fa2fa69dcbd80d6cbd5d..ec5892fadb9beda860f27811d53b74af5ca87766 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 fb783be5806f0ac3748cc7439846d07ad6f75f50..99b3218039ed3acccfae0baffd639b454d11e8ce 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 063e17e39bddea9ba8e4f67c5fca8b106bbdfa8b..123f822d2c8ec814bee3001a2d52019c56ec5e18 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 e7e028f2f7e3a620c98a00869d50297542284c64..7b3c1987a3b0f2aca728f58038f0892523d4fa33 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 78f370e2f075197756573f8768c792ef435d3a91..93901d470f74eff8cd1999b42f949675d271efa2 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 afde91db10cce4ed5862e4102495d077eb7aa249..9c65d3d31cb5aaea8aee7b7c88479c4dd69a9588 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