diff --git a/game_data/base/mob_types/pikmin/blue_pikmin/animations.txt b/game_data/base/mob_types/pikmin/blue_pikmin/animations.txt index 2aaccc1e1..d17adb5d7 100644 --- a/game_data/base/mob_types/pikmin/blue_pikmin/animations.txt +++ b/game_data/base/mob_types/pikmin/blue_pikmin/animations.txt @@ -614,6 +614,46 @@ animations{ } } } + twirling{ + frames{ + idling_01{ + duration=0.0500 + interpolate=true + } + twirling_01{ + duration=0.1000 + interpolate=true + } + twirling_02{ + duration=0.1000 + interpolate=true + } + twirling_03{ + duration=0.1000 + interpolate=true + } + twirling_04{ + duration=0.1000 + interpolate=true + } + twirling_05{ + duration=0.1000 + interpolate=true + } + twirling_06{ + duration=0.1000 + interpolate=true + } + twirling_07{ + duration=0.1000 + interpolate=true + } + idling_01{ + duration=0.1000 + interpolate=true + } + } + } walking{ frames{ idling_01{ @@ -2514,6 +2554,194 @@ sprites{ } } } + twirling_01{ + file=blue_pikmin + file_pos=0.0000 112.0000 + file_size=20.0000 32.0000 + scale=0.5000 0.5000 + angle=5.9341 + top_visible=true + top_pos=-4.0000 1.5000 + top_size=5.5000 10.0000 + top_angle=5.9590 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_02{ + file=blue_pikmin + file_pos=0.0000 112.0000 + file_size=20.0000 32.0000 + scale=0.5000 0.5000 + angle=0.3491 + top_visible=true + top_pos=-4.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=6.1087 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_03{ + file=blue_pikmin + file_pos=0.0000 112.0000 + file_size=20.0000 32.0000 + scale=0.5000 0.5000 + angle=1.3963 + top_visible=true + top_pos=-2.5000 0.0000 + top_size=5.5000 10.0000 + top_angle=5.9643 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_04{ + file=blue_pikmin + file_pos=0.0000 112.0000 + file_size=20.0000 32.0000 + scale=0.5000 0.5000 + angle=2.6180 + top_visible=true + top_pos=0.5000 -3.0000 + top_size=5.5000 10.0000 + top_angle=1.3963 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_05{ + file=blue_pikmin + file_pos=0.0000 112.0000 + file_size=20.0000 32.0000 + scale=0.5000 0.5000 + angle=4.0143 + top_visible=true + top_pos=2.5000 -1.0000 + top_size=5.5000 10.0000 + top_angle=2.2689 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_06{ + file=blue_pikmin + file_pos=0.0000 112.0000 + file_size=20.0000 32.0000 + scale=0.5000 0.5000 + angle=5.6723 + top_visible=true + top_pos=0.5000 3.0000 + top_size=5.5000 10.0000 + top_angle=4.1888 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_07{ + file=blue_pikmin + file_pos=0.0000 112.0000 + file_size=20.0000 32.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-4.0000 1.0000 + top_size=5.5000 10.0000 + top_angle=5.8469 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } walking_01{ file=blue_pikmin file_pos=21.0000 0.0000 diff --git a/game_data/base/mob_types/pikmin/bulbmin/animations.txt b/game_data/base/mob_types/pikmin/bulbmin/animations.txt index c313a3cd4..ab2e96ec9 100644 --- a/game_data/base/mob_types/pikmin/bulbmin/animations.txt +++ b/game_data/base/mob_types/pikmin/bulbmin/animations.txt @@ -533,6 +533,46 @@ animations{ } } } + twirling{ + frames{ + idling_01{ + duration=0.0500 + interpolate=true + } + twirling_01{ + duration=0.1000 + interpolate=true + } + twirling_02{ + duration=0.1000 + interpolate=true + } + twirling_03{ + duration=0.1000 + interpolate=true + } + twirling_04{ + duration=0.1000 + interpolate=true + } + twirling_05{ + duration=0.1000 + interpolate=true + } + twirling_06{ + duration=0.1000 + interpolate=true + } + twirling_07{ + duration=0.1000 + interpolate=true + } + idling_01{ + duration=0.1000 + interpolate=true + } + } + } walking{ frames{ idling_01{ @@ -2281,6 +2321,201 @@ sprites{ } } } + twirling_01{ + file=bulbmin + file_pos=0.0000 147.0000 + file_size=34.0000 44.0000 + offset=2.0000 -0.5000 + scale=0.5000 0.5000 + angle=5.9341 + top_visible=true + top_pos=-4.0000 1.5000 + top_size=5.5000 10.0000 + top_angle=5.9590 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_02{ + file=bulbmin + file_pos=0.0000 147.0000 + file_size=34.0000 44.0000 + offset=2.0000 0.5000 + scale=0.5000 0.5000 + angle=0.3491 + top_visible=true + top_pos=-4.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=6.1087 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_03{ + file=bulbmin + file_pos=0.0000 147.0000 + file_size=34.0000 44.0000 + offset=0.5000 2.0000 + scale=0.5000 0.5000 + angle=1.3963 + top_visible=true + top_pos=-2.5000 0.0000 + top_size=5.5000 10.0000 + top_angle=5.9643 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_04{ + file=bulbmin + file_pos=0.0000 147.0000 + file_size=34.0000 44.0000 + offset=-1.5000 1.0000 + scale=0.5000 0.5000 + angle=2.6180 + top_visible=true + top_pos=0.5000 -3.0000 + top_size=5.5000 10.0000 + top_angle=1.3963 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_05{ + file=bulbmin + file_pos=0.0000 147.0000 + file_size=34.0000 44.0000 + offset=-1.5000 -1.5000 + scale=0.5000 0.5000 + angle=4.0143 + top_visible=true + top_pos=2.5000 -1.0000 + top_size=5.5000 10.0000 + top_angle=2.2689 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_06{ + file=bulbmin + file_pos=0.0000 147.0000 + file_size=34.0000 44.0000 + offset=1.5000 -1.5000 + scale=0.5000 0.5000 + angle=5.6723 + top_visible=true + top_pos=0.5000 3.0000 + top_size=5.5000 10.0000 + top_angle=4.1888 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_07{ + file=bulbmin + file_pos=0.0000 147.0000 + file_size=34.0000 44.0000 + offset=2.0000 0.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-4.0000 1.0000 + top_size=5.5000 10.0000 + top_angle=5.8469 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } walking_01{ file=bulbmin file_pos=35.0000 0.0000 diff --git a/game_data/base/mob_types/pikmin/purple_pikmin/animations.txt b/game_data/base/mob_types/pikmin/purple_pikmin/animations.txt index a453cdd0e..b5780068f 100644 --- a/game_data/base/mob_types/pikmin/purple_pikmin/animations.txt +++ b/game_data/base/mob_types/pikmin/purple_pikmin/animations.txt @@ -614,6 +614,46 @@ animations{ } } } + twirling{ + frames{ + idling_01{ + duration=0.1000 + interpolate=true + } + twirling_01{ + duration=0.1000 + interpolate=true + } + twirling_02{ + duration=0.1000 + interpolate=true + } + twirling_03{ + duration=0.1000 + interpolate=true + } + twirling_04{ + duration=0.1000 + interpolate=true + } + twirling_05{ + duration=0.1000 + interpolate=true + } + twirling_06{ + duration=0.1000 + interpolate=true + } + twirling_07{ + duration=0.1000 + interpolate=true + } + idling_01{ + duration=0.0500 + interpolate=true + } + } + } walking{ frames{ idling_01{ @@ -2513,6 +2553,194 @@ sprites{ } } } + twirling_01{ + file=purple_pikmin + file_pos=0.0000 146.0000 + file_size=24.0000 36.0000 + scale=0.5000 0.5000 + angle=5.9341 + top_visible=true + top_pos=-4.0000 1.5000 + top_size=5.5000 10.0000 + top_angle=5.9590 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_02{ + file=purple_pikmin + file_pos=0.0000 146.0000 + file_size=24.0000 36.0000 + scale=0.5000 0.5000 + angle=0.3491 + top_visible=true + top_pos=-4.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=6.1087 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_03{ + file=purple_pikmin + file_pos=0.0000 146.0000 + file_size=24.0000 36.0000 + scale=0.5000 0.5000 + angle=1.3963 + top_visible=true + top_pos=-2.5000 0.0000 + top_size=5.5000 10.0000 + top_angle=5.9643 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_04{ + file=purple_pikmin + file_pos=0.0000 146.0000 + file_size=24.0000 36.0000 + scale=0.5000 0.5000 + angle=2.6180 + top_visible=true + top_pos=0.5000 -3.0000 + top_size=5.5000 10.0000 + top_angle=1.3963 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_05{ + file=purple_pikmin + file_pos=0.0000 146.0000 + file_size=24.0000 36.0000 + scale=0.5000 0.5000 + angle=4.0143 + top_visible=true + top_pos=2.5000 -1.0000 + top_size=5.5000 10.0000 + top_angle=2.2689 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_06{ + file=purple_pikmin + file_pos=0.0000 146.0000 + file_size=24.0000 36.0000 + scale=0.5000 0.5000 + angle=5.6723 + top_visible=true + top_pos=0.5000 3.0000 + top_size=5.5000 10.0000 + top_angle=4.1888 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_07{ + file=purple_pikmin + file_pos=0.0000 146.0000 + file_size=24.0000 36.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-4.0000 1.0000 + top_size=5.5000 10.0000 + top_angle=5.8469 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } walking_01{ file=purple_pikmin file_pos=25.0000 0.0000 diff --git a/game_data/base/mob_types/pikmin/red_pikmin/animations.txt b/game_data/base/mob_types/pikmin/red_pikmin/animations.txt index e59d0c47f..98c866676 100644 --- a/game_data/base/mob_types/pikmin/red_pikmin/animations.txt +++ b/game_data/base/mob_types/pikmin/red_pikmin/animations.txt @@ -614,6 +614,46 @@ animations{ } } } + twirling{ + frames{ + idling_01{ + duration=0.0500 + interpolate=true + } + twirling_01{ + duration=0.1000 + interpolate=true + } + twirling_02{ + duration=0.1000 + interpolate=true + } + twirling_03{ + duration=0.1000 + interpolate=true + } + twirling_04{ + duration=0.1000 + interpolate=true + } + twirling_05{ + duration=0.1000 + interpolate=true + } + twirling_06{ + duration=0.1000 + interpolate=true + } + twirling_07{ + duration=0.1000 + interpolate=true + } + idling_01{ + duration=0.1000 + interpolate=true + } + } + } walking{ frames{ idling_01{ @@ -2532,6 +2572,201 @@ sprites{ } } } + twirling_01{ + file=red_pikmin + file_pos=0.0000 114.0000 + file_size=28.0000 32.0000 + offset=2.0000 -0.5000 + scale=0.5000 0.5000 + angle=5.9341 + top_visible=true + top_pos=-4.0000 1.5000 + top_size=5.5000 10.0000 + top_angle=5.9590 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_02{ + file=red_pikmin + file_pos=0.0000 114.0000 + file_size=28.0000 32.0000 + offset=2.0000 0.5000 + scale=0.5000 0.5000 + angle=0.3491 + top_visible=true + top_pos=-4.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=6.1087 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_03{ + file=red_pikmin + file_pos=0.0000 114.0000 + file_size=28.0000 32.0000 + offset=0.0000 2.0000 + scale=0.5000 0.5000 + angle=1.3963 + top_visible=true + top_pos=-3.5000 -1.0000 + top_size=5.5000 10.0000 + top_angle=5.6455 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_04{ + file=red_pikmin + file_pos=0.0000 114.0000 + file_size=28.0000 32.0000 + offset=-2.0000 1.0000 + scale=0.5000 0.5000 + angle=2.6180 + top_visible=true + top_pos=0.5000 -3.5000 + top_size=5.5000 10.0000 + top_angle=1.3963 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_05{ + file=red_pikmin + file_pos=0.0000 114.0000 + file_size=28.0000 32.0000 + offset=-1.0000 -1.5000 + scale=0.5000 0.5000 + angle=4.0143 + top_visible=true + top_pos=3.0000 -1.0000 + top_size=5.5000 10.0000 + top_angle=2.2689 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_06{ + file=red_pikmin + file_pos=0.0000 114.0000 + file_size=28.0000 32.0000 + offset=1.5000 -1.0000 + scale=0.5000 0.5000 + angle=5.6723 + top_visible=true + top_pos=0.0000 3.5000 + top_size=5.5000 10.0000 + top_angle=4.1888 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_07{ + file=red_pikmin + file_pos=0.0000 114.0000 + file_size=28.0000 32.0000 + offset=2.0000 0.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-4.0000 1.0000 + top_size=5.5000 10.0000 + top_angle=5.8469 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } walking_01{ file=red_pikmin file_pos=29.0000 0.0000 diff --git a/game_data/base/mob_types/pikmin/rock_pikmin/animations.txt b/game_data/base/mob_types/pikmin/rock_pikmin/animations.txt index 41f8d3c28..36270b68e 100644 --- a/game_data/base/mob_types/pikmin/rock_pikmin/animations.txt +++ b/game_data/base/mob_types/pikmin/rock_pikmin/animations.txt @@ -597,6 +597,46 @@ animations{ } } } + twirling{ + frames{ + idling_01{ + duration=0.0500 + interpolate=true + } + twirling_01{ + duration=0.1000 + interpolate=true + } + twirling_02{ + duration=0.1000 + interpolate=true + } + twirling_03{ + duration=0.1000 + interpolate=true + } + twirling_04{ + duration=0.1000 + interpolate=true + } + twirling_05{ + duration=0.1000 + interpolate=true + } + twirling_06{ + duration=0.1000 + interpolate=true + } + twirling_07{ + duration=0.1000 + interpolate=true + } + idling_01{ + duration=0.1000 + interpolate=true + } + } + } walking{ frames{ idling_01{ @@ -2314,6 +2354,194 @@ sprites{ } } } + twirling_01{ + file=rock_pikmin + file_pos=0.0000 144.0000 + file_size=28.0000 48.0000 + scale=0.5000 0.5000 + angle=5.9341 + top_visible=true + top_pos=-4.0000 1.5000 + top_size=5.5000 10.0000 + top_angle=5.9590 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_02{ + file=rock_pikmin + file_pos=0.0000 144.0000 + file_size=28.0000 48.0000 + scale=0.5000 0.5000 + angle=0.3491 + top_visible=true + top_pos=-4.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=6.1087 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_03{ + file=rock_pikmin + file_pos=0.0000 144.0000 + file_size=28.0000 48.0000 + scale=0.5000 0.5000 + angle=1.3963 + top_visible=true + top_pos=-2.5000 -2.0000 + top_size=5.5000 10.0000 + top_angle=5.9643 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_04{ + file=rock_pikmin + file_pos=0.0000 144.0000 + file_size=28.0000 48.0000 + scale=0.5000 0.5000 + angle=2.6180 + top_visible=true + top_pos=1.0000 -3.0000 + top_size=5.5000 10.0000 + top_angle=1.3963 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_05{ + file=rock_pikmin + file_pos=0.0000 144.0000 + file_size=28.0000 48.0000 + scale=0.5000 0.5000 + angle=4.0143 + top_visible=true + top_pos=2.5000 0.0000 + top_size=5.5000 10.0000 + top_angle=2.2689 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_06{ + file=rock_pikmin + file_pos=0.0000 144.0000 + file_size=28.0000 48.0000 + scale=0.5000 0.5000 + angle=5.6723 + top_visible=true + top_pos=-1.0000 3.5000 + top_size=5.5000 10.0000 + top_angle=4.1888 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } + twirling_07{ + file=rock_pikmin + file_pos=0.0000 144.0000 + file_size=28.0000 48.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-4.0000 1.0000 + top_size=5.5000 10.0000 + top_angle=5.8469 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=7.0000 + type=0 + value=1.0000 + } + } + } walking_01{ file=rock_pikmin file_pos=29.0000 0.0000 diff --git a/game_data/base/mob_types/pikmin/white_pikmin/animations.txt b/game_data/base/mob_types/pikmin/white_pikmin/animations.txt index 788699b62..c31b47c5d 100644 --- a/game_data/base/mob_types/pikmin/white_pikmin/animations.txt +++ b/game_data/base/mob_types/pikmin/white_pikmin/animations.txt @@ -614,6 +614,46 @@ animations{ } } } + twirling{ + frames{ + idling_01{ + duration=0.0500 + interpolate=true + } + twirling_01{ + duration=0.1000 + interpolate=true + } + twirling_02{ + duration=0.1000 + interpolate=true + } + twirling_03{ + duration=0.1000 + interpolate=true + } + twirling_04{ + duration=0.1000 + interpolate=true + } + twirling_05{ + duration=0.1000 + interpolate=true + } + twirling_06{ + duration=0.1000 + interpolate=true + } + twirling_07{ + duration=0.1000 + interpolate=true + } + idling_01{ + duration=0.1000 + interpolate=true + } + } + } walking{ frames{ idling_01{ @@ -2514,6 +2554,194 @@ sprites{ } } } + twirling_01{ + file=white_pikmin + file_pos=0.0000 106.0000 + file_size=16.0000 30.0000 + scale=0.5000 0.5000 + angle=5.9341 + top_visible=true + top_pos=-4.0000 1.5000 + top_size=5.5000 10.0000 + top_angle=5.9590 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_02{ + file=white_pikmin + file_pos=0.0000 106.0000 + file_size=16.0000 30.0000 + scale=0.5000 0.5000 + angle=0.3491 + top_visible=true + top_pos=-4.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=6.1087 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_03{ + file=white_pikmin + file_pos=0.0000 106.0000 + file_size=16.0000 30.0000 + scale=0.5000 0.5000 + angle=1.3963 + top_visible=true + top_pos=-2.5000 0.0000 + top_size=5.5000 10.0000 + top_angle=5.9643 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_04{ + file=white_pikmin + file_pos=0.0000 106.0000 + file_size=16.0000 30.0000 + scale=0.5000 0.5000 + angle=2.6180 + top_visible=true + top_pos=0.5000 -3.0000 + top_size=5.5000 10.0000 + top_angle=1.3963 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_05{ + file=white_pikmin + file_pos=0.0000 106.0000 + file_size=16.0000 30.0000 + scale=0.5000 0.5000 + angle=4.0143 + top_visible=true + top_pos=2.5000 -1.0000 + top_size=5.5000 10.0000 + top_angle=2.2689 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_06{ + file=white_pikmin + file_pos=0.0000 106.0000 + file_size=16.0000 30.0000 + scale=0.5000 0.5000 + angle=5.6723 + top_visible=true + top_pos=0.5000 3.0000 + top_size=5.5000 10.0000 + top_angle=4.1888 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_07{ + file=white_pikmin + file_pos=0.0000 106.0000 + file_size=16.0000 30.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-4.0000 1.0000 + top_size=5.5000 10.0000 + top_angle=5.8469 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } walking_01{ file=white_pikmin file_pos=17.0000 0.0000 diff --git a/game_data/base/mob_types/pikmin/winged_pikmin/animations.txt b/game_data/base/mob_types/pikmin/winged_pikmin/animations.txt index e94fe09eb..d38d2a207 100644 --- a/game_data/base/mob_types/pikmin/winged_pikmin/animations.txt +++ b/game_data/base/mob_types/pikmin/winged_pikmin/animations.txt @@ -566,6 +566,46 @@ animations{ } } } + twirling{ + frames{ + idling_01{ + duration=0.0500 + interpolate=true + } + twirling_01{ + duration=0.1000 + interpolate=true + } + twirling_02{ + duration=0.1000 + interpolate=true + } + twirling_03{ + duration=0.1000 + interpolate=true + } + twirling_04{ + duration=0.1000 + interpolate=true + } + twirling_05{ + duration=0.1000 + interpolate=true + } + twirling_06{ + duration=0.1000 + interpolate=true + } + twirling_07{ + duration=0.1000 + interpolate=true + } + idling_01{ + duration=0.1000 + interpolate=true + } + } + } walking{ frames{ walking_01{ @@ -2573,6 +2613,201 @@ sprites{ } } } + twirling_01{ + file=winged_pikmin + file_pos=62.0000 207.0000 + file_size=30.0000 28.0000 + offset=-2.0000 1.0000 + scale=0.5000 0.5000 + angle=5.9341 + top_visible=true + top_pos=-3.5000 1.5000 + top_size=5.5000 10.0000 + top_angle=5.9590 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_02{ + file=winged_pikmin + file_pos=62.0000 207.0000 + file_size=30.0000 28.0000 + offset=-2.0000 -0.5000 + scale=0.5000 0.5000 + angle=0.3491 + top_visible=true + top_pos=-4.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=6.1087 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_03{ + file=winged_pikmin + file_pos=62.0000 207.0000 + file_size=30.0000 28.0000 + offset=-0.5000 -2.0000 + scale=0.5000 0.5000 + angle=1.3963 + top_visible=true + top_pos=-2.5000 -0.5000 + top_size=5.5000 10.0000 + top_angle=6.1753 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_04{ + file=winged_pikmin + file_pos=62.0000 207.0000 + file_size=30.0000 28.0000 + offset=2.0000 -1.0000 + scale=0.5000 0.5000 + angle=2.6180 + top_visible=true + top_pos=0.5000 -3.0000 + top_size=5.5000 10.0000 + top_angle=1.3963 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_05{ + file=winged_pikmin + file_pos=62.0000 207.0000 + file_size=30.0000 28.0000 + offset=1.5000 1.5000 + scale=0.5000 0.5000 + angle=4.0143 + top_visible=true + top_pos=3.0000 -1.0000 + top_size=5.5000 10.0000 + top_angle=2.2689 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_06{ + file=winged_pikmin + file_pos=62.0000 207.0000 + file_size=30.0000 28.0000 + offset=-2.0000 1.5000 + scale=0.5000 0.5000 + angle=5.6723 + top_visible=true + top_pos=0.5000 3.0000 + top_size=5.5000 10.0000 + top_angle=4.1888 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_07{ + file=winged_pikmin + file_pos=62.0000 207.0000 + file_size=30.0000 28.0000 + offset=-2.5000 0.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-4.0000 1.5000 + top_size=5.5000 10.0000 + top_angle=5.8469 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } walking_01{ file=winged_pikmin file_pos=0.0000 29.0000 diff --git a/game_data/base/mob_types/pikmin/yellow_pikmin/animations.txt b/game_data/base/mob_types/pikmin/yellow_pikmin/animations.txt index da95607aa..eb04e6d7f 100644 --- a/game_data/base/mob_types/pikmin/yellow_pikmin/animations.txt +++ b/game_data/base/mob_types/pikmin/yellow_pikmin/animations.txt @@ -614,6 +614,46 @@ animations{ } } } + twirling{ + frames{ + idling_01{ + duration=0.0500 + interpolate=true + } + twirling_01{ + duration=0.1000 + interpolate=true + } + twirling_02{ + duration=0.1000 + interpolate=true + } + twirling_03{ + duration=0.1000 + interpolate=true + } + twirling_04{ + duration=0.1000 + interpolate=true + } + twirling_05{ + duration=0.1000 + interpolate=true + } + twirling_06{ + duration=0.1000 + interpolate=true + } + twirling_07{ + duration=0.1000 + interpolate=true + } + idling_01{ + duration=0.1000 + interpolate=true + } + } + } walking{ frames{ idling_01{ @@ -2434,6 +2474,194 @@ sprites{ } } } + twirling_01{ + file=yellow_pikmin + file_pos=0.0000 0.0000 + file_size=20.0000 36.0000 + scale=0.5000 0.5000 + angle=5.9341 + top_visible=true + top_pos=-4.0000 1.5000 + top_size=5.5000 10.0000 + top_angle=5.9590 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_02{ + file=yellow_pikmin + file_pos=0.0000 0.0000 + file_size=20.0000 36.0000 + scale=0.5000 0.5000 + angle=0.3491 + top_visible=true + top_pos=-4.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=6.1087 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_03{ + file=yellow_pikmin + file_pos=0.0000 0.0000 + file_size=20.0000 36.0000 + scale=0.5000 0.5000 + angle=1.3963 + top_visible=true + top_pos=-2.5000 0.0000 + top_size=5.5000 10.0000 + top_angle=5.9643 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_04{ + file=yellow_pikmin + file_pos=0.0000 0.0000 + file_size=20.0000 36.0000 + scale=0.5000 0.5000 + angle=2.6180 + top_visible=true + top_pos=0.5000 -3.0000 + top_size=5.5000 10.0000 + top_angle=1.3963 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_05{ + file=yellow_pikmin + file_pos=0.0000 0.0000 + file_size=20.0000 36.0000 + scale=0.5000 0.5000 + angle=4.0143 + top_visible=true + top_pos=2.5000 -1.0000 + top_size=5.5000 10.0000 + top_angle=2.2689 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_06{ + file=yellow_pikmin + file_pos=0.0000 0.0000 + file_size=20.0000 36.0000 + scale=0.5000 0.5000 + angle=5.6723 + top_visible=true + top_pos=0.5000 3.0000 + top_size=5.5000 10.0000 + top_angle=4.1888 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } + twirling_07{ + file=yellow_pikmin + file_pos=0.0000 0.0000 + file_size=20.0000 36.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-4.0000 1.0000 + top_size=5.5000 10.0000 + top_angle=5.8469 + hitboxes{ + top{ + coords=-4.0000 0.0000 0.0000 + height=24.0000 + radius=4.0000 + type=2 + value=1.0000 + } + body{ + coords=0.0000 0.0000 0.0000 + height=24.0000 + radius=5.0000 + type=0 + value=1.0000 + } + } + } walking_01{ file=yellow_pikmin file_pos=21.0000 0.0000 diff --git a/manual/content/changelog.html b/manual/content/changelog.html index 34ffe2959..6aa1c8ce7 100644 --- a/manual/content/changelog.html +++ b/manual/content/changelog.html @@ -29,7 +29,7 @@

0.26.0

diff --git a/source/documents/todo.txt b/source/documents/todo.txt index bdb8db427..be710ffe2 100644 --- a/source/documents/todo.txt +++ b/source/documents/todo.txt @@ -146,10 +146,8 @@ Next tasks (roughly sorted most important first) Sprout animations should start with nothingness, and grow into a sprout proper (as if popping out of the ground) (Helodity's made some) If necessary, seeds should have their own animation New animations - Twirling (for celebrating) Called to attention Climbing (add the track logic too) - Sliding (add the track logic too) Pushing (add the group task logic too) Dying? (like shrinking or something) Leader animations diff --git a/source/documents/vectorial_graphics/objects/pikmin.svg b/source/documents/vectorial_graphics/objects/pikmin.svg index b05fba24f..60fa6095a 100644 --- a/source/documents/vectorial_graphics/objects/pikmin.svg +++ b/source/documents/vectorial_graphics/objects/pikmin.svg @@ -9864,11 +9864,11 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="1.64775" - inkscape:cx="166.59081" - inkscape:cy="1465.0281" + inkscape:zoom="29.530323" + inkscape:cx="13.867102" + inkscape:cy="531.89395" inkscape:document-units="px" - inkscape:current-layer="layer2" + inkscape:current-layer="layer1" showgrid="true" inkscape:snap-bbox="true" inkscape:window-width="1872" @@ -30157,4 +30157,12 @@ height="100%" inkscape:export-filename="/home/andre/Programming/C++/Pikifen/Game_data/Graphics/Bulbmin.png" inkscape:export-xdpi="96" + inkscape:export-ydpi="96" /> diff --git a/source/source/mob_fsms/pikmin_fsm.cpp b/source/source/mob_fsms/pikmin_fsm.cpp index 247dff7fb..1badf0313 100644 --- a/source/source/mob_fsms/pikmin_fsm.cpp +++ b/source/source/mob_fsms/pikmin_fsm.cpp @@ -2179,7 +2179,11 @@ void pikmin_fsm::called_while_knocked_down(mob* m, void* info1, void* info2) { * @param info2 Unused. */ void pikmin_fsm::celebrate(mob* m, void* info1, void* info2) { - m->set_animation(PIKMIN_ANIM_BACKFLIP); + if(randomi(0, 1) == 0) { + m->set_animation(PIKMIN_ANIM_BACKFLIP); + } else { + m->set_animation(PIKMIN_ANIM_TWIRLING); + } } diff --git a/source/source/mob_types/pikmin_type.cpp b/source/source/mob_types/pikmin_type.cpp index 11242d5ce..18845acb6 100644 --- a/source/source/mob_types/pikmin_type.cpp +++ b/source/source/mob_types/pikmin_type.cpp @@ -133,6 +133,7 @@ anim_conversion_vector pikmin_type::get_anim_conversions() const { v.push_back(std::make_pair(PIKMIN_ANIM_ATTACKING, "attacking")); v.push_back(std::make_pair(PIKMIN_ANIM_GRABBING, "grabbing")); v.push_back(std::make_pair(PIKMIN_ANIM_BACKFLIP, "backflip")); + v.push_back(std::make_pair(PIKMIN_ANIM_TWIRLING, "twirling")); v.push_back(std::make_pair(PIKMIN_ANIM_SIGHING, "sighing")); v.push_back(std::make_pair(PIKMIN_ANIM_SHAKING, "shaking")); v.push_back(std::make_pair(PIKMIN_ANIM_CARRYING, "carrying")); diff --git a/source/source/mob_types/pikmin_type.h b/source/source/mob_types/pikmin_type.h index 9be7f39aa..af0efc9ff 100644 --- a/source/source/mob_types/pikmin_type.h +++ b/source/source/mob_types/pikmin_type.h @@ -209,6 +209,9 @@ enum PIKMIN_ANIM { //Backflip celebration. PIKMIN_ANIM_BACKFLIP, + //Twirling celebration. + PIKMIN_ANIM_TWIRLING, + //Sighing. PIKMIN_ANIM_SIGHING,