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.

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

issue#434 speedTime 아이템의 매커니즘 변경 해결 #437

Merged
merged 2 commits into from
Apr 18, 2018
Merged

issue#434 speedTime 아이템의 매커니즘 변경 해결 #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41614c7
speedTime 아이템의 매커니즘 변경
Ochodus Apr 16, 2018
030a62a
Merge branch 'master' into issue#433
inureyes Apr 18, 2018
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
18 changes: 13 additions & 5 deletions gameFunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,12 +450,20 @@ def updateItems(setting, screen, stats, sb, ship, aliens, bullets, eBullets, ite
setting.newStartTime = pg.time.get_ticks()
sounds.shield_sound.play()
elif item.type == 4:
setting.newItemSpeedTime = pg.time.get_ticks()
setting.shipSpeed *= 2
if setting.newItemSpeedTime != 0:
if setting.speedTimeOverLap < 4:
setting.shipSpeed *= 1.3
setting.speedTimeOverLap += 1
setting.newItemSpeedTime += setting.speedTime
else:
setting.newItemSpeedTime = pg.time.get_ticks()
setting.speedStore = setting.shipSpeed
setting.shipSpeed *= 1.3
setting.speedTimeOverLap += 1
items.remove(item)

def updateSlowtime(setting):
if setting.newItemSlowTime !=0:
if setting.newItemSlowTime != 0:
if pg.time.get_ticks() - setting.newItemSlowTime > setting.slowTime:
setting.alienSpeed *= 2
setting.alienbulletSpeed *= 2
Expand All @@ -466,11 +474,11 @@ def updateSlowtime(setting):
def updateSpeedtime(setting):
if setting.newItemSpeedTime !=0:
if pg.time.get_ticks() - setting.newItemSpeedTime > setting.speedTime:
setting.shipSpeed *= 0.5
setting.shipSpeed = setting.speedStore
setting.speedTimeOverLap = 0
setting.newItemSpeedTime = 0



def checkBulletAlienCol(setting, screen, stats, sb, ship, aliens, bullets, eBullets, charged_bullets, items):
"""Detect collisions between alien and bullets"""
global boss
Expand Down
6 changes: 4 additions & 2 deletions settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,11 @@ def __init__(self):
#invincibile time
self.invincibileTime = 2000

#item_time Slow time
#item_time Slow&Speed time
self.slowTime = 3000
self.speedTime = 7000
self.speedTime = 8000
self.speedTimeOverLap = 0
self.speedStore = 0

#Player ship
self.playerShipColor = 'gray'
Expand Down