Merge pull request #2 from dastels/master

Some renaming

Author: ladyada

adafruit_pyoa.py

@@ -197,7 +197,7 @@ def _wait_for_press(self, card):
 
         :param card: The active card
 
-        Return the id of the destination page.
+        Return the id of the destination card.
         """
         button01_text = card.get('button01_text', None)
         button02_text = card.get('button02_text', None)
@@ -209,25 +209,25 @@ def _wait_for_press(self, card):
                     # showing only middle button
                     if self._middle_button.contains(point_touched):
                         print("Middle button")
-                        return card.get('button01_goto_page_id', None)
+                        return card.get('button01_goto_card_id', None)
                 if button01_text and button02_text:
                     if self._left_button.contains(point_touched):
                         print("Left button")
-                        return card.get('button01_goto_page_id', None)
+                        return card.get('button01_goto_card_id', None)
                     if self._right_button.contains(point_touched):
                         print("Right button")
-                        return card.get('button02_goto_page_id', None)
+                        return card.get('button02_goto_card_id', None)
 
     def display_card(self, card_num):
-        """Display and handle input on a page.
+        """Display and handle input on a card.
 
         :param card_num: the index of the card to process
 
         """
         card = self._game[card_num]
         print(card)
         print("*"*32)
-        print('****{:^24s}****'.format(card['page_id']))
+        print('****{:^24s}****'.format(card['card_id']))
         print("*"*32)
 
         self._fade_to_black()
@@ -248,14 +248,14 @@ def display_card(self, card_num):
             time.sleep(auto_adv)
             return card_num+1
 
-        destination_page_id = self._wait_for_press(card)
+        destination_card_id = self._wait_for_press(card)
 
         self.play_sound(None)  # stop playing any sounds
-        for page_number, page_struct in enumerate(self._game):
-            if page_struct.get('page_id', None) == destination_page_id:
-                return page_number    # found the matching card!
+        for card_number, card_struct in enumerate(self._game):
+            if card_struct.get('card_id', None) == destination_card_id:
+                return card_number    # found the matching card!
         # eep if we got here something went wrong
-        raise RuntimeError("Could not find card with matching 'page_id': ", destination_page_id)
+        raise RuntimeError("Could not find card with matching 'card_id': ", destination_card_id)
 
     def play_sound(self, filename, *, wait_to_finish=True, loop=False):
         """Play a sound

examples/cyoa/cyoa.json

@@ -1,74 +1,74 @@
 [
   {
-    "page_id": "startup",
+    "card_id": "startup",
     "background_image": "startup.bmp",
     "sound": "startup.wav",
     "auto_advance": "5"
   },
   {
-    "page_id": "home",
+    "card_id": "home",
     "background_image": "home.bmp",
     "sound": "home.wav",
     "sound_repeat": "True",
     "button01_text": "Help",
-    "button01_goto_page_id": "help",
+    "button01_goto_card_id": "help",
     "button02_text": "Start",
-    "button02_goto_page_id": "1"
+    "button02_goto_card_id": "want to build?"
   },
 
   {
-    "page_id": "1",
+    "card_id": "want to build?",
     "background_image": "page01.bmp",
     "text": "You do not have any friends so you decide that it might be a good idea to build a robot friend. You're unsure if you want to do this, so now is the time to decide. Do you want to build a robot friend?",
     "text_color": "0x000001",
     "sound": "sound_01.wav",
     "button01_text": "Yes",
-    "button01_goto_page_id": "2",
+    "button01_goto_card_id": "continue?",
     "button02_text": "No",
-    "button02_goto_page_id": "4"
+    "button02_goto_card_id": "lazy"
   },
   {
-    "page_id": "2",
+    "card_id": "continue?",
     "background_image": "page02.bmp",
     "text": "You spend all day, then all week, then all month building a robot, everyone stops talking to you, however a lot of progress has been made. Do you want to keep making the robots?",
     "text_color": "0xFFFFFF",
     "button01_text": "Yes",
-    "button01_goto_page_id": "3",
+    "button01_goto_card_id": "robot friend",
     "button02_text": "No",
-    "button02_goto_page_id": "4"
+    "button02_goto_card_id": "lazy"
   },
   {
-    "page_id": "3",
+    "card_id": "robot friend",
     "background_image": "page03.bmp",
     "text": "The robot is now you're friend, everyone else wishes they had a robot, this is the best thing ever. Good work!",
     "text_color": "0xFFFFFF",
     "sound": "sound_03.wav",
     "button01_text": "Next",
-    "button01_goto_page_id": "happy_ending"
+    "button01_goto_card_id": "happy ending"
   },
   {
-    "page_id": "4",
+    "card_id": "lazy",
     "background_image": "page04.bmp",
     "sound": "sound_04.wav",
     "text": "Welp, not only will you not have any friends, you are lazy. What's the point of playing? Try again.",
     "text_color": "0xFFFFFF",
     "button01_text": "Start Over",
-    "button01_goto_page_id": "home"
+    "button01_goto_card_id": "home"
   },
   {
-    "page_id": "help",
+    "card_id": "help",
     "background_image": "help.bmp",
     "text": "All you need to do is click the buttons, that's it.\nThis is a new line.",
     "text_color": "0xFFFFFF",
     "button01_text": "Home",
-    "button01_goto_page_id": "home"
+    "button01_goto_card_id": "home"
   },
  {
-    "page_id": "happy_ending",
+    "card_id": "happy ending",
     "background_image": "happyending.bmp",
     "sound": "happy_ending.wav",
     "sound_repeat": "True",
     "button01_text": "Home",
-    "button01_goto_page_id": "home"
+    "button01_goto_card_id": "home"
   }
 ]