diff --git a/Contributing.md b/Contributing.md index 9f2bff0a6..f1a917fde 100644 --- a/Contributing.md +++ b/Contributing.md @@ -23,6 +23,7 @@ If you want to make your own code changes to _Pikifen_ and you want them include 2. Make your changes (see [Writing code](#writing-code) and [Commits](#commits) below). 3. Update `Source/documents/Todo.txt` if necessary. 4. Update the manual if necessary. +4. Update the manual's changelog if necessary. 5. Open a pull request with your changes. ### Writing code diff --git a/Game_data/Graphics/Blue_Pikmin.png b/Game_data/Graphics/Blue_Pikmin.png index e68b16f72..57fe7e39e 100644 Binary files a/Game_data/Graphics/Blue_Pikmin.png and b/Game_data/Graphics/Blue_Pikmin.png differ diff --git a/Game_data/Graphics/Bulbmin.png b/Game_data/Graphics/Bulbmin.png index 9ca87ec19..8a0f3f800 100644 Binary files a/Game_data/Graphics/Bulbmin.png and b/Game_data/Graphics/Bulbmin.png differ diff --git a/Game_data/Graphics/Purple_Pikmin.png b/Game_data/Graphics/Purple_Pikmin.png index 7158400f3..880453eb4 100644 Binary files a/Game_data/Graphics/Purple_Pikmin.png and b/Game_data/Graphics/Purple_Pikmin.png differ diff --git a/Game_data/Graphics/Red_Pikmin.png b/Game_data/Graphics/Red_Pikmin.png index 03af3679c..93dcaf293 100644 Binary files a/Game_data/Graphics/Red_Pikmin.png and b/Game_data/Graphics/Red_Pikmin.png differ diff --git a/Game_data/Graphics/Rock_Pikmin.png b/Game_data/Graphics/Rock_Pikmin.png index ac3c14138..35737b542 100644 Binary files a/Game_data/Graphics/Rock_Pikmin.png and b/Game_data/Graphics/Rock_Pikmin.png differ diff --git a/Game_data/Graphics/White_Pikmin.png b/Game_data/Graphics/White_Pikmin.png index 76fb62819..efa25e3ba 100644 Binary files a/Game_data/Graphics/White_Pikmin.png and b/Game_data/Graphics/White_Pikmin.png differ diff --git a/Game_data/Graphics/Winged_Pikmin.png b/Game_data/Graphics/Winged_Pikmin.png index 24743d6ca..c2398c84d 100644 Binary files a/Game_data/Graphics/Winged_Pikmin.png and b/Game_data/Graphics/Winged_Pikmin.png differ diff --git a/Game_data/Graphics/Yellow_Pikmin.png b/Game_data/Graphics/Yellow_Pikmin.png index 973e18222..06d2e8517 100644 Binary files a/Game_data/Graphics/Yellow_Pikmin.png and b/Game_data/Graphics/Yellow_Pikmin.png differ diff --git a/Game_data/Types/Pikmin/Blue/Animations.txt b/Game_data/Types/Pikmin/Blue/Animations.txt index 1f2f80252..a389457aa 100644 --- a/Game_data/Types/Pikmin/Blue/Animations.txt +++ b/Game_data/Types/Pikmin/Blue/Animations.txt @@ -74,6 +74,32 @@ animations{ } } } + flailing{ + frames{ + flailing_01{ + duration=0.1600 + interpolate=true + } + flailing_02{ + duration=0.1600 + interpolate=true + } + flailing_01{ + duration=0.0100 + } + flailing_03{ + duration=0.1600 + interpolate=true + } + flailing_04{ + duration=0.1600 + interpolate=true + } + flailing_03{ + duration=0.0100 + } + } + } getting_up{ frames{ lying_01{ @@ -602,6 +628,114 @@ sprites{ } } } + flailing_01{ + file=Blue_Pikmin.png + file_pos=102.0000 52.0000 + file_size=27.0000 28.0000 + offset=-0.5000 0.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_02{ + file=Blue_Pikmin.png + file_pos=130.0000 52.0000 + file_size=29.0000 28.0000 + scale=0.5000 0.5000 + angle=5.7596 + top_visible=true + top_pos=-8.0000 5.0000 + top_size=5.5000 10.0000 + top_angle=5.7596 + hitboxes{ + top{ + coords=-8.0000 5.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 + } + } + } + flailing_03{ + file=Blue_Pikmin.png + file_pos=102.0000 52.0000 + file_size=27.0000 28.0000 + offset=-0.5000 0.0000 + scale=0.5000 -0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_04{ + file=Blue_Pikmin.png + file_pos=130.0000 52.0000 + file_size=29.0000 28.0000 + scale=0.5000 -0.5000 + angle=0.5236 + top_visible=true + top_pos=-8.0000 -5.0000 + top_size=5.5000 10.0000 + top_angle=0.5236 + hitboxes{ + top{ + coords=-8.0000 -5.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 + } + } + } grabbing{ file=Blue_Pikmin.png file_pos=134.0000 31.0000 diff --git a/Game_data/Types/Pikmin/Bulbmin/Animations.txt b/Game_data/Types/Pikmin/Bulbmin/Animations.txt index 83399c8ba..791858ddc 100644 --- a/Game_data/Types/Pikmin/Bulbmin/Animations.txt +++ b/Game_data/Types/Pikmin/Bulbmin/Animations.txt @@ -75,6 +75,32 @@ animations{ } } } + flailing{ + frames{ + flailing_01{ + duration=0.1600 + interpolate=true + } + flailing_02{ + duration=0.1600 + interpolate=true + } + flailing_01{ + duration=0.0100 + } + flailing_03{ + duration=0.1600 + interpolate=true + } + flailing_04{ + duration=0.1600 + interpolate=true + } + flailing_03{ + duration=0.0100 + } + } + } getting_up{ frames{ lying_01{ @@ -494,6 +520,114 @@ sprites{ } } } + flailing_01{ + file=Bulbmin.png + file_pos=35.0000 89.0000 + file_size=36.0000 28.0000 + offset=-0.5000 0.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_02{ + file=Bulbmin.png + file_pos=72.0000 89.0000 + file_size=36.0000 28.0000 + scale=0.5000 0.5000 + angle=5.7596 + top_visible=true + top_pos=-8.0000 5.0000 + top_size=5.5000 10.0000 + top_angle=5.7596 + hitboxes{ + top{ + coords=-8.0000 5.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 + } + } + } + flailing_03{ + file=Bulbmin.png + file_pos=35.0000 89.0000 + file_size=36.0000 28.0000 + offset=-0.5000 0.0000 + scale=0.5000 -0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_04{ + file=Bulbmin.png + file_pos=72.0000 89.0000 + file_size=36.0000 28.0000 + scale=0.5000 -0.5000 + angle=0.5236 + top_visible=true + top_pos=-8.0000 -5.0000 + top_size=5.5000 10.0000 + top_angle=0.5236 + hitboxes{ + top{ + coords=-8.0000 -5.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 + } + } + } grabbing{ file=Bulbmin.png file_pos=0.0000 0.0000 diff --git a/Game_data/Types/Pikmin/Purple/Animations.txt b/Game_data/Types/Pikmin/Purple/Animations.txt index a0a249fcb..3f4b2466d 100644 --- a/Game_data/Types/Pikmin/Purple/Animations.txt +++ b/Game_data/Types/Pikmin/Purple/Animations.txt @@ -74,6 +74,32 @@ animations{ } } } + flailing{ + frames{ + flailing_01{ + duration=0.1600 + interpolate=true + } + flailing_02{ + duration=0.1600 + interpolate=true + } + flailing_01{ + duration=0.0100 + } + flailing_03{ + duration=0.1600 + interpolate=true + } + flailing_04{ + duration=0.1600 + interpolate=true + } + flailing_03{ + duration=0.0100 + } + } + } getting_up{ frames{ lying_01{ @@ -602,6 +628,114 @@ sprites{ } } } + flailing_01{ + file=Purple_Pikmin.png + file_pos=115.0000 74.0000 + file_size=29.0000 36.0000 + offset=-0.5000 0.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_02{ + file=Purple_Pikmin.png + file_pos=145.0000 74.0000 + file_size=32.0000 36.0000 + scale=0.5000 0.5000 + angle=5.7596 + top_visible=true + top_pos=-8.0000 5.0000 + top_size=5.5000 10.0000 + top_angle=5.7596 + hitboxes{ + top{ + coords=-8.0000 5.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 + } + } + } + flailing_03{ + file=Purple_Pikmin.png + file_pos=115.0000 74.0000 + file_size=29.0000 36.0000 + offset=-0.5000 0.0000 + scale=0.5000 -0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_04{ + file=Purple_Pikmin.png + file_pos=145.0000 74.0000 + file_size=32.0000 36.0000 + scale=0.5000 -0.5000 + angle=0.5236 + top_visible=true + top_pos=-8.0000 -5.0000 + top_size=5.5000 10.0000 + top_angle=0.5236 + hitboxes{ + top{ + coords=-8.0000 -5.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 + } + } + } grabbing{ file=Purple_Pikmin.png file_pos=136.0000 37.0000 diff --git a/Game_data/Types/Pikmin/Red/Animations.txt b/Game_data/Types/Pikmin/Red/Animations.txt index f5d36e69a..6133373f5 100644 --- a/Game_data/Types/Pikmin/Red/Animations.txt +++ b/Game_data/Types/Pikmin/Red/Animations.txt @@ -74,6 +74,32 @@ animations{ } } } + flailing{ + frames{ + flailing_01{ + duration=0.1600 + interpolate=true + } + flailing_02{ + duration=0.1600 + interpolate=true + } + flailing_01{ + duration=0.0100 + } + flailing_03{ + duration=0.1600 + interpolate=true + } + flailing_04{ + duration=0.1600 + interpolate=true + } + flailing_03{ + duration=0.0100 + } + } + } getting_up{ frames{ lying_01{ @@ -602,6 +628,114 @@ sprites{ } } } + flailing_01{ + file=Red_Pikmin.png + file_pos=110.0000 54.0000 + file_size=29.0000 29.0000 + offset=-0.5000 0.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_02{ + file=Red_Pikmin.png + file_pos=140.0000 54.0000 + file_size=29.0000 29.0000 + scale=0.5000 0.5000 + angle=5.7596 + top_visible=true + top_pos=-8.0000 5.0000 + top_size=5.5000 10.0000 + top_angle=5.7596 + hitboxes{ + top{ + coords=-8.0000 5.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 + } + } + } + flailing_03{ + file=Red_Pikmin.png + file_pos=110.0000 54.0000 + file_size=29.0000 29.0000 + offset=-0.5000 0.0000 + scale=0.5000 -0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_04{ + file=Red_Pikmin.png + file_pos=140.0000 54.0000 + file_size=29.0000 29.0000 + scale=0.5000 -0.5000 + angle=0.5236 + top_visible=true + top_pos=-8.0000 -5.0000 + top_size=5.5000 10.0000 + top_angle=0.5236 + hitboxes{ + top{ + coords=-8.0000 -5.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 + } + } + } grabbing{ file=Red_Pikmin.png file_pos=134.0000 31.0000 diff --git a/Game_data/Types/Pikmin/Rock/Animations.txt b/Game_data/Types/Pikmin/Rock/Animations.txt index cd8f11f57..084188f68 100644 --- a/Game_data/Types/Pikmin/Rock/Animations.txt +++ b/Game_data/Types/Pikmin/Rock/Animations.txt @@ -59,6 +59,26 @@ animations{ } } } + flailing{ + frames{ + flailing_01{ + duration=0.1600 + interpolate=true + } + flailing_02{ + duration=0.1600 + interpolate=true + } + flailing_01{ + duration=0.1600 + interpolate=true + } + flailing_03{ + duration=0.1600 + interpolate=true + } + } + } getting_up{ frames{ lying_01{ @@ -537,6 +557,87 @@ sprites{ } } } + flailing_01{ + file=Rock_Pikmin.png + file_pos=71.0000 120.0000 + file_size=28.0000 38.0000 + offset=-0.5000 0.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-7.5000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_02{ + file=Rock_Pikmin.png + file_pos=100.0000 120.0000 + file_size=33.0000 38.0000 + scale=0.5000 0.5000 + angle=5.7596 + top_visible=true + top_pos=-6.0000 3.5000 + top_size=5.5000 10.0000 + top_angle=5.7596 + hitboxes{ + top{ + coords=-8.0000 5.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 + } + } + } + flailing_03{ + file=Rock_Pikmin.png + file_pos=134.0000 120.0000 + file_size=33.0000 38.0000 + scale=0.5000 0.5000 + angle=0.5236 + top_visible=true + top_pos=-6.0000 -3.5000 + top_size=5.5000 10.0000 + top_angle=0.5236 + hitboxes{ + top{ + coords=-8.0000 -5.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 + } + } + } grabbing{ file=Rock_Pikmin.png file_pos=146.0000 53.0000 diff --git a/Game_data/Types/Pikmin/White/Animations.txt b/Game_data/Types/Pikmin/White/Animations.txt index 50912e1ce..d1dae936b 100644 --- a/Game_data/Types/Pikmin/White/Animations.txt +++ b/Game_data/Types/Pikmin/White/Animations.txt @@ -74,6 +74,32 @@ animations{ } } } + flailing{ + frames{ + flailing_01{ + duration=0.1600 + interpolate=true + } + flailing_02{ + duration=0.1600 + interpolate=true + } + flailing_01{ + duration=0.0100 + } + flailing_03{ + duration=0.1600 + interpolate=true + } + flailing_04{ + duration=0.1600 + interpolate=true + } + flailing_03{ + duration=0.0100 + } + } + } getting_up{ frames{ lying_01{ @@ -602,6 +628,114 @@ sprites{ } } } + flailing_01{ + file=White_Pikmin.png + file_pos=90.0000 50.0000 + file_size=22.0000 24.0000 + offset=-0.5000 0.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_02{ + file=White_Pikmin.png + file_pos=113.0000 50.0000 + file_size=25.0000 24.0000 + scale=0.5000 0.5000 + angle=5.7596 + top_visible=true + top_pos=-8.0000 5.0000 + top_size=5.5000 10.0000 + top_angle=5.7596 + hitboxes{ + top{ + coords=-8.0000 5.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 + } + } + } + flailing_03{ + file=White_Pikmin.png + file_pos=90.0000 50.0000 + file_size=22.0000 24.0000 + offset=-0.5000 0.0000 + scale=0.5000 -0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_04{ + file=White_Pikmin.png + file_pos=113.0000 50.0000 + file_size=25.0000 24.0000 + scale=0.5000 -0.5000 + angle=0.5236 + top_visible=true + top_pos=-8.0000 -5.0000 + top_size=5.5000 10.0000 + top_angle=0.5236 + hitboxes{ + top{ + coords=-8.0000 -5.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 + } + } + } grabbing{ file=White_Pikmin.png file_pos=110.0000 29.0000 diff --git a/Game_data/Types/Pikmin/Winged/Animations.txt b/Game_data/Types/Pikmin/Winged/Animations.txt index 311c35c2d..68b250001 100644 --- a/Game_data/Types/Pikmin/Winged/Animations.txt +++ b/Game_data/Types/Pikmin/Winged/Animations.txt @@ -83,6 +83,32 @@ animations{ } } } + flailing{ + frames{ + flailing_01{ + duration=0.1600 + interpolate=true + } + flailing_02{ + duration=0.1600 + interpolate=true + } + flailing_01{ + duration=0.0100 + } + flailing_03{ + duration=0.1600 + interpolate=true + } + flailing_04{ + duration=0.1600 + interpolate=true + } + flailing_03{ + duration=0.0100 + } + } + } getting_up{ frames{ lying_01{ @@ -563,6 +589,112 @@ sprites{ } } } + flailing_01{ + file=Winged_Pikmin.png + file_pos=168.0000 147.0000 + file_size=22.0000 28.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-7.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_02{ + file=Winged_Pikmin.png + file_pos=191.0000 147.0000 + file_size=25.0000 28.0000 + scale=0.5000 0.5000 + angle=5.7596 + top_visible=true + top_pos=-7.0000 4.0000 + top_size=5.5000 10.0000 + top_angle=5.7596 + hitboxes{ + top{ + coords=-8.0000 5.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 + } + } + } + flailing_03{ + file=Winged_Pikmin.png + file_pos=168.0000 147.0000 + file_size=22.0000 28.0000 + scale=0.5000 -0.5000 + top_visible=true + top_pos=-7.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_04{ + file=Winged_Pikmin.png + file_pos=191.0000 147.0000 + file_size=25.0000 28.0000 + scale=0.5000 -0.5000 + angle=0.5236 + top_visible=true + top_pos=-7.0000 -4.0000 + top_size=5.5000 10.0000 + top_angle=0.5236 + hitboxes{ + top{ + coords=-8.0000 -5.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 + } + } + } grabbing_01{ file=Winged_Pikmin.png file_pos=0.0000 118.0000 diff --git a/Game_data/Types/Pikmin/Yellow/Animations.txt b/Game_data/Types/Pikmin/Yellow/Animations.txt index aa0cb020a..1f0861694 100644 --- a/Game_data/Types/Pikmin/Yellow/Animations.txt +++ b/Game_data/Types/Pikmin/Yellow/Animations.txt @@ -74,6 +74,32 @@ animations{ } } } + flailing{ + frames{ + flailing_01{ + duration=0.1600 + interpolate=true + } + flailing_02{ + duration=0.1600 + interpolate=true + } + flailing_01{ + duration=0.0100 + } + flailing_03{ + duration=0.1600 + interpolate=true + } + flailing_04{ + duration=0.1600 + interpolate=true + } + flailing_03{ + duration=0.0100 + } + } + } getting_up{ frames{ lying_01{ @@ -602,6 +628,114 @@ sprites{ } } } + flailing_01{ + file=Yellow_Pikmin.png + file_pos=105.0000 74.0000 + file_size=27.0000 36.0000 + offset=-0.5000 0.0000 + scale=0.5000 0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_02{ + file=Yellow_Pikmin.png + file_pos=133.0000 74.0000 + file_size=29.0000 36.0000 + scale=0.5000 0.5000 + angle=5.7596 + top_visible=true + top_pos=-8.0000 5.0000 + top_size=5.5000 10.0000 + top_angle=5.7596 + hitboxes{ + top{ + coords=-8.0000 5.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 + } + } + } + flailing_03{ + file=Yellow_Pikmin.png + file_pos=105.0000 74.0000 + file_size=27.0000 36.0000 + offset=-0.5000 0.0000 + scale=0.5000 -0.5000 + top_visible=true + top_pos=-10.0000 0.0000 + top_size=5.5000 10.0000 + top_angle=0.0000 + hitboxes{ + top{ + coords=-10.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 + } + } + } + flailing_04{ + file=Yellow_Pikmin.png + file_pos=133.0000 74.0000 + file_size=29.0000 36.0000 + scale=0.5000 -0.5000 + angle=0.5236 + top_visible=true + top_pos=-8.0000 -5.0000 + top_size=5.5000 10.0000 + top_angle=0.5236 + hitboxes{ + top{ + coords=-8.0000 -5.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 + } + } + } grabbing{ file=Yellow_Pikmin.png file_pos=134.0000 37.0000 diff --git a/Manual/content/changelog.html b/Manual/content/changelog.html index 54e9a3369..823a1c502 100644 --- a/Manual/content/changelog.html +++ b/Manual/content/changelog.html @@ -28,7 +28,7 @@
Got a question about the engine? You may find the answer here! If your question is a problem, please check the troubleshooting page instead.
-attacking
: If its attack method is "latch", this is the Pikmin reeling back its head and smacking with it, causing damage; this is used regardless of the Pikmin being latched on or attacking while grounded. If its attack method is "impact", this is the Pikmin lunging forward and causing damage; it should be quick and snappy so the Pikmin can be bounced back shortly after.carrying
: Carrying an object.drinking
: Bending down to drink a drop.flailing
: Flailing around, either because it's trying to wade out of water or because it got caught by an enemy.getting_up
: Getting up from lying down.grabbing
: Standing upright and grabbing onto an object.knocked_back
: Getting knocked backwards, flying in the air.