[Merge basic-queries and spell-queries into one file
clinton@unknownlamer.org**20080427173055] {
move ./src/spell-queries.lisp ./src/queries.lisp
hunk ./dnd-tools.asd 23
-			   (:file "basic-queries" :depends-on ("basic-classes"))
-			   (:file "spell-queries" :depends-on ("spells")))
+			   (:file "queries" :depends-on ("basic-classes"
+							 "spells")))
hunk ./src/basic-queries.lisp 1
-(in-package :org.unknownlamer.dnd-tools)
-
-(defgeneric find-player-class (name))
-(defgeneric find-player-level (player-class level))
-
-(defmethod find-player-class ((name symbol))
-  (get-instance-by-value 'player-class 'name name))
-
-(defmethod find-player-level ((player-class-name symbol) level)
-  (find-player-level (find-player-class player-class-name) level))
-
-(defmethod find-player-level ((player-class player-class) (level integer))
-  (if-bind player-level (find-item level (player-levels player-class)
-				   :key #'player-level :test #'=)
-    (values player-level t)
-    (values nil nil)))
-
-(defmethod find-player-level ((player-class (eql nil)) level)
-  (values nil nil))
+
rmfile ./src/basic-queries.lisp
hunk ./src/queries.lisp 3
-;;; Methods for finding various core spell instances. These should all
+;;; Methods for finding various core database instances. These should all
hunk ./src/queries.lisp 11
+(defgeneric find-player-class (name))
+(defgeneric find-player-level (player-class level))
+
+(defmethod find-player-class ((name symbol))
+  (get-instance-by-value 'player-class 'name name))
+
+(defmethod find-player-level ((player-class-name symbol) level)
+  (find-player-level (find-player-class player-class-name) level))
+
+(defmethod find-player-level ((player-class player-class) (level integer))
+  (if-bind player-level (find-item level (player-levels player-class)
+				   :key #'player-level :test #'=)
+    (values player-level t)
+    (values nil nil)))
+
+(defmethod find-player-level ((player-class (eql nil)) level)
+  (values nil nil))
+
}