gemillionaire 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0d866de6a4bcd45b10008c1683ec9ae7a323684a7046099aa009e25e4a1bf3
-  data.tar.gz: 44e42eb68cbfca9657e09bbc8095489fb19a3cad3220da73cd4d095e847c3fb9
+  metadata.gz: b7a56b2de74afac31e283228b91af07cabca44318cc81b630db09d3baef31a05
+  data.tar.gz: b3716f769696d89ffbaa73e387cbe117dcd29b701fd3f39bdf61500f309d8a3e
 SHA512:
-  metadata.gz: 828d8d95ec1f791ae665cac6584fd5fb2e2314ccf6938e872e30e4a438239fd3374a510e5f4b7dd65332946f422e09f8a89bf4b52bbd96335aeec68a778a6702
-  data.tar.gz: f8b5409ffc59032630ca3c69be1582d0880b0185d4055916379b2c901299c0c67da8d57b813eb610a3b432e5edccf161ab2dabf6fcbb85aef59614a1718446fc
+  metadata.gz: 989f12341762af136051061c7f163149ad76505cbf7ff5a09a2a29e6bf518a35b4b70294e7d258e5ee638a7000e9b36bf018e7852db08c0751e3a52b51807f5e
+  data.tar.gz: f1f28e1160363c58b5f03682a9093c33a023b2b60911ec2f2936072801f5d26636870a56d9429fb322c56163ad399ecbbeb39b9fdfe2a1389230d3c105132d95

data/lib/gemillionaire.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'gemillionaire/app'
+require "#{__dir__}/gemillionaire/app"
 
 app = App.new
 app.menu

data/lib/gemillionaire/app.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'csv'
 require 'tty-prompt'
 require 'colorize'
 
@@ -13,9 +14,10 @@ class App
   attr_accessor :questions, :statistics, :prizes, :main_menu
 
   def initialize
+    @args = ARGV.clone
     check_dependencies
