Added Pikmin pushing animations.

Espyo · Dec 15, 2024 · d735d74 · d735d74
1 parent e4c641d
commit d735d74
Show file tree

Hide file tree

Showing 14 changed files with 147 additions and 3 deletions.
diff --git a/game_data/base/mob_types/pikmin/blue_pikmin/animations.txt b/game_data/base/mob_types/pikmin/blue_pikmin/animations.txt
@@ -436,6 +436,22 @@ animations{
 			}
 		}
 	}
+	pushing{
+		frames{
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_01{
+				duration=0.1500
+			}
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_02{
+				duration=0.1500
+			}
+		}
+	}
 	shaking{
 		frames{
 			idling_01{

diff --git a/game_data/base/mob_types/pikmin/bulbmin/animations.txt b/game_data/base/mob_types/pikmin/bulbmin/animations.txt
@@ -402,6 +402,34 @@ animations{
 			}
 		}
 	}
+	pushing{
+		frames{
+			idling_01{
+				duration=0.1200
+			}
+			walking_01{
+				duration=0.1200
+			}
+			walking_02{
+				duration=0.1200
+			}
+			walking_01{
+				duration=0.1200
+			}
+			idling_01{
+				duration=0.1200
+			}
+			walking_03{
+				duration=0.1200
+			}
+			walking_04{
+				duration=0.1200
+			}
+			walking_03{
+				duration=0.1200
+			}
+		}
+	}
 	shaking{
 		frames{
 			idling_01{

diff --git a/game_data/base/mob_types/pikmin/purple_pikmin/animations.txt b/game_data/base/mob_types/pikmin/purple_pikmin/animations.txt
@@ -436,6 +436,22 @@ animations{
 			}
 		}
 	}
+	pushing{
+		frames{
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_01{
+				duration=0.1500
+			}
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_02{
+				duration=0.1500
+			}
+		}
+	}
 	shaking{
 		frames{
 			idling_01{

diff --git a/game_data/base/mob_types/pikmin/red_pikmin/animations.txt b/game_data/base/mob_types/pikmin/red_pikmin/animations.txt
@@ -436,6 +436,22 @@ animations{
 			}
 		}
 	}
+	pushing{
+		frames{
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_01{
+				duration=0.1500
+			}
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_02{
+				duration=0.1500
+			}
+		}
+	}
 	shaking{
 		frames{
 			idling_01{

diff --git a/game_data/base/mob_types/pikmin/rock_pikmin/animations.txt b/game_data/base/mob_types/pikmin/rock_pikmin/animations.txt
@@ -419,6 +419,22 @@ animations{
 			}
 		}
 	}
+	pushing{
+		frames{
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_01{
+				duration=0.1500
+			}
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_02{
+				duration=0.1500
+			}
+		}
+	}
 	shaking{
 		frames{
 			idling_01{

diff --git a/game_data/base/mob_types/pikmin/white_pikmin/animations.txt b/game_data/base/mob_types/pikmin/white_pikmin/animations.txt
@@ -436,6 +436,22 @@ animations{
 			}
 		}
 	}
+	pushing{
+		frames{
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_01{
+				duration=0.1500
+			}
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_02{
+				duration=0.1500
+			}
+		}
+	}
 	shaking{
 		frames{
 			idling_01{

diff --git a/game_data/base/mob_types/pikmin/winged_pikmin/animations.txt b/game_data/base/mob_types/pikmin/winged_pikmin/animations.txt
@@ -426,6 +426,22 @@ animations{
 			}
 		}
 	}
+	pushing{
+		frames{
+			grabbing_01{
+				duration=0.0500
+			}
+			grabbing_02{
+				duration=0.0500
+			}
+			grabbing_01{
+				duration=0.0500
+			}
+			grabbing_03{
+				duration=0.0500
+			}
+		}
+	}
 	shaking{
 		frames{
 			idling_01{

diff --git a/game_data/base/mob_types/pikmin/yellow_pikmin/animations.txt b/game_data/base/mob_types/pikmin/yellow_pikmin/animations.txt
@@ -436,6 +436,22 @@ animations{
 			}
 		}
 	}
+	pushing{
+		frames{
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_01{
+				duration=0.1500
+			}
+			grabbing{
+				duration=0.1500
+			}
+			grabbing_walk_02{
+				duration=0.1500
+			}
+		}
+	}
 	shaking{
 		frames{
 			idling_01{

diff --git a/manual/content/changelog.html b/manual/content/changelog.html
@@ -29,7 +29,7 @@ <h2 id="0.26.0">0.26.0</h2>
     <ul>
       <li><span class="cl-a">Added</span> some songs.</li>
       <li><span class="cl-a">Added</span> many new sounds.</li>
-      <li><span class="cl-a">Added</span> arms out, backflip, called, climbing, crushed, flailing, lounging, plucking thrown, shaking, sitting, sliding, and twirling animations to <a href="mob_pikmin.html">Pikmin</a>.</li>
+      <li><span class="cl-a">Added</span> arms out, backflip, called, climbing, crushed, flailing, lounging, plucking thrown, pushing, shaking, sitting, sliding, and twirling animations to <a href="mob_pikmin.html">Pikmin</a>.</li>
       <li><span class="cl-a">Added</span> throwing animations to <a href="mob_leader.html">leaders</a>.</li>
       <li><span class="cl-a">Added</span> Pikmin generation animations to <a href="mob_onion.html">Onions</a>.</li>
       <li><span class="cl-a">Added</span> a new <a href="area.html">area</a>: Olympian Ruins.</li>

diff --git a/manual/content/mob_pikmin.html b/manual/content/mob_pikmin.html
@@ -170,6 +170,7 @@ <h2 id="animations">Animations</h2>
       <li><b><code>mob_landing</code></b>: Getting ready to strike after landing on an object and latching on. Alternatively, causing damage after landing on an object.</li>
       <li><b><code>plucking</code></b>: Coming out of the ground.</li>
       <li><b><code>plucking_thrown</code></b>: Continuously backflipping in the air after being plucked.</li>
+      <li><b><code>pushing</code></b>: Pushing forward.</li>
       <li><b><code>shaking</code></b>: Shaking itself, like when it comes out of water.</li>
       <li><b><code>sighing</code></b>: Sighing after becoming disappointed with something, like being unable to reach a carrying spot.</li>
       <li><b><code>sprout</code></b>: Idling underground; only the stem is visible.</li>

diff --git a/source/documents/todo.txt b/source/documents/todo.txt
@@ -141,7 +141,6 @@ 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
-            Pushing (add the group task logic too)
             Dying? (like shrinking or something)
     Leader animations
         Improvements

diff --git a/source/source/mob_fsms/pikmin_fsm.cpp b/source/source/mob_fsms/pikmin_fsm.cpp
@@ -4519,7 +4519,7 @@ void pikmin_fsm::work_on_group_task(mob* m, void* info1, void* info2) {
         break;
     }
     case GROUP_TASK_PIKMIN_POSE_PUSHING: {
-        pik_ptr->set_animation(PIKMIN_ANIM_IDLING); //TODO
+        pik_ptr->set_animation(PIKMIN_ANIM_PUSHING);
         break;
     }
     case GROUP_TASK_PIKMIN_POSE_CARRYING: {

diff --git a/source/source/mob_types/pikmin_type.cpp b/source/source/mob_types/pikmin_type.cpp
@@ -147,6 +147,7 @@ anim_conversion_vector pikmin_type::get_anim_conversions() const {
     v.push_back(std::make_pair(PIKMIN_ANIM_DRINKING,        "drinking"));
     v.push_back(std::make_pair(PIKMIN_ANIM_PICKING_UP,      "picking_up"));
     v.push_back(std::make_pair(PIKMIN_ANIM_ARMS_OUT,        "arms_out"));
+    v.push_back(std::make_pair(PIKMIN_ANIM_PUSHING,         "pushing"));
     v.push_back(std::make_pair(PIKMIN_ANIM_CLIMBING,        "climbing"));
     v.push_back(std::make_pair(PIKMIN_ANIM_SLIDING,         "sliding"));
     v.push_back(std::make_pair(PIKMIN_ANIM_CRUSHED,         "crushed"));

diff --git a/source/source/mob_types/pikmin_type.h b/source/source/mob_types/pikmin_type.h
@@ -254,6 +254,9 @@ enum PIKMIN_ANIM {
     //Arms stretched out sideways.
     PIKMIN_ANIM_ARMS_OUT,
 
+    //Pushing forward.
+    PIKMIN_ANIM_PUSHING,
+
     //Climbing.
     PIKMIN_ANIM_CLIMBING,