Merge pull request #57 from kymckay/Fix-milk-price

Fix milk price
kymckay · Mar 4, 2021 · ee2a182 · ee2a182
2 parents e768576 + 2852516
commit ee2a182
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/data/menu.csv b/data/menu.csv
@@ -47,7 +47,7 @@ B111, Water,2.0, false! L! None
 B112, Milkshake,4, false! S|M|L! Regular
 B113, Banana Smoothie,4.2, false! M! None
 B114, Strawbery Smoothie,4.3, false! S|M|L! None
-B115, Frappuccino,3.8, true! S|M|L! Soy
+B115, Frappuccino,3.8, true! S|M|L! Regular|Soy
 B116, Hot Chocolate,3.5, true! S|M|L! Regular|Oat
 B117, Orange Juice ,2.8, false! M! None
 B118, Apple Juice,2.8, false! M! None
diff --git a/src/main/java/sim/coffee/Milk.java b/src/main/java/sim/coffee/Milk.java
@@ -3,7 +3,7 @@
 //used in Beverage and OrderBeverage objects
 public enum Milk {
 	NONE (0), 
-	REGULAR (0.1),
+	REGULAR (0),
 	SOY (0.1),
 	OAT (0.15);