changeset 6:9d940c7ee4c0

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 diff
     1.1 --- a/src/net/kryshen/charamega/game.mirah	Mon Jul 16 06:06:10 2012 +0400
     1.2 +++ b/src/net/kryshen/charamega/game.mirah	Mon Jul 16 06:30:28 2012 +0400
     1.3 @@ -345,8 +345,10 @@
     1.4          @max_seconds += 15
     1.5        elsif i > 40
     1.6          @max_seconds += 12
     1.7 +      elsif i > 30
     1.8 +        @max_seconds += 10
     1.9        elsif i > 20
    1.10 -        @max_seconds += 9
    1.11 +        @max_seconds += 8
    1.12        elsif i > 9
    1.13          @max_seconds += 6
    1.14        elsif i > 5
     2.1 --- a/src/net/kryshen/charamega/ui.mirah	Mon Jul 16 06:06:10 2012 +0400
     2.2 +++ b/src/net/kryshen/charamega/ui.mirah	Mon Jul 16 06:30:28 2012 +0400
     2.3 @@ -35,7 +35,7 @@
     2.4    def initialize(root_pane:JRootPane)
     2.5      super LayoutManager(BorderLayout.new)
     2.6  
     2.7 -    @game = Game.new.shuffle(20)
     2.8 +    @game = Game.new.shuffle(30)
     2.9      @field = Field.new(@game)
    2.10      @field.setBorder BorderFactory.createEmptyBorder(5, 5, 5, 5)
    2.11  
    2.12 @@ -169,7 +169,7 @@
    2.13      pairs_label = JLabel.new('Pairs: ')
    2.14  
    2.15      players = SpinnerNumberModel.new(1, 1, 20, 1)
    2.16 -    pairs = SpinnerNumberModel.new(20, 2, 200, 5)
    2.17 +    pairs = SpinnerNumberModel.new(@game.cards.size / 2, 2, 200, 10)
    2.18  
    2.19      players_spinner = JSpinner.new(players)
    2.20      pairs_spinner = JSpinner.new(pairs)