diff --git a/gameFunctions.py b/gameFunctions.py index 14f09c4..4b7e89a 100644 --- a/gameFunctions.py +++ b/gameFunctions.py @@ -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 @@ -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 diff --git a/settings.py b/settings.py index 2c835a9..2afa043 100644 --- a/settings.py +++ b/settings.py @@ -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'