Compare commits

..

No commits in common. "f21d9803521ebc5cd7498f8da00c330b38a1eec7" and "b3c7d879269422be9738f73ebffbf45a45eb2678" have entirely different histories.

View file

@ -44,7 +44,7 @@ class Objects():
self.name = name self.name = name
self.speed = ms self.speed = ms
with open(f'art/images/{sprite}') as i: with open(f'art/images/{sprite}') as i:
self.sprite = pg.transform.scale2x(pg.image.load(i)) self.sprite = pg.image.load(i)
self.x = x self.x = x
self.y = y self.y = y
self.hidden = False self.hidden = False
@ -59,9 +59,9 @@ class Objects():
class NPC(Objects): class NPC(Objects):
def __init__(self, name, ms, sprite, convo_act, x, y) -> None: def __init__(self, name, ms, sprite, convo_act, x, y) -> None:
super().__init__(name, ms, sprite, x, y)
self.talking = False self.talking = False
self.hidden = False self.hidden = True
super().__init__(name, ms, sprite, x, y)
self.conversation = Convo('Hello, you can shoot fireballs with f now.', convo_act, 'person') self.conversation = Convo('Hello, you can shoot fireballs with f now.', convo_act, 'person')
def talk(self, objects): def talk(self, objects):
@ -71,7 +71,7 @@ class NPC(Objects):
def draw(self, screen): def draw(self, screen):
super().draw(screen) super().draw(screen)
if self.talking: if self.talking == True:
self.conversation.draw(screen) self.conversation.draw(screen)
def update(self, keys, objects): def update(self, keys, objects):
@ -336,7 +336,7 @@ class Weapons(Objects):
pos = vec(1,0) pos = vec(1,0)
angle = pos.angle_to(moveto) angle = pos.angle_to(moveto)
with open(f'art/images/{sprite}') as i: with open(f'art/images/{sprite}') as i:
self.sprite = pg.transform.scale2x(pg.transform.rotate(pg.image.load(i), -angle)) self.sprite = pg.transform.rotate(pg.image.load(i), -angle)
def die(self, objects, kills): def die(self, objects, kills):
touches = pg.sprite.spritecollideany(self, objects[0] + objects[1]) touches = pg.sprite.spritecollideany(self, objects[0] + objects[1])