mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-06 01:18:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link ac_bee

Browse Source
This commit is contained in:
Cuyler36
2024-11-12 05:35:09 -05:00
parent 9fc8ce8527
commit d6a491b02d
16 changed files with 436 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/m_player_main_air_axe.c_inc
+1 -1
View File
@@ -63,7 +63,7 @@ static void Player_actor_request_proc_index_fromAir_axe(ACTOR* actor, GAME* game
if (Player_actor_Check_AnimationFrame(&kf->frame_control, 35.5f)) {
Player_actor_SettleRequestMainIndexPriority(actor);
Player_actor_Set_status_for_bee(actor, TRUE);
Player_actor_Set_status_for_bee(actor, mPlayer_STATUS_FOR_BEE_ATTACK);
} else if ((kf->frame_control.current_frame >= 36.0f) &&
(!Player_actor_CheckAndRequest_main_axe_all(game, mPlayer_REQUEST_PRIORITY_4)) &&
((Player_actor_GetController_move_percentX()) || (Player_actor_GetController_move_percentY()))) {
src/game/m_player_main_dig_scoop.c_inc
+1 -1
View File
@@ -251,7 +251,7 @@ static void Player_actor_request_proc_index_fromDig_scoop(ACTOR* actor, GAME* ga
if (Player_actor_Check_AnimationFrame(fc, 34.5f + mod)) {
Player_actor_SettleRequestMainIndexPriority(actor);
Player_actor_Set_status_for_bee(actor, TRUE);
Player_actor_Set_status_for_bee(actor, mPlayer_STATUS_FOR_BEE_ATTACK);
} else {
f32 cur_frame = fc->current_frame;
src/game/m_player_main_fill_scoop.c_inc
+1 -1
View File
@@ -166,7 +166,7 @@ static void Player_actor_request_proc_index_fromFill_scoop(ACTOR* actor, GAME* g
if (Player_actor_Check_AnimationFrame(fc, 44.5f + mod)) {
Player_actor_SettleRequestMainIndexPriority(actor);
Player_actor_Set_status_for_bee(actor, TRUE);
Player_actor_Set_status_for_bee(actor, mPlayer_STATUS_FOR_BEE_ATTACK);
} else {
f32 cur_frame = fc->current_frame;
src/game/m_player_main_mail_land.c_inc
+1 -1
View File
@@ -51,7 +51,7 @@ static void Player_actor_request_proc_index_fromMail_land(ACTOR* actorx, GAME* g
if (Player_actor_Check_AnimationFrame(fc0_p, 16.5f)) {
Player_actor_SettleRequestMainIndexPriority(actorx);
Player_actor_Set_status_for_bee(actorx, TRUE);
Player_actor_Set_status_for_bee(actorx, mPlayer_STATUS_FOR_BEE_ATTACK);
} else if (fc0_p->current_frame <= 16.0f &&
(Player_actor_GetController_move_percentX() || Player_actor_GetController_move_percentY())) {
Player_actor_request_main_walk_all(game, NULL, -5.0f, 0, mPlayer_REQUEST_PRIORITY_1);
src/game/m_player_main_radio_exercise.c_inc
+1 -1
View File
@@ -177,7 +177,7 @@ static void Player_actor_request_proc_index_fromRadio_exercise(ACTOR* actorx, GA
if (radio_exercise_p->_08 == FALSE) {
if (cur_frame >= fc0_p->end_frame - 0.5f) {
Player_actor_SettleRequestMainIndexPriority(actorx);
Player_actor_Set_status_for_bee(actorx, TRUE);
Player_actor_Set_status_for_bee(actorx, mPlayer_STATUS_FOR_BEE_ATTACK);
radio_exercise_p->_08 = TRUE;
}
} else if (end_flag) {
src/game/m_player_main_reflect_axe.c_inc
+1 -1
View File
@@ -199,7 +199,7 @@ static void Player_actor_request_proc_index_fromReflect_axe(ACTOR* actor, GAME*
if (Player_actor_Check_AnimationFrame(fc, 30.5f)) {
Player_actor_SettleRequestMainIndexPriority(actor);
Player_actor_Set_status_for_bee(actor, 1);
Player_actor_Set_status_for_bee(actor, mPlayer_STATUS_FOR_BEE_ATTACK);
} else if ((fc->current_frame >= 31.0f) &&
(!Player_actor_CheckAndRequest_main_axe_all(game, mPlayer_REQUEST_PRIORITY_4)) &&
src/game/m_player_main_reflect_scoop.c_inc
+1 -1
View File
@@ -261,7 +261,7 @@ static void Player_actor_request_proc_index_fromReflect_scoop(ACTOR* actor, GAME
if (Player_actor_Check_AnimationFrame(fc, 29.5f)) {
Player_actor_SettleRequestMainIndexPriority(actor);
Player_actor_Set_status_for_bee(actor, TRUE);
Player_actor_Set_status_for_bee(actor, mPlayer_STATUS_FOR_BEE_ATTACK);
} else {
f32 cur_frame = fc->current_frame;
src/game/m_player_main_rotate_umbrella.c_inc
+1 -1
View File
@@ -43,7 +43,7 @@ static void Player_actor_request_proc_index_fromRotate_umbrella(ACTOR* actorx, G
if (Player_actor_Check_AnimationFrame(fc0_p, 19.5f)) {
Player_actor_SettleRequestMainIndexPriority(actorx);
Player_actor_Set_status_for_bee(actorx, TRUE);
Player_actor_Set_status_for_bee(actorx, mPlayer_STATUS_FOR_BEE_ATTACK);
} else {
if (fc0_p->current_frame >= 20.0f &&
Player_actor_CheckAndRequest_main_umbrella_all(game, mPlayer_REQUEST_PRIORITY_4) == FALSE) {
src/game/m_player_main_shake_tree.c_inc
+1 -1
View File
@@ -145,7 +145,7 @@ static void Player_actor_request_proc_index_fromShake_tree(ACTOR* actorx, GAME*
}
} else if (Player_actor_Check_AnimationFrame(fc0_p, 29.5f)) {
Player_actor_SettleRequestMainIndexPriority(actorx);
Player_actor_Set_status_for_bee(actorx, TRUE);
Player_actor_Set_status_for_bee(actorx, mPlayer_STATUS_FOR_BEE_ATTACK);
} else if (cur_frame >= 30.0f) {
if (Player_actor_GetController_move_percentX() || Player_actor_GetController_move_percentY()) {
Player_actor_request_main_walk_all(game, NULL, -5.0f, 0, mPlayer_REQUEST_PRIORITY_1);
src/game/m_player_main_swing_axe.c_inc
+1 -1
View File
@@ -274,7 +274,7 @@ static void Player_actor_request_proc_index_fromSwing_axe(ACTOR* actor, GAME* ga
}
} else if (Player_actor_Check_AnimationFrame(fc, 16.5f)) {
Player_actor_SettleRequestMainIndexPriority(actor);
Player_actor_Set_status_for_bee(actor, 1);
Player_actor_Set_status_for_bee(actor, mPlayer_STATUS_FOR_BEE_ATTACK);
} else if ((current >= 17.0f) && (!Player_actor_CheckAndRequest_main_axe_all(game, 4)) &&
((Player_actor_GetController_move_percentX()) || (Player_actor_GetController_move_percentY()))) {
src/game/m_player_main_swing_fan.c_inc
+1 -1
View File
@@ -71,7 +71,7 @@ static void Player_actor_request_proc_index_fromSwing_fan(ACTOR* actorx, GAME* g
if (Player_actor_Check_AnimationFrame(fc0_p, 7.5f)) {
Player_actor_SettleRequestMainIndexPriority(actorx);
Player_actor_Set_status_for_bee(actorx, TRUE);
Player_actor_Set_status_for_bee(actorx, mPlayer_STATUS_FOR_BEE_ATTACK);
} else {
f32 cur_frame = fc0_p->current_frame;