diff --git a/classes.py b/classes.py index bc89d1e..6e1c8ea 100644 --- a/classes.py +++ b/classes.py @@ -243,8 +243,8 @@ class Room(GameObjects): self.locked = True else: self.locked = False - [self.objects[3].append(wall) for wall in self.genWalls(WIDTH, HEIGHT)] - + [self.objects[4].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)) diff --git a/viecher.py b/viecher.py index a85a026..5d11e6c 100644 --- a/viecher.py +++ b/viecher.py @@ -150,6 +150,7 @@ 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': @@ -169,11 +170,11 @@ class MainCharacter(Fighter): 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)) + elif self.x > touches.rect.x: self.x += (self.rect.width - (self.x - touches.rect.x - touches.rect.width * 0.66)) #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: @@ -317,6 +318,7 @@ 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) @@ -330,6 +332,23 @@ 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)