Skip to content
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.

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

Fixes some dex issues with food and natural weapons. #4196

Merged
merged 1 commit into from
Jul 16, 2024

Conversation

@MistakeNot4892 MistakeNot4892 added the ready for review This PR is ready for review and merge. label Jul 13, 2024
@@ -186,3 +186,7 @@
else
animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = windup_time-2)
animate(pixel_x = default_pixel_x, pixel_y = default_pixel_y, time = 2)

// reset wherever the attack animation got us to.
/atom/movable/proc/reset_windup_animation()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh, what's the difference between this and reset_offsets(anim_time = 2) (the default)? It just seems like this is less robust? Does it interact with grabs properly?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was just extracting the existing line. I'll swap it out for reset_offsets() I guess.

@@ -22,6 +22,7 @@
center_of_mass = @'{"x":16,"y":16}'
w_class = ITEM_SIZE_SMALL
abstract_type = /obj/item/chems/food
needs_attack_dexterity = DEXTERITY_NONE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like this. We confirmed drakes can eat foods fine by using it in-hand, which I thought was the intended way for them to do it? This only affects clicking themselves (and other things) with food, and will undoubtedly have other side effects.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fixing them not being able to eat food inhand.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either that or Greenjoe misreported the issue.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it was misreported, we confirmed it on discord. using it inhand worked, clicking yourself is what didn't and that's intended afaik

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per Discord I think I was misunderstood re: intentionality. I don't think it's good UX to arbitrarily have one method work and the other not for something as fundamental as eating. With respect to side effects, I can't think of anything offhand other than drakes feeding food to people, which is a bit whatever.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in that case yeah, this is fine

@out-of-phaze out-of-phaze added awaiting author This PR is awaiting action from the author before it can be merged. and removed ready for review This PR is ready for review and merge. labels Jul 13, 2024
@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. and removed awaiting author This PR is awaiting action from the author before it can be merged. labels Jul 14, 2024
@MistakeNot4892 MistakeNot4892 force-pushed the fixes/mobs branch 2 times, most recently from 9ca06a3 to 73d16b2 Compare July 14, 2024 04:04
out-of-phaze
out-of-phaze previously approved these changes Jul 14, 2024
@@ -79,6 +79,7 @@
if(a_intent == I_HELP || !attacking_with)
return A.attack_animal(src)

a_intent = I_HURT
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already exists on line 77

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 77 is actually in error. Resolved now anyway.

Copy link
Member

@out-of-phaze out-of-phaze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still 24h under conflict resolution rule, yay

@out-of-phaze out-of-phaze merged commit c1e1120 into NebulaSS13:dev Jul 16, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
2 participants