Fixed portfolio function

iblancett · Oct 19, 2017 · Oct 19, 2017 · Oct 19, 2017 · Oct 19, 2017 · Oct 20, 2017
commit 6f88e50d387af4183e557e57a94609fe49d890b7
diff --git a/Source/Level_Icons/robo1.png b/Source/Level_Icons/robo1.png
diff --git a/Source/courses.csv b/Source/courses.csv
@@ -1,8 +1,7 @@
-label,course,description,max,dependencies
-mech,Mechanical Prototyping,Learn techniques for mechanical design... and how to not kill your teammates,5,3bees1 4focs3 4elec2 5mats1
-bees,Sustainable Beekeeping,Beekeeping. Good for the environment. Ben Linder. Good for the soul.
-,3,2focs1 3mats2
-focs,Fundamentals of Computer Science,Step one:FOCS. Step two:Offical Hacker d00d. Step 3:Rule the world.,3,3elec1
-elec,Electricity and Magnetism,Does anyone know how electricity and magnetism work?,2,0
-mats,Material Science,Material science. Explore materials. Self-explanatory...right?,2,0
-robo,Fundamentals of Robotics,Death by Dave, but in a project-based-learning way.,1,2mech5 2bees3 2focs3 2elec2 2mats2
+label,course,description,max,dependencies,xrange
+mech,Mechanical Prototyping,Learn techniques for mechanical design... and how to not kill your teammates,5,3bees1 4focs3 4elec2 5mats1,841
+bees,Sustainable Beekeeping,Beekeeping. Good for the environment. Ben Linder. Good for the soul.,3,2focs1 3mats2,51
+focs,Fundamentals of Computer Science,Step one:FOCS. Step two:Offical Hacker d00d. Step 3:Rule the world.,3,3elec1,367
+elec,Electricity and Magnetism,Does anyone know how electricity and magnetism work?,2,0,209
+mats,Material Science,Material science. Explore materials. Self-explanatory...right?,2,0,683
+robo,Fundamentals of Robotics,Death by Dave but in a project-based-learning way.,1,2mech5 2bees3 2focs3 2elec2 2mats2,525
diff --git a/Source/courses.py b/Source/courses.py
@@ -29,6 +29,7 @@ def setup(self, config):
         self.description = config['description']
         self.max = config['max']
         self.reqs = config['dependencies']
+        self.range = config['xrange']
         self.lvl = 0
         self.order = 0
 
@@ -54,6 +55,7 @@ def populate():
         'description':'DESCRIPTION',
         'max': NUMBER OF LEVELS,
         'dependencies': 'LVL' + 'NEEDEDCOURSE' + 'NEEDEDLEVEL',
+        'xrange': 'MIN MAX'
     }
 
     returns: dictionary of all course instances
@@ -71,5 +73,3 @@ def populate():
         new_course = (create_course(row))
         all_courses[new_course.label] = new_course
     return all_courses
-
-populate()
diff --git a/Source/environment.py b/Source/environment.py
@@ -7,19 +7,19 @@
 import os
 import sys
 
-def initialize():
+def initialize(descriptions):
     """ Initializes graphic screen.
     """
     pygame.init()
     screen = pygame.display.set_mode((1000, 700))
     pygame.font.init()
-    font = pygame.font.Font(None,30)
+    font = pygame.font.Font(None,26)
     pygame.mouse.set_pos([500,350])
     pygame.mouse.set_visible(True)
-    text = setUpE(screen, font)
+    text = setUpE(screen, font, descriptions)
     return [screen, text]
 
-def setUpE(screen, font):
+def setUpE(screen, font, descriptions):
     '''This code is to load the basic backscreen for the program.
     setUpE is NOT to be run whenever the user clicks something, just at beginning.'''
     #loading/scaling images (loads as S___ for start, scaled as F___ for final)
@@ -53,12 +53,12 @@ def setUpE(screen, font):
     screen.blit(FMechProto_Icon,(841,550))
     #render text
     text = []
