X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=lightcards%2Fdeck.py;h=110c5b4fdcee15ab50a27c5eca2ea52dfa3a0ee7;hb=468d491893758e3b9ac532757ea98791303f4a6d;hp=e3ef5c523a3a27d0068c23882be9c541e91aee62;hpb=852be3a599b3686e20b2f3bfe10291380fcc5ff7;p=lightcards.git

diff --git a/lightcards/deck.py b/lightcards/deck.py
index e3ef5c5..110c5b4 100644
--- a/lightcards/deck.py
+++ b/lightcards/deck.py
@@ -1,9 +1,22 @@
 # Classes pertaining to the card deck
 # Armaan Bhojwani 2021
 
-class Card(list):
-    """Card extends the list class, and adds ability to star them."""
-    starred = False
+
+class Card:
+    """Class containing the card information."""
+
+    def __init__(self, inp):
+        self.starred = False
+        self.side = 0
+        self.front = ""
+        self.back = ""
+        if len(inp) >= 1:
+            self.front = inp[0]
+        if len(inp) >= 2:
+            self.back = inp[1]
+
+    def __str__(self):
+        return f"{self.front}, {self.back}"
 
     def unStar(self):
         self.starred = False
@@ -26,19 +39,20 @@ class Card(list):
         else:
             return "Not starred"
 
+    def setSide(self, inp):
+        self.side = inp
 
-class Status():
-    """The status class keeps track of where in the deck the user is"""
-    index = 0
-    side = 0
+    def getSide(self):
+        return self.side
 
-    def forward(self, stack):
-        if not self.index == len(stack):
-            self.index += 1
+    def get(self):
+        if self.side == 0:
+            return self.front
+        else:
+            return self.back
 
-    def back(self):
-        if not self.index < 1:
-            self.index -= 1
+    def getFront(self):
+        return self.front
 
     def flip(self):
         if self.side == 0:
@@ -46,14 +60,23 @@ class Status():
         else:
             self.side = 0
 
-    def setSide(self, inp):
-        self.side = inp
+
+class Status:
+    """Keeps track of where in the deck the user is"""
+
+    def __init__(self):
+        self.index = 0
+
+    def forward(self, stack):
+        if self.index != len(stack):
+            self.index += 1
+
+    def back(self):
+        if not self.index < 1:
+            self.index -= 1
 
     def setIdx(self, inp):
         self.index = inp
 
-    def getSide(self):
-        return self.side
-
     def getIdx(self):
         return self.index