diff --git a/data/plugins/areas/plugin.xml b/data/plugins/areas/plugin.xml
index 0e9c4b1b..2c18bb32 100644
--- a/data/plugins/areas/plugin.xml
+++ b/data/plugins/areas/plugin.xml
@@ -10,7 +10,6 @@
-
diff --git a/data/plugins/combat/plugin.xml b/data/plugins/combat/plugin.xml
new file mode 100644
index 00000000..b236b6b2
--- /dev/null
+++ b/data/plugins/combat/plugin.xml
@@ -0,0 +1,17 @@
+
+
+ combat
+ 1
+ Combat
+ Manages combat between game characters.
+
+ Ryley
+
+
+
+
+
+ attributes
+ areas
+
+
diff --git a/data/plugins/areas/wilderness.rb b/data/plugins/combat/wilderness.rb
similarity index 89%
rename from data/plugins/areas/wilderness.rb
rename to data/plugins/combat/wilderness.rb
index 5e97dc0f..592f71bb 100644
--- a/data/plugins/areas/wilderness.rb
+++ b/data/plugins/combat/wilderness.rb
@@ -50,4 +50,13 @@ area_action :wilderness_level do
end
+# Monkey patch the existing player class to add method of checking whether or not a player is within the wilderness
+class Player
+
+ def in_wilderness
+ self.wilderness_level > 0
+ end
+
+end
+
area :name => :wilderness, :coordinates => [ 2945, 3522, 3390, 3972, 0 ], :actions => :wilderness_level
\ No newline at end of file
diff --git a/data/plugins/player-action/player-action.rb b/data/plugins/player-action/player-action.rb
index edd914e4..cc7a8b70 100644
--- a/data/plugins/player-action/player-action.rb
+++ b/data/plugins/player-action/player-action.rb
@@ -10,7 +10,7 @@ class PlayerAction
def initialize(slot, primary, name)
index = [ :first, :second, :third, :fourth, :fifth ].find_index(slot)
- raise "Unsupport action slot #{slot}." if index.nil?
+ raise "Unsupported action slot #{slot}." if index.nil?
@slot = index
@primary = primary
@@ -55,7 +55,7 @@ class Player
end
def has_action(action)
- return actions[action.slot] == action.name
+ actions[action.slot] == action.name
end
end
\ No newline at end of file