From 219de54856e98ba2e26962592286b273b71204f9 Mon Sep 17 00:00:00 2001 From: Aaron Date: Sat, 23 Jan 2021 16:47:31 -0500 Subject: [PATCH] Adjusted RPS related actions --- ProjectClock/Base.lproj/Main.storyboard | 2 +- ProjectClock/MathExpressions.swift | 2 +- ProjectClock/NotificationLogic.swift | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard index d87ddd9..7cbd5d4 100644 --- a/ProjectClock/Base.lproj/Main.storyboard +++ b/ProjectClock/Base.lproj/Main.storyboard @@ -696,7 +696,7 @@ - + diff --git a/ProjectClock/MathExpressions.swift b/ProjectClock/MathExpressions.swift index 0a31d48..5a8171a 100644 --- a/ProjectClock/MathExpressions.swift +++ b/ProjectClock/MathExpressions.swift @@ -175,7 +175,7 @@ class RPS { else if you == .paper && computer == .rock { return true} else if you == .scissors && computer == .paper { return true } else { - return playRPS(you: you, computer: RPS.randomComputerChoice()) + return false } } diff --git a/ProjectClock/NotificationLogic.swift b/ProjectClock/NotificationLogic.swift index 640a349..29a620c 100644 --- a/ProjectClock/NotificationLogic.swift +++ b/ProjectClock/NotificationLogic.swift @@ -15,10 +15,12 @@ func walkAction() { } func jumpAction() { - let rps = RPS() + } -func rpsAction() { +func rpsAction(choice: RPS.Choice) -> Bool? { + let rps = RPS() + return rps.playRPS(you: choice, computer: RPS.randomComputerChoice()) }