From: Skullheadx <704277@pdsb.net>
Date: Tue, 12 Jul 2022 21:34:27 +0000 (-0400)
Subject: help me fix dialogue
X-Git-Url: http://git.skullheadx.com/index.css?a=commitdiff_plain;h=a41b91008eccd47c43a21bd58d95593e6a1e5e59;p=Pygame-Jam.git

help me fix dialogue
---

diff --git a/Game.py b/Game.py
index 75425d5..36ca4d2 100644
--- a/Game.py
+++ b/Game.py
@@ -22,11 +22,12 @@ from World import World
 from Item import PotionItem
 from Spike import Spike
 from Particle import Cloud
+from Function.createText import createText
+from Object import Object
 
 class Game:
     cloud_density = 1/100000
 
-
     def __init__(self, level):
         self.collision_layer = {"none": set(), "world": set(), "player": set(), "enemy": set(), "pet": set(),
                                 "body": set(), "potion": set(), "spike": set()}
@@ -67,6 +68,7 @@ class Game:
         self.fadeT = fade()
         self.next_level = 0
 
+        self.hints = [(Object((270, 640)), "Hello")]
         self.dialogue = DialogueUI()
 
         self.paused = False
@@ -135,6 +137,11 @@ class Game:
             self.world.update(delta)
             self.fade = self.Transition.fade
 
+            if self.level in [2,5]:
+                for particle in Setup.particles:
+                    if isinstance(particle, Cloud):
+                        del Setup.particles[Setup.particles.index(particle)]
+
         # self.pet.update(delta, self.player, self.camera_pos)
 
     def draw(self, surf):
@@ -172,9 +179,17 @@ 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.dashMeter.update(self.player.lastDash)
         # self.dashMeter.draw(surf)
         self.healthBar.draw(surf, self.player.health)
diff --git a/MainMenu.py b/MainMenu.py
index e3c3084..f8b354f 100644
--- a/MainMenu.py
+++ b/MainMenu.py
@@ -1,3 +1,4 @@
+import Setup
 from Setup import *
 from CommonImports.colours import white
 from Function.createText import createText
@@ -53,4 +54,5 @@ class Menu:
                 except:
                     self.level = self.level + 1
             case 2:
-                pg.quit();
+                Setup.is_running = False # plz so that i don't get errors in the console
+                # pg.quit();
diff --git a/Object.py b/Object.py
new file mode 100644
index 0000000..d10d222
--- /dev/null
+++ b/Object.py
@@ -0,0 +1,14 @@
+from Setup import *
+
+
+class Object:
+
+    def __init__(self, pos):
+        self.position = pg.Vector2(pos)
+        self.width,self.height = 0,0
+
+    def update(self, delta):
+        pass
+
+    def draw(self, surf):
+        pass