Skip to content

Turn in MP4 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hrrs wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Turn in MP4 #2

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
baa5be0
Adding a file
Oct 17, 2017
1dbc0df
!
Oct 18, 2017
ee78117
changes in class thursday
Oct 19, 2017
256aa6b
started adding head class
Oct 21, 2017
23474f1
previously functionality maintained while partially leaning on head c…
Oct 21, 2017
ce51878
Changed head class to Player class and extended features.
Oct 22, 2017
5dff7b1
Semantic changes to clean and compact the code.
Oct 22, 2017
7810d1a
Fixed edge detection
Oct 22, 2017
31d58af
Uncommented lines
Oct 22, 2017
a5f1509
Resolve merge conflicts
Oct 22, 2017
013835c
text + score when hitting wall
Oct 22, 2017
0a87478
Quit when hitting body
Oct 23, 2017
30b31be
Add fruit
Oct 23, 2017
85e039d
Achieve MVP
Oct 23, 2017
8a33589
Refactor game over screen
Oct 23, 2017
f7f4c7f
Add second player
Oct 23, 2017
d68bd14
Fix font multiplayer
Oct 23, 2017
04c3d5c
Add replay text
Oct 25, 2017
ccb9f6f
Add replay option
Oct 25, 2017
f0f4c3e
add comments
Oct 25, 2017
9d3a649
Combine previous versions
Oct 26, 2017
23a3e24
final game
Oct 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
previously functionality maintained while partially leaning on head c… 
…lass
  • Loading branch information
Harris Davidson
Harris Davidson committed Oct 21, 2017
commit 23474f1a6078dec11784d3f8d0bef349b5f5e3c3
28 changes: 19 additions & 9 deletions head.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,17 @@ def step():
'''
pass


### Directions
UP = (0,-1)
DOWN = (0,1)
LEFT = (-1,0)
RIGHT = (1,0)

HEAD_WIDTH = 30
HEAD_HEIGHT = 30
headSpeedX = 1
p1head = pygame.Rect(320, 240, HEAD_WIDTH, HEAD_HEIGHT)
# p1head = pygame.Rect(320, 240, HEAD_WIDTH, HEAD_HEIGHT)
p1head = Head(320,240,UP)
HEAD_COLOR = pygame.color.Color("red")
clock = pygame.time.Clock()

Expand All @@ -47,33 +52,38 @@ def step():
# clear screen with black color
clock.tick(30)
screen.fill( (0,0,0) ) #screen.fill(BLACK)
p1head.left = p1head.left + headSpeedX*direction[0]
p1head.top = p1head.top + headSpeedX*direction[1]
p1head.x = p1head.x + headSpeedX*direction[0]
p1head.y = p1head.y + headSpeedX*direction[1]
# p1head.left = p1head.left + headSpeedX*direction[0]
# p1head.top = p1head.top + headSpeedX*direction[1]
for event in pygame.event.get():
if event.type == KEYDOWN:
if event.key == K_LEFT:
direction = (-1,0)
direction = LEFT
#p1head.left = p1head.left - headSpeedX * 10
if event.key == K_RIGHT:
direction = (1,0)
direction = RIGHT
#p1head.left = p1head.left + headSpeedX * 10
if event.key == K_UP:
direction = (0,-1)
direction = UP
#p1head.top = p1head.top - headSpeedX * 10
if event.key == K_DOWN:
direction = (0,1)
direction = DOWN
#p1head.top = p1head.top + headSpeedX * 10
'''
if p1head.left <= 0 or p1head.left >= 640:
#screen.blit(textsurface,(0,0))
running = False
if p1head.top <= 0 or p1head.top >= 480:
running = False
'''
if event.type == QUIT: #write this one indent out to quit!
pygame.quit()
sys.exit()
pygame.display.update()

# draw the paddle
screen.fill( HEAD_COLOR, p1head );
p1head.sprite.center = p1head.x,p1head.y
screen.fill( HEAD_COLOR, p1head.sprite );

pygame.display.update()