[bknr-cvs] r2217 - branches/trunk-reorg/projects/scrabble/src

[bknr at bknr.net]

Author: hhubner
Date: 2007-10-04 18:51:42 -0400 (Thu, 04 Oct 2007)
New Revision: 2217

Modified:
   branches/trunk-reorg/projects/scrabble/src/make-letters.lisp
   branches/trunk-reorg/projects/scrabble/src/scrabble.lisp
   branches/trunk-reorg/projects/scrabble/src/start-webserver.lisp
Log:
Add english tile set.


Modified: branches/trunk-reorg/projects/scrabble/src/make-letters.lisp
===================================================================
--- branches/trunk-reorg/projects/scrabble/src/make-letters.lisp	2007-10-04 22:33:26 UTC (rev 2216)
+++ branches/trunk-reorg/projects/scrabble/src/make-letters.lisp	2007-10-04 22:51:42 UTC (rev 2217)
@@ -9,6 +9,12 @@
         :triple-letter "DREIFACHER\nBUCHSTABEN\nWERT"
         :triple-word "DREIFACHER\nWORT\nWERT"))
 
+(setf (gethash :en *special-tile-texts*)
+      '(:double-letter "DOUBLE\nLETTER\nSCORE"
+        :double-word "DOUBLE\nWORD\nSCORE"
+        :triple-letter "TRIPLE\nLETTER\nSCORE"
+        :triple-word "TRIPLE\nWORD\nSCORE"))
+
 (defparameter *special-tile-colors*
   '(:double-letter (0.53 0.8 0.94)
     :double-word (0.97 0.67 0.6)

Modified: branches/trunk-reorg/projects/scrabble/src/scrabble.lisp
===================================================================
--- branches/trunk-reorg/projects/scrabble/src/scrabble.lisp	2007-10-04 22:33:26 UTC (rev 2216)
+++ branches/trunk-reorg/projects/scrabble/src/scrabble.lisp	2007-10-04 22:51:42 UTC (rev 2217)
@@ -24,36 +24,17 @@
 (defparameter *tile-sets* (make-hash-table))
 
 (setf (gethash :de *tile-sets*)
-      '((#\A 1 5)
-        (#\B 3 2)
-        (#\C 4 2)
-        (#\D 1 4)
-        (#\E 1 15)
-        (#\F 4 2)
-        (#\G 2 3)
-        (#\H 2 4)
-        (#\I 1 6)
-        (#\J 6 1)
-        (#\K 4 2)
-        (#\L 2 3)
-        (#\M 3 4)
-        (#\N 1 9)
-        (#\O 2 3)
-        (#\P 4 1)
-        (#\Q 10 1)
-        (#\R 1 6)
-        (#\S 1 7)
-        (#\T 1 6)
-        (#\U 1 6)
-        (#\V 6 1)
-        (#\W 3 1)
-        (#\X 8 1)
-        (#\Y 10 1)
-        (#\Z 3 1)
-        #-cmu (#\LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS 6 1)
-        #-cmu (#\LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS 8 1)
-        #-cmu (#\LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS 6 1)
+      '((#\A 1 5) (#\B 3 2) (#\C 4 2) (#\D 1 4) (#\E 1 15) (#\F 4 2) (#\G 2 3) (#\H 2 4) (#\I 1 6)
+        (#\J 6 1) (#\K 4 2) (#\L 2 3) (#\M 3 4) (#\N 1 9) (#\O 2 3) (#\P 4 1) (#\Q 10 1) (#\R 1 6)
+        (#\S 1 7) (#\T 1 6) (#\U 1 6) (#\V 6 1) (#\W 3 1) (#\X 8 1) (#\Y 10 1) (#\Z 3 1)
+	(#\LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS 6 1)
+	(#\LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS 8 1)
+	(#\LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS 6 1)
         (nil 0 2)))
+(setf (gethash :en *tile-sets*)
+      '((#\A 1 9) (#\B 3 2) (#\C 3 2) (#\D 2 4) (#\E 1 12) (#\F 4 2) (#\G 2 3) (#\H 4 2) (#\I 1 9)
+	(#\J 8 1) (#\K 5 1) (#\L 1 4) (#\M 3 2) (#\N 1 6) (#\O 1 8) (#\P 3 2) (#\Q 10 1) (#\R 1 6)
+	(#\S 1 4) (#\T 1 6) (#\U 1 4) (#\V 4 2) (#\W 4 2) (#\X 8 1) (#\Y 4 2) (#\Z 10 1) (nil 0 2)))
 
 (define-condition invalid-move (simple-error)
   ()

Modified: branches/trunk-reorg/projects/scrabble/src/start-webserver.lisp
===================================================================
--- branches/trunk-reorg/projects/scrabble/src/start-webserver.lisp	2007-10-04 22:33:26 UTC (rev 2216)
+++ branches/trunk-reorg/projects/scrabble/src/start-webserver.lisp	2007-10-04 22:51:42 UTC (rev 2217)
@@ -7,9 +7,9 @@
 
 (defparameter *mochikit-directory*
   (make-pathname :name nil :type nil :version nil
-		 :defaults (merge-pathnames #p"../../../../thirdparty/MochiKit/MochiKit/")))
+		 :defaults (merge-pathnames #p"../../../thirdparty/MochiKit/MochiKit/")))
 
-(when (and (boundp '*server*) *server)
+(when (and (boundp '*server*) *server*)
   (stop-server *server*))
 
 (setq *dispatch-table*