Subeen-Kim · Oct 19, 2017 · Oct 22, 2017 · Oct 23, 2017 · Oct 23, 2017 · Oct 23, 2017
diff --git a/Time.py b/Time.py
@@ -0,0 +1,36 @@
+"""
+    Subeen Kim
+    Input handling & time
+"""
+import pygame, time
+
+pygame.init()
+pygame.display.set_mode((400,300))
+pygame.display.set_caption('Mouse Input Test')
+
+"""pause untile frames_per_sec has passed"""
+clock = pygame.time.Clock()
+frames_per_sec = 30
+
+"""
+Input Handling
+    pygame.event.wait() : sit and block further game execution until an events comes along
+    pygame.event.poll() : will see whether there are any events wating for processing
+    pygame.evnet.get() : returns all of the currently-outstanding events
+"""
+
+playtime = 0
+running = True
+while running:
+    seconds = clock.tick(frames_per_sec)//30
+    playtime += seconds
+
+    for event in pygame.event.get():
+        if event.type == QUIT:
+            running = False
+        if event.type == KEYDOWN and event.key == K_ESCAPE:
+            running = False
+        if event.type == MOUSEBUTTONDOWN:
+            print (event.button)
+
+pygame.display.quit()
diff --git a/UI_Skeleton.py b/UI_Skeleton.py
@@ -1,25 +1,40 @@
-""" John Wen"""
+""" John Wen
+Time runs in milliseconds, (1000 = 1 second)
+"""
 
 import pygame
 import os
 
-# class powerupbox(object):
-#     def __init__(self, x0, x1, y0, y1):
-#         self.x0 = x0
-#         self.x1 = x1
-#         self.y0 = y0
-#         self.y1 = y1
+class powerupbox(object):
+    def __init__(self, x0, x1, y0, y1):
+        self.x0 = x0
+        self.x1 = x1
+        self.y0 = y0
+        self.y1 = y1
 
 pygame.init()
 
 background_color = (255,255,255)
 RED = (255,0,0)
 width, height = 640, 480
 
+"""Bunch of variables"""
 screen = pygame.display.set_mode((width, height))
 pygame.display.set_caption('Plague Simulation')
 screen.fill(background_color)
-RECT1 = pygame.Rect(600,440,40,40)
+
+UpgradeMenu = pygame.Rect(600,440,40,40)
+Timelocation = pygame.Rect(400,0,600,40)
+Populationlocation = pygame.Rect(0,440,300,400)
+"""Timer"""
+Time = 0
+ActiveTime = True
+font = pygame.font.SysFont('Consolas', 30)
+
+
+clock = pygame.time.Clock()
+
+
 
 running = True
 while running:
@@ -29,20 +44,29 @@
     """ circles represent classes for now"""
     pygame.draw.circle(screen, RED, (300,200),38)
     pygame.draw.circle(screen, (0,255,0), (150,250),36)
-    pygame.draw.circle(screen, (0,0,255), (200,450),30)
+    pygame.draw.circle(screen, (0,0,255), (200,350),30)
     """ Black box will be sending you to upgrade screen"""
-    pygame.draw.rect(screen, (0,0,0), RECT1)
-    """Red Rectangle will display time"""
-    pygame.draw.rect(screen, (RED), [300,0,600,40])
-    pygame.display.update()
-
-    if event.type == pygame.MOUSEBUTTONDOWN:
-            click = RECT1.collidepoint(pygame.mouse.get_pos())
+    pygame.draw.rect(screen, (0,0,0), UpgradeMenu)
+    """Time Display"""
+    pygame.draw.rect(screen, (0,0,0), Timelocation)
+    """Country Population Display"""
+    pygame.draw.rect(screen, (0,0,0), Populationlocation)
+    """timer display"""
+    screen.blit(font.render(str(pygame.time.get_ticks()/1000), True, (255, 255, 255)), (400, 0))
 
-            if click == 1:
-                print ('CLICKED!')
+    pygame.display.update()
 
-            click2 =
 
+    if event.type == pygame.MOUSEBUTTONDOWN:
+            if UpgradeMenu.collidepoint(pygame.mouse.get_pos()):
+                if pygame.time.get_ticks() > (Time + 1000):
+                    Time = pygame.time.get_ticks()
+                    if ActiveTime == True:
+                        pygame.time.wait(2000)
+                        Time - 1001
+                        ActiveTime = False
+                    else:
+                        ActiveTime = True
 
+                """ Compare last time clicked"""
 pygame.quit()
diff --git a/import.py b/import.py
diff --git a/location.py b/location.py
@@ -0,0 +1,9 @@
+def location(x,y):
+    x1 = x - 20
+    x2 = x + 20
+    y1 = y - 20
+    y2 = y + 20
+
+    indication = ImageDraw.Draw(img)
+    indication.ellipse((x1, y1, x2, y2))
+    img.save('newimage2.jpg')