InfoProjekt/game
3
0
Fork 3
Code Issues 17 Pull requests Projects Releases 1 Packages Wiki Activity

Compare commits

base: InfoProjekt:b3c7d879269422be9738f73ebffbf45a45eb2678
Branches Tags
InfoProjekt:main
InfoProjekt:Development
InfoProjekt:Alpha
..
compare: InfoProjekt:f21d9803521ebc5cd7498f8da00c330b38a1eec7
Branches Tags
InfoProjekt:Development
InfoProjekt:main
InfoProjekt:Alpha

5 commits
b3c7d87926 ... f21d980352

Author SHA1 Message Date
Spafi
f21d980352 Merge pull request 'doubled image size' (#65) from Spafi/game:main into Development 
Reviewed-on: #65
 2024-03-07 06:51:08 +00:00
SpagettiFisch
1b6ccb17b0 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game 2024-03-07 07:49:49 +01:00
SpagettiFisch
6034a8382f changed image size 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-07 07:49:16 +01:00
SpagettiFisch
746982641a Merge https://git.spafi.eu/InfoProjekt/game 2024-03-07 07:46:26 +01:00
Spafi
6fce7e0fd2 Merge pull request 'Development' (#57) from Development into main 
Reviewed-on: #57
 2024-03-03 12:28:45 +00:00
1 changed files with 387 additions and 387 deletions
Show stats Expand all files Collapse all files

10
viecher.py
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.image.load(i) self.sprite = pg.transform.scale2x(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:
self.talking = False
self.hidden = True
super().__init__(name, ms, sprite, x, y) super().__init__(name, ms, sprite, x, y)
self.talking = False
self.hidden = False
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 == True: if self.talking:
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.rotate(pg.image.load(i), -angle) self.sprite = pg.transform.scale2x(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])