From 54ff9ac5a81dbc7435f64e553ae9fbc6508cb538 Mon Sep 17 00:00:00 2001 From: Mike Adeleke Date: Mon, 9 Dec 2013 22:00:41 -0600 Subject: [PATCH 1/4] A lot of questions. need to go over it again --- superfight.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/superfight.rb b/superfight.rb index 081a711..d2a814b 100644 --- a/superfight.rb +++ b/superfight.rb @@ -6,6 +6,15 @@ puts "What is your second fighter's name?" fighter_b = $stdin.gets -match = Match.new(Fighter.new(fighter_a), Fighter.new(fighter_b)) +match = Match.new(Fighter.new(fighter_a), Fighter.new(fighter_b)) do + 13.times.map do + match = Match.new + if @fighter_a.strike == turn.winner + puts "Fighter A -- #{@fighter_a.name} -- won" + else + puts "Fighter B -- #{@fighter_b.name} -- won" + end + end +end puts "The winner of match is ....... #{match.winner.name}" From 332028d428ff78f14faa59fb6419375348f1e7b4 Mon Sep 17 00:00:00 2001 From: Mike Adeleke Date: Tue, 10 Dec 2013 20:05:23 -0600 Subject: [PATCH 2/4] Updates --- lib/match.rb | 2 ++ superfight.rb | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/match.rb b/lib/match.rb index 3d171bc..05c357a 100644 --- a/lib/match.rb +++ b/lib/match.rb @@ -7,6 +7,8 @@ def initialize(opponent_a, opponent_b) @opponent_a = opponent_a @opponent_b = opponent_b @turns = build_turns + @fighter_a = fighter_a + @fighter_b = fighter_b end def opponents diff --git a/superfight.rb b/superfight.rb index d2a814b..5b80d94 100644 --- a/superfight.rb +++ b/superfight.rb @@ -2,11 +2,11 @@ puts "What is your first fighter's name?" -fighter_a = $stdin.gets +@fighter_a = $stdin.gets puts "What is your second fighter's name?" -fighter_b = $stdin.gets +@fighter_b = $stdin.gets -match = Match.new(Fighter.new(fighter_a), Fighter.new(fighter_b)) do +match = Match.new(Fighter.new(@fighter_a), Fighter.new(@fighter_b)).tap do 13.times.map do match = Match.new if @fighter_a.strike == turn.winner From d51e80c29bc4d68cdc98f179990dc4e18da361af Mon Sep 17 00:00:00 2001 From: Mike Adeleke Date: Wed, 11 Dec 2013 14:39:45 -0600 Subject: [PATCH 3/4] More changes --- superfight.rb | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/superfight.rb b/superfight.rb index 5b80d94..19adb1b 100644 --- a/superfight.rb +++ b/superfight.rb @@ -18,3 +18,34 @@ end puts "The winner of match is ....... #{match.winner.name}" + +# Moving away from random winners + +class Move + + attr_reader :strike, :block, :leg_sweep + + def initialize + @strike = strike + @block = block + @leg_sweep = leg_sweep + end + + def moves + strike = 50 + block = 40 + leg_sweep = 60 + end +end + +match = Match.new(Fighter.new(@fighter_a), Fighter.new(@fighter_b)) do + 3.times.map do + match = Match.new + if @fighter_a.moves > @fighter_b.moves + puts "Fighter A -- #{@fighter_a.name} -- won" + else + puts "Fighter B -- #{@fighter_b.name} -- won" + end + end +end + From f6511b05cc042c5dc16e8b4c989f7c0a53c595e2 Mon Sep 17 00:00:00 2001 From: Mike Adeleke Date: Thu, 12 Dec 2013 20:10:51 -0600 Subject: [PATCH 4/4] More changes --- superfight.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/superfight.rb b/superfight.rb index 19adb1b..2efe65e 100644 --- a/superfight.rb +++ b/superfight.rb @@ -31,15 +31,23 @@ def initialize @leg_sweep = leg_sweep end - def moves + def values strike = 50 block = 40 leg_sweep = 60 end + + def moves + move = Move.new + # test + move.values{strike: 50, block: 40, leg_sweep: 60} + puts moves.values.to_i + + end end match = Match.new(Fighter.new(@fighter_a), Fighter.new(@fighter_b)) do - 3.times.map do + 13.times.map do match = Match.new if @fighter_a.moves > @fighter_b.moves puts "Fighter A -- #{@fighter_a.name} -- won"