From 0c8b49374acf047003aa0252a6cee429559c2264 Mon Sep 17 00:00:00 2001 From: hgn Date: Tue, 13 May 2025 20:02:26 +0100 Subject: [PATCH] board maker in t he hub --- content_skaterift/maps/dev_hub/main.mdl | Bin 2115312 -> 2136448 bytes src/ent_npc.c | 9 +++++++ src/player_remote.c | 3 ++- src/scripts/hub.c | 31 ++++++++++++++++++++++++ src/skaterift_script.c | 1 + 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/content_skaterift/maps/dev_hub/main.mdl b/content_skaterift/maps/dev_hub/main.mdl index 5dc735a54e5ab4126737aabe6542a1f369e3337d..42fbf25f18d44d98acf367f4a55b3266825c722b 100644 GIT binary patch delta 15678 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 NJP$fN@cMnk{{iQs{XGBx delta 4582 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 I{q>6f0|@WTAOHXW diff --git a/src/ent_npc.c b/src/ent_npc.c index 6427496..311b0fe 100644 --- a/src/ent_npc.c +++ b/src/ent_npc.c @@ -116,6 +116,15 @@ static _gino_contexts[] = { NULL, NULL }, } }, + { + "boardmaker", .subtitles = (const cs_subtitle[]) + { + { "a1", KCOL_JESUS "Now that you know how to make boards" }, + { "a2", KCOL_JESUS "We moved a workshop in upstairs.." }, + { "a3", KCOL_JESUS ":)" }, + { NULL, NULL }, + } + }, /* VOLCANO world */ { diff --git a/src/player_remote.c b/src/player_remote.c index 08f2df0..618b663 100644 --- a/src/player_remote.c +++ b/src/player_remote.c @@ -1120,7 +1120,8 @@ void remote_players_chat_imgui( ui_context *ctx ) } else { - if( (skaterift.activity == k_skaterift_default) && button_down( k_srbind_chat ) ) + if( (skaterift.activity == k_skaterift_default) && button_down( k_srbind_chat ) && + (_world.event != k_world_event_board_maker) ) { netplayers.chatting = 1; netplayers.chat_buffer[0] = '\0'; diff --git a/src/scripts/hub.c b/src/scripts/hub.c index 9c58b20..690e76c 100644 --- a/src/scripts/hub.c +++ b/src/scripts/hub.c @@ -106,5 +106,36 @@ static bool _skaterift_script_hub( ent_script_event *event ) return 1; } + u64 status; + if( on_nugget_changed( event, "board_maker_unlock", &status ) ) + { + ent_list *list = _ent_list_get_aliased( "gino_board_maker" ); + bool visible = 0; + + if( status ) + { + u64 view = _skaterift_script_nugget_status( "board_maker_hub_view" ); + if( view == 0 ) + visible = 1; + } + + _ent_list_set_visible( list, visible ); + } + + if( on_function_trigger( event, 5 ) ) + { + _skaterift_script_nugget_set( "board_maker_hub_view", 1 ); + + // Hide just the notifier + struct ent_list_iter iter; + _ent_list_iter_start( &iter, _ent_list_get_aliased( "gino_board_maker" ), k_ent_marker ); + if( _ent_list_iter( &iter ) ) + { + world_instance *world = &_world.main; + ent_marker *marker = af_arritm( &world->ent_marker, iter.index ); + marker->flags |= (u32)k_ent_marker_flag_hidden; + } + } + return 0; } diff --git a/src/skaterift_script.c b/src/skaterift_script.c index 73d49d7..fdc136e 100644 --- a/src/skaterift_script.c +++ b/src/skaterift_script.c @@ -683,6 +683,7 @@ struct script_save_nugget _skaterift_script_savedata[] = { { "board_maker_unlock" }, + { "board_maker_hub_view" }, { "intro_view" }, { "hub_info_view" }, -- 2.25.1