--- deliantra/server/include/skills.h	2009/10/12 14:00:58	1.24
+++ deliantra/server/include/skills.h	2010/03/26 20:17:48	1.27
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2003 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -41,15 +41,14 @@
 };
 
 enum {
-  SF_COMBAT      = 0x01, // skill is used only in direct attack combat
-  SF_NEED_WEAPON = 0x02, // skill requires a weapon object
-  SF_RANGED      = 0x04, // skill is only used for ranged attacks
-  SF_NEED_BOW    = 0x08, // skill requires a bow object
-  SF_USE         = 0x10, // skill can be used but is directionless
-  SF_APPLY       = 0x20, // skill can be independently applied and is never a chosen skill
+  SF_COMBAT       = 0x01, // skill can be used in direct attack combat (not ranged)
+  SF_RANGED       = 0x04, // skill can be used for ranged attacks (not combat)
+  SF_USE          = 0x10, // skill can be used directly, directionless
+  SF_APPLY        = 0x20, // skill can be independently applied (ranged) and is never a chosen skill
 
-  SF_MANA        = 0x40, // skill requires a mana-consuming spell
-  SF_GRACE       = 0x80, // skill can use a grace-consuming spell
+  SF_NEED_ITEM    = 0x20, // skill *requires* some object in the weapon slot
+  SF_MANA         = 0x40, // skill requires a mana-consuming spell
+  SF_GRACE        = 0x80, // skill can use a grace-consuming spell
 };
 
 /* This is used in the exp functions - basically what to do if