adding colors and stress

3 files changed, 46 insertions, 20 deletions

diff --git a/bridge.py b/bridge.py
index 42916e7..45b718a 100644
--- a/bridge.py
+++ b/bridge.py
@@ -7,8 +7,11 @@ class Bridge:
         self.world = game.world
         self.joints = []
         self.cost = 0
+        self.stress = 0
+        self.capacity = 1
 
     def create_world(self):
+        self.world.set_color((100,150,50))
         rect = pygame.Rect((-400,800), (750, -250))
         rect.normalize()
         pygame.draw.rect(self.screen, (100,180,255), rect, 3)
@@ -19,6 +22,7 @@ class Bridge:
         pygame.draw.rect(self.screen, (100,180,255), rect, 3)
         self.world.add.rect(rect.center, rect.width / 2, rect.height / 2,
             dynamic=False)
+        self.world.reset_color()
 
     def add_cost(self, value):
         self.cost = self.cost + value
@@ -28,48 +32,53 @@ class Bridge:
         print "joint added!"
         self.joints.append(joint)
         self.add_cost(100)
+        self.capacity += 500
 
     def box_added(self):
         self.add_cost(10)
 
     def for_each_frame(self):
+        self.stress = 0
         for joint in self.joints:
             force = joint.GetReactionForce().Length()
+            self.stress += force
             if force > 500:
                 print "destroy joint!"
                 self.world.world.DestroyJoint(joint)
                 self.joints.remove(joint)
+                self.capacity -= 500
 
-    def create_train(game, worldpoint = (-100,490), train = (100, 50), wheelrad = 20, cars = 3):
+    def create_train(self, worldpoint = (-100,490), train = (100, 50), wheelrad = 20, cars = 3):
         points = []
         for i in range(0,cars):
             startpoint = (worldpoint[0]-(train[0]+7)*i, worldpoint[1])
             points.append(startpoint)
             rect = pygame.Rect(startpoint, train)
             rect.normalize()
