From: lbcmk <30442978+lbcmk@users.noreply.github.com>
Date: Mon, 11 Jul 2022 03:16:52 +0000 (-0400)
Subject: Fixed merge conflict
X-Git-Url: http://git.skullheadx.com/nixos/static/gitweb.js?a=commitdiff_plain;h=0276cb28b9dbd1948f83db03cba41bdd06f04645;p=Pygame-Jam.git

Fixed merge conflict
---

0276cb28b9dbd1948f83db03cba41bdd06f04645
diff --cc Game.py
index 57dbacc,3068fb4..11bcfc5
--- a/Game.py
+++ b/Game.py
@@@ -72,18 -68,13 +72,21 @@@ class Game
          # self.pet.update(delta, self.player, self.camera_pos)
  
      def draw(self, surf):
 +        screen.fill((0, 191, 255))
 +
 +        if(self.level == 1):
 +            self.Transition.draw(surf, self.player.position, [40, -250], 120, 625)
 +            self.dialogue.text = "enemy dialogue"
 +            self.dialogue.draw(surf, get_display_point(self.enemies[0].position)[0] + self.enemies[0].width/2, get_display_point(self.enemies[0].position)[1])
 +            self.dialogue.text = "player dialogue"
 +            self.dialogue.draw(surf, get_display_point(self.player.position)[0] + self.player.width/2, get_display_point(self.player.position)[1])
- 
+         # screen.fill((0, 191, 255))
          # screen.fill((255,255,255))
-         # sky = pg.image.load("Assets/world/SKY.png")
-         # surf.blit(sky,(0,0))
+         sky = pg.image.load("Assets/world/SKY.png")
+         surf.blit(sky,(0,0))
+         self.Transition.draw(surf, self.player.position, [40, -250], 120, 625)
+ 
+ 
          self.world.draw(surf)
          for enemy in self.enemies:
              enemy.draw(surf)