-
Notifications
You must be signed in to change notification settings - Fork 219
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
Conversation
MistakeNot4892
commented
Jul 13, 2024
•
edited
Loading
edited
- Fixes Simple mobs do not reset their attack animations on failure #4193
- Fixes Simple mobs do not show successful attack animations, but apply attack effects like venom. #4194
- Fixes drake food issue in Collected issues from Pyrelight test #4191
code/modules/mob/animations.dm
Outdated
@@ -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() |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
9ca06a3
to
73d16b2
Compare
73d16b2
to
e336098
Compare
@@ -79,6 +79,7 @@ | |||
if(a_intent == I_HELP || !attacking_with) | |||
return A.attack_animal(src) | |||
|
|||
a_intent = I_HURT |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
e336098
to
059dacc
Compare
There was a problem hiding this 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