Removed unnecesary files in the gameplay class, as well as merged gameplay.score with main.scoreController such that score and combo are now displayed properly on the screen

1 files changed, 0 insertions, 52 deletions

diff --git a/src/gameplay/Score.java b/src/gameplay/Score.java
deleted file mode 100644
index fa8ddfe..0000000
--- a/src/gameplay/Score.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*Name:	Guitar Hero Project
- *Description: Handles all the scoring for playing songs
- */
-package gameplay;
-
-import javafx.beans.property.IntegerProperty;
-
-public class Score
-{
-    private int combo=0;
-    private int comboMultiplier=1;
-    private int score=0;
-    
-    public void perfect() {
-        score += 300*comboMultiplier;
-        System.out.println("Perfect!");
-    }
-    
-    public void good() {
-        score += 100*comboMultiplier;
-        System.out.println("Good");
-    }
-    
-    public void miss() {
-        combo = 0;
-        comboMultiplier = 1;
-        System.out.println("Miss");
-    }
-    public void combo() {
-        combo++;
-        
-        if (combo == 2) {
-            comboMultiplier = 2;
-        }
-        
-        if (combo == 4) {
-            comboMultiplier = 4;
-        }
-        
-        if (combo == 8) {
-            comboMultiplier = 8;
-        }
-    }
-    
-    public int getScore() {
-        return score;
-    }
-    
-    public int getCombo() {
-        return combo;
-    }
-}