From: Skullheadx <704277@pdsb.net>
Date: Tue, 12 Jul 2022 21:49:30 +0000 (-0400)
Subject: Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
X-Git-Url: http://git.skullheadx.com/sitemap.xml?a=commitdiff_plain;h=411d0c5b6e6d4e8b59df03fcc52ea14db1e75205;p=Pygame-Jam.git

Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
---

411d0c5b6e6d4e8b59df03fcc52ea14db1e75205
diff --cc Game.py
index 36ca4d2,ead45d6..216d45e
--- a/Game.py
+++ b/Game.py
@@@ -179,17 -174,27 +180,35 @@@ class Game
          self.player.draw(surf)
  
          if (self.level == 1):
 -
              # self.dialogue.draw(surf, self.enemies[0], "enemy dialogue")
-             self.dialogue.draw(surf, self.player, "")
 +            # for o,text in self.hints:
 +            #     o.position -= Setup.camera_offset
 +            #     self.dialogue.draw(surf,o, text)
 +            #     # a,b = createText(o.position.x,o.position.y,10,(0,0,0),"Regular",text)
 +            #
 +            #     # surf.blit(a,pg.Vector2(b)-Setup.camera_offset)
 +            #     # print(o.position,text,b)
 +            #     pg.draw.circle(surf,(255,0,0),o.position,10)
 +            #     o.position += Setup.camera_offset
+             self.dialogue.draw(surf, self.player, "text1", 4, 1)
+             self.dialogue.draw(surf, self.player, "text2", 3, 2)
+             self.dialogue.draw(surf, self.player, "text3", 2, 3)
+             self.dialogue.draw(surf, self.player, "text4", 1, 4)
+             self.dialogue.draw(surf, self.player, "text5", 0.5, 5)
+ 
+         if(self.level == 13):
+             self.dialogue.draw(surf, self.player, "text1", 4, 1)
+             self.dialogue.draw(surf, self.player, "text2", 3, 2)
+             self.dialogue.draw(surf, self.player, "text3", 2, 3)
+             self.dialogue.draw(surf, self.player, "text4", 1, 4)
+             self.dialogue.draw(surf, self.player, "text5", 0.5, 5)
+ 
+         if(self.level == 14):
+             self.dialogue.draw(surf, self.player, "text2", 3, 2)
+             self.dialogue.draw(surf, self.player, "text3", 2, 3)
+             self.dialogue.draw(surf, self.player, "text4", 1, 4)
+             self.dialogue.draw(surf, self.player, "text5", 0.5, 5)
+ 
          # self.dashMeter.update(self.player.lastDash)
          # self.dashMeter.draw(surf)
          self.healthBar.draw(surf, self.player.health)
@@@ -216,7 -221,8 +235,7 @@@
          if self.paused == True:
              self.PauseMenu.update(self)
              self.PauseMenu.draw()
+ 
+         if self.player.dead:
+             self.scene.update()
+             self.scene.draw()
 -