Skip to content

Allow mobs to attack while on jump-through blocks #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cthill wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow mobs to attack while on jump-through blocks #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e8e3a6
allow mobs to attack while on jump-through blocks
cthill Oct 3, 2023
5c7f70e
move in x and y before doing walk/atk/jump animations
cthill Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions server/src/world/mob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,17 @@ def _step_active(self):
self.xspeed = 0

x_plus_speed_as_int = int(round(self.x + self.xspeed))
x_as_int = int(round(self.x))
y_as_int = int(round(self.y))

bbox_side = BoundingBox(x_plus_speed_as_int - self.x_offset, y_as_int - self.y_offset, self.w, self.h)
side_collide = self.world.solid_block_at(bbox_side)

bbox_below = BoundingBox(x_as_int - self.x_offset, y_as_int - self.y_offset + 1, self.w, self.h)
ground_below = self.world.solid_block_at(bbox_below)

# walk, jump, atk
self._walk_step()
self._atk_step(ground_below)
self._jump_step(side_collide, ground_below)
self._move_xspeed_check_side_collide(side_collide)
self._move_yspeed_check_ground_collide()
on_ground = self._move_yspeed_check_ground_collide()
self._walk_step()
self._atk_step(on_ground)
self._jump_step(side_collide, on_ground)
self.update_world_position(self.x, self.y)
self._do_animation()

Expand Down Expand Up @@ -307,7 +303,7 @@ def _move_yspeed_check_ground_collide(self):
self.y += self.yspeed
if self.y - self.y_offset > config.WORLD_HEIGHT + 300:
self._die(broadcast_death=False)
return
return False
elif self.y < 0:
self.y = 0

Expand All @@ -326,6 +322,7 @@ def _move_yspeed_check_ground_collide(self):
self.y = min_touching_y - self.h + self.y_offset
self.xspeed_knockback = 0
self.yspeed = 0
return True
else:
sliver_height = config.WORLD_TERMINAL_VELOCITY + 1
bottom_sliver_bbox = BoundingBox(x_as_int - self.x_offset, y_as_int - self.y_offset + self.h - sliver_height, self.w, sliver_height)
Expand All @@ -340,6 +337,9 @@ def _move_yspeed_check_ground_collide(self):
self.y = min_touching_y - self.h + self.y_offset
self.xspeed_knockback = 0
self.yspeed = 0
return True

return False

def _do_animation(self):
if self.sprite_index == SPRITE_INDEX_ATTACK and self.image_index >= self.sprite['frames']:
Expand Down