-    @questions = JSON.parse(File.read('lib/gemillionaire/questions.json'))
-    @statistics = JSON.parse(File.read('lib/gemillionaire/hiscores.json'))
+    @questions = JSON.parse(File.read("#{__dir__}/questions.json"))
+    @statistics = JSON.parse(File.read("#{__dir__}/hiscores.json"))
     @prizes = ['0', '500', '1,000', '2,000', '3,000', '5,000', '7,500', '10,000', '12,500', '15,000',
                '25,000', '50,000', '100,000', '250,000', '500,000', '1,000,000'].freeze
     @main_menu = [
@@ -30,12 +32,12 @@ class App
     game = Game.new
     game.start
   end
-
+  
   def check_dependencies
-    missing_file = 'app.rb' unless File.exist?('lib/gemillionaire/app.rb')
-    missing_file = 'game.rb' unless File.exist?('lib/gemillionaire/game.rb')
-    missing_file = 'hiscores.json' unless File.exist?('lib/gemillionaire/hiscores.json')
-    missing_file = 'questions.json' unless File.exist?('lib/gemillionaire/questions.json')
+    missing_file = 'app.rb' unless File.exist?("#{__dir__}/app.rb")
+    missing_file = 'game.rb' unless File.exist?("#{__dir__}/game.rb")
+    missing_file = 'hiscores.json' unless File.exist?("#{__dir__}/hiscores.json")
+    missing_file = 'questions.json' unless File.exist?("#{__dir__}/questions.json")
     return unless missing_file
 
     puts 'Missing File Error'.bold.red
@@ -49,6 +51,10 @@ class App
     loop do
       system('clear')
       display_intro
+      if @args.include?('newgame')
+        @args = []
+        new_game
+      end
       prompt = prompt_instance
       puts ('─' * 50).yellow
       prompt.select("For best experience, please maximise your terminal.\n".bold, @main_menu)
@@ -79,7 +85,7 @@ class App
   end
 
   def run_hiscores
-    @statistics = JSON.parse(File.read('lib/gemillionaire/hiscores.json'))
+    @statistics = JSON.parse(File.read("#{__dir__}/hiscores.json"))
     games_played = @statistics['games_played'].to_i
     total_winnings = @statistics['total_winnings'].to_i
     average_earnings = games_played.zero? ? 0 : total_winnings / games_played

data/lib/gemillionaire/game.rb

@@ -24,25 +24,43 @@ class Game < App
     current_q = @q_sample[@score]
     score_table
     puts "\nQuestion #{@score + 1}: #{current_q['question']}\n".bold
-    display_ata if @lifelines[:ata][:status] == 'active'
-    display_paf if @lifelines[:paf][:status] == 'active'
+    display_lifelines
     prompt = prompt_instance
     prompt.select('Select an option:'.bold, gen_menu(current_q), per_page: 8)
   end
 
+  def display_lifelines
+    display_ask_the_audience if @lifelines[:ask][:status] == 'active'
+    display_phone_a_friend if @lifelines[:phone][:status] == 'active'
+  end
+
+  def display_ask_the_audience
+    puts 'Ask The Audience'.center(40, ' ')
+    @keys.each do |k, v|
+      print "#{k} - #{@lifelines[:ask][:value][v]}%".center(10, ' ')
+    end
+    puts "\n\n"
+  end
+
+  def display_phone_a_friend
+    puts 'Phone A Friend'.center(40, ' ')
+    puts "\'I think it's #{@lifelines[:phone][:value]}.\'".center(40, ' ')
+    puts
+  end
+
   def gen_menu(current_q)
-    answer_k = current_q['answer']
-    answer_v = current_q[answer_k]
+    answer_key = current_q['answer']
+    answer_value = current_q[answer_key]
     choices = %w[A B C D].map do |k|
-      { name: "#{k} - #{current_q[k]}", value: -> { check_answer(answer_k, answer_v, k) } }
+      { name: "#{k} - #{current_q[k]}", value: -> { check_answer(answer_key, answer_value, k) } }
     end
-    disable_answers(choices) if @lifelines[:ff][:status] == 'active'
-    add_lifelines(choices, answer_k)
+    disable_answers(choices) if @lifelines[:fifty][:status] == 'active'
+    add_lifelines(choices, answer_key)
   end
 
   def disable_answers(choices)
     @keys.each_value do |v|
-      if @lifelines[:ff][:value].include?(v)
+      if @lifelines[:fifty][:value].include?(v)
         choices[v][:name] = choices[v][:name].red
         choices[v][:disabled] = '- (50/50)'.red
       end
@@ -50,16 +68,16 @@ class Game < App
     choices
   end
 
-  def add_lifelines(choices, answer_k)
+  def add_lifelines(choices, answer_key)
     choices << { name: "Walk away with #{@prizes[@score].yellow.bold} 💎", value: -> { confirm_walk_away } }
-    choices << { name: ' ½ - 50/50', value: -> { fifty_fifty(answer_k) } }
-    choices << { name: '🗨  - Ask The Audience', value: -> { ask_the_audience(answer_k) } }
-    choices << { name: '📱 - Phone A Friend', value: -> { phone_a_friend(answer_k) } }
+    choices << { name: ' ½ - 50/50', value: -> { fifty_fifty(answer_key) } }
+    choices << { name: '🗨  - Ask The Audience', value: -> { ask_the_audience(answer_key) } }
+    choices << { name: '📱 - Phone A Friend', value: -> { phone_a_friend(answer_key) } }
     disable_lifelines(choices)
   end
 
   def lifeline_statuses
-    [@lifelines[:ff][:status], @lifelines[:ata][:status], @lifelines[:paf][:status]]
+    [@lifelines[:fifty][:status], @lifelines[:ask][:status], @lifelines[:phone][:status]]
   end
 
   def disable_lifelines(choices)
@@ -72,22 +90,8 @@ class Game < App
     choices
   end
 
-  def display_ata
-    puts 'Ask The Audience'.center(40, ' ')
-    @keys.each do |k, v|
-      print "#{k} - #{@lifelines[:ata][:value][v]}%".center(10, ' ')
-    end
-    puts "\n\n"
-  end
-
-  def display_paf
-    puts 'Phone A Friend'.center(40, ' ')
-    puts "\'I think it's #{@lifelines[:paf][:value]}.\'".center(40, ' ')
-    puts
-  end
-
-  def check_answer(answer_k, answer_v, input)
-    return you_lose(answer_k, answer_v) unless input == answer_k
+  def check_answer(answer_key, answer_value, input)
+    return you_lose(answer_key, answer_value) unless input == answer_key
 
     @score += 1
     reset_lifelines
@@ -95,9 +99,9 @@ class Game < App
   end
 
   def reset_lifelines
-    @lifelines[:ff][:status]  = 'used' if @lifelines[:ff][:status]  == 'active'
-    @lifelines[:ata][:status] = 'used' if @lifelines[:ata][:status] == 'active'
-    @lifelines[:paf][:status] = 'used' if @lifelines[:paf][:status] == 'active'
+    @lifelines[:fifty][:status]  = 'used' if @lifelines[:fifty][:status]  == 'active'
+    @lifelines[:ask][:status] = 'used' if @lifelines[:ask][:status] == 'active'
+    @lifelines[:phone][:status] = 'used' if @lifelines[:phone][:status] == 'active'
   end
 
   def you_win
@@ -108,8 +112,8 @@ class Game < App
     update_stats(1_000_000)
   end
 
-  def you_lose(answer_k, answer_v)
-    puts "Incorrect! The correct answer was #{answer_k} - #{answer_v}."
+  def you_lose(answer_key, answer_value)
+    puts "Incorrect! The correct answer was #{answer_key} - #{answer_value}."
     @game_over = true
     prize = @prizes[@score / 5 * 5] # removes remainder and returns nearest safe point at 0, 5 or 10
     puts "You won #{prize} 💎. Better luck next time!"
@@ -120,7 +124,7 @@ class Game < App
     @statistics['games_played'] = @statistics['games_played'].to_i + 1
     @statistics['total_winnings'] = @statistics['total_winnings'].to_i + prize
     @statistics['hiscore'] = prize if prize > @statistics['hiscore'].to_i
-    File.write('lib/gemillionaire/hiscores.json', JSON.dump(@statistics))
+    File.write("#{__dir__}/hiscores.json", JSON.dump(@statistics))
     any_key
   end
 
@@ -149,9 +153,9 @@ class Game < App
   end
 
   def fifty_fifty(answer)
-    @lifelines[:ff][:status] = 'active'
-    @lifelines[:ff][:value].slice!(@keys[answer])
-    @lifelines[:ff][:value].slice!(rand(2))
+    @lifelines[:fifty][:status] = 'active'
+    @lifelines[:fifty][:value].slice!(@keys[answer])
+    @lifelines[:fifty][:value].slice!(rand(2))
   end
 
   def rng_graph
@@ -167,15 +171,15 @@ class Game < App
   end
 
   def ask_the_audience(answer)
-    @lifelines[:ata][:status] = 'active'
+    @lifelines[:ask][:status] = 'active'
     return if rand(2).zero?
 
     # increase correct answer percentage by 30% and reduce others by 10%
-    @lifelines[:ata][:value].map!.with_index { |n, index| n + (index == @keys[answer] ? 30 : -10) }
+    @lifelines[:ask][:value].map!.with_index { |n, index| n + (index == @keys[answer] ? 30 : -10) }
   end
 
   def phone_a_friend(answer)
-    @lifelines[:paf][:status] = 'active'
-    @lifelines[:paf][:value] = rand(2).zero? ? %w[A B C D].sample : answer
+    @lifelines[:phone][:status] = 'active'
+    @lifelines[:phone][:value] = rand(2).zero? ? %w[A B C D].sample : answer
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemillionaire
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Matthew Sterling
@@ -16,11 +16,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/gemillionaire.rb
-- lib/gemillionaire/app.rb
-- lib/gemillionaire/game.rb
-- lib/gemillionaire/hiscores.json
-- lib/gemillionaire/questions.json
+- "./lib/gemillionaire.rb"
+- "./lib/gemillionaire/app.rb"
+- "./lib/gemillionaire/game.rb"
+- "./lib/gemillionaire/hiscores.json"
+- "./lib/gemillionaire/questions.json"
 homepage: https://rubygems.org/gems/gemillionaire
 licenses:
 - MIT