-    text.append(font.render("Bees?", 1, (255,255,255)))
-    text.append(font.render("Magic", 1, (255,255,255)))
-    text.append(font.render("Hacker d00d", 1, (255,255,255)))
-    text.append(font.render("beep boop", 1, (255,255,255)))
-    text.append(font.render("hm...", 1, (255,255,255)))
-    text.append(font.render("Mechie Art", 1, (255,255,255)))
+    text.append(font.render("Sustainable Beekeeping: %s" % descriptions[0], 1, (255,255,255)))
+    text.append(font.render("Electricity and Magnetism: %s" % descriptions[1], 1, (255,255,255)))
+    text.append(font.render("Fundamentals of Computer Science: %s" % descriptions[2], 1, (255,255,255)))
+    text.append(font.render("Fundamentals of Robotics: %s" % descriptions[3], 1, (255,255,255)))
+    text.append(font.render("Material Science: %s" % descriptions[4], 1, (255,255,255)))
+    text.append(font.render("Mechanical Prototyping: %s" % descriptions[5], 1, (255,255,255)))
     #Reload display / return font
     pygame.display.flip()
     return text
@@ -126,3 +126,12 @@ def updateImg(screen, img, location):
     loaded = pygame.transform.scale(pygame.image.load(img), (108, 100))
     screen.blit(loaded, location)
     pygame.display.flip()
+
+def update_portfolio(courses, screen):
+    labels = list(courses)
+    pygame.draw.rect(screen, (255,255,255), (0,10,1000,440))
+    for label in labels:
+        if courses[label].lvl:
+            img = 'Source/Level_Icons/%s%s.png' % (label, courses[label].lvl)
+            xmin = int(courses[label].range)
+            updateImg(screen, img, (xmin, 150))
diff --git a/Source/gameplay.py b/Source/gameplay.py
@@ -47,7 +47,7 @@ def level_up(self):
         """ level up any courses that meet all requirements starting with the
         user's previous choice
 
-        returns: None
+        returns: All courses
 
         Examples:
         >>> test_game = Gameplay(courses.populate(), 0)
@@ -64,7 +64,7 @@ def level_up(self):
                 # Check for maxed out and for dependencies
                 if int(self.courses[label].lvl) < int(self.courses[label].max) and self.check_reqs(label):
                     self.courses[label].lvl = self.courses[label].lvl + 1
-        return
+        return self.courses
 
     def check_reqs(self, label):
         """ given a course label, checks whether all dependencies are met

diff --git a/Source/main.py b/Source/main.py
@@ -7,13 +7,13 @@
 from gameplay import Gameplay
 import sys
 import pygame
-import ending
+#import ending
 from environment import *
 
 # INITIALIZE GAME
 BUTTON = pygame.USEREVENT + 1
 init_courses = courses.populate()
-text_screen = environment.initialize()
+text_screen = initialize([init_courses[label].description for label in list(init_courses)])
 screen = text_screen[0]
 text = text_screen[1]
 control = Gameplay(init_courses)
@@ -26,15 +26,16 @@
             sys.exit(1)
         if event.type == BUTTON:
             done = control.add_order(event)
-            control.level_up()
+            courses = control.level_up()
+            update_portfolio(courses, screen)
         mouseOver(text, screen)
         mouseClicks(control.order, BUTTON, screen)
     pygame.display.flip()
     pygame.event.pump()
 
 # EVALUATE ENDING AND SEND TO VICTORY SCREEN
-victory = control.evaluate_portfolio()
-if victory == 1:
-    ending.determine(victory, ["%s: %s" % (control.courses[course].name, 'MAX') for course in control.courses])
-else:
-    ending.determine(victory, ["%s: %s" % (control.courses[course].name, control.courses[course].lvl) for course in control.courses])
+#victory = control.evaluate_portfolio()
+#if victory == 1:
+#    ending.determine(victory, ["%s: %s" % (control.courses[course].name, 'MAX') for course in control.courses])
+#else:
+#    ending.determine(victory, ["%s: %s" % (control.courses[course].name, control.courses[course].lvl) for course in control.courses])
diff --git a/Source/portfolio.py b/Source/portfolio.py