diff --git a/collects/games/aces/aces.scm b/collects/games/aces/aces.scm index a509c16a56..100ef866e8 100644 --- a/collects/games/aces/aces.scm +++ b/collects/games/aces/aces.scm @@ -7,12 +7,7 @@ possible to remap single click (instead of double click)? #lang mzscheme -(require (lib "cards.ss" "games" "cards") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "list.ss") - (lib "unit.ss") - (lib "string-constant.ss" "string-constants") +(require games/cards mred mzlib/class mzlib/list mzlib/unit string-constants "../show-help.ss") (provide game@) diff --git a/collects/games/blackjack/blackjack.ss b/collects/games/blackjack/blackjack.ss index cabe36bf59..a37773da13 100644 --- a/collects/games/blackjack/blackjack.ss +++ b/collects/games/blackjack/blackjack.ss @@ -31,11 +31,7 @@ #lang mzscheme -(require (lib "cards.ss" "games" "cards") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "list.ss") - (lib "unit.ss")) +(require games/cards mred mzlib class mzlib/list mzlib/unit) (provide game@) (define game@ (unit (import) (export) diff --git a/collects/games/cards.ss b/collects/games/cards.ss new file mode 100644 index 0000000000..19d45cf456 --- /dev/null +++ b/collects/games/cards.ss @@ -0,0 +1,4 @@ +#lang mzscheme + +(require "cards/cards.ss") +(provide (all-from "cards/cards.ss")) diff --git a/collects/games/cards/base.ss b/collects/games/cards/base.ss index 2906cee2a3..9419f07871 100644 --- a/collects/games/cards/base.ss +++ b/collects/games/cards/base.ss @@ -1,17 +1,13 @@ (module base mzscheme - (require (lib "class.ss") - (lib "etc.ss") - "make-cards.ss" - "classes.ss" - "card-class.ss") + (require mzlib/class mzlib/etc "make-cards.ss" "classes.ss" "card-class.ss") (provide make-table make-deck make-card table<%> card<%>) (define table<%> (class->interface table%)) (define card<%> (class->interface card%)) - + (define make-table (opt-lambda ([title "Cards"][w 7][h 3]) (make-object table% title w h))) diff --git a/collects/games/cards/doc.txt b/collects/games/cards/doc.txt index 2d7c33a90e..a4b0746ee7 100644 --- a/collects/games/cards/doc.txt +++ b/collects/games/cards/doc.txt @@ -3,9 +3,9 @@ The _Virtual Playing Cards Library_ ----------------------------------- Load the virtual card library with - (require (lib "cards.ss" "games" "cards")) + (require games/cards) -The _cards.ss_ module defines the following procedures: +The _cards_ module defines the following procedures: > (make-table [title-string] [w] [h]) returns a table named by `title-string' that is `w' cards wide and `h' cards high. A diff --git a/collects/games/cards/main.ss b/collects/games/cards/main.ss index a46f5fcc54..9d4d3b7515 100644 --- a/collects/games/cards/main.ss +++ b/collects/games/cards/main.ss @@ -1,4 +1,4 @@ +#lang mzscheme -(module main mzscheme - (require "cards.ss") - (provide (all-from "cards.ss"))) +(require "cards.ss") +(provide (all-from "cards.ss")) diff --git a/collects/games/crazy8s/crazy8s.ss b/collects/games/crazy8s/crazy8s.ss index ff6302c7b0..0c4aea46f4 100644 --- a/collects/games/crazy8s/crazy8s.ss +++ b/collects/games/crazy8s/crazy8s.ss @@ -1,14 +1,8 @@ #lang mzscheme -(require (lib "cards.ss" "games" "cards") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "unit.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "async-channel.ss") - (lib "file.ss")) +(require games/cards mred mzlib/class mzlib/unit mzlib/etc mzlib/list mzlib/file + mzlib/async-channel) ;; Player record (define-struct player (r hand-r ; region diff --git a/collects/games/ginrummy/ginrummy.ss b/collects/games/ginrummy/ginrummy.ss index 8e5710f565..6c6f2e34ce 100644 --- a/collects/games/ginrummy/ginrummy.ss +++ b/collects/games/ginrummy/ginrummy.ss @@ -1,9 +1,5 @@ #lang mzscheme -(require (lib "cards.ss" "games" "cards") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "unit.ss") - (lib "list.ss")) +(require games/cards mred mzlib/class mzlib/unit mzlib/list) (provide game@) (define game@ (unit (import) (export) diff --git a/collects/games/gofish/gofish.ss b/collects/games/gofish/gofish.ss index 450a258d79..05832c2b16 100644 --- a/collects/games/gofish/gofish.ss +++ b/collects/games/gofish/gofish.ss @@ -1,9 +1,5 @@ #lang mzscheme -(require (lib "cards.ss" "games" "cards") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "unit.ss") - (lib "list.ss")) +(require games/cards mred mzlib/class mzlib/unit mzlib/list) (provide game@) (define game@ (unit (import) (export) diff --git a/collects/games/memory/memory.ss b/collects/games/memory/memory.ss index 6cc165c3a0..4054473611 100644 --- a/collects/games/memory/memory.ss +++ b/collects/games/memory/memory.ss @@ -1,9 +1,5 @@ #lang mzscheme -(require (lib "cards.ss" "games" "cards") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "unit.ss") - (lib "list.ss")) +(require games/cards mred mzlib/class mzlib/unit mzlib/list) (provide game@) diff --git a/collects/games/spider/spider.ss b/collects/games/spider/spider.ss index 66dd1da450..6ec8439533 100644 --- a/collects/games/spider/spider.ss +++ b/collects/games/spider/spider.ss @@ -1,11 +1,6 @@ #lang mzscheme -(require (lib "cards.ss" "games" "cards") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "list.ss") - (lib "file.ss") - (lib "unit.ss") +(require games/cards mred mzlib/class mzlib/list mzlib/file mzlib/unit "../show-help.ss") (define (list-first-n l n)