classes.py

@@ -243,8 +243,8 @@ class Room(GameObjects):
             self.locked = True
         else:
             self.locked = False
-        [self.objects[4].append(wall) for wall in self.genWalls(WIDTH, HEIGHT)]
-    
+        [self.objects[3].append(wall) for wall in self.genWalls(WIDTH, HEIGHT)]
+        
     def genWalls(self, WIDTH, HEIGHT):
         walls = []
         walls.append(Obstacle('wall_l', 'wall', None, True, 32, 32, True, WIDTH=4, HEIGHT=HEIGHT))

viecher.py

@@ -150,7 +150,6 @@ class MainCharacter(Fighter):
         if touches is not None and not isinstance(touches, Weapons):
             if isinstance(touches, Obstacle):
                 if not touches.collision:
-                    print(touches.name)
                     return
                 if touches.type == 'wall':
                     if touches.name == 'wall_l':
@@ -163,18 +162,18 @@ class MainCharacter(Fighter):
                         self.y -= (2 + self.rect.height - (touches.rect.y - self.y))
                     return
             elif isinstance(touches, NPC):
-                if keys[pg.K_f]:
+                if keys[pg.K_SPACE]:
                     touches.talk(objects)
                     return
                 else:
                     return
 
             if self.x <= touches.rect.x: self.x -= (self.rect.width - (touches.rect.x - self.x))
-            elif self.x > touches.rect.x: self.x += (self.rect.width - (self.x - touches.rect.x - touches.rect.width * 0.66))
+            elif self.x > touches.rect.x: self.x += (self.rect.width - (self.x - touches.rect.x))
             #if self.y <= touches.y: pass
             #elif self.y > touches.y: pass
-            #self.x -= moveto[0] * 2 / fps
-            #self.y -= moveto[1] * 2 / fps
+            self.x -= moveto[0] * 2 / fps
+            self.y -= moveto[1] * 2 / fps
 
         """
         if self.x <= 32:
@@ -189,7 +188,7 @@ class MainCharacter(Fighter):
     
     def attack(self, obj, mouse):
         if self.lastAttack + self.attack_speed * 1000 < pg.time.get_ticks():
-            moveto = mouse - vec(self.x, self.y)
+            moveto = mouse- vec(self.x, self.y)
             if self.book.current_sp == 'fireball':
                 weapon = Fireball('fb1', 100, self.x, self.y, moveto, 5)
             elif self.book.current_sp == 'windslash':
@@ -202,7 +201,7 @@ class MainCharacter(Fighter):
     def update(self, keys, mouse, objects):
         if not self.talking:
             self.walk(keys, objects)
-            if pg.mouse.get_pressed()[0]:
+            if keys[pg.K_f]:
                 self.attack(objects, vec(mouse))
             self.speech.update(self)
         if self.health.health <= 0:
@@ -318,7 +317,6 @@ class Book():
 
     def update(self):
         pass
-
 class Mobs(Fighter):
     def __init__(self, name, ms, sprite, x, y, health, damage, level, asp, atr, drops) -> None:
         super().__init__(name, ms, sprite, x, y, health, damage, level, asp, atr)
@@ -332,23 +330,6 @@ class Mobs(Fighter):
             moveto.scale_to_length(self.speed)
             self.x += moveto[0] / fps
             self.y += moveto[1] / fps
-            touches = pg.sprite.spritecollideany(self, obj[4])
-            if touches is not None and not isinstance(touches, Weapons):
-                if isinstance(touches, Obstacle):
-                    if not touches.collision:
-                        return
-                    if touches.type == 'wall':
-                        if touches.name == 'wall_l':
-                            self.x += (2 + (self.x - touches.rect.x))
-                        elif touches.name == 'wall_r':
-                            self.x -= (2 + self.rect.width - (touches.rect.x - self.x))
-                        if touches.name == 'wall_t':
-                            self.y += (2 + (self.y - touches.rect.y))
-                        elif touches.name == 'wall_b':
-                            self.y -= (2 + self.rect.height - (touches.rect.y - self.y))
-
-                    if self.x <= touches.rect.x: self.x -= (self.rect.width - (touches.rect.x - self.x))
-                    elif self.x > touches.rect.x: self.x += (self.rect.width - (self.x - touches.rect.x - touches.rect.width * 0.66))
         else:
             self.attack(moveto, obj)