diff --git a/.idea/CNSA-266-FP.iml b/.idea/CNSA-266-FP.iml index bd75178..bf0924d 100644 --- a/.idea/CNSA-266-FP.iml +++ b/.idea/CNSA-266-FP.iml @@ -3,6 +3,7 @@ + diff --git a/Main.py b/Main.py index d0fa01e..3595d06 100644 --- a/Main.py +++ b/Main.py @@ -2,7 +2,7 @@ import random import sys import time import arcade -import Score +from Score import Score from Bullet import Bullet from Alien import Alien @@ -210,6 +210,8 @@ class MyGame(arcade.Window): self.player_list.draw(pixelated=True) self.wall_list.draw(pixelated=True) + + self.score.drawEach() def KillBullet(self): self.bullet = None self.activeBullet = False @@ -231,6 +233,7 @@ class MyGame(arcade.Window): print(str(self.Score)) sys.exit() + def update(self, delta_time): if self.somethingalsi: @@ -404,6 +407,8 @@ class MyGame(arcade.Window): else: self.death() + self.score.update(self.Score) + def main(): diff --git a/Score.py b/Score.py index 748ea91..0f8e4ae 100644 --- a/Score.py +++ b/Score.py @@ -2,6 +2,8 @@ import sys import arcade +LEFT_OFFSET = 8 + class Score(arcade.Sprite): def __init__(self, SCREEN_SCALE, DEBUG): super().__init__() @@ -11,6 +13,7 @@ class Score(arcade.Sprite): self.scScale = SCREEN_SCALE self.deBuggin = DEBUG self.value = 0 + self.sprites = [] def setValue(self, newValue): self.value = newValue @@ -18,9 +21,97 @@ class Score(arcade.Sprite): def getValue(self): return self.value - def update(self): + def drawEach(self): + for sprite in self.sprites: + sprite.draw(pixelated=True) + + def update(self, score): + self.sprites.clear() + + self.sprites.append(arcade.Sprite("assets/Sprites/Letters/s.png", self.scScale)) # add x and y coords + self.sprites.append(arcade.Sprite("assets/Sprites/Letters/c.png", self.scScale)) # add x and y coords + self.sprites.append(arcade.Sprite("assets/Sprites/Letters/o.png", self.scScale)) # add x and y coords + self.sprites.append(arcade.Sprite("assets/Sprites/Letters/r.png", self.scScale)) # add x and y coords + self.sprites.append(arcade.Sprite("assets/Sprites/Letters/e.png", self.scScale)) # add x and y coords + + self.value = score + valArr = [] for value in str(self.value): valArr.append(value) - print(valArr) - sys.exit() \ No newline at end of file + + if self.deBuggin: + print(valArr) + # sys.exit() + + for index, val in enumerate(valArr): + if val == "0": + addSprite = arcade.Sprite("assets/Sprites/Numbers/0.png", self.scScale) + addSprite.center_y = self.scScale * 250 + addSprite.center_x = self.scScale * (index*8) + (self.scScale * LEFT_OFFSET) + self.sprites.append(addSprite) + if self.deBuggin: + print(addSprite.center_x) + elif val == "1": + addSprite = arcade.Sprite("assets/Sprites/Numbers/1.png", self.scScale) + addSprite.center_y = self.scScale * 250 + addSprite.center_x = self.scScale * (index*8) + (self.scScale * LEFT_OFFSET) + self.sprites.append(addSprite) + if self.deBuggin: + print(addSprite.center_x) + elif val == "2": + addSprite = arcade.Sprite("assets/Sprites/Numbers/2.png", self.scScale) + addSprite.center_y = self.scScale * 250 + addSprite.center_x = self.scScale * (index*8) + (self.scScale * LEFT_OFFSET) + self.sprites.append(addSprite) + if self.deBuggin: + print(addSprite.center_x) + elif val == "3": + addSprite = arcade.Sprite("assets/Sprites/Numbers/3.png", self.scScale) + addSprite.center_y = self.scScale * 250 + addSprite.center_x = self.scScale * (index*8) + (self.scScale * LEFT_OFFSET) + self.sprites.append(addSprite) + if self.deBuggin: + print(addSprite.center_x) + elif val == "4": + addSprite = arcade.Sprite("assets/Sprites/Numbers/4.png", self.scScale) + addSprite.center_y = self.scScale * 250 + addSprite.center_x = self.scScale * (index*8) + (self.scScale * LEFT_OFFSET) + self.sprites.append(addSprite) + if self.deBuggin: + print(addSprite.center_x) + elif val == "5": + addSprite = arcade.Sprite("assets/Sprites/Numbers/5.png", self.scScale) + addSprite.center_y = self.scScale * 250 + addSprite.center_x = self.scScale * (index*8) + (self.scScale * LEFT_OFFSET) + self.sprites.append(addSprite) + if self.deBuggin: + print(addSprite.center_x) + elif val == "6": + addSprite = arcade.Sprite("assets/Sprites/Numbers/6.png", self.scScale) + addSprite.center_y = self.scScale * 250 + addSprite.center_x = self.scScale * (index*8) + (self.scScale * LEFT_OFFSET) + self.sprites.append(addSprite) + if self.deBuggin: + print(addSprite.center_x) + elif val == "7": + addSprite = arcade.Sprite("assets/Sprites/Numbers/7.png", self.scScale) + addSprite.center_y = self.scScale * 250 + addSprite.center_x = self.scScale * (index*8) + (self.scScale * LEFT_OFFSET) + self.sprites.append(addSprite) + if self.deBuggin: + print(addSprite.center_x) + elif val == "8": + addSprite = arcade.Sprite("assets/Sprites/Numbers/8.png", self.scScale) + addSprite.center_y = self.scScale * 250 + addSprite.center_x = self.scScale * (index*8) + (self.scScale * LEFT_OFFSET) + self.sprites.append(addSprite) + if self.deBuggin: + print(addSprite.center_x) + elif val == "9": + addSprite = arcade.Sprite("assets/Sprites/Numbers/9.png", self.scScale) + addSprite.center_y = self.scScale * 250 + addSprite.center_x = self.scScale * (index*8) + (self.scScale * LEFT_OFFSET) + self.sprites.append(addSprite) + if self.deBuggin: + print(addSprite.center_x) diff --git a/assets/Sprites/Letters/a.png b/assets/Sprites/Letters/a.png new file mode 100644 index 0000000..ac19c42 Binary files /dev/null and b/assets/Sprites/Letters/a.png differ diff --git a/assets/Sprites/Letters/b.png b/assets/Sprites/Letters/b.png new file mode 100644 index 0000000..2d00aa8 Binary files /dev/null and b/assets/Sprites/Letters/b.png differ diff --git a/assets/Sprites/Letters/c.png b/assets/Sprites/Letters/c.png new file mode 100644 index 0000000..eb8085d Binary files /dev/null and b/assets/Sprites/Letters/c.png differ diff --git a/assets/Sprites/Letters/d.png b/assets/Sprites/Letters/d.png new file mode 100644 index 0000000..5339b0a Binary files /dev/null and b/assets/Sprites/Letters/d.png differ diff --git a/assets/Sprites/Letters/e.png b/assets/Sprites/Letters/e.png new file mode 100644 index 0000000..e19a0b2 Binary files /dev/null and b/assets/Sprites/Letters/e.png differ diff --git a/assets/Sprites/Letters/f.png b/assets/Sprites/Letters/f.png new file mode 100644 index 0000000..aa26ba2 Binary files /dev/null and b/assets/Sprites/Letters/f.png differ diff --git a/assets/Sprites/Letters/g.png b/assets/Sprites/Letters/g.png new file mode 100644 index 0000000..3e2d3e5 Binary files /dev/null and b/assets/Sprites/Letters/g.png differ diff --git a/assets/Sprites/Letters/h.png b/assets/Sprites/Letters/h.png new file mode 100644 index 0000000..3d1572b Binary files /dev/null and b/assets/Sprites/Letters/h.png differ diff --git a/assets/Sprites/Letters/i.png b/assets/Sprites/Letters/i.png new file mode 100644 index 0000000..c7343dd Binary files /dev/null and b/assets/Sprites/Letters/i.png differ diff --git a/assets/Sprites/Letters/j.png b/assets/Sprites/Letters/j.png new file mode 100644 index 0000000..e4c0392 Binary files /dev/null and b/assets/Sprites/Letters/j.png differ diff --git a/assets/Sprites/Letters/k.png b/assets/Sprites/Letters/k.png new file mode 100644 index 0000000..ce8c96a Binary files /dev/null and b/assets/Sprites/Letters/k.png differ diff --git a/assets/Sprites/Letters/l.png b/assets/Sprites/Letters/l.png new file mode 100644 index 0000000..69b1697 Binary files /dev/null and b/assets/Sprites/Letters/l.png differ diff --git a/assets/Sprites/Letters/m.png b/assets/Sprites/Letters/m.png new file mode 100644 index 0000000..b861f3b Binary files /dev/null and b/assets/Sprites/Letters/m.png differ diff --git a/assets/Sprites/Letters/n.png b/assets/Sprites/Letters/n.png new file mode 100644 index 0000000..ef74475 Binary files /dev/null and b/assets/Sprites/Letters/n.png differ diff --git a/assets/Sprites/Letters/o.png b/assets/Sprites/Letters/o.png new file mode 100644 index 0000000..28492c9 Binary files /dev/null and b/assets/Sprites/Letters/o.png differ diff --git a/assets/Sprites/Letters/p.png b/assets/Sprites/Letters/p.png new file mode 100644 index 0000000..b791f90 Binary files /dev/null and b/assets/Sprites/Letters/p.png differ diff --git a/assets/Sprites/Letters/q.png b/assets/Sprites/Letters/q.png new file mode 100644 index 0000000..f73b01a Binary files /dev/null and b/assets/Sprites/Letters/q.png differ diff --git a/assets/Sprites/Letters/r.png b/assets/Sprites/Letters/r.png new file mode 100644 index 0000000..8f0f049 Binary files /dev/null and b/assets/Sprites/Letters/r.png differ diff --git a/assets/Sprites/Letters/s.png b/assets/Sprites/Letters/s.png new file mode 100644 index 0000000..399202b Binary files /dev/null and b/assets/Sprites/Letters/s.png differ diff --git a/assets/Sprites/Letters/t.png b/assets/Sprites/Letters/t.png new file mode 100644 index 0000000..a6e5f25 Binary files /dev/null and b/assets/Sprites/Letters/t.png differ diff --git a/assets/Sprites/Letters/u.png b/assets/Sprites/Letters/u.png new file mode 100644 index 0000000..2ad65dc Binary files /dev/null and b/assets/Sprites/Letters/u.png differ diff --git a/assets/Sprites/Letters/v.png b/assets/Sprites/Letters/v.png new file mode 100644 index 0000000..16d806f Binary files /dev/null and b/assets/Sprites/Letters/v.png differ diff --git a/assets/Sprites/Letters/w.png b/assets/Sprites/Letters/w.png new file mode 100644 index 0000000..496cfaa Binary files /dev/null and b/assets/Sprites/Letters/w.png differ diff --git a/assets/Sprites/Letters/x.png b/assets/Sprites/Letters/x.png new file mode 100644 index 0000000..51bd0c1 Binary files /dev/null and b/assets/Sprites/Letters/x.png differ diff --git a/assets/Sprites/Letters/y.png b/assets/Sprites/Letters/y.png new file mode 100644 index 0000000..207319c Binary files /dev/null and b/assets/Sprites/Letters/y.png differ diff --git a/assets/Sprites/Letters/z.png b/assets/Sprites/Letters/z.png new file mode 100644 index 0000000..a1a4aa4 Binary files /dev/null and b/assets/Sprites/Letters/z.png differ