mirror of
https://github.com/ACreTeam/ac-decomp
synced 2026-05-22 22:24:16 -04:00
Implement & link ac_ev_artist
This commit is contained in:
Cuyler36
+1
-1
@@ -1161,7 +1161,7 @@ config.libs = [
|
||||
"actor_npc_event",
|
||||
[
|
||||
Object(NonMatching, "actor/npc/event/ac_ev_angler.c"),
|
||||
Object(NonMatching, "actor/npc/event/ac_ev_artist.c"),
|
||||
Object(Matching, "actor/npc/event/ac_ev_artist.c"),
|
||||
Object(Matching, "actor/npc/event/ac_ev_broker.c"),
|
||||
Object(NonMatching, "actor/npc/event/ac_ev_broker2.c"),
|
||||
Object(Matching, "actor/npc/event/ac_ev_carpetPeddler.c"),
|
||||
|
||||
+15
-1
@@ -3,11 +3,26 @@
|
||||
|
||||
#include "types.h"
|
||||
#include "m_actor.h"
|
||||
#include "ac_npc.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct ev_artist_actor_s EV_ARTIST_ACTOR;
|
||||
|
||||
typedef void (*aEART_SETUP_ACT_PROC)(EV_ARTIST_ACTOR* artist, GAME_PLAY* play, int action);
|
||||
typedef void (*aEART_TALK_PROC)(EV_ARTIST_ACTOR* artist, GAME_PLAY* play);
|
||||
|
||||
struct ev_artist_actor_s {
|
||||
NPC_ACTOR npc_class;
|
||||
int action;
|
||||
aEART_TALK_PROC talk_proc;
|
||||
aEART_SETUP_ACT_PROC setupAction_proc;
|
||||
mActor_name_t present;
|
||||
mActor_name_t received_item;
|
||||
};
|
||||
|
||||
extern ACTOR_PROFILE Ev_Artist_Profile;
|
||||
|
||||
#ifdef __cplusplus
|
||||
@@ -15,4 +30,3 @@ extern ACTOR_PROFILE Ev_Artist_Profile;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
+4
-2
@@ -461,10 +461,12 @@ typedef struct broker_event_s {
|
||||
mActor_name_t items[mEv_BROKER_ITEM_NUM];
|
||||
} mEv_broker_c;
|
||||
|
||||
#define mEv_ARTIST_ENTRY_SAVE_NUM 2
|
||||
|
||||
typedef struct artist_event_s {
|
||||
PersonalID_c pids[2];
|
||||
PersonalID_c pids[mEv_ARTIST_ENTRY_SAVE_NUM];
|
||||
int used;
|
||||
mActor_name_t walls[2];
|
||||
mActor_name_t walls[mEv_ARTIST_ENTRY_SAVE_NUM];
|
||||
} mEv_artist_c;
|
||||
|
||||
typedef struct arabian_event_s {
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
#include "ac_ev_artist.h"
|
||||
|
||||
#include "m_common_data.h"
|
||||
#include "m_player_lib.h"
|
||||
#include "m_msg.h"
|
||||
#include "libultra/libultra.h"
|
||||
|
||||
enum {
|
||||
aEART_ACTION_SAY_HUNGRY,
|
||||
aEART_ACTION_TALK_END_WAIT,
|
||||
aEART_ACTION_MENU_OPEN_WAIT,
|
||||
aEART_ACTION_MENU_CLOSE_WAIT,
|
||||
aEART_ACTION_MSG_WIN_OPEN_WAIT,
|
||||
aEART_ACTION_DEMO_START_WAIT,
|
||||
aEART_ACTION_REFUSE_DEMO_START_WAIT,
|
||||
aEART_ACTION_REFUSE_DEMO_END_WAIT,
|
||||
|
||||
aEART_ACTION_NUM
|
||||
};
|
||||
|
||||
enum {
|
||||
aEART_ITEM_TYPE_FISH,
|
||||
aEART_ITEM_TYPE_FOOD,
|
||||
aEART_ITEM_TYPE_TOOL,
|
||||
aEART_ITEM_TYPE_OTHER,
|
||||
|
||||
aEART_ITEM_TYPE_NUM
|
||||
};
|
||||
|
||||
static void aEART_actor_ct(ACTOR* actorx, GAME* game);
|
||||
static void aEART_actor_dt(ACTOR* actorx, GAME* game);
|
||||
static void aEART_actor_move(ACTOR* actorx, GAME* game);
|
||||
static void aEART_actor_draw(ACTOR* actorx, GAME* game);
|
||||
static void aEART_actor_init(ACTOR* actorx, GAME* game);
|
||||
static void aEART_actor_save(ACTOR* actorx, GAME* game);
|
||||
|
||||
// clang-format off
|
||||
ACTOR_PROFILE Ev_Artist_Profile = {
|
||||
mAc_PROFILE_EV_ARTIST,
|
||||
ACTOR_PART_NPC,
|
||||
ACTOR_STATE_NONE,
|
||||
SP_NPC_ARTIST,
|
||||
ACTOR_OBJ_BANK_KEEP,
|
||||
sizeof(EV_ARTIST_ACTOR),
|
||||
aEART_actor_ct,
|
||||
aEART_actor_dt,
|
||||
aEART_actor_init,
|
||||
mActor_NONE_PROC1,
|
||||
aEART_actor_save,
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
static void aEART_talk_request(ACTOR* actorx, GAME* game);
|
||||
static int aEART_talk_init(ACTOR* actorx, GAME* game);
|
||||
static int aEART_talk_end_chk(ACTOR* actorx, GAME* game);
|
||||
|
||||
static void aEART_setupAction(EV_ARTIST_ACTOR* artist, GAME_PLAY* play, int action);
|
||||
|
||||
static void aEART_actor_ct(ACTOR* actorx, GAME* game) {
|
||||
static aNPC_ct_data_c ct_data = {
|
||||
// clang-format off
|
||||
aEART_actor_move,
|
||||
aEART_actor_draw,
|
||||
aNPC_CT_SCHED_TYPE_WANDER,
|
||||
aEART_talk_request,
|
||||
aEART_talk_init,
|
||||
aEART_talk_end_chk,
|
||||
0,
|
||||
// clang-format on
|
||||
};
|
||||
|
||||
if (CLIP(npc_clip)->birth_check_proc(actorx, game) == TRUE) {
|
||||
EV_ARTIST_ACTOR* artist = (EV_ARTIST_ACTOR*)actorx;
|
||||
|
||||
CLIP(npc_clip)->ct_proc(actorx, game, &ct_data);
|
||||
artist->setupAction_proc = aEART_setupAction;
|
||||
}
|
||||
}
|
||||
|
||||
static void aEART_actor_save(ACTOR* actorx, GAME* game) {
|
||||
CLIP(npc_clip)->save_proc(actorx, game);
|
||||
}
|
||||
|
||||
static void aEART_actor_dt(ACTOR* actorx, GAME* game) {
|
||||
EV_ARTIST_ACTOR* artist = (EV_ARTIST_ACTOR*)actorx;
|
||||
|
||||
CLIP(npc_clip)->dt_proc(actorx, game);
|
||||
mEv_actor_dying_message(mEv_EVENT_ARTIST, actorx);
|
||||
|
||||
{
|
||||
mEv_artist_c* ev_save_p = &Save_Get(event_save_data).special.event.artist;
|
||||
|
||||
if (ev_save_p->used > mEv_ARTIST_ENTRY_SAVE_NUM) {
|
||||
mEv_special_event_soldout(mEv_EVENT_ARTIST);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void aEART_actor_init(ACTOR* actorx, GAME* game) {
|
||||
CLIP(npc_clip)->init_proc(actorx, game);
|
||||
}
|
||||
|
||||
static void aEART_actor_draw(ACTOR* actorx, GAME* game) {
|
||||
CLIP(npc_clip)->draw_proc(actorx, game);
|
||||
}
|
||||
|
||||
#include "../src/actor/npc/event/ac_ev_artist_move.c_inc"
|
||||
@@ -0,0 +1,258 @@
|
||||
static int aEART_check_present(void) {
|
||||
mEv_artist_c* ev_save_p = &Save_Get(event_save_data).special.event.artist;
|
||||
int ret = FALSE;
|
||||
|
||||
if (ev_save_p->used > mEv_ARTIST_ENTRY_SAVE_NUM) {
|
||||
ret = TRUE;
|
||||
} else {
|
||||
PersonalID_c* pid = ev_save_p->pids;
|
||||
int n = ev_save_p->used;
|
||||
|
||||
for (n; n != 0; n--) {
|
||||
if (mPr_CheckCmpPersonalID(pid, &Now_Private->player_ID) == TRUE) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
pid++;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int aEART_item_check(mActor_name_t item) {
|
||||
int ret = aEART_ITEM_TYPE_OTHER;
|
||||
|
||||
if (ITEM_NAME_GET_TYPE(item) == NAME_TYPE_ITEM1) {
|
||||
// @cleanup - no need to subtract ITEM1_NO_START, we're already masking out 4 bits for the category
|
||||
switch (ITEM_NAME_GET_CAT(item - ITEM1_NO_START)) {
|
||||
case ITEM1_CAT_FISH:
|
||||
ret = aEART_ITEM_TYPE_FISH;
|
||||
break;
|
||||
case ITEM1_CAT_FRUIT:
|
||||
ret = aEART_ITEM_TYPE_FOOD;
|
||||
break;
|
||||
case ITEM1_CAT_TOOL:
|
||||
ret = aEART_ITEM_TYPE_TOOL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void aEART_say_hungry(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
mMsg_Window_c* msg_p = mMsg_Get_base_window_p();
|
||||
|
||||
if (mMsg_Check_MainNormalContinue(msg_p) == TRUE) {
|
||||
switch (mChoice_GET_CHOSENUM()) {
|
||||
case mChoice_CHOICE0:
|
||||
(*artist->setupAction_proc)(artist, play, aEART_ACTION_MENU_OPEN_WAIT);
|
||||
break;
|
||||
case mChoice_CHOICE1:
|
||||
mMsg_Set_continue_msg_num(msg_p, 0x02F6);
|
||||
(*artist->setupAction_proc)(artist, play, aEART_ACTION_TALK_END_WAIT);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void aEART_menu_open_wait(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
if (mMsg_CHECK_MAIN_WAIT() == TRUE) {
|
||||
(*artist->setupAction_proc)(artist, play, aEART_ACTION_MENU_CLOSE_WAIT);
|
||||
}
|
||||
}
|
||||
|
||||
static void aEART_menu_close_wait(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
Submenu* submenu = &play->submenu;
|
||||
|
||||
if (!submenu->open_flag) {
|
||||
(*artist->setupAction_proc)(artist, play, aEART_ACTION_MSG_WIN_OPEN_WAIT);
|
||||
}
|
||||
}
|
||||
|
||||
static void aEART_msg_win_open_wait(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
static int msg_no[] = { 0x02F6, 0x02F9, 0x02F8, 0x02FC, 0x02F7 };
|
||||
static int next_act_idx[] = { aEART_ACTION_TALK_END_WAIT, aEART_ACTION_DEMO_START_WAIT, aEART_ACTION_TALK_END_WAIT, aEART_ACTION_REFUSE_DEMO_START_WAIT, aEART_ACTION_TALK_END_WAIT };
|
||||
|
||||
mMsg_Window_c* msg_p = mMsg_Get_base_window_p();
|
||||
|
||||
if (mMsg_Check_not_series_main_wait(msg_p) == TRUE) {
|
||||
Submenu* submenu = &play->submenu;
|
||||
mActor_name_t item = submenu->item_p->item;
|
||||
int idx = 0;
|
||||
|
||||
if (item != EMPTY_NO) {
|
||||
mPr_SetPossessionItem(Now_Private, submenu->item_p->slot_no, EMPTY_NO, mPr_ITEM_COND_NORMAL);
|
||||
|
||||
switch (aEART_item_check(item)) {
|
||||
case aEART_ITEM_TYPE_FISH:
|
||||
idx = 1;
|
||||
break;
|
||||
case aEART_ITEM_TYPE_FOOD:
|
||||
idx = 2;
|
||||
break;
|
||||
case aEART_ITEM_TYPE_TOOL:
|
||||
idx = 3;
|
||||
break;
|
||||
case aEART_ITEM_TYPE_OTHER:
|
||||
idx = 4;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
artist->received_item = item;
|
||||
mMsg_Set_continue_msg_num(msg_p, msg_no[idx]);
|
||||
(*artist->setupAction_proc)(artist, play, next_act_idx[idx]);
|
||||
}
|
||||
}
|
||||
|
||||
static void aEART_demo_start_wait(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
int order = mDemo_Get_OrderValue(mDemo_ORDER_NPC0, 1);
|
||||
|
||||
if (order == 2) {
|
||||
aNPC_DEMO_GIVE_ITEM(artist->present, aHOI_REQUEST_PUTAWAY, TRUE);
|
||||
mMsg_SET_CONTINUE_MSG_NUM(0x02FA);
|
||||
(*artist->setupAction_proc)(artist, play, aEART_ACTION_TALK_END_WAIT);
|
||||
}
|
||||
}
|
||||
|
||||
static void aEART_refuse_demo_start_wait(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
int order = mDemo_Get_OrderValue(mDemo_ORDER_NPC0, 1);
|
||||
|
||||
if (order == 2) {
|
||||
aNPC_DEMO_GIVE_ITEM(artist->received_item, aHOI_REQUEST_PUTAWAY, FALSE);
|
||||
mPr_SetFreePossessionItem(Now_Private, artist->received_item, mPr_ITEM_COND_NORMAL);
|
||||
(*artist->setupAction_proc)(artist, play, aEART_ACTION_REFUSE_DEMO_END_WAIT);
|
||||
}
|
||||
}
|
||||
|
||||
static void aEART_refuse_demo_end_wait(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
if (CLIP(handOverItem_clip)->master_actor == NULL) {
|
||||
(*artist->setupAction_proc)(artist, play, aEART_ACTION_TALK_END_WAIT);
|
||||
}
|
||||
}
|
||||
|
||||
static void aEART_menu_open_wait_init(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
mMsg_REQUEST_MAIN_DISAPPEAR_WAIT_TYPE1();
|
||||
}
|
||||
|
||||
static void aEART_menu_close_wait_init(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
Submenu* submenu = &play->submenu;
|
||||
|
||||
mSM_open_submenu(submenu, mSM_OVL_INVENTORY, mSM_IV_OPEN_GIVE, 0);
|
||||
}
|
||||
|
||||
static void aEART_msg_win_open_wait_init(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
mMsg_Window_c* msg_p = mMsg_Get_base_window_p();
|
||||
|
||||
mMsg_request_main_appear_wait_type1(msg_p);
|
||||
mMsg_Unset_LockContinue(msg_p);
|
||||
}
|
||||
|
||||
static void aEART_demo_start_wait_init(EV_ARTIST_ACTOR* artist, GAME_PLAY* play) {
|
||||
Submenu* submenu = &play->submenu;
|
||||
Submenu_Item_c* item_p = submenu->item_p;
|
||||
mEv_artist_c* ev_save_p = &Save_Get(event_save_data).special.event.artist;
|
||||
mActor_name_t present;
|
||||
|
||||
mSP_SelectRandomItem_New(NULL, &present, 1, ev_save_p->walls, ev_save_p->used, mSP_KIND_WALLPAPER, mSP_LISTTYPE_EVENT, FALSE);
|
||||
artist->present = present;
|
||||
mPr_SetPossessionItem(Now_Private, item_p->slot_no, present, mPr_ITEM_COND_NORMAL);
|
||||
|
||||
if (ev_save_p->used == mEv_ARTIST_ENTRY_SAVE_NUM) {
|
||||
ev_save_p->used++;
|
||||
} else {
|
||||
mPr_CopyPersonalID(&ev_save_p->pids[ev_save_p->used], &Now_Private->player_ID);
|
||||
ev_save_p->walls[ev_save_p->used] = present;
|
||||
ev_save_p->used++;
|
||||
}
|
||||
}
|
||||
|
||||
typedef void (*aEART_INIT_PROC)(EV_ARTIST_ACTOR* artist, GAME_PLAY* play);
|
||||
|
||||
static void aEART_init_proc(EV_ARTIST_ACTOR* artist, GAME_PLAY* play, int action) {
|
||||
static aEART_INIT_PROC init_proc[] = {
|
||||
// clang-format off
|
||||
(aEART_INIT_PROC)none_proc1,
|
||||
(aEART_INIT_PROC)none_proc1,
|
||||
aEART_menu_open_wait_init,
|
||||
aEART_menu_close_wait_init,
|
||||
aEART_msg_win_open_wait_init,
|
||||
aEART_demo_start_wait_init,
|
||||
(aEART_INIT_PROC)none_proc1,
|
||||
(aEART_INIT_PROC)none_proc1,
|
||||
// clang-format on
|
||||
};
|
||||
|
||||
(*init_proc[action])(artist, play);
|
||||
}
|
||||
|
||||
static void aEART_setupAction(EV_ARTIST_ACTOR* artist, GAME_PLAY* play, int action) {
|
||||
static aEART_TALK_PROC process[] = {
|
||||
// clang-format off
|
||||
aEART_say_hungry,
|
||||
(aEART_TALK_PROC)none_proc1,
|
||||
aEART_menu_open_wait,
|
||||
aEART_menu_close_wait,
|
||||
aEART_msg_win_open_wait,
|
||||
aEART_demo_start_wait,
|
||||
aEART_refuse_demo_start_wait,
|
||||
aEART_refuse_demo_end_wait,
|
||||
// clang-format on
|
||||
};
|
||||
|
||||
artist->talk_proc = process[action];
|
||||
aEART_init_proc(artist, play, action);
|
||||
}
|
||||
|
||||
static void aEART_set_talk_info_talk_request(ACTOR* actorx) {
|
||||
int msg_no;
|
||||
|
||||
if (aEART_check_present() == TRUE) {
|
||||
msg_no = 0x02FB;
|
||||
} else {
|
||||
msg_no = 0x02F5;
|
||||
}
|
||||
|
||||
mDemo_Set_msg_num(msg_no);
|
||||
}
|
||||
|
||||
static void aEART_talk_request(ACTOR* actorx, GAME* game) {
|
||||
mDemo_Request(mDemo_TYPE_TALK, actorx, aEART_set_talk_info_talk_request);
|
||||
}
|
||||
|
||||
static int aEART_talk_init(ACTOR* actorx, GAME* game) {
|
||||
EV_ARTIST_ACTOR* artist = (EV_ARTIST_ACTOR*)actorx;
|
||||
GAME_PLAY* play = (GAME_PLAY*)game;
|
||||
int action;
|
||||
|
||||
if (aEART_check_present() == TRUE) {
|
||||
action = aEART_ACTION_TALK_END_WAIT;
|
||||
} else {
|
||||
action = aEART_ACTION_SAY_HUNGRY;
|
||||
}
|
||||
|
||||
(*artist->setupAction_proc)(artist, play, action);
|
||||
mDemo_Set_ListenAble();
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static int aEART_talk_end_chk(ACTOR* actorx, GAME* game) {
|
||||
EV_ARTIST_ACTOR* artist = (EV_ARTIST_ACTOR*)actorx;
|
||||
GAME_PLAY* play = (GAME_PLAY*)game;
|
||||
int ret = FALSE;
|
||||
|
||||
(*artist->talk_proc)(artist, play);
|
||||
|
||||
if (mDemo_Get_talk_actor() != actorx) {
|
||||
mEv_set_status(mEv_EVENT_ARTIST, mEv_STATUS_TALK);
|
||||
ret = TRUE;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void aEART_actor_move(ACTOR* actorx, GAME* game) {
|
||||
CLIP(npc_clip)->move_proc(actorx, game);
|
||||
}
|
||||
Reference in New Issue
Block a user