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

Ult Gauge fill item #459

Open
wants to merge 9 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
Empty file modified README.md
100644 → 100755
Empty file.
Binary file added __pycache__/button.cpython-36.pyc
Binary file not shown.
Binary file added __pycache__/selector.cpython-36.pyc
Binary file not shown.
Empty file modified about.py
100644 → 100755
Empty file.
Empty file modified alien.py
100644 → 100755
Empty file.
Empty file modified animations.py
100644 → 100755
Empty file.
Empty file modified bullet.py
100644 → 100755
Empty file.
Empty file modified button.py
100644 → 100755
Empty file.
Empty file modified eBullet.py
100644 → 100755
Empty file.
7 changes: 7 additions & 0 deletions gameFunctions.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ def updateShieldEffect(setting, screen, ship):
screen.blit(image, (ship.rect.x - 7, ship.rect.y))



def updateAliens(setting, stats, sb, screen, ship, aliens, bullets, eBullets):
"""Update the aliens"""
checkFleetEdges(setting, aliens)
Expand Down Expand Up @@ -499,6 +500,10 @@ def updateItems(setting, screen, stats, sb, ship, aliens, bullets, eBullets, ite
setting.speedStore = setting.shipSpeed
setting.shipSpeed *= 1.3
setting.speedTimeOverLap += 1
elif 5 < item.type:
stats.ultimateGauge += 20
if stats.ultimateGauge > 100:
stats.ultimateGauge = 100
items.remove(item)


Expand Down Expand Up @@ -564,6 +569,8 @@ def checkBulletAlienCol(setting, screen, stats, sb, ship, aliens, bullets, eBull
createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 4.2, items)
if setting.probabilitySpeedI < i <= setting.probabilitySpeedS:
createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 4.3, items)
if setting.probabilitySpeedS < i <= setting.probabilityGauge:
createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 5.1, items)
aliens.remove(alien)

# Increase the ultimate gauge, upto 100
Expand Down
Empty file modified gameStats.py
100644 → 100755
Empty file.
Empty file modified gfx/About_modify2.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified gfx/gameover.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gfx/gauge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified gfx/old_gfx/Alien_Scout.bmp
100644 → 100755
Empty file.
Empty file modified gfx/old_gfx/fixsettings.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified gfx/old_gfx/player_blue.bmp
100644 → 100755
Empty file.
Empty file modified gfx/spaceship3.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified gfx/spaceship4.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion item.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ def __init__(self, setting, screen, stats, type, posx, posy):
self.image = pg.image.load('gfx/speed 2.png')
elif type == 4.3:
self.image = pg.image.load('gfx/speed 3.png')

elif type == 5.1:
self.image = pg.image.load('gfx/gauge.png')
self.type = type

self.rect = self.image.get_rect()
Expand Down
Empty file modified license
100644 → 100755
Empty file.
Empty file modified main.py
100644 → 100755
Empty file.
Empty file modified mainMenu.py
100644 → 100755
Empty file.
Empty file modified playMenu.py
100644 → 100755
Empty file.
Empty file modified scoreboard.py
100644 → 100755
Empty file.
Empty file modified selector.py
100644 → 100755
Empty file.
1 change: 1 addition & 0 deletions settings.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def __init__(self):
self.probabilitySpeedB = 605
self.probabilitySpeedI = 655
self.probabilitySpeedS = 675
self.probabilityGauge = 710

# invincibile time
self.invincibileTime = 3000
Expand Down
Empty file modified settingsMenu.py
100644 → 100755
Empty file.
Empty file modified ship.py
100644 → 100755
Empty file.
Empty file modified sound_bgms/galtron.mp3
100644 → 100755
Empty file.
Empty file modified sounds.py
100644 → 100755
Empty file.
Empty file modified twoPlayer.py
100644 → 100755
Empty file.