Skip to content
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.

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

Some edit #3

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions DuckLib.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
pygame.init()

#Load in images
<<<<<<< HEAD
#<<<<<<< HEAD
dogImg = [pygame.image.load("DogIdle.gif"),
pygame.image.load("DogDuck.gif")]
duckImg = [[pygame.image.load("duckUD1.gif"),
pygame.image.load("duckUD2.gif"),
duckImg = [[pygame.image.load("DuckUD1.gif"),
pygame.image.load("DuckUD2.gif"),
pygame.image.load("DuckUD3.gif")],
[pygame.image.load("DuckF1.gif"),
pygame.image.load("DuckF2.gif"),
pygame.image.load("DuckF3.gif")],
[pygame.image.load("DuckShot.gif")],
[pygame.image.load("DuckFall.gif"),
pygame.transform.flip(pygame.image.load("DuckFall.gif"), True, False)]]
=======
#=======
dogImg = [pygame.image.load("DogIdle.gif"),
pygame.image.load("DogDuck.gif")]
duckImg = [[pygame.image.load("DuckUD1.gif"),
Expand All @@ -33,7 +33,7 @@
[pygame.image.load("DuckShot.gif")],
[pygame.image.load("DuckFall.gif"),
pygame.transform.flip(pygame.image.load("DuckFall.gif"), True, False)]]
>>>>>>> 807f2a1445c56b1e479d2d67e67c99226717903b
#>>>>>>> 807f2a1445c56b1e479d2d67e67c99226717903b
negaDuckImg = [[pygame.image.load("DarkwingSp.gif")],
[pygame.image.load("DarkwingFlap.gif"),
pygame.image.load("DarkwingFlap2.gif")]]
Expand Down
194 changes: 111 additions & 83 deletions DuckRehunt.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,103 +6,131 @@
"""

import pygame, random
from datetime import datetime
pygame.init()

from DuckLib import *
#from WorldState import *



screen = pygame.display.set_mode((640,480))
screen = pygame.display.set_mode((640,480))
screen_dim = screen.get_rect()

##class World():
##
## def __init__(self):
## self.TITLE = 1
## self.
## def __init__(self):
## self.TITLE = 1
## self.

def main():

pygame.display.set_caption("Duck Rehunt: Reckoning")
pygame.mixer.init()
pygame.mixer.Sound("Music.ogg").play(-1)

background = pygame.Surface(screen.get_size())
background.blit(pygame.image.load("Background.gif"), (0,0))
screen.blit(background, (0,0))


foreground = setPiece(pygame.image.load("Foreground.gif"), (0,301), 1 )
hud = setPiece(pygame.image.load("Hud.gif"), (22, 400), 3 )
setSprites = pygame.sprite.LayeredUpdates( foreground , hud)

dSprites.add(Dog())

crosshair = pygame.sprite.Group(Crosshair())

keepGoing = True
pause = 0
delay = 60
shotScore = 0
global score, ducks

scoreFont = pygame.font.Font("duckhunt.ttf",20)
scoreboard = scoreFont.render("%d" % score, 1, (255,255,255))


clock = pygame.time.Clock()

while keepGoing:

clock.tick(60)
pygame.mouse.set_visible(False)

for event in pygame.event.get():
if event.type == pygame.QUIT:
keepGoing = False
elif event.type == pygame.MOUSEBUTTONDOWN:
gunshot.play()
flash.add(Flash())
pointCollide = [sprite for sprite in dSprites.sprites() if sprite.rect.collidepoint(pygame.mouse.get_pos())]
if pointCollide != []:
for sprite in pointCollide:
if not sprite.dog and not sprite.isDead:
sprite.isDead = True
sprite.pause = 0
if sprite.enemy:
shotScore -= 50
else:
shotScore += 5
sprite.setAnim()
shotScore *= len(pointCollide)
score += shotScore
shotScore = 0
scoreboard = scoreFont.render("%d" % score, 1, (255,255,255))


#Garbage collection
pause+= 1
if pause >= delay:

dSprites.remove([sprite for sprite in dSprites.sprites() if sprite.rect.centery >= 500])

dSprites.clear(screen, background)
crosshair.clear(screen, background)
flash.clear(screen, background)

dSprites.update()
crosshair.update()
flash.update()

dSprites.draw(screen)
setSprites.draw(screen)
screen.blit(scoreboard, (540,410))
flash.draw(screen)
crosshair.draw(screen)
pygame.display.flip()
pygame.display.set_caption("Duck Rehunt: Reckoning")
pygame.mixer.init()
pygame.mixer.Sound("Music.ogg").play(-1)

background = pygame.Surface(screen.get_size())
background.blit(pygame.image.load("Background.gif"), (0,0))
screen.blit(background, (0,0))


foreground = setPiece(pygame.image.load("Foreground.gif"), (0,301), 1 )
hud = setPiece(pygame.image.load("Hud.gif"), (22, 400), 3 )
setSprites = pygame.sprite.LayeredUpdates( foreground , hud)

dSprites.add(Dog())

crosshair = pygame.sprite.Group(Crosshair())

keepGoing = True
pause = 0
delay = 60
shotScore = 0
global score, ducks

time=30
ammo=4
nba=100

scoreFont = pygame.font.Font("duckhunt.ttf",20)
timeFont=pygame.font.Font("duckhunt.ttf",20)
ammoFont=pygame.font.Font("duckhunt.ttf",20)
scoreboard = scoreFont.render("%d" % score, 1, (255,255,255))
timestamp=timeFont.render("%d" % time, 1, (255,255,255))
ammoboard=timeFont.render("%d" % ammo, 1, (255,255,255))

timel=30
frt=datetime.now()
clock = pygame.time.Clock()

while keepGoing:

clock.tick(60)
time=timel-(datetime.now()-frt).seconds
pygame.mouse.set_visible(False)

for event in pygame.event.get():
if event.type == pygame.QUIT:
keepGoing = False
elif event.type == pygame.MOUSEBUTTONDOWN:
gunshot.play()
ammo-=1
flash.add(Flash())
pointCollide = [sprite for sprite in dSprites.sprites() if sprite.rect.collidepoint(pygame.mouse.get_pos())]
if pointCollide != []:
for sprite in pointCollide:
if not sprite.dog and not sprite.isDead:
sprite.isDead = True
sprite.pause = 0
if sprite.enemy:
shotScore -= 50
else:
frt=datetime.now()
shotScore += 5
ammo+=1
sprite.setAnim()
shotScore *= len(pointCollide)
score += shotScore
if score==nba:
ammo+=1
nba+=100
shotScore = 0
scoreboard = scoreFont.render("%d" % score, 1, (255,255,255))
timestamp=timeFont.render("%d" % time, 1, (255,255,255))
ammoboard=timeFont.render("%d" % ammo, 1, (255,255,255))


#Garbage collection
pause+= 1
if pause >= delay:

dSprites.remove([sprite for sprite in dSprites.sprites() if sprite.rect.centery >= 500])

dSprites.clear(screen, background)
crosshair.clear(screen, background)
flash.clear(screen, background)

dSprites.update()
crosshair.update()
flash.update()

dSprites.draw(screen)
setSprites.draw(screen)
screen.blit(scoreboard, (530,420))
screen.blit(timestamp,(290,420))
screen.blit(ammoboard,(40,420))
flash.draw(screen)
crosshair.draw(screen)
pygame.display.flip()
if time<=0 or ammo<=0:
pygame.draw.rect(screen,(255,255,255),(228,98,204,54))
pygame.draw.rect(screen,(0,0,0),(230,100,200,50))
screen.blit((pygame.font.Font("duckhunt.ttf",30)).render("GAME OVER",False,(255,255,255)),(240,112))
pygame.display.flip()
pygame.time.wait(1000)
keepGoing=False

if __name__ == "__main__":
main()
main()

pygame.quit()
pygame.quit()
Binary file added Hud.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ Changelog:
-Separate library file for classes
-GNU GPL added.

0.6 (07/03/2019)
-Ammo counting
-Time left counting
-Game over added

Think about it. Everyone has played Duck Hunt unless they've been living under a rock. Those dead ducks have got to be accumulating. The dog is back and, using his terrible terrible powers of resurrection, is reanimating the corpses of dead ducks left in the grass for his own sinister purpose.

This is a work in progress. The scoring is completely broken and the game does not end but the basic mechanics are in place. I plan on cleaning up the code and getting some separate files going in the next week or so.
Expand All @@ -30,7 +35,6 @@ Requirements:
Coming Soon:

-Win Condition
-Hud
-Boss fight?


Expand Down
Binary file added duckhunt.ttf
Binary file not shown.