Mercurial > hg > charamega

changeset 6:9d940c7ee4c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjusted defaults and limits.
author Mikhail Kryshen <mikhail@kryshen.net>
date Mon, 16 Jul 2012 06:30:28 +0400
parents 0bde65570ec7
children 64334b3d9236
files src/net/kryshen/charamega/game.mirah src/net/kryshen/charamega/ui.mirah
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/net/kryshen/charamega/game.mirah	Mon Jul 16 06:06:10 2012 +0400
+++ b/src/net/kryshen/charamega/game.mirah	Mon Jul 16 06:30:28 2012 +0400
@@ -345,8 +345,10 @@
         @max_seconds += 15
       elsif i > 40
         @max_seconds += 12
+      elsif i > 30
+        @max_seconds += 10
       elsif i > 20
-        @max_seconds += 9
+        @max_seconds += 8
       elsif i > 9
         @max_seconds += 6
       elsif i > 5
--- a/src/net/kryshen/charamega/ui.mirah	Mon Jul 16 06:06:10 2012 +0400
+++ b/src/net/kryshen/charamega/ui.mirah	Mon Jul 16 06:30:28 2012 +0400
@@ -35,7 +35,7 @@
   def initialize(root_pane:JRootPane)
     super LayoutManager(BorderLayout.new)
 
-    @game = Game.new.shuffle(20)
+    @game = Game.new.shuffle(30)
     @field = Field.new(@game)
     @field.setBorder BorderFactory.createEmptyBorder(5, 5, 5, 5)
 
@@ -169,7 +169,7 @@
     pairs_label = JLabel.new('Pairs: ')
 
     players = SpinnerNumberModel.new(1, 1, 20, 1)
-    pairs = SpinnerNumberModel.new(20, 2, 200, 5)
+    pairs = SpinnerNumberModel.new(@game.cards.size / 2, 2, 200, 10)
 
     players_spinner = JSpinner.new(players)
     pairs_spinner = JSpinner.new(pairs)