diff --git a/src/dhii/objects/enemies.py b/src/dhii/objects/enemies.py index 58b053b..77ae23d 100644 --- a/src/dhii/objects/enemies.py +++ b/src/dhii/objects/enemies.py @@ -56,7 +56,7 @@ class Enemy: self.show_health = max(0.0, self.show_health - dt) self.shoot_timer = max(0.0, self.shoot_timer - dt) if self.behavior == "spider": - self._update_spider(dt, player_rect) + self._update_spider(dt, tilemap, player_rect) return if self.static: return @@ -94,7 +94,7 @@ class Enemy: self.y = rect.y - self.offset_y self.vy = 0 - def _update_spider(self, dt: float, player_rect: pygame.Rect | None) -> None: + def _update_spider(self, dt: float, tilemap: ChapterTileMap, player_rect: pygame.Rect | None) -> None: if self.spider_state == "hanging": self.vy = 0 if player_rect is not None and abs(player_rect.centerx - self.rect.centerx) < 18 and player_rect.centery > self.rect.centery: @@ -104,6 +104,14 @@ class Enemy: return if self.spider_state == "dropping": self.y += self.vy * dt + rect = self.rect + for solid in tilemap.solid_rects_near(rect): + if rect.colliderect(solid): + rect.bottom = solid.top + self.y = rect.y - self.offset_y + self.spider_state = "rising" + self.vy = -45 + return if self.y >= self.home_y + 72: self.spider_state = "rising" self.vy = -45