Merge pull request 'doubled image size' (#65) from Spafi/game:main into Development

Reviewed-on: InfoProjekt/game#65

viecher.py

@@ -44,7 +44,7 @@ class Objects():
         self.name = name
         self.speed = ms
         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.y = y
         self.hidden = False
@@ -59,9 +59,9 @@ class Objects():
 
 class NPC(Objects):
     def __init__(self, name, ms, sprite, convo_act, x, y) -> None:
-        self.talking = False
-        self.hidden = True
         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')
     
     def talk(self, objects):
@@ -71,7 +71,7 @@ class NPC(Objects):
     
     def draw(self, screen):
         super().draw(screen)
-        if self.talking == True:
+        if self.talking:
             self.conversation.draw(screen)
     
     def update(self, keys, objects):
@@ -336,7 +336,7 @@ class Weapons(Objects):
         pos = vec(1,0)
         angle = pos.angle_to(moveto)
         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):
         touches = pg.sprite.spritecollideany(self, objects[0] + objects[1])