From 6cf6ff8aa5c38beb20c8c9afb192e152817417e0 Mon Sep 17 00:00:00 2001 From: yxlau Date: Tue, 31 Jan 2017 17:37:44 +0800 Subject: [PATCH 01/15] Add name to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3f18110..0f8d50b 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ Hit me baby one more time? [A Blackjack game using the Ruby Sinatra web application framework which uses object oriented programming, cookies, sessions, and JSON from the Viking Code School](http://www.vikingcodeschool.com) + +Yi-Xuan Lau \ No newline at end of file From 8d57d3f0dedac7fe6452c7189e7634a21c9dede2 Mon Sep 17 00:00:00 2001 From: yxlau Date: Tue, 31 Jan 2017 17:51:23 +0800 Subject: [PATCH 02/15] Basic setup --- Gemfile | 6 ++++++ Gemfile.lock | 32 ++++++++++++++++++++++++++++++++ app.rb | 10 ++++++++++ views/index.erb | 2 ++ views/layout.erb | 9 +++++++++ 5 files changed, 59 insertions(+) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 app.rb create mode 100644 views/index.erb create mode 100644 views/layout.erb diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..dd7a364 --- /dev/null +++ b/Gemfile @@ -0,0 +1,6 @@ +# frozen_string_literal: true +source "https://rubygems.org" + +# gem "rails" +gem 'sinatra' +gem 'sinatra-contrib' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..9818afb --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,32 @@ +GEM + remote: https://rubygems.org/ + specs: + backports (3.6.8) + multi_json (1.12.1) + rack (1.6.5) + rack-protection (1.5.3) + rack + rack-test (0.6.3) + rack (>= 1.0) + sinatra (1.4.8) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + sinatra-contrib (1.4.7) + backports (>= 2.0) + multi_json + rack-protection + rack-test + sinatra (~> 1.4.0) + tilt (>= 1.3, < 3) + tilt (2.0.6) + +PLATFORMS + ruby + +DEPENDENCIES + sinatra + sinatra-contrib + +BUNDLED WITH + 1.13.7 diff --git a/app.rb b/app.rb new file mode 100644 index 0000000..4a93815 --- /dev/null +++ b/app.rb @@ -0,0 +1,10 @@ +require 'sinatra' +require 'sinatra/reloader' if development? + +get '/' do + erb :index +end + +get '/blackjack' do + erb :blackjack +end diff --git a/views/index.erb b/views/index.erb new file mode 100644 index 0000000..f0017fc --- /dev/null +++ b/views/index.erb @@ -0,0 +1,2 @@ +

Welcome to Blackjack!

+Play \ No newline at end of file diff --git a/views/layout.erb b/views/layout.erb new file mode 100644 index 0000000..f4d0de7 --- /dev/null +++ b/views/layout.erb @@ -0,0 +1,9 @@ + + + + Sinatra Blackjack + + +<%= yield %> + + \ No newline at end of file From 56f0c18bdcfe36452b2401be48b04e80a2d89044 Mon Sep 17 00:00:00 2001 From: Yi-Xuan Lau Date: Wed, 1 Feb 2017 11:03:42 +0800 Subject: [PATCH 03/15] Set up basics --- Gemfile | 1 + Gemfile.lock | 2 ++ app.rb | 87 ++++++++++++++++++++++++++++++++++++++++++++- lib/black_jack.rb | 5 +++ lib/player.rb | 0 views/blackjack.erb | 26 ++++++++++++++ 6 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 lib/black_jack.rb create mode 100644 lib/player.rb create mode 100644 views/blackjack.erb diff --git a/Gemfile b/Gemfile index dd7a364..fac8d49 100644 --- a/Gemfile +++ b/Gemfile @@ -4,3 +4,4 @@ source "https://rubygems.org" # gem "rails" gem 'sinatra' gem 'sinatra-contrib' +gem 'json' diff --git a/Gemfile.lock b/Gemfile.lock index 9818afb..3491ae8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,6 +2,7 @@ GEM remote: https://rubygems.org/ specs: backports (3.6.8) + json (1.8.6) multi_json (1.12.1) rack (1.6.5) rack-protection (1.5.3) @@ -25,6 +26,7 @@ PLATFORMS ruby DEPENDENCIES + json sinatra sinatra-contrib diff --git a/app.rb b/app.rb index 4a93815..9c14405 100644 --- a/app.rb +++ b/app.rb @@ -1,10 +1,95 @@ require 'sinatra' require 'sinatra/reloader' if development? +require 'json' +require 'pry' + +enable :sessions get '/' do erb :index end get '/blackjack' do - erb :blackjack + deck = session['deck'] ? JSON.parse(session['deck']) : %w{1 2 3 4 5 6 7 8 9 10 jack queen king ace}.product(%w{diamonds clubs hearts spades}).shuffle + # deal hands + if session['deck'] + player = JSON.parse(session['player']) + dealer = JSON.parse(session['dealer']) + deck = JSON.parse(session['deck']) + else + player, dealer = [], [] + deck = %w{1 2 3 4 5 6 7 8 9 10 jack queen king ace}.product(%w{diamonds clubs hearts spades}).shuffle + 2.times do + s = deck.sample + player << s + deck.delete(s) + s = deck.sample + dealer << s + deck.delete(s) + end + end + + # save session + session['dealer'] = dealer.to_json + session['player'] = player.to_json + session['deck'] = deck.to_json + erb :blackjack, :locals => {'deck' => deck, 'dealer' => dealer, 'player' => player, 'game_over' => session[:game_over], 'player_sum' => session[:player_sum], 'dealer_sum' => session[:dealer_sum]} +end + +post '/blackjack/hit' do + deck = JSON.parse(session['deck']) + card = deck.sample + deck.delete(card) + session['deck'] = deck.to_json + player = JSON.parse(session['player']) << card + session['player'] = player.to_json + # check bust / win + sum = 0 + player.each do |card| + if card[0] == 'ace' + if sum + 11 > 21 + sum += 1 + else + sum += 11 + end + + elsif card[0] == 'king' || card[0] == 'jack' || card[0] == 'queen' + sum += 10 + else + sum += card[0].to_i + end + end + session['player_sum'] = sum + redirect to("/blackjack/stay") if sum > 21 + redirect to('/blackjack') +end + +get '/blackjack/stay' do + dealer = JSON.parse(session['dealer']) + deck = JSON.parse(session['deck']) + sum = 0 + dealer.each do |card| + if card[0] == 'ace' + if sum + 11 > 21 + sum += 1 + else + sum += 11 + end + elsif card[0] == 'king' || card[0] == 'jack' || card[0] == 'queen' + sum += 10 + else + sum += card[0].to_i + end + end + until sum >= 17 + s = deck.sample + sum += s[0].to_i + dealer << s + deck.delete(s) + end + session['game_over'] = true + session['deck'] = deck.to_json + session['dealer'] = dealer.to_json + session['dealer_sum'] = sum + redirect '/blackjack' end diff --git a/lib/black_jack.rb b/lib/black_jack.rb new file mode 100644 index 0000000..c840c75 --- /dev/null +++ b/lib/black_jack.rb @@ -0,0 +1,5 @@ +class Deck + def initialize(cards) + @cards = cards + end +end diff --git a/lib/player.rb b/lib/player.rb new file mode 100644 index 0000000..e69de29 diff --git a/views/blackjack.erb b/views/blackjack.erb new file mode 100644 index 0000000..898cc1e --- /dev/null +++ b/views/blackjack.erb @@ -0,0 +1,26 @@ +<% if ! game_over %> +PLAYER: <%= player %>
+ +
+ +
+ +
+ +
+<% else + +if (player_sum == 21 && dealer_sum != 21) || ( dealer_sum > 21 && player_sum < 21 ) || (player_sum > dealer_sum && player_sum < 21) + message = 'Congratulations, you\'ve won!' +elsif player_sum == dealer_sum && player_sum <= 21 + message = 'It\'s a tie!' +else + message = "Sorry, you\'ve lost!" +end +%> +

<%= message %>

+PLAYER: <%= player %>
+DEALER: <%= dealer %>
+<% end %> + + From 5121b3ccc8b25ba08d5b9dce638d792f070ef29e Mon Sep 17 00:00:00 2001 From: Yi-Xuan Lau Date: Wed, 1 Feb 2017 12:42:50 +0800 Subject: [PATCH 04/15] Refactor for OOP --- app.rb | 104 ++++++++++++++------------------------------ helpers/savers.rb | 9 ++++ lib/black_jack.rb | 5 --- lib/deck.rb | 27 ++++++++++++ lib/player.rb | 30 +++++++++++++ views/blackjack.erb | 21 +++++---- 6 files changed, 111 insertions(+), 85 deletions(-) create mode 100644 helpers/savers.rb delete mode 100644 lib/black_jack.rb create mode 100644 lib/deck.rb diff --git a/app.rb b/app.rb index 9c14405..d897162 100644 --- a/app.rb +++ b/app.rb @@ -1,95 +1,55 @@ require 'sinatra' require 'sinatra/reloader' if development? require 'json' -require 'pry' +require 'erb' +require_relative 'lib/player' +require_relative 'lib/deck' +require './helpers/savers' enable :sessions +helpers Savers + get '/' do erb :index end get '/blackjack' do - deck = session['deck'] ? JSON.parse(session['deck']) : %w{1 2 3 4 5 6 7 8 9 10 jack queen king ace}.product(%w{diamonds clubs hearts spades}).shuffle - # deal hands - if session['deck'] - player = JSON.parse(session['player']) - dealer = JSON.parse(session['dealer']) - deck = JSON.parse(session['deck']) - else - player, dealer = [], [] - deck = %w{1 2 3 4 5 6 7 8 9 10 jack queen king ace}.product(%w{diamonds clubs hearts spades}).shuffle - 2.times do - s = deck.sample - player << s - deck.delete(s) - s = deck.sample - dealer << s - deck.delete(s) - end - end + deck = Deck.new(session['deck']) + player = Player.new(session['player']) + dealer = AI.new(session['dealer']) + deck.deal(player, dealer) unless session['on'] - # save session - session['dealer'] = dealer.to_json - session['player'] = player.to_json - session['deck'] = deck.to_json - erb :blackjack, :locals => {'deck' => deck, 'dealer' => dealer, 'player' => player, 'game_over' => session[:game_over], 'player_sum' => session[:player_sum], 'dealer_sum' => session[:dealer_sum]} + session['on'] = true + save_hand('dealer', dealer) + save_hand('player', player) + save_deck(deck) + erb :blackjack, :locals => {'deck' => deck, 'dealer' => dealer, 'player' => player, 'game_over' => session[:game_over]} end post '/blackjack/hit' do - deck = JSON.parse(session['deck']) - card = deck.sample - deck.delete(card) - session['deck'] = deck.to_json - player = JSON.parse(session['player']) << card - session['player'] = player.to_json - # check bust / win - sum = 0 - player.each do |card| - if card[0] == 'ace' - if sum + 11 > 21 - sum += 1 - else - sum += 11 - end + deck = Deck.new(session['deck']) + player = Player.new(session['player']) + deck.hit(player) - elsif card[0] == 'king' || card[0] == 'jack' || card[0] == 'queen' - sum += 10 - else - sum += card[0].to_i - end - end - session['player_sum'] = sum - redirect to("/blackjack/stay") if sum > 21 + save_deck(deck) + save_hand('player', player) + redirect to("/blackjack/stay") if player.sum > 21 redirect to('/blackjack') end get '/blackjack/stay' do - dealer = JSON.parse(session['dealer']) - deck = JSON.parse(session['deck']) - sum = 0 - dealer.each do |card| - if card[0] == 'ace' - if sum + 11 > 21 - sum += 1 - else - sum += 11 - end - elsif card[0] == 'king' || card[0] == 'jack' || card[0] == 'queen' - sum += 10 - else - sum += card[0].to_i - end - end - until sum >= 17 - s = deck.sample - sum += s[0].to_i - dealer << s - deck.delete(s) - end + dealer = AI.new(session['dealer']) + deck = Deck.new(session['deck']) + deck.hit(dealer) until dealer.enough? + session['game_over'] = true - session['deck'] = deck.to_json - session['dealer'] = dealer.to_json - session['dealer_sum'] = sum + save_deck(deck) + save_hand('dealer', dealer) redirect '/blackjack' end + +get '/blackjack/restart' do + session.clear + redirect '/' +end diff --git a/helpers/savers.rb b/helpers/savers.rb new file mode 100644 index 0000000..204e182 --- /dev/null +++ b/helpers/savers.rb @@ -0,0 +1,9 @@ +module Savers + def save_deck(deck) + session['deck'] = deck.to_json + end + + def save_hand(n, player) + session[n] = player.hand.to_json + end +end diff --git a/lib/black_jack.rb b/lib/black_jack.rb deleted file mode 100644 index c840c75..0000000 --- a/lib/black_jack.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Deck - def initialize(cards) - @cards = cards - end -end diff --git a/lib/deck.rb b/lib/deck.rb new file mode 100644 index 0000000..5bbf75e --- /dev/null +++ b/lib/deck.rb @@ -0,0 +1,27 @@ +class Deck + attr_accessor :cards + def initialize(cards=nil) + @cards = cards ? JSON.parse(cards) : make_deck + end + + def make_deck + %w{1 2 3 4 5 6 7 8 9 10 jack queen king ace}.product(%w{diamonds clubs hearts spades}).shuffle + end + + def deal(one, two) + 2.times do + s = @cards.sample + one.hand << s + @cards.delete(s) + s = @cards.sample + two.hand << s + @cards.delete(s) + end + end + + def hit(player) + s = @cards.sample + player.hand << s + @cards.delete(s) + end +end diff --git a/lib/player.rb b/lib/player.rb index e69de29..8e61aae 100644 --- a/lib/player.rb +++ b/lib/player.rb @@ -0,0 +1,30 @@ +class Player + attr_accessor :hand + def initialize(hand=nil) + @hand = hand ? JSON.parse(hand) : [] + end + + def sum + sum = 0 + ace = false + @hand.each do |card| + if card[0] == 'ace' + ace = true + elsif card[0] == 'king' || card[0] == 'jack' || card[0] == 'queen' + sum += 10 + else + sum += card[0].to_i + end + end + if ace + sum = sum + 11 < 21 ? sum + 11 : sum + 1 + end + sum + end +end + +class AI < Player + def enough? + self.sum >= 17 + end +end diff --git a/views/blackjack.erb b/views/blackjack.erb index 898cc1e..9ee4de3 100644 --- a/views/blackjack.erb +++ b/views/blackjack.erb @@ -1,5 +1,6 @@ <% if ! game_over %> -PLAYER: <%= player %>
+PLAYER: <%= player.hand %>
+DEALER: <%= dealer.hand %>
@@ -8,19 +9,23 @@ PLAYER: <%= player %>
-<% else +<% else +if (player.sum == 21 && dealer.sum != 21) || ( dealer.sum > 21 && player.sum < 21 ) || (player.sum > dealer.sum && player.sum < 21) + message = 'Congratulations, you\'ve won! ' -if (player_sum == 21 && dealer_sum != 21) || ( dealer_sum > 21 && player_sum < 21 ) || (player_sum > dealer_sum && player_sum < 21) - message = 'Congratulations, you\'ve won!' -elsif player_sum == dealer_sum && player_sum <= 21 - message = 'It\'s a tie!' +elsif player.sum == dealer.sum && player.sum <= 21 + message = "It's a tie!" else message = "Sorry, you\'ve lost!" end %>

<%= message %>

-PLAYER: <%= player %>
-DEALER: <%= dealer %>
+PLAYER: <%= player.hand %>
+DEALER: <%= dealer.hand %>
+ +
+ +
<% end %> From 7566f7dee13f9f901c89d91a41ccb682726d16b6 Mon Sep 17 00:00:00 2001 From: Yi-Xuan Lau Date: Wed, 1 Feb 2017 17:03:16 +0800 Subject: [PATCH 05/15] Add betting and partials --- app.rb | 34 +++++++++++++++++++++++----------- helpers/savers.rb | 10 +++++++--- lib/deck.rb | 15 +++++++++++++++ lib/player.rb | 12 ++++++++---- views/bet.erb | 6 ++++++ views/blackjack.erb | 26 ++++++-------------------- views/index.erb | 3 ++- views/shared/blackjack.erb | 4 ++++ views/shared/loss.erb | 4 ++++ views/shared/play.erb | 9 +++++++++ views/shared/tie.erb | 1 + views/shared/win.erb | 4 ++++ 12 files changed, 89 insertions(+), 39 deletions(-) create mode 100644 views/bet.erb create mode 100644 views/shared/blackjack.erb create mode 100644 views/shared/loss.erb create mode 100644 views/shared/play.erb create mode 100644 views/shared/tie.erb create mode 100644 views/shared/win.erb diff --git a/app.rb b/app.rb index d897162..16bddec 100644 --- a/app.rb +++ b/app.rb @@ -11,9 +11,25 @@ helpers Savers get '/' do + session.clear erb :index end +get '/bet' do + erb :bet, :locals => { 'redirect' => session['redirect_message']} +end + +post '/bet' do + player = Player.new(session['player']) + player.bet = params[:bet].to_i + if player.bank < player.bet + session['redirect_message'] = "Sorry, you don't have that much money (yet)! Please enter a different amount:" + redirect '/bet' + end + save_player('player', player) + redirect '/blackjack' +end + get '/blackjack' do deck = Deck.new(session['deck']) player = Player.new(session['player']) @@ -21,8 +37,8 @@ deck.deal(player, dealer) unless session['on'] session['on'] = true - save_hand('dealer', dealer) - save_hand('player', player) + save_player('dealer', dealer) + save_player('player', player) save_deck(deck) erb :blackjack, :locals => {'deck' => deck, 'dealer' => dealer, 'player' => player, 'game_over' => session[:game_over]} end @@ -33,7 +49,7 @@ deck.hit(player) save_deck(deck) - save_hand('player', player) + save_player('player', player) redirect to("/blackjack/stay") if player.sum > 21 redirect to('/blackjack') end @@ -41,15 +57,11 @@ get '/blackjack/stay' do dealer = AI.new(session['dealer']) deck = Deck.new(session['deck']) + player = Player.new(session['player']) deck.hit(dealer) until dealer.enough? - + deck.settle_winnings(player, dealer) + save_player('player', player) session['game_over'] = true - save_deck(deck) - save_hand('dealer', dealer) + save_player('dealer', dealer) redirect '/blackjack' end - -get '/blackjack/restart' do - session.clear - redirect '/' -end diff --git a/helpers/savers.rb b/helpers/savers.rb index 204e182..7c912e2 100644 --- a/helpers/savers.rb +++ b/helpers/savers.rb @@ -1,9 +1,13 @@ module Savers def save_deck(deck) - session['deck'] = deck.to_json + session['deck'] = deck.cards.to_json end - def save_hand(n, player) - session[n] = player.hand.to_json + def save_player(n, player) + bundle = { 'hand' => player.hand, + 'bank' => player.bank, + 'bet' => player.bet, + 'status' => player.status} + session[n] = bundle.to_json end end diff --git a/lib/deck.rb b/lib/deck.rb index 5bbf75e..fa73450 100644 --- a/lib/deck.rb +++ b/lib/deck.rb @@ -24,4 +24,19 @@ def hit(player) player.hand << s @cards.delete(s) end + + def settle_winnings(player, dealer) + if player.sum > 21 || player.sum < dealer.sum && dealer.sum < 21 || dealer.sum == 21 && player.sum != 21 + player.bank -= player.bet + player.status = :loss + elsif player.sum == 21 && dealer.sum != 21 || player.sum > dealer.sum && player.sum < 21 || dealer.sum > 21 + player.bank += player.bet + player.status = :win + elsif player.sum == 21 && dealer.sum != 21 && player.hand.size == 2 + player.bank += player.bet * 1.5 + player.status = :blackjack + else + player.status = :tie + end + end end diff --git a/lib/player.rb b/lib/player.rb index 8e61aae..0e037c4 100644 --- a/lib/player.rb +++ b/lib/player.rb @@ -1,7 +1,11 @@ class Player - attr_accessor :hand - def initialize(hand=nil) - @hand = hand ? JSON.parse(hand) : [] + attr_accessor :hand, :bank, :bet, :status + def initialize(opts=nil) + opts = opts ? JSON.parse(opts) : {} + @hand = opts['hand'] ? opts['hand'] : [] + @bank = opts['bank'] ? opts['bank'] : 1000 + @bet = opts['bet'] ? opts['bet'] : 0 + @status = opts['status'] end def sum @@ -17,7 +21,7 @@ def sum end end if ace - sum = sum + 11 < 21 ? sum + 11 : sum + 1 + sum = sum + 11 <= 21 ? sum + 11 : sum + 1 end sum end diff --git a/views/bet.erb b/views/bet.erb new file mode 100644 index 0000000..029fcb0 --- /dev/null +++ b/views/bet.erb @@ -0,0 +1,6 @@ +<%= redirect %> +
+ + + +
diff --git a/views/blackjack.erb b/views/blackjack.erb index 9ee4de3..171bb77 100644 --- a/views/blackjack.erb +++ b/views/blackjack.erb @@ -1,29 +1,15 @@ <% if ! game_over %> -PLAYER: <%= player.hand %>
-DEALER: <%= dealer.hand %> +<%= erb :'shared/play', :locals => { 'player' => player } %> -
- -
-
- -
-<% else -if (player.sum == 21 && dealer.sum != 21) || ( dealer.sum > 21 && player.sum < 21 ) || (player.sum > dealer.sum && player.sum < 21) - message = 'Congratulations, you\'ve won! ' +<% else %> +<%= erb :"shared/#{player.status.to_s}", :locals => {'bet' => player.bet} %> + -elsif player.sum == dealer.sum && player.sum <= 21 - message = "It's a tie!" -else - message = "Sorry, you\'ve lost!" -end -%> -

<%= message %>

PLAYER: <%= player.hand %>
DEALER: <%= dealer.hand %>
- -
+
+
<% end %> diff --git a/views/index.erb b/views/index.erb index f0017fc..5997bf8 100644 --- a/views/index.erb +++ b/views/index.erb @@ -1,2 +1,3 @@

Welcome to Blackjack!

-Play \ No newline at end of file +Play +Play Hand \ No newline at end of file diff --git a/views/shared/blackjack.erb b/views/shared/blackjack.erb new file mode 100644 index 0000000..ccca678 --- /dev/null +++ b/views/shared/blackjack.erb @@ -0,0 +1,4 @@ +

Blackjack! Naice.

+<% if bet > 0 %> + What the what?! You just made $<%= bet *= 1.5 %> in your bank!
+<% end %> \ No newline at end of file diff --git a/views/shared/loss.erb b/views/shared/loss.erb new file mode 100644 index 0000000..ae27e2b --- /dev/null +++ b/views/shared/loss.erb @@ -0,0 +1,4 @@ +

Better luck next time!

+<% if bet > 0 %> + You just lost $<%= bet %>
+<% end %> \ No newline at end of file diff --git a/views/shared/play.erb b/views/shared/play.erb new file mode 100644 index 0000000..1a170aa --- /dev/null +++ b/views/shared/play.erb @@ -0,0 +1,9 @@ +PLAYER: <%= player.hand %>
+ +
+ +
+ +
+ +
\ No newline at end of file diff --git a/views/shared/tie.erb b/views/shared/tie.erb new file mode 100644 index 0000000..b9076f5 --- /dev/null +++ b/views/shared/tie.erb @@ -0,0 +1 @@ +

Phew! It's a tie!

\ No newline at end of file diff --git a/views/shared/win.erb b/views/shared/win.erb new file mode 100644 index 0000000..5823bd5 --- /dev/null +++ b/views/shared/win.erb @@ -0,0 +1,4 @@ +

Congratulations! You've won!

+<% if bet > 0 %> + You're now $<%= bet %> richer!
+<% end %> \ No newline at end of file From 52e9e48358f53eb4403cff2ff566a874cf694dcd Mon Sep 17 00:00:00 2001 From: yxlau Date: Wed, 1 Feb 2017 21:58:06 +0800 Subject: [PATCH 06/15] Add some style --- app.rb | 4 + helpers/savers.rb | 1 + lib/deck.rb | 11 +- lib/player.rb | 9 +- public/custom.css | 32 ++++ public/normalize.css | 427 ++++++++++++++++++++++++++++++++++++++++++ public/skeleton.css | 418 +++++++++++++++++++++++++++++++++++++++++ views/bet.erb | 2 +- views/blackjack.erb | 6 +- views/index.erb | 7 +- views/layout.erb | 12 ++ views/shared/hand.erb | 16 ++ views/shared/loss.erb | 2 +- views/shared/play.erb | 10 +- views/shared/tie.erb | 2 +- views/shared/win.erb | 4 +- 16 files changed, 943 insertions(+), 20 deletions(-) create mode 100644 public/custom.css create mode 100644 public/normalize.css create mode 100644 public/skeleton.css create mode 100644 views/shared/hand.erb diff --git a/app.rb b/app.rb index 16bddec..3d03c3e 100644 --- a/app.rb +++ b/app.rb @@ -35,6 +35,10 @@ player = Player.new(session['player']) dealer = AI.new(session['dealer']) deck.deal(player, dealer) unless session['on'] + if dealer.blackjack? || player.blackjack? + deck.settle_winnings(player, dealer) + session['game_over'] = true + end session['on'] = true save_player('dealer', dealer) diff --git a/helpers/savers.rb b/helpers/savers.rb index 7c912e2..23e7dcc 100644 --- a/helpers/savers.rb +++ b/helpers/savers.rb @@ -10,4 +10,5 @@ def save_player(n, player) 'status' => player.status} session[n] = bundle.to_json end + end diff --git a/lib/deck.rb b/lib/deck.rb index fa73450..e58c2c0 100644 --- a/lib/deck.rb +++ b/lib/deck.rb @@ -5,16 +5,16 @@ def initialize(cards=nil) end def make_deck - %w{1 2 3 4 5 6 7 8 9 10 jack queen king ace}.product(%w{diamonds clubs hearts spades}).shuffle + %w{1 2 3 4 5 6 7 8 9 10 J Q K A}.product(%w{diamonds clubs hearts spades}).shuffle end def deal(one, two) 2.times do s = @cards.sample - one.hand << s + one.hand << s if one.hand.size < 2 @cards.delete(s) s = @cards.sample - two.hand << s + two.hand << s if two.hand.size < 2 @cards.delete(s) end end @@ -32,9 +32,12 @@ def settle_winnings(player, dealer) elsif player.sum == 21 && dealer.sum != 21 || player.sum > dealer.sum && player.sum < 21 || dealer.sum > 21 player.bank += player.bet player.status = :win - elsif player.sum == 21 && dealer.sum != 21 && player.hand.size == 2 + elsif player.blackjack? && ! dealer.blackjack? player.bank += player.bet * 1.5 player.status = :blackjack + elsif dealer.blackjack? && ! player.blackjack? + player.bank -= player.bet * 1.5 + player.status = :loss else player.status = :tie end diff --git a/lib/player.rb b/lib/player.rb index 0e037c4..954a20e 100644 --- a/lib/player.rb +++ b/lib/player.rb @@ -12,9 +12,9 @@ def sum sum = 0 ace = false @hand.each do |card| - if card[0] == 'ace' + if card[0] == 'A' ace = true - elsif card[0] == 'king' || card[0] == 'jack' || card[0] == 'queen' + elsif card[0] == 'K' || card[0] == 'J' || card[0] == 'Q' sum += 10 else sum += card[0].to_i @@ -25,6 +25,11 @@ def sum end sum end + + def blackjack? + self.sum == 21 + end + end class AI < Player diff --git a/public/custom.css b/public/custom.css new file mode 100644 index 0000000..2912afb --- /dev/null +++ b/public/custom.css @@ -0,0 +1,32 @@ +.container { + margin-top: 80px; +} +body { + font-family: "Roboto Mono"; +} +.card { + font-size: 10em; + margin-top: -20px; +} +.card .logo-right { + transform: rotate(15deg); +} +.card .logo-left { + transform: rotate(-15deg); +} +.card > div { + display: inline-block; + margin-top: -20px; +} +.card.small { + font-size: 2.5em; + display: inline-block; + margin-left: 1em; +} +.suit.red { + color: red; +} +form { + display: inline-block; + margin-top: 1em; +} \ No newline at end of file diff --git a/public/normalize.css b/public/normalize.css new file mode 100644 index 0000000..81c6f31 --- /dev/null +++ b/public/normalize.css @@ -0,0 +1,427 @@ +/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +audio, +canvas, +progress, +video { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + */ + +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ + +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9/10. + */ + +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ + +button, +input, +optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} \ No newline at end of file diff --git a/public/skeleton.css b/public/skeleton.css new file mode 100644 index 0000000..bb91808 --- /dev/null +++ b/public/skeleton.css @@ -0,0 +1,418 @@ +/* +* Skeleton V2.0.4 +* Copyright 2014, Dave Gamache +* www.getskeleton.com +* Free to use under the MIT license. +* http://www.opensource.org/licenses/mit-license.php +* 12/29/2014 +*/ + + +/* Table of contents +–––––––––––––––––––––––––––––––––––––––––––––––––– +- Grid +- Base Styles +- Typography +- Links +- Buttons +- Forms +- Lists +- Code +- Tables +- Spacing +- Utilities +- Clearing +- Media Queries +*/ + + +/* Grid +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +.container { + position: relative; + width: 100%; + max-width: 960px; + margin: 0 auto; + padding: 0 20px; + box-sizing: border-box; } +.column, +.columns { + width: 100%; + float: left; + box-sizing: border-box; } + +/* For devices larger than 400px */ +@media (min-width: 400px) { + .container { + width: 85%; + padding: 0; } +} + +/* For devices larger than 550px */ +@media (min-width: 550px) { + .container { + width: 80%; } + .column, + .columns { + margin-left: 4%; } + .column:first-child, + .columns:first-child { + margin-left: 0; } + + .one.column, + .one.columns { width: 4.66666666667%; } + .two.columns { width: 13.3333333333%; } + .three.columns { width: 22%; } + .four.columns { width: 30.6666666667%; } + .five.columns { width: 39.3333333333%; } + .six.columns { width: 48%; } + .seven.columns { width: 56.6666666667%; } + .eight.columns { width: 65.3333333333%; } + .nine.columns { width: 74.0%; } + .ten.columns { width: 82.6666666667%; } + .eleven.columns { width: 91.3333333333%; } + .twelve.columns { width: 100%; margin-left: 0; } + + .one-third.column { width: 30.6666666667%; } + .two-thirds.column { width: 65.3333333333%; } + + .one-half.column { width: 48%; } + + /* Offsets */ + .offset-by-one.column, + .offset-by-one.columns { margin-left: 8.66666666667%; } + .offset-by-two.column, + .offset-by-two.columns { margin-left: 17.3333333333%; } + .offset-by-three.column, + .offset-by-three.columns { margin-left: 26%; } + .offset-by-four.column, + .offset-by-four.columns { margin-left: 34.6666666667%; } + .offset-by-five.column, + .offset-by-five.columns { margin-left: 43.3333333333%; } + .offset-by-six.column, + .offset-by-six.columns { margin-left: 52%; } + .offset-by-seven.column, + .offset-by-seven.columns { margin-left: 60.6666666667%; } + .offset-by-eight.column, + .offset-by-eight.columns { margin-left: 69.3333333333%; } + .offset-by-nine.column, + .offset-by-nine.columns { margin-left: 78.0%; } + .offset-by-ten.column, + .offset-by-ten.columns { margin-left: 86.6666666667%; } + .offset-by-eleven.column, + .offset-by-eleven.columns { margin-left: 95.3333333333%; } + + .offset-by-one-third.column, + .offset-by-one-third.columns { margin-left: 34.6666666667%; } + .offset-by-two-thirds.column, + .offset-by-two-thirds.columns { margin-left: 69.3333333333%; } + + .offset-by-one-half.column, + .offset-by-one-half.columns { margin-left: 52%; } + +} + + +/* Base Styles +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +/* NOTE +html is set to 62.5% so that all the REM measurements throughout Skeleton +are based on 10px sizing. So basically 1.5rem = 15px :) */ +html { + font-size: 62.5%; } +body { + font-size: 1.5em; /* currently ems cause chrome bug misinterpreting rems on body element */ + line-height: 1.6; + font-weight: 400; + font-family: "Menlo", "Raleway", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #222; } + + +/* Typography +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +h1, h2, h3, h4, h5, h6 { + margin-top: 0; + margin-bottom: 2rem; + font-weight: 300; } +h1 { font-size: 4.0rem; line-height: 1.2; letter-spacing: -.1rem;} +h2 { font-size: 3.6rem; line-height: 1.25; letter-spacing: -.1rem; } +h3 { font-size: 3.0rem; line-height: 1.3; letter-spacing: -.1rem; } +h4 { font-size: 2.4rem; line-height: 1.35; letter-spacing: -.08rem; } +h5 { font-size: 1.8rem; line-height: 1.5; letter-spacing: -.05rem; } +h6 { font-size: 1.5rem; line-height: 1.6; letter-spacing: 0; } + +/* Larger than phablet */ +@media (min-width: 550px) { + h1 { font-size: 5.0rem; } + h2 { font-size: 4.2rem; } + h3 { font-size: 3.6rem; } + h4 { font-size: 3.0rem; } + h5 { font-size: 2.4rem; } + h6 { font-size: 1.5rem; } +} + +p { + margin-top: 0; } + + +/* Links +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +a { + color: #1EAEDB; } +a:hover { + color: #0FA0CE; } + + +/* Buttons +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +.button, +button, +input[type="submit"], +input[type="reset"], +input[type="button"] { + display: inline-block; + height: 38px; + padding: 0 30px; + color: #555; + text-align: center; + font-size: 11px; + font-weight: 600; + line-height: 38px; + letter-spacing: .1rem; + text-transform: uppercase; + text-decoration: none; + white-space: nowrap; + background-color: transparent; + border-radius: 4px; + border: 1px solid #bbb; + cursor: pointer; + box-sizing: border-box; } +.button:hover, +button:hover, +input[type="submit"]:hover, +input[type="reset"]:hover, +input[type="button"]:hover, +.button:focus, +button:focus, +input[type="submit"]:focus, +input[type="reset"]:focus, +input[type="button"]:focus { + color: #333; + border-color: #888; + outline: 0; } +.button.button-primary, +button.button-primary, +input[type="submit"].button-primary, +input[type="reset"].button-primary, +input[type="button"].button-primary { + color: #FFF; + background-color: #33C3F0; + border-color: #33C3F0; } +.button.button-primary:hover, +button.button-primary:hover, +input[type="submit"].button-primary:hover, +input[type="reset"].button-primary:hover, +input[type="button"].button-primary:hover, +.button.button-primary:focus, +button.button-primary:focus, +input[type="submit"].button-primary:focus, +input[type="reset"].button-primary:focus, +input[type="button"].button-primary:focus { + color: #FFF; + background-color: #1EAEDB; + border-color: #1EAEDB; } + + +/* Forms +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +input[type="email"], +input[type="number"], +input[type="search"], +input[type="text"], +input[type="tel"], +input[type="url"], +input[type="password"], +textarea, +select { + height: 38px; + padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */ + background-color: #fff; + border: 1px solid #D1D1D1; + border-radius: 4px; + box-shadow: none; + box-sizing: border-box; } +/* Removes awkward default styles on some inputs for iOS */ +input[type="email"], +input[type="number"], +input[type="search"], +input[type="text"], +input[type="tel"], +input[type="url"], +input[type="password"], +textarea { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; } +textarea { + min-height: 65px; + padding-top: 6px; + padding-bottom: 6px; } +input[type="email"]:focus, +input[type="number"]:focus, +input[type="search"]:focus, +input[type="text"]:focus, +input[type="tel"]:focus, +input[type="url"]:focus, +input[type="password"]:focus, +textarea:focus, +select:focus { + border: 1px solid #33C3F0; + outline: 0; } +label, +legend { + display: block; + margin-bottom: .5rem; + font-weight: 600; } +fieldset { + padding: 0; + border-width: 0; } +input[type="checkbox"], +input[type="radio"] { + display: inline; } +label > .label-body { + display: inline-block; + margin-left: .5rem; + font-weight: normal; } + + +/* Lists +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +ul { + list-style: circle inside; } +ol { + list-style: decimal inside; } +ol, ul { + padding-left: 0; + margin-top: 0; } +ul ul, +ul ol, +ol ol, +ol ul { + margin: 1.5rem 0 1.5rem 3rem; + font-size: 90%; } +li { + margin-bottom: 1rem; } + + +/* Code +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +code { + padding: .2rem .5rem; + margin: 0 .2rem; + font-size: 90%; + white-space: nowrap; + background: #F1F1F1; + border: 1px solid #E1E1E1; + border-radius: 4px; } +pre > code { + display: block; + padding: 1rem 1.5rem; + white-space: pre; } + + +/* Tables +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +th, +td { + padding: 12px 15px; + text-align: left; + border-bottom: 1px solid #E1E1E1; } +th:first-child, +td:first-child { + padding-left: 0; } +th:last-child, +td:last-child { + padding-right: 0; } + + +/* Spacing +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +button, +.button { + margin-bottom: 1rem; } +input, +textarea, +select, +fieldset { + margin-bottom: 1.5rem; } +pre, +blockquote, +dl, +figure, +table, +p, +ul, +ol, +form { + margin-bottom: 2.5rem; } + + +/* Utilities +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +.u-full-width { + width: 100%; + box-sizing: border-box; } +.u-max-full-width { + max-width: 100%; + box-sizing: border-box; } +.u-pull-right { + float: right; } +.u-pull-left { + float: left; } + + +/* Misc +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +hr { + margin-top: 3rem; + margin-bottom: 3.5rem; + border-width: 0; + border-top: 1px solid #E1E1E1; } + + +/* Clearing +–––––––––––––––––––––––––––––––––––––––––––––––––– */ + +/* Self Clearing Goodness */ +.container:after, +.row:after, +.u-cf { + content: ""; + display: table; + clear: both; } + + +/* Media Queries +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +/* +Note: The best way to structure the use of media queries is to create the queries +near the relevant code. For example, if you wanted to change the styles for buttons +on small devices, paste the mobile query code up in the buttons section and style it +there. +*/ + + +/* Larger than mobile */ +@media (min-width: 400px) {} + +/* Larger than phablet (also point when grid becomes active) */ +@media (min-width: 550px) {} + +/* Larger than tablet */ +@media (min-width: 750px) {} + +/* Larger than desktop */ +@media (min-width: 1000px) {} + +/* Larger than Desktop HD */ +@media (min-width: 1200px) {} diff --git a/views/bet.erb b/views/bet.erb index 029fcb0..3924a90 100644 --- a/views/bet.erb +++ b/views/bet.erb @@ -1,6 +1,6 @@ <%= redirect %>
- +
diff --git a/views/blackjack.erb b/views/blackjack.erb index 171bb77..f9074ba 100644 --- a/views/blackjack.erb +++ b/views/blackjack.erb @@ -6,9 +6,9 @@ <%= erb :"shared/#{player.status.to_s}", :locals => {'bet' => player.bet} %> -PLAYER: <%= player.hand %>
-DEALER: <%= dealer.hand %>
-
+
PLAYER:
<%= erb :'shared/hand', :locals => { 'player' => player} %>
+
DEALER:
<%= erb :'shared/hand', :locals => { 'player' => dealer} %>
+
diff --git a/views/index.erb b/views/index.erb index 5997bf8..dc802bb 100644 --- a/views/index.erb +++ b/views/index.erb @@ -1,3 +1,4 @@ -

Welcome to Blackjack!

-Play -Play Hand \ No newline at end of file +

Welcome to
Blackjack!

+
🂡
🂮
+Play +Play Hand \ No newline at end of file diff --git a/views/layout.erb b/views/layout.erb index f4d0de7..8c8a9da 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -2,8 +2,20 @@ Sinatra Blackjack + + + + +
+
+
+
<%= yield %> +
+
+
+
\ No newline at end of file diff --git a/views/shared/hand.erb b/views/shared/hand.erb new file mode 100644 index 0000000..bf9d0db --- /dev/null +++ b/views/shared/hand.erb @@ -0,0 +1,16 @@ +<% +html = '' +player.hand.each do |card| + html += '
' + card[0] + html += '' + html += '♠' if card[1] == 'spades' + html += '♥︎' if card[1] == 'hearts' + html += '♦︎' if card[1] == 'diamonds' + html += '♣︎' if card[1] == 'clubs' + html += '
' +end + %> +<%= html %> diff --git a/views/shared/loss.erb b/views/shared/loss.erb index ae27e2b..85e8fe9 100644 --- a/views/shared/loss.erb +++ b/views/shared/loss.erb @@ -1,4 +1,4 @@ -

Better luck next time!

+

Better luck
next time!

<% if bet > 0 %> You just lost $<%= bet %>
<% end %> \ No newline at end of file diff --git a/views/shared/play.erb b/views/shared/play.erb index 1a170aa..040a821 100644 --- a/views/shared/play.erb +++ b/views/shared/play.erb @@ -1,9 +1,13 @@ -PLAYER: <%= player.hand %>
+
Player:
+<%= erb :'shared/hand', :locals => {'player' => player} %> + +
- +
-
\ No newline at end of file +
+ diff --git a/views/shared/tie.erb b/views/shared/tie.erb index b9076f5..10e5755 100644 --- a/views/shared/tie.erb +++ b/views/shared/tie.erb @@ -1 +1 @@ -

Phew! It's a tie!

\ No newline at end of file +

Close call!
It's a tie!

\ No newline at end of file diff --git a/views/shared/win.erb b/views/shared/win.erb index 5823bd5..dda76ce 100644 --- a/views/shared/win.erb +++ b/views/shared/win.erb @@ -1,4 +1,4 @@ -

Congratulations! You've won!

+

Congratulations!

<% if bet > 0 %> - You're now $<%= bet %> richer!
+

You just won $<%= bet %>!

<% end %> \ No newline at end of file From 8b8f1facdec110b11904df2f6865aa5730a0213d Mon Sep 17 00:00:00 2001 From: yxlau Date: Wed, 1 Feb 2017 22:46:30 +0800 Subject: [PATCH 07/15] Fix bank --- app.rb | 16 ++++++++++++---- helpers/{savers.rb => sessions.rb} | 13 ++++++++++++- views/bet.erb | 5 +++-- 3 files changed, 27 insertions(+), 7 deletions(-) rename helpers/{savers.rb => sessions.rb} (53%) diff --git a/app.rb b/app.rb index 3d03c3e..57a29d7 100644 --- a/app.rb +++ b/app.rb @@ -4,26 +4,34 @@ require 'erb' require_relative 'lib/player' require_relative 'lib/deck' -require './helpers/savers' +require './helpers/sessions' enable :sessions -helpers Savers +helpers Sessions get '/' do + player = load_player(session['player']) if session['player'] session.clear + set_up_player(player) if player + erb :index end get '/bet' do - erb :bet, :locals => { 'redirect' => session['redirect_message']} + if session['player'] + bank = Player.new(session['player']).bank + else + bank = 1000 + end + erb :bet, :locals => { 'redirect' => session['redirect_message'], 'bank' => bank} end post '/bet' do player = Player.new(session['player']) player.bet = params[:bet].to_i if player.bank < player.bet - session['redirect_message'] = "Sorry, you don't have that much money (yet)! Please enter a different amount:" + session['redirect_message'] = "Sorry, you only have $#{player.bank}
Please enter a different amount:
" redirect '/bet' end save_player('player', player) diff --git a/helpers/savers.rb b/helpers/sessions.rb similarity index 53% rename from helpers/savers.rb rename to helpers/sessions.rb index 23e7dcc..02ace2f 100644 --- a/helpers/savers.rb +++ b/helpers/sessions.rb @@ -1,4 +1,4 @@ -module Savers +module Sessions def save_deck(deck) session['deck'] = deck.cards.to_json end @@ -11,4 +11,15 @@ def save_player(n, player) session[n] = bundle.to_json end + def load_player(session) + player = JSON.parse(session) + player.delete('hand') + player.delete('bet') + player + end + + def set_up_player(player) + player = Player.new(player.to_json) + save_player('player', player) + end end diff --git a/views/bet.erb b/views/bet.erb index 3924a90..ce41b28 100644 --- a/views/bet.erb +++ b/views/bet.erb @@ -1,6 +1,7 @@ <%= redirect %>
- - + +
+

You have $<%= bank %> available

From 22f8373a9854308169b160ba1288adf371a80949 Mon Sep 17 00:00:00 2001 From: yxlau Date: Wed, 1 Feb 2017 23:04:11 +0800 Subject: [PATCH 08/15] Add double --- app.rb | 24 +++++++++++++++--------- views/blackjack.erb | 2 +- views/shared/play.erb | 10 +++++++++- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/app.rb b/app.rb index 57a29d7..2c7956e 100644 --- a/app.rb +++ b/app.rb @@ -14,16 +14,11 @@ player = load_player(session['player']) if session['player'] session.clear set_up_player(player) if player - erb :index end get '/bet' do - if session['player'] - bank = Player.new(session['player']).bank - else - bank = 1000 - end + bank = session['player'] ? Player.new(session['player']).bank : 1000 erb :bet, :locals => { 'redirect' => session['redirect_message'], 'bank' => bank} end @@ -52,17 +47,16 @@ save_player('dealer', dealer) save_player('player', player) save_deck(deck) - erb :blackjack, :locals => {'deck' => deck, 'dealer' => dealer, 'player' => player, 'game_over' => session[:game_over]} + erb :blackjack, :locals => {'deck' => deck, 'dealer' => dealer, 'player' => player, 'game_over' => session[:game_over], 'double' => session[:double]} end post '/blackjack/hit' do deck = Deck.new(session['deck']) player = Player.new(session['player']) deck.hit(player) - save_deck(deck) save_player('player', player) - redirect to("/blackjack/stay") if player.sum > 21 + redirect to("/blackjack/stay") if player.sum > 21 || session['double'] redirect to('/blackjack') end @@ -77,3 +71,15 @@ save_player('dealer', dealer) redirect '/blackjack' end + +post '/blackjack/double' do + session['double'] = true + deck = Deck.new(session['deck']) + player = Player.new(session['player']) + deck.hit(player) + save_deck(deck) + player.bet *= 2 + save_player('player', player) + redirect to("/blackjack/stay") + +end diff --git a/views/blackjack.erb b/views/blackjack.erb index f9074ba..571eb0e 100644 --- a/views/blackjack.erb +++ b/views/blackjack.erb @@ -1,5 +1,5 @@ <% if ! game_over %> -<%= erb :'shared/play', :locals => { 'player' => player } %> +<%= erb :'shared/play', :locals => { 'player' => player, 'double' => double } %> <% else %> diff --git a/views/shared/play.erb b/views/shared/play.erb index 040a821..f05831c 100644 --- a/views/shared/play.erb +++ b/views/shared/play.erb @@ -9,5 +9,13 @@
-
+ + +<% unless double %> +
+ +
+<% end %> + + From 384b480e1fdebf2ce3b6ddc50384b89db5ec3238 Mon Sep 17 00:00:00 2001 From: yxlau Date: Wed, 1 Feb 2017 23:13:58 +0800 Subject: [PATCH 09/15] Add config.ru --- app.rb | 1 - config.ru | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 config.ru diff --git a/app.rb b/app.rb index 2c7956e..0cc2525 100644 --- a/app.rb +++ b/app.rb @@ -81,5 +81,4 @@ player.bet *= 2 save_player('player', player) redirect to("/blackjack/stay") - end diff --git a/config.ru b/config.ru new file mode 100644 index 0000000..87a561f --- /dev/null +++ b/config.ru @@ -0,0 +1,2 @@ +require './app.rb' +run Sinatra::Application \ No newline at end of file From 2489b3089f547cc063fcdf2d7960204310fbefae Mon Sep 17 00:00:00 2001 From: yxlau Date: Wed, 1 Feb 2017 23:32:13 +0800 Subject: [PATCH 10/15] Improve UI --- Gemfile | 1 + app.rb | 4 ++-- views/bet.erb | 2 +- views/blackjack.erb | 5 +++-- views/shared/blackjack.erb | 4 ++-- views/shared/loss.erb | 4 ++-- views/shared/play.erb | 7 +++++-- views/shared/win.erb | 4 ++-- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index fac8d49..c9ca562 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ # frozen_string_literal: true source "https://rubygems.org" +ruby "2.2.6" # gem "rails" gem 'sinatra' diff --git a/app.rb b/app.rb index 0cc2525..35f87a5 100644 --- a/app.rb +++ b/app.rb @@ -56,8 +56,8 @@ deck.hit(player) save_deck(deck) save_player('player', player) - redirect to("/blackjack/stay") if player.sum > 21 || session['double'] - redirect to('/blackjack') + redirect "/blackjack/stay" if player.sum > 21 || session['double'] + redirect '/blackjack' end get '/blackjack/stay' do diff --git a/views/bet.erb b/views/bet.erb index ce41b28..03c959c 100644 --- a/views/bet.erb +++ b/views/bet.erb @@ -1,6 +1,6 @@ <%= redirect %>
- +

You have $<%= bank %> available

diff --git a/views/blackjack.erb b/views/blackjack.erb index 571eb0e..b48ded4 100644 --- a/views/blackjack.erb +++ b/views/blackjack.erb @@ -3,12 +3,13 @@ <% else %> -<%= erb :"shared/#{player.status.to_s}", :locals => {'bet' => player.bet} %> +<%= erb :"shared/#{player.status.to_s}", :locals => {'player' => player} %>
PLAYER:
<%= erb :'shared/hand', :locals => { 'player' => player} %>
-
DEALER:
<%= erb :'shared/hand', :locals => { 'player' => dealer} %>
+
DEALER:
<%= erb :'shared/hand', :locals => { 'player' => dealer} %>

+You currently have $<%= player.bank %> in the bank.
diff --git a/views/shared/blackjack.erb b/views/shared/blackjack.erb index ccca678..67c1744 100644 --- a/views/shared/blackjack.erb +++ b/views/shared/blackjack.erb @@ -1,4 +1,4 @@

Blackjack! Naice.

-<% if bet > 0 %> - What the what?! You just made $<%= bet *= 1.5 %> in your bank!
+<% if player.bet > 0 %> + What the what?! You just made $<%= player.bet *= 1.5 %>!
<% end %> \ No newline at end of file diff --git a/views/shared/loss.erb b/views/shared/loss.erb index 85e8fe9..8aed1bc 100644 --- a/views/shared/loss.erb +++ b/views/shared/loss.erb @@ -1,4 +1,4 @@

Better luck
next time!

-<% if bet > 0 %> - You just lost $<%= bet %>
+<% if player.bet > 0 %> + You just lost $<%= player.bet %>
<% end %> \ No newline at end of file diff --git a/views/shared/play.erb b/views/shared/play.erb index f05831c..530efba 100644 --- a/views/shared/play.erb +++ b/views/shared/play.erb @@ -1,4 +1,7 @@ - +<% if player.bet > 0 %> +

Current bet:

+

$<%= player.bet %>

+<% end %>
Player:
<%= erb :'shared/hand', :locals => {'player' => player} %> @@ -11,7 +14,7 @@ -<% unless double %> +<% unless double || player.bet == 0 %>
diff --git a/views/shared/win.erb b/views/shared/win.erb index dda76ce..1c1c25a 100644 --- a/views/shared/win.erb +++ b/views/shared/win.erb @@ -1,4 +1,4 @@

Congratulations!

-<% if bet > 0 %> -

You just won $<%= bet %>!

+<% if player.bet > 0 %> +

You've just won $<%= player.bet %>!

<% end %> \ No newline at end of file From dc500ca211be894053ff822c2a1f6ce1f32ca7eb Mon Sep 17 00:00:00 2001 From: yxlau Date: Wed, 1 Feb 2017 23:38:29 +0800 Subject: [PATCH 11/15] Improve UI --- Gemfile | 1 + app.rb | 4 ++-- public/custom.css | 3 +++ views/bet.erb | 2 +- views/blackjack.erb | 9 ++++++--- views/shared/blackjack.erb | 4 ++-- views/shared/loss.erb | 4 ++-- views/shared/play.erb | 9 +++++++-- views/shared/win.erb | 4 ++-- 9 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index fac8d49..c9ca562 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ # frozen_string_literal: true source "https://rubygems.org" +ruby "2.2.6" # gem "rails" gem 'sinatra' diff --git a/app.rb b/app.rb index 0cc2525..35f87a5 100644 --- a/app.rb +++ b/app.rb @@ -56,8 +56,8 @@ deck.hit(player) save_deck(deck) save_player('player', player) - redirect to("/blackjack/stay") if player.sum > 21 || session['double'] - redirect to('/blackjack') + redirect "/blackjack/stay" if player.sum > 21 || session['double'] + redirect '/blackjack' end get '/blackjack/stay' do diff --git a/public/custom.css b/public/custom.css index 2912afb..4a5f20a 100644 --- a/public/custom.css +++ b/public/custom.css @@ -29,4 +29,7 @@ body { form { display: inline-block; margin-top: 1em; +} +.card-display { + margin: 3em auto 1em; } \ No newline at end of file diff --git a/views/bet.erb b/views/bet.erb index ce41b28..03c959c 100644 --- a/views/bet.erb +++ b/views/bet.erb @@ -1,6 +1,6 @@ <%= redirect %>
- +

You have $<%= bank %> available

diff --git a/views/blackjack.erb b/views/blackjack.erb index 571eb0e..e8a6ea6 100644 --- a/views/blackjack.erb +++ b/views/blackjack.erb @@ -1,14 +1,17 @@ <% if ! game_over %> + <%= erb :'shared/play', :locals => { 'player' => player, 'double' => double } %> <% else %> -<%= erb :"shared/#{player.status.to_s}", :locals => {'bet' => player.bet} %> - +<%= erb :"shared/#{player.status.to_s}", :locals => {'player' => player} %> +
PLAYER:
<%= erb :'shared/hand', :locals => { 'player' => player} %>
-
DEALER:
<%= erb :'shared/hand', :locals => { 'player' => dealer} %>
+
DEALER:
<%= erb :'shared/hand', :locals => { 'player' => dealer} %>

+
+You currently have $<%= player.bank %> in the bank.
diff --git a/views/shared/blackjack.erb b/views/shared/blackjack.erb index ccca678..67c1744 100644 --- a/views/shared/blackjack.erb +++ b/views/shared/blackjack.erb @@ -1,4 +1,4 @@

Blackjack! Naice.

-<% if bet > 0 %> - What the what?! You just made $<%= bet *= 1.5 %> in your bank!
+<% if player.bet > 0 %> + What the what?! You just made $<%= player.bet *= 1.5 %>!
<% end %> \ No newline at end of file diff --git a/views/shared/loss.erb b/views/shared/loss.erb index 85e8fe9..8aed1bc 100644 --- a/views/shared/loss.erb +++ b/views/shared/loss.erb @@ -1,4 +1,4 @@

Better luck
next time!

-<% if bet > 0 %> - You just lost $<%= bet %>
+<% if player.bet > 0 %> + You just lost $<%= player.bet %>
<% end %> \ No newline at end of file diff --git a/views/shared/play.erb b/views/shared/play.erb index f05831c..e1761c0 100644 --- a/views/shared/play.erb +++ b/views/shared/play.erb @@ -1,6 +1,11 @@ - +<% if player.bet > 0 %> +

Current bet:

+

$<%= player.bet %>

+<% end %> +
Player:
<%= erb :'shared/hand', :locals => {'player' => player} %> +
@@ -11,7 +16,7 @@
-<% unless double %> +<% unless double || player.bet == 0 %>
diff --git a/views/shared/win.erb b/views/shared/win.erb index dda76ce..1c1c25a 100644 --- a/views/shared/win.erb +++ b/views/shared/win.erb @@ -1,4 +1,4 @@

Congratulations!

-<% if bet > 0 %> -

You just won $<%= bet %>!

+<% if player.bet > 0 %> +

You've just won $<%= player.bet %>!

<% end %> \ No newline at end of file From da2ba1c1a5e4980a00c274aa9aecd1a234803143 Mon Sep 17 00:00:00 2001 From: yxlau Date: Thu, 2 Feb 2017 08:50:59 +0800 Subject: [PATCH 12/15] Reveal one of dealer's cards at all times --- views/blackjack.erb | 2 +- views/shared/one-card.erb | 13 +++++++++++++ views/shared/play.erb | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 views/shared/one-card.erb diff --git a/views/blackjack.erb b/views/blackjack.erb index e8a6ea6..7f2069a 100644 --- a/views/blackjack.erb +++ b/views/blackjack.erb @@ -1,6 +1,6 @@ <% if ! game_over %> -<%= erb :'shared/play', :locals => { 'player' => player, 'double' => double } %> +<%= erb :'shared/play', :locals => { 'player' => player, 'double' => double, 'dealer' => dealer } %> <% else %> diff --git a/views/shared/one-card.erb b/views/shared/one-card.erb new file mode 100644 index 0000000..7ff7db3 --- /dev/null +++ b/views/shared/one-card.erb @@ -0,0 +1,13 @@ +<% + html = '
' + card[0] + html += '' + html += '♠' if card[1] == 'spades' + html += '♥︎' if card[1] == 'hearts' + html += '♦︎' if card[1] == 'diamonds' + html += '♣︎' if card[1] == 'clubs' + html += '
' + %> +<%= html %> diff --git a/views/shared/play.erb b/views/shared/play.erb index e1761c0..4b40fc2 100644 --- a/views/shared/play.erb +++ b/views/shared/play.erb @@ -5,6 +5,8 @@
Player:
<%= erb :'shared/hand', :locals => {'player' => player} %> +
Dealer:
+<%= erb :'shared/one-card', :locals => {'card' => dealer.hand[0]} %>
From 4d08a479dc475b148dbd3f4e48e7fcecd8083d0f Mon Sep 17 00:00:00 2001 From: Yi-Xuan Lau Date: Thu, 2 Feb 2017 11:50:13 +0800 Subject: [PATCH 13/15] Fix font stuff --- public/custom.css | 2 +- views/layout.erb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/custom.css b/public/custom.css index 4a5f20a..8c410b5 100644 --- a/public/custom.css +++ b/public/custom.css @@ -2,7 +2,7 @@ margin-top: 80px; } body { - font-family: "Roboto Mono"; + font-family: "Roboto Mono", Menlo, "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; } .card { font-size: 10em; diff --git a/views/layout.erb b/views/layout.erb index 8c8a9da..a98b0fe 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -5,7 +5,8 @@ - + +
From 0f260686b1e02495c16744b92ab5ff96e8bdb60a Mon Sep 17 00:00:00 2001 From: Yi-Xuan Lau Date: Thu, 2 Feb 2017 11:57:51 +0800 Subject: [PATCH 14/15] Fix messages and viewport --- views/layout.erb | 1 + views/shared/win.erb | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/views/layout.erb b/views/layout.erb index a98b0fe..ac1048d 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -7,6 +7,7 @@ +
diff --git a/views/shared/win.erb b/views/shared/win.erb index 1c1c25a..511c56d 100644 --- a/views/shared/win.erb +++ b/views/shared/win.erb @@ -1,4 +1,6 @@

Congratulations!

<% if player.bet > 0 %>

You've just won $<%= player.bet %>!

-<% end %> \ No newline at end of file +<% else %> +

You've won!

+ <% end %> \ No newline at end of file From 542c51a8d15710af2a31097e0881678709475739 Mon Sep 17 00:00:00 2001 From: yxlau Date: Mon, 20 Feb 2017 08:50:03 +0800 Subject: [PATCH 15/15] Fix deck --- lib/deck.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/deck.rb b/lib/deck.rb index e58c2c0..be7288c 100644 --- a/lib/deck.rb +++ b/lib/deck.rb @@ -5,7 +5,7 @@ def initialize(cards=nil) end def make_deck - %w{1 2 3 4 5 6 7 8 9 10 J Q K A}.product(%w{diamonds clubs hearts spades}).shuffle + %w{2 3 4 5 6 7 8 9 10 J Q K A}.product(%w{diamonds clubs hearts spades}).shuffle end def deal(one, two)