From: lbcmk <30442978+lbcmk@users.noreply.github.com>
Date: Tue, 12 Jul 2022 22:26:52 +0000 (-0400)
Subject: Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
X-Git-Url: http://git.skullheadx.com/nixos/static/pfp.webp?a=commitdiff_plain;h=2f03e42936d2a30e9275a8ae34c4f4d71a50bd40;p=Pygame-Jam.git

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

2f03e42936d2a30e9275a8ae34c4f4d71a50bd40
diff --cc Game.py
index 6c90278,5daa7cd..da18719
--- a/Game.py
+++ b/Game.py
@@@ -174,16 -180,24 +180,29 @@@ 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, "text1", 4, 1, 100, 200)
 +            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)
+             # 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, "Next dimension, here I am!", 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, "text1", 4, 1, 325, 320)
              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)