-            pygame.draw.rect(game.screen, (200, 50, 100), rect, 3)
-    
-            game.world.add.rect(rect.center, rect.width / 2, rect.height / 2,
+            pygame.draw.rect(self.screen, (200, 50, 100), rect, 3)
+            self.world.add.rect(rect.center, rect.width / 2, rect.height / 2,
                 dynamic = True, density=10.0, restitution=0.16, friction=0.5)
-    
+                
+            self.world.set_color((0,0,0))
             rearwheel = (startpoint[0]+wheelrad,startpoint[1]+train[1]-wheelrad/2)
-            pygame.draw.circle(game.screen, (0,0,0), rearwheel, wheelrad, 3)
-            game.world.add.ball(rearwheel,wheelrad, dynamic=True, density=10.0, 
+            pygame.draw.circle(self.screen, (0,0,0), rearwheel, wheelrad, 3)
+            self.world.add.ball(rearwheel,wheelrad, dynamic=True, density=10.0, 
                 restitution=0.16, friction=0.5)
     
             frontwheel = (startpoint[0]+train[0]-wheelrad,startpoint[1]+train[1]-wheelrad/2)
-            pygame.draw.circle(game.screen, (0,0,0), frontwheel, wheelrad, 3)
-            game.world.add.ball(frontwheel,wheelrad, dynamic=True, density=10.0, 
+            pygame.draw.circle(self.screen, (0,0,0), frontwheel, wheelrad, 3)
+            self.world.add.ball(frontwheel,wheelrad, dynamic=True, density=10.0, 
                 restitution=0.16, friction=0.5)
-    
-            rearaxle = game.world.get_bodies_at_pos(rearwheel)
-            frontaxle = game.world.get_bodies_at_pos(frontwheel)
-            game.world.add.jointMotor(rearaxle[0],rearaxle[1],rearwheel)
-            game.world.add.jointMotor(frontaxle[0],frontaxle[1],frontwheel)
+            self.world.reset_color()
+            
+            rearaxle = self.world.get_bodies_at_pos(rearwheel)
+            frontaxle = self.world.get_bodies_at_pos(frontwheel)
+            self.world.add.jointMotor(rearaxle[0],rearaxle[1],rearwheel)
+            self.world.add.jointMotor(frontaxle[0],frontaxle[1],frontwheel)
             
         for i in range(1,len(points)):
             backlink = (points[i][0]+train[0]-1,points[i][1]+train[1]-1)
             frontlink = (points[i-1][0]+1,points[i-1][1]+train[1]-1)
-            btrain = game.world.get_bodies_at_pos(backlink)
-            ftrain = game.world.get_bodies_at_pos(frontlink)

-            game.world.add.distanceJoint(btrain[0], ftrain[0], backlink, frontlink)
+            btrain = self.world.get_bodies_at_pos(backlink)
+            ftrain = self.world.get_bodies_at_pos(frontlink)

+            self.world.add.distanceJoint(btrain[0], ftrain[0], backlink, frontlink)
diff --git a/physics.py b/physics.py
index b46ee52..f784e41 100644
--- a/physics.py
+++ b/physics.py
@@ -65,7 +65,7 @@ class PhysicsGame:
             for event in pygame.event.get():
                 self.currentTool.handleEvents(event)
             # Clear Display
-            self.screen.fill((255,255,255)) #255 for white
+            self.screen.fill((80,160,240)) #255 for white
 
             if self.world.run_physics:
                 self.bridge.for_each_frame()
@@ -80,7 +80,11 @@ class PhysicsGame:
             #Print all the text on the screen
             text = self.font.render("Total Cost: %d" % self.bridge.cost, True, (0,0,0))
             textpos = text.get_rect(left=700,top=7)
-            self.screen.blit(text,textpos)  
+            self.screen.blit(text,textpos)
+            ratio = self.bridge.stress*100/self.bridge.capacity
+            text = self.font.render("Stress: %d%%" % ratio, True, (0,0,0))
+            textpos = text.get_rect(left=700,top=25)
+            self.screen.blit(text,textpos)
 
             
             # Flip Display
diff --git a/tools.py b/tools.py
index 57c92fb..ec291d2 100644
--- a/tools.py
+++ b/tools.py
@@ -144,6 +144,10 @@ class BoxTool(Tool):
         self.name = "Box"
         self.pt1 = None        
         self.rect = None
+        self.red = 20
+        self.green = 20
+        self.blue = 20
+        self.colordiff = 20
     def handleEvents(self,event):
         #look for default events, and if none are handled then try the custom events 
         if not super(BoxTool,self).handleEvents(event):
@@ -153,8 +157,17 @@ class BoxTool(Tool):
             elif event.type == MOUSEBUTTONUP:
                 if event.button == 1 and self.pt1!=None:                                 
                     if self.rect.width > 10 and self.rect.height > 10: # elements doesn't like small shapes :(
+                        self.game.world.set_color((self.red,self.green,self.blue))
+                        self.red += self.colordiff
+                        self.green += self.colordiff
+                        self.blue += self.colordiff
+                        if self.red > 200:
+                            self.colordiff *= -1
+                        elif self.red < 20:
+                            self.colordiff *= -1
                         self.game.world.add.rect(self.rect.center, self.rect.width/2, self.rect.height/2, dynamic=True, density=1.0, restitution=0.16, friction=0.5)
                         self.game.bridge.box_added()
+                        self.game.world.reset_color()
                     self.pt1 = None        
                                 
     def draw(self):
@@ -164,7 +177,7 @@ class BoxTool(Tool):
             height = pygame.mouse.get_pos()[1] - self.pt1[1]
             self.rect = pygame.Rect(self.pt1, (width, height))
             self.rect.normalize()           
-            pygame.draw.rect(self.game.screen, (100,180,255),self.rect,3)   
+            pygame.draw.rect(self.game.screen, (50,70,90),self.rect,3)   
     def cancel(self):
         self.pt1 = None  
         self.rect = None