# HG changeset patch # User Mikhail Kryshen <mikhail@kryshen.net> # Date 1342405828 -14400 # Node ID 9d940c7ee4c07340abccd1b45a403689940dc989 # Parent 0bde65570ec77cc7dbe5596b05cd6cf49af463dd Adjusted defaults and limits. diff -r 0bde65570ec7 -r 9d940c7ee4c0 src/net/kryshen/charamega/game.mirah --- 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 diff -r 0bde65570ec7 -r 9d940c7ee4c0 src/net/kryshen/charamega/ui.mirah --- 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)